diff --git a/demos/functional/index.html b/demos/functional/index.html
index cf6cb9879..9207a135f 100644
--- a/demos/functional/index.html
+++ b/demos/functional/index.html
@@ -16,8 +16,6 @@
 			<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/flora/flora.accordion.css" type="text/css" media="screen" title="Flora (Default)" />
-			<link rel="stylesheet" href="../../themes/flora/flora.tabs.css" type="text/css" media="screen" title="Flora (Default)" />
 						
 			<script type="text/javascript" src="../../jquery-1.2.6.js"></script>
 		
diff --git a/demos/functional/templates/ui.accordion.data.html b/demos/functional/templates/ui.accordion.data.html
index 79b1aa6d6..320cfa711 100644
--- a/demos/functional/templates/ui.accordion.data.html
+++ b/demos/functional/templates/ui.accordion.data.html
@@ -1,34 +1,26 @@
-<ul id="accordionDemo" class="ui-accordion-container" style="width: 200px; height: 450px;">
+<ul id="accordionDemo" style="width: 200px; height: 450px;">
 	<li>
-		<span class="ui-accordion-left"></span>
-		<a href='#' class="ui-accordion-link">
-			Test 1
-			<span class="ui-accordion-right"></span>
-		</a>
+		<a href='#'>Test 1</a>
 		<div class="ui-accordion-data">Lorem ipsum dolor sit amet, consectetur adipisicing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam, quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo consequat. Duis aute irure dolor in reprehenderit in voluptate velit esse cillum dolore eu fugiat nulla pariatur. Excepteur sint occaecat cupidatat non proident, sunt in culpa qui officia deserunt mollit anim id est laborum.
 		</div>
 	</li>
 	<li>
-		<span class="ui-accordion-left"></span>
-		<a href='#' class="ui-accordion-link">Test 2<span class="ui-accordion-right"></span></a>
+		<a href='#'>Test 2</a>
 		<div  class="ui-accordion-data">Lorem ipsum dolor sit amet, consectetur adipisicing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua.
 		</div>
 	</li>
 	<li>
-		<span class="ui-accordion-left"></span>
-		<a href='#' class="ui-accordion-link">Test 3<span class="ui-accordion-right"></span></a>
+		<a href='#'>Test 3</a>
 		<div  class="ui-accordion-data">Lorem ipsum dolor sit amet, consectetur adipisicing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam, quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo consequat. Duis aute irure dolor in reprehenderit in voluptate velit esse cillum dolore eu fugiat nulla pariatur.
 		</div>
 	</li>
 	<li>
-		<span class="ui-accordion-left"></span>
-		<a href='#' class="ui-accordion-link">Test 4<span class="ui-accordion-right"></span></a>
+		<a href='#'>Test 4</a>
 		<div  class="ui-accordion-data">Lorem ipsum dolor sit amet, consectetur adipisicing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam, quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo consequat. Duis aute irure dolor in reprehenderit in voluptate velit esse cillum dolore eu fugiat nulla pariatur.
 		</div>
 	</li>
 	<li>
-		<span class="ui-accordion-left"></span>
-		<a href='#' class="ui-accordion-link">Test 5<span class="ui-accordion-right"></span></a>
+		<a href='#'>Test 5</a>
 		<div  class="ui-accordion-data">Lorem ipsum dolor sit amet, consectetur adipisicing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam, quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo consequat. Duis aute irure dolor in reprehenderit in voluptate velit esse cillum dolore eu fugiat nulla pariatur.
 		</div>
 	</li>