diff --git a/classes/display/HTMLDisplayHandler.php b/classes/display/HTMLDisplayHandler.php
index 2a27a50e7..34b558edc 100644
--- a/classes/display/HTMLDisplayHandler.php
+++ b/classes/display/HTMLDisplayHandler.php
@@ -94,8 +94,8 @@ class HTMLDisplayHandler
 			}
 		}
 
-		$oTemplate = new Rhymix\Framework\Template;
-		$output = $oTemplate->compile($template_path, $template_file);
+		$oTemplate = new Rhymix\Framework\Template($template_path, $template_file);
+		$output = $oTemplate->compile();
 
 		// add .x div for adminitration pages
 		if(Context::getResponseMethod() == 'HTML')
@@ -300,8 +300,8 @@ class HTMLDisplayHandler
 		{
 			$this->_loadDesktopJSCSS();
 		}
-		$oTemplate = new Rhymix\Framework\Template;
-		$output = $oTemplate->compile('./common/tpl', 'common_layout');
+		$oTemplate = new Rhymix\Framework\Template('./common/tpl', 'common_layout');
+		$output = $oTemplate->compile();
 
 		// replace the user-defined-language
 		$output = Context::replaceUserLang($output);
diff --git a/classes/display/RawDisplayHandler.php b/classes/display/RawDisplayHandler.php
index cc82008b8..24e023f82 100644
--- a/classes/display/RawDisplayHandler.php
+++ b/classes/display/RawDisplayHandler.php
@@ -8,8 +8,8 @@ class RawDisplayHandler
 		$tpl_file = $oModule->getTemplateFile();
 		if ($tpl_path && $tpl_file)
 		{
-			$oTemplate = Rhymix\Framework\Template::getInstance();
-			$output = $oTemplate->compile($tpl_path, $tpl_file);
+			$oTemplate = new Rhymix\Framework\Template($tpl_path, $tpl_file);
+			$output = $oTemplate->compile();
 		}
 		else
 		{
diff --git a/classes/module/ModuleObject.class.php b/classes/module/ModuleObject.class.php
index 037a256d2..1b5f56e49 100644
--- a/classes/module/ModuleObject.class.php
+++ b/classes/module/ModuleObject.class.php
@@ -218,8 +218,8 @@ class ModuleObject extends BaseObject
 			}
 			else
 			{
-				$oTemplate = Rhymix\Framework\Template::getInstance();
-				$oTemplate->compile('modules/admin/tpl', '_admin_common.html');
+				$oTemplate = new Rhymix\Framework\Template('modules/admin/tpl', '_admin_common.html');
+				$oTemplate->compile();
 			}
 		}