diff --git a/public/css/styles.less b/public/css/styles.less
index f50137aa5fb..2acb624e641 100644
--- a/public/css/styles.less
+++ b/public/css/styles.less
@@ -1,5 +1,6 @@
 @import "bootstrap/bootstrap";
-@import "flatly";
+
+@navbar-height: 40px;
 
 body {
   padding-top: 70px;
diff --git a/public/css/flatly.less b/public/css/themes/flatly.less
similarity index 92%
rename from public/css/flatly.less
rename to public/css/themes/flatly.less
index 0090aff146f..75320a91512 100644
--- a/public/css/flatly.less
+++ b/public/css/themes/flatly.less
@@ -6,77 +6,77 @@
 // --------------------------------------------------
 @font-face {
   font-family: 'Lato';
-  src: url('../fonts/lato/lato-black-webfont.eot');
-  src: url('../fonts/lato/lato-black-webfont.eot?#iefix') format('embedded-opentype'),
-  url('../fonts/lato/lato-black-webfont.woff') format('woff'),
-  url('../fonts/lato/lato-black-webfont.ttf') format('truetype'),
-  url('../fonts/lato/lato-black-webfont.svg#latoblack') format('svg');
+  src: url('../../fonts/lato/lato-black-webfont.eot');
+  src: url('../../fonts/lato/lato-black-webfont.eot?#iefix') format('embedded-opentype'),
+  url('../../fonts/lato/lato-black-webfont.woff') format('woff'),
+  url('../../fonts/lato/lato-black-webfont.ttf') format('truetype'),
+  url('../../fonts/lato/lato-black-webfont.svg#latoblack') format('svg');
   font-weight: 900;
   font-style: normal;
 }
 
 @font-face {
   font-family: 'Lato';
-  src: url('../fonts/lato/lato-bold-webfont.eot');
-  src: url('../fonts/lato/lato-bold-webfont.eot?#iefix') format('embedded-opentype'),
-  url('../fonts/lato/lato-bold-webfont.woff') format('woff'),
-  url('../fonts/lato/lato-bold-webfont.ttf') format('truetype'),
-  url('../fonts/lato/lato-bold-webfont.svg#latobold') format('svg');
+  src: url('../../fonts/lato/lato-bold-webfont.eot');
+  src: url('../../fonts/lato/lato-bold-webfont.eot?#iefix') format('embedded-opentype'),
+  url('../../fonts/lato/lato-bold-webfont.woff') format('woff'),
+  url('../../fonts/lato/lato-bold-webfont.ttf') format('truetype'),
+  url('../../fonts/lato/lato-bold-webfont.svg#latobold') format('svg');
   font-weight: bold;
   font-style: normal;
 }
 
 @font-face {
   font-family: 'Lato';
-  src: url('../fonts/lato/lato-bolditalic-webfont.eot');
-  src: url('../fonts/lato/lato-bolditalic-webfont.eot?#iefix') format('embedded-opentype'),
-  url('../fonts/lato/lato-bolditalic-webfont.woff') format('woff'),
-  url('../fonts/lato/lato-bolditalic-webfont.ttf') format('truetype'),
-  url('../fonts/lato/lato-bolditalic-webfont.svg#latobold_italic') format('svg');
+  src: url('../../fonts/lato/lato-bolditalic-webfont.eot');
+  src: url('../../fonts/lato/lato-bolditalic-webfont.eot?#iefix') format('embedded-opentype'),
+  url('../../fonts/lato/lato-bolditalic-webfont.woff') format('woff'),
+  url('../../fonts/lato/lato-bolditalic-webfont.ttf') format('truetype'),
+  url('../../fonts/lato/lato-bolditalic-webfont.svg#latobold_italic') format('svg');
   font-weight: bold;
   font-style: italic;
 }
 
 @font-face {
   font-family: 'Lato';
-  src: url('../fonts/lato/lato-italic-webfont.eot');
-  src: url('../fonts/lato/lato-italic-webfont.eot?#iefix') format('embedded-opentype'),
-  url('../fonts/lato/lato-italic-webfont.woff') format('woff'),
-  url('../fonts/lato/lato-italic-webfont.ttf') format('truetype'),
-  url('../fonts/lato/lato-italic-webfont.svg#latoitalic') format('svg');
+  src: url('../../fonts/lato/lato-italic-webfont.eot');
+  src: url('../../fonts/lato/lato-italic-webfont.eot?#iefix') format('embedded-opentype'),
+  url('../../fonts/lato/lato-italic-webfont.woff') format('woff'),
+  url('../../fonts/lato/lato-italic-webfont.ttf') format('truetype'),
+  url('../../fonts/lato/lato-italic-webfont.svg#latoitalic') format('svg');
   font-weight: normal;
   font-style: italic;
 }
 
 @font-face {
   font-family: 'Lato';
-  src: url('../fonts/lato/lato-light-webfont.eot');
-  src: url('../fonts/lato/lato-light-webfont.eot?#iefix') format('embedded-opentype'),
-  url('../fonts/lato/lato-light-webfont.woff') format('woff'),
-  url('../fonts/lato/lato-light-webfont.ttf') format('truetype'),
-  url('../fonts/lato/lato-light-webfont.svg#latolight') format('svg');
+  src: url('../../fonts/lato/lato-light-webfont.eot');
+  src: url('../../fonts/lato/lato-light-webfont.eot?#iefix') format('embedded-opentype'),
+  url('../../fonts/lato/lato-light-webfont.woff') format('woff'),
+  url('../../fonts/lato/lato-light-webfont.ttf') format('truetype'),
+  url('../../fonts/lato/lato-light-webfont.svg#latolight') format('svg');
   font-weight: 300;
   font-style: normal;
 }
 
 @font-face {
   font-family: 'Lato';
-  src: url('../fonts/lato/lato-regular-webfont.eot');
-  src: url('../fonts/lato/lato-regular-webfont.eot?#iefix') format('embedded-opentype'),
-  url('../fonts/lato/lato-regular-webfont.woff') format('woff'),
-  url('../fonts/lato/lato-regular-webfont.ttf') format('truetype'),
-  url('../fonts/lato/lato-regular-webfont.svg#latoregular') format('svg');
+  src: url('../../fonts/lato/lato-regular-webfont.eot');
+  src: url('../../fonts/lato/lato-regular-webfont.eot?#iefix') format('embedded-opentype'),
+  url('../../fonts/lato/lato-regular-webfont.woff') format('woff'),
+  url('../../fonts/lato/lato-regular-webfont.ttf') format('truetype'),
+  url('../../fonts/lato/lato-regular-webfont.svg#latoregular') format('svg');
   font-weight: normal;
   font-style: normal;
 }
 
 @font-face {
   font-family: 'Flat-UI-Icons';
-  src:url('../fonts/Flat-UI-Icons.eot');
-  src:url('../fonts/Flat-UI-Icons.eot?#iefix') format('embedded-opentype'),
-  url('../fonts/Flat-UI-Icons.woff') format('woff'),
-  url('../fonts/Flat-UI-Icons.ttf') format('truetype'),
-  url('../fonts/Flat-UI-Icons.svg#Flat-UI-Icons') format('svg');
+  src:url('../../fonts/Flat-UI-Icons.eot');
+  src:url('../../fonts/Flat-UI-Icons.eot?#iefix') format('embedded-opentype'),
+  url('../../fonts/Flat-UI-Icons.woff') format('woff'),
+  url('../../fonts/Flat-UI-Icons.ttf') format('truetype'),
+  url('../../fonts/Flat-UI-Icons.svg#Flat-UI-Icons') format('svg');
   font-weight: normal;
   font-style: normal;
 }