diff --git a/dist/framework-theme-default.css b/dist/framework-theme-default.css
index e69de29bb2..9f44090c94 100644
--- a/dist/framework-theme-default.css
+++ b/dist/framework-theme-default.css
@@ -0,0 +1 @@
+@charset "UTF-8";
diff --git a/scss/framework-theme-default.scss b/scss/framework-theme-default.scss
index c4b44bc5ee..232ad9c73c 100755
--- a/scss/framework-theme-default.scss
+++ b/scss/framework-theme-default.scss
@@ -3,24 +3,17 @@
 
 // Components
 @import
-  "framework/theme/accordion",
-  "framework/theme/button-group",
-  "framework/theme/clearing",
-  "framework/theme/footer",
-  "framework/theme/form",
-  "framework/theme/grid",
-  "framework/theme/header",
-  "framework/theme/icon",
-  "framework/theme/img",
-  "framework/theme/input-checkbox",
-  "framework/theme/input-radio",
-  "framework/theme/input-select",
-  "framework/theme/input-slider",
-  "framework/theme/input-text",
-  "framework/theme/label",
-  "framework/theme/listview",
-  "framework/theme/table",
-  "framework/theme/thumb",
-  "framework/theme/transition",
-  "framework/theme/transition-slide",
-  "framework/theme/video";
+  "framework/theme/default/variables",
+  "framework/theme/default/accordion",
+  "framework/theme/default/button",
+  "framework/theme/default/footer",
+  "framework/theme/default/header",
+  "framework/theme/default/icon",
+  "framework/theme/default/input-checkbox",
+  "framework/theme/default/input-radio",
+  "framework/theme/default/input-select",
+  "framework/theme/default/input-slider",
+  "framework/theme/default/input-text",
+  "framework/theme/default/label",
+  "framework/theme/default/listview",
+  "framework/theme/default/table";