diff --git a/templates/Includes/BreadCrumbs.ss b/templates/Includes/BreadCrumbs.ss
index 85f7896..0542f90 100644
--- a/templates/Includes/BreadCrumbs.ss
+++ b/templates/Includes/BreadCrumbs.ss
@@ -1,5 +1,5 @@
-<% if Level(2) %>
+<% if $Level(2) %>
 	<div id="Breadcrumbs">
 	   	$Breadcrumbs
 	</div>
-<% end_if %>
\ No newline at end of file
+<% end_if %>
diff --git a/templates/Includes/Header.ss b/templates/Includes/Header.ss
index 0d481bb..ebd41c0 100644
--- a/templates/Includes/Header.ss
+++ b/templates/Includes/Header.ss
@@ -2,16 +2,16 @@
 	<div class="inner">
 		<a href="$BaseHref" class="brand" rel="home">
 			<h1>$SiteConfig.Title</h1>
-			<% if SiteConfig.Tagline %>
+			<% if $SiteConfig.Tagline %>
 			<p>$SiteConfig.Tagline</p>
 			<% end_if %>
 		</a>
-		<% if SearchForm %>
+		<% if $SearchForm %>
 			<span class="search-dropdown-icon">L</span>
 			<div class="search-bar">
 				$SearchForm
-			</div>		
+			</div>
 		<% end_if %>
 		<% include Navigation %>
 	</div>
-</header>
\ No newline at end of file
+</header>
diff --git a/templates/Includes/Navigation.ss b/templates/Includes/Navigation.ss
index 70d4104..2383fa2 100644
--- a/templates/Includes/Navigation.ss
+++ b/templates/Includes/Navigation.ss
@@ -1,8 +1,8 @@
 <nav class="primary">
 	<span class="nav-open-button">²</span>
 	<ul>
-		<% loop Menu(1) %>	  
+		<% loop $Menu(1) %>
 			<li class="$LinkingMode"><a href="$Link" title="$Title.XML">$MenuTitle.XML</a></li>
 		<% end_loop %>
 	</ul>
-</nav>
\ No newline at end of file
+</nav>
diff --git a/templates/Includes/SideBar.ss b/templates/Includes/SideBar.ss
index 77d632b..0b623a8 100644
--- a/templates/Includes/SideBar.ss
+++ b/templates/Includes/SideBar.ss
@@ -1,16 +1,16 @@
 <aside>
-	<% if Menu(2) %>
+	<% if $Menu(2) %>
 		<nav class="secondary">
 			<h3>
-				<% loop Level(1) %>
+				<% loop $Level(1) %>
 					$Title
 				<% end_loop %>
 			</h3>
 			<ul>
-				<% loop Menu(1) %>
+				<% loop $Menu(1) %>
 					<% include SidebarMenu %>
 				<% end_loop %>
 			</ul>
 		</nav>
-	<% end_if %>  	
-</aside>
\ No newline at end of file
+	<% end_if %>
+</aside>
diff --git a/templates/Includes/SidebarMenu.ss b/templates/Includes/SidebarMenu.ss
index d8aa76b..1a981e5 100644
--- a/templates/Includes/SidebarMenu.ss
+++ b/templates/Includes/SidebarMenu.ss
@@ -1,18 +1,18 @@
-<!--Include SidebarMenu recursively /-->
-<% if Children %>	
-	<% loop Children %>	
+<%--Include SidebarMenu recursively --%>
+<% if $Children %>
+	<% loop $Children %>
 		<li class="$LinkingMode">
 			<a href="$Link" class="$LinkingMode" title="Go to the $Title.XML page">
 				<span class="arrow">&rarr;</span>
 				<span class="text">$MenuTitle.XML</span>
 			</a>
 
-			<% if Children %>
-				<ul>	
+			<% if $Children %>
+				<ul>
 					<% include SidebarMenu %>
-				</ul>	
+				</ul>
 			<% end_if %>
 
 		</li>
 	<% end_loop %>
-<% end_if %>
\ No newline at end of file
+<% end_if %>
diff --git a/templates/Layout/Page_results.ss b/templates/Layout/Page_results.ss
index a1f2686..7dd793a 100644
--- a/templates/Layout/Page_results.ss
+++ b/templates/Layout/Page_results.ss
@@ -1,54 +1,54 @@
 <div id="Content" class="searchResults">
     <h1>$Title</h1>
-     
-    <% if Query %>
+
+    <% if $Query %>
         <p class="searchQuery">You searched for &quot;{$Query}&quot;</p>
     <% end_if %>
