diff --git a/ext/alias_editor/test.php b/ext/alias_editor/test.php
index f1f9c6a1..2aa3ab78 100644
--- a/ext/alias_editor/test.php
+++ b/ext/alias_editor/test.php
@@ -97,4 +97,4 @@ class AliasEditorTest extends ShimmieWebTestCase {
 		*/
 	}
 }
-?>
+
diff --git a/ext/amazon_s3/main.php b/ext/amazon_s3/main.php
index b4191a69..7b39e5a2 100644
--- a/ext/amazon_s3/main.php
+++ b/ext/amazon_s3/main.php
@@ -72,4 +72,4 @@ class UploadS3 extends Extension {
 		}
 	}
 }
-?>
+
diff --git a/ext/bbcode/main.php b/ext/bbcode/main.php
index 4b10a5c7..9812d0ca 100644
--- a/ext/bbcode/main.php
+++ b/ext/bbcode/main.php
@@ -156,4 +156,4 @@ class BBCode extends FormatterExtension {
 		return $text;
 	}
 }
-?>
+
diff --git a/ext/bbcode/test.php b/ext/bbcode/test.php
index a24c548f..14aac004 100644
--- a/ext/bbcode/test.php
+++ b/ext/bbcode/test.php
@@ -81,4 +81,4 @@ class BBCodeUnitTest extends UnitTestCase {
 		return $bb->strip($in);
 	}
 }
-?>
+
diff --git a/ext/blocks/test.php b/ext/blocks/test.php
index a68442b3..d6f91a38 100644
--- a/ext/blocks/test.php
+++ b/ext/blocks/test.php
@@ -8,4 +8,4 @@ class BlocksTest extends SCoreWebTestCase {
 		$this->log_out();
 	}
 }
-?>
+
diff --git a/ext/bulk_add/main.php b/ext/bulk_add/main.php
index cf58e4a3..ea590a3f 100644
--- a/ext/bulk_add/main.php
+++ b/ext/bulk_add/main.php
@@ -111,4 +111,4 @@ class BulkAdd extends Extension {
 		}
 	}
 }
-?>
+
diff --git a/ext/bulk_add/test.php b/ext/bulk_add/test.php
index 40b4d4e5..3f57fe99 100644
--- a/ext/bulk_add/test.php
+++ b/ext/bulk_add/test.php
@@ -31,4 +31,4 @@ class BulkAddTest extends ShimmieWebTestCase {
 		$this->log_out();
 	}
 }
-?>
+
diff --git a/ext/bulk_add/theme.php b/ext/bulk_add/theme.php
index 3df8a40b..787a4532 100644
--- a/ext/bulk_add/theme.php
+++ b/ext/bulk_add/theme.php
@@ -42,4 +42,4 @@ class BulkAddTheme extends Themelet {
 		$this->messages[] = new Block($title, $body);
 	}
 }
-?>
+
diff --git a/ext/bulk_add_csv/main.php b/ext/bulk_add_csv/main.php
index 4ff15773..7fd6d2a7 100644
--- a/ext/bulk_add_csv/main.php
+++ b/ext/bulk_add_csv/main.php
@@ -136,4 +136,4 @@ class BulkAddCSV extends Extension {
 		fclose($csvhandle);
 	}
 }
-?>
+
diff --git a/ext/bulk_add_csv/theme.php b/ext/bulk_add_csv/theme.php
index dfff459b..01c2e21f 100644
--- a/ext/bulk_add_csv/theme.php
+++ b/ext/bulk_add_csv/theme.php
@@ -41,4 +41,4 @@ class BulkAddCSVTheme extends Themelet {
 		$this->messages[] = new Block($title, $body);
 	}
 }
-?>
+
diff --git a/ext/bulk_remove/main.php b/ext/bulk_remove/main.php
index 2e609386..592d85f6 100644
--- a/ext/bulk_remove/main.php
+++ b/ext/bulk_remove/main.php
@@ -130,4 +130,4 @@ class BulkRemove extends Extension {
             $image_arr = $_POST["bulk_remove_images"];
         }
 }
-?>
+
diff --git a/ext/chatbox/main.php b/ext/chatbox/main.php
index 8d52bd6a..0f65d31b 100644
--- a/ext/chatbox/main.php
+++ b/ext/chatbox/main.php
@@ -33,4 +33,4 @@ class Chatbox extends Extension {
 		$page->add_block($chatblock);
 	}
 }
-?>
+
diff --git a/ext/chatbox/preferences.php b/ext/chatbox/preferences.php
index ef79bbf1..cc72b33b 100644
--- a/ext/chatbox/preferences.php
+++ b/ext/chatbox/preferences.php
@@ -71,4 +71,4 @@
 	 resetPrefs();
 	//loadPrefs();
 
-?>
+
diff --git a/ext/cron_uploader/main.php b/ext/cron_uploader/main.php
index 24c62c55..97f4062c 100644
--- a/ext/cron_uploader/main.php
+++ b/ext/cron_uploader/main.php
@@ -415,4 +415,4 @@ class CronUploader extends Extension {
 		file_put_contents ($log_path, $content);
 	}
 }
-?>
+
diff --git a/ext/danbooru_api/test.php b/ext/danbooru_api/test.php
index a5218626..3717ed80 100644
--- a/ext/danbooru_api/test.php
+++ b/ext/danbooru_api/test.php
@@ -23,4 +23,4 @@ class DanbooruApiTest extends ShimmieWebTestCase {
 		$this->log_out();
 	}
 }
-?>
+
diff --git a/ext/downtime/main.php b/ext/downtime/main.php
index 63421db8..2c857fba 100644
--- a/ext/downtime/main.php
+++ b/ext/downtime/main.php
@@ -40,4 +40,4 @@ class Downtime extends Extension {
 		else return false;
 	}
 }
-?>
+
diff --git a/ext/downtime/test.php b/ext/downtime/test.php
index 868eeef6..77657dff 100644
--- a/ext/downtime/test.php
+++ b/ext/downtime/test.php
@@ -20,4 +20,4 @@ class DowntimeTest extends SCoreWebTestCase {
 		$this->log_out();
 	}
 }
