diff --git a/app/Http/Controllers/HomeController.php b/app/Http/Controllers/HomeController.php
index 59cac90dc8..b077674fa4 100644
--- a/app/Http/Controllers/HomeController.php
+++ b/app/Http/Controllers/HomeController.php
@@ -208,7 +208,6 @@ class HomeController extends Controller
         if (0 === $count) {
             return redirect(route('new-user.index'));
         }
-
         $subTitle     = trans('firefly.welcomeBack');
         $transactions = [];
         $frontPage    = Preferences::get(
diff --git a/app/Http/Controllers/PreferencesController.php b/app/Http/Controllers/PreferencesController.php
index 0ea735d098..608cb1e6c4 100644
--- a/app/Http/Controllers/PreferencesController.php
+++ b/app/Http/Controllers/PreferencesController.php
@@ -27,7 +27,7 @@ use FireflyIII\Models\AccountType;
 use FireflyIII\Repositories\Account\AccountRepositoryInterface;
 use FireflyIII\Repositories\User\UserRepositoryInterface;
 use Illuminate\Http\Request;
-use PragmaRX\Google2FA\Contracts\Google2FA;
+use Google2FA;
 use Preferences;
 use Session;
 use View;
@@ -55,16 +55,14 @@ class PreferencesController extends Controller
     }
 
     /**
-     * @param Google2FA $google2fa
-     *
      * @return View
      */
-    public function code(Google2FA $google2fa)
+    public function code()
     {
         $domain = $this->getDomain();
-        $secret = $google2fa->generateSecretKey();
+        $secret = Google2FA::generateSecretKey();
         Session::flash('two-factor-secret', $secret);
-        $image = $google2fa->getQRCodeInline($domain, auth()->user()->email, $secret, 200);
+        $image = Google2FA::getQRCodeInline($domain, auth()->user()->email, $secret, 200);
 
         return view('preferences.code', compact('image'));
     }
