diff --git a/templates/ArchiveWidget.ss b/templates/ArchiveWidget.ss
index 198fc53..e145171 100644
--- a/templates/ArchiveWidget.ss
+++ b/templates/ArchiveWidget.ss
@@ -1,21 +1,21 @@
 <% if DisplayMode == month %>
 	<ul class="archiveMonths">
-		<% control Dates %>
+		<% loop Dates %>
 			<li>
 				<a href="$Link">
 					$Date.Format(F) $Date.Year
 				</a>
 			</li>
-		<% end_control %>
+		<% end_loop %>
 	</ul>
 <% else %>
 	<ul class="archiveYears">
-		<% control Dates %>
+		<% loop Dates %>
 			<li>
 				<a href="$Link">
-					$Date.Year<% if Last %><% else %>,<% end_if %>
+					$Date.Year<% if not Last %>,<% end_if %>
 				</a>
 			</li>
-		<% end_control %>
+		<% end_loop %>
 	</ul>
 <% end_if %>
\ No newline at end of file
diff --git a/templates/Includes/BlogPagination.ss b/templates/Includes/BlogPagination.ss
index da6c838..804326c 100644
--- a/templates/Includes/BlogPagination.ss
+++ b/templates/Includes/BlogPagination.ss
@@ -1,27 +1,41 @@
 <% if BlogEntries.MoreThanOnePage %>
-	<div id="PageNumbers">
-		<p>
-			<% if BlogEntries.NotFirstPage %>
-				<a class="prev" href="$BlogEntries.PrevLink" title="View the previous page">Prev</a>
+<div class="pagination">
+	<ul class="PageNumbers">
+		<% if BlogEntries.NotFirstPage %>
+			<li class="prev">
+				<a class="paginate-left" href="$BlogEntries.PrevLink" title="View the previous page">&lt;</a>
+			</li>
+		<% else %>	
+			<li class="prev disabled">
+				<a class="paginate-left disabled">&lt;</a>
+			</li>
+		<% end_if %>
+	
+    	<% loop BlogEntries.PaginationSummary(4) %>
+			<% if CurrentBool %>
+				<li class="active"><a class="disabled">$PageNum</a></li>
+			<% else %>
+				<% if Link %>
+					<li>
+						<a class="<% if BeforeCurrent %>paginate-left<% else %>paginate-right<% end_if %>" href="$Link">
+						$PageNum
+						</a>
+					</li>
+				<% else %>
+					<li class="disabled"><a class="disabled">&hellip;</a></li>						
+				<% end_if %>
 			<% end_if %>
-		
-			<span>
-		    	<% control BlogEntries.PaginationSummary(4) %>
-					<% if CurrentBool %>
-						<span class="current">$PageNum</span>
-					<% else %>
-						<% if Link %>
-							<a href="$Link" title="View page number $PageNum">$PageNum</a>
-						<% else %>
-							&hellip;
-						<% end_if %>
-					<% end_if %>
-				<% end_control %>
-			</span>
-		
-			<% if BlogEntries.NotLastPage %>
-				<a class="next" href="$BlogEntries.NextLink" title="View the next page">Next</a>
-			<% end_if %>
-		</p>
-	</div>
+		<% end_loop %>
+	
+		<% if BlogEntries.NotLastPage %>
+			<li class="next">
+				<a class="next paginate-right" href="$BlogEntries.NextLink" title="View the next page">&gt;</a>
+			</li>
+		<% else %>
+			<li class="next disabled">
+				<a class="next paginate-right disabled">&gt;</a>
+			</li>
+		<% end_if %>
+	</ul>
+</div>
 <% end_if %>
\ No newline at end of file
diff --git a/templates/Includes/BlogSummary.ss b/templates/Includes/BlogSummary.ss
index 0be8d1b..897fd06 100644
--- a/templates/Includes/BlogSummary.ss
+++ b/templates/Includes/BlogSummary.ss
@@ -4,9 +4,9 @@
 	<% if TagsCollection %>
 		<p class="tags">
 			Tags:
-			<% control TagsCollection %>
-				<a href="$Link" title="View all posts tagged '$Tag'" rel="tag">$Tag</a><% if Last %><% else %>,<% end_if %>
-			<% end_control %>
+			<% loop TagsCollection %>
+				<a href="$Link" title="View all posts tagged '$Tag'" rel="tag">$Tag</a><% if not Last %>,<% end_if %>
+			<% end_loop %>
 		</p>
 	<% end_if %>
 	
diff --git a/templates/Includes/BreadCrumbs.ss b/templates/Includes/BreadCrumbs.ss
index f83475a..85f7896 100644
--- a/templates/Includes/BreadCrumbs.ss
+++ b/templates/Includes/BreadCrumbs.ss
@@ -1,5 +1,5 @@
 <% if Level(2) %>
 	<div id="Breadcrumbs">
-	   	<p>$Breadcrumbs</p>
+	   	$Breadcrumbs
 	</div>
 <% end_if %>
\ No newline at end of file
diff --git a/templates/Includes/TrackBacks.ss b/templates/Includes/TrackBacks.ss
index 77210c5..41c04df 100644
--- a/templates/Includes/TrackBacks.ss
+++ b/templates/Includes/TrackBacks.ss
@@ -3,12 +3,12 @@
 	
 	<% if TrackBacks %>
 	<ul id="TrackBacks">
