diff --git a/mod/dfrn_notify.php b/mod/dfrn_notify.php
index a228f18a7..36e520c0d 100644
--- a/mod/dfrn_notify.php
+++ b/mod/dfrn_notify.php
@@ -11,6 +11,7 @@ use Friendica\Core\Config;
 use Friendica\Core\Logger;
 use Friendica\Core\System;
 use Friendica\Database\DBA;
+use Friendica\DI;
 use Friendica\Model\Contact;
 use Friendica\Model\User;
 use Friendica\Protocol\DFRN;
diff --git a/mod/worker.php b/mod/worker.php
index d14f642bf..5c291ad0b 100644
--- a/mod/worker.php
+++ b/mod/worker.php
@@ -8,6 +8,7 @@ use Friendica\Core\Config;
 use Friendica\Core\Logger;
 use Friendica\Core\Worker;
 use Friendica\Database\DBA;
+use Friendica\DI;
 use Friendica\Util\DateTimeFormat;
 
 function worker_init()
diff --git a/src/Api/Entity/Mastodon/Stats.php b/src/Api/Entity/Mastodon/Stats.php
index c1661d592..72a2849ac 100644
--- a/src/Api/Entity/Mastodon/Stats.php
+++ b/src/Api/Entity/Mastodon/Stats.php
@@ -6,6 +6,7 @@ use Friendica\Api\BaseEntity;
 use Friendica\Core\Config;
 use Friendica\Core\Protocol;
 use Friendica\Database\DBA;
