diff --git a/index.php b/index.php
index 28d6811a..1599e2c4 100644
--- a/index.php
+++ b/index.php
@@ -100,4 +100,4 @@ catch(Exception $e) {
 	_fatal_error($e);
 	ctx_log_ender();
 }
-?>
+
diff --git a/themes/danbooru/comment.theme.php b/themes/danbooru/comment.theme.php
index f7146beb..826c87d4 100644
--- a/themes/danbooru/comment.theme.php
+++ b/themes/danbooru/comment.theme.php
@@ -121,4 +121,4 @@ class CustomCommentListTheme extends CommentListTheme {
 		}
 	}
 }
-?>
+
diff --git a/themes/danbooru/custompage.class.php b/themes/danbooru/custompage.class.php
index 1e71720b..16d676cf 100644
--- a/themes/danbooru/custompage.class.php
+++ b/themes/danbooru/custompage.class.php
@@ -6,4 +6,4 @@ class CustomPage extends Page {
 		$this->left_enabled = false;
 	}
 }
-?>
+
diff --git a/themes/danbooru/index.theme.php b/themes/danbooru/index.theme.php
index b27aa028..47bd2d9a 100644
--- a/themes/danbooru/index.theme.php
+++ b/themes/danbooru/index.theme.php
@@ -58,4 +58,4 @@ class CustomIndexTheme extends IndexTheme {
 		return $table;
 	}
 }
-?>
+
diff --git a/themes/danbooru/layout.class.php b/themes/danbooru/layout.class.php
index 27af8810..ca0f3fe0 100644
--- a/themes/danbooru/layout.class.php
+++ b/themes/danbooru/layout.class.php
@@ -265,4 +265,4 @@ EOD;
 		return $html;
 	}
 }
-?>
+
diff --git a/themes/danbooru/tag_list.theme.php b/themes/danbooru/tag_list.theme.php
index 3c168380..6628ca29 100644
--- a/themes/danbooru/tag_list.theme.php
+++ b/themes/danbooru/tag_list.theme.php
@@ -6,4 +6,4 @@ class CustomTagListTheme extends TagListTheme {
 		parent::display_page($page);
 	}
 }
-?>
+
diff --git a/themes/danbooru/themelet.class.php b/themes/danbooru/themelet.class.php
index b69c5288..9eb986c7 100644
--- a/themes/danbooru/themelet.class.php
+++ b/themes/danbooru/themelet.class.php
@@ -48,4 +48,4 @@ class Themelet extends BaseThemelet {
 		return "<div id='paginator'>$prev_html $first_html $pdots $pages_html $ndots $last_html $next_html</div>";
 	}
 }
-?>
+
diff --git a/themes/danbooru/upload.theme.php b/themes/danbooru/upload.theme.php
index 7e5f75bf..a7047cf3 100644
--- a/themes/danbooru/upload.theme.php
+++ b/themes/danbooru/upload.theme.php
@@ -11,4 +11,4 @@ class CustomUploadTheme extends UploadTheme {
 		parent::display_page($page);
 	}
 }
-?>
+
diff --git a/themes/danbooru/user.theme.php b/themes/danbooru/user.theme.php
index fba58e8d..9990879e 100644
--- a/themes/danbooru/user.theme.php
+++ b/themes/danbooru/user.theme.php
@@ -98,4 +98,4 @@ class CustomUserPageTheme extends UserPageTheme {
 		parent::display_user_page($duser, $stats);
 	}
 }
-?>
+
diff --git a/themes/danbooru/view.theme.php b/themes/danbooru/view.theme.php
index 19aa4fcf..427d4f48 100644
--- a/themes/danbooru/view.theme.php
+++ b/themes/danbooru/view.theme.php
@@ -51,4 +51,4 @@ class CustomViewImageTheme extends ViewImageTheme {
 		return $html;
 	}
 }
