diff --git a/demos/accordion/collapsible.html b/demos/accordion/collapsible.html
index 8002e6556..913e82aa5 100644
--- a/demos/accordion/collapsible.html
+++ b/demos/accordion/collapsible.html
@@ -4,17 +4,12 @@
 	<meta charset="utf-8">
 	<title>jQuery UI Accordion - Collapse content</title>
 	<link rel="stylesheet" href="../../themes/base/all.css">
-	<script src="../../external/jquery/jquery.js"></script>
-	<script src="../../ui/core.js"></script>
-	<script src="../../ui/widget.js"></script>
-	<script src="../../ui/accordion.js"></script>
 	<link rel="stylesheet" href="../demos.css">
-	<script>
-	$(function() {
+	<script src="../../external/requirejs/require.js"></script>
+	<script src="../bootstrap.js">
 		$( "#accordion" ).accordion({
 			collapsible: true
 		});
-	});
 	</script>
 </head>
 <body>
diff --git a/demos/accordion/custom-icons.html b/demos/accordion/custom-icons.html
index 9d43c3c8b..4828ffd45 100644
--- a/demos/accordion/custom-icons.html
+++ b/demos/accordion/custom-icons.html
@@ -4,14 +4,9 @@
 	<meta charset="utf-8">
 	<title>jQuery UI Accordion - Customize icons</title>
 	<link rel="stylesheet" href="../../themes/base/all.css">
-	<script src="../../external/jquery/jquery.js"></script>
-	<script src="../../ui/core.js"></script>
-	<script src="../../ui/widget.js"></script>
-	<script src="../../ui/accordion.js"></script>
-	<script src="../../ui/button.js"></script>
 	<link rel="stylesheet" href="../demos.css">
-	<script>
-	$(function() {
+	<script src="../../external/requirejs/require.js"></script>
+	<script src="../bootstrap.js" data-modules="button">
 		var icons = {
 			header: "ui-icon-circle-arrow-e",
 			activeHeader: "ui-icon-circle-arrow-s"
@@ -26,7 +21,6 @@
 				$( "#accordion" ).accordion( "option", "icons", icons );
 			}
 		});
-	});
 	</script>
 </head>
 <body>
diff --git a/demos/accordion/default.html b/demos/accordion/default.html
index e5476378b..cbe8016b6 100644
--- a/demos/accordion/default.html
+++ b/demos/accordion/default.html
@@ -4,15 +4,10 @@
 	<meta charset="utf-8">
 	<title>jQuery UI Accordion - Default functionality</title>
 	<link rel="stylesheet" href="../../themes/base/all.css">
-	<script src="../../external/jquery/jquery.js"></script>
-	<script src="../../ui/core.js"></script>
-	<script src="../../ui/widget.js"></script>
-	<script src="../../ui/accordion.js"></script>
 	<link rel="stylesheet" href="../demos.css">
-	<script>
-	$(function() {
+	<script src="../../external/requirejs/require.js"></script>
+	<script src="../bootstrap.js">
 		$( "#accordion" ).accordion();
-	});
 	</script>
 </head>
 <body>
diff --git a/demos/accordion/fillspace.html b/demos/accordion/fillspace.html
index 0bc503c61..b1d41777b 100644
--- a/demos/accordion/fillspace.html
+++ b/demos/accordion/fillspace.html
@@ -4,12 +4,6 @@
 	<meta charset="utf-8">
 	<title>jQuery UI Accordion - Fill space</title>
 	<link rel="stylesheet" href="../../themes/base/all.css">
-	<script src="../../external/jquery/jquery.js"></script>
-	<script src="../../ui/core.js"></script>
-	<script src="../../ui/widget.js"></script>
-	<script src="../../ui/mouse.js"></script>
-	<script src="../../ui/resizable.js"></script>
-	<script src="../../ui/accordion.js"></script>
 	<link rel="stylesheet" href="../demos.css">
 	<style>
 	#accordion-resizer {
@@ -18,13 +12,12 @@
 		height: 220px;
 	}
 	</style>
