diff --git a/gtk-3.0/scss/widgets.scss b/gtk-3.0/scss/widgets.scss
index e5613bf..3dfd4ff 100755
--- a/gtk-3.0/scss/widgets.scss
+++ b/gtk-3.0/scss/widgets.scss
@@ -1,24 +1,26 @@
 @import "functions";
+@import "global";
 @import "colors";
-@import "base";
-@import "button";
-@import "entry";
-@import "calendar";
-@import "choosers";
-@import "grid";
-@import "infobar";
-@import "menu";
-@import "misc";
-@import "notebook";
-@import "osd";
-@import "progress";
-@import "scrollbar";
-@import "sidebar";
-@import "spinner";
-@import "toggle";
-@import "toolbar";
-@import "view";
-@import "window";
+
+@import "widgets/base";
+@import "widgets/button";
+@import "widgets/entry";
+@import "widgets/calendar";
+@import "widgets/choosers";
+@import "widgets/grid";
+@import "widgets/infobar";
+@import "widgets/menu";
+@import "widgets/misc";
+@import "widgets/notebook";
+@import "widgets/osd";
+@import "widgets/progress";
+@import "widgets/scrollbar";
+@import "widgets/sidebar";
+@import "widgets/spinner";
+@import "widgets/toggle";
+@import "widgets/toolbar";
+@import "widgets/view";
+@import "widgets/window";
 
 
 /**************
diff --git a/gtk-3.0/scss/_base.scss b/gtk-3.0/scss/widgets/_base.scss
similarity index 98%
rename from gtk-3.0/scss/_base.scss
rename to gtk-3.0/scss/widgets/_base.scss
index e9afca8..d2f95c7 100755
--- a/gtk-3.0/scss/_base.scss
+++ b/gtk-3.0/scss/widgets/_base.scss
@@ -1,7 +1,3 @@
-@import "functions";
-@import "global";
-
-
 /**************
  ! GTK settings
 ***************/
diff --git a/gtk-3.0/scss/_button.scss b/gtk-3.0/scss/widgets/_button.scss
similarity index 99%
rename from gtk-3.0/scss/_button.scss
rename to gtk-3.0/scss/widgets/_button.scss
index f5ff5c6..5ddeb6c 100755
--- a/gtk-3.0/scss/_button.scss
+++ b/gtk-3.0/scss/widgets/_button.scss
@@ -1,7 +1,3 @@
-@import "functions";
-@import "global";
-
-
 /*********
  ! Buttons
 **********/
diff --git a/gtk-3.0/scss/_calendar.scss b/gtk-3.0/scss/widgets/_calendar.scss
similarity index 90%
rename from gtk-3.0/scss/_calendar.scss
rename to gtk-3.0/scss/widgets/_calendar.scss
index 6eacde0..6f2a34b 100644
--- a/gtk-3.0/scss/_calendar.scss
+++ b/gtk-3.0/scss/widgets/_calendar.scss
@@ -1,7 +1,3 @@
-@import "functions";
-@import "global";
-
-
 /**********
  ! Calendar
 ***********/
diff --git a/gtk-3.0/scss/_choosers.scss b/gtk-3.0/scss/widgets/_choosers.scss
similarity index 98%
rename from gtk-3.0/scss/_choosers.scss
rename to gtk-3.0/scss/widgets/_choosers.scss
index 2d1a1cf..82c1283 100644
--- a/gtk-3.0/scss/_choosers.scss
+++ b/gtk-3.0/scss/widgets/_choosers.scss
@@ -1,7 +1,3 @@
-@import "functions";
-@import "global";
-
-
 /***************
  ! Color chooser
 ****************/
diff --git a/gtk-3.0/scss/_entry.scss b/gtk-3.0/scss/widgets/_entry.scss
similarity index 98%
rename from gtk-3.0/scss/_entry.scss
rename to gtk-3.0/scss/widgets/_entry.scss
index b0a3474..184dac5 100755
--- a/gtk-3.0/scss/_entry.scss
+++ b/gtk-3.0/scss/widgets/_entry.scss
@@ -1,7 +1,3 @@
-@import "functions";
-@import "global";
-
-
 /*******
  ! Entry
 ********/
