diff --git a/demos/functional/index.html b/demos/functional/index.html
index cbf4c993a..8d68d19a9 100644
--- a/demos/functional/index.html
+++ b/demos/functional/index.html
@@ -15,7 +15,7 @@
 			<link rel="stylesheet" href="css/base.css" type="text/css" media="screen">
 			<link rel="stylesheet" href="css/functional_demos.css" type="text/css" media="screen">
 			<link rel="stylesheet" href="css/chilli-recipes.css" type="text/css" media="screen">
-			<link rel="stylesheet" href="../../themes/default/ui.all.css" type="text/css" media="screen" title="Flora (Default)" />
+			<link rel="stylesheet" href="../../themes/default/ui.all.css" type="text/css" />
 
 			<script type="text/javascript" src="../../jquery-1.2.6.js"></script>
 
@@ -101,7 +101,7 @@
 			</script>
 	</head>
 
-<body class="flora" id="functional_demos">
+<body id="functional_demos">
 <div id="wrapper">
 	<div id="banner">
 		<h1 class="logo">
diff --git a/demos/functional/templates/ui.tabs.php b/demos/functional/templates/ui.tabs.php
index cf4e89e81..b6c977d7c 100644
--- a/demos/functional/templates/ui.tabs.php
+++ b/demos/functional/templates/ui.tabs.php
@@ -20,7 +20,7 @@
 
 			{
 				title: 'Simple Tabs',
-				html: ['<div><ul id="divTabs" class="flora">',
+				html: ['<div><ul id="divTabs">',
 							'<li><a href="#tabs-fragment-1"><span>One</span></a></li>',
                 			'<li><a href="#tabs-fragment-2"><span>Two</span></a></li>',
                 			'<li><a href="#tabs-fragment-3"><span>Three</span></a></li>',
@@ -51,7 +51,7 @@
 			},
 			{
 				title: 'Add A Tab',
-				html: ['<div><ul id="divAddTabs" class="flora">',
+				html: ['<div><ul id="divAddTabs">',
 							'<li><a href="#addtabs-fragment-1"><span>One</span></a></li>',
                 			'<li><a href="#addtabs-fragment-2"><span>Two</span></a></li>',
                 			'<li><a href="#addtabs-fragment-3"><span>Three</span></a></li>',
diff --git a/demos/real-world/range-interface/index.html b/demos/real-world/range-interface/index.html
index a32501a46..ce9a5f1e6 100644
--- a/demos/real-world/range-interface/index.html
+++ b/demos/real-world/range-interface/index.html
@@ -5,7 +5,7 @@
 <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
 <title>Slider Test Page</title>
 <script src="../../../jquery-1.2.6.js" type="text/javascript" charset="utf-8"></script>
-<link rel="stylesheet" href="../../../themes/flora/flora.all.css" type="text/css" media="screen" title="no title" charset="utf-8">
+<link rel="stylesheet" href="../../../themes/default/ui.all.css" type="text/css" charset="utf-8" />
 <script src="../../../ui/ui.core.js" type="text/javascript" charset="utf-8"></script>
 <script src="../../../ui/ui.slider.js" type="text/javascript" charset="utf-8"></script>
 <script src="../../../ui/effects.core.js" type="text/javascript" charset="utf-8"></script>
@@ -51,7 +51,7 @@
 .label-2 { position: absolute; right: 0; top: -1.1em; }
 </style>
 </head>
-<body class="flora">
+<body>
 <div id="wrap">
 	<h1>Slider Interface Example</h1>
 	<div id="col-1">
diff --git a/tests/all.html b/tests/all.html
index 04ea56578..04d494474 100644
--- a/tests/all.html
+++ b/tests/all.html
@@ -34,14 +34,14 @@
 	<script type="text/javascript" src="tabs.js"></script>
 
 	<style type="text/css">
-		@import "../themes/flora/flora.datepicker.css";
+		@import "../themes/default/ui.datepicker.css";
 		.xerror, .error, .ui-tabs-hide {
 		    display: none;
 		}
 	</style>
 
 </head>
-<body class="flora">
+<body>
 	<h1>jQuery UI All Tests</h1>
 	<h2 id="banner"></h2>
 	<h2 id="userAgent"></h2>
diff --git a/tests/all_2.html b/tests/all_2.html
index 4b76b9adf..e751aee80 100644
--- a/tests/all_2.html
+++ b/tests/all_2.html
@@ -56,14 +56,14 @@
 	<script type="text/javascript" src="plugins/cookie/jquery.cookie.js"></script>
 
 	<style type="text/css">
-		@import "../themes/flora/flora.datepicker.css";
+		@import "../themes/default/ui.datepicker.css";
 		.xerror, .error, .ui-tabs-hide {
 		    display: none;
 		}
 	</style>
 
 </head>
-<body class="flora">
+<body>
 	<h1>jQuery UI All Tests</h1>
 	<h2 id="banner"></h2>
 	<h2 id="userAgent"></h2>
diff --git a/tests/core.html b/tests/core.html
index edb61fda1..d9f536e7d 100644
--- a/tests/core.html
+++ b/tests/core.html
@@ -4,7 +4,6 @@
 	<title>jQuery UI Core Test Suite</title>
 
 	<link rel="stylesheet" href="qunit/testsuite.css" type="text/css" media="screen">
-	<!--link rel="stylesheet" href="../themes/flora/flora.dialog.css" type="text/css" media="screen"-->
 
 	<script type="text/javascript" src="../jquery-1.2.6.js"></script>
 	<script type="text/javascript" src="../ui/ui.core.js"></script>
diff --git a/tests/datepicker.html b/tests/datepicker.html
index 8d927147e..d6c1a1424 100644
--- a/tests/datepicker.html
+++ b/tests/datepicker.html
@@ -17,7 +17,7 @@
 	<script type="text/javascript" src="datepicker.js"></script>
 
 	<style type="text/css">
-		@import "../themes/flora/flora.datepicker.css";
+		@import "../themes/default/ui.datepicker.css";
 		.xerror, .error { display: none }
 	</style>
 </head>
diff --git a/tests/dialog.html b/tests/dialog.html
index 8d3ac1935..200ed7660 100644
--- a/tests/dialog.html
+++ b/tests/dialog.html
@@ -4,7 +4,6 @@
 	<title>jQuery UI Dialog Test Suite</title>
 
 	<link rel="stylesheet" href="qunit/testsuite.css" type="text/css" media="screen">
-	<!--link rel="stylesheet" href="../themes/flora/flora.dialog.css" type="text/css" media="screen"-->
 
 	<script type="text/javascript" src="../jquery-1.2.6.js"></script>
 	<script type="text/javascript" src="../ui/ui.core.js"></script>
@@ -24,7 +23,7 @@
 
 
 </head>
-<body class="flora">
+<body>
 
 <h1 id="header">jQuery UI Dialog Test Suite</h1>
 <h2 id="banner"></h2>
diff --git a/tests/selectable.html b/tests/selectable.html
index e6efbde7c..834a48e4e 100644
--- a/tests/selectable.html
+++ b/tests/selectable.html
@@ -4,7 +4,6 @@
 	<title>jQuery UI Selectable Test Suite</title>
 
 	<link rel="stylesheet" href="qunit/testsuite.css" type="text/css" media="screen">
-	<!--link rel="stylesheet" href="../themes/flora/flora.selectable.css" type="text/css" media="screen"-->
 
 	<script type="text/javascript" src="../jquery-1.2.6.js"></script>
 	<script type="text/javascript" src="../ui/ui.core.js"></script>
@@ -22,7 +21,7 @@
 
 
 </head>
-<body class="flora">
+<body>
 
 <h1 id="header">jQuery UI Selectable Test Suite</h1>
 <h2 id="banner"></h2>
diff --git a/tests/ui.html b/tests/ui.html
index b59446575..a0de5cb8d 100644
--- a/tests/ui.html
+++ b/tests/ui.html
@@ -23,7 +23,7 @@
 	<script type="text/javascript" src="ui.js"></script>
 
 </head>
-<body class="flora">
+<body>
 
 <h1 id="header">jQuery UI Test Suite</h1>
 <h2 id="banner"></h2>
