diff --git a/Makefile b/Makefile
index 506abbbe..3a948b70 100644
--- a/Makefile
+++ b/Makefile
@@ -1,24 +1,3 @@
-# The files to include when compiling the CSS files
-CSSFILES = css/structure/jquery.mobile.core.css \
-	css/structure/jquery.mobile.transitions.css \
-	css/structure/jquery.mobile.grids.css \
-	css/structure/jquery.mobile.fixedToolbar.css \
-	css/structure/jquery.mobile.navbar.css \
-	css/structure/jquery.mobile.button.css \
-	css/structure/jquery.mobile.collapsible.css \
-	css/structure/jquery.mobile.controlgroup.css \
-	css/structure/jquery.mobile.dialog.css \
-	css/structure/jquery.mobile.forms.checkboxradio.css \
-	css/structure/jquery.mobile.forms.fieldcontain.css \
-	css/structure/jquery.mobile.forms.select.css \
-	css/structure/jquery.mobile.forms.textinput.css \
-	css/structure/jquery.mobile.listview.css \
-	css/structure/jquery.mobile.forms.slider.css
-CSSTHEMEFILES = css/themes/${THEME}/jquery.mobile.theme.css
-
-
-
-
 # Helper Variables
 # The command to replace the @VERSION in the files with the actual version
 VER = sed "s/v@VERSION/$$(git log -1 --format=format:"Git Build: SHA1: %H <> Date: %cd")/"
@@ -65,13 +44,18 @@ css: init
 		--type css ${OUTPUT}/${NAME}.compiled.css >> ${OUTPUT}/${NAME}.min.css
 	@@rm ${OUTPUT}/${NAME}.compiled.css
 	# Build the CSS Structure-only file
+	${RUN_JS} \
+		external/r.js/dist/r.js \
+		-o cssIn=css/structure/jquery.mobile.structure.css \
+		out=${OUTPUT}/${STRUCTURE}.compiled.css
 	@@cat LICENSE-INFO.txt | ${VER} > ${OUTPUT}/${STRUCTURE}.css
-	@@cat ${CSSFILES} >> ${OUTPUT}/${STRUCTURE}.css
+	@@cat ${OUTPUT}/${STRUCTURE}.compiled.css >> ${OUTPUT}/${STRUCTURE}.css
 	# ..... and then minify it
 	@@echo ${VER_MIN} > ${OUTPUT}/${STRUCTURE}.min.css
 	@@java -XX:ReservedCodeCacheSize=64m \
 		-jar build/yuicompressor-2.4.6.jar \
-		--type css ${OUTPUT}/${STRUCTURE}.css >> ${OUTPUT}/${STRUCTURE}.min.css
+		--type css ${OUTPUT}/${STRUCTURE}.compiled.css >> ${OUTPUT}/${STRUCTURE}.min.css
+	@@rm ${OUTPUT}/${STRUCTURE}.compiled.css
 	# ..... and then copy in the images
 	@@cp -R css/themes/${THEME}/images ${OUTPUT}/
 	# Css portion is complete.
diff --git a/css/structure/jquery.mobile.forms.slider.css b/css/structure/jquery.mobile.forms.slider.css
index 68814b45..56b525c4 100644
--- a/css/structure/jquery.mobile.forms.slider.css
+++ b/css/structure/jquery.mobile.forms.slider.css
@@ -14,7 +14,7 @@ a.ui-slider-handle .ui-btn-inner { padding-left: 0; padding-right: 0; }
 }	
 div.ui-slider-switch { height: 32px;  overflow: hidden; margin-left: 0; }
 div.ui-slider-inneroffset { margin-left: 50%; position: absolute; top: 1px; height: 100%; width: 50%; }
-a.ui-slider-handle-snapping { -webkit-transition: left 70ms linear; }
+a.ui-slider-handle-snapping { -webkit-transition: left 70ms linear; -moz-transition: left 70ms linear; }
 div.ui-slider-labelbg { position: absolute; top:0; margin: 0; border-width: 0; }
 div.ui-slider-switch div.ui-slider-labelbg-a { width: 60%; height: 100%; left: 0; }
 div.ui-slider-switch div.ui-slider-labelbg-b { width: 60%; height: 100%; right: 0; }
