diff --git a/demos/calendar/buttonbar.html b/demos/calendar/buttonbar.html
index de2ae22dc..ac519247c 100644
--- a/demos/calendar/buttonbar.html
+++ b/demos/calendar/buttonbar.html
@@ -4,15 +4,18 @@
 	<meta charset="utf-8">
 	<title>jQuery UI Calendar - Display button bar</title>
 	<link rel="stylesheet" href="../../themes/base/all.css">
+	<script src="../../external/cldrjs/cldr.js"></script>
+	<script src="../../external/cldrjs/cldr/supplemental.js"></script>
+	<script src="../../external/cldrjs/cldr/event.js"></script>
 	<script src="../../external/jquery/jquery.js"></script>
 	<script src="../../external/globalize/globalize.js"></script>
-	<script src="../../external/date.js"></script>
+	<script src="../../external/globalize/globalize/date.js"></script>
 	<script src="../../external/localization.js"></script>
+	<script src="../../ui/calendar/date.js"></script>
 	<script src="../../ui/core.js"></script>
 	<script src="../../ui/widget.js"></script>
 	<script src="../../ui/button.js"></script>
 	<script src="../../ui/calendar.js"></script>
-	<script src="../../ui/position.js"></script>
 	<link rel="stylesheet" href="../demos.css">
 	<script>
 	$(function() {
diff --git a/demos/calendar/default.html b/demos/calendar/default.html
index a67c2d702..e22cc797f 100644
--- a/demos/calendar/default.html
+++ b/demos/calendar/default.html
@@ -4,15 +4,18 @@
 	<meta charset="utf-8">
 	<title>jQuery UI Calendar - Default functionality</title>
 	<link rel="stylesheet" href="../../themes/base/all.css">
+	<script src="../../external/cldrjs/cldr.js"></script>
+	<script src="../../external/cldrjs/cldr/supplemental.js"></script>
+	<script src="../../external/cldrjs/cldr/event.js"></script>
 	<script src="../../external/jquery/jquery.js"></script>
 	<script src="../../external/globalize/globalize.js"></script>
-	<script src="../../external/date.js"></script>
+	<script src="../../external/globalize/globalize/date.js"></script>
 	<script src="../../external/localization.js"></script>
+	<script src="../../ui/calendar/date.js"></script>
 	<script src="../../ui/core.js"></script>
 	<script src="../../ui/widget.js"></script>
 	<script src="../../ui/button.js"></script>
 	<script src="../../ui/calendar.js"></script>
-	<script src="../../ui/position.js"></script>
 	<link rel="stylesheet" href="../demos.css">
 	<script>
 	$(function() {
diff --git a/demos/calendar/dropdown-month-year.html b/demos/calendar/dropdown-month-year.html
index 050a89157..71b8777cb 100644
--- a/demos/calendar/dropdown-month-year.html
+++ b/demos/calendar/dropdown-month-year.html
@@ -4,15 +4,18 @@
 	<meta charset="utf-8">
 	<title>jQuery UI Calendar - Display month &amp; year menus</title>
 	<link rel="stylesheet" href="../../themes/base/all.css">
+	<script src="../../external/cldrjs/cldr.js"></script>
+	<script src="../../external/cldrjs/cldr/supplemental.js"></script>
+	<script src="../../external/cldrjs/cldr/event.js"></script>
 	<script src="../../external/jquery/jquery.js"></script>
 	<script src="../../external/globalize/globalize.js"></script>
-	<script src="../../external/date.js"></script>
+	<script src="../../external/globalize/globalize/date.js"></script>
 	<script src="../../external/localization.js"></script>
+	<script src="../../ui/calendar/date.js"></script>
 	<script src="../../ui/core.js"></script>
 	<script src="../../ui/widget.js"></script>
 	<script src="../../ui/button.js"></script>
 	<script src="../../ui/calendar.js"></script>
-	<script src="../../ui/position.js"></script>
 	<link rel="stylesheet" href="../demos.css">
 	<script>
 	$(function() {
diff --git a/demos/calendar/localization.html b/demos/calendar/localization.html
index 9b1e7d070..5c325d0a0 100644
--- a/demos/calendar/localization.html
+++ b/demos/calendar/localization.html
@@ -4,25 +4,32 @@
 	<meta charset="utf-8">
 	<title>jQuery UI Calendar - Localize calendar</title>
 	<link rel="stylesheet" href="../../themes/base/all.css">
+	<script src="../../external/cldrjs/cldr.js"></script>
+	<script src="../../external/cldrjs/cldr/supplemental.js"></script>
+	<script src="../../external/cldrjs/cldr/event.js"></script>
 	<script src="../../external/jquery/jquery.js"></script>
 	<script src="../../external/globalize/globalize.js"></script>
-	<script src="../../external/date.js"></script>
+	<script src="../../external/globalize/globalize/date.js"></script>
 	<script src="../../external/localization.js"></script>
+	<script src="../../ui/calendar/date.js"></script>
 	<script src="../../ui/core.js"></script>
 	<script src="../../ui/widget.js"></script>
 	<script src="../../ui/button.js"></script>
 	<script src="../../ui/calendar.js"></script>
-	<script src="../../ui/position.js"></script>
 	<link rel="stylesheet" href="../demos.css">
 	<script>
 	$(function() {
 		var calendar = $( "#calendar" ),
 			select = $( "#locale" );
 
-		Globalize.locale( select.val() );
-		calendar.calendar();
+		calendar.calendar({
+			locale: select.val()
+		});
+
 		select.change( function() {
-			Globalize.locale( $( this ).val() );
+			calendar.calendar( "option", {
+				locale: select.val()
+			});
 			calendar.calendar( "valueAsDate", calendar.calendar( "valueAsDate" ) );
 		});
 	});
@@ -32,8 +39,11 @@
 
 <div id="calendar"></div>
 <select id="locale">
-	<option value="de-DE" selected>German (Deutsch)</option>
+	<option value="ar">Arabic</option>
+	<option value="de" selected>German</option>
 	<option value="en">English</option>
+	<option value="es">Spanish</option>
+	<option value="zh">Chinese Simplified</option>
 </select>
 
 <div class="demo-description">
diff --git a/demos/calendar/min-max.html b/demos/calendar/min-max.html
index fa8471e2c..953e78883 100644
--- a/demos/calendar/min-max.html
+++ b/demos/calendar/min-max.html
@@ -4,15 +4,18 @@
 	<meta charset="utf-8">
 	<title>jQuery UI Calendar - Restrict date range</title>
 	<link rel="stylesheet" href="../../themes/base/all.css">
+	<script src="../../external/cldrjs/cldr.js"></script>
+	<script src="../../external/cldrjs/cldr/supplemental.js"></script>
+	<script src="../../external/cldrjs/cldr/event.js"></script>
 	<script src="../../external/jquery/jquery.js"></script>
 	<script src="../../external/globalize/globalize.js"></script>
-	<script src="../../external/date.js"></script>
+	<script src="../../external/globalize/globalize/date.js"></script>
 	<script src="../../external/localization.js"></script>
+	<script src="../../ui/calendar/date.js"></script>
 	<script src="../../ui/core.js"></script>
 	<script src="../../ui/widget.js"></script>
 	<script src="../../ui/button.js"></script>
 	<script src="../../ui/calendar.js"></script>
-	<script src="../../ui/position.js"></script>
 	<link rel="stylesheet" href="../demos.css">
 	<script>
 	$(function() {
diff --git a/demos/calendar/multiple-months.html b/demos/calendar/multiple-months.html
index 8366b2204..99248d8c2 100644
--- a/demos/calendar/multiple-months.html
+++ b/demos/calendar/multiple-months.html
@@ -4,15 +4,18 @@
 	<meta charset="utf-8">
 	<title>jQuery UI Calendar - Display multiple months</title>
 	<link rel="stylesheet" href="../../themes/base/all.css">
+	<script src="../../external/cldrjs/cldr.js"></script>
+	<script src="../../external/cldrjs/cldr/supplemental.js"></script>
+	<script src="../../external/cldrjs/cldr/event.js"></script>
 	<script src="../../external/jquery/jquery.js"></script>
 	<script src="../../external/globalize/globalize.js"></script>
-	<script src="../../external/date.js"></script>
+	<script src="../../external/globalize/globalize/date.js"></script>
 	<script src="../../external/localization.js"></script>
+	<script src="../../ui/calendar/date.js"></script>
 	<script src="../../ui/core.js"></script>
 	<script src="../../ui/widget.js"></script>
 	<script src="../../ui/button.js"></script>
 	<script src="../../ui/calendar.js"></script>
-	<script src="../../ui/position.js"></script>
 	<link rel="stylesheet" href="../demos.css">
 	<script>
 	$(function() {
diff --git a/demos/calendar/other-months.html b/demos/calendar/other-months.html
index 0228c62df..5f891b202 100644
--- a/demos/calendar/other-months.html
+++ b/demos/calendar/other-months.html
@@ -4,15 +4,18 @@
 	<meta charset="utf-8">
 	<title>jQuery UI Calendar - Dates in other months</title>
 	<link rel="stylesheet" href="../../themes/base/all.css">
+	<script src="../../external/cldrjs/cldr.js"></script>
+	<script src="../../external/cldrjs/cldr/supplemental.js"></script>
+	<script src="../../external/cldrjs/cldr/event.js"></script>
 	<script src="../../external/jquery/jquery.js"></script>
 	<script src="../../external/globalize/globalize.js"></script>
-	<script src="../../external/date.js"></script>
+	<script src="../../external/globalize/globalize/date.js"></script>
 	<script src="../../external/localization.js"></script>
+	<script src="../../ui/calendar/date.js"></script>
 	<script src="../../ui/core.js"></script>
 	<script src="../../ui/widget.js"></script>
 	<script src="../../ui/button.js"></script>
 	<script src="../../ui/calendar.js"></script>
-	<script src="../../ui/position.js"></script>
 	<link rel="stylesheet" href="../demos.css">
 	<script>
 	$(function() {
diff --git a/demos/calendar/show-week.html b/demos/calendar/show-week.html
index 08687aa0d..6443b6de1 100644
--- a/demos/calendar/show-week.html
+++ b/demos/calendar/show-week.html
@@ -4,15 +4,18 @@
 	<meta charset="utf-8">
 	<title>jQuery UI Calendar - Show week of the year</title>
 	<link rel="stylesheet" href="../../themes/base/all.css">
+	<script src="../../external/cldrjs/cldr.js"></script>
+	<script src="../../external/cldrjs/cldr/supplemental.js"></script>
+	<script src="../../external/cldrjs/cldr/event.js"></script>
 	<script src="../../external/jquery/jquery.js"></script>
 	<script src="../../external/globalize/globalize.js"></script>
-	<script src="../../external/date.js"></script>
+	<script src="../../external/globalize/globalize/date.js"></script>
 	<script src="../../external/localization.js"></script>
+	<script src="../../ui/calendar/date.js"></script>
 	<script src="../../ui/core.js"></script>
 	<script src="../../ui/widget.js"></script>
 	<script src="../../ui/button.js"></script>
 	<script src="../../ui/calendar.js"></script>
-	<script src="../../ui/position.js"></script>
 	<link rel="stylesheet" href="../demos.css">
 	<script>
 	$(function() {
diff --git a/demos/datepicker/animation.html b/demos/datepicker/animation.html
index d4549289e..eda917386 100644
--- a/demos/datepicker/animation.html
+++ b/demos/datepicker/animation.html
@@ -9,10 +9,9 @@
 	<script src="../../external/cldrjs/cldr/event.js"></script>
 	<script src="../../external/jquery/jquery.js"></script>
 	<script src="../../external/globalize/globalize.js"></script>
-+	<script src="../../external/globalize/globalize/date.js"></script>
-+	<script src="../../external/globalize/globalize/message.js"></script>
+	<script src="../../external/globalize/globalize/date.js"></script>
 	<script src="../../external/localization.js"></script>
-	<script src="../../external/date.js"></script>
+	<script src="../../ui/calendar/date.js"></script>
 	<script src="../../ui/core.js"></script>
 	<script src="../../ui/widget.js"></script>
 	<script src="../../ui/effect.js"></script>
diff --git a/demos/datepicker/date-formats.html b/demos/datepicker/date-formats.html
index d2b07a796..e17252901 100644
--- a/demos/datepicker/date-formats.html
+++ b/demos/datepicker/date-formats.html
@@ -9,15 +9,14 @@
 	<script src="../../external/cldrjs/cldr/event.js"></script>
 	<script src="../../external/jquery/jquery.js"></script>
 	<script src="../../external/globalize/globalize.js"></script>
-+	<script src="../../external/globalize/globalize/date.js"></script>
-+	<script src="../../external/globalize/globalize/message.js"></script>
+	<script src="../../external/globalize/globalize/date.js"></script>
 	<script src="../../external/localization.js"></script>
-	<script src="../../external/date.js"></script>
+	<script src="../../ui/calendar/date.js"></script>
 	<script src="../../ui/core.js"></script>
 	<script src="../../ui/widget.js"></script>
 	<script src="../../ui/button.js"></script>
-	<script src="../../ui/position.js"></script>
 	<script src="../../ui/calendar.js"></script>
+	<script src="../../ui/position.js"></script>
 	<script src="../../ui/datepicker.js"></script>
 	<link rel="stylesheet" href="../demos.css">
 	<script>
diff --git a/demos/datepicker/default.html b/demos/datepicker/default.html
index 8dc56a505..89f1ceaa9 100644
--- a/demos/datepicker/default.html
+++ b/demos/datepicker/default.html
@@ -9,15 +9,14 @@
 	<script src="../../external/cldrjs/cldr/event.js"></script>
 	<script src="../../external/jquery/jquery.js"></script>
 	<script src="../../external/globalize/globalize.js"></script>
-+	<script src="../../external/globalize/globalize/date.js"></script>
-+	<script src="../../external/globalize/globalize/message.js"></script>
+	<script src="../../external/globalize/globalize/date.js"></script>
 	<script src="../../external/localization.js"></script>
-	<script src="../../external/date.js"></script>
+	<script src="../../ui/calendar/date.js"></script>
 	<script src="../../ui/core.js"></script>
 	<script src="../../ui/widget.js"></script>
 	<script src="../../ui/button.js"></script>
-	<script src="../../ui/position.js"></script>
 	<script src="../../ui/calendar.js"></script>
+	<script src="../../ui/position.js"></script>
 	<script src="../../ui/datepicker.js"></script>
 	<link rel="stylesheet" href="../demos.css">
 	<script>
diff --git a/demos/datepicker/icon-trigger.html b/demos/datepicker/icon-trigger.html
index e95b7857e..4faeb31c7 100644
--- a/demos/datepicker/icon-trigger.html
+++ b/demos/datepicker/icon-trigger.html
@@ -9,14 +9,13 @@
 	<script src="../../external/cldrjs/cldr/event.js"></script>
 	<script src="../../external/jquery/jquery.js"></script>
 	<script src="../../external/globalize/globalize.js"></script>
-+	<script src="../../external/globalize/globalize/date.js"></script>
-+	<script src="../../external/globalize/globalize/message.js"></script>
+	<script src="../../external/globalize/globalize/date.js"></script>
 	<script src="../../external/localization.js"></script>
-	<script src="../../external/date.js"></script>
+	<script src="../../ui/calendar/date.js"></script>
 	<script src="../../ui/core.js"></script>
 	<script src="../../ui/widget.js"></script>
-	<script src="../../ui/calendar.js"></script>
 	<script src="../../ui/button.js"></script>
+	<script src="../../ui/calendar.js"></script>
 	<script src="../../ui/position.js"></script>
 	<script src="../../ui/datepicker.js"></script>
 	<link rel="stylesheet" href="../demos.css">