diff --git a/public/sass/.scss-lint.yml b/public/sass/.scss-lint.yml
new file mode 100644
index 00000000000..925f3c4b0f1
--- /dev/null
+++ b/public/sass/.scss-lint.yml
@@ -0,0 +1,533 @@
+# Default application configuration that all configurations inherit from.
+scss_files:
+  - "**/*.scss"
+
+plugin_directories: ['.scss-linters']
+
+# List of gem names to load custom linters from (make sure they are already
+# installed)
+plugin_gems: []
+
+# Default severity of all linters.
+severity: warning
+
+linters:
+  BangFormat:
+    enabled: true
+    space_before_bang: true
+    space_after_bang: false
+
+  BemDepth:
+    enabled: false
+    max_elements: 1
+
+  BorderZero:
+    enabled: true
+    convention: zero # or `none`
+
+  ChainedClasses:
+    enabled: false
+
+  ColorKeyword:
+    enabled: true
+
+  ColorVariable:
+    enabled: false
+
+  Comment:
+    enabled: true
+    exclude:
+      - _normalize.scss
+      - bootstrap.scss
+    style: silent
+
+  DebugStatement:
+    enabled: true
+
+  DeclarationOrder:
+    enabled: false
+
+  DisableLinterReason:
+    enabled: false
+
+  DuplicateProperty:
+    enabled: true
+
+  ElsePlacement:
+    enabled: true
+    style: same_line # or 'new_line'
+
+  EmptyLineBetweenBlocks:
+    enabled: false
+    ignore_single_line_blocks: true
+
+  EmptyRule:
+    enabled: true
+
+  ExtendDirective:
+    enabled: false
+
+  FinalNewline:
+    enabled: true
+    present: true
+
+  HexLength:
+    enabled: true
+    style: short # or 'long'
+
+  HexNotation:
+    enabled: true
+    style: lowercase # or 'uppercase'
+
+  HexValidation:
+    enabled: true
+
+  IdSelector:
+    enabled: true
+
+  ImportantRule:
+    enabled: true
+
+  ImportPath:
+    enabled: true
+    leading_underscore: false
+    filename_extension: false
+
+  Indentation:
+    enabled: true
+    allow_non_nested_indentation: false
+    character: space # or 'tab'
+    width: 2
+
+  LeadingZero:
+    enabled: true
+    style: exclude_zero # or 'include_zero'
+
+  MergeableSelector:
+    enabled: false
+    force_nesting: true
+
+  NameFormat:
+    enabled: true
+    allow_leading_underscore: true
+    convention: hyphenated_lowercase # or 'camel_case', or 'snake_case', or a regex pattern
+
+  NestingDepth:
+    enabled: true
+    max_depth: 4
+    ignore_parent_selectors: false
+
+  PlaceholderInExtend:
+    enabled: false
+
+  PropertyCount:
+    enabled: false
+    include_nested: false
+    max_properties: 10
+
+  PropertySortOrder:
+    enabled: true
+    ignore_unspecified: false
+    min_properties: 2
+    separate_groups: false
+    order:
+      - position
+      - top
+      - right
+      - bottom
+      - left
+      - z-index
+      - -webkit-box-sizing
+      - -moz-box-sizing
+      - box-sizing
+      - display
+      - flex
+      - flex-align
+      - flex-basis
+      - flex-direction
+      - flex-flow
+      - flex-grow
+      - flex-order
+      - flex-pack
+      - float
+      - width
+      - min-width
+      - max-width
+      - height
+      - min-height
+      - max-height
+      - padding
+      - padding-top
+      - padding-right
+      - padding-bottom
+      - padding-left
+      - margin
+      - margin-top
+      - margin-right
+      - margin-bottom
+      - margin-left
+      - overflow
+      - overflow-x
+      - overflow-y
+      - -webkit-overflow-scrolling
+      - -ms-overflow-x
+      - -ms-overflow-y
+      - -ms-overflow-style
+      - clip
+      - clear
+      - font
+      - font-family
+      - font-size
+      - font-style
+      - font-weight
+      - font-variant
+      - font-size-adjust
+      - font-stretch
+      - font-effect
+      - font-emphasize
+      - font-emphasize-position
+      - font-emphasize-style
+      - font-smooth
+      - -webkit-hyphens
+      - -moz-hyphens
+      - hyphens
+      - line-height
+      - color
+      - text-align
+      - -webkit-text-align-last
+      - -moz-text-align-last
+      - -ms-text-align-last
+      - text-align-last
+      - text-emphasis
+      - text-emphasis-color
+      - text-emphasis-style
+      - text-emphasis-position
+      - text-decoration
+      - text-indent
+      - text-justify
+      - text-outline
+      - -ms-text-overflow
+      - text-overflow
+      - text-overflow-ellipsis
+      - text-overflow-mode
+      - text-shadow
+      - text-transform
+      - text-wrap
+      - -webkit-text-size-adjust
+      - -ms-text-size-adjust
+      - letter-spacing
+      - -ms-word-break
+      - word-break
+      - word-spacing
+      - -ms-word-wrap
+      - word-wrap
+      - -moz-tab-size
+      - -o-tab-size
+      - tab-size
+      - white-space
+      - vertical-align
+      - list-style
+      - list-style-position
+      - list-style-type
+      - list-style-image
+      - pointer-events
+      - -ms-touch-action
+      - touch-action
+      - cursor
+      - visibility
+      - zoom
+      - table-layout
+      - empty-cells
+      - caption-side
+      - border-spacing
+      - border-collapse
+      - content
+      - quotes
+      - counter-reset
+      - counter-increment
+      - resize
+      - -webkit-user-select
+      - -moz-user-select
+      - -ms-user-select
+      - -o-user-select
+      - user-select
+      - nav-index
+      - nav-up
+      - nav-right
+      - nav-down
+      - nav-left
+      - background
+      - background-color
+      - background-image
+      - -ms-filter:\\'progid:DXImageTransform.Microsoft.gradient
+      - filter:progid:DXImageTransform.Microsoft.gradient
+      - filter:progid:DXImageTransform.Microsoft.AlphaImageLoader
+      - filter
+      - background-repeat
+      - background-attachment
+      - background-position
+      - background-position-x
+      - background-position-y
+      - -webkit-background-clip
+      - -moz-background-clip
+      - background-clip
+      - background-origin
+      - -webkit-background-size
+      - -moz-background-size
+      - -o-background-size
+      - background-size
+      - border
+      - border-color
+      - border-style
+      - border-width
+      - border-top
+      - border-top-color
+      - border-top-style
+      - border-top-width
+      - border-right
+      - border-right-color
+      - border-right-style
+      - border-right-width
+      - border-bottom
+      - border-bottom-color
+      - border-bottom-style
+      - border-bottom-width
+      - border-left
+      - border-left-color
+      - border-left-style
+      - border-left-width
+      - border-radius
+      - border-top-left-radius
+      - border-top-right-radius
+      - border-bottom-right-radius
+      - border-bottom-left-radius
+      - -webkit-border-image
+      - -moz-border-image
+      - -o-border-image
+      - border-image
+      - -webkit-border-image-source
+      - -moz-border-image-source
+      - -o-border-image-source
+      - border-image-source
+      - -webkit-border-image-slice
+      - -moz-border-image-slice
+      - -o-border-image-slice
+      - border-image-slice
+      - -webkit-border-image-width
+      - -moz-border-image-width
+      - -o-border-image-width
+      - border-image-width
+      - -webkit-border-image-outset
+      - -moz-border-image-outset
+      - -o-border-image-outset
+      - border-image-outset
+      - -webkit-border-image-repeat
+      - -moz-border-image-repeat
+      - -o-border-image-repeat
+      - border-image-repeat
+      - outline
+      - outline-width
+      - outline-style
+      - outline-color
+      - outline-offset
+      - -webkit-box-shadow
+      - -moz-box-shadow
+      - box-shadow
+      - filter:progid:DXImageTransform.Microsoft.Alpha(Opacity
+      - -ms-filter:\\'progid:DXImageTransform.Microsoft.Alpha
+      - opacity
+      - -ms-interpolation-mode
+      - -webkit-transition
+      - -moz-transition
+      - -ms-transition
+      - -o-transition
+      - transition
+      - -webkit-transition-delay
+      - -moz-transition-delay
+      - -ms-transition-delay
+      - -o-transition-delay
+      - transition-delay
+      - -webkit-transition-timing-function
+      - -moz-transition-timing-function
+      - -ms-transition-timing-function
+      - -o-transition-timing-function
+      - transition-timing-function
+      - -webkit-transition-duration
+      - -moz-transition-duration
+      - -ms-transition-duration
+      - -o-transition-duration
+      - transition-duration
+      - -webkit-transition-property
+      - -moz-transition-property
+      - -ms-transition-property
+      - -o-transition-property
+      - transition-property
+      - -webkit-transform
+      - -moz-transform
+      - -ms-transform
+      - -o-transform
+      - transform
+      - -webkit-transform-origin
+      - -moz-transform-origin
+      - -ms-transform-origin
+      - -o-transform-origin
+      - transform-origin
+      - -webkit-animation
+      - -moz-animation
+      - -ms-animation
+      - -o-animation
+      - animation
+      - -webkit-animation-name
+      - -moz-animation-name
+      - -ms-animation-name
+      - -o-animation-name
+      - animation-name
+      - -webkit-animation-duration
+      - -moz-animation-duration
+      - -ms-animation-duration
+      - -o-animation-duration
+      - animation-duration
+      - -webkit-animation-play-state
+      - -moz-animation-play-state
+      - -ms-animation-play-state
+      - -o-animation-play-state
+      - animation-play-state
+      - -webkit-animation-timing-function
+      - -moz-animation-timing-function
+      - -ms-animation-timing-function
+      - -o-animation-timing-function
+      - animation-timing-function
+      - -webkit-animation-delay
+      - -moz-animation-delay
+      - -ms-animation-delay
+      - -o-animation-delay
+      - animation-delay
+      - -webkit-animation-iteration-count
+      - -moz-animation-iteration-count
+      - -ms-animation-iteration-count
+      - -o-animation-iteration-count
+      - animation-iteration-count
+      - -webkit-animation-direction
+      - -moz-animation-direction
+      - -ms-animation-direction
+      - -o-animation-direction
+
+
+  PropertySpelling:
+    enabled: true
+    extra_properties: []
+    disabled_properties: []
+
+  PropertyUnits:
+    enabled: true
+    global: [
+      'ch', 'em', 'ex', 'rem',                 # Font-relative lengths
+      'cm', 'in', 'mm', 'pc', 'pt', 'px', 'q', # Absolute lengths
+      'vh', 'vw', 'vmin', 'vmax',              # Viewport-percentage lengths
+      'deg', 'grad', 'rad', 'turn',            # Angle
+      'ms', 's',                               # Duration
+      'Hz', 'kHz',                             # Frequency
+      'dpi', 'dpcm', 'dppx',                   # Resolution
+      '%']                                     # Other
+    properties: {}
+
+  PseudoElement:
+    enabled: true
+
+  QualifyingElement:
+    enabled: true
+    allow_element_with_attribute: false
+    allow_element_with_class: false
+    allow_element_with_id: false
+
+  SelectorDepth:
+    enabled: true
+    max_depth: 4
+
+  SelectorFormat:
+    enabled: false
+    convention: hyphenated_lowercase # or 'strict_BEM', or 'hyphenated_BEM', or 'snake_case', or 'camel_case', or a regex pattern
+
+  Shorthand:
+    enabled: true
+    allowed_shorthands: [1, 2, 3]
+
+  SingleLinePerProperty:
+    enabled: false
+    allow_single_line_rule_sets: true
+
+  SingleLinePerSelector:
+    enabled: false
+
+  SpaceAfterComma:
+    enabled: false
+    style: one_space # or 'no_space', or 'at_least_one_space'
+
+  SpaceAfterPropertyColon:
+    enabled: true
+    style: at_least_one_space # or 'no_space', or 'at_least_one_space', or 'aligned'
+
+  SpaceAfterPropertyName:
+    enabled: true
+
+  SpaceAfterVariableName:
+    enabled: true
+
+  SpaceAroundOperator:
+    enabled: true
+    style: one_space # or 'at_least_one_space', or 'no_space'
+
+  SpaceBeforeBrace:
+    enabled: true
+    style: space # or 'new_line'
+    allow_single_line_padding: false
+
+  SpaceBetweenParens:
+    enabled: true
+    spaces: 0
+
+  StringQuotes:
+    enabled: true
+    style: double_quotes # or double_quotes
+
+  TrailingSemicolon:
+    enabled: true
+
+  TrailingWhitespace:
+    enabled: true
+
+  TrailingZero:
+    enabled: false
+
+  TransitionAll:
+    enabled: false
+
+  UnnecessaryMantissa:
+    enabled: true
+
+  UnnecessaryParentReference:
+    enabled: true
+
+  UrlFormat:
+    enabled: true
+
+  UrlQuotes:
+    enabled: true
+
+  VariableForProperty:
+    enabled: false
+    properties: []
+
+  VendorPrefix:
+    enabled: true
+    identifier_list: base
+    additional_identifiers: []
+    excluded_identifiers: []
+    exclude:
+      - _normalize.scss
+
+  ZeroUnit:
+    enabled: true
+
+  Compass::*:
+    enabled: false
diff --git a/public/less/_grafana.scss b/public/sass/_grafana.scss
similarity index 100%
rename from public/less/_grafana.scss
rename to public/sass/_grafana.scss
diff --git a/public/less/_grid-variables.scss b/public/sass/_grid-variables.scss
similarity index 100%
rename from public/less/_grid-variables.scss
rename to public/sass/_grid-variables.scss
diff --git a/public/less/_variables.dark.scss b/public/sass/_variables.dark.scss
similarity index 100%
rename from public/less/_variables.dark.scss
rename to public/sass/_variables.dark.scss
diff --git a/public/less/_variables.light.scss b/public/sass/_variables.light.scss
similarity index 100%
rename from public/less/_variables.light.scss
rename to public/sass/_variables.light.scss
diff --git a/public/less/base/_base.scss b/public/sass/base/_base.scss
similarity index 100%
rename from public/less/base/_base.scss
rename to public/sass/base/_base.scss
diff --git a/public/less/base/_code.scss b/public/sass/base/_code.scss
similarity index 100%
rename from public/less/base/_code.scss
rename to public/sass/base/_code.scss
diff --git a/public/less/base/_fonts.scss b/public/sass/base/_fonts.scss
similarity index 100%
rename from public/less/base/_fonts.scss
rename to public/sass/base/_fonts.scss
diff --git a/public/less/base/_forms.scss b/public/sass/base/_forms.scss
similarity index 100%
rename from public/less/base/_forms.scss
rename to public/sass/base/_forms.scss
diff --git a/public/less/base/_grid.scss b/public/sass/base/_grid.scss
similarity index 100%
rename from public/less/base/_grid.scss
rename to public/sass/base/_grid.scss
diff --git a/public/less/base/_normalize.scss b/public/sass/base/_normalize.scss
similarity index 100%
rename from public/less/base/_normalize.scss
rename to public/sass/base/_normalize.scss
diff --git a/public/less/base/_type.scss b/public/sass/base/_type.scss
similarity index 100%
rename from public/less/base/_type.scss
rename to public/sass/base/_type.scss
diff --git a/public/less/bootstrap/grid.scss b/public/sass/bootstrap/grid.scss
similarity index 100%
rename from public/less/bootstrap/grid.scss
rename to public/sass/bootstrap/grid.scss
diff --git a/public/less/bootstrap/responsive-1200px-min.scss b/public/sass/bootstrap/responsive-1200px-min.scss
similarity index 100%
rename from public/less/bootstrap/responsive-1200px-min.scss
rename to public/sass/bootstrap/responsive-1200px-min.scss
diff --git a/public/less/bootstrap/responsive-767px-max.scss b/public/sass/bootstrap/responsive-767px-max.scss
similarity index 100%
rename from public/less/bootstrap/responsive-767px-max.scss
rename to public/sass/bootstrap/responsive-767px-max.scss
diff --git a/public/less/bootstrap/responsive-768px-979px.scss b/public/sass/bootstrap/responsive-768px-979px.scss
similarity index 100%
rename from public/less/bootstrap/responsive-768px-979px.scss
rename to public/sass/bootstrap/responsive-768px-979px.scss
diff --git a/public/less/bootstrap/responsive-utilities.scss b/public/sass/bootstrap/responsive-utilities.scss
similarity index 100%
rename from public/less/bootstrap/responsive-utilities.scss
rename to public/sass/bootstrap/responsive-utilities.scss
diff --git a/public/less/bootstrap/responsive.scss b/public/sass/bootstrap/responsive.scss
similarity index 100%
rename from public/less/bootstrap/responsive.scss
rename to public/sass/bootstrap/responsive.scss
diff --git a/public/less/components/_alerts.scss b/public/sass/components/_alerts.scss
similarity index 100%
rename from public/less/components/_alerts.scss
rename to public/sass/components/_alerts.scss
diff --git a/public/less/components/_buttons.scss b/public/sass/components/_buttons.scss
similarity index 100%
rename from public/less/components/_buttons.scss
rename to public/sass/components/_buttons.scss
diff --git a/public/less/components/_color_picker.scss b/public/sass/components/_color_picker.scss
similarity index 100%
rename from public/less/components/_color_picker.scss
rename to public/sass/components/_color_picker.scss
diff --git a/public/less/components/_dashboard.scss b/public/sass/components/_dashboard.scss
similarity index 100%
rename from public/less/components/_dashboard.scss
rename to public/sass/components/_dashboard.scss
diff --git a/public/less/components/_dropdown.scss b/public/sass/components/_dropdown.scss
similarity index 100%
rename from public/less/components/_dropdown.scss
rename to public/sass/components/_dropdown.scss
diff --git a/public/less/components/_filter-controls.scss b/public/sass/components/_filter-controls.scss
similarity index 100%
rename from public/less/components/_filter-controls.scss
rename to public/sass/components/_filter-controls.scss
diff --git a/public/less/components/_filter-list.scss b/public/sass/components/_filter-list.scss
similarity index 100%
rename from public/less/components/_filter-list.scss
rename to public/sass/components/_filter-list.scss
diff --git a/public/less/components/_filter-table.scss b/public/sass/components/_filter-table.scss
similarity index 100%
rename from public/less/components/_filter-table.scss
rename to public/sass/components/_filter-table.scss
diff --git a/public/less/components/_footer.scss b/public/sass/components/_footer.scss
similarity index 100%
rename from public/less/components/_footer.scss
rename to public/sass/components/_footer.scss
diff --git a/public/less/components/_gf-form.scss b/public/sass/components/_gf-form.scss
similarity index 100%
rename from public/less/components/_gf-form.scss
rename to public/sass/components/_gf-form.scss
diff --git a/public/less/components/_gfbox.scss b/public/sass/components/_gfbox.scss
similarity index 100%
rename from public/less/components/_gfbox.scss
rename to public/sass/components/_gfbox.scss
diff --git a/public/less/components/_infobox.scss b/public/sass/components/_infobox.scss
similarity index 100%
rename from public/less/components/_infobox.scss
rename to public/sass/components/_infobox.scss
diff --git a/public/less/components/_modals.scss b/public/sass/components/_modals.scss
similarity index 100%
rename from public/less/components/_modals.scss
rename to public/sass/components/_modals.scss
diff --git a/public/less/components/_navbar.scss b/public/sass/components/_navbar.scss
similarity index 100%
rename from public/less/components/_navbar.scss
rename to public/sass/components/_navbar.scss
diff --git a/public/less/components/_navs.scss b/public/sass/components/_navs.scss
similarity index 100%
rename from public/less/components/_navs.scss
rename to public/sass/components/_navs.scss
diff --git a/public/less/components/_old_stuff.scss b/public/sass/components/_old_stuff.scss
similarity index 100%
rename from public/less/components/_old_stuff.scss
rename to public/sass/components/_old_stuff.scss
diff --git a/public/less/components/_pagination.scss b/public/sass/components/_pagination.scss
similarity index 100%
rename from public/less/components/_pagination.scss
rename to public/sass/components/_pagination.scss
diff --git a/public/less/components/_panel_dashlist.scss b/public/sass/components/_panel_dashlist.scss
similarity index 100%
rename from public/less/components/_panel_dashlist.scss
rename to public/sass/components/_panel_dashlist.scss
diff --git a/public/less/components/_panel_graph.scss b/public/sass/components/_panel_graph.scss
similarity index 100%
rename from public/less/components/_panel_graph.scss
rename to public/sass/components/_panel_graph.scss
diff --git a/public/less/components/_panel_singlestat.scss b/public/sass/components/_panel_singlestat.scss
similarity index 100%
rename from public/less/components/_panel_singlestat.scss
rename to public/sass/components/_panel_singlestat.scss
diff --git a/public/less/components/_panel_table.scss b/public/sass/components/_panel_table.scss
similarity index 100%
rename from public/less/components/_panel_table.scss
rename to public/sass/components/_panel_table.scss
diff --git a/public/less/components/_popovers.scss b/public/sass/components/_popovers.scss
similarity index 100%
rename from public/less/components/_popovers.scss
rename to public/sass/components/_popovers.scss
diff --git a/public/less/components/_query_editor.scss b/public/sass/components/_query_editor.scss
similarity index 100%
rename from public/less/components/_query_editor.scss
rename to public/sass/components/_query_editor.scss
diff --git a/public/less/components/_scrollbar.scss b/public/sass/components/_scrollbar.scss
similarity index 100%
rename from public/less/components/_scrollbar.scss
rename to public/sass/components/_scrollbar.scss
diff --git a/public/less/components/_search.scss b/public/sass/components/_search.scss
similarity index 100%
rename from public/less/components/_search.scss
rename to public/sass/components/_search.scss
diff --git a/public/less/components/_shortcuts.scss b/public/sass/components/_shortcuts.scss
similarity index 100%
rename from public/less/components/_shortcuts.scss
rename to public/sass/components/_shortcuts.scss
diff --git a/public/less/components/_sidemenu.scss b/public/sass/components/_sidemenu.scss
similarity index 100%
rename from public/less/components/_sidemenu.scss
rename to public/sass/components/_sidemenu.scss
diff --git a/public/less/components/_submenu.scss b/public/sass/components/_submenu.scss
similarity index 100%
rename from public/less/components/_submenu.scss
rename to public/sass/components/_submenu.scss
diff --git a/public/less/components/_tables_lists.scss b/public/sass/components/_tables_lists.scss
similarity index 100%
rename from public/less/components/_tables_lists.scss
rename to public/sass/components/_tables_lists.scss
diff --git a/public/less/components/_tabs.scss b/public/sass/components/_tabs.scss
similarity index 100%
rename from public/less/components/_tabs.scss
rename to public/sass/components/_tabs.scss
diff --git a/public/less/components/_tags.scss b/public/sass/components/_tags.scss
similarity index 100%
rename from public/less/components/_tags.scss
rename to public/sass/components/_tags.scss
diff --git a/public/less/components/_tagsinput.scss b/public/sass/components/_tagsinput.scss
similarity index 100%
rename from public/less/components/_tagsinput.scss
rename to public/sass/components/_tagsinput.scss
diff --git a/public/less/components/_tightform.scss b/public/sass/components/_tightform.scss
similarity index 100%
rename from public/less/components/_tightform.scss
rename to public/sass/components/_tightform.scss
diff --git a/public/less/components/_timepicker.scss b/public/sass/components/_timepicker.scss
similarity index 100%
rename from public/less/components/_timepicker.scss
rename to public/sass/components/_timepicker.scss
diff --git a/public/less/components/_tooltip.scss b/public/sass/components/_tooltip.scss
similarity index 100%
rename from public/less/components/_tooltip.scss
rename to public/sass/components/_tooltip.scss
diff --git a/public/less/components/_typeahead.scss b/public/sass/components/_typeahead.scss
similarity index 100%
rename from public/less/components/_typeahead.scss
rename to public/sass/components/_typeahead.scss
diff --git a/public/less/grafana-responsive.scss b/public/sass/grafana-responsive.scss
similarity index 100%
rename from public/less/grafana-responsive.scss
rename to public/sass/grafana-responsive.scss
diff --git a/public/less/grafana.dark.scss b/public/sass/grafana.dark.scss
similarity index 100%
rename from public/less/grafana.dark.scss
rename to public/sass/grafana.dark.scss
diff --git a/public/less/grafana.light.scss b/public/sass/grafana.light.scss
similarity index 100%
rename from public/less/grafana.light.scss
rename to public/sass/grafana.light.scss
diff --git a/public/less/layout/_page.scss b/public/sass/layout/_page.scss
similarity index 100%
rename from public/less/layout/_page.scss
rename to public/sass/layout/_page.scss
diff --git a/public/less/mixins/_breakpoints.scss b/public/sass/mixins/_breakpoints.scss
similarity index 100%
rename from public/less/mixins/_breakpoints.scss
rename to public/sass/mixins/_breakpoints.scss
diff --git a/public/less/mixins/_buttons.scss b/public/sass/mixins/_buttons.scss
similarity index 100%
rename from public/less/mixins/_buttons.scss
rename to public/sass/mixins/_buttons.scss
diff --git a/public/less/mixins/_grid-framework.scss b/public/sass/mixins/_grid-framework.scss
similarity index 100%
rename from public/less/mixins/_grid-framework.scss
rename to public/sass/mixins/_grid-framework.scss
diff --git a/public/less/mixins/_grid.scss b/public/sass/mixins/_grid.scss
similarity index 100%
rename from public/less/mixins/_grid.scss
rename to public/sass/mixins/_grid.scss
diff --git a/public/less/mixins/_mixins.scss b/public/sass/mixins/_mixins.scss
similarity index 100%
rename from public/less/mixins/_mixins.scss
rename to public/sass/mixins/_mixins.scss
diff --git a/public/less/pages/_admin.scss b/public/sass/pages/_admin.scss
similarity index 100%
rename from public/less/pages/_admin.scss
rename to public/sass/pages/_admin.scss
diff --git a/public/less/pages/_alerting.scss b/public/sass/pages/_alerting.scss
similarity index 100%
rename from public/less/pages/_alerting.scss
rename to public/sass/pages/_alerting.scss
diff --git a/public/less/pages/_apps.scss b/public/sass/pages/_apps.scss
similarity index 100%
rename from public/less/pages/_apps.scss
rename to public/sass/pages/_apps.scss
diff --git a/public/less/pages/_login.scss b/public/sass/pages/_login.scss
similarity index 100%
rename from public/less/pages/_login.scss
rename to public/sass/pages/_login.scss
diff --git a/public/less/pages/_playlist.scss b/public/sass/pages/_playlist.scss
similarity index 100%
rename from public/less/pages/_playlist.scss
rename to public/sass/pages/_playlist.scss
diff --git a/public/less/pages/_signup.scss b/public/sass/pages/_signup.scss
similarity index 100%
rename from public/less/pages/_signup.scss
rename to public/sass/pages/_signup.scss
diff --git a/public/less/utils/_angular.scss b/public/sass/utils/_angular.scss
similarity index 100%
rename from public/less/utils/_angular.scss
rename to public/sass/utils/_angular.scss
diff --git a/public/less/utils/_flex.scss b/public/sass/utils/_flex.scss
similarity index 100%
rename from public/less/utils/_flex.scss
rename to public/sass/utils/_flex.scss
diff --git a/public/less/utils/_utils.scss b/public/sass/utils/_utils.scss
similarity index 100%
rename from public/less/utils/_utils.scss
rename to public/sass/utils/_utils.scss
diff --git a/public/less/utils/_validation.scss b/public/sass/utils/_validation.scss
similarity index 100%
rename from public/less/utils/_validation.scss
rename to public/sass/utils/_validation.scss
diff --git a/tasks/options/sass.js b/tasks/options/sass.js
index 38e72f28a98..f96970740a0 100644
--- a/tasks/options/sass.js
+++ b/tasks/options/sass.js
@@ -4,8 +4,8 @@ module.exports = function(config) {
     src:{
       options: {},
       files: {
-        "<%= genDir %>/css/grafana.dark.css": "<%= srcDir %>/less/grafana.dark.scss",
-        "<%= genDir %>/css/grafana.light.css": "<%= srcDir %>/less/grafana.light.scss",
+        "<%= genDir %>/css/grafana.dark.css": "<%= srcDir %>/sass/grafana.dark.scss",
+        "<%= genDir %>/css/grafana.light.css": "<%= srcDir %>/sass/grafana.light.scss",
       }
     }
   };
diff --git a/tasks/options/scsslint.js b/tasks/options/scsslint.js
new file mode 100644
index 00000000000..86e2d8555ed
--- /dev/null
+++ b/tasks/options/scsslint.js
@@ -0,0 +1,12 @@
+module.exports = function(config) {
+  return {
+    options: {
+      bundleExec: true,
+      config: 'public/sass/.scss-lint.yml',
+      reporterOutput: null
+    },
+    core: {
+      src: ['public/sass/**/*.scss', '!public/sass/base/_normalize.scss']
+    }
+  };
+};