diff --git a/CHANGELOG b/CHANGELOG
index c115686455..c03829e4f5 100755
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -3,6 +3,8 @@ v1.4.5-rc1 (XXXX-XX-XX)
 
 * defer evaluation of AQL subqueries and logical operators (lazy evaluation)
 
+* Updated font in WebFrontend, it now contains a version that renders properly on windows
+
 * generally allow function return values as call parameters to AQL functions
 
 * fixed potential deadlock in global context method execution
diff --git a/js/apps/system/aardvark/frontend/fonts/opensans/OpenSans.woff b/js/apps/system/aardvark/frontend/fonts/opensans/OpenSans.woff
index 58e6cb3818..82bdeb474a 100644
Binary files a/js/apps/system/aardvark/frontend/fonts/opensans/OpenSans.woff and b/js/apps/system/aardvark/frontend/fonts/opensans/OpenSans.woff differ
diff --git a/js/apps/system/aardvark/frontend/fonts/opensans/OpenSansBold.woff b/js/apps/system/aardvark/frontend/fonts/opensans/OpenSansBold.woff
index a8b5bc261e..17d5df0c0f 100644
Binary files a/js/apps/system/aardvark/frontend/fonts/opensans/OpenSansBold.woff and b/js/apps/system/aardvark/frontend/fonts/opensans/OpenSansBold.woff differ
diff --git a/js/apps/system/aardvark/frontend/fonts/opensans/OpenSansBoldItalic.woff b/js/apps/system/aardvark/frontend/fonts/opensans/OpenSansBoldItalic.woff
index 6a1833811e..a4e29c0f40 100644
Binary files a/js/apps/system/aardvark/frontend/fonts/opensans/OpenSansBoldItalic.woff and b/js/apps/system/aardvark/frontend/fonts/opensans/OpenSansBoldItalic.woff differ
diff --git a/js/apps/system/aardvark/frontend/fonts/opensans/OpenSansItalic.woff b/js/apps/system/aardvark/frontend/fonts/opensans/OpenSansItalic.woff
index 039a294953..cd19d0782d 100644
Binary files a/js/apps/system/aardvark/frontend/fonts/opensans/OpenSansItalic.woff and b/js/apps/system/aardvark/frontend/fonts/opensans/OpenSansItalic.woff differ
diff --git a/js/apps/system/aardvark/frontend/fonts/opensans/OpenSansLight.woff b/js/apps/system/aardvark/frontend/fonts/opensans/OpenSansLight.woff
index 8025ba6cb5..c1ab595f68 100644
Binary files a/js/apps/system/aardvark/frontend/fonts/opensans/OpenSansLight.woff and b/js/apps/system/aardvark/frontend/fonts/opensans/OpenSansLight.woff differ
diff --git a/js/apps/system/aardvark/frontend/fonts/opensans/OpenSansLightItalic.woff b/js/apps/system/aardvark/frontend/fonts/opensans/OpenSansLightItalic.woff
index c1e29dc534..3a02411be6 100644
Binary files a/js/apps/system/aardvark/frontend/fonts/opensans/OpenSansLightItalic.woff and b/js/apps/system/aardvark/frontend/fonts/opensans/OpenSansLightItalic.woff differ
diff --git a/js/common/bootstrap/modules.js b/js/common/bootstrap/modules.js
index 51e3c4ded4..97f26db6a9 100644
--- a/js/common/bootstrap/modules.js
+++ b/js/common/bootstrap/modules.js
@@ -1082,25 +1082,34 @@ function require (path) {
       return null;
     }
 
-     // try to load the file
+    // try to load the file
     var n;
-
-    if (p === "") {
-      n = "." + main + ".js";
-    }
-    else if (p[p.length - 1] === '/') {
-      n = p + main.substr(1) + ".js";
-    }
-    else {
-      n = p + main + ".js";
+    
+    if (p !== "" && p[p.length - 1] === '/') {
+      p = p.substr(0, p.length - 1);
     }
 
+    n = p + main + ".js";
     if (fs.exists(n)) {
       return { name: main,
                path: 'file://' + n,
                content: fs.read(n) };
     }
-
+    
+    n = p + main + "/index.js";
+    if (fs.exists(n)) {
+      return { name: main,
+               path: 'file://' + n,
+               content: fs.read(n) };
+    }
+    
+    n = p + main;
+    if (fs.exists(n)) {
+      return { name: main,
+               path: 'file://' + n,
+               content: fs.read(n) };
+    }
+    
     return null;
   };
 
@@ -1135,7 +1144,7 @@ function require (path) {
       if (fs.exists(n)) {
         try {
           var desc = JSON.parse(fs.read(n));
-          var mainfile = desc.main;
+          var mainfile = desc.main || "./index.js";
           var file;
 
           // the mainfile is always relative