-		<% control TrackBacks %>
+		<% loop TrackBacks %>
 			<li>
 				<a href="$Url"><% if Title %>$Title<% else %>$Url<% end_if %></a> <span class="date">on $Created.Nice</span>
 				<% if Excerpt %><p class="excerpt">$Excerpt</p><% end_if %>
 			</li>
-		<% end_control %>
+		<% end_loop %>
 	</ul>
 	<% else %>
 		<p>No TrackBacks have been submitted for this page.</p>
diff --git a/templates/Layout/BlogEntry.ss b/templates/Layout/BlogEntry.ss
index 67f36b8..4ebc3bb 100644
--- a/templates/Layout/BlogEntry.ss
+++ b/templates/Layout/BlogEntry.ss
@@ -9,13 +9,11 @@
 			<p class="tags">
 				 <% _t('TAGS', 'Tags:') %> 
 				<% control TagsCollection %>
-					<a href="$Link" title="<% _t('VIEWALLPOSTTAGGED', 'View all posts tagged') %> '$Tag'" rel="tag">$Tag</a><% if Last %><% else %>,<% end_if %>
+					<a href="$Link" title="<% _t('VIEWALLPOSTTAGGED', 'View all posts tagged') %> '$Tag'" rel="tag">$Tag</a><% if not Last %>,<% end_if %>
 				<% end_control %>
 			</p>
-		<% end_if %>
-		
-		$Content
-		
+		<% end_if %>		
+		$Content		
 	</div>
 	
 	<% if IsOwner %><p class="edit-post"><a href="$EditURL" id="editpost" title="<% _t('EDITTHIS', 'Edit this post') %>"><% _t('EDITTHIS', 'Edit this post') %></a> | <a href="$Link(unpublishPost)" id="unpublishpost"><% _t('UNPUBLISHTHIS', 'Unpublish this post') %></a></p><% end_if %>
diff --git a/templates/Layout/BlogHolder.ss b/templates/Layout/BlogHolder.ss
index 0ce2595..47a86c6 100644
--- a/templates/Layout/BlogHolder.ss
+++ b/templates/Layout/BlogHolder.ss
@@ -5,17 +5,25 @@
 	<% include BreadCrumbs %>
 	
 	<% if SelectedTag %>
-		<h3><% _t('VIEWINGTAGGED', 'Viewing entries tagged with') %> '$SelectedTag'</h3>
+		<div class="selectedTag">
+			<em>
+			<% _t('VIEWINGTAGGED', 'Viewing entries tagged with') %> '$SelectedTag'
+			</em>
+		</div>
 	<% else_if SelectedDate %>
-		<h3><% _t('VIEWINGPOSTEDIN', 'Viewing entries posted in') %> $SelectedNiceDate</h3>
+		<div class="selectedTag">
+			<em>
+			<% _t('VIEWINGPOSTEDIN', 'Viewing entries posted in') %> $SelectedNiceDate
+			</em>
+		</div>
 	<% end_if %>
 	
 	<% if BlogEntries %>
-		<% control BlogEntries %>
-				<% include BlogSummary %>
-		<% end_control %>
+		<% loop BlogEntries %>
+			<% include BlogSummary %>
+		<% end_loop %>
 	<% else %>
-		<h3><% _t('NOENTRIES', 'There are no blog entries') %></h3>
+		<h2><% _t('NOENTRIES', 'There are no blog entries') %></h2>
 	<% end_if %>
 	
 	<% include BlogPagination %>
diff --git a/templates/Layout/BlogTree.ss b/templates/Layout/BlogTree.ss
index 8c64613..7a77f4a 100644
--- a/templates/Layout/BlogTree.ss
+++ b/templates/Layout/BlogTree.ss
@@ -12,10 +12,10 @@
 	
 	<% if BlogEntries %>
 		<% control BlogEntries %>
-				<% include BlogSummary %>
+			<% include BlogSummary %>
 		<% end_control %>
 	<% else %>
-		<h3><% _t('NOENTRIES', 'There are no blog entries') %></h3>
+		<h2><% _t('NOENTRIES', 'There are no blog entries') %></h2>
 	<% end_if %>
 	
 	<% include BlogPagination %>
diff --git a/templates/RSSWidget.ss b/templates/RSSWidget.ss
index 1cf1089..eb133aa 100644
--- a/templates/RSSWidget.ss
+++ b/templates/RSSWidget.ss
@@ -1,7 +1,7 @@
 <ul>
-	<% control FeedItems %>
+	<% loop FeedItems %>
 		<li>
 			<a href="$Link">$Title</a>
 		</li>
-	<% end_control %>
+	<% end_loop %>
 </ul>
\ No newline at end of file
diff --git a/templates/TagCloudWidget.ss b/templates/TagCloudWidget.ss
index 773987c..3544269 100644
--- a/templates/TagCloudWidget.ss
+++ b/templates/TagCloudWidget.ss
@@ -1,5 +1,5 @@
 <p class="tagcloud">
-	<% control TagsCollection %>
+	<% loop TagsCollection %>
 		<a href="$Link" class="$Class">$Tag</a> 
-	<% end_control %>
+	<% end_loop %>
 </p>
\ No newline at end of file