diff --git a/app/Models/TransactionJournalLink.php b/app/Models/TransactionJournalLink.php
index 05cca646ae..92417a822f 100644
--- a/app/Models/TransactionJournalLink.php
+++ b/app/Models/TransactionJournalLink.php
@@ -76,7 +76,7 @@ class TransactionJournalLink extends Model
     public function getCommentAttribute($value): ?string
     {
         if (null !== $value) {
-            return Crypt::decrypt($value);
+            return app('steam')->tryDecrypt($value);
         }
 
         return null;
diff --git a/config/app.php b/config/app.php
index 80b7062006..9d5c96d992 100644
--- a/config/app.php
+++ b/config/app.php
@@ -76,12 +76,12 @@ return [
         FireflyIII\Providers\RouteServiceProvider::class,
 
         // own stuff:
-//        Barryvdh\LaravelIdeHelper\IdeHelperServiceProvider::class,
-//        Barryvdh\Debugbar\ServiceProvider::class,
-        DaveJamesMiller\Breadcrumbs\BreadcrumbsServiceProvider::class,
+        //        Barryvdh\LaravelIdeHelper\IdeHelperServiceProvider::class,
+        //        Barryvdh\Debugbar\ServiceProvider::class,
         TwigBridge\ServiceProvider::class,
         PragmaRX\Google2FALaravel\ServiceProvider::class,
 
+
         /*
          * More service providers.
         */
@@ -141,14 +141,14 @@ return [
         'Twig'          => TwigBridge\Facade\Twig::class,
         'Form'          => Collective\Html\FormFacade::class,
         'Html'          => Collective\Html\HtmlFacade::class,
-        'Breadcrumbs'   => DaveJamesMiller\Breadcrumbs\Facade::class,
         'Preferences'   => \FireflyIII\Support\Facades\Preferences::class,
         'FireflyConfig' => \FireflyIII\Support\Facades\FireflyConfig::class,
         'Navigation'    => \FireflyIII\Support\Facades\Navigation::class,
         'Amount'        => \FireflyIII\Support\Facades\Amount::class,
         'Steam'         => \FireflyIII\Support\Facades\Steam::class,
         'ExpandedForm'  => \FireflyIII\Support\Facades\ExpandedForm::class,
-        'Google2FA'     => PragmaRX\Google2FA\Vendor\Laravel\Facade::class,
+        'Google2FA'     => PragmaRX\Google2FALaravel\Facade::class,
+
     ],
 
 ];
diff --git a/config/breadcrumbs.php b/config/breadcrumbs.php
new file mode 100644
index 0000000000..764f93c676
--- /dev/null
+++ b/config/breadcrumbs.php
@@ -0,0 +1,70 @@
+<?php
+
+return [
+
+    /*
+    |--------------------------------------------------------------------------
+    | View Name
+    |--------------------------------------------------------------------------
+    |
+    | Choose a view to display when Breadcrumbs::render() is called.
+    | Built in templates are:
+    |
+    | - 'breadcrumbs::bootstrap4' - Twitter Bootstrap v4
+    | - 'breadcrumbs::bootstrap3' - Twitter Bootstrap v3
+    | - 'breadcrumbs::bootstrap2' - Twitter Bootstrap v2
+    |
+    | Or a custom view, e.g. '_partials/breadcrumbs'.
+    |
+    */
+
+    'view' => 'breadcrumbs::bootstrap3',
+
+    /*
+    |--------------------------------------------------------------------------
+    | Breadcrumbs File(s)
+    |--------------------------------------------------------------------------
+    |
+    | The file(s) where breadcrumbs are defined. e.g.
+    |
+    | - base_path('routes/breadcrumbs.php')
+    | - glob(base_path('breadcrumbs/*.php'))
+    |
+    */
+
+    'files' => base_path('routes/breadcrumbs.php'),
+
+    /*
+    |--------------------------------------------------------------------------
+    | Exceptions
+    |--------------------------------------------------------------------------
+    |
+    | Determine when to throw an exception.
+    |
+    */
+
+    // When route-bound breadcrumbs are used but the current route doesn't have a name (UnnamedRouteException)
+    '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,
+
+    /*
+    |--------------------------------------------------------------------------
+    | Classes
+    |--------------------------------------------------------------------------
+    |
+    | Subclass the default classes for more advanced customisations.
+    |
+    */
+
+    // Manager
+    'manager-class' => DaveJamesMiller\Breadcrumbs\BreadcrumbsManager::class,
+
+    // Generator
+    'generator-class' => DaveJamesMiller\Breadcrumbs\BreadcrumbsGenerator::class,
+
+];
diff --git a/config/google2fa.php b/config/google2fa.php
new file mode 100644
index 0000000000..e04f5e0b76
--- /dev/null
+++ b/config/google2fa.php
@@ -0,0 +1,68 @@
+<?php
+
+return [
+
+    /*
+     * Auth container binding
+     */
+
+    'enabled' => true,
+
+    /*
+     * Lifetime in minutes.
+     * In case you need your users to be asked for a new one time passwords from time to time.
+     */
+
+    'lifetime' => 0, // 0 = eternal
+
+    /*
+     * Renew lifetime at every new request.
+     */
+
+    'keep_alive' => true,
+
+    /*
+     * Auth container binding
+     */
+
+    'auth' => 'auth',
+
+    /*
+     * 2FA verified session var
+     */
+
+    'session_var' => 'google2fa',
+
+    /*
+     * One Time Password request input name
+     */
+    'otp_input' => 'one_time_password',
+
+    /*
+     * One Time Password Window
+     */
+    'window' => 1,
+
+    /*
+     * Forbid user to reuse One Time Passwords.
+     */
+    'forbid_old_passwords' => false,
+
+    /*
+     * User's table column for google2fa secret
+     */
+    'otp_secret_column' => 'google2fa_secret',
+
+    /*
+     * One Time Password View
+     */
+    'view' => 'google2fa.index',
+
+    /*
+     * One Time Password error message
+     */
+    'error_messages' => [
+        'wrong_otp' => "The 'One Time Password' typed was wrong.",
+    ],
+
+];
diff --git a/config/twigbridge.php b/config/twigbridge.php
index 3d30985409..5d7467be5b 100644
--- a/config/twigbridge.php
+++ b/config/twigbridge.php
@@ -160,7 +160,7 @@ return [
         'facades'   => [
             'Breadcrumbs'  => [
                 'is_safe' => [
-                    'renderIfExists',
+                    'render',
                 ],
             ],
             'Session',
diff --git a/resources/views/accounts/create.twig b/resources/views/accounts/create.twig
index 25c7c3b25c..50c35a5eae 100644
--- a/resources/views/accounts/create.twig
+++ b/resources/views/accounts/create.twig
@@ -1,6 +1,6 @@
 {% extends "./layout/default" %}
 {% block breadcrumbs %}
-    {{ Breadcrumbs.renderIfExists(Route.getCurrentRoute.getName, what) }}
+    {{ Breadcrumbs.render(Route.getCurrentRoute.getName, what) }}
 {% endblock %}
 {% block content %}
 
diff --git a/resources/views/accounts/delete.twig b/resources/views/accounts/delete.twig
index 919ee63a76..9e8dcb0868 100644
--- a/resources/views/accounts/delete.twig
+++ b/resources/views/accounts/delete.twig
@@ -1,7 +1,7 @@
 {% extends "./layout/default" %}
 
 {% block breadcrumbs %}
-    {{ Breadcrumbs.renderIfExists(Route.getCurrentRoute.getName, account) }}
+    {{ Breadcrumbs.render(Route.getCurrentRoute.getName, account) }}
 {% endblock %}
 
 {% block content %}
diff --git a/resources/views/accounts/edit.twig b/resources/views/accounts/edit.twig
index 37ebc3b9c0..a3ed653d29 100644
--- a/resources/views/accounts/edit.twig
+++ b/resources/views/accounts/edit.twig
@@ -1,7 +1,7 @@
 {% extends "./layout/default" %}
 
 {% block breadcrumbs %}
-    {{ Breadcrumbs.renderIfExists(Route.getCurrentRoute().getName(), account) }}
+    {{ Breadcrumbs.render(Route.getCurrentRoute().getName(), account) }}
 {% endblock %}
 
 {% block content %}
diff --git a/resources/views/accounts/index.twig b/resources/views/accounts/index.twig
index 19a5507473..1783050235 100644
--- a/resources/views/accounts/index.twig
+++ b/resources/views/accounts/index.twig
@@ -1,7 +1,7 @@
 {% extends "./layout/default" %}
 
 {% block breadcrumbs %}
-    {{ Breadcrumbs.renderIfExists(Route.getCurrentRoute.getName, what) }}
+    {{ Breadcrumbs.render(Route.getCurrentRoute.getName, what) }}
 {% endblock %}
 
 {% block content %}
diff --git a/resources/views/accounts/reconcile/edit.twig b/resources/views/accounts/reconcile/edit.twig
index dff6c8c6dc..8eac4a85e4 100644
--- a/resources/views/accounts/reconcile/edit.twig
+++ b/resources/views/accounts/reconcile/edit.twig
@@ -1,7 +1,7 @@
 {% extends "./layout/default" %}
 
 {% block breadcrumbs %}
-    {{ Breadcrumbs.renderIfExists(Route.getCurrentRoute.getName, journal) }}
+    {{ Breadcrumbs.render(Route.getCurrentRoute.getName, journal) }}
 {% endblock %}
 
 {% block content %}
diff --git a/resources/views/accounts/reconcile/index.twig b/resources/views/accounts/reconcile/index.twig
index 70b82ee4b2..23754353b1 100644
--- a/resources/views/accounts/reconcile/index.twig
+++ b/resources/views/accounts/reconcile/index.twig
@@ -1,7 +1,7 @@
 {% extends "./layout/default" %}
 
 {% block breadcrumbs %}
-    {{ Breadcrumbs.renderIfExists(Route.getCurrentRoute.getName, account, moment, start, end) }}
+    {{ Breadcrumbs.render(Route.getCurrentRoute.getName, account, moment, start, end) }}
 {% endblock %}
 
 {% block content %}
diff --git a/resources/views/accounts/reconcile/show.twig b/resources/views/accounts/reconcile/show.twig
index f18ebaf3b5..b67e5ac61f 100644
--- a/resources/views/accounts/reconcile/show.twig
+++ b/resources/views/accounts/reconcile/show.twig
@@ -1,7 +1,7 @@
 {% extends "./layout/default" %}
 
 {% block breadcrumbs %}
-    {{ Breadcrumbs.renderIfExists(Route.getCurrentRoute.getName, account, journal) }}
+    {{ Breadcrumbs.render(Route.getCurrentRoute.getName, account, journal) }}
 {% endblock %}
 
 {% block content %}
diff --git a/resources/views/accounts/show.twig b/resources/views/accounts/show.twig
index 4d9f0a5b72..74fdaf1889 100644
--- a/resources/views/accounts/show.twig
+++ b/resources/views/accounts/show.twig
@@ -1,7 +1,7 @@
 {% extends "./layout/default" %}
 
 {% block breadcrumbs %}
-    {{ Breadcrumbs.renderIfExists(Route.getCurrentRoute.getName, account, moment, start, end) }}
+    {{ Breadcrumbs.render(Route.getCurrentRoute.getName, account, moment, start, end) }}
 {% endblock %}
 
 {% block content %}
diff --git a/resources/views/admin/configuration/index.twig b/resources/views/admin/configuration/index.twig
index 950011a87f..f04b387783 100644
--- a/resources/views/admin/configuration/index.twig
+++ b/resources/views/admin/configuration/index.twig
@@ -1,7 +1,7 @@
 {% extends "./layout/default" %}
 
 {% block breadcrumbs %}
-    {{ Breadcrumbs.renderIfExists }}
+    {{ Breadcrumbs.render }}
 {% endblock %}
 {% block content %}
     <form action="{{ route('admin.configuration.index.post') }}" method="post" id="store" class="form-horizontal">
diff --git a/resources/views/admin/index.twig b/resources/views/admin/index.twig
index 7d1bf24bd8..4901d36deb 100644
--- a/resources/views/admin/index.twig
+++ b/resources/views/admin/index.twig
@@ -1,7 +1,7 @@
 {% extends "./layout/default" %}
 
 {% block breadcrumbs %}
-    {{ Breadcrumbs.renderIfExists }}
+    {{ Breadcrumbs.render }}
 {% endblock %}
 {% block content %}
     <div class="row">
diff --git a/resources/views/admin/link/create.twig b/resources/views/admin/link/create.twig
index cb69f859df..83d7fe947c 100644
--- a/resources/views/admin/link/create.twig
+++ b/resources/views/admin/link/create.twig
@@ -1,7 +1,7 @@
 {% extends "./layout/default" %}
 
 {% block breadcrumbs %}
-    {{ Breadcrumbs.renderIfExists(Route.getCurrentRoute.getName) }}
+    {{ Breadcrumbs.render(Route.getCurrentRoute.getName) }}
 {% endblock %}
 
 {% block content %}
diff --git a/resources/views/admin/link/delete.twig b/resources/views/admin/link/delete.twig
index 7b94903ed9..884bf0da93 100644
--- a/resources/views/admin/link/delete.twig
+++ b/resources/views/admin/link/delete.twig
@@ -1,7 +1,7 @@
 {% extends "./layout/default" %}
 
 {% block breadcrumbs %}
-    {{ Breadcrumbs.renderIfExists(Route.getCurrentRoute.getName, linkType) }}
+    {{ Breadcrumbs.render(Route.getCurrentRoute.getName, linkType) }}
 {% endblock %}
 
 {% block content %}
diff --git a/resources/views/admin/link/edit.twig b/resources/views/admin/link/edit.twig
index 1bd8599f70..c72e131b1c 100644
--- a/resources/views/admin/link/edit.twig
+++ b/resources/views/admin/link/edit.twig
@@ -1,7 +1,7 @@
 {% extends "./layout/default" %}
 
 {% block breadcrumbs %}
-    {{ Breadcrumbs.renderIfExists(Route.getCurrentRoute.getName, linkType) }}
+    {{ Breadcrumbs.render(Route.getCurrentRoute.getName, linkType) }}
 {% endblock %}
 
 {% block content %}
diff --git a/resources/views/admin/link/index.twig b/resources/views/admin/link/index.twig
index 4ae665e1ad..059c67b2d8 100644
--- a/resources/views/admin/link/index.twig
+++ b/resources/views/admin/link/index.twig
@@ -1,7 +1,7 @@
 {% extends "./layout/default" %}
 
 {% block breadcrumbs %}
-    {{ Breadcrumbs.renderIfExists }}
+    {{ Breadcrumbs.render }}
 {% endblock %}
 {% block content %}
     <div class="row">
diff --git a/resources/views/admin/link/show.twig b/resources/views/admin/link/show.twig
index 9515d56588..3a1dab5af5 100644
--- a/resources/views/admin/link/show.twig
+++ b/resources/views/admin/link/show.twig
@@ -1,7 +1,7 @@
 {% extends "./layout/default" %}
 
 {% block breadcrumbs %}
-    {{ Breadcrumbs.renderIfExists(Route.getCurrentRoute.getName, linkType) }}
+    {{ Breadcrumbs.render(Route.getCurrentRoute.getName, linkType) }}
 {% endblock %}
 {% block content %}
     <div class="row">
diff --git a/resources/views/admin/users/delete.twig b/resources/views/admin/users/delete.twig
index 17efd643a8..80c194816d 100644
--- a/resources/views/admin/users/delete.twig
+++ b/resources/views/admin/users/delete.twig
@@ -1,7 +1,7 @@
 {% extends "./layout/default" %}
 
 {% block breadcrumbs %}
-    {{ Breadcrumbs.renderIfExists(Route.getCurrentRoute.getName, user) }}
+    {{ Breadcrumbs.render(Route.getCurrentRoute.getName, user) }}
 {% endblock %}
 
 {% block content %}
diff --git a/resources/views/admin/users/edit.twig b/resources/views/admin/users/edit.twig
index 19a9cb0465..510bc5ffd1 100644
--- a/resources/views/admin/users/edit.twig
+++ b/resources/views/admin/users/edit.twig
@@ -1,7 +1,7 @@
 {% extends "./layout/default" %}
 
 {% block breadcrumbs %}
-    {{ Breadcrumbs.renderIfExists(Route.getCurrentRoute.getName, user) }}
+    {{ Breadcrumbs.render(Route.getCurrentRoute.getName, user) }}
 {% endblock %}
 {% block content %}
 
diff --git a/resources/views/admin/users/index.twig b/resources/views/admin/users/index.twig
index 03b1a255e9..c9b21ebff4 100644
--- a/resources/views/admin/users/index.twig
+++ b/resources/views/admin/users/index.twig
@@ -1,7 +1,7 @@
 {% extends "./layout/default" %}
 
 {% block breadcrumbs %}
-    {{ Breadcrumbs.renderIfExists }}
+    {{ Breadcrumbs.render }}
 {% endblock %}
 {% block content %}
     <div class="row">
diff --git a/resources/views/admin/users/show.twig b/resources/views/admin/users/show.twig
index b627f4c2f0..349e926811 100644
--- a/resources/views/admin/users/show.twig
+++ b/resources/views/admin/users/show.twig
@@ -1,7 +1,7 @@
 {% extends "./layout/default" %}
 
 {% block breadcrumbs %}
-    {{ Breadcrumbs.renderIfExists(Route.getCurrentRoute.getName, user) }}
+    {{ Breadcrumbs.render(Route.getCurrentRoute.getName, user) }}
 {% endblock %}
 {% block content %}
     <div class="row">
diff --git a/resources/views/attachments/delete.twig b/resources/views/attachments/delete.twig
index 3e854f8bde..65412569b4 100644
--- a/resources/views/attachments/delete.twig
+++ b/resources/views/attachments/delete.twig
@@ -1,7 +1,7 @@
 {% extends "./layout/default" %}
 
 {% block breadcrumbs %}
-    {{ Breadcrumbs.renderIfExists(Route.getCurrentRoute().getName(), attachment) }}
+    {{ Breadcrumbs.render(Route.getCurrentRoute().getName(), attachment) }}
 {% endblock %}
 
 {% block content %}
diff --git a/resources/views/attachments/edit.twig b/resources/views/attachments/edit.twig
index 199b39b64f..deed7522de 100644
--- a/resources/views/attachments/edit.twig
+++ b/resources/views/attachments/edit.twig
@@ -1,7 +1,7 @@
 {% extends "./layout/default" %}
 
 {% block breadcrumbs %}
-    {{ Breadcrumbs.renderIfExists(Route.getCurrentRoute().getName(), attachment) }}
+    {{ Breadcrumbs.render(Route.getCurrentRoute().getName(), attachment) }}
 {% endblock %}
 
 {% block content %}
diff --git a/resources/views/bills/create.twig b/resources/views/bills/create.twig
index 3f2701cbcd..08bc14a318 100644
--- a/resources/views/bills/create.twig
+++ b/resources/views/bills/create.twig
@@ -1,7 +1,7 @@
 {% extends "./layout/default" %}
 
 {% block breadcrumbs %}
-    {{ Breadcrumbs.renderIfExists(Route.getCurrentRoute.getName, piggyBank) }}
+    {{ Breadcrumbs.render(Route.getCurrentRoute.getName, piggyBank) }}
 {% endblock %}
 
 {% block content %}
diff --git a/resources/views/bills/delete.twig b/resources/views/bills/delete.twig
index 650242af27..b717d8bf37 100644
--- a/resources/views/bills/delete.twig
+++ b/resources/views/bills/delete.twig
@@ -1,7 +1,7 @@
 {% extends "./layout/default" %}
 
 {% block breadcrumbs %}
-    {{ Breadcrumbs.renderIfExists(Route.getCurrentRoute.getName, bill) }}
+    {{ Breadcrumbs.render(Route.getCurrentRoute.getName, bill) }}
 {% endblock %}
 
 {% block content %}
diff --git a/resources/views/bills/edit.twig b/resources/views/bills/edit.twig
index e2983cd929..583a7a2733 100644
--- a/resources/views/bills/edit.twig
+++ b/resources/views/bills/edit.twig
@@ -1,7 +1,7 @@
 {% extends "./layout/default" %}
 
 {% block breadcrumbs %}
-    {{ Breadcrumbs.renderIfExists(Route.getCurrentRoute.getName, bill) }}
+    {{ Breadcrumbs.render(Route.getCurrentRoute.getName, bill) }}
 {% endblock %}
 
 {% block content %}
diff --git a/resources/views/bills/index.twig b/resources/views/bills/index.twig
index 0870429463..b262cd604a 100644
--- a/resources/views/bills/index.twig
+++ b/resources/views/bills/index.twig
@@ -1,7 +1,7 @@
 {% extends "./layout/default" %}
 
 {% block breadcrumbs %}
-    {{ Breadcrumbs.renderIfExists(Route.getCurrentRoute.getName) }}
+    {{ Breadcrumbs.render(Route.getCurrentRoute.getName) }}
 {% endblock %}
 
 {% block content %}
diff --git a/resources/views/bills/show.twig b/resources/views/bills/show.twig
index 24846d11c4..4a2542f91b 100644
--- a/resources/views/bills/show.twig
+++ b/resources/views/bills/show.twig
@@ -1,7 +1,7 @@
 {% extends "./layout/default" %}
 
 {% block breadcrumbs %}
-    {{ Breadcrumbs.renderIfExists(Route.getCurrentRoute.getName, bill) }}
+    {{ Breadcrumbs.render(Route.getCurrentRoute.getName, bill) }}
 {% endblock %}
 
 {% block content %}
diff --git a/resources/views/budgets/create.twig b/resources/views/budgets/create.twig
index 25e6f9cd10..4243a15087 100644
--- a/resources/views/budgets/create.twig
+++ b/resources/views/budgets/create.twig
@@ -1,7 +1,7 @@
 {% extends "./layout/default" %}
 
 {% block breadcrumbs %}
-    {{ Breadcrumbs.renderIfExists(Route.getCurrentRoute.getName) }}
+    {{ Breadcrumbs.render(Route.getCurrentRoute.getName) }}
 {% endblock %}
 
 {% block content %}
diff --git a/resources/views/budgets/delete.twig b/resources/views/budgets/delete.twig
index 74590ff0c5..523f8e8781 100644
--- a/resources/views/budgets/delete.twig
+++ b/resources/views/budgets/delete.twig
@@ -1,7 +1,7 @@
 {% extends "./layout/default" %}
 
 {% block breadcrumbs %}
-    {{ Breadcrumbs.renderIfExists(Route.getCurrentRoute.getName, budget) }}
+    {{ Breadcrumbs.render(Route.getCurrentRoute.getName, budget) }}
 {% endblock %}
 
 {% block content %}
diff --git a/resources/views/budgets/edit.twig b/resources/views/budgets/edit.twig
index 977dfad47c..5054c47264 100644
--- a/resources/views/budgets/edit.twig
+++ b/resources/views/budgets/edit.twig
@@ -1,7 +1,7 @@
 {% extends "./layout/default" %}
 
 {% block breadcrumbs %}
-    {{ Breadcrumbs.renderIfExists(Route.getCurrentRoute.getName, budget) }}
+    {{ Breadcrumbs.render(Route.getCurrentRoute.getName, budget) }}
 {% endblock %}
 
 {% block content %}
diff --git a/resources/views/budgets/index.twig b/resources/views/budgets/index.twig
index 4d5ee7f177..dd460d05fb 100644
--- a/resources/views/budgets/index.twig
+++ b/resources/views/budgets/index.twig
@@ -1,7 +1,7 @@
 {% extends "./layout/default" %}
 
 {% block breadcrumbs %}
-    {{ Breadcrumbs.renderIfExists(Route.getCurrentRoute.getName) }}
+    {{ Breadcrumbs.render(Route.getCurrentRoute.getName) }}
 {% endblock %}
 
 {% block content %}
diff --git a/resources/views/budgets/no-budget.twig b/resources/views/budgets/no-budget.twig
index cc0910f055..6b1c5fb6dc 100644
--- a/resources/views/budgets/no-budget.twig
+++ b/resources/views/budgets/no-budget.twig
@@ -1,7 +1,7 @@
 {% extends "./layout/default" %}
 
 {% block breadcrumbs %}
-    {{ Breadcrumbs.renderIfExists(Route.getCurrentRoute.getName, moment, start, end) }}
+    {{ Breadcrumbs.render(Route.getCurrentRoute.getName, moment, start, end) }}
 {% endblock %}
 
 {% block content %}
diff --git a/resources/views/budgets/show.twig b/resources/views/budgets/show.twig
index 3b57ef33d1..f2a1c9e945 100644
--- a/resources/views/budgets/show.twig
+++ b/resources/views/budgets/show.twig
@@ -1,7 +1,7 @@
 {% extends "./layout/default" %}
 
 {% block breadcrumbs %}
-    {{ Breadcrumbs.renderIfExists(Route.getCurrentRoute.getName, budget, budgetLimit) }}
+    {{ Breadcrumbs.render(Route.getCurrentRoute.getName, budget, budgetLimit) }}
 {% endblock %}
 
 {% block content %}
diff --git a/resources/views/categories/create.twig b/resources/views/categories/create.twig
index 364e40ca1f..b5c8f65aa3 100644
--- a/resources/views/categories/create.twig
+++ b/resources/views/categories/create.twig
@@ -1,7 +1,7 @@
 {% extends "./layout/default" %}
 
 {% block breadcrumbs %}
-    {{ Breadcrumbs.renderIfExists(Route.getCurrentRoute.getName) }}
+    {{ Breadcrumbs.render(Route.getCurrentRoute.getName) }}
 {% endblock %}
 
 {% block content %}
diff --git a/resources/views/categories/delete.twig b/resources/views/categories/delete.twig
index 9766ddb6f0..2873573ec5 100644
--- a/resources/views/categories/delete.twig
+++ b/resources/views/categories/delete.twig
@@ -1,7 +1,7 @@
 {% extends "./layout/default" %}
 
 {% block breadcrumbs %}
-    {{ Breadcrumbs.renderIfExists(Route.getCurrentRoute.getName, category) }}
+    {{ Breadcrumbs.render(Route.getCurrentRoute.getName, category) }}
 {% endblock %}
 
 {% block content %}
diff --git a/resources/views/categories/edit.twig b/resources/views/categories/edit.twig
index 3a465adf1b..f31c402fe0 100644
--- a/resources/views/categories/edit.twig
+++ b/resources/views/categories/edit.twig
@@ -1,7 +1,7 @@
 {% extends "./layout/default" %}
 
 {% block breadcrumbs %}
-    {{ Breadcrumbs.renderIfExists(Route.getCurrentRoute.getName, category) }}
+    {{ Breadcrumbs.render(Route.getCurrentRoute.getName, category) }}
 {% endblock %}
 
 {% block content %}
diff --git a/resources/views/categories/index.twig b/resources/views/categories/index.twig
index f23a7f3511..8f73c9b307 100644
--- a/resources/views/categories/index.twig
+++ b/resources/views/categories/index.twig
@@ -1,7 +1,7 @@
 {% extends "./layout/default" %}
 
 {% block breadcrumbs %}
-    {{ Breadcrumbs.renderIfExists(Route.getCurrentRoute.getName) }}
+    {{ Breadcrumbs.render(Route.getCurrentRoute.getName) }}
 {% endblock %}
 
 {% block content %}
diff --git a/resources/views/categories/no-category.twig b/resources/views/categories/no-category.twig
index 6d71b3606e..5eee40e9f6 100644
--- a/resources/views/categories/no-category.twig
+++ b/resources/views/categories/no-category.twig
@@ -1,7 +1,7 @@
 {% extends "./layout/default" %}
 
 {% block breadcrumbs %}
-    {{ Breadcrumbs.renderIfExists(Route.getCurrentRoute.getName, moment, start, end) }}
+    {{ Breadcrumbs.render(Route.getCurrentRoute.getName, moment, start, end) }}
 {% endblock %}
 
 {% block content %}
diff --git a/resources/views/categories/show.twig b/resources/views/categories/show.twig
index d333c40a8c..f2e8092a71 100644
--- a/resources/views/categories/show.twig
+++ b/resources/views/categories/show.twig
@@ -1,7 +1,7 @@
 {% extends "./layout/default" %}
 
 {% block breadcrumbs %}
-    {{ Breadcrumbs.renderIfExists(Route.getCurrentRoute.getName, category, moment, start, end) }}
+    {{ Breadcrumbs.render(Route.getCurrentRoute.getName, category, moment, start, end) }}
 {% endblock %}
 
 {% block content %}
diff --git a/resources/views/currencies/create.twig b/resources/views/currencies/create.twig
index ac98994a17..be786ad691 100644
--- a/resources/views/currencies/create.twig
+++ b/resources/views/currencies/create.twig
@@ -1,7 +1,7 @@
 {% extends "./layout/default" %}
 
 {% block breadcrumbs %}
-    {{ Breadcrumbs.renderIfExists(Route.getCurrentRoute.getName) }}
+    {{ Breadcrumbs.render(Route.getCurrentRoute.getName) }}
 {% endblock %}
 
 {% block content %}
diff --git a/resources/views/currencies/delete.twig b/resources/views/currencies/delete.twig
index e14902a17f..e1e22b040d 100644
--- a/resources/views/currencies/delete.twig
+++ b/resources/views/currencies/delete.twig
@@ -1,7 +1,7 @@
 {% extends "./layout/default" %}
 
 {% block breadcrumbs %}
-    {{ Breadcrumbs.renderIfExists(Route.getCurrentRoute.getName, currency) }}
+    {{ Breadcrumbs.render(Route.getCurrentRoute.getName, currency) }}
 {% endblock %}
 
 {% block content %}
diff --git a/resources/views/currencies/edit.twig b/resources/views/currencies/edit.twig
index 68462352da..a9c4c582e3 100644
--- a/resources/views/currencies/edit.twig
+++ b/resources/views/currencies/edit.twig
@@ -1,7 +1,7 @@
 {% extends "./layout/default" %}
 
 {% block breadcrumbs %}
-    {{ Breadcrumbs.renderIfExists(Route.getCurrentRoute.getName, currency) }}
+    {{ Breadcrumbs.render(Route.getCurrentRoute.getName, currency) }}
 {% endblock %}
 
 {% block content %}
diff --git a/resources/views/currencies/index.twig b/resources/views/currencies/index.twig
index da68f20955..0954858b17 100644
--- a/resources/views/currencies/index.twig
+++ b/resources/views/currencies/index.twig
@@ -1,7 +1,7 @@
 {% extends "./layout/default" %}
 
 {% block breadcrumbs %}
-    {{ Breadcrumbs.renderIfExists(Route.getCurrentRoute.getName) }}
+    {{ Breadcrumbs.render(Route.getCurrentRoute.getName) }}
 {% endblock %}
 
 {% block content %}
diff --git a/resources/views/export/index.twig b/resources/views/export/index.twig
index ecbd1f6247..1be34b8667 100644
--- a/resources/views/export/index.twig
+++ b/resources/views/export/index.twig
@@ -1,7 +1,7 @@
 {% extends "./layout/default" %}
 
 {% block breadcrumbs %}
-    {{ Breadcrumbs.renderIfExists(Route.getCurrentRoute.getName) }}
+    {{ Breadcrumbs.render(Route.getCurrentRoute.getName) }}
 {% endblock %}
 
 {% block content %}
diff --git a/resources/views/import/bank/form.twig b/resources/views/import/bank/form.twig
index 212c481abd..70f99a6790 100644
--- a/resources/views/import/bank/form.twig
+++ b/resources/views/import/bank/form.twig
@@ -1,7 +1,7 @@
 {% extends "./layout/default" %}
 
 {% block breadcrumbs %}
-    {{ Breadcrumbs.renderIfExists }}
+    {{ Breadcrumbs.render }}
 {% endblock %}
 {% block content %}
     <div class="row">
diff --git a/resources/views/import/bunq/prerequisites.twig b/resources/views/import/bunq/prerequisites.twig
index a70da151d1..063bad3942 100644
--- a/resources/views/import/bunq/prerequisites.twig
+++ b/resources/views/import/bunq/prerequisites.twig
@@ -1,7 +1,7 @@
 {% extends "./layout/default" %}
 
 {% block breadcrumbs %}
-    {{ Breadcrumbs.renderIfExists }}
+    {{ Breadcrumbs.render }}
 {% endblock %}
 {% block content %}
     <div class="row">
diff --git a/resources/views/import/file/initial.twig b/resources/views/import/file/initial.twig
index bf7a5e2ea6..fa2e6121ec 100644
--- a/resources/views/import/file/initial.twig
+++ b/resources/views/import/file/initial.twig
@@ -1,7 +1,7 @@
 {% extends "./layout/default" %}
 
 {% block breadcrumbs %}
-    {{ Breadcrumbs.renderIfExists(Route.getCurrentRoute.getName, job) }}
+    {{ Breadcrumbs.render(Route.getCurrentRoute.getName, job) }}
 {% endblock %}
 
 {% block content %}
diff --git a/resources/views/import/file/map.twig b/resources/views/import/file/map.twig
index 31d309d7f2..a2ad9d0010 100644
--- a/resources/views/import/file/map.twig
+++ b/resources/views/import/file/map.twig
@@ -1,7 +1,7 @@
 {% extends "./layout/default" %}
 
 {% block breadcrumbs %}
-    {{ Breadcrumbs.renderIfExists(Route.getCurrentRoute.getName, job) }}
+    {{ Breadcrumbs.render(Route.getCurrentRoute.getName, job) }}
 {% endblock %}
 
 {% block content %}
diff --git a/resources/views/import/file/roles.twig b/resources/views/import/file/roles.twig
index e5861329e2..8730ccaf0f 100644
--- a/resources/views/import/file/roles.twig
+++ b/resources/views/import/file/roles.twig
@@ -1,7 +1,7 @@
 {% extends "./layout/default" %}
 
 {% block breadcrumbs %}
-    {{ Breadcrumbs.renderIfExists(Route.getCurrentRoute.getName, job) }}
+    {{ Breadcrumbs.render(Route.getCurrentRoute.getName, job) }}
 {% endblock %}
 
 {% block content %}
diff --git a/resources/views/import/file/upload.twig b/resources/views/import/file/upload.twig
index 4f4414db79..8f07bfe1d1 100644
--- a/resources/views/import/file/upload.twig
+++ b/resources/views/import/file/upload.twig
@@ -1,7 +1,7 @@
 {% extends "./layout/default" %}
 
 {% block breadcrumbs %}
-    {{ Breadcrumbs.renderIfExists }}
+    {{ Breadcrumbs.render }}
 {% endblock %}
 {% block content %}
     <div class="row">
diff --git a/resources/views/import/index.twig b/resources/views/import/index.twig
index 73cfa3cad4..c9b5682c9a 100644
--- a/resources/views/import/index.twig
+++ b/resources/views/import/index.twig
@@ -1,7 +1,7 @@
 {% extends "./layout/default" %}
 
 {% block breadcrumbs %}
-    {{ Breadcrumbs.renderIfExists }}
+    {{ Breadcrumbs.render }}
 {% endblock %}
 {% block content %}
     <div class="row">
diff --git a/resources/views/import/spectre/input-fields.twig b/resources/views/import/spectre/input-fields.twig
index 93c21d595d..adc64440d2 100644
--- a/resources/views/import/spectre/input-fields.twig
+++ b/resources/views/import/spectre/input-fields.twig
@@ -1,7 +1,7 @@
 {% extends "./layout/default" %}
 
 {% block breadcrumbs %}
-    {{ Breadcrumbs.renderIfExists }}
+    {{ Breadcrumbs.render }}
 {% endblock %}
 {% block content %}
     <div class="row">
diff --git a/resources/views/import/spectre/prerequisites.twig b/resources/views/import/spectre/prerequisites.twig
index c521d532f0..0bda9b1823 100644
--- a/resources/views/import/spectre/prerequisites.twig
+++ b/resources/views/import/spectre/prerequisites.twig
@@ -1,7 +1,7 @@
 {% extends "./layout/default" %}
 
 {% block breadcrumbs %}
-    {{ Breadcrumbs.renderIfExists }}
+    {{ Breadcrumbs.render }}
 {% endblock %}
 {% block content %}
     <div class="row">
diff --git a/resources/views/import/spectre/select-country.twig b/resources/views/import/spectre/select-country.twig
index 60f4d58343..55a5905f86 100644
--- a/resources/views/import/spectre/select-country.twig
+++ b/resources/views/import/spectre/select-country.twig
@@ -1,7 +1,7 @@
 {% extends "./layout/default" %}
 
 {% block breadcrumbs %}
-    {{ Breadcrumbs.renderIfExists }}
+    {{ Breadcrumbs.render }}
 {% endblock %}
 {% block content %}
     <div class="row">
diff --git a/resources/views/import/spectre/select-provider.twig b/resources/views/import/spectre/select-provider.twig
index bf41f8f506..c4f94fbdd2 100644
--- a/resources/views/import/spectre/select-provider.twig
+++ b/resources/views/import/spectre/select-provider.twig
@@ -1,7 +1,7 @@
 {% extends "./layout/default" %}
 
 {% block breadcrumbs %}
-    {{ Breadcrumbs.renderIfExists }}
+    {{ Breadcrumbs.render }}
 {% endblock %}
 {% block content %}
     <div class="row">
diff --git a/resources/views/import/status.twig b/resources/views/import/status.twig
index bc6e3867f0..2844f818fa 100644
--- a/resources/views/import/status.twig
+++ b/resources/views/import/status.twig
@@ -1,7 +1,7 @@
 {% extends "./layout/default" %}
 
 {% block breadcrumbs %}
-    {{ Breadcrumbs.renderIfExists }}
+    {{ Breadcrumbs.render }}
 {% endblock %}
 {% block content %}
 
diff --git a/resources/views/index.twig b/resources/views/index.twig
index dd0872325d..bab812d8b9 100644
--- a/resources/views/index.twig
+++ b/resources/views/index.twig
@@ -1,7 +1,7 @@
 {% extends "./layout/default" %}
 
 {% block breadcrumbs %}
-    {{ Breadcrumbs.renderIfExists }}
+    {{ Breadcrumbs.render }}
 {% endblock %}
 {% block content %}
     {% include 'partials.boxes' %}
diff --git a/resources/views/new-user/index.twig b/resources/views/new-user/index.twig
index 4401962300..e3f4b8a2e5 100644
--- a/resources/views/new-user/index.twig
+++ b/resources/views/new-user/index.twig
@@ -1,7 +1,7 @@
 {% extends "./layout/default" %}
 
 {% block breadcrumbs %}
-    {{ Breadcrumbs.renderIfExists(Route.getCurrentRoute.getName) }}
+    {{ Breadcrumbs.render(Route.getCurrentRoute.getName) }}
 {% endblock %}
 
 {% block content %}
diff --git a/resources/views/piggy-banks/add-mobile.twig b/resources/views/piggy-banks/add-mobile.twig
index 61e6a0d8d6..05c4b9667b 100644
--- a/resources/views/piggy-banks/add-mobile.twig
+++ b/resources/views/piggy-banks/add-mobile.twig
@@ -1,7 +1,7 @@
 {% extends "./layout/default" %}
 
 {% block breadcrumbs %}
-    {{ Breadcrumbs.renderIfExists(Route.getCurrentRoute.getName, piggyBank) }}
+    {{ Breadcrumbs.render(Route.getCurrentRoute.getName, piggyBank) }}
 {% endblock %}
 
 {% block content %}
diff --git a/resources/views/piggy-banks/create.twig b/resources/views/piggy-banks/create.twig
index 6923bbbb78..ce1ccd340c 100644
--- a/resources/views/piggy-banks/create.twig
+++ b/resources/views/piggy-banks/create.twig
@@ -1,7 +1,7 @@
 {% extends "./layout/default" %}
 
 {% block breadcrumbs %}
-    {{ Breadcrumbs.renderIfExists(Route.getCurrentRoute.getName) }}
+    {{ Breadcrumbs.render(Route.getCurrentRoute.getName) }}
 {% endblock %}
 
 {% block content %}
diff --git a/resources/views/piggy-banks/delete.twig b/resources/views/piggy-banks/delete.twig
index 3b7b88beef..561acd6592 100644
--- a/resources/views/piggy-banks/delete.twig
+++ b/resources/views/piggy-banks/delete.twig
@@ -1,7 +1,7 @@
 {% extends "./layout/default" %}
 
 {% block breadcrumbs %}
-    {{ Breadcrumbs.renderIfExists(Route.getCurrentRoute.getName, piggyBank) }}
+    {{ Breadcrumbs.render(Route.getCurrentRoute.getName, piggyBank) }}
 {% endblock %}
 
 {% block content %}
diff --git a/resources/views/piggy-banks/edit.twig b/resources/views/piggy-banks/edit.twig
index d6bac800fb..cf9b37cc41 100644
--- a/resources/views/piggy-banks/edit.twig
+++ b/resources/views/piggy-banks/edit.twig
@@ -1,7 +1,7 @@
 {% extends "./layout/default" %}
 
 {% block breadcrumbs %}
-    {{ Breadcrumbs.renderIfExists(Route.getCurrentRoute.getName, piggyBank) }}
+    {{ Breadcrumbs.render(Route.getCurrentRoute.getName, piggyBank) }}
 {% endblock %}
 
 {% block content %}
diff --git a/resources/views/piggy-banks/index.twig b/resources/views/piggy-banks/index.twig
index cfe76aee06..4c13d950a6 100644
--- a/resources/views/piggy-banks/index.twig
+++ b/resources/views/piggy-banks/index.twig
@@ -1,7 +1,7 @@
 {% extends "./layout/default" %}
 
 {% block breadcrumbs %}
-    {{ Breadcrumbs.renderIfExists(Route.getCurrentRoute.getName) }}
+    {{ Breadcrumbs.render(Route.getCurrentRoute.getName) }}
 {% endblock %}
 
 {% block content %}
diff --git a/resources/views/piggy-banks/remove-mobile.twig b/resources/views/piggy-banks/remove-mobile.twig
index d70ade101e..18ae39a048 100644
--- a/resources/views/piggy-banks/remove-mobile.twig
+++ b/resources/views/piggy-banks/remove-mobile.twig
@@ -1,6 +1,6 @@
 {% extends "./layout/default" %}
 {% block breadcrumbs %}
-    {{ Breadcrumbs.renderIfExists(Route.getCurrentRoute.getName, piggyBank) }}
+    {{ Breadcrumbs.render(Route.getCurrentRoute.getName, piggyBank) }}
 {% endblock %}
 
 {% block content %}
diff --git a/resources/views/piggy-banks/show.twig b/resources/views/piggy-banks/show.twig
index fc45aa4490..ab138b1c1c 100644
--- a/resources/views/piggy-banks/show.twig
+++ b/resources/views/piggy-banks/show.twig
@@ -1,7 +1,7 @@
 {% extends "./layout/default" %}
 
 {% block breadcrumbs %}
-    {{ Breadcrumbs.renderIfExists(Route.getCurrentRoute.getName, piggyBank) }}
+    {{ Breadcrumbs.render(Route.getCurrentRoute.getName, piggyBank) }}
 {% endblock %}
 
 {% block content %}
diff --git a/resources/views/preferences/code.twig b/resources/views/preferences/code.twig
index 84eca53ae7..becd1d4432 100644
--- a/resources/views/preferences/code.twig
+++ b/resources/views/preferences/code.twig
@@ -1,7 +1,7 @@
 {% extends "./layout/default" %}
 
 {% block breadcrumbs %}
-    {{ Breadcrumbs.renderIfExists(Route.getCurrentRoute.getName) }}
+    {{ Breadcrumbs.render(Route.getCurrentRoute.getName) }}
 {% endblock %}
 
 {% block content %}
diff --git a/resources/views/preferences/index.twig b/resources/views/preferences/index.twig
index e5eadeac8b..dca354f584 100644
--- a/resources/views/preferences/index.twig
+++ b/resources/views/preferences/index.twig
@@ -1,7 +1,7 @@
 {% extends "./layout/default" %}
 
 {% block breadcrumbs %}
-    {{ Breadcrumbs.renderIfExists(Route.getCurrentRoute.getName) }}
+    {{ Breadcrumbs.render(Route.getCurrentRoute.getName) }}
 {% endblock %}
 
 {% block content %}
diff --git a/resources/views/profile/change-email.twig b/resources/views/profile/change-email.twig
index fe1d0aea3c..e4ffd1cd3a 100644
--- a/resources/views/profile/change-email.twig
+++ b/resources/views/profile/change-email.twig
@@ -1,7 +1,7 @@
 {% extends "./layout/default" %}
 
 {% block breadcrumbs %}
-    {{ Breadcrumbs.renderIfExists(Route.getCurrentRoute.getName) }}
+    {{ Breadcrumbs.render(Route.getCurrentRoute.getName) }}
 {% endblock %}
 
 {% block content %}
diff --git a/resources/views/profile/change-password.twig b/resources/views/profile/change-password.twig
index 4908d533f7..2ea8d99b96 100644
--- a/resources/views/profile/change-password.twig
+++ b/resources/views/profile/change-password.twig
@@ -1,7 +1,7 @@
 {% extends "./layout/default" %}
 
 {% block breadcrumbs %}
-    {{ Breadcrumbs.renderIfExists(Route.getCurrentRoute.getName) }}
+    {{ Breadcrumbs.render(Route.getCurrentRoute.getName) }}
 {% endblock %}
 
 {% block content %}
diff --git a/resources/views/profile/delete-account.twig b/resources/views/profile/delete-account.twig
index 46ac6758bc..5d48147444 100644
--- a/resources/views/profile/delete-account.twig
+++ b/resources/views/profile/delete-account.twig
@@ -1,7 +1,7 @@
 {% extends "./layout/default" %}
 
 {% block breadcrumbs %}
-    {{ Breadcrumbs.renderIfExists(Route.getCurrentRoute.getName) }}
+    {{ Breadcrumbs.render(Route.getCurrentRoute.getName) }}
 {% endblock %}
 
 {% block content %}
diff --git a/resources/views/profile/index.twig b/resources/views/profile/index.twig
index e64516b285..2ab0094d12 100644
--- a/resources/views/profile/index.twig
+++ b/resources/views/profile/index.twig
@@ -1,7 +1,7 @@
 {% extends "./layout/default" %}
 
 {% block breadcrumbs %}
-    {{ Breadcrumbs.renderIfExists(Route.getCurrentRoute.getName) }}
+    {{ Breadcrumbs.render(Route.getCurrentRoute.getName) }}
 {% endblock %}
 
 {% block content %}
diff --git a/resources/views/reports/account/report.twig b/resources/views/reports/account/report.twig
index b03f054604..ba6d2b506d 100644
--- a/resources/views/reports/account/report.twig
+++ b/resources/views/reports/account/report.twig
@@ -1,7 +1,7 @@
 {% extends "./layout/default" %}
 
 {% block breadcrumbs %}
-    {{ Breadcrumbs.renderIfExists(Route.getCurrentRoute.getName, accountIds, expenseIds, start, end) }}
+    {{ Breadcrumbs.render(Route.getCurrentRoute.getName, accountIds, expenseIds, start, end) }}
 {% endblock %}
 
 {% block content %}
diff --git a/resources/views/reports/audit/report.twig b/resources/views/reports/audit/report.twig
index 740b28913a..7c16f0462a 100644
--- a/resources/views/reports/audit/report.twig
+++ b/resources/views/reports/audit/report.twig
@@ -1,7 +1,7 @@
 {% extends "./layout/default" %}
 
 {% block breadcrumbs %}
-    {{ Breadcrumbs.renderIfExists(Route.getCurrentRoute.getName, accountIds, start, end) }}
+    {{ Breadcrumbs.render(Route.getCurrentRoute.getName, accountIds, start, end) }}
 {% endblock %}
 
 {% block content %}
diff --git a/resources/views/reports/budget/month.twig b/resources/views/reports/budget/month.twig
index a52cd09552..4939a20eba 100644
--- a/resources/views/reports/budget/month.twig
+++ b/resources/views/reports/budget/month.twig
@@ -1,7 +1,7 @@
 {% extends "./layout/default" %}
 
 {% block breadcrumbs %}
-    {{ Breadcrumbs.renderIfExists(Route.getCurrentRoute.getName, accountIds, budgetIds, start, end) }}
+    {{ Breadcrumbs.render(Route.getCurrentRoute.getName, accountIds, budgetIds, start, end) }}
 {% endblock %}
 
 {% block content %}
diff --git a/resources/views/reports/category/month.twig b/resources/views/reports/category/month.twig
index 55ba6f5f3d..030b7673a9 100644
--- a/resources/views/reports/category/month.twig
+++ b/resources/views/reports/category/month.twig
@@ -1,7 +1,7 @@
 {% extends "./layout/default" %}
 
 {% block breadcrumbs %}
-    {{ Breadcrumbs.renderIfExists(Route.getCurrentRoute.getName, accountIds, categoryIds, start, end) }}
+    {{ Breadcrumbs.render(Route.getCurrentRoute.getName, accountIds, categoryIds, start, end) }}
 {% endblock %}
 
 {% block content %}
diff --git a/resources/views/reports/default/month.twig b/resources/views/reports/default/month.twig
index 9b0bddad9e..90964b8aac 100644
--- a/resources/views/reports/default/month.twig
+++ b/resources/views/reports/default/month.twig
@@ -1,7 +1,7 @@
 {% extends "./layout/default" %}
 
 {% block breadcrumbs %}
-    {{ Breadcrumbs.renderIfExists(Route.getCurrentRoute.getName, accountIds, start, end) }}
+    {{ Breadcrumbs.render(Route.getCurrentRoute.getName, accountIds, start, end) }}
 {% endblock %}
 
 {% block content %}
diff --git a/resources/views/reports/default/multi-year.twig b/resources/views/reports/default/multi-year.twig
index 96acae16a0..26b116700b 100644
--- a/resources/views/reports/default/multi-year.twig
+++ b/resources/views/reports/default/multi-year.twig
@@ -1,7 +1,7 @@
 {% extends "./layout/default" %}
 
 {% block breadcrumbs %}
-    {{ Breadcrumbs.renderIfExists(Route.getCurrentRoute.getName, accountIds, start, end) }}
+    {{ Breadcrumbs.render(Route.getCurrentRoute.getName, accountIds, start, end) }}
 {% endblock %}
 
 {% block content %}
diff --git a/resources/views/reports/default/year.twig b/resources/views/reports/default/year.twig
index 821fb90e8c..c7fbf97539 100644
--- a/resources/views/reports/default/year.twig
+++ b/resources/views/reports/default/year.twig
@@ -1,7 +1,7 @@
 {% extends "./layout/default" %}
 
 {% block breadcrumbs %}
-    {{ Breadcrumbs.renderIfExists(Route.getCurrentRoute.getName, accountIds, start, end) }}
+    {{ Breadcrumbs.render(Route.getCurrentRoute.getName, accountIds, start, end) }}
 {% endblock %}
 
 {% block content %}
diff --git a/resources/views/reports/index.twig b/resources/views/reports/index.twig
index aa2b563864..6ac4b39362 100644
--- a/resources/views/reports/index.twig
+++ b/resources/views/reports/index.twig
@@ -1,7 +1,7 @@
 {% extends "./layout/default" %}
 
 {% block breadcrumbs %}
-    {{ Breadcrumbs.renderIfExists(Route.getCurrentRoute.getName) }}
+    {{ Breadcrumbs.render(Route.getCurrentRoute.getName) }}
 {% endblock %}
 
 {% block content %}
diff --git a/resources/views/reports/tag/month.twig b/resources/views/reports/tag/month.twig
index e4139f5dbb..32966ae224 100644
--- a/resources/views/reports/tag/month.twig
+++ b/resources/views/reports/tag/month.twig
@@ -1,7 +1,7 @@
 {% extends "./layout/default" %}
 
 {% block breadcrumbs %}
-    {{ Breadcrumbs.renderIfExists(Route.getCurrentRoute.getName, accountIds, tagTags, start, end) }}
+    {{ Breadcrumbs.render(Route.getCurrentRoute.getName, accountIds, tagTags, start, end) }}
 {% endblock %}
 
 {% block content %}
diff --git a/resources/views/rules/index.twig b/resources/views/rules/index.twig
index ecafa6dfea..3a8f16d1ce 100644
--- a/resources/views/rules/index.twig
+++ b/resources/views/rules/index.twig
@@ -1,6 +1,6 @@
 {% extends "./layout/default" %}
 {% block breadcrumbs %}
-    {{ Breadcrumbs.renderIfExists(Route.getCurrentRoute.getName) }}
+    {{ Breadcrumbs.render(Route.getCurrentRoute.getName) }}
 {% endblock %}
 {% block content %}
 
diff --git a/resources/views/rules/rule-group/create.twig b/resources/views/rules/rule-group/create.twig
index bdd99103d2..4d8ad05f44 100644
--- a/resources/views/rules/rule-group/create.twig
+++ b/resources/views/rules/rule-group/create.twig
@@ -1,7 +1,7 @@
 {% extends "./layout/default" %}
 
 {% block breadcrumbs %}
-    {{ Breadcrumbs.renderIfExists(Route.getCurrentRoute.getName) }}
+    {{ Breadcrumbs.render(Route.getCurrentRoute.getName) }}
 {% endblock %}
 
 {% block content %}
diff --git a/resources/views/rules/rule-group/delete.twig b/resources/views/rules/rule-group/delete.twig
index 6b7e838576..0d5474343d 100644
--- a/resources/views/rules/rule-group/delete.twig
+++ b/resources/views/rules/rule-group/delete.twig
@@ -1,7 +1,7 @@
 {% extends "./layout/default" %}
 
 {% block breadcrumbs %}
-    {{ Breadcrumbs.renderIfExists(Route.getCurrentRoute.getName, ruleGroup) }}
+    {{ Breadcrumbs.render(Route.getCurrentRoute.getName, ruleGroup) }}
 {% endblock %}
 
 {% block content %}
diff --git a/resources/views/rules/rule-group/edit.twig b/resources/views/rules/rule-group/edit.twig
index bb9fe698b2..5e86c39b67 100644
--- a/resources/views/rules/rule-group/edit.twig
+++ b/resources/views/rules/rule-group/edit.twig
@@ -1,7 +1,7 @@
 {% extends "./layout/default" %}
 
 {% block breadcrumbs %}
-    {{ Breadcrumbs.renderIfExists(Route.getCurrentRoute.getName, ruleGroup) }}
+    {{ Breadcrumbs.render(Route.getCurrentRoute.getName, ruleGroup) }}
 {% endblock %}
 
 {% block content %}
diff --git a/resources/views/rules/rule-group/select-transactions.twig b/resources/views/rules/rule-group/select-transactions.twig
index dbc0074b4d..0569055293 100644
--- a/resources/views/rules/rule-group/select-transactions.twig
+++ b/resources/views/rules/rule-group/select-transactions.twig
@@ -1,7 +1,7 @@
 {% extends "./layout/default" %}
 
 {% block breadcrumbs %}
-    {{ Breadcrumbs.renderIfExists(Route.getCurrentRoute.getName, ruleGroup) }}
+    {{ Breadcrumbs.render(Route.getCurrentRoute.getName, ruleGroup) }}
 {% endblock %}
 
 {% block content %}
diff --git a/resources/views/rules/rule/create.twig b/resources/views/rules/rule/create.twig
index 15fdc6740d..63bf253a95 100644
--- a/resources/views/rules/rule/create.twig
+++ b/resources/views/rules/rule/create.twig
@@ -1,7 +1,7 @@
 {% extends "./layout/default" %}
 
 {% block breadcrumbs %}
-    {{ Breadcrumbs.renderIfExists(Route.getCurrentRoute.getName, ruleGroup) }}
+    {{ Breadcrumbs.render(Route.getCurrentRoute.getName, ruleGroup) }}
 {% endblock %}
 
 {% block content %}
diff --git a/resources/views/rules/rule/delete.twig b/resources/views/rules/rule/delete.twig
index befd03a63b..e091e40664 100644
--- a/resources/views/rules/rule/delete.twig
+++ b/resources/views/rules/rule/delete.twig
@@ -1,7 +1,7 @@
 {% extends "./layout/default" %}
 
 {% block breadcrumbs %}
-    {{ Breadcrumbs.renderIfExists(Route.getCurrentRoute.getName, rule) }}
+    {{ Breadcrumbs.render(Route.getCurrentRoute.getName, rule) }}
 {% endblock %}
 
 {% block content %}
diff --git a/resources/views/rules/rule/edit.twig b/resources/views/rules/rule/edit.twig
index 3946a2fae4..e10c749ceb 100644
--- a/resources/views/rules/rule/edit.twig
+++ b/resources/views/rules/rule/edit.twig
@@ -1,7 +1,7 @@
 {% extends "./layout/default" %}
 
 {% block breadcrumbs %}
-    {{ Breadcrumbs.renderIfExists(Route.getCurrentRoute.getName, rule) }}
+    {{ Breadcrumbs.render(Route.getCurrentRoute.getName, rule) }}
 {% endblock %}
 
 {% block content %}
diff --git a/resources/views/rules/rule/select-transactions.twig b/resources/views/rules/rule/select-transactions.twig
index 9ac0323fc0..f4241e2cf0 100644
--- a/resources/views/rules/rule/select-transactions.twig
+++ b/resources/views/rules/rule/select-transactions.twig
@@ -1,7 +1,7 @@
 {% extends "./layout/default" %}
 
 {% block breadcrumbs %}
-    {{ Breadcrumbs.renderIfExists(Route.getCurrentRoute.getName, rule) }}
+    {{ Breadcrumbs.render(Route.getCurrentRoute.getName, rule) }}
 {% endblock %}
 
 {% block content %}
diff --git a/resources/views/search/index.twig b/resources/views/search/index.twig
index 8583f75e74..d217a0473a 100644
--- a/resources/views/search/index.twig
+++ b/resources/views/search/index.twig
@@ -1,7 +1,7 @@
 {% extends "./layout/default" %}
 
 {% block breadcrumbs %}
-    {{ Breadcrumbs.renderIfExists(Route.getCurrentRoute.getName, query) }}
+    {{ Breadcrumbs.render(Route.getCurrentRoute.getName, query) }}
 {% endblock %}
 
 {% block content %}
diff --git a/resources/views/tags/create.twig b/resources/views/tags/create.twig
index 8e2f3e0439..d5f0fea178 100644
--- a/resources/views/tags/create.twig
+++ b/resources/views/tags/create.twig
@@ -1,7 +1,7 @@
 {% extends "./layout/default" %}
 
 {% block breadcrumbs %}
-    {{ Breadcrumbs.renderIfExists(Route.getCurrentRoute.getName) }}
+    {{ Breadcrumbs.render(Route.getCurrentRoute.getName) }}
 {% endblock %}
 
 {% block content %}
diff --git a/resources/views/tags/delete.twig b/resources/views/tags/delete.twig
index 9ee307a8b4..4b5bf92422 100644
--- a/resources/views/tags/delete.twig
+++ b/resources/views/tags/delete.twig
@@ -1,7 +1,7 @@
 {% extends "./layout/default" %}
 
 {% block breadcrumbs %}
-    {{ Breadcrumbs.renderIfExists(Route.getCurrentRoute.getName, tag) }}
+    {{ Breadcrumbs.render(Route.getCurrentRoute.getName, tag) }}
 {% endblock %}
 
 {% block content %}
diff --git a/resources/views/tags/edit.twig b/resources/views/tags/edit.twig
index 93e25444f7..5eed6ff416 100644
--- a/resources/views/tags/edit.twig
+++ b/resources/views/tags/edit.twig
@@ -1,7 +1,7 @@
 {% extends "./layout/default" %}
 
 {% block breadcrumbs %}
-    {{ Breadcrumbs.renderIfExists(Route.getCurrentRoute.getName, tag) }}
+    {{ Breadcrumbs.render(Route.getCurrentRoute.getName, tag) }}
 {% endblock %}
 
 {% block content %}
diff --git a/resources/views/tags/index.twig b/resources/views/tags/index.twig
index 946ff46a46..08d8c4156e 100644
--- a/resources/views/tags/index.twig
+++ b/resources/views/tags/index.twig
@@ -1,7 +1,7 @@
 {% extends "./layout/default" %}
 
 {% block breadcrumbs %}
-    {{ Breadcrumbs.renderIfExists(Route.getCurrentRoute.getName) }}
+    {{ Breadcrumbs.render(Route.getCurrentRoute.getName) }}
 {% endblock %}
 
 {% block content %}
diff --git a/resources/views/tags/show.twig b/resources/views/tags/show.twig
index 777a4e46c5..3f5a81478d 100644
--- a/resources/views/tags/show.twig
+++ b/resources/views/tags/show.twig
@@ -1,7 +1,7 @@
 {% extends "./layout/default" %}
 
 {% block breadcrumbs %}
-    {{ Breadcrumbs.renderIfExists(Route.getCurrentRoute.getName, tag, moment, start, end) }}
+    {{ Breadcrumbs.render(Route.getCurrentRoute.getName, tag, moment, start, end) }}
 {% endblock %}
 
 {% block content %}
diff --git a/resources/views/transactions/convert.twig b/resources/views/transactions/convert.twig
index 1375e26dc0..14da1981f9 100644
--- a/resources/views/transactions/convert.twig
+++ b/resources/views/transactions/convert.twig
@@ -1,7 +1,7 @@
 {% extends "./layout/default" %}
 
 {% block breadcrumbs %}
-    {{ Breadcrumbs.renderIfExists(Route.getCurrentRoute.getName, destinationType, journal) }}
+    {{ Breadcrumbs.render(Route.getCurrentRoute.getName, destinationType, journal) }}
 {% endblock %}
 
 {% block content %}
diff --git a/resources/views/transactions/index.twig b/resources/views/transactions/index.twig
index 17e614ae24..a2a5c3e19a 100644
--- a/resources/views/transactions/index.twig
+++ b/resources/views/transactions/index.twig
@@ -1,7 +1,7 @@
 {% extends "./layout/default" %}
 
 {% block breadcrumbs %}
-    {{ Breadcrumbs.renderIfExists(Route.getCurrentRoute.getName, what, moment, start, end) }}
+    {{ Breadcrumbs.render(Route.getCurrentRoute.getName, what, moment, start, end) }}
 {% endblock %}
 
 {% block content %}
diff --git a/resources/views/transactions/links/delete.twig b/resources/views/transactions/links/delete.twig
index e84db20c69..fad7391887 100644
--- a/resources/views/transactions/links/delete.twig
+++ b/resources/views/transactions/links/delete.twig
@@ -1,7 +1,7 @@
 {% extends "./layout/default" %}
 
 {% block breadcrumbs %}
-    {{ Breadcrumbs.renderIfExists(Route.getCurrentRoute.getName, link) }}
+    {{ Breadcrumbs.render(Route.getCurrentRoute.getName, link) }}
 {% endblock %}
 
 {% block content %}
diff --git a/resources/views/transactions/mass-delete.twig b/resources/views/transactions/mass-delete.twig
index 51e2ee3835..b038ab16be 100644
--- a/resources/views/transactions/mass-delete.twig
+++ b/resources/views/transactions/mass-delete.twig
@@ -1,7 +1,7 @@
 {% extends "./layout/default" %}
 
 {% block breadcrumbs %}
-    {{ Breadcrumbs.renderIfExists(Route.getCurrentRoute.getName, journals) }}
+    {{ Breadcrumbs.render(Route.getCurrentRoute.getName, journals) }}
 {% endblock %}
 
 {% block content %}
diff --git a/resources/views/transactions/mass/edit.twig b/resources/views/transactions/mass/edit.twig
index 8b3f253050..9f834d26e5 100644
--- a/resources/views/transactions/mass/edit.twig
+++ b/resources/views/transactions/mass/edit.twig
@@ -1,7 +1,7 @@
 {% extends "./layout/default" %}
 
 {% block breadcrumbs %}
-    {{ Breadcrumbs.renderIfExists(Route.getCurrentRoute.getName, journals) }}
+    {{ Breadcrumbs.render(Route.getCurrentRoute.getName, journals) }}
 {% endblock %}
 
 {% block content %}
diff --git a/resources/views/transactions/show.twig b/resources/views/transactions/show.twig
index 48b3145e10..5920f84bda 100644
--- a/resources/views/transactions/show.twig
+++ b/resources/views/transactions/show.twig
@@ -1,7 +1,7 @@
 {% extends "./layout/default" %}
 
 {% block breadcrumbs %}
-    {{ Breadcrumbs.renderIfExists(Route.getCurrentRoute.getName, journal) }}
+    {{ Breadcrumbs.render(Route.getCurrentRoute.getName, journal) }}
 {% endblock %}
 
 {% block content %}
diff --git a/resources/views/transactions/single/create.twig b/resources/views/transactions/single/create.twig
index 58ae331006..f9e074dfe8 100644
--- a/resources/views/transactions/single/create.twig
+++ b/resources/views/transactions/single/create.twig
@@ -1,7 +1,7 @@
 {% extends "./layout/default" %}
 
 {% block breadcrumbs %}
-    {{ Breadcrumbs.renderIfExists(Route.getCurrentRoute.getName, what) }}
+    {{ Breadcrumbs.render(Route.getCurrentRoute.getName, what) }}
 {% endblock %}
 
 {% block content %}
diff --git a/resources/views/transactions/single/delete.twig b/resources/views/transactions/single/delete.twig
index 69e019d0e8..c834df3496 100644
--- a/resources/views/transactions/single/delete.twig
+++ b/resources/views/transactions/single/delete.twig
@@ -1,7 +1,7 @@
 {% extends "./layout/default" %}
 
 {% block breadcrumbs %}
-    {{ Breadcrumbs.renderIfExists(Route.getCurrentRoute.getName, journal) }}
+    {{ Breadcrumbs.render(Route.getCurrentRoute.getName, journal) }}
 {% endblock %}
 
 {% block content %}
diff --git a/resources/views/transactions/single/edit.twig b/resources/views/transactions/single/edit.twig
index 19b1f6992e..2ead7d9a94 100644
--- a/resources/views/transactions/single/edit.twig
+++ b/resources/views/transactions/single/edit.twig
@@ -1,7 +1,7 @@
 {% extends "./layout/default" %}
 
 {% block breadcrumbs %}
-    {{ Breadcrumbs.renderIfExists(Route.getCurrentRoute.getName, journal) }}
+    {{ Breadcrumbs.render(Route.getCurrentRoute.getName, journal) }}
 {% endblock %}
 
 {% block content %}
diff --git a/resources/views/transactions/split/edit.twig b/resources/views/transactions/split/edit.twig
index d9d4a9c25d..afd8fd371b 100644
--- a/resources/views/transactions/split/edit.twig
+++ b/resources/views/transactions/split/edit.twig
@@ -1,7 +1,7 @@
 {% extends "./layout/default" %}
 
 {% block breadcrumbs %}
-    {{ Breadcrumbs.renderIfExists(Route.getCurrentRoute.getName, journal) }}
+    {{ Breadcrumbs.render(Route.getCurrentRoute.getName, journal) }}
 {% endblock %}
 {% block content %}
     <form method="POST" action="{{ route('transactions.split.update',journal.id) }}" accept-charset="UTF-8" class="form-horizontal" id="update"
diff --git a/app/Http/breadcrumbs.php b/routes/breadcrumbs.php
similarity index 81%
rename from app/Http/breadcrumbs.php
rename to routes/breadcrumbs.php
index 7d3b8acf3b..7c2835dd3c 100644
--- a/app/Http/breadcrumbs.php
+++ b/routes/breadcrumbs.php
@@ -21,7 +21,8 @@
 declare(strict_types=1);
 
 use Carbon\Carbon;
-use DaveJamesMiller\Breadcrumbs\Generator as BreadCrumbGenerator;
+use DaveJamesMiller\Breadcrumbs\BreadcrumbsGenerator;
+//use DaveJamesMiller\Breadcrumbs\Generator as BreadCrumbsGenerator;
 use FireflyIII\Exceptions\FireflyException;
 use FireflyIII\Models\Account;
 use FireflyIII\Models\Attachment;
@@ -45,14 +46,14 @@ use Illuminate\Support\Collection;
 // HOME
 Breadcrumbs::register(
     'home',
-    function (BreadCrumbGenerator $breadcrumbs) {
+    function (BreadCrumbsGenerator $breadcrumbs) {
         $breadcrumbs->push(trans('breadcrumbs.home'), route('index'));
     }
 );
 
 Breadcrumbs::register(
     'index',
-    function (BreadCrumbGenerator $breadcrumbs) {
+    function (BreadCrumbsGenerator $breadcrumbs) {
         $breadcrumbs->push(trans('breadcrumbs.home'), route('index'));
     }
 );
@@ -60,7 +61,7 @@ Breadcrumbs::register(
 // ACCOUNTS
 Breadcrumbs::register(
     'accounts.index',
-    function (BreadCrumbGenerator $breadcrumbs, string $what) {
+    function (BreadCrumbsGenerator $breadcrumbs, string $what) {
         $breadcrumbs->parent('home');
         $breadcrumbs->push(trans('firefly.' . strtolower(e($what)) . '_accounts'), route('accounts.index', [$what]));
     }
@@ -68,7 +69,7 @@ Breadcrumbs::register(
 
 Breadcrumbs::register(
     'accounts.create',
-    function (BreadCrumbGenerator $breadcrumbs, string $what) {
+    function (BreadCrumbsGenerator $breadcrumbs, string $what) {
         $breadcrumbs->parent('accounts.index', $what);
         $breadcrumbs->push(trans('firefly.new_' . strtolower(e($what)) . '_account'), route('accounts.create', [$what]));
     }
@@ -76,7 +77,7 @@ Breadcrumbs::register(
 
 Breadcrumbs::register(
     'accounts.show',
-    function (BreadCrumbGenerator $breadcrumbs, Account $account, string $moment, Carbon $start, Carbon $end) {
+    function (BreadCrumbsGenerator $breadcrumbs, Account $account, string $moment, Carbon $start, Carbon $end) {
         $what = config('firefly.shortNamesByFullName.' . $account->accountType->type);
 
         $breadcrumbs->parent('accounts.index', $what);
@@ -100,7 +101,7 @@ Breadcrumbs::register(
 
 Breadcrumbs::register(
     'accounts.reconcile',
-    function (BreadCrumbGenerator $breadcrumbs, Account $account) {
+    function (BreadCrumbsGenerator $breadcrumbs, Account $account) {
         $breadcrumbs->parent('accounts.show', $account, '(nothing)', new Carbon, new Carbon);
         $breadcrumbs->push(trans('firefly.reconcile_account', ['account' => e($account->name)]), route('accounts.reconcile', [$account->id]));
     }
@@ -108,7 +109,7 @@ Breadcrumbs::register(
 
 Breadcrumbs::register(
     'accounts.reconcile.show',
-    function (BreadCrumbGenerator $breadcrumbs, Account $account, TransactionJournal $journal) {
+    function (BreadCrumbsGenerator $breadcrumbs, Account $account, TransactionJournal $journal) {
         $breadcrumbs->parent('accounts.show', $account, '(nothing)', new Carbon, new Carbon);
         $title = trans('firefly.reconciliation') . ' "' . $journal->description . '"';
         $breadcrumbs->push($title, route('accounts.reconcile.show', [$journal->id]));
@@ -117,7 +118,7 @@ Breadcrumbs::register(
 
 Breadcrumbs::register(
     'accounts.delete',
-    function (BreadCrumbGenerator $breadcrumbs, Account $account) {
+    function (BreadCrumbsGenerator $breadcrumbs, Account $account) {
         $breadcrumbs->parent('accounts.show', $account, '(nothing)', new Carbon, new Carbon);
         $breadcrumbs->push(trans('firefly.delete_account', ['name' => e($account->name)]), route('accounts.delete', [$account->id]));
     }
@@ -125,7 +126,7 @@ Breadcrumbs::register(
 
 Breadcrumbs::register(
     'accounts.edit',
-    function (BreadCrumbGenerator $breadcrumbs, Account $account) {
+    function (BreadCrumbsGenerator $breadcrumbs, Account $account) {
         $breadcrumbs->parent('accounts.show', $account, '(nothing)', new Carbon, new Carbon);
         $what = config('firefly.shortNamesByFullName.' . $account->accountType->type);
 
@@ -136,7 +137,7 @@ Breadcrumbs::register(
 // ADMIN
 Breadcrumbs::register(
     'admin.index',
-    function (BreadCrumbGenerator $breadcrumbs) {
+    function (BreadCrumbsGenerator $breadcrumbs) {
         $breadcrumbs->parent('home');
         $breadcrumbs->push(trans('firefly.administration'), route('admin.index'));
     }
@@ -144,7 +145,7 @@ Breadcrumbs::register(
 
 Breadcrumbs::register(
     'admin.users',
-    function (BreadCrumbGenerator $breadcrumbs) {
+    function (BreadCrumbsGenerator $breadcrumbs) {
         $breadcrumbs->parent('admin.index');
         $breadcrumbs->push(trans('firefly.list_all_users'), route('admin.users'));
     }
@@ -152,21 +153,21 @@ Breadcrumbs::register(
 
 Breadcrumbs::register(
     'admin.users.show',
-    function (BreadCrumbGenerator $breadcrumbs, User $user) {
+    function (BreadCrumbsGenerator $breadcrumbs, User $user) {
         $breadcrumbs->parent('admin.users');
         $breadcrumbs->push(trans('firefly.single_user_administration', ['email' => $user->email]), route('admin.users.show', [$user->id]));
     }
 );
 Breadcrumbs::register(
     'admin.users.edit',
-    function (BreadCrumbGenerator $breadcrumbs, User $user) {
+    function (BreadCrumbsGenerator $breadcrumbs, User $user) {
         $breadcrumbs->parent('admin.users');
         $breadcrumbs->push(trans('firefly.edit_user', ['email' => $user->email]), route('admin.users.edit', [$user->id]));
     }
 );
 Breadcrumbs::register(
     'admin.users.delete',
-    function (BreadCrumbGenerator $breadcrumbs, User $user) {
+    function (BreadCrumbsGenerator $breadcrumbs, User $user) {
         $breadcrumbs->parent('admin.users');
         $breadcrumbs->push(trans('firefly.delete_user', ['email' => $user->email]), route('admin.users.delete', [$user->id]));
     }
@@ -174,7 +175,7 @@ Breadcrumbs::register(
 
 Breadcrumbs::register(
     'admin.users.domains',
-    function (BreadCrumbGenerator $breadcrumbs) {
+    function (BreadCrumbsGenerator $breadcrumbs) {
         $breadcrumbs->parent('admin.index');
         $breadcrumbs->push(trans('firefly.blocked_domains'), route('admin.users.domains'));
     }
@@ -182,7 +183,7 @@ Breadcrumbs::register(
 
 Breadcrumbs::register(
     'admin.configuration.index',
-    function (BreadCrumbGenerator $breadcrumbs) {
+    function (BreadCrumbsGenerator $breadcrumbs) {
         $breadcrumbs->parent('admin.index');
         $breadcrumbs->push(trans('firefly.instance_configuration'), route('admin.configuration.index'));
     }
@@ -190,7 +191,7 @@ Breadcrumbs::register(
 
 Breadcrumbs::register(
     'admin.links.index',
-    function (BreadCrumbGenerator $breadcrumbs) {
+    function (BreadCrumbsGenerator $breadcrumbs) {
         $breadcrumbs->parent('admin.index');
         $breadcrumbs->push(trans('firefly.journal_link_configuration'), route('admin.links.index'));
     }
@@ -198,7 +199,7 @@ Breadcrumbs::register(
 
 Breadcrumbs::register(
     'admin.links.create',
-    function (BreadCrumbGenerator $breadcrumbs) {
+    function (BreadCrumbsGenerator $breadcrumbs) {
         $breadcrumbs->parent('admin.links.index');
         $breadcrumbs->push(trans('firefly.create_new_link_type'), route('admin.links.create'));
     }
@@ -206,7 +207,7 @@ Breadcrumbs::register(
 
 Breadcrumbs::register(
     'admin.links.show',
-    function (BreadCrumbGenerator $breadcrumbs, LinkType $linkType) {
+    function (BreadCrumbsGenerator $breadcrumbs, LinkType $linkType) {
         $breadcrumbs->parent('admin.links.index');
         $breadcrumbs->push(trans('firefly.overview_for_link', [$linkType->name]), route('admin.links.show', [$linkType->id]));
     }
@@ -214,7 +215,7 @@ Breadcrumbs::register(
 
 Breadcrumbs::register(
     'admin.links.edit',
-    function (BreadCrumbGenerator $breadcrumbs, LinkType $linkType) {
+    function (BreadCrumbsGenerator $breadcrumbs, LinkType $linkType) {
         $breadcrumbs->parent('admin.links.index');
         $breadcrumbs->push(trans('firefly.edit_link_type', ['name' => $linkType->name]), route('admin.links.edit', [$linkType->id]));
     }
@@ -222,7 +223,7 @@ Breadcrumbs::register(
 
 Breadcrumbs::register(
     'admin.links.delete',
-    function (BreadCrumbGenerator $breadcrumbs, LinkType $linkType) {
+    function (BreadCrumbsGenerator $breadcrumbs, LinkType $linkType) {
         $breadcrumbs->parent('admin.links.index');
         $breadcrumbs->push(trans('firefly.delete_link_type', ['name' => $linkType->name]), route('admin.links.delete', [$linkType->id]));
     }
@@ -230,7 +231,7 @@ Breadcrumbs::register(
 
 Breadcrumbs::register(
     'transactions.link.delete',
-    function (BreadCrumbGenerator $breadcrumbs, TransactionJournalLink $link) {
+    function (BreadCrumbsGenerator $breadcrumbs, TransactionJournalLink $link) {
         $breadcrumbs->parent('home');
         $breadcrumbs->push(trans('breadcrumbs.delete_journal_link'), route('transactions.link.delete', $link->id));
     }
@@ -239,7 +240,7 @@ Breadcrumbs::register(
 // ATTACHMENTS
 Breadcrumbs::register(
     'attachments.edit',
-    function (BreadCrumbGenerator $breadcrumbs, Attachment $attachment) {
+    function (BreadCrumbsGenerator $breadcrumbs, Attachment $attachment) {
         $object = $attachment->attachable;
         if ($object instanceof TransactionJournal) {
             $breadcrumbs->parent('transactions.show', $object);
@@ -251,7 +252,7 @@ Breadcrumbs::register(
 );
 Breadcrumbs::register(
     'attachments.delete',
-    function (BreadCrumbGenerator $breadcrumbs, Attachment $attachment) {
+    function (BreadCrumbsGenerator $breadcrumbs, Attachment $attachment) {
         $object = $attachment->attachable;
         if ($object instanceof TransactionJournal) {
             $breadcrumbs->parent('transactions.show', $object);
@@ -265,14 +266,14 @@ Breadcrumbs::register(
 // BILLS
 Breadcrumbs::register(
     'bills.index',
-    function (BreadCrumbGenerator $breadcrumbs) {
+    function (BreadCrumbsGenerator $breadcrumbs) {
         $breadcrumbs->parent('home');
         $breadcrumbs->push(trans('breadcrumbs.bills'), route('bills.index'));
     }
 );
 Breadcrumbs::register(
     'bills.create',
-    function (BreadCrumbGenerator $breadcrumbs) {
+    function (BreadCrumbsGenerator $breadcrumbs) {
         $breadcrumbs->parent('bills.index');
         $breadcrumbs->push(trans('breadcrumbs.newBill'), route('bills.create'));
     }
@@ -280,14 +281,14 @@ Breadcrumbs::register(
 
 Breadcrumbs::register(
     'bills.edit',
-    function (BreadCrumbGenerator $breadcrumbs, Bill $bill) {
+    function (BreadCrumbsGenerator $breadcrumbs, Bill $bill) {
         $breadcrumbs->parent('bills.show', $bill);
         $breadcrumbs->push(trans('breadcrumbs.edit_bill', ['name' => e($bill->name)]), route('bills.edit', [$bill->id]));
     }
 );
 Breadcrumbs::register(
     'bills.delete',
-    function (BreadCrumbGenerator $breadcrumbs, Bill $bill) {
+    function (BreadCrumbsGenerator $breadcrumbs, Bill $bill) {
         $breadcrumbs->parent('bills.show', $bill);
         $breadcrumbs->push(trans('breadcrumbs.delete_bill', ['name' => e($bill->name)]), route('bills.delete', [$bill->id]));
     }
@@ -295,7 +296,7 @@ Breadcrumbs::register(
 
 Breadcrumbs::register(
     'bills.show',
-    function (BreadCrumbGenerator $breadcrumbs, Bill $bill) {
+    function (BreadCrumbsGenerator $breadcrumbs, Bill $bill) {
         $breadcrumbs->parent('bills.index');
         $breadcrumbs->push(e($bill->name), route('bills.show', [$bill->id]));
     }
@@ -304,14 +305,14 @@ Breadcrumbs::register(
 // BUDGETS
 Breadcrumbs::register(
     'budgets.index',
-    function (BreadCrumbGenerator $breadcrumbs) {
+    function (BreadCrumbsGenerator $breadcrumbs) {
         $breadcrumbs->parent('home');
         $breadcrumbs->push(trans('firefly.budgets'), route('budgets.index'));
     }
 );
 Breadcrumbs::register(
     'budgets.create',
-    function (BreadCrumbGenerator $breadcrumbs) {
+    function (BreadCrumbsGenerator $breadcrumbs) {
         $breadcrumbs->parent('budgets.index');
         $breadcrumbs->push(trans('firefly.create_new_budget'), route('budgets.create'));
     }
@@ -319,14 +320,14 @@ Breadcrumbs::register(
 
 Breadcrumbs::register(
     'budgets.edit',
-    function (BreadCrumbGenerator $breadcrumbs, Budget $budget) {
+    function (BreadCrumbsGenerator $breadcrumbs, Budget $budget) {
         $breadcrumbs->parent('budgets.show', $budget);
         $breadcrumbs->push(trans('firefly.edit_budget', ['name' => e($budget->name)]), route('budgets.edit', [$budget->id]));
     }
 );
 Breadcrumbs::register(
     'budgets.delete',
-    function (BreadCrumbGenerator $breadcrumbs, Budget $budget) {
+    function (BreadCrumbsGenerator $breadcrumbs, Budget $budget) {
         $breadcrumbs->parent('budgets.show', $budget);
         $breadcrumbs->push(trans('firefly.delete_budget', ['name' => e($budget->name)]), route('budgets.delete', [$budget->id]));
     }
@@ -334,7 +335,7 @@ Breadcrumbs::register(
 
 Breadcrumbs::register(
     'budgets.no-budget',
-    function (BreadCrumbGenerator $breadcrumbs, string $moment, Carbon $start, Carbon $end) {
+    function (BreadCrumbsGenerator $breadcrumbs, string $moment, Carbon $start, Carbon $end) {
         $breadcrumbs->parent('budgets.index');
         $breadcrumbs->push(trans('firefly.journals_without_budget'), route('budgets.no-budget'));
 
@@ -356,7 +357,7 @@ Breadcrumbs::register(
 
 Breadcrumbs::register(
     'budgets.show',
-    function (BreadCrumbGenerator $breadcrumbs, Budget $budget) {
+    function (BreadCrumbsGenerator $breadcrumbs, Budget $budget) {
         $breadcrumbs->parent('budgets.index');
         $breadcrumbs->push(e($budget->name), route('budgets.show', [$budget->id]));
         $breadcrumbs->push(trans('firefly.everything'), route('budgets.show', [$budget->id]));
@@ -365,7 +366,7 @@ Breadcrumbs::register(
 
 Breadcrumbs::register(
     'budgets.show.limit',
-    function (BreadCrumbGenerator $breadcrumbs, Budget $budget, BudgetLimit $budgetLimit) {
+    function (BreadCrumbsGenerator $breadcrumbs, Budget $budget, BudgetLimit $budgetLimit) {
         $breadcrumbs->parent('budgets.index');
         $breadcrumbs->push(e($budget->name), route('budgets.show', [$budget->id]));
 
@@ -385,14 +386,14 @@ Breadcrumbs::register(
 // CATEGORIES
 Breadcrumbs::register(
     'categories.index',
-    function (BreadCrumbGenerator $breadcrumbs) {
+    function (BreadCrumbsGenerator $breadcrumbs) {
         $breadcrumbs->parent('home');
         $breadcrumbs->push(trans('firefly.categories'), route('categories.index'));
     }
 );
 Breadcrumbs::register(
     'categories.create',
-    function (BreadCrumbGenerator $breadcrumbs) {
+    function (BreadCrumbsGenerator $breadcrumbs) {
         $breadcrumbs->parent('categories.index');
         $breadcrumbs->push(trans('firefly.new_category'), route('categories.create'));
     }
@@ -400,14 +401,14 @@ Breadcrumbs::register(
 
 Breadcrumbs::register(
     'categories.edit',
-    function (BreadCrumbGenerator $breadcrumbs, Category $category) {
+    function (BreadCrumbsGenerator $breadcrumbs, Category $category) {
         $breadcrumbs->parent('categories.show', $category, '(nothing)', new Carbon, new Carbon);
         $breadcrumbs->push(trans('firefly.edit_category', ['name' => e($category->name)]), route('categories.edit', [$category->id]));
     }
 );
 Breadcrumbs::register(
     'categories.delete',
-    function (BreadCrumbGenerator $breadcrumbs, Category $category) {
+    function (BreadCrumbsGenerator $breadcrumbs, Category $category) {
         $breadcrumbs->parent('categories.show', $category, '(nothing)', new Carbon, new Carbon);
         $breadcrumbs->push(trans('firefly.delete_category', ['name' => e($category->name)]), route('categories.delete', [$category->id]));
     }
@@ -415,7 +416,7 @@ Breadcrumbs::register(
 
 Breadcrumbs::register(
     'categories.show',
-    function (BreadCrumbGenerator $breadcrumbs, Category $category, string $moment, Carbon $start, Carbon $end) {
+    function (BreadCrumbsGenerator $breadcrumbs, Category $category, string $moment, Carbon $start, Carbon $end) {
         $breadcrumbs->parent('categories.index');
         $breadcrumbs->push($category->name, route('categories.show', [$category->id]));
 
@@ -437,7 +438,7 @@ Breadcrumbs::register(
 
 Breadcrumbs::register(
     'categories.no-category',
-    function (BreadCrumbGenerator $breadcrumbs, string $moment, Carbon $start, Carbon $end) {
+    function (BreadCrumbsGenerator $breadcrumbs, string $moment, Carbon $start, Carbon $end) {
         $breadcrumbs->parent('categories.index');
         $breadcrumbs->push(trans('firefly.journals_without_category'), route('categories.no-category'));
 
@@ -460,7 +461,7 @@ Breadcrumbs::register(
 // CURRENCIES
 Breadcrumbs::register(
     'currencies.index',
-    function (BreadCrumbGenerator $breadcrumbs) {
+    function (BreadCrumbsGenerator $breadcrumbs) {
         $breadcrumbs->parent('home');
         $breadcrumbs->push(trans('firefly.currencies'), route('currencies.index'));
     }
@@ -468,7 +469,7 @@ Breadcrumbs::register(
 
 Breadcrumbs::register(
     'currencies.create',
-    function (BreadCrumbGenerator $breadcrumbs) {
+    function (BreadCrumbsGenerator $breadcrumbs) {
         $breadcrumbs->parent('currencies.index');
         $breadcrumbs->push(trans('firefly.create_currency'), route('currencies.create'));
     }
@@ -476,14 +477,14 @@ Breadcrumbs::register(
 
 Breadcrumbs::register(
     'currencies.edit',
-    function (BreadCrumbGenerator $breadcrumbs, TransactionCurrency $currency) {
+    function (BreadCrumbsGenerator $breadcrumbs, TransactionCurrency $currency) {
         $breadcrumbs->parent('currencies.index');
         $breadcrumbs->push(trans('breadcrumbs.edit_currency', ['name' => e($currency->name)]), route('currencies.edit', [$currency->id]));
     }
 );
 Breadcrumbs::register(
     'currencies.delete',
-    function (BreadCrumbGenerator $breadcrumbs, TransactionCurrency $currency) {
+    function (BreadCrumbsGenerator $breadcrumbs, TransactionCurrency $currency) {
         $breadcrumbs->parent('currencies.index');
         $breadcrumbs->push(trans('breadcrumbs.delete_currency', ['name' => e($currency->name)]), route('currencies.delete', [$currency->id]));
     }
@@ -492,7 +493,7 @@ Breadcrumbs::register(
 // EXPORT
 Breadcrumbs::register(
     'export.index',
-    function (BreadCrumbGenerator $breadcrumbs) {
+    function (BreadCrumbsGenerator $breadcrumbs) {
         $breadcrumbs->parent('home');
         $breadcrumbs->push(trans('firefly.export_data'), route('export.index'));
     }
@@ -501,14 +502,14 @@ Breadcrumbs::register(
 // PIGGY BANKS
 Breadcrumbs::register(
     'piggy-banks.index',
-    function (BreadCrumbGenerator $breadcrumbs) {
+    function (BreadCrumbsGenerator $breadcrumbs) {
         $breadcrumbs->parent('home');
         $breadcrumbs->push(trans('firefly.piggyBanks'), route('piggy-banks.index'));
     }
 );
 Breadcrumbs::register(
     'piggy-banks.create',
-    function (BreadCrumbGenerator $breadcrumbs) {
+    function (BreadCrumbsGenerator $breadcrumbs) {
         $breadcrumbs->parent('piggy-banks.index');
         $breadcrumbs->push(trans('breadcrumbs.newPiggyBank'), route('piggy-banks.create'));
     }
@@ -516,14 +517,14 @@ Breadcrumbs::register(
 
 Breadcrumbs::register(
     'piggy-banks.edit',
-    function (BreadCrumbGenerator $breadcrumbs, PiggyBank $piggyBank) {
+    function (BreadCrumbsGenerator $breadcrumbs, PiggyBank $piggyBank) {
         $breadcrumbs->parent('piggy-banks.show', $piggyBank);
         $breadcrumbs->push(trans('breadcrumbs.edit_piggyBank', ['name' => e($piggyBank->name)]), route('piggy-banks.edit', [$piggyBank->id]));
     }
 );
 Breadcrumbs::register(
     'piggy-banks.delete',
-    function (BreadCrumbGenerator $breadcrumbs, PiggyBank $piggyBank) {
+    function (BreadCrumbsGenerator $breadcrumbs, PiggyBank $piggyBank) {
         $breadcrumbs->parent('piggy-banks.show', $piggyBank);
         $breadcrumbs->push(trans('firefly.delete_piggy_bank', ['name' => e($piggyBank->name)]), route('piggy-banks.delete', [$piggyBank->id]));
     }
@@ -531,7 +532,7 @@ Breadcrumbs::register(
 
 Breadcrumbs::register(
     'piggy-banks.show',
-    function (BreadCrumbGenerator $breadcrumbs, PiggyBank $piggyBank) {
+    function (BreadCrumbsGenerator $breadcrumbs, PiggyBank $piggyBank) {
         $breadcrumbs->parent('piggy-banks.index');
         $breadcrumbs->push(e($piggyBank->name), route('piggy-banks.show', [$piggyBank->id]));
     }
@@ -539,7 +540,7 @@ Breadcrumbs::register(
 
 Breadcrumbs::register(
     'piggy-banks.add-money-mobile',
-    function (BreadCrumbGenerator $breadcrumbs, PiggyBank $piggyBank) {
+    function (BreadCrumbsGenerator $breadcrumbs, PiggyBank $piggyBank) {
         $breadcrumbs->parent('piggy-banks.show', $piggyBank);
         $breadcrumbs->push(trans('firefly.add_money_to_piggy', ['name' => $piggyBank->name]), route('piggy-banks.add-money-mobile', [$piggyBank->id]));
     }
@@ -547,7 +548,7 @@ Breadcrumbs::register(
 
 Breadcrumbs::register(
     'piggy-banks.remove-money-mobile',
-    function (BreadCrumbGenerator $breadcrumbs, PiggyBank $piggyBank) {
+    function (BreadCrumbsGenerator $breadcrumbs, PiggyBank $piggyBank) {
         $breadcrumbs->parent('piggy-banks.show', $piggyBank);
         $breadcrumbs->push(
             trans('firefly.remove_money_from_piggy_title', ['name' => $piggyBank->name]),
@@ -559,7 +560,7 @@ Breadcrumbs::register(
 // IMPORT
 Breadcrumbs::register(
     'import.index',
-    function (BreadCrumbGenerator $breadcrumbs) {
+    function (BreadCrumbsGenerator $breadcrumbs) {
         $breadcrumbs->parent('home');
         $breadcrumbs->push(trans('firefly.import'), route('import.index'));
     }
@@ -567,14 +568,14 @@ Breadcrumbs::register(
 
 Breadcrumbs::register(
     'import.configure',
-    function (BreadCrumbGenerator $breadcrumbs, ImportJob $job) {
+    function (BreadCrumbsGenerator $breadcrumbs, ImportJob $job) {
         $breadcrumbs->parent('import.index');
         $breadcrumbs->push(trans('import.config_sub_title', ['key' => $job->key]), route('import.configure', [$job->key]));
     }
 );
 Breadcrumbs::register(
     'import.status',
-    function (BreadCrumbGenerator $breadcrumbs, ImportJob $job) {
+    function (BreadCrumbsGenerator $breadcrumbs, ImportJob $job) {
         $breadcrumbs->parent('import.index');
         $breadcrumbs->push(trans('import.status_bread_crumb', ['key' => $job->key]), route('import.status', [$job->key]));
     }
@@ -583,7 +584,7 @@ Breadcrumbs::register(
 // PREFERENCES
 Breadcrumbs::register(
     'preferences.index',
-    function (BreadCrumbGenerator $breadcrumbs) {
+    function (BreadCrumbsGenerator $breadcrumbs) {
         $breadcrumbs->parent('home');
         $breadcrumbs->push(trans('breadcrumbs.preferences'), route('preferences.index'));
     }
@@ -591,7 +592,7 @@ Breadcrumbs::register(
 
 Breadcrumbs::register(
     'preferences.code',
-    function (BreadCrumbGenerator $breadcrumbs) {
+    function (BreadCrumbsGenerator $breadcrumbs) {
         $breadcrumbs->parent('home');
         $breadcrumbs->push(trans('breadcrumbs.preferences'), route('preferences.index'));
     }
@@ -600,14 +601,14 @@ Breadcrumbs::register(
 // PROFILE
 Breadcrumbs::register(
     'profile.index',
-    function (BreadCrumbGenerator $breadcrumbs) {
+    function (BreadCrumbsGenerator $breadcrumbs) {
         $breadcrumbs->parent('home');
         $breadcrumbs->push(trans('breadcrumbs.profile'), route('profile.index'));
     }
 );
 Breadcrumbs::register(
     'profile.change-password',
-    function (BreadCrumbGenerator $breadcrumbs) {
+    function (BreadCrumbsGenerator $breadcrumbs) {
         $breadcrumbs->parent('profile.index');
         $breadcrumbs->push(trans('breadcrumbs.changePassword'), route('profile.change-password'));
     }
@@ -615,7 +616,7 @@ Breadcrumbs::register(
 
 Breadcrumbs::register(
     'profile.change-email',
-    function (BreadCrumbGenerator $breadcrumbs) {
+    function (BreadCrumbsGenerator $breadcrumbs) {
         $breadcrumbs->parent('profile.index');
         $breadcrumbs->push(trans('breadcrumbs.change_email'), route('profile.change-email'));
     }
@@ -623,7 +624,7 @@ Breadcrumbs::register(
 
 Breadcrumbs::register(
     'profile.delete-account',
-    function (BreadCrumbGenerator $breadcrumbs) {
+    function (BreadCrumbsGenerator $breadcrumbs) {
         $breadcrumbs->parent('profile.index');
         $breadcrumbs->push(trans('firefly.delete_account'), route('profile.delete-account'));
     }
@@ -632,7 +633,7 @@ Breadcrumbs::register(
 // REPORTS
 Breadcrumbs::register(
     'reports.index',
-    function (BreadCrumbGenerator $breadcrumbs) {
+    function (BreadCrumbsGenerator $breadcrumbs) {
         $breadcrumbs->parent('home');
         $breadcrumbs->push(trans('breadcrumbs.reports'), route('reports.index'));
     }
@@ -640,7 +641,7 @@ Breadcrumbs::register(
 
 Breadcrumbs::register(
     'reports.report.audit',
-    function (BreadCrumbGenerator $breadcrumbs, string $accountIds, Carbon $start, Carbon $end) {
+    function (BreadCrumbsGenerator $breadcrumbs, string $accountIds, Carbon $start, Carbon $end) {
         $breadcrumbs->parent('reports.index');
 
         $monthFormat = (string)trans('config.month_and_day');
@@ -653,7 +654,7 @@ Breadcrumbs::register(
 );
 Breadcrumbs::register(
     'reports.report.budget',
-    function (BreadCrumbGenerator $breadcrumbs, string $accountIds, string $budgetIds, Carbon $start, Carbon $end) {
+    function (BreadCrumbsGenerator $breadcrumbs, string $accountIds, string $budgetIds, Carbon $start, Carbon $end) {
         $breadcrumbs->parent('reports.index');
 
         $monthFormat = (string)trans('config.month_and_day');
@@ -667,7 +668,7 @@ Breadcrumbs::register(
 
 Breadcrumbs::register(
     'reports.report.tag',
-    function (BreadCrumbGenerator $breadcrumbs, string $accountIds, string $tagTags, Carbon $start, Carbon $end) {
+    function (BreadCrumbsGenerator $breadcrumbs, string $accountIds, string $tagTags, Carbon $start, Carbon $end) {
         $breadcrumbs->parent('reports.index');
 
         $monthFormat = (string)trans('config.month_and_day');
@@ -681,7 +682,7 @@ Breadcrumbs::register(
 
 Breadcrumbs::register(
     'reports.report.category',
-    function (BreadCrumbGenerator $breadcrumbs, string $accountIds, string $categoryIds, Carbon $start, Carbon $end) {
+    function (BreadCrumbsGenerator $breadcrumbs, string $accountIds, string $categoryIds, Carbon $start, Carbon $end) {
         $breadcrumbs->parent('reports.index');
 
         $monthFormat = (string)trans('config.month_and_day');
@@ -695,7 +696,7 @@ Breadcrumbs::register(
 
 Breadcrumbs::register(
     'reports.report.account',
-    function (BreadCrumbGenerator $breadcrumbs, string $accountIds, string $expenseIds, Carbon $start, Carbon $end) {
+    function (BreadCrumbsGenerator $breadcrumbs, string $accountIds, string $expenseIds, Carbon $start, Carbon $end) {
         $breadcrumbs->parent('reports.index');
 
         $monthFormat = (string)trans('config.month_and_day');
@@ -709,7 +710,7 @@ Breadcrumbs::register(
 
 Breadcrumbs::register(
     'reports.report.default',
-    function (BreadCrumbGenerator $breadcrumbs, string $accountIds, Carbon $start, Carbon $end) {
+    function (BreadCrumbsGenerator $breadcrumbs, string $accountIds, Carbon $start, Carbon $end) {
         $breadcrumbs->parent('reports.index');
 
         $monthFormat = (string)trans('config.month_and_day');
@@ -724,7 +725,7 @@ Breadcrumbs::register(
 // New user Controller
 Breadcrumbs::register(
     'new-user.index',
-    function (BreadCrumbGenerator $breadcrumbs) {
+    function (BreadCrumbsGenerator $breadcrumbs) {
         $breadcrumbs->parent('home');
         $breadcrumbs->push(trans('firefly.getting_started'), route('new-user.index'));
     }
@@ -733,7 +734,7 @@ Breadcrumbs::register(
 // Rules
 Breadcrumbs::register(
     'rules.index',
-    function (BreadCrumbGenerator $breadcrumbs) {
+    function (BreadCrumbsGenerator $breadcrumbs) {
         $breadcrumbs->parent('home');
         $breadcrumbs->push(trans('firefly.rules'), route('rules.index'));
     }
@@ -741,42 +742,42 @@ Breadcrumbs::register(
 
 Breadcrumbs::register(
     'rules.create',
-    function (BreadCrumbGenerator $breadcrumbs, RuleGroup $ruleGroup) {
+    function (BreadCrumbsGenerator $breadcrumbs, RuleGroup $ruleGroup) {
         $breadcrumbs->parent('rules.index');
         $breadcrumbs->push(trans('firefly.make_new_rule', ['title' => $ruleGroup->title]), route('rules.create', [$ruleGroup]));
     }
 );
 Breadcrumbs::register(
     'rules.edit',
-    function (BreadCrumbGenerator $breadcrumbs, Rule $rule) {
+    function (BreadCrumbsGenerator $breadcrumbs, Rule $rule) {
         $breadcrumbs->parent('rules.index');
         $breadcrumbs->push(trans('firefly.edit_rule', ['title' => $rule->title]), route('rules.edit', [$rule]));
     }
 );
 Breadcrumbs::register(
     'rules.delete',
-    function (BreadCrumbGenerator $breadcrumbs, Rule $rule) {
+    function (BreadCrumbsGenerator $breadcrumbs, Rule $rule) {
         $breadcrumbs->parent('rules.index');
         $breadcrumbs->push(trans('firefly.delete_rule', ['title' => $rule->title]), route('rules.delete', [$rule]));
     }
 );
 Breadcrumbs::register(
     'rule-groups.create',
-    function (BreadCrumbGenerator $breadcrumbs) {
+    function (BreadCrumbsGenerator $breadcrumbs) {
         $breadcrumbs->parent('rules.index');
         $breadcrumbs->push(trans('firefly.make_new_rule_group'), route('rule-groups.create'));
     }
 );
 Breadcrumbs::register(
     'rule-groups.edit',
-    function (BreadCrumbGenerator $breadcrumbs, RuleGroup $ruleGroup) {
+    function (BreadCrumbsGenerator $breadcrumbs, RuleGroup $ruleGroup) {
         $breadcrumbs->parent('rules.index');
         $breadcrumbs->push(trans('firefly.edit_rule_group', ['title' => $ruleGroup->title]), route('rule-groups.edit', [$ruleGroup]));
     }
 );
 Breadcrumbs::register(
     'rule-groups.delete',
-    function (BreadCrumbGenerator $breadcrumbs, RuleGroup $ruleGroup) {
+    function (BreadCrumbsGenerator $breadcrumbs, RuleGroup $ruleGroup) {
         $breadcrumbs->parent('rules.index');
         $breadcrumbs->push(trans('firefly.delete_rule_group', ['title' => $ruleGroup->title]), route('rule-groups.delete', [$ruleGroup]));
     }
@@ -784,7 +785,7 @@ Breadcrumbs::register(
 
 Breadcrumbs::register(
     'rules.select-transactions',
-    function (BreadCrumbGenerator $breadcrumbs, Rule $rule) {
+    function (BreadCrumbsGenerator $breadcrumbs, Rule $rule) {
         $breadcrumbs->parent('rules.index');
         $breadcrumbs->push(
             trans('firefly.rule_select_transactions', ['title' => $rule->title]), route('rules.select-transactions', [$rule])
@@ -794,7 +795,7 @@ Breadcrumbs::register(
 
 Breadcrumbs::register(
     'rule-groups.select-transactions',
-    function (BreadCrumbGenerator $breadcrumbs, RuleGroup $ruleGroup) {
+    function (BreadCrumbsGenerator $breadcrumbs, RuleGroup $ruleGroup) {
         $breadcrumbs->parent('rules.index');
         $breadcrumbs->push(
             trans('firefly.rule_group_select_transactions', ['title' => $ruleGroup->title]), route('rule-groups.select-transactions', [$ruleGroup])
@@ -805,7 +806,7 @@ Breadcrumbs::register(
 // SEARCH
 Breadcrumbs::register(
     'search.index',
-    function (BreadCrumbGenerator $breadcrumbs, $query) {
+    function (BreadCrumbsGenerator $breadcrumbs, $query) {
         $breadcrumbs->parent('home');
         $breadcrumbs->push(trans('breadcrumbs.search_result', ['query' => e($query)]), route('search.index'));
     }
@@ -814,7 +815,7 @@ Breadcrumbs::register(
 // TAGS
 Breadcrumbs::register(
     'tags.index',
-    function (BreadCrumbGenerator $breadcrumbs) {
+    function (BreadCrumbsGenerator $breadcrumbs) {
         $breadcrumbs->parent('home');
         $breadcrumbs->push(trans('breadcrumbs.tags'), route('tags.index'));
     }
@@ -822,7 +823,7 @@ Breadcrumbs::register(
 
 Breadcrumbs::register(
     'tags.create',
-    function (BreadCrumbGenerator $breadcrumbs) {
+    function (BreadCrumbsGenerator $breadcrumbs) {
         $breadcrumbs->parent('tags.index');
         $breadcrumbs->push(trans('breadcrumbs.createTag'), route('tags.create'));
     }
@@ -830,7 +831,7 @@ Breadcrumbs::register(
 
 Breadcrumbs::register(
     'tags.edit',
-    function (BreadCrumbGenerator $breadcrumbs, Tag $tag) {
+    function (BreadCrumbsGenerator $breadcrumbs, Tag $tag) {
         $breadcrumbs->parent('tags.show', $tag, '(nothing)', new Carbon, new Carbon);
         $breadcrumbs->push(trans('breadcrumbs.edit_tag', ['tag' => e($tag->tag)]), route('tags.edit', [$tag->id]));
     }
@@ -838,7 +839,7 @@ Breadcrumbs::register(
 
 Breadcrumbs::register(
     'tags.delete',
-    function (BreadCrumbGenerator $breadcrumbs, Tag $tag) {
+    function (BreadCrumbsGenerator $breadcrumbs, Tag $tag) {
         $breadcrumbs->parent('tags.show', $tag, '(nothing)', new Carbon, new Carbon);
         $breadcrumbs->push(trans('breadcrumbs.delete_tag', ['tag' => e($tag->tag)]), route('tags.delete', [$tag->id]));
     }
@@ -846,7 +847,7 @@ Breadcrumbs::register(
 
 Breadcrumbs::register(
     'tags.show',
-    function (BreadCrumbGenerator $breadcrumbs, Tag $tag, string $moment, Carbon $start, Carbon $end) {
+    function (BreadCrumbsGenerator $breadcrumbs, Tag $tag, string $moment, Carbon $start, Carbon $end) {
         $breadcrumbs->parent('tags.index');
         $breadcrumbs->push(e($tag->tag), route('tags.show', [$tag->id, $moment]));
         if ('all' === $moment) {
@@ -867,7 +868,7 @@ Breadcrumbs::register(
 // TRANSACTIONS
 Breadcrumbs::register(
     'transactions.index',
-    function (BreadCrumbGenerator $breadcrumbs, string $what, string $moment = '', Carbon $start, Carbon $end) {
+    function (BreadCrumbsGenerator $breadcrumbs, string $what, string $moment = '', Carbon $start, Carbon $end) {
         $breadcrumbs->parent('home');
         $breadcrumbs->push(trans('breadcrumbs.' . $what . '_list'), route('transactions.index', [$what]));
         if ('all' === $moment) {
@@ -888,7 +889,7 @@ Breadcrumbs::register(
 
 Breadcrumbs::register(
     'transactions.create',
-    function (BreadCrumbGenerator $breadcrumbs, string $what) {
+    function (BreadCrumbsGenerator $breadcrumbs, string $what) {
         $breadcrumbs->parent('transactions.index', $what, '(nothing)', new Carbon, new Carbon);
         $breadcrumbs->push(trans('breadcrumbs.create_' . e($what)), route('transactions.create', [$what]));
     }
@@ -896,7 +897,7 @@ Breadcrumbs::register(
 
 Breadcrumbs::register(
     'transactions.edit',
-    function (BreadCrumbGenerator $breadcrumbs, TransactionJournal $journal) {
+    function (BreadCrumbsGenerator $breadcrumbs, TransactionJournal $journal) {
         $breadcrumbs->parent('transactions.show', $journal);
         $breadcrumbs->push(trans('breadcrumbs.edit_journal', ['description' => $journal->description]), route('transactions.edit', [$journal->id]));
     }
@@ -905,7 +906,7 @@ Breadcrumbs::register(
 // also edit reconciliations:
 Breadcrumbs::register(
     'accounts.reconcile.edit',
-    function (BreadCrumbGenerator $breadcrumbs, TransactionJournal $journal) {
+    function (BreadCrumbsGenerator $breadcrumbs, TransactionJournal $journal) {
         $breadcrumbs->parent('transactions.show', $journal);
         $breadcrumbs->push(
             trans('breadcrumbs.edit_reconciliation', ['description' => $journal->description]), route('accounts.reconcile.edit', [$journal->id])
@@ -915,7 +916,7 @@ Breadcrumbs::register(
 
 Breadcrumbs::register(
     'transactions.delete',
-    function (BreadCrumbGenerator $breadcrumbs, TransactionJournal $journal) {
+    function (BreadCrumbsGenerator $breadcrumbs, TransactionJournal $journal) {
         $breadcrumbs->parent('transactions.show', $journal);
         $breadcrumbs->push(trans('breadcrumbs.delete_journal', ['description' => e($journal->description)]), route('transactions.delete', [$journal->id]));
     }
@@ -923,7 +924,7 @@ Breadcrumbs::register(
 
 Breadcrumbs::register(
     'transactions.show',
-    function (BreadCrumbGenerator $breadcrumbs, TransactionJournal $journal) {
+    function (BreadCrumbsGenerator $breadcrumbs, TransactionJournal $journal) {
         $what = strtolower($journal->transactionType->type);
         $breadcrumbs->parent('transactions.index', $what, '(nothing)', new Carbon, new Carbon);
         $breadcrumbs->push($journal->description, route('transactions.show', [$journal->id]));
@@ -931,8 +932,8 @@ Breadcrumbs::register(
 );
 
 Breadcrumbs::register(
-    'transactions.convert',
-    function (BreadCrumbGenerator $breadcrumbs, TransactionType $destinationType, TransactionJournal $journal) {
+    'transactions.convert.index',
+    function (BreadCrumbsGenerator $breadcrumbs, TransactionType $destinationType, TransactionJournal $journal) {
         $breadcrumbs->parent('transactions.show', $journal);
         $breadcrumbs->push(
             trans('firefly.convert_to_' . $destinationType->type, ['description' => $journal->description]),
@@ -944,7 +945,7 @@ Breadcrumbs::register(
 // MASS TRANSACTION EDIT / DELETE
 Breadcrumbs::register(
     'transactions.mass.edit',
-    function (BreadCrumbGenerator $breadcrumbs, Collection $journals): void {
+    function (BreadCrumbsGenerator $breadcrumbs, Collection $journals): void {
         if ($journals->count() > 0) {
             $journalIds = $journals->pluck('id')->toArray();
             $what       = strtolower($journals->first()->transactionType->type);
@@ -962,7 +963,7 @@ Breadcrumbs::register(
 
 Breadcrumbs::register(
     'transactions.mass.delete',
-    function (BreadCrumbGenerator $breadcrumbs, Collection $journals) {
+    function (BreadCrumbsGenerator $breadcrumbs, Collection $journals) {
         $journalIds = $journals->pluck('id')->toArray();
         $what       = strtolower($journals->first()->transactionType->type);
         $breadcrumbs->parent('transactions.index', $what, '(nothing)', new Carbon, new Carbon);
@@ -973,7 +974,7 @@ Breadcrumbs::register(
 // SPLIT
 Breadcrumbs::register(
     'transactions.split.edit',
-    function (BreadCrumbGenerator $breadcrumbs, TransactionJournal $journal) {
+    function (BreadCrumbsGenerator $breadcrumbs, TransactionJournal $journal) {
         $breadcrumbs->parent('transactions.show', $journal);
         $breadcrumbs->push(trans('breadcrumbs.edit_journal', ['description' => $journal->description]), route('transactions.split.edit', [$journal->id]));
     }
diff --git a/tests/Feature/Controllers/Admin/LinkControllerTest.php b/tests/Feature/Controllers/Admin/LinkControllerTest.php
index 0d21c3df77..cc05022d83 100644
--- a/tests/Feature/Controllers/Admin/LinkControllerTest.php
+++ b/tests/Feature/Controllers/Admin/LinkControllerTest.php
@@ -20,7 +20,7 @@
  */
 declare(strict_types=1);
 
-namespace Tests\Feature\Controllers;
+namespace Tests\Feature\Controllers\Admin;
 
 use FireflyIII\Models\LinkType;
 use Tests\TestCase;
diff --git a/tests/Feature/Controllers/Auth/TwoFactorControllerTest.php b/tests/Feature/Controllers/Auth/TwoFactorControllerTest.php
index f329197162..6a1d994bde 100644
--- a/tests/Feature/Controllers/Auth/TwoFactorControllerTest.php
+++ b/tests/Feature/Controllers/Auth/TwoFactorControllerTest.php
@@ -23,7 +23,7 @@ declare(strict_types=1);
 namespace Tests\Feature\Controllers\Auth;
 
 use FireflyIII\Models\Preference;
-use PragmaRX\Google2FA\Contracts\Google2FA;
+use Google2FA;
 use Preferences;
 use Tests\TestCase;
 
@@ -46,7 +46,7 @@ class TwoFactorControllerTest extends TestCase
         $truePref               = new Preference;
         $truePref->data         = true;
         $secretPreference       = new Preference;
-        $secretPreference->data = 'BlablaSeecret';
+        $secretPreference->data = 'JZMES376Z6YXY4QZ';
 
         Preferences::shouldReceive('get')->withArgs(['twoFactorAuthEnabled', false])->andReturn($truePref)->twice();
         Preferences::shouldReceive('get')->withArgs(['twoFactorAuthSecret', null])->andReturn($secretPreference)->once();
@@ -104,7 +104,7 @@ class TwoFactorControllerTest extends TestCase
         $truePreference         = new Preference;
         $truePreference->data   = true;
         $secretPreference       = new Preference;
-        $secretPreference->data = 'BlablaSeecret';
+        $secretPreference->data = 'JZMES376Z6YXY4QZ';
         Preferences::shouldReceive('get')->withArgs(['twoFactorAuthEnabled', false])->andReturn($truePreference);
         Preferences::shouldReceive('get')->withArgs(['twoFactorAuthSecret', null])->andReturn($secretPreference);
         Preferences::shouldReceive('get')->withArgs(['twoFactorAuthSecret'])->andReturn($secretPreference);
@@ -119,8 +119,7 @@ class TwoFactorControllerTest extends TestCase
     public function testPostIndex()
     {
         $data   = ['code' => '123456'];
-        $google = $this->mock(Google2FA::class);
-        $google->shouldReceive('verifyKey')->andReturn(true)->once();
+        Google2FA::shouldReceive('verifyKey')->andReturn(true)->once();
         $this->session(['remember_login' => true]);
 
         $this->be($this->user());
diff --git a/tests/Feature/Controllers/PreferencesControllerTest.php b/tests/Feature/Controllers/PreferencesControllerTest.php
index f533927840..45b9b94b23 100644
--- a/tests/Feature/Controllers/PreferencesControllerTest.php
+++ b/tests/Feature/Controllers/PreferencesControllerTest.php
@@ -28,9 +28,9 @@ use FireflyIII\Repositories\Account\AccountRepositoryInterface;
 use FireflyIII\Repositories\Journal\JournalRepositoryInterface;
 use FireflyIII\Repositories\User\UserRepositoryInterface;
 use Illuminate\Support\Collection;
-use PragmaRX\Google2FA\Contracts\Google2FA;
 use Preferences;
 use Tests\TestCase;
+use Google2FA;
 
 /**
  * Class PreferencesControllerTest
@@ -49,10 +49,9 @@ class PreferencesControllerTest extends TestCase
     {
         // mock stuff
         $journalRepos = $this->mock(JournalRepositoryInterface::class);
-        $google       = $this->mock(Google2FA::class);
         $journalRepos->shouldReceive('first')->once()->andReturn(new TransactionJournal);
-        $google->shouldReceive('generateSecretKey')->andReturn('secret');
-        $google->shouldReceive('getQRCodeInline')->andReturn('long-data-url');
+        Google2FA::shouldReceive('generateSecretKey')->andReturn('secret');
+        Google2FA::shouldReceive('getQRCodeInline')->andReturn('long-data-url');
 
         $this->be($this->user());
         $response = $this->get(route('preferences.code'));
@@ -102,7 +101,6 @@ class PreferencesControllerTest extends TestCase
     {
         $secret = '0123456789abcde';
         $key    = '123456';
-        $google = $this->mock(Google2FA::class);
 
         $this->withoutMiddleware();
         $this->session(['two-factor-secret' => $secret]);
@@ -111,7 +109,7 @@ class PreferencesControllerTest extends TestCase
         Preferences::shouldReceive('set')->withArgs(['twoFactorAuthSecret', $secret])->once();
         Preferences::shouldReceive('mark')->once();
 
-        $google->shouldReceive('verifyKey')->withArgs([$secret, $key])->andReturn(true);
+        Google2FA::shouldReceive('verifyKey')->withArgs([$secret, $key])->andReturn(true);
 
         $data = [
             'code' => $key,