diff --git a/boot.php b/boot.php
index 390a6ef9c2..c863cda723 100644
--- a/boot.php
+++ b/boot.php
@@ -17,9 +17,7 @@
  * easily as email does today.
  */
 
-use Friendica\App;
 use Friendica\Core\Config;
-use Friendica\Core\PConfig;
 use Friendica\Core\Protocol;
 use Friendica\Core\System;
 use Friendica\Database\DBA;
@@ -322,7 +320,7 @@ function info($s)
 {
 	$a = DI::app();
 
-	if (local_user() && PConfig::get(local_user(), 'system', 'ignore_info')) {
+	if (local_user() && DI::pConfig()->get(local_user(), 'system', 'ignore_info')) {
 		return;
 	}
 
diff --git a/doc/themes.md b/doc/themes.md
index 6193fa2d22..577d6a5da9 100644
--- a/doc/themes.md
+++ b/doc/themes.md
@@ -129,7 +129,7 @@ The selected 1st part will be saved in the database by the theme_post function.
         // if the one specific submit button was pressed then proceed
         if (isset($_POST['duepuntozero-settings-submit'])){
             // and save the selection key into the personal config of the user
-            PConfig::set(local_user(), 'duepuntozero', 'colorset', $_POST['duepuntozero_colorset']);
+            DI::pConfig()->set(local_user(), 'duepuntozero', 'colorset', $_POST['duepuntozero_colorset']);
         }
     }
 
@@ -137,7 +137,7 @@ Now that this information is set in the database, what should friendica do with
 For this, have a look at the theme.php file of the *duepunto zero*.
 There you'll find somethink alike
 
-        $colorset = PConfig::get( local_user(), 'duepuntozero','colorset');
+        $colorset = DI::pConfig()->get( local_user(), 'duepuntozero','colorset');
         if (!$colorset)
             $colorset = Config::get('duepuntozero', 'colorset');
         if ($colorset) {
diff --git a/include/api.php b/include/api.php
index 8dd00bae81..8220e7bb16 100644
--- a/include/api.php
+++ b/include/api.php
@@ -15,7 +15,6 @@ use Friendica\Core\Config;
 use Friendica\Core\Hook;
 use Friendica\Core\L10n;
 use Friendica\Core\Logger;
-use Friendica\Core\PConfig;
 use Friendica\Core\Protocol;
 use Friendica\Core\Session;
 use Friendica\Core\System;
@@ -728,7 +727,7 @@ function api_get_user(App $a, $contact_id = null)
 	if ($ret['self']) {
 		$theme_info = DBA::selectFirst('user', ['theme'], ['uid' => $ret['uid']]);
 		if ($theme_info['theme'] === 'frio') {
-			$schema = PConfig::get($ret['uid'], 'frio', 'schema');
+			$schema = DI::pConfig()->get($ret['uid'], 'frio', 'schema');
 
 			if ($schema && ($schema != '---')) {
 				if (file_exists('view/theme/frio/schema/'.$schema.'.php')) {
@@ -736,9 +735,9 @@ function api_get_user(App $a, $contact_id = null)
 					require_once $schemefile;
 				}
 			} else {
-				$nav_bg = PConfig::get($ret['uid'], 'frio', 'nav_bg');
-				$link_color = PConfig::get($ret['uid'], 'frio', 'link_color');
-				$bgcolor = PConfig::get($ret['uid'], 'frio', 'background_color');
+				$nav_bg = DI::pConfig()->get($ret['uid'], 'frio', 'nav_bg');
+				$link_color = DI::pConfig()->get($ret['uid'], 'frio', 'link_color');
+				$bgcolor = DI::pConfig()->get($ret['uid'], 'frio', 'background_color');
 			}
 			if (empty($nav_bg)) {
 				$nav_bg = "#708fa0";
diff --git a/include/conversation.php b/include/conversation.php
index bbabcc4372..5c1b140f4c 100644
--- a/include/conversation.php
+++ b/include/conversation.php
@@ -12,7 +12,6 @@ use Friendica\Core\Config;
 use Friendica\Core\Hook;
 use Friendica\Core\L10n;
 use Friendica\Core\Logger;
-use Friendica\Core\PConfig;
 use Friendica\Core\Protocol;
 use Friendica\Core\Renderer;
 use Friendica\Core\Session;
@@ -419,7 +418,7 @@ function conv_get_blocklist()
 		return [];
 	}
 
-	$str_blocked = PConfig::get(local_user(), 'system', 'blocked');
+	$str_blocked = DI::pConfig()->get(local_user(), 'system', 'blocked');
 	if (empty($str_blocked)) {
 		return [];
 	}
@@ -666,7 +665,7 @@ function conversation(App $a, array $items, Pager $pager, $mode, $update, $previ
 
 				list($categories, $folders) = DI::contentItem()->determineCategoriesTerms($item);
 
-				if (!empty($item['content-warning']) && PConfig::get(local_user(), 'system', 'disable_cw', false)) {
+				if (!empty($item['content-warning']) && DI::pConfig()->get(local_user(), 'system', 'disable_cw', false)) {
 					$title = ucfirst($item['content-warning']);
 				} else {
 					$title = $item['title'];
@@ -1469,7 +1468,7 @@ function conv_sort(array $item_list, $order)
 		$parents[$i]['children'] = sort_item_children($parents[$i]['children']);
 	}
 
-	if (!PConfig::get(local_user(), 'system', 'no_smart_threading', 0)) {
+	if (!DI::pConfig()->get(local_user(), 'system', 'no_smart_threading', 0)) {
 		foreach ($parents as $i => $parent) {
 			$parents[$i] = smart_flatten_conversation($parent);
 		}
diff --git a/mod/community.php b/mod/community.php
index 22c1c5d76e..8ed0c14dca 100644
--- a/mod/community.php
+++ b/mod/community.php
@@ -11,7 +11,6 @@ use Friendica\Content\Widget\TrendingTags;
 use Friendica\Core\ACL;
 use Friendica\Core\Config;
 use Friendica\Core\L10n;
-use Friendica\Core\PConfig;
 use Friendica\Core\Renderer;
 use Friendica\Core\Session;
 use Friendica\Database\DBA;
@@ -138,9 +137,9 @@ function community_content(App $a, $update = 0)
 
 	// check if we serve a mobile device and get the user settings accordingly
 	if (DI::mode()->isMobile()) {
-		$itemspage_network = PConfig::get(local_user(), 'system', 'itemspage_mobile_network', 20);
+		$itemspage_network = DI::pConfig()->get(local_user(), 'system', 'itemspage_mobile_network', 20);
 	} else {
-		$itemspage_network = PConfig::get(local_user(), 'system', 'itemspage_network', 40);
+		$itemspage_network = DI::pConfig()->get(local_user(), 'system', 'itemspage_network', 40);
 	}
 
 	// now that we have the user settings, see if the theme forces
diff --git a/mod/network.php b/mod/network.php
index 59e3b80b5b..d4e371c152 100644
--- a/mod/network.php
+++ b/mod/network.php
@@ -16,7 +16,6 @@ use Friendica\Core\Config;
 use Friendica\Core\Hook;
 use Friendica\Core\L10n;
 use Friendica\Core\Logger;
-use Friendica\Core\PConfig;
 use Friendica\Core\Protocol;
 use Friendica\Core\Renderer;
 use Friendica\Core\Session;
@@ -70,7 +69,7 @@ function network_init(App $a)
 		$sel_nets = $_GET['nets'] ?? '';
 		$sel_tabs = network_query_get_sel_tab($a);
 		$sel_groups = network_query_get_sel_group($a);
-		$last_sel_tabs = PConfig::get(local_user(), 'network.view', 'tab.selected');
+		$last_sel_tabs = DI::pConfig()->get(local_user(), 'network.view', 'tab.selected');
 
 		$remember_tab = ($sel_tabs[0] === 'active' && is_array($last_sel_tabs) && $last_sel_tabs[0] !== 'active');
 
@@ -219,10 +218,10 @@ function networkPager(App $a, Pager $pager, $update)
 	//  check if we serve a mobile device and get the user settings
 	//  accordingly
 	if (DI::mode()->isMobile()) {
-		$itemspage_network = PConfig::get(local_user(), 'system', 'itemspage_mobile_network');
+		$itemspage_network = DI::pConfig()->get(local_user(), 'system', 'itemspage_mobile_network');
 		$itemspage_network = ((intval($itemspage_network)) ? $itemspage_network : 20);
 	} else {
-		$itemspage_network = PConfig::get(local_user(), 'system', 'itemspage_network');
+		$itemspage_network = DI::pConfig()->get(local_user(), 'system', 'itemspage_network');
 		$itemspage_network = ((intval($itemspage_network)) ? $itemspage_network : 40);
 	}
 
@@ -282,7 +281,7 @@ function networkConversation(App $a, $items, Pager $pager, $mode, $update, $orde
 	$o = conversation($a, $items, $pager, $mode, $update, false, $ordering, local_user());
 
 	if (!$update) {
-		if (PConfig::get(local_user(), 'system', 'infinite_scroll')) {
+		if (DI::pConfig()->get(local_user(), 'system', 'infinite_scroll')) {
 			$o .= HTML::scrollLoader();
 		} else {
 			$o .= $pager->renderMinimal(count($items));
@@ -491,7 +490,7 @@ function networkThreadedView(App $a, $update, $parent)
 		$tabs = network_tabs($a);
 		$o .= $tabs;
 
-		if ($gid && ($t = Contact::getOStatusCountByGroupId($gid)) && !PConfig::get(local_user(), 'system', 'nowarn_insecure')) {
+		if ($gid && ($t = Contact::getOStatusCountByGroupId($gid)) && !DI::pConfig()->get(local_user(), 'system', 'nowarn_insecure')) {
 			notice(L10n::tt("Warning: This group contains %s member from a network that doesn't allow non public messages.",
 				"Warning: This group contains %s members from a network that doesn't allow non public messages.",
 				$t) . EOL);
@@ -612,7 +611,7 @@ function networkThreadedView(App $a, $update, $parent)
 				'id' => 'network',
 			]) . $o;
 
-			if ($contact['network'] === Protocol::OSTATUS && $contact['writable'] && !PConfig::get(local_user(),'system','nowarn_insecure')) {
+			if ($contact['network'] === Protocol::OSTATUS && $contact['writable'] && !DI::pConfig()->get(local_user(),'system','nowarn_insecure')) {
 				notice(L10n::t('Private messages to this person are at risk of public disclosure.') . EOL);
 			}
 		} else {
@@ -770,7 +769,7 @@ function networkThreadedView(App $a, $update, $parent)
 
 		// When checking for updates we need to fetch from the newest date to the newest date before
 		// Only do this, when the last stored date isn't too long ago (10 times the update interval)
-		$browser_update = PConfig::get(local_user(), 'system', 'update_interval', 40000) / 1000;
+		$browser_update = DI::pConfig()->get(local_user(), 'system', 'update_interval', 40000) / 1000;
 
 		if (($browser_update > 0) && $update && !empty($_SESSION['network_last_date']) &&
 			(($bottom_limit < $_SESSION['network_last_date']) || ($top_limit == $bottom_limit)) &&
@@ -959,7 +958,7 @@ function network_tabs(App $a)
 
 	// save selected tab, but only if not in file mode
 	if (empty($_GET['file'])) {
-		PConfig::set(local_user(), 'network.view', 'tab.selected', [
+		DI::pConfig()->set(local_user(), 'network.view', 'tab.selected', [
 			$all_active, $post_active, $conv_active, $new_active, $starred_active, $bookmarked_active
 		]);
 	}
@@ -994,7 +993,7 @@ function network_infinite_scroll_head(App $a, &$htmlhead)
 	 */
 	global $pager;
 
-	if (PConfig::get(local_user(), 'system', 'infinite_scroll')
+	if (DI::pConfig()->get(local_user(), 'system', 'infinite_scroll')
 		&& ($_GET['mode'] ?? '') != 'minimal'
 	) {
 		$tpl = Renderer::getMarkupTemplate('infinite_scroll_head.tpl');
diff --git a/mod/ostatus_subscribe.php b/mod/ostatus_subscribe.php
index e199b2818c..f6d826e85a 100644
--- a/mod/ostatus_subscribe.php
+++ b/mod/ostatus_subscribe.php
@@ -5,7 +5,6 @@
 
 use Friendica\App;
 use Friendica\Core\L10n;
-use Friendica\Core\PConfig;
 use Friendica\Core\Protocol;
 use Friendica\DI;
 use Friendica\Model\Contact;
@@ -26,17 +25,17 @@ function ostatus_subscribe_content(App $a)
 
 	$counter = intval($_REQUEST['counter']);
 
-	if (PConfig::get($uid, 'ostatus', 'legacy_friends') == '') {
+	if (DI::pConfig()->get($uid, 'ostatus', 'legacy_friends') == '') {
 
 		if ($_REQUEST['url'] == '') {
-			PConfig::delete($uid, 'ostatus', 'legacy_contact');
+			DI::pConfig()->delete($uid, 'ostatus', 'legacy_contact');
 			return $o . L10n::t('No contact provided.');
 		}
 
 		$contact = Probe::uri($_REQUEST['url']);
 
 		if (!$contact) {
-			PConfig::delete($uid, 'ostatus', 'legacy_contact');
+			DI::pConfig()->delete($uid, 'ostatus', 'legacy_contact');
 			return $o . L10n::t('Couldn\'t fetch information for contact.');
 		}
 
@@ -46,14 +45,14 @@ function ostatus_subscribe_content(App $a)
 		$curlResult = Network::curl($api . 'statuses/friends.json?screen_name=' . $contact['nick']);
 
 		if (!$curlResult->isSuccess()) {
-			PConfig::delete($uid, 'ostatus', 'legacy_contact');
+			DI::pConfig()->delete($uid, 'ostatus', 'legacy_contact');
 			return $o . L10n::t('Couldn\'t fetch friends for contact.');
 		}
 
-		PConfig::set($uid, 'ostatus', 'legacy_friends', $curlResult->getBody());
+		DI::pConfig()->set($uid, 'ostatus', 'legacy_friends', $curlResult->getBody());
 	}
 
-	$friends = json_decode(PConfig::get($uid, 'ostatus', 'legacy_friends'));
+	$friends = json_decode(DI::pConfig()->get($uid, 'ostatus', 'legacy_friends'));
 
 	if (empty($friends)) {
 		$friends = [];
@@ -63,8 +62,8 @@ function ostatus_subscribe_content(App $a)
 
 	if ($counter >= $total) {
 		DI::page()['htmlhead'] = '<meta http-equiv="refresh" content="0; URL=' . DI::baseUrl() . '/settings/connectors">';
-		PConfig::delete($uid, 'ostatus', 'legacy_friends');
-		PConfig::delete($uid, 'ostatus', 'legacy_contact');
+		DI::pConfig()->delete($uid, 'ostatus', 'legacy_friends');
+		DI::pConfig()->delete($uid, 'ostatus', 'legacy_contact');
 		$o .= L10n::t('Done');
 		return $o;
 	}
diff --git a/mod/ping.php b/mod/ping.php
index 6e4f32927d..2f6d8a9a58 100644
--- a/mod/ping.php
+++ b/mod/ping.php
@@ -10,7 +10,6 @@ use Friendica\Core\Cache\Duration;
 use Friendica\Core\Config;
 use Friendica\Core\Hook;
 use Friendica\Core\L10n;
-use Friendica\Core\PConfig;
 use Friendica\Database\DBA;
 use Friendica\DI;
 use Friendica\Model\Contact;
@@ -453,7 +452,7 @@ function ping_get_notifications($uid)
 				&& empty($result[$notification["parent"]])
 			) {
 				// Should we condense the notifications or show them all?
-				if (PConfig::get(local_user(), 'system', 'detailed_notif')) {
+				if (DI::pConfig()->get(local_user(), 'system', 'detailed_notif')) {
 					$result[$notification["id"]] = $notification;
 				} else {
 					$result[$notification["parent"]] = $notification;
diff --git a/mod/profiles.php b/mod/profiles.php
index 575d3443fb..f333e302f0 100644
--- a/mod/profiles.php
+++ b/mod/profiles.php
@@ -11,7 +11,6 @@ use Friendica\Content\Nav;
 use Friendica\Core\Config;
 use Friendica\Core\Hook;
 use Friendica\Core\L10n;
-use Friendica\Core\PConfig;
 use Friendica\Core\Renderer;
 use Friendica\Core\Worker;
 use Friendica\Database\DBA;
@@ -338,7 +337,7 @@ function profiles_post(App $a) {
 
 		$hide_friends = (($_POST['hide-friends'] == 1) ? 1: 0);
 
-		PConfig::set(local_user(), 'system', 'detailled_profile', !empty($_POST['detailed_profile']) ? 1: 0);
+		DI::pConfig()->set(local_user(), 'system', 'detailled_profile', !empty($_POST['detailed_profile']) ? 1: 0);
 
 		$changes = [];
 		if ($is_default) {
@@ -535,7 +534,7 @@ function profiles_content(App $a) {
 		$personal_account = !(in_array($a->user["page-flags"],
 					[User::PAGE_FLAGS_COMMUNITY, User::PAGE_FLAGS_PRVGROUP]));
 
-		$detailed_profile = (PConfig::get(local_user(), 'system', 'detailled_profile') AND $personal_account);
+		$detailed_profile = (DI::pConfig()->get(local_user(), 'system', 'detailled_profile') AND $personal_account);
 
 		$is_default = (($r[0]['is-default']) ? 1 : 0);
 		$tpl = Renderer::getMarkupTemplate("profile_edit.tpl");
diff --git a/mod/profperm.php b/mod/profperm.php
index 218d1973ee..a79358c819 100644
--- a/mod/profperm.php
+++ b/mod/profperm.php
@@ -5,10 +5,10 @@
 use Friendica\App;
 use Friendica\Core\Config;
 use Friendica\Core\L10n;
-use Friendica\Core\PConfig;
 use Friendica\Core\Protocol;
 use Friendica\Content\Text\HTML;
 use Friendica\Database\DBA;
+use Friendica\DI;
 use Friendica\Model\Profile;
 
 function profperm_init(App $a)
@@ -41,7 +41,7 @@ function profperm_content(App $a) {
 
 	// Switch to text mod interface if we have more than 'n' contacts or group members
 
-	$switchtotext = PConfig::get(local_user(),'system','groupedit_image_limit');
+	$switchtotext = DI::pConfig()->get(local_user(),'system','groupedit_image_limit');
 	if (is_null($switchtotext)) {
 		$switchtotext = Config::get('system','groupedit_image_limit', 400);
 	}
diff --git a/mod/salmon.php b/mod/salmon.php
index 313c2cb0bb..c7b25a6655 100644
--- a/mod/salmon.php
+++ b/mod/salmon.php
@@ -5,9 +5,9 @@
 
 use Friendica\App;
 use Friendica\Core\Logger;
-use Friendica\Core\PConfig;
 use Friendica\Core\Protocol;
 use Friendica\Database\DBA;
+use Friendica\DI;
 use Friendica\Model\Contact;
 use Friendica\Protocol\ActivityNamespace;
 use Friendica\Protocol\OStatus;
@@ -158,7 +158,7 @@ function salmon_post(App $a, $xml = '') {
 	if (!DBA::isResult($r)) {
 		Logger::log('Author ' . $author_link . ' unknown to user ' . $importer['uid'] . '.');
 
-		if (PConfig::get($importer['uid'], 'system', 'ostatus_autofriend')) {
+		if (DI::pConfig()->get($importer['uid'], 'system', 'ostatus_autofriend')) {
 			$result = Contact::createFromProbe($importer['uid'], $author_link);
 
 			if ($result['success']) {
diff --git a/mod/settings.php b/mod/settings.php
index 4f44e9a00e..8213fda7c9 100644
--- a/mod/settings.php
+++ b/mod/settings.php
@@ -12,7 +12,6 @@ use Friendica\Core\Config;
 use Friendica\Core\Hook;
 use Friendica\Core\L10n;
 use Friendica\Core\Logger;
-use Friendica\Core\PConfig;
 use Friendica\Core\Renderer;
 use Friendica\Core\Session;
 use Friendica\Core\Theme;
@@ -233,13 +232,13 @@ function settings_post(App $a)
 		BaseModule::checkFormSecurityTokenRedirectOnError('/settings/connectors', 'settings_connectors');
 
 		if (!empty($_POST['general-submit'])) {
-			PConfig::set(local_user(), 'system', 'accept_only_sharer', intval($_POST['accept_only_sharer']));
-			PConfig::set(local_user(), 'system', 'disable_cw', intval($_POST['disable_cw']));
-			PConfig::set(local_user(), 'system', 'no_intelligent_shortening', intval($_POST['no_intelligent_shortening']));
-			PConfig::set(local_user(), 'system', 'attach_link_title', intval($_POST['attach_link_title']));
-			PConfig::set(local_user(), 'system', 'ostatus_autofriend', intval($_POST['snautofollow']));
-			PConfig::set(local_user(), 'ostatus', 'default_group', $_POST['group-selection']);
-			PConfig::set(local_user(), 'ostatus', 'legacy_contact', $_POST['legacy_contact']);
+			DI::pConfig()->set(local_user(), 'system', 'accept_only_sharer', intval($_POST['accept_only_sharer']));
+			DI::pConfig()->set(local_user(), 'system', 'disable_cw', intval($_POST['disable_cw']));
+			DI::pConfig()->set(local_user(), 'system', 'no_intelligent_shortening', intval($_POST['no_intelligent_shortening']));
+			DI::pConfig()->set(local_user(), 'system', 'attach_link_title', intval($_POST['attach_link_title']));
+			DI::pConfig()->set(local_user(), 'system', 'ostatus_autofriend', intval($_POST['snautofollow']));
+			DI::pConfig()->set(local_user(), 'ostatus', 'default_group', $_POST['group-selection']);
+			DI::pConfig()->set(local_user(), 'ostatus', 'legacy_contact', $_POST['legacy_contact']);
 		} elseif (!empty($_POST['imap-submit'])) {
 			$mail_server       =                 $_POST['mail_server']       ?? '';
 			$mail_port         =                 $_POST['mail_port']         ?? '';
@@ -314,7 +313,7 @@ function settings_post(App $a)
 		BaseModule::checkFormSecurityTokenRedirectOnError('/settings/features', 'settings_features');
 		foreach ($_POST as $k => $v) {
 			if (strpos($k, 'feature_') === 0) {
-				PConfig::set(local_user(), 'feature', substr($k, 8), ((intval($v)) ? 1 : 0));
+				DI::pConfig()->set(local_user(), 'feature', substr($k, 8), ((intval($v)) ? 1 : 0));
 			}
 		}
 		info(L10n::t('Features updated') . EOL);
@@ -352,20 +351,20 @@ function settings_post(App $a)
 		}
 
 		if ($mobile_theme !== '') {
-			PConfig::set(local_user(), 'system', 'mobile_theme', $mobile_theme);
+			DI::pConfig()->set(local_user(), 'system', 'mobile_theme', $mobile_theme);
 		}
 
-		PConfig::set(local_user(), 'system', 'nowarn_insecure'         , $nowarn_insecure);
-		PConfig::set(local_user(), 'system', 'update_interval'         , $browser_update);
-		PConfig::set(local_user(), 'system', 'itemspage_network'       , $itemspage_network);
-		PConfig::set(local_user(), 'system', 'itemspage_mobile_network', $itemspage_mobile_network);
-		PConfig::set(local_user(), 'system', 'no_smilies'              , $nosmile);
-		PConfig::set(local_user(), 'system', 'first_day_of_week'       , $first_day_of_week);
-		PConfig::set(local_user(), 'system', 'ignore_info'             , $noinfo);
-		PConfig::set(local_user(), 'system', 'infinite_scroll'         , $infinite_scroll);
-		PConfig::set(local_user(), 'system', 'no_auto_update'          , $no_auto_update);
-		PConfig::set(local_user(), 'system', 'bandwidth_saver'         , $bandwidth_saver);
-		PConfig::set(local_user(), 'system', 'no_smart_threading'      , $no_smart_threading);
+		DI::pConfig()->set(local_user(), 'system', 'nowarn_insecure'         , $nowarn_insecure);
+		DI::pConfig()->set(local_user(), 'system', 'update_interval'         , $browser_update);
+		DI::pConfig()->set(local_user(), 'system', 'itemspage_network'       , $itemspage_network);
+		DI::pConfig()->set(local_user(), 'system', 'itemspage_mobile_network', $itemspage_mobile_network);
+		DI::pConfig()->set(local_user(), 'system', 'no_smilies'              , $nosmile);
+		DI::pConfig()->set(local_user(), 'system', 'first_day_of_week'       , $first_day_of_week);
+		DI::pConfig()->set(local_user(), 'system', 'ignore_info'             , $noinfo);
+		DI::pConfig()->set(local_user(), 'system', 'infinite_scroll'         , $infinite_scroll);
+		DI::pConfig()->set(local_user(), 'system', 'no_auto_update'          , $no_auto_update);
+		DI::pConfig()->set(local_user(), 'system', 'bandwidth_saver'         , $bandwidth_saver);
+		DI::pConfig()->set(local_user(), 'system', 'no_smart_threading'      , $no_smart_threading);
 
 		if (in_array($theme, Theme::getAllowedList())) {
 			if ($theme == $a->user['theme']) {
@@ -568,16 +567,16 @@ function settings_post(App $a)
 	$str_group_deny    = !empty($_POST['group_deny'])    ? $aclFormatter->toString($_POST['group_deny'])    : '';
 	$str_contact_deny  = !empty($_POST['contact_deny'])  ? $aclFormatter->toString($_POST['contact_deny'])  : '';
 
-	PConfig::set(local_user(), 'expire', 'items', $expire_items);
-	PConfig::set(local_user(), 'expire', 'notes', $expire_notes);
-	PConfig::set(local_user(), 'expire', 'starred', $expire_starred);
-	PConfig::set(local_user(), 'expire', 'photos', $expire_photos);
-	PConfig::set(local_user(), 'expire', 'network_only', $expire_network_only);
+	DI::pConfig()->set(local_user(), 'expire', 'items', $expire_items);
+	DI::pConfig()->set(local_user(), 'expire', 'notes', $expire_notes);
+	DI::pConfig()->set(local_user(), 'expire', 'starred', $expire_starred);
+	DI::pConfig()->set(local_user(), 'expire', 'photos', $expire_photos);
+	DI::pConfig()->set(local_user(), 'expire', 'network_only', $expire_network_only);
 
-	PConfig::set(local_user(), 'system', 'suggestme', $suggestme);
+	DI::pConfig()->set(local_user(), 'system', 'suggestme', $suggestme);
 
-	PConfig::set(local_user(), 'system', 'email_textonly', $email_textonly);
-	PConfig::set(local_user(), 'system', 'detailed_notif', $detailed_notif);
+	DI::pConfig()->set(local_user(), 'system', 'email_textonly', $email_textonly);
+	DI::pConfig()->set(local_user(), 'system', 'detailed_notif', $detailed_notif);
 
 	if ($page_flags == User::PAGE_FLAGS_PRVGROUP) {
 		$hidewall = 1;
@@ -776,13 +775,13 @@ function settings_content(App $a)
 	}
 
 	if (($a->argc > 1) && ($a->argv[1] === 'connectors')) {
-		$accept_only_sharer        = intval(PConfig::get(local_user(), 'system', 'accept_only_sharer'));
-		$disable_cw                = intval(PConfig::get(local_user(), 'system', 'disable_cw'));
-		$no_intelligent_shortening = intval(PConfig::get(local_user(), 'system', 'no_intelligent_shortening'));
-		$attach_link_title         = intval(PConfig::get(local_user(), 'system', 'attach_link_title'));
-		$ostatus_autofriend        = intval(PConfig::get(local_user(), 'system', 'ostatus_autofriend'));
-		$default_group             = PConfig::get(local_user(), 'ostatus', 'default_group');
-		$legacy_contact            = PConfig::get(local_user(), 'ostatus', 'legacy_contact');
+		$accept_only_sharer        = intval(DI::pConfig()->get(local_user(), 'system', 'accept_only_sharer'));
+		$disable_cw                = intval(DI::pConfig()->get(local_user(), 'system', 'disable_cw'));
+		$no_intelligent_shortening = intval(DI::pConfig()->get(local_user(), 'system', 'no_intelligent_shortening'));
+		$attach_link_title         = intval(DI::pConfig()->get(local_user(), 'system', 'attach_link_title'));
+		$ostatus_autofriend        = intval(DI::pConfig()->get(local_user(), 'system', 'ostatus_autofriend'));
+		$default_group             = DI::pConfig()->get(local_user(), 'ostatus', 'default_group');
+		$legacy_contact            = DI::pConfig()->get(local_user(), 'ostatus', 'legacy_contact');
 
 		if (!empty($legacy_contact)) {
 			/// @todo Isn't it supposed to be a $a->internalRedirect() call?
@@ -915,27 +914,27 @@ function settings_content(App $a)
 		$theme_selected        = $a->user['theme'] ?: $default_theme;
 		$mobile_theme_selected = Session::get('mobile-theme', $default_mobile_theme);
 
-		$nowarn_insecure = intval(PConfig::get(local_user(), 'system', 'nowarn_insecure'));
+		$nowarn_insecure = intval(DI::pConfig()->get(local_user(), 'system', 'nowarn_insecure'));
 
-		$browser_update = intval(PConfig::get(local_user(), 'system', 'update_interval'));
+		$browser_update = intval(DI::pConfig()->get(local_user(), 'system', 'update_interval'));
 		if (intval($browser_update) != -1) {
 			$browser_update = (($browser_update == 0) ? 40 : $browser_update / 1000); // default if not set: 40 seconds
 		}
 
-		$itemspage_network = intval(PConfig::get(local_user(), 'system', 'itemspage_network'));
+		$itemspage_network = intval(DI::pConfig()->get(local_user(), 'system', 'itemspage_network'));
 		$itemspage_network = (($itemspage_network > 0 && $itemspage_network < 101) ? $itemspage_network : 40); // default if not set: 40 items
-		$itemspage_mobile_network = intval(PConfig::get(local_user(), 'system', 'itemspage_mobile_network'));
+		$itemspage_mobile_network = intval(DI::pConfig()->get(local_user(), 'system', 'itemspage_mobile_network'));
 		$itemspage_mobile_network = (($itemspage_mobile_network > 0 && $itemspage_mobile_network < 101) ? $itemspage_mobile_network : 20); // default if not set: 20 items
 
-		$nosmile = PConfig::get(local_user(), 'system', 'no_smilies', 0);
-		$first_day_of_week = PConfig::get(local_user(), 'system', 'first_day_of_week', 0);
+		$nosmile = DI::pConfig()->get(local_user(), 'system', 'no_smilies', 0);
+		$first_day_of_week = DI::pConfig()->get(local_user(), 'system', 'first_day_of_week', 0);
 		$weekdays = [0 => L10n::t("Sunday"), 1 => L10n::t("Monday")];
 
-		$noinfo = PConfig::get(local_user(), 'system', 'ignore_info', 0);
-		$infinite_scroll = PConfig::get(local_user(), 'system', 'infinite_scroll', 0);
-		$no_auto_update = PConfig::get(local_user(), 'system', 'no_auto_update', 0);
-		$bandwidth_saver = PConfig::get(local_user(), 'system', 'bandwidth_saver', 0);
-		$no_smart_threading = PConfig::get(local_user(), 'system', 'no_smart_threading', 0);
+		$noinfo = DI::pConfig()->get(local_user(), 'system', 'ignore_info', 0);
+		$infinite_scroll = DI::pConfig()->get(local_user(), 'system', 'infinite_scroll', 0);
+		$no_auto_update = DI::pConfig()->get(local_user(), 'system', 'no_auto_update', 0);
+		$bandwidth_saver = DI::pConfig()->get(local_user(), 'system', 'bandwidth_saver', 0);
+		$no_smart_threading = DI::pConfig()->get(local_user(), 'system', 'no_smart_threading', 0);
 
 		$theme_config = "";
 		if (($themeconfigfile = get_theme_config_file($theme_selected)) !== null) {
@@ -1000,12 +999,12 @@ function settings_content(App $a)
 	$unkmail    = $a->user['unkmail'];
 	$cntunkmail = $a->user['cntunkmail'];
 
-	$expire_items = PConfig::get(local_user(), 'expire', 'items', true);
-	$expire_notes = PConfig::get(local_user(), 'expire', 'notes', true);
-	$expire_starred = PConfig::get(local_user(), 'expire', 'starred', true);
-	$expire_photos = PConfig::get(local_user(), 'expire', 'photos', false);
-	$expire_network_only = PConfig::get(local_user(), 'expire', 'network_only', false);
-	$suggestme = PConfig::get(local_user(), 'system', 'suggestme', false);
+	$expire_items = DI::pConfig()->get(local_user(), 'expire', 'items', true);
+	$expire_notes = DI::pConfig()->get(local_user(), 'expire', 'notes', true);
+	$expire_starred = DI::pConfig()->get(local_user(), 'expire', 'starred', true);
+	$expire_photos = DI::pConfig()->get(local_user(), 'expire', 'photos', false);
+	$expire_network_only = DI::pConfig()->get(local_user(), 'expire', 'network_only', false);
+	$suggestme = DI::pConfig()->get(local_user(), 'system', 'suggestme', false);
 
 	// nowarn_insecure
 
@@ -1244,11 +1243,11 @@ function settings_content(App $a)
 		'$desktop_notifications' => ['desktop_notifications', L10n::t('Activate desktop notifications') , false, L10n::t('Show desktop popup on new notifications')],
 
 		'$email_textonly' => ['email_textonly', L10n::t('Text-only notification emails'),
-									PConfig::get(local_user(), 'system', 'email_textonly'),
+									DI::pConfig()->get(local_user(), 'system', 'email_textonly'),
 									L10n::t('Send text only notification emails, without the html part')],
 
 		'$detailed_notif' => ['detailed_notif', L10n::t('Show detailled notifications'),
-									PConfig::get(local_user(), 'system', 'detailed_notif'),
+									DI::pConfig()->get(local_user(), 'system', 'detailed_notif'),
 									L10n::t('Per default, notifications are condensed to a single notification per item. When enabled every notification is displayed.')],
 
 		'$h_advn' => L10n::t('Advanced Account/Page Type Settings'),
diff --git a/mod/update_community.php b/mod/update_community.php
index e15520320e..2f23bb7deb 100644
--- a/mod/update_community.php
+++ b/mod/update_community.php
@@ -4,7 +4,7 @@
 
 use Friendica\App;
 use Friendica\Core\L10n;
-use Friendica\Core\PConfig;
+use Friendica\DI;
 
 require_once 'mod/community.php';
 
@@ -19,7 +19,7 @@ function update_community_content(App $a) {
 		$text = '';
 	}
 
-	if (PConfig::get(local_user(), "system", "bandwidth_saver")) {
+	if (DI::pConfig()->get(local_user(), "system", "bandwidth_saver")) {
 		$replace = "<br />".L10n::t("[Embedded content - reload page to view]")."<br />";
 		$pattern = "/<\s*audio[^>]*>(.*?)<\s*\/\s*audio>/i";
 		$text = preg_replace($pattern, $replace, $text);
diff --git a/mod/update_contact.php b/mod/update_contact.php
index bea33b4841..5092dd835c 100644
--- a/mod/update_contact.php
+++ b/mod/update_contact.php
@@ -4,7 +4,7 @@
 
 use Friendica\App;
 use Friendica\Core\L10n;
-use Friendica\Core\PConfig;
+use Friendica\DI;
 use Friendica\Module\Contact;
 
 function update_contact_content(App $a)
@@ -19,7 +19,7 @@ function update_contact_content(App $a)
 		$text = '';
 	}
 
-	if (PConfig::get(local_user(), "system", "bandwidth_saver")) {
+	if (DI::pConfig()->get(local_user(), "system", "bandwidth_saver")) {
 		$replace = "<br />".L10n::t("[Embedded content - reload page to view]")."<br />";
 		$pattern = "/<\s*audio[^>]*>(.*?)<\s*\/\s*audio>/i";
 		$text = preg_replace($pattern, $replace, $text);
diff --git a/mod/update_display.php b/mod/update_display.php
index 4059332510..569c76ab31 100644
--- a/mod/update_display.php
+++ b/mod/update_display.php
@@ -6,7 +6,7 @@
 
 use Friendica\App;
 use Friendica\Core\L10n;
-use Friendica\Core\PConfig;
+use Friendica\DI;
 
 require_once "mod/display.php";
 
@@ -20,7 +20,7 @@ function update_display_content(App $a)
 
 	$text = display_content($a, true, $profile_uid);
 
-	if (PConfig::get(local_user(), "system", "bandwidth_saver")) {
+	if (DI::pConfig()->get(local_user(), "system", "bandwidth_saver")) {
 		$replace = "<br />" . L10n::t("[Embedded content - reload page to view]") . "<br />";
 		$pattern = "/<\s*audio[^>]*>(.*?)<\s*\/\s*audio>/i";
 		$text = preg_replace($pattern, $replace, $text);
diff --git a/mod/update_network.php b/mod/update_network.php
index 6ba761d04a..2ae9ccb787 100644
--- a/mod/update_network.php
+++ b/mod/update_network.php
@@ -6,7 +6,7 @@
 
 use Friendica\App;
 use Friendica\Core\L10n;
-use Friendica\Core\PConfig;
+use Friendica\DI;
 
 require_once "mod/network.php";
 
@@ -23,13 +23,13 @@ function update_network_content(App $a)
 	echo "<!DOCTYPE html><html><body>\r\n";
 	echo "<section>";
 
-	if (!PConfig::get($profile_uid, "system", "no_auto_update") || ($_GET["force"] == 1)) {
+	if (!DI::pConfig()->get($profile_uid, "system", "no_auto_update") || ($_GET["force"] == 1)) {
 		$text = network_content($a, $profile_uid, $parent);
 	} else {
 		$text = "";
 	}
 
-	if (PConfig::get(local_user(), "system", "bandwidth_saver")) {
+	if (DI::pConfig()->get(local_user(), "system", "bandwidth_saver")) {
 		$replace = "<br />" . L10n::t("[Embedded content - reload page to view]") . "<br />";
 		$pattern = "/<\s*audio[^>]*>(.*?)<\s*\/\s*audio>/i";
 		$text = preg_replace($pattern, $replace, $text);
diff --git a/mod/update_notes.php b/mod/update_notes.php
index 10f60c1ef1..989af976a2 100644
--- a/mod/update_notes.php
+++ b/mod/update_notes.php
@@ -7,7 +7,7 @@
 
 use Friendica\App;
 use Friendica\Core\L10n;
-use Friendica\Core\PConfig;
+use Friendica\DI;
 
 require_once("mod/notes.php");
 
@@ -32,7 +32,7 @@ function update_notes_content(App $a) {
 
 	$text = notes_content($a, $profile_uid);
 
-	if (PConfig::get(local_user(), "system", "bandwidth_saver")) {
+	if (DI::pConfig()->get(local_user(), "system", "bandwidth_saver")) {
 		$replace = "<br />".L10n::t("[Embedded content - reload page to view]")."<br />";
 		$pattern = "/<\s*audio[^>]*>(.*?)<\s*\/\s*audio>/i";
 		$text = preg_replace($pattern, $replace, $text);
diff --git a/mod/update_profile.php b/mod/update_profile.php
index 85ca3d3c97..38802866d9 100644
--- a/mod/update_profile.php
+++ b/mod/update_profile.php
@@ -7,7 +7,7 @@
 
 use Friendica\App;
 use Friendica\Core\L10n;
-use Friendica\Core\PConfig;
+use Friendica\DI;
 use Friendica\Module\Profile;
 
 function update_profile_content(App $a) {
@@ -30,7 +30,7 @@ function update_profile_content(App $a) {
 
 	$text = Profile::content([], $profile_uid);
 
-	if (PConfig::get(local_user(), "system", "bandwidth_saver")) {
+	if (DI::pConfig()->get(local_user(), "system", "bandwidth_saver")) {
 		$replace = "<br />".L10n::t("[Embedded content - reload page to view]")."<br />";
 		$pattern = "/<\s*audio[^>]*>(.*?)<\s*\/\s*audio>/i";
 		$text = preg_replace($pattern, $replace, $text);
diff --git a/src/App.php b/src/App.php
index 4a62031381..7f22cfd91d 100644
--- a/src/App.php
+++ b/src/App.php
@@ -7,7 +7,6 @@ namespace Friendica;
 use Exception;
 use Friendica\App\Arguments;
 use Friendica\App\BaseURL;
-use Friendica\App\Page;
 use Friendica\App\Authentication;
 use Friendica\Core\Config\Cache\ConfigCache;
 use Friendica\Core\Config\IConfiguration;
@@ -118,6 +117,11 @@ class App
 	 */
 	private $process;
 
+	/**
+	 * @var IPConfiguration
+	 */
+	private $pConfig;
+
 	/**
 	 * Returns the current config cache of this node
 	 *
@@ -149,8 +153,9 @@ class App
 	 * @param L10n            $l10n     The translator instance
 	 * @param App\Arguments   $args     The Friendica Arguments of the call
 	 * @param Core\Process    $process  The process methods
+	 * @param IPConfiguration $pConfig  Personal configuration
 	 */
-	public function __construct(Database $database, IConfiguration $config, App\Mode $mode, BaseURL $baseURL, LoggerInterface $logger, Profiler $profiler, L10n $l10n, Arguments $args, Core\Process $process)
+	public function __construct(Database $database, IConfiguration $config, App\Mode $mode, BaseURL $baseURL, LoggerInterface $logger, Profiler $profiler, L10n $l10n, Arguments $args, Core\Process $process, IPConfiguration $pConfig)
 	{
 		$this->database = $database;
 		$this->config   = $config;
@@ -161,6 +166,7 @@ class App
 		$this->l10n     = $l10n;
 		$this->args     = $args;
 		$this->process  = $process;
+		$this->pConfig  = $pConfig;
 
 		$this->argv         = $args->getArgv();
 		$this->argc         = $args->getArgc();
@@ -336,7 +342,7 @@ class App
 			// Allow folks to override user themes and always use their own on their own site.
 			// This works only if the user is on the same server
 			$user = $this->database->selectFirst('user', ['theme'], ['uid' => $this->profile_uid]);
-			if ($this->database->isResult($user) && !Core\PConfig::get(local_user(), 'system', 'always_my_theme')) {
+			if ($this->database->isResult($user) && !$this->pConfig->get(local_user(), 'system', 'always_my_theme')) {
 				$page_theme = $user['theme'];
 			}
 		}
@@ -368,8 +374,8 @@ class App
 		if ($this->profile_uid && ($this->profile_uid != local_user())) {
 			// Allow folks to override user themes and always use their own on their own site.
 			// This works only if the user is on the same server
-			if (!Core\PConfig::get(local_user(), 'system', 'always_my_theme')) {
-				$page_mobile_theme = Core\PConfig::get($this->profile_uid, 'system', 'mobile-theme');
+			if (!$this->pConfig->get(local_user(), 'system', 'always_my_theme')) {
+				$page_mobile_theme = $this->pConfig->get($this->profile_uid, 'system', 'mobile-theme');
 			}
 		}
 
diff --git a/src/App/Authentication.php b/src/App/Authentication.php
index 39c684ffd3..2ffa5814a2 100644
--- a/src/App/Authentication.php
+++ b/src/App/Authentication.php
@@ -9,8 +9,8 @@ namespace Friendica\App;
 use Exception;
 use Friendica\App;
 use Friendica\Core\Config\IConfiguration;
+use Friendica\Core\Config\IPConfiguration;
 use Friendica\Core\Hook;
-use Friendica\Core\PConfig;
 use Friendica\Core\Session;
 use Friendica\Core\System;
 use Friendica\Database\Database;
@@ -46,6 +46,8 @@ class Authentication
 	private $cookie;
 	/** @var Session\ISession */
 	private $session;
+	/** @var IPConfiguration */
+	private $pConfig;
 
 	/**
 	 * Authentication constructor.
@@ -58,17 +60,19 @@ class Authentication
 	 * @param LoggerInterface $logger
 	 * @param User\Cookie     $cookie
 	 * @param Session\ISession $session
+	 * @param IPConfiguration  $pConfig
 	 */
-	public function __construct(IConfiguration $config, App\Mode $mode, App\BaseURL $baseUrl, L10n $l10n, Database $dba, LoggerInterface $logger, User\Cookie $cookie, Session\ISession $session)
+	public function __construct(IConfiguration $config, App\Mode $mode, App\BaseURL $baseUrl, L10n $l10n, Database $dba, LoggerInterface $logger, User\Cookie $cookie, Session\ISession $session, IPConfiguration $pConfig)
 	{
 		$this->config  = $config;
-		$this->mode = $mode;
+		$this->mode    = $mode;
 		$this->baseUrl = $baseUrl;
 		$this->l10n    = $l10n;
 		$this->dba     = $dba;
 		$this->logger  = $logger;
-		$this->cookie = $cookie;
+		$this->cookie  = $cookie;
 		$this->session = $session;
+		$this->pConfig = $pConfig;
 	}
 
 	/**
@@ -295,7 +299,7 @@ class Authentication
 		$this->session->setMultiple([
 			'uid'           => $user_record['uid'],
 			'theme'         => $user_record['theme'],
-			'mobile-theme'  => PConfig::get($user_record['uid'], 'system', 'mobile_theme'),
+			'mobile-theme'  => $this->pConfig->get($user_record['uid'], 'system', 'mobile_theme'),
 			'authenticated' => 1,
 			'page_flags'    => $user_record['page-flags'],
 			'my_url'        => $this->baseUrl->get() . '/profile/' . $user_record['nickname'],
@@ -395,7 +399,7 @@ class Authentication
 	private function twoFactorCheck(int $uid, App $a)
 	{
 		// Check user setting, if 2FA disabled return
-		if (!PConfig::get($uid, '2fa', 'verified')) {
+		if (!$this->pConfig->get($uid, '2fa', 'verified')) {
 			return;
 		}
 
diff --git a/src/Content/Feature.php b/src/Content/Feature.php
index 0f119d3054..995f33292b 100644
--- a/src/Content/Feature.php
+++ b/src/Content/Feature.php
@@ -8,7 +8,7 @@ namespace Friendica\Content;
 use Friendica\Core\Config;
 use Friendica\Core\Hook;
 use Friendica\Core\L10n;
-use Friendica\Core\PConfig;
+use Friendica\DI;
 
 class Feature
 {
@@ -25,7 +25,7 @@ class Feature
 		$x = Config::get('feature_lock', $feature, false);
 
 		if ($x === false) {
-			$x = PConfig::get($uid, 'feature', $feature, false);
+			$x = DI::pConfig()->get($uid, 'feature', $feature, false);
 		}
 
 		if ($x === false) {
diff --git a/src/Content/Smilies.php b/src/Content/Smilies.php
index 08c6309018..cafc6f3147 100644
--- a/src/Content/Smilies.php
+++ b/src/Content/Smilies.php
@@ -16,7 +16,6 @@ namespace Friendica\Content;
 
 use Friendica\Core\Config;
 use Friendica\Core\Hook;
-use Friendica\Core\PConfig;
 use Friendica\DI;
 use Friendica\Util\Strings;
 
@@ -210,7 +209,7 @@ class Smilies
 	public static function replaceFromArray($text, array $smilies, $no_images = false)
 	{
 		if (intval(Config::get('system', 'no_smilies'))
-			|| (local_user() && intval(PConfig::get(local_user(), 'system', 'no_smilies')))
+			|| (local_user() && intval(DI::pConfig()->get(local_user(), 'system', 'no_smilies')))
 		) {
 			return $text;
 		}
diff --git a/src/Content/Widget.php b/src/Content/Widget.php
index 8f88a0d836..74955be020 100644
--- a/src/Content/Widget.php
+++ b/src/Content/Widget.php
@@ -7,7 +7,6 @@ namespace Friendica\Content;
 use Friendica\Core\Addon;
 use Friendica\Core\Config;
 use Friendica\Core\L10n;
-use Friendica\Core\PConfig;
 use Friendica\Core\Protocol;
 use Friendica\Core\Renderer;
 use Friendica\Core\Session;
@@ -51,7 +50,7 @@ class Widget
 		$global_dir = Config::get('system', 'directory');
 
 		if (Config::get('system', 'invitation_only')) {
-			$x = intval(PConfig::get(local_user(), 'system', 'invites_remaining'));
+			$x = intval(DI::pConfig()->get(local_user(), 'system', 'invites_remaining'));
 			if ($x || is_site_admin()) {
 				DI::page()['aside'] .= '<div class="side-link widget" id="side-invite-remain">'
 					. L10n::tt('%d invitation available', '%d invitations available', $x)
@@ -267,7 +266,7 @@ class Widget
 			return '';
 		}
 
-		$saved = PConfig::get(local_user(), 'system', 'filetags');
+		$saved = DI::pConfig()->get(local_user(), 'system', 'filetags');
 		if (!strlen($saved)) {
 			return;
 		}
@@ -310,7 +309,7 @@ class Widget
 			return '';
 		}
 
-		$saved = PConfig::get($uid, 'system', 'filetags');
+		$saved = DI::pConfig()->get($uid, 'system', 'filetags');
 		if (!strlen($saved)) {
 			return;
 		}
@@ -455,7 +454,7 @@ class Widget
 			return $o;
 		}
 
-		$visible_years = PConfig::get($uid, 'system', 'archive_visible_years', 5);
+		$visible_years = DI::pConfig()->get($uid, 'system', 'archive_visible_years', 5);
 
 		/* arrange the list in years */
 		$dnow = DateTimeFormat::localNow('Y-m-d');
diff --git a/src/Content/Widget/ContactBlock.php b/src/Content/Widget/ContactBlock.php
index ec78dae922..bd4d10fd39 100644
--- a/src/Content/Widget/ContactBlock.php
+++ b/src/Content/Widget/ContactBlock.php
@@ -9,10 +9,10 @@ namespace Friendica\Content\Widget;
 use Friendica\Content\Text\HTML;
 use Friendica\Core\Hook;
 use Friendica\Core\L10n;
-use Friendica\Core\PConfig;
 use Friendica\Core\Protocol;
 use Friendica\Core\Renderer;
 use Friendica\Database\DBA;
+use Friendica\DI;
 use Friendica\Model\Contact;
 use Friendica\Model\User;
 
@@ -34,7 +34,7 @@ class ContactBlock
 	{
 		$o = '';
 
-		$shown = PConfig::get($profile['uid'], 'system', 'display_friend_count', 24);
+		$shown = DI::pConfig()->get($profile['uid'], 'system', 'display_friend_count', 24);
 		if ($shown == 0) {
 			return $o;
 		}
diff --git a/src/Core/PConfig.php b/src/Core/PConfig.php
deleted file mode 100644
index 06b0140097..0000000000
--- a/src/Core/PConfig.php
+++ /dev/null
@@ -1,80 +0,0 @@
-<?php
-/**
- * User Configuration Class
- *
- * @file include/Core/PConfig.php
- *
- * @brief Contains the class with methods for user configuration
- */
-namespace Friendica\Core;
-
-use Friendica\DI;
-
-/**
- * @brief Management of user configuration storage
- * Note:
- * Please do not store booleans - convert to 0/1 integer values
- * The PConfig::get() functions return boolean false for keys that are unset,
- * and this could lead to subtle bugs.
- */
-class PConfig
-{
-	/**
-	 * @brief Loads all configuration values of a user's config family into a cached storage.
-	 *
-	 * @param int    $uid The user_id
-	 * @param string $cat The category of the configuration value
-	 *
-	 * @return void
-	 */
-	public static function load(int $uid, string $cat)
-	{
-		DI::pConfig()->load($uid, $cat);
-	}
-
-	/**
-	 * @brief Get a particular user's config variable given the category name
-	 * ($cat) and a key.
-	 *
-	 * @param int     $uid           The user_id
-	 * @param string  $cat           The category of the configuration value
-	 * @param string  $key           The configuration key to query
-	 * @param mixed   $default_value optional, The value to return if key is not set (default: null)
-	 * @param boolean $refresh       optional, If true the config is loaded from the db and not from the cache (default: false)
-	 *
-	 * @return mixed Stored value or null if it does not exist
-	 */
-	public static function get(int $uid, string $cat, string $key, $default_value = null, bool $refresh = false)
-	{
-		return DI::pConfig()->get($uid, $cat, $key, $default_value, $refresh);
-	}
-
-	/**
-	 * @brief Sets a configuration value for a user
-	 *
-	 * @param int    $uid    The user_id
-	 * @param string $cat    The category of the configuration value
-	 * @param string $key    The configuration key to set
-	 * @param mixed  $value  The value to store
-	 *
-	 * @return bool Operation success
-	 */
-	public static function set(int $uid, string $cat, string $key, $value)
-	{
-		return DI::pConfig()->set($uid, $cat, $key, $value);
-	}
-
-	/**
-	 * @brief Deletes the given key from the users's configuration.
-	 *
-	 * @param int    $uid The user_id
-	 * @param string $cat The category of the configuration value
-	 * @param string $key The configuration key to delete
-	 *
-	 * @return bool
-	 */
-	public static function delete(int $uid, string $cat, string $key)
-	{
-		return DI::pConfig()->delete($uid, $cat, $key);
-	}
-}
diff --git a/src/Core/UserImport.php b/src/Core/UserImport.php
index fdacd2b2bf..ae9bd944ce 100644
--- a/src/Core/UserImport.php
+++ b/src/Core/UserImport.php
@@ -159,7 +159,7 @@ class UserImport
 		}
 		$newuid = self::lastInsertId();
 
-		PConfig::set($newuid, 'system', 'previous_addr', $old_handle);
+		DI::pConfig()->set($newuid, 'system', 'previous_addr', $old_handle);
 
 		foreach ($account['profile'] as &$profile) {
 			foreach ($profile as $k => &$v) {
diff --git a/src/Model/Event.php b/src/Model/Event.php
index ec39cc7133..48544b06de 100644
--- a/src/Model/Event.php
+++ b/src/Model/Event.php
@@ -9,7 +9,6 @@ use Friendica\Content\Text\BBCode;
 use Friendica\Core\Hook;
 use Friendica\Core\L10n;
 use Friendica\Core\Logger;
-use Friendica\Core\PConfig;
 use Friendica\Core\Renderer;
 use Friendica\Core\System;
 use Friendica\Database\DBA;
@@ -379,7 +378,7 @@ class Event
 	public static function getStrings()
 	{
 		// First day of the week (0 = Sunday).
-		$firstDay = PConfig::get(local_user(), 'system', 'first_day_of_week', 0);
+		$firstDay = DI::pConfig()->get(local_user(), 'system', 'first_day_of_week', 0);
 
 		$i18n = [
 			"firstDay" => $firstDay,
diff --git a/src/Model/FileTag.php b/src/Model/FileTag.php
index f4d04634fa..ffcea7e281 100644
--- a/src/Model/FileTag.php
+++ b/src/Model/FileTag.php
@@ -6,8 +6,8 @@
 namespace Friendica\Model;
 
 use Friendica\Core\L10n;
-use Friendica\Core\PConfig;
 use Friendica\Database\DBA;
+use Friendica\DI;
 
 /**
  * @brief This class handles FileTag related functions
@@ -174,7 +174,7 @@ class FileTag
 			return true;
 		}
 
-		$saved = PConfig::get($uid, 'system', 'filetags');
+		$saved = DI::pConfig()->get($uid, 'system', 'filetags');
 
 		if (strlen($saved)) {
 			if ($type == 'file') {
@@ -222,12 +222,12 @@ class FileTag
 			}
 
 			if ($saved != $filetags_updated) {
-				PConfig::set($uid, 'system', 'filetags', $filetags_updated);
+				DI::pConfig()->set($uid, 'system', 'filetags', $filetags_updated);
 			}
 
 			return true;
 		} elseif (strlen($file_new)) {
-			PConfig::set($uid, 'system', 'filetags', $file_new);
+			DI::pConfig()->set($uid, 'system', 'filetags', $file_new);
 		}
 
 		return true;
@@ -256,10 +256,10 @@ class FileTag
 				Item::update($fields, ['id' => $item_id]);
 			}
 
-			$saved = PConfig::get($uid, 'system', 'filetags');
+			$saved = DI::pConfig()->get($uid, 'system', 'filetags');
 
 			if (!strlen($saved) || !stristr($saved, '[' . self::encode($file) . ']')) {
-				PConfig::set($uid, 'system', 'filetags', $saved . '[' . self::encode($file) . ']');
+				DI::pConfig()->set($uid, 'system', 'filetags', $saved . '[' . self::encode($file) . ']');
 			}
 
 			info(L10n::t('Item filed'));
@@ -311,8 +311,8 @@ class FileTag
 		);
 
 		if (!DBA::isResult($r)) {
-			$saved = PConfig::get($uid, 'system', 'filetags');
-			PConfig::set($uid, 'system', 'filetags', str_replace($pattern, '', $saved));
+			$saved = DI::pConfig()->get($uid, 'system', 'filetags');
+			DI::pConfig()->set($uid, 'system', 'filetags', str_replace($pattern, '', $saved));
 		}
 
 		return true;
diff --git a/src/Model/Item.php b/src/Model/Item.php
index 0fc1280c2b..94fe567f66 100644
--- a/src/Model/Item.php
+++ b/src/Model/Item.php
@@ -11,9 +11,7 @@ use Friendica\Content\Text\HTML;
 use Friendica\Core\Config;
 use Friendica\Core\Hook;
 use Friendica\Core\L10n;
-use Friendica\Core\Lock;
 use Friendica\Core\Logger;
-use Friendica\Core\PConfig;
 use Friendica\Core\Protocol;
 use Friendica\Core\Renderer;
 use Friendica\Core\Session;
@@ -3026,7 +3024,7 @@ class Item
 		 * $expire_network_only = save your own wall posts
 		 * and just expire conversations started by others
 		 */
-		$expire_network_only = PConfig::get($uid, 'expire', 'network_only', false);
+		$expire_network_only = DI::pConfig()->get($uid, 'expire', 'network_only', false);
 
 		if ($expire_network_only) {
 			$condition[0] .= " AND NOT `wall`";
@@ -3046,16 +3044,16 @@ class Item
 			return;
 		}
 
-		$expire_items = PConfig::get($uid, 'expire', 'items', true);
+		$expire_items = DI::pConfig()->get($uid, 'expire', 'items', true);
 
 		// Forcing expiring of items - but not notes and marked items
 		if ($force) {
 			$expire_items = true;
 		}
 
-		$expire_notes = PConfig::get($uid, 'expire', 'notes', true);
-		$expire_starred = PConfig::get($uid, 'expire', 'starred', true);
-		$expire_photos = PConfig::get($uid, 'expire', 'photos', false);
+		$expire_notes = DI::pConfig()->get($uid, 'expire', 'notes', true);
+		$expire_starred = DI::pConfig()->get($uid, 'expire', 'starred', true);
+		$expire_photos = DI::pConfig()->get($uid, 'expire', 'photos', false);
 
 		$expired = 0;
 
@@ -3525,7 +3523,7 @@ class Item
 		// Compile eventual content filter reasons
 		$filter_reasons = [];
 		if (!$is_preview && public_contact() != $item['author-id']) {
-			if (!empty($item['content-warning']) && (!local_user() || !PConfig::get(local_user(), 'system', 'disable_cw', false))) {
+			if (!empty($item['content-warning']) && (!local_user() || !DI::pConfig()->get(local_user(), 'system', 'disable_cw', false))) {
 				$filter_reasons[] = L10n::t('Content warning: %s', $item['content-warning']);
 			}
 
diff --git a/src/Model/ItemContent.php b/src/Model/ItemContent.php
index 136323385c..672631b7e8 100644
--- a/src/Model/ItemContent.php
+++ b/src/Model/ItemContent.php
@@ -7,8 +7,8 @@
 namespace Friendica\Model;
 
 use Friendica\Content\Text;
-use Friendica\Core\PConfig;
 use Friendica\Core\Protocol;
+use Friendica\DI;
 
 class ItemContent
 {
@@ -158,7 +158,7 @@ class ItemContent
 					$post['url'] = $item['plink'];
 				} elseif (strpos($item['body'], '[share') !== false) {
 					$post['url'] = $item['plink'];
-				} elseif (PConfig::get($item['uid'], 'system', 'no_intelligent_shortening')) {
+				} elseif (DI::pConfig()->get($item['uid'], 'system', 'no_intelligent_shortening')) {
 					$post['url'] = $item['plink'];
 				}
 				$msg = Text\Plaintext::shorten($msg, $limit);
diff --git a/src/Model/Profile.php b/src/Model/Profile.php
index 80c8481bf4..1a99d4a185 100644
--- a/src/Model/Profile.php
+++ b/src/Model/Profile.php
@@ -15,7 +15,6 @@ use Friendica\Core\Config;
 use Friendica\Core\Hook;
 use Friendica\Core\L10n;
 use Friendica\Core\Logger;
-use Friendica\Core\PConfig;
 use Friendica\Core\Protocol;
 use Friendica\Core\Renderer;
 use Friendica\Core\Session;
@@ -184,12 +183,12 @@ class Profile
 		$a->profile = $pdata;
 		$a->profile_uid = $pdata['profile_uid'];
 
-		$a->profile['mobile-theme'] = PConfig::get($a->profile['profile_uid'], 'system', 'mobile_theme');
+		$a->profile['mobile-theme'] = DI::pConfig()->get($a->profile['profile_uid'], 'system', 'mobile_theme');
 		$a->profile['network'] = Protocol::DFRN;
 
 		DI::page()['title'] = $a->profile['name'] . ' @ ' . Config::get('config', 'sitename');
 
-		if (!$profiledata && !PConfig::get(local_user(), 'system', 'always_my_theme')) {
+		if (!$profiledata && !DI::pConfig()->get(local_user(), 'system', 'always_my_theme')) {
 			$a->setCurrentTheme($a->profile['theme']);
 			$a->setCurrentMobileTheme($a->profile['mobile-theme']);
 		}
@@ -1218,7 +1217,7 @@ class Profile
 	public static function getThemeUid(App $a)
 	{
 		$uid = !empty($a->profile_uid) ? intval($a->profile_uid) : 0;
-		if (local_user() && (PConfig::get(local_user(), 'system', 'always_my_theme') || !$uid)) {
+		if (local_user() && (DI::pConfig()->get(local_user(), 'system', 'always_my_theme') || !$uid)) {
 			return local_user();
 		}
 
diff --git a/src/Model/User.php b/src/Model/User.php
index b2b60d4362..f19ebc03c5 100644
--- a/src/Model/User.php
+++ b/src/Model/User.php
@@ -13,7 +13,6 @@ use Friendica\Core\Config;
 use Friendica\Core\Hook;
 use Friendica\Core\L10n;
 use Friendica\Core\Logger;
-use Friendica\Core\PConfig;
 use Friendica\Core\Protocol;
 use Friendica\Core\System;
 use Friendica\Core\Worker;
@@ -275,7 +274,7 @@ class User
 		$default_group = 0;
 
 		if ($network == Protocol::OSTATUS) {
-			$default_group = PConfig::get($uid, "ostatus", "default_group");
+			$default_group = DI::pConfig()->get($uid, "ostatus", "default_group");
 		}
 
 		if ($default_group != 0) {
@@ -326,7 +325,7 @@ class User
 	{
 		$user = self::getAuthenticationInfo($user_info);
 
-		if ($third_party && PConfig::get($user['uid'], '2fa', 'verified')) {
+		if ($third_party && DI::pConfig()->get($user['uid'], '2fa', 'verified')) {
 			// Third-party apps can't verify two-factor authentication, we use app-specific passwords instead
 			if (AppSpecificPassword::authenticateUser($user['uid'], $password)) {
 				return $user['uid'];
diff --git a/src/Module/Filer/SaveTag.php b/src/Module/Filer/SaveTag.php
index 93f683744e..0b6a41ae22 100644
--- a/src/Module/Filer/SaveTag.php
+++ b/src/Module/Filer/SaveTag.php
@@ -4,7 +4,6 @@ namespace Friendica\Module\Filer;
 
 use Friendica\BaseModule;
 use Friendica\Core\L10n;
-use Friendica\Core\PConfig;
 use Friendica\Core\Renderer;
 use Friendica\DI;
 use Friendica\Model;
@@ -41,7 +40,7 @@ class SaveTag extends BaseModule
 		}
 
 		// return filer dialog
-		$filetags = PConfig::get(local_user(), 'system', 'filetags', '');
+		$filetags = DI::pConfig()->get(local_user(), 'system', 'filetags', '');
 		$filetags = Model\FileTag::fileToArray($filetags);
 
 		$tpl = Renderer::getMarkupTemplate("filer_dialog.tpl");
diff --git a/src/Module/Group.php b/src/Module/Group.php
index ccb4f8bdf8..6542cc74a8 100644
--- a/src/Module/Group.php
+++ b/src/Module/Group.php
@@ -8,7 +8,6 @@ namespace Friendica\Module;
 use Friendica\BaseModule;
 use Friendica\Core\Config;
 use Friendica\Core\L10n;
-use Friendica\Core\PConfig;
 use Friendica\Core\Renderer;
 use Friendica\Core\System;
 use Friendica\Database\DBA;
@@ -146,7 +145,7 @@ class Group extends BaseModule
 		}
 
 		// Switch to text mode interface if we have more than 'n' contacts or group members
-		$switchtotext = PConfig::get(local_user(), 'system', 'groupedit_image_limit');
+		$switchtotext = DI::pConfig()->get(local_user(), 'system', 'groupedit_image_limit');
 		if (is_null($switchtotext)) {
 			$switchtotext = Config::get('system', 'groupedit_image_limit', 200);
 		}
diff --git a/src/Module/Invite.php b/src/Module/Invite.php
index 67d26f6fa7..b06efc5a2a 100644
--- a/src/Module/Invite.php
+++ b/src/Module/Invite.php
@@ -4,7 +4,6 @@ namespace Friendica\Module;
 
 use Friendica\BaseModule;
 use Friendica\Core\L10n;
-use Friendica\Core\PConfig;
 use Friendica\Core\Renderer;
 use Friendica\DI;
 use Friendica\Model;
@@ -33,7 +32,7 @@ class Invite extends BaseModule
 			$max_invites = 50;
 		}
 
-		$current_invites = intval(PConfig::get(local_user(), 'system', 'sent_invites'));
+		$current_invites = intval(DI::pConfig()->get(local_user(), 'system', 'sent_invites'));
 		if ($current_invites > $max_invites) {
 			throw new HTTPException\ForbiddenException(L10n::t('Total invitation limit exceeded.'));
 		}
@@ -48,7 +47,7 @@ class Invite extends BaseModule
 
 		if ($config->get('system', 'invitation_only')) {
 			$invitation_only = true;
-			$invites_remaining = PConfig::get(local_user(), 'system', 'invites_remaining');
+			$invites_remaining = DI::pConfig()->get(local_user(), 'system', 'invites_remaining');
 			if ((!$invites_remaining) && (!is_site_admin())) {
 				throw new HTTPException\ForbiddenException();
 			}
@@ -69,7 +68,7 @@ class Invite extends BaseModule
 				if (!is_site_admin()) {
 					$invites_remaining--;
 					if ($invites_remaining >= 0) {
-						PConfig::set(local_user(), 'system', 'invites_remaining', $invites_remaining);
+						DI::pConfig()->set(local_user(), 'system', 'invites_remaining', $invites_remaining);
 					} else {
 						return;
 					}
@@ -92,7 +91,7 @@ class Invite extends BaseModule
 			if ($res) {
 				$total++;
 				$current_invites++;
-				PConfig::set(local_user(), 'system', 'sent_invites', $current_invites);
+				DI::pConfig()->set(local_user(), 'system', 'sent_invites', $current_invites);
 				if ($current_invites > $max_invites) {
 					notice(L10n::t('Invitation limit exceeded. Please contact your site administrator.') . EOL);
 					return;
@@ -118,7 +117,7 @@ class Invite extends BaseModule
 
 		if ($config->get('system', 'invitation_only')) {
 			$inviteOnly = true;
-			$x = PConfig::get(local_user(), 'system', 'invites_remaining');
+			$x = DI::pConfig()->get(local_user(), 'system', 'invites_remaining');
 			if ((!$x) && (!is_site_admin())) {
 				throw new HTTPException\ForbiddenException(L10n::t('You have no more invitations available'));
 			}
diff --git a/src/Module/Profile.php b/src/Module/Profile.php
index 6261ed955d..3dc35cb2dd 100644
--- a/src/Module/Profile.php
+++ b/src/Module/Profile.php
@@ -10,19 +10,15 @@ use Friendica\Core\ACL;
 use Friendica\Core\Config;
 use Friendica\Core\Hook;
 use Friendica\Core\L10n;
-use Friendica\Core\PConfig;
 use Friendica\Core\Session;
 use Friendica\Core\System;
 use Friendica\Database\DBA;
 use Friendica\DI;
-use Friendica\Model\Contact as ContactModel;
-use Friendica\Model\Group;
 use Friendica\Model\Item;
 use Friendica\Model\Profile as ProfileModel;
 use Friendica\Model\User;
 use Friendica\Module\Security\Login;
 use Friendica\Protocol\ActivityPub;
-use Friendica\Protocol\DFRN;
 use Friendica\Util\DateTimeFormat;
 use Friendica\Util\Security;
 use Friendica\Util\Strings;
@@ -293,9 +289,9 @@ class Profile extends BaseModule
 			//  check if we serve a mobile device and get the user settings
 			//  accordingly
 			if (DI::mode()->isMobile()) {
-				$itemspage_network = PConfig::get(local_user(), 'system', 'itemspage_mobile_network', 10);
+				$itemspage_network = DI::pConfig()->get(local_user(), 'system', 'itemspage_mobile_network', 10);
 			} else {
-				$itemspage_network = PConfig::get(local_user(), 'system', 'itemspage_network', 20);
+				$itemspage_network = DI::pConfig()->get(local_user(), 'system', 'itemspage_network', 20);
 			}
 
 			//  now that we have the user settings, see if the theme forces
diff --git a/src/Module/Register.php b/src/Module/Register.php
index 2ea4373b9b..9341061156 100644
--- a/src/Module/Register.php
+++ b/src/Module/Register.php
@@ -2,7 +2,6 @@
 
 namespace Friendica\Module;
 
-use Friendica\App\BaseURL;
 use Friendica\BaseModule;
 use Friendica\Content\Text\BBCode;
 use Friendica\Core\Config;
@@ -10,7 +9,6 @@ use Friendica\Core\Hook;
 use Friendica\Core\L10n;
 use Friendica\Core\L10n\L10n as L10nClass;
 use Friendica\Core\Logger;
-use Friendica\Core\PConfig;
 use Friendica\Core\Renderer;
 use Friendica\Core\Worker;
 use Friendica\Database\DBA;
@@ -293,7 +291,7 @@ class Register extends BaseModule
 		if (intval(Config::get('config', 'register_policy')) === self::OPEN) {
 			if ($using_invites && $invite_id) {
 				Model\Register::deleteByHash($invite_id);
-				PConfig::set($user['uid'], 'system', 'invites_remaining', $num_invites);
+				DI::pConfig()->set($user['uid'], 'system', 'invites_remaining', $num_invites);
 			}
 
 			// Only send a password mail when the password wasn't manually provided
@@ -339,7 +337,7 @@ class Register extends BaseModule
 			// invite system
 			if ($using_invites && $invite_id) {
 				Model\Register::deleteByHash($invite_id);
-				PConfig::set($user['uid'], 'system', 'invites_remaining', $num_invites);
+				DI::pConfig()->set($user['uid'], 'system', 'invites_remaining', $num_invites);
 			}
 
 			// send email to admins
diff --git a/src/Module/Security/TwoFactor/Verify.php b/src/Module/Security/TwoFactor/Verify.php
index 8fc647472d..c00c8abe58 100644
--- a/src/Module/Security/TwoFactor/Verify.php
+++ b/src/Module/Security/TwoFactor/Verify.php
@@ -3,9 +3,7 @@
 namespace Friendica\Module\Security\TwoFactor;
 
 use Friendica\BaseModule;
-use Friendica\App\Authentication;
 use Friendica\Core\L10n;
-use Friendica\Core\PConfig;
 use Friendica\Core\Renderer;
 use Friendica\Core\Session;
 use Friendica\DI;
@@ -33,7 +31,7 @@ class Verify extends BaseModule
 
 			$code = $_POST['verify_code'] ?? '';
 
-			$valid = (new Google2FA())->verifyKey(PConfig::get(local_user(), '2fa', 'secret'), $code);
+			$valid = (new Google2FA())->verifyKey(DI::pConfig()->get(local_user(), '2fa', 'secret'), $code);
 
 			// The same code can't be used twice even if it's valid
 			if ($valid && Session::get('2fa') !== $code) {
diff --git a/src/Module/Settings/TwoFactor/AppSpecific.php b/src/Module/Settings/TwoFactor/AppSpecific.php
index a303862712..d87247346e 100644
--- a/src/Module/Settings/TwoFactor/AppSpecific.php
+++ b/src/Module/Settings/TwoFactor/AppSpecific.php
@@ -1,11 +1,8 @@
 <?php
 
-
 namespace Friendica\Module\Settings\TwoFactor;
 
-
 use Friendica\Core\L10n;
-use Friendica\Core\PConfig;
 use Friendica\Core\Renderer;
 use Friendica\DI;
 use Friendica\Model\TwoFactor\AppSpecificPassword;
@@ -27,7 +24,7 @@ class AppSpecific extends BaseSettingsModule
 			return;
 		}
 
-		$verified = PConfig::get(local_user(), '2fa', 'verified');
+		$verified = DI::pConfig()->get(local_user(), '2fa', 'verified');
 
 		if (!$verified) {
 			DI::baseUrl()->redirect('settings/2fa');
diff --git a/src/Module/Settings/TwoFactor/Index.php b/src/Module/Settings/TwoFactor/Index.php
index 06e0e66d51..df06333fce 100644
--- a/src/Module/Settings/TwoFactor/Index.php
+++ b/src/Module/Settings/TwoFactor/Index.php
@@ -1,11 +1,8 @@
 <?php
 
-
 namespace Friendica\Module\Settings\TwoFactor;
 
-
 use Friendica\Core\L10n;
-use Friendica\Core\PConfig;
 use Friendica\Core\Renderer;
 use Friendica\Core\Session;
 use Friendica\DI;
@@ -29,15 +26,15 @@ class Index extends BaseSettingsModule
 		try {
 			User::getIdFromPasswordAuthentication(local_user(), $_POST['password'] ?? '');
 
-			$has_secret = (bool) PConfig::get(local_user(), '2fa', 'secret');
-			$verified = PConfig::get(local_user(), '2fa', 'verified');
+			$has_secret = (bool) DI::pConfig()->get(local_user(), '2fa', 'secret');
+			$verified = DI::pConfig()->get(local_user(), '2fa', 'verified');
 
 			switch ($_POST['action'] ?? '') {
 				case 'enable':
 					if (!$has_secret && !$verified) {
 						$Google2FA = new Google2FA();
 
-						PConfig::set(local_user(), '2fa', 'secret', $Google2FA->generateSecretKey(32));
+						DI::pConfig()->set(local_user(), '2fa', 'secret', $Google2FA->generateSecretKey(32));
 
 						DI::baseUrl()->redirect('settings/2fa/recovery?t=' . self::getFormSecurityToken('settings_2fa_password'));
 					}
@@ -45,8 +42,8 @@ class Index extends BaseSettingsModule
 				case 'disable':
 					if ($has_secret) {
 						RecoveryCode::deleteForUser(local_user());
-						PConfig::delete(local_user(), '2fa', 'secret');
-						PConfig::delete(local_user(), '2fa', 'verified');
+						DI::pConfig()->delete(local_user(), '2fa', 'secret');
+						DI::pConfig()->delete(local_user(), '2fa', 'verified');
 						Session::remove('2fa');
 
 						notice(L10n::t('Two-factor authentication successfully disabled.'));
@@ -82,8 +79,8 @@ class Index extends BaseSettingsModule
 
 		parent::content($parameters);
 
-		$has_secret = (bool) PConfig::get(local_user(), '2fa', 'secret');
-		$verified = PConfig::get(local_user(), '2fa', 'verified');
+		$has_secret = (bool) DI::pConfig()->get(local_user(), '2fa', 'secret');
+		$verified = DI::pConfig()->get(local_user(), '2fa', 'verified');
 
 		return Renderer::replaceMacros(Renderer::getMarkupTemplate('settings/twofactor/index.tpl'), [
 			'$form_security_token' => self::getFormSecurityToken('settings_2fa'),
diff --git a/src/Module/Settings/TwoFactor/Recovery.php b/src/Module/Settings/TwoFactor/Recovery.php
index 492b96635b..604eca4802 100644
--- a/src/Module/Settings/TwoFactor/Recovery.php
+++ b/src/Module/Settings/TwoFactor/Recovery.php
@@ -1,11 +1,8 @@
 <?php
 
-
 namespace Friendica\Module\Settings\TwoFactor;
 
-
 use Friendica\Core\L10n;
-use Friendica\Core\PConfig;
 use Friendica\Core\Renderer;
 use Friendica\DI;
 use Friendica\Model\TwoFactor\RecoveryCode;
@@ -25,7 +22,7 @@ class Recovery extends BaseSettingsModule
 			return;
 		}
 
-		$secret = PConfig::get(local_user(), '2fa', 'secret');
+		$secret = DI::pConfig()->get(local_user(), '2fa', 'secret');
 
 		if (!$secret) {
 			DI::baseUrl()->redirect('settings/2fa');
@@ -68,7 +65,7 @@ class Recovery extends BaseSettingsModule
 
 		$recoveryCodes = RecoveryCode::getListForUser(local_user());
 
-		$verified = PConfig::get(local_user(), '2fa', 'verified');
+		$verified = DI::pConfig()->get(local_user(), '2fa', 'verified');
 		
 		return Renderer::replaceMacros(Renderer::getMarkupTemplate('settings/twofactor/recovery.tpl'), [
 			'$form_security_token'     => self::getFormSecurityToken('settings_2fa_recovery'),
diff --git a/src/Module/Settings/TwoFactor/Verify.php b/src/Module/Settings/TwoFactor/Verify.php
index 96feab825a..8371064c39 100644
--- a/src/Module/Settings/TwoFactor/Verify.php
+++ b/src/Module/Settings/TwoFactor/Verify.php
@@ -1,16 +1,12 @@
 <?php
 
-
 namespace Friendica\Module\Settings\TwoFactor;
 
-
 use BaconQrCode\Renderer\Image\SvgImageBackEnd;
 use BaconQrCode\Renderer\ImageRenderer;
 use BaconQrCode\Renderer\RendererStyle\RendererStyle;
 use BaconQrCode\Writer;
-use Friendica\BaseModule;
 use Friendica\Core\L10n;
-use Friendica\Core\PConfig;
 use Friendica\Core\Renderer;
 use Friendica\Core\Session;
 use Friendica\DI;
@@ -31,8 +27,8 @@ class Verify extends BaseSettingsModule
 			return;
 		}
 
-		$secret = PConfig::get(local_user(), '2fa', 'secret');
-		$verified = PConfig::get(local_user(), '2fa', 'verified');
+		$secret = DI::pConfig()->get(local_user(), '2fa', 'secret');
+		$verified = DI::pConfig()->get(local_user(), '2fa', 'verified');
 
 		if ($secret && $verified) {
 			DI::baseUrl()->redirect('settings/2fa');
@@ -55,10 +51,10 @@ class Verify extends BaseSettingsModule
 
 			$google2fa = new Google2FA();
 
-			$valid = $google2fa->verifyKey(PConfig::get(local_user(), '2fa', 'secret'), $_POST['verify_code'] ?? '');
+			$valid = $google2fa->verifyKey(DI::pConfig()->get(local_user(), '2fa', 'secret'), $_POST['verify_code'] ?? '');
 
 			if ($valid) {
-				PConfig::set(local_user(), '2fa', 'verified', true);
+				DI::pConfig()->set(local_user(), '2fa', 'verified', true);
 				Session::set('2fa', true);
 
 				notice(L10n::t('Two-factor authentication successfully activated.'));
@@ -80,7 +76,7 @@ class Verify extends BaseSettingsModule
 
 		$company = 'Friendica';
 		$holder = Session::get('my_address');
-		$secret = PConfig::get(local_user(), '2fa', 'secret');
+		$secret = DI::pConfig()->get(local_user(), '2fa', 'secret');
 
 		$otpauthUrl = (new Google2FA())->getQRCodeUrl($company, $holder, $secret);
 
diff --git a/src/Object/Post.php b/src/Object/Post.php
index fd99a206de..2df5e9a36a 100644
--- a/src/Object/Post.php
+++ b/src/Object/Post.php
@@ -11,7 +11,6 @@ use Friendica\Core\Config;
 use Friendica\Core\Hook;
 use Friendica\Core\L10n;
 use Friendica\Core\Logger;
-use Friendica\Core\PConfig;
 use Friendica\Core\Protocol;
 use Friendica\Core\Renderer;
 use Friendica\Core\Session;
@@ -348,7 +347,7 @@ class Post
 		$text_e       = strip_tags($body);
 		$name_e       = $profile_name;
 
-		if (!empty($item['content-warning']) && PConfig::get(local_user(), 'system', 'disable_cw', false)) {
+		if (!empty($item['content-warning']) && DI::pConfig()->get(local_user(), 'system', 'disable_cw', false)) {
 			$title_e = ucfirst($item['content-warning']);
 		} else {
 			$title_e = $item['title'];
@@ -874,7 +873,7 @@ class Post
 			 * This should be better if done by a hook
 			 */
 			if (Addon::isEnabled('qcomment')) {
-				$qc = ((local_user()) ? PConfig::get(local_user(), 'qcomment', 'words') : null);
+				$qc = ((local_user()) ? DI::pConfig()->get(local_user(), 'qcomment', 'words') : null);
 				$qcomment = (($qc) ? explode("\n", $qc) : null);
 			}
 
diff --git a/src/Protocol/ActivityPub/Processor.php b/src/Protocol/ActivityPub/Processor.php
index ca8d6478d7..89abac6c94 100644
--- a/src/Protocol/ActivityPub/Processor.php
+++ b/src/Protocol/ActivityPub/Processor.php
@@ -8,9 +8,9 @@ use Friendica\Content\Text\BBCode;
 use Friendica\Content\Text\HTML;
 use Friendica\Core\Config;
 use Friendica\Core\Logger;
-use Friendica\Core\PConfig;
 use Friendica\Core\Protocol;
 use Friendica\Database\DBA;
+use Friendica\DI;
 use Friendica\Model\APContact;
 use Friendica\Model\Contact;
 use Friendica\Model\Event;
@@ -462,7 +462,7 @@ class Processor
 				continue;
 			}
 
-			if (PConfig::get($receiver, 'system', 'accept_only_sharer', false) && ($receiver != 0) && ($item['gravity'] == GRAVITY_PARENT)) {
+			if (DI::pConfig()->get($receiver, 'system', 'accept_only_sharer', false) && ($receiver != 0) && ($item['gravity'] == GRAVITY_PARENT)) {
 				$skip = !Contact::isSharingByURL($activity['author'], $receiver);
 
 				if ($skip && (($activity['type'] == 'as:Announce') || $isForum)) {
diff --git a/src/Protocol/Diaspora.php b/src/Protocol/Diaspora.php
index 73f6f85f80..15f9fa3d12 100644
--- a/src/Protocol/Diaspora.php
+++ b/src/Protocol/Diaspora.php
@@ -17,7 +17,6 @@ use Friendica\Core\Cache\Duration;
 use Friendica\Core\Config;
 use Friendica\Core\L10n;
 use Friendica\Core\Logger;
-use Friendica\Core\PConfig;
 use Friendica\Core\Protocol;
 use Friendica\Core\System;
 use Friendica\Core\Worker;
@@ -3290,7 +3289,7 @@ class Diaspora
 	 */
 	public static function sendAccountMigration(array $owner, array $contact, $uid)
 	{
-		$old_handle = PConfig::get($uid, 'system', 'previous_addr');
+		$old_handle = DI::pConfig()->get($uid, 'system', 'previous_addr');
 		$profile = self::createProfileData($uid);
 
 		$signed_text = 'AccountMigration:'.$old_handle.':'.$profile['author'];
@@ -3551,7 +3550,7 @@ class Diaspora
 			$body = $item["body"];
 
 			// Fetch the title from an attached link - if there is one
-			if (empty($item["title"]) && PConfig::get($owner['uid'], 'system', 'attach_link_title')) {
+			if (empty($item["title"]) && DI::pConfig()->get($owner['uid'], 'system', 'attach_link_title')) {
 				$page_data = BBCode::getAttachmentData($item['body']);
 				if (!empty($page_data['type']) && !empty($page_data['title']) && ($page_data['type'] == 'link')) {
 					$title = $page_data['title'];
diff --git a/src/Protocol/OStatus.php b/src/Protocol/OStatus.php
index 29adcfcc53..66f003eec2 100644
--- a/src/Protocol/OStatus.php
+++ b/src/Protocol/OStatus.php
@@ -12,7 +12,6 @@ use Friendica\Core\Cache\Duration;
 use Friendica\Core\Config;
 use Friendica\Core\L10n;
 use Friendica\Core\Logger;
-use Friendica\Core\PConfig;
 use Friendica\Core\Protocol;
 use Friendica\Database\DBA;
 use Friendica\DI;
@@ -493,7 +492,7 @@ class OStatus
 
 					if (!$valid) {
 						// If not, then it depends on this setting
-						$valid = ((self::$itemlist[0]['uid'] == 0) || !PConfig::get(self::$itemlist[0]['uid'], 'system', 'accept_only_sharer', false));
+						$valid = ((self::$itemlist[0]['uid'] == 0) || !DI::pConfig()->get(self::$itemlist[0]['uid'], 'system', 'accept_only_sharer', false));
 						if ($valid) {
 							Logger::log("Item with uri ".self::$itemlist[0]['uri']." will be imported due to the system settings.", Logger::DEBUG);
 						}
diff --git a/src/Util/Emailer.php b/src/Util/Emailer.php
index d7ca234a98..0da917033a 100644
--- a/src/Util/Emailer.php
+++ b/src/Util/Emailer.php
@@ -7,7 +7,6 @@ namespace Friendica\Util;
 use Friendica\Core\Config;
 use Friendica\Core\Hook;
 use Friendica\Core\Logger;
-use Friendica\Core\PConfig;
 use Friendica\Protocol\Email;
 
 /**
@@ -44,7 +43,7 @@ class Emailer
 
 		$email_textonly = false;
 		if (!empty($params['uid'])) {
-			$email_textonly = PConfig::get($params['uid'], "system", "email_textonly");
+			$email_textonly = DI::pConfig()->get($params['uid'], "system", "email_textonly");
 		}
 
 		$fromName = Email::encodeHeader(html_entity_decode($params['fromName'], ENT_QUOTES, 'UTF-8'), 'UTF-8');
diff --git a/src/Util/ExAuth.php b/src/Util/ExAuth.php
index cf98312aa3..9644bf9d18 100644
--- a/src/Util/ExAuth.php
+++ b/src/Util/ExAuth.php
@@ -35,7 +35,6 @@
 namespace Friendica\Util;
 
 use Friendica\Core\Config;
-use Friendica\Core\PConfig;
 use Friendica\Database\DBA;
 use Friendica\DI;
 use Friendica\Model\User;
@@ -234,7 +233,7 @@ class ExAuth
 			}
 			if ($Error) {
 				$this->writeLog(LOG_INFO, 'check against alternate password for ' . $sUser . '@' . $aCommand[2]);
-				$sPassword = PConfig::get($uid, 'xmpp', 'password', null, true);
+				$sPassword = DI::pConfig()->get($uid, 'xmpp', 'password', null, true);
 				$Error = ($aCommand[3] != $sPassword);
 			}
 		} else {
diff --git a/src/Util/Temporal.php b/src/Util/Temporal.php
index 6a331104ee..b19bfa05bb 100644
--- a/src/Util/Temporal.php
+++ b/src/Util/Temporal.php
@@ -9,7 +9,6 @@ namespace Friendica\Util;
 use DateTime;
 use DateTimeZone;
 use Friendica\Core\L10n;
-use Friendica\Core\PConfig;
 use Friendica\Core\Renderer;
 use Friendica\Database\DBA;
 
@@ -218,7 +217,7 @@ class Temporal
 		$required = false)
 	{
 		// First day of the week (0 = Sunday)
-		$firstDay = PConfig::get(local_user(), 'system', 'first_day_of_week', 0);
+		$firstDay = DI::pConfig()->get(local_user(), 'system', 'first_day_of_week', 0);
 
 		$lang = substr(L10n::getCurrentLang(), 0, 2);
 
diff --git a/src/Worker/OnePoll.php b/src/Worker/OnePoll.php
index b557f4ea3d..0d12e40d9b 100644
--- a/src/Worker/OnePoll.php
+++ b/src/Worker/OnePoll.php
@@ -6,9 +6,9 @@ namespace Friendica\Worker;
 
 use Friendica\Core\Config;
 use Friendica\Core\Logger;
-use Friendica\Core\PConfig;
 use Friendica\Core\Protocol;
 use Friendica\Database\DBA;
+use Friendica\DI;
 use Friendica\Model\Contact;
 use Friendica\Model\Item;
 use Friendica\Model\User;
@@ -641,7 +641,7 @@ class OnePoll
 						$datarray['private'] = 1;
 					}
 
-					if (!PConfig::get($importer_uid, 'system', 'allow_public_email_replies')) {
+					if (!DI::pConfig()->get($importer_uid, 'system', 'allow_public_email_replies')) {
 						$datarray['private'] = 1;
 						$datarray['allow_cid'] = '<' . $contact['id'] . '>';
 					}
diff --git a/update.php b/update.php
index 55fd82b2ed..6c902ab851 100644
--- a/update.php
+++ b/update.php
@@ -4,10 +4,10 @@ use Friendica\Core\Addon;
 use Friendica\Core\Config;
 use Friendica\Core\L10n;
 use Friendica\Core\Logger;
-use Friendica\Core\PConfig;
 use Friendica\Core\Update;
 use Friendica\Core\Worker;
 use Friendica\Database\DBA;
+use Friendica\DI;
 use Friendica\Model\Contact;
 use Friendica\Model\GContact;
 use Friendica\Model\Item;
@@ -134,23 +134,23 @@ function update_1191()
 			$value = $rr['v'];
 
 			if ($key === 'randomise') {
-				PConfig::delete($uid, $family, $key);
+				DI::pConfig()->delete($uid, $family, $key);
 			}
 
 			if ($key === 'show_on_profile') {
 				if ($value) {
-					PConfig::set($uid, feature, forumlist_profile, $value);
+					DI::pConfig()->set($uid, feature, forumlist_profile, $value);
 				}
 
-				PConfig::delete($uid, $family, $key);
+				DI::pConfig()->delete($uid, $family, $key);
 			}
 
 			if ($key === 'show_on_network') {
 				if ($value) {
-					PConfig::set($uid, feature, forumlist_widget, $value);
+					DI::pConfig()->set($uid, feature, forumlist_widget, $value);
 				}
 
-				PConfig::delete($uid, $family, $key);
+				DI::pConfig()->delete($uid, $family, $key);
 			}
 		}
 	}
diff --git a/view/theme/duepuntozero/config.php b/view/theme/duepuntozero/config.php
index cd04455512..574e25648e 100644
--- a/view/theme/duepuntozero/config.php
+++ b/view/theme/duepuntozero/config.php
@@ -6,9 +6,8 @@
 use Friendica\App;
 use Friendica\Core\Config;
 use Friendica\Core\L10n;
-use Friendica\Core\PConfig;
 use Friendica\Core\Renderer;
-use Friendica\Core\System;
+use Friendica\DI;
 
 function theme_content(App $a)
 {
@@ -16,7 +15,7 @@ function theme_content(App $a)
 		return;
 	}
 
-	$colorset = PConfig::get(local_user(), 'duepuntozero', 'colorset');
+	$colorset = DI::pConfig()->get(local_user(), 'duepuntozero', 'colorset');
 	$user = true;
 
 	return clean_form($a, $colorset, $user);
@@ -29,7 +28,7 @@ function theme_post(App $a)
 	}
 
 	if (isset($_POST['duepuntozero-settings-submit'])) {
-		PConfig::set(local_user(), 'duepuntozero', 'colorset', $_POST['duepuntozero_colorset']);
+		DI::pConfig()->set(local_user(), 'duepuntozero', 'colorset', $_POST['duepuntozero_colorset']);
 	}
 }
 
@@ -62,7 +61,7 @@ function clean_form(App $a, &$colorset, $user)
 	];
 
 	if ($user) {
-		$color = PConfig::get(local_user(), 'duepuntozero', 'colorset');
+		$color = DI::pConfig()->get(local_user(), 'duepuntozero', 'colorset');
 	} else {
 		$color = Config::get('duepuntozero', 'colorset');
 	}
diff --git a/view/theme/duepuntozero/style.php b/view/theme/duepuntozero/style.php
index 2758ada414..189d5ac400 100644
--- a/view/theme/duepuntozero/style.php
+++ b/view/theme/duepuntozero/style.php
@@ -3,8 +3,7 @@
  * @file view/theme/duepuntozero/style.php
  */
 use Friendica\Core\Config;
-use Friendica\Core\PConfig;
-use Friendica\Model\Profile;
+use Friendica\DI;
 
 if (file_exists("$THEMEPATH/style.css")) {
 	echo file_get_contents("$THEMEPATH/style.css");
@@ -13,7 +12,7 @@ if (file_exists("$THEMEPATH/style.css")) {
 $uid = $_REQUEST['puid'] ?? 0;
 
 $s_colorset = Config::get('duepuntozero', 'colorset');
-$colorset = PConfig::get($uid, 'duepuntozero', 'colorset');
+$colorset = DI::pConfig()->get($uid, 'duepuntozero', 'colorset');
 
 if (empty($colorset)) {
 	$colorset = $s_colorset;
diff --git a/view/theme/duepuntozero/theme.php b/view/theme/duepuntozero/theme.php
index 5ee2e2bcfb..77eb38e8a1 100644
--- a/view/theme/duepuntozero/theme.php
+++ b/view/theme/duepuntozero/theme.php
@@ -2,7 +2,6 @@
 
 use Friendica\App;
 use Friendica\Core\Config;
-use Friendica\Core\PConfig;
 use Friendica\Core\Renderer;
 use Friendica\DI;
 
@@ -10,7 +9,7 @@ function duepuntozero_init(App $a) {
 
 Renderer::setActiveTemplateEngine('smarty3');
 
-    $colorset = PConfig::get( local_user(), 'duepuntozero','colorset');
+    $colorset = DI::pConfig()->get( local_user(), 'duepuntozero','colorset');
     if (!$colorset)
        $colorset = Config::get('duepuntozero', 'colorset');          // user setting have priority, then node settings
     if ($colorset) {
diff --git a/view/theme/frio/config.php b/view/theme/frio/config.php
index 125081235c..899cbfbc18 100644
--- a/view/theme/frio/config.php
+++ b/view/theme/frio/config.php
@@ -3,9 +3,8 @@
 use Friendica\App;
 use Friendica\Core\Config;
 use Friendica\Core\L10n;
-use Friendica\Core\PConfig;
 use Friendica\Core\Renderer;
-use Friendica\Core\System;
+use Friendica\DI;
 
 require_once 'view/theme/frio/php/Image.php';
 
@@ -16,16 +15,16 @@ function theme_post(App $a)
 	}
 
 	if (isset($_POST['frio-settings-submit'])) {
-		PConfig::set(local_user(), 'frio', 'scheme',           $_POST['frio_scheme']           ?? '');
-		PConfig::set(local_user(), 'frio', 'nav_bg',           $_POST['frio_nav_bg']           ?? '');
-		PConfig::set(local_user(), 'frio', 'nav_icon_color',   $_POST['frio_nav_icon_color']   ?? '');
-		PConfig::set(local_user(), 'frio', 'link_color',       $_POST['frio_link_color']       ?? '');
-		PConfig::set(local_user(), 'frio', 'background_color', $_POST['frio_background_color'] ?? '');
-		PConfig::set(local_user(), 'frio', 'contentbg_transp', $_POST['frio_contentbg_transp'] ?? '');
-		PConfig::set(local_user(), 'frio', 'background_image', $_POST['frio_background_image'] ?? '');
-		PConfig::set(local_user(), 'frio', 'bg_image_option',  $_POST['frio_bg_image_option']  ?? '');
-		PConfig::set(local_user(), 'frio', 'css_modified',     time());
-		PConfig::set(local_user(), 'frio', 'enable_compose',   $_POST['frio_enable_compose']   ?? 0);
+		DI::pConfig()->set(local_user(), 'frio', 'scheme',           $_POST['frio_scheme']           ?? '');
+		DI::pConfig()->set(local_user(), 'frio', 'nav_bg',           $_POST['frio_nav_bg']           ?? '');
+		DI::pConfig()->set(local_user(), 'frio', 'nav_icon_color',   $_POST['frio_nav_icon_color']   ?? '');
+		DI::pConfig()->set(local_user(), 'frio', 'link_color',       $_POST['frio_link_color']       ?? '');
+		DI::pConfig()->set(local_user(), 'frio', 'background_color', $_POST['frio_background_color'] ?? '');
+		DI::pConfig()->set(local_user(), 'frio', 'contentbg_transp', $_POST['frio_contentbg_transp'] ?? '');
+		DI::pConfig()->set(local_user(), 'frio', 'background_image', $_POST['frio_background_image'] ?? '');
+		DI::pConfig()->set(local_user(), 'frio', 'bg_image_option',  $_POST['frio_bg_image_option']  ?? '');
+		DI::pConfig()->set(local_user(), 'frio', 'css_modified',     time());
+		DI::pConfig()->set(local_user(), 'frio', 'enable_compose',   $_POST['frio_enable_compose']   ?? 0);
 	}
 }
 
@@ -60,16 +59,16 @@ function theme_content(App $a)
 
 	$node_scheme = Config::get('frio', 'scheme', Config::get('frio', 'scheme'));
 
-	$arr['scheme']           = PConfig::get(local_user(), 'frio', 'scheme', PConfig::get(local_user(), 'frio', 'schema', $node_scheme));
+	$arr['scheme']           = DI::pConfig()->get(local_user(), 'frio', 'scheme', DI::pConfig()->get(local_user(), 'frio', 'schema', $node_scheme));
 	$arr['share_string']     = '';
-	$arr['nav_bg']           = PConfig::get(local_user(), 'frio', 'nav_bg'          , Config::get('frio', 'nav_bg'));
-	$arr['nav_icon_color']   = PConfig::get(local_user(), 'frio', 'nav_icon_color'  , Config::get('frio', 'nav_icon_color'));
-	$arr['link_color']       = PConfig::get(local_user(), 'frio', 'link_color'      , Config::get('frio', 'link_color'));
-	$arr['background_color'] = PConfig::get(local_user(), 'frio', 'background_color', Config::get('frio', 'background_color'));
-	$arr['contentbg_transp'] = PConfig::get(local_user(), 'frio', 'contentbg_transp', Config::get('frio', 'contentbg_transp'));
-	$arr['background_image'] = PConfig::get(local_user(), 'frio', 'background_image', Config::get('frio', 'background_image'));
-	$arr['bg_image_option']  = PConfig::get(local_user(), 'frio', 'bg_image_option' , Config::get('frio', 'bg_image_option'));
-	$arr['enable_compose']   = PConfig::get(local_user(), 'frio', 'enable_compose'  , Config::get('frio', 'enable_compose'));
+	$arr['nav_bg']           = DI::pConfig()->get(local_user(), 'frio', 'nav_bg'          , Config::get('frio', 'nav_bg'));
+	$arr['nav_icon_color']   = DI::pConfig()->get(local_user(), 'frio', 'nav_icon_color'  , Config::get('frio', 'nav_icon_color'));
+	$arr['link_color']       = DI::pConfig()->get(local_user(), 'frio', 'link_color'      , Config::get('frio', 'link_color'));
+	$arr['background_color'] = DI::pConfig()->get(local_user(), 'frio', 'background_color', Config::get('frio', 'background_color'));
+	$arr['contentbg_transp'] = DI::pConfig()->get(local_user(), 'frio', 'contentbg_transp', Config::get('frio', 'contentbg_transp'));
+	$arr['background_image'] = DI::pConfig()->get(local_user(), 'frio', 'background_image', Config::get('frio', 'background_image'));
+	$arr['bg_image_option']  = DI::pConfig()->get(local_user(), 'frio', 'bg_image_option' , Config::get('frio', 'bg_image_option'));
+	$arr['enable_compose']   = DI::pConfig()->get(local_user(), 'frio', 'enable_compose'  , Config::get('frio', 'enable_compose'));
 
 	return frio_form($arr);
 }
diff --git a/view/theme/frio/php/default.php b/view/theme/frio/php/default.php
index fe08a43fb8..b23944d120 100644
--- a/view/theme/frio/php/default.php
+++ b/view/theme/frio/php/default.php
@@ -8,8 +8,6 @@
 <?php
 
 use Friendica\Core\Config;
-use Friendica\Core\PConfig;
-use Friendica\Core\System;
 use Friendica\DI;
 use Friendica\Model\Profile;
 
@@ -44,14 +42,14 @@ $is_singleuser_class = $is_singleuser ? "is-singleuser" : "is-not-singleuser";
 		// Add the theme color meta
 		// It makes mobile Chrome UI match Frio's top bar color.
 		$uid = Profile::getThemeUid($a);
-		$scheme = PConfig::get($uid, 'frio', 'scheme', PConfig::get($uid, 'frio', 'schema'));
+		$scheme = DI::pConfig()->get($uid, 'frio', 'scheme', DI::pConfig()->get($uid, 'frio', 'schema'));
 		if ($scheme && is_string($scheme) && $scheme != '---') {
 			if (file_exists('view/theme/frio/scheme/' . $scheme . '.php')) {
 				$schemefile = 'view/theme/frio/scheme/' . $scheme . '.php';
 				require_once $schemefile;
 			}
 		} else {
-			$nav_bg = PConfig::get($uid, 'frio', 'nav_bg');
+			$nav_bg = DI::pConfig()->get($uid, 'frio', 'nav_bg');
 		}
 
 		if (empty($nav_bg)) {
diff --git a/view/theme/frio/php/scheme.php b/view/theme/frio/php/scheme.php
index b2b346cccb..56e55a0157 100644
--- a/view/theme/frio/php/scheme.php
+++ b/view/theme/frio/php/scheme.php
@@ -18,7 +18,6 @@
  *    'overwrites' => Variables which overwriting custom settings
  */
 
-use Friendica\Core\PConfig;
 use Friendica\DI;
 use Friendica\Util\Strings;
 
@@ -27,7 +26,7 @@ function get_scheme_info($scheme)
 	$theme = DI::app()->getCurrentTheme();
 	$themepath = 'view/theme/' . $theme . '/';
 	if (empty($scheme)) {
-		$scheme = PConfig::get(local_user(), 'frio', 'scheme', PConfig::get(local_user(), 'frio', 'schema'));
+		$scheme = DI::pConfig()->get(local_user(), 'frio', 'scheme', DI::pConfig()->get(local_user(), 'frio', 'schema'));
 	}
 
 	$scheme = Strings::sanitizeFilePathItem($scheme);
diff --git a/view/theme/frio/style.php b/view/theme/frio/style.php
index c39e672dfa..363f7cd44d 100644
--- a/view/theme/frio/style.php
+++ b/view/theme/frio/style.php
@@ -4,7 +4,7 @@
  */
 
 use Friendica\Core\Config;
-use Friendica\Core\PConfig;
+use Friendica\DI;
 use Friendica\Util\Strings;
 
 require_once 'view/theme/frio/php/PHPColors/Color.php';
@@ -37,18 +37,18 @@ $login_bg_color = $login_bg_color ?: '#ededed';
 // Get the UID of the profile owner.
 $uid = $_REQUEST['puid'] ?? 0;
 if ($uid) {
-	PConfig::load($uid, 'frio');
+	DI::pConfig()->load($uid, 'frio');
 
 	// Only override display settings that have actually been set
-	$scheme           = PConfig::get($uid, 'frio', 'scheme', PConfig::get($uid, 'frio', 'schema')) ?: $scheme;
-	$nav_bg           = PConfig::get($uid, 'frio', 'nav_bg')           ?: $nav_bg;
-	$nav_icon_color   = PConfig::get($uid, 'frio', 'nav_icon_color')   ?: $nav_icon_color;
-	$link_color       = PConfig::get($uid, 'frio', 'link_color')       ?: $link_color;
-	$background_color = PConfig::get($uid, 'frio', 'background_color') ?: $background_color;
-	$contentbg_transp = PConfig::get($uid, 'frio', 'contentbg_transp') ?: $contentbg_transp;
-	$background_image = PConfig::get($uid, 'frio', 'background_image') ?: $background_image;
-	$bg_image_option  = PConfig::get($uid, 'frio', 'bg_image_option')  ?: $bg_image_option;
-	$modified         = PConfig::get($uid, 'frio', 'css_modified')     ?: $modified;
+	$scheme           = DI::pConfig()->get($uid, 'frio', 'scheme', DI::pConfig()->get($uid, 'frio', 'schema')) ?: $scheme;
+	$nav_bg           = DI::pConfig()->get($uid, 'frio', 'nav_bg')           ?: $nav_bg;
+	$nav_icon_color   = DI::pConfig()->get($uid, 'frio', 'nav_icon_color')   ?: $nav_icon_color;
+	$link_color       = DI::pConfig()->get($uid, 'frio', 'link_color')       ?: $link_color;
+	$background_color = DI::pConfig()->get($uid, 'frio', 'background_color') ?: $background_color;
+	$contentbg_transp = DI::pConfig()->get($uid, 'frio', 'contentbg_transp') ?: $contentbg_transp;
+	$background_image = DI::pConfig()->get($uid, 'frio', 'background_image') ?: $background_image;
+	$bg_image_option  = DI::pConfig()->get($uid, 'frio', 'bg_image_option')  ?: $bg_image_option;
+	$modified         = DI::pConfig()->get($uid, 'frio', 'css_modified')     ?: $modified;
 }
 
 // Now load the scheme.  If a value is changed above, we'll keep the settings
diff --git a/view/theme/frio/theme.php b/view/theme/frio/theme.php
index 513bb4e61d..14f93f6b7e 100644
--- a/view/theme/frio/theme.php
+++ b/view/theme/frio/theme.php
@@ -43,7 +43,7 @@ function frio_init(App $a)
 EOT;
 	}
 
-	$enable_compose = \Friendica\Core\PConfig::get(local_user(), 'frio', 'enable_compose');
+	$enable_compose = DI::pConfig()->get(local_user(), 'frio', 'enable_compose');
 	$compose = $enable_compose === '1' || $enable_compose === null && Config::get('frio', 'enable_compose') ? 1 : 0;
 	DI::page()['htmlhead'] .= <<< HTML
 		<script type="text/javascript">
diff --git a/view/theme/quattro/config.php b/view/theme/quattro/config.php
index bbe33a1e14..eb6c5d0aa3 100644
--- a/view/theme/quattro/config.php
+++ b/view/theme/quattro/config.php
@@ -6,19 +6,18 @@
 use Friendica\App;
 use Friendica\Core\Config;
 use Friendica\Core\L10n;
-use Friendica\Core\PConfig;
 use Friendica\Core\Renderer;
-use Friendica\Core\System;
+use Friendica\DI;
 
 function theme_content(App $a) {
 	if (!local_user()) {
 		return;
 	}
 
-	$align = PConfig::get(local_user(), 'quattro', 'align' );
-	$color = PConfig::get(local_user(), 'quattro', 'color' );
-	$tfs = PConfig::get(local_user(),"quattro","tfs");
-	$pfs = PConfig::get(local_user(),"quattro","pfs");
+	$align = DI::pConfig()->get(local_user(), 'quattro', 'align' );
+	$color = DI::pConfig()->get(local_user(), 'quattro', 'color' );
+	$tfs = DI::pConfig()->get(local_user(),"quattro","tfs");
+	$pfs = DI::pConfig()->get(local_user(),"quattro","pfs");
 
 	return quattro_form($a,$align, $color, $tfs, $pfs);
 }
@@ -29,10 +28,10 @@ function theme_post(App $a) {
 	}
 
 	if (isset($_POST['quattro-settings-submit'])){
-		PConfig::set(local_user(), 'quattro', 'align', $_POST['quattro_align']);
-		PConfig::set(local_user(), 'quattro', 'color', $_POST['quattro_color']);
-		PConfig::set(local_user(), 'quattro', 'tfs', $_POST['quattro_tfs']);
-		PConfig::set(local_user(), 'quattro', 'pfs', $_POST['quattro_pfs']);
+		DI::pConfig()->set(local_user(), 'quattro', 'align', $_POST['quattro_align']);
+		DI::pConfig()->set(local_user(), 'quattro', 'color', $_POST['quattro_color']);
+		DI::pConfig()->set(local_user(), 'quattro', 'tfs', $_POST['quattro_tfs']);
+		DI::pConfig()->set(local_user(), 'quattro', 'pfs', $_POST['quattro_pfs']);
 	}
 }
 
diff --git a/view/theme/quattro/style.php b/view/theme/quattro/style.php
index 84fa0b9736..f028e11e13 100644
--- a/view/theme/quattro/style.php
+++ b/view/theme/quattro/style.php
@@ -3,8 +3,7 @@
  * @file view/theme/quattro/style.php
  */
 use Friendica\Core\Config;
-use Friendica\Core\PConfig;
-use Friendica\Model\Profile;
+use Friendica\DI;
 
 $uid = $_REQUEST['puid'] ?? 0;
 
@@ -14,8 +13,8 @@ $site_color = Config::get("quattro", "color", "dark");
 $site_quattro_align = Config::get("quattro", "align", false);
 
 if ($uid) {
-	$color = PConfig::get($uid, "quattro", "color", false);
-	$quattro_align = PConfig::get($uid, 'quattro', 'align', false);
+	$color = DI::pConfig()->get($uid, "quattro", "color", false);
+	$quattro_align = DI::pConfig()->get($uid, 'quattro', 'align', false);
 }
 
 if ($color === false) {
@@ -51,8 +50,8 @@ $site_textarea_font_size = Config::get("quattro", "tfs", "20");
 $site_post_font_size = Config::get("quattro", "pfs", "12");
 
 if ($uid) {
-	$textarea_font_size = PConfig::get($uid, "quattro", "tfs", false);
-	$post_font_size = PConfig::get($uid, "quattro", "pfs", false);
+	$textarea_font_size = DI::pConfig()->get($uid, "quattro", "tfs", false);
+	$post_font_size = DI::pConfig()->get($uid, "quattro", "pfs", false);
 }
 
 if ($textarea_font_size === false) {
diff --git a/view/theme/vier/config.php b/view/theme/vier/config.php
index 9b19ae6a99..9bcf4cffc2 100644
--- a/view/theme/vier/config.php
+++ b/view/theme/vier/config.php
@@ -6,9 +6,8 @@
 use Friendica\App;
 use Friendica\Core\Config;
 use Friendica\Core\L10n;
-use Friendica\Core\PConfig;
 use Friendica\Core\Renderer;
-use Friendica\Core\System;
+use Friendica\DI;
 
 require_once __DIR__ . '/theme.php';
 
@@ -22,7 +21,7 @@ function theme_content(App $a)
 		return;
 	}
 
-	$style = PConfig::get(local_user(), 'vier', 'style');
+	$style = DI::pConfig()->get(local_user(), 'vier', 'style');
 
 	if ($style == "") {
 		$style = Config::get('vier', 'style');
@@ -50,13 +49,13 @@ function theme_post(App $a)
 	}
 
 	if (isset($_POST['vier-settings-submit'])) {
-		PConfig::set(local_user(), 'vier', 'style', $_POST['vier_style']);
-		PConfig::set(local_user(), 'vier', 'show_pages', $_POST['vier_show_pages']);
-		PConfig::set(local_user(), 'vier', 'show_profiles', $_POST['vier_show_profiles']);
-		PConfig::set(local_user(), 'vier', 'show_helpers', $_POST['vier_show_helpers']);
-		PConfig::set(local_user(), 'vier', 'show_services', $_POST['vier_show_services']);
-		PConfig::set(local_user(), 'vier', 'show_friends', $_POST['vier_show_friends']);
-		PConfig::set(local_user(), 'vier', 'show_lastusers', $_POST['vier_show_lastusers']);
+		DI::pConfig()->set(local_user(), 'vier', 'style', $_POST['vier_style']);
+		DI::pConfig()->set(local_user(), 'vier', 'show_pages', $_POST['vier_show_pages']);
+		DI::pConfig()->set(local_user(), 'vier', 'show_profiles', $_POST['vier_show_profiles']);
+		DI::pConfig()->set(local_user(), 'vier', 'show_helpers', $_POST['vier_show_helpers']);
+		DI::pConfig()->set(local_user(), 'vier', 'show_services', $_POST['vier_show_services']);
+		DI::pConfig()->set(local_user(), 'vier', 'show_friends', $_POST['vier_show_friends']);
+		DI::pConfig()->set(local_user(), 'vier', 'show_lastusers', $_POST['vier_show_lastusers']);
 	}
 }
 
diff --git a/view/theme/vier/style.php b/view/theme/vier/style.php
index 8a7c2f67d1..f8068646ca 100644
--- a/view/theme/vier/style.php
+++ b/view/theme/vier/style.php
@@ -4,12 +4,11 @@
  */
 use Friendica\Core\Logger;
 use Friendica\Core\Config;
-use Friendica\Core\PConfig;
-use Friendica\Model\Profile;
+use Friendica\DI;
 
 $uid = $_REQUEST['puid'] ?? 0;
 
-$style = PConfig::get($uid, 'vier', 'style');
+$style = DI::pConfig()->get($uid, 'vier', 'style');
 
 if (empty($style)) {
 	$style = Config::get('vier', 'style');
diff --git a/view/theme/vier/theme.php b/view/theme/vier/theme.php
index ebe4011e65..e7318902a6 100644
--- a/view/theme/vier/theme.php
+++ b/view/theme/vier/theme.php
@@ -14,7 +14,6 @@ use Friendica\Content\ForumManager;
 use Friendica\Core\Addon;
 use Friendica\Core\Config;
 use Friendica\Core\L10n;
-use Friendica\Core\PConfig;
 use Friendica\Core\Renderer;
 use Friendica\Core\Search;
 use Friendica\Database\DBA;
@@ -91,7 +90,7 @@ EOT;
 function get_vier_config($key, $default = false, $admin = false)
 {
 	if (local_user() && !$admin) {
-		$result = PConfig::get(local_user(), "vier", $key);
+		$result = DI::pConfig()->get(local_user(), "vier", $key);
 		if (!is_null($result)) {
 			return $result;
 		}