Merge remote branch 'upstream/master'

32 files changed, 570 insertions, 482 deletions

diff --git a/mod/developers/views/default/theme_preview/buttons.php b/mod/developers/views/default/theme_preview/buttons.php
new file mode 100644
index 000000000..718d88617
--- /dev/null
+++ b/mod/developers/views/default/theme_preview/buttons.php
@@ -0,0 +1,41 @@
+<table class="elgg-table">
+	<thead>
+		<tr>
+			<th></th>
+			<th>Default</th>
+			<th>Disabled (.elgg-state-disabled)</th>
+		</tr>
+	</thead>
+	<tbody>
+		<tr>
+			<th>Base (.elgg-button)</th>
+			<td><a href="#" class="elgg-button">anchor</a></td>
+			<td><a href="#" class="elgg-button elgg-state-disabled">anchor</a></td>
+		</tr>
+		<tr>
+			<th>Action (.elgg-button-action)</th>
+			<td><a href="#" class="elgg-button elgg-button-action">anchor</a></td>
+			<td><a href="#" class="elgg-button elgg-button-action elgg-state-disabled">anchor</a></td>
+		</tr>
+		<tr>
+			<th>Cancel (.elgg-button-cancel)</th>
+			<td><a href="#" class="elgg-button elgg-button-cancel">anchor</a></td>
+			<td><a href="#" class="elgg-button elgg-button-cancel elgg-state-disabled">anchor</a></td>
+		</tr>
+		<tr>
+			<th>Submit (.elgg-button-submit)</th>
+			<td><a href="#" class="elgg-button elgg-button-submit">anchor</a></td>
+			<td><a href="#" class="elgg-button elgg-button-submit elgg-state-disabled">anchor</a></td>
+		</tr>
+		<tr>
+			<th>Special (.elgg-button-special)</th>
+			<td><a href="#" class="elgg-button elgg-button-special">anchor</a></td>
+			<td><a href="#" class="elgg-button elgg-button-special elgg-state-disabled">anchor</a></td>
+		</tr>
+		<tr>
+			<th>Delete (.elgg-button-delete)</th>
+			<td><a href="#" class="elgg-button elgg-button-delete">anchor</a></td>
+			<td><a href="#" class="elgg-button elgg-button-delete elgg-state-disabled">anchor</a></td>
+		</tr>
+	</tbody>
+</table>
\ No newline at end of file
diff --git a/mod/developers/views/default/theme_preview/components.php b/mod/developers/views/default/theme_preview/components.php
new file mode 100644
index 000000000..ab5a6e941
--- /dev/null
+++ b/mod/developers/views/default/theme_preview/components.php
@@ -0,0 +1,12 @@
+<?php
+/**
+ * CSS Objects: list, module, image_block, table, messages
+ */
+
+echo elgg_view_module('info', 'Image Block (.elgg-image-block)', elgg_view('theme_preview/components/image_block'));
+
+echo elgg_view_module('info', 'List (.elgg-list)', elgg_view('theme_preview/components/list'));
+
+echo elgg_view_module('info', 'Table (.elgg-table)', elgg_view('theme_preview/components/table'));
+
+echo elgg_view_module('info', 'Messages (.elgg-message)', elgg_view('theme_preview/components/messages'));
diff --git a/mod/developers/views/default/theme_preview/components/image_block.php b/mod/developers/views/default/theme_preview/components/image_block.php
new file mode 100644
index 000000000..0bb16428b
--- /dev/null
+++ b/mod/developers/views/default/theme_preview/components/image_block.php
@@ -0,0 +1,6 @@
+<?php

+$ipsum = elgg_view('developers/ipsum');

+

+$user = new ElggUser();

+$image = elgg_view_entity_icon($user, 'small');

+echo elgg_view_image_block($image, "$ipsum $ipsum $ipsum $ipsum $ipsum $ipsum $ipsum");

diff --git a/mod/developers/views/default/theme_preview/components/list.php b/mod/developers/views/default/theme_preview/components/list.php
new file mode 100644
index 000000000..8096bda04
--- /dev/null
+++ b/mod/developers/views/default/theme_preview/components/list.php
@@ -0,0 +1,19 @@
+<?php

+

+$obj1 = new ElggObject();

+$obj1->title = "Object 1";

+$obj1->description = $ipsum;

+

+$obj2 = new ElggObject();

+$obj2->title = "Object 2";

+$obj2->description = $ipsum;

+

+$obj3 = new ElggObject();

+$obj3->title = "Object 3";

+$obj3->description = $ipsum;

+

+$obj4 = new ElggObject();

+$obj4->title = "Object 4";

+$obj4->description = $ipsum;

+

+echo elgg_view('page/components/list', array('items' => array($obj1, $obj2, $obj3, $obj4)));

diff --git a/mod/developers/views/default/theme_preview/components/messages.php b/mod/developers/views/default/theme_preview/components/messages.php
new file mode 100644
index 000000000..ac4d2bfd7
--- /dev/null
+++ b/mod/developers/views/default/theme_preview/components/messages.php
@@ -0,0 +1,5 @@
+<ul>

+	<li class="elgg-message elgg-state-success mas">Success message (.elgg-state-success)</li>

+	<li class="elgg-message elgg-state-error mas">Error message (.elgg-state-error)</li>

+	<li class="elgg-message elgg-state-notice mas">Notice message (.elgg-state-notice)</li>

+</ul>

diff --git a/mod/developers/views/default/theme_preview/components/table.php b/mod/developers/views/default/theme_preview/components/table.php
new file mode 100644
index 000000000..e9ef32143
--- /dev/null
+++ b/mod/developers/views/default/theme_preview/components/table.php
@@ -0,0 +1,12 @@
+<table class="elgg-table">

+<?php

+	echo "<thead><tr><th>column 1</th><th>column 2</th></tr></thead>";

+	for ($i = 1; $i < 5; $i++) {

+		echo '<tr>';

+		for ($j = 1; $j < 3; $j++) {

+			echo "<td>value $j</td>";

+		}

+		echo '</tr>';

+	}

+?>