-?>
+
diff --git a/themes/danbooru2/admin.theme.php b/themes/danbooru2/admin.theme.php
index b08d12c3..2007705d 100644
--- a/themes/danbooru2/admin.theme.php
+++ b/themes/danbooru2/admin.theme.php
@@ -8,4 +8,4 @@ class CustomAdminPageTheme extends AdminPageTheme {
 	}
 }
 
-?>
+
diff --git a/themes/danbooru2/custompage.class.php b/themes/danbooru2/custompage.class.php
index 1e71720b..16d676cf 100644
--- a/themes/danbooru2/custompage.class.php
+++ b/themes/danbooru2/custompage.class.php
@@ -6,4 +6,4 @@ class CustomPage extends Page {
 		$this->left_enabled = false;
 	}
 }
-?>
+
diff --git a/themes/danbooru2/ext_manager.theme.php b/themes/danbooru2/ext_manager.theme.php
index 67449dcf..1c42e2e8 100644
--- a/themes/danbooru2/ext_manager.theme.php
+++ b/themes/danbooru2/ext_manager.theme.php
@@ -11,4 +11,4 @@ class CustomExtManagerTheme extends ExtManagerTheme {
 	}
 }
 
-?>
+
diff --git a/themes/danbooru2/index.theme.php b/themes/danbooru2/index.theme.php
index 4d0ca68f..090cd248 100644
--- a/themes/danbooru2/index.theme.php
+++ b/themes/danbooru2/index.theme.php
@@ -58,4 +58,4 @@ class CustomIndexTheme extends IndexTheme {
 		return $table;
 	}
 }
-?>
+
diff --git a/themes/danbooru2/layout.class.php b/themes/danbooru2/layout.class.php
index d7e108b2..e937ed8b 100644
--- a/themes/danbooru2/layout.class.php
+++ b/themes/danbooru2/layout.class.php
@@ -291,4 +291,4 @@ EOD;
 		return $html;
 	}
 }
-?>
+
diff --git a/themes/danbooru2/tag_list.theme.php b/themes/danbooru2/tag_list.theme.php
index 3c168380..6628ca29 100644
--- a/themes/danbooru2/tag_list.theme.php
+++ b/themes/danbooru2/tag_list.theme.php
@@ -6,4 +6,4 @@ class CustomTagListTheme extends TagListTheme {
 		parent::display_page($page);
 	}
 }
-?>
+
diff --git a/themes/danbooru2/themelet.class.php b/themes/danbooru2/themelet.class.php
index b69c5288..9eb986c7 100644
--- a/themes/danbooru2/themelet.class.php
+++ b/themes/danbooru2/themelet.class.php
@@ -48,4 +48,4 @@ class Themelet extends BaseThemelet {
 		return "<div id='paginator'>$prev_html $first_html $pdots $pages_html $ndots $last_html $next_html</div>";
 	}
 }
-?>
+
diff --git a/themes/danbooru2/upload.theme.php b/themes/danbooru2/upload.theme.php
index 7e5f75bf..a7047cf3 100644
--- a/themes/danbooru2/upload.theme.php
+++ b/themes/danbooru2/upload.theme.php
@@ -11,4 +11,4 @@ class CustomUploadTheme extends UploadTheme {
 		parent::display_page($page);
 	}
 }
-?>
+
diff --git a/themes/danbooru2/user.theme.php b/themes/danbooru2/user.theme.php
index fba58e8d..9990879e 100644
--- a/themes/danbooru2/user.theme.php
+++ b/themes/danbooru2/user.theme.php
@@ -98,4 +98,4 @@ class CustomUserPageTheme extends UserPageTheme {
 		parent::display_user_page($duser, $stats);
 	}
 }
-?>
+
diff --git a/themes/danbooru2/view.theme.php b/themes/danbooru2/view.theme.php
index 11956fc9..bd6e5f45 100644
--- a/themes/danbooru2/view.theme.php
+++ b/themes/danbooru2/view.theme.php
@@ -64,4 +64,4 @@ class CustomViewImageTheme extends ViewImageTheme {
 		return "$h_search";
 	}
 }
