diff --git a/docs/_assets/css/jqm-docs.css b/docs/_assets/css/jqm-docs.css
index 434c79cc..51df43a8 100644
--- a/docs/_assets/css/jqm-docs.css
+++ b/docs/_assets/css/jqm-docs.css
@@ -2,4 +2,5 @@
 .ui-mobile #jqm-homeheader { padding: 55px 25px 0; text-align: center }
 .ui-mobile #jqm-homeheader h1 { margin: 0 0 10px; }
 .ui-mobile #jqm-homeheader p { margin: 0; }
-.ui-mobile #jqm-version { text-indent: -99999px; background: url(../images/version.png) top right no-repeat; width: 119px; height: 122px; overflow: hidden; position: absolute; top: 0; right: 0; }
\ No newline at end of file
+.ui-mobile #jqm-version { text-indent: -99999px; background: url(../images/version.png) top right no-repeat; width: 119px; height: 122px; overflow: hidden; position: absolute; top: 0; right: 0; }
+.ui-mobile .jqm-themeswitcher { clear: both; margin: 20px 0 -15px; }
\ No newline at end of file
diff --git a/docs/_assets/js/jqm-docs.js b/docs/_assets/js/jqm-docs.js
index af183518..64bf7596 100644
--- a/docs/_assets/js/jqm-docs.js
+++ b/docs/_assets/js/jqm-docs.js
@@ -1,15 +1,18 @@
 //set up the theme switcher on the homepage
-$(function(){
-	var lvli = $('#jqm-home ul:eq(2) li:eq(1)');
-	lvli
-		.clone()
-		.find('a:eq(0)')
-		.attr('href', '#')
-		.text('Theme switcher')
-		.click(function(){
-			$.themeswitcher();
-			return false;
-		})
-		.end()
-		.insertBefore(lvli);
+$('div').live('pagecreate',function(){
+	if( !$(this).is('.ui-dialog')){ 
+		$('<a href="#">Switch theme</a>')
+			.buttonMarkup({
+				'icon':'gear',
+				'inline': true,
+				'shadow': false,
+				'theme': 'd'
+			})
+			.appendTo( $(this).find('.ui-content') )
+			.wrap('<div class="jqm-themeswitcher">')
+			.click(function(){
+				$.themeswitcher();
+				return false;
+			});
+	}	
 });
\ No newline at end of file
diff --git a/index.html b/index.html
index cf581e99..d729aea6 100755
--- a/index.html
+++ b/index.html
@@ -4,7 +4,7 @@
 	<title>jQuery UI Mobile Framework - Documentation</title>
 	<link rel="stylesheet"  href="themes/default" />
 	<link rel="stylesheet" href="docs/_assets/css/jqm-docs.css" />
-	<script type="text/javascript" src="js/all"></script>
+	<script src="js/all"></script>
 	<script src="experiments/themeswitcher/jquery.mobile.themeswitcher.js"></script>
 	<script src="docs/_assets/js/jqm-docs.js"></script>
 </head> 
@@ -41,15 +41,10 @@
 		<ul data-role="listview" data-inset="true" data-theme="c" data-dividertheme="b">
 			<li data-role="list-divider">Demos</li>
 			<li><a href="experiments/api-viewer/index.html">jQuery API browser</a></li>
-			<li><a href="experiments/photos/_photo1.html">Photo viewer</a></li>
-			<li><a href="experiments/converter/index.html">Converter</a></li>
 		</ul>
 		
-		<ul  data-role="listview" data-inset="true" data-theme="c" data-dividertheme="b">
-			<li data-role="list-divider">Experiments</li>
-			<li><a href="experiments/ui-datepicker">Date picker styling</a></li>
-		</ul>
+
 	</div>
 </div>
 </body>
-</html>
+</html>
\ No newline at end of file