diff --git a/.gitignore b/.gitignore
index ad8d0959..e2dec537 100644
--- a/.gitignore
+++ b/.gitignore
@@ -7,8 +7,6 @@ cache/
 combined/
 combine/
 compiled/
-gitstatus.log
-refreshCDN
 *.swp
 .gitignore
 tests/speed/stats/stats.db
diff --git a/GPL-LICENSE.txt b/GPL-LICENSE.txt
new file mode 100644
index 00000000..11dddd00
--- /dev/null
+++ b/GPL-LICENSE.txt
@@ -0,0 +1,278 @@
+        GNU GENERAL PUBLIC LICENSE
+           Version 2, June 1991
+
+ Copyright (C) 1989, 1991 Free Software Foundation, Inc.
+ 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
+ Everyone is permitted to copy and distribute verbatim copies
+ of this license document, but changing it is not allowed.
+
+          Preamble
+
+  The licenses for most software are designed to take away your
+freedom to share and change it.  By contrast, the GNU General Public
+License is intended to guarantee your freedom to share and change free
+software--to make sure the software is free for all its users.  This
+General Public License applies to most of the Free Software
+Foundation's software and to any other program whose authors commit to
+using it.  (Some other Free Software Foundation software is covered by
+the GNU Lesser General Public License instead.)  You can apply it to
+your programs, too.
+
+  When we speak of free software, we are referring to freedom, not
+price.  Our General Public Licenses are designed to make sure that you
+have the freedom to distribute copies of free software (and charge for
+this service if you wish), that you receive source code or can get it
+if you want it, that you can change the software or use pieces of it
+in new free programs; and that you know you can do these things.
+
+  To protect your rights, we need to make restrictions that forbid
+anyone to deny you these rights or to ask you to surrender the rights.
+These restrictions translate to certain responsibilities for you if you
+distribute copies of the software, or if you modify it.
+
+  For example, if you distribute copies of such a program, whether
+gratis or for a fee, you must give the recipients all the rights that
+you have.  You must make sure that they, too, receive or can get the
+source code.  And you must show them these terms so they know their
+rights.
+
+  We protect your rights with two steps: (1) copyright the software, and
+(2) offer you this license which gives you legal permission to copy,
+distribute and/or modify the software.
+
+  Also, for each author's protection and ours, we want to make certain
+that everyone understands that there is no warranty for this free
+software.  If the software is modified by someone else and passed on, we
+want its recipients to know that what they have is not the original, so
+that any problems introduced by others will not reflect on the original
+authors' reputations.
+
+  Finally, any free program is threatened constantly by software
+patents.  We wish to avoid the danger that redistributors of a free
+program will individually obtain patent licenses, in effect making the
+program proprietary.  To prevent this, we have made it clear that any
+patent must be licensed for everyone's free use or not licensed at all.
+
+  The precise terms and conditions for copying, distribution and
+modification follow.
+
+        GNU GENERAL PUBLIC LICENSE
+   TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION
+
+  0. This License applies to any program or other work which contains
+a notice placed by the copyright holder saying it may be distributed
+under the terms of this General Public License.  The "Program", below,
+refers to any such program or work, and a "work based on the Program"
+means either the Program or any derivative work under copyright law:
+that is to say, a work containing the Program or a portion of it,
+either verbatim or with modifications and/or translated into another
+language.  (Hereinafter, translation is included without limitation in
+the term "modification".)  Each licensee is addressed as "you".
+
+Activities other than copying, distribution and modification are not
+covered by this License; they are outside its scope.  The act of
+running the Program is not restricted, and the output from the Program
+is covered only if its contents constitute a work based on the
+Program (independent of having been made by running the Program).
+Whether that is true depends on what the Program does.
+
+  1. You may copy and distribute verbatim copies of the Program's
+source code as you receive it, in any medium, provided that you
+conspicuously and appropriately publish on each copy an appropriate
+copyright notice and disclaimer of warranty; keep intact all the
+notices that refer to this License and to the absence of any warranty;
+and give any other recipients of the Program a copy of this License
+along with the Program.
+
+You may charge a fee for the physical act of transferring a copy, and
+you may at your option offer warranty protection in exchange for a fee.
+
+  2. You may modify your copy or copies of the Program or any portion
+of it, thus forming a work based on the Program, and copy and
+distribute such modifications or work under the terms of Section 1
+above, provided that you also meet all of these conditions:
+
+    a) You must cause the modified files to carry prominent notices
+    stating that you changed the files and the date of any change.
+
+    b) You must cause any work that you distribute or publish, that in
+    whole or in part contains or is derived from the Program or any
+    part thereof, to be licensed as a whole at no charge to all third
+    parties under the terms of this License.
+
+    c) If the modified program normally reads commands interactively
+    when run, you must cause it, when started running for such
+    interactive use in the most ordinary way, to print or display an
+    announcement including an appropriate copyright notice and a
+    notice that there is no warranty (or else, saying that you provide
+    a warranty) and that users may redistribute the program under
+    these conditions, and telling the user how to view a copy of this
+    License.  (Exception: if the Program itself is interactive but
+    does not normally print such an announcement, your work based on
+    the Program is not required to print an announcement.)
+
+These requirements apply to the modified work as a whole.  If
+identifiable sections of that work are not derived from the Program,
+and can be reasonably considered independent and separate works in
+themselves, then this License, and its terms, do not apply to those
+sections when you distribute them as separate works.  But when you
+distribute the same sections as part of a whole which is a work based
+on the Program, the distribution of the whole must be on the terms of
+this License, whose permissions for other licensees extend to the
+entire whole, and thus to each and every part regardless of who wrote it.
+
+Thus, it is not the intent of this section to claim rights or contest
+your rights to work written entirely by you; rather, the intent is to
+exercise the right to control the distribution of derivative or
+collective works based on the Program.
+
+In addition, mere aggregation of another work not based on the Program
+with the Program (or with a work based on the Program) on a volume of
+a storage or distribution medium does not bring the other work under
+the scope of this License.
+
+  3. You may copy and distribute the Program (or a work based on it,
+under Section 2) in object code or executable form under the terms of
+Sections 1 and 2 above provided that you also do one of the following:
+
+    a) Accompany it with the complete corresponding machine-readable
+    source code, which must be distributed under the terms of Sections
+    1 and 2 above on a medium customarily used for software interchange; or,
+
+    b) Accompany it with a written offer, valid for at least three
+    years, to give any third party, for a charge no more than your
+    cost of physically performing source distribution, a complete
+    machine-readable copy of the corresponding source code, to be
+    distributed under the terms of Sections 1 and 2 above on a medium
+    customarily used for software interchange; or,
+
+    c) Accompany it with the information you received as to the offer
+    to distribute corresponding source code.  (This alternative is
+    allowed only for noncommercial distribution and only if you
+    received the program in object code or executable form with such
+    an offer, in accord with Subsection b above.)
+
+The source code for a work means the preferred form of the work for
+making modifications to it.  For an executable work, complete source
+code means all the source code for all modules it contains, plus any
+associated interface definition files, plus the scripts used to
+control compilation and installation of the executable.  However, as a
+special exception, the source code distributed need not include
+anything that is normally distributed (in either source or binary
+form) with the major components (compiler, kernel, and so on) of the
+operating system on which the executable runs, unless that component
+itself accompanies the executable.
+
+If distribution of executable or object code is made by offering
+access to copy from a designated place, then offering equivalent
+access to copy the source code from the same place counts as
+distribution of the source code, even though third parties are not
+compelled to copy the source along with the object code.
+
+  4. You may not copy, modify, sublicense, or distribute the Program
+except as expressly provided under this License.  Any attempt
+otherwise to copy, modify, sublicense or distribute the Program is
+void, and will automatically terminate your rights under this License.
+However, parties who have received copies, or rights, from you under
+this License will not have their licenses terminated so long as such
+parties remain in full compliance.
+
+  5. You are not required to accept this License, since you have not
+signed it.  However, nothing else grants you permission to modify or
+distribute the Program or its derivative works.  These actions are
+prohibited by law if you do not accept this License.  Therefore, by
+modifying or distributing the Program (or any work based on the
+Program), you indicate your acceptance of this License to do so, and
+all its terms and conditions for copying, distributing or modifying
+the Program or works based on it.
+
+  6. Each time you redistribute the Program (or any work based on the
+Program), the recipient automatically receives a license from the
+original licensor to copy, distribute or modify the Program subject to
+these terms and conditions.  You may not impose any further
+restrictions on the recipients' exercise of the rights granted herein.
+You are not responsible for enforcing compliance by third parties to
+this License.
+
+  7. If, as a consequence of a court judgment or allegation of patent
+infringement or for any other reason (not limited to patent issues),
+conditions are imposed on you (whether by court order, agreement or
+otherwise) that contradict the conditions of this License, they do not
+excuse you from the conditions of this License.  If you cannot
+distribute so as to satisfy simultaneously your obligations under this
+License and any other pertinent obligations, then as a consequence you
+may not distribute the Program at all.  For example, if a patent
+license would not permit royalty-free redistribution of the Program by
+all those who receive copies directly or indirectly through you, then
+the only way you could satisfy both it and this License would be to
+refrain entirely from distribution of the Program.
+
+If any portion of this section is held invalid or unenforceable under
+any particular circumstance, the balance of the section is intended to
+apply and the section as a whole is intended to apply in other
+circumstances.
+
+It is not the purpose of this section to induce you to infringe any
+patents or other property right claims or to contest validity of any
+such claims; this section has the sole purpose of protecting the
+integrity of the free software distribution system, which is
+implemented by public license practices.  Many people have made
+generous contributions to the wide range of software distributed
+through that system in reliance on consistent application of that
+system; it is up to the author/donor to decide if he or she is willing
+to distribute software through any other system and a licensee cannot
+impose that choice.
+
+This section is intended to make thoroughly clear what is believed to
+be a consequence of the rest of this License.
+
+  8. If the distribution and/or use of the Program is restricted in
+certain countries either by patents or by copyrighted interfaces, the
+original copyright holder who places the Program under this License
+may add an explicit geographical distribution limitation excluding
+those countries, so that distribution is permitted only in or among
+countries not thus excluded.  In such case, this License incorporates
+the limitation as if written in the body of this License.
+
+  9. The Free Software Foundation may publish revised and/or new versions
+of the General Public License from time to time.  Such new versions will
+be similar in spirit to the present version, but may differ in detail to
+address new problems or concerns.
+
+Each version is given a distinguishing version number.  If the Program
+specifies a version number of this License which applies to it and "any
+later version", you have the option of following the terms and conditions
+either of that version or of any later version published by the Free
+Software Foundation.  If the Program does not specify a version number of
+this License, you may choose any version ever published by the Free Software
+Foundation.
+
+  10. If you wish to incorporate parts of the Program into other free
+programs whose distribution conditions are different, write to the author
+to ask for permission.  For software which is copyrighted by the Free
+Software Foundation, write to the Free Software Foundation; we sometimes
+make exceptions for this.  Our decision will be guided by the two goals
+of preserving the free status of all derivatives of our free software and
+of promoting the sharing and reuse of software generally.
+
+          NO WARRANTY
+
+  11. BECAUSE THE PROGRAM IS LICENSED FREE OF CHARGE, THERE IS NO WARRANTY
+FOR THE PROGRAM, TO THE EXTENT PERMITTED BY APPLICABLE LAW.  EXCEPT WHEN
+OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR OTHER PARTIES
+PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED
+OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
+MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.  THE ENTIRE RISK AS
+TO THE QUALITY AND PERFORMANCE OF THE PROGRAM IS WITH YOU.  SHOULD THE
+PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF ALL NECESSARY SERVICING,
+REPAIR OR CORRECTION.
+
+  12. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING
+WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY AND/OR
+REDISTRIBUTE THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES,
+INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING
+OUT OF THE USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED
+TO LOSS OF DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY
+YOU OR THIRD PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER
+PROGRAMS), EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE
+POSSIBILITY OF SUCH DAMAGES.
diff --git a/LICENSE-INFO.txt b/LICENSE-INFO.txt
new file mode 100644
index 00000000..4b990893
--- /dev/null
+++ b/LICENSE-INFO.txt
@@ -0,0 +1,9 @@
+/*
+* jQuery Mobile Framework v@VERSION
+* http://jquerymobile.com
+*
+* Copyright 2011 (c) jQuery Project
+* Dual licensed under the MIT or GPL Version 2 licenses.
+* http://jquery.org/license
+*
+*/
diff --git a/MIT-LICENSE.txt b/MIT-LICENSE.txt
new file mode 100644
index 00000000..53270463
--- /dev/null
+++ b/MIT-LICENSE.txt
@@ -0,0 +1,20 @@
+Copyright (c) 2011 John Resig, http://jquery.com/
+
+Permission is hereby granted, free of charge, to any person obtaining
+a copy of this software and associated documentation files (the
+"Software"), to deal in the Software without restriction, including
+without limitation the rights to use, copy, modify, merge, publish,
+distribute, sublicense, and/or sell copies of the Software, and to
+permit persons to whom the Software is furnished to do so, subject to
+the following conditions:
+
+The above copyright notice and this permission notice shall be
+included in all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
+LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
+OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
+WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
diff --git a/Makefile b/Makefile
index 55f403e8..7c78838d 100644
--- a/Makefile
+++ b/Makefile
@@ -1,44 +1,3 @@
-# The system generated date in YYYYMMDD format
-DATE = $(shell date "+%Y%m%d")
-
-# The version according to the source file. If this is the nightly build, use a different version
-VER = $(shell cat version.txt)
-
-# The command to replace the @VERSION in the files with the actual version
-SED_VER = sed "s/@VERSION/$(shell git log -1 --format=format:" Git > Date: %cd Info SHA1: %H")/"
-deploy:  SED_VER = sed "s/@VERSION/${VER}/"
-MIN_VER = "/*! jQuery Mobile v@VERSION jquerymobile.com | jquery.org/license */"
-
-# The version of jQuery core used
-JQUERY = $(shell grep Library js/jquery.js | sed s'/ \* jQuery JavaScript Library v//')
-
-# The directory to create the zipped files in and also serves as the filenames
-DIR = jquery.mobile-${VER}
-STRUCTUREFILE = jquery.mobile.structure-${VER}
-nightly: DIR = jquery.mobile
-
-# The output folder for the finished files
-OUTPUT = compiled
-
-# Command to remove the latest directory from the CDN before uploading, only if using latest target
-RMLATEST = echo ""
-
-# The output folder for the nightly files.
-NIGHTLY_OUTPUT = nightlies/${DATE}
-ifeq (${NIGHTLY_OUTPUT}, latest)
-	RMLATEST = ssh jqadmin@code.origin.jquery.com 'rm -rf /var/www/html/code.jquery.com/mobile/latest'
-endif
-NIGHTLY_WEBPATH = http://code.jquery.com/mobile/${NIGHTLY_OUTPUT}
-
-# The filenames
-JS = ${DIR}.js
-MIN = ${DIR}.min.js
-CSS = ${DIR}.css
-CSSMIN = ${DIR}.min.css
-CSSSTRUCTURE = ${STRUCTUREFILE}.css
-CSSSTRUCTUREMIN = ${STRUCTUREFILE}.min.css
-CSSTHEME = default
-
 # The files to include when compiling the JS files
 JSFILES = 	  js/jquery.ui.widget.js \
 			  js/jquery.mobile.widget.js \
@@ -75,8 +34,8 @@ JSFILES = 	  js/jquery.ui.widget.js \
 			  js/jquery.mobile.fixHeaderFooter.native.js \
 			  js/jquery.mobile.init.js
 
-CSSTHEMEFILES = css/themes/${CSSTHEME}/jquery.mobile.theme.css
-CSSSTRUCTUREFILES = css/structure/jquery.mobile.core.css \
+# 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.headerfooter.css \
@@ -91,129 +50,154 @@ CSSSTRUCTUREFILES = css/structure/jquery.mobile.core.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
 
 
-# The files to include when compiling the CSS files
-CSSFILES = ${CSSTHEMEFILES} ${CSSSTRUCTUREFILES}
 
-# By default, this is what get runs when make is called without any arguments.
-# Min and un-min CSS and JS files are the only things built
-all: init js min css cssmin notify
 
-# Build the normal CSS file.
+# 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")/"
+VER_MIN = "/*! jQuery Mobile v${VER_OFFICIAL} jquerymobile.com | jquery.org/license */"
+VER_OFFICIAL = $(shell cat version.txt)
+
+# The output folder for the finished files
+OUTPUT = compiled
+
+# The name of the files
+NAME = jquery.mobile
+STRUCTURE = jquery.mobile.structure
+deploy: NAME = jquery.mobile-${VER_OFFICIAL}
+deploy: STRUCTURE = jquery.mobile.structure-${VER_OFFICIAL}
+
+# The CSS theme being used
+THEME = default
+
+
+
+
+
+# Build Targets
+
+# When no build target is specified, all gets ran
+all: init css js zip notify
+
+
+# Build and minify the CSS files
 css: init
-	# Build the CSS file
-	@@head -8 js/jquery.mobile.core.js | ${SED_VER} > ${OUTPUT}/${CSS}
-	@@cat ${CSSFILES} >> ${OUTPUT}/${CSS}
-	@@head -8 js/jquery.mobile.core.js | ${SED_VER} > ${OUTPUT}/${CSSSTRUCTURE}
-	@@cat ${CSSSTRUCTUREFILES} >> ${OUTPUT}/${CSSSTRUCTURE}
+	# Build the CSS file with the theme included
+	@@cat js/jquery.mobile.intro.js | ${VER} > ${OUTPUT}/${NAME}.css
+	@@cat ${CSSTHEMEFILES} ${CSSFILES} >> ${OUTPUT}/${NAME}.css
+	# ..... and then minify it
+	@@echo ${VER_MIN} > ${OUTPUT}/${NAME}.min.css
+	@@java -jar build/yuicompressor-2.4.6.jar --type css ${OUTPUT}/${NAME}.css >> ${OUTPUT}/${NAME}.min.css
+	# Build the CSS Structure-only file
+	@@cat js/jquery.mobile.intro.js | ${VER} > ${OUTPUT}/${STRUCTURE}.css
+	@@cat ${CSSFILES} >> ${OUTPUT}/${STRUCTURE}.css
+	# ..... and then minify it
+	@@echo ${VER_MIN} > ${OUTPUT}/${NAME}.structure.min.css
+	@@java -jar build/yuicompressor-2.4.6.jar --type css ${OUTPUT}/${STRUCTURE}.css >> ${OUTPUT}/${STRUCTURE}.min.css
+	# ..... and then copy in the images
+	@@cp -R css/themes/${THEME}/images ${OUTPUT}/
+	# Css portion is complete.
+	# -------------------------------------------------
 
-# Build the minified CSS file
-cssmin: init css
-	# Build the minified CSS file
-	@@echo ${MIN_VER} | ${SED_VER} > ${OUTPUT}/${CSSMIN}
-	@@echo ${MIN_VER} | ${SED_VER} > ${OUTPUT}/${CSSSTRUCTUREMIN}
-	@@java -jar build/yuicompressor-2.4.6.jar --type css ${OUTPUT}/${CSS} >> ${OUTPUT}/${CSSMIN}
-	@@java -jar build/yuicompressor-2.4.6.jar --type css ${OUTPUT}/${CSSSTRUCTURE} >> ${OUTPUT}/${CSSSTRUCTUREMIN}
 
-# Build the normal JS file
-js: init
-	# Build the JavaScript file
-	@@head -8 js/jquery.mobile.core.js | ${SED_VER} > ${OUTPUT}/${JS}
-	@@cat ${JSFILES} >> ${OUTPUT}/${JS}
+docs: init css js
+	# Create the Demos/Docs/Tests/Tools
+	@@mkdir -p tmp/${NAME}
+	@@cp -r index.html docs experiments external js/jquery.js tests tmp/${NAME}/
+	@@cp ${OUTPUT}/${NAME}.min.css ${OUTPUT}/${NAME}.min.js tmp/${NAME}/
+	# ... Update the JavaScript and CSS paths
+	@@find tmp/${NAME} -type f \
+		\( -name '*.html' -o -name '*.php' \) \
+		-exec perl -pi -e \
+		's|js/"|${NAME}.min.js"|g;s|css/themes/default/|${NAME}.min.css|g;s|js/jquery.js"|jquery.js"|g' {} \;
+	# ... Move and zip up the the whole folder
+	@@zip -rq ${OUTPUT}/${NAME}.docs.zip tmp/${NAME}
+	@@mv tmp/${NAME} ${OUTPUT}/demos
+	# Finish by removing the temporary files
+	@@rm -rf tmp
+	# -------------------------------------------------
+
 
 # Create the output directory. This is in a separate step so its not dependant on other targets
 init:
+	# -------------------------------------------------
 	# Building jQuery Mobile in the "${OUTPUT}" folder
 	@@rm -rf ${OUTPUT}
-	@@mkdir ${OUTPUT}
+	@@rm -rf tmp
+	@@mkdir -p ${OUTPUT}
+	# -------------------------------------------------
 
-# Build the minified JS file
-min: init js
-	# Build the minified JavaScript file
-	@@echo ${MIN_VER} | ${SED_VER} > ${OUTPUT}/${MIN}
-	@@java -jar build/google-compiler-20111003.jar --js ${OUTPUT}/${JS} --warning_level QUIET --js_output_file ${MIN}.tmp
-	@@cat ${MIN}.tmp >> ${OUTPUT}/${MIN}
-	@@rm -f ${MIN}.tmp
 
-# Let the user know the files were built and where they are
-notify:
+# Build and minify the JS files
+js: init
+	# Build the JavaScript file
+	@@cat js/jquery.mobile.intro.js | ${VER} > ${OUTPUT}/${NAME}.js
+	@@cat ${JSFILES} >> ${OUTPUT}/${NAME}.js
+	# ..... and then minify it
+	@@echo ${VER_MIN} > ${OUTPUT}/${NAME}.min.js
+	@@java -jar build/google-compiler-20111003.jar --js ${OUTPUT}/${NAME}.js --warning_level QUIET >> ${OUTPUT}/${NAME}.min.js
+	# -------------------------------------------------
+
+
+# Output a message saying the process is complete
+notify: init
 	@@echo "The files have been built and are in: " $$(pwd)/${OUTPUT}
-
-# Pull the latest commits. This is used for the nightly build but can be used to save some keystrokes
-pull:
-	@@git pull --quiet
-
-# Zip the 4 files and the theme images into one convenient package
-zip: init js min css cssmin
-	@@mkdir -p ${DIR}
-	@@cp ${OUTPUT}/*.js ${DIR}/
-	@@cp ${OUTPUT}/*.css ${DIR}/
-	@@cp -R css/themes/${CSSTHEME}/images ${DIR}/
-	@@zip -rq ${OUTPUT}/${DIR}.zip ${DIR}
-	@@rm -fr ${DIR}
+	# -------------------------------------------------
 
 
-# Used by the jQuery team to make the nightly builds
-nightly: pull zip
-	# Create the folder to hold the files for the demos
-	@@mkdir -p ${VER}
+# Zip up the jQm files without docs
+zip: init css js
+	# Packaging up the files into a zip archive
+	@@zip -rq ${NAME}.tmp.zip ${OUTPUT}
+	@@mv ${NAME}.tmp.zip ${OUTPUT}/${NAME}.zip
+	# -------------------------------------------------
+	
 
-	# Copy in the base stuff for the demos
-	@@cp -r index.html css experiments docs tools ${VER}/
 
-	# First change all the paths from super deep to the same level for JS files
-	@@find ${VER} -type f -name '*.html' -exec sed -i 's|src="../../../js|src="js|g' {} \;
-	@@find ${VER} -type f -name '*.html' -exec sed -i 's|src="../../js|src="js|g' {} \;
-	@@find ${VER} -type f -name '*.html' -exec sed -i 's|src="../js|src="js|g' {} \;
 
-	# Then change all the paths from super deep to the same level for CSS files
-	@@find ${VER} -type f -name '*.html' -exec sed -i 's|media="only all"||g' {} \;
-	@@find ${VER} -type f -name '*.html' -exec sed -i 's|rel="stylesheet"  href="../../../|rel="stylesheet"  href="|g' {} \;
-	@@find ${VER} -type f -name '*.html' -exec sed -i 's|rel="stylesheet"  href="../../|rel="stylesheet"  href="|g' {} \;
-	@@find ${VER} -type f -name '*.html' -exec sed -i 's|rel="stylesheet"  href="../|rel="stylesheet"  href="|g' {} \;
+# -------------------------------------------------
+# -------------------------------------------------
+# -------------------------------------------------
+#
+# For jQuery Team Use Only
+#
+# -------------------------------------------------
 
-	# Change the empty paths to the location of this nightly file
-	@@find ${VER} -type f -name '*.html' -exec sed -i 's|href="css/themes/${CSSTHEME}/"|href="${NIGHTLY_WEBPATH}/${DIR}.min.css"|g' {} \;
-	@@find ${VER} -type f -name '*.html' -exec sed -i 's|src="js/jquery.js"|src="http://code.jquery.com/jquery-${JQUERY}.min.js"|' {} \;
-	@@find ${VER} -type f -name '*.html' -exec sed -i 's|src="js/"|src="${NIGHTLY_WEBPATH}/${DIR}.min.js"|g' {} \;
-
-	# Move the demos into the output folder
-	@@mv ${VER} ${OUTPUT}/demos
-
-	# Copy the images as well
-	@@cp -R css/themes/${CSSTHEME}/images ${OUTPUT}
-
-	@@${RMLATEST}
-	@@scp -r ${OUTPUT} jqadmin@code.origin.jquery.com:/var/www/html/code.jquery.com/mobile/${NIGHTLY_OUTPUT}
+# Push the latest git version to the CDN. This is done on a post commit hook
+latest: init js css zip
+	# Time to put these on the CDN
+	@@scp -r ${OUTPUT}/* jqadmin@code.origin.jquery.com:/var/www/html/code.jquery.com/mobile/latest/
+	# Do some cleanup to wrap it up
 	@@rm -rf ${OUTPUT}
+	# -------------------------------------------------
 
-# Used by the jQuery team to deploy a build to the CDN
-deploy: zip
-	# Deploy to CDN
-	@@mv ${OUTPUT} ${VER}
-	@@scp -r ${VER} jqadmin@code.origin.jquery.com:/var/www/html/code.jquery.com/mobile/
-	@@mv ${VER} ${OUTPUT}
+# Build the nightly backups. This is done on a server cronjob
+nightlies: init js css zip docs 
+	# Time to put these on the CDN
+	@@mkdir -p tmp/nightlies
+	@@mv ${OUTPUT} tmp/nightlies/$$(date "+%Y%m%d")
+	@@scp -r tmp/nightlies/* jqadmin@code.origin.jquery.com:/var/www/html/code.jquery.com/mobile/nightlies/
+	# Do some cleanup to wrap it up
+	@@rm -rf tmp
+	# -------------------------------------------------
 
-	# Deploy Demos to the jQueryMobile.com site
-	@@mkdir -p ${VER}
-	@@cp -r index.html css experiments docs tools ${VER}/
 
-	@@find ${VER} -type f -name '*.html' -exec sed -i "" -e 's|src="../../../js|src="js|g' {} \;
-	@@find ${VER} -type f -name '*.html' -exec sed -i "" -e 's|src="../../js|src="js|g' {} \;
-	@@find ${VER} -type f -name '*.html' -exec sed -i "" -e 's|src="../js|src="js|g' {} \;
+# Deploy a finished release. This is manually done.
+deploy: init js css docs zip
+	# Deploying all the files to the CDN
+	@@mkdir tmp
+	@@cp -r ${OUTPUT} tmp/${VER_OFFICIAL}
+	@@scp -r tmp/* jqadmin@code.origin.jquery.com:/var/www/html/code.jquery.com/mobile/
+	@@rm -rf tmp/${VER_OFFICIAL}
+	# Create the Demos/Docs/Tests/Tools for jQueryMobile.com
+	@@mv ${OUTPUT}/demos tmp/${VER_OFFICIAL}
+	# ... And copied to the CDN and the jquerymobile.com server
+	@@scp -r tmp/* jqadmin@jquerymobile.com:/srv/jquerymobile.com/htdocs/demos/	
+	# Do some cleanup to wrap it up
+	@@rm -rf tmp
+	@@rm -rf ${OUTPUT}
+	# -------------------------------------------------
 
-	@@find ${VER} -type f -name '*.html' -exec sed -i "" -e 's|media="only all"||g' {} \;
-	@@find ${VER} -type f -name '*.html' -exec sed -i "" -e 's|rel="stylesheet"  href="../../../|rel="stylesheet"  href="|g' {} \;
-	@@find ${VER} -type f -name '*.html' -exec sed -i "" -e 's|rel="stylesheet"  href="../../|rel="stylesheet"  href="|g' {} \;
-	@@find ${VER} -type f -name '*.html' -exec sed -i "" -e 's|rel="stylesheet"  href="../|rel="stylesheet"  href="|g' {} \;
-
-	@@find ${VER} -type f -name '*.html' -exec sed -i "" -e 's|href="css/themes/${CSSTHEME}/"|href="http://code.jquery.com/mobile/${VER}/${DIR}.min.css"|g' {} \;
-	@@find ${VER} -type f -name '*.html' -exec sed -i "" -e 's|src="js/jquery.js"|src="http://code.jquery.com/jquery-${JQUERY}.min.js"|' {} \;
-	@@find ${VER} -type f -name '*.html' -exec sed -i "" -e 's|src="js/"|src="http://code.jquery.com/mobile/${VER}/${DIR}.min.js"|g' {} \;
-
-	@@scp -r ${VER} jqadmin@jquerymobile.com:/srv/jquerymobile.com/htdocs/demos/
-
-	# Clean up the local files
-	@@rm -rf ${VER}
-	@@echo "All Done"
diff --git a/README.md b/README.md
index abd45ef9..fb4c2b50 100644
--- a/README.md
+++ b/README.md
@@ -15,6 +15,16 @@ Clone this repo and build the js and css files (you'll need Git and Make install
 A full version and a minified version of the jQuery Mobile JavaScript and CSS files will be created 
 in a folder named "compiled". There is also now a Structure only css file so you can add your own theme on top of it.
 
+How to build a self-contained version of the Docs/Demos
+=======================================================
+Once you have your own cloned repo on your computer:
+
+    make docs
+
+The docs will be built and available in the compiled/demos folder. You can move this folder to your web server or 
+other location. It has no dependencies on anything other than a basic HTML web server.
+
+
 Submitting bugs
 ===============
 If you think you've found a bug, please report it by following these instructions:  
@@ -77,9 +87,8 @@ theme's name. For testing locally, make sure the index.php file is copied as wel
 2. Edit the `jquery.mobile.theme.css` file so it contains your custom fonts and colors.
 3. Once you are done editing your files and saving them, open a terminal.
 4. Navigate to the jQuery-Mobile folder's root.
-5. Run the following command to build jQuery-Mobile. The CSSTHEME specifies what theme to include. If you leave it off,
-it will build using the "default" theme.
+5. Run the following command to build jQuery-Mobile (THEME is the name of the folder for your theme from step 1.):
 
-    make CSSTHEME=YourThemeName
+    make THEME=YourThemeName
     
-6. The compiled files will be located in the "compiled" folder in the root of jQuery-Mobile.
\ No newline at end of file
+6. The compiled files will be located in the "compiled" folder in the root of jQuery-Mobile.
diff --git a/css/structure/index.php b/css/structure/index.php
index a6971970..ab08918d 100644
--- a/css/structure/index.php
+++ b/css/structure/index.php
@@ -1,5 +1,6 @@
 <?php
 $files = array_merge($files, array(
+	'../../../LICENSE-INFO.txt',
 	'../../structure/jquery.mobile.core.css',
 	'../../structure/jquery.mobile.transitions.css',
 	'../../structure/jquery.mobile.grids.css',
diff --git a/css/structure/jquery.mobile.button.css b/css/structure/jquery.mobile.button.css
index 7632e313..2ead0f29 100644
--- a/css/structure/jquery.mobile.button.css
+++ b/css/structure/jquery.mobile.button.css
@@ -1,8 +1,3 @@
-/*
-* jQuery Mobile Framework
-* Copyright (c) jQuery Project
-* Dual licensed under the MIT (MIT-LICENSE.txt) or GPL (GPL-LICENSE.txt) licenses.
-*/
 .ui-btn { display: block; text-align: center; cursor:pointer;  position: relative; margin: .5em 5px; padding: 0; }
 .ui-header .ui-btn, .ui-footer .ui-btn, .ui-bar .ui-btn { display: inline-block; font-size: 13px; margin: 0; }
 .ui-btn-inline { display: inline-block; }
