From cfafc3309c2a53973f23ffbd40acb7f6390effc1 Mon Sep 17 00:00:00 2001
From: Todd Parker <todd@Todd-Parkers-MacBook-Pro.local>
Date: Tue, 12 Oct 2010 13:25:29 -0400
Subject: [PATCH] updates to demos to align with new theme

---
 _form-controls.html              |  13 ++--
 docs/buttons/buttons-themes.html |  18 ++++-
 docs/lists/lists-readonly.html   |   2 +-
 docs/lists/lists-themes.html     |  77 ++++++++++++++++----
 docs/lists/lists-ul.html         |   2 +-
 docs/pages/index.html            |   2 +-
 docs/themes.html                 | 119 ++++++++++++++++++++++++-------
 7 files changed, 178 insertions(+), 55 deletions(-)

diff --git a/_form-controls.html b/_form-controls.html
index a1b1a8dd..200f1213 100644
--- a/_form-controls.html
+++ b/_form-controls.html
@@ -104,20 +104,15 @@
 	    </fieldset>
 	    
 	     <fieldset data-role="controlgroup"  data-type="horizontal" data-role="fieldcontain">
-	     	<legend>Cache settings:</legend>
-	         	<input type="radio" name="radio-choice-a" id="radio-choice-a" value="on" checked="checked" />
-	         	<label for="radio-choice-a">On</label>
-	         	<input type="radio" name="radio-choice-a" id="radio-choice-b" value="off"  />
-	         	<label for="radio-choice-b">Off</label>
-	    </fieldset>
+
 	    
 	    <fieldset data-role="controlgroup"  data-type="horizontal" data-role="fieldcontain">
 	     	<legend>Same with theme change:</legend>
-	         	<input type="radio" name="radio-choice-b" id="radio-choice-c" value="on" checked="checked" data-theme="a" />
+	         	<input type="radio" name="radio-choice-b" id="radio-choice-c" value="on" checked="checked" />
 	         	<label for="radio-choice-c">On</label>
-	         	<input type="radio" name="radio-choice-b" id="radio-choice-d" value="off" data-theme="a" />
+	         	<input type="radio" name="radio-choice-b" id="radio-choice-d" value="off" data-theme="b" />
 	         	<label for="radio-choice-d">Off</label>
-	         	<input type="radio" name="radio-choice-b" id="radio-choice-e" value="other" data-theme="a" />
+	         	<input type="radio" name="radio-choice-b" id="radio-choice-e" value="other" data-theme="b" />
 	         	<label for="radio-choice-e">Other</label>
 	    </fieldset>
     
diff --git a/docs/buttons/buttons-themes.html b/docs/buttons/buttons-themes.html
index e47288f0..29de3389 100755
--- a/docs/buttons/buttons-themes.html
+++ b/docs/buttons/buttons-themes.html
@@ -24,7 +24,7 @@
 			<div data-role="content" data-theme="b"><h4>B swatch</h4><a href="index.html" data-role="button">Button</a></div>
 			<div data-role="content" data-theme="c"><h4>C swatch</h4><a href="index.html" data-role="button">Button</a></div>
 			<div data-role="content" data-theme="d"><h4>D swatch</h4><a href="index.html" data-role="button">Button</a></div>
-			
+			<div data-role="content" data-theme="e"><h4>E swatch</h4><a href="index.html" data-role="button">Button</a></div>
 			
 			<h2>Assigning theme swatches</h2>
 			<p>Button can be manually assigned any of the button color swatches from the theme to add visual contrast with the container they sit inside by adding the <code>data-theme</code> attribute on the button markup and specifying a swatch letter. </p>
@@ -39,7 +39,8 @@
 		<a href="index.html" data-role="button" data-theme="b" data-icon="arrow-l" data-inline="true">Theme b</a>
 		<a href="index.html" data-role="button" data-theme="c" data-icon="arrow-l" data-inline="true">Theme c</a>
 		<a href="index.html" data-role="button" data-theme="d" data-icon="arrow-l" data-inline="true">Theme d</a>
