diff --git a/app/Console/Commands/System/VerifySecurityAlerts.php b/app/Console/Commands/System/VerifySecurityAlerts.php
index ff801050b9..53c09d7da0 100644
--- a/app/Console/Commands/System/VerifySecurityAlerts.php
+++ b/app/Console/Commands/System/VerifySecurityAlerts.php
@@ -107,8 +107,8 @@ class VerifySecurityAlerts extends Command
     private function removeOldAdvisory(): void
     {
         try {
-            app('fireflyconfig')->delete('upgrade_security_message');
-            app('fireflyconfig')->delete('upgrade_security_level');
+            \FireflyIII\Support\Facades\FireflyConfig::delete('upgrade_security_message');
+            \FireflyIII\Support\Facades\FireflyConfig::delete('upgrade_security_level');
         } catch (QueryException $e) {
             Log::debug(sprintf('Could not delete old security advisory, but thats OK: %s', $e->getMessage()));
         }
@@ -117,8 +117,8 @@ class VerifySecurityAlerts extends Command
     private function saveSecurityAdvisory(array $array): void
     {
         try {
-            app('fireflyconfig')->set('upgrade_security_message', $array['message']);
-            app('fireflyconfig')->set('upgrade_security_level', $array['level']);
+            \FireflyIII\Support\Facades\FireflyConfig::set('upgrade_security_message', $array['message']);
+            \FireflyIII\Support\Facades\FireflyConfig::set('upgrade_security_level', $array['level']);
         } catch (QueryException $e) {
             Log::debug(sprintf('Could not save new security advisory, but thats OK: %s', $e->getMessage()));
         }
diff --git a/app/Console/Commands/Upgrade/AddsTransactionIdentifiers.php b/app/Console/Commands/Upgrade/AddsTransactionIdentifiers.php
index baef09da3d..c07952b28b 100644
--- a/app/Console/Commands/Upgrade/AddsTransactionIdentifiers.php
+++ b/app/Console/Commands/Upgrade/AddsTransactionIdentifiers.php
@@ -97,7 +97,7 @@ class AddsTransactionIdentifiers extends Command
 
     private function isExecuted(): bool
     {
-        $configVar = app('fireflyconfig')->get(self::CONFIG_NAME, false);
+        $configVar = \FireflyIII\Support\Facades\FireflyConfig::get(self::CONFIG_NAME, false);
 
         return (bool)$configVar?->data;
 
@@ -157,6 +157,6 @@ class AddsTransactionIdentifiers extends Command
 
     private function markAsExecuted(): void
     {
-        app('fireflyconfig')->set(self::CONFIG_NAME, true);
+        \FireflyIII\Support\Facades\FireflyConfig::set(self::CONFIG_NAME, true);
     }
 }
diff --git a/app/Console/Commands/Upgrade/RemovesDatabaseDecryption.php b/app/Console/Commands/Upgrade/RemovesDatabaseDecryption.php
index e1451c94a5..ff051b324e 100644
--- a/app/Console/Commands/Upgrade/RemovesDatabaseDecryption.php
+++ b/app/Console/Commands/Upgrade/RemovesDatabaseDecryption.php
@@ -86,7 +86,7 @@ class RemovesDatabaseDecryption extends Command
         $this->friendlyPositive(sprintf('Decrypted the data in table "%s".', $table));
         // mark as decrypted:
         $configName = sprintf('is_decrypted_%s', $table);
-        app('fireflyconfig')->set($configName, true);
+        \FireflyIII\Support\Facades\FireflyConfig::set($configName, true);
     }
 
     private function isDecrypted(string $table): bool
@@ -95,7 +95,7 @@ class RemovesDatabaseDecryption extends Command
         $configVar  = null;
 
         try {
-            $configVar = app('fireflyconfig')->get($configName, false);
+            $configVar = \FireflyIII\Support\Facades\FireflyConfig::get($configName, false);
         } catch (FireflyException $e) {
             Log::error($e->getMessage());
         }
diff --git a/app/Console/Commands/Upgrade/RepairsAccountBalances.php b/app/Console/Commands/Upgrade/RepairsAccountBalances.php
index 3282b2f00f..88a5a040d3 100644
--- a/app/Console/Commands/Upgrade/RepairsAccountBalances.php
+++ b/app/Console/Commands/Upgrade/RepairsAccountBalances.php
@@ -58,14 +58,14 @@ class RepairsAccountBalances extends Command
 
     private function isExecuted(): bool
     {
-        $configVar = app('fireflyconfig')->get(self::CONFIG_NAME, false);
+        $configVar = \FireflyIII\Support\Facades\FireflyConfig::get(self::CONFIG_NAME, false);
 
         return (bool) $configVar?->data;
     }
 
     private function markAsExecuted(): void
     {
-        app('fireflyconfig')->set(self::CONFIG_NAME, true);
+        \FireflyIII\Support\Facades\FireflyConfig::set(self::CONFIG_NAME, true);
     }
 
     private function correctBalanceAmounts(): void
diff --git a/app/Console/Commands/Upgrade/UpgradeSkeleton.php.stub b/app/Console/Commands/Upgrade/UpgradeSkeleton.php.stub
index 6a9c3897df..9cd5d0f483 100644
--- a/app/Console/Commands/Upgrade/UpgradeSkeleton.php.stub
+++ b/app/Console/Commands/Upgrade/UpgradeSkeleton.php.stub
@@ -41,7 +41,7 @@ class UpgradeSkeleton extends Command
      */
     private function isExecuted(): bool
     {
-        $configVar = app('fireflyconfig')->get(self::CONFIG_NAME, false);
+        $configVar = \FireflyIII\Support\Facades\FireflyConfig::get(self::CONFIG_NAME, false);
         if (null !== $configVar) {
             return (bool)$configVar->data;
         }
@@ -55,6 +55,6 @@ class UpgradeSkeleton extends Command
      */
     private function markAsExecuted(): void
     {
-        app('fireflyconfig')->set(self::CONFIG_NAME, true);
+        \FireflyIII\Support\Facades\FireflyConfig::set(self::CONFIG_NAME, true);
     }
 }
diff --git a/app/Console/Commands/Upgrade/UpgradesAccountCurrencies.php b/app/Console/Commands/Upgrade/UpgradesAccountCurrencies.php
index cb1a35cc55..7ab7392f4d 100644
--- a/app/Console/Commands/Upgrade/UpgradesAccountCurrencies.php
+++ b/app/Console/Commands/Upgrade/UpgradesAccountCurrencies.php
@@ -85,7 +85,7 @@ class UpgradesAccountCurrencies extends Command
 
     private function isExecuted(): bool
     {
-        $configVar = app('fireflyconfig')->get(self::CONFIG_NAME, false);
+        $configVar = \FireflyIII\Support\Facades\FireflyConfig::get(self::CONFIG_NAME, false);
 
         return (bool) $configVar?->data;
     }
@@ -155,6 +155,6 @@ class UpgradesAccountCurrencies extends Command
 
     private function markAsExecuted(): void
     {
-        app('fireflyconfig')->set(self::CONFIG_NAME, true);
+        \FireflyIII\Support\Facades\FireflyConfig::set(self::CONFIG_NAME, true);
     }
 }
