--- comics/comics.conf	2011/08/18 12:39:12	1.1.1.1
+++ comics/comics.conf	2013/07/17 12:44:38	1.7
@@ -18,23 +18,17 @@ index_directory = indexes
 image_directory = images
 
 dilbert,http://www.dilbert.com,.*textarea class=\"STR_EmbedCode\".*<img src=\"(.*gif|jpg)\" border.*,1,Dilbert,gif
-babyblues,http://www.babyblues.com,.*img src="(http:\/\/cserver.king-online.com\/.*Baby_Blues.*\d{4}(?:-\d\d?){2}).*,1,Baby Blues,gif
+babyblues,http://www.arcamax.com/thefunnies/babyblues/,img src=\"(/newspics/.*gif)\",1,Baby Blues,gif
 userfriendly,http://www.userfriendly.org/,.*Latest Strip.*(\/cartoons\/archives\/.*gif|png|jpg).*,1,User Friendly,gif
-luann,http://www.gocomics.com/luann,.*Check out Luann.* src=\"(.*)\".*/>,1,Luann,jpg
+luann,http://www.arcamax.com/thefunnies/luann/,img src=\"(/newspics/.*gif)\",1,Luann,gif
+andycapp,http://www.arcamax.com/thefunnies/andycapp/,img src=\"(/newspics/.*gif)\",1,Andy Capp,gif
 fbofw,http://www.ucomics.com/fbofw,http://images.ucomics.com/comics/fb/__year__/fb__year2____mon2____day2__.__ext__,2,For Better or For Worse,gif
-andycapp,http://www.gocomics.com/andy_capp/,.*Check out Andy.* src=\"(.*)\".*/>,1,Andy Capp,gif
 stonesoup,http://www.ucomics.com/stonesoup,http://images.ucomics.com/comics/ss/__year__/ss__year2____mon2____day2__.__ext__,2,StoneSoup,gif
-roseisrose,http://comics.com/rose_is_rose/,.*Check out Rose.* src=\"(.*)\".*/>,1,Rose is Rose,gif
-xkcd,http://xkcd.com,.*embedding\): (.*\.png)</h3>.*,1,xkcd,png
-
-#----  Old Comica -----
-
-#garfield,http://www.ucomics.com/garfield,http://picayune.uclick.com/comics/ga/__year__/ga__year2____mon2____day2__.__ext__,2,Garfield,gif
-##wizeardofid,http://comics.com/wizard_of_id/,.*img src=\"(.*gif|jpg).*STR.AttachZoomHover.*,1,Wizard of ID,gif
-##ziggy,http://www.ucomics.com/ziggy,http://images.ucomics.com/comics/zi/__year__/zi__year2____mon2____day2__.__ext__,2,Ziggy,gif
-##momma,http://comics.com/momma/,.*img src=\"(.*gif|jpg).*STR.AttachZoomHover.*,1,Momma,gif
-##peanuts,http://comics.com/peanuts/,.*img src=\"(.*gif|jpg).*STR.AttachZoomHover.*,1,Peanuts,gif
-##zrandom,http://comics.com/,.*img src=\"(.*gif|jpg).*STR.AttachZoomHover.*,1,Random Comic of the Day,gif
-#foxtrot,http://www.ucomics.com/foxtrot,http://images.ucomics.com/comics/ft/__year__/ft__year2____mon2____day2__.__ext__,2,Foxtrot,gif
-#bc,http://www.comics.com/creators/bc/index.html,.*IMG SRC=\"(.*gif|jpg).*ALT.*Today.*Comic.*,1,B.C.,gif
-# getfuzzy,http://www.comics.com/comics/getfuzzy/index.html,.*IMG SRC=\"(.*gif|jpg).*ALT.*Today.*Comic.*,1,Get Fuzzy,gif
+xkcd,http://xkcd.com,.*embedding\): (.*\.png).*,1,xkcd,png
+penny_arcade,http://penny-arcade.com/comic,.\s*<img src=\"(.*com\/photos.*)\" alt.*,1,Penny Arcade,png
+questionable_content,http://questionablecontent.net/,<img id=\"strip\" src=\"(.*)\">.*,1,Questionable Content,gif
+hagar_the_horrible,http://www.arcamax.com/thefunnies/hagarthehorrible/,img src=\"(/newspics/.*gif)\",1,Hagar the Horrible,gif
+the_lockhorns,http://www.arcamax.com/thefunnies/thelockhorns/,img src=\"(/newspics/.*gif)\",1,The Lockhorns,gif
+zits,http://www.arcamax.com/thefunnies/zits/,img src=\"(/newspics/.*gif)\",1,Zits,gif
+blondie,http://www.arcamax.com/thefunnies/blondie/,img src=\"(/newspics/.*gif)\",1,Blondie,gif
+wizard_of_id,http://www.arcamax.com/thefunnies/wizardofid/,img src=\"(/newspics/.*gif)\",1,Wizard Of Id,gif