-?>
+
diff --git a/ext/downtime/theme.php b/ext/downtime/theme.php
index cec59c7b..aae0cca5 100644
--- a/ext/downtime/theme.php
+++ b/ext/downtime/theme.php
@@ -59,4 +59,4 @@ class DowntimeTheme extends Themelet {
 EOD;
 	}
 }
-?>
+
diff --git a/ext/emoticons/main.php b/ext/emoticons/main.php
index ec7a071d..a33b06c7 100644
--- a/ext/emoticons/main.php
+++ b/ext/emoticons/main.php
@@ -32,4 +32,4 @@ class EmoticonList extends Extension {
 		}
 	}
 }
-?>
+
diff --git a/ext/emoticons/test.php b/ext/emoticons/test.php
index 3758ce3b..7f9237c7 100644
--- a/ext/emoticons/test.php
+++ b/ext/emoticons/test.php
@@ -19,4 +19,4 @@ class EmoticonTest extends ShimmieWebTestCase {
 		$this->log_out();
 	}
 }
-?>
+
diff --git a/ext/emoticons/theme.php b/ext/emoticons/theme.php
index 22eaa350..dff9f98a 100644
--- a/ext/emoticons/theme.php
+++ b/ext/emoticons/theme.php
@@ -18,4 +18,4 @@ class EmoticonListTheme extends Themelet {
 		$page->set_data($html);
 	}
 }
-?>
+
diff --git a/ext/et/test.php b/ext/et/test.php
index 6d4fcae8..d6df53b9 100644
--- a/ext/et/test.php
+++ b/ext/et/test.php
@@ -7,4 +7,4 @@ class ETTest extends ShimmieWebTestCase {
 		$this->log_out();
 	}
 }
-?>
+
diff --git a/ext/favorites/main.php b/ext/favorites/main.php
index 10242e53..e90aa009 100644
--- a/ext/favorites/main.php
+++ b/ext/favorites/main.php
@@ -196,4 +196,4 @@ class Favorites extends Extension {
 				array("image_id"=>$image->id));
 	}
 }
-?>
+
diff --git a/ext/favorites/test.php b/ext/favorites/test.php
index 34dc91eb..c3c4b8d1 100644
--- a/ext/favorites/test.php
+++ b/ext/favorites/test.php
@@ -30,4 +30,4 @@ class FavoritesTest extends ShimmieWebTestCase {
 		$this->log_out();
 	}
 }
-?>
+
diff --git a/ext/favorites/theme.php b/ext/favorites/theme.php
index 14a4fd39..d530e497 100644
--- a/ext/favorites/theme.php
+++ b/ext/favorites/theme.php
@@ -35,4 +35,4 @@ class FavoritesTheme extends Themelet {
 	}
 }
 
-?>
+
diff --git a/ext/forum/main.php b/ext/forum/main.php
index 62951e4f..1fea2064 100644
--- a/ext/forum/main.php
+++ b/ext/forum/main.php
@@ -412,4 +412,4 @@ class Forum extends Extension {
 			}
 		}
 }
-?>
+
diff --git a/ext/forum/theme.php b/ext/forum/theme.php
index 78c06261..74d7c5df 100644
--- a/ext/forum/theme.php
+++ b/ext/forum/theme.php
@@ -229,4 +229,4 @@ class ForumTheme extends Themelet {
         return $html;
     }
 }
-?>
+
diff --git a/ext/google_analytics/main.php b/ext/google_analytics/main.php
index f1ef0b08..3f0f8608 100644
--- a/ext/google_analytics/main.php
+++ b/ext/google_analytics/main.php
@@ -35,4 +35,4 @@ class google_analytics extends Extension {
                 }
         }
 }
-?>
+
diff --git a/ext/handle_404/main.php b/ext/handle_404/main.php
index cc41b03d..fd00790c 100644
--- a/ext/handle_404/main.php
+++ b/ext/handle_404/main.php
@@ -50,4 +50,4 @@ class Handle404 extends Extension {
 
 	public function get_priority() {return 99;}
 }
-?>
+
diff --git a/ext/handle_404/test.php b/ext/handle_404/test.php
index 452af8da..ad6d3943 100644
--- a/ext/handle_404/test.php
+++ b/ext/handle_404/test.php
@@ -10,4 +10,4 @@ class Handle404Test extends SCoreWebTestCase {
 		$this->assert_response(200);
 	}
 }
-?>
+
diff --git a/ext/handle_archive/main.php b/ext/handle_archive/main.php
index f4dfe3dc..3f61ad60 100644
--- a/ext/handle_archive/main.php
+++ b/ext/handle_archive/main.php
@@ -110,4 +110,4 @@ class ArchiveFileHandler extends Extension {
 		// $this->theme->add_status("Adding $subdir", $list);
 	}
 }
-?>
+
diff --git a/ext/handle_flash/main.php b/ext/handle_flash/main.php
index 88becce7..f84153ad 100644
--- a/ext/handle_flash/main.php
+++ b/ext/handle_flash/main.php
@@ -46,4 +46,4 @@ class FlashFileHandler extends DataHandlerExtension {
 		return true;
 	}
 }
-?>
+
diff --git a/ext/handle_flash/theme.php b/ext/handle_flash/theme.php
index 6b956a75..e4557088 100644
--- a/ext/handle_flash/theme.php
+++ b/ext/handle_flash/theme.php
@@ -23,4 +23,4 @@ class FlashFileHandlerTheme extends Themelet {
 		$page->add_block(new Block("Flash Animation", $html, "main", 10));
 	}
 }
-?>
+
diff --git a/ext/handle_ico/main.php b/ext/handle_ico/main.php
index 07fa97ec..dae069c8 100644
--- a/ext/handle_ico/main.php
+++ b/ext/handle_ico/main.php
@@ -107,4 +107,4 @@ class IcoFileHandler extends Extension {
 		return true;
 	}
 }
-?>
+
diff --git a/ext/handle_ico/test.php b/ext/handle_ico/test.php
index dd362055..9292a4a5 100644
--- a/ext/handle_ico/test.php
+++ b/ext/handle_ico/test.php
@@ -17,4 +17,4 @@ class IcoHandlerTest extends ShimmieWebTestCase {
 		# FIXME: test that it gets displayed properly
 	}
 }
