diff --git a/gulpfile.js b/gulpfile.js
index b721b71158..de01405bcb 100644
--- a/gulpfile.js
+++ b/gulpfile.js
@@ -340,23 +340,23 @@ gulp.task('e2e', function() {
 
   function createPlatformTests(file) {
     return through2.obj(function(file, enc, next) {
-      var self = this
-      var relativePath = path.dirname(file.path.replace(/^.*?ionic(\/|\\)components(\/|\\)/, ''))
-      var contents = file.contents.toString()
+      var self = this;
+      var relativePath = path.dirname(file.path.replace(/^.*?ionic(\/|\\)components(\/|\\)/, ''));
+      var contents = file.contents.toString();
       platforms.forEach(function(platform) {
         var platformContents = testTemplate({
           contents: contents,
           buildConfig: buildConfig,
           relativePath: relativePath,
           platform: platform
-        })
+        });
         self.push(new VinylFile({
           base: file.base,
           contents: new Buffer(platformContents),
           path: file.path.replace(/e2e.js$/, platform + '.e2e.js')
-        }))
+        }));
       })
-      next()
+      next();
     })
   }
 });
@@ -364,6 +364,21 @@ gulp.task('e2e', function() {
 gulp.task('sass', function() {
   var sass = require('gulp-sass');
   var autoprefixer = require('gulp-autoprefixer');
+
+  gulp.src('ionic/ionic.ios.scss')
+    .pipe(sass()
+      .on('error', sass.logError)
+    )
+    .pipe(autoprefixer(buildConfig.autoprefixer))
+    .pipe(gulp.dest('dist/css/'));
+
+  gulp.src('ionic/ionic.md.scss')
+    .pipe(sass()
+      .on('error', sass.logError)
+    )
+    .pipe(autoprefixer(buildConfig.autoprefixer))
+    .pipe(gulp.dest('dist/css/'));
+
   return gulp.src('ionic/ionic.scss')
     .pipe(sass()
       .on('error', sass.logError)
diff --git a/ionic/ionic.ios.scss b/ionic/ionic.ios.scss
index c29bfd9a79..fc34e616ac 100644
--- a/ionic/ionic.ios.scss
+++ b/ionic/ionic.ios.scss
@@ -1,24 +1,11 @@
 /*! Ionic: iOS */
+@charset "UTF-8";
+
+
+// Core Components
+@import "ionic.core";
 
 
 // iOS Components
 @import
-  "components/app/modes/ios",
-  "components/button/modes/ios",
-  "components/icon/modes/ios",
-  "components/item/modes/ios",
-  "components/toolbar/modes/ios",
-  "components/action-sheet/modes/ios",
-  "components/card/modes/ios",
-  "components/content/modes/ios",
-  "components/list/modes/ios",
-  "components/text-input/modes/ios",
-  "components/navbar/modes/ios",
-  "components/popup/modes/ios",
-  "components/checkbox/modes/ios",
-  "components/radio/modes/ios",
-  "components/searchbar/modes/ios",
-  "components/segment/modes/ios",
-  "components/switch/modes/ios",
-  "components/tabs/modes/ios",
-  "platform/cordova-ios";
+  "components/action-sheet/modes/ios";
diff --git a/ionic/ionic.ios_OLD.scss b/ionic/ionic.ios_OLD.scss
new file mode 100644
index 0000000000..862310d0d4
--- /dev/null
+++ b/ionic/ionic.ios_OLD.scss
@@ -0,0 +1,23 @@
+/*! Ionic: iOS */
+
+
+// iOS Components
+@import
+  "components/app/modes/ios",
+  "components/button/modes/ios",
+  "components/icon/modes/ios",
+  "components/item/modes/ios",
+  "components/toolbar/modes/ios",
+  "components/card/modes/ios",
+  "components/content/modes/ios",
+  "components/list/modes/ios",
+  "components/text-input/modes/ios",
+  "components/navbar/modes/ios",
+  "components/popup/modes/ios",
+  "components/checkbox/modes/ios",
+  "components/radio/modes/ios",
+  "components/searchbar/modes/ios",
+  "components/segment/modes/ios",
+  "components/switch/modes/ios",
+  "components/tabs/modes/ios",
+  "platform/cordova-ios";
diff --git a/ionic/ionic.md.scss b/ionic/ionic.md.scss
index fdeb5abe9d..c20ede7a79 100644
--- a/ionic/ionic.md.scss
+++ b/ionic/ionic.md.scss
@@ -1,23 +1,11 @@
 /*! Ionic: Material Design */
+@charset "UTF-8";
+
+
+// Core Components
+@import "ionic.core";
 
 
 // Material Design Components
 @import
-  "components/app/modes/md",
-  "components/toolbar/modes/md",
-  "components/action-sheet/modes/md",
-  "components/button/modes/md",
-  "components/content/modes/md",
-  "components/item/modes/md",
-  "components/list/modes/md",
-  "components/card/modes/md",
-  "components/checkbox/modes/md",
-  "components/text-input/modes/md",
-  "components/navbar/modes/md",
-  "components/popup/modes/md",
-  "components/radio/modes/md",
-  "components/searchbar/modes/md",
-  "components/segment/modes/md",
-  "components/switch/modes/md",
-  "components/tabs/modes/md",
-  "components/tap-click/ripple";
+  "components/action-sheet/modes/md";
diff --git a/ionic/ionic.md_OLD.scss b/ionic/ionic.md_OLD.scss
new file mode 100644
index 0000000000..1c52d2f105
--- /dev/null
+++ b/ionic/ionic.md_OLD.scss
@@ -0,0 +1,22 @@
+/*! Ionic: Material Design */
+
+
+// Material Design Components
+@import
+  "components/app/modes/md",
+  "components/toolbar/modes/md",
+  "components/button/modes/md",
+  "components/content/modes/md",
+  "components/item/modes/md",
+  "components/list/modes/md",
+  "components/card/modes/md",
+  "components/checkbox/modes/md",
+  "components/text-input/modes/md",
+  "components/navbar/modes/md",
+  "components/popup/modes/md",
+  "components/radio/modes/md",
+  "components/searchbar/modes/md",
+  "components/segment/modes/md",
+  "components/switch/modes/md",
+  "components/tabs/modes/md",
+  "components/tap-click/ripple";
diff --git a/ionic/ionic.scss b/ionic/ionic.scss
index b541ccbb4b..858799a586 100755
--- a/ionic/ionic.scss
+++ b/ionic/ionic.scss
@@ -7,13 +7,13 @@
 
 // iOS Components
 .ios {
-  @import "ionic.ios";
+  @import "ionic.ios_OLD";
 }
 
 
 // Material Design Components
 .md {
-  @import "ionic.md";
+  @import "ionic.md_OLD";
 }