diff --git a/ionic/ionic.core.scss b/ionic/components.core.scss
similarity index 100%
rename from ionic/ionic.core.scss
rename to ionic/components.core.scss
diff --git a/ionic/components.ios.scss b/ionic/components.ios.scss
new file mode 100644
index 0000000000..de8547e44f
--- /dev/null
+++ b/ionic/components.ios.scss
@@ -0,0 +1,24 @@
+
+// iOS Theme
+@import "themes/default.ios";
+
+
+// iOS Components
+@import
+  "components/action-sheet/modes/ios",
+  "components/button/modes/ios",
+  "components/card/modes/ios",
+  "components/checkbox/modes/ios",
+  "components/content/modes/ios",
+  "components/item/modes/ios",
+  "components/list/modes/ios",
+  "components/menu/modes/ios",
+  "components/modal/modes/ios",
+  "components/popup/modes/ios",
+  "components/radio/modes/ios",
+  "components/searchbar/modes/ios",
+  "components/segment/modes/ios",
+  "components/switch/modes/ios",
+  "components/tabs/modes/ios",
+  "components/text-input/modes/ios",
+  "components/toolbar/modes/ios";
diff --git a/ionic/components.md.scss b/ionic/components.md.scss
new file mode 100644
index 0000000000..7697e05245
--- /dev/null
+++ b/ionic/components.md.scss
@@ -0,0 +1,25 @@
+
+// Material Design Theme
+@import "themes/default.md";
+
+
+// Material Design Components
+@import
+  "components/action-sheet/modes/md",
+  "components/button/modes/md",
+  "components/card/modes/md",
+  "components/checkbox/modes/md",
+  "components/content/modes/md",
+  "components/item/modes/md",
+  "components/list/modes/md",
+  "components/menu/modes/md",
+  "components/modal/modes/md",
+  "components/popup/modes/md",
+  "components/radio/modes/md",
+  "components/tap-click/ripple",
+  "components/searchbar/modes/md",
+  "components/segment/modes/md",
+  "components/switch/modes/md",
+  "components/tabs/modes/md",
+  "components/text-input/modes/md",
+  "components/toolbar/modes/md";
diff --git a/ionic/ionic.ios.scss b/ionic/ionic.ios.scss
index 3c6b2a96e6..ed0c3cc51c 100644
--- a/ionic/ionic.ios.scss
+++ b/ionic/ionic.ios.scss
@@ -2,30 +2,9 @@
 @charset "UTF-8";
 
 
-// iOS Theme
-@import "themes/default.ios";
-
-
 // Core Components
-@import "ionic.core";
+@import "components.core";
 
 
 // iOS Components
-@import
-  "components/action-sheet/modes/ios",
-  "components/button/modes/ios",
-  "components/card/modes/ios",
-  "components/checkbox/modes/ios",
-  "components/content/modes/ios",
-  "components/item/modes/ios",
-  "components/list/modes/ios",
-  "components/menu/modes/ios",
-  "components/modal/modes/ios",
-  "components/popup/modes/ios",
-  "components/radio/modes/ios",
-  "components/searchbar/modes/ios",
-  "components/segment/modes/ios",
-  "components/switch/modes/ios",
-  "components/tabs/modes/ios",
-  "components/text-input/modes/ios",
-  "components/toolbar/modes/ios";
+@import "components.ios";
diff --git a/ionic/ionic.md.scss b/ionic/ionic.md.scss
index 529d984164..e10e940ca8 100644
--- a/ionic/ionic.md.scss
+++ b/ionic/ionic.md.scss
@@ -2,31 +2,9 @@
 @charset "UTF-8";
 
 
-// Material Design Theme
-@import "themes/default.md";
-
-
 // Core Components
-@import "ionic.core";
+@import "components.core";
 
 
 // Material Design Components
-@import
-  "components/action-sheet/modes/md",
-  "components/button/modes/md",
-  "components/card/modes/md",
-  "components/checkbox/modes/md",
-  "components/content/modes/md",
-  "components/item/modes/md",
-  "components/list/modes/md",
-  "components/menu/modes/md",
-  "components/modal/modes/md",
-  "components/popup/modes/md",
-  "components/radio/modes/md",
-  "components/tap-click/ripple",
-  "components/searchbar/modes/md",
-  "components/segment/modes/md",
-  "components/switch/modes/md",
-  "components/tabs/modes/md",
-  "components/text-input/modes/md",
-  "components/toolbar/modes/md";
+@import "components.md";
diff --git a/ionic/ionic.scss b/ionic/ionic.scss
index 9040d58ec7..361e8d522f 100755
--- a/ionic/ionic.scss
+++ b/ionic/ionic.scss
@@ -2,4 +2,16 @@
 
 
 // Core Components
-@import "ionic.core";
+@import "components.core";
+
+
+// iOS Components
+.ios {
+  @import "components.ios";
+}
+
+
+// Material Design Components
+.md {
+  @import "components.md";
+}
diff --git a/ionic/themes/default.scss b/ionic/themes/default.scss
index 733be5a230..c8c0a92b22 100644
--- a/ionic/themes/default.scss
+++ b/ionic/themes/default.scss
@@ -28,3 +28,16 @@ $toolbar-border-color:       #b2b2b2 !default;
 $toolbar-text-color:         $text-color !default;
 $toolbar-active-color:       $link-color !default;
 $toolbar-inactive-color:     #8c8c8c !default;
+
+
+
+
+@function color($color-name) {
+  @return map-get($colors, $color-name);
+}
+
+
+@function auxiliary-colors() {
+  // get a map of all the colors, except "primary"
+  @return map-remove($colors, primary);
+}
diff --git a/ionic/util/functions.scss b/ionic/util/functions.scss
index 8ef5e21cc9..95e2ea1550 100644
--- a/ionic/util/functions.scss
+++ b/ionic/util/functions.scss
@@ -28,17 +28,6 @@
 }
 
 
-@function color($color-name) {
-  @return map-get($colors, $color-name);
-}
-
-
-@function auxiliary-colors() {
-  // get a map of all the colors, except "primary"
-  @return map-remove($colors, primary);
-}
-
-
 // String Replace Function
 // --------------------------------------------------