diff --git a/view/theme/duepuntozero/config.php b/view/theme/duepuntozero/config.php
index 2c79896227..7d52bc55bb 100644
--- a/view/theme/duepuntozero/config.php
+++ b/view/theme/duepuntozero/config.php
@@ -5,7 +5,7 @@
 
 
 
-function theme_content(&$a){
+function theme_content(App &$a){
     if(!local_user())
         return;		
 
@@ -15,7 +15,7 @@ function theme_content(&$a){
     return clean_form($a, $colorset, $user);
 }
 
-function theme_post(&$a){
+function theme_post(App &$a){
     if(! local_user())
         return;
     
@@ -25,14 +25,14 @@ function theme_post(&$a){
 }
 
 
-function theme_admin(&$a){
+function theme_admin(App &$a){
     $colorset = get_config( 'duepuntozero', 'colorset');
     $user = false;
 
     return clean_form($a, $colorset, $user);
 }
 
-function theme_admin_post(&$a){
+function theme_admin_post(App &$a){
     if (isset($_POST['duepuntozero-settings-submit'])){
         set_config('duepuntozero', 'colorset', $_POST['duepuntozero_colorset']);
     }
diff --git a/view/theme/duepuntozero/theme.php b/view/theme/duepuntozero/theme.php
index 50d57f91e5..bf1d031def 100644
--- a/view/theme/duepuntozero/theme.php
+++ b/view/theme/duepuntozero/theme.php
@@ -1,6 +1,6 @@
 <?php
 
-function duepuntozero_init(&$a) {
+function duepuntozero_init(App &$a) {
 
 set_template_engine($a, 'smarty3');
 
diff --git a/view/theme/frio/config.php b/view/theme/frio/config.php
index 589f1591a0..cb2683aa0b 100644
--- a/view/theme/frio/config.php
+++ b/view/theme/frio/config.php
@@ -1,7 +1,7 @@
 <?php
 require_once('view/theme/frio/php/Image.php');
 
-function theme_content(&$a) {
+function theme_content(App &$a) {
 	if(!local_user()) { return;}
 	$arr = array();
 
@@ -17,7 +17,7 @@ function theme_content(&$a) {
 	return frio_form($a, $arr);
 }
 
-function theme_post(&$a) {
+function theme_post(App &$a) {
 	if(!local_user()) { return;}
 	if (isset($_POST['frio-settings-submit'])) {
 		set_pconfig(local_user(), 'frio', 'schema',		$_POST["frio_schema"]);
diff --git a/view/theme/frio/php/frio_boot.php b/view/theme/frio/php/frio_boot.php
index 827874d7e1..0e221f5337 100644
--- a/view/theme/frio/php/frio_boot.php
+++ b/view/theme/frio/php/frio_boot.php
@@ -13,7 +13,7 @@
  * 
  * @todo Check if this is really needed.
  */
-function load_page(&$a) {
+function load_page(App &$a) {
 	if(isset($_GET["mode"]) AND ($_GET["mode"] == "minimal")) {
 		require "view/theme/frio/minimal.php";
 	} elseif((isset($_GET["mode"]) AND ($_GET["mode"] == "none"))) {
diff --git a/view/theme/frio/theme.php b/view/theme/frio/theme.php
index 5bc5140bf1..664881a4a8 100644
--- a/view/theme/frio/theme.php
+++ b/view/theme/frio/theme.php
@@ -11,7 +11,7 @@ $frio = "view/theme/frio";
 
 global $frio;
 
-function frio_init(&$a) {
+function frio_init(App &$a) {
 
 	// disable the events module link in the profile tab
 	$a->theme_events_in_profile = false;
diff --git a/view/theme/frost-mobile/theme.php b/view/theme/frost-mobile/theme.php
index 24d5e9e52e..7fe17ce7e1 100644
--- a/view/theme/frost-mobile/theme.php
+++ b/view/theme/frost-mobile/theme.php
@@ -9,7 +9,7 @@
  * Maintainer: Zach P <techcity@f.shmuz.in>
  */
 
-function frost_mobile_init(&$a) {
+function frost_mobile_init(App &$a) {
 	$a->sourcename = 'Friendica mobile web';
 	$a->videowidth = 250;
 	$a->videoheight = 200;
@@ -18,7 +18,7 @@ function frost_mobile_init(&$a) {
 	set_template_engine($a, 'smarty3');
 }
 
-function frost_mobile_content_loaded(&$a) {
+function frost_mobile_content_loaded(App &$a) {
 
 	// I could do this in style.php, but by having the CSS in a file the browser will cache it,
 	// making pages load faster
diff --git a/view/theme/frost/theme.php b/view/theme/frost/theme.php
index 464c14d470..964ea88ec4 100644
--- a/view/theme/frost/theme.php
+++ b/view/theme/frost/theme.php
@@ -9,14 +9,14 @@
  * Maintainer: Zach P <techcity@f.shmuz.in>
  */
 
-function frost_init(&$a) {
+function frost_init(App &$a) {
 	$a->videowidth = 400;
 	$a->videoheight = 330;
 	$a->theme_thread_allow = false;
 	set_template_engine($a, 'smarty3');
 }
 
-function frost_content_loaded(&$a) {
+function frost_content_loaded(App &$a) {
 
 	// I could do this in style.php, but by having the CSS in a file the browser will cache it,
 	// making pages load faster
diff --git a/view/theme/quattro/config.php b/view/theme/quattro/config.php
index 2a32b9f05a..11e6f6cbce 100644
--- a/view/theme/quattro/config.php
+++ b/view/theme/quattro/config.php
@@ -5,7 +5,7 @@
 
 
 
-function theme_content(&$a){
+function theme_content(App &$a){
 	if(!local_user())
 		return;		
 	
@@ -17,7 +17,7 @@ function theme_content(&$a){
 	return quattro_form($a,$align, $color, $tfs, $pfs);
 }
 
-function theme_post(&$a){
+function theme_post(App &$a){
 	if(! local_user())
 		return;
 	
@@ -30,7 +30,7 @@ function theme_post(&$a){
 }
 
 
-function theme_admin(&$a){
+function theme_admin(App &$a){
 	$align = get_config('quattro', 'align' );
 	$color = get_config('quattro', 'color' );
     $tfs = get_config("quattro","tfs");
@@ -39,7 +39,7 @@ function theme_admin(&$a){
 	return quattro_form($a,$align, $color, $tfs, $pfs);
 }
 
-function theme_admin_post(&$a){
+function theme_admin_post(App &$a){
 	if (isset($_POST['quattro-settings-submit'])){
 		set_config('quattro', 'align', $_POST['quattro_align']);
 		set_config('quattro', 'color', $_POST['quattro_color']);
diff --git a/view/theme/quattro/theme.php b/view/theme/quattro/theme.php
index f316323fd3..ae8f4f9065 100644
--- a/view/theme/quattro/theme.php
+++ b/view/theme/quattro/theme.php
@@ -7,7 +7,7 @@
  * Maintainer: Tobias <https://diekershoff.homeunix.net/friendica/profile/tobias>
  */
 
-function quattro_init(&$a) {
+function quattro_init(App &$a) {
 	$a->page['htmlhead'] .= '<script src="'.App::get_baseurl().'/view/theme/quattro/tinycon.min.js"></script>';
 	$a->page['htmlhead'] .= '<script src="'.App::get_baseurl().'/view/theme/quattro/js/quattro.js"></script>';;
 }
diff --git a/view/theme/smoothly/theme.php b/view/theme/smoothly/theme.php
index 189110a952..32c48fffa4 100644
--- a/view/theme/smoothly/theme.php
+++ b/view/theme/smoothly/theme.php
@@ -10,7 +10,7 @@
  * Screenshot: <a href="screenshot.png">Screenshot</a>
  */
 
-function smoothly_init(&$a) {
+function smoothly_init(App &$a) {
 	set_template_engine($a, 'smarty3');
 
 	$cssFile = null;
diff --git a/view/theme/vier/config.php b/view/theme/vier/config.php
index 0f07ff9a1e..55ef2654f1 100644
--- a/view/theme/vier/config.php
+++ b/view/theme/vier/config.php
@@ -5,7 +5,7 @@
 
 
 
-function theme_content(&$a){
+function theme_content(App &$a){
 	if(!local_user())
 		return;
 
@@ -31,7 +31,7 @@ function theme_content(&$a){
 			$show_services, $show_friends, $show_lastusers);
 }
 
-function theme_post(&$a){
+function theme_post(App &$a){
 	if(! local_user())
 		return;
 
@@ -47,7 +47,7 @@ function theme_post(&$a){
 }
 
 
-function theme_admin(&$a){
+function theme_admin(App &$a){
 
 	if (!function_exists('get_vier_config'))
 		return;
@@ -76,7 +76,7 @@ function theme_admin(&$a){
 	return $o;
 }
 
-function theme_admin_post(&$a){
+function theme_admin_post(App &$a){
 	if (isset($_POST['vier-settings-submit'])){
 		set_config('vier', 'style', $_POST['vier_style']);
 		set_config('vier', 'show_pages', $_POST['vier_show_pages']);
diff --git a/view/theme/vier/theme.php b/view/theme/vier/theme.php
index 45dde5f449..46921dc1c5 100644
--- a/view/theme/vier/theme.php
+++ b/view/theme/vier/theme.php
@@ -13,7 +13,7 @@ require_once("include/plugin.php");
 require_once("include/socgraph.php");
 require_once("mod/proxy.php");
 
-function vier_init(&$a) {
+function vier_init(App &$a) {
 
 	$a->theme_events_in_profile = false;