-			
+		<a href="index.html" data-role="button" data-theme="e" data-icon="arrow-l" data-inline="true">Theme e</a>
+		
 		<h2>Theme variations</h2>
 		
 		<p><strong>"a" theme</strong> on container with themed buttons inside</p>
@@ -48,6 +49,7 @@
 			<a href="index.html" data-role="button" data-theme="b" data-icon="arrow-l" data-inline="true">Theme b</a>
 			<a href="index.html" data-role="button" data-theme="c" data-icon="arrow-l" data-inline="true">Theme c</a>
 			<a href="index.html" data-role="button" data-theme="d" data-icon="arrow-l" data-inline="true">Theme d</a>
+			<a href="index.html" data-role="button" data-theme="e" data-icon="arrow-l" data-inline="true">Theme e</a>
 		</div>
 		
 		<p><strong>"b" theme</strong> on container with themed buttons inside</p>
@@ -56,6 +58,7 @@
 			<a href="index.html" data-role="button" data-theme="b" data-icon="arrow-l" data-inline="true">Theme b</a>
 			<a href="index.html" data-role="button" data-theme="c" data-icon="arrow-l" data-inline="true">Theme c</a>
 			<a href="index.html" data-role="button" data-theme="d" data-icon="arrow-l" data-inline="true">Theme d</a>
+			<a href="index.html" data-role="button" data-theme="e" data-icon="arrow-l" data-inline="true">Theme e</a>
 		</div>
 		
 		<p><strong>"c" theme</strong> on container with themed buttons inside</p>
@@ -64,6 +67,7 @@
 			<a href="index.html" data-role="button" data-theme="b" data-icon="arrow-l" data-inline="true">Theme b</a>
 			<a href="index.html" data-role="button" data-theme="c" data-icon="arrow-l" data-inline="true">Theme c</a>
 			<a href="index.html" data-role="button" data-theme="d" data-icon="arrow-l" data-inline="true">Theme d</a>
+			<a href="index.html" data-role="button" data-theme="e" data-icon="arrow-l" data-inline="true">Theme e</a>
 		</div>
 		
 		<p><strong>"d" theme</strong> on container with themed buttons inside</p>
@@ -72,6 +76,16 @@
 			<a href="index.html" data-role="button" data-theme="b" data-icon="arrow-l" data-inline="true">Theme b</a>
 			<a href="index.html" data-role="button" data-theme="c" data-icon="arrow-l" data-inline="true">Theme c</a>
 			<a href="index.html" data-role="button" data-theme="d" data-icon="arrow-l" data-inline="true">Theme d</a>
+			<a href="index.html" data-role="button" data-theme="e" data-icon="arrow-l" data-inline="true">Theme e</a>
+		</div>
+		
+		<p><strong>"d" theme</strong> on container with themed buttons inside</p>
+		<div data-role="content" data-theme="e">
+			<a href="index.html" data-role="button" data-theme="a" data-icon="arrow-l" data-inline="true">Theme a</a>
+			<a href="index.html" data-role="button" data-theme="b" data-icon="arrow-l" data-inline="true">Theme b</a>
+			<a href="index.html" data-role="button" data-theme="c" data-icon="arrow-l" data-inline="true">Theme c</a>
+			<a href="index.html" data-role="button" data-theme="d" data-icon="arrow-l" data-inline="true">Theme d</a>
+			<a href="index.html" data-role="button" data-theme="e" data-icon="arrow-l" data-inline="true">Theme e</a>
 		</div>
 		
 	</div><!-- /content -->
diff --git a/docs/lists/lists-readonly.html b/docs/lists/lists-readonly.html
index 20fadb55..c36ad02f 100755
--- a/docs/lists/lists-readonly.html
+++ b/docs/lists/lists-readonly.html
@@ -15,7 +15,7 @@
 	</div><!-- /header -->
 
 	<div data-role="content">
-			<ul data-role="listview" data-theme="g" data-inset="true">
+			<ul data-role="listview" data-theme="d" data-inset="true">
 				<li>Acura</li>
 				<li>Audi</li>
 				<li>BMW</li>