diff --git a/app/Console/Commands/Upgrade/UpgradesAccountMetaData.php b/app/Console/Commands/Upgrade/UpgradesAccountMetaData.php
index 234fc3cba8..d62504694d 100644
--- a/app/Console/Commands/Upgrade/UpgradesAccountMetaData.php
+++ b/app/Console/Commands/Upgrade/UpgradesAccountMetaData.php
@@ -82,7 +82,7 @@ class UpgradesAccountMetaData extends Command
 
     private function isExecuted(): bool
     {
-        $configVar = app('fireflyconfig')->get(self::CONFIG_NAME, false);
+        $configVar = \FireflyIII\Support\Facades\FireflyConfig::get(self::CONFIG_NAME, false);
 
         return (bool)$configVar?->data;
 
@@ -90,6 +90,6 @@ class UpgradesAccountMetaData extends Command
 
     private function markAsExecuted(): void
     {
-        app('fireflyconfig')->set(self::CONFIG_NAME, true);
+        \FireflyIII\Support\Facades\FireflyConfig::set(self::CONFIG_NAME, true);
     }
 }
diff --git a/app/Console/Commands/Upgrade/UpgradesAttachments.php b/app/Console/Commands/Upgrade/UpgradesAttachments.php
index 5c8022345b..13856443e0 100644
--- a/app/Console/Commands/Upgrade/UpgradesAttachments.php
+++ b/app/Console/Commands/Upgrade/UpgradesAttachments.php
@@ -92,7 +92,7 @@ class UpgradesAttachments extends Command
 
     private function isExecuted(): bool
     {
-        $configVar = app('fireflyconfig')->get(self::CONFIG_NAME, false);
+        $configVar = \FireflyIII\Support\Facades\FireflyConfig::get(self::CONFIG_NAME, false);
 
         return (bool)$configVar?->data;
 
@@ -100,6 +100,6 @@ class UpgradesAttachments extends Command
 
     private function markAsExecuted(): void
     {
-        app('fireflyconfig')->set(self::CONFIG_NAME, true);
+        \FireflyIII\Support\Facades\FireflyConfig::set(self::CONFIG_NAME, true);
     }
 }
diff --git a/app/Console/Commands/Upgrade/UpgradesBillsToRules.php b/app/Console/Commands/Upgrade/UpgradesBillsToRules.php
index 7575dc31e3..b73b56f221 100644
--- a/app/Console/Commands/Upgrade/UpgradesBillsToRules.php
+++ b/app/Console/Commands/Upgrade/UpgradesBillsToRules.php
@@ -99,7 +99,7 @@ class UpgradesBillsToRules extends Command
 
     private function isExecuted(): bool
     {
-        $configVar = app('fireflyconfig')->get(self::CONFIG_NAME, false);
+        $configVar = \FireflyIII\Support\Facades\FireflyConfig::get(self::CONFIG_NAME, false);
 
         return (bool)$configVar?->data;
 
@@ -206,6 +206,6 @@ class UpgradesBillsToRules extends Command
 
     private function markAsExecuted(): void
     {
-        app('fireflyconfig')->set(self::CONFIG_NAME, true);
+        \FireflyIII\Support\Facades\FireflyConfig::set(self::CONFIG_NAME, true);
     }
 }
diff --git a/app/Console/Commands/Upgrade/UpgradesBudgetLimitPeriods.php b/app/Console/Commands/Upgrade/UpgradesBudgetLimitPeriods.php
index d3581741b3..2578ab0b25 100644
--- a/app/Console/Commands/Upgrade/UpgradesBudgetLimitPeriods.php
+++ b/app/Console/Commands/Upgrade/UpgradesBudgetLimitPeriods.php
@@ -58,7 +58,7 @@ class UpgradesBudgetLimitPeriods extends Command
 
     private function isExecuted(): bool
     {
-        $configVar = app('fireflyconfig')->get(self::CONFIG_NAME, false);
+        $configVar = \FireflyIII\Support\Facades\FireflyConfig::get(self::CONFIG_NAME, false);
 
         return (bool) $configVar->data;
     }
@@ -152,6 +152,6 @@ class UpgradesBudgetLimitPeriods extends Command
 
     private function markAsExecuted(): void
     {
-        app('fireflyconfig')->set(self::CONFIG_NAME, true);
+        \FireflyIII\Support\Facades\FireflyConfig::set(self::CONFIG_NAME, true);
     }
 }
diff --git a/app/Console/Commands/Upgrade/UpgradesBudgetLimits.php b/app/Console/Commands/Upgrade/UpgradesBudgetLimits.php
index 2b55dabfd5..c9756098c7 100644
--- a/app/Console/Commands/Upgrade/UpgradesBudgetLimits.php
+++ b/app/Console/Commands/Upgrade/UpgradesBudgetLimits.php
@@ -84,7 +84,7 @@ class UpgradesBudgetLimits extends Command
 
     private function isExecuted(): bool
     {
-        $configVar = app('fireflyconfig')->get(self::CONFIG_NAME, false);
+        $configVar = \FireflyIII\Support\Facades\FireflyConfig::get(self::CONFIG_NAME, false);
 
         return (bool)$configVar?->data;
 
@@ -92,6 +92,6 @@ class UpgradesBudgetLimits extends Command
 
     private function markAsExecuted(): void
     {
-        app('fireflyconfig')->set(self::CONFIG_NAME, true);
+        \FireflyIII\Support\Facades\FireflyConfig::set(self::CONFIG_NAME, true);
     }
 }