-?>
+
diff --git a/ext/handle_ico/theme.php b/ext/handle_ico/theme.php
index 27b1ae74..aa092709 100644
--- a/ext/handle_ico/theme.php
+++ b/ext/handle_ico/theme.php
@@ -9,4 +9,4 @@ class IcoFileHandlerTheme extends Themelet {
 		$page->add_block(new Block("Image", $html, "main", 10));
 	}
 }
-?>
+
diff --git a/ext/handle_mp3/main.php b/ext/handle_mp3/main.php
index 2a81fcbb..be807472 100644
--- a/ext/handle_mp3/main.php
+++ b/ext/handle_mp3/main.php
@@ -59,4 +59,4 @@ class MP3FileHandler extends DataHandlerExtension {
 		return FALSE;
 	}
 }
-?>
+
diff --git a/ext/handle_mp3/theme.php b/ext/handle_mp3/theme.php
index 59ecefac..d6beb126 100644
--- a/ext/handle_mp3/theme.php
+++ b/ext/handle_mp3/theme.php
@@ -20,4 +20,4 @@ class MP3FileHandlerTheme extends Themelet {
 		$page->add_block(new Block("Music", $html, "main", 10));
 	}
 }
-?>
+
diff --git a/ext/handle_svg/main.php b/ext/handle_svg/main.php
index 76b9a18d..d27bb6f0 100644
--- a/ext/handle_svg/main.php
+++ b/ext/handle_svg/main.php
@@ -103,4 +103,4 @@ class MiniSVGParser {
 	function endElement($parser, $name) {
 	}
 }
-?>
+
diff --git a/ext/handle_svg/test.php b/ext/handle_svg/test.php
index 934d6ef6..f6420684 100644
--- a/ext/handle_svg/test.php
+++ b/ext/handle_svg/test.php
@@ -34,4 +34,4 @@ class SVGHandlerTest extends ShimmieWebTestCase {
 		# FIXME: test that it gets displayed properly
 	}
 }
-?>
+
diff --git a/ext/handle_svg/theme.php b/ext/handle_svg/theme.php
index 304baf79..76d76aa3 100644
--- a/ext/handle_svg/theme.php
+++ b/ext/handle_svg/theme.php
@@ -12,4 +12,4 @@ class SVGFileHandlerTheme extends Themelet {
 		$page->add_block(new Block("Image", $html, "main", 10));
 	}
 }
-?>
+
diff --git a/ext/hellban/main.php b/ext/hellban/main.php
index ae6e2be6..cac33ee9 100644
--- a/ext/hellban/main.php
+++ b/ext/hellban/main.php
@@ -22,4 +22,4 @@ class HellBan extends Extension {
 		}
 	}
 }
-?>
+
diff --git a/ext/holiday/main.php b/ext/holiday/main.php
index f435099a..be23350c 100644
--- a/ext/holiday/main.php
+++ b/ext/holiday/main.php
@@ -29,4 +29,4 @@ class Holiday extends Extension {
 		}
 	}
 }
-?>
+
diff --git a/ext/holiday/theme.php b/ext/holiday/theme.php
index 2012f3ee..fa32d350 100644
--- a/ext/holiday/theme.php
+++ b/ext/holiday/theme.php
@@ -17,4 +17,4 @@ class HolidayTheme extends Themelet {
 		}
 	}
 }
-?>
+
diff --git a/ext/image_hash_ban/main.php b/ext/image_hash_ban/main.php
index 410f0b41..5037c844 100644
--- a/ext/image_hash_ban/main.php
+++ b/ext/image_hash_ban/main.php
@@ -158,4 +158,4 @@ class ImageBan extends Extension {
 	// in before resolution limit plugin
 	public function get_priority() {return 30;}
 }
-?>
+
diff --git a/ext/image_hash_ban/test.php b/ext/image_hash_ban/test.php
index 9af952e8..d84889fd 100644
--- a/ext/image_hash_ban/test.php
+++ b/ext/image_hash_ban/test.php
@@ -34,4 +34,4 @@ class HashBanTest extends ShimmieWebTestCase {
 		$this->log_out();
 	}
 }
-?>
+
diff --git a/ext/image_hash_ban/theme.php b/ext/image_hash_ban/theme.php
index 87c70cb1..0c759a4a 100644
--- a/ext/image_hash_ban/theme.php
+++ b/ext/image_hash_ban/theme.php
@@ -92,4 +92,4 @@ class ImageBanTheme extends Themelet {
 		return $html;
 	}
 }
-?>
+
diff --git a/ext/image_view_counter/main.php b/ext/image_view_counter/main.php
index a5da3593..4d8fa1cf 100644
--- a/ext/image_view_counter/main.php
+++ b/ext/image_view_counter/main.php
@@ -105,4 +105,4 @@ class image_view_counter extends Extension {
             return $view_count;
         }
 }
-?>
+
diff --git a/ext/ipban/main.php b/ext/ipban/main.php
index c566f47a..67e363fa 100644
--- a/ext/ipban/main.php
+++ b/ext/ipban/main.php
@@ -284,4 +284,4 @@ class IPBan extends Extension {
 	}
 // }}}
 }
-?>
+
diff --git a/ext/ipban/test.php b/ext/ipban/test.php
index 9fd636d4..4e4226b6 100644
--- a/ext/ipban/test.php
+++ b/ext/ipban/test.php
@@ -25,5 +25,5 @@ class IPBanTest extends SCoreWebTestCase {
 		# FIXME: test that the IP is actually banned
 	}
 }
-?>
+
 
diff --git a/ext/ipban/theme.php b/ext/ipban/theme.php
index e9e927b6..9b9996e6 100644
--- a/ext/ipban/theme.php
+++ b/ext/ipban/theme.php
@@ -57,4 +57,4 @@ class IPBanTheme extends Themelet {
 		$page->add_block(new Block("Edit IP Bans", $html));
 	}
 }
-?>
+
diff --git a/ext/link_image/main.php b/ext/link_image/main.php
index 3183a41d..75f97221 100644
--- a/ext/link_image/main.php
+++ b/ext/link_image/main.php
@@ -34,4 +34,4 @@ class LinkImage extends Extension {
 			'text_link' => $text_link);
 	}
 }