-         
-    <% if Results %>
+
+    <% if $Results %>
     <ul id="SearchResults">
-        <% control Results %>
+        <% loop $Results %>
         <li>
             <h4>
                 <a href="$Link">
-                    <% if MenuTitle %>
+                    <% if $MenuTitle %>
                     $MenuTitle
                     <% else %>
                     $Title
                     <% end_if %>
                 </a>
             </h4>
-            <% if Content %>
+            <% if $Content %>
                 <p>$Content.LimitWordCountXML</p>
             <% end_if %>
             <a class="readMoreLink" href="$Link" title="Read more about &quot;{$Title}&quot;">Read more about &quot;{$Title}&quot;...</a>
         </li>
-        <% end_control %>
+        <% end_loop %>
     </ul>
     <% else %>
     <p>Sorry, your search query did not return any results.</p>
     <% end_if %>
-             
-    <% if Results.MoreThanOnePage %>
+
+    <% if $Results.MoreThanOnePage %>
     <div id="PageNumbers">
         <div class="pagination">
-            <% if Results.NotFirstPage %>
+            <% if $Results.NotFirstPage %>
             <a class="prev" href="$Results.PrevLink" title="View the previous page">&larr;</a>
             <% end_if %>
             <span>
-                <% control Results.Pages %>
-                    <% if CurrentBool %>
+                <% loop $Results.Pages %>
+                    <% if $CurrentBool %>
                     $PageNum
                     <% else %>
                     <a href="$Link" title="View page number $PageNum" class="go-to-page">$PageNum</a>
                     <% end_if %>
-                <% end_control %>
+                <% end_loop %>
             </span>
-            <% if Results.NotLastPage %>
+            <% if $Results.NotLastPage %>
             <a class="next" href="$Results.NextLink" title="View the next page">&rarr;</a>
             <% end_if %>
-        </div>    
+        </div>
         <p>Page $Results.CurrentPage of $Results.TotalPages</p>
     </div>
     <% end_if %>
-</div>
\ No newline at end of file
+</div>
diff --git a/templates/Page.ss b/templates/Page.ss
index 5c6535f..223c307 100644
--- a/templates/Page.ss
+++ b/templates/Page.ss
@@ -14,7 +14,7 @@ Change it, enhance it and most importantly enjoy it!
 <!--[if IE 8 ]><html lang="$ContentLocale" class="ie ie8"><![endif]-->
 <head>
 	<% base_tag %>
-	<title><% if MetaTitle %>$MetaTitle<% else %>$Title<% end_if %> &raquo; $SiteConfig.Title</title>
+	<title><% if $MetaTitle %>$MetaTitle<% else %>$Title<% end_if %> &raquo; $SiteConfig.Title</title>
 	<meta charset="utf-8">
 	<meta name="viewport" content="width=device-width, initial-scale=1.0, maximum-scale=1.0, user-scalable=0;">
 	<meta http-equiv="Content-Type" content="text/html; charset=utf-8">
@@ -22,13 +22,13 @@ Change it, enhance it and most importantly enjoy it!
 	<!--[if lt IE 9]>
 	<script src="//html5shiv.googlecode.com/svn/trunk/html5.js"></script>
 	<![endif]-->
-	<% require themedCSS(reset) %>
-	<% require themedCSS(typography) %>
-	<% require themedCSS(form) %>	
-	<% require themedCSS(layout) %>
+	<% require themedCSS('reset') %>
+	<% require themedCSS('typography') %>
+	<% require themedCSS('form') %>
+	<% require themedCSS('layout') %>
 	<link rel="shortcut icon" href="$ThemeDir/images/favicon.ico" />
 </head>
-<body class="$ClassName<% if Menu(2) %><% else %> no-sidebar<% end_if %>">
+<body class="$ClassName<% if not $Menu(2) %> no-sidebar<% end_if %>">
 <% include Header %>
 <div class="main" role="main">
 	<div class="inner typography">
@@ -37,9 +37,9 @@ Change it, enhance it and most importantly enjoy it!
 </div>
 <% include Footer %>
 
-<% require javascript(framework/thirdparty/jquery/jquery.js) %>
+<% require javascript('framework/thirdparty/jquery/jquery.js') %>
 <%-- Please move: Theme javascript (below) should be moved to mysite/code/page.php  --%>
 <script type="text/javascript" src="{$ThemeDir}/javascript/script.js"></script>
 
 </body>
-</html>
\ No newline at end of file
+</html>