diff --git a/docs/lists/lists-themes.html b/docs/lists/lists-themes.html
index 3cd2af70..d9924376 100755
--- a/docs/lists/lists-themes.html
+++ b/docs/lists/lists-themes.html
@@ -20,14 +20,61 @@
 		<p>All the standard button swatches can be applied to lists. The default theme is "f" (silver in the default theme).  </p>
 			
 		<p>The list item color scheme can be changed to any button color theme swatch by adding the <code>data-theme="e"</code> attribute to the list, and setting the letter theme swatch. </p>
-		<p>The theme for list dividers can be set by adding the <code>data-groupingtheme</code> to the list and specifying a swatch letter.</p>
 		
+		<p>The theme for list dividers can be set by adding the <code>data-dividertheme</code> to the list and specifying a swatch letter.</p>
 		
-		<h2>Theme variation: "a" body, "e" lists, "a" dividers</h2>
+		<p>The theme for list dividers can be set by adding the <code>data-counttheme</code> to the list and specifying a swatch letter.</p>
+		
+		<p><strong>A</strong> swatch</p>
+		<ul data-role="listview" data-inset="true" data-theme="a" data-counttheme="d">
+			<li><a href="index.html">Inbox</a> <span class="ui-li-count">12</span></li>
+			<li><a href="index.html">Outbox</a> <span class="ui-li-count">0</span></li>
+			<li><a href="index.html">Drafts</a> <span class="ui-li-count">4</span></li>
+			<li><a href="index.html">Sent</a> <span class="ui-li-count">328</span></li>
+			<li><a href="index.html">Trash</a> <span class="ui-li-count">62</span></li>
+		</ul>
+		
+		<p><strong>B</strong> swatch</p>
+		<ul data-role="listview" data-inset="true" data-theme="b">
+			<li><a href="index.html">Inbox</a> <span class="ui-li-count">12</span></li>
+			<li><a href="index.html">Outbox</a> <span class="ui-li-count">0</span></li>
+			<li><a href="index.html">Drafts</a> <span class="ui-li-count">4</span></li>
+			<li><a href="index.html">Sent</a> <span class="ui-li-count">328</span></li>
+			<li><a href="index.html">Trash</a> <span class="ui-li-count">62</span></li>
+		</ul>
+		
+		<p><strong>C</strong> swatch</p>
+		<ul data-role="listview" data-inset="true" data-theme="c">
+			<li><a href="index.html">Inbox</a> <span class="ui-li-count">12</span></li>
+			<li><a href="index.html">Outbox</a> <span class="ui-li-count">0</span></li>
+			<li><a href="index.html">Drafts</a> <span class="ui-li-count">4</span></li>
+			<li><a href="index.html">Sent</a> <span class="ui-li-count">328</span></li>
+			<li><a href="index.html">Trash</a> <span class="ui-li-count">62</span></li>
+		</ul>
+		
+		<p><strong>D</strong> swatch</p>
+		<ul data-role="listview" data-inset="true" data-theme="d">
+			<li><a href="index.html">Inbox</a> <span class="ui-li-count">12</span></li>
+			<li><a href="index.html">Outbox</a> <span class="ui-li-count">0</span></li>
+			<li><a href="index.html">Drafts</a> <span class="ui-li-count">4</span></li>
+			<li><a href="index.html">Sent</a> <span class="ui-li-count">328</span></li>
+			<li><a href="index.html">Trash</a> <span class="ui-li-count">62</span></li>
+		</ul>
+		
+		<p><strong>E</strong> swatch</p>
+		<ul data-role="listview" data-inset="true" data-theme="e">
+			<li><a href="index.html">Inbox</a> <span class="ui-li-count">12</span></li>
+			<li><a href="index.html">Outbox</a> <span class="ui-li-count">0</span></li>
+			<li><a href="index.html">Drafts</a> <span class="ui-li-count">4</span></li>
+			<li><a href="index.html">Sent</a> <span class="ui-li-count">328</span></li>
+			<li><a href="index.html">Trash</a> <span class="ui-li-count">62</span></li>
+		</ul>
+		
+		<h2>Theme variation: "a" body, "a" lists, "a" dividers</h2>
 	
 		<div class="ui-body-a">				
 	
