diff --git a/themes/goofy/goofy.theme b/themes/goofy/goofy.theme
deleted file mode 100644
index ac6764c54741..000000000000
--- a/themes/goofy/goofy.theme
+++ /dev/null
@@ -1,182 +0,0 @@
-<?php
-// $Id$
-
-  /*********************************************************************
-
-   Theme: Goofy
-   Author: Steven Wittens (UnConeD)
-   Email: unconed@drop.org
-   Description: Colourful, graphical, orange theme for high-resolutions.
-   Notes: Only boxes on the right, because the graphics take up a lot
-          of horizontal space.
-
-  *********************************************************************/
-
-  class Theme_goofy extends BaseTheme {
-    // General colorset that can be used for this theme
-    var $foreground = "#000000";
-    var $background = "#FFFFFF";
-
-    function system($field) {
-      $system["name"] = "Goofy";
-      $system["author"] = "Steven Wittens";
-      $system["description"] = "Internet explorer, Netscape, Opera";
-
-      return $system[$field];
-    }
-
-    function header($title = "") {
-?>
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
- <html>
-  <head>
-   <?php print theme_head($main); ?>
-   <title><?php echo ($title ? ($title . " - ") : "") . variable_get(site_name, "drupal"); ?></title>
-   <style type="text/css">
-   <!--
-     body { background-color: #FFFFFF; font-size: 10pt; font-family: tahoma,helvetica,arial; }
-     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("<?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("<?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("<?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; }
-
-     small { font-size: 8pt; }
-     big { font-size: 12pt; }
-
-     hr { color: #404040; height: 1px; }
-
-     a { color: #804000; text-decoration: none; }
-     a:link { color: #804000; }
-     a:visited { color: #804000; }
-     a:active { color: #804000; }
-
-     b { font-weight: bold; }
-
-   -->
-   </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=\"<?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="<?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>
-     <tr>
-      <td valign="top" width="100%">
-<?php
-    } // close header function
-
-
-
-    function linksbar() { // helper function to prevent double code
-?>
-       <table border="0" cellspacing="0" cellpadding="0" width="100%">
-        <tr>
-         <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="<?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="<?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" alt=""></td>
-         <td><img src="<?php echo $this->path; ?>/images/lg-dr.png" alt=""></td>
-        </tr>
-       </table>
-<?php
-    } // close linksbar function
-
-
-    function node($node, $main = 0) {
-      echo "\n<!-- node: \"$node->title\" -->\n";
-      $title = $node->title;
-      $subleft = strtr(t("Submitted by %a on %b"), array("%a" => format_name($node), "%b" => format_date($node->created, "large")));
-      if (function_exists("taxonomy_node_get_terms")) {
-        if ($terms = taxonomy_node_get_terms($node->nid)) {
-          $taxlinks = array();
-          foreach ($terms as $term) {
-            $taxlinks[] = l($term->name, NULL, array(), "or=$term->tid");
-          }
-          $subright = $this->links($taxlinks);
-        }
-      }
-
-      if ($main && $node->teaser) {
-        $body = check_output($node->teaser);
-      }
-      else {
-        $body = check_output($node->body);
-      }
-
-      if ($links = link_node($node, $main)) {
-        $body .= "<hr color=\"#404040\" size=\"1\"><div align=\"right\">[ " . $this->links($links) . " ]</div>";
-      }
-
-      print "<script language=\"JavaScript\"><!--\ns(\"". $this->stripbreaks(addslashes($title)) ."\",\"". $this->stripbreaks(addslashes($subleft)) ."\",\"". $this->stripbreaks(addslashes($subright)) ."\",\"". $this->stripbreaks(addslashes($body)) ."\"); // -->\n</script>\n";
-    } // close node function
-
-
-    function comment($comment, $link = "") {
-      $author = "<b>" . format_name($comment) . "</b>";
-      $body = check_output($comment->comment) . "<br><hr color=\"#404040\" size=\"1\"><div align=\"right\">[ $link ]</div>";
-
-      print "<script language=\"JavaScript\"><!--\nc(\"". $this->stripbreaks(addslashes($comment->subject)) ."\",\"". $this->stripbreaks(addslashes(comment_moderation($comment))) ."\",\"". $this->stripbreaks(addslashes($author)) ."\",\"". $this->stripbreaks(addslashes(format_date($comment->timestamp))) ."\",\"". $this->stripbreaks(addslashes($body)) ."\"); // -->\n</script>\n";
-    } // close comment function
-
-
-    function stripbreaks($a) { // helper function for generating the javascripted boxes
-      return str_replace("\n","\\n",str_replace("\r","\\r",$a));
-    } // close stripbreaks function
-
-
-    function box($subject, $content, $region = "main") {
-      print "<script language=\"JavaScript\"><!--\nb(\"". $this->stripbreaks(addslashes($subject)) ."\",\"". $this->stripbreaks(addslashes($content)) ."\"); // -->\n</script>\n";
-    } // close box function
-
-
-    function footer() {
-?>
-              </td>
-              <td valign="top">
-<?php
-          theme_blocks("all", $this);
-?>
-     </td>
-    </tr>
-    <tr><td colspan="2">
-<?php $this->linksbar(); ?>
-    </td></tr>
-   </table>
-  </body>
- </html>
-<?php
-    } // close footer function
-  } // close theme-class
-
-?>
diff --git a/themes/goofy/images/drupal.png b/themes/goofy/images/drupal.png
deleted file mode 100644
index 7f2c0f886e9d..000000000000
Binary files a/themes/goofy/images/drupal.png and /dev/null differ
diff --git a/themes/goofy/images/gr-d.png b/themes/goofy/images/gr-d.png
deleted file mode 100644
index 644f6ecf168e..000000000000
Binary files a/themes/goofy/images/gr-d.png and /dev/null differ
diff --git a/themes/goofy/images/gr-dl.png b/themes/goofy/images/gr-dl.png
deleted file mode 100644
index 3a979dc8abbd..000000000000
Binary files a/themes/goofy/images/gr-dl.png and /dev/null differ
diff --git a/themes/goofy/images/gr-dr.png b/themes/goofy/images/gr-dr.png
deleted file mode 100644
index 889f897911e2..000000000000
Binary files a/themes/goofy/images/gr-dr.png and /dev/null differ
diff --git a/themes/goofy/images/gr-l.png b/themes/goofy/images/gr-l.png
deleted file mode 100644
index 506ec6ec0be0..000000000000
Binary files a/themes/goofy/images/gr-l.png and /dev/null differ
diff --git a/themes/goofy/images/gr-r.png b/themes/goofy/images/gr-r.png
deleted file mode 100644
index 7f46a8eb7f73..000000000000
Binary files a/themes/goofy/images/gr-r.png and /dev/null differ
diff --git a/themes/goofy/images/gr-u.png b/themes/goofy/images/gr-u.png
deleted file mode 100644
index ce6ac5026660..000000000000
Binary files a/themes/goofy/images/gr-u.png and /dev/null differ
diff --git a/themes/goofy/images/gr-ul.png b/themes/goofy/images/gr-ul.png
deleted file mode 100644
index fae5e12dc3e3..000000000000
Binary files a/themes/goofy/images/gr-ul.png and /dev/null differ
diff --git a/themes/goofy/images/gr-ur.png b/themes/goofy/images/gr-ur.png
deleted file mode 100644
index e8845d655ae3..000000000000
Binary files a/themes/goofy/images/gr-ur.png and /dev/null differ
diff --git a/themes/goofy/images/lg-d.png b/themes/goofy/images/lg-d.png
deleted file mode 100644
index 554e64b62948..000000000000
Binary files a/themes/goofy/images/lg-d.png and /dev/null differ
diff --git a/themes/goofy/images/lg-dl.png b/themes/goofy/images/lg-dl.png
deleted file mode 100644
index df3047a1d977..000000000000
Binary files a/themes/goofy/images/lg-dl.png and /dev/null differ
diff --git a/themes/goofy/images/lg-dr.png b/themes/goofy/images/lg-dr.png
deleted file mode 100644
index 81b4e3fa91fd..000000000000
Binary files a/themes/goofy/images/lg-dr.png and /dev/null differ
diff --git a/themes/goofy/images/lg-l.png b/themes/goofy/images/lg-l.png
deleted file mode 100644
index 00ece7601f79..000000000000
Binary files a/themes/goofy/images/lg-l.png and /dev/null differ
diff --git a/themes/goofy/images/lg-r.png b/themes/goofy/images/lg-r.png
deleted file mode 100644
index 2ceccfa47de6..000000000000
Binary files a/themes/goofy/images/lg-r.png and /dev/null differ
diff --git a/themes/goofy/images/lg-u.png b/themes/goofy/images/lg-u.png
deleted file mode 100644
index beec57de9e4d..000000000000
Binary files a/themes/goofy/images/lg-u.png and /dev/null differ
diff --git a/themes/goofy/images/lg-ul.png b/themes/goofy/images/lg-ul.png
deleted file mode 100644
index 48e94e36d278..000000000000
Binary files a/themes/goofy/images/lg-ul.png and /dev/null differ
diff --git a/themes/goofy/images/lg-ur.png b/themes/goofy/images/lg-ur.png
deleted file mode 100644
index 9a929cfa8fcb..000000000000
Binary files a/themes/goofy/images/lg-ur.png and /dev/null differ
diff --git a/themes/goofy/images/logo.png b/themes/goofy/images/logo.png
deleted file mode 100644
index 7d87aa99dd91..000000000000
Binary files a/themes/goofy/images/logo.png and /dev/null differ
diff --git a/themes/goofy/images/null.gif b/themes/goofy/images/null.gif
deleted file mode 100644
index c8897e7492b2..000000000000
Binary files a/themes/goofy/images/null.gif and /dev/null differ
diff --git a/themes/goofy/images/or-d.png b/themes/goofy/images/or-d.png
deleted file mode 100644
index 223984f96481..000000000000
Binary files a/themes/goofy/images/or-d.png and /dev/null differ
diff --git a/themes/goofy/images/or-dl.png b/themes/goofy/images/or-dl.png
deleted file mode 100644
index dd7807af670d..000000000000
Binary files a/themes/goofy/images/or-dl.png and /dev/null differ
diff --git a/themes/goofy/images/or-dr.png b/themes/goofy/images/or-dr.png
deleted file mode 100644
index 2c5fd231dd1f..000000000000
Binary files a/themes/goofy/images/or-dr.png and /dev/null differ
diff --git a/themes/goofy/images/or-l.png b/themes/goofy/images/or-l.png
deleted file mode 100644
index dce2f2ca0465..000000000000
Binary files a/themes/goofy/images/or-l.png and /dev/null differ
diff --git a/themes/goofy/images/or-r.png b/themes/goofy/images/or-r.png
deleted file mode 100644
index 9dc2bac42f25..000000000000
Binary files a/themes/goofy/images/or-r.png and /dev/null differ
diff --git a/themes/goofy/images/or-u.png b/themes/goofy/images/or-u.png
deleted file mode 100644
index 156e10639a7e..000000000000
Binary files a/themes/goofy/images/or-u.png and /dev/null differ
diff --git a/themes/goofy/images/or-ul.png b/themes/goofy/images/or-ul.png
deleted file mode 100644
index 085d5c3134a6..000000000000
Binary files a/themes/goofy/images/or-ul.png and /dev/null differ
diff --git a/themes/goofy/images/or-ur.png b/themes/goofy/images/or-ur.png
deleted file mode 100644
index 1804a560edc6..000000000000
Binary files a/themes/goofy/images/or-ur.png and /dev/null differ
