diff --git a/upload/includes/functions.php b/upload/includes/functions.php
index 02dfe8ea9..725b7a60b 100644
--- a/upload/includes/functions.php
+++ b/upload/includes/functions.php
@@ -1226,7 +1226,7 @@ function show_bt_userdata ($user_id)
 		'MIN_DL_FOR_RATIO' => humn_size(MIN_DL_FOR_RATIO),
 		'MIN_DL_BYTES'     => MIN_DL_FOR_RATIO,
 		'AUTH_KEY'         => ($btu['auth_key']) ? $btu['auth_key'] : $lang['NONE'],
-		
+
 		'TD_DL'            => humn_size($btu['down_today']),
 		'TD_UL'            => humn_size($btu['up_today']),
 		'TD_REL'           => humn_size($btu['up_release_today']),
@@ -1238,7 +1238,7 @@ function show_bt_userdata ($user_id)
 		'YS_REL'           => humn_size($btu['up_release_yesterday']),
 		'YS_BONUS'         => humn_size($btu['up_bonus_yesterday']),
 		'YS_POINTS'        => ($btu['auth_key']) ? $btu['points_yesterday'] : '0.00',
-		
+
 		'SPEED_UP'         => humn_size($btu['speed_up'], 0, 'KB') .'/s',
 		'SPEED_DOWN'       => humn_size($btu['speed_down'], 0, 'KB') .'/s',
 	));
@@ -1555,13 +1555,15 @@ function setup_style ()
 	$stylesheet   = defined('IN_ADMIN') ? 'main.css'  : basename($bb_cfg['stylesheet']);
 
 	$template = new Template(TEMPLATES_DIR . $tpl_dir_name);
-	$css_dir = BB_ROOT . basename(TEMPLATES_DIR) ."/$tpl_dir_name/css/";
+	$css_dir = basename(TEMPLATES_DIR) ."/$tpl_dir_name/css/";
 
 	$template->assign_vars(array(
 		'BB_ROOT'          => BB_ROOT,
-		'SPACER'           => BB_ROOT .'images/spacer.gif',
-		'STYLESHEET'       => $css_dir . $stylesheet,
+		'SPACER'           => make_url('/images/spacer.gif'),
+		'STYLESHEET'       => make_url($css_dir . $stylesheet),
 		'EXT_LINK_NEW_WIN' => $bb_cfg['ext_link_new_win'],
+		'TPL_DIR'          => make_url($css_dir),
+		'SITE_URL'         => make_url('/'),
 	));
 
 	require(TEMPLATES_DIR . $tpl_dir_name .'/tpl_config.php');