-?>
+
diff --git a/ext/link_image/test.php b/ext/link_image/test.php
index 83f641f7..1e70a4d2 100644
--- a/ext/link_image/test.php
+++ b/ext/link_image/test.php
@@ -22,4 +22,4 @@ class LinkImageTest extends ShimmieWebTestCase {
 		$this->log_out();
 	}
 }
-?>
+
diff --git a/ext/link_image/theme.php b/ext/link_image/theme.php
index 24de94dc..f92891c6 100644
--- a/ext/link_image/theme.php
+++ b/ext/link_image/theme.php
@@ -91,4 +91,4 @@ class LinkImageTheme extends Themelet {
 		";
 	}
 }
-?>
+
diff --git a/ext/log_db/main.php b/ext/log_db/main.php
index 126a6f66..c72c51cd 100644
--- a/ext/log_db/main.php
+++ b/ext/log_db/main.php
@@ -135,4 +135,4 @@ class LogDatabase extends Extension {
 		}
 	}
 }
-?>
+
diff --git a/ext/log_db/test.php b/ext/log_db/test.php
index f2e9b8dd..2314d41f 100644
--- a/ext/log_db/test.php
+++ b/ext/log_db/test.php
@@ -10,4 +10,4 @@ class LogDatabaseTest extends SCoreWebTestCase {
 		$this->log_out();
 	}
 }
-?>
+
diff --git a/ext/log_db/theme.php b/ext/log_db/theme.php
index 77705826..1b0ba8b0 100644
--- a/ext/log_db/theme.php
+++ b/ext/log_db/theme.php
@@ -103,4 +103,4 @@ class LogDatabaseTheme extends Themelet {
 		return "<a href='".make_link("post/view/$iid")."'>Image #$iid</a>";
 	}
 }
-?>
+
diff --git a/ext/log_net/main.php b/ext/log_net/main.php
index f82d01d3..8a0fdd8a 100644
--- a/ext/log_net/main.php
+++ b/ext/log_net/main.php
@@ -46,4 +46,4 @@ class LogNet extends Extension {
 		}
 	}
 }
-?>
+
diff --git a/ext/mail/main.php b/ext/mail/main.php
index 7d0ac454..d4b8007f 100644
--- a/ext/mail/main.php
+++ b/ext/mail/main.php
@@ -42,4 +42,4 @@ class MailTest extends Extension {
 		}
 	}
 }
-?>
+
diff --git a/ext/mass_tagger/main.php b/ext/mass_tagger/main.php
index 2216699b..aa9e650e 100644
--- a/ext/mass_tagger/main.php
+++ b/ext/mass_tagger/main.php
@@ -57,4 +57,4 @@ class MassTagger extends Extension {
 		$page->set_redirect($_SERVER['HTTP_REFERER']);
 	}
 }
-?>
+
diff --git a/ext/mass_tagger/theme.php b/ext/mass_tagger/theme.php
index 5a844bac..56a2273a 100644
--- a/ext/mass_tagger/theme.php
+++ b/ext/mass_tagger/theme.php
@@ -24,4 +24,4 @@ class MassTaggerTheme extends Themelet {
 		$page->add_block( $block );
 	}
 }
-?>
+
diff --git a/ext/not_a_tag/main.php b/ext/not_a_tag/main.php
index 5dcb41fc..777d6dbe 100644
--- a/ext/not_a_tag/main.php
+++ b/ext/not_a_tag/main.php
@@ -119,4 +119,4 @@ class NotATag extends Extension {
 		else {return array();}
 	}
 }
-?>
+
diff --git a/ext/not_a_tag/theme.php b/ext/not_a_tag/theme.php
index 543af6f5..d5b39cf0 100644
--- a/ext/not_a_tag/theme.php
+++ b/ext/not_a_tag/theme.php
@@ -55,4 +55,4 @@ class NotATagTheme extends Themelet {
 		$this->display_paginator($page, "untag/list", null, $page_number, $page_count);
 	}
 }
-?>
+
diff --git a/ext/notes/main.php b/ext/notes/main.php
index cfbb6259..b241343d 100644
--- a/ext/notes/main.php
+++ b/ext/notes/main.php
@@ -609,4 +609,4 @@ class Notes extends Extension {
 		
 	}
 }
-?>
+
diff --git a/ext/notes/theme.php b/ext/notes/theme.php
index 99359b92..6f3fb9c9 100644
--- a/ext/notes/theme.php
+++ b/ext/notes/theme.php
@@ -236,4 +236,4 @@ class NotesTheme extends Themelet {
 		$this->display_paginator($page, "note/updated", null, $pageNumber, $totalPages);
 	}
 }		
-?>
+
diff --git a/ext/numeric_score/test.php b/ext/numeric_score/test.php
index 69f1d64f..ed230272 100644
--- a/ext/numeric_score/test.php
+++ b/ext/numeric_score/test.php
@@ -54,4 +54,4 @@ class NumericScoreTest extends ShimmieWebTestCase {
 		$this->log_out();
 	}
 }
-?>
+
diff --git a/ext/oekaki/main.php b/ext/oekaki/main.php
index 6c114537..b9081fe1 100644
--- a/ext/oekaki/main.php
+++ b/ext/oekaki/main.php
@@ -87,4 +87,4 @@ class Oekaki extends Extension {
 		}
 	}
 }
-?>
+
diff --git a/ext/oekaki/test.php b/ext/oekaki/test.php
index f4257590..07ca4ec3 100644
--- a/ext/oekaki/test.php
+++ b/ext/oekaki/test.php
@@ -6,4 +6,4 @@ class OekakiTest extends SCoreWebTestCase {
 		$this->log_out();
 	}
 }
-?>
+
diff --git a/ext/oekaki/theme.php b/ext/oekaki/theme.php
index 468c0bdb..8a0ee9b9 100644
--- a/ext/oekaki/theme.php
+++ b/ext/oekaki/theme.php
@@ -61,4 +61,4 @@ class OekakiTheme extends Themelet {
 			, "left", 21)); // upload is 20
 	}
 }
-?>
+
diff --git a/ext/pm/main.php b/ext/pm/main.php
index 9cd781e7..2deaf4e4 100644
--- a/ext/pm/main.php
+++ b/ext/pm/main.php
@@ -210,4 +210,4 @@ class PrivMsg extends Extension {
 		return $count;
 	}
 }