-?>
+
diff --git a/themes/default/layout.class.php b/themes/default/layout.class.php
index 078e143f..87b86d31 100644
--- a/themes/default/layout.class.php
+++ b/themes/default/layout.class.php
@@ -94,4 +94,4 @@ $header_html
 EOD;
 	}
 }
-?>
+
diff --git a/themes/default/themelet.class.php b/themes/default/themelet.class.php
index d13596ce..77c927c3 100644
--- a/themes/default/themelet.class.php
+++ b/themes/default/themelet.class.php
@@ -1,3 +1,3 @@
 <?php
 class Themelet extends BaseThemelet {}
-?>
+
diff --git a/themes/futaba/comment.theme.php b/themes/futaba/comment.theme.php
index eeeb72c4..35e74d7d 100644
--- a/themes/futaba/comment.theme.php
+++ b/themes/futaba/comment.theme.php
@@ -89,4 +89,4 @@ class CustomCommentListTheme extends CommentListTheme {
 		}
 	}
 }
-?>
+
diff --git a/themes/futaba/custompage.class.php b/themes/futaba/custompage.class.php
index 1e71720b..16d676cf 100644
--- a/themes/futaba/custompage.class.php
+++ b/themes/futaba/custompage.class.php
@@ -6,4 +6,4 @@ class CustomPage extends Page {
 		$this->left_enabled = false;
 	}
 }
-?>
+
diff --git a/themes/futaba/layout.class.php b/themes/futaba/layout.class.php
index b42c9ad2..a2f1c370 100644
--- a/themes/futaba/layout.class.php
+++ b/themes/futaba/layout.class.php
@@ -102,4 +102,4 @@ $header_html
 EOD;
 	}
 }
-?>
+
diff --git a/themes/futaba/themelet.class.php b/themes/futaba/themelet.class.php
index 5770b05b..5044c3fe 100644
--- a/themes/futaba/themelet.class.php
+++ b/themes/futaba/themelet.class.php
@@ -50,4 +50,4 @@ class Themelet extends BaseThemelet {
 		return "<p class='paginator'>$prev_html $pages_html $next_html</p>";
 	}
 }
-?>
+
diff --git a/themes/futaba/view.theme.php b/themes/futaba/view.theme.php
index c8c3519b..54b66e88 100644
--- a/themes/futaba/view.theme.php
+++ b/themes/futaba/view.theme.php
@@ -8,4 +8,4 @@ class CustomViewImageTheme extends ViewImageTheme {
 		$page->add_block(new Block(null, $this->build_info($image, $editor_parts), "main", 10));
 	}
 }
-?>
+
diff --git a/themes/warm/layout.class.php b/themes/warm/layout.class.php
index ba17a673..2b55f32f 100644
--- a/themes/warm/layout.class.php
+++ b/themes/warm/layout.class.php
@@ -110,4 +110,4 @@ $header_html
 EOD;
 	}
 }
-?>
+
diff --git a/themes/warm/themelet.class.php b/themes/warm/themelet.class.php
index d13596ce..77c927c3 100644
--- a/themes/warm/themelet.class.php
+++ b/themes/warm/themelet.class.php
@@ -1,3 +1,3 @@
 <?php
 class Themelet extends BaseThemelet {}
-?>
+
diff --git a/themes/warm/upload.theme.php b/themes/warm/upload.theme.php
index 6950e18a..bb9dcd34 100644
--- a/themes/warm/upload.theme.php
+++ b/themes/warm/upload.theme.php
@@ -9,4 +9,4 @@ class CustomUploadTheme extends UploadTheme {
 		$page->add_block(new Block("Upload", "Disk nearly full, uploads disabled", "head", 20));
 	}
 }
-?>
+
diff --git a/themes/warm/user.theme.php b/themes/warm/user.theme.php
index 638af836..96db52b8 100644
--- a/themes/warm/user.theme.php
+++ b/themes/warm/user.theme.php
@@ -27,4 +27,4 @@ class CustomUserPageTheme extends UserPageTheme {
 		$page->add_block(new Block("Login", $html, "head", 90));
 	}
 }
-?>
+