-			<ul data-role="listview" data-inset="true" data-theme="e" data-groupingtheme="a">
+			<ul data-role="listview" data-inset="true" data-theme="a">
 				<li><a href="index.html">Inbox</a> <span class="ui-li-count">12</span></li>
 				<li><a href="index.html">Outbox</a> <span class="ui-li-count">0</span></li>
 				<li><a href="index.html">Drafts</a> <span class="ui-li-count">4</span></li>
@@ -35,7 +82,7 @@
 				<li><a href="index.html">Trash</a> <span class="ui-li-count">62</span></li>
 			</ul>
 			
-			<ul data-role="listview" data-inset="true" data-theme="e" data-groupingtheme="a">
+			<ul data-role="listview" data-inset="true" data-theme="a">
 				<li>
 					<img src="images/album-bb.jpg" />
 					<h3><a href="index.html">Broken Bells</a></h3>
@@ -66,7 +113,7 @@
 				</li>
 			</ul>
 			
-				<ul data-role="listview" data-inset="true" data-theme="e" data-groupingtheme="a">
+				<ul data-role="listview" data-inset="true" data-theme="a" data-dividertheme="a">
 					<li data-role="list-divider">A</li>
 					<li><a href="index.html">Adam Kinkaid</a></li>
 					<li><a href="index.html">Alex Wickerham</a></li>
@@ -80,11 +127,11 @@
 			</div><!-- / body wrapper -->
 			
 			
-			<h2>Theme variation: "b" body, "f" lists, "b" dividers</h2>
+			<h2>Theme variation: "b" body, "c" lists, "b" dividers</h2>
 			
 			<div class="ui-body-b">
 
-				<ul data-role="listview" data-inset="true" data-theme="f" data-groupingtheme="b">
+				<ul data-role="listview" data-inset="true" data-theme="c">
 					<li><a href="index.html">Inbox</a> <span class="ui-li-count">12</span></li>
 					<li><a href="index.html">Outbox</a> <span class="ui-li-count">0</span></li>
 					<li><a href="index.html">Drafts</a> <span class="ui-li-count">4</span></li>
@@ -92,7 +139,7 @@
 					<li><a href="index.html">Trash</a> <span class="ui-li-count">62</span></li>
 				</ul>
 
-				<ul data-role="listview" data-inset="true" data-theme="f" data-groupingtheme="b">
+				<ul data-role="listview" data-inset="true" data-theme="c">
 					<li>
 						<img src="images/album-bb.jpg" />
 						<h3><a href="index.html">Broken Bells</a></h3>
@@ -123,7 +170,7 @@
 					</li>
 				</ul>
 
-					<ul data-role="listview" data-inset="true" data-theme="f"  data-groupingtheme="b">
+					<ul data-role="listview" data-inset="true" data-theme="c" data-dividertheme="b">
 						<li data-role="list-divider">A</li>
 						<li><a href="index.html">Adam Kinkaid</a></li>
 						<li><a href="index.html">Alex Wickerham</a></li>
@@ -137,11 +184,11 @@
 				</div><!-- / body wrapper -->
 				
 				
-				<h2>Theme variation: "c" body, "g" lists, "b" dividers</h2>
+				<h2>Theme variation: "d" body, "c" lists, "b" dividers</h2>
 				
-				<div class="ui-body-c">
+				<div class="ui-body-d">
 
-					<ul data-role="listview" data-inset="true" data-theme="g" data-groupingtheme="b">
+					<ul data-role="listview" data-inset="true" data-theme="c">
 						<li><a href="index.html">Inbox</a> <span class="ui-li-count">12</span></li>
 						<li><a href="index.html">Outbox</a> <span class="ui-li-count">0</span></li>
 						<li><a href="index.html">Drafts</a> <span class="ui-li-count">4</span></li>
@@ -149,7 +196,7 @@
 						<li><a href="index.html">Trash</a> <span class="ui-li-count">62</span></li>
 					</ul>
 
-					<ul data-role="listview" data-inset="true" data-theme="g"  data-groupingtheme="b">
+					<ul data-role="listview" data-inset="true" data-theme="c">
 						<li>
 							<img src="images/album-bb.jpg" />
 							<h3><a href="index.html">Broken Bells</a></h3>
