diff --git a/blogger/blogger.php b/blogger/blogger.php
index 20e13075..3652db52 100644
--- a/blogger/blogger.php
+++ b/blogger/blogger.php
@@ -37,8 +37,7 @@ function blogger_uninstall()
 }
 
 
-function blogger_jot_nets(App $a, array &$b)
-{
+function blogger_jot_nets(App $a, &$b) {
 	if (!local_user()) {
 		return;
 	}
diff --git a/buffer/buffer.php b/buffer/buffer.php
index 8e89f289..89b2e12c 100644
--- a/buffer/buffer.php
+++ b/buffer/buffer.php
@@ -109,7 +109,7 @@ function buffer_connect(&$a) {
 	return($o);
 }
 
-function buffer_jot_nets(App $a, array &$b) {
+function buffer_jot_nets(App $a, &$b) {
 	if(! local_user())
 		return;
 
@@ -122,7 +122,7 @@ function buffer_jot_nets(App $a, array &$b) {
 	}
 }
 
-function buffer_settings(&$a,&$s) {
+function buffer_settings(App $a, &$s) {
 
 	if(! local_user())
 		return;
diff --git a/buglink/buglink.php b/buglink/buglink.php
index 7b8d7836..91d860cd 100644
--- a/buglink/buglink.php
+++ b/buglink/buglink.php
@@ -20,7 +20,7 @@ function buglink_uninstall()
 	Addon::unregisterHook('page_end', 'addon/buglink/buglink.php', 'buglink_active');
 }
 
-function buglink_active(App $a, array &$b)
+function buglink_active(App $a, &$b)
 {
 	$b .= '<div id="buglink_wrapper" style="position: fixed; bottom: 5px; left: 5px;"><a href="https://github.com/friendica/friendica/issues" target="_blank" title="' . L10n::t('Report Bug') . '"><img src="addon/buglink/bug-x.gif" alt="' . L10n::t('Report Bug') . '" /></a></div>';
 }
diff --git a/diaspora/diaspora.php b/diaspora/diaspora.php
index 0589b1a0..cb921c41 100644
--- a/diaspora/diaspora.php
+++ b/diaspora/diaspora.php
@@ -36,7 +36,7 @@ function diaspora_uninstall() {
 }
 
 
-function diaspora_jot_nets(App $a, array &$b) {
+function diaspora_jot_nets(App $a, &$b) {
     if(! local_user())
         return;
 
diff --git a/dwpost/dwpost.php b/dwpost/dwpost.php
index 3c2156ba..24bdcdbb 100644
--- a/dwpost/dwpost.php
+++ b/dwpost/dwpost.php
@@ -34,12 +34,13 @@ function dwpost_uninstall() {
 }
 
 
-function dwpost_jot_nets(App $a, array &$b) {
-    if(! local_user())
+function dwpost_jot_nets(App $a, &$b) {
+    if (! local_user()) {
         return;
+    }
 
     $dw_post = PConfig::get(local_user(),'dwpost','post');
-    if(intval($dw_post) == 1) {
+    if (intval($dw_post) == 1) {
         $dw_defpost = PConfig::get(local_user(),'dwpost','post_by_default');
         $selected = ((intval($dw_defpost) == 1) ? ' checked="checked" ' : '');
         $b .= '<div class="profile-jot-net"><input type="checkbox" name="dwpost_enable" ' . $selected . ' value="1" /> '
diff --git a/fortunate/fortunate.php b/fortunate/fortunate.php
index 73306219..24bdb3ec 100644
--- a/fortunate/fortunate.php
+++ b/fortunate/fortunate.php
@@ -29,7 +29,7 @@ function fortunate_uninstall()
 }
 
 
-function fortunate_fetch(App $a, array &$b)
+function fortunate_fetch(App $a, &$b)
 {
 	$a->page['htmlhead'] .= '<link rel="stylesheet" type="text/css" href="'
 		. $a->get_baseurl() . '/addon/fortunate/fortunate.css' . '" media="all" />' . "\r\n";
diff --git a/ijpost/ijpost.php b/ijpost/ijpost.php
index fbcb529f..0957bb91 100644
--- a/ijpost/ijpost.php
+++ b/ijpost/ijpost.php
@@ -34,7 +34,7 @@ function ijpost_uninstall() {
 }
 
 
-function ijpost_jot_nets(App $a, array &$b) {
+function ijpost_jot_nets(App $a, &$b) {
     if(! local_user())
         return;
 
diff --git a/impressum/impressum.php b/impressum/impressum.php
index 310bfc7a..bb9da5c9 100644
--- a/impressum/impressum.php
+++ b/impressum/impressum.php
@@ -41,7 +41,7 @@ function obfuscate_email ($s) {
     $s = str_replace('.','(dot)',$s);
     return $s;
 }
-function impressum_footer(App $a, array &$b) {
+function impressum_footer(App $a, &$b) {
     $text = proxy_parse_html(BBCode::convert(Config::get('impressum','footer_text')));
     if (! $text == '') {
         $a->page['htmlhead'] .= '<link rel="stylesheet" type="text/css" href="'.$a->get_baseurl().'/addon/impressum/impressum.css" media="all" />';
@@ -50,12 +50,12 @@ function impressum_footer(App $a, array &$b) {
     }
 }
 
-function impressum_load_config(\Friendica\App $a)
+function impressum_load_config(App $a)
 {
-	$a->loadConfigFile(__DIR__. '/config/impressum.ini.php');
+    $a->loadConfigFile(__DIR__. '/config/impressum.ini.php');
 }
 
-function impressum_show($a,&$b) {
+function impressum_show(App $a,&$b) {
     $b .= '<h3>'.L10n::t('Impressum').'</h3>';
     $owner = Config::get('impressum', 'owner');
     $owner_profile = Config::get('impressum','ownerprofile');
diff --git a/jappixmini/jappixmini.php b/jappixmini/jappixmini.php
index fcb49e42..ea6d97e5 100644
--- a/jappixmini/jappixmini.php
+++ b/jappixmini/jappixmini.php
@@ -693,7 +693,7 @@ function jappixmini_cron(App $a, $d)
 	}
 }
 
-function jappixmini_download_source(App $a, array &$b)
+function jappixmini_download_source(App $a, &$b)
 {
 	// Jappix Mini source download link on About page
 	$b .= '<h1>Jappix Mini</h1>';
diff --git a/libertree/libertree.php b/libertree/libertree.php
index 7459dd52..e45e9694 100644
--- a/libertree/libertree.php
+++ b/libertree/libertree.php
@@ -31,7 +31,7 @@ function libertree_uninstall() {
 }
 
 
-function libertree_jot_nets(App $a, array &$b) {
+function libertree_jot_nets(App $a, &$b) {
     if(! local_user())
         return;
 
@@ -45,7 +45,7 @@ function libertree_jot_nets(App $a, array &$b) {
 }
 
 
-function libertree_settings(&$a,&$s) {
+function libertree_settings(App $a,&$s) {
 
     if(! local_user())
         return;
diff --git a/ljpost/ljpost.php b/ljpost/ljpost.php
index 4b962495..cb4f3f23 100644
--- a/ljpost/ljpost.php
+++ b/ljpost/ljpost.php
@@ -34,7 +34,7 @@ function ljpost_uninstall() {
 }
 
 
-function ljpost_jot_nets(App $a, array &$b) {
+function ljpost_jot_nets(App $a, &$b) {
     if(! local_user())
         return;
 
diff --git a/mathjax/mathjax.php b/mathjax/mathjax.php
index 30ace80e..3250f24c 100644
--- a/mathjax/mathjax.php
+++ b/mathjax/mathjax.php
@@ -74,7 +74,7 @@ function mathjax_settings (&$a, &$s) {
 /*  we need to add one JavaScript include command to the html output
  *  note that you have to check the jsmath/easy/load.js too.
  */
-function mathjax_page_header(App $a, array &$b) {
+function mathjax_page_header(App $a, &$b) {
     //  if the visitor of the page is not a local_user, use MathJax
     //  otherwise check the users settings.
     $url = Config::get ('mathjax','baseurl');
diff --git a/pageheader/pageheader.php b/pageheader/pageheader.php
index 958249f8..a3665d75 100644
--- a/pageheader/pageheader.php
+++ b/pageheader/pageheader.php
@@ -72,7 +72,7 @@ function pageheader_addon_settings_post(App $a, array &$b) {
 	}
 }
 
-function pageheader_fetch($a,&$b) {
+function pageheader_fetch(App $a, &$b) {
 	
 	if(file_exists('pageheader.html')){
 		$s = file_get_contents('pageheader.html');
diff --git a/piwik/piwik.php b/piwik/piwik.php
index 5e34e098..1a35300d 100644
--- a/piwik/piwik.php
+++ b/piwik/piwik.php
@@ -30,6 +30,8 @@
  *     about http/https but beware to put the trailing / at the end of your
  *     setting.
  */
+
+use Friendica\App;
 use Friendica\Core\Addon;
 use Friendica\Core\Config;
 use Friendica\Core\L10n;
@@ -48,12 +50,12 @@ function piwik_uninstall() {
 	logger("uninstalled piwik addon");
 }
 
-function piwik_load_config(\Friendica\App $a)
+function piwik_load_config(App $a)
 {
 	$a->loadConfigFile(__DIR__. '/config/piwik.ini.php');
 }
 
-function piwik_analytics($a,&$b) {
+function piwik_analytics(App $a, &$b) {
 
 	/*
 	 *   styling of every HTML block added by this addon is done in the
diff --git a/pledgie/pledgie.php b/pledgie/pledgie.php
index 58579793..c549872b 100644
--- a/pledgie/pledgie.php
+++ b/pledgie/pledgie.php
@@ -24,7 +24,7 @@ function pledgie_uninstall() {
 	Addon::unregisterHook('addon_settings_post', 'addon/pledgie/pledgie.php', 'pledgie_addon_settings_post');
 }
 
-function pledgie_addon_settings(&$a,&$s) {
+function pledgie_addon_settings(App $a,&$s) {
 
 	if(! is_site_admin())
 		return;
@@ -71,7 +71,7 @@ function pledgie_addon_settings_post(App $a, array &$b) {
 	}
 }
 
-function pledgie_active(App $a, array &$b) {
+function pledgie_active(App $a, &$b) {
 	$campaign = Config::get('pledgie-campaign','text');
 	$describe = Config::get('pledgie-describe','text');
 	$b .= '<div style="position: fixed; padding:5px; border-style:dotted; border-width:1px; background-color: white; line-height: 1; bottom: 5px; left: 20px; z-index: 1000; width: 150px; font-size: 12px;">';
diff --git a/pumpio/pumpio.php b/pumpio/pumpio.php
index 71287fb6..083a1c94 100644
--- a/pumpio/pumpio.php
+++ b/pumpio/pumpio.php
@@ -212,7 +212,7 @@ function pumpio_connect(&$a)
 	return $o;
 }
 
-function pumpio_jot_nets(App $a, array &$b)
+function pumpio_jot_nets(App $a, &$b)
 {
 	if(! local_user())
 		return;
diff --git a/statusnet/statusnet.php b/statusnet/statusnet.php
index 253021a6..86a1d0a4 100644
--- a/statusnet/statusnet.php
+++ b/statusnet/statusnet.php
@@ -94,7 +94,7 @@ function statusnet_check_item_notification(App $a, &$notification_data)
 	$notification_data["profiles"][] = PConfig::get($notification_data["uid"], 'statusnet', 'own_url');
 }
 
-function statusnet_jot_nets(App $a, array &$b)
+function statusnet_jot_nets(App $a, &$b)
 {
 	if (!local_user()) {
 		return;
diff --git a/tumblr/tumblr.php b/tumblr/tumblr.php
index 368b62f0..4f3676b5 100644
--- a/tumblr/tumblr.php
+++ b/tumblr/tumblr.php
@@ -172,7 +172,7 @@ function tumblr_callback($a) {
 	return $o;
 }
 
-function tumblr_jot_nets(App $a, array &$b) {
+function tumblr_jot_nets(App $a, &$b) {
 	if (! local_user()) {
 		return;
 	}
diff --git a/twitter/twitter.php b/twitter/twitter.php
index 328c2c80..da0abf90 100644
--- a/twitter/twitter.php
+++ b/twitter/twitter.php
@@ -190,7 +190,7 @@ function twitter_follow(App $a, &$contact)
 	}
 }
 
-function twitter_jot_nets(App $a, array &$b)
+function twitter_jot_nets(App $a, &$b)
 {
 	if (!local_user()) {
 		return;
diff --git a/wppost/wppost.php b/wppost/wppost.php
index 31bb2da1..4266beb8 100644
--- a/wppost/wppost.php
+++ b/wppost/wppost.php
@@ -38,7 +38,7 @@ function wppost_uninstall() {
 }
 
 
-function wppost_jot_nets(App $a, array &$b) {
+function wppost_jot_nets(App $a, &$b) {
     if(! local_user())
         return;
 
@@ -52,7 +52,7 @@ function wppost_jot_nets(App $a, array &$b) {
 }
 
 
-function wppost_settings(&$a,&$s) {
+function wppost_settings(App &$a,&$s) {
 
 	if(! local_user())
 		return;