-	<script>
-	$(function() {
+	<script src="../../external/requirejs/require.js"></script>
+	<script src="../bootstrap.js" data-modules="resizable">
 		$( "#accordion" ).accordion({
 			heightStyle: "fill"
 		});
-	});
-	$(function() {
+
 		$( "#accordion-resizer" ).resizable({
 			minHeight: 140,
 			minWidth: 200,
@@ -32,7 +25,6 @@
 				$( "#accordion" ).accordion( "refresh" );
 			}
 		});
-	});
 	</script>
 </head>
 <body>
diff --git a/demos/accordion/hoverintent.html b/demos/accordion/hoverintent.html
deleted file mode 100644
index ad15721f3..000000000
--- a/demos/accordion/hoverintent.html
+++ /dev/null
@@ -1,148 +0,0 @@
-<!doctype html>
-<html lang="en">
-<head>
-	<meta charset="utf-8">
-	<title>jQuery UI Accordion - Open on hoverintent</title>
-	<link rel="stylesheet" href="../../themes/base/all.css">
-	<script src="../../external/jquery/jquery.js"></script>
-	<script src="../../ui/core.js"></script>
-	<script src="../../ui/widget.js"></script>
-	<script src="../../ui/accordion.js"></script>
-	<link rel="stylesheet" href="../demos.css">
-	<script>
-	$(function() {
-		$( "#accordion" ).accordion({
-			event: "click hoverintent"
-		});
-	});
-
-	/*
-	 * hoverIntent | Copyright 2011 Brian Cherne
-	 * http://cherne.net/brian/resources/jquery.hoverIntent.html
-	 * modified by the jQuery UI team
-	 */
-	$.event.special.hoverintent = {
-		setup: function() {
-			$( this ).on( "mouseover", jQuery.event.special.hoverintent.handler );
-		},
-		teardown: function() {
-			$( this ).off( "mouseover", jQuery.event.special.hoverintent.handler );
-		},
-		handler: function( event ) {
-			var currentX, currentY, timeout,
-				args = arguments,
-				target = $( event.target ),
-				previousX = event.pageX,
-				previousY = event.pageY;
-
-			function track( event ) {
-				currentX = event.pageX;
-				currentY = event.pageY;
-			};
-
-			function clear() {
-				target
-					.off( "mousemove", track )
-					.off( "mouseout", clear );
-				clearTimeout( timeout );
-			}
-
-			function handler() {
-				var prop,
-					orig = event;
-
-				if ( ( Math.abs( previousX - currentX ) +
-						Math.abs( previousY - currentY ) ) < 7 ) {
-					clear();
-
-					event = $.Event( "hoverintent" );
-					for ( prop in orig ) {
-						if ( !( prop in event ) ) {
-							event[ prop ] = orig[ prop ];
-						}
-					}
-					// Prevent accessing the original event since the new event
-					// is fired asynchronously and the old event is no longer
-					// usable (#6028)
-					delete event.originalEvent;
-
-					target.trigger( event );
-				} else {
-					previousX = currentX;
-					previousY = currentY;
-					timeout = setTimeout( handler, 100 );
-				}
-			}
-
-			timeout = setTimeout( handler, 100 );
-			target.on({
-				mousemove: track,
-				mouseout: clear
-			});
-		}
-	};
-	</script>
-</head>
-<body>
-
-<div id="accordion">
-	<h3>Section 1</h3>
-	<div>
-		<p>
-		Mauris mauris ante, blandit et, ultrices a, suscipit eget, quam. Integer
-		ut neque. Vivamus nisi metus, molestie vel, gravida in, condimentum sit
-		amet, nunc. Nam a nibh. Donec suscipit eros. Nam mi. Proin viverra leo ut
-		odio. Curabitur malesuada. Vestibulum a velit eu ante scelerisque vulputate.
-		</p>
-	</div>
-	<h3>Section 2</h3>
-	<div>
-		<p>
-		Sed non urna. Donec et ante. Phasellus eu ligula. Vestibulum sit amet
-		purus. Vivamus hendrerit, dolor at aliquet laoreet, mauris turpis porttitor
-		velit, faucibus interdum tellus libero ac justo. Vivamus non quam. In
-		suscipit faucibus urna.
-		</p>
-	</div>
-	<h3>Section 3</h3>
-	<div>
-		<p>
-		Nam enim risus, molestie et, porta ac, aliquam ac, risus. Quisque lobortis.
-		Phasellus pellentesque purus in massa. Aenean in pede. Phasellus ac libero
-		ac tellus pellentesque semper. Sed ac felis. Sed commodo, magna quis
-		lacinia ornare, quam ante aliquam nisi, eu iaculis leo purus venenatis dui.
-		</p>
-		<ul>
-			<li>List item one</li>
-			<li>List item two</li>
-			<li>List item three</li>
-		</ul>
-	</div>
-	<h3>Section 4</h3>
-	<div>
-		<p>
-		Cras dictum. Pellentesque habitant morbi tristique senectus et netus
-		et malesuada fames ac turpis egestas. Vestibulum ante ipsum primis in
-		faucibus orci luctus et ultrices posuere cubilia Curae; Aenean lacinia
-		mauris vel est.
-		</p>
-		<p>
-		Suspendisse eu nisl. Nullam ut libero. Integer dignissim consequat lectus.
-		Class aptent taciti sociosqu ad litora torquent per conubia nostra, per
-		inceptos himenaeos.
-		</p>
-	</div>
-</div>
-
-<div class="demo-description">
-<p>
-Click headers to expand/collapse content that is broken into logical sections, much like tabs.
-Optionally, toggle sections open/closed on mouseover.
-</p>
-<p>
-The underlying HTML markup is a series of headers (H3 tags) and content divs so the content is
-usable without JavaScript.
-</p>
-</div>
-</body>
-</html>
diff --git a/demos/accordion/index.html b/demos/accordion/index.html
index 1d8a2892d..4f364a299 100644
--- a/demos/accordion/index.html
+++ b/demos/accordion/index.html
@@ -12,7 +12,6 @@
 	<li><a href="fillspace.html">Fill space</a></li>
 	<li><a href="no-auto-height.html">No auto height</a></li>
 	<li><a href="collapsible.html">Collapse content</a></li>