diff --git a/gtk-3.0/scss/_grid.scss b/gtk-3.0/scss/widgets/_grid.scss
similarity index 95%
rename from gtk-3.0/scss/_grid.scss
rename to gtk-3.0/scss/widgets/_grid.scss
index 403e592..fbbfd56 100644
--- a/gtk-3.0/scss/_grid.scss
+++ b/gtk-3.0/scss/widgets/_grid.scss
@@ -1,7 +1,3 @@
-@import "functions";
-@import "global";
-
-
 /******************
  ! Grid and flowbox
 *******************/
diff --git a/gtk-3.0/scss/_infobar.scss b/gtk-3.0/scss/widgets/_infobar.scss
similarity index 94%
rename from gtk-3.0/scss/_infobar.scss
rename to gtk-3.0/scss/widgets/_infobar.scss
index c5cec55..faf4e5c 100644
--- a/gtk-3.0/scss/_infobar.scss
+++ b/gtk-3.0/scss/widgets/_infobar.scss
@@ -1,5 +1,3 @@
-@import "functions";
-@import "global";
 @import "button";
 
 
diff --git a/gtk-3.0/scss/_menu.scss b/gtk-3.0/scss/widgets/_menu.scss
similarity index 99%
rename from gtk-3.0/scss/_menu.scss
rename to gtk-3.0/scss/widgets/_menu.scss
index 49aae6c..e5f6cfb 100755
--- a/gtk-3.0/scss/_menu.scss
+++ b/gtk-3.0/scss/widgets/_menu.scss
@@ -1,5 +1,3 @@
-@import "functions";
-@import "global";
 @import "entry";
 
 
diff --git a/gtk-3.0/scss/_misc.scss b/gtk-3.0/scss/widgets/_misc.scss
similarity index 98%
rename from gtk-3.0/scss/_misc.scss
rename to gtk-3.0/scss/widgets/_misc.scss
index 73ac894..73e64b5 100644
--- a/gtk-3.0/scss/_misc.scss
+++ b/gtk-3.0/scss/widgets/_misc.scss
@@ -1,7 +1,3 @@
-@import "functions";
-@import "global";
-
-
 /***************
 ! Dimmed label *
 ****************/
diff --git a/gtk-3.0/scss/_notebook.scss b/gtk-3.0/scss/widgets/_notebook.scss
similarity index 98%
rename from gtk-3.0/scss/_notebook.scss
rename to gtk-3.0/scss/widgets/_notebook.scss
index defac44..7d5c1ef 100644
--- a/gtk-3.0/scss/_notebook.scss
+++ b/gtk-3.0/scss/widgets/_notebook.scss
@@ -1,5 +1,4 @@
-@import "functions";
-@import "global";
+@import "button";
 
 
 /**********
diff --git a/gtk-3.0/scss/_osd.scss b/gtk-3.0/scss/widgets/_osd.scss
similarity index 99%
rename from gtk-3.0/scss/_osd.scss
rename to gtk-3.0/scss/widgets/_osd.scss
index 673a262..c1cc404 100644
--- a/gtk-3.0/scss/_osd.scss
+++ b/gtk-3.0/scss/widgets/_osd.scss
@@ -1,5 +1,3 @@
-@import "functions";
-@import "global";
 @import "button";
 
 
diff --git a/gtk-3.0/scss/_progress.scss b/gtk-3.0/scss/widgets/_progress.scss
similarity index 99%
rename from gtk-3.0/scss/_progress.scss
rename to gtk-3.0/scss/widgets/_progress.scss
index 1bb9636..94ec533 100644
--- a/gtk-3.0/scss/_progress.scss
+++ b/gtk-3.0/scss/widgets/_progress.scss
@@ -1,7 +1,3 @@
-@import "functions";
-@import "global";
-
-
 /*****************
  ! Progress bars *
 ******************/
