diff --git a/advancedcontentfilter/advancedcontentfilter.php b/advancedcontentfilter/advancedcontentfilter.php
index 84eb468cb..c03034cd2 100644
--- a/advancedcontentfilter/advancedcontentfilter.php
+++ b/advancedcontentfilter/advancedcontentfilter.php
@@ -33,7 +33,6 @@
  *
  */
 
-use Friendica\App;
 use Friendica\BaseModule;
 use Friendica\Content\Text\Markdown;
 use Friendica\Core\Hook;
@@ -42,7 +41,6 @@ use Friendica\Core\Renderer;
 use Friendica\Database\DBA;
 use Friendica\Database\DBStructure;
 use Friendica\DI;
-use Friendica\Model\Item;
 use Friendica\Model\Post;
 use Friendica\Model\Tag;
 use Friendica\Model\User;
@@ -273,7 +271,7 @@ function advancedcontentfilter_content()
 				'rule_expression'   => DI::l10n()->t('Rule Expression'),
 				'cancel'            => DI::l10n()->t('Cancel'),
 			],
-			'$current_theme' => DI::app()->getCurrentTheme(),
+			'$current_theme' => DI::appHelper()->getCurrentTheme(),
 			'$rules' => DBA::toArray(DBA::select('advancedcontentfilter_rules', [], ['uid' => DI::userSession()->getLocalUserId()])),
 			'$form_security_token' => BaseModule::getFormSecurityToken()
 		]);
diff --git a/birdavatar/birdavatar.php b/birdavatar/birdavatar.php
index 4841ba52e..9a9dce0a6 100644
--- a/birdavatar/birdavatar.php
+++ b/birdavatar/birdavatar.php
@@ -6,7 +6,6 @@
  * Author: Fabio <https://kirgroup.com/profile/fabrixxm>
  */
 
-use Friendica\App;
 use Friendica\Core\Hook;
 use Friendica\Core\Logger;
 use Friendica\Core\Renderer;
diff --git a/blackout/blackout.php b/blackout/blackout.php
index 55fb8d32c..a3f806ff2 100644
--- a/blackout/blackout.php
+++ b/blackout/blackout.php
@@ -44,7 +44,6 @@
  * THE SOFTWARE.
  */
 
-use Friendica\App;
 use Friendica\Core\Hook;
 use Friendica\Core\Logger;
 use Friendica\Core\Renderer;
diff --git a/bluesky/bluesky.php b/bluesky/bluesky.php
index 91e524fea..aa4bc3402 100644
--- a/bluesky/bluesky.php
+++ b/bluesky/bluesky.php
@@ -98,7 +98,7 @@ function bluesky_install()
 
 function bluesky_load_config(ConfigFileManager $loader)
 {
-	DI::app()->getConfigCache()->load($loader->loadAddonConfig('bluesky'), \Friendica\Core\Config\ValueObject\Cache::SOURCE_STATIC);
+	DI::appHelper()->getConfigCache()->load($loader->loadAddonConfig('bluesky'), \Friendica\Core\Config\ValueObject\Cache::SOURCE_STATIC);
 }
 
 function bluesky_check_item_notification(array &$notification_data)
diff --git a/buglink/buglink.php b/buglink/buglink.php
index 78fb8bef3..b7dd6504a 100644
--- a/buglink/buglink.php
+++ b/buglink/buglink.php
@@ -6,7 +6,6 @@
  * Author: Mike Macgirvin <mike@macgirvin.com>
  */
 
-use Friendica\App;
 use Friendica\Core\Hook;
 use Friendica\DI;
 
diff --git a/calc/calc.php b/calc/calc.php
index a8a340c4d..76d1805c6 100644
--- a/calc/calc.php
+++ b/calc/calc.php
@@ -6,7 +6,6 @@
  * Author: Mike Macgirvin <http://macgirvin.com/profile/mike>
  */
 
-use Friendica\App;
 use Friendica\Core\Hook;
 use Friendica\DI;
 
