diff --git a/update.php b/update.php
index 0679b5a1f8..7aec2ec2b8 100644
--- a/update.php
+++ b/update.php
@@ -86,7 +86,7 @@ function update_1006() {
 
 	$r = q("SELECT * FROM `user` WHERE `spubkey` = '' ");
 	if (dbm::is_result($r)) {
-		foreach($r as $rr) {
+		foreach ($r as $rr) {
 			$sres=openssl_pkey_new(array('encrypt_key' => false ));
 			$sprvkey = '';
 			openssl_pkey_export($sres, $sprvkey);
@@ -123,7 +123,7 @@ function update_1011() {
 	q("ALTER TABLE `contact` ADD `nick` CHAR( 255 ) NOT NULL AFTER `name` ");
 	$r = q("SELECT * FROM `contact` WHERE 1");
 	if (dbm::is_result($r)) {
-		foreach($r as $rr) {
+		foreach ($r as $rr) {
 				q("UPDATE `contact` SET `nick` = '%s' WHERE `id` = %d",
 					dbesc(basename($rr['url'])),
 					intval($rr['id'])
@@ -146,7 +146,7 @@ function update_1014() {
 	q("ALTER TABLE `contact` ADD `micro` TEXT NOT NULL AFTER `thumb` ");
 	$r = q("SELECT * FROM `photo` WHERE `scale` = 4");
 	if (dbm::is_result($r)) {
-		foreach($r as $rr) {
+		foreach ($r as $rr) {
 			$ph = new Photo($rr['data']);
 			if($ph->is_valid()) {
 				$ph->scaleImage(48);
@@ -156,7 +156,7 @@ function update_1014() {
 	}
 	$r = q("SELECT * FROM `contact` WHERE 1");
 	if (dbm::is_result($r)) {
-		foreach($r as $rr) {
+		foreach ($r as $rr) {
 			if(stristr($rr['thumb'],'avatar'))
 				q("UPDATE `contact` SET `micro` = '%s' WHERE `id` = %d",
 					dbesc(str_replace('avatar','micro',$rr['thumb'])),
@@ -309,7 +309,7 @@ function update_1031() {
 	// Repair any bad links that slipped into the item table
 	$r = q("SELECT `id`, `object` FROM `item` WHERE `object` != '' ");
 	if($r && dbm::is_result($r)) {
-		foreach($r as $rr) {
+		foreach ($r as $rr) {
 			if(strstr($rr['object'],'type="http')) {
 				q("UPDATE `item` SET `object` = '%s' WHERE `id` = %d",
 					dbesc(str_replace('type="http','href="http',$rr['object'])),
@@ -357,7 +357,7 @@ function update_1036() {
 
 	$r = dbq("SELECT * FROM `contact` WHERE `network` = 'dfrn' && `photo` LIKE '%include/photo%' ");
 	if (dbm::is_result($r)) {
-		foreach($r as $rr) {
+		foreach ($r as $rr) {
 			q("UPDATE `contact` SET `photo` = '%s', `thumb` = '%s', `micro` = '%s' WHERE `id` = %d",
 				dbesc(str_replace('include/photo','photo',$rr['photo'])),
 				dbesc(str_replace('include/photo','photo',$rr['thumb'])),
@@ -607,7 +607,7 @@ function update_1075() {
 	q("ALTER TABLE `user` ADD `guid` CHAR( 16 ) NOT NULL AFTER `uid` ");
 	$r = q("SELECT `uid` FROM `user` WHERE 1");
 	if (dbm::is_result($r)) {
-		foreach($r as $rr) {
+		foreach ($r as $rr) {
 			$found = true;
 			do {
 				$guid = substr(random_string(),0,16);
@@ -689,7 +689,7 @@ function update_1082() {
 		return;
 	$r = q("SELECT distinct(`resource-id`) FROM `photo` WHERE 1 group by `id`");
 	if (dbm::is_result($r)) {
-		foreach($r as $rr) {
+		foreach ($r as $rr) {
 			$guid = get_guid();
 			q("update `photo` set `guid` = '%s' where `resource-id` = '%s'",
 				dbesc($guid),
@@ -732,7 +732,7 @@ function update_1087() {
 
 	$r = q("SELECT `id` FROM `item` WHERE `parent` = `id` ");
 	if (dbm::is_result($r)) {
-		foreach($r as $rr) {
+		foreach ($r as $rr) {
 			$x = q("SELECT max(`created`) AS `cdate` FROM `item` WHERE `parent` = %d LIMIT 1",
 				intval($rr['id'])
 			);
@@ -855,7 +855,7 @@ function update_1100() {
 
 	$r = q("select id, url from contact where url != '' and nurl = '' ");
 	if (dbm::is_result($r)) {
-		foreach($r as $rr) {
+		foreach ($r as $rr) {
 			q("update contact set nurl = '%s' where id = %d",
 				dbesc(normalise_link($rr['url'])),
 				intval($rr['id'])
@@ -1169,7 +1169,7 @@ function update_1136() {
 
 	$r = q("select * from config where 1 order by id desc");
 	if (dbm::is_result($r)) {
-		foreach($r as $rr) {
+		foreach ($r as $rr) {
 			$found = false;
 			foreach($arr as $x) {
 				if($x['cat'] == $rr['cat'] && $x['k'] == $rr['k']) {
@@ -1188,7 +1188,7 @@ function update_1136() {
 	$arr = array();
 	$r = q("select * from pconfig where 1 order by id desc");
 	if (dbm::is_result($r)) {
-		foreach($r as $rr) {
+		foreach ($r as $rr) {
 			$found = false;
 			foreach($arr as $x) {
 				if($x['uid'] == $rr['uid'] && $x['cat'] == $rr['cat'] && $x['k'] == $rr['k']) {
diff --git a/view/theme/frio/theme.php b/view/theme/frio/theme.php
index 664881a4a8..f9cbf79a6a 100644
--- a/view/theme/frio/theme.php
+++ b/view/theme/frio/theme.php
@@ -271,7 +271,7 @@ function frio_remote_nav($a,&$nav) {
  * We use this to give the data to textcomplete and have a filter function at the
  * contact page.
  * 
- * @param App $a The app data
+ * @param App $a The app data @TODO Unused
  * @param array $results The array with the originals from acl_lookup()
  */
 function frio_acl_lookup($a, &$results) {
@@ -281,17 +281,18 @@ function frio_acl_lookup($a, &$results) {
 
 	// we introduce a new search type, r should do the same query like it's
 	// done in /mod/contacts for connections
-	if($results["type"] == "r") {
+	if ($results["type"] == "r") {
 		$searching = false;
-		if($search) {
+		if ($search) {
 			$search_hdr = $search;
 			$search_txt = dbesc(protect_sprintf(preg_quote($search)));
 			$searching = true;
 		}
 		$sql_extra .= (($searching) ? " AND (`attag` LIKE '%%".dbesc($search_txt)."%%' OR `name` LIKE '%%".dbesc($search_txt)."%%' OR `nick` LIKE '%%".dbesc($search_txt)."%%') " : "");
 
-		if($nets)
+		if ($nets) {
 			$sql_extra .= sprintf(" AND network = '%s' ", dbesc($nets));
+		}
 
 		$sql_extra2 = ((($sort_type > 0) && ($sort_type <= CONTACT_IS_FRIEND)) ? sprintf(" AND `rel` = %d ",intval($sort_type)) : '');
 
@@ -312,7 +313,7 @@ function frio_acl_lookup($a, &$results) {
 		$contacts = array();
 
 		if (dbm::is_result($r)) {
-			foreach($r as $rr) {
+			foreach ($r as $rr) {
 				$contacts[] = _contact_detail_for_template($rr);
 			}
 		}
diff --git a/view/theme/vier/theme.php b/view/theme/vier/theme.php
index 46921dc1c5..8be91220af 100644
--- a/view/theme/vier/theme.php
+++ b/view/theme/vier/theme.php
@@ -152,7 +152,7 @@ function vier_community_info() {
 			$aside['$comunity_profiles_title'] = t('Community Profiles');
 			$aside['$comunity_profiles_items'] = array();
 
-			foreach($r as $rr) {
+			foreach ($r as $rr) {
 				$entry = replace_macros($tpl,array(
 					'$id' => $rr['id'],
 					//'$profile_link' => zrl($rr['url']),
@@ -182,7 +182,7 @@ function vier_community_info() {
 			$aside['$lastusers_title'] = t('Last users');
 			$aside['$lastusers_items'] = array();
 
-			foreach($r as $rr) {
+			foreach ($r as $rr) {
 				$profile_link = 'profile/' . ((strlen($rr['nickname'])) ? $rr['nickname'] : $rr['profile_uid']);
 				$entry = replace_macros($tpl,array(
 					'$id' => $rr['id'],
@@ -300,7 +300,7 @@ function vier_community_info() {
 
 			$aside['$helpers_items'] = array();
 
-			foreach($r as $rr) {
+			foreach ($r as $rr) {
 				$entry = replace_macros($tpl,array(
 					'$url' => $rr['url'],
 					'$title' => $rr['name'],
@@ -316,55 +316,72 @@ function vier_community_info() {
 	//connectable services
 	if ($show_services) {
 
+		/// @TODO This whole thing is hard-coded, better rewrite to Intercepting Filter Pattern (future-todo)
 		$r = array();
 
-		if (plugin_enabled("appnet"))
+		if (plugin_enabled("appnet")) {
 			$r[] = array("photo" => "images/appnet.png", "name" => "App.net");
+		}
 
-		if (plugin_enabled("buffer"))
+		if (plugin_enabled("buffer")) {
 			$r[] = array("photo" => "images/buffer.png", "name" => "Buffer");
+		}
 
-		if (plugin_enabled("blogger"))
+		if (plugin_enabled("blogger")) {
 			$r[] = array("photo" => "images/blogger.png", "name" => "Blogger");
+		}
 
-		if (plugin_enabled("dwpost"))
+		if (plugin_enabled("dwpost")) {
 			$r[] = array("photo" => "images/dreamwidth.png", "name" => "Dreamwidth");
+		}
 
-		if (plugin_enabled("fbpost"))
+		if (plugin_enabled("fbpost")) {
 			$r[] = array("photo" => "images/facebook.png", "name" => "Facebook");
+		}
 
-		if (plugin_enabled("ifttt"))
+		if (plugin_enabled("ifttt")) {
 			$r[] = array("photo" => "addon/ifttt/ifttt.png", "name" => "IFTTT");
+		}
 
-		if (plugin_enabled("statusnet"))
+		if (plugin_enabled("statusnet")) {
 			$r[] = array("photo" => "images/gnusocial.png", "name" => "GNU Social");
+		}
 
-		if (plugin_enabled("gpluspost"))
+		if (plugin_enabled("gpluspost")) {
 			$r[] = array("photo" => "images/googleplus.png", "name" => "Google+");
+		}
 
-		//if (plugin_enabled("ijpost"))
+		//if (plugin_enabled("ijpost")) {
 		//	$r[] = array("photo" => "images/", "name" => "");
+		//}
 
-		if (plugin_enabled("libertree"))
+		if (plugin_enabled("libertree")) {
 			$r[] = array("photo" => "images/libertree.png", "name" => "Libertree");
+		}
 
-		//if (plugin_enabled("ljpost"))
+		//if (plugin_enabled("ljpost")) {
 		//	$r[] = array("photo" => "images/", "name" => "");
+		//}
 
-		if (plugin_enabled("pumpio"))
+		if (plugin_enabled("pumpio")) {
 			$r[] = array("photo" => "images/pumpio.png", "name" => "pump.io");
+		}
 
-		if (plugin_enabled("tumblr"))
+		if (plugin_enabled("tumblr")) {
 			$r[] = array("photo" => "images/tumblr.png", "name" => "Tumblr");
+		}
 
-		if (plugin_enabled("twitter"))
+		if (plugin_enabled("twitter")) {
 			$r[] = array("photo" => "images/twitter.png", "name" => "Twitter");
+		}
 
-		if (plugin_enabled("wppost"))
+		if (plugin_enabled("wppost")) {
 			$r[] = array("photo" => "images/wordpress.png", "name" => "Wordpress");
+		}
 
-		if(function_exists("imap_open") AND !get_config("system","imap_disabled") AND !get_config("system","dfrn_only"))
+		if (function_exists("imap_open") AND !get_config("system","imap_disabled") AND !get_config("system","dfrn_only")) {
 			$r[] = array("photo" => "images/mail.png", "name" => "E-Mail");
+		}
 
 		$tpl = get_markup_template('ch_connectors.tpl');
 
@@ -374,7 +391,7 @@ function vier_community_info() {
 			$con_services['title'] = Array("", t('Connect Services'), "", "");
 			$aside['$con_services'] = $con_services;
 
-			foreach($r as $rr) {
+			foreach ($r as $rr) {
 				$entry = replace_macros($tpl,array(
 					'$url' => $url,
 					'$photo' => $rr['photo'],