diff --git a/phpgwapi/inc/class.egw_framework.inc.php b/phpgwapi/inc/class.egw_framework.inc.php
index 43e7db4db6..25f6e9af43 100644
--- a/phpgwapi/inc/class.egw_framework.inc.php
+++ b/phpgwapi/inc/class.egw_framework.inc.php
@@ -219,7 +219,7 @@ abstract class egw_framework
 		}
 		$var['powered_by'] = lang('Powered by').' <a href="http://www.stylite.de/" target="_blank">Stylite\'s</a>'.
                         ' <a href="'.egw::link('/about.php','','about').'">EGroupware</a>'.
-			' Community Version '.$GLOBALS['egw_info']['server']['versions']['phpgwapi'];
+			' Version '.$GLOBALS['egw_info']['server']['versions']['phpgwapi'];
 
 		return $var;
 	}
diff --git a/phpgwapi/setup/tables_update.inc.php b/phpgwapi/setup/tables_update.inc.php
index 618c6b1da0..84db84164b 100644
--- a/phpgwapi/setup/tables_update.inc.php
+++ b/phpgwapi/setup/tables_update.inc.php
@@ -308,6 +308,8 @@ function phpgwapi_upgrade1_9_010()
 		$prefs->add($app, 'document_dir', $dir, 'default');
 	}
 	$prefs->save_repository(false, 'default');
+	// mount EPL document dir "under" /templates
+	egw_vfs::mount('stylite.merge://default/templates?merge=stylite/printtemplates&lang=1','/templates');
 	egw_vfs::$is_root = false;
 
 	return $GLOBALS['setup_info']['phpgwapi']['currentver'] = '1.9.011';
diff --git a/phpgwapi/templates/default/images/logo.png b/phpgwapi/templates/default/images/logo.png
index e25c1e8b18..baea5fba36 100644
Binary files a/phpgwapi/templates/default/images/logo.png and b/phpgwapi/templates/default/images/logo.png differ
diff --git a/preferences/inc/class.preferences_hooks.inc.php b/preferences/inc/class.preferences_hooks.inc.php
index 11450781f0..71b57a50f2 100644
--- a/preferences/inc/class.preferences_hooks.inc.php
+++ b/preferences/inc/class.preferences_hooks.inc.php
@@ -126,7 +126,7 @@ class preferences_hooks
 				'help'   => 'A template defines the layout of eGroupWare and it contains icons for each application.',
 				'xmlrpc' => True,
 				'admin'  => False,
-				'forced' => 'idots',
+				'forced' => file_exists(EGW_SERVER_ROOT.'/jdots') ? 'jdots' : 'idots',
 			),
 			'theme' => array(
 				'type'   => 'select',
@@ -136,7 +136,7 @@ class preferences_hooks
 				'help'   => 'A theme defines the colors and fonts used by the template.',
 				'xmlrpc' => True,
 				'admin'  => False,
-				'forced' => 'idots',
+				'forced' => file_exists(EGW_SERVER_ROOT.'/jdots') ? 'jdots' : 'idots',
 			),
 			'navbar_format' => array(
 				'type'   => 'select',