-?>
+
diff --git a/ext/pm/test.php b/ext/pm/test.php
index 0717433a..f08a0274 100644
--- a/ext/pm/test.php
+++ b/ext/pm/test.php
@@ -50,4 +50,4 @@ class PrivMsgTest extends SCoreWebTestCase {
 		$this->log_out();
 	}
 }
-?>
+
diff --git a/ext/pm/theme.php b/ext/pm/theme.php
index 7b0f5be1..79001617 100644
--- a/ext/pm/theme.php
+++ b/ext/pm/theme.php
@@ -70,4 +70,4 @@ EOD;
 		$page->add_block(new Block("Message from {$from->name}", format_text($pm->message), "main", 10));
 	}
 }
-?>
+
diff --git a/ext/pm_triggers/main.php b/ext/pm_triggers/main.php
index a09454a1..7cb80013 100644
--- a/ext/pm_triggers/main.php
+++ b/ext/pm_triggers/main.php
@@ -26,4 +26,4 @@ class PMTrigger extends Extension {
 		)));
 	}
 }
-?>
+
diff --git a/ext/pools/test.php b/ext/pools/test.php
index ea8015c3..8a59dce9 100644
--- a/ext/pools/test.php
+++ b/ext/pools/test.php
@@ -38,4 +38,4 @@ class PoolsTest extends ShimmieWebTestCase {
 		$this->log_out();
 	}
 }
-?>
+
diff --git a/ext/pools/theme.php b/ext/pools/theme.php
index fd25d431..c8cc4e02 100644
--- a/ext/pools/theme.php
+++ b/ext/pools/theme.php
@@ -423,4 +423,4 @@ class PoolsTheme extends Themelet {
 		$this->display_paginator($page, "pool/updated", null, $pageNumber, $totalPages);
 	}
 }
-?>
+
diff --git a/ext/qr_code/main.php b/ext/qr_code/main.php
index ed671fd3..4fe864d8 100644
--- a/ext/qr_code/main.php
+++ b/ext/qr_code/main.php
@@ -12,4 +12,4 @@ class QRImage extends Extension {
 		$this->theme->links_block(make_http(make_link('image/'.$event->image->id.'.jpg')));
 	}
 }
-?>
+
diff --git a/ext/qr_code/theme.php b/ext/qr_code/theme.php
index 8f6103de..3e82351d 100644
--- a/ext/qr_code/theme.php
+++ b/ext/qr_code/theme.php
@@ -6,4 +6,4 @@ class QRImageTheme extends Themelet {
 			"QR Code","<img alt='QR Code' src='http://chart.apis.google.com/chart?chs=150x150&amp;cht=qr&amp;chl=$link' />","left",50));
 	}
 }
-?>
+
diff --git a/ext/random_image/main.php b/ext/random_image/main.php
index 0d799855..1d2d194a 100644
--- a/ext/random_image/main.php
+++ b/ext/random_image/main.php
@@ -76,4 +76,4 @@ class RandomImage extends Extension {
 		}
 	}
 }
-?>
+
diff --git a/ext/random_image/test.php b/ext/random_image/test.php
index 4d30c0e1..f11c83ef 100644
--- a/ext/random_image/test.php
+++ b/ext/random_image/test.php
@@ -55,4 +55,4 @@ class RandomTest extends ShimmieWebTestCase {
 		$this->assert_no_text("Random Image");
 	}
 }
-?>
+
diff --git a/ext/random_image/theme.php b/ext/random_image/theme.php
index 87806bec..1210959e 100644
--- a/ext/random_image/theme.php
+++ b/ext/random_image/theme.php
@@ -24,4 +24,4 @@ class RandomImageTheme extends Themelet {
 		";
 	}
 }
-?>
+
diff --git a/ext/random_list/main.php b/ext/random_list/main.php
index c9671309..609766fb 100644
--- a/ext/random_list/main.php
+++ b/ext/random_list/main.php
@@ -51,4 +51,4 @@ class RandomList extends Extension {
 		$event->panel->add_block($sb);
 	}
 }
-?>
+
diff --git a/ext/rating/main.php b/ext/rating/main.php
index eda01145..c9f3c8aa 100644
--- a/ext/rating/main.php
+++ b/ext/rating/main.php
@@ -235,4 +235,4 @@ class Ratings extends Extension {
 		}
 	}
 }
-?>
+
diff --git a/ext/rating/test.php b/ext/rating/test.php
index ac092c2f..81d02dfc 100644
--- a/ext/rating/test.php
+++ b/ext/rating/test.php
@@ -52,4 +52,4 @@ class RatingTest extends ShimmieWebTestCase {
 		$this->log_out();
 	}
 }
-?>
+
diff --git a/ext/rating/theme.php b/ext/rating/theme.php
index 3e9437a6..4fde8274 100644
--- a/ext/rating/theme.php
+++ b/ext/rating/theme.php
@@ -45,4 +45,4 @@ class RatingsTheme extends Themelet {
 	}
 }
 
-?>
+
diff --git a/ext/regen_thumb/main.php b/ext/regen_thumb/main.php
index b417e539..4c12f0c4 100644
--- a/ext/regen_thumb/main.php
+++ b/ext/regen_thumb/main.php
@@ -31,4 +31,4 @@ class RegenThumb extends Extension {
 		}
 	}
 }
-?>
+
diff --git a/ext/regen_thumb/test.php b/ext/regen_thumb/test.php
index cb2139f6..e2b5dc63 100644
--- a/ext/regen_thumb/test.php
+++ b/ext/regen_thumb/test.php
@@ -12,4 +12,4 @@ class RegenThumbTest extends ShimmieWebTestCase {
 		# FIXME: test that the thumb's modified time has been updated
 	}
 }
-?>
+
diff --git a/ext/regen_thumb/theme.php b/ext/regen_thumb/theme.php
index 6f5720a7..68d7904c 100644
--- a/ext/regen_thumb/theme.php
+++ b/ext/regen_thumb/theme.php
@@ -24,4 +24,4 @@ class RegenThumbTheme extends Themelet {
 		$page->add_block(new Block("Thumbnail", $this->build_thumb_html($image)));
 	}
 }
