diff --git a/plugins/af_buni/init.php b/plugins/af_buni/init.php
deleted file mode 100644
index 50166e325..000000000
--- a/plugins/af_buni/init.php
+++ /dev/null
@@ -1,62 +0,0 @@
-<?php
-class Af_Buni extends Plugin {
-
-	private $host;
-
-	function about() {
-		return array(1.0,
-			"Fix Buni rss feed",
-			"fox");
-	}
-
-	function init($host) {
-		$this->host = $host;
-
-		$host->add_hook($host::HOOK_ARTICLE_FILTER, $this);
-	}
-
-	function hook_article_filter($article) {
-		$owner_uid = $article["owner_uid"];
-
-		if (strpos($article["guid"], "bunicomic.com") !== FALSE) {
-			if (strpos($article["plugin_data"], "buni,$owner_uid:") === FALSE) {
-
-				$doc = new DOMDocument();
-				@$doc->loadHTML(fetch_file_contents($article["link"]));
-
-				$basenode = false;
-
-				if ($doc) {
-					$xpath = new DOMXPath($doc);
-					$entries = $xpath->query('(//img[@src])');
-
-					$matches = array();
-
-					foreach ($entries as $entry) {
-
-						if (preg_match("/(http:\/\/www.bunicomic.com\/comics\/\d{4}.*)/i", $entry->getAttribute("src"), $matches)) {
-
-							$basenode = $entry;
-							break;
-						}
-					}
-
-					if ($basenode) {
-						$article["content"] = $doc->saveXML($basenode);
-						$article["plugin_data"] = "buni,$owner_uid:" . $article["plugin_data"];
-					}
-				}
-			} else if (isset($article["stored"]["content"])) {
-				$article["content"] = $article["stored"]["content"];
-			}
-		}
-
-		return $article;
-	}
-
-	function api_version() {
-		return 2;
-	}
-
-}
-?>
diff --git a/plugins/af_buttersafe/init.php b/plugins/af_buttersafe/init.php
deleted file mode 100644
index 05e684aa0..000000000
--- a/plugins/af_buttersafe/init.php
+++ /dev/null
@@ -1,62 +0,0 @@
-<?php
-class Af_Buttersafe extends Plugin {
-
-	private $host;
-
-	function about() {
-		return array(1.0,
-			"Strip unnecessary stuff from Buttersafe feeds",
-			"fox");
-	}
-
-	function init($host) {
-		$this->host = $host;
-
-		$host->add_hook($host::HOOK_ARTICLE_FILTER, $this);
-	}
-
-	function hook_article_filter($article) {
-		$owner_uid = $article["owner_uid"];
-
-		if (strpos($article["guid"], "buttersafe.com") !== FALSE) {
-			if (strpos($article["plugin_data"], "buttersafe,$owner_uid:") === FALSE) {
-
-				$doc = new DOMDocument();
-				@$doc->loadHTML(fetch_file_contents($article["link"]));
-
-				$basenode = false;
-
-				if ($doc) {
-					$xpath = new DOMXPath($doc);
-					$entries = $xpath->query('(//img[@src])');
-
-					$matches = array();
-
-					foreach ($entries as $entry) {
-
-						if (preg_match("/(http:\/\/buttersafe.com\/comics\/\d{4}.*)/i", $entry->getAttribute("src"), $matches)) {
-
-							$basenode = $entry;
-							break;
-						}
-					}
-
-					if ($basenode) {
-						$article["content"] = $doc->saveXML($basenode);
-						$article["plugin_data"] = "buttersafe,$owner_uid:" . $article["plugin_data"];
-					}
-				}
-			} else if (isset($article["stored"]["content"])) {
-				$article["content"] = $article["stored"]["content"];
-			}
-		}
-
-		return $article;
-	}
-
-	function api_version() {
-		return 2;
-	}
-
-}
-?>
diff --git a/plugins/af_comics/init.php b/plugins/af_comics/init.php
new file mode 100644
index 000000000..e8b5a00cc
--- /dev/null
+++ b/plugins/af_comics/init.php
@@ -0,0 +1,283 @@
+<?php
+class Af_Comics extends Plugin {
+
+	private $host;
+
+	function about() {
+		return array(1.0,
+			"Fixes RSS feeds of assorted comic strips",
+			"fox");
+	}
+
+	function init($host) {
+		$this->host = $host;
+
+		$host->add_hook($host::HOOK_ARTICLE_FILTER, $this);
+		$host->add_hook($host::HOOK_PREFS_TAB, $this);
+	}
+
+	function hook_prefs_tab($args) {
+		if ($args != "prefPrefs") return;
+
+		print "<div dojoType=\"dijit.layout.AccordionPane\" title=\"".__('Feeds supported by af_comics')."\">";
+
+		print_notice("This plugin supports the following comics:");
+
+		print "<ul class=\"browseFeedList\" style=\"border-width : 1px\">";
+		print "<li>Buni</li>
+		<li>Buttersafe</li>
+		<li>CSection</li>
+		<li>Dilbert</li>
+		<li>Explosm</li>
+		<li>GoComics</li>
+		<li>Penny Arcade</li>
+		<li>Three word phrase</li>
+		<li>Whomp</li>";
+		print "</ul>";
+
+		print "</div>";
+	}
+
+	function hook_article_filter($article) {
+		$owner_uid = $article["owner_uid"];
+
+		$found = false;
+
+		# div#comic - comicpress?
+
+		if (strpos($article["guid"], "bunicomic.com") !== FALSE ||
+				strpos($article["guid"], "buttersafe.com") !== FALSE ||
+				strpos($article["guid"], "whompcomic.com") !== FALSE ||
+				strpos($article["guid"], "csectioncomics.com") !== FALSE) {
+
+			 if (strpos($article["plugin_data"], "af_comics,$owner_uid:") === FALSE) {
+
+				$doc = new DOMDocument();
+				@$doc->loadHTML(fetch_file_contents($article["link"]));
+
+				$basenode = false;
+
+				if ($doc) {
+					$xpath = new DOMXPath($doc);
+					$basenode = $xpath->query('//div[@id="comic"]')->item(0);
+
+					if ($basenode) {
+						$article["content"] = $doc->saveXML($basenode);
+						$article["plugin_data"] = "af_comics,$owner_uid:" . $article["plugin_data"];
+					}
+				}
+			} else if (isset($article["stored"]["content"])) {
+				$article["content"] = $article["stored"]["content"];
+			}
+		}
+
+		if (strpos($article["guid"], "dilbert.com") !== FALSE) {
+			if (strpos($article["plugin_data"], "af_comics,$owner_uid:") === FALSE) {
+				$doc = new DOMDocument();
+				@$doc->loadHTML(fetch_file_contents($article["link"]));
+
+				$basenode = false;
+
+				if ($doc) {
+					$xpath = new DOMXPath($doc);
+					$entries = $xpath->query('(//img[@src])'); // we might also check for img[@class='strip'] I guess...
+
+					$matches = array();
+
+					foreach ($entries as $entry) {
+
+						if (preg_match("/dyn\/str_strip\/.*zoom\.gif$/", $entry->getAttribute("src"), $matches)) {
+
+							$entry->setAttribute("src",
+								rewrite_relative_url("http://dilbert.com/",
+								$matches[0]));
+
+							$basenode = $entry;
+							break;
+						}
+					}
+
+					if ($basenode) {
+						$article["content"] = $doc->saveXML($basenode);
+						$article["plugin_data"] = "af_comics,$owner_uid:" . $article["plugin_data"];
+					}
+				}
+			} else if (isset($article["stored"]["content"])) {
+				$article["content"] = $article["stored"]["content"];
+			}
+		}
+
+		if (strpos($article["link"], "explosm.net/comics") !== FALSE) {
+			if (strpos($article["plugin_data"], "af_comics,$owner_uid:") === FALSE) {
+
+				$doc = new DOMDocument();
+				@$doc->loadHTML(fetch_file_contents($article["link"]));
+
+				$basenode = false;
+
+				if ($doc) {
+					$xpath = new DOMXPath($doc);
+					$entries = $xpath->query('(//img[@src])'); // we might also check for img[@class='strip'] I guess...
+
+					$matches = array();
+
+					foreach ($entries as $entry) {
+
+						if (preg_match("/(http:\/\/.*\/db\/files\/Comics\/.*)/i", $entry->getAttribute("src"), $matches)) {
+
+							$basenode = $entry;
+							break;
+						}
+					}
+
+					if ($basenode) {
+						$article["content"] = $doc->saveXML($basenode);
+						$article["plugin_data"] = "af_comics,$owner_uid:" . $article["plugin_data"];
+					}
+				}
+			} else if (isset($article["stored"]["content"])) {
+				$article["content"] = $article["stored"]["content"];
+			}
+		}
+
+		if (strpos($article["guid"], "gocomics.com") !== FALSE) {
+			if (strpos($article["plugin_data"], "af_comics,$owner_uid:") === FALSE) {
+				$doc = new DOMDocument();
+				@$doc->loadHTML(fetch_file_contents($article["link"]));
+
+				$basenode = false;
+
+				if ($doc) {
+					$xpath = new DOMXPath($doc);
+					$entries = $xpath->query('(//img[@src])'); // we might also check for img[@class='strip'] I guess...
+
+					$matches = array();
+
+					foreach ($entries as $entry) {
+
+						if (preg_match("/(http:\/\/assets.amuniversal.com\/.*width.*)/i", $entry->getAttribute("src"), $matches)) {
+
+							$entry->setAttribute("src", $matches[0]);
+							$basenode = $entry;
+							break;
+						}
+					}
+
+                    if (!$basenode) {
+                        // fallback on the smaller version
+                        foreach ($entries as $entry) {
+
+                            if (preg_match("/(http:\/\/assets.amuniversal.com\/.*)/i", $entry->getAttribute("src"), $matches)) {
+
+                                $entry->setAttribute("src", $matches[0]);
+                                $basenode = $entry;
+                                break;
+                            }
+                        }
+                    }
+
+					if ($basenode) {
+						$article["content"] = $doc->saveXML($basenode);
+						$article["plugin_data"] = "af_comics,$owner_uid:" . $article["plugin_data"];
+					}
+				}
+			} else if (isset($article["stored"]["content"])) {
+				$article["content"] = $article["stored"]["content"];
+			}
+		}
+
+		if (strpos($article["link"], "penny-arcade.com") !== FALSE && strpos($article["title"], "Comic:") !== FALSE) {
+			if (strpos($article["plugin_data"], "af_comics,$owner_uid:") === FALSE) {
+
+				if ($debug_enabled) {
+					_debug("af_pennyarcade: Processing comic");
+				}
+
+				$doc = new DOMDocument();
+				$doc->loadHTML(fetch_file_contents($article["link"]));
+
+				$basenode = false;
+
+				if ($doc) {
+					$xpath = new DOMXPath($doc);
+					$entries = $xpath->query('(//div[@class="post comic"])');
+
+					foreach ($entries as $entry) {
+						$basenode = $entry;
+					}
+
+					if ($basenode) {
+						$article["content"] = $doc->saveXML($basenode);
+						$article["plugin_data"] = "af_comics,$owner_uid:" . $article["plugin_data"];
+					}
+				}
+			} else if (isset($article["stored"]["content"])) {
+				$article["content"] = $article["stored"]["content"];
+			}
+		}
+
+		if (strpos($article["link"], "penny-arcade.com") !== FALSE && strpos($article["title"], "News Post:") !== FALSE) {
+			if (strpos($article["plugin_data"], "af_comics,$owner_uid:") === FALSE) {
+				if ($debug_enabled) {
+					_debug("af_pennyarcade: Processing news post");
+				}
+				$doc = new DOMDocument();
+				$doc->loadHTML(fetch_file_contents($article["link"]));
+
+				if ($doc) {
+					$xpath = new DOMXPath($doc);
+					$entries = $xpath->query('(//div[@class="post"])');
+
+					$basenode = false;
+
+					foreach ($entries as $entry) {
+						$basenode = $entry;
+					}
+
+					$uninteresting = $xpath->query('(//div[@class="heading"])');
+					foreach ($uninteresting as $i) {
+						$i->parentNode->removeChild($i);
+					}
+
+					if ($basenode){
+						$article["content"] = $doc->saveXML($basenode);
+						$article["plugin_data"] = "af_comics,$owner_uid:" . $article["plugin_data"];
+					}
+				}
+			} else if (isset($article["stored"]["content"])) {
+				$article["content"] = $article["stored"]["content"];
+			}
+		}
+
+		if (strpos($article["link"], "threewordphrase.com") !== FALSE) {
+			if (strpos($article["plugin_data"], "af_comics,$owner_uid:") === FALSE) {
+
+				$doc = new DOMDocument();
+				@$doc->loadHTML(fetch_file_contents($article["link"]));
+
+				$basenode = false;
+
+				if ($doc) {
+					$xpath = new DOMXpath($doc);
+
+					$basenode = $xpath->query("//td/center/img")->item(0);
+
+					if ($basenode) {
+						$article["content"] = $doc->saveXML($basenode);
+						$article["plugin_data"] = "af_comics,$owner_uid:" . $article["plugin_data"];
+					}
+				}
+			} else if (isset($article["stored"]["content"])) {
+				$article["content"] = $article["stored"]["content"];
+			}
+		}
+
+		return $article;
+	}
+
+	function api_version() {
+		return 2;
+	}
+
+}
+?>
diff --git a/plugins/af_csection/init.php b/plugins/af_csection/init.php
deleted file mode 100644
index bfc5b0061..000000000
--- a/plugins/af_csection/init.php
+++ /dev/null
@@ -1,51 +0,0 @@
-<?php
-class Af_CSection extends Plugin {
-
-	private $host;
-
-	function about() {
-		return array(1.0,
-			"Fix csection rss feed",
-			"fox");
-	}
-
-	function init($host) {
-		$this->host = $host;
-
-		$host->add_hook($host::HOOK_ARTICLE_FILTER, $this);
-	}
-
-	function hook_article_filter($article) {
-		$owner_uid = $article["owner_uid"];
-
-		if (strpos($article["guid"], "csectioncomics.com") !== FALSE) {
-			if (strpos($article["plugin_data"], "csection,$owner_uid:") === FALSE) {
-
-				$doc = new DOMDocument();
-				@$doc->loadHTML(fetch_file_contents($article["link"]));
-
-				$basenode = false;
-
-				if ($doc) {
-					$xpath = new DOMXPath($doc);
-					$basenode = $xpath->query('//div[@id="comic"]')->item(0);
-
-					if ($basenode) {
-						$article["content"] = $doc->saveXML($basenode);
-						$article["plugin_data"] = "csection,$owner_uid:" . $article["plugin_data"];
-					}
-				}
-			} else if (isset($article["stored"]["content"])) {
-				$article["content"] = $article["stored"]["content"];
-			}
-		}
-
-		return $article;
-	}
-
-	function api_version() {
-		return 2;
-	}
-
-}
-?>
diff --git a/plugins/af_dilbert/init.php b/plugins/af_dilbert/init.php
deleted file mode 100644
index 4668d64ee..000000000
--- a/plugins/af_dilbert/init.php
+++ /dev/null
@@ -1,64 +0,0 @@
-<?php
-class Af_Dilbert extends Plugin {
-	private $host;
-
-	function about() {
-		return array(1.0,
-			"Embeds Dilbert strips",
-			"fox");
-	}
-
-	function init($host) {
-		$this->host = $host;
-
-		$host->add_hook($host::HOOK_ARTICLE_FILTER, $this);
-	}
-
-	function hook_article_filter($article) {
-		$owner_uid = $article["owner_uid"];
-
-		if (strpos($article["guid"], "dilbert.com") !== FALSE) {
-			if (strpos($article["plugin_data"], "dilbert,$owner_uid:") === FALSE) {
-				$doc = new DOMDocument();
-				@$doc->loadHTML(fetch_file_contents($article["link"]));
-
-				$basenode = false;
-
-				if ($doc) {
-					$xpath = new DOMXPath($doc);
-					$entries = $xpath->query('(//img[@src])'); // we might also check for img[@class='strip'] I guess...
-
-					$matches = array();
-
-					foreach ($entries as $entry) {
-
-						if (preg_match("/dyn\/str_strip\/.*zoom\.gif$/", $entry->getAttribute("src"), $matches)) {
-
-							$entry->setAttribute("src",
-								rewrite_relative_url("http://dilbert.com/",
-								$matches[0]));
-
-							$basenode = $entry;
-							break;
-						}
-					}
-
-					if ($basenode) {
-						$article["content"] = $doc->saveXML($basenode);
-						$article["plugin_data"] = "dilbert,$owner_uid:" . $article["plugin_data"];
-					}
-				}
-			} else if (isset($article["stored"]["content"])) {
-				$article["content"] = $article["stored"]["content"];
-			}
-		}
-
-		return $article;
-	}
-
-	function api_version() {
-		return 2;
-	}
-
-}
-?>
diff --git a/plugins/af_explosm/init.php b/plugins/af_explosm/init.php
deleted file mode 100644
index dd106653a..000000000
--- a/plugins/af_explosm/init.php
+++ /dev/null
@@ -1,61 +0,0 @@
-<?php
-class Af_Explosm extends Plugin {
-
-	private $host;
-
-	function about() {
-		return array(1.0,
-			"Strip unnecessary stuff from Cyanide and Happiness feeds",
-			"fox");
-	}
-
-	function init($host) {
-		$this->host = $host;
-
-		$host->add_hook($host::HOOK_ARTICLE_FILTER, $this);
-	}
-
-	function hook_article_filter($article) {
-		$owner_uid = $article["owner_uid"];
-
-		if (strpos($article["link"], "explosm.net/comics") !== FALSE) {
-			if (strpos($article["plugin_data"], "explosm,$owner_uid:") === FALSE) {
-
-				$doc = new DOMDocument();
-				@$doc->loadHTML(fetch_file_contents($article["link"]));
-
-				$basenode = false;
-
-				if ($doc) {
-					$xpath = new DOMXPath($doc);
-					$entries = $xpath->query('(//img[@src])'); // we might also check for img[@class='strip'] I guess...
-
-					$matches = array();
-
-					foreach ($entries as $entry) {
-
-						if (preg_match("/(http:\/\/.*\/db\/files\/Comics\/.*)/i", $entry->getAttribute("src"), $matches)) {
-
-							$basenode = $entry;
-							break;
-						}
-					}
-
-					if ($basenode) {
-						$article["content"] = $doc->saveXML($basenode);
-						$article["plugin_data"] = "explosm,$owner_uid:" . $article["plugin_data"];
-					}
-				}
-			} else if (isset($article["stored"]["content"])) {
-				$article["content"] = $article["stored"]["content"];
-			}
-		}
-
-		return $article;
-	}
-
-	function api_version() {
-		return 2;
-	}
-}
-?>
diff --git a/plugins/af_gocomics/init.php b/plugins/af_gocomics/init.php
deleted file mode 100644
index 35c535492..000000000
--- a/plugins/af_gocomics/init.php
+++ /dev/null
@@ -1,74 +0,0 @@
-<?php
-class Af_GoComics extends Plugin {
-	private $host;
-
-	function about() {
-		return array(1.0,
-			"Strip unnecessary stuff from gocomics feeds",
-			"fox");
-	}
-
-	function init($host) {
-		$this->host = $host;
-
-		$host->add_hook($host::HOOK_ARTICLE_FILTER, $this);
-	}
-
-	function hook_article_filter($article) {
-		$owner_uid = $article["owner_uid"];
-
-		if (strpos($article["guid"], "gocomics.com") !== FALSE) {
-			if (strpos($article["plugin_data"], "gocomics,$owner_uid:") === FALSE) {
-				$doc = new DOMDocument();
-				@$doc->loadHTML(fetch_file_contents($article["link"]));
-
-				$basenode = false;
-
-				if ($doc) {
-					$xpath = new DOMXPath($doc);
-					$entries = $xpath->query('(//img[@src])'); // we might also check for img[@class='strip'] I guess...
-
-					$matches = array();
-
-					foreach ($entries as $entry) {
-
-						if (preg_match("/(http:\/\/assets.amuniversal.com\/.*width.*)/i", $entry->getAttribute("src"), $matches)) {
-
-							$entry->setAttribute("src", $matches[0]);
-							$basenode = $entry;
-							break;
-						}
-					}
-
-                    if (!$basenode) {
-                        // fallback on the smaller version
-                        foreach ($entries as $entry) {
-
-                            if (preg_match("/(http:\/\/assets.amuniversal.com\/.*)/i", $entry->getAttribute("src"), $matches)) {
-
-                                $entry->setAttribute("src", $matches[0]);
-                                $basenode = $entry;
-                                break;
-                            }
-                        }
-                    }
-
-					if ($basenode) {
-						$article["content"] = $doc->saveXML($basenode);
-						$article["plugin_data"] = "gocomics,$owner_uid:" . $article["plugin_data"];
-					}
-				}
-			} else if (isset($article["stored"]["content"])) {
-				$article["content"] = $article["stored"]["content"];
-			}
-		}
-
-		return $article;
-	}
-
-	function api_version() {
-		return 2;
-	}
-
-}
-?>
diff --git a/plugins/af_pennyarcade/init.php b/plugins/af_pennyarcade/init.php
deleted file mode 100644
index 8ad02e14c..000000000
--- a/plugins/af_pennyarcade/init.php
+++ /dev/null
@@ -1,92 +0,0 @@
-<?php
-class Af_PennyArcade extends Plugin {
-
-	private $host;
-
-	function about() {
-		return array(1.1,
-			"Strip unnecessary stuff from PA feeds",
-			"fox");
-	}
-
-	function init($host) {
-		$this->host = $host;
-
-		$host->add_hook($host::HOOK_ARTICLE_FILTER, $this);
-	}
-
-	function hook_article_filter($article) {
-		$owner_uid = $article["owner_uid"];
-
-		if (strpos($article["link"], "penny-arcade.com") !== FALSE && strpos($article["title"], "Comic:") !== FALSE) {
-			if (strpos($article["plugin_data"], "pennyarcade,$owner_uid:") === FALSE) {
-
-				if ($debug_enabled) {
-					_debug("af_pennyarcade: Processing comic");
-				}
-
-				$doc = new DOMDocument();
-				$doc->loadHTML(fetch_file_contents($article["link"]));
-
-				$basenode = false;
-
-				if ($doc) {
-					$xpath = new DOMXPath($doc);
-					$entries = $xpath->query('(//div[@class="post comic"])');
-
-					foreach ($entries as $entry) {
-						$basenode = $entry;
-					}
-
-					if ($basenode) {
-						$article["content"] = $doc->saveXML($basenode);
-						$article["plugin_data"] = "pennyarcade,$owner_uid:" . $article["plugin_data"];
-					}
-				}
-			} else if (isset($article["stored"]["content"])) {
-				$article["content"] = $article["stored"]["content"];
-			}
-		}
-
-		if (strpos($article["link"], "penny-arcade.com") !== FALSE && strpos($article["title"], "News Post:") !== FALSE) {
-			if (strpos($article["plugin_data"], "pennyarcade,$owner_uid:") === FALSE) {
-				if ($debug_enabled) {
-					_debug("af_pennyarcade: Processing news post");
-				}
-				$doc = new DOMDocument();
-				$doc->loadHTML(fetch_file_contents($article["link"]));
-
-				if ($doc) {
-					$xpath = new DOMXPath($doc);
-					$entries = $xpath->query('(//div[@class="post"])');
-
-					$basenode = false;
-
-					foreach ($entries as $entry) {
-						$basenode = $entry;
-					}
-
-					$uninteresting = $xpath->query('(//div[@class="heading"])');
-					foreach ($uninteresting as $i) {
-						$i->parentNode->removeChild($i);
-					}
-
-					if ($basenode){
-						$article["content"] = $doc->saveXML($basenode);
-						$article["plugin_data"] = "pennyarcade,$owner_uid:" . $article["plugin_data"];
-					}
-				}
-			} else if (isset($article["stored"]["content"])) {
-				$article["content"] = $article["stored"]["content"];
-			}
-		}
-
-		return $article;
-	}
-
-	function api_version() {
-		return 2;
-	}
-
-}
-?>
diff --git a/plugins/af_threewordphrase/init.php b/plugins/af_threewordphrase/init.php
deleted file mode 100644
index 7b178313b..000000000
--- a/plugins/af_threewordphrase/init.php
+++ /dev/null
@@ -1,51 +0,0 @@
-<?php
-class Af_ThreeWordPhrase extends Plugin {
-
-	private $host;
-
-	function about() {
-		return array(1.0,
-			"Fetch content of Three Word Phrase comics",
-			"fox");
-	}
-
-	function init($host) {
-		$this->host = $host;
-
-		$host->add_hook($host::HOOK_ARTICLE_FILTER, $this);
-	}
-
-	function hook_article_filter($article) {
-		$owner_uid = $article["owner_uid"];
-
-		if (strpos($article["link"], "threewordphrase.com") !== FALSE) {
-			if (strpos($article["plugin_data"], "threewordphrase,$owner_uid:") === FALSE) {
-
-				$doc = new DOMDocument();
-				@$doc->loadHTML(fetch_file_contents($article["link"]));
-
-				$basenode = false;
-
-				if ($doc) {
-					$xpath = new DOMXpath($doc);
-
-					$basenode = $xpath->query("//td/center/img")->item(0);
-
-					if ($basenode) {
-						$article["content"] = $doc->saveXML($basenode);
-						$article["plugin_data"] = "threewordphrase,$owner_uid:" . $article["plugin_data"];
-					}
-				}
-			} else if (isset($article["stored"]["content"])) {
-				$article["content"] = $article["stored"]["content"];
-			}
-		}
-
-		return $article;
-	}
-
-	function api_version() {
-		return 2;
-	}
-}
-?>
diff --git a/plugins/af_whomp/init.php b/plugins/af_whomp/init.php
deleted file mode 100644
index 46d6e921d..000000000
--- a/plugins/af_whomp/init.php
+++ /dev/null
@@ -1,61 +0,0 @@
-<?php
-class Af_Whomp extends Plugin {
-	private $host;
-
-	function about() {
-		return array(1.0,
-			"Embed images in Whomp!",
-			"fox");
-	}
-
-	function init($host) {
-		$this->host = $host;
-
-		$host->add_hook($host::HOOK_ARTICLE_FILTER, $this);
-	}
-
-	function hook_article_filter($article) {
-		$owner_uid = $article["owner_uid"];
-
-		if (strpos($article["guid"], "whompcomic.com") !== FALSE) {
-			if (strpos($article["plugin_data"], "whomp,$owner_uid:") === FALSE) {
-				$doc = new DOMDocument();
-				@$doc->loadHTML(fetch_file_contents($article["link"]));
-
-				$basenode = false;
-
-				if ($doc) {
-					$xpath = new DOMXPath($doc);
-					$entries = $xpath->query('(//img[@src])');
-
-					$matches = array();
-
-					foreach ($entries as $entry) {
-
-						if (preg_match("/(http:\/\/www\.whompcomic\.com\/comics\/.*)/i", $entry->getAttribute("src"), $matches)) {
-
-							$entry->setAttribute("src", $matches[0]);
-							$basenode = $entry;
-							break;
-						}
-					}
-
-					if ($basenode) {
-						$article["content"] = $doc->saveXML($basenode);
-						$article["plugin_data"] = "whomp,$owner_uid:" . $article["plugin_data"];
-					}
-				}
-			} else if (isset($article["stored"]["content"])) {
-				$article["content"] = $article["stored"]["content"];
-			}
-		}
-
-		return $article;
-	}
-
-	function api_version() {
-		return 2;
-	}
-
-}
-?>