diff --git a/gtk-3.0/scss/_scrollbar.scss b/gtk-3.0/scss/widgets/_scrollbar.scss
similarity index 96%
rename from gtk-3.0/scss/_scrollbar.scss
rename to gtk-3.0/scss/widgets/_scrollbar.scss
index 7777280..b2548ed 100644
--- a/gtk-3.0/scss/_scrollbar.scss
+++ b/gtk-3.0/scss/widgets/_scrollbar.scss
@@ -1,6 +1,3 @@
-@import "functions";
-@import "global";
-
 /***********
  ! Scrollbar
 ************/
diff --git a/gtk-3.0/scss/_sidebar.scss b/gtk-3.0/scss/widgets/_sidebar.scss
similarity index 98%
rename from gtk-3.0/scss/_sidebar.scss
rename to gtk-3.0/scss/widgets/_sidebar.scss
index 78e1b89..af417ff 100755
--- a/gtk-3.0/scss/_sidebar.scss
+++ b/gtk-3.0/scss/widgets/_sidebar.scss
@@ -1,7 +1,3 @@
-@import "functions";
-@import "global";
-
-
 /*********
  ! Sidebar
 **********/
diff --git a/gtk-3.0/scss/_spinner.scss b/gtk-3.0/scss/widgets/_spinner.scss
similarity index 93%
rename from gtk-3.0/scss/_spinner.scss
rename to gtk-3.0/scss/widgets/_spinner.scss
index ee50103..395c21c 100644
--- a/gtk-3.0/scss/_spinner.scss
+++ b/gtk-3.0/scss/widgets/_spinner.scss
@@ -1,7 +1,3 @@
-@import "functions";
-@import "global";
-
-
 /*******************
  ! Spinner animation
 ********************/
diff --git a/gtk-3.0/scss/_toggle.scss b/gtk-3.0/scss/widgets/_toggle.scss
similarity index 98%
rename from gtk-3.0/scss/_toggle.scss
rename to gtk-3.0/scss/widgets/_toggle.scss
index 70c1f39..cf4936c 100755
--- a/gtk-3.0/scss/_toggle.scss
+++ b/gtk-3.0/scss/widgets/_toggle.scss
@@ -1,7 +1,3 @@
-@import "functions";
-@import "global";
-
-
 /***********************
  ! Check and Radio items
 ************************/
diff --git a/gtk-3.0/scss/_toolbar.scss b/gtk-3.0/scss/widgets/_toolbar.scss
similarity index 98%
rename from gtk-3.0/scss/_toolbar.scss
rename to gtk-3.0/scss/widgets/_toolbar.scss
index 094d398..057f817 100755
--- a/gtk-3.0/scss/_toolbar.scss
+++ b/gtk-3.0/scss/widgets/_toolbar.scss
@@ -1,7 +1,6 @@
-@import "functions";
-@import "global";
 @import "button";
 
+
 /*********
  ! Toolbar
 **********/
diff --git a/gtk-3.0/scss/_view.scss b/gtk-3.0/scss/widgets/_view.scss
similarity index 99%
rename from gtk-3.0/scss/_view.scss
rename to gtk-3.0/scss/widgets/_view.scss
index a8cf5b4..bda6711 100644
--- a/gtk-3.0/scss/_view.scss
+++ b/gtk-3.0/scss/widgets/_view.scss
@@ -1,7 +1,3 @@
-@import "functions";
-@import "global";
-
-
 /***************
  ! Generic views
 ****************/
diff --git a/gtk-3.0/scss/_window.scss b/gtk-3.0/scss/widgets/_window.scss
similarity index 96%
rename from gtk-3.0/scss/_window.scss
rename to gtk-3.0/scss/widgets/_window.scss
index 0be7a63..8f354c8 100755
--- a/gtk-3.0/scss/_window.scss
+++ b/gtk-3.0/scss/widgets/_window.scss
@@ -1,7 +1,3 @@
-@import "functions";
-@import "global";
-
-
 /**************
  ! Window frame
 ***************/