-?>
+
diff --git a/ext/relatationships/main.php b/ext/relatationships/main.php
index b1be3c36..846687a1 100644
--- a/ext/relatationships/main.php
+++ b/ext/relatationships/main.php
@@ -120,4 +120,4 @@ class Relationships extends Extension {
 		}
 	}
 }
-?>
+
diff --git a/ext/relatationships/theme.php b/ext/relatationships/theme.php
index b40c6289..a73e2293 100644
--- a/ext/relatationships/theme.php
+++ b/ext/relatationships/theme.php
@@ -42,4 +42,4 @@ class RelationshipsTheme extends Themelet {
 		return $html;
 	}
 }
-?>
+
diff --git a/ext/report_image/main.php b/ext/report_image/main.php
index a21a0581..b99f7030 100644
--- a/ext/report_image/main.php
+++ b/ext/report_image/main.php
@@ -181,4 +181,4 @@ class ReportImage extends Extension {
 // * Version 0.2b - 10/27/07 - Now supports Shimmie2 RC2!
 // * Version 0.2a - 10/24/07 - Fixed some SQL issues. I will make sure to test before commiting :)
 // * Version 0.2 - 10/24/07 - First public release.
-?>
+
diff --git a/ext/report_image/test.php b/ext/report_image/test.php
index cb1339db..65b89aef 100644
--- a/ext/report_image/test.php
+++ b/ext/report_image/test.php
@@ -37,4 +37,4 @@ class ReportImageTest extends ShimmieWebTestCase {
 		# FIXME: test that >>123 works
 	}
 }
-?>
+
diff --git a/ext/report_image/theme.php b/ext/report_image/theme.php
index b62fd02a..35aca30f 100644
--- a/ext/report_image/theme.php
+++ b/ext/report_image/theme.php
@@ -78,4 +78,4 @@ class ReportImageTheme extends Themelet {
 		$page->add_block(new Block("Report Image", $html, "left"));
 	}
 }
-?>
+
diff --git a/ext/res_limit/main.php b/ext/res_limit/main.php
index c17ad203..34b0f90d 100644
--- a/ext/res_limit/main.php
+++ b/ext/res_limit/main.php
@@ -70,4 +70,4 @@ class ResolutionLimit extends Extension {
 		$event->panel->add_block($sb);
 	}
 }
-?>
+
diff --git a/ext/res_limit/test.php b/ext/res_limit/test.php
index 2707923a..9d66d3ce 100644
--- a/ext/res_limit/test.php
+++ b/ext/res_limit/test.php
@@ -110,4 +110,4 @@ class ResLimitTest extends ShimmieWebTestCase {
 		$this->log_out();
 	}
 }
-?>
+
diff --git a/ext/rotate/main.php b/ext/rotate/main.php
index cde59505..5e1c8af8 100644
--- a/ext/rotate/main.php
+++ b/ext/rotate/main.php
@@ -231,4 +231,4 @@ class RotateImage extends Extension {
 		log_info("rotate", "Rotated Image #{$image_id} - New hash: {$new_hash}");
 	}
 }
-?>
+
diff --git a/ext/rotate/theme.php b/ext/rotate/theme.php
index ddef58c7..c6481469 100644
--- a/ext/rotate/theme.php
+++ b/ext/rotate/theme.php
@@ -25,4 +25,4 @@ class RotateImageTheme extends Themelet {
 		$page->add_block(new Block($title, $message));
 	}
 }
-?>
+
diff --git a/ext/rss_comments/main.php b/ext/rss_comments/main.php
index a141cc39..7ae90be5 100644
--- a/ext/rss_comments/main.php
+++ b/ext/rss_comments/main.php
@@ -75,4 +75,4 @@ EOD;
 		}
 	}
 }
-?>
+
diff --git a/ext/rss_comments/test.php b/ext/rss_comments/test.php
index e6062c29..1036c177 100644
--- a/ext/rss_comments/test.php
+++ b/ext/rss_comments/test.php
@@ -19,4 +19,4 @@ class RSSCommentsTest extends ShimmieWebTestCase {
 		$this->log_out();
     }
 }
-?>
+
diff --git a/ext/rss_images/main.php b/ext/rss_images/main.php
index f9d4b330..cef02075 100644
--- a/ext/rss_images/main.php
+++ b/ext/rss_images/main.php
@@ -112,4 +112,4 @@ class RSS_Images extends Extension {
 		return $data;
 	}
 }
-?>
+
diff --git a/ext/rss_images/test.php b/ext/rss_images/test.php
index 9447ecc6..4322b308 100644
--- a/ext/rss_images/test.php
+++ b/ext/rss_images/test.php
@@ -33,4 +33,4 @@ class RSSImagesTest extends ShimmieWebTestCase {
 		$this->log_out();
     }
 }
-?>
+
diff --git a/ext/rss_images/theme.php b/ext/rss_images/theme.php
index d1f2734f..ef4ac101 100644
--- a/ext/rss_images/theme.php
+++ b/ext/rss_images/theme.php
@@ -1,4 +1,4 @@
 <?php
 /* needed for access to build_thumb_html */
 class RSS_ImagesTheme extends Themelet {}
-?>
+
diff --git a/ext/setup/main.php b/ext/setup/main.php
index d6c0cd45..f34e0d4d 100644
--- a/ext/setup/main.php
+++ b/ext/setup/main.php
@@ -306,4 +306,4 @@ class Setup extends Extension {
 		}
 	}
 }
-?>
+
diff --git a/ext/setup/test.php b/ext/setup/test.php
index c990f2ee..6114b030 100644
--- a/ext/setup/test.php
+++ b/ext/setup/test.php
@@ -28,4 +28,4 @@ class SetupTest extends SCoreWebTestCase {
 		$this->log_out();
 	}
 }
-?>
+
diff --git a/ext/setup/theme.php b/ext/setup/theme.php
index 3bad7007..99fa314a 100644
--- a/ext/setup/theme.php
+++ b/ext/setup/theme.php
@@ -96,4 +96,4 @@ class SetupTheme extends Themelet {
 		return $html;
 	}
 }
-?>
+
diff --git a/ext/shimmie_api/test.php b/ext/shimmie_api/test.php
index 961afa0a..c8dfa91c 100644
--- a/ext/shimmie_api/test.php
+++ b/ext/shimmie_api/test.php
@@ -26,4 +26,4 @@ class ShimmieApiTest extends ShimmieWebTestCase {
 		$this->log_out();
 	}
 }
