diff --git a/dist/framework-with-theme.css b/dist/framework-with-theme.css
index 796546be3d..1f896e115d 100644
--- a/dist/framework-with-theme.css
+++ b/dist/framework-with-theme.css
@@ -84,6 +84,15 @@ main > * {
 .ptr-content .refreshing {
   display: none; }
 
+.panel-content {
+  width: 17em;
+  min-height: 100%;
+  max-height: none;
+  border-width: 0;
+  position: absolute;
+  top: 0;
+  display: block; }
+
 .button {
   position: relative;
   display: block;
@@ -148,7 +157,7 @@ main > * {
 
 /* Pad top/bottom of content so it doesn't hide behind .bar-title and .bar-tab.
    Note: For these to work, content must come after both bars in the markup */
-.bar-header ~ main, .has-header {
+.has-header {
   top: 44px; }
 
 .has-footer {
diff --git a/scss/framework-structure.scss b/scss/framework-structure.scss
index 9d9eb63e91..a55044e761 100755
--- a/scss/framework-structure.scss
+++ b/scss/framework-structure.scss
@@ -3,7 +3,7 @@
 
 // Components
 @import
-  "framework/structure/variables",
+  "framework/structure-variables",
   "framework/structure/mixins",
 
   "framework/structure/alerts",
diff --git a/scss/framework-theme-default.scss b/scss/framework-theme-default.scss
index d96de88200..ce645db0d8 100755
--- a/scss/framework-theme-default.scss
+++ b/scss/framework-theme-default.scss
@@ -3,12 +3,12 @@
 
 // Components
 @import
-  "framework/theme/default/variables",
-  "framework/theme/default/alerts",
-  "framework/theme/default/bar",
-  "framework/theme/default/tabs",
-  "framework/theme/default/button",
-  "framework/theme/default/icon",
-  "framework/theme/default/listview",
-  "framework/theme/default/pull-to-refresh",
-  "framework/theme/default/table";
+  "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/table";
diff --git a/scss/framework/structure/_variables.scss b/scss/framework/_structure-variables.scss
similarity index 100%
rename from scss/framework/structure/_variables.scss
rename to scss/framework/_structure-variables.scss
diff --git a/scss/framework/theme/default/_variables.scss b/scss/framework/_theme-variables.scss
similarity index 100%
rename from scss/framework/theme/default/_variables.scss
rename to scss/framework/_theme-variables.scss
diff --git a/scss/framework/theme/default/_alerts.scss b/scss/framework/theme/_alerts.scss
similarity index 100%
rename from scss/framework/theme/default/_alerts.scss
rename to scss/framework/theme/_alerts.scss
diff --git a/scss/framework/theme/default/_bar.scss b/scss/framework/theme/_bar.scss
similarity index 100%
rename from scss/framework/theme/default/_bar.scss
rename to scss/framework/theme/_bar.scss
diff --git a/scss/framework/theme/default/_button.scss b/scss/framework/theme/_button.scss
similarity index 100%
rename from scss/framework/theme/default/_button.scss
rename to scss/framework/theme/_button.scss
diff --git a/scss/framework/theme/default/_footer.scss b/scss/framework/theme/_footer.scss
similarity index 100%
rename from scss/framework/theme/default/_footer.scss
rename to scss/framework/theme/_footer.scss
diff --git a/scss/framework/theme/default/_icon.scss b/scss/framework/theme/_icon.scss
similarity index 100%
rename from scss/framework/theme/default/_icon.scss
rename to scss/framework/theme/_icon.scss
diff --git a/scss/framework/theme/default/_listview.scss b/scss/framework/theme/_listview.scss
similarity index 100%
rename from scss/framework/theme/default/_listview.scss
rename to scss/framework/theme/_listview.scss
diff --git a/scss/framework/theme/default/_pull-to-refresh.scss b/scss/framework/theme/_pull-to-refresh.scss
similarity index 100%
rename from scss/framework/theme/default/_pull-to-refresh.scss
rename to scss/framework/theme/_pull-to-refresh.scss
diff --git a/scss/framework/theme/default/_table.scss b/scss/framework/theme/_table.scss
similarity index 100%
rename from scss/framework/theme/default/_table.scss
rename to scss/framework/theme/_table.scss
diff --git a/scss/framework/theme/default/_tabs.scss b/scss/framework/theme/_tabs.scss
similarity index 100%
rename from scss/framework/theme/default/_tabs.scss
rename to scss/framework/theme/_tabs.scss