diff --git a/scss/ionic/_structure-variables.scss b/scss/ionic/_structure-variables.scss
index 4aa942e853..d4e2307d97 100644
--- a/scss/ionic/_structure-variables.scss
+++ b/scss/ionic/_structure-variables.scss
@@ -4,38 +4,10 @@ $baseFontSize: 14px !default;
 
 $fontSizeLarge: ceil($baseFontSize * 1.25);
 
-$baseLineHeight:        1.428571429; // 20/14
+$baseLineHeight:            1.428571429; // 20/14
 $baseLineHeightComputed:    floor($baseFontSize * $baseLineHeight); // ~20px
-$lineHeightComputed: $baseLineHeightComputed;
-$baseBorderRadius:      2px !default;
-
-$brandPrimary:         #428bca;
-$brandSuccess:         #5cb85c;
-$brandWarning:         #f0ad4e;
-$brandDanger:          #d9534f;
-$brandInfo:            #5bc0de;
-
-// Grays
-// -------------------------
-$black:                 #000 !default;
-$grayDarker:            #222 !default;
-$grayDark:              #333 !default;
-$gray:                  #555 !default;
-$grayLight:             #999 !default;
-$grayLighter:           #eee !default;
-$white:                 #fff !default;
-
-
-// Accent colors
-// -------------------------
-$blue:                  #049cdb !default;
-$blueDark:              #0064cd !default;
-$green:                 #46a546 !default;
-$red:                   #9d261d !default;
-$yellow:                #ffc40d !default;
-$orange:                #f89406 !default;
-$pink:                  #c3325f !default;
-$purple:                #7a43b6 !default;
+$lineHeightComputed:        $baseLineHeightComputed;
+$baseBorderRadius:          2px !default;
 
 
 // Content stuff
@@ -56,62 +28,16 @@ $barPaddingPortrait: 8px;
 $barPaddingLandscape : 5px;
 
 
-// Forms
-// -------------------------
-$inputBackground:               $white !default;
-$inputBorder:                   #ccc !default;
-$inputBorderRadius:             4px !default;
-$inputDisabledBackground:       $grayLighter !default;
-$formActionsBackground:         #f5f5f5 !default;
-$inputHeight:                   $baseFontSize + 10px; // base line-height + 8px vertical padding + 2px top/bottom border
-
-
 // Horizontal forms & lists
 // -------------------------
 $horizontalComponentOffset:       180px !default;
 
 
-// Input placeholder text color
-// -------------------------
-$placeholderText:         $grayLight !default;
-
-
 // Lists
 // -------------------------
 $listItemBorder: 1px solid #ddd;
 
 
-// Panels
-// -------------------------
-$panelBg: #fff;
-$panelBorderRadius: 2px;
-$panelInnerBorder: #ddd;
-$panelFooterBg:             #f5f5f5;
-$panelDefaultText:          $grayDark;
-$panelDefaultBorder:        #ddd;
-$panelDefaultHeadingBg:    #f5f5f5;
-
-$panelPrimaryText:          #fff;
-$panelPrimaryBorder:        $brandPrimary;
-$panelPrimaryHeadingBg:    $brandPrimary;
-
-$panelSuccessText:          #fff;
-$panelSuccessBorder:        $brandSuccess;
-$panelSuccessHeadingBg:    $brandSuccess;
-
-$panelWarningText:          #fff;
-$panelWarningBorder:        $brandWarning;
-$panelWarningHeadingBg:    $brandWarning;
-
-$panelDangerText:          #fff;
-$panelDangerBorder:        $brandDanger;
-$panelDangerHeadingBg:    $brandDanger;
-
-$panelInfoText:          #fff;
-$panelInfoBorder:        $brandInfo;
-$panelInfoHeadingBg:    $brandInfo;
-
-
 // Menus
 // -------------------------
 $menuWidth: 270px;
diff --git a/scss/ionic/_theme-variables.scss b/scss/ionic/_theme-variables.scss
index 37d94bdcf0..ff06e28c2f 100644
--- a/scss/ionic/_theme-variables.scss
+++ b/scss/ionic/_theme-variables.scss
@@ -1,4 +1,36 @@
 
+// Brand Colors
+// -------------------------------
+$brandPrimary:         #428bca;
+$brandSuccess:         #5cb85c;
+$brandWarning:         #f0ad4e;
+$brandDanger:          #d9534f;
+$brandInfo:            #5bc0de;
+
+
+// Grays
+// -------------------------------
+$black:                 #000 !default;
+$grayDarker:            #222 !default;
+$grayDark:              #333 !default;
+$gray:                  #555 !default;
+$grayLight:             #999 !default;
+$grayLighter:           #eee !default;
+$white:                 #fff !default;
+
+
+// Accent colors
+// -------------------------------
+$blue:                  #049cdb !default;
+$blueDark:              #0064cd !default;
+$green:                 #46a546 !default;
+$red:                   #9d261d !default;
+$yellow:                #ffc40d !default;
+$orange:                #f89406 !default;
+$pink:                  #c3325f !default;
+$purple:                #7a43b6 !default;
+
+
 // Fonts
 // -------------------------------
 $sansFontFamily:        "Helvetica Neue", Helvetica, Arial, sans-serif !default;
@@ -7,6 +39,17 @@ $serifFontFamily:       Georgia, "Times New Roman", Times, serif !default;
 $monoFontFamily:        Monaco, Menlo, Consolas, "Courier New", monospace !default;
 
 
+// Forms
+// -------------------------
+$inputBackground:               $white !default;
+$inputBorder:                   #ccc !default;
+$inputBorderRadius:             4px !default;
+$inputDisabledBackground:       $grayLighter !default;
+$formActionsBackground:         #f5f5f5 !default;
+$inputHeight:                   $baseFontSize + 10px; // base line-height + 8px vertical padding + 2px top/bottom border
+$placeholderText:               $grayLight !default;
+
+
 // Base
 // -------------------------------
 $baseFontFamily: $sansFontFamily;