diff --git a/css/structure/jquery.mobile.collapsible.css b/css/structure/jquery.mobile.collapsible.css
index 3c90f790..c636d899 100644
--- a/css/structure/jquery.mobile.collapsible.css
+++ b/css/structure/jquery.mobile.collapsible.css
@@ -1,8 +1,3 @@
-/*
-* jQuery Mobile Framework
-* Copyright (c) jQuery Project
-* Dual licensed under the MIT (MIT-LICENSE.txt) or GPL (GPL-LICENSE.txt) licenses.
-*/
 .ui-collapsible { margin: .5em 0; }
 .ui-collapsible-heading { font-size: 16px; display: block; margin: 0 -8px; padding: 0; border-width: 0 0 1px 0; position: relative; }
 .ui-collapsible-heading a { text-align: left; margin: 0;  }
diff --git a/css/structure/jquery.mobile.controlgroup.css b/css/structure/jquery.mobile.controlgroup.css
index 509b03c5..a5ac01f8 100644
--- a/css/structure/jquery.mobile.controlgroup.css
+++ b/css/structure/jquery.mobile.controlgroup.css
@@ -1,8 +1,3 @@
-/*
-* jQuery Mobile Framework
-* Copyright (c) jQuery Project
-* Dual licensed under the MIT (MIT-LICENSE.txt) or GPL (GPL-LICENSE.txt) licenses.
-*/
 .ui-controlgroup, fieldset.ui-controlgroup { padding: 0; margin: .5em 0 1em; }
 .ui-bar .ui-controlgroup { margin: 0 .3em; }
 .ui-controlgroup-label { font-size: 16px; line-height: 1.4; font-weight: normal; margin: 0 0 .3em; }
diff --git a/css/structure/jquery.mobile.core.css b/css/structure/jquery.mobile.core.css
index e832153b..266de4ed 100644
--- a/css/structure/jquery.mobile.core.css
+++ b/css/structure/jquery.mobile.core.css
@@ -1,18 +1,13 @@
-/*
-* jQuery Mobile Framework
-* Copyright (c) jQuery Project
-* Dual licensed under the MIT (MIT-LICENSE.txt) and GPL (GPL-LICENSE.txt) licenses.
-*/
-
 /* some unsets - more probably needed */
 .ui-mobile, .ui-mobile body { height: 100%; }
 .ui-mobile fieldset, .ui-page { padding: 0; margin: 0; }
 .ui-mobile a img, .ui-mobile fieldset { border: 0; }
 
 /* responsive page widths */
-.ui-mobile-viewport {  margin: 0; overflow-x: hidden; -webkit-text-size-adjust: none; -ms-text-size-adjust:none; -webkit-tap-highlight-color: rgba(0, 0, 0, 0); }
+.ui-mobile-viewport {  margin: 0; overflow-x: visible; -webkit-text-size-adjust: none; -ms-text-size-adjust:none; -webkit-tap-highlight-color: rgba(0, 0, 0, 0); }
 /* Issue #2066 */
-form.ui-mobile-viewport { overflow-x: visible; }
+body.ui-mobile-viewport,
+div.ui-mobile-viewport { overflow-x: hidden; }
 
 /* "page" containers - full-screen views, one should always be in view post-pageload */
 .ui-mobile [data-role=page], .ui-mobile [data-role=dialog], .ui-page { top: 0; left: 0; width: 100%; min-height: 100%; position: absolute; display: none; border: 0; }
diff --git a/css/structure/jquery.mobile.dialog.css b/css/structure/jquery.mobile.dialog.css
index ffea3d3a..63006eb3 100644
--- a/css/structure/jquery.mobile.dialog.css
+++ b/css/structure/jquery.mobile.dialog.css
@@ -1,8 +1,3 @@
-/*
-* jQuery Mobile Framework
-* Copyright (c) jQuery Project
-* Dual licensed under the MIT (MIT-LICENSE.txt) or GPL (GPL-LICENSE.txt) licenses.
-*/
 .ui-dialog { min-height: 480px; }
 .ui-dialog .ui-header, 
 .ui-dialog .ui-content, 
diff --git a/css/structure/jquery.mobile.forms.checkboxradio.css b/css/structure/jquery.mobile.forms.checkboxradio.css
index 839d0072..9db0fb36 100644
--- a/css/structure/jquery.mobile.forms.checkboxradio.css
+++ b/css/structure/jquery.mobile.forms.checkboxradio.css
@@ -1,8 +1,3 @@
-/*
-* jQuery Mobile Framework
-* Copyright (c) jQuery Project
-* Dual licensed under the MIT (MIT-LICENSE.txt) or GPL (GPL-LICENSE.txt) licenses.
-*/
 .ui-checkbox, .ui-radio { position:relative;  margin: .2em 0 .5em; z-index: 1;  }
 .ui-checkbox .ui-btn, .ui-radio .ui-btn { margin: 0; text-align: left; z-index: 2; }
 .ui-checkbox .ui-btn-inner, .ui-radio .ui-btn-inner { white-space: normal; }
