diff --git a/e107_plugins/forum/newforumposts_menu.php b/e107_plugins/forum/newforumposts_menu.php
index 18d51f649..411cd737a 100755
--- a/e107_plugins/forum/newforumposts_menu.php
+++ b/e107_plugins/forum/newforumposts_menu.php
@@ -11,9 +11,9 @@
 |     GNU General Public License (http://gnu.org).
 |
 |     $Source: /cvs_backup/e107_0.8/e107_plugins/forum/newforumposts_menu.php,v $
-|     $Revision: 1.1.1.1 $
-|     $Date: 2006-12-02 04:35:15 $
-|     $Author: mcfly_e107 $
+|     $Revision: 1.2 $
+|     $Date: 2007-05-28 16:52:31 $
+|     $Author: e107steved $
 +----------------------------------------------------------------------------+
 */
 if (!defined('e107_INIT')) { exit; }
@@ -85,11 +85,11 @@ else
 
 		if ($menu_pref['newforumposts_title'])
 		{
-			$text .= "<img src='".THEME."images/".(defined("BULLET") ? BULLET : "bullet2.gif")."' alt='' /> <a href='".e_PLUGIN."forum/forum_viewtopic.php?{$id}.post'>".$topic."</a><br />".$fi['thread_thread']."<br />".NFP_11." ".$poster."<br />".$datestamp."<br/><br />";
+			$text .= "<img src='".THEME_ABS."images/".(defined("BULLET") ? BULLET : "bullet2.gif")."' alt='' /> <a href='".e_PLUGIN."forum/forum_viewtopic.php?{$id}.post'>".$topic."</a><br />".$fi['thread_thread']."<br />".NFP_11." ".$poster."<br />".$datestamp."<br/><br />";
 		}
 		else
 		{
-			$text .= "<img src='".THEME."images/".(defined("BULLET") ? BULLET : "bullet2.gif")."' alt='' /> <a href='".e_PLUGIN."forum/forum_viewtopic.php?{$id}.post'>".NFP_11." ".$poster."</a><br />".$fi['thread_thread']."<br />".$datestamp."<br/><br />";
+			$text .= "<img src='".THEME_ABS."images/".(defined("BULLET") ? BULLET : "bullet2.gif")."' alt='' /> <a href='".e_PLUGIN."forum/forum_viewtopic.php?{$id}.post'>".NFP_11." ".$poster."</a><br />".$fi['thread_thread']."<br />".$datestamp."<br/><br />";
 		}
 	}
 }
diff --git a/e107_plugins/links_page/link_menu.php b/e107_plugins/links_page/link_menu.php
index 95773f203..07f734565 100644
--- a/e107_plugins/links_page/link_menu.php
+++ b/e107_plugins/links_page/link_menu.php
@@ -11,7 +11,7 @@ global $tp;
 $lan_file = e_PLUGIN."links_page/languages/".e_LANGUAGE.".php";
 include_once(file_exists($lan_file) ? $lan_file : e_PLUGIN."links_page/languages/English.php");
 
-$bullet = "<img src='".THEME."images/bullet2.gif' alt='' style='border:0;' />";
+$bullet = "<img src='".THEME_ABS."images/bullet2.gif' alt='' style='border:0;' />";
 global $linkspage_pref;
 $linkspage_pref = $lc -> getLinksPagePref();
 