-?>
+
diff --git a/ext/simpletest/main.php b/ext/simpletest/main.php
index b3972cb5..2ff0abf0 100644
--- a/ext/simpletest/main.php
+++ b/ext/simpletest/main.php
@@ -258,4 +258,4 @@ class SimpleSCoreTest extends Extension {
 		}
 	}
 }
-?>
+
diff --git a/ext/simpletest/theme.php b/ext/simpletest/theme.php
index 4ed982d9..44d22a8c 100644
--- a/ext/simpletest/theme.php
+++ b/ext/simpletest/theme.php
@@ -84,4 +84,4 @@ class SCoreWebReporter extends HtmlReporter {
 /** @private */
 class SCoreCLIReporter extends TextReporter {
 }
-?>
+
diff --git a/ext/site_description/main.php b/ext/site_description/main.php
index 9adaa5d3..80563617 100644
--- a/ext/site_description/main.php
+++ b/ext/site_description/main.php
@@ -30,4 +30,4 @@ class SiteDescription extends Extension {
 		$event->panel->add_block($sb);
 	}
 }
-?>
+
diff --git a/ext/site_description/test.php b/ext/site_description/test.php
index ee27e2fc..293c6a1a 100644
--- a/ext/site_description/test.php
+++ b/ext/site_description/test.php
@@ -15,4 +15,4 @@ class SiteDescriptionTest extends SCoreWebTestCase {
 		$this->log_out();
 	}
 }
-?>
+
diff --git a/ext/sitemap/main.php b/ext/sitemap/main.php
index 056d07fe..7172dc21 100644
--- a/ext/sitemap/main.php
+++ b/ext/sitemap/main.php
@@ -164,4 +164,4 @@ class XMLSitemap extends Extension {
             $page->set_data($xml);
         }
 }
-?>
+
diff --git a/ext/sitemap/test.php b/ext/sitemap/test.php
index 0d420888..fa459d9b 100644
--- a/ext/sitemap/test.php
+++ b/ext/sitemap/test.php
@@ -6,4 +6,4 @@ class XMLSitemapTest extends ShimmieWebTestCase {
 		$this->get_page('sitemap.xml');
 	}
 }
-?>
+
diff --git a/ext/source_history/main.php b/ext/source_history/main.php
index ff74c853..a9eab563 100644
--- a/ext/source_history/main.php
+++ b/ext/source_history/main.php
@@ -387,4 +387,4 @@ class Source_History extends Extension {
 		}
 	}
 }
-?>
+
diff --git a/ext/source_history/theme.php b/ext/source_history/theme.php
index 29bcc019..4399c300 100644
--- a/ext/source_history/theme.php
+++ b/ext/source_history/theme.php
@@ -134,4 +134,4 @@ class Source_HistoryTheme extends Themelet {
 		$this->messages[] = '<p><b>'. $title .'</b><br>'. $body .'</p>';
 	}
 }
-?>
+
diff --git a/ext/tag_categories/main.php b/ext/tag_categories/main.php
index 80f62e88..4e0fbdda 100644
--- a/ext/tag_categories/main.php
+++ b/ext/tag_categories/main.php
@@ -146,4 +146,4 @@ class TagCategories extends Extension {
 	}
 }
 
-?>
+
diff --git a/ext/tag_edit/main.php b/ext/tag_edit/main.php
index eb58efe3..8161af83 100644
--- a/ext/tag_edit/main.php
+++ b/ext/tag_edit/main.php
@@ -320,4 +320,4 @@ class TagEdit extends Extension {
 		}
 	}
 }
-?>
+
diff --git a/ext/tag_edit/test.php b/ext/tag_edit/test.php
index a88bfc37..89541830 100644
--- a/ext/tag_edit/test.php
+++ b/ext/tag_edit/test.php
@@ -68,4 +68,4 @@ class TagEditTest extends ShimmieWebTestCase {
 	}
 */
 }
-?>
+
diff --git a/ext/tag_edit/theme.php b/ext/tag_edit/theme.php
index 4cd67bae..4e1650cc 100644
--- a/ext/tag_edit/theme.php
+++ b/ext/tag_edit/theme.php
@@ -134,4 +134,4 @@ class TagEditTheme extends Themelet {
 		";
 	}
 }
-?>
+
diff --git a/ext/tag_editcloud/main.php b/ext/tag_editcloud/main.php
index d74e061e..d1cd2bd2 100644
--- a/ext/tag_editcloud/main.php
+++ b/ext/tag_editcloud/main.php
@@ -156,4 +156,4 @@ class TagEditCloud extends Extension {
 		return ($user->can("edit_image_tag") && (!$image->is_locked() || $user->can("edit_image_lock")));
 	}
 }
-?>
+
diff --git a/ext/tag_history/test.php b/ext/tag_history/test.php
index 5ca06e44..ae8f2bdf 100644
--- a/ext/tag_history/test.php
+++ b/ext/tag_history/test.php
@@ -20,4 +20,4 @@ class TagHistoryTest extends ShimmieWebTestCase {
 		$this->log_out();
 	}
 }
-?>
+
diff --git a/ext/tag_history/theme.php b/ext/tag_history/theme.php
index 62efac5a..1f516d64 100644
--- a/ext/tag_history/theme.php
+++ b/ext/tag_history/theme.php
@@ -146,4 +146,4 @@ class Tag_HistoryTheme extends Themelet {
 		$this->messages[] = '<p><b>'. $title .'</b><br>'. $body .'</p>';
 	}
 }
-?>
+
diff --git a/ext/tag_list/main.php b/ext/tag_list/main.php
index 3677c98a..53f748ea 100644
--- a/ext/tag_list/main.php
+++ b/ext/tag_list/main.php
@@ -492,4 +492,4 @@ class TagList extends Extension {
 	}
 // }}}
 }
-?>
+
diff --git a/ext/tag_list/test.php b/ext/tag_list/test.php
index fc574eab..6b50fc87 100644
--- a/ext/tag_list/test.php
+++ b/ext/tag_list/test.php
@@ -34,4 +34,4 @@ class TagListTest extends ShimmieWebTestCase {
 		}
 	}
 }