@@ -180,7 +227,7 @@
 						</li>
 					</ul>
 
-						<ul data-role="listview" data-inset="true" data-theme="g" data-groupingtheme="b">
+						<ul data-role="listview" data-inset="true" data-theme="c" data-dividertheme="b">
 							<li data-role="list-divider">A</li>
 							<li><a href="index.html">Adam Kinkaid</a></li>
 							<li><a href="index.html">Alex Wickerham</a></li>
@@ -191,6 +238,8 @@
 							<li><a href="index.html">Caleb Booth</a></li>
 							<li><a href="index.html">Christopher Adams</a></li>
 						</ul>
+						
+						
 			
 	</div><!-- /content -->
 </div><!-- /page -->
diff --git a/docs/lists/lists-ul.html b/docs/lists/lists-ul.html
index 5df8ec49..b19e4aad 100755
--- a/docs/lists/lists-ul.html
+++ b/docs/lists/lists-ul.html
@@ -15,7 +15,7 @@
 	</div><!-- /header -->
 
 	<div data-role="content">
-			<ul data-role="listview" data-theme="g">
+			<ul data-role="listview">
 				<li><a href="index.html">Acura</a></li>
 				<li><a href="index.html">Audi</a></li>
 				<li><a href="index.html">BMW</a></li>
diff --git a/docs/pages/index.html b/docs/pages/index.html
index 302039e4..ca605726 100755
--- a/docs/pages/index.html
+++ b/docs/pages/index.html
@@ -17,7 +17,7 @@
 		<p>jQuery Mobile includes automatic AJAX page loading of external pages with back button history support, set of animated page transitions and simple tools for displaying pages as dialogs.</p>
 		</div><!-- /ui-body wrapper -->	
 			
-		<ul data-role="listview" data-inset="true">
+		<ul data-role="listview" data-inset="true" data-dividertheme="b">
 			<li data-role="list-divider">Documentation</li>
 			<li><a href="docs-pages.html">Anatomy of a page</a></li>
 			<li><a href="docs-links.html">Links &amp; transitions</a></li>
diff --git a/docs/themes.html b/docs/themes.html
index d4da3ccc..14967830 100755
--- a/docs/themes.html
+++ b/docs/themes.html
@@ -15,26 +15,75 @@
 
 	<div data-role="content" class="ui-body">
 	
-		<h2 id="overview">Theming overview</h2>
+		<h2>Theming overview</h2>
 		
-			<p>Every layout and widget is in jQuery Mobile designed around a new object-oriented CSS framework to support rich theming of complete sites and applications. The theming system is similiar to the ThemeRoller system in jQuery UI but with a few important improvements:</p> 
+			<p>Every layout and widget in jQuery Mobile is designed around a new object-oriented CSS framework to make it possible to design complete sites and applications. The theming system is similar to the ThemeRoller system in jQuery UI but with a few important improvements:</p> 
 
 			<ul> 
-			<li>Richer designs are now possible because themes now include multiple color "swatches": 4 bars with matching buttons for each, 3 content areas that can be freely mixed and matched to create visual texture</li> 
-			<li>Open-ended theming allows for additional theme swatches can be added to a theme to add almost unlimited more variety to designs</li> 
-			<li>All backgrounds now use CSS3 gradients to dramatically reduce file size and number of server requests</li> 
-			<li>A simplified icon set only includes the most commonly used icons in either black or white colors to reduce image weight</li> 
+				<li>By taking advantage of CSS3 properties to add rounded corners, box and text shadow and gradients instead of images, the theme file is very lightweight and reduces server requests.</li>
+				<li>Richer designs are now possible because themes now include multiple color "swatches": 4 bars with matching buttons for each, 3 content areas that can be freely mixed and matched to create visual texture</li> 
+				<li>Open-ended theming allows for additional theme swatches can be added to a theme to add almost unlimited more variety to designs</li> 
+				<li>All backgrounds now use CSS3 gradients to dramatically reduce file size and number of server requests</li> 
+				<li>A simplified icon set only includes the most commonly used icons in either black or white colors to reduce image weight</li> 
 			</ul>
