diff --git a/public/less/_grafana.scss b/public/less/_grafana.scss
new file mode 100644
index 00000000000..dd896261c93
--- /dev/null
+++ b/public/less/_grafana.scss
@@ -0,0 +1,69 @@
+
+// MIXINS
+@import "./mixins/_mixins.scss";
+@import "./mixins/_buttons.scss";
+
+// BASE
+@import "./base/_normalize.scss";
+@import "./base/_base.scss";
+@import "./base/_type.scss";
+@import "./base/_forms.scss";
+@import "./base/_fonts.scss";
+@import "./base/_code.scss";
+
+// UTILS
+@import "./utils/_utils.scss";
+@import "./utils/_validation.scss";
+@import "./utils/_angular.scss";
+
+// LAYOUTS
+// @import "./bootstrap/grid.scss";
+@import "./layout/_page.scss";
+
+// COMPONENTS
+@import "./components/_panel_graph.scss";
+@import "./components/_submenu.scss";
+@import "./components/_panel_dashlist.scss";
+@import "./components/_panel_singlestat.scss";
+@import "./components/_panel_table.scss";
+@import "./components/_tagsinput.scss";
+@import "./components/_tables_lists.scss";
+@import "./components/_search.scss";
+@import "./components/_dashboard.scss";
+@import "./components/_tightform.scss";
+@import "./components/_gf-form.scss";
+@import "./components/_sidemenu.scss";
+@import "./components/_navbar.scss";
+@import "./components/_gfbox.scss";
+@import "./components/_pagination.scss";
+@import "./components/_tabs.scss";
+@import "./components/_timepicker.scss";
+@import "./components/_filter-controls.scss";
+@import "./components/_filter-list.scss";
+@import "./components/_filter-table.scss";
+@import "./components/_scrollbar.scss";
+@import "./components/_old_stuff.scss";
+@import "./components/_navbar.scss";
+@import "./components/_popovers.scss";
+@import "./components/_alerts.scss";
+@import "./components/_typeahead.scss";
+@import "./components/_tags.scss";
+@import "./components/_modals.scss";
+@import "./components/_dropdown.scss";
+@import "./components/_color_picker.scss";
+@import "./components/_tooltip.scss";
+@import "./components/_buttons.scss";
+@import "./components/_footer.scss";
+@import "./components/_infobox.scss";
+@import "./components/_shortcuts.scss";
+@import "./components/_query_editor.scss";
+@import "./components/_navs.scss";
+
+// PAGES
+@import "./pages/_login.scss";
+@import "./pages/_playlist.scss";
+@import "./pages/_admin.scss";
+@import "./pages/_alerting.scss";
+@import "./pages/_apps.scss";
+@import "./pages/_signup.scss";
+
diff --git a/public/less/variables.dark.scss b/public/less/_variables.dark.scss
similarity index 100%
rename from public/less/variables.dark.scss
rename to public/less/_variables.dark.scss
diff --git a/public/less/variables.light.scss b/public/less/_variables.light.scss
similarity index 100%
rename from public/less/variables.light.scss
rename to public/less/_variables.light.scss
diff --git a/public/less/base/base.scss b/public/less/base/_base.scss
similarity index 100%
rename from public/less/base/base.scss
rename to public/less/base/_base.scss
diff --git a/public/less/base/code.scss b/public/less/base/_code.scss
similarity index 100%
rename from public/less/base/code.scss
rename to public/less/base/_code.scss
diff --git a/public/less/base/fonts.scss b/public/less/base/_fonts.scss
similarity index 100%
rename from public/less/base/fonts.scss
rename to public/less/base/_fonts.scss
diff --git a/public/less/base/forms.scss b/public/less/base/_forms.scss
similarity index 100%
rename from public/less/base/forms.scss
rename to public/less/base/_forms.scss
diff --git a/public/less/base/normalize.scss b/public/less/base/_normalize.scss
similarity index 100%
rename from public/less/base/normalize.scss
rename to public/less/base/_normalize.scss
diff --git a/public/less/base/type.scss b/public/less/base/_type.scss
similarity index 100%
rename from public/less/base/type.scss
rename to public/less/base/_type.scss
diff --git a/public/less/components/alerts.scss b/public/less/components/_alerts.scss
similarity index 100%
rename from public/less/components/alerts.scss
rename to public/less/components/_alerts.scss
diff --git a/public/less/components/buttons.scss b/public/less/components/_buttons.scss
similarity index 100%
rename from public/less/components/buttons.scss
rename to public/less/components/_buttons.scss
diff --git a/public/less/components/color_picker.scss b/public/less/components/_color_picker.scss
similarity index 100%
rename from public/less/components/color_picker.scss
rename to public/less/components/_color_picker.scss
diff --git a/public/less/components/dashboard.scss b/public/less/components/_dashboard.scss
similarity index 100%
rename from public/less/components/dashboard.scss
rename to public/less/components/_dashboard.scss
diff --git a/public/less/components/dropdown.scss b/public/less/components/_dropdown.scss
similarity index 100%
rename from public/less/components/dropdown.scss
rename to public/less/components/_dropdown.scss
diff --git a/public/less/components/filter-controls.scss b/public/less/components/_filter-controls.scss
similarity index 100%
rename from public/less/components/filter-controls.scss
rename to public/less/components/_filter-controls.scss
diff --git a/public/less/components/filter-list.scss b/public/less/components/_filter-list.scss
similarity index 100%
rename from public/less/components/filter-list.scss
rename to public/less/components/_filter-list.scss
diff --git a/public/less/components/filter-table.scss b/public/less/components/_filter-table.scss
similarity index 100%
rename from public/less/components/filter-table.scss
rename to public/less/components/_filter-table.scss
diff --git a/public/less/components/footer.scss b/public/less/components/_footer.scss
similarity index 100%
rename from public/less/components/footer.scss
rename to public/less/components/_footer.scss
diff --git a/public/less/components/gf-form.scss b/public/less/components/_gf-form.scss
similarity index 100%
rename from public/less/components/gf-form.scss
rename to public/less/components/_gf-form.scss
diff --git a/public/less/components/gfbox.scss b/public/less/components/_gfbox.scss
similarity index 100%
rename from public/less/components/gfbox.scss
rename to public/less/components/_gfbox.scss
diff --git a/public/less/components/infobox.scss b/public/less/components/_infobox.scss
similarity index 100%
rename from public/less/components/infobox.scss
rename to public/less/components/_infobox.scss
diff --git a/public/less/components/modals.scss b/public/less/components/_modals.scss
similarity index 100%
rename from public/less/components/modals.scss
rename to public/less/components/_modals.scss
diff --git a/public/less/components/navbar.scss b/public/less/components/_navbar.scss
similarity index 100%
rename from public/less/components/navbar.scss
rename to public/less/components/_navbar.scss
diff --git a/public/less/components/navs.scss b/public/less/components/_navs.scss
similarity index 100%
rename from public/less/components/navs.scss
rename to public/less/components/_navs.scss
diff --git a/public/less/components/old_stuff.scss b/public/less/components/_old_stuff.scss
similarity index 100%
rename from public/less/components/old_stuff.scss
rename to public/less/components/_old_stuff.scss
diff --git a/public/less/components/pagination.scss b/public/less/components/_pagination.scss
similarity index 100%
rename from public/less/components/pagination.scss
rename to public/less/components/_pagination.scss
diff --git a/public/less/components/panel_dashlist.scss b/public/less/components/_panel_dashlist.scss
similarity index 100%
rename from public/less/components/panel_dashlist.scss
rename to public/less/components/_panel_dashlist.scss
diff --git a/public/less/components/panel_graph.scss b/public/less/components/_panel_graph.scss
similarity index 100%
rename from public/less/components/panel_graph.scss
rename to public/less/components/_panel_graph.scss
diff --git a/public/less/components/panel_singlestat.scss b/public/less/components/_panel_singlestat.scss
similarity index 100%
rename from public/less/components/panel_singlestat.scss
rename to public/less/components/_panel_singlestat.scss
diff --git a/public/less/components/panel_table.scss b/public/less/components/_panel_table.scss
similarity index 100%
rename from public/less/components/panel_table.scss
rename to public/less/components/_panel_table.scss
diff --git a/public/less/components/popovers.scss b/public/less/components/_popovers.scss
similarity index 100%
rename from public/less/components/popovers.scss
rename to public/less/components/_popovers.scss
diff --git a/public/less/components/query_editor.scss b/public/less/components/_query_editor.scss
similarity index 100%
rename from public/less/components/query_editor.scss
rename to public/less/components/_query_editor.scss
diff --git a/public/less/components/scrollbar.scss b/public/less/components/_scrollbar.scss
similarity index 100%
rename from public/less/components/scrollbar.scss
rename to public/less/components/_scrollbar.scss
diff --git a/public/less/components/search.scss b/public/less/components/_search.scss
similarity index 100%
rename from public/less/components/search.scss
rename to public/less/components/_search.scss
diff --git a/public/less/components/shortcuts.scss b/public/less/components/_shortcuts.scss
similarity index 100%
rename from public/less/components/shortcuts.scss
rename to public/less/components/_shortcuts.scss
diff --git a/public/less/components/sidemenu.scss b/public/less/components/_sidemenu.scss
similarity index 100%
rename from public/less/components/sidemenu.scss
rename to public/less/components/_sidemenu.scss
diff --git a/public/less/components/submenu.scss b/public/less/components/_submenu.scss
similarity index 100%
rename from public/less/components/submenu.scss
rename to public/less/components/_submenu.scss
diff --git a/public/less/components/tables_lists.scss b/public/less/components/_tables_lists.scss
similarity index 100%
rename from public/less/components/tables_lists.scss
rename to public/less/components/_tables_lists.scss
diff --git a/public/less/components/tabs.scss b/public/less/components/_tabs.scss
similarity index 100%
rename from public/less/components/tabs.scss
rename to public/less/components/_tabs.scss
diff --git a/public/less/components/tags.scss b/public/less/components/_tags.scss
similarity index 100%
rename from public/less/components/tags.scss
rename to public/less/components/_tags.scss
diff --git a/public/less/components/tagsinput.scss b/public/less/components/_tagsinput.scss
similarity index 100%
rename from public/less/components/tagsinput.scss
rename to public/less/components/_tagsinput.scss
diff --git a/public/less/components/tightform.scss b/public/less/components/_tightform.scss
similarity index 100%
rename from public/less/components/tightform.scss
rename to public/less/components/_tightform.scss
diff --git a/public/less/components/timepicker.scss b/public/less/components/_timepicker.scss
similarity index 100%
rename from public/less/components/timepicker.scss
rename to public/less/components/_timepicker.scss
diff --git a/public/less/components/tooltip.scss b/public/less/components/_tooltip.scss
similarity index 100%
rename from public/less/components/tooltip.scss
rename to public/less/components/_tooltip.scss
diff --git a/public/less/components/typeahead.scss b/public/less/components/_typeahead.scss
similarity index 100%
rename from public/less/components/typeahead.scss
rename to public/less/components/_typeahead.scss
diff --git a/public/less/grafana.dark.scss b/public/less/grafana.dark.scss
index 2dbd9475e24..24341125549 100644
--- a/public/less/grafana.dark.scss
+++ b/public/less/grafana.dark.scss
@@ -1,2 +1,2 @@
-@import "variables.dark.scss";
-@import "grafana.scss";
+@import "_variables.dark.scss";
+@import "_grafana.scss";
diff --git a/public/less/grafana.light.scss b/public/less/grafana.light.scss
index bc9b18e52fe..f44df3ec9a0 100644
--- a/public/less/grafana.light.scss
+++ b/public/less/grafana.light.scss
@@ -1,2 +1,2 @@
-@import "variables.light.scss";
-@import "grafana.scss";
+@import "_variables.light.scss";
+@import "_grafana.scss";
diff --git a/public/less/grafana.scss b/public/less/grafana.scss
deleted file mode 100644
index f994c9a194d..00000000000
--- a/public/less/grafana.scss
+++ /dev/null
@@ -1,69 +0,0 @@
-
-// MIXINS
-@import "./mixins/mixins.scss";
-@import "./mixins/buttons.scss";
-
-// BASE
-@import "./base/normalize.scss";
-@import "./base/base.scss";
-@import "./base/type.scss";
-@import "./base/forms.scss";
-@import "./base/fonts.scss";
-@import "./base/code.scss";
-
-// UTILS
-@import "./utils/utils.scss";
-@import "./utils/validation.scss";
-@import "./utils/angular.scss";
-
-// LAYOUTS
-// @import "./bootstrap/grid.scss";
-@import "./layout/page.scss";
-
-// COMPONENTS
-@import "./components/panel_graph.scss";
-@import "./components/submenu.scss";
-@import "./components/panel_dashlist.scss";
-@import "./components/panel_singlestat.scss";
-@import "./components/panel_table.scss";
-@import "./components/tagsinput.scss";
-@import "./components/tables_lists.scss";
-@import "./components/search.scss";
-@import "./components/dashboard.scss";
-@import "./components/tightform.scss";
-@import "./components/gf-form.scss";
-@import "./components/sidemenu.scss";
-@import "./components/navbar.scss";
-@import "./components/gfbox.scss";
-@import "./components/pagination.scss";
-@import "./components/tabs.scss";
-@import "./components/timepicker.scss";
-@import "./components/filter-controls.scss";
-@import "./components/filter-list.scss";
-@import "./components/filter-table.scss";
-@import "./components/scrollbar.scss";
-@import "./components/old_stuff.scss";
-@import "./components/navbar.scss";
-@import "./components/popovers.scss";
-@import "./components/alerts.scss";
-@import "./components/typeahead.scss";
-@import "./components/tags.scss";
-@import "./components/modals.scss";
-@import "./components/dropdown.scss";
-@import "./components/color_picker.scss";
-@import "./components/tooltip.scss";
-@import "./components/buttons.scss";
-@import "./components/footer.scss";
-@import "./components/infobox.scss";
-@import "./components/shortcuts.scss";
-@import "./components/query_editor.scss";
-@import "./components/navs.scss";
-
-// PAGES
-@import "./pages/login.scss";
-@import "./pages/playlist.scss";
-@import "./pages/admin.scss";
-@import "./pages/alerting.scss";
-@import "./pages/apps.scss";
-@import "./pages/signup.scss";
-
diff --git a/public/less/layout/page.scss b/public/less/layout/_page.scss
similarity index 100%
rename from public/less/layout/page.scss
rename to public/less/layout/_page.scss
diff --git a/public/less/mixins/_breakpoints.scss b/public/less/mixins/_breakpoints.scss
new file mode 100644
index 00000000000..a868833b45e
--- /dev/null
+++ b/public/less/mixins/_breakpoints.scss
@@ -0,0 +1,86 @@
+// Breakpoint viewport sizes and media queries.
+//
+// Breakpoints are defined as a map of (name: minimum width), order from small to large:
+//
+//    (xs: 0, sm: 544px, md: 768px)
+//
+// The map defined in the `$grid-breakpoints` global variable is used as the `$breakpoints` argument by default.
+
+// Name of the next breakpoint, or null for the last breakpoint.
+//
+//    >> breakpoint-next(sm)
+//    md
+//    >> breakpoint-next(sm, (xs: 0, sm: 544px, md: 768px))
+//    md
+//    >> breakpoint-next(sm, $breakpoint-names: (xs sm md))
+//    md
+@function breakpoint-next($name, $breakpoints: $grid-breakpoints, $breakpoint-names: map-keys($breakpoints)) {
+  $n: index($breakpoint-names, $name);
+  @return if($n < length($breakpoint-names), nth($breakpoint-names, $n + 1), null);
+}
+
+// Minimum breakpoint width. Null for the smallest (first) breakpoint.
+//
+//    >> breakpoint-min(sm, (xs: 0, sm: 544px, md: 768px))
+//    544px
+@function breakpoint-min($name, $breakpoints: $grid-breakpoints) {
+  $min: map-get($breakpoints, $name);
+  @return if($min != 0, $min, null);
+}
+
+// Maximum breakpoint width. Null for the largest (last) breakpoint.
+// The maximum value is calculated as the minimum of the next one less 0.1.
+//
+//    >> breakpoint-max(sm, (xs: 0, sm: 544px, md: 768px))
+//    767px
+@function breakpoint-max($name, $breakpoints: $grid-breakpoints) {
+  $next: breakpoint-next($name, $breakpoints);
+  @return if($next, breakpoint-min($next, $breakpoints) - 1px, null);
+}
+
+// Media of at least the minimum breakpoint width. No query for the smallest breakpoint.
+// Makes the @content apply to the given breakpoint and wider.
+@mixin media-breakpoint-up($name, $breakpoints: $grid-breakpoints) {
+  $min: breakpoint-min($name, $breakpoints);
+  @if $min {
+    @media (min-width: $min) {
+      @content;
+    }
+  } @else {
+    @content;
+  }
+}
+
+// Media of at most the maximum breakpoint width. No query for the largest breakpoint.
+// Makes the @content apply to the given breakpoint and narrower.
+@mixin media-breakpoint-down($name, $breakpoints: $grid-breakpoints) {
+  $max: breakpoint-max($name, $breakpoints);
+  @if $max {
+    @media (max-width: $max) {
+      @content;
+    }
+  } @else {
+    @content;
+  }
+}
+
+// Media between the breakpoint's minimum and maximum widths.
+// No minimum for the smallest breakpoint, and no maximum for the largest one.
+// Makes the @content apply only to the given breakpoint, not viewports any wider or narrower.
+@mixin media-breakpoint-only($name, $breakpoints: $grid-breakpoints) {
+  @include media-breakpoint-up($name, $breakpoints) {
+    @include media-breakpoint-down($name, $breakpoints) {
+      @content;
+    }
+  }
+}
+
+// Media that spans multiple breakpoint widths.
+// Makes the @content apply between the min and max breakpoints
+@mixin media-breakpoint-between($lower, $upper, $breakpoints: $grid-breakpoints) {
+  @include media-breakpoint-up($lower, $breakpoints) {
+    @include media-breakpoint-down($upper, $breakpoints) {
+      @content;
+    }
+  }
+}
diff --git a/public/less/mixins/buttons.scss b/public/less/mixins/_buttons.scss
similarity index 100%
rename from public/less/mixins/buttons.scss
rename to public/less/mixins/_buttons.scss
diff --git a/public/less/mixins/mixins.scss b/public/less/mixins/_mixins.scss
similarity index 100%
rename from public/less/mixins/mixins.scss
rename to public/less/mixins/_mixins.scss
diff --git a/public/less/pages/admin.scss b/public/less/pages/_admin.scss
similarity index 100%
rename from public/less/pages/admin.scss
rename to public/less/pages/_admin.scss
diff --git a/public/less/pages/alerting.scss b/public/less/pages/_alerting.scss
similarity index 100%
rename from public/less/pages/alerting.scss
rename to public/less/pages/_alerting.scss
diff --git a/public/less/pages/apps.scss b/public/less/pages/_apps.scss
similarity index 100%
rename from public/less/pages/apps.scss
rename to public/less/pages/_apps.scss
diff --git a/public/less/pages/login.scss b/public/less/pages/_login.scss
similarity index 100%
rename from public/less/pages/login.scss
rename to public/less/pages/_login.scss
diff --git a/public/less/pages/playlist.scss b/public/less/pages/_playlist.scss
similarity index 100%
rename from public/less/pages/playlist.scss
rename to public/less/pages/_playlist.scss
diff --git a/public/less/pages/signup.scss b/public/less/pages/_signup.scss
similarity index 100%
rename from public/less/pages/signup.scss
rename to public/less/pages/_signup.scss
diff --git a/public/less/utils/angular.scss b/public/less/utils/_angular.scss
similarity index 100%
rename from public/less/utils/angular.scss
rename to public/less/utils/_angular.scss
diff --git a/public/less/utils/utils.scss b/public/less/utils/_utils.scss
similarity index 100%
rename from public/less/utils/utils.scss
rename to public/less/utils/_utils.scss
diff --git a/public/less/utils/validation.scss b/public/less/utils/_validation.scss
similarity index 100%
rename from public/less/utils/validation.scss
rename to public/less/utils/_validation.scss