diff --git a/pixelegg/css/mobile.less b/pixelegg/css/mobile.less
index ac2ba4cd0c..a071a87136 100644
--- a/pixelegg/css/mobile.less
+++ b/pixelegg/css/mobile.less
@@ -65,7 +65,7 @@
 				position: absolute;
 				width: 100%;
 				height: 100%;
-				background-image: url(../../phpgwapi/templates/default/images/logo64x64.png);
+				background-image: url(../../api/templates/default/images/logo64x64.png);
 				background-position: center;
 				background-repeat: no-repeat;
 				background-size: 64px;
diff --git a/pixelegg/head_mobile.tpl b/pixelegg/head_mobile.tpl
index 78ae67d8aa..c20af8224d 100644
--- a/pixelegg/head_mobile.tpl
+++ b/pixelegg/head_mobile.tpl
@@ -11,7 +11,7 @@
 		<meta name="author" content="Stylite AG www.stylite.de" />
 		<meta name="apple-mobile-web-app-capable" content="yes" />
 		<meta name="viewport" content="user-scalable=no,width=device-width" />
-		<link rel="apple-touch-icon" href="{webserver_url}/phpgwapi/templates/default/images/logo64x64.png" />
+		<link rel="apple-touch-icon" href="{webserver_url}/api/templates/default/images/logo64x64.png" />
 		{pngfix}
 		{meta_robots}
 		<link rel="icon" href="{img_icon}" type="image/x-ico" />
diff --git a/pixelegg/hook_settings.inc.php b/pixelegg/hook_settings.inc.php
index f8d1efa2bc..885dfe59a0 100644
--- a/pixelegg/hook_settings.inc.php
+++ b/pixelegg/hook_settings.inc.php
@@ -13,7 +13,7 @@
  * @todo extend Stylite template preferences instead of this copy (simple include fails)
  */
 $apps = $no_navbar_apps = array();
-if (!$hook_data['setup'])	// does not work on setup time
+if (!$hook_data['setup'] && !isset($GLOBALS['egw_setup']))	// does not work on setup time
 {
 	foreach(ExecMethod('pixelegg.pixelegg_framework.navbar_apps') as $app => $data)
 	{
diff --git a/pixelegg/less/def_buttons.less b/pixelegg/less/def_buttons.less
index 76efbffbdd..a960d3ea99 100755
--- a/pixelegg/less/def_buttons.less
+++ b/pixelegg/less/def_buttons.less
@@ -8,7 +8,7 @@
  * @link http://www.egroupware.org
  * @license http://opensource.org/licenses/gpl-license.php GPL - GNU General Public License
  * @author Stefan Reinhardt <stefan.reinhardt@pixelegg.de>
- * @package phpgwapi
+ * @package pixelegg
  * @version $Id$
  */
 
diff --git a/pixelegg/less/def_design_pattern_color_font_shadow.less b/pixelegg/less/def_design_pattern_color_font_shadow.less
index 74cd1e293a..0ac8daee3b 100755
--- a/pixelegg/less/def_design_pattern_color_font_shadow.less
+++ b/pixelegg/less/def_design_pattern_color_font_shadow.less
@@ -8,7 +8,7 @@
  * @link http://www.egroupware.org
  * @license http://opensource.org/licenses/gpl-license.php GPL - GNU General Public License
  * @author Stefan Reinhard <stefan.reinhard@pixelegg.de>
- * @package phpgwapi
+ * @package pixelegg
  * @version $Id$
  */
 
diff --git a/pixelegg/less/layout_content_elements.less b/pixelegg/less/layout_content_elements.less
index 0e96b8c8d2..ed72dfe610 100755
--- a/pixelegg/less/layout_content_elements.less
+++ b/pixelegg/less/layout_content_elements.less
@@ -8,7 +8,7 @@
  * @link http://www.egroupware.org
  * @license http://opensource.org/licenses/gpl-license.php GPL - GNU General Public License
  * @author Stefan Reinhardt <stefan.reinhardt@pixelegg.de>
- * @package phpgwapi
+ * @package pixelegg
  * @version $Id$
  */
 @import (reference) "definitions.less";
diff --git a/pixelegg/less/layout_messages.less b/pixelegg/less/layout_messages.less
index 48c3c21305..15c79e5027 100755
--- a/pixelegg/less/layout_messages.less
+++ b/pixelegg/less/layout_messages.less
@@ -8,7 +8,7 @@
  * @link http://www.egroupware.org
  * @license http://opensource.org/licenses/gpl-license.php GPL - GNU General Public License
  * @author Stefan Reinhardt <stefan.reinhardt@pixelegg.de>
- * @package phpgwapi
+ * @package pixelegg
  * @version $Id$
  */
 
diff --git a/pixelegg/less/layout_tutorials.less b/pixelegg/less/layout_tutorials.less
index 28f3a36d38..864da091cf 100644
--- a/pixelegg/less/layout_tutorials.less
+++ b/pixelegg/less/layout_tutorials.less
@@ -8,7 +8,7 @@
  * @link http://www.egroupware.org
  * @license http://opensource.org/licenses/gpl-license.php GPL - GNU General Public License
  * @author Hadi Nategh <hn@stylite.de>
- * @package phpgwapi
+ * @package pixelegg
  * @version $Id$
  */
 @import (reference) "definitions.less";
diff --git a/pixelegg/less/traditional.less b/pixelegg/less/traditional.less
index c7643e7f55..9e0156001e 100755
--- a/pixelegg/less/traditional.less
+++ b/pixelegg/less/traditional.less
@@ -11,7 +11,7 @@
  * @link http://www.egroupware.org
  * @license http://opensource.org/licenses/gpl-license.php GPL - GNU General Public License
  * @author Stefan Reinhard <stefan.reinhard@pixelegg.de>
- * @package phpgwapi
+ * @package pixelegg
  * @version $Id$
  */