diff --git a/app/Console/Commands/Upgrade/UpgradesCreditCardLiabilities.php b/app/Console/Commands/Upgrade/UpgradesCreditCardLiabilities.php
index 7b3b8e65b1..9b60caf1bd 100644
--- a/app/Console/Commands/Upgrade/UpgradesCreditCardLiabilities.php
+++ b/app/Console/Commands/Upgrade/UpgradesCreditCardLiabilities.php
@@ -80,13 +80,13 @@ class UpgradesCreditCardLiabilities extends Command
 
     private function isExecuted(): bool
     {
-        $configVar = app('fireflyconfig')->get(self::CONFIG_NAME, false);
+        $configVar = \FireflyIII\Support\Facades\FireflyConfig::get(self::CONFIG_NAME, false);
 
         return (bool) $configVar?->data;
     }
 
     private function markAsExecuted(): void
     {
-        app('fireflyconfig')->set(self::CONFIG_NAME, true);
+        \FireflyIII\Support\Facades\FireflyConfig::set(self::CONFIG_NAME, true);
     }
 }
diff --git a/app/Console/Commands/Upgrade/UpgradesCurrencyPreferences.php b/app/Console/Commands/Upgrade/UpgradesCurrencyPreferences.php
index 92b8b0445b..f6fc42a7d1 100644
--- a/app/Console/Commands/Upgrade/UpgradesCurrencyPreferences.php
+++ b/app/Console/Commands/Upgrade/UpgradesCurrencyPreferences.php
@@ -65,7 +65,7 @@ class UpgradesCurrencyPreferences extends Command
 
     private function isExecuted(): bool
     {
-        $configVar = app('fireflyconfig')->get(self::CONFIG_NAME, false);
+        $configVar = \FireflyIII\Support\Facades\FireflyConfig::get(self::CONFIG_NAME, false);
 
         return (bool)$configVar?->data;
 
@@ -144,6 +144,6 @@ class UpgradesCurrencyPreferences extends Command
 
     private function markAsExecuted(): void
     {
-        app('fireflyconfig')->set(self::CONFIG_NAME, true);
+        \FireflyIII\Support\Facades\FireflyConfig::set(self::CONFIG_NAME, true);
     }
 }
diff --git a/app/Console/Commands/Upgrade/UpgradesJournalMetaData.php b/app/Console/Commands/Upgrade/UpgradesJournalMetaData.php
index 3f199e57a1..8c02368773 100644
--- a/app/Console/Commands/Upgrade/UpgradesJournalMetaData.php
+++ b/app/Console/Commands/Upgrade/UpgradesJournalMetaData.php
@@ -69,14 +69,14 @@ class UpgradesJournalMetaData extends Command
 
     private function isMigrated(): bool
     {
-        $configVar = app('fireflyconfig')->get(UpgradesToGroups::CONFIG_NAME, false);
+        $configVar = \FireflyIII\Support\Facades\FireflyConfig::get(UpgradesToGroups::CONFIG_NAME, false);
 
         return (bool) $configVar->data;
     }
 
     private function isExecuted(): bool
     {
-        $configVar = app('fireflyconfig')->get(self::CONFIG_NAME, false);
+        $configVar = \FireflyIII\Support\Facades\FireflyConfig::get(self::CONFIG_NAME, false);
 
         return (bool) $configVar->data;
     }
@@ -218,6 +218,6 @@ class UpgradesJournalMetaData extends Command
 
     private function markAsExecuted(): void
     {
-        app('fireflyconfig')->set(self::CONFIG_NAME, true);
+        \FireflyIII\Support\Facades\FireflyConfig::set(self::CONFIG_NAME, true);
     }
 }
diff --git a/app/Console/Commands/Upgrade/UpgradesJournalNotes.php b/app/Console/Commands/Upgrade/UpgradesJournalNotes.php
index 2190cea5e1..6cd7dfcbea 100644
--- a/app/Console/Commands/Upgrade/UpgradesJournalNotes.php
+++ b/app/Console/Commands/Upgrade/UpgradesJournalNotes.php
@@ -86,7 +86,7 @@ class UpgradesJournalNotes extends Command
 
     private function isExecuted(): bool
     {
-        $configVar = app('fireflyconfig')->get(self::CONFIG_NAME, false);
+        $configVar = \FireflyIII\Support\Facades\FireflyConfig::get(self::CONFIG_NAME, false);
 
         return (bool)$configVar?->data;
 
@@ -94,6 +94,6 @@ class UpgradesJournalNotes extends Command
 
     private function markAsExecuted(): void
     {
-        app('fireflyconfig')->set(self::CONFIG_NAME, true);
+        \FireflyIII\Support\Facades\FireflyConfig::set(self::CONFIG_NAME, true);
     }
 }
diff --git a/app/Console/Commands/Upgrade/UpgradesLiabilities.php b/app/Console/Commands/Upgrade/UpgradesLiabilities.php
index 23b94883f7..89a10e9359 100644
--- a/app/Console/Commands/Upgrade/UpgradesLiabilities.php
+++ b/app/Console/Commands/Upgrade/UpgradesLiabilities.php
@@ -61,7 +61,7 @@ class UpgradesLiabilities extends Command
 
     private function isExecuted(): bool
     {
-        $configVar = app('fireflyconfig')->get(self::CONFIG_NAME, false);
+        $configVar = \FireflyIII\Support\Facades\FireflyConfig::get(self::CONFIG_NAME, false);
 
         return (bool)$configVar?->data;
 
@@ -148,6 +148,6 @@ class UpgradesLiabilities extends Command
 
     private function markAsExecuted(): void
     {
-        app('fireflyconfig')->set(self::CONFIG_NAME, true);
+        \FireflyIII\Support\Facades\FireflyConfig::set(self::CONFIG_NAME, true);
     }
 }