diff --git a/css/structure/jquery.mobile.structure.css b/css/structure/jquery.mobile.structure.css
new file mode 100644
index 00000000..dc57f1ba
--- /dev/null
+++ b/css/structure/jquery.mobile.structure.css
@@ -0,0 +1,23 @@
+@import url( "jquery.mobile.core.css" );
+@import url( "jquery.mobile.transitions.css" );
+@import url( "jquery.mobile.transitions.fade.css" );
+@import url( "jquery.mobile.transitions.pop.css" );
+@import url( "jquery.mobile.transitions.slide.css" );
+@import url( "jquery.mobile.transitions.slidedown.css" );
+@import url( "jquery.mobile.transitions.slideup.css" );
+@import url( "jquery.mobile.transitions.flip.css" );
+@import url( "jquery.mobile.transitions.turn.css" );
+@import url( "jquery.mobile.transitions.flow.css" );
+@import url( "jquery.mobile.grids.css" );
+@import url( "jquery.mobile.fixedToolbar.css" );
+@import url( "jquery.mobile.navbar.css" );
+@import url( "jquery.mobile.button.css" );
+@import url( "jquery.mobile.collapsible.css" );
+@import url( "jquery.mobile.controlgroup.css" );
+@import url( "jquery.mobile.dialog.css" );
+@import url( "jquery.mobile.forms.checkboxradio.css" );
+@import url( "jquery.mobile.forms.fieldcontain.css" );
+@import url( "jquery.mobile.forms.select.css" );
+@import url( "jquery.mobile.forms.textinput.css" );
+@import url( "jquery.mobile.listview.css" );
+@import url( "jquery.mobile.forms.slider.css" );
\ No newline at end of file
diff --git a/css/themes/default/jquery.mobile.css b/css/themes/default/jquery.mobile.css
index 53985808..08df1297 100644
--- a/css/themes/default/jquery.mobile.css
+++ b/css/themes/default/jquery.mobile.css
@@ -1,24 +1,2 @@
 @import url( "jquery.mobile.theme.css" );
-@import url( "../../structure/jquery.mobile.core.css" );
-@import url( "../../structure/jquery.mobile.transitions.css" );
-@import url( "../../structure/jquery.mobile.transitions.fade.css" );
-@import url( "../../structure/jquery.mobile.transitions.pop.css" );
-@import url( "../../structure/jquery.mobile.transitions.slide.css" );
-@import url( "../../structure/jquery.mobile.transitions.slidedown.css" );
-@import url( "../../structure/jquery.mobile.transitions.slideup.css" );
-@import url( "../../structure/jquery.mobile.transitions.flip.css" );
-@import url( "../../structure/jquery.mobile.transitions.turn.css" );
-@import url( "../../structure/jquery.mobile.transitions.flow.css" );
-@import url( "../../structure/jquery.mobile.grids.css" );
-@import url( "../../structure/jquery.mobile.fixedToolbar.css" );
-@import url( "../../structure/jquery.mobile.navbar.css" );
-@import url( "../../structure/jquery.mobile.button.css" );
-@import url( "../../structure/jquery.mobile.collapsible.css" );
-@import url( "../../structure/jquery.mobile.controlgroup.css" );
-@import url( "../../structure/jquery.mobile.dialog.css" );
-@import url( "../../structure/jquery.mobile.forms.checkboxradio.css" );
-@import url( "../../structure/jquery.mobile.forms.fieldcontain.css" );
-@import url( "../../structure/jquery.mobile.forms.select.css" );
-@import url( "../../structure/jquery.mobile.forms.textinput.css" );
-@import url( "../../structure/jquery.mobile.listview.css" );
-@import url( "../../structure/jquery.mobile.forms.slider.css" );
+@import url( "../../structure/jquery.mobile.structure.css" );
diff --git a/css/themes/valencia/jquery.mobile.css b/css/themes/valencia/jquery.mobile.css
index a85f4c84..bd73b00f 100644
--- a/css/themes/valencia/jquery.mobile.css
+++ b/css/themes/valencia/jquery.mobile.css
@@ -1,24 +1,2 @@
 @import url( "jquery.mobile.theme.css" );