diff --git a/e107_plugins/links_page/link_shortcodes.php b/e107_plugins/links_page/link_shortcodes.php
index d7da95b45..148d14f28 100644
--- a/e107_plugins/links_page/link_shortcodes.php
+++ b/e107_plugins/links_page/link_shortcodes.php
@@ -186,7 +186,7 @@ if(isset($linkspage_pref['link_cat_icon']) && $linkspage_pref['link_cat_icon']){
 			$LINK_MAIN_ICON = "<img src='".e_BASE.$rowl['link_category_icon']."' alt='' style='border:0; vertical-align:middle' />";
 			} else {
 				if(isset($linkspage_pref['link_cat_icon_empty']) && $linkspage_pref['link_cat_icon_empty']){
-				$LINK_MAIN_ICON = "<img src='".THEME."images/".(defined("BULLET") ? BULLET : "bullet2.gif")."' alt='' style='border:0; vertical-align:middle;' />";
+				$LINK_MAIN_ICON = "<img src='".THEME_ABS."images/".(defined("BULLET") ? BULLET : "bullet2.gif")."' alt='' style='border:0; vertical-align:middle;' />";
 				}
 			}
 		}else{
@@ -194,13 +194,13 @@ if(isset($linkspage_pref['link_cat_icon']) && $linkspage_pref['link_cat_icon']){
 			$LINK_MAIN_ICON = "<img src='".e_PLUGIN."links_page/cat_images/".$rowl['link_category_icon']."' alt='' style='border:0; vertical-align:middle' />";
 			} else {
 				if(isset($linkspage_pref['link_cat_icon_empty']) && $linkspage_pref['link_cat_icon_empty']){
-				$LINK_MAIN_ICON = "<img src='".THEME."images/".(defined("BULLET") ? BULLET : "bullet2.gif")."' alt='' style='border:0; vertical-align:middle;' />";
+				$LINK_MAIN_ICON = "<img src='".THEME_ABS."images/".(defined("BULLET") ? BULLET : "bullet2.gif")."' alt='' style='border:0; vertical-align:middle;' />";
 				}
 			}
 		}
 	} else {
 		if(isset($linkspage_pref['link_cat_icon_empty']) && $linkspage_pref['link_cat_icon_empty']){
-		$LINK_MAIN_ICON = "<img src='".THEME."images/".(defined("BULLET") ? BULLET : "bullet2.gif")."' alt='' style='border:0; vertical-align:middle;' />";
+		$LINK_MAIN_ICON = "<img src='".THEME_ABS."images/".(defined("BULLET") ? BULLET : "bullet2.gif")."' alt='' style='border:0; vertical-align:middle;' />";
 		}
 	}
 	if($rowl['total_links'] && $LINK_MAIN_ICON){
diff --git a/e107_plugins/online/online_menu.php b/e107_plugins/online/online_menu.php
index 6e663d8ef..3bb3b84b9 100644
--- a/e107_plugins/online/online_menu.php
+++ b/e107_plugins/online/online_menu.php
@@ -11,9 +11,9 @@
 |     GNU General Public License (http://gnu.org).
 |
 |     $Source: /cvs_backup/e107_0.8/e107_plugins/online/online_menu.php,v $
-|     $Revision: 1.1 $
-|     $Date: 2007-05-01 19:50:56 $
-|     $Author: lisa_ $
+|     $Revision: 1.2 $
+|     $Date: 2007-05-28 16:52:31 $
+|     $Author: e107steved $
 +----------------------------------------------------------------------------+
 */
 
@@ -88,7 +88,7 @@ if(!defined("e_TRACKING_DISABLED") && varsettrue($pref['track_online'])){
 	}
 }
 
-$img = (is_readable(THEME."images/online_menu.png") ? "<img src='".THEME."images/online_menu.png' alt='' />" : "");
+$img = (is_readable(THEME."images/online_menu.png") ? "<img src='".THEME_ABS."images/online_menu.png' alt='' />" : "");
 $caption = $img." ".varsettrue($menu_pref['online_caption'],LAN_ONLINE_10);
 $ns->tablerender($caption, $text, 'online');
 
diff --git a/e107_plugins/poll/poll_class.php b/e107_plugins/poll/poll_class.php
index e12a37758..a36082b41 100644
--- a/e107_plugins/poll/poll_class.php
+++ b/e107_plugins/poll/poll_class.php
@@ -11,8 +11,8 @@
 |     GNU General Public License (http://gnu.org).
 |
 |     $Source: /cvs_backup/e107_0.8/e107_plugins/poll/poll_class.php,v $
-|     $Revision: 1.2 $
-|     $Date: 2007-01-07 15:59:42 $
+|     $Revision: 1.3 $
+|     $Date: 2007-05-28 16:52:31 $
 |     $Author: e107steved $
 +----------------------------------------------------------------------------+
 */
@@ -240,9 +240,9 @@ class poll
 			$POLLMODE = $this->pollmode;
 		}
 
-		$barl = (file_exists(THEME."images/barl.png") ? THEME."images/barl.png" : e_PLUGIN."poll/images/barl.png");
-		$barr = (file_exists(THEME."images/barr.png") ? THEME."images/barr.png" : e_PLUGIN."poll/images/barr.png");
-		$bar = (file_exists(THEME."images/bar.png") ? THEME."images/bar.png" : e_PLUGIN."poll/images/bar.png");
+		$barl = (file_exists(THEME."images/barl.png") ? THEME_ABS."images/barl.png" : e_PLUGIN."poll/images/barl.png");
+		$barr = (file_exists(THEME."images/barr.png") ? THEME_ABS."images/barr.png" : e_PLUGIN."poll/images/barr.png");
+		$bar = (file_exists(THEME."images/bar.png") ? THEME_ABS."images/bar.png" : e_PLUGIN."poll/images/bar.png");
 
 		if($type == "preview")
 		{
@@ -399,7 +399,7 @@ class poll
 		}
 
 		if(!defined("POLLRENDERED")) define("POLLRENDERED", TRUE);
-		$caption = (file_exists(THEME."images/poll_menu.png") ? "<img src='".THEME."images/poll_menu.png' alt='' /> ".POLLAN_MENU_CAPTION : POLLAN_MENU_CAPTION);
+		$caption = (file_exists(THEME."images/poll_menu.png") ? "<img src='".THEME_ABS."images/poll_menu.png' alt='' /> ".POLLAN_MENU_CAPTION : POLLAN_MENU_CAPTION);
 		if($type == "preview")
 		{
 			$caption = POLLAN_23;
diff --git a/e107_themes/khatru/forum_viewforum_template.php b/e107_themes/khatru/forum_viewforum_template.php
index e604a64b4..75bfa64c5 100644
--- a/e107_themes/khatru/forum_viewforum_template.php
+++ b/e107_themes/khatru/forum_viewforum_template.php
@@ -11,15 +11,15 @@
 |     GNU General Public License (http://gnu.org).
 |
 |     $Source: /cvs_backup/e107_0.8/e107_themes/khatru/forum_viewforum_template.php,v $
-|     $Revision: 1.2 $
-|     $Date: 2007-01-20 16:31:14 $
-|     $Author: mrpete $
+|     $Revision: 1.3 $
+|     $Date: 2007-05-28 16:52:39 $
+|     $Author: e107steved $
 +----------------------------------------------------------------------------+
 */
 
 if (!defined('e107_INIT')) { exit; }
 
-$icon = (file_exists(THEME."forum/e.png") ? THEME."forum/e.png" : e_PLUGIN."forum/images/lite/e.png");
+$icon = (file_exists(THEME."forum/e.png") ? THEME_ABS."forum/e.png" : e_PLUGIN."forum/images/lite/e.png");
 
 
 
diff --git a/e107_themes/leaf/theme.php b/e107_themes/leaf/theme.php
index a020bd4f3..88c93cdec 100644
--- a/e107_themes/leaf/theme.php
+++ b/e107_themes/leaf/theme.php
@@ -11,8 +11,8 @@
 |	GNU General Public License (http://gnu.org).
 |
 |     $Source: /cvs_backup/e107_0.8/e107_themes/leaf/theme.php,v $
-|     $Revision: 1.2 $
-|     $Date: 2007-03-03 19:59:43 $
+|     $Revision: 1.3 $
+|     $Date: 2007-05-28 16:52:39 $
 |     $Author: e107steved $
 +---------------------------------------------------------------+
 */
@@ -61,16 +61,16 @@ $colorstyle ="E2EDF0";
 // [header function]
 function theme_head() {
 	global $logo, $colorstyle;
-	return "<link rel='alternate stylesheet' type='text/css' href='".THEME."style.css' title='Small' />
-	<link rel='alternate stylesheet' type='text/css' href='".THEME."fontstyles/medium.css' title='Medium' />
-	<link rel='alternate stylesheet' type='text/css' href='".THEME."fontstyles/large.css' title='Large' />
+	return "<link rel='alternate stylesheet' type='text/css' href='".THEME_ABS."style.css' title='Small' />
+	<link rel='alternate stylesheet' type='text/css' href='".THEME_ABS."fontstyles/medium.css' title='Medium' />
+	<link rel='alternate stylesheet' type='text/css' href='".THEME_ABS."fontstyles/large.css' title='Large' />
 	<style type='text/css'>
 	#header{
 		position: relative;
 		width: 700px;
 		height: 151px;
 		margin: auto;
-		background: url(".THEME."images/01_header0".$logo.".jpg) no-repeat;
+		background: url(".THEME_ABS."images/01_header0".$logo.".jpg) no-repeat;
 	}
 	/* Sidbar menu content styles */
 	.loginform, .searchform, .chatboxform, .onlineform{
diff --git a/e107_themes/templates/login_template.php b/e107_themes/templates/login_template.php
index 715e4cd92..e9f099aea 100644
--- a/e107_themes/templates/login_template.php
+++ b/e107_themes/templates/login_template.php
@@ -7,7 +7,7 @@ if(!$LOGIN_TABLE_HEADER){
 	$LOGIN_TABLE_HEADER .= "
 	<div style='width:100%;text-align:center; margin-left: auto;margin-right: auto'><br />
 		<div style='text-align:center;width:70%;margin-left: auto;margin-right: auto'>
-			".(file_exists(THEME."images/login_logo.png") ? "<img src='".THEME."images/login_logo.png' alt='' />\n" : "<img src='".e_IMAGE."logo.png' alt='' />\n" );
+			".(file_exists(THEME."images/login_logo.png") ? "<img src='".THEME_ABS."images/login_logo.png' alt='' />\n" : "<img src='".e_IMAGE."logo.png' alt='' />\n" );
 }
 
 // ##### LOGIN TABLE -----------------------------------------------------------------------------
@@ -18,7 +18,7 @@ if(!$LOGIN_TABLE){
 		}
 		$LOGIN_TABLE .= "
 		<div style='text-align:center'>
-		".$rs -> form_open("post", e_SELF)."<table class='fborder' style='width:60%' >\n<tr>\n<td class='forumheader' style='text-align:center;' colspan='3'>".LAN_LOGIN_4."</td>\n</tr>\n<tr>\n<td class='forumheader3' width='40%'>".LAN_LOGIN_1."</td>\n<td class='forumheader3' width='40%'>{LOGIN_TABLE_USERNAME}</td>\n<td class='forumheader3' width='20%' rowspan='".($LOGIN_TABLE_SECIMG_SECIMG ? 3 : 2)."' style='vertical-align: middle; margin-left: auto; margin-right: auto; text-align: center;'>".(file_exists(THEME."images/password.png") ? "<img src='".THEME."images/password.png' alt='' />\n" : "<img src='".e_IMAGE."packs/".$imode."/generic/password.png' alt='' />\n" )."</td>\n</tr>\n<tr>\n<td class='forumheader3'>".LAN_LOGIN_2."</td>\n<td class='forumheader3'>{LOGIN_TABLE_PASSWORD}</td>\n</tr>\n";
+		".$rs -> form_open("post", e_SELF)."<table class='fborder' style='width:60%' >\n<tr>\n<td class='forumheader' style='text-align:center;' colspan='3'>".LAN_LOGIN_4."</td>\n</tr>\n<tr>\n<td class='forumheader3' width='40%'>".LAN_LOGIN_1."</td>\n<td class='forumheader3' width='40%'>{LOGIN_TABLE_USERNAME}</td>\n<td class='forumheader3' width='20%' rowspan='".($LOGIN_TABLE_SECIMG_SECIMG ? 3 : 2)."' style='vertical-align: middle; margin-left: auto; margin-right: auto; text-align: center;'>".(file_exists(THEME."images/password.png") ? "<img src='".THEME_ABS."images/password.png' alt='' />\n" : "<img src='".e_IMAGE."packs/".$imode."/generic/password.png' alt='' />\n" )."</td>\n</tr>\n<tr>\n<td class='forumheader3'>".LAN_LOGIN_2."</td>\n<td class='forumheader3'>{LOGIN_TABLE_PASSWORD}</td>\n</tr>\n";
 	if($LOGIN_TABLE_SECIMG_SECIMG){
 		$LOGIN_TABLE .= "<tr><td class='forumheader3'>{LOGIN_TABLE_SECIMG_LAN}</td>\n<td class='forumheader3'>{LOGIN_TABLE_SECIMG_HIDDEN} {LOGIN_TABLE_SECIMG_SECIMG} {LOGIN_TABLE_SECIMG_TEXTBOC}</td>\n</tr>\n";
 	}