+			
 		
-		<h3 id="bars">Themes &amp; swatches</h3>
+		<h2>Themes &amp; swatches</h2>
 		
-		<p>In jQuery Mobile, there is a single theme CSS file that contains multiple color "swatches" for bars, content blocks and buttons that can be combined to achieve a wide range of visual effects. The key to the theme system used in jQuery UI is separation of color and texture (theme) from structural styles that define things like padding and dimensions. This allows the theme colors and textures to be defined once in the stylesheet as color "swatches", that can be mixed and matched. We also take advantage of CSS3 properties to add rounded corners, box and text shadow and gradients to make the theme styles very lightweight and reduce server requests.</p>
+		<p>The key to the theme system used in jQuery UI is separation of color and texture (theme) from structural styles that define things like padding and dimensions. This allows the theme colors and textures to be defined once in the stylesheet as color "swatches", that can be mixed and matched. Within a jQuery Mobile theme, there are multiple color "swatches" for bars, content blocks and buttons that can be combined to achieve a wide range of visual effects. 
+			</p>
 		
-		<p>Themes include at least 3 swatches for bars, content blocks and buttons. To make mapping of color swatches consistent across our widgets, we have followed the convention that swatch "a" is the highest level of visual priority (black in our default theme), "b" is secondary level (blue) and "c" is the baseline level (gray) that we use by default in many situations. Themes may have additional swatches but these are used for accents colors or specific situations within an app or site.</p>
+		<p>Themes include at 5 swatches each for bars, content blocks and buttons. To make mapping of color swatches consistent across our widgets, we have followed the convention that swatch "a" is the highest level of visual priority (black in our default theme), "b" is secondary level (blue) and "c" is the baseline level (gray) that we use by default in many situations, "d" for an alternate secondary level and "e" as an accent swatch.</p>
 		
+		<p> Themes may have additional swatches for accent colors or specific situations within an app or site. For example, you could </p>
+		
+		<h2>Theme swatch example</h2>
+		
+		<div data-role="header" data-position="inline">
+			<a href="index.html" data-icon="arrow-l">Button A</a>
+			<h1>Swatch A</h1>
+			<a href="index.html" data-icon="plus" data-icon-pos="right" data-theme="b">Button B</a>
+		</div>
+		<div class="ui-bar ui-bar-d">
+			<div data-role="controlgroup" data-type="horizontal" >
+				<h3>Bar D: </h3>
+				<a href="#">Button D</a>
+				<a href="#">Button D</a>
+				<a href="#">Button D</a>
+			</div><!-- /controlgroup -->
+		</div>
+		<div class="ui-body ui-body-d">
+			<h2>Body D</h2>
+			<p>This is the body content block with a <a href="#" class="ui-link">link</a>.</p>
+				<label for="slider1">Input slider:</label>
+			 	<input type="range" name="slider1" id="slider1" value="50" min="0" max="100" data-theme="c" />
+			     <fieldset data-role="controlgroup"  data-type="horizontal" data-role="fieldcontain">
+			     	<legend>Cache settings:</legend>
+			         	<input type="radio" name="radio-choice-a1" id="radio-choice-a1" value="on" checked="checked" />
+			         	<label for="radio-choice-a1">On</label>
+			         	<input type="radio" name="radio-choice-a1" id="radio-choice-b1" value="off"  />
+			         	<label for="radio-choice-b1">Off</label>
+			    </fieldset>
+			<a href="#" data-role="button" data-inline="true" data-theme="a">Button A</a>
+			<a href="#" data-role="button" data-inline="true" data-theme="e">Button E</a>
+			<h4>Here is an inset split list</h4>
+			<ul data-role="listview" data-inset="true" data-theme="d">
+				<li data-role="list-divider" data-theme="b">Body B</li>
+				<li><a href="index.html">Button D</a><a href="index.html">Details</a></li>
+				<li><a href="index.html">Button D</a><a href="index.html">Details</a></li>
+				<li><a href="index.html">Button D</a><a href="index.html">Details</a></li>
+			</ul>
+		</div>
+		<div class="ui-bar ui-bar-b">
+			<div data-role="controlgroup" data-type="horizontal" >
+				<a href="#" data-icon="delete">Button B</a>
+				<a href="#" data-icon="plus">Button B</a>
+				<a href="#" data-icon="arrow-r">Button B</a>
+			</div><!-- /controlgroup -->
+		</div>
 	
 		
-		<h3 id="bars">Bars</h3>
+		<h2>Bars</h2>
 		<p>The default theme contains 4 color swatches for bars to use in header, footer and tool bars. The swatches are designated by letters (a, b, c, etc.) and are organized into a visual hierarchy where "a" is the highest level of visual priority, "b" is secondary, "c" is the baseline, and "d" is for accents. Each swatch defines the border color, text color, gradient, text-shadow, font family and link color. Our default theme looks like this:</p>
 		
 		<div class="swatch-preview">
