Make it easier to switch between v1/v2 layout.

app/Http/Controllers/Account/CreateController.php

@@ -122,7 +122,7 @@ class CreateController extends Controller
         $request->session()->forget('accounts.create.fromStore');
         Log::channel('audit')->info('Creating new account.');
 
-        return view('accounts.create', compact('subTitleIcon', 'locations', 'objectType', 'interestPeriods', 'subTitle', 'roles', 'liabilityTypes'));
+        return prefixView('accounts.create', compact('subTitleIcon', 'locations', 'objectType', 'interestPeriods', 'subTitle', 'roles', 'liabilityTypes'));
     }
 
     /**

app/Http/Controllers/Account/DeleteController.php

@@ -88,7 +88,7 @@ class DeleteController extends Controller
         // put previous url in session
         $this->rememberPreviousUri('accounts.delete.uri');
 
-        return view('accounts.delete', compact('account', 'subTitle', 'accountList', 'objectType'));
+        return prefixView('accounts.delete', compact('account', 'subTitle', 'accountList', 'objectType'));
     }
 
     /**

app/Http/Controllers/Account/EditController.php

@@ -150,7 +150,7 @@ class EditController extends Controller
 
         $request->session()->flash('preFilled', $preFilled);
 
-        return view(
+        return prefixView(
             'accounts.edit',
             compact(
                 'account',

app/Http/Controllers/Account/IndexController.php

@@ -113,7 +113,7 @@ class IndexController extends Controller
         $accounts = new LengthAwarePaginator($accounts, $total, $pageSize, $page);
         $accounts->setPath(route('accounts.inactive.index', [$objectType]));
 
-        return view('accounts.index', compact('objectType', 'inactivePage', 'subTitleIcon', 'subTitle', 'page', 'accounts'));
+        return prefixView('accounts.index', compact('objectType', 'inactivePage', 'subTitleIcon', 'subTitle', 'page', 'accounts'));
 
     }
 
@@ -182,7 +182,7 @@ class IndexController extends Controller
         Log::debug(sprintf('Count of accounts after LAP (1): %d', $accounts->count()));
         Log::debug(sprintf('Count of accounts after LAP (2): %d', $accounts->getCollection()->count()));
 
-        return view('accounts.index', compact('objectType', 'inactiveCount', 'subTitleIcon', 'subTitle', 'page', 'accounts'));
+        return prefixView('accounts.index', compact('objectType', 'inactiveCount', 'subTitleIcon', 'subTitle', 'page', 'accounts'));
     }
 
 

app/Http/Controllers/Account/ReconcileController.php

@@ -140,7 +140,7 @@ class ReconcileController extends Controller
         $indexUri        = route('accounts.reconcile', [$account->id, '%start%', '%end%']);
         $objectType      = 'asset';
 
-        return view(
+        return prefixView(
             'accounts.reconcile.index',
             compact(
                 'account',

app/Http/Controllers/Account/ShowController.php

@@ -130,7 +130,7 @@ class ShowController extends Controller
         $showAll = false;
         $balance = app('steam')->balance($account, $end);
 
-        return view(
+        return prefixView(
             'accounts.show',
             compact(
                 'account',
@@ -191,7 +191,7 @@ class ShowController extends Controller
         $showAll  = true;
         $balance  = app('steam')->balance($account, $end);
 
-        return view(
+        return prefixView(
             'accounts.show',
             compact(
                 'account',

app/Http/Controllers/Admin/ConfigurationController.php

@@ -74,7 +74,7 @@ class ConfigurationController extends Controller
         $isDemoSite     = app('fireflyconfig')->get('is_demo_site', config('firefly.configuration.is_demo_site'))->data;
         $siteOwner      = config('firefly.site_owner');
 
-        return view(
+        return prefixView(
             'admin.configuration.index',
             compact('subTitle', 'subTitleIcon', 'singleUserMode', 'isDemoSite', 'siteOwner')
         );

app/Http/Controllers/Admin/HomeController.php

@@ -66,7 +66,7 @@ class HomeController extends Controller
         }
         Log::debug('Email is ', [$email]);
 
-        return view('admin.index', compact('title', 'mainTitleIcon','email'));
+        return prefixView('admin.index', compact('title', 'mainTitleIcon','email'));
     }
 
     /**

app/Http/Controllers/Admin/LinkController.php

@@ -80,7 +80,7 @@ class LinkController extends Controller
             $this->rememberPreviousUri('link-types.create.uri');
         }
 
-        return view('admin.link.create', compact('subTitle', 'subTitleIcon'));
+        return prefixView('admin.link.create', compact('subTitle', 'subTitleIcon'));
     }
 
     /**
@@ -116,7 +116,7 @@ class LinkController extends Controller
         // put previous url in session
         $this->rememberPreviousUri('link-types.delete.uri');
 
-        return view('admin.link.delete', compact('linkType', 'subTitle', 'moveTo', 'count'));
+        return prefixView('admin.link.delete', compact('linkType', 'subTitle', 'moveTo', 'count'));
     }
 
     /**
@@ -166,7 +166,7 @@ class LinkController extends Controller
         }
         $request->session()->forget('link-types.edit.fromUpdate');
 
-        return view('admin.link.edit', compact('subTitle', 'subTitleIcon', 'linkType'));
+        return prefixView('admin.link.edit', compact('subTitle', 'subTitleIcon', 'linkType'));
     }
 
     /**
@@ -187,7 +187,7 @@ class LinkController extends Controller
             }
         );
 
-        return view('admin.link.index', compact('subTitle', 'subTitleIcon', 'linkTypes'));
+        return prefixView('admin.link.index', compact('subTitle', 'subTitleIcon', 'linkTypes'));
     }
 
     /**
@@ -205,7 +205,7 @@ class LinkController extends Controller
 
         Log::channel('audit')->info(sprintf('User viewing link type #%d', $linkType->id));
 
-        return view('admin.link.show', compact('subTitle', 'subTitleIcon', 'linkType', 'links'));
+        return prefixView('admin.link.show', compact('subTitle', 'subTitleIcon', 'linkType', 'links'));
     }
 
     /**

app/Http/Controllers/Admin/TelemetryController.php

@@ -106,7 +106,7 @@ class TelemetryController extends Controller
 
         $count   = $this->repository->count();
 
-        return view('admin.telemetry.index', compact('version', 'enabled', 'count'));
+        return prefixView('admin.telemetry.index', compact('version', 'enabled', 'count'));
     }
 
     /**
@@ -120,6 +120,6 @@ class TelemetryController extends Controller
         $size    = 100;
         $records = $this->repository->paginated($size);
 
-        return view('admin.telemetry.view', compact('records', 'format'));
+        return prefixView('admin.telemetry.view', compact('records', 'format'));
     }
 }

app/Http/Controllers/Admin/UpdateController.php

@@ -85,7 +85,7 @@ class UpdateController extends Controller
             'alpha'  => (string) trans('firefly.update_channel_alpha'),
         ];
 
-        return view('admin.update.index', compact('subTitle', 'subTitleIcon', 'selected', 'options', 'channelSelected', 'channelOptions'));
+        return prefixView('admin.update.index', compact('subTitle', 'subTitleIcon', 'selected', 'options', 'channelSelected', 'channelOptions'));
     }
 
     /**

app/Http/Controllers/Admin/UserController.php

@@ -75,7 +75,7 @@ class UserController extends Controller
 
         $subTitle = (string) trans('firefly.delete_user', ['email' => $user->email]);
 
-        return view('admin.users.delete', compact('user', 'subTitle'));
+        return prefixView('admin.users.delete', compact('user', 'subTitle'));
     }
 
     /**
@@ -128,7 +128,7 @@ class UserController extends Controller
             'email_changed' => (string) trans('firefly.block_code_email_changed'),
         ];
 
-        return view('admin.users.edit', compact('user', 'canEditDetails', 'subTitle', 'subTitleIcon', 'codes', 'currentUser', 'isAdmin'));
+        return prefixView('admin.users.edit', compact('user', 'canEditDetails', 'subTitle', 'subTitleIcon', 'codes', 'currentUser', 'isAdmin'));
     }
 
     /**
@@ -150,7 +150,7 @@ class UserController extends Controller
             }
         );
 
-        return view('admin.users.index', compact('subTitle', 'subTitleIcon', 'users'));
+        return prefixView('admin.users.index', compact('subTitle', 'subTitleIcon', 'users'));
     }
 
     /**
@@ -168,7 +168,7 @@ class UserController extends Controller
         $subTitleIcon  = 'fa-user';
         $information   = $this->repository->getUserData($user);
 
-        return view(
+        return prefixView(
             'admin.users.show',
             compact(
                 'title',

app/Http/Controllers/AttachmentController.php

@@ -74,7 +74,7 @@ class AttachmentController extends Controller
         // put previous url in session
         $this->rememberPreviousUri('attachments.delete.uri');
 
-        return view('attachments.delete', compact('attachment', 'subTitle'));
+        return prefixView('attachments.delete', compact('attachment', 'subTitle'));
     }
 
     /**
@@ -153,7 +153,7 @@ class AttachmentController extends Controller
         ];
         $request->session()->flash('preFilled', $preFilled);
 
-        return view('attachments.edit', compact('attachment', 'subTitleIcon', 'subTitle'));
+        return prefixView('attachments.edit', compact('attachment', 'subTitleIcon', 'subTitle'));
     }
 
     /**
@@ -173,7 +173,7 @@ class AttachmentController extends Controller
         );
 
 
-        return view('attachments.index', compact('set'));
+        return prefixView('attachments.index', compact('set'));
     }
 
     /**

app/Http/Controllers/Auth/ForgotPasswordController.php

@@ -77,7 +77,7 @@ class ForgotPasswordController extends Controller
             $message = sprintf('Cannot reset password when authenticating over "%s".', $loginProvider);
             Log::error($message);
 
-            return view('error', compact('message'));
+            return prefixView('error', compact('message'));
         }
         // @codeCoverageIgnoreEnd
 
@@ -118,7 +118,7 @@ class ForgotPasswordController extends Controller
         if ('eloquent' !== $loginProvider) {
             $message = sprintf('Cannot reset password when authenticating over "%s".', $loginProvider);
 
-            return view('error', compact('message'));
+            return prefixView('error', compact('message'));
         }
 
         // is allowed to?
@@ -130,6 +130,6 @@ class ForgotPasswordController extends Controller
             $allowRegistration = false;
         }
 
-        return view('auth.passwords.email')->with(compact('allowRegistration', 'pageTitle'));
+        return prefixView('auth.passwords.email')->with(compact('allowRegistration', 'pageTitle'));
     }
 }

app/Http/Controllers/Auth/LoginController.php

@@ -160,7 +160,7 @@ class LoginController extends Controller
         }
 
 
-        return view('auth.login', compact('allowRegistration', 'email', 'remember', 'allowReset', 'title'));
+        return prefixView('auth.login', compact('allowRegistration', 'email', 'remember', 'allowReset', 'title'));
     }
 
     /**

app/Http/Controllers/Auth/RegisterController.php

@@ -98,7 +98,7 @@ class RegisterController extends Controller
         if (false === $allowRegistration) {
             $message = 'Registration is currently not available.';
 
-            return view('error', compact('message'));
+            return prefixView('error', compact('message'));
         }
 
         $this->validator($request->all())->validate();
@@ -149,12 +149,12 @@ class RegisterController extends Controller
         if (false === $allowRegistration) {
             $message = 'Registration is currently not available.';
 
-            return view('error', compact('message'));
+            return prefixView('error', compact('message'));
         }
 
         $email = $request->old('email');
 
-        return view('auth.register', compact('isDemoSite', 'email', 'pageTitle'));
+        return prefixView('auth.register', compact('isDemoSite', 'email', 'pageTitle'));
     }
 
 }

app/Http/Controllers/Auth/ResetPasswordController.php

@@ -85,7 +85,7 @@ class ResetPasswordController extends Controller
         if ('eloquent' !== $loginProvider) {
             $message = sprintf('Cannot reset password when authenticating over "%s".', $loginProvider);
 
-            return view('error', compact('message'));
+            return prefixView('error', compact('message'));
         }
 
         $rules = [
@@ -130,7 +130,7 @@ class ResetPasswordController extends Controller
         if ('eloquent' !== $loginProvider) {
             $message = sprintf('Cannot reset password when authenticating over "%s".', $loginProvider);
 
-            return view('error', compact('message'));
+            return prefixView('error', compact('message'));
         }
 
         // is allowed to register?
@@ -143,7 +143,7 @@ class ResetPasswordController extends Controller
         }
 
         /** @noinspection PhpUndefinedFieldInspection */
