diff --git a/library/includes/functions.php b/library/includes/functions.php
index faebf0415..326dc7d7a 100644
--- a/library/includes/functions.php
+++ b/library/includes/functions.php
@@ -1118,7 +1118,6 @@ function setup_style()
     $css_dir = 'styles/' . basename(TEMPLATES_DIR) . '/' . $tpl_dir_name . '/css/';
 
     $template->assign_vars(array(
-        'BB_ROOT' => BB_ROOT,
         'SPACER' => make_url('styles/images/spacer.gif'),
         'STYLESHEET' => make_url($css_dir . $stylesheet),
         'EXT_LINK_NEW_WIN' => $bb_cfg['ext_link_new_win'],
@@ -1126,7 +1125,7 @@ function setup_style()
         'SITE_URL' => make_url('/'),
     ));
 
-    require TEMPLATES_DIR . '/' . $tpl_dir_name . '/tpl_config.php';
+    require_once TEMPLATES_DIR . '/' . $tpl_dir_name . '/tpl_config.php';
 
     return array('template_name' => $tpl_dir_name);
 }
diff --git a/library/includes/page_header.php b/library/includes/page_header.php
index d1f753462..af65da172 100644
--- a/library/includes/page_header.php
+++ b/library/includes/page_header.php
@@ -193,12 +193,8 @@ $template->assign_vars(array(
 
     'AJAX_HTML_DIR' => AJAX_HTML_DIR,
 
-    'ONLY_NEW_POSTS' => ONLY_NEW_POSTS,
-    'ONLY_NEW_TOPICS' => ONLY_NEW_TOPICS,
-
     // Misc
     'BOT_UID' => BOT_UID,
-    'COOKIE_MARK' => COOKIE_MARK,
     'SID' => $userdata['session_id'],
     'SID_HIDDEN' => '<input type="hidden" name="sid" value="' . $userdata['session_id'] . '" />',
 
diff --git a/styles/templates/default/index.tpl b/styles/templates/default/index.tpl
index 9d6617e38..5eeeb465d 100644
--- a/styles/templates/default/index.tpl
+++ b/styles/templates/default/index.tpl
@@ -48,7 +48,7 @@
 <div id="forums_wrap">
 
 <!-- IF H_C_AL_MESS -->
-<div class="row1 med tCenter pad_4 border bw_TRBL" style="margin: 4px 0;">{L_HIDE_CAT_MESS} &middot; <a href="index.php?sh=1">{L_SHOW_ALL}</a></div>
+<div class="row1 med tCenter pad_4 border bw_TRBL" style="margin: 4px 0;">{L_HIDE_CAT_MESS} &middot; <a href="{U_INDEX}?sh=1">{L_SHOW_ALL}</a></div>
 <div class="spacer_2"></div>
 <!-- ENDIF -->
 
@@ -155,7 +155,7 @@
 <!-- IF LOGGED_IN and SHOW_FORUMS -->
 <div id="mark_all_forums_read">
 	<a href="{U_SEARCH_NEW}" class="med">{L_SEARCH_NEW}</a> &#0183;
-	<a href="{U_INDEX}" class="med" onclick="setCookie('{COOKIE_MARK}', 'all_forums');">{L_MARK_ALL_FORUMS_READ}</a>
+	<a href="{U_INDEX}" class="med" onclick="setCookie('{#COOKIE_MARK#}', 'all_forums');">{L_MARK_ALL_FORUMS_READ}</a>
 </div>
 <!-- ENDIF -->
 
diff --git a/styles/templates/default/page_header.tpl b/styles/templates/default/page_header.tpl
index d9829ad33..d472f58c9 100644
--- a/styles/templates/default/page_header.tpl
+++ b/styles/templates/default/page_header.tpl
@@ -390,14 +390,14 @@ $(document).ready(function() {
 				<label>
 					<input id="only_new_posts" type="checkbox" <!-- IF ONLY_NEW_POSTS_ON -->{CHECKED}<!-- ENDIF -->
 						onclick="
-							user.set('only_new', ( this.checked ? {ONLY_NEW_POSTS} : 0 ), 365, true);
+							user.set('only_new', ( this.checked ? {#ONLY_NEW_POSTS#} : 0 ), 365, true);
 							$('#only_new_topics').attr('checked', false);
 						" />{L_ONLY_NEW_POSTS}
 				</label>
 				<label>
 					<input id="only_new_topics" type="checkbox" <!-- IF ONLY_NEW_TOPICS_ON -->{CHECKED}<!-- ENDIF -->
 						onclick="
-							user.set('only_new', ( this.checked ? {ONLY_NEW_TOPICS} : 0 ), 365, true);
+							user.set('only_new', ( this.checked ? {#ONLY_NEW_TOPICS#} : 0 ), 365, true);
 							$('#only_new_posts').attr('checked', false);
 						" />{L_ONLY_NEW_TOPICS}
 				</label>
diff --git a/styles/templates/default/search_results.tpl b/styles/templates/default/search_results.tpl
index 95a9dbca0..5f09466f4 100644
--- a/styles/templates/default/search_results.tpl
+++ b/styles/templates/default/search_results.tpl
@@ -10,7 +10,7 @@
 	<span id="edit-sel-topics" style="display: none;"><a href="#" class="bold adm" onclick="$('input.topic-chbox').trigger('click'); return false;">{L_SELECT_INVERT}</a></span>
 	<!-- ENDIF -->
 	&nbsp;&middot;&nbsp;
-	<!-- IF LOGGED_IN --><a href="#" class="med normal" onclick="setCookie('{COOKIE_MARK}', 'all_forums'); post2url ('{SITE_URL}'); return false;">{L_MARK_ALL_FORUMS_READ}</a><!-- ENDIF -->
+	<!-- IF LOGGED_IN --><a href="#" class="med normal" onclick="setCookie('{#COOKIE_MARK#}', 'all_forums'); post2url ('{SITE_URL}'); return false;">{L_MARK_ALL_FORUMS_READ}</a><!-- ENDIF -->
 </div>
 
 <!-- IF DISPLAY_AS_POSTS -->
diff --git a/styles/templates/default/usercp_topic_watch.tpl b/styles/templates/default/usercp_topic_watch.tpl
index 59ab0fc82..9a1f3dcc5 100644
--- a/styles/templates/default/usercp_topic_watch.tpl
+++ b/styles/templates/default/usercp_topic_watch.tpl
@@ -80,7 +80,7 @@ td.topic_id { cursor: pointer; }
 			<a href="{U_INDEX}">{T_INDEX}</a>&nbsp;<em>&middot;</em>
 			<span id="show-edit-btn"><a href="#">{L_EDIT_MY_MESSAGE_LIST}</a></span>
 			<span id="edit-sel-topics" style="display: none;"><a href="#" class="bold adm" onclick="$('input.topic-chbox').trigger('click'); return false;">{L_SELECT_INVERT}</a></span><em>&middot;</em>
-			<a href="#" class="med normal" onclick="setCookie('{COOKIE_MARK}', 'all_forums');">{L_MARK_ALL_FORUMS_READ}</a>
+			<a href="#" class="med normal" onclick="setCookie('{#COOKIE_MARK#}', 'all_forums');">{L_MARK_ALL_FORUMS_READ}</a>
 		</div>
 	</td>
 	<td class="vBottom tLeft nowrap med"><b>{PAGINATION}</b></td>