diff --git a/gulp/styles.js b/gulp/styles.js
index 65f44e56a..0e1c62bf3 100644
--- a/gulp/styles.js
+++ b/gulp/styles.js
@@ -26,13 +26,13 @@ var buildStyles = function() {
   };
 
   var injectFiles = gulp.src([
-    path.join(conf.paths.src, '/sass/**/_*.scss')
+    path.join(conf.paths.src, '/sass/**/_*.scss'),
+    '!' + path.join(conf.paths.src, '/sass/theme/conf/**/*.scss')
   ], { read: false });
 
   var injectOptions = {
     transform: function(filePath) {
       filePath = filePath.replace(conf.paths.src + '/sass/', '');
-      console.log(filePath);
       return '@import "' + filePath + '";';
     },
     starttag: '// injector',
diff --git a/src/sass/common.scss b/src/sass/common.scss
new file mode 100644
index 000000000..6e46cc67e
--- /dev/null
+++ b/src/sass/common.scss
@@ -0,0 +1,2 @@
+@import 'theme/conf/variables';
+@import 'theme/conf/mixins';
\ No newline at end of file
diff --git a/src/sass/main.scss b/src/sass/main.scss
index 9a1211808..f8ffe2d75 100644
--- a/src/sass/main.scss
+++ b/src/sass/main.scss
@@ -1,2 +1,4 @@
+@import 'common';
+
 // injector
 // endinjector
\ No newline at end of file
diff --git a/src/sass/theme/comonents/_backTop.scss b/src/sass/theme/components/_backTop.scss
similarity index 100%
rename from src/sass/theme/comonents/_backTop.scss
rename to src/sass/theme/components/_backTop.scss
diff --git a/src/sass/theme/comonents/_blurPanel.scss b/src/sass/theme/components/_blurPanel.scss
similarity index 100%
rename from src/sass/theme/comonents/_blurPanel.scss
rename to src/sass/theme/components/_blurPanel.scss
diff --git a/src/sass/theme/comonents/_contentTop.scss b/src/sass/theme/components/_contentTop.scss
similarity index 100%
rename from src/sass/theme/comonents/_contentTop.scss
rename to src/sass/theme/components/_contentTop.scss
diff --git a/src/sass/theme/comonents/_msgCenter.scss b/src/sass/theme/components/_msgCenter.scss
similarity index 100%
rename from src/sass/theme/comonents/_msgCenter.scss
rename to src/sass/theme/components/_msgCenter.scss
diff --git a/src/sass/theme/comonents/_pageTop.scss b/src/sass/theme/components/_pageTop.scss
similarity index 100%
rename from src/sass/theme/comonents/_pageTop.scss
rename to src/sass/theme/components/_pageTop.scss
diff --git a/src/sass/theme/comonents/_sidebar.scss b/src/sass/theme/components/_sidebar.scss
similarity index 100%
rename from src/sass/theme/comonents/_sidebar.scss
rename to src/sass/theme/components/_sidebar.scss
diff --git a/src/sass/theme/comonents/_widgets.scss b/src/sass/theme/components/_widgets.scss
similarity index 100%
rename from src/sass/theme/comonents/_widgets.scss
rename to src/sass/theme/components/_widgets.scss
diff --git a/src/sass/theme/_mixins.scss b/src/sass/theme/conf/_mixins.scss
similarity index 61%
rename from src/sass/theme/_mixins.scss
rename to src/sass/theme/conf/_mixins.scss
index 8ddc8ceb7..96d8a15ee 100644
--- a/src/sass/theme/_mixins.scss
+++ b/src/sass/theme/conf/_mixins.scss
@@ -50,4 +50,33 @@
   &:-ms-input-placeholder {
     color: $color;
   }
+}
+
+@mixin overrideColors($color) {
+  color: $color;
+
+  p,.pie-charts,.panel-heading>.dropdown .dropdown-toggle, .panel-title, .panel-title>.small, .panel-title>.small>a, .panel-title>a, .panel-title>small, .panel-title>small>a,.traffic-text span, .form-group label {
+    color: $color;
+  }
+  .traffic-text {
+    color: $warning;
+  }
+  .feed-message .message-time, .text-muted {
+    color: darken($color, 20);
+  }
+}
+
+@mixin overridePanelBg($color, $borderColor, $dropdownColor) {
+  .panel, .panel:hover {
+    border-color: $borderColor;
+    background-color: $color;
+  }
+
+  .progress {
+    background: $color;
+  }
+
+  .dropdown-menu {
+    background-color: $dropdownColor;
+  }
 }