diff --git a/app/Console/Commands/Upgrade/UpgradesLiabilitiesEight.php b/app/Console/Commands/Upgrade/UpgradesLiabilitiesEight.php
index fc986e5260..3a24482b7b 100644
--- a/app/Console/Commands/Upgrade/UpgradesLiabilitiesEight.php
+++ b/app/Console/Commands/Upgrade/UpgradesLiabilitiesEight.php
@@ -63,7 +63,7 @@ class UpgradesLiabilitiesEight extends Command
 
     private function isExecuted(): bool
     {
-        $configVar = app('fireflyconfig')->get(self::CONFIG_NAME, false);
+        $configVar = \FireflyIII\Support\Facades\FireflyConfig::get(self::CONFIG_NAME, false);
 
         return (bool)$configVar?->data;
 
@@ -207,6 +207,6 @@ class UpgradesLiabilitiesEight extends Command
 
     private function markAsExecuted(): void
     {
-        app('fireflyconfig')->set(self::CONFIG_NAME, true);
+        \FireflyIII\Support\Facades\FireflyConfig::set(self::CONFIG_NAME, true);
     }
 }
diff --git a/app/Console/Commands/Upgrade/UpgradesMultiPiggyBanks.php b/app/Console/Commands/Upgrade/UpgradesMultiPiggyBanks.php
index 61f7ba4b0e..26a1fa929f 100644
--- a/app/Console/Commands/Upgrade/UpgradesMultiPiggyBanks.php
+++ b/app/Console/Commands/Upgrade/UpgradesMultiPiggyBanks.php
@@ -64,7 +64,7 @@ class UpgradesMultiPiggyBanks extends Command
 
     private function isExecuted(): bool
     {
-        $configVar = app('fireflyconfig')->get(self::CONFIG_NAME, false);
+        $configVar = \FireflyIII\Support\Facades\FireflyConfig::get(self::CONFIG_NAME, false);
 
         return (bool)$configVar?->data;
 
@@ -112,6 +112,6 @@ class UpgradesMultiPiggyBanks extends Command
 
     private function markAsExecuted(): void
     {
-        app('fireflyconfig')->set(self::CONFIG_NAME, true);
+        \FireflyIII\Support\Facades\FireflyConfig::set(self::CONFIG_NAME, true);
     }
 }
diff --git a/app/Console/Commands/Upgrade/UpgradesPrimaryCurrencyAmounts.php b/app/Console/Commands/Upgrade/UpgradesPrimaryCurrencyAmounts.php
index 40e768aefc..55647c6b99 100644
--- a/app/Console/Commands/Upgrade/UpgradesPrimaryCurrencyAmounts.php
+++ b/app/Console/Commands/Upgrade/UpgradesPrimaryCurrencyAmounts.php
@@ -60,7 +60,7 @@ class UpgradesPrimaryCurrencyAmounts extends Command
 
     private function isExecuted(): bool
     {
-        $configVar = app('fireflyconfig')->get(self::CONFIG_NAME, false);
+        $configVar = \FireflyIII\Support\Facades\FireflyConfig::get(self::CONFIG_NAME, false);
 
         return (bool)$configVar?->data;
 
@@ -68,6 +68,6 @@ class UpgradesPrimaryCurrencyAmounts extends Command
 
     private function markAsExecuted(): void
     {
-        app('fireflyconfig')->set(self::CONFIG_NAME, true);
+        \FireflyIII\Support\Facades\FireflyConfig::set(self::CONFIG_NAME, true);
     }
 }
diff --git a/app/Console/Commands/Upgrade/UpgradesRecurrenceMetaData.php b/app/Console/Commands/Upgrade/UpgradesRecurrenceMetaData.php
index c6126388ec..c3f6419f63 100644
--- a/app/Console/Commands/Upgrade/UpgradesRecurrenceMetaData.php
+++ b/app/Console/Commands/Upgrade/UpgradesRecurrenceMetaData.php
@@ -65,7 +65,7 @@ class UpgradesRecurrenceMetaData extends Command
 
     private function isExecuted(): bool
     {
-        $configVar = app('fireflyconfig')->get(self::CONFIG_NAME, false);
+        $configVar = \FireflyIII\Support\Facades\FireflyConfig::get(self::CONFIG_NAME, false);
 
         return (bool)$configVar?->data;
 
@@ -117,6 +117,6 @@ class UpgradesRecurrenceMetaData extends Command
 
     private function markAsExecuted(): void
     {
-        app('fireflyconfig')->set(self::CONFIG_NAME, true);
+        \FireflyIII\Support\Facades\FireflyConfig::set(self::CONFIG_NAME, true);
     }
 }
diff --git a/app/Console/Commands/Upgrade/UpgradesRuleActions.php b/app/Console/Commands/Upgrade/UpgradesRuleActions.php
index 0be7c55811..70e1b7c52f 100644
--- a/app/Console/Commands/Upgrade/UpgradesRuleActions.php
+++ b/app/Console/Commands/Upgrade/UpgradesRuleActions.php
@@ -63,7 +63,7 @@ class UpgradesRuleActions extends Command
 
     private function isExecuted(): bool
     {
-        $configVar = app('fireflyconfig')->get(self::CONFIG_NAME, false);
+        $configVar = \FireflyIII\Support\Facades\FireflyConfig::get(self::CONFIG_NAME, false);
 
         return (bool)$configVar?->data;
 
@@ -183,6 +183,6 @@ class UpgradesRuleActions extends Command
 
     private function markAsExecuted(): void
     {
-        app('fireflyconfig')->set(self::CONFIG_NAME, true);
+        \FireflyIII\Support\Facades\FireflyConfig::set(self::CONFIG_NAME, true);
     }
 }
diff --git a/app/Console/Commands/Upgrade/UpgradesTagLocations.php b/app/Console/Commands/Upgrade/UpgradesTagLocations.php
index 1bba349b76..ef2fbd28de 100644
--- a/app/Console/Commands/Upgrade/UpgradesTagLocations.php
+++ b/app/Console/Commands/Upgrade/UpgradesTagLocations.php
@@ -57,7 +57,7 @@ class UpgradesTagLocations extends Command
 
     private function isExecuted(): bool
     {
-        $configVar = app('fireflyconfig')->get(self::CONFIG_NAME, false);
+        $configVar = \FireflyIII\Support\Facades\FireflyConfig::get(self::CONFIG_NAME, false);
 
         return (bool)$configVar?->data;
 
@@ -97,6 +97,6 @@ class UpgradesTagLocations extends Command
 
     private function markAsExecuted(): void
     {
-        app('fireflyconfig')->set(self::CONFIG_NAME, true);
+        \FireflyIII\Support\Facades\FireflyConfig::set(self::CONFIG_NAME, true);
     }
 }
