diff --git a/admin/inc/class.uicategories.inc.php b/admin/inc/class.uicategories.inc.php
index 0339c1d1a8..c77a52d89f 100644
--- a/admin/inc/class.uicategories.inc.php
+++ b/admin/inc/class.uicategories.inc.php
@@ -34,14 +34,14 @@
 
 		function uicategories()
 		{
-			$this->bo			= CreateObject('admin.bocategories');
-			$this->nextmatchs	= CreateObject('phpgwapi.nextmatchs');
+			$this->bo         = CreateObject('admin.bocategories');
+			$this->nextmatchs = CreateObject('phpgwapi.nextmatchs');
 
-			$this->start		= $this->bo->start;
-			$this->query		= $this->bo->query;
-			$this->sort 		= $this->bo->sort;
-			$this->order		= $this->bo->order;
-			$this->cat_id		= $this->bo->cat_id;
+			$this->start  = $this->bo->start;
+			$this->query  = $this->bo->query;
+			$this->sort   = $this->bo->sort;
+			$this->order  = $this->bo->order;
+			$this->cat_id = $this->bo->cat_id;
 			if($this->debug) { $this->_debug_sqsof(); }
 		}
 
@@ -106,9 +106,9 @@
 
 			$link_data = array
 			(
-				'menuaction'	=> 'admin.uicategories.index',
-				'appname'		=> $GLOBALS['appname'],
-				'global_cats'	=> $global_cats
+				'menuaction'  => 'admin.uicategories.index',
+				'appname'     => $GLOBALS['appname'],
+				'global_cats' => $global_cats
 			);
 
 			$GLOBALS['phpgw']->template->set_var('lang_action',lang('Category list'));
@@ -240,20 +240,20 @@
 
 			$link_data = array
 			(
-				'menuaction'	=> 'admin.uicategories.index',
-				'appname'		=> $GLOBALS['appname'],
-				'global_cats'	=> $global_cats
+				'menuaction'  => 'admin.uicategories.index',
+				'appname'     => $GLOBALS['appname'],
+				'global_cats' => $global_cats
 			);
 
 			$GLOBALS['phpgw']->common->phpgw_header();
 
 			$this->set_langs();
 
-			$new_parent			= $GLOBALS['HTTP_POST_VARS']['new_parent'];
-			$submit				= $GLOBALS['HTTP_POST_VARS']['submit'];
-			$cat_parent			= $GLOBALS['HTTP_POST_VARS']['cat_parent'] ? $GLOBALS['HTTP_POST_VARS']['cat_parent'] : $GLOBALS['HTTP_GET_VARS']['cat_parent'];
-			$cat_name			= $GLOBALS['HTTP_POST_VARS']['cat_name'];
-			$cat_description	= $GLOBALS['HTTP_POST_VARS']['cat_description'];
+			$new_parent = $GLOBALS['HTTP_POST_VARS']['new_parent'];
+			$submit     = $GLOBALS['HTTP_POST_VARS']['submit'];
+			$cat_parent = $GLOBALS['HTTP_POST_VARS']['cat_parent'] ? $GLOBALS['HTTP_POST_VARS']['cat_parent'] : $GLOBALS['HTTP_GET_VARS']['cat_parent'];
+			$cat_name = $GLOBALS['HTTP_POST_VARS']['cat_name'];
+			$cat_description = $GLOBALS['HTTP_POST_VARS']['cat_description'];
 
 			$GLOBALS['phpgw']->template->set_file(array('cat_form' => 'category_form.tpl'));
 			$GLOBALS['phpgw']->template->set_block('cat_form','add');
