diff --git a/themes/commerce_kickstart_theme/config.rb b/themes/commerce_kickstart_theme/config.rb
new file mode 100644
index 0000000..a1413f9
--- /dev/null
+++ b/themes/commerce_kickstart_theme/config.rb
@@ -0,0 +1,24 @@
+# Require any additional compass plugins here.
+
+# Set this to the root of your project when deployed:
+http_path = "/"
+css_dir = "css"
+sass_dir = "scss"
+images_dir = "images"
+javascripts_dir = "js"
+
+# You can select your preferred output style here (can be overridden via the command line):
+# output_style = :expanded or :nested or :compact or :compressed
+
+# To enable relative paths to assets via compass helper functions. Uncomment:
+# relative_assets = true
+
+# To disable debugging comments that display the original location of your selectors. Uncomment:
+# line_comments = false
+
+
+# If you prefer the indented syntax, you might want to regenerate this
+# project again passing --syntax sass, or you can uncomment this:
+# preferred_syntax = :sass
+# and then run:
+# sass-convert -R --from scss --to sass sass scss && rm -rf sass && mv scss sass
diff --git a/themes/commerce_kickstart_theme/scss/_mixins.scss b/themes/commerce_kickstart_theme/scss/_mixins.scss
new file mode 100644
index 0000000..13c61f7
--- /dev/null
+++ b/themes/commerce_kickstart_theme/scss/_mixins.scss
@@ -0,0 +1,39 @@
+@mixin clearfix {
+/**
+ * For modern browsers
+ * 1. The space content is one way to avoid an Opera bug when the
+ *    contenteditable attribute is included anywhere else in the document.
+ *    Otherwise it causes space to appear at the top and bottom of elements
+ *    that are clearfixed.
+ * 2. The use of `table` rather than `block` is only necessary if using
+ *    `:before` to contain the top-margins of child elements.
+ */
+  &:before,
+  &.cf:after {
+    content: " "; /* 1 */
+    display: table; /* 2 */
+  }
+
+  &:after {
+    clear: both;
+  }
+
+/**
+* For IE 6/7 only
+* Include this rule to trigger hasLayout and contain floats.
+*/
+  *zoom: 1;
+}
+
+@mixin rounded-corners($radius) {
+  -moz-border-radius: $radius;
+  -webkit-border-radius: $radius;
+  -khtml-border-radius: $radius;
+  border-radius: $radius;
+}
+
+@mixin rounded($side, $radius) {
+  border-#{$side}-radius: $radius;
+  -moz-border-radius-#{$side}: $radius;
+  -webkit-border-#{$side}-radius: $radius;
+}
diff --git a/themes/commerce_kickstart_theme/scss/_variables.scss b/themes/commerce_kickstart_theme/scss/_variables.scss
new file mode 100644
index 0000000..80065ec
--- /dev/null
+++ b/themes/commerce_kickstart_theme/scss/_variables.scss
@@ -0,0 +1,49 @@
+@import url(//fonts.googleapis.com/css?family=Open+Sans:400,700,300,600,800);
+@import url(//fonts.googleapis.com/css?family=Gentium+Basic:400,700);
+
+$bodybg: #FFF;
+$headerfont: 'Open Sans', sans-serif;
+$altheaderfont: 'Gentium Basic', serif;
+
+//text color
+$color1: #2698F2;
+$color2: #FFF;
+
+
+
+// mobile specific elements
+$mobilemenubg: #444;
+$tabletmenubg: transparent;
+// User Zone
+$topbarbackground: #888;
+// shopping cart block (in user zone)
+$cartceckoutbg: #999;
+$cartceckoutcolor: #FFF;
+// main menu
+$mainmenuitembg: #EEE;
+$mainmenuitemborder: 1px solid #CCC;
+$mainmenulinkcolor: #888;
+$mainmenuitembghover: #FFF;
+$mainmenuitemborderhover: 1px solid #CCC;
+$mainmenuitemfonthover: #999;
+$mainmenuitemfontactive: #000;
+// secondary menu
+$secondarymenuitembg: #EEE;
+$secondarymenuitemborder: 1px solid #CCC;
+$secondarymenulinkcolor: #888;
+$secondarymenuitembghover: #FFF;
+$secondarymenuitemborderhover: 1px solid #CCC;
+$secondarymenuitemfonthover: #999;
+$secondarymenuitemfontactive: #000;
+// promotional banner
+$promobannerbg: #999;
+$promobannercolor: #FFF;
+$promobannerbuttonbg: #888;
+$promobannerbuttoncolor: #FFF;
+$promobannerbuttonborder: 1px solid #CCC;
+// footer
+$footerbg: #FFF;
+$footermenuheadercolor: #666;
+$footermenulinkcolor: #999;
+
+$footer2bg: #CCC;
diff --git a/themes/commerce_kickstart_theme/scss/commerce-kickstart-theme-alpha-default-rtl.scss b/themes/commerce_kickstart_theme/scss/commerce-kickstart-theme-alpha-default-rtl.scss
index 8827f89..563fcc9 100644
--- a/themes/commerce_kickstart_theme/scss/commerce-kickstart-theme-alpha-default-rtl.scss
+++ b/themes/commerce_kickstart_theme/scss/commerce-kickstart-theme-alpha-default-rtl.scss
@@ -1,6 +1,6 @@
 /* Include Default Variables & Mixins */
-@import "variables.scss";
-@import "mixins.scss";
+@import "_variables.scss";
+@import "_mixins.scss";
 
 /**
 * Navigation
diff --git a/themes/commerce_kickstart_theme/scss/commerce-kickstart-theme-alpha-default.scss b/themes/commerce_kickstart_theme/scss/commerce-kickstart-theme-alpha-default.scss
index 61ca13d..b350ab9 100755
--- a/themes/commerce_kickstart_theme/scss/commerce-kickstart-theme-alpha-default.scss
+++ b/themes/commerce_kickstart_theme/scss/commerce-kickstart-theme-alpha-default.scss
@@ -1,8 +1,8 @@
 /* This file will hold styles for all layouts using the alpha grid (i.e. not the mobile layout). */
 
 /* Include Default Variables & Mixins */
-@import "variables.scss";
-@import "mixins.scss";
+@import "_variables.scss";
+@import "_mixins.scss";
 /* End Variables & Mixins */
 
 /**************************************************
diff --git a/themes/commerce_kickstart_theme/scss/commerce_kickstart_style-rtl.scss b/themes/commerce_kickstart_theme/scss/commerce_kickstart_style-rtl.scss
index ed372d3..6df5dc3 100644
--- a/themes/commerce_kickstart_theme/scss/commerce_kickstart_style-rtl.scss
+++ b/themes/commerce_kickstart_theme/scss/commerce_kickstart_style-rtl.scss
@@ -1,6 +1,6 @@
 /* Include Default Variables & Mixins */
-@import "variables.scss";
-@import "mixins.scss";
+@import "_variables.scss";
+@import "_mixins.scss";
 /* End Variables & Mixins */
 
 /* User menu */
diff --git a/themes/commerce_kickstart_theme/scss/commerce_kickstart_style.scss b/themes/commerce_kickstart_theme/scss/commerce_kickstart_style.scss
index e365b36..3195231 100755
--- a/themes/commerce_kickstart_theme/scss/commerce_kickstart_style.scss
+++ b/themes/commerce_kickstart_theme/scss/commerce_kickstart_style.scss
@@ -3,8 +3,8 @@
 /* Override Omega */
 
 /* Include Default Variables & Mixins */
-@import "variables.scss";
-@import "mixins.scss";
+@import "_variables.scss";
+@import "_mixins.scss";
 /* End Variables & Mixins */
 
 /*------------------------------------------------
diff --git a/themes/commerce_kickstart_theme/scss/mixins.scss b/themes/commerce_kickstart_theme/scss/mixins.scss
deleted file mode 100644
index 13c61f7..0000000
--- a/themes/commerce_kickstart_theme/scss/mixins.scss
+++ /dev/null
@@ -1,39 +0,0 @@
-@mixin clearfix {
-/**
- * For modern browsers
- * 1. The space content is one way to avoid an Opera bug when the
- *    contenteditable attribute is included anywhere else in the document.
- *    Otherwise it causes space to appear at the top and bottom of elements
- *    that are clearfixed.
- * 2. The use of `table` rather than `block` is only necessary if using
- *    `:before` to contain the top-margins of child elements.
- */
-  &:before,
-  &.cf:after {
-    content: " "; /* 1 */
-    display: table; /* 2 */
-  }
-
-  &:after {
-    clear: both;
-  }
-
-/**
-* For IE 6/7 only
-* Include this rule to trigger hasLayout and contain floats.
-*/
-  *zoom: 1;
-}
-
-@mixin rounded-corners($radius) {
-  -moz-border-radius: $radius;
-  -webkit-border-radius: $radius;
-  -khtml-border-radius: $radius;
-  border-radius: $radius;
-}
-
-@mixin rounded($side, $radius) {
-  border-#{$side}-radius: $radius;
-  -moz-border-radius-#{$side}: $radius;
-  -webkit-border-#{$side}-radius: $radius;
-}
diff --git a/themes/commerce_kickstart_theme/scss/variables.scss b/themes/commerce_kickstart_theme/scss/variables.scss
deleted file mode 100644
index 80065ec..0000000
--- a/themes/commerce_kickstart_theme/scss/variables.scss
+++ /dev/null
@@ -1,49 +0,0 @@
-@import url(//fonts.googleapis.com/css?family=Open+Sans:400,700,300,600,800);
-@import url(//fonts.googleapis.com/css?family=Gentium+Basic:400,700);
-
-$bodybg: #FFF;
-$headerfont: 'Open Sans', sans-serif;
-$altheaderfont: 'Gentium Basic', serif;
-
-//text color
-$color1: #2698F2;
-$color2: #FFF;
-
-
-
-// mobile specific elements
-$mobilemenubg: #444;
-$tabletmenubg: transparent;
-// User Zone
-$topbarbackground: #888;
-// shopping cart block (in user zone)
-$cartceckoutbg: #999;
-$cartceckoutcolor: #FFF;
-// main menu
-$mainmenuitembg: #EEE;
-$mainmenuitemborder: 1px solid #CCC;
-$mainmenulinkcolor: #888;
-$mainmenuitembghover: #FFF;
-$mainmenuitemborderhover: 1px solid #CCC;
-$mainmenuitemfonthover: #999;
-$mainmenuitemfontactive: #000;
-// secondary menu
-$secondarymenuitembg: #EEE;
-$secondarymenuitemborder: 1px solid #CCC;
-$secondarymenulinkcolor: #888;
-$secondarymenuitembghover: #FFF;
-$secondarymenuitemborderhover: 1px solid #CCC;
-$secondarymenuitemfonthover: #999;
-$secondarymenuitemfontactive: #000;
-// promotional banner
-$promobannerbg: #999;
-$promobannercolor: #FFF;
-$promobannerbuttonbg: #888;
-$promobannerbuttoncolor: #FFF;
-$promobannerbuttonborder: 1px solid #CCC;
-// footer
-$footerbg: #FFF;
-$footermenuheadercolor: #666;
-$footermenulinkcolor: #999;
-
-$footer2bg: #CCC;