diff --git a/app/Console/Commands/Upgrade/UpgradesToGroups.php b/app/Console/Commands/Upgrade/UpgradesToGroups.php
index b1411a7b25..accae5e614 100644
--- a/app/Console/Commands/Upgrade/UpgradesToGroups.php
+++ b/app/Console/Commands/Upgrade/UpgradesToGroups.php
@@ -97,7 +97,7 @@ class UpgradesToGroups extends Command
 
     private function isMigrated(): bool
     {
-        $configVar = app('fireflyconfig')->get(self::CONFIG_NAME, false);
+        $configVar = \FireflyIII\Support\Facades\FireflyConfig::get(self::CONFIG_NAME, false);
 
         return (bool)$configVar?->data;
 
@@ -379,6 +379,6 @@ class UpgradesToGroups extends Command
 
     private function markAsMigrated(): void
     {
-        app('fireflyconfig')->set(self::CONFIG_NAME, true);
+        \FireflyIII\Support\Facades\FireflyConfig::set(self::CONFIG_NAME, true);
     }
 }
diff --git a/app/Console/Commands/Upgrade/UpgradesTransferCurrencies.php b/app/Console/Commands/Upgrade/UpgradesTransferCurrencies.php
index 2b4b566c8b..9e796b82c7 100644
--- a/app/Console/Commands/Upgrade/UpgradesTransferCurrencies.php
+++ b/app/Console/Commands/Upgrade/UpgradesTransferCurrencies.php
@@ -105,7 +105,7 @@ class UpgradesTransferCurrencies extends Command
 
     private function isExecuted(): bool
     {
-        $configVar = app('fireflyconfig')->get(self::CONFIG_NAME, false);
+        $configVar = \FireflyIII\Support\Facades\FireflyConfig::get(self::CONFIG_NAME, false);
 
         return (bool)$configVar?->data;
 
@@ -480,6 +480,6 @@ class UpgradesTransferCurrencies extends Command
 
     private function markAsExecuted(): void
     {
-        app('fireflyconfig')->set(self::CONFIG_NAME, true);
+        \FireflyIII\Support\Facades\FireflyConfig::set(self::CONFIG_NAME, true);
     }
 }
diff --git a/app/Console/Commands/Upgrade/UpgradesVariousCurrencyInformation.php b/app/Console/Commands/Upgrade/UpgradesVariousCurrencyInformation.php
index f0e669797d..5a157029d1 100644
--- a/app/Console/Commands/Upgrade/UpgradesVariousCurrencyInformation.php
+++ b/app/Console/Commands/Upgrade/UpgradesVariousCurrencyInformation.php
@@ -86,7 +86,7 @@ class UpgradesVariousCurrencyInformation extends Command
 
     private function isExecuted(): bool
     {
-        $configVar = app('fireflyconfig')->get(self::CONFIG_NAME, false);
+        $configVar = \FireflyIII\Support\Facades\FireflyConfig::get(self::CONFIG_NAME, false);
 
         return (bool)$configVar?->data;
 
@@ -246,6 +246,6 @@ class UpgradesVariousCurrencyInformation extends Command
 
     private function markAsExecuted(): void
     {
-        app('fireflyconfig')->set(self::CONFIG_NAME, true);
+        \FireflyIII\Support\Facades\FireflyConfig::set(self::CONFIG_NAME, true);
     }
 }
diff --git a/app/Console/Commands/Upgrade/UpgradesWebhooks.php b/app/Console/Commands/Upgrade/UpgradesWebhooks.php
index bd4773a3f9..abbcc8cd34 100644
--- a/app/Console/Commands/Upgrade/UpgradesWebhooks.php
+++ b/app/Console/Commands/Upgrade/UpgradesWebhooks.php
@@ -63,7 +63,7 @@ class UpgradesWebhooks extends Command
 
     private function isExecuted(): bool
     {
-        $configVar = app('fireflyconfig')->get(self::CONFIG_NAME, false);
+        $configVar = \FireflyIII\Support\Facades\FireflyConfig::get(self::CONFIG_NAME, false);
 
         return (bool)$configVar?->data;
 
@@ -109,6 +109,6 @@ class UpgradesWebhooks extends Command
 
     private function markAsExecuted(): void
     {
-        app('fireflyconfig')->set(self::CONFIG_NAME, true);
+        \FireflyIII\Support\Facades\FireflyConfig::set(self::CONFIG_NAME, true);
     }
 }