@@ -42,37 +91,53 @@
 			<div class="ui-bar ui-bar-b">Bar B</div>
 			<div class="ui-bar ui-bar-c">Bar C</div>
 			<div class="ui-bar ui-bar-d">Bar D</div>
+			<div class="ui-bar ui-bar-e">Bar E</div>
 		</div><!-- end swatch-bars -->
 		
-		<p>By default, the framework assigns the "a" swatch (black in the default theme) to all headers and footer because these are typically given high visual priority in an application. To set the color of a bar to a different swatch color, simply add the  <code>data-theme</code> attribute to your header or footer and specify a letter (a, b, c, d) and the specified theme swatch color will be applied.</p>
+		<p>By default, the framework assigns the "a" swatch (black in the default theme) to all headers and footer because these are typically given high visual priority in an application. To set the color of a bar to a different swatch color, simply add the  <code>data-theme</code> attribute to your header or footer and specify a letter (a, b, c, d) and the specified theme swatch color will be applied. Learn more about <a href="toolbars/bars-themes.html">toolbar theming</a>.</p>
 		
 		
 		
-		<h3 id="blocks">Content Blocks</h3>
-		<p>The default theme contains 3 color swatches for use in content blocks. These are designed to coordinate with the header color swatches in the default theme. Just as with bars, you can add as many content block swatches you want by extending the theme stylesheet. If a theme isn't specified on a content block, the framework will default to "c", just like the header.</p>
+		<h2>Content Blocks</h2>
+		<p>The default theme contains 3 color swatches for use in content blocks. These are designed to coordinate with the header color swatches in the default theme. Just as with bars, you can add as many content block swatches you want by extending the theme stylesheet. If a theme isn't specified on a content block, the framework will default to "c", just like the header.Learn more about <a href="content/content-themes.html">content theming</a>.</p>
 		
 		<div class="swatch-preview">	
 			<div class="ui-body ui-body-a">Block A</div>
 			<div class="ui-body ui-body-b">Block B</div>
 			<div class="ui-body ui-body-c">Block C</div>
+			<div class="ui-body ui-body-d">Block D</div>
+			<div class="ui-body ui-body-e">Block E</div>
 		</div><!-- end swatch-bars -->
 
 
-		<h3 id="lists">Lists</h3>
-		<p>There are 2 supported list view styles. The system defaults to the "a" swatch (silver in default theme) and it can be switched to "b" via the <code>data-theme</code> attribute.</p>
+		<h2>Lists</h2>
+		<p>There are 2 supported list view styles. The system defaults to the "a" swatch (silver in default theme) and it can be switched to "b" via the <code>data-theme</code> attribute. Learn more about <a href="lists/lists-themes.html">list theming</a>.</p>
+		<ul data-role="listview" data-inset="true" data-theme="a">
+			<li><a href="index.html">List item</a></li>
+			<li><a href="index.html">List item</a></li>
+		</ul>
+		
+		<ul data-role="listview" data-inset="true" data-theme="b">
+			<li><a href="index.html">List item</a></li>
+			<li><a href="index.html">List item</a></li>
+		</ul>
+		
 		<ul data-role="listview" data-inset="true" data-theme="c">
