diff --git a/config/breadcrumbs.php b/config/breadcrumbs.php
index f238785376..ea323c8789 100644
--- a/config/breadcrumbs.php
+++ b/config/breadcrumbs.php
@@ -2,7 +2,6 @@
 declare(strict_types=1);
 
 
-
 /**
  * breadcrumbs.php
  * Copyright (c) 2018 thegrumpydictator@gmail.com
@@ -55,7 +54,7 @@ return [
     |
     */
 
-    'files' => base_path('routes/breadcrumbs.php'),
+    'files'                                    => base_path('routes/breadcrumbs.php'),
 
     /*
     |--------------------------------------------------------------------------
@@ -67,13 +66,13 @@ return [
     */
 
     // When route-bound breadcrumbs are used but the current route doesn't have a name (UnnamedRouteException)
-    'unnamed-route-exception' => true,
+    'unnamed-route-exception'                  => true,
 
     // When route-bound breadcrumbs are used and the matching breadcrumb doesn't exist (InvalidBreadcrumbException)
     'missing-route-bound-breadcrumb-exception' => true,
 
     // When a named breadcrumb is used but doesn't exist (InvalidBreadcrumbException)
-    'invalid-named-breadcrumb-exception' => true,
+    'invalid-named-breadcrumb-exception'       => true,
 
     /*
     |--------------------------------------------------------------------------
@@ -85,9 +84,9 @@ return [
     */
 
     // Manager
-    'manager-class' => DaveJamesMiller\Breadcrumbs\BreadcrumbsManager::class,
+    'manager-class'                            => DaveJamesMiller\Breadcrumbs\BreadcrumbsManager::class,
 
     // Generator
-    'generator-class' => DaveJamesMiller\Breadcrumbs\BreadcrumbsGenerator::class,
+    'generator-class'                          => DaveJamesMiller\Breadcrumbs\BreadcrumbsGenerator::class,
 
 ];
diff --git a/config/csv.php b/config/csv.php
index 32404f3738..8f6ff88f9a 100644
--- a/config/csv.php
+++ b/config/csv.php
@@ -1,4 +1,12 @@
 <?php
+declare(strict_types=1);
+
+use FireflyIII\Import\Specifics\AbnAmroDescription;
+use FireflyIII\Import\Specifics\IngDescription;
+use FireflyIII\Import\Specifics\PresidentsChoice;
+use FireflyIII\Import\Specifics\RabobankDescription;
+use FireflyIII\Import\Specifics\SnsDescription;
+
 /**
  * csv.php
  * Copyright (c) 2017 thegrumpydictator@gmail.com
@@ -19,8 +27,6 @@
  * along with Firefly III. If not, see <http://www.gnu.org/licenses/>.
  */
 