+use Friendica\DI;
 
 /**
  * Class Stats
diff --git a/src/Database/PostUpdate.php b/src/Database/PostUpdate.php
index 863e823a1..44e203ab4 100644
--- a/src/Database/PostUpdate.php
+++ b/src/Database/PostUpdate.php
@@ -7,6 +7,7 @@ namespace Friendica\Database;
 use Friendica\Core\Config;
 use Friendica\Core\Logger;
 use Friendica\Core\Protocol;
+use Friendica\DI;
 use Friendica\Model\Contact;
 use Friendica\Model\Item;
 use Friendica\Model\ItemURI;
diff --git a/src/Model/APContact.php b/src/Model/APContact.php
index 5af57e69f..2296205d3 100644
--- a/src/Model/APContact.php
+++ b/src/Model/APContact.php
@@ -10,6 +10,7 @@ use Friendica\Content\Text\HTML;
 use Friendica\Core\Logger;
 use Friendica\Core\Config;
 use Friendica\Database\DBA;
+use Friendica\DI;
 use Friendica\Protocol\ActivityPub;
 use Friendica\Util\Network;
 use Friendica\Util\JsonLD;
diff --git a/src/Model/GServer.php b/src/Model/GServer.php
index 7bb9efaff..34bb8559c 100644
--- a/src/Model/GServer.php
+++ b/src/Model/GServer.php
@@ -12,6 +12,7 @@ use Friendica\Core\Config;
 use Friendica\Core\Protocol;
 use Friendica\Core\Worker;
 use Friendica\Database\DBA;
+use Friendica\DI;
 use Friendica\Module\Register;
 use Friendica\Network\CurlResult;
 use Friendica\Util\Network;
diff --git a/src/Module/Contact/Hovercard.php b/src/Module/Contact/Hovercard.php
index b9cfabd96..48854136b 100644
--- a/src/Module/Contact/Hovercard.php
+++ b/src/Module/Contact/Hovercard.php
@@ -7,6 +7,7 @@ use Friendica\Core\Config;
 use Friendica\Core\Renderer;
 use Friendica\Core\Session;
 use Friendica\Database\DBA;
+use Friendica\DI;
 use Friendica\Model\Contact;
 use Friendica\Model\GContact;
 use Friendica\Network\HTTPException;
diff --git a/src/Network/FKOAuthDataStore.php b/src/Network/FKOAuthDataStore.php
index ff6a1e216..ff639adf2 100644
--- a/src/Network/FKOAuthDataStore.php
+++ b/src/Network/FKOAuthDataStore.php
@@ -12,6 +12,7 @@ namespace Friendica\Network;
 use Friendica\Core\Config;
 use Friendica\Core\Logger;
 use Friendica\Database\DBA;
+use Friendica\DI;
 use Friendica\Util\Strings;
 use OAuthConsumer;
 use OAuthDataStore;
diff --git a/src/Protocol/PortableContact.php b/src/Protocol/PortableContact.php
index 304e95e14..138c39f5a 100644
--- a/src/Protocol/PortableContact.php
+++ b/src/Protocol/PortableContact.php
@@ -18,6 +18,7 @@ use Friendica\Core\Logger;
 use Friendica\Core\Protocol;
 use Friendica\Core\Worker;
 use Friendica\Database\DBA;
+use Friendica\DI;
 use Friendica\Model\Contact;
 use Friendica\Model\GContact;
 use Friendica\Model\GServer;
diff --git a/src/Util/Crypto.php b/src/Util/Crypto.php
index b5a0ef72f..628b45f89 100644
--- a/src/Util/Crypto.php
+++ b/src/Util/Crypto.php
@@ -10,6 +10,7 @@ use Friendica\Core\Config;
 use Friendica\Core\Hook;
 use Friendica\Core\Logger;
 use Friendica\Core\System;
+use Friendica\DI;
 
 /**
  * Crypto class
diff --git a/src/Util/HTTPSignature.php b/src/Util/HTTPSignature.php
index 7db3966d0..48ed2846e 100644
--- a/src/Util/HTTPSignature.php
+++ b/src/Util/HTTPSignature.php
@@ -8,6 +8,7 @@ namespace Friendica\Util;
 use Friendica\Database\DBA;
 use Friendica\Core\Config;
 use Friendica\Core\Logger;
+use Friendica\DI;
 use Friendica\Model\User;
 use Friendica\Model\APContact;
 
diff --git a/src/Worker/CheckVersion.php b/src/Worker/CheckVersion.php
index a25651523..4ece4cb9b 100644
--- a/src/Worker/CheckVersion.php
+++ b/src/Worker/CheckVersion.php
@@ -10,6 +10,7 @@ namespace Friendica\Worker;
 use Friendica\Core\Config;
 use Friendica\Core\Logger;
 use Friendica\Database\DBA;
+use Friendica\DI;
 use Friendica\Util\Network;
 
 /**
diff --git a/src/Worker/DBClean.php b/src/Worker/DBClean.php
index 60f0e64c4..402a70d06 100644
--- a/src/Worker/DBClean.php
+++ b/src/Worker/DBClean.php
@@ -10,6 +10,7 @@ use Friendica\Core\Config;
 use Friendica\Core\Logger;
 use Friendica\Core\Worker;
 use Friendica\Database\DBA;
+use Friendica\DI;
 
 class DBClean {
 	public static function execute($stage = 0) {
diff --git a/src/Worker/Directory.php b/src/Worker/Directory.php
index 4bba9ca58..88a11a321 100644
--- a/src/Worker/Directory.php
+++ b/src/Worker/Directory.php
@@ -11,6 +11,7 @@ use Friendica\Core\Hook;
 use Friendica\Core\Logger;
 use Friendica\Core\Worker;
 use Friendica\Database\DBA;
+use Friendica\DI;
 use Friendica\Util\Network;
 
 class Directory
diff --git a/src/Worker/UpdateGContacts.php b/src/Worker/UpdateGContacts.php
index 9283257c3..98ec56c48 100644
--- a/src/Worker/UpdateGContacts.php
+++ b/src/Worker/UpdateGContacts.php
@@ -9,6 +9,7 @@ use Friendica\Core\Logger;
 use Friendica\Core\Protocol;
 use Friendica\Core\Worker;
 use Friendica\Database\DBA;
+use Friendica\DI;
 use Friendica\Model\GContact;
 use Friendica\Model\GServer;
 use Friendica\Util\DateTimeFormat;
diff --git a/src/Worker/UpdateServerDirectories.php b/src/Worker/UpdateServerDirectories.php
index 365a997e3..b6b4cb7b3 100644
--- a/src/Worker/UpdateServerDirectories.php
+++ b/src/Worker/UpdateServerDirectories.php
@@ -6,6 +6,7 @@ namespace Friendica\Worker;
 
 use Friendica\Core\Config;
 use Friendica\Core\Logger;
+use Friendica\DI;
 use Friendica\Model\GContact;
 use Friendica\Model\GServer;
 use Friendica\Protocol\PortableContact;
diff --git a/view/theme/frio/php/standard.php b/view/theme/frio/php/standard.php
index 6a24944d1..a48c76dd9 100644
--- a/view/theme/frio/php/standard.php
+++ b/view/theme/frio/php/standard.php
@@ -21,8 +21,8 @@
 <a href="#content" class="sr-only sr-only-focusable">Skip to main content</a>
 <?php
 	if(!empty($page['nav'])) {
-	echo	str_replace("~config.sitename~",Friendica\Core\DI::config()->get('config','sitename'),
-			str_replace("~system.banner~",Friendica\Core\DI::config()->get('system','banner'),
+	echo	str_replace("~config.sitename~",Friendica\DI::config()->get('config','sitename'),
+			str_replace("~system.banner~",Friendica\DI::config()->get('system','banner'),
 			$page['nav']
 	));};
 ?>