\ No newline at end of file
diff --git a/src/sass/theme/_variables.scss b/src/sass/theme/conf/_variables.scss
similarity index 100%
rename from src/sass/theme/_variables.scss
rename to src/sass/theme/conf/_variables.scss
diff --git a/src/app/pages/dashboard/widgets/amChart/_amChart.scss b/src/sass/theme/dashboard/_amChart.scss
similarity index 100%
rename from src/app/pages/dashboard/widgets/amChart/_amChart.scss
rename to src/sass/theme/dashboard/_amChart.scss
diff --git a/src/app/pages/dashboard/widgets/amChartMap/_amChartMap.scss b/src/sass/theme/dashboard/_amChartMap.scss
similarity index 100%
rename from src/app/pages/dashboard/widgets/amChartMap/_amChartMap.scss
rename to src/sass/theme/dashboard/_amChartMap.scss
diff --git a/src/app/pages/dashboard/widgets/blurFeed/_blurFeed.scss b/src/sass/theme/dashboard/_blurFeed.scss
similarity index 100%
rename from src/app/pages/dashboard/widgets/blurFeed/_blurFeed.scss
rename to src/sass/theme/dashboard/_blurFeed.scss
diff --git a/src/app/pages/dashboard/widgets/calendar/_calendar.scss b/src/sass/theme/dashboard/_calendar.scss
similarity index 100%
rename from src/app/pages/dashboard/widgets/calendar/_calendar.scss
rename to src/sass/theme/dashboard/_calendar.scss
diff --git a/src/app/pages/dashboard/widgets/pieCharts/_pieCharts.scss b/src/sass/theme/dashboard/_pieCharts.scss
similarity index 100%
rename from src/app/pages/dashboard/widgets/pieCharts/_pieCharts.scss
rename to src/sass/theme/dashboard/_pieCharts.scss
diff --git a/src/app/pages/dashboard/widgets/popularApp/_popularApp.scss b/src/sass/theme/dashboard/_popularApp.scss
similarity index 100%
rename from src/app/pages/dashboard/widgets/popularApp/_popularApp.scss
rename to src/sass/theme/dashboard/_popularApp.scss
diff --git a/src/app/pages/dashboard/widgets/timeline/_timeline.scss b/src/sass/theme/dashboard/_timeline.scss
similarity index 100%
rename from src/app/pages/dashboard/widgets/timeline/_timeline.scss
rename to src/sass/theme/dashboard/_timeline.scss
diff --git a/src/app/pages/dashboard/widgets/todo/_todo.scss b/src/sass/theme/dashboard/_todo.scss
similarity index 100%
rename from src/app/pages/dashboard/widgets/todo/_todo.scss
rename to src/sass/theme/dashboard/_todo.scss
diff --git a/src/app/pages/dashboard/widgets/trafficChart/_trafficChart.scss b/src/sass/theme/dashboard/_trafficChart.scss
similarity index 100%
rename from src/app/pages/dashboard/widgets/trafficChart/_trafficChart.scss
rename to src/sass/theme/dashboard/_trafficChart.scss
diff --git a/src/app/pages/dashboard/widgets/weather/_weather.scss b/src/sass/theme/dashboard/_weather.scss
similarity index 100%
rename from src/app/pages/dashboard/widgets/weather/_weather.scss
rename to src/sass/theme/dashboard/_weather.scss
diff --git a/src/sass/theme/skins/skins.scss b/src/sass/theme/skins/skins.scss
deleted file mode 100644
index 25737e724..000000000
--- a/src/sass/theme/skins/skins.scss
+++ /dev/null
@@ -1,28 +0,0 @@
-@mixin overrideColors($color) {
-  color: $color;
-
-  p,.pie-charts,.panel-heading>.dropdown .dropdown-toggle, .panel-title, .panel-title>.small, .panel-title>.small>a, .panel-title>a, .panel-title>small, .panel-title>small>a,.traffic-text span, .form-group label {
-    color: $color;
-  }
-  .traffic-text {
-    color: $warning;
-  }
-  .feed-message .message-time, .text-muted {
-    color: darken($color, 20);
-  }
-}
-
-@mixin overridePanelBg($color, $borderColor, $dropdownColor) {
-  .panel, .panel:hover {
-    border-color: $borderColor;
-    background-color: $color;
-  }
-
-  .progress {
-    background: $color;
-  }
-
-  .dropdown-menu {
-    background-color: $dropdownColor;
-  }
-}
\ No newline at end of file