diff --git a/phpgwapi/inc/class.egw_framework.inc.php b/phpgwapi/inc/class.egw_framework.inc.php
index b100c9efb2..21acd93eaf 100644
--- a/phpgwapi/inc/class.egw_framework.inc.php
+++ b/phpgwapi/inc/class.egw_framework.inc.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * eGW API - framework
+ * EGroupware API - framework baseclass
  *
  * @link http://www.egroupware.org
  * @author Ralf Becker <RalfBecker-AT-outdoor-training.de> rewrite in 12/2006
diff --git a/phpgwapi/templates/idots/class.idots_framework.inc.php b/phpgwapi/templates/idots/class.idots_framework.inc.php
index a318915497..d730fe0571 100644
--- a/phpgwapi/templates/idots/class.idots_framework.inc.php
+++ b/phpgwapi/templates/idots/class.idots_framework.inc.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * eGW idots template
+ * EGroupware idots template set
  *
  * @link http://www.egroupware.org
  * @author Ralf Becker <RalfBecker-AT-outdoor-training.de> rewrite in 12/2006
@@ -62,8 +62,7 @@ class idots_framework extends egw_framework
 	*/
 	function __construct($template='idots')
 	{
-		$GLOBALS['egw_info']['flags']['include_xajax'] = True;
-		$this->egw_framework($template);		// call the constructor of the extended class
+		parent::__construct($template);		// call the constructor of the extended class
 
 		$this->tplsav2 = new tplsavant2();
 		$this->tplsav2->set_tpl_path(EGW_SERVER_ROOT.SEP.'phpgwapi'.SEP.'templates'.SEP.'idots');
diff --git a/phpgwapi/templates/jerryr/class.jerryr_framework.inc.php b/phpgwapi/templates/jerryr/class.jerryr_framework.inc.php
index 645bb07dea..6966c5c139 100644
--- a/phpgwapi/templates/jerryr/class.jerryr_framework.inc.php
+++ b/phpgwapi/templates/jerryr/class.jerryr_framework.inc.php
@@ -1,8 +1,9 @@
 <?php
 /**
- * eGW jerryr template
- * 
+ * EGroupware jerryr template set
+ *
  * @link http://www.egroupware.org
+ * @author Jerry Ruhe <jerry.ruhe@dilawri-group.ca>
  * @author Ralf Becker <RalfBecker-AT-outdoor-training.de> rewrite in 12/2006
  * @author Pim Snel <pim@lingewoud.nl> author of the idots template set
  * @license http://opensource.org/licenses/gpl-license.php GPL - GNU General Public License
@@ -25,9 +26,9 @@ class jerryr_framework extends idots_framework
 	 * @param string $template='jerryr'
 	 * @return jerryr_framework
 	 */
-	function jerryr_framework($template='jerryr')
+	function __construct($template='jerryr')
 	{
-		$this->idots_framework($template);
+		parent::__construct($template);
 	}
 
 	function topmenu(array &$vars,array &$apps)