@@ -280,10 +280,10 @@
 			{
 				$values = array
 				(
-					'parent'	=> $cat_parent,
-					'descr'		=> $cat_description,
-					'name'		=> $cat_name,
-					'access'	=> 'public'
+					'parent' => $cat_parent,
+					'descr'  => $cat_description,
+					'name'   => $cat_name,
+					'access' => 'public'
 				);
 
 				$error = $this->bo->check_values($values);
@@ -301,8 +301,12 @@
 			$link_data['menuaction'] = 'admin.uicategories.add';
 			$GLOBALS['phpgw']->template->set_var('actionurl',$GLOBALS['phpgw']->link('/index.php',$link_data));
 
-			$GLOBALS['phpgw']->template->set_var('category_list',$this->bo->formatted_list(array('select' => 'select','all' => 'all','cat_parent' => $cat_parent,
-																						'global_cats' => $global_cats)));
+			$GLOBALS['phpgw']->template->set_var('category_list',$this->bo->formatted_list(array(
+				'select'      => 'select',
+				'all'         => 'all',
+				'cat_parent'  => $cat_parent,
+				'global_cats' => $global_cats
+			)));
 
 			$GLOBALS['phpgw']->template->set_var('cat_name',$cat_name);
 			$GLOBALS['phpgw']->template->set_var('cat_description',$cat_description);
@@ -317,9 +321,9 @@
 
 			$link_data = array
 			(
-				'menuaction'	=> 'admin.uicategories.index',
-				'appname'		=> $GLOBALS['appname'],
-				'global_cats'	=> $global_cats
+				'menuaction'  => 'admin.uicategories.index',
+				'appname'     => $GLOBALS['appname'],
+				'global_cats' => $global_cats
 			);
 
 			if (!$this->cat_id)
@@ -331,11 +335,11 @@
 
 			$this->set_langs();
 
-			$new_parent			= $GLOBALS['HTTP_POST_VARS']['new_parent'];
-			$submit				= $GLOBALS['HTTP_POST_VARS']['submit'];
-			$cat_parent			= $GLOBALS['HTTP_POST_VARS']['cat_parent'];
-			$cat_name			= $GLOBALS['HTTP_POST_VARS']['cat_name'];
-			$cat_description	= $GLOBALS['HTTP_POST_VARS']['cat_description'];
+			$new_parent = $GLOBALS['HTTP_POST_VARS']['new_parent'];
+			$submit     = $GLOBALS['HTTP_POST_VARS']['submit'];
+			$cat_parent = $GLOBALS['HTTP_POST_VARS']['cat_parent'];
+			$cat_name   = $GLOBALS['HTTP_POST_VARS']['cat_name'];
+			$cat_description = $GLOBALS['HTTP_POST_VARS']['cat_description'];
 
 			$GLOBALS['phpgw']->template->set_file(array('cat_form' => 'category_form.tpl'));
 			$GLOBALS['phpgw']->template->set_block('cat_form','add');
@@ -356,11 +360,11 @@
 			{
 				$values = array
 				(
-					'id'		=> $this->cat_id,
-					'parent'	=> $cat_parent,
-					'descr'		=> $cat_description,
-					'name'		=> $cat_name,
-					'access'	=> 'public'
+					'id'     => $this->cat_id,
+					'parent' => $cat_parent,
+					'descr'  => $cat_description,
+					'name'   => $cat_name,
+					'access' => 'public'
 				);
 
 				$error = $this->bo->check_values($values);
@@ -386,16 +390,20 @@
 				$GLOBALS['phpgw']->template->set_var('title_categories',lang('Edit global category'));
 			}
 
-			$link_data['menuaction']	= 'admin.uicategories.edit';
-			$link_data['cat_id']		= $this->cat_id;
+			$link_data['menuaction'] = 'admin.uicategories.edit';
+			$link_data['cat_id']     = $this->cat_id;
 			$GLOBALS['phpgw']->template->set_var('actionurl',$GLOBALS['phpgw']->link('/index.php',$link_data));
-			$link_data['menuaction']	= 'admin.uicategories.delete';
+			$link_data['menuaction'] = 'admin.uicategories.delete';
 			$GLOBALS['phpgw']->template->set_var('deleteurl',$GLOBALS['phpgw']->link('/index.php',$link_data));
 
 			$GLOBALS['phpgw']->template->set_var('cat_name',$GLOBALS['phpgw']->strip_html($cats[0]['name']));
 			$GLOBALS['phpgw']->template->set_var('cat_description',$GLOBALS['phpgw']->strip_html($cats[0]['description']));
-			$GLOBALS['phpgw']->template->set_var('category_list',$this->bo->formatted_list(array('select' => 'select','all' => 'all','cat_parent' => $cats[0]['parent'],
-																					'global_cats' => $global_cats)));
+			$GLOBALS['phpgw']->template->set_var('category_list',$this->bo->formatted_list(array(
+				'select'      => 'select',
+				'all'         => 'all',
+				'cat_parent'  => $cats[0]['parent'],
+				'global_cats' => $global_cats
+			)));
 
 			$GLOBALS['phpgw']->template->parse('buttons','edit');
 			$GLOBALS['phpgw']->template->fp('phpgw_body','form');
@@ -407,9 +415,9 @@
 
 			$link_data = array
 			(
-				'menuaction'	=> 'admin.uicategories.index',
-				'appname'		=> $GLOBALS['appname'],
-				'global_cats'	=> $global_cats
+				'menuaction'  => 'admin.uicategories.index',
+				'appname'     => $GLOBALS['appname'],
+				'global_cats' => $global_cats
 			);
 
 			if (!$this->cat_id)
diff --git a/admin/setup/setup.inc.php b/admin/setup/setup.inc.php
index 61981cfb71..e5ee2ebd54 100755
--- a/admin/setup/setup.inc.php
+++ b/admin/setup/setup.inc.php
@@ -37,7 +37,7 @@
 
 	/* Dependencies for this app to work */
 	$setup_info['admin']['depends'][] = array(
-		 'appname' => 'phpgwapi',
-		 'versions' => Array('0.9.13', '0.9.14', '0.9.15')
+		'appname' => 'phpgwapi',
+		'versions' => Array('0.9.13', '0.9.14', '0.9.15')
 	);
 ?>
diff --git a/preferences/inc/class.bocategories.inc.php b/preferences/inc/class.bocategories.inc.php
index 2ca37f4864..a174bb71b2 100644
--- a/preferences/inc/class.bocategories.inc.php
+++ b/preferences/inc/class.bocategories.inc.php
@@ -22,8 +22,8 @@
 
 		function bocategories($cats_app)
 		{
-			$this->cats				= CreateObject('phpgwapi.categories');
-			$this->cats->app_name	= $cats_app;
+			$this->cats = CreateObject('phpgwapi.categories');
+			$this->cats->app_name = $cats_app;
 
 			$this->read_sessiondata($cats_app);
 
@@ -96,8 +96,8 @@
 
 		function exists($data)
 		{
-			$data['type']	= $data['type'] ? $data['type'] : '';
-			$data['cat_id']	= $data['cat_id'] ? $data['cat_id'] : '';
+			$data['type']   = $data['type'] ? $data['type'] : '';
+			$data['cat_id'] = $data['cat_id'] ? $data['cat_id'] : '';
 			return $this->cats->exists($data['type'],$data['cat_name'],$data['cat_id']);
 		}
 
diff --git a/preferences/inc/class.uiaclprefs.inc.php b/preferences/inc/class.uiaclprefs.inc.php
index cce60114c3..713e96ad10 100644
--- a/preferences/inc/class.uiaclprefs.inc.php
+++ b/preferences/inc/class.uiaclprefs.inc.php
@@ -25,17 +25,17 @@
 
 		function index()
 		{
-			$acl_app		= get_var('acl_app',Array('GET','POST'));
-			$start			= get_var('start',Array('GET','POST'));
-			$query			= get_var('query',Array('GET','POST'));
-			$s_groups		= get_var('s_groups',Array('GET','POST'));
-			$s_users		= get_var('s_users',Array('GET','POST'));
-			$owner			= $GLOBALS['owner'];
+			$acl_app  = get_var('acl_app',Array('GET','POST'));
+			$start    = get_var('start',Array('GET','POST'));
+			$query    = get_var('query',Array('GET','POST'));
+			$s_groups = get_var('s_groups',Array('GET','POST'));
+			$s_users  = get_var('s_users',Array('GET','POST'));
+			$owner    = $GLOBALS['owner'];
 
 			if (! $acl_app)
 			{
-				$acl_app			= 'preferences';
-				$acl_app_not_passed	= True;
+				$acl_app = 'preferences';
+				$acl_app_not_passed = True;
 			}
 
 			$GLOBALS['phpgw_info']['flags']['currentapp'] = $acl_app;
diff --git a/preferences/inc/class.uicategories.inc.php b/preferences/inc/class.uicategories.inc.php
index df88320e92..944c5cf1a3 100644
--- a/preferences/inc/class.uicategories.inc.php
+++ b/preferences/inc/class.uicategories.inc.php
@@ -32,15 +32,15 @@
 
 		function uicategories()
 		{
-			$this->bo			= CreateObject('preferences.bocategories',$cats_app);
-			$this->nextmatchs	= CreateObject('phpgwapi.nextmatchs');
-			$this->account		= $GLOBALS['phpgw_info']['user']['account_id'];
-			$this->user			= $GLOBALS['phpgw_info']['user']['fullname'];
+			$this->bo         = CreateObject('preferences.bocategories',$cats_app);
+			$this->nextmatchs = CreateObject('phpgwapi.nextmatchs');
+			$this->account    = $GLOBALS['phpgw_info']['user']['account_id'];
+			$this->user       = $GLOBALS['phpgw_info']['user']['fullname'];
 
-			$this->start		= $this->bo->start;
-			$this->query		= $this->bo->query;
-			$this->sort			= $this->bo->sort;
-			$this->order		= $this->bo->order;
+			$this->start = $this->bo->start;
+			$this->query = $this->bo->query;
+			$this->sort  = $this->bo->sort;
+			$this->order = $this->bo->order;
 		}
 
 		function save_sessiondata($cats_app)
@@ -89,11 +89,11 @@
 
 			$link_data = array
 			(
-				'menuaction'	=> 'preferences.uicategories.index',
-				'cats_app'		=> $cats_app,
-				'extra'			=> $extra,
-				'global_cats'	=> $global_cats,
-				'cats_level'	=> $cats_level
+				'menuaction'  => 'preferences.uicategories.index',
+				'cats_app'    => $cats_app,
+				'extra'       => $extra,
+				'global_cats' => $global_cats,
+				'cats_level'  => $cats_level
 			);
 
 			if ($extra)
@@ -103,7 +103,7 @@
 
 			$GLOBALS['phpgw']->common->phpgw_header();
 
-			$GLOBALS['phpgw']->template->set_file(array('cat_list_t'	=> 'listcats.tpl'));
+			$GLOBALS['phpgw']->template->set_file(array('cat_list_t' => 'listcats.tpl'));
 			$GLOBALS['phpgw']->template->set_block('cat_list_t','cat_list');
 			$GLOBALS['phpgw']->template->set_block('cat_list_t','cat_row');
 
@@ -205,8 +205,10 @@
 					$descr = '<font color="FF0000"><b>' . $descr . '</b></font>';
 				}
 
-				$GLOBALS['phpgw']->template->set_var(array('name' => $name,
-										'descr' => $descr));
+				$GLOBALS['phpgw']->template->set_var(array(
+					'name' => $name,
+					'descr' => $descr
+				));
 
 				$GLOBALS['phpgw']->template->set_var('app_url',$GLOBALS['phpgw']->link('/' . $cats_app . '/index.php','cat_id=' . $cats[$i]['id']));
 
@@ -214,8 +216,8 @@
 				{
 					if ($cats[$i]['owner'] == $this->account || $cats[$i]['app_name'] == 'phpgw')
 					{
-						$link_data['menuaction']	= 'preferences.uicategories.add';
-						$link_data['cat_parent']	= $cats[$i]['id'];
+						$link_data['menuaction'] = 'preferences.uicategories.add';
+						$link_data['cat_parent'] = $cats[$i]['id'];
 						$GLOBALS['phpgw']->template->set_var('add_sub',$GLOBALS['phpgw']->link('/index.php',$link_data));
 						$GLOBALS['phpgw']->template->set_var('lang_sub_entry',lang('Add sub'));
 					}
@@ -260,11 +262,11 @@
 
 			$link_data = array
 			(
-				'menuaction'	=> 'preferences.uicategories.add',
-				'cats_app'		=> $cats_app,
-				'extra'			=> $extra,
-				'global_cats'	=> $global_cats,
-				'cats_level'	=> $cats_level
+				'menuaction'  => 'preferences.uicategories.add',
+				'cats_app'    => $cats_app,
+				'extra'       => $extra,
+				'global_cats' => $global_cats,
+				'cats_level'  => $cats_level
 			);
 
 			$GLOBALS['phpgw']->common->phpgw_header();
@@ -303,11 +305,11 @@
 
 				$values = array
 				(
-					'parent'	=> $cat_parent,
-					'descr'		=> $cat_description,
-					'name'		=> $cat_name,
-					'access'	=> $cat_access,
-					'data'		=> $data
+					'parent' => $cat_parent,
+					'descr'  => $cat_description,
+					'name'   => $cat_name,
+					'access' => $cat_access,
+					'data'   => $data
 				);
 
 				$error = $this->bo->check_values($values);
@@ -340,7 +342,7 @@
 			$GLOBALS['phpgw']->template->set_var('cat_description',$cat_description);
 
 			$GLOBALS['phpgw']->template->set_var('access','<input type="checkbox" name="cat_access" value="True"'
-										. ($cat_access == True ?' checked':'') . '>');
+				. ($cat_access == True ?' checked':'') . '>');
 
 			if ($extra)
 			{
@@ -353,7 +355,7 @@
 				}
 			}
 
-			$link_data['menuaction']	= 'preferences.uicategories.index';
+			$link_data['menuaction'] = 'preferences.uicategories.index';
 			$GLOBALS['phpgw']->template->set_var('doneurl',$GLOBALS['phpgw']->link('/index.php',$link_data));
 
 			$GLOBALS['phpgw']->template->parse('buttons','add');
@@ -366,12 +368,12 @@
 
 			$link_data = array
 			(
-				'menuaction'	=> 'preferences.uicategories.index',
-				'cats_app'		=> $cats_app,
-				'extra'			=> $extra,
-				'global_cats'	=> $global_cats,
-				'cats_level'	=> $cats_level,
-				'cat_id'		=> $cat_id
+				'menuaction'  => 'preferences.uicategories.index',
+				'cats_app'    => $cats_app,
+				'extra'       => $extra,
+				'global_cats' => $global_cats,
+				'cats_level'  => $cats_level,
+				'cat_id'      => $cat_id
 			);
 
 			if (!$cat_id)
@@ -415,12 +417,12 @@
 
 				$values = array
 				(
-					'id'		=> $cat_id,
-					'parent'	=> $cat_parent,
-					'descr'		=> $cat_description,
-					'name'		=> $cat_name,
-					'access'	=> $cat_access,
-					'data'		=> $data
+					'id'     => $cat_id,
+					'parent' => $cat_parent,
+					'descr'  => $cat_description,
+					'name'   => $cat_name,
+					'access' => $cat_access,
+					'data'   => $data
 				);
 
 				$error = $this->bo->check_values($values);
@@ -439,7 +441,7 @@
 
 			$GLOBALS['phpgw']->template->set_var('title_categories',lang('Edit x category for',lang($cats_app)));
 			$GLOBALS['phpgw']->template->set_var('lang_app',lang($cats_app));
-			$link_data['menuaction']	= 'preferences.uicategories.edit';
+			$link_data['menuaction'] = 'preferences.uicategories.edit';
 			$GLOBALS['phpgw']->template->set_var('actionurl',$GLOBALS['phpgw']->link('/index.php',$link_data));
 
 			$GLOBALS['phpgw']->template->set_var('cat_name',$GLOBALS['phpgw']->strip_html($cats[0]['name']));
@@ -457,7 +459,7 @@
 			$GLOBALS['phpgw']->template->set_var('category_list',$this->bo->cats->formated_list('select',$type,$cats[0]['parent'],$global_cats));
 
 			$GLOBALS['phpgw']->template->set_var('access','<input type="checkbox" name="cat_access" value="True"'
-										. ($cats[0]['access'] == private ?' checked':'') . '>');
+				. ($cats[0]['access'] == private ?' checked':'') . '>');
 
 			if ($extra)
 			{
@@ -474,9 +476,9 @@
 
 			if ($cats[0]['owner'] == $this->account)
 			{
-				$link_data['menuaction']	= 'preferences.uicategories.delete';
+				$link_data['menuaction'] = 'preferences.uicategories.delete';
 				$GLOBALS['phpgw']->template->set_var('delete','<form method="POST" action="' . $GLOBALS['phpgw']->link('/index.php',$link_data)
-											. '"><input type="submit" value="' . lang('Delete') .'"></form>');
+					. '"><input type="submit" value="' . lang('Delete') .'"></form>');
 			}
 			else
 			{
@@ -493,12 +495,12 @@
 
 			$link_data = array
 			(
-				'menuaction'	=> 'preferences.uicategories.index',
-				'cats_app'		=> $cats_app,
-				'extra'			=> $extra,
-				'global_cats'	=> $global_cats,
-				'cats_level'	=> $cats_level,
-				'cat_id'		=> $cat_id
+				'menuaction'  => 'preferences.uicategories.index',
+				'cats_app'    => $cats_app,
+				'extra'       => $extra,
+				'global_cats' => $global_cats,
+				'cats_level'  => $cats_level,
+				'cat_id'      => $cat_id
 			);
 
 			if (!$cat_id)
@@ -550,7 +552,7 @@
 
 				$GLOBALS['phpgw']->template->set_var('nolink',$nolink);
 				$GLOBALS['phpgw']->template->set_var('lang_no',lang('No'));
-				$link_data['menuaction']	= 'preferences.uicategories.delete';
+				$link_data['menuaction'] = 'preferences.uicategories.delete';
 				$GLOBALS['phpgw']->template->set_var('action_url',$GLOBALS['phpgw']->link('/index.php',$link_data));
 				$GLOBALS['phpgw']->template->set_var('lang_yes',lang('Yes'));
 				$GLOBALS['phpgw']->template->fp('phpgw_body','category_delete');