-@import url( "../../structure/jquery.mobile.core.css" );
-@import url( "../../structure/jquery.mobile.transitions.css" );
-@import url( "../../structure/jquery.mobile.transitions.fade.css" );
-@import url( "../../structure/jquery.mobile.transitions.pop.css" );
-@import url( "../../structure/jquery.mobile.transitions.slide.css" );
-@import url( "../../structure/jquery.mobile.transitions.slidedown.css" );
-@import url( "../../structure/jquery.mobile.transitions.slideup.css" );
-@import url( "../../structure/jquery.mobile.transitions.flip.css" );
-@import url( "../../structure/jquery.mobile.transitions.turn.css" );
-@import url( "../../structure/jquery.mobile.transitions.flow.css" );
-@import url( "../../structure/jquery.mobile.grids.css" );
-@import url( "../../structure/jquery.mobile.fixedToolbar.css" );
-@import url( "../../structure/jquery.mobile.navbar.css" );
-@import url( "../../structure/jquery.mobile.button.css" );
-@import url( "../../structure/jquery.mobile.collapsible.css" );
-@import url( "../../structure/jquery.mobile.controlgroup.css" );
-@import url( "../../structure/jquery.mobile.dialog.css" );
-@import url( "../../structure/jquery.mobile.forms.checkboxradio.css" );
-@import url( "../../structure/jquery.mobile.forms.fieldcontain.css" );
-@import url( "../../structure/jquery.mobile.forms.select.css" );
-@import url( "../../structure/jquery.mobile.forms.textinput.css" );
-@import url( "../../structure/jquery.mobile.listview.css" );
-@import url( "../../structure/jquery.mobile.forms.slider.css" );
\ No newline at end of file
+@import url( "../../structure/jquery.mobile.structure.css" );
\ No newline at end of file
diff --git a/js/jquery.mobile.fixedToolbar.js b/js/jquery.mobile.fixedToolbar.js
index 0a963546..0eb9d4a9 100644
--- a/js/jquery.mobile.fixedToolbar.js
+++ b/js/jquery.mobile.fixedToolbar.js
@@ -134,10 +134,11 @@ define( [ "jquery", "jquery.mobile.widget", "jquery.mobile.core", "jquery.mobile
 		show: function(){
 			var hideClass = "ui-fixed-hidden",
 				$el = this.element,
-				scroll = $( window ).scrollTop(),
+				$win = $( window ),
+				scroll = $win.scrollTop(),
 				elHeight = $el.height(),
 				pHeight = $el.closest( ".ui-page" ).height(),
-				viewportHeight = Math.min( screen.height, $( window ).height() ),
+				viewportHeight = Math.min( screen.height, $win.height() ),
 				tbtype = $el.is( ".ui-header" ) ? "header" : "footer";
 
 				if( this.options.transition && this.options.transition !== "none" &&
@@ -158,10 +159,11 @@ define( [ "jquery", "jquery.mobile.widget", "jquery.mobile.core", "jquery.mobile
 		hide: function(){
 			var hideClass = "ui-fixed-hidden",
 				$el = this.element,
-				scroll = $( window ).scrollTop(),
+				$win = $( window ),
+				scroll = $win.scrollTop(),
 				elHeight = $el.height(),
 				pHeight = $el.closest( ".ui-page" ).height(),
-				viewportHeight = Math.min( screen.height, $( window ).height() ),
+				viewportHeight = Math.min( screen.height, $win.height() ),
 				tbtype = $el.is( ".ui-header" ) ? "header" : "footer";
 
 				if( this.options.transition && this.options.transition !== "none" &&