-	<li><a href="hoverintent.html">Open on hoverintent</a></li>
 	<li><a href="custom-icons.html">Customize icons</a></li>
 	<li><a href="sortable.html">Sortable</a></li>
 </ul>
diff --git a/demos/accordion/no-auto-height.html b/demos/accordion/no-auto-height.html
index c1375c3ef..48626ead0 100644
--- a/demos/accordion/no-auto-height.html
+++ b/demos/accordion/no-auto-height.html
@@ -4,17 +4,12 @@
 	<meta charset="utf-8">
 	<title>jQuery UI Accordion - No auto height</title>
 	<link rel="stylesheet" href="../../themes/base/all.css">
-	<script src="../../external/jquery/jquery.js"></script>
-	<script src="../../ui/core.js"></script>
-	<script src="../../ui/widget.js"></script>
-	<script src="../../ui/accordion.js"></script>
 	<link rel="stylesheet" href="../demos.css">
-	<script>
-	$(function() {
+	<script src="../../external/requirejs/require.js"></script>
+	<script src="../bootstrap.js">
 		$( "#accordion" ).accordion({
 			heightStyle: "content"
 		});
-	});
 	</script>
 </head>
 <body>
diff --git a/demos/accordion/sortable.html b/demos/accordion/sortable.html
index 13356995f..6e66c2e9c 100644
--- a/demos/accordion/sortable.html
+++ b/demos/accordion/sortable.html
@@ -4,19 +4,9 @@
 	<meta charset="utf-8">
 	<title>jQuery UI Accordion - Sortable</title>
 	<link rel="stylesheet" href="../../themes/base/all.css">
-	<script src="../../external/jquery/jquery.js"></script>
-	<script src="../../ui/core.js"></script>
-	<script src="../../ui/widget.js"></script>
-	<script src="../../ui/mouse.js"></script>
-	<script src="../../ui/sortable.js"></script>
-	<script src="../../ui/accordion.js"></script>
 	<link rel="stylesheet" href="../demos.css">
-	<style>
-	/* IE has layout issues when sorting (see #5413) */
-	.group { zoom: 1 }
-	</style>
-	<script>
-	$(function() {
+	<script src="../../external/requirejs/require.js"></script>
+	<script src="../bootstrap.js" data-modules="sortable">
 		$( "#accordion" )
 			.accordion({
 				header: "> div > h3"
@@ -33,7 +23,6 @@
 					$( this ).accordion( "refresh" );
 				}
 			});
-	});
 	</script>
 </head>
 <body>