@@ -16,7 +15,7 @@ function calc_install() {
 
 function calc_app_menu(array &$b)
 {
-	$b['app_menu'][] = '<div class="app-title"><a href="calc">Calculator</a></div>'; 
+	$b['app_menu'][] = '<div class="app-title"><a href="calc">Calculator</a></div>';
 }
 
 /**
@@ -296,7 +295,7 @@ $o .=  <<< EOT
 <h3>Calculator</h3>
 <br /><br />
 <table>
-<tbody><tr><td> 
+<tbody><tr><td>
 <table bgcolor="#af9999" border="1">
 <tbody><tr><td>
 <table border="1" cellpadding="2" cellspacing="2">
@@ -323,7 +322,7 @@ $o .=  <<< EOT
 	<td><input name="multiplication" value="&nbsp;&nbsp;*&nbsp;&nbsp;&nbsp;&nbsp;" onclick="multiplyNumbers()" type="button"></td>
 </tr><tr align="left" valign="middle">
 	<td><input name="zero" value="&nbsp;&nbsp;0&nbsp;&nbsp;&nbsp;" onclick="addDisplay(0)" type="button"></td>
-	<td><input name="pi" value="&nbsp;Pi&nbsp;&nbsp;" onclick="addDisplay(Math.PI)" type="button"> </td> 
+	<td><input name="pi" value="&nbsp;Pi&nbsp;&nbsp;" onclick="addDisplay(Math.PI)" type="button"> </td>
 	<td><input name="dot" value="&nbsp;&nbsp;&nbsp;.&nbsp;&nbsp;&nbsp;" onclick='addDisplay(".")' type="button"></td>
 	<td><input name="division" value="&nbsp;&nbsp;&nbsp;/&nbsp;&nbsp;&nbsp;" onclick="divideNumbers()" type="button"></td>
 </tr><tr align="left" valign="middle">
@@ -345,13 +344,13 @@ $o .=  <<< EOT
 </form>
 
 	<!--
-	<TD VALIGN=top> 
+	<TD VALIGN=top>
 		<B>NOTE:</B> All sine and cosine calculations are
 		<br>done in radians. Remember to convert first
 		<br>if using degrees.
 	</TD>
 	-->
-	
+
 </td></tr></tbody></table>
 
 
diff --git a/catavatar/catavatar.php b/catavatar/catavatar.php
index 2116ac44b..2bdf0cca8 100644
--- a/catavatar/catavatar.php
+++ b/catavatar/catavatar.php
@@ -6,11 +6,9 @@
  * Author: Fabio <https://kirgroup.com/profile/fabrixxm>
  */
 
-use Friendica\App;
 use Friendica\Core\Hook;
 use Friendica\Core\Logger;
 use Friendica\Core\Renderer;
-use Friendica\Core\Worker;
 use Friendica\Database\DBA;
 use Friendica\DI;
 use Friendica\Model\Contact;
diff --git a/cookienotice/cookienotice.php b/cookienotice/cookienotice.php
index 2bd6f9b1b..bc9d24166 100644
--- a/cookienotice/cookienotice.php
+++ b/cookienotice/cookienotice.php
@@ -7,7 +7,6 @@
  * Author: Peter Liebetrau <https://socivitas/profile/peerteer>
  */
 
-use Friendica\App;
 use Friendica\Core\Hook;
 use Friendica\Core\Renderer;
 use Friendica\DI;
diff --git a/diaspora/diaspora.php b/diaspora/diaspora.php
index 979204baf..d6c98e342 100644
--- a/diaspora/diaspora.php
+++ b/diaspora/diaspora.php
@@ -9,7 +9,6 @@
 
 require_once 'addon/diaspora/Diaspora_Connection.php';
 
-use Friendica\App;
 use Friendica\Content\Text\BBCode;
 use Friendica\Core\Hook;
 use Friendica\Core\Logger;
diff --git a/discourse/discourse.php b/discourse/discourse.php
index 298b3f3ee..e97a4fd80 100644
--- a/discourse/discourse.php
+++ b/discourse/discourse.php
@@ -8,7 +8,6 @@
  *
  */
 
-use Friendica\App;
 use Friendica\Content\Text\Markdown;
 use Friendica\Core\Hook;
 use Friendica\Core\Logger;
diff --git a/dwpost/dwpost.php b/dwpost/dwpost.php
index 1ecd9764b..7ce30086e 100644
--- a/dwpost/dwpost.php
+++ b/dwpost/dwpost.php
@@ -8,7 +8,6 @@
  * Author: Cat Gray <https://free-haven.org/profile/catness>
  */
 
-use Friendica\App;
 use Friendica\Content\Text\BBCode;
 use Friendica\Core\Hook;
 use Friendica\Core\Logger;
diff --git a/fancybox/fancybox.php b/fancybox/fancybox.php
index 73bbdab92..b1a1ff359 100644
--- a/fancybox/fancybox.php
+++ b/fancybox/fancybox.php
@@ -7,7 +7,6 @@
  * Status: Unsupported
  */
 
-use Friendica\App;
 use Friendica\Core\Hook;
 use Friendica\DI;
 
@@ -40,7 +39,7 @@ function fancybox_render(array &$b){
 		function ($text) use ($gallery) {
 			// This processes images inlined in posts
 			// Frio / Vier hooks für lightbox are un-hooked in fancybox-config.js. So this works for them, too!
-			//if (!in_array(DI::app()->getCurrentTheme(),['vier','frio']))
+			//if (!in_array(DI::appHelper()->getCurrentTheme(),['vier','frio']))
 			$text = preg_replace(
 				'#<a[^>]*href="([^"]*)"[^>]*>(<img[^>]*src="[^"]*"[^>]*>)</a>#',
 				'<a data-fancybox="' . $gallery . '" href="$1">$2</a>',
diff --git a/fromapp/fromapp.php b/fromapp/fromapp.php
index 0d5a5b16b..8bd276060 100644
--- a/fromapp/fromapp.php
+++ b/fromapp/fromapp.php
@@ -7,7 +7,6 @@
  *
  */
 
-use Friendica\App;
 use Friendica\Core\Hook;
 use Friendica\Core\Logger;
 use Friendica\Core\Renderer;
@@ -76,6 +75,6 @@ function fromapp_post_hook(&$item)
 
 	$apps = explode(',', $app);
 	$item['app'] = trim($apps[mt_rand(0, count($apps)-1)]);
-	
+
 	return;
 }
diff --git a/geocoordinates/geocoordinates.php b/geocoordinates/geocoordinates.php
index 5cb90efde..eb56f093a 100644
--- a/geocoordinates/geocoordinates.php
+++ b/geocoordinates/geocoordinates.php
@@ -6,7 +6,6 @@
  * Author: Michael Vogel <https://pirati.ca/profile/heluecht>
  */
 
-use Friendica\App;
 use Friendica\Core\Hook;
 use Friendica\Core\Logger;
 use Friendica\Core\Renderer;
diff --git a/geonames/geonames.php b/geonames/geonames.php
index dcbd65f80..d14b1e8fe 100644
--- a/geonames/geonames.php
+++ b/geonames/geonames.php
@@ -6,7 +6,6 @@
  * Author: Mike Macgirvin <http://macgirvin.com/profile/mike>
  */
 
-use Friendica\App;
 use Friendica\Core\Hook;
 use Friendica\Core\Logger;
 use Friendica\Core\Renderer;
@@ -35,7 +34,7 @@ function geonames_install()
 
 function geonames_load_config(ConfigFileManager $loader)
 {
-	DI::app()->getConfigCache()->load($loader->loadAddonConfig('geonames'), \Friendica\Core\Config\ValueObject\Cache::SOURCE_STATIC);
+	DI::appHelper()->getConfigCache()->load($loader->loadAddonConfig('geonames'), \Friendica\Core\Config\ValueObject\Cache::SOURCE_STATIC);
 }
 
 function geonames_post_hook(array &$item)
diff --git a/gnot/gnot.php b/gnot/gnot.php
index 15fb4da00..5d0919cbd 100644
--- a/gnot/gnot.php
+++ b/gnot/gnot.php
@@ -4,11 +4,10 @@
  * Description: Thread email comment notifications on Gmail and anonymise them
  * Version: 1.0
  * Author: Mike Macgirvin <http://macgirvin.com/profile/mike>
- * 
+ *
  *
  */
 
-use Friendica\App;
 use Friendica\Core\Hook;
 use Friendica\Core\Logger;
 use Friendica\Core\Renderer;
@@ -38,7 +37,7 @@ function gnot_settings_post($post) {
 }
 
 /**
- * Called from the Addon Setting form. 
+ * Called from the Addon Setting form.
  * Add our own settings info to the page.
  */
 function gnot_settings(array &$data)
diff --git a/googlemaps/googlemaps.php b/googlemaps/googlemaps.php
index 356ce68ca..b83a9cf99 100644
--- a/googlemaps/googlemaps.php
+++ b/googlemaps/googlemaps.php
@@ -7,7 +7,6 @@
  *
  */
 
-use Friendica\App;
 use Friendica\Core\Hook;
 use Friendica\Core\Logger;
 
diff --git a/gravatar/gravatar.php b/gravatar/gravatar.php
index 83a8fbb93..6007c433e 100644
--- a/gravatar/gravatar.php
+++ b/gravatar/gravatar.php
@@ -6,15 +6,12 @@
  * Author: Klaus Weidenbach <http://friendica.dszdw.net/profile/klaus>
  */
 
-use Friendica\App;
 use Friendica\BaseModule;
 use Friendica\Core\Hook;
 use Friendica\Core\Logger;
 use Friendica\Core\Renderer;
-use Friendica\Database\DBA;
 use Friendica\DI;
 use Friendica\Core\Config\Util\ConfigFileManager;
-use Friendica\Util\Strings;
 
 /**
  * Installs the addon hook
@@ -28,7 +25,7 @@ function gravatar_install() {
 
 function gravatar_load_config(ConfigFileManager $loader)
 {
-	DI::app()->getConfigCache()->load($loader->loadAddonConfig('gravatar'), \Friendica\Core\Config\ValueObject\Cache::SOURCE_STATIC);
+	DI::appHelper()->getConfigCache()->load($loader->loadAddonConfig('gravatar'), \Friendica\Core\Config\ValueObject\Cache::SOURCE_STATIC);
 }
 
 /**
diff --git a/group_text/group_text.php b/group_text/group_text.php
index 02e9fd0a5..e5067fb54 100644
--- a/group_text/group_text.php
+++ b/group_text/group_text.php
@@ -8,9 +8,7 @@
  * Note: Please use Circle Text instead
  */
 
-use Friendica\App;
 use Friendica\Core\Hook;
-use Friendica\Core\Logger;
 use Friendica\Core\Renderer;
 use Friendica\DI;
 
diff --git a/highlightjs/highlightjs.php b/highlightjs/highlightjs.php
index 097d34c7e..762f4117a 100644
--- a/highlightjs/highlightjs.php
+++ b/highlightjs/highlightjs.php
@@ -6,7 +6,6 @@
  * Author: Hypolite Petovan <hypolite@mrpetovan.com>
  */
 
-use Friendica\App;
 use Friendica\Core\Hook;
 use Friendica\DI;
 
@@ -18,7 +17,7 @@ function highlightjs_install()
 
 function highlightjs_head(string &$str)
 {
-	if (DI::app()->getCurrentTheme() == 'frio') {
+	if (DI::appHelper()->getCurrentTheme() == 'frio') {
 		$style = 'bootstrap';
 	} else {
 		$style = 'default';
diff --git a/ifttt/ifttt.php b/ifttt/ifttt.php
index 6d4f402c5..51fa8db81 100644
--- a/ifttt/ifttt.php
+++ b/ifttt/ifttt.php
@@ -6,7 +6,6 @@
  * Version: 0.1
  * Author: Michael Vogel <https://pirati.ca/profile/heluecht>
  */
-use Friendica\App;
 use Friendica\Content\PageInfo;
 use Friendica\Core\Hook;
 use Friendica\Core\Logger;
diff --git a/ijpost/ijpost.php b/ijpost/ijpost.php
index f22dfff29..37c3cd45e 100644
--- a/ijpost/ijpost.php
+++ b/ijpost/ijpost.php
@@ -8,7 +8,6 @@
  * Author: Cat Gray <https://free-haven.org/profile/catness>
  */
 
-use Friendica\App;
 use Friendica\Content\Text\BBCode;
 use Friendica\Core\Hook;
 use Friendica\Core\Logger;
diff --git a/impressum/impressum.php b/impressum/impressum.php
index 754cb8286..f61d7182f 100644
--- a/impressum/impressum.php
+++ b/impressum/impressum.php
@@ -7,7 +7,6 @@
  * License: 3-clause BSD license
  */
 
-use Friendica\App;
 use Friendica\Content\Text\BBCode;
 use Friendica\Core\Hook;
 use Friendica\Core\Logger;
@@ -56,7 +55,7 @@ function impressum_footer(string &$body)
 
 function impressum_load_config(ConfigFileManager $loader)
 {
-	DI::app()->getConfigCache()->load($loader->loadAddonConfig('impressum'), \Friendica\Core\Config\ValueObject\Cache::SOURCE_STATIC);
+	DI::appHelper()->getConfigCache()->load($loader->loadAddonConfig('impressum'), \Friendica\Core\Config\ValueObject\Cache::SOURCE_STATIC);
 }
 
 function impressum_show(string &$body)
diff --git a/infiniteimprobabilitydrive/infiniteimprobabilitydrive.php b/infiniteimprobabilitydrive/infiniteimprobabilitydrive.php
index aff7aec0b..9eb6ab36c 100644
--- a/infiniteimprobabilitydrive/infiniteimprobabilitydrive.php
+++ b/infiniteimprobabilitydrive/infiniteimprobabilitydrive.php
@@ -6,7 +6,6 @@
 * Author: Thomas Willingham <https://kakste.com/profile/beardyunixer>
 */
 
-use Friendica\App;
 use Friendica\Core\Hook;
 use Friendica\DI;
 
diff --git a/irc/irc.php b/irc/irc.php
index d44358511..db808a995 100644
--- a/irc/irc.php
+++ b/irc/irc.php
@@ -7,7 +7,6 @@
 * Author: Tobias Diekershoff <https://f.diekershoff.de/u/tobias>
 */
 
-use Friendica\App;
 use Friendica\Core\Hook;
 use Friendica\Core\Renderer;
 use Friendica\DI;
diff --git a/krynn/krynn.php b/krynn/krynn.php
index f7e77c269..fa9db1331 100644
--- a/krynn/krynn.php
+++ b/krynn/krynn.php
@@ -10,7 +10,6 @@
  *"My body was my sacrifice... for my magic. This damage is permanent." - Raistlin Majere
  */
 
-use Friendica\App;
 use Friendica\Core\Hook;
 use Friendica\Core\Logger;
 use Friendica\Core\Renderer;
diff --git a/ldapauth/ldapauth.php b/ldapauth/ldapauth.php
index 38e2d6a1e..f834b4d54 100644
--- a/ldapauth/ldapauth.php
+++ b/ldapauth/ldapauth.php
@@ -29,7 +29,6 @@
  * The configuration options for this module are described in the config/ldapauth.config.php file
  */
 
-use Friendica\App;
 use Friendica\Core\Hook;
 use Friendica\Core\Logger;
 use Friendica\Database\DBA;
@@ -45,7 +44,7 @@ function ldapauth_install()
 
 function ldapauth_load_config(ConfigFileManager $loader)
 {
-	DI::app()->getConfigCache()->load($loader->loadAddonConfig('ldapauth'), \Friendica\Core\Config\ValueObject\Cache::SOURCE_STATIC);
+	DI::appHelper()->getConfigCache()->load($loader->loadAddonConfig('ldapauth'), \Friendica\Core\Config\ValueObject\Cache::SOURCE_STATIC);
 }
 
 function ldapauth_hook_authenticate(array &$b)
diff --git a/libertree/libertree.php b/libertree/libertree.php
index 1d997123a..c138e5977 100644
--- a/libertree/libertree.php
+++ b/libertree/libertree.php
@@ -6,7 +6,6 @@
  * Author: Tony Baldwin <https://free-haven.org/u/tony>
  */
 
-use Friendica\App;
 use Friendica\Content\Text\BBCode;
 use Friendica\Core\Hook;
 use Friendica\Core\Logger;
diff --git a/libravatar/libravatar.php b/libravatar/libravatar.php
index 54594b889..4cd72c83e 100644
--- a/libravatar/libravatar.php
+++ b/libravatar/libravatar.php
@@ -6,7 +6,6 @@
  * Author: Klaus Weidenbach <http://friendica.dszdw.net/profile/klaus>
  */
 
-use Friendica\App;
 use Friendica\Core\Addon;
 use Friendica\Core\Hook;
 use Friendica\Core\Logger;
@@ -26,7 +25,7 @@ function libravatar_install()
 
 function libravatar_load_config(ConfigFileManager $loader)
 {
-	DI::app()->getConfigCache()->load($loader->loadAddonConfig('libravatar'), \Friendica\Core\Config\ValueObject\Cache::SOURCE_STATIC);
+	DI::appHelper()->getConfigCache()->load($loader->loadAddonConfig('libravatar'), \Friendica\Core\Config\ValueObject\Cache::SOURCE_STATIC);
 }
 
 /**
diff --git a/markdown/markdown.php b/markdown/markdown.php
index 6f4592445..0822ac836 100644
--- a/markdown/markdown.php
+++ b/markdown/markdown.php
@@ -5,7 +5,6 @@
  * Version: 0.1
  * Author: Michael Vogel <https://pirati.ca/profile/heluecht>
  */
-use Friendica\App;
 use Friendica\Core\Hook;
 use Friendica\Content\Text\Markdown;
 use Friendica\Core\Renderer;
diff --git a/mathjax/mathjax.php b/mathjax/mathjax.php
index d0046cf7a..e96aaddf8 100644
--- a/mathjax/mathjax.php
+++ b/mathjax/mathjax.php
@@ -8,7 +8,6 @@
  * License: 3-clause BSD license
  */
 
-use Friendica\App;
 use Friendica\Core\Hook;
 use Friendica\Core\Renderer;
 use Friendica\DI;
diff --git a/morechoice/morechoice.php b/morechoice/morechoice.php
index fe726d279..fbb88ce19 100644
--- a/morechoice/morechoice.php
+++ b/morechoice/morechoice.php
@@ -8,7 +8,6 @@
  * Status: Deprecated
  */
 
-use Friendica\App;
 use Friendica\Core\Hook;
 use Friendica\DI;
 
diff --git a/morepokes/morepokes.php b/morepokes/morepokes.php
index abe59a6e6..2ac09a73f 100644
--- a/morepokes/morepokes.php
+++ b/morepokes/morepokes.php
@@ -7,7 +7,6 @@
  *
  */
 
-use Friendica\App;
 use Friendica\Core\Hook;
 use Friendica\DI;
 
diff --git a/newmemberwidget/newmemberwidget.php b/newmemberwidget/newmemberwidget.php
index 01977d0c3..d3b68807a 100644
--- a/newmemberwidget/newmemberwidget.php
+++ b/newmemberwidget/newmemberwidget.php
@@ -6,7 +6,6 @@
  * Author: Tobias Diekershoff <https://f.diekershoff.de/profile/tobias>
  ***/
 
-use Friendica\App;
 use Friendica\Content\Text\BBCode;
 use Friendica\Core\Hook;
 use Friendica\Core\Logger;
diff --git a/nitter/nitter.php b/nitter/nitter.php
index 946b18c0c..adbfd6b06 100644
--- a/nitter/nitter.php
+++ b/nitter/nitter.php
@@ -25,7 +25,6 @@
  * SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
  */
 
-use Friendica\App;
 use Friendica\Core\Hook;
 use Friendica\Core\Renderer;
 use Friendica\DI;
diff --git a/nominatim/nominatim.php b/nominatim/nominatim.php
index 6ad4a8a3f..a3d14af5e 100644
--- a/nominatim/nominatim.php
+++ b/nominatim/nominatim.php
@@ -6,7 +6,6 @@
  * Author: Michael Vogel <https://pirati.ca/profile/heluecht>
  */
 
-use Friendica\App;
 use Friendica\Core\Hook;
 use Friendica\Core\Logger;
 use Friendica\Core\Renderer;
diff --git a/notifyall/notifyall.php b/notifyall/notifyall.php
index 966a91843..d37bac568 100644
--- a/notifyall/notifyall.php
+++ b/notifyall/notifyall.php
@@ -9,9 +9,7 @@
  */
 
 use Friendica\Addon\notifyall\NotifyAllEmail;
-use Friendica\App;
 use Friendica\Database\DBA;
-use Friendica\Core\Logger;
 use Friendica\Core\Renderer;
 use Friendica\DI;
 
diff --git a/numfriends/numfriends.php b/numfriends/numfriends.php
index 538a4a3ec..66c9b74a1 100644
--- a/numfriends/numfriends.php
+++ b/numfriends/numfriends.php
@@ -6,7 +6,6 @@
  * Author: Mike Macgirvin <http://macgirvin.com/profile/mike>
  */
 
-use Friendica\App;
 use Friendica\Core\Hook;
 use Friendica\Core\Logger;
 use Friendica\Core\Renderer;
@@ -39,7 +38,7 @@ function numfriends_settings_post($post) {
 
 /**
  *
- * Called from the Addon Setting form. 
+ * Called from the Addon Setting form.
  * Add our own settings info to the page.
  *
  */
@@ -50,7 +49,7 @@ function numfriends_settings(array &$data)
 	}
 
 	$numfriends = DI::pConfig()->get(DI::userSession()->getLocalUserId(), 'system', 'display_friend_count', 24);
-	
+
 	$t    = Renderer::getMarkupTemplate('settings.tpl', 'addon/numfriends/');
 	$html = Renderer::replaceMacros($t, [
 		'$numfriends' => ['numfriends', DI::l10n()->t('How many contacts to display on profile sidebar'), $numfriends],
diff --git a/openstreetmap/openstreetmap.php b/openstreetmap/openstreetmap.php
index ae22aff04..fc5ebbbeb 100644
--- a/openstreetmap/openstreetmap.php
+++ b/openstreetmap/openstreetmap.php
@@ -9,7 +9,6 @@
  *
  */
 
-use Friendica\App;
 use Friendica\Core\Cache\Enum\Duration;
 use Friendica\Core\Hook;
 use Friendica\Core\Logger;
@@ -37,7 +36,7 @@ function openstreetmap_install()
 
 function openstreetmap_load_config(ConfigFileManager $loader)
 {
-	DI::app()->getConfigCache()->load($loader->loadAddonConfig('openstreetmap'), \Friendica\Core\Config\ValueObject\Cache::SOURCE_STATIC);
+	DI::appHelper()->getConfigCache()->load($loader->loadAddonConfig('openstreetmap'), \Friendica\Core\Config\ValueObject\Cache::SOURCE_STATIC);
 }
 
 function openstreetmap_alterheader(&$navHtml)
diff --git a/opmlexport/opmlexport.php b/opmlexport/opmlexport.php
index fdfacc3e3..3df712752 100644
--- a/opmlexport/opmlexport.php
+++ b/opmlexport/opmlexport.php
@@ -8,12 +8,8 @@
  */
 
 use Friendica\DI;
-use Friendica\App;
 use Friendica\Core\Hook;
 use Friendica\Core\Logger;
-use Friendica\Network\HTTPException;
-use Friendica\Database\DBA;
-use Friendica\Core\Renderer;
 use Friendica\Core\Protocol;
 use Friendica\Model\Contact;
 use Friendica\Model\User;
diff --git a/pageheader/pageheader.php b/pageheader/pageheader.php
index 057bb863c..d729acc18 100644
--- a/pageheader/pageheader.php
+++ b/pageheader/pageheader.php
@@ -5,10 +5,9 @@
  * Version: 1.1
  * Author: Keith Fernie <http://friendika.me4.it/profile/keith>
  *         Hauke Altmann <https://snarl.de/profile/tugelblend>
- * 
+ *
  */
 
-use Friendica\App;
 use Friendica\Core\Hook;
 use Friendica\Core\Renderer;
 use Friendica\DI;
diff --git a/phpmailer/phpmailer.php b/phpmailer/phpmailer.php
index 4c12709d0..f4bb7753e 100644
--- a/phpmailer/phpmailer.php
+++ b/phpmailer/phpmailer.php
@@ -7,7 +7,6 @@
  * Maintainer: Hypolite Petovan <hypolite@friendica.mrpetovan.com>
  */
 
-use Friendica\App;
 use Friendica\Core\Hook;
 use Friendica\DI;
 use Friendica\Object\EMail\IEmail;
@@ -25,7 +24,7 @@ function phpmailer_install()
 
 function phpmailer_load_config(ConfigFileManager $loader)
 {
-	DI::app()->getConfigCache()->load($loader->loadAddonConfig('phpmailer'), \Friendica\Core\Config\ValueObject\Cache::SOURCE_STATIC);
+	DI::appHelper()->getConfigCache()->load($loader->loadAddonConfig('phpmailer'), \Friendica\Core\Config\ValueObject\Cache::SOURCE_STATIC);
 }
 
 /**
diff --git a/piwik/piwik.php b/piwik/piwik.php
index fd6d5fc9b..fc459a875 100644
--- a/piwik/piwik.php
+++ b/piwik/piwik.php
@@ -35,7 +35,6 @@
  *     setting.
  */
 
-use Friendica\App;
 use Friendica\Core\Hook;
 use Friendica\Core\Logger;
 use Friendica\Core\Renderer;
@@ -51,7 +50,7 @@ function piwik_install() {
 
 function piwik_load_config(ConfigFileManager $loader)
 {
-	DI::app()->getConfigCache()->load($loader->loadAddonConfig('piwik'), \Friendica\Core\Config\ValueObject\Cache::SOURCE_STATIC);
+	DI::appHelper()->getConfigCache()->load($loader->loadAddonConfig('piwik'), \Friendica\Core\Config\ValueObject\Cache::SOURCE_STATIC);
 }
 
 function piwik_analytics(string &$b)
@@ -76,7 +75,7 @@ function piwik_analytics(string &$b)
 	 *   Add the Piwik tracking code for the site.
 	 *   If async is set to true use asynchronous tracking
 	 */
-	
+
 	$scriptAsyncValue = $async ? 'true' : 'false';
 	$scriptPhpEndpoint = $shortendpoint ? 'js/' : 'piwik.php';
 	$scriptJsEndpoint = $shortendpoint ? 'js/' : 'piwik.js';
diff --git a/planets/planets.php b/planets/planets.php
index 8a206fb51..d96e33a6f 100644
--- a/planets/planets.php
+++ b/planets/planets.php
@@ -7,7 +7,6 @@
  * Author: Tony Baldwin <https://free-haven.org/profile/tony>
  */
 
-use Friendica\App;
 use Friendica\Core\Hook;
 use Friendica\Core\Logger;
 use Friendica\Core\Renderer;
diff --git a/pnut/pnut.php b/pnut/pnut.php
index 32f60f6d5..f298997b4 100644
--- a/pnut/pnut.php
+++ b/pnut/pnut.php
@@ -90,7 +90,7 @@ function pnut_connect()
 
 function pnut_load_config(ConfigFileManager $loader)
 {
-	DI::app()->getConfigCache()->load($loader->loadAddonConfig('pnut'), \Friendica\Core\Config\ValueObject\Cache::SOURCE_STATIC);
+	DI::appHelper()->getConfigCache()->load($loader->loadAddonConfig('pnut'), \Friendica\Core\Config\ValueObject\Cache::SOURCE_STATIC);
 }
 
 function pnut_addon_admin(string &$o)
diff --git a/public_server/public_server.php b/public_server/public_server.php
index 7591c7d0d..eb7af1e75 100644
--- a/public_server/public_server.php
+++ b/public_server/public_server.php
@@ -6,7 +6,6 @@
  * Author: Keith Fernie <http://friendika.me4.it/profile/keith>
  */
 
-use Friendica\App;
 use Friendica\BaseModule;
 use Friendica\Core\Hook;
 use Friendica\Core\Logger;
@@ -29,7 +28,7 @@ function public_server_install()
 
 function public_server_load_config(ConfigFileManager $loader)
 {
-	DI::app()->getConfigCache()->load($loader->loadAddonConfig('public_server'), \Friendica\Core\Config\ValueObject\Cache::SOURCE_STATIC);
+	DI::appHelper()->getConfigCache()->load($loader->loadAddonConfig('public_server'), \Friendica\Core\Config\ValueObject\Cache::SOURCE_STATIC);
 }
 
 function public_server_register_account($b)
diff --git a/pumpio/pumpio.php b/pumpio/pumpio.php
index d7c2ac326..ffe5f187a 100644
--- a/pumpio/pumpio.php
+++ b/pumpio/pumpio.php
@@ -319,7 +319,7 @@ function pumpio_settings_post(array &$b)
 
 function pumpio_load_config(ConfigFileManager $loader)
 {
-	DI::app()->getConfigCache()->load($loader->loadAddonConfig('pumpio'), \Friendica\Core\Config\ValueObject\Cache::SOURCE_STATIC);
+	DI::appHelper()->getConfigCache()->load($loader->loadAddonConfig('pumpio'), \Friendica\Core\Config\ValueObject\Cache::SOURCE_STATIC);
 }
 
 function pumpio_hook_fork(array &$b)
diff --git a/qcomment/qcomment.php b/qcomment/qcomment.php
index 1b8bfcbfd..f7126531b 100644
--- a/qcomment/qcomment.php
+++ b/qcomment/qcomment.php
@@ -18,7 +18,6 @@
  *
  */
 
-use Friendica\App;
 use Friendica\Core\Hook;
 use Friendica\Core\Renderer;
 use Friendica\DI;
diff --git a/randplace/randplace.php b/randplace/randplace.php
index 34f48c6c2..5cb075970 100644
--- a/randplace/randplace.php
+++ b/randplace/randplace.php
@@ -19,7 +19,6 @@
  *
  */
 
-use Friendica\App;
 use Friendica\Core\Hook;
 use Friendica\Core\Logger;
 use Friendica\Core\Renderer;
diff --git a/rendertime/rendertime.php b/rendertime/rendertime.php
index 731cf0037..1cce5b1b5 100644
--- a/rendertime/rendertime.php
+++ b/rendertime/rendertime.php
@@ -7,7 +7,6 @@
  *
  */
 
-use Friendica\App;
 use Friendica\Core\Hook;
 use Friendica\Core\Renderer;
 use Friendica\DI;
diff --git a/s3_storage/s3_storage.php b/s3_storage/s3_storage.php
index 361577be5..c08c3172e 100644
--- a/s3_storage/s3_storage.php
+++ b/s3_storage/s3_storage.php
@@ -8,7 +8,6 @@
 
 use Friendica\Addon\s3_storage\src\S3Client;
 use Friendica\Addon\s3_storage\src\S3Config;
-use Friendica\App;
 use Friendica\Core\Hook;
 use Friendica\DI;
 
diff --git a/securemail/SecureTestEmail.php b/securemail/SecureTestEmail.php
index c614104f4..325100918 100644
--- a/securemail/SecureTestEmail.php
+++ b/securemail/SecureTestEmail.php
@@ -21,7 +21,6 @@
 
 namespace Friendica\Addon\securemail;
 
-use Friendica\App;
 use Friendica\App\BaseURL;
 use Friendica\Core\Config\Capability\IManageConfigValues;
 use Friendica\Core\PConfig\Capability\IManagePersonalConfigValues;
diff --git a/securemail/securemail.php b/securemail/securemail.php
index 611255872..b56c0cbcd 100644
--- a/securemail/securemail.php
+++ b/securemail/securemail.php
@@ -7,7 +7,6 @@
  */
 
 use Friendica\Addon\securemail\SecureTestEmail;
-use Friendica\App;
 use Friendica\Core\Hook;
 use Friendica\Core\Logger;
 use Friendica\Core\Renderer;
@@ -32,8 +31,6 @@ function securemail_install()
  * @link  https://github.com/friendica/friendica/blob/develop/doc/Addons.md#addon_settings 'addon_settings' hook
  *
  * @param array $data
- *
- * @see   App
  */
 function securemail_settings(array &$data)
 {
@@ -67,8 +64,6 @@ function securemail_settings(array &$data)
  * @link  https://github.com/friendica/friendica/blob/develop/doc/Addons.md#addon_settings_post 'addon_settings_post' hook
  *
  * @param array $b hook data
- *
- * @see   App
  */
 function securemail_settings_post(array &$b)
 {
@@ -102,8 +97,6 @@ function securemail_settings_post(array &$b)
  * @link  https://github.com/friendica/friendica/blob/develop/doc/Addons.md#emailer_send_prepare 'emailer_send_prepare' hook
  *
  * @param IEmail $email Email
- *
- * @see   App
  */
 function securemail_emailer_send_prepare(IEmail &$email)
 {
diff --git a/showmore_dyn/showmore_dyn.php b/showmore_dyn/showmore_dyn.php
index 7cb64bcca..4c2e62f5a 100644
--- a/showmore_dyn/showmore_dyn.php
+++ b/showmore_dyn/showmore_dyn.php
@@ -7,12 +7,8 @@
  *
  */
 
-use Friendica\App;
 use Friendica\Core\Hook;
-use Friendica\Core\L10n;
-use Friendica\Core\Logger;
 use Friendica\Core\Renderer;
-use Friendica\Database\DBA;
 use Friendica\DI;
 
 function showmore_dyn_install()
diff --git a/smiley_pack/lang/smiley_pack_es/smiley_pack_es.php b/smiley_pack/lang/smiley_pack_es/smiley_pack_es.php
index 38b208da1..0f41101df 100644
--- a/smiley_pack/lang/smiley_pack_es/smiley_pack_es.php
+++ b/smiley_pack/lang/smiley_pack_es/smiley_pack_es.php
@@ -3,11 +3,10 @@
  * Name: Smiley Pack (Español)
  * Description: Pack of smileys that make master too AOLish.
  * Version: 1.02
- * Author: Thomas Willingham (based on Mike Macgirvin's Adult Smile template) 
+ * Author: Thomas Willingham (based on Mike Macgirvin's Adult Smile template)
  * All smileys from sites offering them as Public Domain
  */
 
-use Friendica\App;
 use Friendica\Core\Hook;
 use Friendica\DI;
 
@@ -19,7 +18,7 @@ function smiley_pack_smilies_es(array &$b) {
 
 #Smileys are split into various directories by the intended range of emotions.  This is in case we get too big and need to modularise things.  We can then cut and paste the right lines, move the right directory, and just change the name of the addon to happy_smilies or whatever.
 
-#Be careful with invocation strings.  If you have a smiley called foo, and another called foobar, typing :foobar will call foo.  Avoid this with clever naming, using ~ instead of : 
+#Be careful with invocation strings.  If you have a smiley called foo, and another called foobar, typing :foobar will call foo.  Avoid this with clever naming, using ~ instead of :
 #when all else fails.
 
 
@@ -49,7 +48,7 @@ function smiley_pack_smilies_es(array &$b) {
 
 	$b['texts'][] = ':vaca';
 	$b['icons'][] = '<img src="' . DI::baseUrl() . '/addon/smiley_pack/icons/animals/cow.gif' . '" alt="' . ':vaca' . '" />';
-    
+
 	$b['texts'][] = ':cangrejo';
 	$b['icons'][] = '<img src="' . DI::baseUrl() . '/addon/smiley_pack/icons/animals/crab.gif' . '" alt="' . ':cangrejo' . '" />';
 
@@ -70,7 +69,7 @@ function smiley_pack_smilies_es(array &$b) {
 
 	$b['texts'][] = ':caballo';
 	$b['icons'][] = '<img src="' . DI::baseUrl() . '/addon/smiley_pack/icons/animals/horse.gif' . '" alt="' . ':caballo' . '" />';
-  
+
 	$b['texts'][] = ':loro';
 	$b['icons'][] = '<img src="' . DI::baseUrl() . '/addon/smiley_pack/icons/animals/parrot.gif' . '" alt="' . ':loro' . '" />';
 
@@ -107,7 +106,7 @@ function smiley_pack_smilies_es(array &$b) {
 
 	$b['texts'][] = ':cuna';
 	$b['icons'][] = '<img src="' . DI::baseUrl() . '/addon/smiley_pack/icons/babies/babycot.gif' . '" alt="' . ':cuna' . '" />';
-	
+
 
 	$b['texts'][] = ':embarazada';
 	$b['icons'][] = '<img src="' . DI::baseUrl() . '/addon/smiley_pack/icons/babies/pregnant.gif' . '" alt="' . ':embarazada' . '" />';
@@ -116,10 +115,10 @@ function smiley_pack_smilies_es(array &$b) {
 	$b['icons'][] = '<img src="' . DI::baseUrl() . '/addon/smiley_pack/icons/babies/stork.gif' . '" alt="' . ':cigüeña' . '" />';
 
 
-#Confused Smileys	
+#Confused Smileys
 	$b['texts'][] = ':confundido';
 	$b['icons'][] = '<img src="' . DI::baseUrl() . '/addon/smiley_pack/icons/confused/confused.gif' . '" alt="' . ':confundido' . '" />';
-    
+
 	$b['texts'][] = ':encogehombros';
 	$b['icons'][] = '<img src="' . DI::baseUrl() . '/addon/smiley_pack/icons/confused/shrug.gif' . '" alt="' . ':encogehombros' . '" />';
 
@@ -154,13 +153,13 @@ function smiley_pack_smilies_es(array &$b) {
 
 	$b['texts'][] = ':diabólico';
 	$b['icons'][] = '<img src="' . DI::baseUrl() . '/addon/smiley_pack/icons/devilangel/devil.gif' . '" alt="' . ':diabólico' . '" />';
-	
+
 	$b['texts'][] = ':adbalancín';
 	$b['icons'][] = '<img src="' . DI::baseUrl() . '/addon/smiley_pack/icons/devilangel/daseesaw.gif' . '" alt="' . ':adbalancín' . '" />';
 
 	$b['texts'][] = ':vuelvedemonio';
 	$b['icons'][] = '<img src="' . DI::baseUrl() . '/addon/smiley_pack/icons/devilangel/turnevil.gif' . '" alt="' . ':vuelvedemonio' . '" />';
-	
+
 	$b['texts'][] = ':santo';
 	$b['icons'][] = '<img src="' . DI::baseUrl() . '/addon/smiley_pack/icons/devilangel/saint.gif' . '" alt="' . ':santo' . '" />';
 
@@ -242,7 +241,7 @@ function smiley_pack_smilies_es(array &$b) {
 
 	$b['texts'][] = ':billar';
 	$b['icons'][] = '<img src="' . DI::baseUrl() . '/addon/smiley_pack/icons/sport/snooker.gif' . '" alt="' . ':billar' . '" />';
-  
+
 	$b['texts'][] = ':tenis';
 	$b['icons'][] = '<img src="' . DI::baseUrl() . '/addon/smiley_pack/icons/sport/tennis.gif' . '" alt="' . ':tenis' . '" />';
 
diff --git a/smiley_pack/lang/smiley_pack_fr/smiley_pack_fr.php b/smiley_pack/lang/smiley_pack_fr/smiley_pack_fr.php
index 63cf613e0..c5474e3c1 100644
--- a/smiley_pack/lang/smiley_pack_fr/smiley_pack_fr.php
+++ b/smiley_pack/lang/smiley_pack_fr/smiley_pack_fr.php
@@ -9,7 +9,6 @@
  *
  */
 
-use Friendica\App;
 use Friendica\Core\Hook;
 use Friendica\DI;
 
@@ -23,7 +22,7 @@ function smiley_pack_fr_smilies(array &$b)
 
 #Smileys are split into various directories by the intended range of emotions.  This is in case we get too big and need to modularise things.  We can then cut and paste the right lines, move the right directory, and just change the name of the addon to happy_smilies or whatever.
 
-#Be careful with invocation strings.  If you have a smiley called foo, and another called foobar, typing :foobar will call foo.  Avoid this with clever naming, using ~ instead of : 
+#Be careful with invocation strings.  If you have a smiley called foo, and another called foobar, typing :foobar will call foo.  Avoid this with clever naming, using ~ instead of :
 #when all else fails.
 
 
@@ -56,7 +55,7 @@ function smiley_pack_fr_smilies(array &$b)
 
 	$b['texts'][] = ':vache';
 	$b['icons'][] = '<img src="' . DI::baseUrl() . '/addon/smiley_pack/icons/animals/cow.gif' . '" alt="' . ':vache' . '" />';
-    
+
 	$b['texts'][] = ':crabe';
 	$b['icons'][] = '<img src="' . DI::baseUrl() . '/addon/smiley_pack/icons/animals/crab.gif' . '" alt="' . ':crabe' . '" />';
 
@@ -74,7 +73,7 @@ function smiley_pack_fr_smilies(array &$b)
 
 	$b['texts'][] = ':cheval';
 	$b['icons'][] = '<img src="' . DI::baseUrl() . '/addon/smiley_pack/icons/animals/horse.gif' . '" alt="' . ':cheval' . '" />';
-  
+
 	$b['texts'][] = ':perroquet';
 	$b['icons'][] = '<img src="' . DI::baseUrl() . '/addon/smiley_pack/icons/animals/parrot.gif' . '" alt="' . ':perroquet' . '" />';
 
@@ -108,7 +107,7 @@ function smiley_pack_fr_smilies(array &$b)
 
 	$b['texts'][] = ':litbébé';
 	$b['icons'][] = '<img src="' . DI::baseUrl() . '/addon/smiley_pack/icons/babies/babycot.gif' . '" alt="' . ':litbébé' . '" />';
-	
+
 
 	$b['texts'][] = ':enceinte';
 	$b['icons'][] = '<img src="' . DI::baseUrl() . '/addon/smiley_pack/icons/babies/pregnant.gif' . '" alt="' . ':enceinte' . '" />';
@@ -117,10 +116,10 @@ function smiley_pack_fr_smilies(array &$b)
 	$b['icons'][] = '<img src="' . DI::baseUrl() . '/addon/smiley_pack/icons/babies/stork.gif' . '" alt="' . ':cigogne' . '" />';
 
 
-#Confused Smileys	
+#Confused Smileys
 	$b['texts'][] = ':paumé';
 	$b['icons'][] = '<img src="' . DI::baseUrl() . '/addon/smiley_pack/icons/confused/confused.gif' . '" alt="' . ':paumé' . '" />';
-    
+
 	$b['texts'][] = ':hausseépaules';
 	$b['icons'][] = '<img src="' . DI::baseUrl() . '/addon/smiley_pack/icons/confused/shrug.gif' . '" alt="' . ':hausseépaules' . '" />';
 
@@ -152,13 +151,13 @@ function smiley_pack_fr_smilies(array &$b)
 
 	$b['texts'][] = ':démoniaque';
 	$b['icons'][] = '<img src="' . DI::baseUrl() . '/addon/smiley_pack/icons/devilangel/devil.gif' . '" alt="' . ':démoniaque' . '" />';
-	
+
 	$b['texts'][] = ':bascule';
 	$b['icons'][] = '<img src="' . DI::baseUrl() . '/addon/smiley_pack/icons/devilangel/daseesaw.gif' . '" alt="' . ':bascule' . '" />';
 
 	$b['texts'][] = ':possédé';
 	$b['icons'][] = '<img src="' . DI::baseUrl() . '/addon/smiley_pack/icons/devilangel/turnevil.gif' . '" alt="' . ':possédé' . '" />';
-	
+
 	$b['texts'][] = ':tombe';
 	$b['icons'][] = '<img src="' . DI::baseUrl() . '/addon/smiley_pack/icons/devilangel/graveside.gif' . '" alt="' . ':tombe' . '" />';
 
@@ -225,7 +224,7 @@ function smiley_pack_fr_smilies(array &$b)
 
 	$b['texts'][] = ':billard';
 	$b['icons'][] = '<img src="' . DI::baseUrl() . '/addon/smiley_pack/icons/sport/snooker.gif' . '" alt="' . ':billard' . '" />';
-  
+
 	$b['texts'][] = ':équitation';
 	$b['icons'][] = '<img src="' . DI::baseUrl() . '/addon/smiley_pack/icons/sport/horseriding.gif' . '" alt="' . ':équitation' . '" />';
 
diff --git a/smileybutton/smileybutton.php b/smileybutton/smileybutton.php
index 1df717b72..4d0a8d421 100644
--- a/smileybutton/smileybutton.php
+++ b/smileybutton/smileybutton.php
@@ -7,7 +7,6 @@
  * Maintainer: Hypolite Petovan <https://friendica.mrpetovan.com/profile/hypolite>
  */
 
-use Friendica\App;
 use Friendica\Core\Hook;
 use Friendica\DI;
 
@@ -20,7 +19,7 @@ function smileybutton_install()
 function smileybutton_jot_tool(string &$body)
 {
 	// Disable if theme is quattro
-	if (DI::app()->getCurrentTheme() == 'quattro') {
+	if (DI::appHelper()->getCurrentTheme() == 'quattro') {
 		return;
 	}
 
@@ -97,7 +96,7 @@ function smileybutton_jot_tool(string &$body)
 	$s .= '</tr></table>';
 
 	//Add css to header
-	$css_file = __DIR__ . '/view/' . DI::app()->getCurrentTheme() . '.css';
+	$css_file = __DIR__ . '/view/' . DI::appHelper()->getCurrentTheme() . '.css';
 	if (!file_exists($css_file)) {
 		$css_file = __DIR__ . '/view/default.css';
 	}
@@ -105,7 +104,7 @@ function smileybutton_jot_tool(string &$body)
 	DI::page()->registerStylesheet($css_file);
 
 	//Get the correct image for the theme
-	$image = 'addon/smileybutton/view/' . DI::app()->getCurrentTheme() . '.png';
+	$image = 'addon/smileybutton/view/' . DI::appHelper()->getCurrentTheme() . '.png';
 	if (!file_exists($image)) {
 		$image = 'addon/smileybutton/view/default.png';
 	}
diff --git a/smilies_adult/smilies_adult.php b/smilies_adult/smilies_adult.php
index e8af21e16..4a80168de 100644
--- a/smilies_adult/smilies_adult.php
+++ b/smilies_adult/smilies_adult.php
@@ -4,12 +4,11 @@
  * Description: Smily icons that could or should not be included in core
  * Version: 1.0
  * Author: Mike Macgirvin <http://macgirvin.com/profile/mike>
- * 
+ *
  * This is a template for how to extend the "smily" code.
- * 
+ *
  */
 
-use Friendica\App;
 use Friendica\Core\Hook;
 use Friendica\DI;
 
diff --git a/startpage/startpage.php b/startpage/startpage.php
index e4d80c0c2..558af473e 100644
--- a/startpage/startpage.php
+++ b/startpage/startpage.php
@@ -7,7 +7,6 @@
  *
  */
 
-use Friendica\App;
 use Friendica\Core\Hook;
 use Friendica\Core\Renderer;
 use Friendica\DI;
diff --git a/statusnet/statusnet.php b/statusnet/statusnet.php
index 48f9c2542..bd115115e 100644
--- a/statusnet/statusnet.php
+++ b/statusnet/statusnet.php
@@ -38,7 +38,6 @@ define('STATUSNET_DEFAULT_POLL_INTERVAL', 5); // given in minutes
 require_once __DIR__ . DIRECTORY_SEPARATOR . 'library' . DIRECTORY_SEPARATOR . 'statusnetoauth.php';
 
 use CodebirdSN\CodebirdSN;
-use Friendica\App;
 use Friendica\Content\Text\Plaintext;
 use Friendica\Core\Hook;
 use Friendica\Core\Logger;
diff --git a/testdrive/testdrive.php b/testdrive/testdrive.php
index 556452845..90fb59188 100644
--- a/testdrive/testdrive.php
+++ b/testdrive/testdrive.php
@@ -6,7 +6,6 @@
  * Author: Mike Macgirvin <http://macgirvin.com/profile/mike>
  */
 
-use Friendica\App;
 use Friendica\Core\Hook;
 use Friendica\Core\Search;
 use Friendica\Database\DBA;
@@ -27,7 +26,7 @@ function testdrive_install()
 
 function testdrive_load_config(ConfigFileManager $loader)
 {
-	DI::app()->getConfigCache()->load($loader->loadAddonConfig('testdrive'), \Friendica\Core\Config\ValueObject\Cache::SOURCE_STATIC);
+	DI::appHelper()->getConfigCache()->load($loader->loadAddonConfig('testdrive'), \Friendica\Core\Config\ValueObject\Cache::SOURCE_STATIC);
 }
 
 function testdrive_globaldir_update(array &$b)
diff --git a/tumblr/tumblr.php b/tumblr/tumblr.php
index 1e9f5c7fa..580d73e66 100644
--- a/tumblr/tumblr.php
+++ b/tumblr/tumblr.php
@@ -65,7 +65,7 @@ function tumblr_install()
 
 function tumblr_load_config(ConfigFileManager $loader)
 {
-	DI::app()->getConfigCache()->load($loader->loadAddonConfig('tumblr'), \Friendica\Core\Config\ValueObject\Cache::SOURCE_STATIC);
+	DI::appHelper()->getConfigCache()->load($loader->loadAddonConfig('tumblr'), \Friendica\Core\Config\ValueObject\Cache::SOURCE_STATIC);
 }
 
 function tumblr_check_item_notification(array &$notification_data)
diff --git a/twitter/twitter.php b/twitter/twitter.php
index 10f8a2fb3..ea4ae3569 100644
--- a/twitter/twitter.php
+++ b/twitter/twitter.php
@@ -67,7 +67,7 @@ function twitter_install()
 
 function twitter_load_config(ConfigFileManager $loader)
 {
-	DI::app()->getConfigCache()->load($loader->loadAddonConfig('twitter'), \Friendica\Core\Config\ValueObject\Cache::SOURCE_STATIC);
+	DI::appHelper()->getConfigCache()->load($loader->loadAddonConfig('twitter'), \Friendica\Core\Config\ValueObject\Cache::SOURCE_STATIC);
 }
 
 function twitter_jot_nets(array &$jotnets_fields)
diff --git a/unicode_smilies/unicode_smilies.php b/unicode_smilies/unicode_smilies.php
index 22ee3439c..b39c6f100 100644
--- a/unicode_smilies/unicode_smilies.php
+++ b/unicode_smilies/unicode_smilies.php
@@ -7,7 +7,6 @@
  * Author: Matthias Ebers <https://loma.ml/profile/one>
  */
 
-use Friendica\App;
 use Friendica\Content\Smilies;
 use Friendica\Core\Hook;
 
@@ -691,7 +690,7 @@ function unicode_smilies_smilies(array &$b)
 	Smilies::add($b, ':custard:', '&#x1F36E');
 	Smilies::add($b, ':honey pot:', '&#x1F36F');
 
-// drink  
+// drink
 	Smilies::add($b, ':baby bottle:', '&#x1F37C');
 	Smilies::add($b, ':glass of milk:', '&#x1F95B');
 	Smilies::add($b, ':hot beverage:', '&#x2615');
@@ -1123,7 +1122,7 @@ function unicode_smilies_smilies(array &$b)
 	Smilies::add($b, ':control knobs:', '&#x1F39B');
 	Smilies::add($b, ':microphone:', '&#x1F3A4');
 	Smilies::add($b, ':headphone:', '&#x1F3A7');
-	Smilies::add($b, ':radio:', '&#x1F4FB');    
+	Smilies::add($b, ':radio:', '&#x1F4FB');
 
 // musical-instrument
 	Smilies::add($b, ':saxophone:', '&#x1F3B7');
@@ -1529,7 +1528,7 @@ function unicode_smilies_smilies(array &$b)
 	Smilies::add($b, ':O button (blood type):', '&#x1F17E');
 	Smilies::add($b, ':OK button:', '&#x1F197');
 	Smilies::add($b, ':P button:', '&#x1F17F');
-	Smilies::add($b, ':SOS button:', '&#x1F198');  
+	Smilies::add($b, ':SOS button:', '&#x1F198');
 	Smilies::add($b, ':UP! button:', '&#x1F199');
 	Smilies::add($b, ':VS button:', '&#x1F19A');
 	Smilies::add($b, ':Japanese “here” button:', '&#x1F201');
diff --git a/viewsrc/viewsrc.php b/viewsrc/viewsrc.php
index c4d21ccbd..bd07b5417 100644
--- a/viewsrc/viewsrc.php
+++ b/viewsrc/viewsrc.php
@@ -7,7 +7,6 @@
  *
  */
 
-use Friendica\App;
 use Friendica\Core\Hook;
 use Friendica\DI;
 
diff --git a/webrtc/webrtc.php b/webrtc/webrtc.php
index e142b374b..e5d4ce6e5 100644
--- a/webrtc/webrtc.php
+++ b/webrtc/webrtc.php
@@ -7,7 +7,6 @@
  * Author: Tobias Diekershoff <https://f.diekershoff.de/profile/tobias>
  */
 
-use Friendica\App;
 use Friendica\Core\Hook;
 use Friendica\Core\Renderer;
 use Friendica\DI;