<script language="JavaScript">
<!--
function _AN_global_var_init(){
	_AN_this_url = "/prx/000/";
	_AN_base_scheme = "https";
	_AN_base_host = "https://patch-diff.githubusercontent.com";
	_AN_base_path = "https://patch-diff.githubusercontent.com/raw/jquery-archive/jquery-mobile/pull/";
	_AN_encode_urls = 0;
	_AN_mpo = 1;
	_AN_md = 0;
	_AN_rel_urls = 0;
	_AN_nav_switch = 0;
	_AN_nav_allowurl = 1;
	_AN_nav_override = 0;
	_AN_has_iframe = 0;
	_AN_dbg_flags = null;
	_AN_nav_use_aaa = 1;
	_AN_expires_pass = 0;
	_AN_wrap_evthandlers = 0;
	_AN_rewrite_param_exact = 0;
	_AN_obj_params = {};
} 
_AN_global_var_init();
//-->
</script>
<script language="JavaScript" src="/prx/001/http/localh/an_util.js"></script>
<script language="JavaScript" src="/prx/001/http/localh/NSLib.js"></script>

diff --git a/demos/forms-field-contain/index.php b/demos/forms-field-contain/index.php
index c3871f6d3a5..bc2fe4e41e7 100644
--- a/demos/forms-field-contain/index.php
+++ b/demos/forms-field-contain/index.php
@@ -63,7 +63,7 @@
 			<div data-demo-html="true">
 				<div class="ui-field-contain">
 					<legend>Checkbox legend:</legend>
-					<label for="checkbox-b">Checkbox with legend:</label>
+					<label for="checkbox-b">Checkbox with legend</label>
 					<input type="checkbox" name="checkbox-b" id="checkbox-b">
 				</div>
 			</div><!--/demo-html -->
@@ -101,8 +101,8 @@
 				<div class="ui-field-contain">
 					<fieldset data-role="controlgroup">
 						<legend>Vertical controlgroup, buttons:</legend>
-						<button class="ui-shadow ui-button ui-corner-all">One <span class="ui-icon ui-icon-home"></span></button>
-						<input type="button" data-icon="back" data-iconpos="right" value="Two">
+						<button class="ui-shadow ui-button">One <span class="ui-icon ui-icon-home"></span></button>
+						<input type="button" value="Two">
 						<a href="#">Three <span class="ui-icon ui-icon-grid"></span></a>
 					</fieldset>
 				</div>
@@ -112,8 +112,8 @@
 				<div class="ui-field-contain">
 					<fieldset data-role="controlgroup" data-type="horizontal">
 						<legend>Horizontal controlgroup, buttons:</legend>
-						<button class="ui-shadow ui-button ui-corner-all">One <span class="ui-icon ui-icon-home"></span></button>
-						<input type="button" data-icon="back" data-iconpos="right" value="Two">
+						<button class="ui-shadow ui-button">One <span class="ui-icon ui-icon-home"></span></button>
+						<input type="button" value="Two">
 						<a href="#">Three <span class="ui-icon ui-icon-grid"></span></a>
 					</fieldset>
 				</div>
@@ -176,7 +176,7 @@
 					<fieldset data-role="controlgroup" data-type="horizontal">
 						<legend>Horizontal controlgroup, mixed:</legend>
 						<a href="#">Link <span class="ui-icon ui-icon-arrow-r"></span></a>
-						<button class="ui-shadow ui-button ui-corner-all ui-button-icon-only">Button <span class="ui-icon ui-icon-grid"></span></button>
+						<button class="ui-shadow ui-button ui-button-icon-only">Button <span class="ui-icon ui-icon-grid"></span></button>
 						<label for="select-v-1e" class="ui-hidden-accessible">Select</label>
 						<select name="select-v-1e" id="select-v-1e">
 							<option value="#">One</option>
@@ -197,7 +197,7 @@
 			<div data-demo-html="true">
 				<div class="ui-field-contain">
 					<label for="flip-1">Flip toggle:</label>
-					<select name="flip-1" id="flip-1" data-role="slider">
+					<select name="flip-1" id="flip-1" data-role="flipswitch">
 						<option value="off">Off</option>
 						<option value="on">On</option>
 					</select>
@@ -331,9 +331,9 @@
 				<div class="ui-field-contain">
 					<fieldset data-role="controlgroup" data-mini="true">
 						<legend>Vertical controlgroup, buttons:</legend>
-						<button class="ui-shadow ui-button ui-corner-all">One <span class="ui-icon ui-icon-home"></span></button>
-						<input type="button" data-icon="back" data-iconpos="right" value="Two">
-						<a href="#" class="ui-shadow ui-button ui-corner-all">Three <span class="ui-icon ui-icon-grid"></span></a>
+						<button class="ui-shadow ui-button">One <span class="ui-icon ui-icon-home"></span></button>
+						<input type="button" value="Two">
+						<a href="#" class="ui-shadow ui-button">Three <span class="ui-icon ui-icon-grid"></span></a>
 					</fieldset>
 				</div>
 			</div><!--/demo-html -->
@@ -342,9 +342,9 @@
 				<div class="ui-field-contain">
 					<fieldset data-role="controlgroup" data-mini="true" data-type="horizontal">
 						<legend>Horizontal controlgroup, buttons:</legend>