-			<li><a href="index.html">List item A</a></li>
-			<li><a href="index.html">List item A</a></li>
-			<li><a href="index.html">List item A</a></li>
+			<li><a href="index.html">List item</a></li>
+			<li><a href="index.html">List item</a></li>
 		</ul>
 		
-		<ul data-role="listview" data-inset="true" data-theme="f">
-			<li><a href="index.html">List item A</a></li>
-			<li><a href="index.html">List item A</a></li>
-			<li><a href="index.html">List item A</a></li>
+		<ul data-role="listview" data-inset="true" data-theme="d">
+			<li><a href="index.html">List item</a></li>
+			<li><a href="index.html">List item</a></li>
 		</ul>
 		
-		<h3 id="active">Active state</h3>
+		<ul data-role="listview" data-inset="true" data-theme="e">
+			<li><a href="index.html">List item</a></li>
+			<li><a href="index.html">List item</a></li>
+		</ul>
+		
+		<h2>Active state</h2>
 		<p>The jQuery Mobile framework uses a single theme swatch called "active" (bright blue in the default theme) to consistently indicate the selected state, regardless of the theme of the widget. We apply this in navigation and form controls to indicate what is currently selected. Because this theme swatch is designed for clear, consistent user feedback, it is not currently a theme swatch that can be overridden via the markup. It is set once in the theme and applied by the framework whenever a selected or active state is needed. The styling for this state is in the theme stylesheet under the <code>ui-btn-active</code> style rules.</p>
 		
 		<fieldset data-role="controlgroup"  data-type="horizontal" data-role="fieldcontain">
@@ -83,7 +148,7 @@
 	         	<label for="radio-choice-b">Off</label>
 	    </fieldset>
 		
-		<h3 id="buttons">Buttons</h3>
+		<h2>Buttons</h2>
 		<p>A set of 4 button colors are also included in the default theme. Each button has styles for normal, hover/focus and pressed states. Each button is intentionally styled to match the color of a bar so they feel tightly integrated. </p>
 		
 		<div class="swatch-preview">
@@ -93,7 +158,7 @@
 			<a href="index.html" data-role="button" data-theme="d" data-icon="arrow-l">Button D</a>
 		</div><!-- end swatch-bars -->
 		
-		<h3 id="context">Context-aware button theming</h3>
+		<h2 id="context">Context-aware button theming</h2>
 		<p>A button is automatically assigned a theme swatch letter that matches it's parent bar or content box to visually integrate the button into the parent theme, like a chameleon. To illustrate this idea, below, the same exact button code is in each of the 4 bars and is automatically setting their color swatch to match on the parent bar swatch.</p>
 		
 		<div class="swatch-preview">
@@ -103,7 +168,7 @@
 			<div data-role="header" data-theme="d"><h1>Bar D</h1><a href="index.html" data-icon="arrow-l">Button D</a></div>
 		</div><!-- end swatch-bars -->
 		
-		<p>This makes it really easy to ripple a theme change through a page by setting a theme swatch on a parent because you know the buttons will maintain the same relative visual weight across themes. Since form elements use the button styles, they will also adapt to their parent container too. </p>
+		<p>This makes it really easy to ripple a theme change through a page by setting a theme swatch on a parent because you know the buttons will maintain the same relative visual weight across themes. Since form elements use the button styles, they will also adapt to their parent container too. Learn more about <a href="buttons/buttons-themes.html">button theming</a>.</p>
 			
 		<p>To add visual emphasis of certain buttons in a toolbar, the theme swatch color for a button can be set by adding a <code>data-theme="a"</code> to the anchor to make it stand out visually from it's parent. If the theme is set on a button in the markup, the framework won't override the theme swatch color when the parent theme is changed because you made a conscious decision to set the color.</p>
 		
@@ -143,7 +208,7 @@
 			
 		</div><!-- end swatch-bars -->
 		
-		<h3 id="icons">Icons</h3>
+		<h3>Icons</h3>
 		<p>There a core set of <a href="buttons/buttons-icons.html">standard icons</a> included in the framework that can be assigned to any button. To minimize the download size of the core icons, jQuery Mobile only includes these icons in white and automatically adds a semi-transparent black circle behind the icon to make sure it has good contrast on all background colors.</p>