diff --git a/src/_h5ai/client/css/inc/colors.less b/src/_h5ai/client/css/inc/colors.less
index 25c75c5a..279d4d05 100644
--- a/src/_h5ai/client/css/inc/colors.less
+++ b/src/_h5ai/client/css/inc/colors.less
@@ -9,9 +9,7 @@
 
 @col-light: #ffffff;
 @col-lightgray: #fafafa;
-// @col-darkgray: #eeeeee;
 @col-darkgray: #f3f3f3;
-// @col-dark: #333;
 @col-dark: #212121;
 
 @col-text-primary-black: rgba(0,0,0,0.87);
diff --git a/src/_h5ai/client/css/inc/ext/contextmenu.less b/src/_h5ai/client/css/inc/ext/contextmenu.less
index 631b941a..70c6d562 100644
--- a/src/_h5ai/client/css/inc/ext/contextmenu.less
+++ b/src/_h5ai/client/css/inc/ext/contextmenu.less
@@ -7,8 +7,6 @@
     bottom: 0;
     overflow: hidden;
     z-index: 200;
-    // background: rgba(0,0,0,0.1);
-    // background: rgba(255,255,255,0.6);
 
     .cm-panel {
         .popup();
diff --git a/src/_h5ai/client/css/inc/ext/preview.less b/src/_h5ai/client/css/inc/ext/preview.less
index ee13b4fb..b06696e8 100644
--- a/src/_h5ai/client/css/inc/ext/preview.less
+++ b/src/_h5ai/client/css/inc/ext/preview.less
@@ -132,7 +132,6 @@
     right: 0;
     bottom: 0;
     background-color: rgb(27,27,27);
-    // box-shadow: 0 0 8px 0 rgba(0,0,0,0.2);
     box-shadow: 0 0 8px 2px rgba(0,0,0,0.3);
     height: 48px;
 }
diff --git a/src/_h5ai/client/css/inc/fonts.less b/src/_h5ai/client/css/inc/fonts.less
index 52b52590..cc13349a 100644
--- a/src/_h5ai/client/css/inc/fonts.less
+++ b/src/_h5ai/client/css/inc/fonts.less
@@ -1,5 +1,3 @@
-@import url(//fonts.googleapis.com/css?family=Roboto:300,400,700);
-
 @font-family: Roboto, Helvetica, Arial, sans-serif;
 @font-weight: normal;
 @font-size: 13px;
diff --git a/src/_h5ai/client/css/inc/misc.less b/src/_h5ai/client/css/inc/misc.less
index b017320c..c457eaa4 100644
--- a/src/_h5ai/client/css/inc/misc.less
+++ b/src/_h5ai/client/css/inc/misc.less
@@ -7,6 +7,5 @@ html {
 ::selection { background: @col-pink-a200; color: @col-text-primary-white; text-shadow: none; }
 
 *:focus {
-    // outline: 1px solid @col-pink-a200;
     outline: none;
 }
diff --git a/src/_h5ai/client/css/styles.less b/src/_h5ai/client/css/styles.less
index 385b429f..5f2577d6 100644
--- a/src/_h5ai/client/css/styles.less
+++ b/src/_h5ai/client/css/styles.less
@@ -1,3 +1,5 @@
+@charset "utf-8";
+
 // @include "lib/h5bp-normalize.less"
 // @include "lib/h5bp-main-header.less"
 
diff --git a/src/_h5ai/index.html.jade b/src/_h5ai/index.html.jade
index 36dd17d7..d4aa6887 100644
--- a/src/_h5ai/index.html.jade
+++ b/src/_h5ai/index.html.jade
@@ -10,6 +10,7 @@ head
     meta( name="viewport", content="width=device-width, initial-scale=1" )
     link( rel="shortcut icon", href="client/images/favicon/favicon-16-32.ico" )
     link( rel="apple-touch-icon-precomposed", type="image/png", href="client/images/favicon/favicon-152.png" )
+    link( rel="stylesheet", type="text/css", href="https://fonts.googleapis.com/css?family=Roboto:300,400,700" )
     link( rel="stylesheet", href="client/css/styles.css" )
     script( src="client/js/scripts.js", data-module="info" )
 
diff --git a/src/_h5ai/server/php/inc/page.php.jade b/src/_h5ai/server/php/inc/page.php.jade
index f9487f4a..e7e18b92 100644
--- a/src/_h5ai/server/php/inc/page.php.jade
+++ b/src/_h5ai/server/php/inc/page.php.jade
@@ -15,6 +15,7 @@ head
     meta( name="viewport", content="width=device-width, initial-scale=1" )
     link( rel="shortcut icon", href!="#{app_href}client/images/favicon/favicon-16-32.ico" )
     link( rel="apple-touch-icon-precomposed", type="image/png", href!="#{app_href}client/images/favicon/favicon-152.png" )
+    link( rel="stylesheet", type="text/css", href="https://fonts.googleapis.com/css?family=Roboto:300,400,700" )
     link( rel="stylesheet", href!="#{app_href}client/css/styles.css" )
     script( src!="#{app_href}client/js/scripts.js", data-module="index" )
 
diff --git a/test/index.html.jade b/test/index.html.jade
index 14b528e4..4c832822 100644
--- a/test/index.html.jade
+++ b/test/index.html.jade
@@ -5,6 +5,7 @@ html
         meta( http-equiv="x-ua-compatible", content="ie=edge" )
         title h5ai #{pkg.version} test suite
         meta( name="viewport", content="width=device-width, initial-scale=1" )
+        link( rel="stylesheet", type="text/css", href="https://fonts.googleapis.com/css?family=Roboto:300,400,700" )
         link( rel="stylesheet", href="h5ai-styles.css" )
         link( rel="stylesheet", href="styles.css" )
         script( src="h5ai-scripts.js" )
diff --git a/test/styles.less b/test/styles.less
index c197040f..af4c5db3 100644
--- a/test/styles.less
+++ b/test/styles.less
@@ -6,7 +6,7 @@
 @col-grey: #555;
 
 #report {
-    font-family: arial, sans;
+    font-family: Roboto, Helvetica, Arial, sans-serif;
     position: fixed;
     left: 0;
     top: 0;
@@ -34,7 +34,7 @@
 }
 
 #mocha-overlay {
-    font-family: arial, sans;
+    font-family: Roboto, Helvetica, Arial, sans-serif;
     position: fixed;
     left: 0;
     top: 32px;