-        return view('auth.passwords.reset')->with(
+        return prefixView('auth.passwords.reset')->with(
             ['token' => $token, 'email' => $request->email, 'allowRegistration' => $allowRegistration, 'pageTitle' => $pageTitle]
         );
     }

app/Http/Controllers/Auth/TwoFactorController.php

@@ -47,7 +47,7 @@ class TwoFactorController extends Controller
         $siteOwner = config('firefly.site_owner');
         $title     = (string) trans('firefly.two_factor_forgot_title');
 
-        return view('auth.lost-two-factor', compact('user', 'siteOwner', 'title'));
+        return prefixView('auth.lost-two-factor', compact('user', 'siteOwner', 'title'));
     }
 
     /**

app/Http/Controllers/Bill/CreateController.php

@@ -86,7 +86,7 @@ class CreateController extends Controller
         }
         $request->session()->forget('bills.create.fromStore');
 
-        return view('bills.create', compact('periods', 'subTitle', 'defaultCurrency'));
+        return prefixView('bills.create', compact('periods', 'subTitle', 'defaultCurrency'));
     }
 
     /**

app/Http/Controllers/Bill/DeleteController.php

@@ -75,7 +75,7 @@ class DeleteController extends Controller
         $this->rememberPreviousUri('bills.delete.uri');
         $subTitle = (string) trans('firefly.delete_bill', ['name' => $bill->name]);
 
-        return view('bills.delete', compact('bill', 'subTitle'));
+        return prefixView('bills.delete', compact('bill', 'subTitle'));
     }
 
     /**

app/Http/Controllers/Bill/EditController.php

@@ -107,7 +107,7 @@ class EditController extends Controller
         $request->session()->flash('preFilled', $preFilled);
         $request->session()->forget('bills.edit.fromUpdate');
 
-        return view('bills.edit', compact('subTitle', 'periods', 'rules', 'bill', 'defaultCurrency', 'preFilled'));
+        return prefixView('bills.edit', compact('subTitle', 'periods', 'rules', 'bill', 'defaultCurrency', 'preFilled'));
     }
 
 

app/Http/Controllers/Bill/IndexController.php

@@ -143,7 +143,7 @@ class IndexController extends Controller
         $sums   = $this->getSums($bills);
         $totals = $this->getTotals($sums);
 
-        return view('bills.index', compact('bills', 'sums', 'total', 'totals'));
+        return prefixView('bills.index', compact('bills', 'sums', 'total', 'totals'));
     }
 
 

app/Http/Controllers/Bill/ShowController.php

@@ -184,7 +184,7 @@ class ShowController extends Controller
         // @codeCoverageIgnoreEnd
 
 
-        return view('bills.show', compact('attachments', 'groups', 'rules', 'yearAverage', 'overallAverage', 'year', 'object', 'bill', 'subTitle'));
+        return prefixView('bills.show', compact('attachments', 'groups', 'rules', 'yearAverage', 'overallAverage', 'year', 'object', 'bill', 'subTitle'));
     }
 
 }

app/Http/Controllers/Budget/AvailableBudgetController.php

@@ -97,7 +97,7 @@ class AvailableBudgetController extends Controller
         }
         $page = (int) ($request->get('page') ?? 1);
 
-        return view('budgets.available-budgets.create', compact('start', 'end', 'page', 'currency'));
+        return prefixView('budgets.available-budgets.create', compact('start', 'end', 'page', 'currency'));
     }
 
     /**
@@ -131,7 +131,7 @@ class AvailableBudgetController extends Controller
 
         $page = (int) ($request->get('page') ?? 1);
 
-        return view('budgets.available-budgets.create-alternative', compact('start', 'end', 'page', 'currencies'));
+        return prefixView('budgets.available-budgets.create-alternative', compact('start', 'end', 'page', 'currencies'));
     }
 
     /**
@@ -158,7 +158,7 @@ class AvailableBudgetController extends Controller
     public function edit(AvailableBudget $availableBudget, Carbon $start, Carbon $end)
     {
         $availableBudget->amount = number_format((float) $availableBudget->amount, $availableBudget->transactionCurrency->decimal_places, '.', '');
-        return view('budgets.available-budgets.edit', compact('availableBudget', 'start', 'end'));
+        return prefixView('budgets.available-budgets.edit', compact('availableBudget', 'start', 'end'));
     }
 
     /**

app/Http/Controllers/Budget/BudgetLimitController.php

@@ -103,7 +103,7 @@ class BudgetLimitController extends Controller
             }
         );
 
-        return view('budgets.budget-limits.create', compact('start', 'end', 'currencies', 'budget'));
+        return prefixView('budgets.budget-limits.create', compact('start', 'end', 'currencies', 'budget'));
     }
 
     /**

app/Http/Controllers/Budget/CreateController.php

@@ -106,7 +106,7 @@ class CreateController extends Controller
         $request->session()->forget('budgets.create.fromStore');
         $subTitle = (string) trans('firefly.create_new_budget');
 
-        return view('budgets.create', compact('subTitle', 'autoBudgetTypes', 'autoBudgetPeriods'));
+        return prefixView('budgets.create', compact('subTitle', 'autoBudgetTypes', 'autoBudgetPeriods'));
     }
 
 

app/Http/Controllers/Budget/DeleteController.php

@@ -77,7 +77,7 @@ class DeleteController extends Controller
         // put previous url in session
         $this->rememberPreviousUri('budgets.delete.uri');
 
-        return view('budgets.delete', compact('budget', 'subTitle'));
+        return prefixView('budgets.delete', compact('budget', 'subTitle'));
     }
 
     /**

app/Http/Controllers/Budget/EditController.php

@@ -114,7 +114,7 @@ class EditController extends Controller
         $request->session()->forget('budgets.edit.fromUpdate');
         $request->session()->flash('preFilled', $preFilled);
 
-        return view('budgets.edit', compact('budget', 'subTitle', 'autoBudgetTypes', 'autoBudgetPeriods', 'autoBudget'));
+        return prefixView('budgets.edit', compact('budget', 'subTitle', 'autoBudgetTypes', 'autoBudgetPeriods', 'autoBudget'));
     }
 
     /**

app/Http/Controllers/Budget/ShowController.php

@@ -107,7 +107,7 @@ class ShowController extends Controller
         $groups = $collector->getPaginatedGroups();
         $groups->setPath(route('budgets.no-budget'));
 
-        return view('budgets.no-budget', compact('groups', 'subTitle', 'periods', 'start', 'end'));
+        return prefixView('budgets.no-budget', compact('groups', 'subTitle', 'periods', 'start', 'end'));
     }
 
     /**
@@ -134,7 +134,7 @@ class ShowController extends Controller
         $groups = $collector->getPaginatedGroups();
         $groups->setPath(route('budgets.no-budget'));
 
-        return view('budgets.no-budget', compact('groups', 'subTitle', 'start', 'end'));
+        return prefixView('budgets.no-budget', compact('groups', 'subTitle', 'start', 'end'));
     }
 
 
@@ -170,7 +170,7 @@ class ShowController extends Controller
 
         $subTitle = (string) trans('firefly.all_journals_for_budget', ['name' => $budget->name]);
 
-        return view('budgets.show', compact('limits','attachments', 'budget', 'repetition', 'groups', 'subTitle'));
+        return prefixView('budgets.show', compact('limits','attachments', 'budget', 'repetition', 'groups', 'subTitle'));
     }
 
     /**
@@ -215,6 +215,6 @@ class ShowController extends Controller
         $attachments = $this->repository->getAttachments($budget);
         $limits = $this->getLimits($budget, $start, $end);
 
-        return view('budgets.show', compact('limits','attachments', 'budget', 'budgetLimit', 'groups', 'subTitle'));
+        return prefixView('budgets.show', compact('limits','attachments', 'budget', 'budgetLimit', 'groups', 'subTitle'));
     }
 }

app/Http/Controllers/Category/CreateController.php

@@ -79,7 +79,7 @@ class CreateController extends Controller
         $request->session()->forget('categories.create.fromStore');
         $subTitle = (string) trans('firefly.create_new_category');
 
-        return view('categories.create', compact('subTitle'));
+        return prefixView('categories.create', compact('subTitle'));
     }
 
 

app/Http/Controllers/Category/DeleteController.php

@@ -75,7 +75,7 @@ class DeleteController extends Controller
         // put previous url in session
         $this->rememberPreviousUri('categories.delete.uri');
 
-        return view('categories.delete', compact('category', 'subTitle'));
+        return prefixView('categories.delete', compact('category', 'subTitle'));
     }
 
     /**

app/Http/Controllers/Category/EditController.php

@@ -88,7 +88,7 @@ class EditController extends Controller
             'notes' => $request->old('notes') ?? $this->repository->getNoteText($category),
         ];
 
-        return view('categories.edit', compact('category', 'subTitle', 'preFilled'));
+        return prefixView('categories.edit', compact('category', 'subTitle', 'preFilled'));
     }
 
     /**

app/Http/Controllers/Category/IndexController.php

@@ -87,7 +87,7 @@ class IndexController extends Controller
         $categories = new LengthAwarePaginator($collection, $total, $pageSize, $page);
         $categories->setPath(route('categories.index'));
 
-        return view('categories.index', compact('categories'));
+        return prefixView('categories.index', compact('categories'));
     }
 
 }

app/Http/Controllers/Category/NoCategoryController.php

@@ -103,7 +103,7 @@ class NoCategoryController extends Controller
         $groups = $collector->getPaginatedGroups();
         $groups->setPath(route('categories.no-category'));
 
-        return view('categories.no-category', compact('groups', 'subTitle', 'periods', 'start', 'end'));
+        return prefixView('categories.no-category', compact('groups', 'subTitle', 'periods', 'start', 'end'));
     }
 
 
@@ -138,6 +138,6 @@ class NoCategoryController extends Controller
         $groups = $collector->getPaginatedGroups();
         $groups->setPath(route('categories.no-category.all'));
 
-        return view('categories.no-category', compact('groups', 'subTitle', 'periods', 'start', 'end'));
+        return prefixView('categories.no-category', compact('groups', 'subTitle', 'periods', 'start', 'end'));
     }
 }

app/Http/Controllers/Category/ShowController.php

@@ -105,7 +105,7 @@ class ShowController extends Controller
         $groups = $collector->getPaginatedGroups();
         $groups->setPath($path);
 
-        return view('categories.show', compact('category','attachments', 'groups', 'periods', 'subTitle', 'subTitleIcon', 'start', 'end'));
+        return prefixView('categories.show', compact('category','attachments', 'groups', 'periods', 'subTitle', 'subTitleIcon', 'start', 'end'));
     }
 
     /**
@@ -143,6 +143,6 @@ class ShowController extends Controller
         $groups = $collector->getPaginatedGroups();
         $groups->setPath($path);
 
-        return view('categories.show', compact('category','attachments', 'groups', 'periods', 'subTitle', 'subTitleIcon', 'start', 'end'));
+        return prefixView('categories.show', compact('category','attachments', 'groups', 'periods', 'subTitle', 'subTitleIcon', 'start', 'end'));
     }
 }

app/Http/Controllers/CurrencyController.php

@@ -97,7 +97,7 @@ class CurrencyController extends Controller
 
         Log::channel('audit')->info('Create new currency.');
 
-        return view('currencies.create', compact('subTitleIcon', 'subTitle'));
+        return prefixView('currencies.create', compact('subTitleIcon', 'subTitle'));
     }
 
     /**
@@ -156,7 +156,7 @@ class CurrencyController extends Controller
         $subTitle = (string) trans('form.delete_currency', ['name' => $currency->name]);
         Log::channel('audit')->info(sprintf('Visit page to delete currency %s.', $currency->code));
 
-        return view('currencies.delete', compact('currency', 'subTitle'));
+        return prefixView('currencies.delete', compact('currency', 'subTitle'));
     }
 
     /**
@@ -299,7 +299,7 @@ class CurrencyController extends Controller
         }
         $request->session()->forget('currencies.edit.fromUpdate');
 
-        return view('currencies.edit', compact('currency', 'subTitle', 'subTitleIcon'));
+        return prefixView('currencies.edit', compact('currency', 'subTitle', 'subTitleIcon'));
     }
 
     /**
@@ -344,7 +344,7 @@ class CurrencyController extends Controller
             $isOwner = false;
         }
 
-        return view('currencies.index', compact('currencies', 'defaultCurrency', 'isOwner'));
+        return prefixView('currencies.index', compact('currencies', 'defaultCurrency', 'isOwner'));
     }
 
 

app/Http/Controllers/DebugController.php

@@ -189,7 +189,7 @@ class DebugController extends Controller
             $logContent = 'Truncated from this point <----|' . substr($logContent, -8192);
         }
 
-        return view(
+        return prefixView(
             'debug',
             compact(
                 'phpVersion',

app/Http/Controllers/Export/IndexController.php

@@ -111,7 +111,7 @@ class IndexController extends Controller
      */
     public function index()
     {
-        return view('export.index');
+        return prefixView('export.index');
     }
 
 }