-						<button class="ui-shadow ui-button ui-corner-all">One <span class="ui-icon ui-icon-home"></span></button>
-						<input type="button" data-icon="back" data-iconpos="right" value="Two">
-						<a href="#" class="ui-shadow ui-button ui-corner-all">Three <span class="ui-icon ui-icon-grid"></span></a>
+						<button class="ui-shadow ui-button">One <span class="ui-icon ui-icon-home"></span></button>
+						<input type="button" value="Two">
+						<a href="#" class="ui-shadow ui-button">Three <span class="ui-icon ui-icon-grid"></span></a>
 					</fieldset>
 				</div>
 			</div><!--/demo-html -->
@@ -406,7 +406,7 @@
 					<fieldset data-role="controlgroup" data-mini="true" data-type="horizontal">
 						<legend>Horizontal controlgroup, mixed:</legend>
 						<a href="#">Link <span class="ui-icon ui-icon-arrow-r"></span></a>
-						<button class="ui-shadow ui-button ui-corner-all ui-button-icon-only">Button <span class="ui-icon ui-icon-grid"></span></button>
+						<button class="ui-shadow ui-button ui-button-icon-only">Button <span class="ui-icon ui-icon-grid"></span></button>
 						<label for="select-v-5e" class="ui-hidden-accessible">Select</label>
 						<select name="select-v-5e" id="select-v-5e">
 							<option value="#">One</option>
@@ -427,7 +427,7 @@
 			<div data-demo-html="true">
 				<div class="ui-field-contain">
 					<label for="flip-5">Flip toggle:</label>
-					<select name="flip-5" id="flip-5" data-role="slider" data-mini="true">
+					<select name="flip-5" id="flip-5" data-role="flipswitch" data-mini="true">
 						<option value="off">Off</option>
 						<option value="on">On</option>
 					</select>
diff --git a/demos/jqm-contents.php b/demos/jqm-contents.php
index 0c5cf7b4f86..fbee7b7b933 100644
--- a/demos/jqm-contents.php
+++ b/demos/jqm-contents.php
@@ -21,46 +21,6 @@
 		</ul>
 	</div>
 </li>
-<li>
-	<h3>Form Widgets</h3>
-	<div>
-		<ul>
-			<li data-filtertext="form button widget input button submit reset anchor link button element buttonmarkup buttons"><a href="../button/" data-ajax="false">Button widget</a></li>
-			<li>
-				<h3>Checkboxradio widget</h3>
-				<div>
-					<ul>
-						<li data-filtertext="form checkboxradio widget checkbox input checkboxes controlgroups"><a href="../checkboxradio-checkbox/" data-ajax="false">Checkboxes</a></li>
-						<li data-filtertext="form checkboxradio widget radio input radio buttons controlgroups"><a href="../checkboxradio-radio/" data-ajax="false">Radio buttons</a></li>
-					</ul>
-				</div>
-			</li>
-			<li data-filtertext="form datepicker widget date input 3rd party demo" class="jqm-3rd-party"><a href="../datepicker/" data-ajax="false">Datepicker widget</a></li>
-			<li>
-				<h3>Selectmenu widget</h3>
-				<div>
-					<ul>
-						<li data-filtertext="form selectmenu widget select input custom select menu selects"><a href="../selectmenu/" data-ajax="false">Selectmenu</a></li>
-						<li data-filtertext="form custom select menu selectmenu widget custom menu option optgroup multiple selects"><a href="../selectmenu-custom/" data-ajax="false">Custom select menu</a></li>
-					</ul>
-				</div>
-			</li>
-			<li>
-				<h3>Slider widget</h3>
-				<div>
-					<ul>
-						<li data-filtertext="form slider widget range input single sliders"><a href="../slider/" data-ajax="false">Slider</a></li>
-						<li data-filtertext="form slider widget flipswitch slider binary select flip toggle switch"><a href="../slider-flipswitch/" data-ajax="false">Slider flip toggle switch</a></li>
-						<li data-filtertext="form slider tooltip handle value input range sliders"><a href="../slider-tooltip/" data-ajax="false">Slider tooltip</a></li>
-					</ul>
-				</div>
-			</li>
-			<li data-filtertext="form rangeslider widget dual sliders dual handle sliders range input"><a href="../rangeslider/" data-ajax="false">Rangeslider widget</a></li>
-			<li data-filtertext="form flipswitch widget flip toggle switch binary select checkbox input"><a href="../flipswitch/" data-ajax="false">Flipswitch widget</a></li>
-			<li data-filtertext="form textinput widget text input textarea number date time tel email file color password"><a href="../textinput/" data-ajax="false">Textinput widget</a></li>
-		</ul>
-	</div>
-</li>
 <li>
 	<h3>Icons</h3>
 	<div>
diff --git a/demos/slider-tooltip/index.php b/demos/slider-tooltip/index.php
index 54e6be3733e..528b6f19f67 100644
--- a/demos/slider-tooltip/index.php
+++ b/demos/slider-tooltip/index.php
@@ -33,8 +33,8 @@
               <input type="range" name="slider-2" id="slider-2" min="0" max="100" value="50" data-show-value="true">
               <label for="slider-3">Both options together:</label>
               <input type="range" name="slider-3" id="slider-3" min="0" max="100" value="50" data-show-value="true" data-popup-enabled="true">
-              <label for="slider-3">Both options together (mini):</label>
-              <input type="range" name="slider-3" id="slider-3" min="0" max="100" value="50" data-show-value="true" data-popup-enabled="true" data-mini="true">
+              <label for="slider-4">Both options together (mini):</label>
+              <input type="range" name="slider-4" id="slider-4" min="0" max="100" value="50" data-show-value="true" data-popup-enabled="true" data-mini="true">
             </form>
         </div><!-- /demo-html -->
 
