Index: trunk/index.php
===================================================================
diff -u -N -r668 -r720
--- trunk/index.php	(.../index.php)	(revision 668)
+++ trunk/index.php	(.../index.php)	(revision 720)
@@ -64,7 +64,6 @@
 	  LogEntry("Language Set Loaded\n");
 
   	  $TemplateRoot = $CurrentTheme->ThemeDirectory()."/";
-//	echo "Template Root: $TemplateRoot<br>\n";
 
 	  LogEntry("Parsing Templates in $TemplateRoot\n");
 	  $objTemplate = new clsTemplateList($TemplateRoot);
@@ -91,8 +90,7 @@
 }
 if($objTemplate->ErrorNo == -1)
 {
-    $html = $objTemplate->ParseTemplate("error_template");
-    
+	$html = $objTemplate->ParseTemplate('error_template');
 }
 //$html = replacePngTags($html);
 LogEntry("Output Start\n");
Index: trunk/kernel/include/parse.php
===================================================================
diff -u -N -r595 -r720
--- trunk/kernel/include/parse.php	(.../parse.php)	(revision 595)
+++ trunk/kernel/include/parse.php	(.../parse.php)	(revision 720)
@@ -785,6 +785,7 @@
   function ParseTemplate($tname, $NoCache=0, $NoStack=0,$SupressError=FALSE)
   {
     $html = "";
+    if( defined('TEMPLATE_PREFIX') ) $tname = TEMPLATE_PREFIX.'/'.$tname;
     $t = $this->GetTemplate($tname,$SupressError);
 
     if(is_object($t))
Index: trunk/admin/include/mainscript.php
===================================================================
diff -u -N -r642 -r720
--- trunk/admin/include/mainscript.php	(.../mainscript.php)	(revision 642)
+++ trunk/admin/include/mainscript.php	(.../mainscript.php)	(revision 720)
@@ -183,23 +183,23 @@
 	var ob = document.getElementById(imgid);
 	if(ob)
 	{
-      SetButtonStateByImage(imgid, src);
-      var s = src;
-      s = s.slice(0,4);
-      if(s=='http')
-      {
-        ob.src = src;
-      }
-      else
-      {
-      	if(module_name == null)
-	    	ob.src = '$adminURL' + '/images/' + src;
-	    else
-	    {
-	    	ob.src = '$rootURL' + module_name + '/$admin/images/' + src;
-	    }
-      }
-    }
+		SetButtonStateByImage(imgid, src);
+		var s = src;
+		s = s.slice(0,4);
+		if(s=='http')
+		{
+			ob.src = src;
+		}
+		else
+		{
+			if(module_name == null)
+				ob.src = '$adminURL' + '/images/' + src;
+			else
+			{
+				ob.src = '$rootURL' + module_name + '/$admin/images/' + src;
+			}
+		}
+	}
 }
 
 function flip(val)