-declare(strict_types=1);
-
 
 return [
 
@@ -28,11 +34,11 @@ return [
      * Configuration for the CSV specifics.
      */
     'import_specifics' => [
-        'IngDescription'      => 'FireflyIII\Import\Specifics\IngDescription',
-        'RabobankDescription' => 'FireflyIII\Import\Specifics\RabobankDescription',
-        'AbnAmroDescription'  => 'FireflyIII\Import\Specifics\AbnAmroDescription',
-        'SnsDescription'      => 'FireflyIII\Import\Specifics\SnsDescription',
-        'PresidentsChoice'    => 'FireflyIII\Import\Specifics\PresidentsChoice',
+        'IngDescription'      => IngDescription::class,
+        'RabobankDescription' => RabobankDescription::class,
+        'AbnAmroDescription'  => AbnAmroDescription::class,
+        'SnsDescription'      => SnsDescription::class,
+        'PresidentsChoice'    => PresidentsChoice::class,
     ],
 
     /*
@@ -137,102 +143,102 @@ return [
             'field'           => 'external-id',
         ],
 
-        'currency-symbol'   => [
+        'currency-symbol'    => [
             'mappable'        => true,
             'pre-process-map' => false,
             'converter'       => 'CurrencySymbol',
             'field'           => 'currency',
             'mapper'          => 'TransactionCurrencies',
         ],
-        'description'       => [
+        'description'        => [
             'mappable'        => false,
             'pre-process-map' => false,
             'converter'       => 'Description',
             'field'           => 'description',
         ],
-        'date-transaction'  => [
+        'date-transaction'   => [
             'mappable'        => false,
             'pre-process-map' => false,
             'converter'       => 'Date',
             'field'           => 'date',
         ],
-        'date-interest'     => [
+        'date-interest'      => [
             'mappable'        => false,
             'pre-process-map' => false,
             'converter'       => 'Date',
             'field'           => 'date-interest',
         ],
-        'date-book'         => [
+        'date-book'          => [
             'mappable'        => false,
             'pre-process-map' => false,
             'converter'       => 'Date',
             'field'           => 'date-book',
         ],
-        'date-process'      => [
+        'date-process'       => [
             'mappable'        => false,
             'pre-process-map' => false,
             'converter'       => 'Date',
             'field'           => 'date-process',
         ],
-        'date-due'      => [
+        'date-due'           => [
             'mappable'        => false,
             'pre-process-map' => false,
             'converter'       => 'Date',
             'field'           => 'date-due',
         ],
-        'date-payment'      => [
+        'date-payment'       => [
             'mappable'        => false,
             'pre-process-map' => false,
             'converter'       => 'Date',
             'field'           => 'date-payment',
         ],
-        'date-invoice'      => [
+        'date-invoice'       => [
             'mappable'        => false,
             'pre-process-map' => false,
             'converter'       => 'Date',
             'field'           => 'date-invoice',
         ],
-        'budget-id'         => [
+        'budget-id'          => [
             'mappable'        => true,
             'pre-process-map' => false,
             'converter'       => 'BudgetId',
             'field'           => 'budget',
             'mapper'          => 'Budgets',
         ],
-        'budget-name'       => [
+        'budget-name'        => [
             'mappable'        => true,
             'pre-process-map' => false,
             'converter'       => 'BudgetName',
             'field'           => 'budget',
             'mapper'          => 'Budgets',
         ],
-        'rabo-debit-credit' => [
+        'rabo-debit-credit'  => [
             'mappable'        => false,
             'pre-process-map' => false,
             'converter'       => 'RabobankDebitCredit',
             'field'           => 'amount-modifier',
         ],
-        'ing-debit-credit'  => [
+        'ing-debit-credit'   => [
             'mappable'        => false,
             'pre-process-map' => false,
             'converter'       => 'INGDebitCredit',
             'field'           => 'amount-modifier',
         ],
-        'category-id'       => [
+        'category-id'        => [
             'mappable'        => true,
             'pre-process-map' => false,
             'converter'       => 'CategoryId',
             'field'           => 'category',
             'mapper'          => 'Categories',
         ],
-        'category-name'     => [
+        'category-name'      => [
             'mappable'        => true,
             'pre-process-map' => false,
             'converter'       => 'CategoryName',
             'field'           => 'category',
             'mapper'          => 'Categories',
         ],
-        'tags-comma'        => [
+        'tags-comma'         => [
             'mappable'           => false,
             'pre-process-map'    => true,
             'pre-process-mapper' => 'TagsComma',
@@ -240,7 +246,7 @@ return [
             'converter'          => 'TagsComma',
             'mapper'             => 'Tags',
         ],
-        'tags-space'        => [
+        'tags-space'         => [
             'mappable'           => false,
             'pre-process-map'    => true,
             'pre-process-mapper' => 'TagsSpace',
@@ -248,21 +254,21 @@ return [
             'converter'          => 'TagsSpace',
             'mapper'             => 'Tags',
         ],
-        'account-id'        => [
+        'account-id'         => [
             'mappable'        => true,
             'pre-process-map' => false,
             'field'           => 'asset-account-id',
             'converter'       => 'AccountId',
             'mapper'          => 'AssetAccounts',
         ],
-        'account-name'      => [
+        'account-name'       => [
             'mappable'        => true,
             'pre-process-map' => false,
             'field'           => 'asset-account-name',
             'converter'       => 'AssetAccountName',
             'mapper'          => 'AssetAccounts',
         ],
-        'account-iban'      => [
+        'account-iban'       => [
             'mappable'        => true,
             'pre-process-map' => false,
             'field'           => 'asset-account-iban',
@@ -270,66 +276,66 @@ return [
             'mapper'          => 'AssetAccountIbans',
 
         ],
-        'account-number'    => [
+        'account-number'     => [
             'mappable'        => true,
             'pre-process-map' => false,
             'field'           => 'asset-account-number',
             'converter'       => 'AssetAccountNumber',
             'mapper'          => 'AssetAccounts',
         ],
-        'opposing-id'       => [
+        'opposing-id'        => [
             'mappable'        => true,
             'pre-process-map' => false,
             'field'           => 'opposing-account-id',
             'converter'       => 'AccountId',
             'mapper'          => 'OpposingAccounts',
         ],
-        'opposing-bic'      => [
+        'opposing-bic'       => [
             'mappable'        => false,
             'pre-process-map' => false,
             'field'           => 'opposing-account-bic',
             'converter'       => 'AccountBic',
         ],
-        'opposing-name'     => [
+        'opposing-name'      => [
             'mappable'        => true,
             'pre-process-map' => false,
             'field'           => 'opposing-account-name',
             'converter'       => 'OpposingAccountName',
             'mapper'          => 'OpposingAccounts',
         ],
-        'opposing-iban'     => [
+        'opposing-iban'      => [
             'mappable'        => true,
             'pre-process-map' => false,
             'field'           => 'opposing-account-iban',
             'converter'       => 'OpposingAccountIban',
             'mapper'          => 'OpposingAccountIbans',
         ],
-        'opposing-number'   => [
+        'opposing-number'    => [
             'mappable'        => true,
             'pre-process-map' => false,
             'field'           => 'opposing-account-number',
             'converter'       => 'OpposingAccountNumber',
             'mapper'          => 'OpposingAccounts',
         ],
-        'amount'            => [
+        'amount'             => [
             'mappable'        => false,
             'pre-process-map' => false,
             'converter'       => 'Amount',
             'field'           => 'amount',
         ],
-        'amount_debit'      => [
+        'amount_debit'       => [
             'mappable'        => false,
             'pre-process-map' => false,
             'converter'       => 'AmountDebit',
             'field'           => 'amount_debit',
         ],
-        'amount_credit'     => [
+        'amount_credit'      => [
             'mappable'        => false,
             'pre-process-map' => false,
             'converter'       => 'AmountCredit',
             'field'           => 'amount_credit',
         ],
-        'amount_foreign'    => [
+        'amount_foreign'     => [
             'mappable'        => false,
             'pre-process-map' => false,
             'converter'       => 'Amount',
@@ -337,56 +343,56 @@ return [
         ],
 
         // SEPA end to end ID
-        'sepa-ct-id'        => [
+        'sepa-ct-id'         => [
             'mappable'        => false,
             'pre-process-map' => false,
             'converter'       => 'Description',
             'field'           => 'sepa_ct_id',
         ],
         // SEPA opposing account identifier
-        'sepa-ct-op'        => [
+        'sepa-ct-op'         => [
             'mappable'        => false,
             'pre-process-map' => false,
             'converter'       => 'Description',
             'field'           => 'sepa_ct_op',
         ],
         // SEPA Direct Debit Mandate Identifier
-        'sepa-db'           => [
+        'sepa-db'            => [
             'mappable'        => false,
             'pre-process-map' => false,
             'converter'       => 'Description',
             'field'           => 'sepa_db',
         ],
         // SEPA clearing code
-        'sepa-cc'           => [
+        'sepa-cc'            => [
             'mappable'        => false,
             'pre-process-map' => false,
             'converter'       => 'Description',
             'field'           => 'sepa_cc',
         ],
         // SEPA country
-        'sepa-country'           => [
+        'sepa-country'       => [
             'mappable'        => false,
             'pre-process-map' => false,
             'converter'       => 'Description',
             'field'           => 'sepa_country',
         ],
         // SEPA external purpose
-        'sepa-ep'           => [
+        'sepa-ep'            => [
             'mappable'        => false,
             'pre-process-map' => false,
             'converter'       => 'Description',
             'field'           => 'sepa_ep',
         ],
         // SEPA creditor identifier
-        'sepa-ci'           => [
+        'sepa-ci'            => [
             'mappable'        => false,
             'pre-process-map' => false,
             'converter'       => 'Description',
             'field'           => 'sepa_ci',
         ],
         // Internal reference
-        'internal-reference'           => [
+        'internal-reference' => [
             'mappable'        => false,
             'pre-process-map' => false,
             'converter'       => 'Description',
diff --git a/config/firefly.php b/config/firefly.php
index 1b0a7639b7..64e6277cf0 100644
--- a/config/firefly.php
+++ b/config/firefly.php
@@ -1,4 +1,58 @@
 <?php
+
+declare(strict_types=1);
+
+use FireflyIII\Export\Exporter\CsvExporter;
+use FireflyIII\TransactionRules\Actions\AddTag;
+use FireflyIII\TransactionRules\Actions\AppendDescription;
+use FireflyIII\TransactionRules\Actions\AppendNotes;
+use FireflyIII\TransactionRules\Actions\ClearBudget;
+use FireflyIII\TransactionRules\Actions\ClearCategory;
+use FireflyIII\TransactionRules\Actions\ClearNotes;
+use FireflyIII\TransactionRules\Actions\PrependDescription;
+use FireflyIII\TransactionRules\Actions\PrependNotes;
+use FireflyIII\TransactionRules\Actions\RemoveAllTags;
+use FireflyIII\TransactionRules\Actions\RemoveTag;
+use FireflyIII\TransactionRules\Actions\SetBudget;
+use FireflyIII\TransactionRules\Actions\SetCategory;
+use FireflyIII\TransactionRules\Actions\SetDescription;
+use FireflyIII\TransactionRules\Actions\SetDestinationAccount;
+use FireflyIII\TransactionRules\Actions\SetNotes;
+use FireflyIII\TransactionRules\Actions\SetSourceAccount;
+use FireflyIII\TransactionRules\Triggers\AmountExactly;
+use FireflyIII\TransactionRules\Triggers\AmountLess;
+use FireflyIII\TransactionRules\Triggers\AmountMore;
+use FireflyIII\TransactionRules\Triggers\BudgetIs;
+use FireflyIII\TransactionRules\Triggers\CategoryIs;
+use FireflyIII\TransactionRules\Triggers\DescriptionContains;
+use FireflyIII\TransactionRules\Triggers\DescriptionEnds;
+use FireflyIII\TransactionRules\Triggers\DescriptionIs;
+use FireflyIII\TransactionRules\Triggers\DescriptionStarts;
+use FireflyIII\TransactionRules\Triggers\FromAccountContains;
+use FireflyIII\TransactionRules\Triggers\FromAccountEnds;
+use FireflyIII\TransactionRules\Triggers\FromAccountIs;
+use FireflyIII\TransactionRules\Triggers\FromAccountStarts;
+use FireflyIII\TransactionRules\Triggers\HasAnyBudget;
+use FireflyIII\TransactionRules\Triggers\HasAnyCategory;
+use FireflyIII\TransactionRules\Triggers\HasAnyTag;
+use FireflyIII\TransactionRules\Triggers\HasAttachment;
+use FireflyIII\TransactionRules\Triggers\HasNoBudget;
+use FireflyIII\TransactionRules\Triggers\HasNoCategory;
+use FireflyIII\TransactionRules\Triggers\HasNoTag;
+use FireflyIII\TransactionRules\Triggers\NotesAny;
+use FireflyIII\TransactionRules\Triggers\NotesAre;
+use FireflyIII\TransactionRules\Triggers\NotesContain;
+use FireflyIII\TransactionRules\Triggers\NotesEmpty;
+use FireflyIII\TransactionRules\Triggers\NotesEnd;
+use FireflyIII\TransactionRules\Triggers\NotesStart;
+use FireflyIII\TransactionRules\Triggers\TagIs;
+use FireflyIII\TransactionRules\Triggers\ToAccountContains;
+use FireflyIII\TransactionRules\Triggers\ToAccountEnds;
+use FireflyIII\TransactionRules\Triggers\ToAccountIs;
+use FireflyIII\TransactionRules\Triggers\ToAccountStarts;
+use FireflyIII\TransactionRules\Triggers\TransactionType;
+use FireflyIII\TransactionRules\Triggers\UserAction;
+
 /**
  * firefly.php
  * Copyright (c) 2017 thegrumpydictator@gmail.com
@@ -19,7 +73,6 @@
  * along with Firefly III. If not, see <http://www.gnu.org/licenses/>.
  */
 
-declare(strict_types=1);
 
 /*
  * DO NOT EDIT THIS FILE. IT IS AUTO GENERATED.
@@ -101,20 +154,20 @@ return [
     ],
     'list_length'    => 10,
     'export_formats' => [
-        'csv' => 'FireflyIII\Export\Exporter\CsvExporter',
+        'csv' => CsvExporter::class,
     ],
     'spectre'        => [
         'server' => 'https://www.saltedge.com',
     ],
 
-    'default_export_format'      => 'csv',
-    'default_import_format'      => 'csv',
-    'bill_periods'               => ['weekly', 'monthly', 'quarterly', 'half-year', 'yearly'],
-    'accountRoles'               => ['defaultAsset', 'sharedAsset', 'savingAsset', 'ccAsset',],
-    'ccTypes'                    => [
+    'default_export_format'    => 'csv',
+    'default_import_format'    => 'csv',
+    'bill_periods'             => ['weekly', 'monthly', 'quarterly', 'half-year', 'yearly'],
+    'accountRoles'             => ['defaultAsset', 'sharedAsset', 'savingAsset', 'ccAsset',],
+    'ccTypes'                  => [
         'monthlyFull' => 'Full payment every month',
     ],
-    'range_to_repeat_freq'       => [
+    'range_to_repeat_freq'     => [
         '1D'     => 'weekly',
         '1W'     => 'weekly',
         '1M'     => 'monthly',
@@ -123,14 +176,14 @@ return [
         '1Y'     => 'yearly',
         'custom' => 'custom',
     ],
-    'subTitlesByIdentifier'      =>
+    'subTitlesByIdentifier'    =>
         [
             'asset'   => 'Asset accounts',
             'expense' => 'Expense accounts',
             'revenue' => 'Revenue accounts',
             'cash'    => 'Cash accounts',
         ],
-    'subIconsByIdentifier'       =>
+    'subIconsByIdentifier'     =>
         [
             'asset'               => 'fa-money',
             'Asset account'       => 'fa-money',
@@ -144,14 +197,14 @@ return [
             'import'              => 'fa-download',
             'Import account'      => 'fa-download',
         ],
-    'accountTypesByIdentifier'   =>
+    'accountTypesByIdentifier' =>
         [
             'asset'   => ['Default account', 'Asset account'],
             'expense' => ['Expense account', 'Beneficiary account'],
             'revenue' => ['Revenue account'],
             'import'  => ['Import account'],
         ],
-    'accountTypeByIdentifier'    =>
+    'accountTypeByIdentifier'  =>
         [
             'asset'     => 'Asset account',
             'expense'   => 'Expense account',
@@ -161,7 +214,7 @@ return [
             'import'    => 'Import account',
             'reconcile' => 'Reconciliation account',
         ],
-    'shortNamesByFullName'       =>
+    'shortNamesByFullName'     =>
         [
             'Default account'     => 'asset',
             'Asset account'       => 'asset',
@@ -171,7 +224,7 @@ return [
             'Revenue account'     => 'revenue',
             'Cash account'        => 'cash',
         ],
-    'languages'                  => [
+    'languages'                => [
         // completed languages
         'en_US' => ['name_locale' => 'English', 'name_english' => 'English'],
         'es_ES' => ['name_locale' => 'Español', 'name_english' => 'Spanish'],
@@ -188,7 +241,7 @@ return [
         // incomplete languages:
         // 'ca_ES' => ['name_locale' => 'Català', 'name_english' => 'Catalan'],
     ],
-    'transactionTypesByWhat'     => [
+    'transactionTypesByWhat'   => [
         'expenses'   => ['Withdrawal'],
         'withdrawal' => ['Withdrawal'],
         'revenue'    => ['Deposit'],
@@ -196,7 +249,7 @@ return [
         'transfer'   => ['Transfer'],
         'transfers'  => ['Transfer'],
     ],
-    'transactionIconsByWhat'     => [
+    'transactionIconsByWhat'   => [
         'expenses'   => 'fa-long-arrow-left',
         'withdrawal' => 'fa-long-arrow-left',
         'revenue'    => 'fa-long-arrow-right',
@@ -205,7 +258,7 @@ return [
         'transfers'  => 'fa-exchange',
 
     ],
-    'bindables'                  => [
+    'bindables'                => [
         // models
         'account'           => \FireflyIII\Models\Account::class,
         'attachment'        => \FireflyIII\Models\Attachment::class,
@@ -249,60 +302,60 @@ return [
 
 
     ],
-    'rule-triggers'              => [
-        'user_action'           => 'FireflyIII\TransactionRules\Triggers\UserAction',
-        'from_account_starts'   => 'FireflyIII\TransactionRules\Triggers\FromAccountStarts',
-        'from_account_ends'     => 'FireflyIII\TransactionRules\Triggers\FromAccountEnds',
-        'from_account_is'       => 'FireflyIII\TransactionRules\Triggers\FromAccountIs',
-        'from_account_contains' => 'FireflyIII\TransactionRules\Triggers\FromAccountContains',
-        'to_account_starts'     => 'FireflyIII\TransactionRules\Triggers\ToAccountStarts',
-        'to_account_ends'       => 'FireflyIII\TransactionRules\Triggers\ToAccountEnds',
-        'to_account_is'         => 'FireflyIII\TransactionRules\Triggers\ToAccountIs',
-        'to_account_contains'   => 'FireflyIII\TransactionRules\Triggers\ToAccountContains',
-        'amount_less'           => 'FireflyIII\TransactionRules\Triggers\AmountLess',
-        'amount_exactly'        => 'FireflyIII\TransactionRules\Triggers\AmountExactly',
-        'amount_more'           => 'FireflyIII\TransactionRules\Triggers\AmountMore',
-        'description_starts'    => 'FireflyIII\TransactionRules\Triggers\DescriptionStarts',
-        'description_ends'      => 'FireflyIII\TransactionRules\Triggers\DescriptionEnds',
-        'description_contains'  => 'FireflyIII\TransactionRules\Triggers\DescriptionContains',
-        'description_is'        => 'FireflyIII\TransactionRules\Triggers\DescriptionIs',
-        'transaction_type'      => 'FireflyIII\TransactionRules\Triggers\TransactionType',
-        'category_is'           => 'FireflyIII\TransactionRules\Triggers\CategoryIs',
-        'budget_is'             => 'FireflyIII\TransactionRules\Triggers\BudgetIs',
-        'tag_is'                => 'FireflyIII\TransactionRules\Triggers\TagIs',
-        'has_attachments'       => 'FireflyIII\TransactionRules\Triggers\HasAttachment',
-        'has_no_category'       => 'FireflyIII\TransactionRules\Triggers\HasNoCategory',
-        'has_any_category'      => 'FireflyIII\TransactionRules\Triggers\HasAnyCategory',
-        'has_no_budget'         => 'FireflyIII\TransactionRules\Triggers\HasNoBudget',
-        'has_any_budget'        => 'FireflyIII\TransactionRules\Triggers\HasAnyBudget',
-        'has_no_tag'            => 'FireflyIII\TransactionRules\Triggers\HasNoTag',
-        'has_any_tag'           => 'FireflyIII\TransactionRules\Triggers\HasAnyTag',
-        'notes_contain'         => 'FireflyIII\TransactionRules\Triggers\NotesContain',
-        'notes_start'           => 'FireflyIII\TransactionRules\Triggers\NotesStart',
-        'notes_end'             => 'FireflyIII\TransactionRules\Triggers\NotesEnd',
-        'notes_are'             => 'FireflyIII\TransactionRules\Triggers\NotesAre',
-        'no_notes'              => 'FireflyIII\TransactionRules\Triggers\NotesEmpty',
-        'any_notes'             => 'FireflyIII\TransactionRules\Triggers\NotesAny',
+    'rule-triggers'            => [
+        'user_action'           => UserAction::class,
+        'from_account_starts'   => FromAccountStarts::class,
+        'from_account_ends'     => FromAccountEnds::class,
+        'from_account_is'       => FromAccountIs::class,
+        'from_account_contains' => FromAccountContains::class,
+        'to_account_starts'     => ToAccountStarts::class,
+        'to_account_ends'       => ToAccountEnds::class,
+        'to_account_is'         => ToAccountIs::class,
+        'to_account_contains'   => ToAccountContains::class,
+        'amount_less'           => AmountLess::class,
+        'amount_exactly'        => AmountExactly::class,
+        'amount_more'           => AmountMore::class,
+        'description_starts'    => DescriptionStarts::class,
+        'description_ends'      => DescriptionEnds::class,
+        'description_contains'  => DescriptionContains::class,
+        'description_is'        => DescriptionIs::class,
+        'transaction_type'      => TransactionType::class,
+        'category_is'           => CategoryIs::class,
+        'budget_is'             => BudgetIs::class,
+        'tag_is'                => TagIs::class,
+        'has_attachments'       => HasAttachment::class,
+        'has_no_category'       => HasNoCategory::class,
+        'has_any_category'      => HasAnyCategory::class,
+        'has_no_budget'         => HasNoBudget::class,
+        'has_any_budget'        => HasAnyBudget::class,
+        'has_no_tag'            => HasNoTag::class,
+        'has_any_tag'           => HasAnyTag::class,
+        'notes_contain'         => NotesContain::class,
+        'notes_start'           => NotesStart::class,
+        'notes_end'             => NotesEnd::class,
+        'notes_are'             => NotesAre::class,
+        'no_notes'              => NotesEmpty::class,
+        'any_notes'             => NotesAny::class,
     ],
-    'rule-actions'               => [
-        'set_category'            => 'FireflyIII\TransactionRules\Actions\SetCategory',
-        'clear_category'          => 'FireflyIII\TransactionRules\Actions\ClearCategory',
-        'set_budget'              => 'FireflyIII\TransactionRules\Actions\SetBudget',
-        'clear_budget'            => 'FireflyIII\TransactionRules\Actions\ClearBudget',
-        'add_tag'                 => 'FireflyIII\TransactionRules\Actions\AddTag',
-        'remove_tag'              => 'FireflyIII\TransactionRules\Actions\RemoveTag',
-        'remove_all_tags'         => 'FireflyIII\TransactionRules\Actions\RemoveAllTags',
-        'set_description'         => 'FireflyIII\TransactionRules\Actions\SetDescription',
-        'append_description'      => 'FireflyIII\TransactionRules\Actions\AppendDescription',
-        'prepend_description'     => 'FireflyIII\TransactionRules\Actions\PrependDescription',
-        'set_source_account'      => 'FireflyIII\TransactionRules\Actions\SetSourceAccount',
-        'set_destination_account' => 'FireflyIII\TransactionRules\Actions\SetDestinationAccount',
-        'set_notes'               => 'FireflyIII\TransactionRules\Actions\SetNotes',
-        'append_notes'            => 'FireflyIII\TransactionRules\Actions\AppendNotes',
-        'prepend_notes'           => 'FireflyIII\TransactionRules\Actions\PrependNotes',
-        'clear_notes'             => 'FireflyIII\TransactionRules\Actions\ClearNotes',
+    'rule-actions'             => [
+        'set_category'            => SetCategory::class,
+        'clear_category'          => ClearCategory::class,
+        'set_budget'              => SetBudget::class,
+        'clear_budget'            => ClearBudget::class,
+        'add_tag'                 => AddTag::class,
+        'remove_tag'              => RemoveTag::class,
+        'remove_all_tags'         => RemoveAllTags::class,
+        'set_description'         => SetDescription::class,
+        'append_description'      => AppendDescription::class,
+        'prepend_description'     => PrependDescription::class,
+        'set_source_account'      => SetSourceAccount::class,
+        'set_destination_account' => SetDestinationAccount::class,
+        'set_notes'               => SetNotes::class,
+        'append_notes'            => AppendNotes::class,
+        'prepend_notes'           => PrependNotes::class,
+        'clear_notes'             => ClearNotes::class,
     ],
-    'rule-actions-text'          => [
+    'rule-actions-text'        => [
         'set_category',
         'set_budget',
         'add_tag',
@@ -311,18 +364,13 @@ return [
         'append_description',
         'prepend_description',
     ],
-    'test-triggers'              => [
+    'test-triggers'            => [
         'limit' => 10,
         'range' => 200,
     ],
-    'default_currency'           => 'EUR',
-    'default_language'           => 'en_US',
-    'search_modifiers'           => ['amount_is', 'amount', 'amount_max', 'amount_min', 'amount_less', 'amount_more', 'source', 'destination', 'category',
-                                     'budget', 'bill', 'type', 'date', 'date_before', 'date_after', 'on', 'before', 'after'],
+    'default_currency'         => 'EUR',
+    'default_language'         => 'en_US',
+    'search_modifiers'         => ['amount_is', 'amount', 'amount_max', 'amount_min', 'amount_less', 'amount_more', 'source', 'destination', 'category',
+                                   'budget', 'bill', 'type', 'date', 'date_before', 'date_after', 'on', 'before', 'after'],
     // tag notes has_attachments
-    'currency_exchange_services' => [
-        'fixerio' => 'FireflyIII\Services\Currency\FixerIO',
-    ],
-    'preferred_exchange_service' => 'fixerio',
-
 ];
diff --git a/config/google2fa.php b/config/google2fa.php
index 0e99a087d1..2ff91b26c2 100644
--- a/config/google2fa.php
+++ b/config/google2fa.php
@@ -2,7 +2,6 @@
 declare(strict_types=1);
 
 
-
 /**
  * google2fa.php
  * Copyright (c) 2018 thegrumpydictator@gmail.com
@@ -54,17 +53,17 @@ return [
      * 2FA verified session var
      */
 
-    'session_var' => 'google2fa',
+    'session_var'          => 'google2fa',
 
     /*
      * One Time Password request input name
      */
-    'otp_input' => 'one_time_password',
+    'otp_input'            => 'one_time_password',
 
     /*
      * One Time Password Window
      */
-    'window' => 1,
+    'window'               => 1,
 
     /*
      * Forbid user to reuse One Time Passwords.
@@ -74,17 +73,17 @@ return [
     /*
      * User's table column for google2fa secret
      */
-    'otp_secret_column' => 'google2fa_secret',
+    'otp_secret_column'    => 'google2fa_secret',
 
     /*
      * One Time Password View
      */
-    'view' => 'google2fa.index',
+    'view'                 => 'google2fa.index',
 
     /*
      * One Time Password error message
      */
-    'error_messages' => [
+    'error_messages'       => [
         'wrong_otp' => "The 'One Time Password' typed was wrong.",
     ],
 
diff --git a/config/import.php b/config/import.php
index e078a78ea1..b6a05b62dc 100644
--- a/config/import.php
+++ b/config/import.php
@@ -1,4 +1,17 @@
 <?php
+declare(strict_types=1);
+
+use FireflyIII\Import\Configuration\BunqConfigurator;
+use FireflyIII\Import\Configuration\FileConfigurator;
+use FireflyIII\Import\Configuration\SpectreConfigurator;
+use FireflyIII\Import\FileProcessor\CsvProcessor;
+use FireflyIII\Import\Prerequisites\BunqPrerequisites;
+use FireflyIII\Import\Prerequisites\FilePrerequisites;
+use FireflyIII\Import\Prerequisites\SpectrePrerequisites;
+use FireflyIII\Import\Routine\BunqRoutine;
+use FireflyIII\Import\Routine\FileRoutine;
+use FireflyIII\Import\Routine\SpectreRoutine;
+
 /**
  * import.php
  * Copyright (c) 2017 thegrumpydictator@gmail.com
@@ -19,7 +32,6 @@
  * along with Firefly III. If not, see <http://www.gnu.org/licenses/>.
  */
 
-declare(strict_types=1);
 
 return [
     'enabled'       => [
@@ -29,22 +41,22 @@ return [
         'plaid'   => false,
     ],
     'prerequisites' => [
-        'file'    => 'FireflyIII\Import\Prerequisites\FilePrerequisites',
-        'bunq'    => 'FireflyIII\Import\Prerequisites\BunqPrerequisites',
-        'spectre' => 'FireflyIII\Import\Prerequisites\SpectrePrerequisites',
+        'file'    => FilePrerequisites::class,
+        'bunq'    => BunqPrerequisites::class,
+        'spectre' => SpectrePrerequisites::class,
         'plaid'   => 'FireflyIII\Import\Prerequisites\PlaidPrerequisites',
 
     ],
     'configuration' => [
-        'file'    => 'FireflyIII\Import\Configuration\FileConfigurator',
-        'bunq'    => 'FireflyIII\Import\Configuration\BunqConfigurator',
-        'spectre' => 'FireflyIII\Import\Configuration\SpectreConfigurator',
+        'file'    => FileConfigurator::class,
+        'bunq'    => BunqConfigurator::class,
+        'spectre' => SpectreConfigurator::class,
         'plaid'   => 'FireflyIII\Import\Configuration\PlaidConfigurator',
     ],
     'routine'       => [
-        'file'    => 'FireflyIII\Import\Routine\FileRoutine',
-        'bunq'    => 'FireflyIII\Import\Routine\BunqRoutine',
-        'spectre' => 'FireflyIII\Import\Routine\SpectreRoutine',
+        'file'    => FileRoutine::class,
+        'bunq'    => BunqRoutine::class,
+        'spectre' => SpectreRoutine::class,
         'plaid'   => 'FireflyIII\Import\Routine\PlaidRoutine',
     ],
 
@@ -53,7 +65,7 @@ return [
             'import_formats'        => ['csv'], // mt940
             'default_import_format' => 'csv',
             'processors'            => [
-                'csv' => 'FireflyIII\Import\FileProcessor\CsvProcessor',
+                'csv' => CsvProcessor::class,
             ],
         ],
         'bunq' => [
diff --git a/config/intro.php b/config/intro.php
index dafcb13bac..29fccb7fa0 100644
--- a/config/intro.php
+++ b/config/intro.php
@@ -37,7 +37,7 @@ return [
     ],
     // accounts: create
     'accounts_create'                => [
-        'iban'  => ['element' => '#ffInput_iban'],
+        'iban' => ['element' => '#ffInput_iban'],
     ],
     // extra text for asset account creation.
     'accounts_create_asset'          => [
diff --git a/config/twigbridge.php b/config/twigbridge.php
index 2433a298c2..60f2d36c79 100644
--- a/config/twigbridge.php
+++ b/config/twigbridge.php
@@ -1,4 +1,18 @@
 <?php
+declare(strict_types=1);
+
+use TwigBridge\Extension\Laravel\Auth;
+use TwigBridge\Extension\Laravel\Config;
+use TwigBridge\Extension\Laravel\Dump;
+use TwigBridge\Extension\Laravel\Input;
+use TwigBridge\Extension\Laravel\Session;
+use TwigBridge\Extension\Laravel\Str;
+use TwigBridge\Extension\Laravel\Translator;
+use TwigBridge\Extension\Laravel\Url;
+use TwigBridge\Extension\Loader\Facades;
+use TwigBridge\Extension\Loader\Filters;
+use TwigBridge\Extension\Loader\Functions;
+use TwigBridge\Twig\Template;
 
 /**
  * twigbridge.php
@@ -20,8 +34,6 @@
  * along with Firefly III. If not, see <http://www.gnu.org/licenses/>.
  */
 
-declare(strict_types=1);
-
 
 /**
  * Configuration options for Twig.
@@ -59,7 +71,7 @@ return [
 
             // The base template class to use for generated templates.
             // default: TwigBridge\Twig\Template
-            'base_template_class' => 'TwigBridge\Twig\Template',
+            'base_template_class' => Template::class,
 
             // An absolute path where to store the compiled templates, or false to disable caching. If null
             // then the cache file path is used.
@@ -111,18 +123,18 @@ return [
         |
         */
         'enabled'   => [
-            'TwigBridge\Extension\Loader\Facades',
-            'TwigBridge\Extension\Loader\Filters',
-            'TwigBridge\Extension\Loader\Functions',
+            Facades::class,
+            Filters::class,
+            Functions::class,
 
-            'TwigBridge\Extension\Laravel\Auth',
-            'TwigBridge\Extension\Laravel\Config',
-            'TwigBridge\Extension\Laravel\Dump',
-            'TwigBridge\Extension\Laravel\Input',
-            'TwigBridge\Extension\Laravel\Session',
-            'TwigBridge\Extension\Laravel\Str',
-            'TwigBridge\Extension\Laravel\Translator',
-            'TwigBridge\Extension\Laravel\Url',
+            Auth::class,
+            Config::class,
+            Dump::class,
+            Input::class,
+            Session::class,
+            Str::class,
+            Translator::class,
+            Url::class,
             // 'TwigBridge\Extension\Laravel\Gate',
 
             // 'TwigBridge\Extension\Laravel\Form',