diff --git a/ext/admin/main.php b/ext/admin/main.php
index 3101fd5f..dd1a99c7 100644
--- a/ext/admin/main.php
+++ b/ext/admin/main.php
@@ -43,8 +43,7 @@ class AdminPage extends Extension {
 		if(is_a($event, 'DisplayingImageEvent')) {
 			global $user;
 			if($user->is_admin()) {
-				global $page;
-				$page->add_block(new Block("Admin", $this->build_del_block($event->image->id), "left"));
+				$event->page->add_block(new Block("Admin", $this->build_del_block($event->image->id), "left"));
 			}
 		}
 
diff --git a/ext/comment/main.php b/ext/comment/main.php
index 90ae9719..9621441e 100644
--- a/ext/comment/main.php
+++ b/ext/comment/main.php
@@ -95,14 +95,13 @@ class CommentList extends Extension {
 		}
 
 		if(is_a($event, 'DisplayingImageEvent')) {
-			global $page;
 			if($this->can_comment()) {
-				$page->add_block(new Block("Comments",
+				$event->page->add_block(new Block("Comments",
 						$this->build_image_comments($event->image->id).
 						$this->theme->build_postbox($event->image->id), "main", 30));
 			}
 			else {
-				$page->add_block(new Block("Comments",
+				$event->page->add_block(new Block("Comments",
 						$this->build_image_comments($event->image->id), "main", 30));
 			}
 		}
diff --git a/ext/regen_thumb/main.php b/ext/regen_thumb/main.php
index 0c27556f..8f48ca47 100644
--- a/ext/regen_thumb/main.php
+++ b/ext/regen_thumb/main.php
@@ -14,10 +14,9 @@ class RegenThumb extends Extension {
 		}
 
 		if(is_a($event, 'DisplayingImageEvent')) {
-			global $page;
 			global $user;
 			if($user->is_admin()) {
-				$this->theme->display_buttons($page, $event->image->id);
+				$this->theme->display_buttons($event->page, $event->image->id);
 			}
 		}
 	}
diff --git a/ext/tag_edit/main.php b/ext/tag_edit/main.php
index a9010b84..3fccfd72 100644
--- a/ext/tag_edit/main.php
+++ b/ext/tag_edit/main.php
@@ -33,8 +33,7 @@ class TagEdit extends Extension {
 		}
 
 		if(is_a($event, 'DisplayingImageEvent')) {
-			global $page;
-			$page->add_block(new Block(null, $this->build_tag_editor($event->image), "main", 5));
+			$event->page->add_block(new Block(null, $this->build_tag_editor($event->image), "main", 5));
 		}
 
 		if(is_a($event, 'TagSetEvent')) {
diff --git a/ext/tag_list/main.php b/ext/tag_list/main.php
index 37a945ef..584fa074 100644
--- a/ext/tag_list/main.php
+++ b/ext/tag_list/main.php
@@ -42,10 +42,9 @@ class TagList extends Extension {
 		}
 
 		if(is_a($event, 'DisplayingImageEvent')) {
-			global $page;
 			global $config;
 			if($config->get_int('tag_list_length') > 0) {
-				$this->add_related_block($page, $event->image);
+				$this->add_related_block($event->page, $event->image);
 			}
 		}
 
diff --git a/ext/view/main.php b/ext/view/main.php
index d17855af..c0b63f3b 100644
--- a/ext/view/main.php
+++ b/ext/view/main.php
@@ -25,7 +25,7 @@ class ViewImage extends Extension {
 		if(is_a($event, 'DisplayingImageEvent')) {
 			$image = $event->get_image();
 			
-			global $page;
+			$page = $event->page;
 			$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->id), "left", 0));
diff --git a/ext/zoom/main.php b/ext/zoom/main.php
index fd827694..1f92bdc3 100644
--- a/ext/zoom/main.php
+++ b/ext/zoom/main.php
@@ -7,9 +7,8 @@ class Zoom extends Extension {
 		if($this->theme == null) $this->theme = get_theme_object("zoom", "ZoomTheme");
 
 		if(is_a($event, 'DisplayingImageEvent')) {
-			global $page;
 			global $config;
-			$this->theme->display_zoomer($page, $config->get_bool("image_zoom", false));
+			$this->theme->display_zoomer($event->page, $config->get_bool("image_zoom", false));
 		}
 		
 		if(is_a($event, 'SetupBuildingEvent')) {