+</table>
\ No newline at end of file
diff --git a/mod/developers/views/default/theme_preview/forms.php b/mod/developers/views/default/theme_preview/forms.php
index bf637d6f0..60183ead9 100644
--- a/mod/developers/views/default/theme_preview/forms.php
+++ b/mod/developers/views/default/theme_preview/forms.php
@@ -1,222 +1,139 @@
-<?php
-/**
- * Form CSS
- */
-
-$url = current_page_url();
-
-$ipsum = elgg_view('developers/ipsum');
-
-?>
-<style>
-	td, th {padding: 5px;}
-</style>
-<div class="elgg-page mal">
-	<?php echo elgg_view('theme_preview/header', $vars); ?>
-	<h2>Form</h2>
-	<form action="#">
-		<fieldset>
-			<legend>Form legend</legend>
-			<div>
-				<label for="f1">Text input:</label>
-				<?php echo elgg_view('input/text', array(
-						'name' => 'f1',
-						'id' => 'f1',
-						'value' => 'input text',
-						));
-				?>
-			</div>
-			<div>
-				<label for="f2">Password input:</label>
-				<?php echo elgg_view('input/password', array(
-						'name' => 'f2',
-						'id' => 'f2',
-						'value' => 'password',
-						));
-				?>
-			</div>
-			<div>
-				<label for="f3">Radio input:</label><br />
-				<?php echo elgg_view('input/radio', array(
-						'name' => 'f3',
-						'id' => 'f3',
-						'options' => array('a' => 1, 'b' => 2),
-						));
-				?>
-			</div>
-			<div>
-				<label for="f4">Checkboxes input:</label><br />
-				<?php echo elgg_view('input/checkboxes', array(
-						'name' => 'f4',
-						'id' => 'f4',
-						'options' => array('a' => 1, 'b' => 2),
-						));
-				?>
-			</div>
-			<div>
-				<label for="f5">Dropdown input:</label><br />
-				<?php echo elgg_view('input/dropdown', array(
-						'name' => 'f5',
-						'id' => 'f5',
-						'options' => array('option 1', 'option 2'),
-						));
-				?>
-			</div>
-			<div>
-				<label for="f6">Access input:</label>
-				<?php echo elgg_view('input/access', array(
-						'name' => 'f6',
-						'id' => 'f6',
-						'value' => ACCESS_PUBLIC,
-						));
-				?>
-			</div>
-			<div>
-				<label for="f7">File input:</label>
-				<?php echo elgg_view('input/file', array(
-						'name' => 'f7',
-						'id' => 'f7',
-						));
-				?>
-			</div>
-			<div>
-				<label for="f8">URL input:</label>
-				<?php echo elgg_view('input/url', array(
-						'name' => 'f8',
-						'id' => 'f8',
-						'value' => 'http://elgg.org/',
-						));
-				?>
-			</div>
-			<div>
-				<label for="f9">Tags input:</label>
-				<?php echo elgg_view('input/tags', array(
-						'name' => 'f9',
-						'id' => 'f9',
-						'value' => 'one, two, three',
-						));
-				?>
-			</div>
-			<div>
-				<label for="f10">Email input:</label>
-				<?php echo elgg_view('input/email', array(
-						'name' => 'f10',
-						'id' => 'f10',
-						'value' => 'noone@elgg.org',
-						));
-				?>
-			</div>
-			<div>
-				<label for="f11">Autocomplete input:</label>
-				<?php echo elgg_view('input/autocomplete', array(
-						'name' => 'f11',
-						'id' => 'f11',
-						'match_on' => 'users',
-						));
-				?>
-			</div>
-			<div>
-				<label for="f12">Date picker input:</label>
-				<?php echo elgg_view('input/datepicker', array(
-						'name' => 'f12',
-						'id' => 'f12',
-						));
-				?>
-			</div>
-			<div>
-				<label for="f13">User picker input:</label>
-				<?php echo elgg_view('input/userpicker', array(
-						'name' => 'f13',
-						'id' => 'f13',
-						));
-				?>
-			</div>
-			<div>
-				<label for="f14">Long text input:</label>
-				<?php echo elgg_view('input/longtext', array(
-						'name' => 'f14',
-						'id' => 'f14',
-						'value' => $ipsum,
-						));
-				?>
-			</div>
-			<div>
-				<label for="f15">Plain text input:</label>
-				<?php echo elgg_view('input/plaintext', array(
-						'name' => 'f15',
-						'id' => 'f15',
-						'value' => $ipsum,
-						));
-				?>
-			</div>
-		</fieldset>
-	</form>
-
-	<div class="mtl">
-		<h2>Buttons</h2>
-		<table>
-			<thead>
-				<tr>
-					<th>Anchors</th>
-					<th>Default</th>
-					<th>Hover</th>
-					<th>Focus</th>
-					<th>Active</th>
-					<th>Disabled</th>
-					<th>Selected</th>
-				</tr>
-			</thead>
-			<tbody>
-				<tr>
-					<th>Default</th>
-					<td><a href="#" class="elgg-button">anchor</a></td>
-					<td><a href="#" class="elgg-button elgg-state-hover">anchor</a></td>
-					<td><a href="#" class="elgg-button elgg-state-focus">anchor</a></td>
-					<td><a href="#" class="elgg-button elgg-state-active">anchor</a></td>
-					<td><a href="#" class="elgg-button elgg-state-disabled">anchor</a></td>
-					<td><a href="#" class="elgg-button elgg-state-selected">anchor</a></td>
-				</tr>
-				<tr>
-					<th>Action</th>
-					<td><a href="#" class="elgg-button elgg-button-action">anchor</a></td>
-					<td><a href="#" class="elgg-button elgg-button-action elgg-state-hover">anchor</a></td>
-					<td><a href="#" class="elgg-button elgg-button-action elgg-state-focus">anchor</a></td>
-					<td><a href="#" class="elgg-button elgg-button-action elgg-state-active">anchor</a></td>
-					<td><a href="#" class="elgg-button elgg-button-action elgg-state-disabled">anchor</a></td>
-				</tr>
-				<tr>
-					<th>Cancel</th>
-					<td><a href="#" class="elgg-button elgg-button-cancel">anchor</a></td>
-					<td><a href="#" class="elgg-button elgg-button-cancel elgg-state-hover">anchor</a></td>
-					<td><a href="#" class="elgg-button elgg-button-cancel elgg-state-focus">anchor</a></td>
-					<td><a href="#" class="elgg-button elgg-button-cancel elgg-state-active">anchor</a></td>
-					<td><a href="#" class="elgg-button elgg-button-cancel elgg-state-disabled">anchor</a></td>
-				</tr>
-				<tr>
-					<th>Submit</th>
-					<td><a href="#" class="elgg-button elgg-button-submit">anchor</a></td>
-					<td><a href="#" class="elgg-button elgg-button-submit elgg-state-hover">anchor</a></td>
-					<td><a href="#" class="elgg-button elgg-button-submit elgg-state-focus">anchor</a></td>
-					<td><a href="#" class="elgg-button elgg-button-submit elgg-state-active">anchor</a></td>
-					<td><a href="#" class="elgg-button elgg-button-submit elgg-state-disabled">anchor</a></td>
-				</tr>
-				<tr>
-					<th>Special</th>
-					<td><a href="#" class="elgg-button elgg-button-special">anchor</a></td>
-					<td><a href="#" class="elgg-button elgg-button-special elgg-state-hover">anchor</a></td>
-					<td><a href="#" class="elgg-button elgg-button-special elgg-state-focus">anchor</a></td>
-					<td><a href="#" class="elgg-button elgg-button-special elgg-state-active">anchor</a></td>
-					<td><a href="#" class="elgg-button elgg-button-special elgg-state-disabled">anchor</a></td>
-				</tr>
-				<tr>
-					<th>Delete</th>
-					<td><a href="#" class="elgg-button elgg-button-delete">anchor</a></td>
-					<td><a href="#" class="elgg-button elgg-button-delete elgg-state-hover">anchor</a></td>
-					<td><a href="#" class="elgg-button elgg-button-delete elgg-state-focus">anchor</a></td>
-					<td><a href="#" class="elgg-button elgg-button-delete elgg-state-active">anchor</a></td>
-					<td><a href="#" class="elgg-button elgg-button-delete elgg-state-disabled">anchor</a></td>
-				</tr>
-			</tbody>
-		</table>
-	</div>
-</div>
+<form action="#">
+	<fieldset>
+		<legend>Fieldset Legend</legend>
+		<div>
+			<label for="f1">Text input (.elgg-input-text):</label>
+			<?php echo elgg_view('input/text', array(
+					'name' => 'f1',
+					'id' => 'f1',
+					'value' => 'input text',
+					));
+			?>
+		</div>
+		<div>
+			<label for="f2">Password input (.elgg-input-password):</label>
+			<?php echo elgg_view('input/password', array(
+					'name' => 'f2',
+					'id' => 'f2',
+					'value' => 'password',
+					));
+			?>
+		</div>
+		<div>
+			<label for="f3">Radio input (.elgg-input-radio):</label><br />
+			<?php echo elgg_view('input/radio', array(
+					'name' => 'f3',
+					'id' => 'f3',
+					'options' => array('a' => 1, 'b' => 2),
+					));
+			?>
+		</div>
+		<div>
+			<label for="f4">Checkboxes input (.elgg-input-checkboxes):</label><br />
+			<?php echo elgg_view('input/checkboxes', array(
+					'name' => 'f4',
+					'id' => 'f4',
+					'options' => array('a (.elgg-input-checkbox)' => 1, 'b (.elgg-input-checkbox)' => 2),
+					));
+			?>
+		</div>
+		<div>
+			<label for="f5">Dropdown input (.elgg-input-dropdown):</label><br />
+			<?php echo elgg_view('input/dropdown', array(
+					'name' => 'f5',
+					'id' => 'f5',
+					'options' => array('option 1', 'option 2'),
+					));
+			?>
+		</div>
+		<div>
+			<label for="f6">Access input (.elgg-input-access):</label><br />
+			<?php echo elgg_view('input/access', array(
+					'name' => 'f6',
+					'id' => 'f6',
+					'value' => ACCESS_PUBLIC,
+					));
+			?>
+		</div>
+		<div>
+			<label for="f7">File input (.elgg-input-file):</label>
+			<?php echo elgg_view('input/file', array(
+					'name' => 'f7',
+					'id' => 'f7',
+					));
+			?>
+		</div>
+		<div>
+			<label for="f8">URL input (.elgg-input-url):</label>
+			<?php echo elgg_view('input/url', array(
+					'name' => 'f8',
+					'id' => 'f8',
+					'value' => 'http://elgg.org/',
+					));
+			?>
+		</div>
+		<div>
+			<label for="f9">Tags input (.elgg-input-tags):</label>
+			<?php echo elgg_view('input/tags', array(
+					'name' => 'f9',
+					'id' => 'f9',
+					'value' => 'one, two, three',
+					));
+			?>
+		</div>
+		<div>
+			<label for="f10">Email input (.elgg-input-email):</label>
+			<?php echo elgg_view('input/email', array(
+					'name' => 'f10',
+					'id' => 'f10',
+					'value' => 'noone@elgg.org',
+					));
+			?>
+		</div>
+		<div>
+			<label for="f11">Autocomplete input (.elgg-input-autocomplete):</label>
+			<?php echo elgg_view('input/autocomplete', array(
+					'name' => 'f11',
+					'id' => 'f11',
+					'match_on' => 'users',
+					));
+			?>
+		</div>
+		<div>
+			<label for="f12">Date input (.elgg-input-date):</label>
+			<?php echo elgg_view('input/date', array(
+					'name' => 'f12',
+					'id' => 'f12',
+					'value' => '12/12/2012'
+					));
+			?>
+		</div>
+		<div>
+			<label for="f13">User picker input (.elgg-user-picker):</label>
+			<?php echo elgg_view('input/userpicker', array(
+					'name' => 'f13',
+					'id' => 'f13',
+					'value' => array(new ElggUser(), new ElggUser(), new ElggUser()),
+					));
+			?>
+		</div>
+		<div>
+			<label for="f15">Plain textarea input (.elgg-input-plaintext):</label>
+			<?php echo elgg_view('input/plaintext', array(
+					'name' => 'f15',
+					'id' => 'f15',
+					'value' => $ipsum,
+					));
+			?>
+		</div>
+		<div>
+			<label for="f14">Long textarea input (.elgg-input-longtext):</label>
+			<?php echo elgg_view('input/longtext', array(
+					'name' => 'f14',
+					'id' => 'f14',
+					'value' => $ipsum,
+					));
+			?>
+		</div>
+	</fieldset>
+</form>
\ No newline at end of file
diff --git a/mod/developers/views/default/theme_preview/general.php b/mod/developers/views/default/theme_preview/general.php
deleted file mode 100644
index bd11b35db..000000000
--- a/mod/developers/views/default/theme_preview/general.php
+++ /dev/null
@@ -1,59 +0,0 @@
-<?php
-/**
- * General CSS
- */
-
-$ipsum = elgg_view('developers/ipsum');
-
-?>
-
-<div class="elgg-page mal">
-	<?php echo elgg_view('theme_preview/header', $vars); ?>
-	<h2>Headings</h2>
-	<div class="mbl">
-		<h1>Level 1 heading</h1>
-		<h2>Level 2 heading</h2>
-		<h3>Level 3 heading</h3>
-		<h4>Level 4 heading</h4>
-		<h5>Level 5 heading</h5>
-		<h6>Level 6 heading</h6>
-	</div>
-	<h2>Paragraph</h2>
-	<div class="mbl">
-	<p>Lorem ipsum dolor sit amet, <a href="#" title="test link">test link</a>
-  adipiscing elit. Nullam dignissim convallis est. Quisque aliquam. Donec
-  faucibus. Nunc iaculis suscipit dui. Nam sit amet sem. Aliquam libero
-  nisi, imperdiet at, tincidunt nec, gravida vehicula, nisl. Praesent
-  mattis, massa quis luctus fermentum, turpis mi volutpat justo, eu
-  volutpat enim diam eget metus. Maecenas ornare tortor. Donec sed tellus
-  eget sapien fringilla nonummy. Mauris a ante. Suspendisse quam sem,
-  consequat at, commodo vitae, feugiat in, nunc. Morbi imperdiet augue
-  quis tellus.</p>
-
-  <p>Lorem ipsum dolor sit amet, <em>emphasis</em>
-  consectetuer
-  adipiscing elit. Nullam dignissim convallis est. Quisque aliquam. Donec
-  faucibus. Nunc iaculis suscipit dui. Nam sit amet sem. Aliquam libero
-  nisi, imperdiet at, tincidunt nec, gravida vehicula, nisl. Praesent
-  mattis, massa quis luctus fermentum, turpis mi volutpat justo, eu
-  volutpat enim diam eget metus. Maecenas ornare tortor. Donec sed tellus
-  eget sapien fringilla nonummy. Mauris a ante. Suspendisse quam sem,
-  consequat at, commodo vitae, feugiat in, nunc. Morbi imperdiet augue
-  quis tellus.</p>
-	</div>
-	<h2>Misc</h2>
-			<p>
-				I am <a href="?abc123">the a tag</a> example<br />
-				I am <abbr title="test">the abbr tag</abbr> example<br />
-				I am <acronym>the acronym tag</acronym> example<br />
-				I am <b>the b tag</b> example<br />
-				I am <code>the code tag</code> example<br />
-				I am <del>the del tag</del> example<br />
-				I am <em>the em tag</em> example<br />
-				I am <i>the i tag</i> example<br />
-				I am <strong>the strong tag</strong> example<br />
-			</p>
-			<blockquote><p>Paragraph inside Blockquote: <?php echo $ipsum; ?></p></blockquote>
-			<pre><strong>Preformated:</strong>Testing one row
-			 and another</pre>
-</div>
diff --git a/mod/developers/views/default/theme_preview/grid.php b/mod/developers/views/default/theme_preview/grid.php
index 95e14cfd5..030e752e7 100644
--- a/mod/developers/views/default/theme_preview/grid.php
+++ b/mod/developers/views/default/theme_preview/grid.php
@@ -4,16 +4,13 @@
  */
 
 ?>
