diff --git a/contrib/handle_flash/main.php b/contrib/handle_flash/main.php
index f61db9f0..e4328482 100644
--- a/contrib/handle_flash/main.php
+++ b/contrib/handle_flash/main.php
@@ -9,7 +9,7 @@ class FlashFileHandler implements Extension {
 	var $theme;
 
 	public function receive_event(Event $event) {
-		if(is_null($this->theme)) $this->theme = get_theme_object("handle_flash", "FlashFileHandlerTheme");
+		if(is_null($this->theme)) $this->theme = get_theme_object($this);
 
 		if(($event instanceof DataUploadEvent) && $this->supported_ext($event->type) && $this->check_contents($event->tmpname)) {
 			$hash = $event->hash;
diff --git a/contrib/handle_ico/main.php b/contrib/handle_ico/main.php
index b20d32d1..20df8315 100644
--- a/contrib/handle_ico/main.php
+++ b/contrib/handle_ico/main.php
@@ -9,7 +9,7 @@ class IcoFileHandler implements Extension {
 	var $theme;
 
 	public function receive_event(Event $event) {
-		if(is_null($this->theme)) $this->theme = get_theme_object("handle_ico", "IcoFileHandlerTheme");
+		if(is_null($this->theme)) $this->theme = get_theme_object($this);
 
 		if(($event instanceof DataUploadEvent) && $this->supported_ext($event->type) && $this->check_contents($event->tmpname)) {
 			$hash = $event->hash;
diff --git a/contrib/handle_mp3/main.php b/contrib/handle_mp3/main.php
index 3816a9ae..b3ac3c2c 100644
--- a/contrib/handle_mp3/main.php
+++ b/contrib/handle_mp3/main.php
@@ -9,7 +9,7 @@ class MP3FileHandler implements Extension {
 	var $theme;
 
 	public function receive_event(Event $event) {
-		if(is_null($this->theme)) $this->theme = get_theme_object("handle_mp3", "MP3FileHandlerTheme");
+		if(is_null($this->theme)) $this->theme = get_theme_object($this);
 
 		if(($event instanceof DataUploadEvent) && $this->supported_ext($event->type) && $this->check_contents($event->tmpname)) {
 			$hash = $event->hash;
diff --git a/contrib/handle_svg/main.php b/contrib/handle_svg/main.php
index 73f81cd6..7ba44a43 100644
--- a/contrib/handle_svg/main.php
+++ b/contrib/handle_svg/main.php
@@ -9,7 +9,7 @@ class SVGFileHandler implements Extension {
 	var $theme;
 
 	public function receive_event(Event $event) {
-		if(is_null($this->theme)) $this->theme = get_theme_object("handle_svg", "SVGFileHandlerTheme");
+		if(is_null($this->theme)) $this->theme = get_theme_object($this);
 
 		if(($event instanceof DataUploadEvent) && $this->supported_ext($event->type) && $this->check_contents($event->tmpname)) {
 			$hash = $event->hash;
diff --git a/ext/handle_pixel/main.php b/ext/handle_pixel/main.php
index f82fbe58..30e6afdc 100644
--- a/ext/handle_pixel/main.php
+++ b/ext/handle_pixel/main.php
@@ -9,7 +9,7 @@ class PixelFileHandler implements Extension {
 	var $theme;
 
 	public function receive_event(Event $event) {
-		if(is_null($this->theme)) $this->theme = get_theme_object("handle_pixel", "PixelFileHandlerTheme");
+		if(is_null($this->theme)) $this->theme = get_theme_object($this);
 
 		if(($event instanceof DataUploadEvent) && $this->supported_ext($event->type) && $this->check_contents($event->tmpname)) {
 			$hash = $event->hash;