diff --git a/includes/theme.inc b/includes/theme.inc
index 16910009272..8c304746613 100644
--- a/includes/theme.inc
+++ b/includes/theme.inc
@@ -139,7 +139,7 @@ function theme_init() {
   if (is_object($themes[$name])) {
     include_once($themes[$name]->filename);
     $theme_class = "Theme_$name";
-    @$obj =& new $theme_class;
+    @$obj =& new $theme_class($themes[$name]->filename);
     return $obj;
   }
 
diff --git a/themes/goofy/goofy.theme b/themes/goofy/goofy.theme
index 8dd71630cee..efeefa991a1 100644
--- a/themes/goofy/goofy.theme
+++ b/themes/goofy/goofy.theme
@@ -17,6 +17,10 @@
     var $foreground = "#000000";
     var $background = "#FFFFFF";
 
+    function Theme_goofy($filename) {
+      $this->path = dirname($filename);
+    }
+
     function system($field) {
       $system["name"] = "Goofy";
       $system["author"] = "Steven Wittens";
@@ -38,20 +42,20 @@
      p,ul,li,div,form,em,blockquote,quote { font-size: 10pt; font-family: tahoma,helvetica,arial; font-weight: normal; }
      td { font-family: tahoma,arial,helvetica; font-size: 10pt; font-weight: normal; }
      td.left { font-family: tahoma,arial,helvetica; font-size: 10pt; text-align: left; }
-     td.oru { background: url("themes/goofy/images/or-u.png"); width: 100%; }
-     td.ord { background: url("themes/goofy/images/or-d.png"); width: 100%; }
-     td.orl { background: url("themes/goofy/images/or-l.png"); }
-     td.orr { background: url("themes/goofy/images/or-r.png"); }
+     td.oru { background: url("<?php echo $this->path; ?>/images/or-u.png"); width: 100%; }
+     td.ord { background: url("<?php echo $this->path; ?>/images/or-d.png"); width: 100%; }
+     td.orl { background: url("<?php echo $this->path; ?>/images/or-l.png"); }
+     td.orr { background: url("<?php echo $this->path; ?>/images/or-r.png"); }
      td.orcnt { background: #FBC636; width: 100%; font-family: tahoma,arial,helvetica; font-size: 10pt; font-weight: bold; text-align: center; }
-     td.gru { background: url("themes/goofy/images/gr-u.png"); width: 100%; }
-     td.grd { background: url("themes/goofy/images/gr-d.png"); width: 100%; }
-     td.grl { background: url("themes/goofy/images/gr-l.png"); }
-     td.grr { background: url("themes/goofy/images/gr-r.png"); }
+     td.gru { background: url("<?php echo $this->path; ?>/images/gr-u.png"); width: 100%; }
+     td.grd { background: url("<?php echo $this->path; ?>/images/gr-d.png"); width: 100%; }
+     td.grl { background: url("<?php echo $this->path; ?>/images/gr-l.png"); }
+     td.grr { background: url("<?php echo $this->path; ?>/images/gr-r.png"); }
      td.grcnt { background: #C6C6C6; width: 100%; font-family: tahoma,arial,helvetica; font-size: 10pt; }
-     td.lgu { background: url("themes/goofy/images/lg-u.png"); width: 100%; }
-     td.lgd { background: url("themes/goofy/images/lg-d.png"); width: 100%; }
-     td.lgl { background: url("themes/goofy/images/lg-l.png"); }
-     td.lgr { background: url("themes/goofy/images/lg-r.png"); }
+     td.lgu { background: url("<?php echo $this->path; ?>/images/lg-u.png"); width: 100%; }
+     td.lgd { background: url("<?php echo $this->path; ?>/images/lg-d.png"); width: 100%; }
+     td.lgl { background: url("<?php echo $this->path; ?>/images/lg-l.png"); }
+     td.lgr { background: url("<?php echo $this->path; ?>/images/lg-r.png"); }
      td.lgcnt { background: #E4E4E4; width: 100%; font-family: tahoma,arial,helvetica; font-size: 10pt; white-space: normal; }
      td.lgcntnw { background: #E4E4E4; width: 100%; font-family: tahoma,arial,helvetica; font-size: 10pt; white-space: nowrap; }
 
@@ -70,16 +74,16 @@
    -->
    </style>
    <script language="JavaScript" type="text/javascript"><!--
-function b(title,content) {document.writeln("<table border=\"0\" cellspacing=\"0\" cellpadding=\"0\" width=\"100%\"><tr><td><img src=\"themes/goofy/images/or-ul.png\" alt=\"\"></td><td class=\"oru\" width=\"100%\"><img src=\"themes/goofy/images/null.gif\" alt=\"\"></td><td><img src=\"themes/goofy/images/or-ur.png\" alt=\"\"></td></tr><tr><td class=\"orl\"><img src=\"themes/goofy/images/null.gif\" alt=\"\"></td><td class=\"orcnt\" width=\"100%\" valign=\"top\">" + title + "</td><td class=\"orr\"><img src=\"themes/goofy/images/null.gif\" alt=\"\"></td></tr><tr><td class=\"orl\"><img src=\"themes/goofy/images/null.gif\" alt=\"\"></td><td class=\"orcnt\" width=\"100%\"><img src=\"themes/goofy/images/null.gif\" height=\"5\" alt=\"\"></td><td class=\"orr\"><img src=\"themes/goofy/images/null.gif\" alt=\"\"></td></tr><tr><td class=\"lgl\"><img src=\"themes/goofy/images/null.gif\" alt=\"\"></td><td class=\"lgcnt\" width=\"100%\"><img src=\"themes/goofy/images/null.gif\" height=\"4\" alt=\"\"></td><td class=\"lgr\"><img src=\"themes/goofy/images/null.gif\" alt=\"\"></td></tr><tr><td class=\"lgl\"><img src=\"themes/goofy/images/null.gif\" alt=\"\"></td><td class=\"lgcnt\" width=\"100%\">" + content + "</td><td class=\"lgr\"><img src=\"themes/goofy/images/null.gif\" alt=\"\"></td></tr><tr><td><img src=\"themes/goofy/images/lg-dl.png\" alt=\"\"></td><td class=\"lgd\" width=\"100%\"><img src=\"themes/goofy/images/null.gif\" width=\"150\" height=\"1\" alt=\"\"></td><td><img src=\"themes/goofy/images/lg-dr.png\" alt=\"\"></td></tr></table><br>");}
-function s(title,subleft,subright,body) {document.writeln("<table border=\"0\" cellspacing=\"0\" cellpadding=\"0\" width=\"100%\"><tr><td><img src=\"themes/goofy/images/or-ul.png\" alt=\"\"></td><td class=\"oru\" width=\"100%\" colspan=\"2\"><img src=\"themes/goofy/images/null.gif\" alt=\"\"></td><td><img src=\"themes/goofy/images/or-ur.png\" alt=\"\"></td></tr><tr><td class=\"orl\"><img src=\"themes/goofy/images/null.gif\" alt=\"\"></td><td class=\"orcnt\" width=\"100%\" valign=\"top\" colspan=\"2\">" + title + "</td><td class=\"orr\"><img src=\"themes/goofy/images/null.gif\" alt=\"\"></td></tr><tr><td class=\"orl\"><img src=\"themes/goofy/images/null.gif\" alt=\"\"></td><td class=\"orcnt\" width=\"100%\" colspan=\"2\"><img src=\"themes/goofy/images/null.gif\" height=\"5\" alt=\"\"></td><td class=\"orr\"><img src=\"themes/goofy/images/null.gif\" alt=\"\"></td></tr><tr><td class=\"lgl\"><img src=\"themes/goofy/images/null.gif\" alt=\"\"></td><td class=\"lgcnt\" width=\"100%\" colspan=\"2\"><img src=\"themes/goofy/images/null.gif\" height=\"4\" alt=\"\"></td><td class=\"lgr\"><img src=\"themes/goofy/images/null.gif\" alt=\"\"></td></tr><tr><td class=\"lgl\"><img src=\"themes/goofy/images/null.gif\" alt=\"\"></td><td class=\"lgcnt\"><small>" + subleft + "</small></td><td class=\"lgcntnw\"><div align=\"right\">" + subright + "</div></td><td class=\"lgr\"><img src=\"themes/goofy/images/null.gif\" alt=\"\"></td></tr><tr><td class=\"lgl\"><img src=\"themes/goofy/images/null.gif\" alt=\"\"></td><td class=\"lgcnt\" width=\"100%\" colspan=\"2\"><hr color=\"#404040\" size=\"1\">" + body + "</div></td><td class=\"lgr\"><img src=\"themes/goofy/images/null.gif\" alt=\"\"></td></tr><tr><td><img src=\"themes/goofy/images/lg-dl.png\" alt=\"\"></td><td class=\"lgd\" width=\"100%\" colspan=\"2\"><img src=\"themes/goofy/images/null.gif\" alt=\"\"></td><td><img src=\"themes/goofy/images/lg-dr.png\" alt=\"\"></td></tr></table><br>");}
-function c(subject,mod,author,date,body) {document.writeln("<table border=\"0\" cellspacing=\"0\" cellpadding=\"0\" width=\"100%\"><tr><td><img src=\"themes/goofy/images/or-ul.png\" alt=\"\"></td><td class=\"oru\" width=\"100%\" colspan=\"2\"><img src=\"themes/goofy/images/null.gif\" alt=\"\"></td><td><img src=\"themes/goofy/images/or-ur.png\" alt=\"\"></td></tr><tr><td class=\"orl\"><img src=\"themes/goofy/images/null.gif\" alt=\"\"></td><td class=\"orcnt\" width=\"100%\" valign=\"top\" colspan=\"2\"><table border=\"0\" cellpadding=\"0\" cellspacing=\"1\" width=\"100%\"><tr><td valign=\"top\" width=\"5%\"><div align=\"right\"><b><?php echo t("Subject");  ?>:</b>&nbsp;</div></td><td width=\"80%\" class=\"left\"><b>" + subject + "</b></td><td rowspan=\"3\" valign=\"middle\" width=\"15%\"><div align=\"right\">" + mod + "</div></td></tr><tr><td valign=\"top\"><div align=\"right\"><?php echo t("Author"); ?>:&nbsp;</div></td><td class=\"left\">" + author + "</td></tr><tr><td><div align=\"right\"><?php echo t("Date"); ?>:&nbsp;</div></td><td class=\"left\">" + date + "</td></tr></table></td><td class=\"orr\"><img src=\"themes/goofy/images/null.gif\" alt=\"\"></td></tr><tr><td class=\"orl\"><img src=\"themes/goofy/images/null.gif\" alt=\"\"></td><td class=\"orcnt\" width=\"100%\" colspan=\"2\"><img src=\"themes/goofy/images/null.gif\" height=\"5\" alt=\"\"></td><td class=\"orr\"><img src=\"themes/goofy/images/null.gif\" alt=\"\"></td></tr><tr><td class=\"lgl\"><img src=\"themes/goofy/images/null.gif\" alt=\"\"></td><td class=\"lgcnt\" width=\"100%\" colspan=\"2\"><img src=\"themes/goofy/images/null.gif\" height=\"4\" alt=\"\"></td><td class=\"lgr\"><img src=\"themes/goofy/images/null.gif\" alt=\"\"></td></tr>");if(body){document.writeln("<tr><td class=\"lgl\"><img src=\"themes/goofy/images/null.gif\" alt=\"\"></td><td class=\"lgcnt\" width=\"100%\" colspan=\"2\">" + body + "</td><td class=\"lgr\"><img src=\"themes/goofy/images/null.gif\" alt=\"\"></td></tr>");};document.writeln("<tr><td><img src=\"themes/goofy/images/lg-dl.png\" alt=\"\"></td><td class=\"lgd\" width=\"100%\" colspan=\"2\"><img src=\"themes/goofy/images/null.gif\" alt=\"\"></td><td><img src=\"themes/goofy/images/lg-dr.png\" alt=\"\"></td></tr></table><br>");}
+function b(title,content) {document.writeln("<table border=\"0\" cellspacing=\"0\" cellpadding=\"0\" width=\"100%\"><tr><td><img src=\"<?php echo $this->path; ?>/images/or-ul.png\" alt=\"\"></td><td class=\"oru\" width=\"100%\"><img src=\"<?php echo $this->path; ?>/images/null.gif\" alt=\"\"></td><td><img src=\"<?php echo $this->path; ?>/images/or-ur.png\" alt=\"\"></td></tr><tr><td class=\"orl\"><img src=\"<?php echo $this->path; ?>/images/null.gif\" alt=\"\"></td><td class=\"orcnt\" width=\"100%\" valign=\"top\">" + title + "</td><td class=\"orr\"><img src=\"<?php echo $this->path; ?>/images/null.gif\" alt=\"\"></td></tr><tr><td class=\"orl\"><img src=\"<?php echo $this->path; ?>/images/null.gif\" alt=\"\"></td><td class=\"orcnt\" width=\"100%\"><img src=\"<?php echo $this->path; ?>/images/null.gif\" height=\"5\" alt=\"\"></td><td class=\"orr\"><img src=\"<?php echo $this->path; ?>/images/null.gif\" alt=\"\"></td></tr><tr><td class=\"lgl\"><img src=\"<?php echo $this->path; ?>/images/null.gif\" alt=\"\"></td><td class=\"lgcnt\" width=\"100%\"><img src=\"<?php echo $this->path; ?>/images/null.gif\" height=\"4\" alt=\"\"></td><td class=\"lgr\"><img src=\"<?php echo $this->path; ?>/images/null.gif\" alt=\"\"></td></tr><tr><td class=\"lgl\"><img src=\"<?php echo $this->path; ?>/images/null.gif\" alt=\"\"></td><td class=\"lgcnt\" width=\"100%\">" + content + "</td><td class=\"lgr\"><img src=\"<?php echo $this->path; ?>/images/null.gif\" alt=\"\"></td></tr><tr><td><img src=\"<?php echo $this->path; ?>/images/lg-dl.png\" alt=\"\"></td><td class=\"lgd\" width=\"100%\"><img src=\"<?php echo $this->path; ?>/images/null.gif\" width=\"150\" height=\"1\" alt=\"\"></td><td><img src=\"<?php echo $this->path; ?>/images/lg-dr.png\" alt=\"\"></td></tr></table><br>");}
+function s(title,subleft,subright,body) {document.writeln("<table border=\"0\" cellspacing=\"0\" cellpadding=\"0\" width=\"100%\"><tr><td><img src=\"<?php echo $this->path; ?>/images/or-ul.png\" alt=\"\"></td><td class=\"oru\" width=\"100%\" colspan=\"2\"><img src=\"<?php echo $this->path; ?>/images/null.gif\" alt=\"\"></td><td><img src=\"<?php echo $this->path; ?>/images/or-ur.png\" alt=\"\"></td></tr><tr><td class=\"orl\"><img src=\"<?php echo $this->path; ?>/images/null.gif\" alt=\"\"></td><td class=\"orcnt\" width=\"100%\" valign=\"top\" colspan=\"2\">" + title + "</td><td class=\"orr\"><img src=\"<?php echo $this->path; ?>/images/null.gif\" alt=\"\"></td></tr><tr><td class=\"orl\"><img src=\"<?php echo $this->path; ?>/images/null.gif\" alt=\"\"></td><td class=\"orcnt\" width=\"100%\" colspan=\"2\"><img src=\"<?php echo $this->path; ?>/images/null.gif\" height=\"5\" alt=\"\"></td><td class=\"orr\"><img src=\"<?php echo $this->path; ?>/images/null.gif\" alt=\"\"></td></tr><tr><td class=\"lgl\"><img src=\"<?php echo $this->path; ?>/images/null.gif\" alt=\"\"></td><td class=\"lgcnt\" width=\"100%\" colspan=\"2\"><img src=\"<?php echo $this->path; ?>/images/null.gif\" height=\"4\" alt=\"\"></td><td class=\"lgr\"><img src=\"<?php echo $this->path; ?>/images/null.gif\" alt=\"\"></td></tr><tr><td class=\"lgl\"><img src=\"<?php echo $this->path; ?>/images/null.gif\" alt=\"\"></td><td class=\"lgcnt\"><small>" + subleft + "</small></td><td class=\"lgcntnw\"><div align=\"right\">" + subright + "</div></td><td class=\"lgr\"><img src=\"<?php echo $this->path; ?>/images/null.gif\" alt=\"\"></td></tr><tr><td class=\"lgl\"><img src=\"<?php echo $this->path; ?>/images/null.gif\" alt=\"\"></td><td class=\"lgcnt\" width=\"100%\" colspan=\"2\"><hr color=\"#404040\" size=\"1\">" + body + "</div></td><td class=\"lgr\"><img src=\"<?php echo $this->path; ?>/images/null.gif\" alt=\"\"></td></tr><tr><td><img src=\"<?php echo $this->path; ?>/images/lg-dl.png\" alt=\"\"></td><td class=\"lgd\" width=\"100%\" colspan=\"2\"><img src=\"<?php echo $this->path; ?>/images/null.gif\" alt=\"\"></td><td><img src=\"<?php echo $this->path; ?>/images/lg-dr.png\" alt=\"\"></td></tr></table><br>");}
+function c(subject,mod,author,date,body) {document.writeln("<table border=\"0\" cellspacing=\"0\" cellpadding=\"0\" width=\"100%\"><tr><td><img src=\"<?php echo $this->path; ?>/images/or-ul.png\" alt=\"\"></td><td class=\"oru\" width=\"100%\" colspan=\"2\"><img src=\"<?php echo $this->path; ?>/images/null.gif\" alt=\"\"></td><td><img src=\"<?php echo $this->path; ?>/images/or-ur.png\" alt=\"\"></td></tr><tr><td class=\"orl\"><img src=\"<?php echo $this->path; ?>/images/null.gif\" alt=\"\"></td><td class=\"orcnt\" width=\"100%\" valign=\"top\" colspan=\"2\"><table border=\"0\" cellpadding=\"0\" cellspacing=\"1\" width=\"100%\"><tr><td valign=\"top\" width=\"5%\"><div align=\"right\"><b><?php echo t("Subject");  ?>:</b>&nbsp;</div></td><td width=\"80%\" class=\"left\"><b>" + subject + "</b></td><td rowspan=\"3\" valign=\"middle\" width=\"15%\"><div align=\"right\">" + mod + "</div></td></tr><tr><td valign=\"top\"><div align=\"right\"><?php echo t("Author"); ?>:&nbsp;</div></td><td class=\"left\">" + author + "</td></tr><tr><td><div align=\"right\"><?php echo t("Date"); ?>:&nbsp;</div></td><td class=\"left\">" + date + "</td></tr></table></td><td class=\"orr\"><img src=\"<?php echo $this->path; ?>/images/null.gif\" alt=\"\"></td></tr><tr><td class=\"orl\"><img src=\"<?php echo $this->path; ?>/images/null.gif\" alt=\"\"></td><td class=\"orcnt\" width=\"100%\" colspan=\"2\"><img src=\"<?php echo $this->path; ?>/images/null.gif\" height=\"5\" alt=\"\"></td><td class=\"orr\"><img src=\"<?php echo $this->path; ?>/images/null.gif\" alt=\"\"></td></tr><tr><td class=\"lgl\"><img src=\"<?php echo $this->path; ?>/images/null.gif\" alt=\"\"></td><td class=\"lgcnt\" width=\"100%\" colspan=\"2\"><img src=\"<?php echo $this->path; ?>/images/null.gif\" height=\"4\" alt=\"\"></td><td class=\"lgr\"><img src=\"<?php echo $this->path; ?>/images/null.gif\" alt=\"\"></td></tr>");if(body){document.writeln("<tr><td class=\"lgl\"><img src=\"<?php echo $this->path; ?>/images/null.gif\" alt=\"\"></td><td class=\"lgcnt\" width=\"100%\" colspan=\"2\">" + body + "</td><td class=\"lgr\"><img src=\"<?php echo $this->path; ?>/images/null.gif\" alt=\"\"></td></tr>");};document.writeln("<tr><td><img src=\"<?php echo $this->path; ?>/images/lg-dl.png\" alt=\"\"></td><td class=\"lgd\" width=\"100%\" colspan=\"2\"><img src=\"<?php echo $this->path; ?>/images/null.gif\" alt=\"\"></td><td><img src=\"<?php echo $this->path; ?>/images/lg-dr.png\" alt=\"\"></td></tr></table><br>");}
    //-->
    </script>
    </head>
    <body>
     <table border="0" cellspacing="3" cellpadding="0" width="100%">
      <tr>
-      <td colspan="2" width="100%"><table border="0" cellspacing="0" cellpadding="0" width="100%"><tr><td align="left"><img src="themes/goofy/images/logo.png" alt=""></td><td align="right"><img src="themes/goofy/images/drupal.png" alt="Powered by Drupal"></td></tr></table>
+      <td colspan="2" width="100%"><table border="0" cellspacing="0" cellpadding="0" width="100%"><tr><td align="left"><img src="<?php echo $this->path; ?>/images/logo.png" alt=""></td><td align="right"><img src="<?php echo $this->path; ?>/images/drupal.png" alt="Powered by Drupal"></td></tr></table>
 <?php $this->linksbar(); ?>
       </td>
      </tr>
@@ -94,19 +98,19 @@ function c(subject,mod,author,date,body) {document.writeln("<table border=\"0\"
 ?>
        <table border="0" cellspacing="0" cellpadding="0" width="100%">
         <tr>
-         <td><img src="themes/goofy/images/lg-ul.png" alt=""></td>
-         <td class="lgu" width="100%"><img src="themes/goofy/images/null.gif" alt=""></td>
-         <td><img src="themes/goofy/images/lg-ur.png" alt=""></td>
+         <td><img src="<?php echo $this->path; ?>/images/lg-ul.png" alt=""></td>
+         <td class="lgu" width="100%"><img src="<?php echo $this->path; ?>/images/null.gif" alt=""></td>
+         <td><img src="<?php echo $this->path; ?>/images/lg-ur.png" alt=""></td>
         </tr>
         <tr>
-         <td class="lgl"><img src="themes/goofy/images/null.gif" alt=""></td>
+         <td class="lgl"><img src="<?php echo $this->path; ?>/images/null.gif" alt=""></td>
          <td class="lgcnt" width="100%" valign="top"><div align="center"><?php print $this->links(link_page()); ?></div></td>
-         <td class="lgr"><img src="themes/goofy/images/null.gif" alt=""></td>
+         <td class="lgr"><img src="<?php echo $this->path; ?>/images/null.gif" alt=""></td>
         </tr>
         <tr>
-         <td><img src="themes/goofy/images/lg-dl.png" alt=""></td>
-         <td class="lgd" width="100%"><img src="themes/goofy/images/null.gif" alt=""></td>
-         <td><img src="themes/goofy/images/lg-dr.png" alt=""></td>
+         <td><img src="<?php echo $this->path; ?>/images/lg-dl.png" alt=""></td>
+         <td class="lgd" width="100%"><img src="<?php echo $this->path; ?>/images/null.gif" alt=""></td>
+         <td><img src="<?php echo $this->path; ?>/images/lg-dr.png" alt=""></td>
         </tr>
        </table>
 <?php
diff --git a/themes/marvin/marvin.theme b/themes/marvin/marvin.theme
index 5343193afaa..69096d8a94c 100644
--- a/themes/marvin/marvin.theme
+++ b/themes/marvin/marvin.theme
@@ -17,7 +17,11 @@
    // General colorset that can be used for this theme
    var $foreground = "#000000";
    var $background = "#EAEAEA";
-
+   
+   function Theme_marvin($filename) {
+     $this->path = dirname($filename);
+   }
+  
    function system($field) {
      $system["name"] = "Marvin";
      $system["author"] = "Dries";
@@ -66,7 +70,7 @@
      <body text="#000000" bgcolor="#ffffff" alink="#cccccc" link="#665566" vlink="#665566">
       <table border="0" cellpadding="8" cellspacing="0">
        <tr>
-        <td><a href="index.php"><img src="themes/marvin/images/logo.png" alt="" border="0" /></a></td>
+        <td><a href="index.php"><img src="<?php print $this->path; ?>/images/logo.png" alt="" border="0" /></a></td>
         <td>&nbsp;</td>
        </tr>
        <tr>
@@ -94,8 +98,8 @@
 
      print "\n<!-- node: \"$node->title\" -->\n";
      print "<table border=\"0\" cellpadding=\"0\" cellspacing=\"0\" width=\"100%\">\n";
-     print " <tr><td colspan=\"2\"><img src=\"themes/marvin/images/drop.gif\" alt=\"\" /> &nbsp; <b>". check_output($node->title) ."</b></td></tr>\n";
-     print " <tr valign=\"bottom\"><td colspan=\"2\" bgcolor=\"#000000\" width=\"100%\"><img src=\"themes/marvin/images/pixel.gif\" width=\"1\" height=\"1\" alt=\"\" /></td></tr>\n";
+     print " <tr><td colspan=\"2\"><img src=\"$this->path/images/drop.gif\" alt=\"\" /> &nbsp; <b>". check_output($node->title) ."</b></td></tr>\n";
+     print " <tr valign=\"bottom\"><td colspan=\"2\" bgcolor=\"#000000\" width=\"100%\"><img src=\"$this->path/images/pixel.gif\" width=\"1\" height=\"1\" alt=\"\" /></td></tr>\n";
      print " <tr><td nowrap=\"nowrap\"><font color=\"#7C7C7C\"><small>". t("Submitted by %a on %b", array("%a" => format_name($node), "%b" => format_date($node->created, "large"))); ?><?php print "</small></font></td><td align=\"right\" valign=\"top\" nowrap=\"nowrap\"><small>". $this->links($terms) ."</small></td></tr>\n";
      print " <tr><td colspan=\"2\">&nbsp;</td></tr>\n";
 
diff --git a/themes/unconed/unconed.theme b/themes/unconed/unconed.theme
index 25249eb2e03..bbcfece95da 100644
--- a/themes/unconed/unconed.theme
+++ b/themes/unconed/unconed.theme
@@ -37,6 +37,10 @@
    var $bgcolor3 = "#D7D7D7";
    var $fgcolor3 = "#000000";
 
+   function Theme_unconed($filename) {
+     $this->path = dirname($filename);
+   }
+
    function system($field) {
      $system["name"] = "UnConeD";
      $system["author"] = "Steven Wittens";
@@ -66,12 +70,12 @@
      </HEAD>
      <BODY TEXT="#000000" BGCOLOR="<?php print $this->clc0; ?>" ALINK="#000000" LINK="#404040" VLINK="#404040" MARGINHEIGHT="10" MARGINWIDTH="10">
      <TABLE BORDER="0" CELLPADDING="0" CELLSPACING="0" ALIGN="CENTER" WIDTH="100%">
-     <TR><TD BGCOLOR="<?php print $this->cl00; ?>"><IMG SRC="themes/<?php print $this->themename; ?>/images/null.gif" WIDTH="10"></TD><TD BGCOLOR="<?php print $this->clc0; ?>"><IMG SRC="themes/<?php print $this->themename; ?>/images/null.gif" WIDTH="4"></TD>
+     <TR><TD BGCOLOR="<?php print $this->cl00; ?>"><IMG SRC="<?php print $this->path; ?>/images/null.gif" WIDTH="10"></TD><TD BGCOLOR="<?php print $this->clc0; ?>"><IMG SRC="<?php print $this->path; ?>/images/null.gif" WIDTH="4"></TD>
      <TD BGCOLOR="<?php print $this->cl80; ?>">
       <TABLE BORDER="0" CELLPADDING="0" CELLSPACING="9" BGCOLOR="<?php print $this->cl80; ?>">
        <TR>
         <TD COLSPAN="2">
-         <TABLE BORDER="0" WIDTH="100%" CELLSPACING="0" CELLPADDING="0" BGCOLOR="<?php echo $this->brcolor1; ?>"><TR><TD ALIGN="CENTER"><TABLE BORDER="0" WIDTH="100%" CELLSPACING="1" CELLPADDING="4"><TR><TD ALIGN="CENTER" BGCOLOR="<?php echo $this->bgcolor2; ?>"><IMG SRC="themes/<?php print $this->themename; ?>/images/logo.png" ALT="logo"></TD></TR></TABLE></TD></TR></TABLE>
+         <TABLE BORDER="0" WIDTH="100%" CELLSPACING="0" CELLPADDING="0" BGCOLOR="<?php echo $this->brcolor1; ?>"><TR><TD ALIGN="CENTER"><TABLE BORDER="0" WIDTH="100%" CELLSPACING="1" CELLPADDING="4"><TR><TD ALIGN="CENTER" BGCOLOR="<?php echo $this->bgcolor2; ?>"><IMG SRC="<?php print $this->path; ?>/images/logo.png" ALT="logo"></TD></TR></TABLE></TD></TR></TABLE>
         </TD>
        </TR>
        <TR>
@@ -83,7 +87,7 @@
             print "<TABLE BORDER=\"0\" CELLPADDING=\"0\" CELLSPACING=\"0\" BGCOLOR=\"$this->brcolor1;\" WIDTH=\"100%\">";
             print "<TR><TD>";
             print "<TABLE BORDER=\"0\" CELLPADDING=\"0\" CELLSPACING=\"1\" WIDTH=\"100%\">";
-            print "<TR><TD ALIGN=\"center\" BGCOLOR=\"$this->bgcolor2\"><FONT COLOR=\"$this->fgcolor1\"><IMG SRC=\"themes/" . $this->themename . "/images/null.gif\" WIDTH=\"2\" HEIGHT=\"2\"></FONT></TD></TR>";
+            print "<TR><TD ALIGN=\"center\" BGCOLOR=\"$this->bgcolor2\"><FONT COLOR=\"$this->fgcolor1\"><IMG SRC=\"" . $this->path . "/images/null.gif\" WIDTH=\"2\" HEIGHT=\"2\"></FONT></TD></TR>";
             print "</TABLE>";
             print "</TD></TR></TABLE>";
        ?></TD></TR>
@@ -99,7 +103,7 @@
         <TABLE BORDER="0" CELLPADDING="0" CELLSPACING="0" BGCOLOR="<?php echo $this->brcolor1; ?>" WIDTH="100%">
         <TR><TD>
          <TABLE BORDER="0" CELLPADDING="4" CELLSPACING="1" WIDTH="100%">
-          <TR><TD COLSPAN="2" BGCOLOR="<?php echo $this->bgcolor1; ?>" WIDTH="100%"><table width="100%" cellpadding="0" cellspacing="0"><tr><td width="100%"><FONT COLOR="<?php echo $this->fgcolor1; ?>"><B><?php echo "". check_output($node->title) .""; ?></B></FONT></td><td valign="middle" align="center"><IMG SRC="themes/<?php print $this->themename; ?>/images/icon.gif" valign="middle"></td></tr></table></TD></TR>
+          <TR><TD COLSPAN="2" BGCOLOR="<?php echo $this->bgcolor1; ?>" WIDTH="100%"><table width="100%" cellpadding="0" cellspacing="0"><tr><td width="100%"><FONT COLOR="<?php echo $this->fgcolor1; ?>"><B><?php echo "". check_output($node->title) .""; ?></B></FONT></td><td valign="middle" align="center"><IMG SRC="<?php print $this->path; ?>/images/icon.gif" valign="middle"></td></tr></table></TD></TR>
           <TR BGCOLOR="<?php echo $this->bgcolor2; ?>">
            <?php
             if (function_exists("taxonomy_node_get_terms")) {
@@ -217,7 +221,7 @@
             print "<TABLE BORDER=\"0\" CELLPADDING=\"0\" CELLSPACING=\"0\" BGCOLOR=\"$this->brcolor1;\" WIDTH=\"100%\">";
             print "<TR><TD>";
             print "<TABLE BORDER=\"0\" CELLPADDING=\"0\" CELLSPACING=\"1\" WIDTH=\"100%\">";
-            print "<TR><TD ALIGN=\"center\" BGCOLOR=\"$this->bgcolor2\"><FONT COLOR=\"$this->fgcolor1\"><IMG SRC=\"themes/" . $this->themename . "/images/null.gif\" WIDTH=\"2\" HEIGHT=\"2\"></FONT></TD></TR>";
+            print "<TR><TD ALIGN=\"center\" BGCOLOR=\"$this->bgcolor2\"><FONT COLOR=\"$this->fgcolor1\"><IMG SRC=\"" . $this->path . "/images/null.gif\" WIDTH=\"2\" HEIGHT=\"2\"></FONT></TD></TR>";
             print "</TABLE>";
             print "</TD></TR></TABLE>";
        ?></TD></TR>
@@ -227,7 +231,7 @@
        </TD>
       </TR>
      </TABLE>
-    </TD><TD BGCOLOR="<?php print $this->clc0; ?>"><IMG SRC="themes/<?php print $this->themename; ?>/images/null.gif" WIDTH="4"></TD><TD BGCOLOR="<?php print $this->cl00; ?>"><IMG SRC="themes/<?php print $this->themename; ?>/images/null.gif" WIDTH="10"></TD></TR>
+    </TD><TD BGCOLOR="<?php print $this->clc0; ?>"><IMG SRC="<?php print $this->path; ?>/images/null.gif" WIDTH="4"></TD><TD BGCOLOR="<?php print $this->cl00; ?>"><IMG SRC="<?php print $this->path; ?>/images/null.gif" WIDTH="10"></TD></TR>
     </TABLE>
     </BODY>
     </HTML>