-<div class="elgg-page mal">
-	<?php echo elgg_view('theme_preview/header', $vars); ?>
-
 <style>
 h3 {text-align: center;}
-.preview-outline {border: 1px solid #cccccc; padding: 5px;}
+.elgg-col > .elgg-inner {border: 1px solid #cccccc; padding: 5px;}
 </style>
 
 <div class="elgg-col elgg-col-1of5">
-	<div class="preview-outline">
+	<div class="elgg-inner">
 		<h3>1/5</h3>
 		<p>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.</p>
 		<p>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.</p>
@@ -21,44 +18,44 @@ h3 {text-align: center;}
 	</div>
 </div>
 <div class="elgg-col elgg-col-3of5">
-	<div class="preview-outline clearfix">
+	<div class="elgg-inner clearfix">
 		<h3>3/5</h3>
 		<div class="elgg-col elgg-col-1of2">
-			<div class="preview-outline">
+			<div class="elgg-inner">
 				<h3>1/2</h3>
 				<p>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.</p>
 			</div>
 		</div>
 		<div class="elgg-col elgg-col-1of2">
-			<div class="preview-outline">
+			<div class="elgg-inner">
 				<h3>1/2</h3>
 				<p>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.</p>
 			</div>
 		</div>
 		<div class="elgg-col elgg-col-1of3">
-			<div class="preview-outline">
+			<div class="elgg-inner">
 				<h3>1/3</h3>
 				<p>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.</p>
 				<p>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.</p>
 			</div>
 		</div>
 		<div class="elgg-col elgg-col-2of3">
-			<div class="preview-outline">
+			<div class="elgg-inner">
 				<h3>2/3</h3>
 				<div class="elgg-col elgg-col-1of2">
-					<div class="preview-outline">
+					<div class="elgg-inner">
 						<h3>1/2</h3>
 						<p>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.</p>
 					</div>
 				</div>
 				<div class="elgg-col elgg-col-1of2">
-					<div class="preview-outline">
+					<div class="elgg-inner">
 						<h3>1/2</h3>
 						<p>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.</p>
 					</div>
 				</div>
 				<div class="elgg-col elgg-col-1of1">
-					<div class="preview-outline">
+					<div class="elgg-inner">
 						<h3>1</h3>
 						<p>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.</p>
 					</div>
@@ -68,7 +65,7 @@ h3 {text-align: center;}
 	</div>
 </div>
 <div class="elgg-col elgg-col-1of5 elgg-col-last">
-	<div class="preview-outline">
+	<div class="elgg-inner">
 		<h3>1/5</h3>
 		<p>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.</p>
 		<p>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.</p>
diff --git a/mod/developers/views/default/theme_preview/icons.php b/mod/developers/views/default/theme_preview/icons.php
index 8178a9da7..e1684c110 100644
--- a/mod/developers/views/default/theme_preview/icons.php
+++ b/mod/developers/views/default/theme_preview/icons.php
@@ -3,56 +3,8 @@
  * Icons CSS
  */
 
-?>
-<style>li {margin: 10px; float: left;} ul {background-color: #e0e0e0;}</style>
-<div class="elgg-page mal">
-	<?php echo elgg_view('theme_preview/header', $vars); ?>
-	<h2>Icon Sprites</h2>
-	<ul class="mbl clearfix">
-	<?php 
-		$icons = array(
-			'settings' => 'Settings', 
-			'friends' => 'Friends', 
-			'help' => 'Help', 
-			'delete' => 'Delete', 
-			'thumbs-up' => 'Thumbs Up',
-			'thumbs-up-alt' => 'Thumbs Up Alternate',
-			'following' => 'Following', 
-			'dragger' => 'Dragger', 
-			'rss' => 'RSS', 
-			'arrow-s' => 'Arrow S', 
-			'hover-menu' => 'Hover Menu',
-		);
-		
-		foreach ($icons as $icon_id => $icon_label) {
-			echo "<li>" . elgg_view_icon($icon_id) . $icon_label . "</li>";
-		}
-	
-	?>
-	</ul>
-	<h2>Ajax loader</h2>
-	<div class="mbl">
-		<?php echo elgg_view('graphics/ajax_loader', array('hidden' => false)); ?>
-	</div>
-	<h2>Avatars</h2>
-	<div class="mbl">
-		<?php
-			$user = new ElggUser();
-			$sizes = array('large', 'medium', 'small', 'tiny');
-			echo '<table>';
-			echo '<tr>';
-			foreach ($sizes as $size) {
-				echo "<td class=\"center\"><h4>$size</h4></td>";
-			}
-			echo '</tr>';
-			echo '<tr>';
-			foreach ($sizes as $size) {
-				echo '<td class="phs">';
-				echo elgg_view_entity_icon($user, $size, array('hover' => false));
-				echo '</td>';
-			}
-			echo '</tr>';
-			echo '</table>';
-		?>
-	</div>
-</div>
+echo elgg_view_module('info', 'Icon Sprites (.elgg-icon)', elgg_view('theme_preview/icons/sprites'));
+
+echo elgg_view_module('info', 'Ajax Loader (.elgg-ajax-loader)', elgg_view('theme_preview/icons/loader'));
+
+echo elgg_view_module('info', 'Avatars (.elgg-avatar)', elgg_view('theme_preview/icons/avatars'));
diff --git a/mod/developers/views/default/theme_preview/icons/avatars.php b/mod/developers/views/default/theme_preview/icons/avatars.php
new file mode 100644
index 000000000..cbce5bc7d
--- /dev/null
+++ b/mod/developers/views/default/theme_preview/icons/avatars.php
@@ -0,0 +1,36 @@
+<?php

+	$user = new ElggUser();

+	$group = new ElggGroup();

+	

+	$sizes = array('large', 'medium', 'small', 'tiny');

+?>

+<table class="elgg-table">

+	<tr>

+		<th></th>

+		<?php

+			foreach ($sizes as $size) {

+				echo "<th>$size</th>";

+			}

+		?>

+	</tr>

+	<tr>

+		<th>User</th>

+		<?php

+			foreach ($sizes as $size) {

+				echo '<td>';

+				echo elgg_view_entity_icon($user, $size, array('hover' => false));

+				echo '</td>';

+			}

+		?>

+	</tr>

+	<tr>

+		<th>Group</th>

+		<?php

+			foreach ($sizes as $size) {

+				echo '<td>';

+				echo elgg_view_entity_icon($group, $size, array('hover' => false));

+				echo '</td>';

+			}

+		?>

+	</tr>

+</table>

diff --git a/mod/developers/views/default/theme_preview/icons/loader.php b/mod/developers/views/default/theme_preview/icons/loader.php
new file mode 100644
index 000000000..e542da27c
--- /dev/null
+++ b/mod/developers/views/default/theme_preview/icons/loader.php
@@ -0,0 +1 @@
+<?php echo elgg_view('graphics/ajax_loader', array('hidden' => false)); ?>
\ No newline at end of file
diff --git a/mod/developers/views/default/theme_preview/icons/sprites.php b/mod/developers/views/default/theme_preview/icons/sprites.php
new file mode 100644
index 000000000..134dd9aca
--- /dev/null
+++ b/mod/developers/views/default/theme_preview/icons/sprites.php
@@ -0,0 +1,61 @@
+<?php 

+$icons = array(

+	'arrow-left',

+	'arrow-right',

+	'arrow-two-head',

+	'calendar',

+	'checkmark',

+	'clip',

+	'cursor-drag-arrow',

+	'delete-alt',

+	'delete',

+	'download',

+	'facebook',

+	'home',

+	'hover-menu',

+	'link',

+	'mail-alt',

+	'mail',

+	'print-alt',

+	'print',

+	'push-pin-alt',

+	'push-pin',

+	'redo',

+	'refresh',

+	'round-arrow-left',

+	'round-arrow-right',

+	'round-checkmark',

+	'round-minus',

+	'round-plus',

+	'rss',

+	'search-focus',

+	'search',

+	'settings-alt',

+	'settings',

+	'share',

+	'shop-cart',

+	'speech-bubble-alt',

+	'speech-bubble',

+	'star-alt',

+	'star-empty',

+	'star',

+	'tag',

+	'thumbs-down-alt',

+	'thumbs-down',

+	'thumbs-up-alt',

+	'thumbs-up',

+	'trash',

+	'twitter',

+	'undo',

+	'user',

+	'users',

+);

+?>

+

+<ul class="elgg-gallery">

+<?php 

+	foreach ($icons as $icon) {

+		echo "<li title=\".elgg-icon-$icon\" style=\"margin:10px\">" . elgg_view_icon($icon) . "</li>";

+	}

+?>

+</ul>
\ No newline at end of file
diff --git a/mod/developers/views/default/theme_preview/modules.php b/mod/developers/views/default/theme_preview/modules.php
new file mode 100644
index 000000000..3e0acb3a5
--- /dev/null
+++ b/mod/developers/views/default/theme_preview/modules.php
@@ -0,0 +1,6 @@
+<?php
+
+echo elgg_view_module('info', 'Modules (.elgg-module)', elgg_view('theme_preview/modules/modules'));
+
+echo elgg_view_module('info', 'Widgets (.elgg-widget)', elgg_view('theme_preview/modules/widgets'));
+
diff --git a/mod/developers/views/default/theme_preview/modules/modules.php b/mod/developers/views/default/theme_preview/modules/modules.php
new file mode 100644
index 000000000..e0d39c0da
--- /dev/null
+++ b/mod/developers/views/default/theme_preview/modules/modules.php
@@ -0,0 +1,23 @@
+<?php 

+

+$ipsum = elgg_view('developers/ipsum');

+

+?>

+<div class="elgg-grid">

+	<div class="elgg-col elgg-col-1of2">

+		<div class="pam">

+			<?php

+				echo elgg_view_module('aside', 'Aside (.elgg-module-aside)', $ipsum);

+				echo elgg_view_module('popup', 'Popup (.elgg-module-popup)', $ipsum);

+			?>

+		</div>

+	</div>

+	<div class="elgg-col elgg-col-1of2">

+		<div class="pam">

+			<?php

+				echo elgg_view_module('info', 'Info (.elgg-module-info)', $ipsum);

+				echo elgg_view_module('featured', 'Featured (.elgg-module-featured)', $ipsum);

+			?>

+		</div>

+	</div>

+</div>
\ No newline at end of file
diff --git a/mod/developers/views/default/theme_preview/widgets.php b/mod/developers/views/default/theme_preview/modules/widgets.php
index eafbcef6f..8c9fd6483 100644
--- a/mod/developers/views/default/theme_preview/widgets.php
+++ b/mod/developers/views/default/theme_preview/modules/widgets.php
@@ -50,7 +50,7 @@ for ($column_index = 1; $column_index <= $num_columns; $column_index++) {
 </div>
 <script type="text/javascript">
 	// widgets do not have guids so we override the edit toggle and delete button
-	$(document).ready(function() {
+	$(function() {
 		$('.elgg-widget-edit-button').unbind('click');
 		$('.elgg-widget-edit-button').click(function() {
 			$(this).closest('.elgg-module-widget').find('.elgg-widget-edit').slideToggle('medium');
diff --git a/mod/developers/views/default/theme_preview/navigation.php b/mod/developers/views/default/theme_preview/navigation.php
index 10cffd230..b80634317 100644
--- a/mod/developers/views/default/theme_preview/navigation.php
+++ b/mod/developers/views/default/theme_preview/navigation.php
@@ -2,64 +2,20 @@
 /**
  * Navigation CSS
  */
+echo elgg_view_module('info', "Tabs", elgg_view('theme_preview/navigation/tabs'));
 
-$url = current_page_url();
+echo elgg_view_module('info', "Pagination", elgg_view('theme_preview/navigation/pagination'));
 
-elgg_push_breadcrumb('First', "$url#");
-elgg_push_breadcrumb('Second', "$url#");
-elgg_push_breadcrumb('Third');
+echo elgg_view_module('info', "Site Menu (.elgg-menu-site)", elgg_view('theme_preview/navigation/site'));
+
+echo elgg_view_module('info', "Breadcrumbs (.elgg-breadcrumbs)", elgg_view('theme_preview/navigation/breadcrumbs'));
+
+echo elgg_view_module('info', "Page Menu (.elgg-menu-page)", elgg_view('theme_preview/navigation/page'));
+
+echo elgg_view_module('info', "Filter Menu (.elgg-menu-filter)", elgg_view('theme_preview/navigation/filter'));
+
+echo elgg_view_module('info', "Extras Menu (.elgg-menu-extras)", elgg_view('theme_preview/navigation/extras'));
+
+echo elgg_view_module('info', "Owner Block Menu (.elgg-menu-owner-block)", elgg_view('theme_preview/navigation/owner_block'));
 
 ?>
-<div class="elgg-page mal">
-	<?php echo elgg_view('theme_preview/header', $vars); ?>
-	<h2>Breadcrumbs</h2>
-	<div class="mbl">
-		<?php echo elgg_view('navigation/breadcrumbs'); ?>
-	</div>
-	<h2>Tabs</h2>
-	<div class="mbl">
-		<?php
-		$tabs = array(
-			array('title' => 'First', 'url' => "$url#"),
-			array('title' => 'Second', 'url' => "$url#", 'selected' => true),
-			array('title' => 'Third', 'url' => "$url#"),
-		);
-		echo elgg_view('navigation/tabs', array('tabs' => $tabs));
-		?>
-	</div>
-	<h2>Pagination</h2>
-	<div class="mbl">
-		<?php
-		$params = array(
-			'count' => 1000,
-			'limit' => 10,
-			'offset' => 230,
-		);
-		echo elgg_view('navigation/pagination', $params);
-		?>
-	</div>
-	<h2>Site Menu</h2>
-	<div class="mbl">
-		<div class="elgg-page-header" style="height: 40px;">
-	<?php
-		$params = array();
-		$params['menu'] = array();
-		$params['menu']['default'] = array();
-		for ($i=1; $i<=5; $i++) {
-			$params['menu']['default'][] = new ElggMenuItem($i, "Page $i", "$url#");
-		}
-		$params['menu']['default'][2]->setSelected(true);
-		echo elgg_view('navigation/menu/site', $params);
-	?>
-		</div>
-	</div>
-	<h2>Page Menu</h2>
-	<div class="mbl pam" style="width: 200px; background-color: #ccc;">
-	<?php
-		$m = new ElggMenuItem(10, "Child", "$url#");
-		$m->setParent($params['menu']['default'][1]);
-		$params['menu']['default'][1]->addChild($m);
-		echo elgg_view('navigation/menu/page', $params);
-	?>
-	</div>
-</div>
diff --git a/mod/developers/views/default/theme_preview/navigation/breadcrumbs.php b/mod/developers/views/default/theme_preview/navigation/breadcrumbs.php
new file mode 100644
index 000000000..eb3dd47a3
--- /dev/null
+++ b/mod/developers/views/default/theme_preview/navigation/breadcrumbs.php
@@ -0,0 +1,6 @@
+<?php

+elgg_push_breadcrumb('First', "#");

+elgg_push_breadcrumb('Second', "#");

+elgg_push_breadcrumb('Third');

+

+echo elgg_view('navigation/breadcrumbs');

diff --git a/mod/developers/views/default/theme_preview/navigation/default.php b/mod/developers/views/default/theme_preview/navigation/default.php
new file mode 100644
index 000000000..fd67b8094
--- /dev/null
+++ b/mod/developers/views/default/theme_preview/navigation/default.php
@@ -0,0 +1,11 @@
+<?php 

+

+$params = array();

+$params['menu'] = array();

+$params['menu']['default'] = array();

+for ($i=1; $i<=5; $i++) {

+	$params['menu']['default'][] = new ElggMenuItem($i, "Page $i", "$url#");

+}

+$params['menu']['default'][2]->setSelected(true);

+

+echo elgg_view('navigation/menu/default', $params);

diff --git a/mod/developers/views/default/theme_preview/navigation/extras.php b/mod/developers/views/default/theme_preview/navigation/extras.php
new file mode 100644
index 000000000..6982cf57d
--- /dev/null
+++ b/mod/developers/views/default/theme_preview/navigation/extras.php
@@ -0,0 +1,18 @@
+<?php

+

+$params = array();

+$params['menu'] = array();

+$params['menu']['default'] = array();

+for ($i=1; $i<=5; $i++) {

+	$params['menu']['default'][] = new ElggMenuItem($i, "Page $i", "$url#");

+}

+$params['class'] = 'elgg-menu-extras';

+

+

+?>

+

+<div class="elgg-sidebar">

+<?php 

+	echo elgg_view('navigation/menu/default', $params);

+?>

+</div>
\ No newline at end of file
diff --git a/mod/developers/views/default/theme_preview/navigation/filter.php b/mod/developers/views/default/theme_preview/navigation/filter.php
new file mode 100644
index 000000000..f27edf150
--- /dev/null
+++ b/mod/developers/views/default/theme_preview/navigation/filter.php
@@ -0,0 +1,13 @@
+<?php 

+

+$params = array();

+$params['menu'] = array();

+$params['menu']['default'] = array();

+for ($i=1; $i<=5; $i++) {

+	$params['menu']['default'][] = new ElggMenuItem($i, "Page $i", "$url#");

+}

+$params['menu']['default'][2]->setSelected(true);

+

+$params['name'] = 'filter';

+

+echo elgg_view('navigation/menu/default', $params); 

diff --git a/mod/developers/views/default/theme_preview/navigation/horizontal.php b/mod/developers/views/default/theme_preview/navigation/horizontal.php
new file mode 100644
index 000000000..69e75c063
--- /dev/null
+++ b/mod/developers/views/default/theme_preview/navigation/horizontal.php
@@ -0,0 +1,12 @@
+<?php 

+

+$params = array();

+$params['menu'] = array();

+$params['menu']['default'] = array();

+for ($i=1; $i<=5; $i++) {

+	$params['menu']['default'][] = new ElggMenuItem($i, "Page $i", "$url#");

+}

+$params['menu']['default'][2]->setSelected(true);

+$params['class'] = 'elgg-menu-hz';

+

+echo elgg_view('navigation/menu/default', $params);

diff --git a/mod/developers/views/default/theme_preview/navigation/owner_block.php b/mod/developers/views/default/theme_preview/navigation/owner_block.php
new file mode 100644
index 000000000..6bf79fe7e
--- /dev/null
+++ b/mod/developers/views/default/theme_preview/navigation/owner_block.php
@@ -0,0 +1,11 @@
+<?php

+$params = array();

+$params['menu'] = array();

+$params['menu']['default'] = array();

+for ($i=1; $i<=5; $i++) {

+	$params['menu']['default'][] = new ElggMenuItem($i, "Page $i", "$url#");

+}

+$params['menu']['default'][2]->setSelected(true);

+$params['class'] = 'elgg-menu-owner-block';

+

+echo elgg_view('navigation/menu/default', $params); 
\ No newline at end of file
diff --git a/mod/developers/views/default/theme_preview/navigation/page.php b/mod/developers/views/default/theme_preview/navigation/page.php
new file mode 100644
index 000000000..fb3f075dc
--- /dev/null
+++ b/mod/developers/views/default/theme_preview/navigation/page.php
@@ -0,0 +1,21 @@
+<?php

+

+$params = array();

+$params['menu'] = array();

+$params['menu']['default'] = array();

+for ($i=1; $i<=5; $i++) {

+	$params['menu']['default'][] = new ElggMenuItem($i, "Page $i", "#");

+	$params['menu']['alt'][] = new ElggMenuItem($i, "Page $i", "#");

+}

+$params['menu']['default'][2]->setSelected(true);

+

+$m = new ElggMenuItem(10, "Child", "$url#");

+$m->setParent($params['menu']['default'][1]);

+$params['menu']['default'][1]->addChild($m);

+?>

+

+<div class="elgg-sidebar">

+<?php 

+	echo elgg_view('navigation/menu/page', $params);

+?>

+</div>
\ No newline at end of file
diff --git a/mod/developers/views/default/theme_preview/navigation/pagination.php b/mod/developers/views/default/theme_preview/navigation/pagination.php
new file mode 100644
index 000000000..90ae48edf
--- /dev/null
+++ b/mod/developers/views/default/theme_preview/navigation/pagination.php
@@ -0,0 +1,8 @@
+<?php

+$params = array(

+	'count' => 1000,

+	'limit' => 10,

+	'offset' => 230,

+);

+

+echo elgg_view('navigation/pagination', $params);
\ No newline at end of file
diff --git a/mod/developers/views/default/theme_preview/navigation/site.php b/mod/developers/views/default/theme_preview/navigation/site.php
new file mode 100644
index 000000000..df8dc1b70
--- /dev/null
+++ b/mod/developers/views/default/theme_preview/navigation/site.php
@@ -0,0 +1,18 @@
+<?php 

+

+$params = array();

+$params['menu'] = array();

+$params['menu']['default'] = array();

+for ($i=1; $i<=5; $i++) {

+	$params['menu']['default'][] = new ElggMenuItem($i, "Page $i", "$url#");

+}

+$params['menu']['default'][2]->setSelected(true);

+?>

+

+<div class="elgg-page-header">

+	<div class="elgg-inner">

+	<?php 

+		echo elgg_view('navigation/menu/site', $params); 

+	?>

+	</div>

+</div>

diff --git a/mod/developers/views/default/theme_preview/navigation/tabs.php b/mod/developers/views/default/theme_preview/navigation/tabs.php
new file mode 100644
index 000000000..b2638bb37
--- /dev/null
+++ b/mod/developers/views/default/theme_preview/navigation/tabs.php
@@ -0,0 +1,10 @@
+<?php

+$params = array(

+	'tabs' => array(

+		array('title' => 'First', 'url' => "$url#"),

+		array('title' => 'Second', 'url' => "$url#", 'selected' => true),

+		array('title' => 'Third', 'url' => "$url#"),

+	)

+);

+

+echo elgg_view('navigation/tabs', $params);
\ No newline at end of file
diff --git a/mod/developers/views/default/theme_preview/objects.php b/mod/developers/views/default/theme_preview/objects.php
deleted file mode 100644
index c67348c0d..000000000
--- a/mod/developers/views/default/theme_preview/objects.php
+++ /dev/null
@@ -1,76 +0,0 @@
-<?php
-/**
- * CSS Objects: list, module, image_block
- */
-
-$url = current_page_url();
-
-$ipsum = elgg_view('developers/ipsum');
-
-?>
-
-<div class="elgg-page mal">
-	<?php echo elgg_view('theme_preview/header', $vars); ?>
-	<h2>Modules</h2>
-	<div class="mbl clearfix">
-		<div class="elgg-col elgg-col-1of2">
-			<div class="pam">
-			<?php
-				echo elgg_view_module('aside', 'elgg-module-aside', $ipsum);
-				echo elgg_view_module('popup', 'elgg-module-popup', $ipsum);
-			?>
-			</div>
-		</div>
-		<div class="elgg-col elgg-col-1of2">
-			<div class="pam">
-			<?php
-				echo elgg_view_module('info', 'elgg-module-info', $ipsum);
-				echo elgg_view_module('featured', 'elgg-module-featured', $ipsum);
-			?>
-			</div>
-		</div>
-	</div>
-	<h2>Image Block</h2>
-	<div class="mbl clearfix">
-	<?php
-		$user = new ElggUser();
-		$image = elgg_view_entity_icon($user, 'small');
-		echo elgg_view_image_block($image, $ipsum);
-	?>
-	</div>
-	<h2>List</h2>
-	<div class="mbl clearfix">
-	<?php
-		$obj1 = new ElggObject();
-		$obj1->title = "Object 1";
-		$obj1->description = $ipsum;
-		$obj2 = new ElggObject();
-		$obj2->title = "Object 2";
-		$obj2->description = $ipsum;
-		echo elgg_view('page/components/list', array('items' => array($obj1, $obj2)));
-	?>
-	</div>
-	<h2>Table</h2>
-	<div class="mbl clearfix">
-		<table class="elgg-table">
-		<?php
-			echo "<thead><tr><th>column 1</th><th>column 2</th></tr></thead>";
-			for ($i = 1; $i < 5; $i++) {
-				echo '<tr>';
-				for ($j = 1; $j < 3; $j++) {
-					echo "<td>value $j</td>";
-				}
-				echo '</tr>';
-			}
-		?>
-		</table>
-	</div>
-	<h2>Messages</h2>
-	<div class="mbl clearfix">
-		<ul>
-			<li class="elgg-message elgg-state-success mas">Success message</li>
-			<li class="elgg-message elgg-state-error mas">Error message</li>
-			<li class="elgg-message elgg-state-notice mas">Notice message</li>
-		</ul>
-	</div>
-</div>
diff --git a/mod/developers/views/default/theme_preview/typography.php b/mod/developers/views/default/theme_preview/typography.php
new file mode 100644
index 000000000..6662a9a46
--- /dev/null
+++ b/mod/developers/views/default/theme_preview/typography.php
@@ -0,0 +1,10 @@
+<?php
+/**
+ * General CSS
+ */
+
+echo elgg_view_module('info', "Headings", elgg_view('theme_preview/typography/headings'));
+
+echo elgg_view_module('info', "Paragraph", elgg_view('theme_preview/typography/paragraph'));
+
+echo elgg_view_module('info', "Misc", elgg_view('theme_preview/typography/misc'));
\ No newline at end of file
diff --git a/mod/developers/views/default/theme_preview/typography/headings.php b/mod/developers/views/default/theme_preview/typography/headings.php
new file mode 100644
index 000000000..1eb96c75c
--- /dev/null
+++ b/mod/developers/views/default/theme_preview/typography/headings.php
@@ -0,0 +1,6 @@
+<h1>Level 1 heading</h1>

+<h2>Level 2 heading</h2>

+<h3>Level 3 heading</h3>

+<h4>Level 4 heading</h4>

+<h5>Level 5 heading</h5>

+<h6>Level 6 heading</h6>
\ No newline at end of file
diff --git a/mod/developers/views/default/theme_preview/typography/misc.php b/mod/developers/views/default/theme_preview/typography/misc.php
new file mode 100644
index 000000000..93a279c36
--- /dev/null
+++ b/mod/developers/views/default/theme_preview/typography/misc.php
@@ -0,0 +1,16 @@
+<ul>

+	<li>I am <a href="?abc123">the a tag</a> example</li>

+	<li>I am <abbr title="test">the abbr tag</abbr> example</li>

+	<li>I am <acronym>the acronym tag</acronym> example</li>

+	<li>I am <b>the b tag</b> example</li>

+	<li>I am <code>the code tag</code> example</li>

+	<li>I am <del>the del tag</del> example</li>

+	<li>I am <em>the em tag</em> example</li>

+	<li>I am <i>the i tag</i> example</li>

+	<li>I am <strong>the strong tag</strong> example</li>

+</ul>

+<blockquote><p>Paragraph inside Blockquote: <?php echo $ipsum; ?></p></blockquote>

+<pre>

+	<strong>Preformated:</strong>Testing one row

+	and another

+</pre>

diff --git a/mod/developers/views/default/theme_preview/typography/paragraph.php b/mod/developers/views/default/theme_preview/typography/paragraph.php
new file mode 100644
index 000000000..54d548f46
--- /dev/null
+++ b/mod/developers/views/default/theme_preview/typography/paragraph.php
@@ -0,0 +1,19 @@
+<p>Lorem ipsum dolor sit amet, <a href="#" title="test link">test link</a>

+adipiscing elit. Nullam dignissim convallis est. Quisque aliquam. Donec

+faucibus. Nunc iaculis suscipit dui. Nam sit amet sem. Aliquam libero

+nisi, imperdiet at, tincidunt nec, gravida vehicula, nisl. Praesent

+mattis, massa quis luctus <strong>strong</strong>, turpis mi volutpat justo, eu

+volutpat enim diam eget metus. Maecenas ornare tortor. Donec sed tellus

+eget sapien fringilla nonummy. Mauris a ante. Suspendisse quam sem,

+consequat at, commodo vitae, feugiat in, nunc. Morbi imperdiet augue

+quis tellus.</p>

+

+<p>Lorem ipsum dolor sit amet, <em>emphasis</em> consectetuer

+adipiscing elit. Nullam dignissim convallis est. Quisque aliquam. Donec

+faucibus. Nunc iaculis suscipit dui. Nam sit amet sem. Aliquam libero

+nisi, imperdiet at, tincidunt nec, gravida vehicula, nisl. Praesent

+mattis, massa quis luctus fermentum, turpis mi volutpat justo, eu

+volutpat enim diam eget metus. Maecenas ornare tortor. Donec sed tellus

+eget sapien fringilla nonummy. Mauris a ante. Suspendisse quam sem,

+consequat at, commodo vitae, feugiat in, nunc. Morbi imperdiet augue

+quis tellus.</p>
\ No newline at end of file