-?>
+
diff --git a/ext/tag_list/theme.php b/ext/tag_list/theme.php
index 87866476..525330e2 100644
--- a/ext/tag_list/theme.php
+++ b/ext/tag_list/theme.php
@@ -272,4 +272,4 @@ class TagListTheme extends Themelet {
 		return make_link("post/list/$u_tag/1");
 	}
 }
-?>
+
diff --git a/ext/tagger/main.php b/ext/tagger/main.php
index 4df81ee8..553a8fc6 100644
--- a/ext/tagger/main.php
+++ b/ext/tagger/main.php
@@ -139,4 +139,4 @@ class TaggerXML extends Extension {
 			"SELECT COUNT(*) FROM `tags` $query",$values)->fields['COUNT(*)'];
 	}
 } 
-?>
+
diff --git a/ext/tagger/theme.php b/ext/tagger/theme.php
index 398fea7d..27ac184a 100644
--- a/ext/tagger/theme.php
+++ b/ext/tagger/theme.php
@@ -66,4 +66,4 @@ EOD;
 		return $html;
 	}
 }
-?>
+
diff --git a/ext/tips/test.php b/ext/tips/test.php
index 7e3998a6..6b5e6c1a 100644
--- a/ext/tips/test.php
+++ b/ext/tips/test.php
@@ -68,4 +68,4 @@ class TipsTest extends SCoreWebTestCase {
 		$this->log_out();
 	}
 }
-?>
+
diff --git a/ext/tips/theme.php b/ext/tips/theme.php
index 2f4b84ba..2aa3ef51 100644
--- a/ext/tips/theme.php
+++ b/ext/tips/theme.php
@@ -92,4 +92,4 @@ class TipsTheme extends Themelet {
 		$page->add_block(new Block("All Tips", $html, "main", 20));
 	}
 }
-?>
+
diff --git a/ext/twitter_soc/main.php b/ext/twitter_soc/main.php
index c81a2d6a..0242c7d4 100644
--- a/ext/twitter_soc/main.php
+++ b/ext/twitter_soc/main.php
@@ -21,4 +21,4 @@ class TwitterSoc extends Extension {
 		$event->panel->add_block($sb);
 	}
 }
-?>
+
diff --git a/ext/twitter_soc/test.php b/ext/twitter_soc/test.php
index 438e530b..cbc700de 100644
--- a/ext/twitter_soc/test.php
+++ b/ext/twitter_soc/test.php
@@ -26,4 +26,4 @@ class TwitterSocTest extends SCoreWebTestCase {
 		$this->log_out();
 	}
 }
-?>
+
diff --git a/ext/twitter_soc/theme.php b/ext/twitter_soc/theme.php
index efbf7959..c8685f4b 100644
--- a/ext/twitter_soc/theme.php
+++ b/ext/twitter_soc/theme.php
@@ -22,4 +22,4 @@ $(function() {
 		', "left", 25));
 	}
 }
-?>
+
diff --git a/ext/update/main.php b/ext/update/main.php
index 6cd29b26..8804e787 100644
--- a/ext/update/main.php
+++ b/ext/update/main.php
@@ -109,4 +109,4 @@ class Update extends Extension {
 	}
 }
 
-?>
+
diff --git a/ext/update/theme.php b/ext/update/theme.php
index 4823e0c6..e3dffb6a 100644
--- a/ext/update/theme.php
+++ b/ext/update/theme.php
@@ -11,4 +11,4 @@ class UpdateTheme extends Themelet {
 		$page->add_block(new Block("Software Update", $html, "main", 75));
 	}
 }
-?>
+
diff --git a/ext/upgrade/main.php b/ext/upgrade/main.php
index d7967754..477452cb 100644
--- a/ext/upgrade/main.php
+++ b/ext/upgrade/main.php
@@ -95,4 +95,4 @@ class Upgrade extends Extension {
 
 	public function get_priority() {return 5;}
 }
-?>
+
diff --git a/ext/user/test.php b/ext/user/test.php
index 8655cd5e..cd55086b 100644
--- a/ext/user/test.php
+++ b/ext/user/test.php
@@ -37,4 +37,4 @@ class UserPageTest extends SCoreWebTestCase {
 		$this->assert_text("demo");
 	}
 }
-?>
+
diff --git a/ext/view/test.php b/ext/view/test.php
index 9338f841..2398e356 100644
--- a/ext/view/test.php
+++ b/ext/view/test.php
@@ -42,4 +42,4 @@ class ViewTest extends ShimmieWebTestCase {
 		$this->log_out();
 	}
 }
-?>
+
diff --git a/ext/view/theme.php b/ext/view/theme.php
index c043ff83..a2775c8b 100644
--- a/ext/view/theme.php
+++ b/ext/view/theme.php
@@ -90,4 +90,4 @@ class ViewImageTheme extends Themelet {
 		return $html;
 	}
 }
-?>
+
diff --git a/ext/wiki/test.php b/ext/wiki/test.php
index 7694a496..3cbbd44c 100644
--- a/ext/wiki/test.php
+++ b/ext/wiki/test.php
@@ -111,4 +111,4 @@ class WikiTest extends SCoreWebTestCase {
 		$this->log_out();
 	}
 }
-?>
+
diff --git a/ext/wiki/theme.php b/ext/wiki/theme.php
index 54e7338d..99b94a41 100644
--- a/ext/wiki/theme.php
+++ b/ext/wiki/theme.php
@@ -106,4 +106,4 @@ class WikiTheme extends Themelet {
 		";
 	}
 }
-?>
+
diff --git a/ext/word_filter/main.php b/ext/word_filter/main.php
index f85cc3de..0ce8d5ea 100644
--- a/ext/word_filter/main.php
+++ b/ext/word_filter/main.php
@@ -48,4 +48,4 @@ class WordFilter extends Extension {
 		return $map;
 	}
 }
-?>
+
diff --git a/ext/word_filter/test.php b/ext/word_filter/test.php
index 5fbe0f19..6b3df0b2 100644
--- a/ext/word_filter/test.php
+++ b/ext/word_filter/test.php
@@ -53,4 +53,4 @@ class WordFilterTest extends ShimmieWebTestCase {
 		$this->log_out();
 	}
 }
-?>
+