diff --git a/app/Handlers/Events/AdminEventHandler.php b/app/Handlers/Events/AdminEventHandler.php
index 6c71077ca2..807019e794 100644
--- a/app/Handlers/Events/AdminEventHandler.php
+++ b/app/Handlers/Events/AdminEventHandler.php
@@ -45,7 +45,7 @@ class AdminEventHandler
 {
     public function sendInvitationNotification(InvitationCreated $event): void
     {
-        $sendMail = app('fireflyconfig')->get('notification_invite_created', true)->data;
+        $sendMail = \FireflyIII\Support\Facades\FireflyConfig::get('notification_invite_created', true)->data;
         if (false === $sendMail) {
             return;
         }
@@ -96,7 +96,7 @@ class AdminEventHandler
      */
     public function sendNewVersion(NewVersionAvailable $event): void
     {
-        $sendMail = app('fireflyconfig')->get('notification_new_version', true)->data;
+        $sendMail = \FireflyIII\Support\Facades\FireflyConfig::get('notification_new_version', true)->data;
         if (false === $sendMail) {
             return;
         }
diff --git a/app/Handlers/Events/UserEventHandler.php b/app/Handlers/Events/UserEventHandler.php
index 398298fc6d..b1833b65e2 100644
--- a/app/Handlers/Events/UserEventHandler.php
+++ b/app/Handlers/Events/UserEventHandler.php
@@ -224,7 +224,7 @@ class UserEventHandler
 
     public function sendAdminRegistrationNotification(RegisteredUser $event): void
     {
-        $sendMail = (bool)app('fireflyconfig')->get('notification_admin_new_reg', true)->data;
+        $sendMail = (bool)\FireflyIII\Support\Facades\FireflyConfig::get('notification_admin_new_reg', true)->data;
         if ($sendMail) {
             $owner = $event->owner;
 
@@ -367,7 +367,7 @@ class UserEventHandler
      */
     public function sendRegistrationMail(RegisteredUser $event): void
     {
-        $sendMail = (bool)app('fireflyconfig')->get('notification_user_new_reg', true)->data;
+        $sendMail = (bool)\FireflyIII\Support\Facades\FireflyConfig::get('notification_user_new_reg', true)->data;
         if ($sendMail) {
             try {
                 Notification::send($event->user, new UserRegistrationNotification());
diff --git a/app/Handlers/Events/VersionCheckEventHandler.php b/app/Handlers/Events/VersionCheckEventHandler.php
index 3a2d7c42d4..d15fca083b 100644
--- a/app/Handlers/Events/VersionCheckEventHandler.php
+++ b/app/Handlers/Events/VersionCheckEventHandler.php
@@ -54,7 +54,7 @@ class VersionCheckEventHandler
         Log::debug('Now in checkForUpdates()');
 
         // should not check for updates:
-        $permission    = app('fireflyconfig')->get('permission_update_check', -1);
+        $permission    = \FireflyIII\Support\Facades\FireflyConfig::get('permission_update_check', -1);
         $value         = (int) $permission->data;
         if (1 !== $value) {
             Log::debug('Update check is not enabled.');
@@ -73,7 +73,7 @@ class VersionCheckEventHandler
         }
 
         /** @var Configuration $lastCheckTime */
-        $lastCheckTime = app('fireflyconfig')->get('last_update_check', Carbon::now()->getTimestamp());
+        $lastCheckTime = \FireflyIII\Support\Facades\FireflyConfig::get('last_update_check', Carbon::now()->getTimestamp());
         $now           = Carbon::now()->getTimestamp();
         $diff          = $now - $lastCheckTime->data;
         Log::debug(sprintf('Last check time is %d, current time is %d, difference is %d', $lastCheckTime->data, $now, $diff));
@@ -87,7 +87,7 @@ class VersionCheckEventHandler
         $release       = $this->getLatestRelease();
 
         session()->flash($release['level'], $release['message']);
-        app('fireflyconfig')->set('last_update_check', Carbon::now()->getTimestamp());
+        \FireflyIII\Support\Facades\FireflyConfig::set('last_update_check', Carbon::now()->getTimestamp());
     }
 
     /**
@@ -107,7 +107,7 @@ class VersionCheckEventHandler
         }
 
         /** @var Configuration $lastCheckTime */
-        $lastCheckTime = app('fireflyconfig')->get('last_update_warning', Carbon::now()->getTimestamp());
+        $lastCheckTime = \FireflyIII\Support\Facades\FireflyConfig::get('last_update_warning', Carbon::now()->getTimestamp());
         $now           = Carbon::now()->getTimestamp();
         $diff          = $now - $lastCheckTime->data;
         Log::debug(sprintf('Last warning time is %d, current time is %d, difference is %d', $lastCheckTime->data, $now, $diff));
@@ -120,6 +120,6 @@ class VersionCheckEventHandler
         Log::debug('Have warned about a new version in four weeks!');
 
         session()->flash('info', (string) trans('firefly.disabled_but_check'));
-        app('fireflyconfig')->set('last_update_warning', Carbon::now()->getTimestamp());
+        \FireflyIII\Support\Facades\FireflyConfig::set('last_update_warning', Carbon::now()->getTimestamp());
     }
 }
diff --git a/app/Helpers/Update/UpdateTrait.php b/app/Helpers/Update/UpdateTrait.php
index 20b65fb024..f94ce56e80 100644
--- a/app/Helpers/Update/UpdateTrait.php
+++ b/app/Helpers/Update/UpdateTrait.php
@@ -43,7 +43,7 @@ trait UpdateTrait
 
         /** @var UpdateRequestInterface $checker */
         $checker       = app(UpdateRequestInterface::class);
-        $channelConfig = app('fireflyconfig')->get('update_channel', 'stable');
+        $channelConfig = \FireflyIII\Support\Facades\FireflyConfig::get('update_channel', 'stable');
         $channel       = (string) $channelConfig->data;
 
         return $checker->getUpdateInformation($channel);
diff --git a/app/Http/Controllers/Admin/UserController.php b/app/Http/Controllers/Admin/UserController.php
index 380ac6dc3e..eee9c0f498 100644
--- a/app/Http/Controllers/Admin/UserController.php
+++ b/app/Http/Controllers/Admin/UserController.php
@@ -164,7 +164,7 @@ class UserController extends Controller
         $subTitle       = (string) trans('firefly.user_administration');
         $subTitleIcon   = 'fa-users';
         $users          = $this->repository->all();
-        $singleUserMode = (bool) app('fireflyconfig')->get('single_user_mode', config('firefly.configuration.single_user_mode'))->data;
+        $singleUserMode = (bool) \FireflyIII\Support\Facades\FireflyConfig::get('single_user_mode', config('firefly.configuration.single_user_mode'))->data;
         $allowInvites   = false;
         if (!$this->externalIdentity && $singleUserMode) {
             // also registration enabled.
diff --git a/app/Http/Controllers/Auth/ForgotPasswordController.php b/app/Http/Controllers/Auth/ForgotPasswordController.php
index 303bad7505..c55665f712 100644
--- a/app/Http/Controllers/Auth/ForgotPasswordController.php
+++ b/app/Http/Controllers/Auth/ForgotPasswordController.php
@@ -142,7 +142,7 @@ class ForgotPasswordController extends Controller
         }
 
         // is allowed to?
-        $singleUserMode    = app('fireflyconfig')->get('single_user_mode', config('firefly.configuration.single_user_mode'))->data;
+        $singleUserMode    = \FireflyIII\Support\Facades\FireflyConfig::get('single_user_mode', config('firefly.configuration.single_user_mode'))->data;
         $userCount         = User::count();
         $allowRegistration = true;
         $pageTitle         = (string) trans('firefly.forgot_pw_page_title');
diff --git a/app/Http/Controllers/Auth/LoginController.php b/app/Http/Controllers/Auth/LoginController.php
index 59c02428e1..94c034b108 100644
--- a/app/Http/Controllers/Auth/LoginController.php
+++ b/app/Http/Controllers/Auth/LoginController.php
@@ -236,7 +236,7 @@ class LoginController extends Controller
         }
 
         // is allowed to register, etc.
-        $singleUserMode    = app('fireflyconfig')->get('single_user_mode', config('firefly.configuration.single_user_mode'))->data;
+        $singleUserMode    = \FireflyIII\Support\Facades\FireflyConfig::get('single_user_mode', config('firefly.configuration.single_user_mode'))->data;
         $allowRegistration = true;
         $allowReset        = true;
         if (true === $singleUserMode && $count > 0) {
diff --git a/app/Http/Controllers/Auth/RegisterController.php b/app/Http/Controllers/Auth/RegisterController.php
index 314f6cab2b..fe431c500a 100644
--- a/app/Http/Controllers/Auth/RegisterController.php
+++ b/app/Http/Controllers/Auth/RegisterController.php
@@ -121,7 +121,7 @@ class RegisterController extends Controller
         $allowRegistration = true;
 
         try {
-            $singleUserMode = app('fireflyconfig')->get('single_user_mode', config('firefly.configuration.single_user_mode'))->data;
+            $singleUserMode = \FireflyIII\Support\Facades\FireflyConfig::get('single_user_mode', config('firefly.configuration.single_user_mode'))->data;
         } catch (ContainerExceptionInterface|NotFoundExceptionInterface) {
             $singleUserMode = true;
         }
@@ -148,7 +148,7 @@ class RegisterController extends Controller
      */
     public function showInviteForm(Request $request, string $code): Factory|\Illuminate\Contracts\View\View
     {
-        $isDemoSite        = app('fireflyconfig')->get('is_demo_site', config('firefly.configuration.is_demo_site'))->data;
+        $isDemoSite        = \FireflyIII\Support\Facades\FireflyConfig::get('is_demo_site', config('firefly.configuration.is_demo_site'))->data;
         $pageTitle         = (string) trans('firefly.register_page_title');
         $repository        = app(UserRepositoryInterface::class);
         $allowRegistration = $this->allowedToRegister();
@@ -182,7 +182,7 @@ class RegisterController extends Controller
      */
     public function showRegistrationForm(?Request $request = null): Factory|\Illuminate\Contracts\View\View
     {
-        $isDemoSite        = app('fireflyconfig')->get('is_demo_site', config('firefly.configuration.is_demo_site'))->data;
+        $isDemoSite        = \FireflyIII\Support\Facades\FireflyConfig::get('is_demo_site', config('firefly.configuration.is_demo_site'))->data;
         $pageTitle         = (string) trans('firefly.register_page_title');
         $allowRegistration = $this->allowedToRegister();
 
diff --git a/app/Http/Controllers/Auth/ResetPasswordController.php b/app/Http/Controllers/Auth/ResetPasswordController.php
index 2b82d826bf..f9204c9d99 100644
--- a/app/Http/Controllers/Auth/ResetPasswordController.php
+++ b/app/Http/Controllers/Auth/ResetPasswordController.php
@@ -131,7 +131,7 @@ class ResetPasswordController extends Controller
         }
 
         // is allowed to register?
-        $singleUserMode    = app('fireflyconfig')->get('single_user_mode', config('firefly.configuration.single_user_mode'))->data;
+        $singleUserMode    = \FireflyIII\Support\Facades\FireflyConfig::get('single_user_mode', config('firefly.configuration.single_user_mode'))->data;
         $userCount         = User::count();
         $allowRegistration = true;
         $pageTitle         = (string) trans('firefly.reset_pw_page_title');
diff --git a/app/Http/Controllers/Controller.php b/app/Http/Controllers/Controller.php
index 3a148e0168..dd80fec692 100644
--- a/app/Http/Controllers/Controller.php
+++ b/app/Http/Controllers/Controller.php
@@ -71,7 +71,7 @@ abstract class Controller extends BaseController
     public function __construct()
     {
         // is site a demo site?
-        $isDemoSiteConfig = app('fireflyconfig')->get('is_demo_site', config('firefly.configuration.is_demo_site', false));
+        $isDemoSiteConfig = \FireflyIII\Support\Facades\FireflyConfig::get('is_demo_site', config('firefly.configuration.is_demo_site', false));
         $isDemoSite       = (bool) $isDemoSiteConfig->data;
         View::share('IS_DEMO_SITE', $isDemoSite);
         View::share('DEMO_USERNAME', config('firefly.demo_username'));
diff --git a/app/Http/Controllers/DebugController.php b/app/Http/Controllers/DebugController.php
index a721ac7d83..c3f96fc3a2 100644
--- a/app/Http/Controllers/DebugController.php
+++ b/app/Http/Controllers/DebugController.php
@@ -241,7 +241,7 @@ class DebugController extends Controller
     {
         $userGuard      = config('auth.defaults.guard');
 
-        $config         = app('fireflyconfig')->get('last_rt_job', 0);
+        $config         = \FireflyIII\Support\Facades\FireflyConfig::get('last_rt_job', 0);
         $lastTime       = (int) $config->data;
         $lastCronjob    = 'never';
         $lastCronjobAgo = 'never';
diff --git a/app/Http/Middleware/Range.php b/app/Http/Middleware/Range.php
index 10f859435d..9ba6ad25e8 100644
--- a/app/Http/Middleware/Range.php
+++ b/app/Http/Middleware/Range.php
@@ -144,11 +144,11 @@ class Range
 
         // share security message:
         if (
-            app('fireflyconfig')->has('upgrade_security_message')
-            && app('fireflyconfig')->has('upgrade_security_level')
+            \FireflyIII\Support\Facades\FireflyConfig::has('upgrade_security_message')
+            && \FireflyIII\Support\Facades\FireflyConfig::has('upgrade_security_level')
         ) {
-            app('view')->share('upgrade_security_message', app('fireflyconfig')->get('upgrade_security_message')->data);
-            app('view')->share('upgrade_security_level', app('fireflyconfig')->get('upgrade_security_level')->data);
+            app('view')->share('upgrade_security_message', \FireflyIII\Support\Facades\FireflyConfig::get('upgrade_security_message')->data);
+            app('view')->share('upgrade_security_level', \FireflyIII\Support\Facades\FireflyConfig::get('upgrade_security_level')->data);
         }
     }
 }
diff --git a/app/Notifications/Notifiables/OwnerNotifiable.php b/app/Notifications/Notifiables/OwnerNotifiable.php
index 96198c5d39..5e82e725d3 100644
--- a/app/Notifications/Notifiables/OwnerNotifiable.php
+++ b/app/Notifications/Notifiables/OwnerNotifiable.php
@@ -58,8 +58,8 @@ class OwnerNotifiable
     public function routeNotificationForPushover(): PushoverReceiver
     {
         Log::debug('Return settings for routeNotificationForPushover');
-        $pushoverAppToken  = (string) app('fireflyconfig')->getEncrypted('pushover_app_token', '')->data;
-        $pushoverUserToken = (string) app('fireflyconfig')->getEncrypted('pushover_user_token', '')->data;
+        $pushoverAppToken  = (string) \FireflyIII\Support\Facades\FireflyConfig::getEncrypted('pushover_app_token', '')->data;
+        $pushoverUserToken = (string) \FireflyIII\Support\Facades\FireflyConfig::getEncrypted('pushover_user_token', '')->data;
 
         return PushoverReceiver::withUserKey($pushoverUserToken)
             ->withApplicationToken($pushoverAppToken)
@@ -68,7 +68,7 @@ class OwnerNotifiable
 
     public function routeNotificationForSlack(): string
     {
-        $res = app('fireflyconfig')->getEncrypted('slack_webhook_url', '')->data;
+        $res = \FireflyIII\Support\Facades\FireflyConfig::getEncrypted('slack_webhook_url', '')->data;
         if (is_array($res)) {
             $res = '';
         }
diff --git a/app/Notifications/ReturnsAvailableChannels.php b/app/Notifications/ReturnsAvailableChannels.php
index 0d4d5dd523..7341b5b04d 100644
--- a/app/Notifications/ReturnsAvailableChannels.php
+++ b/app/Notifications/ReturnsAvailableChannels.php
@@ -54,7 +54,7 @@ class ReturnsAvailableChannels
 
         $channels = ['mail'];
         if (true === config('notifications.channels.slack.enabled', false)) {
-            $slackUrl = app('fireflyconfig')->getEncrypted('slack_webhook_url', '')->data;
+            $slackUrl = \FireflyIII\Support\Facades\FireflyConfig::getEncrypted('slack_webhook_url', '')->data;
             if (UrlValidator::isValidWebhookURL($slackUrl)) {
                 $channels[] = 'slack';
             }
@@ -62,19 +62,19 @@ class ReturnsAvailableChannels
 
         //        if (true === config('notifications.channels.ntfy.enabled', false)) {
         //            // validate presence of of Ntfy settings.
-        //            if ('' !== (string) app('fireflyconfig')->getEncrypted('ntfy_topic', '')->data) {
+        //            if ('' !== (string) \FireflyIII\Support\Facades\FireflyConfig::getEncrypted('ntfy_topic', '')->data) {
         //                Log::debug('Enabled ntfy.');
         //                $channels[] = NtfyChannel::class;
         //            }
-        //            if ('' === (string) app('fireflyconfig')->getEncrypted('ntfy_topic', '')->data) {
+        //            if ('' === (string) \FireflyIII\Support\Facades\FireflyConfig::getEncrypted('ntfy_topic', '')->data) {
         //                Log::warning('No topic name for Ntfy, channel is disabled.');
         //            }
         //        }
 
         // pushover
         if (true === config('notifications.channels.pushover.enabled', false)) {
-            $pushoverAppToken  = (string) app('fireflyconfig')->getEncrypted('pushover_app_token', '')->data;
-            $pushoverUserToken = (string) app('fireflyconfig')->getEncrypted('pushover_user_token', '')->data;
+            $pushoverAppToken  = (string) \FireflyIII\Support\Facades\FireflyConfig::getEncrypted('pushover_app_token', '')->data;
+            $pushoverUserToken = (string) \FireflyIII\Support\Facades\FireflyConfig::getEncrypted('pushover_user_token', '')->data;
             if ('' === $pushoverAppToken || '' === $pushoverUserToken) {
                 Log::warning('[b] No Pushover token, channel is disabled.');
             }
diff --git a/app/Support/System/GeneratesInstallationId.php b/app/Support/System/GeneratesInstallationId.php
index 32ca760483..2a5fc8eedf 100644
--- a/app/Support/System/GeneratesInstallationId.php
+++ b/app/Support/System/GeneratesInstallationId.php
@@ -36,7 +36,7 @@ trait GeneratesInstallationId
     protected function generateInstallationId(): void
     {
         try {
-            $config = app('fireflyconfig')->get('installation_id');
+            $config = \FireflyIII\Support\Facades\FireflyConfig::get('installation_id');
         } catch (FireflyException) {
             Log::info('Could not create or generate installation ID. Do not continue.');
 
@@ -52,7 +52,7 @@ trait GeneratesInstallationId
             $uuid4    = Uuid::uuid4();
             $uniqueId = (string)$uuid4;
             Log::info(sprintf('Created Firefly III installation ID %s', $uniqueId));
-            app('fireflyconfig')->set('installation_id', $uniqueId);
+            \FireflyIII\Support\Facades\FireflyConfig::set('installation_id', $uniqueId);
         }
     }
 }
diff --git a/app/User.php b/app/User.php
index d97b9a767b..12a3ed2ee1 100644
--- a/app/User.php
+++ b/app/User.php
@@ -24,6 +24,7 @@ declare(strict_types=1);
 
 namespace FireflyIII;
 
+use FireflyIII\Support\Facades\FireflyConfig;
 use FireflyIII\Support\Facades\Preferences;
 use Illuminate\Support\Facades\Log;
 use Deprecated;
@@ -403,7 +404,7 @@ class User extends Authenticatable
     public function routeNotificationForSlack(Notification $notification): ?string
     {
         // this check does not validate if the user is owner, Should be done by notification itself.
-        $res  = app('fireflyconfig')->getEncrypted('slack_webhook_url', '')->data;
+        $res  = \FireflyIII\Support\Facades\FireflyConfig::getEncrypted('slack_webhook_url', '')->data;
         if (is_array($res)) {
             $res = '';
         }