diff --git a/contrib/bulk_add/theme.php b/contrib/bulk_add/theme.php
index 990c89af..a0403aa1 100644
--- a/contrib/bulk_add/theme.php
+++ b/contrib/bulk_add/theme.php
@@ -6,7 +6,7 @@ class BulkAddTheme extends Themelet {
 	/*
 	 * Show a standard page for results to be put into
 	 */
-	public function display_upload_results($page) {
+	public function display_upload_results(Page $page) {
 		$page->set_title("Adding folder");
 		$page->set_heading("Adding folder");
 		$page->add_block(new NavBlock());
@@ -20,7 +20,7 @@ class BulkAddTheme extends Themelet {
 	 * links to bulk_add with POST[dir] set to the name of a server-side
 	 * directory full of images
 	 */
-	public function display_admin_block($page) {
+	public function display_admin_block(Page $page) {
 		$html = "
 			Add a folder full of images; any subfolders will have their names
 			used as tags for the images within.
diff --git a/contrib/event_log/theme.php b/contrib/event_log/theme.php
index a2ba1718..df94446b 100644
--- a/contrib/event_log/theme.php
+++ b/contrib/event_log/theme.php
@@ -1,7 +1,7 @@
 <?php
 
 class EventLogTheme extends Themelet {
-	public function display_page($page, $events) {
+	public function display_page(Page $page, $events) {
 		$page->set_title("Event Log");
 		$page->set_heading("Event Log");
 		$page->add_block(new NavBlock());
@@ -10,7 +10,7 @@ class EventLogTheme extends Themelet {
 		$this->display_controls($page);
 	}
 
-	protected function display_table($page, $events) {
+	protected function display_table(Page $page, $events) {
 		$table = "
 			<style>
 			.event_log_table TD {
@@ -70,7 +70,7 @@ class EventLogTheme extends Themelet {
 		$page->add_block(new Block("Log Contents", $table));
 	}
 
-	protected function display_controls($page) {
+	protected function display_controls(Page $page) {
 		$html = "
 		<form action='".make_link("event_log")."' method='POST'>
 			<input type='hidden' name='action' value='clear'>
diff --git a/contrib/featured/theme.php b/contrib/featured/theme.php
index ba9eea50..b6f9c0f2 100644
--- a/contrib/featured/theme.php
+++ b/contrib/featured/theme.php
@@ -4,7 +4,7 @@ class FeaturedTheme extends Themelet {
 	/*
 	 * Show $text on the $page
 	 */
-	public function display_featured($page, $image) {
+	public function display_featured(Page $page, Image $image) {
 		$page->add_block(new Block("Featured Image", $this->build_thumb_html($image), "left", 3));
 	}
 
diff --git a/contrib/handle_flash/theme.php b/contrib/handle_flash/theme.php
index 8f679f84..758825d4 100644
--- a/contrib/handle_flash/theme.php
+++ b/contrib/handle_flash/theme.php
@@ -1,7 +1,7 @@
 <?php
 
 class FlashFileHandlerTheme extends Themelet {
-	public function display_image($page, $image) {
+	public function display_image(Page $page, Image $image) {
 		$ilink = $image->get_image_link();
 		// FIXME: object and embed have "height" and "width"
 		$html = "
diff --git a/contrib/handle_ico/theme.php b/contrib/handle_ico/theme.php
index 32baef06..47b91121 100644
--- a/contrib/handle_ico/theme.php
+++ b/contrib/handle_ico/theme.php
@@ -1,7 +1,7 @@
 <?php
 
 class IcoFileHandlerTheme extends Themelet {
-	public function display_image($page, $image) {
+	public function display_image(Page $page, Image $image) {
 		$ilink = make_link("get_ico/{$image->id}/{$image->id}.ico");
 		$html = "
 			<img id='main_image' src='$ilink'>
diff --git a/contrib/handle_mp3/theme.php b/contrib/handle_mp3/theme.php
index c3baae92..8b0f7157 100644
--- a/contrib/handle_mp3/theme.php
+++ b/contrib/handle_mp3/theme.php
@@ -1,7 +1,7 @@
 <?php
 
 class MP3FileHandlerTheme extends Themelet {
-	public function display_image($page, $image) {
+	public function display_image(Page $page, Image $image) {
 		$data_href = get_base_href();
 		$ilink = $image->get_image_link();
 		$html = "
diff --git a/contrib/handle_svg/theme.php b/contrib/handle_svg/theme.php
index 86186537..ed4697d3 100644
--- a/contrib/handle_svg/theme.php
+++ b/contrib/handle_svg/theme.php
@@ -1,7 +1,7 @@
 <?php
 
 class SVGFileHandlerTheme extends Themelet {
-	public function display_image($page, $image) {
+	public function display_image(Page $page, Image $image) {
 		$ilink = make_link("get_svg/{$image->id}/{$image->id}.svg");
 //		$ilink = $image->get_image_link();
 		$html = "
diff --git a/contrib/home/theme.php b/contrib/home/theme.php
index d6e43e38..cbde15c5 100644
--- a/contrib/home/theme.php
+++ b/contrib/home/theme.php
@@ -1,7 +1,7 @@
 <?php
 
 class HomeTheme extends Themelet {
-	public function display_page($page, $sitename, $data_href, $theme_name, $body) {
+	public function display_page(Page $page, $sitename, $data_href, $theme_name, $body) {
 		$page->set_mode("data");
 		$page->set_data(<<<EOD
 <html>
diff --git a/contrib/image_hash_ban/theme.php b/contrib/image_hash_ban/theme.php
index 2f978d15..fdf108c8 100644
--- a/contrib/image_hash_ban/theme.php
+++ b/contrib/image_hash_ban/theme.php
@@ -20,7 +20,7 @@ class ImageBanTheme extends Themelet {
 	 *  'date' => when the ban started
 	 * )
 	 */
-	public function display_image_hash_bans($page, $page_number, $bans) {
+	public function display_image_hash_bans(Page $page, $page_number, $bans) {
 		$h_bans = "";
 		foreach($bans as $ban) {
 			$h_bans .= "
@@ -70,7 +70,7 @@ class ImageBanTheme extends Themelet {
 	 *
 	 * $image_id = the image to delete
 	 */
-	public function get_buttons_html($image) {
+	public function get_buttons_html(Image $image) {
 		$html = "
 			<form action='".make_link("image_hash_ban/add")."' method='POST'>
 				<input type='hidden' name='hash' value='{$image->hash}'>
diff --git a/contrib/ipban/theme.php b/contrib/ipban/theme.php
index 4e6fdca3..ba8ff6f8 100644
--- a/contrib/ipban/theme.php
+++ b/contrib/ipban/theme.php
@@ -11,7 +11,7 @@ class IPBanTheme extends Themelet {
 	 *  'end' => when the ban will end
 	 * )
 	 */
-	public function display_bans($page, $bans) {
+	public function display_bans(Page $page, $bans) {
 		global $user;
 		$h_bans = "";
 		foreach($bans as $ban) {
diff --git a/contrib/link_image/theme.php b/contrib/link_image/theme.php
index 52bee0e7..cbc4186e 100644
--- a/contrib/link_image/theme.php
+++ b/contrib/link_image/theme.php
@@ -1,7 +1,6 @@
 <?php
 class LinkImageTheme extends Themelet {
-	public function links_block($page,$data) {
-
+	public function links_block(Page $page, $data) {
 		$thumb_src = $data['thumb_src'];
 		$image_src = $data['image_src'];
 		$post_link = $data['post_link'];
diff --git a/contrib/notes/theme.php b/contrib/notes/theme.php
index df4f140d..178b9fb9 100644
--- a/contrib/notes/theme.php
+++ b/contrib/notes/theme.php
@@ -1,7 +1,7 @@
 <?php
 
 class NotesTheme extends Themelet {
-	public function display_notes($page, $notes) {
+	public function display_notes(Page $page, $notes) {
 		$html = <<<EOD
 <script type="text/javascript">
 img = byId("main_image");
diff --git a/contrib/numeric_score/theme.php b/contrib/numeric_score/theme.php
index 32567f6c..7619df94 100644
--- a/contrib/numeric_score/theme.php
+++ b/contrib/numeric_score/theme.php
@@ -1,7 +1,7 @@
 <?php
 
 class NumericScoreTheme extends Themelet {
-	public function get_voter_html($image) {
+	public function get_voter_html(Image $image) {
 		$i_image_id = int_escape($image->id);
 		$i_score = int_escape($image->numeric_score);
 
diff --git a/contrib/regen_thumb/theme.php b/contrib/regen_thumb/theme.php
index 03ade603..7c55c7af 100644
--- a/contrib/regen_thumb/theme.php
+++ b/contrib/regen_thumb/theme.php
@@ -16,7 +16,7 @@ class RegenThumbTheme extends Themelet {
 	/*
 	 * Show a link to the new thumbnail
 	 */
-	public function display_results($page, $image) {
+	public function display_results(Page $page, Image $image) {
 		$page->set_title("Thumbnail Regenerated");
 		$page->set_heading("Thumbnail Regenerated");
 		$page->add_header("<meta http-equiv=\"cache-control\" content=\"no-cache\">");
diff --git a/contrib/report_image/theme.php b/contrib/report_image/theme.php
index 8b77f97a..528b6769 100755
--- a/contrib/report_image/theme.php
+++ b/contrib/report_image/theme.php
@@ -11,7 +11,7 @@
  */
 
 class ReportImageTheme extends Themelet {
-	public function display_reported_images($page, $reports) {
+	public function display_reported_images(Page $page, $reports) {
 		global $config;
 
 		$h_reportedimages = "";
@@ -71,7 +71,7 @@ class ReportImageTheme extends Themelet {
 
 	}
 
-	public function display_image_banner($page, $image) {
+	public function display_image_banner(Page $page, Image $image) {
 		global $config;
 
 		$i_image = int_escape($image);
diff --git a/contrib/simpletest/theme.php b/contrib/simpletest/theme.php
index 868a594b..868621ef 100644
--- a/contrib/simpletest/theme.php
+++ b/contrib/simpletest/theme.php
@@ -7,7 +7,7 @@ class SCoreReporter extends HtmlReporter {
 	var $clear_modules = "";
 	var $page;
 
-	public function SCoreReporter($page) {
+	public function SCoreReporter(Page $page) {
 		$this->page = $page;
 		$this->_fails = 0;
 	}
diff --git a/contrib/svn_update/theme.php b/contrib/svn_update/theme.php
index bcae1846..574a0691 100644
--- a/contrib/svn_update/theme.php
+++ b/contrib/svn_update/theme.php
@@ -1,14 +1,14 @@
 <?php
 
 class SVNUpdateTheme extends Themelet {
-	public function display_form($page) {
+	public function display_form(Page $page) {
 		$html = "
 			<a href='".make_link("update/view_changes")."'>Check for Updates</a>
 		";
 		$page->add_block(new Block("Update", $html));
 	}
 
-	public function display_update_todo($page, $log, $branches) {
+	public function display_update_todo(Page $page, $log, $branches) {
 		$h_log = html_escape($log);
 		$updates = "
 			<textarea rows='20' cols='80'>$h_log</textarea>
@@ -37,7 +37,7 @@ class SVNUpdateTheme extends Themelet {
 		$page->add_block(new Block("Available Branches", $branches));
 	}
 
-	public function display_update_log($page, $log) {
+	public function display_update_log(Page $page, $log) {
 		$h_log = html_escape($log);
 		$html = "
 			<textarea rows='20' cols='80'>$h_log</textarea>
diff --git a/contrib/tag_history/theme.php b/contrib/tag_history/theme.php
index 3666cb07..a1e75929 100644
--- a/contrib/tag_history/theme.php
+++ b/contrib/tag_history/theme.php
@@ -1,7 +1,7 @@
 <?php
 
 class Tag_HistoryTheme extends Themelet {
-	public function display_history_page($page, $image_id, $history) {
+	public function display_history_page(Page $page, $image_id, $history) {
 		$start_string = "
 			<div style='text-align: left'>
 				<form enctype='multipart/form-data' action='".make_link("tag_history/revert")."' method='POST'>
@@ -36,7 +36,7 @@ class Tag_HistoryTheme extends Themelet {
 		$page->add_block(new Block("Tag History", $history_html, "main", 10));
 	}
 
-	public function display_global_page($page, $history) {
+	public function display_global_page(Page $page, $history) {
 		$start_string = "
 			<div style='text-align: left'>
 				<form enctype='multipart/form-data' action='".make_link("tag_history/revert")."' method='POST'>
@@ -77,7 +77,7 @@ class Tag_HistoryTheme extends Themelet {
 		$page->add_block(new Block("Tag History", $history_html, "main", 10));
 	}
 
-	public function display_history_link($page, $image_id) {
+	public function display_history_link(Page $page, $image_id) {
 		$link = "<a href='".make_link("tag_history/$image_id")."'>Tag History</a>\n";
 		$page->add_block(new Block(null, $link, "main", 5));
 	}
diff --git a/contrib/tagger/theme.php b/contrib/tagger/theme.php
index 1c3463a2..f1edc566 100644
--- a/contrib/tagger/theme.php
+++ b/contrib/tagger/theme.php
@@ -6,7 +6,7 @@
  * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */
 
 class taggerTheme extends Themelet {
-	public function build_tagger ($page, $event) {
+	public function build_tagger (Page $page, $event) {
 		global $config;
 		// Initialization code
 		$base_href = $config->get_string('base_href');
@@ -22,7 +22,7 @@ class taggerTheme extends Themelet {
 			$this->html($event->get_image()),
 			"main"));
 	}
-	private function html($image) {
+	private function html(Image $image) {
 		global $config;
 		$i_image_id = int_escape($image->id);
 		$h_source = html_escape($image->source);
diff --git a/contrib/text_score/theme.php b/contrib/text_score/theme.php
index e6cb1ed6..bc0f14b4 100644
--- a/contrib/text_score/theme.php
+++ b/contrib/text_score/theme.php
@@ -1,7 +1,7 @@
 <?php
 
 class TextScoreTheme extends Themelet {
-	public function get_scorer_html($image) {
+	public function get_scorer_html(Image $image) {
 		$i_image_id = int_escape($image->id);
 
 		$s_score = $this->score_to_name($image->text_score);
diff --git a/contrib/wiki/theme.php b/contrib/wiki/theme.php
index 156ab1bf..9319bd1b 100644
--- a/contrib/wiki/theme.php
+++ b/contrib/wiki/theme.php
@@ -8,7 +8,7 @@ class WikiTheme {
 	 * $wiki_page = the wiki page, has ->title and ->body
 	 * $nav_page = a wiki page object with navigation, has ->body
 	 */
-	public function display_page($page, $wiki_page, $nav_page) {
+	public function display_page(Page $page, WikiPage $wiki_page, WikiPage $nav_page) {
 		if(is_null($nav_page)) {
 			$nav_page = new WikiPage();
 			$nav_page->body = "";
@@ -29,14 +29,14 @@ class WikiTheme {
 		$page->add_block(new Block("Content", $this->create_display_html($wiki_page)));
 	}
 
-	public function display_page_editor($page, $wiki_page) {
+	public function display_page_editor(Page $page, WikiPage $wiki_page) {
 		$page->set_title(html_escape($wiki_page->title));
 		$page->set_heading(html_escape($wiki_page->title));
 		$page->add_block(new NavBlock());
 		$page->add_block(new Block("Editor", $this->create_edit_html($wiki_page)));
 	}
 
-	protected function can_edit($user, $page) {
+	protected function can_edit(User $user, WikiPage $page) {
 		global $config;
 
 		if(!is_null($page) && $page->is_locked() && !$user->is_admin()) return false;
@@ -46,7 +46,7 @@ class WikiTheme {
 		return false;
 	}
 
-	protected function create_edit_html($page) {
+	protected function create_edit_html(WikiPage $page) {
 		$h_title = html_escape($page->title);
 		$u_title = url_escape($page->title);
 		$i_revision = int_escape($page->revision) + 1;
@@ -70,7 +70,7 @@ class WikiTheme {
 		";
 	}
 
-	protected function create_display_html($page) {
+	protected function create_display_html(WikiPage $page) {
 		$owner = $page->get_owner();
 
 		$tfe = new TextFormattingEvent($page->body);
diff --git a/contrib/zoom/theme.php b/contrib/zoom/theme.php
index c8a4ef71..9cc59583 100644
--- a/contrib/zoom/theme.php
+++ b/contrib/zoom/theme.php
@@ -1,7 +1,7 @@
 <?php
 
 class ZoomTheme extends Themelet {
-	public function display_zoomer($page, $image, $zoom_by_default) {
+	public function display_zoomer(Page $page, Image $image, $zoom_by_default) {
 		$page->add_block(new Block(null, $this->make_zoomer($image->width, $zoom_by_default)));
 	}
 
diff --git a/ext/admin/theme.php b/ext/admin/theme.php
index adc68c93..986ba11b 100644
--- a/ext/admin/theme.php
+++ b/ext/admin/theme.php
@@ -4,7 +4,7 @@ class AdminPageTheme extends Themelet {
 	/*
 	 * Show the basics of a page, for other extensions to add to
 	 */
-	public function display_page($page) {
+	public function display_page(Page $page) {
 		$page->set_title("Admin Tools");
 		$page->set_heading("Admin Tools");
 		$page->add_block(new NavBlock());
@@ -32,7 +32,7 @@ class AdminPageTheme extends Themelet {
 	 *  'recount tag use'
 	 *  'purge unused tags'
 	 */
-	public function display_form($page) {
+	public function display_form(Page $page) {
 		$html = "
 			<p><form action='".make_link("admin_utils")."' method='POST'>
 				<select name='action'>
diff --git a/ext/alias_editor/theme.php b/ext/alias_editor/theme.php
index 893afc54..470bb476 100644
--- a/ext/alias_editor/theme.php
+++ b/ext/alias_editor/theme.php
@@ -7,7 +7,7 @@ class AliasEditorTheme extends Themelet {
 	 * $aliases = an array of ($old_tag => $new_tag)
 	 * $is_admin = whether things like "add new alias" should be shown
 	 */
-	public function display_aliases($page, $aliases, $is_admin) {
+	public function display_aliases(Page $page, $aliases, $is_admin) {
 		if($is_admin) {
 			$action = "<td>Action</td>";
 			$add = "
diff --git a/ext/comment/theme.php b/ext/comment/theme.php
index 8659991c..7572f56a 100644
--- a/ext/comment/theme.php
+++ b/ext/comment/theme.php
@@ -7,7 +7,7 @@ class CommentListTheme extends Themelet {
 	 * $page_number = the current page number
 	 * $total_pages = the total number of comment pages
 	 */
-	public function display_page_start($page, $page_number, $total_pages) {
+	public function display_page_start(Page $page, $page_number, $total_pages) {
 		$prev = $page_number - 1;
 		$next = $page_number + 1;
 
@@ -30,7 +30,7 @@ class CommentListTheme extends Themelet {
 	 *
 	 * $comments = an array of Comment objects to be shown
 	 */
-	public function display_recent_comments($page, $comments) {
+	public function display_recent_comments(Page $page, $comments) {
 		$html = $this->comments_to_html($comments, true);
 		$html .= "<p><a class='more' href='".make_link("comment/list")."'>Full List</a>";
 		$page->add_block(new Block("Comments", $html, "left"));
@@ -39,7 +39,7 @@ class CommentListTheme extends Themelet {
 	/*
 	 * Show comments for an image
 	 */
-	public function display_comments($page, $comments, $postbox, $image_id) {
+	public function display_comments(Page $page, $comments, $postbox, $image_id) {
 		if($postbox) {
 			$page->add_block(new Block("Comments",
 					$this->comments_to_html($comments).
@@ -57,7 +57,7 @@ class CommentListTheme extends Themelet {
 	 * Add a block with thumbnail and comments, as part of the comment
 	 * list page
 	 */
-	public function add_comment_list($page, $image, $comments, $position, $with_postbox) {
+	public function add_comment_list(Page $page, Image $image, $comments, $position, $with_postbox) {
 		$html  = "<div style='text-align: left'>";
 		$html .=   "<div style='float: left; margin-right: 16px;'>" . $this->build_thumb_html($image) . "</div>";
 		$html .=   $this->comments_to_html($comments);
diff --git a/ext/ext_manager/theme.php b/ext/ext_manager/theme.php
index 044500d8..f8292c12 100644
--- a/ext/ext_manager/theme.php
+++ b/ext/ext_manager/theme.php
@@ -1,7 +1,7 @@
 <?php
 
 class ExtManagerTheme extends Themelet {
-	public function display_table($page, $extensions) {
+	public function display_table(Page $page, $extensions) {
 		$html = "
 			<form action='".make_link("ext_manager/set")."' method='POST'>
 				<table border='1'>
diff --git a/ext/handle_pixel/theme.php b/ext/handle_pixel/theme.php
index def60f0e..dbdd0c25 100644
--- a/ext/handle_pixel/theme.php
+++ b/ext/handle_pixel/theme.php
@@ -1,7 +1,7 @@
 <?php
 
 class PixelFileHandlerTheme extends Themelet {
-	public function display_image($page, $image) {
+	public function display_image(Page $page, Image $image) {
 		$ilink = $image->get_image_link();
 		$html = "<img id='main_image' src='$ilink'>";
 		$page->add_block(new Block("Image", $html, "main", 0));
diff --git a/ext/index/theme.php b/ext/index/theme.php
index 5bebfb3b..8b4b1723 100644
--- a/ext/index/theme.php
+++ b/ext/index/theme.php
@@ -7,7 +7,7 @@ class IndexTheme extends Themelet {
 		$this->search_terms = $search_terms;
 	}
 
-	public function display_page($page, $images) {
+	public function display_page(Page $page, $images) {
 		global $config;
 
 		if(count($this->search_terms) == 0) {
diff --git a/ext/setup/theme.php b/ext/setup/theme.php
index 61d7e957..a347252a 100644
--- a/ext/setup/theme.php
+++ b/ext/setup/theme.php
@@ -12,7 +12,7 @@ class SetupTheme extends Themelet {
 	 *
 	 * The page should wrap all the options in a form which links to setup_save
 	 */
-	public function display_page($page, $panel) {
+	public function display_page(Page $page, $panel) {
 		$setupblock_html1 = "";
 		$setupblock_html2 = "";
 
@@ -52,7 +52,7 @@ class SetupTheme extends Themelet {
 		$page->add_block(new Block("Setup", $table));
 	}
 
-	public function display_advanced($page, $options) {
+	public function display_advanced(Page $page, $options) {
 		$rows = "";
 		foreach($options as $name => $value) {
 			$h_value = html_escape($value);
@@ -90,7 +90,7 @@ class SetupTheme extends Themelet {
 		";
 	}
 
-	protected function sb_to_html($block) {
+	protected function sb_to_html(SetupBlock $block) {
 		return "<div class='setupblock'><b>{$block->header}</b><br>{$block->body}</div>\n";
 	}
 }
diff --git a/ext/tag_edit/theme.php b/ext/tag_edit/theme.php
index 13838605..8c7c583f 100644
--- a/ext/tag_edit/theme.php
+++ b/ext/tag_edit/theme.php
@@ -5,7 +5,7 @@ class TagEditTheme extends Themelet {
 	 * Display a form which links to tag_edit/replace with POST[search]
 	 * and POST[replace] set appropriately
 	 */
-	public function display_mass_editor($page) {
+	public function display_mass_editor(Page $page) {
 		$html = "
 		<form action='".make_link("tag_edit/replace")."' method='POST'>
 			<table border='1' style='width: 200px;'>
@@ -18,12 +18,12 @@ class TagEditTheme extends Themelet {
 		$page->add_block(new Block("Mass Tag Edit", $html));
 	}
 
-	public function get_tag_editor_html($image) {
+	public function get_tag_editor_html(Image $image) {
 		$h_tags = html_escape($image->get_tag_list());
 		return "<tr><td width='50px'>Tags</td><td width='300px'><input type='text' name='tag_edit__tags' value='$h_tags'></td></tr>";
 	}
 
-	public function get_source_editor_html($image) {
+	public function get_source_editor_html(Image $image) {
 		$h_source = html_escape($image->get_source());
 		return "<tr><td>Source</td><td><input type='text' name='tag_edit__source' value='$h_source'></td></tr>";
 	}
diff --git a/ext/tag_list/theme.php b/ext/tag_list/theme.php
index d0f912f8..6bc0c050 100644
--- a/ext/tag_list/theme.php
+++ b/ext/tag_list/theme.php
@@ -16,7 +16,7 @@ class TagListTheme extends Themelet {
 		$this->navigation = $nav;
 	}
 
-	public function display_page($page) {
+	public function display_page(Page $page) {
 		$page->set_title("Tag List");
 		$page->set_heading($this->heading);
 		$page->add_block(new Block("Tags", $this->list));
@@ -31,7 +31,7 @@ class TagListTheme extends Themelet {
 	 *                 ...
 	 *              )
 	 */
-	public function display_related_block($page, $tag_infos) {
+	public function display_related_block(Page $page, $tag_infos) {
 		global $config;
 
 		$html = "";
@@ -63,7 +63,7 @@ class TagListTheme extends Themelet {
 	 *                 ...
 	 *              )
 	 */
-	public function display_popular_block($page, $tag_infos) {
+	public function display_popular_block(Page $page, $tag_infos) {
 		global $config;
 
 		$html = "";
@@ -96,7 +96,7 @@ class TagListTheme extends Themelet {
 	 *              )
 	 * $search = the current array of tags being searched for
 	 */
-	public function display_refine_block($page, $tag_infos, $search) {
+	public function display_refine_block(Page $page, $tag_infos, $search) {
 		global $config;
 
 		$html = "";
diff --git a/ext/upload/theme.php b/ext/upload/theme.php
index 6ae6b219..0ddb9c67 100644
--- a/ext/upload/theme.php
+++ b/ext/upload/theme.php
@@ -1,15 +1,15 @@
 <?php
 
 class UploadTheme extends Themelet {
-	public function display_block($page) {
+	public function display_block(Page $page) {
 		$page->add_block(new Block("Upload", $this->build_upload_block(), "left", 20));
 	}
 
-	public function display_full($page) {
+	public function display_full(Page $page) {
 		$page->add_block(new Block("Upload", "Disk nearly full, uploads disabled", "left", 20));
 	}
 
-	public function display_page($page) {
+	public function display_page(Page $page) {
 		global $config;
 		$tl_enabled = ($config->get_string("transload_engine", "none") != "none");
 
@@ -61,7 +61,7 @@ class UploadTheme extends Themelet {
 		$page->add_block(new Block("Upload", $html, "main", 20));
 	}
 
-	public function display_upload_status($page, $ok) {
+	public function display_upload_status(Page $page, $ok) {
 		if($ok) {
 			$page->set_mode("redirect");
 			$page->set_redirect(make_link());
@@ -73,7 +73,7 @@ class UploadTheme extends Themelet {
 		}
 	}
 
-	public function display_upload_error($page, $title, $message) {
+	public function display_upload_error(Page $page, $title, $message) {
 		$page->add_block(new Block($title, $message));
 	}
 
diff --git a/ext/view/theme.php b/ext/view/theme.php
index 378c90bd..2f602ecc 100644
--- a/ext/view/theme.php
+++ b/ext/view/theme.php
@@ -4,7 +4,7 @@ class ViewImageTheme extends Themelet {
 	/*
 	 * Build a page showing $image and some info about it
 	 */
-	public function display_page($page, $image, $editor_parts) {
+	public function display_page(Page $page, Image $image, $editor_parts) {
 		$page->set_title("Image {$image->id}: ".html_escape($image->get_tag_list()));
 		$page->set_heading(html_escape($image->get_tag_list()));
 		$page->add_block(new Block("Navigation", $this->build_navigation($image), "left", 0));
@@ -12,7 +12,7 @@ class ViewImageTheme extends Themelet {
 		$page->add_block(new Block(null, $this->build_pin($image), "main", 11));
 	}
 
-	public function display_admin_block($page, $parts) {
+	public function display_admin_block(Page $page, $parts) {
 		if(count($parts) > 0) {
 			$page->add_block(new Block("Image Admin", join("<br>", $parts), "left", 50));
 		}
@@ -21,7 +21,7 @@ class ViewImageTheme extends Themelet {
 
 	var $pin = null;
 
-	protected function build_pin($image) {
+	protected function build_pin(Image $image) {
 		if(!is_null($this->pin)) {
 			return $this->pin;
 		}
@@ -48,7 +48,7 @@ class ViewImageTheme extends Themelet {
 		return $this->pin;
 	}
 
-	protected function build_navigation($image) {
+	protected function build_navigation(Image $image) {
 		$h_pin = $this->build_pin($image);
 		$h_search = "
 			<p><form action='".make_link()."' method='GET'>
@@ -61,7 +61,7 @@ class ViewImageTheme extends Themelet {
 		return "$h_pin<br>$h_search";
 	}
 
-	protected function build_info($image, $editor_parts) {
+	protected function build_info(Image $image, $editor_parts) {
 		global $user;
 		$owner = $image->get_owner();
 		$h_owner = html_escape($owner->name);
@@ -89,7 +89,7 @@ class ViewImageTheme extends Themelet {
 		return $html;
 	}
 
-	protected function build_image_editor($image, $editor_parts) {
+	protected function build_image_editor(Image $image, $editor_parts) {
 		if(count($editor_parts) == 0) return "";
 
 		if(isset($_GET['search'])) {$h_query = "search=".url_escape($_GET['search']);}