diff --git a/scss/framework-structure.scss b/scss/framework-structure.scss
index a55044e761..942241b1b1 100755
--- a/scss/framework-structure.scss
+++ b/scss/framework-structure.scss
@@ -1,30 +1,22 @@
 @charset "UTF-8";
 
 
-// Components
+// Component Structures
 @import
   "framework/structure-variables",
   "framework/structure/mixins",
 
   "framework/structure/alerts",
-  "framework/structure/base",
-
-  "framework/structure/pull-to-refresh",
-  "framework/structure/panel",
-
-  "framework/structure/button",
-
   "framework/structure/bar",
-  "framework/structure/tabs",
-  
+  "framework/structure/base",
+  "framework/structure/button",
   "framework/structure/button-group",
-
   "framework/structure/form",
   "framework/structure/grid",
-  
   "framework/structure/icon",
   "framework/structure/img",
-
   "framework/structure/listview",
-  "framework/structure/table";
-
+  "framework/structure/panel",
+  "framework/structure/pull-to-refresh",
+  "framework/structure/table",
+  "framework/structure/tabs";
\ No newline at end of file
diff --git a/scss/framework-theme.scss b/scss/framework-theme.scss
index d4d9399cba..6a1839675a 100755
--- a/scss/framework-theme.scss
+++ b/scss/framework-theme.scss
@@ -1,15 +1,16 @@
 @charset "UTF-8";
 
 
-// Components
+// Component Themes
 @import
   "framework/theme-variables",
+
   "framework/theme/alerts",
   "framework/theme/bar",
-  "framework/theme/tabs",
   "framework/theme/button",
   "framework/theme/icon",
   "framework/theme/listview",
-  "framework/theme/pull-to-refresh",
   "framework/theme/panel",
-  "framework/theme/table";
+  "framework/theme/pull-to-refresh",
+  "framework/theme/table",
+  "framework/theme/tabs";
\ No newline at end of file