diff --git a/upload/includes/page_header.php b/upload/includes/page_header.php
index 0206417b7..1c4764c09 100644
--- a/upload/includes/page_header.php
+++ b/upload/includes/page_header.php
@@ -245,7 +245,6 @@ $template->assign_vars(array(
 	'TOPIC_URL'          => BB_ROOT . TOPIC_URL,
 
 	'AJAX_HTML_DIR'      => AJAX_HTML_DIR,
-	'AJAX_HANDLER'       => BB_ROOT .'ajax.php',
 
 	'ONLY_NEW_POSTS'     => ONLY_NEW_POSTS,
 	'ONLY_NEW_TOPICS'    => ONLY_NEW_TOPICS,
diff --git a/upload/templates/default/page_header.tpl b/upload/templates/default/page_header.tpl
index e151eb554..073be4b3e 100644
--- a/upload/templates/default/page_header.tpl
+++ b/upload/templates/default/page_header.tpl
@@ -7,16 +7,16 @@
 <meta http-equiv="Content-Style-Type" content="text/css" />
 {META}
 <link rel="stylesheet" href="{STYLESHEET}?v={$bb_cfg['css_ver']}" type="text/css">
-<link rel="icon" type="image/png" href="/images/logo/logo_big.png" />
-<link rel="shortcut icon" href="/favicon.ico" type="image/x-icon">
-<link rel="search" type="application/opensearchdescription+xml" href="opensearch_desc.xml" title="{SITENAME} (Forum)" />
-<link rel="search" type="application/opensearchdescription+xml" href="opensearch_desc_bt.xml" title="{SITENAME} (Tracker)" />
+<link rel="icon" type="image/png" href="{SITE_URL}images/logo/logo_big.png" />
+<link rel="shortcut icon" href="{SITE_URL}favicon.ico" type="image/x-icon">
+<link rel="search" type="application/opensearchdescription+xml" href="{SITE_URL}opensearch_desc.xml" title="{SITENAME} (Forum)" />
+<link rel="search" type="application/opensearchdescription+xml" href="{SITE_URL}opensearch_desc_bt.xml" title="{SITENAME} (Tracker)" />
 
-<script type="text/javascript" src="{#BB_ROOT}misc/js/jquery.pack.js?v={$bb_cfg['js_ver']}"></script>
-<script type="text/javascript" src="{#BB_ROOT}misc/js/main.js?v={$bb_cfg['js_ver']}"></script>
+<script type="text/javascript" src="{SITE_URL}misc/js/jquery.pack.js?v={$bb_cfg['js_ver']}"></script>
+<script type="text/javascript" src="{SITE_URL}misc/js/main.js?v={$bb_cfg['js_ver']}"></script>
 
 <!-- IF INCLUDE_BBCODE_JS -->
-<script type="text/javascript" src="{#BB_ROOT}misc/js/bbcode.js?v={$bb_cfg['js_ver']}"></script>
+<script type="text/javascript" src="{SITE_URL}misc/js/bbcode.js?v={$bb_cfg['js_ver']}"></script>
 <script type="text/javascript">
 var postImg_MaxWidth = screen.width - {POST_IMG_WIDTH_DECR_JS};
 var postImgAligned_MaxWidth = Math.round(screen.width/3);
@@ -58,7 +58,7 @@ function initPostImages(context)
 		$img.bind('click', function(){ return imgFit(this, maxW); });
 		if (user.opt_js.i_aft_l) {
 			$('#preload').append($img);
-			var loading_icon = '<a href="'+ src +'" target="_blank"><img src="images/pic_loading.gif" alt="" /></a>';
+			var loading_icon = '<a href="'+ src +'" target="_blank"><img src="{SITE_URL}images/pic_loading.gif" alt="" /></a>';
 			$v.html(loading_icon);
 			if ($.browser.msie) {
 				$v.after('<wbr>');
@@ -167,7 +167,7 @@ $(document).ready(function(){
 });
 <!-- ENDIF -->
 
-var ajax = new Ajax('{AJAX_HANDLER}', 'POST', 'json');
+var ajax = new Ajax('{SITE_URL}ajax.php', 'POST', 'json');
 
 function getElText (e)
 {
@@ -565,12 +565,12 @@ important_info
     <td id="main_content">
     <div id="main_content_wrap">
     <div id="latest_news">
-    <table cellspacing="0" cellpadding="0" width="100%"> 
+    <table cellspacing="0" cellpadding="0" width="100%">
         <tr>
             <td width="50%">
                 <!-- IF SHOW_LATEST_NEWS -->
-                <h3>{L_LATEST_NEWS}</h3> 
-                    <table cellpadding="0"> 
+                <h3>{L_LATEST_NEWS}</h3>
+                    <table cellpadding="0">
                     <!-- BEGIN news -->
                     <tr>
                         <td><div class="news_date">{news.NEWS_TIME}</div></td>
@@ -582,7 +582,7 @@ important_info
                     </table>
 			        <!-- ENDIF -->
             </td>
-   
+
             <!-- IF SHOW_NETWORK_NEWS -->
             <td width="50%">
                 <h3>{L_NETWORK_NEWS}</h3>