app/Http/Controllers/Json/FrontpageController.php

@@ -66,7 +66,7 @@ class FrontpageController extends Controller
         $html = '';
         if (!empty($info)) {
             try {
-                $html = view('json.piggy-banks', compact('info'))->render();
+                $html = prefixView('json.piggy-banks', compact('info'))->render();
                 // @codeCoverageIgnoreStart
             } catch (Throwable $e) {
                 Log::error(sprintf('Cannot render json.piggy-banks: %s', $e->getMessage()));

app/Http/Controllers/Json/ReconcileController.php

@@ -138,7 +138,7 @@ class ReconcileController extends Controller
         $reconSum = bcadd(bcadd($startBalance, $amount), $clearedAmount);
 
         try {
-            $view = view(
+            $view = prefixView(
                 'accounts.reconcile.overview',
                 compact(
                     'account',
@@ -212,7 +212,7 @@ class ReconcileController extends Controller
         $journals = $this->processTransactions($account, $array);
 
         try {
-            $html = view(
+            $html = prefixView(
                 'accounts.reconcile.transactions',
                 compact('account', 'journals', 'currency', 'start', 'end', 'selectionStart', 'selectionEnd')
             )->render();

app/Http/Controllers/Json/RuleController.php

@@ -51,7 +51,7 @@ class RuleController extends Controller
             $actions[$key] = (string) trans('firefly.rule_action_' . $key . '_choice');
         }
         try {
-            $view = view('rules.partials.action', compact('actions', 'count'))->render();
+            $view = prefixView('rules.partials.action', compact('actions', 'count'))->render();
             // @codeCoverageIgnoreStart
         } catch (Throwable $e) {
             Log::error(sprintf('Cannot render rules.partials.action: %s', $e->getMessage()));
@@ -84,7 +84,7 @@ class RuleController extends Controller
         asort($triggers);
 
         try {
-            $view = view('rules.partials.trigger', compact('triggers', 'count'))->render();
+            $view = prefixView('rules.partials.trigger', compact('triggers', 'count'))->render();
         } catch (Throwable $e) {
             Log::error(sprintf('Cannot render rules.partials.trigger: %s', $e->getMessage()));
             $view = 'Could not render view.';

app/Http/Controllers/NewUserController.php

@@ -74,7 +74,7 @@ class NewUserController extends Controller
             return redirect(route('index'));
         }
 
-        return view('new-user.index', compact('languages'));
+        return prefixView('new-user.index', compact('languages'));
     }
 
     /**

app/Http/Controllers/ObjectGroup/DeleteController.php

@@ -71,7 +71,7 @@ class DeleteController extends Controller
         // put previous url in session
         $this->rememberPreviousUri('object-groups.delete.uri');
 
-        return view('object-groups.delete', compact('objectGroup', 'subTitle', 'piggyBanks'));
+        return prefixView('object-groups.delete', compact('objectGroup', 'subTitle', 'piggyBanks'));
     }
 
     /**

app/Http/Controllers/ObjectGroup/EditController.php

@@ -73,7 +73,7 @@ class EditController extends Controller
         }
         session()->forget('object-groups.edit.fromUpdate');
 
-        return view('object-groups.edit', compact('subTitle', 'subTitleIcon', 'objectGroup'));
+        return prefixView('object-groups.edit', compact('subTitle', 'subTitleIcon', 'objectGroup'));
     }
 
 

app/Http/Controllers/ObjectGroup/IndexController.php

@@ -69,7 +69,7 @@ class IndexController extends Controller
         $subTitle     = (string) trans('firefly.object_groups_index');
         $objectGroups = $this->repository->get();
 
-        return view('object-groups.index', compact('subTitle', 'objectGroups'));
+        return prefixView('object-groups.index', compact('subTitle', 'objectGroups'));
     }
 
     /**

app/Http/Controllers/PiggyBank/AmountController.php

@@ -82,7 +82,7 @@ class AmountController extends Controller
         $maxAmount     = min($leftOnAccount, $leftToSave);
         $currency      = $this->accountRepos->getAccountCurrency($piggyBank->account) ?? app('amount')->getDefaultCurrency();
 
-        return view('piggy-banks.add', compact('piggyBank', 'maxAmount', 'currency'));
+        return prefixView('piggy-banks.add', compact('piggyBank', 'maxAmount', 'currency'));
     }
 
     /**
@@ -102,7 +102,7 @@ class AmountController extends Controller
         $maxAmount     = min($leftOnAccount, $leftToSave);
         $currency      = $this->accountRepos->getAccountCurrency($piggyBank->account) ?? app('amount')->getDefaultCurrency();
 
-        return view('piggy-banks.add-mobile', compact('piggyBank', 'maxAmount', 'currency'));
+        return prefixView('piggy-banks.add-mobile', compact('piggyBank', 'maxAmount', 'currency'));
     }
 
     /**
@@ -202,7 +202,7 @@ class AmountController extends Controller
         $repetition = $this->piggyRepos->getRepetition($piggyBank);
         $currency   = $this->accountRepos->getAccountCurrency($piggyBank->account) ?? app('amount')->getDefaultCurrency();
 
-        return view('piggy-banks.remove', compact('piggyBank', 'repetition', 'currency'));
+        return prefixView('piggy-banks.remove', compact('piggyBank', 'repetition', 'currency'));
     }
 
     /**
@@ -217,6 +217,6 @@ class AmountController extends Controller
         $repetition = $this->piggyRepos->getRepetition($piggyBank);
         $currency   = $this->accountRepos->getAccountCurrency($piggyBank->account) ?? app('amount')->getDefaultCurrency();
 
-        return view('piggy-banks.remove-mobile', compact('piggyBank', 'repetition', 'currency'));
+        return prefixView('piggy-banks.remove-mobile', compact('piggyBank', 'repetition', 'currency'));
     }
 }

app/Http/Controllers/PiggyBank/CreateController.php

@@ -80,7 +80,7 @@ class CreateController extends Controller
         }
         session()->forget('piggy-banks.create.fromStore');
 
-        return view('piggy-banks.create', compact('subTitle', 'subTitleIcon'));
+        return prefixView('piggy-banks.create', compact('subTitle', 'subTitleIcon'));
     }
 
 

app/Http/Controllers/PiggyBank/DeleteController.php

@@ -75,7 +75,7 @@ class DeleteController extends Controller
         // put previous url in session
         $this->rememberPreviousUri('piggy-banks.delete.uri');
 
-        return view('piggy-banks.delete', compact('piggyBank', 'subTitle'));
+        return prefixView('piggy-banks.delete', compact('piggyBank', 'subTitle'));
     }
 
     /**

app/Http/Controllers/PiggyBank/EditController.php

@@ -103,7 +103,7 @@ class EditController extends Controller
         }
         session()->forget('piggy-banks.edit.fromUpdate');
 
-        return view('piggy-banks.edit', compact('subTitle', 'subTitleIcon', 'piggyBank', 'preFilled'));
+        return prefixView('piggy-banks.edit', compact('subTitle', 'subTitleIcon', 'piggyBank', 'preFilled'));
     }
 
 

app/Http/Controllers/PiggyBank/IndexController.php

@@ -136,7 +136,7 @@ class IndexController extends Controller
 
         ksort($piggyBanks);
 
-        return view('piggy-banks.index', compact('piggyBanks', 'accounts'));
+        return prefixView('piggy-banks.index', compact('piggyBanks', 'accounts'));
     }
 
     /**

app/Http/Controllers/PiggyBank/ShowController.php

@@ -85,6 +85,6 @@ class ShowController extends Controller
         $subTitle    = $piggyBank->name;
         $attachments = $this->piggyRepos->getAttachments($piggyBank);
 
-        return view('piggy-banks.show', compact('piggyBank', 'events', 'subTitle', 'piggy', 'attachments'));
+        return prefixView('piggy-banks.show', compact('piggyBank', 'events', 'subTitle', 'piggy', 'attachments'));
     }
 }

app/Http/Controllers/PreferencesController.php

@@ -118,7 +118,7 @@ class PreferencesController extends Controller
             $frontPageAccounts = $accountIds;
         }
 
-        return view(
+        return prefixView(
             'preferences.index',
             compact(
                 'language',

app/Http/Controllers/ProfileController.php

@@ -98,7 +98,7 @@ class ProfileController extends Controller
             session()->flash('info', (string) trans('firefly.external_auth_disabled'));
             return redirect(route('profile.index'));
         }
-        return view('profile.logout-other-sessions');
+        return prefixView('profile.logout-other-sessions');
     }
 
     /**
@@ -148,7 +148,7 @@ class ProfileController extends Controller
         $subTitle     = (string) trans('firefly.change_your_email');
         $subTitleIcon = 'fa-envelope';
 
-        return view('profile.change-email', compact('title', 'subTitle', 'subTitleIcon', 'email'));
+        return prefixView('profile.change-email', compact('title', 'subTitle', 'subTitleIcon', 'email'));
     }
 
     /**
@@ -170,7 +170,7 @@ class ProfileController extends Controller
         $subTitle     = (string) trans('firefly.change_your_password');
         $subTitleIcon = 'fa-key';
 
-        return view('profile.change-password', compact('title', 'subTitle', 'subTitleIcon'));
+        return prefixView('profile.change-password', compact('title', 'subTitle', 'subTitleIcon'));
     }
 
     /**
@@ -223,7 +223,7 @@ class ProfileController extends Controller
 
         $image = Google2FA::getQRCodeInline($domain, auth()->user()->email, $secret);
 
-        return view('profile.code', compact('image', 'secret', 'codes'));
+        return prefixView('profile.code', compact('image', 'secret', 'codes'));
     }
 
     /**
@@ -283,7 +283,7 @@ class ProfileController extends Controller
         $subTitle     = (string) trans('firefly.delete_account');
         $subTitleIcon = 'fa-trash';
 
-        return view('profile.delete-account', compact('title', 'subTitle', 'subTitleIcon'));
+        return prefixView('profile.delete-account', compact('title', 'subTitle', 'subTitleIcon'));
     }
 
     /**
@@ -370,7 +370,7 @@ class ProfileController extends Controller
             $accessToken = app('preferences')->set('access_token', $token);
         }
 
-        return view('profile.index', compact('subTitle', 'mfaBackupCount', 'userId', 'accessToken', 'enabled2FA', 'isInternalAuth','isInternalIdentity'));
+        return prefixView('profile.index', compact('subTitle', 'mfaBackupCount', 'userId', 'accessToken', 'enabled2FA', 'isInternalAuth','isInternalIdentity'));
     }
 
     /**
@@ -396,7 +396,7 @@ class ProfileController extends Controller
         app('preferences')->set('mfa_recovery', $recoveryCodes);
         app('preferences')->mark();
 
-        return view('profile.new-backup-codes', compact('codes'));
+        return prefixView('profile.new-backup-codes', compact('codes'));
     }
 
     /**

app/Http/Controllers/Recurring/CreateController.php

@@ -158,7 +158,7 @@ class CreateController extends Controller
 
         $request->session()->flash('preFilled', $preFilled);
 
-        return view(
+        return prefixView(
             'recurring.create',
             compact('tomorrow', 'oldRepetitionType', 'weekendResponses', 'preFilled', 'repetitionEnds', 'defaultCurrency', 'budgets')
         );
@@ -206,7 +206,7 @@ class CreateController extends Controller
         ];
         $request->session()->flash('preFilled', $preFilled);
 
-        return view(
+        return prefixView(
             'recurring.create',
             compact('tomorrow', 'oldRepetitionType', 'weekendResponses', 'preFilled', 'repetitionEnds', 'defaultCurrency', 'budgets')
         );

app/Http/Controllers/Recurring/DeleteController.php

@@ -78,7 +78,7 @@ class DeleteController extends Controller
 
         $journalsCreated = $this->recurring->getTransactions($recurrence)->count();
 
-        return view('recurring.delete', compact('recurrence', 'subTitle', 'journalsCreated'));
+        return prefixView('recurring.delete', compact('recurrence', 'subTitle', 'journalsCreated'));
     }
 
     /**

app/Http/Controllers/Recurring/EditController.php

@@ -137,7 +137,7 @@ class EditController extends Controller
 
         $array['transactions'][0]['tags'] = implode(',', $array['transactions'][0]['tags'] ?? []);
 
-        return view(
+        return prefixView(
             'recurring.edit',
             compact('recurrence', 'array', 'weekendResponses', 'budgets', 'preFilled', 'currentRepType', 'repetitionEnd', 'repetitionEnds')
         );

app/Http/Controllers/Recurring/IndexController.php

@@ -125,7 +125,7 @@ class IndexController extends Controller
 
         $this->verifyRecurringCronJob();
 
-        return view('recurring.index', compact('paginator', 'today', 'page', 'pageSize', 'total'));
+        return prefixView('recurring.index', compact('paginator', 'today', 'page', 'pageSize', 'total'));
     }
 
 }

app/Http/Controllers/Recurring/ShowController.php

@@ -96,6 +96,6 @@ class ShowController extends Controller
 
         $subTitle = (string) trans('firefly.overview_for_recurrence', ['title' => $recurrence->title]);
 
-        return view('recurring.show', compact('recurrence', 'subTitle', 'array', 'groups','today'));
+        return prefixView('recurring.show', compact('recurrence', 'subTitle', 'array', 'groups','today'));
     }
 }

app/Http/Controllers/Report/AccountController.php

@@ -62,7 +62,7 @@ class AccountController extends Controller
         $accountTasker = app(AccountTaskerInterface::class);
         $accountReport = $accountTasker->getAccountReport($accounts, $start, $end);
         try {
-            $result = view('reports.partials.accounts', compact('accountReport'))->render();
+            $result = prefixView('reports.partials.accounts', compact('accountReport'))->render();
             // @codeCoverageIgnoreStart
         } catch (Throwable $e) {
             Log::debug(sprintf('Could not render reports.partials.accounts: %s', $e->getMessage()));

app/Http/Controllers/Report/BalanceController.php

@@ -139,7 +139,7 @@ class BalanceController extends Controller
 
 
         try {
-            $result = view('reports.partials.balance', compact('report'))->render();
+            $result = prefixView('reports.partials.balance', compact('report'))->render();
             // @codeCoverageIgnoreStart
         } catch (Throwable $e) {
             Log::debug(sprintf('Could not render reports.partials.balance: %s', $e->getMessage()));

app/Http/Controllers/Report/BillController.php

@@ -60,7 +60,7 @@ class BillController extends Controller
 
 
         try {
-            $result = view('reports.partials.bills', compact('report'))->render();
+            $result = prefixView('reports.partials.bills', compact('report'))->render();
             // @codeCoverageIgnoreStart
         } catch (Throwable $e) {
             Log::debug(sprintf('Could not render reports.partials.budgets: %s', $e->getMessage()));

app/Http/Controllers/Report/BudgetController.php

@@ -95,7 +95,7 @@ class BudgetController extends Controller
         $generator->accountPerBudget();
         $report = $generator->getReport();
 
-        return view('reports.budget.partials.account-per-budget', compact('report', 'budgets'));
+        return prefixView('reports.budget.partials.account-per-budget', compact('report', 'budgets'));
     }
 
     /**
@@ -151,7 +151,7 @@ class BudgetController extends Controller
             }
         }
 
-        return view('reports.budget.partials.accounts', compact('sums', 'report'));
+        return prefixView('reports.budget.partials.accounts', compact('sums', 'report'));
     }
 
     /**
@@ -196,7 +196,7 @@ class BudgetController extends Controller
         array_multisort($amounts, SORT_ASC, $result);
 
         try {
-            $result = view('reports.budget.partials.avg-expenses', compact('result'))->render();
+            $result = prefixView('reports.budget.partials.avg-expenses', compact('result'))->render();
             // @codeCoverageIgnoreStart
         } catch (Throwable $e) {
             Log::debug(sprintf('Could not render reports.partials.budget-period: %s', $e->getMessage()));
@@ -271,7 +271,7 @@ class BudgetController extends Controller
             }
         }
 
-        return view('reports.budget.partials.budgets', compact('sums', 'report'));
+        return prefixView('reports.budget.partials.budgets', compact('sums', 'report'));
     }
 
     /**
@@ -296,7 +296,7 @@ class BudgetController extends Controller
         $generator->general();
         $report = $generator->getReport();
 
-        return view('reports.partials.budgets', compact('report'))->render();
+        return prefixView('reports.partials.budgets', compact('report'))->render();
     }
 
     /**
@@ -353,7 +353,7 @@ class BudgetController extends Controller
             }
         }
         try {
-            $result = view('reports.partials.budget-period', compact('report', 'periods'))->render();
+            $result = prefixView('reports.partials.budget-period', compact('report', 'periods'))->render();
             // @codeCoverageIgnoreStart
         } catch (Throwable $e) {
             Log::debug(sprintf('Could not render reports.partials.budget-period: %s', $e->getMessage()));
@@ -405,7 +405,7 @@ class BudgetController extends Controller
         array_multisort($amounts, SORT_ASC, $result);
 
         try {
-            $result = view('reports.budget.partials.top-expenses', compact('result'))->render();
+            $result = prefixView('reports.budget.partials.top-expenses', compact('result'))->render();
             // @codeCoverageIgnoreStart
         } catch (Throwable $e) {
             Log::debug(sprintf('Could not render reports.partials.budget-period: %s', $e->getMessage()));

app/Http/Controllers/Report/CategoryController.php

@@ -165,7 +165,7 @@ class CategoryController extends Controller
             }
         }
 
-        return view('reports.category.partials.account-per-category', compact('report', 'categories'));
+        return prefixView('reports.category.partials.account-per-category', compact('report', 'categories'));
     }
 
     /**
@@ -269,7 +269,7 @@ class CategoryController extends Controller
             }
         }
 
-        return view('reports.category.partials.accounts', compact('sums', 'report'));
+        return prefixView('reports.category.partials.accounts', compact('sums', 'report'));
     }
 
     /**
@@ -314,7 +314,7 @@ class CategoryController extends Controller
         array_multisort($amounts, SORT_ASC, $result);
 
         try {
-            $result = view('reports.category.partials.avg-expenses', compact('result'))->render();
+            $result = prefixView('reports.category.partials.avg-expenses', compact('result'))->render();
             // @codeCoverageIgnoreStart
         } catch (Throwable $e) {
             Log::debug(sprintf('Could not render reports.partials.budget-period: %s', $e->getMessage()));
@@ -366,7 +366,7 @@ class CategoryController extends Controller
         array_multisort($amounts, SORT_DESC, $result);
 
         try {
-            $result = view('reports.category.partials.avg-income', compact('result'))->render();
+            $result = prefixView('reports.category.partials.avg-income', compact('result'))->render();
             // @codeCoverageIgnoreStart
         } catch (Throwable $e) {
             Log::debug(sprintf('Could not render reports.partials.budget-period: %s', $e->getMessage()));
@@ -481,7 +481,7 @@ class CategoryController extends Controller
             }
         }
 
-        return view('reports.category.partials.categories', compact('sums', 'report'));
+        return prefixView('reports.category.partials.categories', compact('sums', 'report'));
     }
 
     /**
@@ -550,7 +550,7 @@ class CategoryController extends Controller
         $report = $data;
 
         try {
-            $result = view('reports.partials.category-period', compact('report', 'periods'))->render();
+            $result = prefixView('reports.partials.category-period', compact('report', 'periods'))->render();
             // @codeCoverageIgnoreStart
         } catch (Throwable $e) {
             Log::error(sprintf('Could not render category::expenses: %s', $e->getMessage()));
@@ -629,7 +629,7 @@ class CategoryController extends Controller
         $report = $data;
 
         try {
-            $result = view('reports.partials.category-period', compact('report', 'periods'))->render();
+            $result = prefixView('reports.partials.category-period', compact('report', 'periods'))->render();
             // @codeCoverageIgnoreStart
         } catch (Throwable $e) {
             Log::error(sprintf('Could not render category::expenses: %s', $e->getMessage()));
@@ -674,7 +674,7 @@ class CategoryController extends Controller
 
         // @codeCoverageIgnoreStart
         try {
-            $result = view('reports.partials.categories', compact('report'))->render();
+            $result = prefixView('reports.partials.categories', compact('report'))->render();
             $cache->store($result);
         } catch (Throwable $e) {
             Log::error(sprintf('Could not render category::expenses: %s', $e->getMessage()));
@@ -726,7 +726,7 @@ class CategoryController extends Controller
         array_multisort($amounts, SORT_ASC, $result);
 
         try {
-            $result = view('reports.category.partials.top-expenses', compact('result'))->render();
+            $result = prefixView('reports.category.partials.top-expenses', compact('result'))->render();
             // @codeCoverageIgnoreStart
         } catch (Throwable $e) {
             Log::debug(sprintf('Could not render reports.partials.budget-period: %s', $e->getMessage()));
@@ -776,7 +776,7 @@ class CategoryController extends Controller
         array_multisort($amounts, SORT_DESC, $result);
 
         try {
-            $result = view('reports.category.partials.top-income', compact('result'))->render();
+            $result = prefixView('reports.category.partials.top-income', compact('result'))->render();
             // @codeCoverageIgnoreStart
         } catch (Throwable $e) {
             Log::debug(sprintf('Could not render reports.partials.budget-period: %s', $e->getMessage()));

app/Http/Controllers/Report/DoubleController.php

@@ -110,7 +110,7 @@ class DoubleController extends Controller
         array_multisort($amounts, SORT_ASC, $result);
 
         try {
-            $result = view('reports.double.partials.avg-expenses', compact('result'))->render();
+            $result = prefixView('reports.double.partials.avg-expenses', compact('result'))->render();
             // @codeCoverageIgnoreStart
         } catch (Throwable $e) {
             Log::debug(sprintf('Could not render reports.partials.budget-period: %s', $e->getMessage()));
@@ -162,7 +162,7 @@ class DoubleController extends Controller
         array_multisort($amounts, SORT_DESC, $result);
 
         try {
-            $result = view('reports.double.partials.avg-income', compact('result'))->render();
+            $result = prefixView('reports.double.partials.avg-income', compact('result'))->render();
             // @codeCoverageIgnoreStart
         } catch (Throwable $e) {
             Log::debug(sprintf('Could not render reports.partials.budget-period: %s', $e->getMessage()));
@@ -288,7 +288,7 @@ class DoubleController extends Controller
             }
         }
 
-        return view('reports.double.partials.accounts', compact('sums', 'report'));
+        return prefixView('reports.double.partials.accounts', compact('sums', 'report'));
     }
 
     /**
@@ -388,7 +388,7 @@ class DoubleController extends Controller
             }
         }
 
-        return view('reports.double.partials.accounts-per-asset', compact('sums', 'report'));
+        return prefixView('reports.double.partials.accounts-per-asset', compact('sums', 'report'));
     }
 
     /**
@@ -431,7 +431,7 @@ class DoubleController extends Controller
         array_multisort($amounts, SORT_ASC, $result);
 
         try {
-            $result = view('reports.double.partials.top-expenses', compact('result'))->render();
+            $result = prefixView('reports.double.partials.top-expenses', compact('result'))->render();
             // @codeCoverageIgnoreStart
         } catch (Throwable $e) {
             Log::debug(sprintf('Could not render reports.partials.budget-period: %s', $e->getMessage()));
@@ -481,7 +481,7 @@ class DoubleController extends Controller
         array_multisort($amounts, SORT_DESC, $result);
 
         try {
-            $result = view('reports.double.partials.top-income', compact('result'))->render();
+            $result = prefixView('reports.double.partials.top-income', compact('result'))->render();
             // @codeCoverageIgnoreStart
         } catch (Throwable $e) {
             Log::debug(sprintf('Could not render reports.partials.budget-period: %s', $e->getMessage()));

app/Http/Controllers/Report/OperationsController.php

@@ -82,7 +82,7 @@ class OperationsController extends Controller
         $report = $this->tasker->getExpenseReport($start, $end, $accounts);
         $type   = 'expense-entry';
         try {
-            $result = view('reports.partials.income-expenses', compact('report', 'type'))->render();
+            $result = prefixView('reports.partials.income-expenses', compact('report', 'type'))->render();
             // @codeCoverageIgnoreStart
         } catch (Throwable $e) {
             Log::debug(sprintf('Could not render reports.partials.income-expense: %s', $e->getMessage()));
@@ -117,7 +117,7 @@ class OperationsController extends Controller
         $report = $this->tasker->getIncomeReport($start, $end, $accounts);
         $type   = 'income-entry';
         try {
-            $result = view('reports.partials.income-expenses', compact('report', 'type'))->render();
+            $result = prefixView('reports.partials.income-expenses', compact('report', 'type'))->render();
             // @codeCoverageIgnoreStart
         } catch (Throwable $e) {
             Log::debug(sprintf('Could not render reports.partials.income-expenses: %s', $e->getMessage()));
@@ -172,7 +172,7 @@ class OperationsController extends Controller
         }
 
         try {
-            $result = view('reports.partials.operations', compact('sums'))->render();
+            $result = prefixView('reports.partials.operations', compact('sums'))->render();
         } catch (Throwable $e) {
             Log::debug(sprintf('Could not render reports.partials.operations: %s', $e->getMessage()));
             $result = 'Could not render view.';

app/Http/Controllers/Report/TagController.php

@@ -159,7 +159,7 @@ class TagController extends Controller
             }
         }
 
-        return view('reports.tag.partials.account-per-tag', compact('report', 'tags'));
+        return prefixView('reports.tag.partials.account-per-tag', compact('report', 'tags'));
     }
 
     /**
@@ -263,7 +263,7 @@ class TagController extends Controller
             }
         }
 
-        return view('reports.tag.partials.accounts', compact('sums', 'report'));
+        return prefixView('reports.tag.partials.accounts', compact('sums', 'report'));
     }
 
     /**
@@ -308,7 +308,7 @@ class TagController extends Controller
         array_multisort($amounts, SORT_ASC, $result);
 
         try {
-            $result = view('reports.tag.partials.avg-expenses', compact('result'))->render();
+            $result = prefixView('reports.tag.partials.avg-expenses', compact('result'))->render();
             // @codeCoverageIgnoreStart
         } catch (Throwable $e) {
             Log::debug(sprintf('Could not render reports.partials.budget-period: %s', $e->getMessage()));
@@ -360,7 +360,7 @@ class TagController extends Controller
         array_multisort($amounts, SORT_DESC, $result);
 
         try {
-            $result = view('reports.tag.partials.avg-income', compact('result'))->render();
+            $result = prefixView('reports.tag.partials.avg-income', compact('result'))->render();
             // @codeCoverageIgnoreStart
         } catch (Throwable $e) {
             Log::debug(sprintf('Could not render reports.partials.budget-period: %s', $e->getMessage()));
@@ -475,7 +475,7 @@ class TagController extends Controller
             }
         }
 
-        return view('reports.tag.partials.tags', compact('sums', 'report'));
+        return prefixView('reports.tag.partials.tags', compact('sums', 'report'));
     }
 
     /**
@@ -518,7 +518,7 @@ class TagController extends Controller
         array_multisort($amounts, SORT_ASC, $result);
 
         try {
-            $result = view('reports.tag.partials.top-expenses', compact('result'))->render();
+            $result = prefixView('reports.tag.partials.top-expenses', compact('result'))->render();
             // @codeCoverageIgnoreStart
         } catch (Throwable $e) {
             Log::debug(sprintf('Could not render reports.partials.budget-period: %s', $e->getMessage()));
@@ -568,7 +568,7 @@ class TagController extends Controller
         array_multisort($amounts, SORT_DESC, $result);
 
         try {
-            $result = view('reports.tag.partials.top-income', compact('result'))->render();
+            $result = prefixView('reports.tag.partials.top-income', compact('result'))->render();
             // @codeCoverageIgnoreStart
         } catch (Throwable $e) {
             Log::debug(sprintf('Could not render reports.partials.budget-period: %s', $e->getMessage()));

app/Http/Controllers/ReportController.php

@@ -88,7 +88,7 @@ class ReportController extends Controller
     public function auditReport(Collection $accounts, Carbon $start, Carbon $end)
     {
         if ($end < $start) {
-            return view('error')->with('message', (string) trans('firefly.end_after_start_date')); // @codeCoverageIgnore
+            return prefixView('error')->with('message', (string) trans('firefly.end_after_start_date')); // @codeCoverageIgnore
         }
         $this->repository->cleanupBudgets();
 
@@ -124,7 +124,7 @@ class ReportController extends Controller
     public function budgetReport(Collection $accounts, Collection $budgets, Carbon $start, Carbon $end)
     {
         if ($end < $start) {
-            return view('error')->with('message', (string) trans('firefly.end_after_start_date')); // @codeCoverageIgnore
+            return prefixView('error')->with('message', (string) trans('firefly.end_after_start_date')); // @codeCoverageIgnore
         }
         $this->repository->cleanupBudgets();
 
@@ -161,7 +161,7 @@ class ReportController extends Controller
     public function categoryReport(Collection $accounts, Collection $categories, Carbon $start, Carbon $end)
     {
         if ($end < $start) {
-            return view('error')->with('message', (string) trans('firefly.end_after_start_date')); // @codeCoverageIgnore
+            return prefixView('error')->with('message', (string) trans('firefly.end_after_start_date')); // @codeCoverageIgnore
         }
         $this->repository->cleanupBudgets();
 
@@ -197,7 +197,7 @@ class ReportController extends Controller
     public function defaultReport(Collection $accounts, Carbon $start, Carbon $end)
     {
         if ($end < $start) {
-            return view('error')->with('message', (string) trans('firefly.end_after_start_date'));
+            return prefixView('error')->with('message', (string) trans('firefly.end_after_start_date'));
         }
 
         $this->repository->cleanupBudgets();
@@ -291,7 +291,7 @@ class ReportController extends Controller
         $accountList = implode(',', $accounts->pluck('id')->toArray());
         $this->repository->cleanupBudgets();
 
-        return view('reports.index', compact('months', 'accounts', 'start', 'accountList', 'groupedAccounts', 'customFiscalYear'));
+        return prefixView('reports.index', compact('months', 'accounts', 'start', 'accountList', 'groupedAccounts', 'customFiscalYear'));
     }
 
     /**
@@ -379,7 +379,7 @@ class ReportController extends Controller
         }
 
         if ($request->getEndDate() < $request->getStartDate()) {
-            return view('error')->with('message', (string) trans('firefly.end_after_start_date'));
+            return prefixView('error')->with('message', (string) trans('firefly.end_after_start_date'));
         }
 
         switch ($reportType) {
@@ -422,7 +422,7 @@ class ReportController extends Controller
     public function tagReport(Collection $accounts, Collection $tags, Carbon $start, Carbon $end)
     {
         if ($end < $start) {
-            return view('error')->with('message', (string) trans('firefly.end_after_start_date')); // @codeCoverageIgnore
+            return prefixView('error')->with('message', (string) trans('firefly.end_after_start_date')); // @codeCoverageIgnore
         }
         $this->repository->cleanupBudgets();
 

app/Http/Controllers/Rule/CreateController.php

@@ -126,7 +126,7 @@ class CreateController extends Controller
         }
         session()->forget('rules.create.fromStore');
 
-        return view(
+        return prefixView(
             'rules.rule.create',
             compact('subTitleIcon', 'oldTriggers', 'preFilled', 'oldActions', 'triggerCount', 'actionCount', 'ruleGroup', 'subTitle')
         );
@@ -180,7 +180,7 @@ class CreateController extends Controller
         }
         session()->forget('rules.create.fromStore');
 
-        return view(
+        return prefixView(
             'rules.rule.create',
             compact('subTitleIcon', 'oldTriggers', 'preFilled', 'oldActions', 'triggerCount', 'actionCount', 'subTitle')
         );
@@ -229,7 +229,7 @@ class CreateController extends Controller
         }
         session()->forget('rules.create.fromStore');
 
-        return view(
+        return prefixView(
             'rules.rule.create',
             compact('subTitleIcon', 'oldTriggers', 'preFilled', 'oldActions', 'triggerCount', 'actionCount', 'subTitle')
         );

app/Http/Controllers/Rule/DeleteController.php

@@ -74,7 +74,7 @@ class DeleteController extends Controller
         // put previous url in session
         $this->rememberPreviousUri('rules.delete.uri');
 
-        return view('rules.rule.delete', compact('rule', 'subTitle'));
+        return prefixView('rules.rule.delete', compact('rule', 'subTitle'));
     }
 
     /**

app/Http/Controllers/Rule/EditController.php

@@ -136,7 +136,7 @@ class EditController extends Controller
 
         $request->session()->flash('preFilled', $preFilled);
 
-        return view('rules.rule.edit', compact('rule', 'subTitle', 'primaryTrigger', 'oldTriggers', 'oldActions', 'triggerCount', 'actionCount'));
+        return prefixView('rules.rule.edit', compact('rule', 'subTitle', 'primaryTrigger', 'oldTriggers', 'oldActions', 'triggerCount', 'actionCount'));
     }
 
     /**
@@ -187,7 +187,7 @@ class EditController extends Controller
         $index = 0;
         foreach ($submittedOperators as $operator) {
             try {
-                $renderedEntries[] = view(
+                $renderedEntries[] = prefixView(
                     'rules.partials.trigger',
                     [
                         'oldTrigger' => OperatorQuerySearch::getRootOperator($operator['type']),

app/Http/Controllers/Rule/IndexController.php

@@ -79,7 +79,7 @@ class IndexController extends Controller
         $this->ruleGroupRepos->resetRuleGroupOrder();
         $ruleGroups = $this->ruleGroupRepos->getRuleGroupsWithRules($user);
 
-        return view('rules.index', compact('ruleGroups'));
+        return prefixView('rules.index', compact('ruleGroups'));
     }
 
     /**

app/Http/Controllers/Rule/SelectController.php

@@ -123,7 +123,7 @@ class SelectController extends Controller
         $today    = Carbon::now()->format('Y-m-d');
         $subTitle = (string) trans('firefly.apply_rule_selection', ['title' => $rule->title]);
 
-        return view('rules.rule.select-transactions', compact('first', 'today', 'rule', 'subTitle'));
+        return prefixView('rules.rule.select-transactions', compact('first', 'today', 'rule', 'subTitle'));
     }
 
     /**
@@ -176,7 +176,7 @@ class SelectController extends Controller
         // Return json response
         $view = 'ERROR, see logs.';
         try {
-            $view = view('list.journals-array-tiny', ['groups' => $collection])->render();
+            $view = prefixView('list.journals-array-tiny', ['groups' => $collection])->render();
             // @codeCoverageIgnoreStart
         } catch (Throwable $exception) {
             Log::error(sprintf('Could not render view in testTriggers(): %s', $exception->getMessage()));
@@ -223,7 +223,7 @@ class SelectController extends Controller
         // Return json response
         $view = 'ERROR, see logs.';
         try {
-            $view = view('list.journals-array-tiny', ['groups' => $collection])->render();
+            $view = prefixView('list.journals-array-tiny', ['groups' => $collection])->render();
             // @codeCoverageIgnoreStart
         } catch (Throwable $exception) {
             Log::error(sprintf('Could not render view in testTriggersByRule(): %s', $exception->getMessage()));

app/Http/Controllers/RuleGroup/CreateController.php

@@ -77,7 +77,7 @@ class CreateController extends Controller
         }
         session()->forget('rule-groups.create.fromStore');
 
-        return view('rules.rule-group.create', compact('subTitleIcon', 'subTitle'));
+        return prefixView('rules.rule-group.create', compact('subTitleIcon', 'subTitle'));
     }
 
     /**

app/Http/Controllers/RuleGroup/DeleteController.php

@@ -77,7 +77,7 @@ class DeleteController extends Controller
         // put previous url in session
         $this->rememberPreviousUri('rule-groups.delete.uri');
 
-        return view('rules.rule-group.delete', compact('ruleGroup', 'subTitle'));
+        return prefixView('rules.rule-group.delete', compact('ruleGroup', 'subTitle'));
     }
 
     /**

app/Http/Controllers/RuleGroup/EditController.php

@@ -101,7 +101,7 @@ class EditController extends Controller
         session()->forget('rule-groups.edit.fromUpdate');
         session()->flash('preFilled', $preFilled);
 
-        return view('rules.rule-group.edit', compact('ruleGroup', 'subTitle'));
+        return prefixView('rules.rule-group.edit', compact('ruleGroup', 'subTitle'));
     }
 
     /**

app/Http/Controllers/RuleGroup/ExecutionController.php

@@ -115,7 +115,7 @@ class ExecutionController extends Controller
         $today    = Carbon::now()->format('Y-m-d');
         $subTitle = (string) trans('firefly.apply_rule_group_selection', ['title' => $ruleGroup->title]);
 
-        return view('rules.rule-group.select-transactions', compact('first', 'today', 'ruleGroup', 'subTitle'));
+        return prefixView('rules.rule-group.select-transactions', compact('first', 'today', 'ruleGroup', 'subTitle'));
     }
 
 

app/Http/Controllers/SearchController.php

@@ -88,7 +88,7 @@ class SearchController extends Controller
 
         $subTitle = (string) trans('breadcrumbs.search_result', ['query' => $fullQuery]);
 
-        return view('search.index', compact('query',  'operators', 'page', 'rule', 'fullQuery', 'subTitle', 'ruleId', 'ruleChanged'));
+        return prefixView('search.index', compact('query',  'operators', 'page', 'rule', 'fullQuery', 'subTitle', 'ruleId', 'ruleChanged'));
     }
 
     /**
@@ -115,7 +115,7 @@ class SearchController extends Controller
         $groups->setPath($url);
 
         try {
-            $html = view('search.search', compact('groups', 'hasPages', 'searchTime'))->render();
+            $html = prefixView('search.search', compact('groups', 'hasPages', 'searchTime'))->render();
             // @codeCoverageIgnoreStart
         } catch (Throwable $e) {
             Log::error(sprintf('Cannot render search.search: %s', $e->getMessage()));

app/Http/Controllers/System/InstallController.php

@@ -125,7 +125,7 @@ class InstallController extends Controller
         // set new DB version.
         app('fireflyconfig')->set('db_version', (int) config('firefly.db_version'));
 
-        return view('install.index');
+        return prefixView('install.index');
     }
 
     /**

app/Http/Controllers/TagController.php

@@ -94,7 +94,7 @@ class TagController extends Controller
         }
         session()->forget('tags.create.fromStore');
 
-        return view('tags.create', compact('subTitle', 'subTitleIcon', 'locations'));
+        return prefixView('tags.create', compact('subTitle', 'subTitleIcon', 'locations'));
     }
 
     /**
@@ -111,7 +111,7 @@ class TagController extends Controller
         // put previous url in session
         $this->rememberPreviousUri('tags.delete.uri');
 
-        return view('tags.delete', compact('tag', 'subTitle'));
+        return prefixView('tags.delete', compact('tag', 'subTitle'));
     }
 
     /**
@@ -164,7 +164,7 @@ class TagController extends Controller
         }
         session()->forget('tags.edit.fromUpdate');
 
-        return view('tags.edit', compact('tag', 'subTitle', 'subTitleIcon', 'locations'));
+        return prefixView('tags.edit', compact('tag', 'subTitle', 'subTitleIcon', 'locations'));
     }
 
     /**
@@ -192,7 +192,7 @@ class TagController extends Controller
         }
         $count = $repository->count();
 
-        return view('tags.index', compact('tags', 'count'));
+        return prefixView('tags.index', compact('tags', 'count'));
     }
 
     /**
@@ -262,7 +262,7 @@ class TagController extends Controller
         $groups->setPath($path);
         $sums = $this->repository->sumsOfTag($tag, $start, $end);
 
-        return view('tags.show', compact('tag', 'attachments', 'sums', 'periods', 'subTitle', 'subTitleIcon', 'groups', 'start', 'end', 'location'));
+        return prefixView('tags.show', compact('tag', 'attachments', 'sums', 'periods', 'subTitle', 'subTitleIcon', 'groups', 'start', 'end', 'location'));
     }
 
     /**
@@ -295,7 +295,7 @@ class TagController extends Controller
         $groups->setPath($path);
         $sums = $this->repository->sumsOfTag($tag, $start, $end);
 
-        return view('tags.show', compact('tag', 'attachments', 'sums', 'periods', 'subTitle', 'subTitleIcon', 'groups', 'start', 'end', 'location'));
+        return prefixView('tags.show', compact('tag', 'attachments', 'sums', 'periods', 'subTitle', 'subTitleIcon', 'groups', 'start', 'end', 'location'));
     }
 
     /**

app/Http/Controllers/Transaction/BulkController.php

@@ -84,7 +84,7 @@ class BulkController extends Controller
         $budgetRepos = app(BudgetRepositoryInterface::class);
         $budgetList = app('expandedform')->makeSelectListWithEmpty($budgetRepos->getActiveBudgets());
 
-        return view('transactions.bulk.edit', compact('journals', 'subTitle', 'budgetList'));
+        return prefixView('transactions.bulk.edit', compact('journals', 'subTitle', 'budgetList'));
     }
 
 

app/Http/Controllers/Transaction/ConvertController.php

@@ -124,7 +124,7 @@ class ConvertController extends Controller
             return redirect(route('transactions.show', [$group->id]));
         }
 
-        return view(
+        return prefixView(
             'transactions.convert',
             compact(
                 'sourceType',

app/Http/Controllers/Transaction/CreateController.php

@@ -110,7 +110,7 @@ class CreateController extends Controller
         session()->put('preFilled', $preFilled);
 
 
-        return view(
+        return prefixView(
             'transactions.create',
             compact(
                 'subTitleIcon',

app/Http/Controllers/Transaction/DeleteController.php

@@ -91,7 +91,7 @@ class DeleteController extends Controller
         Log::debug('Will try to remember previous URI');
         $this->rememberPreviousUri('transactions.delete.uri');
 
-        return view('transactions.delete', compact('group', 'journal', 'subTitle', 'objectType', 'previous'));
+        return prefixView('transactions.delete', compact('group', 'journal', 'subTitle', 'objectType', 'previous'));
     }
 
     /**

app/Http/Controllers/Transaction/EditController.php

@@ -89,7 +89,7 @@ class EditController extends Controller
         $previousUri     = str_replace($search, '', $previousUri);
 
 
-        return view(
+        return prefixView(
             'transactions.edit',
             compact(
                 'cash', 'allowedSourceDests', 'expectedSourceTypes', 'transactionGroup', 'allowedOpposingTypes', 'accountToTypes', 'defaultCurrency',

app/Http/Controllers/Transaction/IndexController.php

@@ -117,7 +117,7 @@ class IndexController extends Controller
         $groups = $collector->getPaginatedGroups();
         $groups->setPath($path);
 
-        return view('transactions.index', compact('subTitle', 'objectType', 'subTitleIcon', 'groups', 'periods', 'start', 'end'));
+        return prefixView('transactions.index', compact('subTitle', 'objectType', 'subTitleIcon', 'groups', 'periods', 'start', 'end'));
     }
 
     /**
@@ -156,6 +156,6 @@ class IndexController extends Controller
         $groups = $collector->getPaginatedGroups();
         $groups->setPath($path);
 
-        return view('transactions.index', compact('subTitle', 'objectType', 'subTitleIcon', 'groups', 'start', 'end'));
+        return prefixView('transactions.index', compact('subTitle', 'objectType', 'subTitleIcon', 'groups', 'start', 'end'));
     }
 }

app/Http/Controllers/Transaction/LinkController.php

@@ -78,7 +78,7 @@ class LinkController extends Controller
         $subTitle     = (string) trans('breadcrumbs.delete_journal_link');
         $this->rememberPreviousUri('journal_links.delete.uri');
 
-        return view('transactions.links.delete', compact('link', 'subTitle', 'subTitleIcon'));
+        return prefixView('transactions.links.delete', compact('link', 'subTitle', 'subTitleIcon'));
     }
 
     /**
@@ -107,7 +107,7 @@ class LinkController extends Controller
     {
         $linkTypes = $this->repository->get();
 
-        return view('transactions.links.modal', compact('journal', 'linkTypes'));
+        return prefixView('transactions.links.modal', compact('journal', 'linkTypes'));
     }
 
     /**

app/Http/Controllers/Transaction/MassController.php

@@ -83,7 +83,7 @@ class MassController extends Controller
         // put previous url in session
         $this->rememberPreviousUri('transactions.mass-delete.uri');
 
-        return view('transactions.mass.delete', compact('journals', 'subTitle'));
+        return prefixView('transactions.mass.delete', compact('journals', 'subTitle'));
     }
 
     /**
@@ -154,7 +154,7 @@ class MassController extends Controller
 
         $this->rememberPreviousUri('transactions.mass-edit.uri');
 
-        return view('transactions.mass.edit', compact('journals', 'subTitle', 'withdrawalSources', 'depositDestinations', 'budgets'));
+        return prefixView('transactions.mass.edit', compact('journals', 'subTitle', 'withdrawalSources', 'depositDestinations', 'budgets'));
     }
 
     /**

app/Http/Controllers/Transaction/ShowController.php

@@ -109,7 +109,7 @@ class ShowController extends Controller
         $attachments = $this->repository->getAttachments($transactionGroup);
         $links       = $this->repository->getLinks($transactionGroup);
 
-        return view(
+        return prefixView(
             'transactions.show',
             compact(
                 'transactionGroup',