diff --git a/css/structure/jquery.mobile.forms.fieldcontain.css b/css/structure/jquery.mobile.forms.fieldcontain.css
index a4f8c101..cd73ff79 100644
--- a/css/structure/jquery.mobile.forms.fieldcontain.css
+++ b/css/structure/jquery.mobile.forms.fieldcontain.css
@@ -1,8 +1,3 @@
-/*
-* jQuery Mobile Framework
-* Copyright (c) jQuery Project
-* Dual licensed under the MIT (MIT-LICENSE.txt) or GPL (GPL-LICENSE.txt) licenses.
-*/
 .ui-field-contain { padding: 1.5em 0; margin: 0; border-bottom-width: 1px; overflow: visible; }
 .ui-field-contain:first-child { border-top-width: 0; }
 @media all and (min-width: 450px){
diff --git a/css/structure/jquery.mobile.forms.select.css b/css/structure/jquery.mobile.forms.select.css
index 67580449..73ea2aa7 100644
--- a/css/structure/jquery.mobile.forms.select.css
+++ b/css/structure/jquery.mobile.forms.select.css
@@ -1,12 +1,13 @@
-/*
-* jQuery Mobile Framework
-* Copyright (c) jQuery Project
-* Dual licensed under the MIT (MIT-LICENSE.txt) or GPL (GPL-LICENSE.txt) licenses.
-*/
 .ui-select { display: block; position: relative; }
 .ui-select select { position: absolute; left: -9999px; top: -9999px; }
 .ui-select .ui-btn { overflow: hidden; }
+
+
+.ui-select .ui-btn { opacity: 1; }
+/* Fixes #2588 — When Windows Phone 7.5 (Mango) tries to calculate a numeric opacity for a select—including “inherit”—without explicitly specifying an opacity on the parent to give it context, a bug appears where clicking elsewhere on the page after opening the select will open the select again. */
 .ui-select .ui-btn select { cursor: pointer; -webkit-appearance: button; left: 0; top:0; width: 100%;  min-height: 1.5em; min-height: 100%; height: 3em; max-height: 100%; opacity: 0; -ms-filter: "progid:DXImageTransform.Microsoft.Alpha(Opacity=0)"; filter: alpha(opacity=0); z-index: 2; }
+
+
 @-moz-document url-prefix() {.ui-select .ui-btn select { opacity: 0.0001; }}
 .ui-select .ui-btn select.ui-select-nativeonly { opacity: 1; text-indent: 0; }
 
diff --git a/css/structure/jquery.mobile.forms.slider.css b/css/structure/jquery.mobile.forms.slider.css
index 407312df..67ef9ffe 100644
--- a/css/structure/jquery.mobile.forms.slider.css
+++ b/css/structure/jquery.mobile.forms.slider.css
@@ -1,8 +1,3 @@
-/*
-* jQuery Mobile Framework
-* Copyright (c) jQuery Project
-* Dual licensed under the MIT (MIT-LICENSE.txt) or GPL (GPL-LICENSE.txt) licenses.
-*/
 label.ui-slider { font-size: 16px; line-height: 1.4;  font-weight: normal; margin: 0 0 .3em; display: block; }
 input.ui-slider-input,
 .ui-field-contain input.ui-slider-input { display: inline-block; width: 50px; }
diff --git a/css/structure/jquery.mobile.forms.textinput.css b/css/structure/jquery.mobile.forms.textinput.css
index 9d9eac91..028a34a3 100644
--- a/css/structure/jquery.mobile.forms.textinput.css
+++ b/css/structure/jquery.mobile.forms.textinput.css
@@ -1,8 +1,3 @@
-/*
-* jQuery Mobile Framework
-* Copyright (c) jQuery Project
-* Dual licensed under the MIT (MIT-LICENSE.txt) or GPL (GPL-LICENSE.txt) licenses.
-*/
 label.ui-input-text { font-size: 16px; line-height: 1.4; display: block; font-weight: normal; margin: 0 0 .3em; }
 input.ui-input-text, textarea.ui-input-text { background-image: none; padding: .4em; line-height: 1.4; font-size: 16px; display: block; width: 97%; }
 input.ui-input-text { -webkit-appearance: none; }
diff --git a/css/structure/jquery.mobile.grids.css b/css/structure/jquery.mobile.grids.css
index 162cb838..39a3850a 100644
--- a/css/structure/jquery.mobile.grids.css
+++ b/css/structure/jquery.mobile.grids.css
@@ -1,9 +1,3 @@
-/*
-* jQuery Mobile Framework
-* Copyright (c) jQuery Project
-* Dual licensed under the MIT (MIT-LICENSE.txt) or GPL (GPL-LICENSE.txt) licenses.
-*/
-
 /* content configurations. */
 .ui-grid-a, .ui-grid-b, .ui-grid-c, .ui-grid-d { overflow: hidden; }
 .ui-block-a, .ui-block-b, .ui-block-c, .ui-block-d, .ui-block-e { margin: 0; padding: 0; border: 0; float: left; min-height:1px;}
diff --git a/css/structure/jquery.mobile.headerfooter.css b/css/structure/jquery.mobile.headerfooter.css
index 21dbcd2b..1d52c3d9 100644
--- a/css/structure/jquery.mobile.headerfooter.css
+++ b/css/structure/jquery.mobile.headerfooter.css
@@ -1,8 +1,3 @@
-/*
-* jQuery Mobile Framework
-* Copyright (c) jQuery Project
-* Dual licensed under the MIT (MIT-LICENSE.txt) or GPL (GPL-LICENSE.txt) licenses.
-*/
 /* fixed page header & footer configuration */
 .ui-header, .ui-footer, .ui-page-fullscreen .ui-header, .ui-page-fullscreen .ui-footer  { position: absolute;  overflow: hidden; width: 100%; border-left-width: 0; border-right-width: 0; }
 .ui-header-fixed, .ui-footer-fixed {
diff --git a/css/structure/jquery.mobile.listview.css b/css/structure/jquery.mobile.listview.css
index 9ef6485c..9726cc5b 100644
--- a/css/structure/jquery.mobile.listview.css
+++ b/css/structure/jquery.mobile.listview.css
@@ -1,8 +1,3 @@
-/*
-* jQuery Mobile Framework
-* Copyright (c) jQuery Project
-* Dual licensed under the MIT (MIT-LICENSE.txt) or GPL (GPL-LICENSE.txt) licenses.
-*/
 .ui-listview { margin: 0; counter-reset: listnumbering; }
 .ui-content .ui-listview { margin: -15px; }
 .ui-content .ui-listview-inset { margin: 1em 0;  }
diff --git a/css/structure/jquery.mobile.navbar.css b/css/structure/jquery.mobile.navbar.css
index 83f5208b..b4403b2b 100644
--- a/css/structure/jquery.mobile.navbar.css
+++ b/css/structure/jquery.mobile.navbar.css
@@ -1,8 +1,3 @@
-/*
-* jQuery Mobile Framework
-* Copyright (c) jQuery Project
-* Dual licensed under the MIT (MIT-LICENSE.txt) or GPL (GPL-LICENSE.txt) licenses.
-*/
 .ui-navbar { overflow: hidden;  }
 .ui-navbar ul, .ui-navbar-expanded ul { list-style:none; padding: 0; margin: 0; position: relative; display: block; border: 0;}
 .ui-navbar-collapsed ul { float: left; width: 75%; margin-right: -2px; }
diff --git a/css/structure/jquery.mobile.transitions.css b/css/structure/jquery.mobile.transitions.css
index 82c78594..503baa32 100644
--- a/css/structure/jquery.mobile.transitions.css
+++ b/css/structure/jquery.mobile.transitions.css
@@ -1,8 +1,3 @@
-/*
-* jQuery Mobile Framework
-* Copyright (c) jQuery Project
-* Dual licensed under the MIT (MIT-LICENSE.txt) or GPL (GPL-LICENSE.txt) licenses.
-*/
 .spin  {
 	-webkit-transform: rotate(360deg);
 	-webkit-animation-name: spin;
diff --git a/css/themes/default/index.php b/css/themes/default/index.php
index b595f406..6e2dedcb 100644
--- a/css/themes/default/index.php
+++ b/css/themes/default/index.php
@@ -1,6 +1,7 @@
 <?php
 $type = 'text/css';
 $files = array(
+	'../../../LICENSE-INFO.txt',
 	'jquery.mobile.theme.css'
 );
 $base = dirname(__FILE__);
diff --git a/css/themes/default/jquery.mobile.theme.css b/css/themes/default/jquery.mobile.theme.css
index 406d90f5..04090f70 100644
--- a/css/themes/default/jquery.mobile.theme.css
+++ b/css/themes/default/jquery.mobile.theme.css
@@ -1,9 +1,3 @@
-/*
-* jQuery Mobile Framework
-* Copyright (c) jQuery Project
-* Dual licensed under the MIT (MIT-LICENSE.txt) and GPL (GPL-LICENSE.txt) licenses.
-*/
-
 /* Swatches */
 
 /* A
diff --git a/css/themes/valencia/index.php b/css/themes/valencia/index.php
index b595f406..6e2dedcb 100644
--- a/css/themes/valencia/index.php
+++ b/css/themes/valencia/index.php
@@ -1,6 +1,7 @@
 <?php
 $type = 'text/css';
 $files = array(
+	'../../../LICENSE-INFO.txt',
 	'jquery.mobile.theme.css'
 );
 $base = dirname(__FILE__);
diff --git a/css/themes/valencia/jquery.mobile.theme.css b/css/themes/valencia/jquery.mobile.theme.css
index 5981b4ec..641e01de 100644
--- a/css/themes/valencia/jquery.mobile.theme.css
+++ b/css/themes/valencia/jquery.mobile.theme.css
@@ -1,10 +1,3 @@
-/*
-* jQuery Mobile Framework
-* Copyright (c) jQuery Project
-* Dual licensed under the MIT (MIT-LICENSE.txt) and GPL (GPL-LICENSE.txt) licenses.
-*/
-
-
 /*####################################################################################################################################
 
   A
diff --git a/docs/api/data-attributes.html b/docs/api/data-attributes.html
index 9e562f50..67b441d7 100644
--- a/docs/api/data-attributes.html
+++ b/docs/api/data-attributes.html
@@ -23,6 +23,8 @@
 	<div data-role="content" data-theme="c">
 
 		<div class="content-primary">
+			<h2>Data- attribute reference</h2>
+			<p>The jQuery Mobile framework uses HTML5 <code>data-</code> attributes to allow for markup-based initialization and configuration of widgets. These attributes are completely optional; calling plugins manually and passing options directly is also supported. To avoid naming conflicts with other plugins or frameworks that also use <code>data-</code> attributes, set a custom namespace by modifying the <a href="globalconfig.html"><code>ns</code> global option</a>.<p>
 
 				<style>
 					table { width:100%; border-bottom:1px solid #ccc; }
@@ -107,12 +109,37 @@
 					<td>swatch letter (a-z) - Sets all collapsibles in set</td>
 				</tr>
 			</table>
-
+			
 			<h2><a href="../pages/page-dialogs.html">Dialog</a></h2>
+			<p>Container with <code>data-role="page"</code> or <code>"dialog"</code> linked to with <code>data-rel="dialog"</code> on the anchor.</p>
 			<table>
+				<tr>
+					<th>data-close-btn-text</th>
+					<td>string (text for the close button, dialog only)</td>
+				</tr>
+				<tr>
+					<th>data-dom-cache</th>
+					<td>true | <strong>false</strong></td>
+				</tr>
+				<tr>
+					<th>data-id</th>
+					<td>string (unique id for the page)</td>
+				</tr>
+				<tr>
+					<th>data-fullscreen</th>
+					<td>true | false (used in conjunction with fixed toolbars)</td>
+				</tr>
 				<tr>
 					<th>data-overlay-theme</th>
-					<td>swatch letter (a-z) - overlay theme</td>
+					<td>swatch letter (a-z) - overlay theme when the page is opened in a dialog</td>
+				</tr>
+				<tr>
+					<th>data-theme</th>
+					<td>swatch letter (a-z)</td>
+				</tr>
+				<tr>
+					<th>data-title</th>
+					<td>string (title used when page is shown)</td>
 				</tr>
 			</table>
 
@@ -278,7 +305,7 @@
 			</table>
 
 			<h2><a href="../pages/page-anatomy.html">Page</a></h2>
-			<p>Container with <code>data-role="page"</code> or <code>"dialog"</code></p>
+			<p>Container with <code>data-role="page"</code></p>
 			<table>
 				<tr>
 					<th>data-close-btn-text</th>
@@ -342,6 +369,10 @@
 					<th>data-native-menu</th>
 					<td><strong>true</strong> | false</td>
 				</tr>
+				<tr>
+					<th>data-overlay-theme</th>
+					<td>swatch letter (a-z) - overlay theme for non-native selects</td>
+				</tr>
 				<tr>
 					<th>data-placeholder</th>
 					<td>true | false - Add to the Option</td>
@@ -350,10 +381,6 @@
 					<th>data-role</th>
 					<td>none (prevents auto-enhancement to use native control)</td>
 				</tr>
-				<tr>
-					<th>data-overlay-theme</th>
-					<td>swatch letter (a-z) - overlay theme for non-native selects</td>
-				</tr>
 				<tr>
 					<th>data-theme</th>
 					<td>swatch letter (a-z) - Added to the form element</td>
@@ -405,7 +432,6 @@
 					<li><a href="../../docs/api/globalconfig.html">Configuring defaults</a></li>
 					<li><a href="../../docs/api/events.html">Events</a></li>
 					<li><a href="../../docs/api/methods.html">Methods &amp; Utilities</a></li>
-					<li><a href="../../docs/api/mediahelpers.html">Responsive layout</a></li> 
 					<li data-theme="a"><a href="../../docs/api/data-attributes.html">Data attribute reference</a></li>
 					<li><a href="../../docs/api/themes.html">Theme framework</a></li>
 				</ul>
diff --git a/docs/api/themes.html b/docs/api/themes.html
index 5dedc2b3..5f988218 100755
--- a/docs/api/themes.html
+++ b/docs/api/themes.html
@@ -233,7 +233,7 @@
 			<dt><code>ui-btn-up-(a-z)</code></dt>
 			<dd>Applies the button/clickable element theme styles for the selected swatch letter. Commonly used in with the <code>ui-btn-hover-(a-z)</code> and <code>ui-btn-down-(a-z)</code> interaction class states to provide visual feedback and <code>ui-btn-active</code> to indicate the selected or "on" state.</dd>
 			<dt><code>ui-corner-all</code></dt>
-			<dd>Applies the theme's global border-radius for rounded corners and is used for container or grouped items in the framework (inset lists, radiobutton sets). There are additional classes for all the possible combinations of rounded corners, for example: <code>ui-corner-tl</code> (top left only), <code>-top</code> (both top corners), <code>-left</code> (both left corners),  etc. A second full set of corner classes is provided for buttons so these can have a different corner radius. These use classes with a similar naming convention, but with "btn" instead of "corner", like this: <code>.ui-<strong>btn</strong>-corner-all</code>.</dd>
+			<dd>Applies the theme's global border-radius for rounded corners and is used for container or grouped items in the framework (inset lists, radiobutton sets). There are additional classes for all the possible combinations of rounded corners, for example: <code>ui-corner-tl</code> (top left only), <code>-top</code> (both top corners), <code>-left</code> (both left corners),  etc. A second full set of corner classes is provided for buttons so these can have a different corner radius. These use classes with a similar naming convention, but with "btn-corner" instead of "corner", like this: <code>.ui-<strong>btn-corner</strong>-all</code>.</dd>
 			<dt><code>ui-shadow</code></dt>
 			<dd>Applies the theme's global drop shadow to any element using CSS <code>box-shadow</code> property. </dd>
 			<dt><code>ui-disabled</code></dt>
diff --git a/docs/buttons/buttons-icons.html b/docs/buttons/buttons-icons.html
index 00e416e8..f148112d 100755
--- a/docs/buttons/buttons-icons.html
+++ b/docs/buttons/buttons-icons.html
@@ -107,8 +107,24 @@
 			<a href="index.html" data-role="button" data-icon="delete" data-iconpos="notext">Delete</a>
 
 		<h2>Custom Icons</h2>
-		<p>To use custom icons, specify a <code> data-icon</code> value that has a unique name like <code>myapp-email</code> and the button plugin will generate a class by prefixing <code>ui-icon-</code> to the <code> data-icon</code> value and apply it to the button. You can then write a CSS rule that targets the <code>ui-icon-myapp-email</code> class to specify the icon background source. To maintain visual consistency, create a white icon 18x18 pixels saved as a PNG-8 with alpha transparency.</p>
-			
+		<p>To use custom icons, specify a <code>data-icon</code> value that has a unique name like <code>myapp-email</code> and the button plugin will generate a class by prefixing <code>ui-icon-</code> to the <code> data-icon</code> value and apply it to the button: <code>ui-icon-myapp-email</code>. </p>
+		<p>You can then write a CSS rule in your stylesheet that targets the <code>ui-icon-myapp-email</code> class to specify the icon background source. To maintain visual consistency with the rest of the icons, create a white icon 18x18 pixels saved as a PNG-8 with alpha transparency.</p>
+		<p> In this example, we're just pointing to a standalone icon image, but you could just as easily use an icon sprite and specify the positioning instead, just like the icon sprite we use in the framework.</p>
+		
+<pre><code>.ui-icon-myapp-email {
+	background-image: url("app-icon-email.png");
+}</code></pre>
+
+		<p>This will create the standard resolution icon, but many devices now have very high resolution displays, like the retina display on the iPhone 4. To add a HD icon, create an icon that is 36x36 pixels (exactly double the 18 pixel size), and add second rule that uses the <code>-webkit-min-device-pixel-ratio: 2</code> media query to target a rule only to high resolution displays. Specify the background image for the HD icon file and set the background size to 18x18 pixels which will fit the 36 pixel icon into the same 18 pixel space. The media query block can wrap multiple icon rules:</p>
+<pre><code>
+@media only screen and (-webkit-min-device-pixel-ratio: 2) {
+	.ui-icon-myapp-email {
+		background-image: url("app-icon-email-highres.png");
+		background-size: 18px 18px;
+	}
+	...more HD icon rules go here...
+}
+</code></pre>			
 		 	
 		<h2>Icons and themes</h2>
 		<p>The semi-transparent black circle behind the white icon ensures good contrast on any background color so it works well with the jQuery Mobile theming system. Here are examples of the same icons sitting on top of a range of different color swatches in out theme.</p>
diff --git a/docs/forms/selects/index.html b/docs/forms/selects/index.html
index 7ae82e53..894bd61a 100644
--- a/docs/forms/selects/index.html
+++ b/docs/forms/selects/index.html
@@ -583,18 +583,85 @@ $.mobile.selectmenu.prototype.options.hidePlaceholderMenuItems = false;
 	</div>
 
 
-	<h2>Styling with data attributes</h2>
+	<h2>Theming selects</h2>
 	<p>You can specify any jQuery Mobile button <code>data-</code> attribute on a select element, too. In this example, we're setting the theme, icon and inline properties:</p>
 
 	<div data-role="fieldcontain">
 		<label for="select-choice-11" class="select">Actions</label>
-		<select name="select-choice-11" id="select-choice-11" data-theme="a" data-icon="gear" data-inline="true" data-native-menu="false">
+		<select name="select-choice-11" id="select-choice-11" data-theme="e" data-icon="gear" data-inline="true" data-native-menu="false">
 			<option value="edit">Edit user</option>
 			<option value="delete">Delete user</option>
 		</select>
 	</div>
     
-            
+	<p>The <code>data-overlay-theme</code> attribute can be added a select element to set the color of the overlay layer that the dialog-based custom select menus and the outer border of the smaller custom menus. By default, the content block colors for swatch A will be used for the overlays.</p>
+      
+	<div data-role="fieldcontain">
+		<label for="select-choice-15" class="select">Size</label>
+		<select name="select-choice-15" id="select-choice-15" data-theme="b" data-overlay-theme="d" data-native-menu="false">
+			<option value="t">Tall</option>
+			<option value="g">Grande</option>
+			<option value="v">Vente</option>
+		</select>
+	</div>
+	
+	<div data-role="fieldcontain">
+		<label for="select-choice-13" class="select">Choose state(s):</label>
+		<select name="select-choice-13" id="select-choice-13" data-native-menu="false" data-theme="a" data-overlay-theme="e">
+			<option>Choose options</option>
+			<option value="AL">Alabama</option>
+			<option value="AK">Alaska</option>
+			<option value="AZ">Arizona</option>
+			<option value="AR">Arkansas</option>
+			<option value="CA">California</option>
+			<option value="CO">Colorado</option>
+			<option value="CT">Connecticut</option>
+			<option value="DE">Delaware</option>
+			<option value="FL">Florida</option>
+			<option value="GA">Georgia</option>
+			<option value="HI">Hawaii</option>
+			<option value="ID">Idaho</option>
+			<option value="IL">Illinois</option>
+			<option value="IN">Indiana</option>
+			<option value="IA">Iowa</option>
+			<option value="KS">Kansas</option>
+			<option value="KY">Kentucky</option>
+			<option value="LA">Louisiana</option>
+			<option value="ME">Maine</option>
+			<option value="MD">Maryland</option>
+			<option value="MA">Massachusetts</option>
+			<option value="MI">Michigan</option>
+			<option value="MN">Minnesota</option>
+			<option value="MS">Mississippi</option>
+			<option value="MO">Missouri</option>
+			<option value="MT">Montana</option>
+			<option value="NE">Nebraska</option>
+			<option value="NV">Nevada</option>
+			<option value="NH">New Hampshire</option>
+			<option value="NJ">New Jersey</option>
+			<option value="NM">New Mexico</option>
+			<option value="NY">New York</option>
+			<option value="NC">North Carolina</option>
+			<option value="ND">North Dakota</option>
+			<option value="OH">Ohio</option>
+			<option value="OK">Oklahoma</option>
+			<option value="OR">Oregon</option>
+			<option value="PA">Pennsylvania</option>
+			<option value="RI">Rhode Island</option>
+			<option value="SC">South Carolina</option>
+			<option value="SD">South Dakota</option>
+			<option value="TN">Tennessee</option>
+			<option value="TX">Texas</option>
+			<option value="UT">Utah</option>
+			<option value="VT">Vermont</option>
+			<option value="VA">Virginia</option>
+			<option value="WA">Washington</option>
+			<option value="WV">West Virginia</option>
+			<option value="WI">Wisconsin</option>
+			<option value="WY">Wyoming</option>
+		</select>
+	</div>
+      
         
 <h2>Calling the select menu plugin</h2>
 <p>The select menu plugin will auto initialize on any page that contains a select menu, no need for a <code>data-role</code> attribute in the markup. However, you can directly call the select menu plugin on any selector, just like any normal jQuery plugin:</p>
diff --git a/docs/lists/docs-lists.html b/docs/lists/docs-lists.html
index 38025a0d..10963752 100755
--- a/docs/lists/docs-lists.html
+++ b/docs/lists/docs-lists.html
@@ -35,41 +35,41 @@
 
 			<a href="lists-ul.html" data-role="button" data-icon="arrow-r" data-iconpos="right">Basic list example</a>
 
-			<p><strong>Style note</strong>: all standard, non-inset lists have a -15px margin to negate the 15px of padding on the content area to make lists fill to the edges of the screen. If you add other widgets above or below a list, the negative margin may make these elements overlap so you'll need to add additional spacing in your custom CSS.</p>
+			<p><strong>Style note on non-inset lists</strong>: all standard, non-inset lists have a -15px margin to negate the 15px of padding on the content area to make lists fill to the edges of the screen. If you add other widgets above or below a list, the negative margin may make these elements overlap so you'll need to add additional spacing in your custom CSS.</p>
 			<h2>Nested lists</h2>
-			<p>By nesting child <code>ul</code> or <code>ol</code> inside list items, you can create nested lists. When a list item with a child list is clicked, the framework will generate a new ui-page populated with the title of the parent in the header and the list of child elements. These dynamic nested lists are styled with the "b" theme swatch (blue in the default theme) to indicate that you are in a secondary level of navigation. Lists can be nested multiple level deep and all pages and linking will be automatically handled by the framework.</p>
-			<p>To set the swatch color of the child list views, <code> data-theme</code> attribute on each list inside.</p>
+			<p>By nesting child <code>ul</code> or <code>ol</code> inside list items, you can create nested lists. When a list item with a child list is clicked, the framework will generate a new ui-page populated with the title of the parent in the header and the list of child elements. These dynamic nested lists are styled with the "b" theme swatch (blue in the default theme) to indicate that you are in a secondary level of navigation. Lists can be nested multiple levels deep and all pages and linking will be automatically handled by the framework.</p>
+			<p>To <a href="../lists/lists-themes.html">set the swatch color</a> of the child list views, set the <code>data-theme</code> attribute on each list inside.</p>
 			<a href="lists-nested.html" data-role="button" data-icon="arrow-r" data-iconpos="right">Nested list example</a>
 
 			<h2>Numbered lists</h2>
-			<p>Lists can also be created from ordered lists <code>(ol)</code> which is useful when presented items that are in a sequence such as search results or a movie queue. When the enhanced markup is applied to the list view, jQuery Mobile will try to first use CSS to add numbers to the list and, if not supported, will fall back to injecting numbers with JavaScript.</p>
+			<p>Lists can also be created from ordered lists <code>(ol)</code> which is useful when presenting items that are in a sequence such as search results or a movie queue. When the enhanced markup is applied to the list view, jQuery Mobile will try to first use CSS to add numbers to the list and, if not supported, will fall back to injecting numbers with JavaScript.</p>
 
 			<a href="lists-ol.html" data-role="button" data-icon="arrow-r" data-iconpos="right">Numbered list example</a>
 
 			<h2>Read-only lists</h2>
 			<p>List views can also be used to display a non-interactive list of items, usually as an inset list. This list is built from an unordered or ordered list that don't have linked list items. The framework defaults to styling these list with the "c" theme swatch (flat white in the default theme) and sets the text size to a smaller size than the clickable lists to save a bit of space.</p>
 
-			<a href="lists-readonly.html" data-role="button" data-icon="arrow-r" data-iconpos="right">Read-only list example</a>
+			<a href="lists-readonly-inset.html" data-role="button" data-icon="arrow-r" data-iconpos="right">Read-only list example</a>
 
 			<h2>Split button lists</h2>
-			<p>In cases where there is more than one possible action per list item, a split button can be used to offer two independently clickable items -- the list item and a small arrow icon in the far right. To make a split list item, simply add a second link inside the <code>li</code> and the framework will add a vertical divider line, style the link as an icon-only arrow button, and sets the <code>title</code> attribute of the link to the text the link for accessibility. </p>
+			<p>In cases where there is more than one possible action per list item, a split button can be used to offer two independently clickable items -- the list item and a small arrow icon in the far right. To make a split list item, simply add a second link inside the <code>li</code> and the framework will add a vertical divider line, style the link as an icon-only arrow button, and set the <code>title</code> attribute of the link to the text the link for accessibility. </p>
 			<p>You can set the icon for the right split icon by specifying a <code>data-split-icon</code> attribute with the <a href="../buttons/buttons-themes.html">icon name</a> you want. The theme swatch color of the split button can be set by specifying a swatch letter in the <code>data-split-theme</code> attribute</p>
 
 			<a href="lists-split.html" data-role="button" data-icon="arrow-r" data-iconpos="right">Split list example</a>
 
 
 			<h2>List dividers</h2>
-			<p>List items can be turned into dividers to organize and group the list items. This is done by adding the <code> data-role="list-divider"</code> to any list item. These items are styled with the body swatch "b" by default (light gray in the default theme) but you can specify a theme for dividers by adding the <code>data-dividertheme</code> attribute to the list element (ul or ol) and specifying a theme swatch letter.</p>
+			<p>List items can be turned into dividers to organize and group the list items. This is done by adding the <code> data-role="list-divider"</code> to any list item. These items are styled with the body swatch "b" by default (light gray in the default theme) but you can specify a theme for dividers by adding the <code>data-dividertheme</code> attribute to the list element (<code>ul</code> or <code>ol</code>) and specifying a theme swatch letter.</p>
 
 			<a href="lists-divider.html" data-role="button" data-icon="arrow-r" data-iconpos="right">List divider example</a>
 
 
 			<h2>Search filter</h2>
-			<p>jQuery Mobile provides a very easy way to filter a list with a simple client-side search feature. To make a list filterable, simply add the <code>data-filter="true"</code> attribute to the list. The framework will then append a search box above the list and add the behavior to filter out list items that don't contain the current search string as the user types. The input's placeholder text defaults to "Filter items...". To configure the placeholder text in the search input, you can either bind to the <code>mobileinit</code> event and set the <code>$.mobile.listview.prototype.options.filterPlaceholder</code> option to a string of your choosing, or use the data-attribute <code>data-filter-placeholder</code> on your listview. By default the search box will inherit its theme from its parent. The search box theme can be configured using the data-attribute <code>data-filter-theme</code> on your listview.</p>
+			<p>jQuery Mobile provides a very easy way to filter a list with a simple client-side search feature. To make a list filterable, simply add the <code>data-filter="true"</code> attribute to the list. The framework will then append a search box above the list and add the behavior to filter out list items that don't contain the current search string as the user types. The input's placeholder text defaults to "Filter items...". To configure the placeholder text in the search input, you can either <a href="../api/globalconfig.html">bind to the <code>mobileinit</code> event</a> and set the <code>$.mobile.listview.prototype.options.filterPlaceholder</code> option to a string of your choosing, or use the data-attribute <code>data-filter-placeholder</code> on your listview. By default the search box will inherit its theme from its parent. The search box theme can be configured using the data-attribute <code>data-filter-theme</code> on your listview.</p>
 
 			<a href="lists-search.html" data-role="button" data-icon="arrow-r" data-iconpos="right">Search filter example</a>
 
-      <p>If you want to change the way in which list items are filtered, ie fuzzy search or matching from the beginning of the string, you can configure the callback used internally by defining <code>$.mobile.listview.prototype.options.filterCallback</code> during <code>mobileinit</code> or after the widget has been created with <code>$("#mylist").listview('option', 'filterCallback', yourFilterFunction)</code>. Any function defined for the callback will be provided two arguments. First, the text of the current list item and second the value being searched for. A truthy value will result in a hidden list item. The default callback which filters entries without the <code>searchValue</code> as a substring is described below:
+      <p>If you want to change the way in which list items are filtered, ie fuzzy search or matching from the beginning of the string, you can configure the callback used internally by defining <code>$.mobile.listview.prototype.options.filterCallback</code> during <code>mobileinit</code> or after the widget has been created with <code>$("#mylist").listview('option', 'filterCallback', yourFilterFunction)</code>. Any function defined for the callback will be provided two arguments. First, the text of the current list item and second, the value being searched for. A truthy value will result in a hidden list item. The default callback which filters entries without the <code>searchValue</code> as a substring is described below:
       </p>
 
       <pre>
@@ -81,7 +81,7 @@ function( text, searchValue ){
       </pre>
 
 			<h2>Text formatting &amp; counts</h2>
-			<p>The framework includes text formatting conventions for common list patterns like header/descriptions, secondary information, counts through HTML semantic markup. </p>
+			<p>The framework includes text formatting conventions for common list patterns like header/descriptions, secondary information and counts through semantic HTML markup.</p>
 
 			<ul>
 				<li>To add a count indicator to the right of the list item, wrap the number in an element with a class of <code>ui-li-count</code></li>
@@ -92,7 +92,7 @@ function( text, searchValue ){
 			<a href="lists-formatting.html" data-role="button" data-icon="arrow-r" data-iconpos="right">List with text formatting</a>
 
 			<h2>Thumbnails &amp; icons</h2>
-			<p>To add thumbnails to the left of a list item, simply add an image inside a list item as the first child element. The framework will scale the image to 80 pixels square. To use standard 16x16 pixel icons in list items, add the class of <code>ui-li-icon</code> to the image element to size.</p>
+			<p>To add thumbnails to the left of a list item, simply add an image inside a list item as the first child element. The framework will scale the image to 80 pixels square. To use standard 16x16 pixel icons in list items, add the class of <code>ui-li-icon</code> to the image element.</p>
 			<a href="lists-thumbnails.html" data-role="button" data-icon="arrow-r" data-iconpos="right">List with thumbnail images</a>
 		 	<a href="lists-icons.html" data-role="button" data-icon="arrow-r" data-iconpos="right">List with icon images</a>
 
diff --git a/docs/pages/api-pages.html b/docs/pages/api-pages.html
deleted file mode 100755
index 233c16d5..00000000
--- a/docs/pages/api-pages.html
+++ /dev/null
@@ -1,43 +0,0 @@
-<!DOCTYPE html> 
-<html> 
-	<head>
-	<meta charset="utf-8">
-	<meta name="viewport" content="width=device-width, initial-scale=1"> 
-	<title>jQuery Mobile Docs - Pages API</title> 
-	<link rel="stylesheet"  href="../../css/themes/default/" />  
-	<link rel="stylesheet" href="../_assets/css/jqm-docs.css"/>
-	<script src="../../js/jquery.js"></script>
-	<script src="../../experiments/themeswitcher/jquery.mobile.themeswitcher.js"></script>
-	<script src="../_assets/js/jqm-docs.js"></script>
-	<script src="../../js/"></script>
-</head> 
-<body> 
-
-	<div data-role="page" class="type-interior">
-
-		<div data-role="header" data-theme="f">
-		<h1>Pages API</h1>
-		<a href="../../" data-icon="home" data-iconpos="notext" data-direction="reverse" class="ui-btn-right jqm-home">Home</a>
-	</div><!-- /header -->
-
-	<div data-role="content" data-theme="c">
-			
-			<h2>Dependencies</h2>
-			<p>To be documented</p>
-			
-			<h2>Options</h2>
-			<p>To be documented</p>
-			
-			<h2>Methods</h2>
-			<p>To be documented</p>
-			
-			<h2>Known Issues</h2>
-			<p>To be documented</p>
-			
-			
-		
-	</div><!-- /content -->
-</div><!-- /page -->
-
-</body>
-</html>
\ No newline at end of file
diff --git a/docs/pages/dialog-overlay.html b/docs/pages/dialog-overlay.html
new file mode 100644
index 00000000..41bff2f9
--- /dev/null
+++ b/docs/pages/dialog-overlay.html
@@ -0,0 +1,37 @@
+<!DOCTYPE html> 
+<html> 
+	<head>
+	<meta charset="utf-8">
+	<meta name="viewport" content="width=device-width, initial-scale=1"> 
+	<title>jQuery Mobile Framework - Dialog Example</title> 
+	<link rel="stylesheet"  href="../../css/themes/default/" />  
+	<link rel="stylesheet" href="../_assets/css/jqm-docs.css"/>
+	<script src="../../js/jquery.js"></script>
+	<script src="../../experiments/themeswitcher/jquery.mobile.themeswitcher.js"></script>
+	<script src="../_assets/js/jqm-docs.js"></script>
+	<script src="../../js/"></script>
+</head> 
+<body> 
+
+	<div data-role="page" data-overlay-theme="e">
+		<div data-role="header" data-theme="b">
+			<h1>Dialog</h1>
+		</div>
+
+		<div data-role="content" data-theme="d">
+			<h1>Custom overlay</h1>
+			<p>This dialog adds <code>data-overlay-theme="e"</code> to the page container to set the overlay swatch color.</p>
+			<a href="docs-dialogs.html" data-role="button" data-rel="back" data-theme="a" data-inline="true">I like it</a>       
+		</div>
+		
+		<div data-role="footer" data-theme="c">
+			<form style="padding-top:4px;">
+			<input type="checkbox" name="checkbox-0" id="checkbox-0" class="custom" />
+			<label for="checkbox-0">Don't show this message again </label>
+			</form>
+		</div>
+	</div>
+
+
+</body>
+</html>
\ No newline at end of file
diff --git a/docs/pages/index.html b/docs/pages/index.html
index 2ab11247..0ebbebb4 100755
--- a/docs/pages/index.html
+++ b/docs/pages/index.html
@@ -35,8 +35,10 @@
 								<li><a href="page-dialogs.html">Dialogs</a></li>
 								<li><a href="page-cache.html">Prefetching &amp; caching pages</a></li>
 								<li><a href="page-navmodel.html">Ajax, hashes &amp; history</a></li>
-								<li><a href="page-dynamic.html">Dynamically Injecting Pages</a></li>
+								<li><a href="page-dynamic.html">Dynamically injecting pages</a></li>
 								<li><a href="page-scripting.html">Scripting pages</a></li>
+								<li><a href="phonegap.html">PhoneGap apps</a></li>
+								<li><a href="touchoverflow.html">touchOverflow feature</a></li>
 								<li><a href="pages-themes.html">Theming pages</a></li>
 		</ul>
 
diff --git a/docs/pages/page-anatomy.html b/docs/pages/page-anatomy.html
index b7772c97..7268df68 100644
--- a/docs/pages/page-anatomy.html
+++ b/docs/pages/page-anatomy.html
@@ -60,7 +60,7 @@
 			<p>Inside the <code>&lt;body&gt;</code> tag, each view or "page" on the mobile device is identified with an element (usually a <code>div</code>) with the <code> data-role="page"</code> attribute:</p> 
 
 <div class="highlight"> 
-<pre><span class="nt">&lt;div</span> <span class="na"> data-role=</span><span class="s">"page"</span><span class="nt">&gt;</span> 
+<pre><span class="nt">&lt;div</span> <span class="na">data-role=</span><span class="s">"page"</span><span class="nt">&gt;</span> 
 	...
 <span class="nt">&lt;/div&gt;</span> 
 </pre> 
@@ -153,7 +153,7 @@
 	&lt;/div&gt;&lt;!-- /header --&gt;
 
 	&lt;div data-role=&quot;content&quot;&gt;	
-		&lt;p&gt;I&#x27;m the second in the source order so I&#x27;m hidden when the page load. I&#x27;m just shown, if a link that reference my ID is beeing clicked.&lt;/p&gt;		
+		&lt;p&gt;I&#x27;m the second in the source order so I&#x27;m hidden when the page loads. I&#x27;m just shown if a link that references my ID is beeing clicked.&lt;/p&gt;		
 		&lt;p&gt;&lt;a href=&quot;#foo&quot;&gt;Back to foo&lt;/a&gt;&lt;/p&gt;	
 	&lt;/div&gt;&lt;!-- /content --&gt;
 
@@ -173,7 +173,7 @@
 		
 <h2>Conventions, not requirements</h2>
 
-<p>Although the page structure outlined above is a recommended approach for a standard web app built with jQuery Mobile, the framework is very flexible with document structure. The page, header, content, and footer data-role elements are optional and are mostly helpful for providing some basic formatting and structure. The page wrapper used to be required for auto-initialization to work but this too is now optional for single page documents so there isn't any required markup at all. For a web page with a custom layout, all of these structural elements can be omitted but the Ajax navigation and all widgets will work just like they do in the boilerplate structure. Behind the scenes, the framework will inject the page wrapper if it's not included in the markup because it’s needed for managing pages, but the starting markup can now be extremely simple. </p>
+<p>Although the page structure outlined above is a recommended approach for a standard web app built with jQuery Mobile, the framework is very flexible with document structure. The page, header, content, and footer data-role elements are optional and are mostly helpful for providing some basic formatting and structure. The page wrapper that used to be required for auto-initialization to work is now optional for single page documents, so there isn't any required markup at all. For a web page with a custom layout, all of these structural elements can be omitted and the Ajax navigation and all widgets will work just like they do in the boilerplate structure. Behind the scenes, the framework will inject the page wrapper if it's not included in the markup because it’s needed for managing pages, but the starting markup can now be extremely simple. </p>
 
 <p>Note that in a multi-page setup, you are required to have page wrappers in your markup in order to group the content into multiple pages.</p>
 
@@ -200,8 +200,10 @@
 								<li><a href="page-dialogs.html">Dialogs</a></li>
 								<li><a href="page-cache.html">Prefetching &amp; caching pages</a></li>
 								<li><a href="page-navmodel.html">Ajax, hashes &amp; history</a></li>
-								<li><a href="page-dynamic.html">Dynamically Injecting Pages</a></li>
+								<li><a href="page-dynamic.html">Dynamically injecting pages</a></li>
 								<li><a href="page-scripting.html">Scripting pages</a></li>
+								<li><a href="phonegap.html">PhoneGap apps</a></li>
+								<li><a href="touchoverflow.html">touchOverflow feature</a></li>
 								<li><a href="pages-themes.html">Theming pages</a></li>
 
 							</ul>
diff --git a/docs/pages/page-cache.html b/docs/pages/page-cache.html
index 85db2d33..833af07c 100644
--- a/docs/pages/page-cache.html
+++ b/docs/pages/page-cache.html
@@ -28,7 +28,7 @@
 	
       <p>Usually, it's a good idea to store your app's pages in several single-page templates instead of one large multi-page template. This minimizes the size of the page's DOM.</p>
 
-			<p>When using single-page templates, you can prefetch pages into the DOM so that they're available instantly when the user visits them. To prefetch a page, add the <code>data-prefetch</code> attribute to a link that points to the page. jQuery Mobile then loads the target page in the background after the primary page has loaded and the pagecreate event has triggered. For example:</p>
+			<p>When using single-page templates, you can prefetch pages into the DOM so that they're available instantly when the user visits them. To prefetch a page, add the <code>data-prefetch</code> attribute to a link that points to the page. jQuery Mobile then loads the target page in the background after the primary page has loaded and the <code>pagecreate</code> event has triggered. For example:</p>
 			
 <pre><code>
 &lt;a href="prefetchThisPage.html" data-prefetch&gt; ... &lt;/a&gt;
@@ -51,7 +51,7 @@ $.mobile.loadPage( <var>pageUrl</var>, { showLoadMsg: false } );
 
 		<p>For animated page transitions to work, the pages you're transitioning from and to both need to be in the DOM. However, keeping old pages in the DOM quickly fills the browser's memory, and can cause some mobile browsers to slow down or even crash.</p>
 
-		<p>jQuery Mobile therefore has a simple mechanism to keep the DOM tidy. Whenever it loads a page via Ajax, jQuery Mobile flags the page to be removed from the DOM when you navigate away from it later (technically, on the pagehide event). If you revisit a removed page, the browser may be able to retrieve the page's HTML file from its cache. If not, it refetches the file from the server. (In the case of nested list views, jQuery Mobile removes all the pages that make up the nested list once you navigate to a page that's not part of the list.)</p>
+		<p>jQuery Mobile therefore has a simple mechanism to keep the DOM tidy. Whenever it loads a page via Ajax, jQuery Mobile flags the page to be removed from the DOM when you navigate away from it later (technically, on the <code>pagehide</code> event). If you revisit a removed page, the browser may be able to retrieve the page's HTML file from its cache. If not, it refetches the file from the server. (In the case of nested list views, jQuery Mobile removes all the pages that make up the nested list once you navigate to a page that's not part of the list.)</p>
     
     <p>Pages inside a multi-page template aren't affected by this feature at all - jQuery Mobile only removes pages loaded via Ajax.</p>
 
@@ -101,8 +101,10 @@ $.mobile.page.prototype.options.domCache = true;
 								<li><a href="page-dialogs.html">Dialogs</a></li>
 								<li data-theme="a"><a href="page-cache.html">Prefetching &amp; caching pages</a></li>
 								<li><a href="page-navmodel.html">Ajax, hashes &amp; history</a></li>
-								<li><a href="page-dynamic.html">Dynamically Injecting Pages</a></li>
+								<li><a href="page-dynamic.html">Dynamically injecting pages</a></li>
 								<li><a href="page-scripting.html">Scripting pages</a></li>
+								<li><a href="phonegap.html">PhoneGap apps</a></li>
+								<li><a href="touchoverflow.html">touchOverflow feature</a></li>
 								<li><a href="pages-themes.html">Theming pages</a></li>
 
 							</ul>
diff --git a/docs/pages/page-dialogs.html b/docs/pages/page-dialogs.html
index 4a5118b1..73138f3b 100755
--- a/docs/pages/page-dialogs.html
+++ b/docs/pages/page-dialogs.html
@@ -54,27 +54,35 @@
 			<p>For JavaScript-generated links, you can simply set the href attribute to "#" and use the <code>data-rel="back"</code> attribute. You can also call the dialog's <code>close()</code> method to programmatically close dialogs, for example: <code>$('.ui-dialog').dialog('close')</code>. </p>
 			
 			<h3>Setting the close button text</h3>
-			<p>Just like the page plugin, you can set a dialog's close button text through option or data attribute. The option can be configured for all dialogs by binding to the <code>mobileinit</code> event and setting the <code>$.mobile.dialog.prototype.options.closeBtnText</code> property to a string of your choosing, or you can place the data attribute <code>data-close-btn-text</code> to configure the text from your markup.</p>
+			<p>Just like the page plugin, you can set a dialog's close button text through an option or data attribute. The option can be configured for all dialogs by binding to the <code>mobileinit</code> event and setting the <code>$.mobile.dialog.prototype.options.closeBtnText</code> property to a string of your choosing, or you can place the data attribute <code>data-close-btn-text</code> to configure the text from your markup.</p>
 			
 			<h2>History &amp; Back button behavior</h2>
 			<p>Since dialogs are typically used to support actions within a page, the framework does not include dialogs in the hash state history tracking. This means that dialogs will not appear in your browsing history chronology when the Back button is clicked. For example, if you are on a page, click a link to open a dialog, close the dialog, then navigate to another page, if you were to click the browser's Back button at that point you will navigate back to the first page, not the dialog.</p>
 			
 			<h2>Styling &amp; theming</h2>
-			<p>Dialogs can be styled with different themes, just like any page. Here is a different dialog design:</p>
+			<p>Dialogs can be styled with different theme swatches, just like any page by adding <code>data-theme</code> attributes to the header, content, or footer containers. Here is an example of a different dialog design:</p>
 				<a href="dialog-alt.html" data-role="button" data-inline="true" data-rel="dialog" data-transition="pop">An alternate color scheme</a>
+				
+			<p>Dialogs appear to be floating above an overlay layer. This overlay adopts the swatch A content color by default, but the <code>data-overlay-theme</code> attribute can be added to the page wrapper to set the overlay to any swatch letter. Here is an example of a dialog with the overlay set to swatch e:</p>
+				<a href="dialog-overlay.html" data-role="button" data-inline="true" data-rel="dialog" data-transition="pop">Custom overlay swatch</a>
 		
 		
-			<p>And dialogs can be can used more like a control sheet to offer multiple buttons by removing the header:</p>
+			<p>Dialogs can also be used more like a control sheet to offer multiple buttons by removing the header:</p>
 						<a href="dialog-buttons.html" data-role="button" data-inline="true" data-rel="dialog" data-transition="slidedown">Share photos...</a>
 			
-			<p>For the sake of readability, dialogs have a default <code>max-width</code> of 500 pixels (plus 15px padding on each side). To override this, use the following CSS in your theme:</p>
+			<h2>Dialog width and margins</h2>
+			<p>For the sake of readability, dialogs have a default <code>max-width</code> of 500 pixels (plus 15px padding on each side). There is also a 10% top <code>margin</code> to give dialogs larger top margin on larger screens, but collapse to a small margin on smartphones. To override these styles, add the following CSS override rule to your stylesheet and tweak as needed:</p>
 
-<code>
-.ui-dialog .ui-header,
-.ui-dialog .ui-content,
-.ui-dialog .ui-footer { <strong>max-width: 100%;</strong> }
-</code>
+<code><pre>
+.ui-dialog .ui-header, 
+.ui-dialog .ui-content, 
+.ui-dialog .ui-footer { 
+<strong>	max-width: 500px; 
+	margin: 10% auto 15px auto; </strong>
+}
+</pre></code>
 
+			
 
 
 			
@@ -98,10 +106,11 @@
 								<li data-theme="a"><a href="page-dialogs.html">Dialogs</a></li>
 								<li><a href="page-cache.html">Prefetching &amp; caching pages</a></li>
 								<li><a href="page-navmodel.html">Ajax, hashes &amp; history</a></li>
-								<li><a href="page-dynamic.html">Dynamically Injecting Pages</a></li>
+								<li><a href="page-dynamic.html">Dynamically injecting pages</a></li>
 								<li><a href="page-scripting.html">Scripting pages</a></li>
+								<li><a href="phonegap.html">PhoneGap apps</a></li>
+								<li><a href="touchoverflow.html">touchOverflow feature</a></li>
 								<li><a href="pages-themes.html">Theming pages</a></li>
-
 				</ul>
 		</div>
 	</div>		
diff --git a/docs/pages/page-dynamic.html b/docs/pages/page-dynamic.html
index 8ce8dfb9..80d70a6a 100644
--- a/docs/pages/page-dynamic.html
+++ b/docs/pages/page-dynamic.html
@@ -277,10 +277,11 @@ function showCategory( urlObj, options )
 								<li><a href="page-dialogs.html">Dialogs</a></li>
 								<li><a href="page-cache.html">Prefetching &amp; caching pages</a></li>
 								<li><a href="page-navmodel.html">Ajax, hashes &amp; history</a></li>
-								<li data-theme="a"><a href="page-dynamic.html">Dynamically Injecting Pages</a></li>
+								<li data-theme="a"><a href="page-dynamic.html">Dynamically injecting pages</a></li>
 								<li><a href="page-scripting.html">Scripting pages</a></li>
+								<li><a href="phonegap.html">PhoneGap apps</a></li>
+								<li><a href="touchoverflow.html">touchOverflow feature</a></li>
 								<li><a href="pages-themes.html">Theming pages</a></li>
-
 							</ul>
 					</div>
 				</div>
diff --git a/docs/pages/page-links.html b/docs/pages/page-links.html
index d84ce292..7d7f2f67 100755
--- a/docs/pages/page-links.html
+++ b/docs/pages/page-links.html
@@ -39,7 +39,7 @@
 
 <h2>Linking without Ajax</h2>
 		
-		<p>Links that point to other domains or that have <code>rel="external"</code>, <code>data-ajax="false"</code> or <code>target</code> attributes will not be loaded with Ajax. Instead, these links and will cause a full page refresh with no animated transition. Both attributes have the same effect, but different semantic meaning: <code>rel="external"</code> should be used when linking to another site or domain, while <code>data-ajax="false"</code> is useful for simply opting a page within your domain from being loaded via Ajax. Because of security restrictions, the framework always opts links to external domains out of the Ajax behavior.</p>
+		<p>Links that point to other domains or that have <code>rel="external"</code>, <code>data-ajax="false"</code> or <code>target</code> attributes will not be loaded with Ajax. Instead, these links will cause a full page refresh with no animated transition. Both attributes (<code>rel="external"</code> and <code>data-ajax="false"</code>) have the same effect, but a different semantic meaning: <code>rel="external"</code> should be used when linking to another site or domain, while <code>data-ajax="false"</code> is useful for simply opting a page within your domain from being loaded via Ajax. Because of security restrictions, the framework always opts links to external domains out of the Ajax behavior.</p>
 		
 		<p>Note: When building a jQuery Mobile application where the Ajax navigation system is disabled globally or frequently disabled on individual links, we  recommend disabling the <code>$.mobile.pushStateEnabled</code> global <a href="../api/globalconfig.html">configuration option</a> to avoid inconsistent navigation behavior in some browsers.</p>
 		
@@ -47,11 +47,11 @@
 
 		<h2>Linking within a multi-page document</h2> 
 		
-			<p>A single HTML document can contain or multiple 'page' containers simply be  stacking multiple divs with a <code> data-role</code> of <code>"page"</code>. This allows you to build a small site or application within a single HTML document; jQuery Mobile will simply display the first 'page' it finds in the source order when the page loads.</p> 
+			<p>A single HTML document can contain one or many 'page' containers simply by stacking multiple divs with a <code> data-role</code> of <code>"page"</code>. This allows you to build a small site or application within a single HTML document; jQuery Mobile will simply display the first 'page' it finds in the source order when the page loads.</p> 
 			
-			<p>If a link in a multi-page document points to an anchor (<code>#foo</code>), the framework will looks for a page wrapper with that ID (id="foo"). If it finds a page in the HTML document, it will transition the new page into view. You can seamlessly navigate between local, internal "pages" and external pages in jQuery Mobile. Both will look the same to the end user except that external pages will display the Ajax spinner while loading. In either situation, jQuery Mobile updates the page's URL hash to enable Back button support, deep-linking and bookmarking. </p>
+			<p>If a link in a multi-page document points to an anchor (<code>#foo</code>), the framework will look for a page wrapper with that ID (<code>id="foo"</code>). If it finds a page in the HTML document, it will transition the new page into view. You can seamlessly navigate between local, internal "pages" and external pages in jQuery Mobile. Both will look the same to the end user except that external pages will display the Ajax spinner while loading. In either situation, jQuery Mobile updates the page's URL hash to enable Back button support, deep-linking and bookmarking. </p>
 		
-		<p>It's important to note if you  are linking from a mobile page that was loaded via Ajax to a page that contains multiple internal pages, you need to add a <code>rel="external"</code> or <code>data-ajax="false"</code> to the link. This tells the framework to do a full page reload to clear out the Ajax hash in the URL. This is critical because Ajax pages use the hash (#) to track the Ajax history, while multiple internal pages use the hash to indicate internal pages so there will be conflicts in the hash between these two modes.</p>
+		<p>It's important to note that if you are linking from a mobile page that was loaded via Ajax to a page that contains multiple internal pages, you need to add a <code>rel="external"</code> or <code>data-ajax="false"</code> to the link. This tells the framework to do a full page reload to clear out the Ajax hash in the URL. This is critical because Ajax pages use the hash (<code>#</code>) to track the Ajax history, while multiple internal pages use the hash to indicate internal pages so there will be conflicts in the hash between these two modes.</p>
 		
 		<p>For example, a link to a page containing multiple internal pages would look like this:</p>
 			
@@ -60,7 +60,7 @@
 				
 
 		<h2>"Back" button links</h2>
-		<p>If you use the attribute <code>data-rel="back"</code> on an anchor, any clicks on that anchor will mimic the back button, going back one history entry and ignoring the anchor's default href. This is particularly useful when linking back to a named page, such as a link that says "home", or when generating "back" buttons with JavaScript, such as a button to close a dialog. When using this feature in your source markup, <strong>be sure to provide a meaningful href that actually points to the URL of the referring page (this will allow the feature to work for users in C-Grade browsers</strong>. Also, please keep in mind that if you just want a reverse transition without actually going back in history, you should use the <code>data-direction="reverse"</code> attribute instead.</p>
+		<p>If you use the attribute <code>data-rel="back"</code> on an anchor, any clicks on that anchor will mimic the back button, going back one history entry and ignoring the anchor's default href. This is particularly useful when generating "back" buttons with JavaScript, such as a button to close a dialog. When using this feature in your source markup, although browsers that support this feature will not use the specified <code>href</code> attribute, <strong>be sure to still provide a meaningful value that actually points to the URL of the referring page to allow the feature to work for users in C-Grade browsers</strong>. If users can reach this page from more than one referring pages, specify a sensible <code>href</code> so that the navigation remains logical for all users. Also, please keep in mind that if you just want a reverse transition without actually going back in history, you should use the <code>data-direction="reverse"</code> attribute instead.</p>
 		
 				
 		<h2>Redirects and linking to directories</h2>
@@ -118,10 +118,11 @@
 								<li><a href="page-dialogs.html">Dialogs</a></li>
 								<li><a href="page-cache.html">Prefetching &amp; caching pages</a></li>
 								<li><a href="page-navmodel.html">Ajax, hashes &amp; history</a></li>
-								<li><a href="page-dynamic.html">Dynamically Injecting Pages</a></li>
+								<li><a href="page-dynamic.html">Dynamically injecting pages</a></li>
 								<li><a href="page-scripting.html">Scripting pages</a></li>
+								<li><a href="phonegap.html">PhoneGap apps</a></li>
+								<li><a href="touchoverflow.html">touchOverflow feature</a></li>
 								<li><a href="pages-themes.html">Theming pages</a></li>
-
 							</ul>
 					</div>
 				</div>		
diff --git a/docs/pages/page-navmodel.html b/docs/pages/page-navmodel.html
index c7efae02..ab24521d 100644
--- a/docs/pages/page-navmodel.html
+++ b/docs/pages/page-navmodel.html
@@ -45,7 +45,7 @@
 
 			<h2>pushState plugin</h2>
 
-			<p>There is an optional feature is converts the longer, hash-based URLs mentioned in the previous section into the full document path which is cleaner and makes the Ajax tracking transparent in the URL structure. This is built as an enhancement on top of the hash-based URL system for Ajax links. Note that despite the name, this feature technically converts hash-based urls by using <code>history.replaceState</code> (not <code>history.pushState</code>) in the current release because this works more reliably across our target platforms. For browsers that do not support <code>history.replaceState</code>, or if this feature is disabled, hash-based URLs will be used instead. </p>
+			<p>There is an optional feature that converts the longer, hash-based URLs mentioned in the previous section into the full document path which is cleaner and makes the Ajax tracking transparent in the URL structure. This is built as an enhancement on top of the hash-based URL system for Ajax links. Note that despite the name, this feature technically converts hash-based urls by using <code>history.replaceState</code> (not <code>history.pushState</code>) in the current release because this works more reliably across our target platforms. For browsers that do not support <code>history.replaceState</code>, or if this feature is disabled, hash-based URLs will be used instead. </p>
 
 			<p>Since the plugin initializes when the DOM is fully loaded you can enable and disable it manually by setting <code>$.mobile.pushStateEnabled</code> global <a href="../api/globalconfig.html">configuration option</a> to <code>false</code> anytime before document ready.</p>
 
@@ -99,7 +99,7 @@
 
 			</ul><h2>Form submissions</h2>
 
-			<p>Form submissions are handled automatically through the navigation model as well. Visit the forms section for more information.</p>
+			<p>Form submissions are handled automatically through the navigation model as well. Visit the <a href="../forms/forms-sample.html">forms section</a> for more information.</p>
 
 			<h2>Using the Application Cache</h2>
 
@@ -158,10 +158,11 @@ $.ajaxPrefilter( function(options, originalOptions, jqXHR) {
 								<li><a href="page-dialogs.html">Dialogs</a></li>
 								<li><a href="page-cache.html">Prefetching &amp; caching pages</a></li>
 								<li data-theme="a"><a href="page-navmodel.html">Ajax, hashes &amp; history</a></li>
-								<li><a href="page-dynamic.html">Dynamically Injecting Pages</a></li>
+								<li><a href="page-dynamic.html">Dynamically injecting pages</a></li>
 								<li><a href="page-scripting.html">Scripting pages</a></li>
+								<li><a href="phonegap.html">PhoneGap apps</a></li>
+								<li><a href="touchoverflow.html">touchOverflow feature</a></li>
 								<li><a href="pages-themes.html">Theming pages</a></li>
-
 							</ul>
 					</div>
 				</div>
diff --git a/docs/pages/page-scripting.html b/docs/pages/page-scripting.html
index 30c01d90..230dc0e5 100644
--- a/docs/pages/page-scripting.html
+++ b/docs/pages/page-scripting.html
@@ -22,11 +22,11 @@
 
 	<div data-role="content">
 		<div class="content-primary">		
-			<p>Since jQuery Mobile uses an Ajax-powered navigation system, there are a few helpful things to know when writing scripts that manipulate your content. You can explore the mobile API in more detail by reading up on <a href="../api/globalConfig.html">global configuration options</a>, <a href="../api/events.html">events</a>, and <a href="../api/methods.html">methods</a> or dig into the technical details of the <a href="page-navmodel.html">Ajax navigation model</a>.</p> 
+			<p>Since jQuery Mobile uses an Ajax-powered navigation system, there are a few helpful things to know when writing scripts that manipulate your content. You can explore the mobile API in more detail by reading up on <a href="../api/globalconfig.html">global configuration options</a>, <a href="../api/events.html">events</a>, and <a href="../api/methods.html">methods</a> or dig into the technical details of the <a href="page-navmodel.html">Ajax navigation model</a>.</p> 
 			
 			<h2>Scripts &amp; styles in the head</h2> 
 			
-			<p>When the user clicks a link in a jQuery Mobile-driven site, the default behavior of the navigation system is to use that link's href to formulate an Ajax request (instead of allowing the browser's default link behavior of requesting that href with full page load). When that Ajax request goes out, the framework will receive its entire text content, but it will only inject the <em>contents of the response's <code>body</code> element (or more specifically the <code>data-role="page"</code> element, if it's provided)</em>, meaning nothing in the <code>head</code> of the page will be used (with the exception of the page title, which is fetched specifically).</p>
+			<p>When the user clicks a link in a jQuery Mobile-driven site, the default behavior of the navigation system is to use that link's <code>href</code> to formulate an Ajax request (instead of allowing the browser's default link behavior of requesting that <code>href</code> with full page load). When that Ajax request goes out, the framework will receive its entire text content, but it will only inject the <em>contents of the response's <code>body</code> element (or more specifically the <code>data-role="page"</code> element, if it's provided)</em>, meaning nothing in the <code>head</code> of the page will be used (with the exception of the page title, which is fetched specifically).</p>
 			
 			<p> This means that any scripts and styles referenced the <code>head</code> of a page won't have any effect <em>when a page is loaded via Ajax</em>, but they <strong>will execute if the page is requested normally via HTTP</strong>. When scripting jQuery Mobile sites, both scenarios need to be considered. The reason that the <code>head</code> of a page is ignored when requested via Ajax is that the potential of re-executing the same JavaScript is very high (it's common to reference the same scripts in every page of a site). Due to the complexity of attempting to work around that issue, we leave the task of executing page-specific scripts to the developer, and assume <code>head</code> scripts are only expected to execute once per browsing session.</p>
 			
@@ -36,7 +36,7 @@
 			
 			<h2>pagecreate = DOM ready</h2> 
 
-			<p>One of the first things people learn in jQuery is to use the $(document).ready() function for executing DOM-specific code as soon as the DOM is ready (which often occurs long before the <code>onload</code> event). However, in jQuery Mobile site and apps, pages are requested and injected into the same DOM as the user navigates, so the DOM ready event is not as useful, as it only executes for the first page. To execute code whenever a new page is loaded and created in jQuery Mobile, you can bind to the <a href="../api/events.html"><code>pagecreate</code></a> event. </p>
+			<p>One of the first things people learn in jQuery is to use the <code>$(document).ready()</code> function for executing DOM-specific code as soon as the DOM is ready (which often occurs long before the <code>onload</code> event). However, in jQuery Mobile site and apps, pages are requested and injected into the same DOM as the user navigates, so the DOM ready event is not as useful, as it only executes for the first page. To execute code whenever a new page is loaded and created in jQuery Mobile, you can bind to the <a href="../api/events.html"><code>pagecreate</code></a> event. </p>
 			
 			<p>The <code>pagecreate</code> event is triggered on a page when it is initialized, right after initialization occurs. Most of jQuery Mobile's official widgets auto-initialize themselves based on this event, and you can set up your code to do the same.</p>
 <pre><code>
@@ -74,8 +74,8 @@ $.mobile.loadPage( "about/us.html" );
 </code></pre>
 
 			<h2>Enhancing new markup</h2> 
-			<p>The page plugin dispatches a &#8220;pagecreate&#8221; event, which most widgets use to auto-initialize themselves. As long as a widget plugin script is referenced, it will automatically enhance any instances of the widgets it finds on the page.</p>		
-			<p>However, if you generate new markup client-side or load in content via Ajax and inject it into a page, you can trigger the <code>create</code> event to handle the auto-initialization for all the plugins contained within the new markup. This can be triggered on any element (even the page div itself), saving you the task of manually initializing each plugin (listview button, select, etc.).</p> 
+			<p>The page plugin dispatches a <code>pagecreate</code> event, which most widgets use to auto-initialize themselves. As long as a widget plugin script is referenced, it will automatically enhance any instances of the widgets it finds on the page.</p>		
+			<p>However, if you generate new markup client-side or load in content via Ajax and inject it into a page, you can trigger the <code>create</code> event to handle the auto-initialization for all the plugins contained within the new markup. This can be triggered on any element (even the page <code>div</code> itself), saving you the task of manually initializing each plugin (listview button, select, etc.).</p> 
 			<p>For example, if a block of HTML markup (say a login form) was loaded in through Ajax, trigger the <code>create</code> event to automatically transform all the widgets it contains (<a href="http://jquerymobile.com/test/docs/forms/textinputs/index.html">inputs</a> and <a href="http://jquerymobile.com/test/docs/buttons/index.html">buttons</a> in this case) into the enhanced versions. The code for this scenario would be:</p> 
 <pre style="margin: 25px 0;"><code style="font-size: 12px;">$( ...new markup that contains widgets... ).appendTo( ".ui-page" ).trigger( "create" );
 </code></pre> 
@@ -125,10 +125,11 @@ $.mobile.silentScroll(300);
 								<li><a href="page-dialogs.html">Dialogs</a></li>
 								<li><a href="page-cache.html">Prefetching &amp; caching pages</a></li>
 								<li><a href="page-navmodel.html">Ajax, hashes &amp; history</a></li>
-								<li><a href="page-dynamic.html">Dynamically Injecting Pages</a></li>
+								<li><a href="page-dynamic.html">Dynamically injecting pages</a></li>
 								<li data-theme="a"><a href="page-scripting.html">Scripting pages</a></li>
+								<li><a href="phonegap.html">PhoneGap apps</a></li>
+								<li><a href="touchoverflow.html">touchOverflow feature</a></li>
 								<li><a href="pages-themes.html">Theming pages</a></li>
-
 							</ul>
 					</div>
 				</div>		
diff --git a/docs/pages/page-titles.html b/docs/pages/page-titles.html
index 93a56e93..4744729a 100644
--- a/docs/pages/page-titles.html
+++ b/docs/pages/page-titles.html
@@ -30,7 +30,7 @@
 		
 		<h2>Titles in multi-page templates</h2>
 		
-		<p>On multi-page documents, we follow a similiar convention, but since all the page share a common <code>title</code>, we have a <code>data-title</code> attribute that can be added to each page container within a multi-page template to manually define a title. The title of the HTML document will be automatically updated to match the <code>data-title</code> of the page currently in view.</p>
+		<p>On multi-page documents, we follow a similiar convention, but since all the pages share a common <code>title</code>, we have a <code>data-title</code> attribute that can be added to each page container within a multi-page template to manually define a title. The title of the HTML document will be automatically updated to match the <code>data-title</code> of the page currently in view.</p>
 		
 <pre><code>
 &lt;div data-role=&quot;page&quot; id=&quot;foo&quot; <strong>data-title=&quot;Page Foo&quot;</strong>&gt;
@@ -59,10 +59,11 @@
 								<li><a href="page-dialogs.html">Dialogs</a></li>
 								<li><a href="page-cache.html">Prefetching &amp; caching pages</a></li>
 								<li><a href="page-navmodel.html">Ajax, hashes &amp; history</a></li>
-								<li><a href="page-dynamic.html">Dynamically Injecting Pages</a></li>
+								<li><a href="page-dynamic.html">Dynamically injecting pages</a></li>
 								<li><a href="page-scripting.html">Scripting pages</a></li>
+								<li><a href="phonegap.html">PhoneGap apps</a></li>
+								<li><a href="touchoverflow.html">touchOverflow feature</a></li>
 								<li><a href="pages-themes.html">Theming pages</a></li>
-
 							</ul>
 					</div>
 				</div>		
diff --git a/docs/pages/page-transitions.html b/docs/pages/page-transitions.html
index ef34ce39..b4093d96 100755
--- a/docs/pages/page-transitions.html
+++ b/docs/pages/page-transitions.html
@@ -24,29 +24,230 @@
 		<div class="content-primary">		
 		<h2>Page transitions</h2> 
 
-		<p>The jQuery Mobile framework includes a set of six CSS-based transition effects that can be applied to any object or page change event, which apply the chosen transition when navigating to a new page and the reverse transition for the Back button. By default, the framework applies the right to left slide transition.</p>
+		<p>The jQuery Mobile framework includes a set of six CSS-based transition effects that can be applied to any page link or form submission with Ajax navigation: </p>
 
-		<p>To set a custom transition effect, add the <code>data-transition</code> attribute to the link. Possible values include: </p>
 
-<code><code>
-&lt;a href=&quot;index.html&quot; data-transition=&quot;pop&quot;&gt;I'll pop&lt;/a&gt;
-</code></code>
-
-		<p>
+<div class="ui-grid-a">
+	<div class="ui-block-a">
 		<a href="#dialog" data-role="button" data-rel="dialog" data-transition="slide">slide</a>
 		<a href="#dialog" data-role="button" data-rel="dialog" data-transition="slideup">slideup</a>
 		<a href="#dialog" data-role="button" data-rel="dialog" data-transition="slidedown">slidedown</a>
-		<a href="#dialog" data-role="button" data-rel="dialog" data-transition="pop">pop</a>
+	</div>
+	<div class="ui-block-b">
+	    <a href="#dialog" data-role="button" data-rel="dialog" data-transition="pop">pop</a>
 		<a href="#dialog" data-role="button" data-rel="dialog" data-transition="fade">fade</a>
-		<a href="#dialog" data-role="button" data-rel="dialog" data-transition="flip">flip *</a>
-		</p>
+		<a href="#dialog" data-role="button" data-rel="dialog" data-transition="flip">flip*</a>
+	</div>
+</div><!-- /grid-a -->
+
+<p><strong>Transitions from <a href="http://www.jqtouch.com/">jQtouch</a></strong> (<em>with small modifications</em>): Built by David Kaneda and maintained by Jonathan Stark.</p>
+
+<p>NOTE: The flip transition isn't rendered correctly on most versions of Android because it lacks 3D CSS transform capabilities. Unfortunately, instead of ignoring the flip, Android makes the page "cartwheel" away by rotating instead of flipping. We recommend using this transition sparingly until support improves.</p>
+
+
+	<h2>Setting a transition on a link or form submit</h2>
+	<p>By default, the framework applies the right to left <strong>slide</strong> transition. To set a custom transition effect, add the <code>data-transition</code> attribute to the link. </p>
+
+<code><code>
+&lt;a href=&quot;index.html&quot; <strong>data-transition=&quot;pop&quot;</strong>&gt;I'll pop&lt;/a&gt;
+</code></code>
 		
-        <p>NOTE: The flip transition isn't rendered correctly on most versions of Android because it lacks 3D CSS transform capabilities. Unfortunately, instead of ignoring the flip, Android makes the page "cartwheel" away by rotating instead of flipping. We recommend using this transition sparingly until support improves.</p>
-		<p>In addition, you can also force a "backwards" transition by specifying <code>data-direction="reverse"</code> on your link. Note: (this was formerly <code>data-back="true"</code>, which will remain supported until 1.0)</p>
+		<p>When the Back button is pressed, the framework will automatically apply the reverse version of the transition that was used to show the page. To specify that the reverse version of a transition should be used, add the <code>data-direction="reverse"</code> attribute to a link. Note: (this was formerly <code>data-back="true"</code>, which will remain supported until 1.0)</p>
 		
-		<div class="ui-body ui-body-e">
-			<p><strong>Transitions from <a href="http://www.jqtouch.com/">jQtouch</a></strong> (<em>with small modifications</em>): Built by David Kaneda and maintained by Jonathan Stark.</p>
-		</div>
+		<p>For smoother page transitions, consider enabling the <a href="touchoverflow.html">touchOverflow</a> feature.</p>
+		
+		<h2>Global configuration of transitions</h2>
+		
+		<p>Set the <code>defaultPageTransition</code> <a href="../api/globalconfig.html">global option</a> if you'd prefer a different default transition. Dialogs have a different option called <code>defaultDialogTransition</code> that can also set configured.</p>
+		
+
+
+
+		<h2>Creating custom CSS-based transitions</h2>
+
+
+		<p>To create a custom CSS transition, select a class name that corresponds to the name of your transition, for example "slide", and then define your "in" and "out" CSS rules to take advantage of transitions or animation keyframes:</p>
+
+		<pre><code>.slide.in {
+	    -webkit-transform: translateX(0);
+	    -webkit-animation-name: slideinfromright;
+	}
+
+	.slide.out {
+	    -webkit-transform: translateX(-100%);
+	    -webkit-animation-name: slideouttoleft;
+	}
+
+	@-webkit-keyframes slideinfromright {
+	    from { -webkit-transform: translateX(100%); }
+	    to { -webkit-transform: translateX(0); }
+	}
+	@-webkit-keyframes slideouttoleft {
+	    from { -webkit-transform: translateX(0); }
+	    to { -webkit-transform: translateX(-100%); }
+	}
+		</code></pre>
+
+		<p>During a CSS-based page transition, jQuery Mobile will place the class name of the transition on both the "from" and "to" pages involved in the transition. It then places an "out" class on the "from" page, and "in" class on the "to" page. The presence of these classes on the "from" and "to" page elements then triggers the animation CSS rules defined above.</p>
+
+		<p>If your transition supports a reverse direction, you need to create CSS rules that use the <code>reverse</code> class in addition to the transition class name and the "in" and "out" classes:</p>
+
+		<pre><code>.slide.in.reverse {
+		    -webkit-transform: translateX(0);
+		    -webkit-animation-name: slideinfromleft;
+		}
+
+		.slide.out.reverse {
+		    -webkit-transform: translateX(100%);
+		    -webkit-animation-name: slideouttoright;
+		}
+
+		@-webkit-keyframes slideinfromleft {
+		    from { -webkit-transform: translateX(-100%); }
+		    to { -webkit-transform: translateX(0); }
+		}
+
+		@-webkit-keyframes slideouttoright {
+		    from { -webkit-transform: translateX(0); }
+		    to { -webkit-transform: translateX(100%); }
+		}
+		</code></pre>
+
+		<p>After the CSS rules are in place, you simply specify the name of your transition within the @data-transition attribute of a navigation link:</p>
+
+		<pre><code>&lt;a href="#page2" data-transition="slide"&gt;Page 2&lt;/a&gt;
+		</code></pre>
+
+		<p>When the user clicks on the navigation link, jQuery Mobile will invoke your transition when it navigates to the page mentioned within the link.</p>
+
+		<p>In case you were wondering why none of the CSS rules above specified any easing or duration, it's because the CSS for jQuery Mobile defines the default easing and duration in the following rules:</p>
+
+		<pre><code>
+.in, .out {
+    -webkit-animation-timing-function: ease-in-out;
+    -webkit-animation-duration: 350ms;
+}
+		</code></pre>
+
+		<p>If you need to specify a different easing or duration, simply add the appropriate CSS3 property to your custom page transition rules.</p>
+
+		<h2>Creating custom JavaScript-based transitions</h2>
+
+		<p>When a user clicks on a link within a page, jQuery Mobile checks if the link specifies a <code>@data-transition</code> attribute. The value of this attribute is the name of the transition to use when displaying the page referred to by the link. If there is no <code>@data-transition</code> attribute, the transition name specified by the configuration option <code>$.mobile.defaultPageTransition</code> is used for pages, and <code>$.mobile.defaultDialogTransition</code> is used for dialogs.</p>
+
+		<p>After the new page is loaded, the <code>$.mobile.transitionHandlers</code> dictionary is used to see if any transition handler function is registered for the given transition name. If a handler is found, that handler is invoked to start and manage the transition. If no handler is found the handler specified by the configuration option <code>$.mobile.defaultTransitionHandler</code> is invoked.</p>
+
+		<p>By default, the <code>$.mobile.transitionHandlers</code> dictionary is only populated with a single handler entry called "none". This handler simply removes the <code>"ui-page-active"</code> class from the page we are transitioning "from", and places it on the page we are transitioning "to". The transition is instantaneous; no animation, no fanfare.</p>
+
+		<p>The <code>$.defaultTransitionHandler</code> points to a handler function that assumes the name is a CSS class name, and implements the "Pure CSS3 Based Transitions" section above.</p>
+
+		<p>Both the "none" and "css3" transition handlers are available off of the $.mobile namespace:</p>
+
+		<pre><code>
+$.mobile.noneTransitionHandler
+$.mobile.css3TransitionHandler
+		</code></pre>
+
+		<h3>Transition Handlers</h3>
+
+		<p>A transition handler is a function with the following call signature:</p>
+
+		<pre><code>function myTransitionHandler(name, reverse, $to, $from)
+{
+    var deferred = new $.Deferred();
+
+    // Perform any actions or set-up necessary to kick-off
+    // your transition here. The only requirement is that
+    // whenever the transition completes, your code calls
+    // deferred.resolve(name, reverse, $to, $from).
+
+    // Return a promise.
+    return deferred.promise();
+}
+		</code></pre>
+
+		<p>Your handler must create a Deferred object and return a promise to the caller. The promise is used to communicate to the caller when your transition is actually complete. It is up to you to call <code>deferred.resolve()</code> at the correct time. If you are new to Deferred objects, you can find documentation <a href="http://api.jquery.com/category/deferred-object/" rel="nofollow">here</a>.</p>
+
+		<h3>Registering and Invoking Your Transition Handler</h3>
+
+		<p>Once you have created a transition handler function, you need to tell jQuery Mobile about it. To do this, simply add your handler to the <code>$.mobile.transitionHandlers</code> dictionary. Remember, the key used should be the name of your transition. This name is also the same name that will be used within the <code>@data-transition</code> attribute of any navigation links.</p>
+
+		<pre><code>// Define your transition handler:
+
+function myTransitionHandler(name, reverse, $to, $from)
+{
+    var deferred = new $.Deferred();
+
+    // Perform any actions or set-up necessary to kick-off
+    // your transition here. The only requirement is that
+    // whenever the transition completes, your code calls
+    // deferred.resolve(name, reverse, $to, $from).
+
+    // Return a promise.
+    return deferred.promise();
+}
+
+// Register it with jQuery Mobile:
+
+$.mobile.transitionHandlers["myTransition"] = myTransitionHandler;
+		</code></pre>
+
+		<p>Once you've registered your handler, you can invoke your transition by placing a <code>data-transition</code> attribute on a link:</p>
+
+		<pre><code>&lt;a href="#page2" data-transition="myTransition"&gt;Page 2&lt;/a&gt;
+		</code></pre>
+
+		<p>When the user clicks the link above, your transition handler will be invoked after the page is loaded and it is ready to be shown.</p>
+
+		<h3>Overriding a CSS Transition With Your Own Handler</h3>
+
+		<p>As previously mentioned the default transition handler assumes that any transition name other than "none" is a CSS class to be placed on the "from" and "to" elements to kick off a CSS3 animation. If you would like to override one of these built-in CSS transitions, you simply register your own handler with the same name as the CSS page transition you want to override. So for example, if I wanted to override the built-in "slide" CSS transition with my own JavaScript based transition, I would simply do the following:</p>
+
+		<pre><code>// Define your transition handler:
+
+function myTransitionHandler(name, reverse, $to, $from)
+{
+    var deferred = new $.Deferred();
+
+    // Perform any actions or set-up necessary to kick-off
+    // your transition here. The only requirement is that
+    // whenever the transition completes, your code calls
+    // deferred.resolve(name, reverse, $to, $from).
+
+    // Return a promise.
+    return deferred.promise();
+}
+
+// Register it with jQuery Mobile:
+
+$.mobile.transitionHandlers["slide"] = myTransitionHandler;
+		</code></pre>
+
+		<p>Once you do this, anytime the "slide" transition is invoked, your handler, instead of the default one, will be called to perform the transition.</p>
+
+		<h3>Overriding the Default Transition Handler</h3>
+
+		<p>The <code>$.mobile.css3TransitionHandler</code> function is the default transition handler that gets invoked when a transition name is used and not found in the <code>$.mobile.transitionHandlers</code> dictionary. If you want to install your own custom default handler, you simply set the <code>$.mobile.defaultTransitionHandler</code> to your handler:</p>
+
+		<pre><code>// Define your default transition handler:
+
+function myTransitionHandler(name, reverse, $to, $from)
+{
+    var deferred = new $.Deferred();
+
+    // Perform any actions or set-up necessary to kick-off
+    // your transition here. The only requirement is that
+    // whenever the transition completes, your code calls
+    // deferred.resolve(name, reverse, $to, $from).
+
+    // Return a promise.
+    return deferred.promise();
+}
+
+$.mobile.defaultTransitionHandler = myTransitionHandler;
+		</code></pre>
+
+		<p>Once you do this, your handler will be invoked any time a transition name is used but not found within the <code>$.mobile.transitionHandlers</code> dictionary.</p>
 			
 
 				</div><!--/content-primary -->		
@@ -58,7 +259,6 @@
 							<h3>More in this section</h3>
 
 							<ul data-role="listview" data-theme="c" data-dividertheme="d">
-
 								<li data-role="list-divider">Pages &amp; Dialogs</li>
 								<li><a href="page-anatomy.html">Anatomy of a page</a></li>
 								<li><a href="page-template.html" data-ajax="false">Single page template</a></li>
@@ -69,10 +269,11 @@
 								<li><a href="page-dialogs.html">Dialogs</a></li>
 								<li><a href="page-cache.html">Prefetching &amp; caching pages</a></li>
 								<li><a href="page-navmodel.html">Ajax, hashes &amp; history</a></li>
-								<li><a href="page-dynamic.html">Dynamically Injecting Pages</a></li>
+								<li><a href="page-dynamic.html">Dynamically injecting pages</a></li>
 								<li><a href="page-scripting.html">Scripting pages</a></li>
+								<li><a href="phonegap.html">PhoneGap apps</a></li>
+								<li><a href="touchoverflow.html">touchOverflow feature</a></li>
 								<li><a href="pages-themes.html">Theming pages</a></li>
-
 							</ul>
 					</div>
 				</div>		
diff --git a/docs/pages/pages-themes.html b/docs/pages/pages-themes.html
index 5ef7b19c..5008a450 100755
--- a/docs/pages/pages-themes.html
+++ b/docs/pages/pages-themes.html
@@ -205,10 +205,11 @@
 								<li><a href="page-dialogs.html">Dialogs</a></li>
 								<li><a href="page-cache.html">Prefetching &amp; caching pages</a></li>
 								<li><a href="page-navmodel.html">Ajax, hashes &amp; history</a></li>
-								<li><a href="page-dynamic.html">Dynamically Injecting Pages</a></li>
+								<li><a href="page-dynamic.html">Dynamically injecting pages</a></li>
 								<li><a href="page-scripting.html">Scripting pages</a></li>
+								<li><a href="phonegap.html">PhoneGap apps</a></li>
+								<li><a href="touchoverflow.html">touchOverflow feature</a></li>
 								<li data-theme="a"><a href="pages-themes.html">Theming pages</a></li>
-
 							</ul>
 					</div>
 				</div>		
diff --git a/docs/pages/phonegap.html b/docs/pages/phonegap.html
new file mode 100644
index 00000000..836f3e51
--- /dev/null
+++ b/docs/pages/phonegap.html
@@ -0,0 +1,109 @@
+<!DOCTYPE html>
+<html>
+	<head>
+	<meta charset="utf-8">
+	<meta name="viewport" content="width=device-width, initial-scale=1">
+	<title>jQuery Mobile Docs - Phonegap</title>
+	<link rel="stylesheet"  href="../../css/themes/default/" />
+	<link rel="stylesheet" href="../_assets/css/jqm-docs.css"/>
+	<script src="../../js/jquery.js"></script>
+	<script src="../../experiments/themeswitcher/jquery.mobile.themeswitcher.js"></script>
+	<script src="../_assets/js/jqm-docs.js"></script>
+	<script src="../../js/"></script>
+</head>
+<body>
+
+	<div data-role="page" class="type-interior">
+
+		<div data-role="header" data-theme="f">
+		<h1>Dynamically Injecting Pages</h1>
+		<a href="../../" data-icon="home" data-iconpos="notext" data-direction="reverse" class="ui-btn-right jqm-home">Home</a>
+	</div><!-- /header -->
+
+	<div data-role="content">
+		<div class="content-primary">
+			
+		
+			<h2>Building PhoneGap apps with jQuery Mobile</h2>
+			
+			<p><a href="http://phonegap.com/" rel="external">PhoneGap</a> is an HTML5 app platform that allows developers to author native applications with web technologies and get access to APIs and app stores. Applications are built as normal HTML pages and packaged up to run as a native application within a Web View (a chrome-less browser). PhoneGap commonly used in conjunction with to jQuery Mobile so we wanted to offer a few things to keep in mind to avoid common issues. </p>
+
+			<p>First, your initial application document is loaded by the PhoneGap application by a file:// URL. This means that if you want to pull in pages from your company's remote server (phone home) you will have to refer to them with absolute URLs to your server. Because your document originates from a file:// URL, loading pages or assets from your remote server is considered a cross-domain request. </p>
+			
+			<p>Your ability to access cross-domain pages from within a Phone Gap jQuery Mobile application is controlled by 2 key things: <code>$.support.cors</code> and <code>$.mobile.allowCrossDomainPages</code>, and can also be influenced by the white list fueature in later builds of PhoneGap.</p>
+
+			<h2>$.support.cors</h2>
+
+			<p>In jQuery core, there is a <a href="http://api.jquery.com/jQuery.support/" rel="external">$.support.cors</a> boolean that indicates whether or not jQuery thinks the browser supports the W3C "<a hre="http://www.w3.org/TR/cors/" rel="external">Cross-Origin Resource Sharing</a>" feature to support cross-domain requests.</p>
+
+			<p>Since jQuery Mobile relies on jQuery core's $.ajax() functionality, <code>$.support.cors</code> must be set to <code>true</code> to tell <code>$.ajax</code> to load cross-domain pages. We've heard reports that Web Views on some platforms, like BlackBerry, support cross-domain loading, but that jQuery core incorrectly sets <code>$.support.cors</code> value to <code>false</code> which disables cross-domain $.ajax() requests and will cause the page or assets to fail to load. </p>
+
+			<h2>$.mobile.allowCrossDomainPages</h2>
+
+			<p>When jQuery Mobile attempts to load an external page, the request runs through <code>$.mobile.loadPage()</code>. This will only allow cross-domain requests if the <code>$.mobile.allowCrossDomainPages</code> configuration option is set to <code>true</code>. Because the jQuery Mobile framework tracks what page is being viewed within the browser's location hash, it is possible for an XSS attack to occur if the XSS code in question can manipulate the hash and set it to a cross-domain URL of it's choice. This is the main reason that the default setting for <code>$.mobile.allowCrossDomainPages</code> is set to <code>false</code>.</p>
+
+			<p>So PhoneGap apps that must "phone home" by loading assets off a remote server, both the <code>$.support.cors</code> AND <code>$.mobile.allowCrossDomainPages</code> must be set to <code>true</code>.  The  <code>$.mobile.allowCrossDomainPages</code> option must set before any cross-domain request is made so we recommend wrapping this in a <code>mobileinit</code> handler:</p>
+
+<pre><code>$( document ).bind( "mobileinit", function() {
+    // Make your jQuery Mobile framework configuration changes here!
+
+    $.mobile.allowCrossDomainPages = true;
+});</code></pre>
+
+			<h2>PhoneGap White Listing</h2>
+
+			<p>PhoneGap 1.0 introduced the idea of white-listing servers that it's internal WebView is allowed to make cross-domain requests to. You can find info about it here on the <a href="http://wiki.phonegap.com/w/page/40796976/Install%20the%20latest%20%28trunk%29%20source%20of%20iOS%20PhoneGap">PhoneGap wiki</a>:</p>
+
+			<p>However, not all platforms support this whitelisting feature so check the PhoneGap documentation for details. Older versions of PhoneGap prior to 1.0 defaulted to allowing cross-domain requests to any server.</p>
+
+			<h2>Still having issues?</h2>
+
+			<p>Here are a few more tips that aren't specifically related to PhoneGap but are good to know:</p>
+
+			<p><strong>We recommend disabling the <a href="../api/globalconfig.html">pushState feature</a> for installed apps </strong>because there are edge cases where this feature can cause unexpected navigation behavior and since URLs aren't visible in a WebView, it's not worth keeping this active in these situations. </p>
+
+			<p><strong>Android enforces a timeout when loading URLs in a webview</strong> which may be too short for your needs. You can change this timeout by editing a Java class generated by the Eclipse plugin for Android:</p>
+
+			<code>super.setIntegerProperty("loadUrlTimeoutValue", 60000);</code>
+			
+			
+			
+      </div>
+		<!--/content-primary -->
+
+				<div class="content-secondary">
+
+					<div data-role="collapsible" data-collapsed="true" data-theme="b" data-content-theme="d">
+
+							<h3>More in this section</h3>
+
+							<ul data-role="listview" data-theme="c" data-dividertheme="d">
+								<li data-role="list-divider">Pages &amp; Dialogs</li>
+								<li><a href="page-anatomy.html">Anatomy of a page</a></li>
+								<li><a href="page-template.html" data-ajax="false">Single page template</a></li>
+								<li><a href="multipage-template.html" data-ajax="false">Multi-page template</a></li>
+								<li><a href="page-titles.html">Page titles</a></li>
+								<li><a href="page-links.html">Linking pages</a></li>
+								<li><a href="page-transitions.html" data-ajax="false">Page transitions</a></li>
+								<li><a href="page-dialogs.html">Dialogs</a></li>
+								<li><a href="page-cache.html">Prefetching &amp; caching pages</a></li>
+								<li><a href="page-navmodel.html">Ajax, hashes &amp; history</a></li>
+								<li><a href="page-dynamic.html">Dynamically injecting pages</a></li>
+								<li><a href="page-scripting.html">Scripting pages</a></li>
+								<li data-theme="a"><a href="phonegap.html">PhoneGap apps</a></li>
+								<li><a href="touchoverflow.html">touchOverflow feature</a></li>
+								<li><a href="pages-themes.html">Theming pages</a></li>
+							</ul>
+					</div>
+				</div>
+
+			</div><!-- /content -->
+
+			<div data-role="footer" class="footer-docs" data-theme="c">
+					<p>&copy; 2011 The jQuery Project</p>
+			</div>
+
+			</div><!-- /page -->
+
+			</body>
+			</html>
diff --git a/docs/pages/touchoverflow.html b/docs/pages/touchoverflow.html
new file mode 100644
index 00000000..cf396c3a
--- /dev/null
+++ b/docs/pages/touchoverflow.html
@@ -0,0 +1,104 @@
+<!DOCTYPE html> 
+<html> 
+	<head>
+	<meta charset="utf-8">
+	<meta name="viewport" content="width=device-width, initial-scale=1"> 
+	<title>jQuery Mobile Docs - touchOverflow</title> 
+	<link rel="stylesheet"  href="../../css/themes/default/" />  
+	<link rel="stylesheet" href="../_assets/css/jqm-docs.css"/>
+	<script src="../../js/jquery.js"></script>
+	<script src="../../experiments/themeswitcher/jquery.mobile.themeswitcher.js"></script>
+	<script src="../_assets/js/jqm-docs.js"></script>
+	<script src="../../js/"></script>
+</head> 
+<body> 
+
+	<div data-role="page" class="type-interior">
+
+		<div data-role="header" data-theme="f">
+		<h1>touchOverflow</h1>
+		<a href="../../" data-icon="home" data-iconpos="notext" data-direction="reverse" class="ui-btn-right jqm-home">Home</a>
+	</div><!-- /header -->
+
+	<div data-role="content">
+		<div class="content-primary">		
+			
+			<h2 id="ios5">touchOverflow: Dramatically improved page transitions and true fixed toolbars</h2>
+			
+			<p>Currently, both the page you're viewing and the one you're navigating to are both sitting next to each other in the viewport which lets us leverage native scrolling for the broadest possible device support. The downside to this approach is that since both pages share the same viewport, when a page transition stars, we must first scroll to the top of the document, then start animating to ensure that the pages are lined up vertically. If you hit the Back button, we need to scroll up, transition, then restore the previous scroll position. Since mobile browsers are pretty slow, these scroll movements can detract from the flow of the experience.</p>
+			
+			<p>The way to really improve this situation is to have both pages in separate containers, each with it's own internal scroll bar. The means no more scrolling the document or needing to restore scroll positions for a smoother experience. It also has the benefit of making fixed toolbars very easy to implement by simply placing them outside the containers with internal scrolling.<p>
+			
+			<h2>How it works</h2>
+			
+			<p>To leverage iOS5&#8242;s support for a touch-targeted version of <code>overflow:auto</code> which allows for internal scrolling regions with the native momentum scrolling, we've added an feature called touchOverflow that leverages these new CSS capabilities to  enable us to bring both true &#8220;fixed&#8221; toolbars and super smooth transitions in iOS5, all by using web standards and very little additional code.</p>				
+				
+			<p>A feature called <code>touchOverflowEnabled</code> is designed to leverage the upcoming wave of browsers that support overflow scrolling in CSS. Note that this feature is off by default to give us more time to test and debug this for best performance but we hope to turn it on by default at a later point. Here's to to enable this <a href="../api/globalconfig.html">global option</a>:</p>
+			
+<pre><code>&lt;script&gt;
+$(document).bind(&quot;mobileinit&quot;, function(){
+<strong>  $.mobile.touchOverflowEnabled = true;
+</strong>});
+&lt;/script&gt;</code></pre>
+			
+			<p>When this feature is activated, the framework looks for browser support for both the <code>overflow:</code> and <code>-webkit-overflow-scrolling:touch</code> CSS properties. In browsers that support both, it switches to a dual page container model with native overflow: scrolling within each which brings true fixed toolbars smooth transitions. Coupled with iOS&#8217;s already-excellent hardware-accelerated transitions, it's now possible to build interfaces that are very close to native performance.</p>
+			
+			<p>To demo this feature, check out <a href="../config/touchOverflow.html">this page</a> in iOS5</p>
+
+			<h2>A few downsides</h2>
+			
+			<p>Nothing is perfect, especially a new feature so there are a few downsides to keep in mind. </p>
+				
+			<ul>
+				<li>Sometimes child elements like lists and forms wouldn't render when embedded in a page with <code>overflow:</code> in iOS5. This was a pretty random phenomenon but is not acceptable so we've added a translate-z CSS property which forces iOS to render the contents. The downside with this fix is that when a transform is applied, all elements are set to position:relative which can cause issues in your layout.</li>
+				<li>The <code>-webkit-overflow-scrolling:touch</code> property seems to disable the events to scroll you to the top of the page when the time is tapped in the status bar. We hope Apple fixes this because it's a very useful feature.</li>
+			</ul>	
+			
+			
+			
+			<h2>Don&#8217;t other mobile platforms already support overflow?</h2>
+			<p>Yes, but there&#8217;s a catch. Both Android Honeycomb and the Blackberry PlayBook support <code>overflow:</code> properties, but we found in testing that their implementation of overflow was't smooth enough so pages would stutter and hang during scrolling, leading to an unusable experience. We're working with device makers to ensure that they are included when performance improves.</p>
+			<p>More importantly, targeting overflow correctly is a major issue. If we simply placed an <code>overflow: auto</code> CSS rule on the pages, other popular mobile platforms like older versions of Android and iOS would essentially just clip off the content and make it effectively inaccessible (yes, you can can do a two-finger scroll gesture in iOS but nobody knows that). The smart thing about Apple&#8217;s implementation for iOS5 is that they added an additional CSS property <code>-webkit-overflow-scrolling:touch</code> that allows us to test for this touch scrolling property and, if supported, add in the <code>overflow</code> rules for just those browsers. This is the only safe way to target overflow without resorting to complex and unmaintainable user agent detection.</p>
+			<p>We will be working with device and browser makers to encourage support for <em>both</em> these CSS-based properties because we strongly believe that this a critical piece needed to build rich mobile web apps. The project will add any vendor-prefixed additions to touch scrolling property if, for example, Opera, Firefox or Microsoft added this support. Once people see how much better page transitions and fixed toolbars are on iOS5, we&#8217;re hoping this will be supported quickly by other browsers. JS-based scroller scripts may still have a place in this new world as a polyfill for browsers that don&#8217;t yet support these new CSS capabilities but we see this as a brief, interim tool in the evolution of the mobile web.</p>
+			
+
+
+		</div><!--/content-primary -->		
+
+		<div class="content-secondary">
+
+					<div data-role="collapsible" data-collapsed="true" data-theme="b" data-content-theme="d">
+
+							<h3>More in this section</h3>
+
+							<ul data-role="listview" data-theme="c" data-dividertheme="d">
+
+								<li data-role="list-divider">Pages &amp; Dialogs</li>
+								<li><a href="page-anatomy.html">Anatomy of a page</a></li>
+								<li><a href="page-template.html" data-ajax="false">Single page template</a></li>
+								<li><a href="multipage-template.html" data-ajax="false">Multi-page template</a></li>
+								<li><a href="page-titles.html">Page titles</a></li>
+								<li><a href="page-links.html">Linking pages</a></li>
+								<li><a href="page-transitions.html" data-ajax="false">Page transitions</a></li>
+								<li><a href="page-dialogs.html">Dialogs</a></li>
+								<li><a href="page-cache.html">Prefetching &amp; caching pages</a></li>
+								<li><a href="page-navmodel.html">Ajax, hashes &amp; history</a></li>
+								<li><a href="page-dynamic.html">Dynamically injecting pages</a></li>
+								<li><a href="page-scripting.html">Scripting pages</a></li>
+								<li><a href="phonegap.html">PhoneGap apps</a></li>
+								<li data-theme="a"><a href="touchoverflow.html">touchOverflow feature</a></li>
+								<li><a href="pages-themes.html">Theming pages</a></li>
+							</ul>
+					</div>
+				</div>		
+
+			</div><!-- /content -->
+
+			<div data-role="footer" class="footer-docs" data-theme="c">
+					<p>&copy; 2011 The jQuery Project</p>
+			</div>
+
+			</div><!-- /page -->
+
+			</body>
+			</html>
diff --git a/docs/toolbars/bars-fixed.html b/docs/toolbars/bars-fixed.html
index 4c8094fa..0a7b4cad 100755
--- a/docs/toolbars/bars-fixed.html
+++ b/docs/toolbars/bars-fixed.html
@@ -40,16 +40,16 @@
 		<h2>Updating toolbar positioning</h2>
 		<p>If the height of the page changes, either through dynamic injection of markup, or by widgets that hide or collapse content, it can throw off the dynamic positioning of the toolbars. To manually tell the toolbars to re-position themselves then fade in, use <code>$.mobile.fixedToolbars.show();</code>. To have them appear immediately without the fade, use <code>$.mobile.fixedToolbars.show(true);</code>.</p>
 			 
-		<p>There is also a <code>updatelayout</code> event that can be used to trigger the toolbars to re-position. Developers who are building dynamic applications that inject content into the current page can also manually trigger this <code><a href="../api/events.html">updatelayout</a></code> event to ensure components on the page update in response to the new content that was just added. This event is used internally in the collapsible and listview filter plugins and is powerful because it's not toolbar-specific -- any widget can be built to listen for the <code>updatelayout</code> event to update the widget in response.</p>
+		<p>There is also an <code>updatelayout</code> event that can be used to trigger the toolbars to re-position. Developers who are building dynamic applications that inject content into the current page can also manually trigger this <code><a href="../api/events.html">updatelayout</a></code> event to ensure components on the page update in response to the new content that was just added. This event is used internally in the collapsible and listview filter plugins and is powerful because it's not toolbar-specific -- any widget can be built to listen for the <code>updatelayout</code> event to update the widget in response.</p>
 		
 		
 		<h2>Known limitations</h2>
 		
-		<p>jQuery Mobile uses dynamically re-positioned toolbars for the fixed header effect because very few mobile browsers support the position:fixed CSS property. Although our fixed toolbar feature works fairly well, there are a number of technical limitations that can cause the toolbars to appear to scroll with the page. Most of these rendering issues are due to the fact many mobile platforms (iOS, Android, etc.) essentially take a static screenshot of the page and display this image during scrolling instead of the actual rendered HTML. This improves scrolling performance, but when scrolling happens quickly, the toolbars will be "burned" into the page screenshot before our script can hide them so they appear to scroll with the page. We have optimized this as much as we possibly can, but there are going to be situations where fixed toolbars won't work perfectly due to browser limitations so this si important to note when considering whether to use this feature.</p>
+		<p>jQuery Mobile uses dynamically re-positioned toolbars for the fixed header effect because very few mobile browsers support the <code>position:fixed</code> CSS property. Although our fixed toolbar feature works fairly well, there are a number of technical limitations that can cause the toolbars to appear to scroll with the page. Most of these rendering issues are due to the fact many mobile platforms (iOS, Android, etc.) essentially take a static screenshot of the page and display this image during scrolling instead of the actual rendered HTML. This improves scrolling performance, but when scrolling happens quickly, the toolbars will be "burned" into the page screenshot before our script can hide them so they appear to scroll with the page. We have optimized this as much as we possibly can, but there are going to be situations where fixed toolbars won't work perfectly due to browser limitations, so this is important to note when considering whether to use this feature.</p>
 		
 		<h2>True fixed toolbars: touchOverflowEnabled</h2>
 		
-		<p>In order to achieve true fixed toolbars, a browser needs to either support position:fixed or overflow:auto. Fortunately, this support is coming to mobile platforms so we can achieve, this with web standards. In jQuery Mobile, we have added a global feature called <code>touchOverflowEnabled</code> that leverages the overflow:auto CSS property on supported platforms like iOS5. When enabled, the framework wraps each page in a container with it's own internal scrolling. This allows up to position the toolbars outside the scrolling body so they truly stay fixed in place at all times. Learn more about this feature on the <a href="../api/globalconfig.html">global options</a> page or <a href="../config/touchOverflow.html">demo</a> this feature (currently iOS5 only, other browsers will fall back to dynamically re-positioned fixed toolbars).</p>
+		<p>In order to achieve true fixed toolbars, a browser needs to either support <code>position:fixed</code> or <code>overflow:auto</code>. Fortunately, this support is coming to mobile platforms so we can achieve this with web standards. In jQuery Mobile, we have added a global feature called <code>touchOverflowEnabled</code> that leverages the <code>overflow:auto</code> CSS property on supported platforms like iOS5. When enabled, the framework wraps each page in a container with it's own internal scrolling. This allows us to position the toolbars outside the scrolling body so they truly stay fixed in place at all times. Learn more about this feature on the <a href="../api/globalconfig.html">global options</a> page or <a href="../config/touchOverflow.html">demo</a> this feature (currently iOS5 only, other browsers will fall back to dynamically re-positioned fixed toolbars).</p>
 
 		<hr>
 	
@@ -148,7 +148,7 @@
 								<li><a href="docs-navbar.html">Navbars</a></li>
 								<li data-theme="a"><a href="bars-fixed.html">Fixed positioning</a></li>
 								<li><a href="bars-fullscreen.html">Fullscreen positioning</a></li>
-								<li><a href="footer-persist-a.html">Persistent footer nav bar</a></li>
+								<li><a href="footer-persist-a.html">Persistent footer navbar</a></li>
 								<li><a href="bars-themes.html">Theming toolbars</a></li>
 
 							</ul>
diff --git a/docs/toolbars/bars-fullscreen.html b/docs/toolbars/bars-fullscreen.html
index b032d947..305b221c 100755
--- a/docs/toolbars/bars-fullscreen.html
+++ b/docs/toolbars/bars-fullscreen.html
@@ -26,7 +26,7 @@
 	
 		<p class="ui-body">This page demonstrates the "fullscreen" toolbar mode. This toolbar treatment is used in special cases where you want the content to fill the whole screen, and you want the header and footer toolbars to appear and disappear when the page is clicked responsively &mdash; a common scenario for photo, image or video viewers.</p>
 		
-		<p class="ui-body">To enable this toolbar feature type, you apply a <code>data-fullscreen="true"</code> attribute to the <code>div</code> contain that has the attribute <code> data-role="page"</code>, and the <code>data-position="fixed"</code> attribute to both the header and footer <code>div</code> elements. </p>
+		<p class="ui-body">To enable this toolbar feature type, you apply a <code>data-fullscreen="true"</code> attribute to the <code>div</code> container that has the attribute <code>data-role="page"</code>, and the <code>data-position="fixed"</code> attribute to both the header and footer <code>div</code> elements. </p>
 		
 		<p class="ui-body">Keep in mind that the toolbars in this mode will sit <strong>over</strong> page content, so not all content will be accessible with the toolbars open, just as shown in this demo.</p>
 			       
@@ -48,7 +48,7 @@
 								<li><a href="docs-navbar.html">Navbars</a></li>
 								<li><a href="bars-fixed.html">Fixed positioning</a></li>
 								<li data-theme="a"><a href="bars-fullscreen.html">Fullscreen positioning</a></li>
-								<li><a href="footer-persist-a.html">Persistent footer nav bar</a></li>
+								<li><a href="footer-persist-a.html">Persistent footer navbar</a></li>
 								<li><a href="bars-themes.html">Theming toolbars</a></li>
 
 							</ul>
diff --git a/docs/toolbars/bars-themes.html b/docs/toolbars/bars-themes.html
index cdedf9db..3c667114 100644
--- a/docs/toolbars/bars-themes.html
+++ b/docs/toolbars/bars-themes.html
@@ -100,7 +100,7 @@
 		</div>
 
     <h3>Footers</h3>
-	<p>These are examples of a footer with link buttons inside. Note that footers do not have the same prescriptive markup contentions as headers with button slots so use layout <a href="../content/content-grids.html">grids</a> or custom styles to achieve the design you want.</p>
+	<p>These are examples of a footer with link buttons inside. Note that footers do not have the same prescriptive markup contentions as headers with button slots so use <a href="../content/content-grids.html">layout grids</a> or custom styles to achieve the design you want.</p>
 	
 
 	
@@ -157,7 +157,7 @@
 								<li><a href="docs-navbar.html">Navbars</a></li>
 								<li><a href="bars-fixed.html">Fixed positioning</a></li>
 								<li><a href="bars-fullscreen.html">Fullscreen positioning</a></li>
-								<li><a href="footer-persist-a.html">Persistent footer nav bar</a></li>
+								<li><a href="footer-persist-a.html">Persistent footer navbar</a></li>
 								<li data-theme="a"><a href="bars-themes.html">Theming toolbars</a></li>
 
 							</ul>
diff --git a/docs/toolbars/docs-bars.html b/docs/toolbars/docs-bars.html
index e318ac87..63c8bcd7 100755
--- a/docs/toolbars/docs-bars.html
+++ b/docs/toolbars/docs-bars.html
@@ -31,7 +31,7 @@
 	<li>The <a href="docs-footers.html"><strong>Footer bar</strong></a> is usually the last element inside each mobile page, and tends to be more freeform than the header in terms of content and functionality, but typically contains a combination of text and buttons.</li> 
 </ul>	
 
-	<p>It's very common to have a horizontal navigation or tab bar inside the header an/or footer; jQuery Mobile includes a <a href="docs-navbar.html"><strong>nav bar widget </strong></a> that turns an unordered list of links into a horizontal button bar, which works well in these instances.</p>
+	<p>It's very common to have a horizontal navigation or tab bar inside the header and/or footer; jQuery Mobile includes a <a href="docs-navbar.html"><strong>navbar widget </strong></a> that turns an unordered list of links into a horizontal button bar, which works well in these instances.</p>
 
 			
 			<h2>Toolbar positioning options</h2>
@@ -42,7 +42,7 @@
 			<p> At any time, tapping the screen will toggle the visibility of the fixed toolbars: tapping the page when the toolbars aren't visible brings them into view, tapping again hides them until you tap again. This gives users the option to hide the toolbars until needed to maximize screen real estate. </p>
 			<p>To set this behavior on a header or footer, add the <code> data-position="fixed"</code> attribute to the toolbar container.</p>
 									
-			<p>A <a href="bars-fullscreen.html"><strong>"fullscreen" position mode</strong></a> works just like the fixed mode except that the toolbars aren't shown at the top and bottom of the page and only appear when the page is clicked. This is useful for immersive apps like photo or video viewers where you want the content to full when whole screen and toolbars can be summoned to appear by tapping the screen. Keep in mind that the toolbars in this mode will sit <strong>over</strong> page content so this is best used for specific situations.</p>
+			<p>A <a href="bars-fullscreen.html"><strong>"fullscreen" position mode</strong></a> works just like the fixed mode except that the toolbars aren't shown at the top and bottom of the page and only appear when the page is clicked. This is useful for immersive apps like photo or video viewers where you want the content to fill the whole screen and toolbars can be summoned to appear by tapping the screen. Keep in mind that the toolbars in this mode will sit <strong>over</strong> page content so this is best used for specific situations.</p>
 
 				
 
@@ -63,7 +63,7 @@
 								<li><a href="docs-navbar.html">Navbars</a></li>
 								<li><a href="bars-fixed.html">Fixed positioning</a></li>
 								<li><a href="bars-fullscreen.html">Fullscreen positioning</a></li>
-								<li><a href="footer-persist-a.html">Persistent footer nav bar</a></li>
+								<li><a href="footer-persist-a.html">Persistent footer navbar</a></li>
 								<li><a href="bars-themes.html">Theming toolbars</a></li>
 
 							</ul>
diff --git a/docs/toolbars/docs-footers.html b/docs/toolbars/docs-footers.html
index 6e413f4c..4ad8be74 100755
--- a/docs/toolbars/docs-footers.html
+++ b/docs/toolbars/docs-footers.html
@@ -134,7 +134,7 @@
 										<li><a href="docs-navbar.html">Navbars</a></li>
 										<li><a href="bars-fixed.html">Fixed positioning</a></li>
 										<li><a href="bars-fullscreen.html">Fullscreen positioning</a></li>
-										<li><a href="footer-persist-a.html">Persistent footer nav bar</a></li>
+										<li><a href="footer-persist-a.html">Persistent footer navbar</a></li>
 										<li><a href="bars-themes.html">Theming toolbars</a></li>
 
 									</ul>
diff --git a/docs/toolbars/docs-headers.html b/docs/toolbars/docs-headers.html
index b20eebb3..c9ef4764 100644
--- a/docs/toolbars/docs-headers.html
+++ b/docs/toolbars/docs-headers.html
@@ -169,7 +169,7 @@
 								<li><a href="docs-navbar.html">Navbars</a></li>
 								<li><a href="bars-fixed.html">Fixed positioning</a></li>
 								<li><a href="bars-fullscreen.html">Fullscreen positioning</a></li>
-								<li><a href="footer-persist-a.html">Persistent footer nav bar</a></li>
+								<li><a href="footer-persist-a.html">Persistent footer navbar</a></li>
 								<li><a href="bars-themes.html">Theming toolbars</a></li>
 
 							</ul>
diff --git a/docs/toolbars/docs-navbar.html b/docs/toolbars/docs-navbar.html
index 77b2e1ef..8091ac6a 100755
--- a/docs/toolbars/docs-navbar.html
+++ b/docs/toolbars/docs-navbar.html
@@ -24,7 +24,7 @@
 		<div class="content-primary">		
 	<h2>Simple navbar</h2>
 	
-	<p>jQuery Mobile has a very basic navbar widget that is useful for providing up to 5 buttons with optional icons in a bar, typically within a header or footer. There is also a <a href="footer-persist-a.html">persistent nav bar</a> variation that works more like a tab bar that stays fixed as you navigate across pages.</p>
+	<p>jQuery Mobile has a very basic navbar widget that is useful for providing up to 5 buttons with optional icons in a bar, typically within a header or footer. There is also a <a href="footer-persist-a.html">persistent navbar</a> variation that works more like a tab bar that stays fixed as you navigate across pages.</p>
 	<p>A navbar is coded as an unordered list of links wrapped in a container element that has the <code> data-role="navbar"</code> attribute. To set one of links to the active (selected) state, add <code>class="ui-btn-active"</code> to the anchor. In this example, we have a two-button navbar in the footer with the "One" item set to active:</p>
 	
 <pre><code>
@@ -154,7 +154,7 @@
 	
 	<h2>Icons in navbars</h2>
 	
-	<p>Icons can be added to navbar items by adding the <code> data-icon</code> attribute specifying a <a href="../buttons/buttons-icons.html">standard mobile icon</a> to each anchor. By default icons are added above the text (<code>data-iconpos="top"</code>). The following examples add icons to a navbar in a footer.</p>
+	<p>Icons can be added to navbar items by adding the <code> data-icon</code> attribute specifying a <a href="../buttons/buttons-icons.html">standard mobile icon</a> to each anchor. By default, icons are added above the text (<code>data-iconpos="top"</code>). The following examples add icons to a navbar in a footer.</p>
 
 	<div data-role="footer">
 		<div data-role="navbar">
@@ -166,7 +166,7 @@
 		</div><!-- /navbar -->
 	</div><!-- /footer -->
 	
-	<p>The icon position is set <em>on the navbar container</em> instead of for individual links within for visual consistency. For example, to place the icons below the labels, add the <code> data-iconpos="bottom"</code> attribute to navbar container.</p>
+	<p>The icon position is set <em>on the navbar container</em> instead of for individual links within for visual consistency. For example, to place the icons below the labels, add the <code> data-iconpos="bottom"</code> attribute to the navbar container.</p>
 <pre><code>
 &lt;div data-role=&quot;navbar&quot; <strong>data-iconpos=&quot;bottom&quot;</strong>&gt;
 </code></pre>
@@ -207,7 +207,7 @@
 	
 	<h2>Using 3rd party icon sets</h2>
 	
-	<p>You can add any of the popular icon libraries like <a href="http://glyphish.com/">Glyphish</a> to achieve the iOS style tab tab that has large icons stacked on top of text labels. All that is required is a bit of custom styles to link to the icons and position them in the navbar. Here is an example using Glyphish icons and custom styles (view page source for styles) in our navbar:</p>
+	<p>You can add any of the popular icon libraries like <a href="http://glyphish.com/">Glyphish</a> to achieve the iOS style tab that has large icons stacked on top of text labels. All that is required is a bit of custom styles to link to the icons and position them in the navbar. Here is an example using Glyphish icons and custom styles (view page source for styles) in our navbar:</p>
 	
 	
 	<style>	
@@ -238,8 +238,8 @@
 
 	<h2>Theming navbars</h2>
 	
-	<p>Navbars inherit the theme swatch from their parent container, just like buttons. If a navbar is placed in header or footer toolbar, it will inherit the default toolbar swatch (A) for bars unless you set this in the markup. </p>
-	<p>Here are a few examples of navbars in various container swatches automatically inheriting their parent's swatch letter. Note that in these examples, instead of using a <code>data-theme</code> attribute, we're manually adding the swatch classes to apply the body swatch (<code>ui-body-a</code>) and the class to add the standard body padding (ui-body), but the inheritance works the same way:</p>
+	<p>Navbars inherit the theme swatch from their parent container, just like buttons. If a navbar is placed in the header or footer toolbar, it will inherit the default toolbar swatch (A) for bars unless you set this in the markup. </p>
+	<p>Here are a few examples of navbars in various container swatches that automatically inheriting their parent's swatch letter. Note that in these examples, instead of using a <code>data-theme</code> attribute, we're manually adding the swatch classes to apply the body swatch (<code>ui-body-a</code>) and the class to add the standard body padding (ui-body), but the inheritance works the same way:</p>
 
 	<div class="ui-body-a ui-body">
 		<h3>Swatch A</h3>
@@ -267,7 +267,7 @@
 		</div><!-- /navbar -->
 	</div><!-- /container -->
 	
-<p>To set to the theme color for a navbar item, add the <code>data-theme</code> attribute to the individual links and specify a theme swatch. Note that applying a theme swatch at the navbar container is <em>not</em> supported.</p>
+<p>To set to the theme color for a navbar item, add the <code>data-theme</code> attribute to the individual links and specify a theme swatch. Note that applying a theme swatch to the navbar container is <em>not</em> supported.</p>
 	<div data-role="footer">
 		<div data-role="navbar">
 			<ul>
@@ -298,7 +298,7 @@
 						<li data-theme="a"><a href="docs-navbar.html">Navbars</a></li>
 						<li><a href="bars-fixed.html">Fixed positioning</a></li>
 						<li><a href="bars-fullscreen.html">Fullscreen positioning</a></li>
-						<li><a href="footer-persist-a.html">Persistent footer nav bar</a></li>
+						<li><a href="footer-persist-a.html">Persistent footer navbar</a></li>
 						<li><a href="bars-themes.html">Theming toolbars</a></li>
 
 					</ul>
diff --git a/docs/toolbars/footer-persist-a.html b/docs/toolbars/footer-persist-a.html
index de507ce4..7a76e98d 100755
--- a/docs/toolbars/footer-persist-a.html
+++ b/docs/toolbars/footer-persist-a.html
@@ -22,7 +22,7 @@
 	
 	<div data-role="content">
 		<div class="content-primary">
-				<p>This page is a demo of a persistent footer navigation bar. At the foot of the page, you'll see a persistent horizontal navigation bar. Click on any of the links, and you'll see the page content transition but the footer remain fixed: The footer sticks persistently even when transitioning to a new HTML page, because the footer on all four HTML pages has the same <code>data-id</code> attribute. <strong>Note:</strong> If you'd like an active button in your navbar to remain active when you return to it again, add a class of <code>ui-state-persist</code> in addition to <code>ui-btn-active</code></p>
+				<p>This page is a demo of a persistent footer navigation bar. At the foot of the page, you'll see a persistent horizontal navigation bar. Click on any of the links, and you'll see the page content transition but the footer remains fixed: The footer sticks persistently even when transitioning to a new HTML page, because the footer on all four HTML pages has the same <code>data-id</code> attribute. <strong>Note:</strong> If you'd like an active button in your navbar to remain active when you return to the page displaying this active button, add a class of <code>ui-state-persist</code> in addition to <code>ui-btn-active</code> to the corresponding anchor.</p>
 
 	
 
@@ -89,7 +89,7 @@
 						<li><a href="docs-navbar.html">Navbars</a></li>
 						<li><a href="bars-fixed.html">Fixed positioning</a></li>
 						<li><a href="bars-fullscreen.html">Fullscreen positioning</a></li>
-						<li data-theme="a"><a href="footer-persist-a.html">Persistent footer nav bar</a></li>
+						<li data-theme="a"><a href="footer-persist-a.html">Persistent footer navbar</a></li>
 						<li><a href="bars-themes.html">Theming toolbars</a></li>
 
 					</ul>
diff --git a/docs/toolbars/footer-persist-b.html b/docs/toolbars/footer-persist-b.html
index f8cc5b86..e44e3d18 100755
--- a/docs/toolbars/footer-persist-b.html
+++ b/docs/toolbars/footer-persist-b.html
@@ -113,7 +113,7 @@
 							<li><a href="docs-navbar.html">Navbars</a></li>
 							<li><a href="bars-fixed.html">Fixed positioning</a></li>
 							<li><a href="bars-fullscreen.html">Fullscreen positioning</a></li>
-							<li data-theme="a"><a href="footer-persist-a.html">Persistent footer nav bar</a></li>
+							<li data-theme="a"><a href="footer-persist-a.html">Persistent footer navbar</a></li>
 							<li><a href="bars-themes.html">Theming toolbars</a></li>
 
 						</ul>
diff --git a/docs/toolbars/footer-persist-c.html b/docs/toolbars/footer-persist-c.html
index edc0b334..cedcfa28 100755
--- a/docs/toolbars/footer-persist-c.html
+++ b/docs/toolbars/footer-persist-c.html
@@ -98,7 +98,7 @@
 							<li><a href="docs-navbar.html">Navbars</a></li>
 							<li><a href="bars-fixed.html">Fixed positioning</a></li>
 							<li><a href="bars-fullscreen.html">Fullscreen positioning</a></li>
-							<li data-theme="a"><a href="footer-persist-a.html">Persistent footer nav bar</a></li>
+							<li data-theme="a"><a href="footer-persist-a.html">Persistent footer navbar</a></li>
 							<li><a href="bars-themes.html">Theming toolbars</a></li>
 
 						</ul>
diff --git a/docs/toolbars/index.html b/docs/toolbars/index.html
index cfc18751..9b114ab1 100755
--- a/docs/toolbars/index.html
+++ b/docs/toolbars/index.html
@@ -32,7 +32,7 @@
 			<li><a href="docs-navbar.html">Navbars</a></li>
 			<li><a href="bars-fixed.html">Fixed positioning</a></li>
 			<li><a href="bars-fullscreen.html">Fullscreen positioning</a></li>
-			<li><a href="footer-persist-a.html">Persistent footer nav bar</a></li>
+			<li><a href="footer-persist-a.html">Persistent footer navbar</a></li>
 			<li><a href="bars-themes.html">Theming toolbars</a></li>
 			<!--<li><a href="api-bars.html">API documentation</a></li>-->
 		</ul>			
diff --git a/experiments/google-maps/index.html b/experiments/google-maps/index.html
index 7425b941..138651b8 100644
--- a/experiments/google-maps/index.html
+++ b/experiments/google-maps/index.html
@@ -6,7 +6,7 @@
 	<title>Main Page</title>
 	<link rel="stylesheet"  href="../../css/themes/default/" />
 	<script src="../../js/jquery.js"></script>
-	<script src="../../js"></script>
+	<script src="../../js/"></script>
 	
 	<script src="http://maps.google.com/maps/api/js?sensor=false"></script>
 
diff --git a/experiments/google-maps/map.html b/experiments/google-maps/map.html
index aca2141b..290569f0 100644
--- a/experiments/google-maps/map.html
+++ b/experiments/google-maps/map.html
@@ -6,7 +6,7 @@
 	<title>Main Page</title>
 	<link rel="stylesheet"  href="../../css/themes/default/" />
 	<script src="../../js/jquery.js"></script>
-	<script src="../../js"></script>	
+	<script src="../../js/"></script>	
 	
 	<script src="http://maps.google.com/maps/api/js?sensor=false"></script>
 	
diff --git a/experiments/scrollview/index.html b/experiments/scrollview/index.html
index 336badb0..ee5d9140 100644
--- a/experiments/scrollview/index.html
+++ b/experiments/scrollview/index.html
@@ -20,7 +20,7 @@
 		}
 	</style>
 	<script src="../../js/jquery.js"></script>
-	<script src="../../js"></script>
+	<script src="../../js/"></script>
 	<script src="jquery.easing.1.3.js"></script>
 	<script src="jquery.mobile.scrollview.js"></script>
 	<script src="scrollview.js"></script>
diff --git a/experiments/scrollview/lists-divider.html b/experiments/scrollview/lists-divider.html
index 08207ba6..9a9ea0b7 100644
--- a/experiments/scrollview/lists-divider.html
+++ b/experiments/scrollview/lists-divider.html
@@ -20,7 +20,7 @@
 		}
 	</style>
 	<script src="../../js/jquery.js"></script>
-	<script src="../../js"></script>
+	<script src="../../js/"></script>
 	<script src="jquery.easing.1.3.js"></script>
 	<script src="jquery.mobile.scrollview.js"></script>
 	<script src="scrollview.js"></script>
diff --git a/experiments/scrollview/scrollview-direction.html b/experiments/scrollview/scrollview-direction.html
index beb5113e..26859af0 100644
--- a/experiments/scrollview/scrollview-direction.html
+++ b/experiments/scrollview/scrollview-direction.html
@@ -59,7 +59,7 @@
 		}
 	</style>
 	<script src="../../js/jquery.js"></script>
-	<script src="../../js"></script>
+	<script src="../../js/"></script>
 	<script src="jquery.easing.1.3.js"></script>
 	<script src="jquery.mobile.scrollview.js"></script>
 	<script src="scrollview.js"></script>
diff --git a/experiments/scrollview/scrollview-nested.html b/experiments/scrollview/scrollview-nested.html
index bc0ecd72..35f82851 100644
--- a/experiments/scrollview/scrollview-nested.html
+++ b/experiments/scrollview/scrollview-nested.html
@@ -83,7 +83,7 @@
 
 	</style>
 	<script src="../../js/jquery.js"></script>
-	<script src="../../js"></script>
+	<script src="../../js/"></script>
 	<script src="jquery.easing.1.3.js"></script>
 	<script src="jquery.mobile.scrollview.js"></script>
 	<script src="scrollview.js"></script>
diff --git a/experiments/scrollview/scrollview.js b/experiments/scrollview/scrollview.js
index f033c784..cac968ed 100644
--- a/experiments/scrollview/scrollview.js
+++ b/experiments/scrollview/scrollview.js
@@ -1,8 +1,8 @@
 function ResizePageContentHeight(page) {
 	var $page = $(page),
 		$content = $page.children( ".ui-content" ),
-		hh = $page.children( ".ui-header" ).outerHeight() : 0,
-		fh = $page.children( ".ui-footer" ).outerHeight() : 0,
+		hh = $page.children( ".ui-header" ).outerHeight() || 0,
+		fh = $page.children( ".ui-footer" ).outerHeight() || 0,
 		pt = parseFloat($content.css( "padding-top" )),
 		pb = parseFloat($content.css( "padding-bottom" )),
 		wh = window.innerHeight;
diff --git a/experiments/scrollview/sv-test-01.html b/experiments/scrollview/sv-test-01.html
index 69f63754..4c60b941 100644
--- a/experiments/scrollview/sv-test-01.html
+++ b/experiments/scrollview/sv-test-01.html
@@ -7,7 +7,7 @@
 <link rel="stylesheet"  href="../../css/themes/default/" />
 <link rel="stylesheet" href="../../docs/_assets/css/jqm-docs.css"/>
 <script src="../../js/jquery.js"></script>
-<script src="../../js"></script>
+<script src="../../js/"></script>
 <style>
 
 #evtCatcher {
diff --git a/experiments/scrollview/sv-test-02.html b/experiments/scrollview/sv-test-02.html
index 943eb372..a4ab487a 100644
--- a/experiments/scrollview/sv-test-02.html
+++ b/experiments/scrollview/sv-test-02.html
@@ -19,7 +19,7 @@
 }
 	</style>
 	<script src="../../js/jquery.js"></script>
-	<script src="../../js"></script>
+	<script src="../../js/"></script>
 	<script src="../../docs/lists/docs/docs.js"></script>
 	<script src="jquery.easing.1.3.js"></script>
 	<script src="jquery.mobile.scrollview.js"></script>
diff --git a/gitposthook.php b/gitposthook.php
deleted file mode 100755
index ee0578a1..00000000
--- a/gitposthook.php
+++ /dev/null
@@ -1,5 +0,0 @@
-<?php
-$file = fopen('gitstatus.log','wb');
-fwrite($file, 'NewCommit');
-fclose($file);
-
diff --git a/gitpushlatest.php b/gitpushlatest.php
deleted file mode 100755
index bb62db74..00000000
--- a/gitpushlatest.php
+++ /dev/null
@@ -1,10 +0,0 @@
-<?php
-$filename = 'gitstatus.log';
-$file = fopen($filename, 'r+b');
-if ( fread($file, filesize($filename)) === 'NewCommit' )
-{
-        ftruncate($file, 0);
-        exec('git pull --quiet && make NIGHTLY_OUTPUT=latest nightly >> /dev/null 2>&1');
-		exec('./refreshCDN >> /dev/null 2>&1');
-}
-
diff --git a/js/index.php b/js/index.php
index c0ade1d8..766c2b1c 100644
--- a/js/index.php
+++ b/js/index.php
@@ -1,6 +1,7 @@
 <?php
 $type = 'text/javascript';
 $files = array(
+	'../LICENSE-INFO.txt',
 	'jquery.ui.widget.js',
 	'jquery.mobile.widget.js',
 	'jquery.mobile.media.js',
diff --git a/js/jquery.mobile.buttonMarkup.js b/js/jquery.mobile.buttonMarkup.js
index dc86de21..7b682ef8 100644
--- a/js/jquery.mobile.buttonMarkup.js
+++ b/js/jquery.mobile.buttonMarkup.js
@@ -1,9 +1,7 @@
 /*
-* jQuery Mobile Framework : "buttons" plugin - for making button-like links
-* Copyright (c) jQuery Project
-* Dual licensed under the MIT or GPL Version 2 licenses.
-* http://jquery.org/license
+* "buttons" plugin - for making button-like links
 */
+
 ( function( $, undefined ) {
 
 $.fn.buttonMarkup = function( options ) {
@@ -165,7 +163,7 @@ var attachEvents = function() {
 			if ( btn ) {
 				$btn = $( btn );
 				theme = $btn.attr( "data-" + $.mobile.ns + "theme" );
-				$btn.removeClass( "ui-btn-hover-" + theme ).addClass( "ui-btn-up-" + theme );
+				$btn.removeClass( "ui-btn-hover-" + theme  + " ui-btn-down-" + theme ).addClass( "ui-btn-up-" + theme );
 			}
 		}
 	});
diff --git a/js/jquery.mobile.collapsible.js b/js/jquery.mobile.collapsible.js
index f2eb368a..115e83e2 100644
--- a/js/jquery.mobile.collapsible.js
+++ b/js/jquery.mobile.collapsible.js
@@ -1,9 +1,7 @@
 /*
-* jQuery Mobile Framework : "collapsible" plugin
-* Copyright (c) jQuery Project
-* Dual licensed under the MIT or GPL Version 2 licenses.
-* http://jquery.org/license
+* "collapsible" plugin
 */
+
 (function( $, undefined ) {
 
 $.widget( "mobile.collapsible", $.mobile.widget, {
@@ -11,7 +9,7 @@ $.widget( "mobile.collapsible", $.mobile.widget, {
 		expandCueText: " click to expand contents",
 		collapseCueText: " click to collapse contents",
 		collapsed: true,
-		heading: ">:header,>legend",
+		heading: "h1,h2,h3,h4,h5,h6,legend",
 		theme: null,
 		contentTheme: null,
 		iconTheme: "d",
@@ -22,10 +20,10 @@ $.widget( "mobile.collapsible", $.mobile.widget, {
 		var $el = this.element,
 			o = this.options,
 			collapsible = $el.addClass( "ui-collapsible" ),
-			collapsibleHeading = $el.find( o.heading ).eq( 0 ),
+			collapsibleHeading = $el.children( o.heading ).first(),
 			collapsibleContent = collapsible.wrapInner( "<div class='ui-collapsible-content'></div>" ).find( ".ui-collapsible-content" ),
 			collapsibleSet = $el.closest( ":jqmData(role='collapsible-set')" ).addClass( "ui-collapsible-set" ),
-			colllapsiblesInSet = collapsibleSet.children( ":jqmData(role='collapsible')" );
+			collapsiblesInSet = collapsibleSet.children( ":jqmData(role='collapsible')" );
 
 		// Replace collapsibleHeading if it's a legend
 		if ( collapsibleHeading.is( "legend" ) ) {
@@ -54,7 +52,8 @@ $.widget( "mobile.collapsible", $.mobile.widget, {
 			.addClass( "ui-collapsible-heading" )
 			.append( "<span class='ui-collapsible-heading-status'></span>" )
 			.wrapInner( "<a href='#' class='ui-collapsible-heading-toggle'></a>" )
-			.find( "a:eq(0)" )
+			.find( "a" )
+				.first()
 				.buttonMarkup({
 					shadow: false,
 					corners: false,
@@ -65,7 +64,7 @@ $.widget( "mobile.collapsible", $.mobile.widget, {
 
 		if ( !collapsibleSet.length ) {
 			collapsibleHeading
-				.find( "a:eq(0), .ui-btn-inner" )
+				.find( "a" ).first().add( collapsibleHeading.find( ".ui-btn-inner" ) )
 					.addClass( "ui-corner-top ui-corner-bottom" );
 		} else {
 			// If we are in a collapsible set
@@ -85,15 +84,17 @@ $.widget( "mobile.collapsible", $.mobile.widget, {
 					});
 			}
 
-			colllapsiblesInSet.first()
-				.find( "a:eq(0)" )
+			collapsiblesInSet.first()
+				.find( "a" )
+					.first()
 					.addClass( "ui-corner-top" )
 						.find( ".ui-btn-inner" )
 							.addClass( "ui-corner-top" );
 
-			colllapsiblesInSet.last()
+			collapsiblesInSet.last()
 				.jqmData( "collapsible-last", true )
-				.find( "a:eq(0)" )
+				.find( "a" )
+					.first()
 					.addClass( "ui-corner-bottom" )
 						.find( ".ui-btn-inner" )
 							.addClass( "ui-corner-bottom" );
@@ -101,7 +102,7 @@ $.widget( "mobile.collapsible", $.mobile.widget, {
 
 			if ( collapsible.jqmData( "collapsible-last" ) ) {
 				collapsibleHeading
-					.find( "a:eq(0), .ui-btn-inner" )
+					.find( "a" ).first().add ( collapsibleHeading.find( ".ui-btn-inner" ) )
 						.addClass( "ui-corner-bottom" );
 			}
 		}
@@ -131,7 +132,7 @@ $.widget( "mobile.collapsible", $.mobile.widget, {
 
 					if ( contentTheme && ( !collapsibleSet.length || collapsible.jqmData( "collapsible-last" ) ) ) {
 						collapsibleHeading
-							.find( "a:eq(0), .ui-btn-inner" )
+							.find( "a" ).first().add( collapsibleHeading.find( ".ui-btn-inner" ) )
 							.toggleClass( "ui-corner-bottom", isCollapse );
 						collapsibleContent.toggleClass( "ui-corner-bottom", !isCollapse );
 					}
diff --git a/js/jquery.mobile.controlGroup.js b/js/jquery.mobile.controlGroup.js
index d2e47327..91c34729 100644
--- a/js/jquery.mobile.controlGroup.js
+++ b/js/jquery.mobile.controlGroup.js
@@ -1,9 +1,7 @@
-/*
-* jQuery Mobile Framework: "controlgroup" plugin - corner-rounding for groups of buttons, checks, radios, etc
-* Copyright (c) jQuery Project
-* Dual licensed under the MIT or GPL Version 2 licenses.
-* http://jquery.org/license
+/* 
+* "controlgroup" plugin - corner-rounding for groups of buttons, checks, radios, etc
 */
+
 (function( $, undefined ) {
 
 $.fn.controlgroup = function( options ) {
diff --git a/js/jquery.mobile.core.js b/js/jquery.mobile.core.js
index e8480381..191297d2 100644
--- a/js/jquery.mobile.core.js
+++ b/js/jquery.mobile.core.js
@@ -1,13 +1,11 @@
-/*
-* jQuery Mobile Framework : "core" - The base file for jQm
-* Copyright (c) jQuery Project
-* Dual licensed under the MIT or GPL Version 2 licenses.
-* http://jquery.org/license
+/* 
+* "core" - The base file for jQm
 */
 
-
 (function( $, window, undefined ) {
 
+	var nsNormalizeDict = {};
+
 	// jQuery.mobile configurable options
 	$.extend( $.mobile, {
 
@@ -119,14 +117,18 @@
 			}, 150 );
 		},
 
+		// Expose our cache for testing purposes.
+		nsNormalizeDict: nsNormalizeDict,
+
 		// Take a data attribute property, prepend the namespace
-		// and then camel case the attribute string
+		// and then camel case the attribute string. Add the result
+		// to our nsNormalizeDict so we don't have to do this again.
 		nsNormalize: function( prop ) {
 			if ( !prop ) {
 				return;
 			}
 
-			return $.camelCase( $.mobile.ns + prop );
+			return nsNormalizeDict[ prop ] || ( nsNormalizeDict[ prop ] = $.camelCase( $.mobile.ns + prop ) );
 		},
 
 		getInheritedTheme: function( el, defaultTheme ) {
@@ -213,10 +215,11 @@
 	};
 
 	// Monkey-patching Sizzle to filter the :jqmData selector
-	var oldFind = $.find;
+	var oldFind = $.find,
+		jqmDataRE = /:jqmData\(([^)]*)\)/g;
 
 	$.find = function( selector, context, ret, extra ) {
-		selector = selector.replace(/:jqmData\(([^)]*)\)/g, "[data-" + ( $.mobile.ns || "" ) + "$1]");
+		selector = selector.replace( jqmDataRE, "[data-" + ( $.mobile.ns || "" ) + "$1]" );
 
 		return oldFind.call( this, selector, context, ret, extra );
 	};
diff --git a/js/jquery.mobile.degradeInputs.js b/js/jquery.mobile.degradeInputs.js
index 729f901b..62f96d79 100644
--- a/js/jquery.mobile.degradeInputs.js
+++ b/js/jquery.mobile.degradeInputs.js
@@ -1,8 +1,5 @@
 /*
-* jQuery Mobile Framework : "degradeInputs" plugin - degrades inputs to another type after custom enhancements are made.
-* Copyright (c) jQuery Project
-* Dual licensed under the MIT or GPL Version 2 licenses.
-* http://jquery.org/license
+* "degradeInputs" plugin - degrades inputs to another type after custom enhancements are made.
 */
 
 (function( $, undefined ) {
diff --git a/js/jquery.mobile.dialog.js b/js/jquery.mobile.dialog.js
index 1d1ea560..1089c187 100644
--- a/js/jquery.mobile.dialog.js
+++ b/js/jquery.mobile.dialog.js
@@ -1,7 +1,5 @@
 /*
-* jQuery Mobile Framework : "dialog" plugin.
-* Copyright (c) jQuery Project
-* Dual licensed under the MIT (MIT-LICENSE.txt) and GPL (GPL-LICENSE.txt) licenses.
+* "dialog" plugin.
 */
 
 (function( $, window, undefined ) {
diff --git a/js/jquery.mobile.event.js b/js/jquery.mobile.event.js
index 5d92e3e6..7b79b79a 100644
--- a/js/jquery.mobile.event.js
+++ b/js/jquery.mobile.event.js
@@ -1,8 +1,5 @@
-/*
-* jQuery Mobile Framework : "events" plugin - Handles events
-* Copyright (c) jQuery Project
-* Dual licensed under the MIT or GPL Version 2 licenses.
-* http://jquery.org/license
+/* 
+* "events" plugin - Handles events
 */
 
 (function( $, window, undefined ) {
diff --git a/js/jquery.mobile.fieldContain.js b/js/jquery.mobile.fieldContain.js
index 1d9c7f75..905e4ec3 100644
--- a/js/jquery.mobile.fieldContain.js
+++ b/js/jquery.mobile.fieldContain.js
@@ -1,8 +1,5 @@
 /*
-* jQuery Mobile Framework : "fieldcontain" plugin - simple class additions to make form row separators
-* Copyright (c) jQuery Project
-* Dual licensed under the MIT or GPL Version 2 licenses.
-* http://jquery.org/license
+* "fieldcontain" plugin - simple class additions to make form row separators
 */
 
 (function( $, undefined ) {
diff --git a/js/jquery.mobile.fixHeaderFooter.js b/js/jquery.mobile.fixHeaderFooter.js
index 0c114274..3bb56138 100644
--- a/js/jquery.mobile.fixHeaderFooter.js
+++ b/js/jquery.mobile.fixHeaderFooter.js
@@ -1,8 +1,5 @@
 /*
-* jQuery Mobile Framework : "fixHeaderFooter" plugin - on-demand positioning for headers,footers
-* Copyright (c) jQuery Project
-* Dual licensed under the MIT or GPL Version 2 licenses.
-* http://jquery.org/license
+* "fixHeaderFooter" plugin - on-demand positioning for headers,footers
 */
 
 (function( $, undefined ) {
diff --git a/js/jquery.mobile.fixHeaderFooter.native.js b/js/jquery.mobile.fixHeaderFooter.native.js
index 7cc531fc..5ba2c0d9 100644
--- a/js/jquery.mobile.fixHeaderFooter.native.js
+++ b/js/jquery.mobile.fixHeaderFooter.native.js
@@ -1,8 +1,5 @@
 /*
-* jQuery Mobile Framework : "fixHeaderFooter" native plugin - Behavior for "fixed" headers,footers, and scrolling inner content
-* Copyright (c) jQuery Project
-* Dual licensed under the MIT or GPL Version 2 licenses.
-* http://jquery.org/license
+* "fixHeaderFooter" native plugin - Behavior for "fixed" headers,footers, and scrolling inner content
 */
 
 (function( $, undefined ) {
diff --git a/js/jquery.mobile.forms.button.js b/js/jquery.mobile.forms.button.js
index 4eb8ad56..a8bad655 100644
--- a/js/jquery.mobile.forms.button.js
+++ b/js/jquery.mobile.forms.button.js
@@ -1,8 +1,5 @@
 /*
-* jQuery Mobile Framework : "button" plugin - links that proxy to native input/buttons
-* Copyright (c) jQuery Project
-* Dual licensed under the MIT or GPL Version 2 licenses.
-* http://jquery.org/license
+* "button" plugin - links that proxy to native input/buttons
 */
 
 (function( $, undefined ) {
diff --git a/js/jquery.mobile.forms.checkboxradio.js b/js/jquery.mobile.forms.checkboxradio.js
index d0a22eeb..4d233cb4 100644
--- a/js/jquery.mobile.forms.checkboxradio.js
+++ b/js/jquery.mobile.forms.checkboxradio.js
@@ -1,8 +1,5 @@
 /*
-* jQuery Mobile Framework : "checkboxradio" plugin
-* Copyright (c) jQuery Project
-* Dual licensed under the MIT or GPL Version 2 licenses.
-* http://jquery.org/license
+* "checkboxradio" plugin
 */
 
 (function( $, undefined ) {
diff --git a/js/jquery.mobile.forms.select.custom.js b/js/jquery.mobile.forms.select.custom.js
index 2bccb6ab..cd8ada09 100644
--- a/js/jquery.mobile.forms.select.custom.js
+++ b/js/jquery.mobile.forms.select.custom.js
@@ -1,8 +1,5 @@
 /*
-* jQuery Mobile Framework : custom "selectmenu" plugin
-* Copyright (c) jQuery Project
-* Dual licensed under the MIT or GPL Version 2 licenses.
-* http://jquery.org/license
+* custom "selectmenu" plugin
 */
 
 (function( $, undefined ) {
@@ -24,7 +21,7 @@
 				"<div data-" + $.mobile.ns + "role='content'></div>"+
 				"</div>" ).appendTo( $.mobile.pageContainer ).page(),
 
-			listbox =  $("<div>", { "class": "ui-selectmenu ui-selectmenu-hidden ui-overlay-shadow ui-corner-all ui-overlay-" + widget.options.overlayTheme + " " + $.mobile.defaultDialogTransition } ).insertAfter(screen),
+			listbox =  $("<div>", { "class": "ui-selectmenu ui-selectmenu-hidden ui-overlay-shadow ui-corner-all ui-body-" + widget.options.overlayTheme + " " + $.mobile.defaultDialogTransition } ).insertAfter(screen),
 
 			list = $( "<ul>", {
 				"class": "ui-selectmenu-list",
@@ -33,7 +30,9 @@
 				"aria-labelledby": buttonId
 			}).attr( "data-" + $.mobile.ns + "theme", widget.options.theme ).appendTo( listbox ),
 
-			header = $( "<div>" ).attr( "data-" + $.mobile.ns + "theme", widget.options.theme ).prependTo( listbox ),
+			header = $( "<div>", {
+				"class": "ui-header ui-bar-" + widget.options.theme
+			}).prependTo( listbox ),
 
 			headerTitle = $( "<h1>", {
 				"class": "ui-title"
diff --git a/js/jquery.mobile.forms.select.js b/js/jquery.mobile.forms.select.js
index 64a8e51c..de19fabd 100644
--- a/js/jquery.mobile.forms.select.js
+++ b/js/jquery.mobile.forms.select.js
@@ -1,8 +1,5 @@
 /*
-* jQuery Mobile Framework : "selectmenu" plugin
-* Copyright (c) jQuery Project
-* Dual licensed under the MIT or GPL Version 2 licenses.
-* http://jquery.org/license
+* "selectmenu" plugin
 */
 
 (function( $, undefined ) {
diff --git a/js/jquery.mobile.forms.slider.js b/js/jquery.mobile.forms.slider.js
index 4f47ae11..25d6f25c 100644
--- a/js/jquery.mobile.forms.slider.js
+++ b/js/jquery.mobile.forms.slider.js
@@ -1,8 +1,5 @@
 /*
-* jQuery Mobile Framework : "slider" plugin
-* Copyright (c) jQuery Project
-* Dual licensed under the MIT or GPL Version 2 licenses.
-* http://jquery.org/license
+* "slider" plugin
 */
 
 ( function( $, undefined ) {
diff --git a/js/jquery.mobile.forms.textinput.js b/js/jquery.mobile.forms.textinput.js
index d52084e4..f44c8a80 100644
--- a/js/jquery.mobile.forms.textinput.js
+++ b/js/jquery.mobile.forms.textinput.js
@@ -1,8 +1,5 @@
 /*
-* jQuery Mobile Framework : "textinput" plugin for text inputs, textareas
-* Copyright (c) jQuery Project
-* Dual licensed under the MIT or GPL Version 2 licenses.
-* http://jquery.org/license
+* "textinput" plugin for text inputs, textareas
 */
 
 (function( $, undefined ) {
@@ -89,9 +86,7 @@ $.widget( "mobile.textinput", $.mobile.widget, {
 						clientHeight = input[ 0 ].clientHeight;
 
 					if ( clientHeight < scrollHeight ) {
-						input.css({
-							height: (scrollHeight + extraLineHeight)
-						});
+						input.height(scrollHeight + extraLineHeight);
 					}
 				},
 				keyupTimeout;
@@ -101,10 +96,15 @@ $.widget( "mobile.textinput", $.mobile.widget, {
 				keyupTimeout = setTimeout( keyup, keyupTimeoutBuffer );
 			});
 
-			// Issue 509: the browser is not giving scrollHeight properly until after the document
-			// is ready.
-			if ($.trim(input.text())) {
-				$(keyup);
+			// Issue 509: the browser is not providing scrollHeight properly until the styles load
+			if ( $.trim( input.val() ) ) {
+				// bind to the window load to make sure the height is calculated based on BOTH
+				// the DOM and CSS
+				$( window ).load( keyup );
+
+				// binding to pagechange here ensures that for pages loaded via
+				// ajax the height is recalculated without user input
+				$( document ).one( "pagechange", keyup );
 			}
 		}
 	},
diff --git a/js/jquery.mobile.grid.js b/js/jquery.mobile.grid.js
index b89e157b..62129209 100644
--- a/js/jquery.mobile.grid.js
+++ b/js/jquery.mobile.grid.js
@@ -1,8 +1,5 @@
 /*
-* jQuery Mobile Framework : plugin for creating CSS grids
-* Copyright (c) jQuery Project
-* Dual licensed under the MIT or GPL Version 2 licenses.
-* http://jquery.org/license
+* plugin for creating CSS grids
 */
 
 (function( $, undefined ) {
diff --git a/js/jquery.mobile.hashchange.js b/js/jquery.mobile.hashchange.js
index 47105f4a..2f68cc62 100644
--- a/js/jquery.mobile.hashchange.js
+++ b/js/jquery.mobile.hashchange.js
@@ -1,14 +1,5 @@
-/*!
- * jQuery hashchange event - v1.3 - 7/21/2010
- * http://benalman.com/projects/jquery-hashchange-plugin/
- * 
- * Copyright (c) 2010 "Cowboy" Ben Alman
- * Dual licensed under the MIT and GPL licenses.
- * http://benalman.com/about/license/
- */
-
 // Script: jQuery hashchange event
-//
+// 
 // *Version: 1.3, Last updated: 7/21/2010*
 // 
 // Project Home - http://benalman.com/projects/jquery-hashchange-plugin/
diff --git a/js/jquery.mobile.init.js b/js/jquery.mobile.init.js
index ae0557d0..3934816d 100644
--- a/js/jquery.mobile.init.js
+++ b/js/jquery.mobile.init.js
@@ -1,8 +1,5 @@
 /*
-* jQuery Mobile Framework : "init" - Initialize the framework
-* Copyright (c) jQuery Project
-* Dual licensed under the MIT or GPL Version 2 licenses.
-* http://jquery.org/license
+* "init" - Initialize the framework
 */
 
 (function( $, window, undefined ) {
diff --git a/js/jquery.mobile.intro.js b/js/jquery.mobile.intro.js
new file mode 100644
index 00000000..4b990893
--- /dev/null
+++ b/js/jquery.mobile.intro.js
@@ -0,0 +1,9 @@
+/*
+* jQuery Mobile Framework v@VERSION
+* http://jquerymobile.com
+*
+* Copyright 2011 (c) jQuery Project
+* Dual licensed under the MIT or GPL Version 2 licenses.
+* http://jquery.org/license
+*
+*/
diff --git a/js/jquery.mobile.links.js b/js/jquery.mobile.links.js
index ba54af17..2b0d836d 100644
--- a/js/jquery.mobile.links.js
+++ b/js/jquery.mobile.links.js
@@ -1,8 +1,5 @@
 /*
-* jQuery Mobile Framework : "links" plugin - simple class additions for links
-* Copyright (c) jQuery Project
-* Dual licensed under the MIT or GPL Version 2 licenses.
-* http://jquery.org/license
+* "links" plugin - simple class additions for links
 */
 
 (function( $, undefined ) {
diff --git a/js/jquery.mobile.listview.filter.js b/js/jquery.mobile.listview.filter.js
index 4d8d4024..abf3ad0f 100755
--- a/js/jquery.mobile.listview.filter.js
+++ b/js/jquery.mobile.listview.filter.js
@@ -1,8 +1,5 @@
 /*
-* jQuery Mobile Framework : "listview" filter extension
-* Copyright (c) jQuery Project
-* Dual licensed under the MIT or GPL Version 2 licenses.
-* http://jquery.org/license
+* "listview" filter extension
 */
 
 (function( $, undefined ) {
diff --git a/js/jquery.mobile.listview.js b/js/jquery.mobile.listview.js
index 317875ad..f80184ca 100644
--- a/js/jquery.mobile.listview.js
+++ b/js/jquery.mobile.listview.js
@@ -1,8 +1,5 @@
 /*
-* jQuery Mobile Framework : "listview" plugin
-* Copyright (c) jQuery Project
-* Dual licensed under the MIT or GPL Version 2 licenses.
-* http://jquery.org/license
+* "listview" plugin
 */
 
 (function( $, undefined ) {
@@ -35,19 +32,6 @@ $.widget( "mobile.listview", $.mobile.widget, {
 		t.refresh( true );
 	},
 
-	_itemApply: function( $list, item ) {
-		var $countli = item.find( ".ui-li-count" );
-		if ( $countli.length ) {
-			item.addClass( "ui-li-has-count" );
-			$countli.addClass( "ui-btn-up-" + ( $list.jqmData( "counttheme" ) || this.options.countTheme ) + " ui-btn-corner-all" );
-		}
-
-		// TODO class has to be defined in markup
-		item.find( ">img:eq(0), .ui-link-inherit>img:eq(0)" ).addClass( "ui-li-thumb" ).each(function() {
-				item.addClass( $(this).is( ".ui-li-icon" ) ? "ui-li-has-icon" : "ui-li-has-thumb" );
-			});
-	},
-
 	_removeCorners: function( li, which ) {
 		var top = "ui-corner-top ui-corner-tr ui-corner-tl",
 			bot = "ui-corner-bottom ui-corner-br ui-corner-bl";
@@ -108,6 +92,42 @@ $.widget( "mobile.listview", $.mobile.widget, {
 		}
 	},
 
+	// This is a generic utility method for finding the first
+	// node with a given nodeName. It uses basic DOM traversal
+	// to be fast and is meant to be a substitute for simple
+	// $.fn.closest() and $.fn.children() calls on a single
+	// element. Note that callers must pass both the lowerCase
+	// and upperCase version of the nodeName they are looking for.
+	// The main reason for this is that this function will be
+	// called many times and we want to avoid having to lowercase
+	// the nodeName from the element every time to ensure we have
+	// a match. Note that this function lives here for now, but may
+	// be moved into $.mobile if other components need a similar method.
+	_findFirstElementByTagName: function( ele, nextProp, lcName, ucName )
+	{
+		var dict = {};
+		dict[ lcName ] = dict[ ucName ] = true;
+		while ( ele ) {
+			if ( dict[ ele.nodeName ] ) {
+				return ele;
+			}
+			ele = ele[ nextProp ];
+		}
+		return null;
+	},
+	
+	_addThumbClasses: function( containers )
+	{
+		var i, img, len = containers.length;
+		for ( i = 0; i < len; i++ ) {
+			img = $( this._findFirstElementByTagName( containers[ i ].firstChild, "nextSibling", "img", "IMG" ) );
+			if ( img.length ) {
+				img.addClass( "ui-li-thumb" );
+				$( this._findFirstElementByTagName( img[ 0 ].parentNode, "parentNode", "li", "LI" ) ).addClass( img.is( ".ui-li-icon" ) ? "ui-li-has-icon" : "ui-li-has-thumb" );
+			}
+		}
+	},
+
 	refresh: function( create ) {
 		this.parentPage = this.element.closest( ".ui-page" );
 		this._createSubPages();
@@ -121,7 +141,7 @@ $.widget( "mobile.listview", $.mobile.widget, {
 			li = $list.children( "li" ),
 			counter = $.support.cssPseudoElement || !$.nodeName( $list[ 0 ], "ol" ) ? 0 : 1,
 			item, itemClass, itemTheme,
-			a, last, splittheme, countParent, icon;
+			a, last, splittheme, countParent, icon, imgParents, img;
 
 		if ( counter ) {
 			$list.find( ".ui-li-dec" ).remove();
@@ -173,7 +193,7 @@ $.widget( "mobile.listview", $.mobile.widget, {
 							})
 							.find( ".ui-btn-inner" )
 								.append(
-									$( "<span />" ).buttonMarkup({
+									$( document.createElement( "span" ) ).buttonMarkup({
 										shadow: true,
 										corners: true,
 										theme: splittheme,
@@ -204,18 +224,39 @@ $.widget( "mobile.listview", $.mobile.widget, {
 					.prepend( "<span class='ui-li-dec'>" + (counter++) + ". </span>" );
 			}
 
-			item.add( item.children( ".ui-btn-inner" ) ).addClass( itemClass );
-
-			self._itemApply( $list, item );
+			item.addClass( itemClass ).children( ".ui-btn-inner" ).addClass( itemClass );
 		}
 
-		$list.find( "h1, h2, h3, h4, h5, h6" ).addClass( "ui-li-heading" ).end()
-			.find( "p, dl" ).addClass( "ui-li-desc" ).end()
-			.find( ".ui-li-aside" ).each(function() {
-				var $this = $(this);
-				$this.prependTo( $this.parent() ); //shift aside to front for css float
-			});
+		$list.find( "h1, h2, h3, h4, h5, h6" ).addClass( "ui-li-heading" )
+			.end()
 
+			.find( "p, dl" ).addClass( "ui-li-desc" )
+			.end()
+
+			.find( ".ui-li-aside" ).each(function() {
+					var $this = $(this);
+					$this.prependTo( $this.parent() ); //shift aside to front for css float
+				})
+			.end()
+
+			.find( ".ui-li-count" ).each( function() {
+					$( this ).closest( "li" ).addClass( "ui-li-has-count" );
+				}).addClass( "ui-btn-up-" + ( $list.jqmData( "counttheme" ) || this.options.countTheme) + " ui-btn-corner-all" );
+
+		// The idea here is to look at the first image in the list item
+		// itself, and any .ui-link-inherit element it may contain, so we
+		// can place the appropriate classes on the image and list item.
+		// Note that we used to use something like:
+		//
+		//    li.find(">img:eq(0), .ui-link-inherit>img:eq(0)").each( ... );
+		//
+		// But executing a find() like that on Windows Phone 7.5 took a
+		// really long time. Walking things manually with the code below
+		// allows the 400 listview item page to load in about 3 seconds as
+		// opposed to 30 seconds.
+
+		this._addThumbClasses( li );
+		this._addThumbClasses( $list.find( ".ui-link-inherit" ) );
 
 		this._refreshCorners( create );
 	},
diff --git a/js/jquery.mobile.media.js b/js/jquery.mobile.media.js
index e67986f6..479b2342 100644
--- a/js/jquery.mobile.media.js
+++ b/js/jquery.mobile.media.js
@@ -1,8 +1,5 @@
 /*
-* jQuery Mobile Framework : a workaround for window.matchMedia
-* Copyright (c) jQuery Project
-* Dual licensed under the MIT or GPL Version 2 licenses.
-* http://jquery.org/license
+* a workaround for window.matchMedia
 */
 
 (function( $, undefined ) {
diff --git a/js/jquery.mobile.navbar.js b/js/jquery.mobile.navbar.js
index 4da6d903..d5e094e3 100755
--- a/js/jquery.mobile.navbar.js
+++ b/js/jquery.mobile.navbar.js
@@ -1,8 +1,5 @@
 /*
-* jQuery Mobile Framework : "navbar" plugin
-* Copyright (c) jQuery Project
-* Dual licensed under the MIT or GPL Version 2 licenses.
-* http://jquery.org/license
+* "navbar" plugin
 */
 
 (function( $, undefined ) {
diff --git a/js/jquery.mobile.navigation.js b/js/jquery.mobile.navigation.js
index 7181ff4a..716a76e0 100755
--- a/js/jquery.mobile.navigation.js
+++ b/js/jquery.mobile.navigation.js
@@ -1,8 +1,5 @@
 /*
-* jQuery Mobile Framework : core utilities for auto ajax navigation, base tag mgmt,
-* Copyright (c) jQuery Project
-* Dual licensed under the MIT or GPL Version 2 licenses.
-* http://jquery.org/license
+* core utilities for auto ajax navigation, base tag mgmt,
 */
 
 ( function( $, undefined ) {
diff --git a/js/jquery.mobile.navigation.pushstate.js b/js/jquery.mobile.navigation.pushstate.js
index da95f026..2568df48 100644
--- a/js/jquery.mobile.navigation.pushstate.js
+++ b/js/jquery.mobile.navigation.pushstate.js
@@ -1,8 +1,5 @@
 /*
-* jQuery Mobile Framework : history.pushState support, layered on top of hashchange
-* Copyright (c) jQuery Project
-* Dual licensed under the MIT or GPL Version 2 licenses.
-* http://jquery.org/license
+* history.pushState support, layered on top of hashchange
 */
 
 ( function( $, window ) {
diff --git a/js/jquery.mobile.nojs.js b/js/jquery.mobile.nojs.js
index 7804f41a..bb1f684d 100644
--- a/js/jquery.mobile.nojs.js
+++ b/js/jquery.mobile.nojs.js
@@ -1,8 +1,5 @@
 /*
-* jQuery Mobile Framework : "nojs" plugin - class to make elements hidden to A grade browsers
-* Copyright (c) jQuery Project
-* Dual licensed under the MIT or GPL Version 2 licenses.
-* http://jquery.org/license
+* "nojs" plugin - class to make elements hidden to A grade browsers
 */
 
 (function( $, undefined ) {
diff --git a/js/jquery.mobile.page.js b/js/jquery.mobile.page.js
index 5f492393..feaaa6fc 100644
--- a/js/jquery.mobile.page.js
+++ b/js/jquery.mobile.page.js
@@ -1,8 +1,5 @@
 /*
-* jQuery Mobile Framework : "page" plugin
-* Copyright (c) jQuery Project
-* Dual licensed under the MIT or GPL Version 2 licenses.
-* http://jquery.org/license
+* "page" plugin
 */
 
 (function( $, undefined ) {
diff --git a/js/jquery.mobile.page.sections.js b/js/jquery.mobile.page.sections.js
index 04d77b04..9782cdbc 100644
--- a/js/jquery.mobile.page.sections.js
+++ b/js/jquery.mobile.page.sections.js
@@ -1,8 +1,5 @@
 /*
-* jQuery Mobile Framework : This plugin handles theming and layout of headers, footers, and content areas
-* Copyright (c) jQuery Project
-* Dual licensed under the MIT or GPL Version 2 licenses.
-* http://jquery.org/license
+* This plugin handles theming and layout of headers, footers, and content areas
 */
 
 (function( $, undefined ) {
diff --git a/js/jquery.mobile.support.js b/js/jquery.mobile.support.js
index aa8dd967..446bbb74 100644
--- a/js/jquery.mobile.support.js
+++ b/js/jquery.mobile.support.js
@@ -1,7 +1,5 @@
 /*
-* jQuery Mobile Framework : support tests
-* Copyright (c) jQuery Project
-* Dual licensed under the MIT (MIT-LICENSE.txt) and GPL (GPL-LICENSE.txt) licenses.
+* support tests
 */
 
 (function( $, undefined ) {
diff --git a/js/jquery.mobile.transition.js b/js/jquery.mobile.transition.js
index 9646f200..9f19c247 100644
--- a/js/jquery.mobile.transition.js
+++ b/js/jquery.mobile.transition.js
@@ -1,8 +1,5 @@
 /*
-* jQuery Mobile Framework : "transitions" plugin - Page change tranistions
-* Copyright (c) jQuery Project
-* Dual licensed under the MIT or GPL Version 2 licenses.
-* http://jquery.org/license
+* "transitions" plugin - Page change tranistions
 */
 
 (function( $, window, undefined ) {
diff --git a/js/jquery.mobile.vmouse.js b/js/jquery.mobile.vmouse.js
index ac90bca2..6fa6d8f3 100644
--- a/js/jquery.mobile.vmouse.js
+++ b/js/jquery.mobile.vmouse.js
@@ -1,8 +1,5 @@
 /*
-* jQuery Mobile Framework : "mouse" plugin
-* Copyright (c) jQuery Project
-* Dual licensed under the MIT or GPL Version 2 licenses.
-* http://jquery.org/license
+* "mouse" plugin
 */
 
 // This plugin is an experiment for abstracting away the touch and mouse
diff --git a/js/jquery.mobile.widget.js b/js/jquery.mobile.widget.js
index 4a1ff863..19bd2762 100644
--- a/js/jquery.mobile.widget.js
+++ b/js/jquery.mobile.widget.js
@@ -1,8 +1,5 @@
 /*
-* jQuery Mobile Framework : widget factory extentions for mobile
-* Copyright (c) jQuery Project
-* Dual licensed under the MIT or GPL Version 2 licenses.
-* http://jquery.org/license
+* widget factory extentions for mobile
 */
 
 (function( $, undefined ) {
diff --git a/tests/speed/stats/index.php b/tests/speed/stats/index.php
index 6c3335e3..d90e13ac 100644
--- a/tests/speed/stats/index.php
+++ b/tests/speed/stats/index.php
@@ -1,33 +1,52 @@
 <?php
-  $db = new SQLiteDatabase('stats.db');
-
-  // hand to God I tried CREATE TABLE IF NOT EXISTS and it persisted with
-  // a syntax error. The IDENTICAL query sans IF NOT EXISTS works perfectly
-  // http://www.sqlite.org/lang_createtable.html
-  @$db->query('CREATE TABLE stats (id INTEGER, agent TEXT, point TEXT, value REAL, time TIMESTAMP, PRIMARY KEY (id))');
+  $db = new PDO('sqlite:./stats.db');
+  $db->query('CREATE TABLE IF NOT EXISTS stats (id INTEGER, agent TEXT, agent_version Text, agent_full TEXT, point TEXT, value REAL, time TIMESTAMP, pathname TEXT, PRIMARY KEY (id))');
 
   // making a sad attempt here to provide a clean REST-respecting url scheme.
   // stats with a GET returns - wait for it - the stats, and a post with the
   // the right params will create a new entry
   if ( $_SERVER['REQUEST_METHOD'] == "GET" ) {
-     $json = Array();
-     $results = $db->query( 'SELECT agent, point, value, time FROM stats' );
+     $agent = (empty($_GET['agent'])) ? '' : urldecode($_GET['agent']);
+     $data_point = (empty($_GET['data_point'])) ? '' : urldecode($_GET['data_point']);
 
-     // TODO not sure if there's a better way to convert db results into
-     // a json encodable data structure
-     while($row = $results->fetch(SQLITE3_ASSOC)){
-          array_push($json, $row);
-     }
+     $st = $db->prepare( '
+     SELECT agent, agent_version, point, avg(value) as avg_value,
+            pathname, strftime(\'%Y-%m-%d\', time) as day
+     FROM stats
+     WHERE (agent_full like \'%Mobile%\' or agent_full like \'%mobile%\')
+           and agent like :agent and point like :data_point
+     GROUP BY agent, agent_version, pathname, point, strftime(\'%Y-%m-%d\', time)
+     ORDER BY time;
+     ');
 
+     $st->execute(array(
+        ':agent' => '%' . $agent . '%',
+        ':data_point' => '%' . $data_point . '%'
+     ));
+
+     $result = $st->fetchAll(PDO::FETCH_ASSOC);
      header("Content-Type: application/json");
-     echo json_encode($json);
-  }  elseif ( $_POST['datapoint'] && $_POST['value'] && $_POST['agent'] ){
-     // TODO it is not clear from the docs if there's an easier way to do the
-     // escaped query interpolation here. Suggestions welcome :(
-     $data_point = sqlite_escape_string( $_POST['datapoint'] );
-     $value = sqlite_escape_string( $_POST['value'] );
-     $agent = sqlite_escape_string( $_POST['agent'] );
-     $db->query('INSERT INTO stats (agent, point, value, time) VALUES ("' . $agent . '", "' . $data_point . '",' . $value . ', DATETIME(\'now\'))');
+     echo json_encode($result);
+
+  }  elseif ( $_POST['datapoint'] &&
+              $_POST['value'] &&
+              $_POST['agent'] &&
+              $_POST['pathname'] &&
+              $_POST['agentVersion'] ) {
+
+     $st = $db->prepare('
+     INSERT INTO stats (agent, agent_full, agent_version, point, value, pathname, time)
+     VALUES (:agent, :agent_full, :agent_version, :data_point, :value, :pathname, DATETIME(\'now\'))
+     ');
+
+     $st->execute(array(
+            ':agent' => $_POST['agent'],
+						':agent_full' => $_POST['agentFull'],
+            ':agent_version' => $_POST['agentVersion'],
+            ':data_point' => $_POST['datapoint'],
+            ':value' => $_POST['value'],
+            ':pathname' => $_POST['pathname']
+        ));
 
      echo "success";
   }
diff --git a/tests/speed/stats/perf.js b/tests/speed/stats/perf.js
index 343c0be6..7bf21931 100644
--- a/tests/speed/stats/perf.js
+++ b/tests/speed/stats/perf.js
@@ -7,9 +7,14 @@ window.Perf = (function($, Perf) {
 		currentRev: undefined,
 
 		report: function( data, after ) {
-			var self = this;
+			$.extend(data, {
+				pathname: location.pathname,
+				agent: this.agent(),
+				agentFull: window.navigator.userAgent,
+				agentVersion: this.agentVersion()
+			});
 
-			$.post( self.reportUrl, data, after );
+			$.post( this.reportUrl, data, after );
 		},
 
 		poll: function() {
@@ -32,8 +37,44 @@ window.Perf = (function($, Perf) {
 			$.get( self.revUrl, function( data ) {
 				self.currentRev = data;
 			});
-		}
+		},
+
+		agent: function() {
+			var agent = window.navigator.userAgent;
+
+			for( name in this.agents ) {
+				if( agent.indexOf( this.agents[name] ) > -1 ) {
+					return this.agents[name];
+				}
+			}
+
+			return agent;
+		},
+
+		agentVersion: function() {
+			var agent = window.navigator.userAgent;
+
+			agent.search(this.vRegexs[this.agent()] || "");
+
+			return RegExp.$1 ? RegExp.$1 : "0.0";
+		},
+
+		agents: {
+			ANDROID: "Android",
+			WP: "Windows Phone OS",
+			IPHONE: "iPhone OS",
+			IPAD: "iPad; U; CPU OS",
+			BLACKBERRY: "BlackBerry"
+		},
+
+		vRegexs: {}
 	});
 
+	Perf.vRegexs[Perf.agents.ANDROID] = /([0-9].[0-9].[0-9]);/;
+	Perf.vRegexs[Perf.agents.WP] = /Windows Phone OS ([0-9].[0-9]);/;
+	Perf.vRegexs[Perf.agents.IPHONE] = /iPhone OS ([0-9]_[0-9])/;
+	Perf.vRegexs[Perf.agents.IPAD] = /iPad; U; CPU OS ([0-9]_[0-9])/;
+	Perf.vRegexs[Perf.agents.BLACKBERRY] = /BlackBerry ([0-9]{4})/;
+
 	return Perf;
 })(jQuery, window.Perf || {});
diff --git a/tests/speed/stats/startup.js b/tests/speed/stats/startup.js
index c3e5bccd..6bb389dd 100644
--- a/tests/speed/stats/startup.js
+++ b/tests/speed/stats/startup.js
@@ -22,7 +22,6 @@
 
 		// report the time taken for a full app boot
 		Perf.report({
-			agent: window.navigator.userAgent,
 			datapoint: "fullboot",
 			value: Perf.pageLoadEnd - Perf.pageLoadStart
 		});
@@ -30,7 +29,6 @@
 		// record the time taken to load and enhance the page
 		// start polling for a new revision
 		Perf.report({
-			agent: window.navigator.userAgent,
 			datapoint: "pageload",
 			value: Perf.pageCreateStart - Perf.pageLoadStart,
 			after: function() {
diff --git a/tests/speed/stats/visualize/index.html b/tests/speed/stats/visualize/index.html
new file mode 100644
index 00000000..0a8c6afb
--- /dev/null
+++ b/tests/speed/stats/visualize/index.html
@@ -0,0 +1,18 @@
+<!DOCTYPE html>
+<html>
+	<head>
+	<meta charset="utf-8">
+  <script type="text/javascript" src="../../../../js/jquery.js"></script>
+  <script type="text/javascript" src="http://www.filamentgroup.com/examples/charting_v2/visualize.jQuery.js"></script>
+  <script type="text/javascript" src="visualize.js"></script>
+  <link rel="stylesheet" href="visualize.css" type="text/css" media="screen" />
+</head>
+<body>
+  <div id="tables">
+  </div>
+
+	<div id="graphs">
+
+	</div>
+</body>
+</html>
diff --git a/tests/speed/stats/visualize/visualize.css b/tests/speed/stats/visualize/visualize.css
new file mode 100644
index 00000000..5269fd40
--- /dev/null
+++ b/tests/speed/stats/visualize/visualize.css
@@ -0,0 +1,45 @@
+/*plugin styles*/
+.visualize { border: 1px solid #888; position: relative; background: #fafafa; }
+.visualize canvas { position: absolute; }
+.visualize ul,.visualize li { margin: 0; padding: 0;}
+
+/*table title, key elements*/
+.visualize .visualize-info { padding: 3px 5px; background: #fafafa; border: 1px solid #888; position: absolute; top: -20px; right: 10px; opacity: .8; }
+.visualize .visualize-title { display: block; color: #333; margin-bottom: 3px;  font-size: 1.1em; }
+.visualize ul.visualize-key { list-style: none;  }
+.visualize ul.visualize-key li { list-style: none; float: left; margin-right: 10px; padding-left: 10px; position: relative;}
+.visualize ul.visualize-key .visualize-key-color { width: 6px; height: 6px; left: 0; position: absolute; top: 50%; margin-top: -3px;  }
+.visualize ul.visualize-key .visualize-key-label { color: #000; }
+
+/*pie labels*/
+.visualize-pie .visualize-labels { list-style: none; }
+.visualize-pie .visualize-label-pos, .visualize-pie .visualize-label { position: absolute;  margin: 0; padding:0; }
+.visualize-pie .visualize-label { display: block; color: #fff; font-weight: bold; font-size: 1em; }
+.visualize-pie-outside .visualize-label { color: #000; font-weight: normal; }
+
+/*line,bar, area labels*/
+.visualize-labels-x,.visualize-labels-y { position: absolute; left: 0; top: 0; list-style: none; }
+.visualize-labels-x li, .visualize-labels-y li { position: absolute; bottom: 0; }
+.visualize-labels-x li span.label, .visualize-labels-y li span.label { position: absolute; color: #555;  }
+.visualize-labels-x li span.line, .visualize-labels-y li span.line {  position: absolute; border: 0 solid #ccc; }
+.visualize-labels-x li { height: 100%; }
+.visualize-labels-x li span.label { top: 100%; margin-top: 5px; }
+.visualize-labels-x li span.line { border-left-width: 1px; height: 100%; display: block; }
+.visualize-labels-x li span.line { border: 0;} /*hide vertical lines on area, line, bar*/
+.visualize-labels-y li { width: 100%;  }
+.visualize-labels-y li span.label { right: 100%; margin-right: 5px; display: block; width: 100px; text-align: right; }
+.visualize-labels-y li span.line { border-top-width: 1px; width: 100%; }
+.visualize-bar .visualize-labels-x li span.label { width: 100%; text-align: center; }
+
+body {
+  margin-top: 50px;
+}
+
+table {
+  display: none;
+}
+
+div.visualize {
+  float: left;
+  margin: 0 50px 70px 100px;
+}
\ No newline at end of file
diff --git a/tests/speed/stats/visualize/visualize.js b/tests/speed/stats/visualize/visualize.js
new file mode 100644
index 00000000..70eda316
--- /dev/null
+++ b/tests/speed/stats/visualize/visualize.js
@@ -0,0 +1,71 @@
+(function($) {
+	// TODO this is entire thing sucks
+	$(function() {
+		var searchMap = (function() {
+			var searchSplit, searchMap = {};
+
+			if ( !location.search ){
+				return searchMap;
+			}
+
+			searchSplit = location.search.replace(/^\?/, "").split( /&|;/ );
+
+			for( var i = 0; i < searchSplit.length; i++ ) {
+				var kv = searchSplit[i].split(/=/);
+				searchMap[ kv[0] ] = kv[1];
+			}
+
+			return searchMap;
+		})();
+
+		$.get("../", searchMap, function(data) {
+			$.each(data, function( i, avg ) {
+				var tablename = avg.point + " " + avg.agent + " " + avg.pathname + " " + avg.agent_version,
+					$table = $( "table > caption:contains(" + tablename + ")");
+
+				if( !$table.length ) {
+					$table = $( "<table></table>", {
+						"data-pathname": avg.pathname,
+						"data-point": avg.point,
+						"data-agent": avg.agent,
+						"data-agent": avg.agent_version
+					});
+
+					$table.append( "<caption>" + tablename + "</caption>");
+					$table.append( "<thead><tr></tr></thead>" );
+					$table.append( "<tbody><tr></tr></tbody>" );
+				}
+
+				// TODO assume time ordering in the data set
+				var $heading = $table.find("thead > tr > th:contains(" + avg.day + ")");
+
+				if( !$heading.length ) {
+					$heading = $("<th></th>", {
+						text: avg.day,
+						scope: "column"
+					});
+
+					$table.find("thead > tr").append($heading);
+				}
+
+				var $rowHeading = $table.find("tbody > tr > th:contains(" + avg.point + ")" ),
+					$row = $table.find( "tbody > tr" );
+
+				if( !$rowHeading.length ) {
+					$rowHeading = $("<th></th>", {
+						text: avg.point,
+						scope: "row"
+					});
+
+					$row.append( $rowHeading );
+				}
+
+				$row.append( "<td>" + avg.avg_value + "</td>" );
+
+				$("#tables").append($table);
+			});
+
+			$("#tables table").visualize({ type: "bar", width: 400, height: 400 }).appendTo("#graphs");
+		});
+	});
+})(jQuery);
\ No newline at end of file
diff --git a/tests/unit/buttonMarkup/index.html b/tests/unit/buttonMarkup/index.html
index 32f714f7..57bbb378 100644
--- a/tests/unit/buttonMarkup/index.html
+++ b/tests/unit/buttonMarkup/index.html
@@ -10,7 +10,7 @@
 	<script src="../../jquery.testHelper.js"></script>
 	<script src="buttonMarkup_core.js"></script>
 
-	<link rel="stylesheet"  href="../../../css/themes/default" />
+	<link rel="stylesheet"  href="../../../css/themes/default/" />
 	<link rel="stylesheet" href="../../../external/qunit.css"/>
 
 	<script src="../swarminject.js"></script>
diff --git a/tests/unit/collapsible/collapsible_core.js b/tests/unit/collapsible/collapsible_core.js
index d353e8ac..2aa8d516 100644
--- a/tests/unit/collapsible/collapsible_core.js
+++ b/tests/unit/collapsible/collapsible_core.js
@@ -147,14 +147,17 @@
 			function() {
 				var collapsibles = $.mobile.activePage.find( ".ui-collapsible" );
 				ok( collapsibles.eq(0).find( ".ui-collapsible-heading-toggle" ).hasClass( "ui-btn-up-a" ), "Heading of first collapsible should have class ui-btn-up-a");
-				ok( !collapsibles.eq(0).find( ".ui-collapsible-content" ).hasClass( "ui-body-a" ), "Content of first collapsible should NOT have class ui-btn-up-a");
+				ok( !collapsibles.eq(0).find( ".ui-collapsible-content" ).is( ".ui-body-a,.ui-body-b,.ui-body-c" ), "Content of first collapsible should NOT have class ui-btn-up-[a,b,c]");
 				ok( collapsibles.eq(0).find( ".ui-collapsible-content" ).hasClass( "ui-body-d" ), "Content of first collapsible should NOT have class ui-btn-up-d");
 				ok( collapsibles.eq(1).find( ".ui-collapsible-heading-toggle" ).hasClass( "ui-btn-up-b" ), "Heading of second collapsible should have class ui-btn-up-b");
+				ok( !collapsibles.eq(1).find( ".ui-collapsible-content" ).is( ".ui-body-a,.ui-body-c,.ui-body-d" ), "Content of second collapsible should NOT have class ui-btn-up-[a,c,d]");
 				ok( collapsibles.eq(1).find( ".ui-collapsible-content" ).hasClass( "ui-body-b" ), "Content of second collapsible should have class ui-btn-up-b");
 				ok( collapsibles.eq(2).find( ".ui-collapsible-heading-toggle" ).hasClass( "ui-btn-up-d" ), "Heading of third collapsible should have class ui-btn-up-d");
+				ok( !collapsibles.eq(2).find( ".ui-collapsible-content" ).is( ".ui-body-a,.ui-body-b,.ui-body-c" ), "Content of third collapsible should NOT have class ui-btn-up-[a,b,c]");
 				ok( collapsibles.eq(2).find( ".ui-collapsible-content" ).hasClass( "ui-body-d" ), "Content of third collapsible should have class ui-btn-up-d");
 				ok( !collapsibles.eq(2).find( ".ui-collapsible-content" ).hasClass( "ui-collapsible-content-collapsed" ), "Content of third collapsible should NOT have class ui-collapsible-content-collapsed");
 				ok( collapsibles.eq(3).find( ".ui-collapsible-heading-toggle" ).hasClass( "ui-btn-up-d" ), "Heading of fourth collapsible should have class ui-btn-up-d");
+				ok( !collapsibles.eq(3).find( ".ui-collapsible-content" ).is( ".ui-body-a,.ui-body-b,.ui-body-c" ), "Content of fourth collapsible should NOT have class ui-btn-up-[a,b,c]");
 				ok( collapsibles.eq(3).find( ".ui-collapsible-content" ).hasClass( "ui-body-d" ), "Content of fourth collapsible should have class ui-btn-up-d");
 				start();
 			}
diff --git a/tests/unit/collapsible/index.html b/tests/unit/collapsible/index.html
index 6eaac1fc..6741193c 100644
--- a/tests/unit/collapsible/index.html
+++ b/tests/unit/collapsible/index.html
@@ -9,7 +9,7 @@
 	<script src="../jquery.setNameSpace.js"></script>
 	<script src="../../../js/"></script>
 	<script src="../../jquery.testHelper.js"></script>
-	<link rel="stylesheet"  href="../../../css/themes/default" />
+	<link rel="stylesheet"  href="../../../css/themes/default/" />
 	<link rel="stylesheet" href="../../../external/qunit.css"/>
 	<script src="../../../external/qunit.js"></script>
 
diff --git a/tests/unit/core/core.js b/tests/unit/core/core.js
index 06eb651b..3b0d825e 100644
--- a/tests/unit/core/core.js
+++ b/tests/unit/core/core.js
@@ -35,11 +35,26 @@
 		});
 	});
 
+	function clearNSNormalizeDictionary()
+	{
+		var dict = $.mobile.nsNormalizeDict;
+		for ( var prop in dict ) {
+			delete dict[ prop ];
+		}
+	}
+
 	test( "$.mobile.nsNormalize works properly with namespace defined (test default)", function(){
+		// Start with a fresh namespace property cache, just in case
+		// the previous test mucked with namespaces.
+		clearNSNormalizeDictionary();
+
 		equal($.mobile.nsNormalize("foo"), "nstestFoo", "appends ns and initcaps");
 		equal($.mobile.nsNormalize("fooBar"), "nstestFooBar", "leaves capped strings intact");
 		equal($.mobile.nsNormalize("foo-bar"), "nstestFooBar", "changes dashed strings");
 		equal($.mobile.nsNormalize("foo-bar-bak"), "nstestFooBarBak", "changes multiple dashed strings");
+
+		// Reset the namespace property cache for the next test.
+		clearNSNormalizeDictionary();
 	});
 
 	test( "$.mobile.nsNormalize works properly with an empty namespace", function(){
@@ -47,12 +62,19 @@
 
 		$.mobile.ns = "";
 
+		// Start with a fresh namespace property cache, just in case
+		// the previous test mucked with namespaces.
+		clearNSNormalizeDictionary();
+
 		equal($.mobile.nsNormalize("foo"), "foo", "leaves uncapped and undashed");
 		equal($.mobile.nsNormalize("fooBar"), "fooBar", "leaves capped strings intact");
 		equal($.mobile.nsNormalize("foo-bar"), "fooBar", "changes dashed strings");
 		equal($.mobile.nsNormalize("foo-bar-bak"), "fooBarBak", "changes multiple dashed strings");
 
 		$.mobile.ns = realNs;
+
+		// Reset the namespace property cache for the next test.
+		clearNSNormalizeDictionary();
 	});
 
 	//data tests
diff --git a/tests/unit/core/index.html b/tests/unit/core/index.html
index 8cafe48d..eefc587c 100644
--- a/tests/unit/core/index.html
+++ b/tests/unit/core/index.html
@@ -11,7 +11,7 @@
 	<script src="../../../js/"></script>
 	<!-- added explicitly for library reloading (see testHelper )  -->
 	<script src="../../jquery.testHelper.js"></script>
-	<link rel="stylesheet"  href="../../../css/themes/default" />
+	<link rel="stylesheet"  href="../../../css/themes/default/" />
 	<link rel="stylesheet" href="../../../external/qunit.css"/>
 
 	<script src="core.js"></script>
diff --git a/tests/unit/event/index.html b/tests/unit/event/index.html
index bdcc89de..a495c9f2 100644
--- a/tests/unit/event/index.html
+++ b/tests/unit/event/index.html
@@ -9,7 +9,7 @@
 	<script src="../jquery.setNameSpace.js"></script>
 	<script src="../../../tests/jquery.testHelper.js"></script>
 	<script src="../../../js/jquery.mobile.event.js"></script>
-	<script src="../../../js"></script>
+	<script src="../../../js/"></script>
 
 
 	<link rel="stylesheet" href="../../../external/qunit.css"/>
diff --git a/tests/unit/init/index.html b/tests/unit/init/index.html
index 6e0403b8..0cff9c32 100644
--- a/tests/unit/init/index.html
+++ b/tests/unit/init/index.html
@@ -13,7 +13,7 @@
 	<!-- added explicitly for library reloading (see testHelper )  -->
 	<script src="../../../js/jquery.mobile.core.js"></script>
 	<script src="../../../js/jquery.mobile.init.js"></script>
-	<link rel="stylesheet"  href="../../../css/themes/default" />
+	<link rel="stylesheet"  href="../../../css/themes/default/" />
 	<link rel="stylesheet" href="../../../external/qunit.css"/>
 
 	<script src="../swarminject.js"></script>
diff --git a/tests/unit/init/nopage.html b/tests/unit/init/nopage.html
index 3074b8b5..218b01c3 100644
--- a/tests/unit/init/nopage.html
+++ b/tests/unit/init/nopage.html
@@ -10,7 +10,7 @@
 	<script src="../../../external/qunit.js"></script>
 	<script src="../../jquery.testHelper.js"></script>
 	<script src="init_core_nopage.js"></script>
-	<link rel="stylesheet"  href="../../../css/themes/default" />
+	<link rel="stylesheet"  href="../../../css/themes/default/" />
 	<link rel="stylesheet" href="../../../external/qunit.css"/>
 	<script src="../swarminject.js"></script>
 
diff --git a/tests/unit/listview/index.html b/tests/unit/listview/index.html
index 9a6ed594..92f42d67 100644
--- a/tests/unit/listview/index.html
+++ b/tests/unit/listview/index.html
@@ -9,7 +9,7 @@
 	<script src="../jquery.setNameSpace.js"></script>
 	<script src="../../../js/"></script>
 	<script src="../../jquery.testHelper.js"></script>
-	<link rel="stylesheet"  href="../../../css/themes/default" />
+	<link rel="stylesheet"  href="../../../css/themes/default/" />
 	<link rel="stylesheet" href="../../../external/qunit.css"/>
 	<script src="../../../external/qunit.js"></script>
 
diff --git a/tests/unit/listview/pushstate-tests.html b/tests/unit/listview/pushstate-tests.html
index 77126325..5ed009bf 100644
--- a/tests/unit/listview/pushstate-tests.html
+++ b/tests/unit/listview/pushstate-tests.html
@@ -9,7 +9,7 @@
 	<script src="../jquery.setNameSpace.js"></script>
 	<script src="../../../js/"></script>
 	<script src="../../jquery.testHelper.js"></script>
-	<link rel="stylesheet"  href="../../../css/themes/default" />
+	<link rel="stylesheet"  href="../../../css/themes/default/" />
 	<link rel="stylesheet" href="../../../external/qunit.css"/>
 	<script src="../../../external/qunit.js"></script>
 
diff --git a/tests/unit/navigation/navigation_core.js b/tests/unit/navigation/navigation_core.js
index a4bfb4e2..7d61bcff 100644
--- a/tests/unit/navigation/navigation_core.js
+++ b/tests/unit/navigation/navigation_core.js
@@ -520,6 +520,30 @@
 		]);
 	});
 
+	asyncTest( "Page title updates properly when clicking a link back to first page", function(){
+		var title = document.title;
+
+		$.testHelper.pageSequence([
+			function(){
+				$.testHelper.openPage("#ajax-title-page");
+			},
+
+			function(){
+				$("#titletest1").click();
+			},
+
+			function(){
+				same(document.title, "Title Tag");
+				$.mobile.activePage.find("#title-check-link").click();
+			},
+
+			function(){
+				same(document.title, title);
+				start();
+			}
+		]);
+	});
+
 	asyncTest( "Page title updates properly from title tag when loading an external page", function(){
 		$.testHelper.pageSequence([
 			function(){
diff --git a/tests/unit/navigation/title1.html b/tests/unit/navigation/title1.html
index e280211f..eb83eae7 100644
--- a/tests/unit/navigation/title1.html
+++ b/tests/unit/navigation/title1.html
@@ -6,7 +6,8 @@
 </head>
 <body>
 
-<div data-nstest-role="page"></div>
-
+<div data-nstest-role="page">
+  <a href="./" id="title-check-link">back to the parent page</a>
+</div>
 </body>
-</html>
\ No newline at end of file
+</html>
diff --git a/tests/unit/select/cached-tests.html b/tests/unit/select/cached-tests.html
index 3f8f74b9..f001e83f 100644
--- a/tests/unit/select/cached-tests.html
+++ b/tests/unit/select/cached-tests.html
@@ -9,7 +9,7 @@
 	<script src="../jquery.setNameSpace.js"></script>
 	<script src="../../../external/qunit.js"></script>
 	<script src="../../../tests/jquery.testHelper.js"></script>
-	<script src="../../../js"></script>
+	<script src="../../../js/"></script>
     <script src="select_cached.js"></script>
 
 	<link rel="stylesheet"  href="../../../css/themes/default/"/>
diff --git a/tests/unit/select/index.html b/tests/unit/select/index.html
index 047cce92..8043ab76 100644
--- a/tests/unit/select/index.html
+++ b/tests/unit/select/index.html
@@ -9,7 +9,7 @@
 	<script src="../jquery.setNameSpace.js"></script>
 	<script src="../../../external/qunit.js"></script>
 	<script src="../../../tests/jquery.testHelper.js"></script>
-	<script src="../../../js"></script>
+	<script src="../../../js/"></script>
 	<script src="select_events.js"></script>
 	<script src="select_native.js"></script>
 	<script src="select_cached.js"></script>
diff --git a/tests/unit/slider/slider_events.js b/tests/unit/slider/slider_events.js
index 19c8e33a..feca782d 100644
--- a/tests/unit/slider/slider_events.js
+++ b/tests/unit/slider/slider_events.js
@@ -203,16 +203,16 @@
 		var integerLeft, compare, css, threshold;
 
 		css = obj.css('left');
-		threshold = opts.pxThreshold || 10;
+		threshold = opts.pxThreshold || 0;
 
 		if( css.indexOf( "px" ) > -1 ) {
 			// parse the actual pixel value returned by the left css value
 			// and the pixels passed in for comparison
-			integerLeft = parseInt(css.replace("px", ""), 10 ),
+			integerLeft = Math.round( parseFloat( css.replace("px", "") ) ),
 			compare = parseInt( opts.pixels.replace( "px", "" ), 10 );
 
-			// check that the pixel value provided is within a given threshold default is 10px
-			ok( compare > integerLeft - threshold && compare < integerLeft + threshold, opts.message );
+			// check that the pixel value provided is within a given threshold; default is 0px
+			ok( compare >= integerLeft - threshold && compare <= integerLeft + threshold, opts.message );
 		} else {
 			equal( css, opts.percent, opts.message );
 		}
@@ -235,7 +235,7 @@
 			function() {
 				assertLeftCSS(handle, {
 					percent: '100%',
-					pixels: handle.css('width'),
+					pixels: handle.parent().css('width'),
 					message: 'handle starts on the right side'
 				});
 
@@ -249,10 +249,9 @@
 			function() {
 				assertLeftCSS(handle, {
 					percent: '100%',
-					pixels: handle.css('width'),
+					pixels: handle.parent().css('width'),
 					message: 'handle ends on the right side'
 				});
-				// equals(handle.css('left'), '100%', 'handle ends on the right side');
 
 				// initialize the switch
 				control.val('on').slider('refresh');
@@ -261,7 +260,7 @@
 			function() {
 				assertLeftCSS(handle, {
 					percent: '100%',
-					pixels: handle.css('width'),
+					pixels: handle.parent().css('width'),
 					message: 'handle starts on the right side'
 				});
 
@@ -269,7 +268,6 @@
 				offset = handle.offset();
 				slider.trigger( createEvent( "mousedown", handle[ 0 ], offset.left + 10, offset.top + 10 ) );
 				slider.trigger( createEvent( "mousemove", handle[ 0 ], offset.left - ( width / 2 ), offset.top + 10 ) );
-				//slider.trigger( createEvent( "mousemove", handle[ 0 ], offset.left - width + 20, offset.top + 10 ) );
 				slider.trigger( createEvent( "mouseup", handle[ 0 ], offset.left - ( width / 2 ), offset.top + 10 ) );
 			},
 
@@ -277,7 +275,7 @@
 				assertLeftCSS(handle, {
 					percent: '0%',
 					pixels: '0px',
-					message: 'handle starts on the right side'
+					message: 'handle ends on the left side'
 				});
 
 				start();
@@ -302,14 +300,14 @@
 			function() {
 				assertLeftCSS(handle, {
 					percent: '100%',
-					pixels: handle.css('width'),
+					pixels: handle.parent().css('width'),
 					message: 'handle starts on the right side'
 				});
 
 				// simulate dragging more than a half
 				offset = handle.offset();
 				slider.trigger( createEvent( "mousedown", handle[ 0 ], offset.left + 10, offset.top + 10 ) );
-				slider.trigger( createEvent( "mousemove", handle[ 0 ], offset.left - width + 70, offset.top + 10 ) );
+				slider.trigger( createEvent( "mousemove", handle[ 0 ], offset.left - ( width / 2 ), offset.top + 10 ) );
 			},
 
 			function() {
@@ -319,14 +317,14 @@
 					max = "100%";
 				} else {
 					min = "0px";
-					max = handle.css( 'width' );
+					max = handle.parent().css( 'width' );
 				}
 
 				notEqual(handle.css('left'), min, 'handle is not on the left side');
 				notEqual(handle.css('left'), max, 'handle is not on the right side');
 
 				// reset slider state so it is ready for other tests
-				slider.trigger( createEvent( "mouseup", handle[ 0 ], offset.left - width + 20, offset.top + 10 ) );
+				slider.trigger( createEvent( "mouseup", handle[ 0 ], offset.left - ( width / 2 ), offset.top + 10 ) );
 
 				start();
 			}
@@ -358,8 +356,8 @@
 			function() {
 				assertLeftCSS(handle, {
 					percent: '100%',
-					pixels: handle.css( 'width' ),
-					message: 'handle ends on the left side'
+					pixels: handle.parent().css( 'width' ),
+					message: 'handle ends on the right side'
 				});
 
 				// reset slider state so it is ready for other tests
diff --git a/tests/unit/textinput/external.html b/tests/unit/textinput/external.html
new file mode 100644
index 00000000..2d10dd62
--- /dev/null
+++ b/tests/unit/textinput/external.html
@@ -0,0 +1,38 @@
+<!DOCTYPE html>
+<html lang="en">
+<head>
+</head>
+<body>
+<div  data-nstest-role="page" id="foo">
+  <textarea id="page-load-autogrow">
+    Place holder text
+    Place holder text
+    Place holder text
+    Place holder text
+    Place holder text
+    Place holder text
+    Place holder text
+    Place holder text
+    Place holder text
+    Place holder text
+    Place holder text
+    Place holder text
+    Place holder text
+    Place holder text
+    Place holder text
+    Place holder text
+    Place holder text
+    Place holder text
+    Place holder text
+    Place holder text
+    Place holder text
+    Place holder text
+    Place holder text
+    Place holder text
+    Place holder text
+    Place holder text
+    Place holder text
+  </textarea>
+</div>
+</body>
+</html>
diff --git a/tests/unit/textinput/index.html b/tests/unit/textinput/index.html
index 849b38c5..1e6add37 100644
--- a/tests/unit/textinput/index.html
+++ b/tests/unit/textinput/index.html
@@ -10,7 +10,7 @@
 	<script src="../../jquery.testHelper.js"></script>
 	<script src="../../../external/qunit.js"></script>
 	<script src="../../../js/"></script>
-	<link rel="stylesheet"  href="../../../css/themes/default" />
+	<link rel="stylesheet"  href="../../../css/themes/default/" />
 	<link rel="stylesheet" href="../../../external/qunit.css"/>
 
 	<script src="textinput_core.js"></script>
@@ -46,6 +46,7 @@
 
   <textarea id="keyup-autogrow">
   </textarea>
+  <a href="external.html" id="external">external</a>
 </div>
 </body>
 </html>
diff --git a/tests/unit/textinput/textinput_core.js b/tests/unit/textinput/textinput_core.js
index 106e3975..41381f51 100644
--- a/tests/unit/textinput/textinput_core.js
+++ b/tests/unit/textinput/textinput_core.js
@@ -39,4 +39,23 @@
 
 		test.val("foo\n\n\n\n\n\n\n\n\n\n\n\n\n\n").trigger("keyup");
 	});
+
+	asyncTest( "text area should auto grow when the parent page is loaded via ajax", function() {
+		$.testHelper.pageSequence([
+			function() {
+				$("#external").click();
+			},
+
+			function() {
+				setTimeout(function() {
+					ok($.mobile.activePage.find( "textarea" )[0].clientHeight > 100, "text area's height has grown");
+					window.history.back();
+				}, 1000);
+			},
+
+			function() {
+				start();
+			}
+		]);
+	});
 })(jQuery);
\ No newline at end of file