From 21da959203973da862e5abd09dfed82386df24eb Mon Sep 17 00:00:00 2001
From: James Cole <james@firefly-iii.org>
Date: Sun, 31 Jan 2021 20:26:24 +0100
Subject: [PATCH] Make it easier to switch between v1/v2 layout.

---
 resources/lang/en_US/firefly.php                 |  1 +
 .../views/{v2 => }/errors/FireflyException.twig  |  0
 resources/views/v1/accounts/create.twig          |  2 +-
 resources/views/v1/accounts/delete.twig          |  2 +-
 resources/views/v1/accounts/edit.twig            |  2 +-
 resources/views/v1/accounts/index.twig           |  6 +++---
 resources/views/v1/accounts/reconcile/edit.twig  |  2 +-
 resources/views/v1/accounts/reconcile/index.twig |  2 +-
 resources/views/v1/accounts/reconcile/show.twig  |  2 +-
 resources/views/v1/accounts/show.twig            |  8 ++++----
 .../views/v1/admin/configuration/index.twig      |  2 +-
 resources/views/v1/admin/index.twig              |  2 +-
 resources/views/v1/admin/link/create.twig        |  2 +-
 resources/views/v1/admin/link/delete.twig        |  2 +-
 resources/views/v1/admin/link/edit.twig          |  2 +-
 resources/views/v1/admin/link/index.twig         |  2 +-
 resources/views/v1/admin/link/show.twig          |  2 +-
 resources/views/v1/admin/telemetry/index.twig    |  2 +-
 resources/views/v1/admin/telemetry/view.twig     |  2 +-
 resources/views/v1/admin/update/index.twig       |  2 +-
 resources/views/v1/admin/users/delete.twig       |  2 +-
 resources/views/v1/admin/users/edit.twig         |  2 +-
 resources/views/v1/admin/users/index.twig        |  2 +-
 resources/views/v1/admin/users/show.twig         |  2 +-
 resources/views/v1/attachments/delete.twig       |  2 +-
 resources/views/v1/attachments/edit.twig         |  2 +-
 resources/views/v1/attachments/index.twig        |  2 +-
 resources/views/v1/auth/lost-two-factor.twig     |  2 +-
 resources/views/v1/auth/register.twig            |  2 +-
 resources/views/v1/bills/create.twig             |  2 +-
 resources/views/v1/bills/delete.twig             |  2 +-
 resources/views/v1/bills/edit.twig               |  2 +-
 resources/views/v1/bills/index.twig              |  6 +++---
 resources/views/v1/bills/show.twig               |  6 +++---
 resources/views/v1/budgets/create.twig           |  2 +-
 resources/views/v1/budgets/delete.twig           |  2 +-
 resources/views/v1/budgets/edit.twig             |  2 +-
 resources/views/v1/budgets/index.twig            |  4 ++--
 resources/views/v1/budgets/no-budget.twig        |  8 ++++----
 resources/views/v1/budgets/show.twig             |  6 +++---
 resources/views/v1/categories/create.twig        |  2 +-
 resources/views/v1/categories/delete.twig        |  2 +-
 resources/views/v1/categories/edit.twig          |  2 +-
 resources/views/v1/categories/index.twig         |  6 +++---
 resources/views/v1/categories/no-category.twig   |  8 ++++----
 resources/views/v1/categories/show.twig          | 10 +++++-----
 resources/views/v1/currencies/create.twig        |  2 +-
 resources/views/v1/currencies/delete.twig        |  2 +-
 resources/views/v1/currencies/edit.twig          |  2 +-
 resources/views/v1/currencies/index.twig         |  2 +-
 .../v1/emails/access-token-created-html.twig     |  4 ++--
 .../v1/emails/access-token-created-text.twig     |  4 ++--
 resources/views/v1/emails/admin-test-html.twig   |  4 ++--
 resources/views/v1/emails/admin-test-text.twig   |  4 ++--
 .../v1/emails/confirm-email-change-html.twig     |  4 ++--
 .../v1/emails/confirm-email-change-text.twig     |  4 ++--
 resources/views/v1/emails/error-html.twig        |  4 ++--
 resources/views/v1/emails/error-text.twig        |  4 ++--
 resources/views/v1/emails/new-ip-html.twig       |  4 ++--
 resources/views/v1/emails/new-ip-text.twig       |  4 ++--
 .../v1/emails/oauth-client-created-html.twig     |  4 ++--
 .../v1/emails/oauth-client-created-text.twig     |  4 ++--
 resources/views/v1/emails/password-html.twig     |  4 ++--
 resources/views/v1/emails/password-text.twig     |  4 ++--
 resources/views/v1/emails/registered-html.twig   |  4 ++--
 resources/views/v1/emails/registered-text.twig   |  4 ++--
 .../v1/emails/report-new-journals-html.twig      |  4 ++--
 .../v1/emails/report-new-journals-text.twig      |  4 ++--
 .../views/v1/emails/undo-email-change-html.twig  |  4 ++--
 .../views/v1/emails/undo-email-change-text.twig  |  4 ++--
 resources/views/v1/errors/404.twig               |  2 +-
 resources/views/v1/errors/500.twig               |  2 +-
 resources/views/v1/errors/503.twig               |  2 +-
 resources/views/v1/errors/FireflyException.twig  |  2 +-
 resources/views/v1/export/index.twig             |  2 +-
 resources/views/v1/index.twig                    |  6 +++---
 resources/views/v1/layout/default.twig           | 10 +++++-----
 resources/views/v1/layout/empty.twig             |  2 +-
 resources/views/v1/layout/guest.twig             |  2 +-
 resources/views/v1/layout/install.twig           |  2 +-
 resources/views/v1/new-user/index.twig           |  2 +-
 resources/views/v1/object-groups/delete.twig     |  2 +-
 resources/views/v1/object-groups/edit.twig       |  2 +-
 resources/views/v1/object-groups/index.twig      |  2 +-
 resources/views/v1/piggy-banks/add-mobile.twig   |  2 +-
 resources/views/v1/piggy-banks/create.twig       |  2 +-
 resources/views/v1/piggy-banks/delete.twig       |  2 +-
 resources/views/v1/piggy-banks/edit.twig         |  2 +-
 resources/views/v1/piggy-banks/index.twig        |  6 +++---
 .../views/v1/piggy-banks/remove-mobile.twig      |  2 +-
 resources/views/v1/piggy-banks/show.twig         |  6 +++---
 resources/views/v1/preferences/index.twig        |  2 +-
 resources/views/v1/profile/change-email.twig     |  2 +-
 resources/views/v1/profile/change-password.twig  |  4 ++--
 resources/views/v1/profile/code.twig             |  2 +-
 resources/views/v1/profile/delete-account.twig   |  2 +-
 resources/views/v1/profile/index.twig            |  2 +-
 .../views/v1/profile/logout-other-sessions.twig  |  4 ++--
 resources/views/v1/profile/new-backup-codes.twig |  2 +-
 resources/views/v1/recurring/create.twig         |  2 +-
 resources/views/v1/recurring/delete.twig         |  2 +-
 resources/views/v1/recurring/edit.twig           |  2 +-
 resources/views/v1/recurring/index.twig          |  4 ++--
 resources/views/v1/recurring/show.twig           |  4 ++--
 resources/views/v1/reports/audit/report.twig     |  2 +-
 resources/views/v1/reports/budget/month.twig     |  2 +-
 resources/views/v1/reports/category/month.twig   |  2 +-
 resources/views/v1/reports/default/month.twig    |  2 +-
 .../views/v1/reports/default/multi-year.twig     |  2 +-
 resources/views/v1/reports/default/year.twig     |  2 +-
 resources/views/v1/reports/double/report.twig    |  2 +-
 resources/views/v1/reports/index.twig            |  2 +-
 resources/views/v1/reports/tag/month.twig        |  2 +-
 resources/views/v1/rules/index.twig              |  2 +-
 resources/views/v1/rules/rule-group/create.twig  |  2 +-
 resources/views/v1/rules/rule-group/delete.twig  |  2 +-
 resources/views/v1/rules/rule-group/edit.twig    |  2 +-
 .../v1/rules/rule-group/select-transactions.twig |  2 +-
 resources/views/v1/rules/rule/create.twig        |  2 +-
 resources/views/v1/rules/rule/delete.twig        |  2 +-
 resources/views/v1/rules/rule/edit.twig          |  2 +-
 .../views/v1/rules/rule/select-transactions.twig |  2 +-
 resources/views/v1/search/index.twig             |  2 +-
 resources/views/v1/search/search.twig            |  2 +-
 resources/views/v1/tags/create.twig              |  2 +-
 resources/views/v1/tags/delete.twig              |  2 +-
 resources/views/v1/tags/edit.twig                |  2 +-
 resources/views/v1/tags/index.twig               |  4 ++--
 resources/views/v1/tags/show.twig                |  8 ++++----
 resources/views/v1/transactions/bulk/edit.twig   |  2 +-
 resources/views/v1/transactions/convert.twig     |  2 +-
 resources/views/v1/transactions/create.twig      |  2 +-
 resources/views/v1/transactions/delete.twig      |  2 +-
 resources/views/v1/transactions/edit.twig        |  2 +-
 resources/views/v1/transactions/index.twig       |  6 +++---
 .../views/v1/transactions/links/delete.twig      |  2 +-
 resources/views/v1/transactions/mass/delete.twig |  2 +-
 resources/views/v1/transactions/mass/edit.twig   |  2 +-
 resources/views/v1/transactions/show.twig        |  4 ++--
 .../views/v1/transactions/single/delete.twig     |  2 +-
 resources/views/v2/auth/register.twig            |  2 +-
 .../views/v2/budgets/{index.twig => indexx.twig} |  0
 .../v2/emails/access-token-created-html.twig     |  4 ++--
 .../v2/emails/access-token-created-text.twig     |  4 ++--
 resources/views/v2/emails/admin-test-html.twig   |  4 ++--
 resources/views/v2/emails/admin-test-text.twig   |  4 ++--
 .../v2/emails/confirm-email-change-html.twig     |  4 ++--
 .../v2/emails/confirm-email-change-text.twig     |  4 ++--
 resources/views/v2/emails/error-html.twig        |  4 ++--
 resources/views/v2/emails/error-text.twig        |  4 ++--
 .../v2/emails/oauth-client-created-html.twig     |  4 ++--
 .../v2/emails/oauth-client-created-text.twig     |  4 ++--
 resources/views/v2/emails/password-html.twig     |  4 ++--
 resources/views/v2/emails/password-text.twig     |  4 ++--
 resources/views/v2/emails/registered-html.twig   |  4 ++--
 resources/views/v2/emails/registered-text.twig   |  4 ++--
 .../v2/emails/report-new-journals-html.twig      |  4 ++--
 .../v2/emails/report-new-journals-text.twig      |  4 ++--
 .../views/v2/emails/undo-email-change-html.twig  |  4 ++--
 .../views/v2/emails/undo-email-change-text.twig  |  4 ++--
 resources/views/v2/index.twig                    |  2 +-
 resources/views/v2/layout/default.twig           | 16 ++++++++--------
 162 files changed, 250 insertions(+), 249 deletions(-)
 rename resources/views/{v2 => }/errors/FireflyException.twig (100%)
 rename resources/views/v2/budgets/{index.twig => indexx.twig} (100%)

diff --git a/resources/lang/en_US/firefly.php b/resources/lang/en_US/firefly.php
index ab2b4797bf..1537623966 100644
--- a/resources/lang/en_US/firefly.php
+++ b/resources/lang/en_US/firefly.php
@@ -1337,6 +1337,7 @@ return [
     'automation'                                => 'Automation',
     'others'                                    => 'Others',
     'classification'                            => 'Classification',
+    'store_transaction'                         => 'Store transaction',
 
     // reports:
     'report_default'                            => 'Default financial report between :start and :end',
diff --git a/resources/views/v2/errors/FireflyException.twig b/resources/views/errors/FireflyException.twig
similarity index 100%
rename from resources/views/v2/errors/FireflyException.twig
rename to resources/views/errors/FireflyException.twig
diff --git a/resources/views/v1/accounts/create.twig b/resources/views/v1/accounts/create.twig
index 2d73dc1ac2..6a4695509b 100644
--- a/resources/views/v1/accounts/create.twig
+++ b/resources/views/v1/accounts/create.twig
@@ -1,4 +1,4 @@
-{% extends "./layout/default" %}
+{% extends './v1/layout/default' %}
 {% block breadcrumbs %}
     {{ Breadcrumbs.render(Route.getCurrentRoute.getName, objectType) }}
 {% endblock %}
diff --git a/resources/views/v1/accounts/delete.twig b/resources/views/v1/accounts/delete.twig
index 76b61ae2a3..c005555dd0 100644
--- a/resources/views/v1/accounts/delete.twig
+++ b/resources/views/v1/accounts/delete.twig
@@ -1,4 +1,4 @@
-{% extends "./layout/default" %}
+{% extends './v1/layout/default' %}
 
 {% block breadcrumbs %}
     {{ Breadcrumbs.render(Route.getCurrentRoute.getName, account) }}
diff --git a/resources/views/v1/accounts/edit.twig b/resources/views/v1/accounts/edit.twig
index d7c1ffbd2b..20f2f3e058 100644
--- a/resources/views/v1/accounts/edit.twig
+++ b/resources/views/v1/accounts/edit.twig
@@ -1,4 +1,4 @@
-{% extends "./layout/default" %}
+{% extends './v1/layout/default' %}
 
 {% block breadcrumbs %}
     {{ Breadcrumbs.render(Route.getCurrentRoute().getName(), account) }}
diff --git a/resources/views/v1/accounts/index.twig b/resources/views/v1/accounts/index.twig
index dd036b55e0..60284eaecd 100644
--- a/resources/views/v1/accounts/index.twig
+++ b/resources/views/v1/accounts/index.twig
@@ -1,4 +1,4 @@
-{% extends "./layout/default" %}
+{% extends './v1/layout/default' %}
 
 {% block breadcrumbs %}
     {{ Breadcrumbs.render(Route.getCurrentRoute.getName, objectType) }}
@@ -32,7 +32,7 @@
                             <a href="{{ route('accounts.create', objectType) }}" class="btn btn-success"><i class="fa fa-plus fa-fw"></i> {{ ('make_new_' ~ objectType ~ '_account')|_ }}</a>
                         </div>
 
-                        {% include 'list.accounts' %}
+                        {% include 'v1.list.accounts' %}
                     </div>
                     <div class="box-footer">
                         <p>
@@ -66,7 +66,7 @@
         </div>
     {% endif %}
     {% if accounts.count() == 0 and page == 1 %}
-        {% include 'partials.empty' with {objectType: objectType, type: 'accounts',route: route('accounts.create', [objectType])} %}
+        {% include 'v1.partials.empty' with {objectType: objectType, type: 'accounts',route: route('accounts.create', [objectType])} %}
     {% endif %}
 {% endblock %}
 
diff --git a/resources/views/v1/accounts/reconcile/edit.twig b/resources/views/v1/accounts/reconcile/edit.twig
index 575d274051..5dc88db065 100644
--- a/resources/views/v1/accounts/reconcile/edit.twig
+++ b/resources/views/v1/accounts/reconcile/edit.twig
@@ -1,4 +1,4 @@
-{% extends "./layout/default" %}
+{% extends './v1/layout/default' %}
 
 {% block breadcrumbs %}
     {{ Breadcrumbs.render(Route.getCurrentRoute.getName, journal) }}
diff --git a/resources/views/v1/accounts/reconcile/index.twig b/resources/views/v1/accounts/reconcile/index.twig
index 4ee9017e99..fd0d0ace45 100644
--- a/resources/views/v1/accounts/reconcile/index.twig
+++ b/resources/views/v1/accounts/reconcile/index.twig
@@ -1,4 +1,4 @@
-{% extends "./layout/default" %}
+{% extends './v1/layout/default' %}
 
 {% block breadcrumbs %}
     {{ Breadcrumbs.render(Route.getCurrentRoute.getName, account, start, end) }}
diff --git a/resources/views/v1/accounts/reconcile/show.twig b/resources/views/v1/accounts/reconcile/show.twig
index 5437712fd1..63d9441404 100644
--- a/resources/views/v1/accounts/reconcile/show.twig
+++ b/resources/views/v1/accounts/reconcile/show.twig
@@ -1,4 +1,4 @@
-{% extends "./layout/default" %}
+{% extends './v1/layout/default' %}
 
 {% block breadcrumbs %}
     {{ Breadcrumbs.render(Route.getCurrentRoute.getName, account, journal) }}
diff --git a/resources/views/v1/accounts/show.twig b/resources/views/v1/accounts/show.twig
index 116ce38b24..991cfcecd3 100644
--- a/resources/views/v1/accounts/show.twig
+++ b/resources/views/v1/accounts/show.twig
@@ -1,4 +1,4 @@
-{% extends "./layout/default" %}
+{% extends './v1/layout/default' %}
 
 {% block breadcrumbs %}
     {{ Breadcrumbs.render(Route.getCurrentRoute.getName, account, start, end) }}
@@ -41,7 +41,7 @@
                         </h3>
                     </div>
                     <div class="box-body no-padding">
-                        {% include 'list.attachments' %}
+                        {% include 'v1.list.attachments' %}
                     </div>
                 </div>
             </div>
@@ -142,7 +142,7 @@
                         {% set showReconcile = false %}
                     {% endif %}
 
-                    {% include 'list.groups' %}
+                    {% include 'v1.list.groups' %}
                     <p>
                         <i class="fa fa-calendar"></i>
                         {% if periods|length > 0 %}
@@ -160,7 +160,7 @@
         </div>
         {% if periods|length > 0 %}
             <div class="col-lg-2 col-md-4 col-sm-12 col-xs-12">
-                {% include 'list.periods' %}
+                {% include 'v1.list.periods' %}
             </div>
         {% endif %}
     </div>
diff --git a/resources/views/v1/admin/configuration/index.twig b/resources/views/v1/admin/configuration/index.twig
index d950ee5989..bd07e74df3 100644
--- a/resources/views/v1/admin/configuration/index.twig
+++ b/resources/views/v1/admin/configuration/index.twig
@@ -1,4 +1,4 @@
-{% extends "./layout/default" %}
+{% extends './v1/layout/default' %}
 
 {% block breadcrumbs %}
     {{ Breadcrumbs.render }}
diff --git a/resources/views/v1/admin/index.twig b/resources/views/v1/admin/index.twig
index ce2b68f9c0..eee15aa8d2 100644
--- a/resources/views/v1/admin/index.twig
+++ b/resources/views/v1/admin/index.twig
@@ -1,4 +1,4 @@
-{% extends "./layout/default" %}
+{% extends './v1/layout/default' %}
 
 {% block breadcrumbs %}
     {{ Breadcrumbs.render }}
diff --git a/resources/views/v1/admin/link/create.twig b/resources/views/v1/admin/link/create.twig
index cf4b130715..76eac6df3d 100644
--- a/resources/views/v1/admin/link/create.twig
+++ b/resources/views/v1/admin/link/create.twig
@@ -1,4 +1,4 @@
-{% extends "./layout/default" %}
+{% extends './v1/layout/default' %}
 
 {% block breadcrumbs %}
     {{ Breadcrumbs.render(Route.getCurrentRoute.getName) }}
diff --git a/resources/views/v1/admin/link/delete.twig b/resources/views/v1/admin/link/delete.twig
index 884bf0da93..7aa4a5529a 100644
--- a/resources/views/v1/admin/link/delete.twig
+++ b/resources/views/v1/admin/link/delete.twig
@@ -1,4 +1,4 @@
-{% extends "./layout/default" %}
+{% extends './v1/layout/default' %}
 
 {% block breadcrumbs %}
     {{ Breadcrumbs.render(Route.getCurrentRoute.getName, linkType) }}
diff --git a/resources/views/v1/admin/link/edit.twig b/resources/views/v1/admin/link/edit.twig
index 32ffb9a680..4f996c8ac1 100644
--- a/resources/views/v1/admin/link/edit.twig
+++ b/resources/views/v1/admin/link/edit.twig
@@ -1,4 +1,4 @@
-{% extends "./layout/default" %}
+{% extends './v1/layout/default' %}
 
 {% block breadcrumbs %}
     {{ Breadcrumbs.render(Route.getCurrentRoute.getName, linkType) }}
diff --git a/resources/views/v1/admin/link/index.twig b/resources/views/v1/admin/link/index.twig
index 821c49b3de..4e86f64403 100644
--- a/resources/views/v1/admin/link/index.twig
+++ b/resources/views/v1/admin/link/index.twig
@@ -1,4 +1,4 @@
-{% extends "./layout/default" %}
+{% extends './v1/layout/default' %}
 
 {% block breadcrumbs %}
     {{ Breadcrumbs.render }}
diff --git a/resources/views/v1/admin/link/show.twig b/resources/views/v1/admin/link/show.twig
index 8a807af761..bdc6166910 100644
--- a/resources/views/v1/admin/link/show.twig
+++ b/resources/views/v1/admin/link/show.twig
@@ -1,4 +1,4 @@
-{% extends "./layout/default" %}
+{% extends './v1/layout/default' %}
 
 {% block breadcrumbs %}
     {{ Breadcrumbs.render(Route.getCurrentRoute.getName, linkType) }}
diff --git a/resources/views/v1/admin/telemetry/index.twig b/resources/views/v1/admin/telemetry/index.twig
index 2f19a6f321..fcd80abdc5 100644
--- a/resources/views/v1/admin/telemetry/index.twig
+++ b/resources/views/v1/admin/telemetry/index.twig
@@ -1,4 +1,4 @@
-{% extends "./layout/default" %}
+{% extends './v1/layout/default' %}
 
 {% block breadcrumbs %}
     {{ Breadcrumbs.render }}
diff --git a/resources/views/v1/admin/telemetry/view.twig b/resources/views/v1/admin/telemetry/view.twig
index f366257a89..3a8448105a 100644
--- a/resources/views/v1/admin/telemetry/view.twig
+++ b/resources/views/v1/admin/telemetry/view.twig
@@ -1,4 +1,4 @@
-{% extends "./layout/default" %}
+{% extends './v1/layout/default' %}
 
 {% block breadcrumbs %}
     {{ Breadcrumbs.render }}
diff --git a/resources/views/v1/admin/update/index.twig b/resources/views/v1/admin/update/index.twig
index c2a0d63963..8a192b7a2b 100644
--- a/resources/views/v1/admin/update/index.twig
+++ b/resources/views/v1/admin/update/index.twig
@@ -1,4 +1,4 @@
-{% extends "./layout/default" %}
+{% extends './v1/layout/default' %}
 
 {% block breadcrumbs %}
     {{ Breadcrumbs.render }}
diff --git a/resources/views/v1/admin/users/delete.twig b/resources/views/v1/admin/users/delete.twig
index 64ad1ec1ae..0d190e4a3c 100644
--- a/resources/views/v1/admin/users/delete.twig
+++ b/resources/views/v1/admin/users/delete.twig
@@ -1,4 +1,4 @@
-{% extends "./layout/default" %}
+{% extends './v1/layout/default' %}
 
 {% block breadcrumbs %}
     {{ Breadcrumbs.render(Route.getCurrentRoute.getName, user) }}
diff --git a/resources/views/v1/admin/users/edit.twig b/resources/views/v1/admin/users/edit.twig
index d1a71fcfa8..e9ec513dc2 100644
--- a/resources/views/v1/admin/users/edit.twig
+++ b/resources/views/v1/admin/users/edit.twig
@@ -1,4 +1,4 @@
-{% extends "./layout/default" %}
+{% extends './v1/layout/default' %}
 
 {% block breadcrumbs %}
     {{ Breadcrumbs.render(Route.getCurrentRoute.getName, user) }}
diff --git a/resources/views/v1/admin/users/index.twig b/resources/views/v1/admin/users/index.twig
index 6b82598376..ec01ad2ec0 100644
--- a/resources/views/v1/admin/users/index.twig
+++ b/resources/views/v1/admin/users/index.twig
@@ -1,4 +1,4 @@
-{% extends "./layout/default" %}
+{% extends './v1/layout/default' %}
 
 {% block breadcrumbs %}
     {{ Breadcrumbs.render }}
diff --git a/resources/views/v1/admin/users/show.twig b/resources/views/v1/admin/users/show.twig
index adaaa258c2..63a5bbabed 100644
--- a/resources/views/v1/admin/users/show.twig
+++ b/resources/views/v1/admin/users/show.twig
@@ -1,4 +1,4 @@
-{% extends "./layout/default" %}
+{% extends './v1/layout/default' %}
 
 {% block breadcrumbs %}
     {{ Breadcrumbs.render(Route.getCurrentRoute.getName, user) }}
diff --git a/resources/views/v1/attachments/delete.twig b/resources/views/v1/attachments/delete.twig
index 65412569b4..db78a162a6 100644
--- a/resources/views/v1/attachments/delete.twig
+++ b/resources/views/v1/attachments/delete.twig
@@ -1,4 +1,4 @@
-{% extends "./layout/default" %}
+{% extends './v1/layout/default' %}
 
 {% block breadcrumbs %}
     {{ Breadcrumbs.render(Route.getCurrentRoute().getName(), attachment) }}
diff --git a/resources/views/v1/attachments/edit.twig b/resources/views/v1/attachments/edit.twig
index e2bb7265b7..d7ab2eb582 100644
--- a/resources/views/v1/attachments/edit.twig
+++ b/resources/views/v1/attachments/edit.twig
@@ -1,4 +1,4 @@
-{% extends "./layout/default" %}
+{% extends './v1/layout/default' %}
 
 {% block breadcrumbs %}
     {{ Breadcrumbs.render(Route.getCurrentRoute().getName(), attachment) }}
diff --git a/resources/views/v1/attachments/index.twig b/resources/views/v1/attachments/index.twig
index fd78e78a81..0998b4d804 100644
--- a/resources/views/v1/attachments/index.twig
+++ b/resources/views/v1/attachments/index.twig
@@ -1,4 +1,4 @@
-{% extends "./layout/default" %}
+{% extends './v1/layout/default' %}
 
 {% block breadcrumbs %}
     {{ Breadcrumbs.render(Route.getCurrentRoute.getName) }}
diff --git a/resources/views/v1/auth/lost-two-factor.twig b/resources/views/v1/auth/lost-two-factor.twig
index 4a9e293390..230cf621b2 100644
--- a/resources/views/v1/auth/lost-two-factor.twig
+++ b/resources/views/v1/auth/lost-two-factor.twig
@@ -12,7 +12,7 @@
     <link href="v1/lib/adminlte/css/AdminLTE.min.css?v={{ FF_VERSION }}" rel="stylesheet" type="text/css"/>
 
     {# favicons #}
-    {% include('partials.favicons') %}
+    {% include('v1.partials.favicons') %}
 
 </head>
 <body class="container">
diff --git a/resources/views/v1/auth/register.twig b/resources/views/v1/auth/register.twig
index 692256e4db..fbecd1f561 100644
--- a/resources/views/v1/auth/register.twig
+++ b/resources/views/v1/auth/register.twig
@@ -48,6 +48,6 @@
         <a href="{{ URL.to('/password/reset') }}">{{ 'forgot_my_password'|_ }}</a>
     </div>
 
-    {% include 'partials.password-modal' %}
+    {% include 'v1.partials.password-modal' %}
 
 {% endblock %}
diff --git a/resources/views/v1/bills/create.twig b/resources/views/v1/bills/create.twig
index 9ea39e3329..6b81bcae0e 100644
--- a/resources/views/v1/bills/create.twig
+++ b/resources/views/v1/bills/create.twig
@@ -1,4 +1,4 @@
-{% extends "./layout/default" %}
+{% extends './v1/layout/default' %}
 
 {% block breadcrumbs %}
     {{ Breadcrumbs.render(Route.getCurrentRoute.getName, piggyBank) }}
diff --git a/resources/views/v1/bills/delete.twig b/resources/views/v1/bills/delete.twig
index 3f3284af8e..8d10d2785b 100644
--- a/resources/views/v1/bills/delete.twig
+++ b/resources/views/v1/bills/delete.twig
@@ -1,4 +1,4 @@
-{% extends "./layout/default" %}
+{% extends './v1/layout/default' %}
 
 {% block breadcrumbs %}
     {{ Breadcrumbs.render(Route.getCurrentRoute.getName, bill) }}
diff --git a/resources/views/v1/bills/edit.twig b/resources/views/v1/bills/edit.twig
index f55a38dc95..fb3a247504 100644
--- a/resources/views/v1/bills/edit.twig
+++ b/resources/views/v1/bills/edit.twig
@@ -1,4 +1,4 @@
-{% extends "./layout/default" %}
+{% extends './v1/layout/default' %}
 
 {% block breadcrumbs %}
     {{ Breadcrumbs.render(Route.getCurrentRoute.getName, bill) }}
diff --git a/resources/views/v1/bills/index.twig b/resources/views/v1/bills/index.twig
index c57497fef7..3f6c3a76c0 100644
--- a/resources/views/v1/bills/index.twig
+++ b/resources/views/v1/bills/index.twig
@@ -1,4 +1,4 @@
-{% extends "./layout/default" %}
+{% extends './v1/layout/default' %}
 
 {% block breadcrumbs %}
     {{ Breadcrumbs.render(Route.getCurrentRoute.getName) }}
@@ -6,7 +6,7 @@
 
 {% block content %}
     {% if total == 0 %}
-        {% include 'partials.empty' with {objectType: 'default', type: 'bills',route: route('bills.create')} %}
+        {% include 'v1.partials.empty' with {objectType: 'default', type: 'bills',route: route('bills.create')} %}
     {% else %}
 <div class="row">
     <div class="col-lg-12 col-sm-12 col-md-12">
@@ -26,7 +26,7 @@
                 <div style="padding:8px;">
                     <a class="btn btn-success" href="{{ route('bills.create') }}"><i class="fa fa-plus fa-fw"></i> {{ 'create_new_bill'|_ }}</a>
                 </div>
-                {% include 'list/bills' %}
+                {% include 'v1.list/bills' %}
             </div>
             <div class="box-footer">
                 <a class="btn btn-success" href="{{ route('bills.create') }}"><i class="fa fa-plus fa-fw"></i> {{ 'create_new_bill'|_ }}</a>
diff --git a/resources/views/v1/bills/show.twig b/resources/views/v1/bills/show.twig
index 594ac11a26..1a1a9cb02a 100644
--- a/resources/views/v1/bills/show.twig
+++ b/resources/views/v1/bills/show.twig
@@ -1,4 +1,4 @@
-{% extends "./layout/default" %}
+{% extends './v1/layout/default' %}
 
 {% block breadcrumbs %}
     {{ Breadcrumbs.render(Route.getCurrentRoute.getName, bill) }}
@@ -122,7 +122,7 @@
                         <h3 class="box-title">{{ 'attachments'|_ }}</h3>
                     </div>
                     <div class="box-body no-padding">
-                        {% include 'list.attachments' %}
+                        {% include 'v1.list.attachments' %}
                     </div>
                 </div>
             {% endif %}
@@ -149,7 +149,7 @@
                     <h3 class="box-title">{{ 'connected_journals'|_ }}</h3>
                 </div>
                 <div class="box-body">
-                    {% include 'list.groups' %}
+                    {% include 'v1.list.groups' %}
                 </div>
             </div>
         </div>
diff --git a/resources/views/v1/budgets/create.twig b/resources/views/v1/budgets/create.twig
index 4253694a13..cc12b1296d 100644
--- a/resources/views/v1/budgets/create.twig
+++ b/resources/views/v1/budgets/create.twig
@@ -1,4 +1,4 @@
-{% extends "./layout/default" %}
+{% extends './v1/layout/default' %}
 
 {% block breadcrumbs %}
     {{ Breadcrumbs.render(Route.getCurrentRoute.getName) }}
diff --git a/resources/views/v1/budgets/delete.twig b/resources/views/v1/budgets/delete.twig
index be71b1d140..cf7439c288 100644
--- a/resources/views/v1/budgets/delete.twig
+++ b/resources/views/v1/budgets/delete.twig
@@ -1,4 +1,4 @@
-{% extends "./layout/default" %}
+{% extends './v1/layout/default' %}
 
 {% block breadcrumbs %}
     {{ Breadcrumbs.render(Route.getCurrentRoute.getName, budget) }}
diff --git a/resources/views/v1/budgets/edit.twig b/resources/views/v1/budgets/edit.twig
index 7dd3478980..e313778c18 100644
--- a/resources/views/v1/budgets/edit.twig
+++ b/resources/views/v1/budgets/edit.twig
@@ -1,4 +1,4 @@
-{% extends "./layout/default" %}
+{% extends './v1/layout/default' %}
 
 {% block breadcrumbs %}
     {{ Breadcrumbs.render(Route.getCurrentRoute.getName, budget) }}
diff --git a/resources/views/v1/budgets/index.twig b/resources/views/v1/budgets/index.twig
index b3e42db164..70009d9c5c 100644
--- a/resources/views/v1/budgets/index.twig
+++ b/resources/views/v1/budgets/index.twig
@@ -1,4 +1,4 @@
-{% extends "./layout/default" %}
+{% extends './v1/layout/default' %}
 
 {% block breadcrumbs %}
     {{ Breadcrumbs.render(Route.getCurrentRoute.getName) }}
@@ -203,7 +203,7 @@
         </div>
     {% endif %}
     {% if budgets|length == 0 and inactive.count() == 0 %}
-        {% include 'partials.empty' with {objectType: 'default', type: 'budgets',route: route('budgets.create')} %}
+        {% include 'v1.partials.empty' with {objectType: 'default', type: 'budgets',route: route('budgets.create')} %}
         {# make FF ignore demo for now. #}
         {% set shownDemo = true %}
     {% else %}
diff --git a/resources/views/v1/budgets/no-budget.twig b/resources/views/v1/budgets/no-budget.twig
index 498d7b2458..8f48140617 100644
--- a/resources/views/v1/budgets/no-budget.twig
+++ b/resources/views/v1/budgets/no-budget.twig
@@ -1,4 +1,4 @@
-{% extends "./layout/default" %}
+{% extends './v1/layout/default' %}
 
 {% block breadcrumbs %}
     {{ Breadcrumbs.render(Route.getCurrentRoute.getName, start, end) }}
@@ -24,13 +24,13 @@
                 <div class="box-body ">
 
                     {% if periods|length > 0 %}
-                        {% include 'list.groups' %}
+                        {% include 'v1.list.groups' %}
                         <p>
                             <i class="fa fa-calendar"></i>
                             <a href="{{ route('budgets.no-budget-all') }}">{{ 'show_all_no_filter'|_ }}</a>
                         </p>
                     {% else %}
-                        {% include 'list.groups' %}
+                        {% include 'v1.list.groups' %}
                         <p>
                             <i class="fa fa-calendar"></i>
                             <a href="{{ route('budgets.no-budget') }}">{{ 'show_the_current_period_and_overview'|_ }}</a>
@@ -42,7 +42,7 @@
 
         {% if periods|length > 0 %}
             <div class="col-lg-3 col-md-3 col-sm-12 col-xs-12">
-                {% include 'list.periods' %}
+                {% include 'v1.list.periods' %}
             </div>
         {% endif %}
 
diff --git a/resources/views/v1/budgets/show.twig b/resources/views/v1/budgets/show.twig
index 0c18acd7b1..9ef3cc5e22 100644
--- a/resources/views/v1/budgets/show.twig
+++ b/resources/views/v1/budgets/show.twig
@@ -1,4 +1,4 @@
-{% extends "./layout/default" %}
+{% extends './v1/layout/default' %}
 
 {% block breadcrumbs %}
     {{ Breadcrumbs.render(Route.getCurrentRoute.getName, budget, budgetLimit) }}
@@ -47,7 +47,7 @@
                         </h3>
                     </div>
                     <div class="box-body no-padding">
-                        {% include 'list.attachments' %}
+                        {% include 'v1.list.attachments' %}
                     </div>
                 </div>
             </div>
@@ -128,7 +128,7 @@
                     <h3 class="box-title">{{ 'transactions'|_ }}</h3>
                 </div>
                 <div class="box-body">
-                    {% include 'list.groups' %}
+                    {% include 'v1.list.groups' %}
                     {% if budgetLimit %}
                         <p>
                             <i class="fa fa-calendar"></i>
diff --git a/resources/views/v1/categories/create.twig b/resources/views/v1/categories/create.twig
index a10ada5d18..b3a2b83b19 100644
--- a/resources/views/v1/categories/create.twig
+++ b/resources/views/v1/categories/create.twig
@@ -1,4 +1,4 @@
-{% extends "./layout/default" %}
+{% extends './v1/layout/default' %}
 
 {% block breadcrumbs %}
     {{ Breadcrumbs.render(Route.getCurrentRoute.getName) }}
diff --git a/resources/views/v1/categories/delete.twig b/resources/views/v1/categories/delete.twig
index 9d5c4dec09..600f8fda52 100644
--- a/resources/views/v1/categories/delete.twig
+++ b/resources/views/v1/categories/delete.twig
@@ -1,4 +1,4 @@
-{% extends "./layout/default" %}
+{% extends './v1/layout/default' %}
 
 {% block breadcrumbs %}
     {{ Breadcrumbs.render(Route.getCurrentRoute.getName, category) }}
diff --git a/resources/views/v1/categories/edit.twig b/resources/views/v1/categories/edit.twig
index 62421a4d32..6abbbb0da9 100644
--- a/resources/views/v1/categories/edit.twig
+++ b/resources/views/v1/categories/edit.twig
@@ -1,4 +1,4 @@
-{% extends "./layout/default" %}
+{% extends './v1/layout/default' %}
 
 {% block breadcrumbs %}
     {{ Breadcrumbs.render(Route.getCurrentRoute.getName, category) }}
diff --git a/resources/views/v1/categories/index.twig b/resources/views/v1/categories/index.twig
index e73ec09bdf..cb9f13d2f8 100644
--- a/resources/views/v1/categories/index.twig
+++ b/resources/views/v1/categories/index.twig
@@ -1,4 +1,4 @@
-{% extends "./layout/default" %}
+{% extends './v1/layout/default' %}
 
 {% block breadcrumbs %}
     {{ Breadcrumbs.render(Route.getCurrentRoute.getName) }}
@@ -25,7 +25,7 @@
                 <div style="padding:8px;">
                     <a class="btn btn-success" href="{{ route('categories.create') }}"><i class="fa fa-plus fa-fw"></i> {{ 'new_category'|_ }}</a>
                 </div>
-                {% include 'list/categories' %}
+                {% include 'v1.list/categories' %}
             </div>
             <div class="box-footer">
                 <a class="btn btn-success" href="{{ route('categories.create') }}"><i class="fa fa-plus fa-fw"></i> {{ 'new_category'|_ }}</a>
@@ -35,7 +35,7 @@
     </div>
 </div>
 {% else %}
-        {% include 'partials.empty' with {objectType: 'default', type: 'categories',route: route('categories.create')} %}
+        {% include 'v1.partials.empty' with {objectType: 'default', type: 'categories',route: route('categories.create')} %}
     {% endif %}
 {% endblock %}
 
diff --git a/resources/views/v1/categories/no-category.twig b/resources/views/v1/categories/no-category.twig
index 0553cf1331..70fce8305b 100644
--- a/resources/views/v1/categories/no-category.twig
+++ b/resources/views/v1/categories/no-category.twig
@@ -1,4 +1,4 @@
-{% extends "./layout/default" %}
+{% extends './v1/layout/default' %}
 
 {% block breadcrumbs %}
     {{ Breadcrumbs.render(Route.getCurrentRoute.getName, start, end) }}
@@ -24,13 +24,13 @@
                 <div class="box-body ">
 
                     {% if periods|length > 0 %}
-                        {% include 'list.groups' %}
+                        {% include 'v1.list.groups' %}
                         <p>
                             <i class="fa fa-calendar"></i>
                             <a href="{{ route('categories.no-category.all') }}">{{ 'show_all_no_filter'|_ }}</a>
                         </p>
                     {% else %}
-                        {% include 'list.groups' %}
+                        {% include 'v1.list.groups' %}
                         <p>
                             <i class="fa fa-calendar"></i>
                             <a href="{{ route('categories.no-category') }}">{{ 'show_the_current_period_and_overview'|_ }}</a>
@@ -42,7 +42,7 @@
 
         {% if periods|length > 0 %}
             <div class="col-lg-2 col-md-4 col-sm-12 col-xs-12">
-                {% include 'list.periods' %}
+                {% include 'v1.list.periods' %}
             </div>
         {% endif %}
 
diff --git a/resources/views/v1/categories/show.twig b/resources/views/v1/categories/show.twig
index 0c519ee6c7..fe5d3d93ea 100644
--- a/resources/views/v1/categories/show.twig
+++ b/resources/views/v1/categories/show.twig
@@ -1,4 +1,4 @@
-{% extends "./layout/default" %}
+{% extends './v1/layout/default' %}
 
 {% block breadcrumbs %}
     {{ Breadcrumbs.render(Route.getCurrentRoute.getName, category, start, end) }}
@@ -57,7 +57,7 @@
                         </h3>
                     </div>
                     <div class="box-body no-padding">
-                        {% include 'list.attachments' %}
+                        {% include 'v1.list.attachments' %}
                     </div>
                 </div>
             </div>
@@ -80,7 +80,7 @@
                 </div>
                 <div class="box-body">
                     {% if periods|length > 0 %}
-                        {% include 'list.groups' %}
+                        {% include 'v1.list.groups' %}
                         <p>
                             <i class="fa fa-calendar"></i>
                             <a href="{{ route('categories.show.all', [category.id]) }}">
@@ -88,7 +88,7 @@
                             </a>
                         </p>
                     {% else %}
-                        {% include 'list.groups'  %}
+                        {% include 'v1.list.groups'  %}
                         <p>
                             <i class="fa fa-calendar"></i>
                             <a href="{{ route('categories.show', [category.id]) }}">
@@ -101,7 +101,7 @@
         </div>
         {% if periods|length > 0 %}
             <div class="col-lg-2 col-md-4 col-sm-12 col-xs-12">
-                {% include 'list.periods' %}
+                {% include 'v1.list.periods' %}
             </div>
         {% endif %}
     </div>
diff --git a/resources/views/v1/currencies/create.twig b/resources/views/v1/currencies/create.twig
index bab224ea4d..287baf1c63 100644
--- a/resources/views/v1/currencies/create.twig
+++ b/resources/views/v1/currencies/create.twig
@@ -1,4 +1,4 @@
-{% extends "./layout/default" %}
+{% extends './v1/layout/default' %}
 
 {% block breadcrumbs %}
     {{ Breadcrumbs.render(Route.getCurrentRoute.getName) }}
diff --git a/resources/views/v1/currencies/delete.twig b/resources/views/v1/currencies/delete.twig
index e1e22b040d..1ef83a4dc6 100644
--- a/resources/views/v1/currencies/delete.twig
+++ b/resources/views/v1/currencies/delete.twig
@@ -1,4 +1,4 @@
-{% extends "./layout/default" %}
+{% extends './v1/layout/default' %}
 
 {% block breadcrumbs %}
     {{ Breadcrumbs.render(Route.getCurrentRoute.getName, currency) }}
diff --git a/resources/views/v1/currencies/edit.twig b/resources/views/v1/currencies/edit.twig
index 221b226329..1408158ae0 100644
--- a/resources/views/v1/currencies/edit.twig
+++ b/resources/views/v1/currencies/edit.twig
@@ -1,4 +1,4 @@
-{% extends "./layout/default" %}
+{% extends './v1/layout/default' %}
 
 {% block breadcrumbs %}
     {{ Breadcrumbs.render(Route.getCurrentRoute.getName, currency) }}
diff --git a/resources/views/v1/currencies/index.twig b/resources/views/v1/currencies/index.twig
index 3f56d1a294..64cac9d7c8 100644
--- a/resources/views/v1/currencies/index.twig
+++ b/resources/views/v1/currencies/index.twig
@@ -1,4 +1,4 @@
-{% extends "./layout/default" %}
+{% extends './v1/layout/default' %}
 
 {% block breadcrumbs %}
     {{ Breadcrumbs.render(Route.getCurrentRoute.getName) }}
diff --git a/resources/views/v1/emails/access-token-created-html.twig b/resources/views/v1/emails/access-token-created-html.twig
index ede3a2f044..d3406b09bd 100644
--- a/resources/views/v1/emails/access-token-created-html.twig
+++ b/resources/views/v1/emails/access-token-created-html.twig
@@ -1,4 +1,4 @@
-{% include 'emails.header-html' %}
+{% include 'v1.emails.header-html' %}
 <p style="font-family: 'Helvetica Neue', Helvetica, Arial, sans-serif;font-size:13px;">
     {{ trans('email.access_token_created_body') }}
 </p>
@@ -10,4 +10,4 @@
 <p style="font-family: 'Helvetica Neue', Helvetica, Arial, sans-serif;font-size:13px;">
     {{ trans('email.access_token_created_revoke', {url: route('profile.index') }) }}
 </p>
-{% include 'emails.footer-html' %}
+{% include 'v1.emails.footer-html' %}
diff --git a/resources/views/v1/emails/access-token-created-text.twig b/resources/views/v1/emails/access-token-created-text.twig
index 04d85cdf35..264150e31c 100644
--- a/resources/views/v1/emails/access-token-created-text.twig
+++ b/resources/views/v1/emails/access-token-created-text.twig
@@ -1,7 +1,7 @@
-{% include 'emails.header-text' %}
+{% include 'v1.emails.header-text' %}
 {{ trans('email.access_token_created_body')|raw }}
 
 {{ trans('email.access_token_created_explanation')|striptags|raw }}
 
 {{ trans('email.access_token_created_revoke', {url: route('profile.index') })|raw }}
-{% include 'emails.footer-text' %}
+{% include 'v1.emails.footer-text' %}
diff --git a/resources/views/v1/emails/admin-test-html.twig b/resources/views/v1/emails/admin-test-html.twig
index 6d343085b8..75b42ea812 100644
--- a/resources/views/v1/emails/admin-test-html.twig
+++ b/resources/views/v1/emails/admin-test-html.twig
@@ -1,5 +1,5 @@
-{% include 'emails.header-html' %}
+{% include 'v1.emails.header-html' %}
 <p style="font-family: 'Helvetica Neue', Helvetica, Arial, sans-serif;font-size:13px;">
     {{ trans('email.admin_test_body', {email: email })}}
 </p>
-{% include 'emails.footer-html' %}
+{% include 'v1.emails.footer-html' %}
diff --git a/resources/views/v1/emails/admin-test-text.twig b/resources/views/v1/emails/admin-test-text.twig
index e6c5aca702..323ed6f6d0 100644
--- a/resources/views/v1/emails/admin-test-text.twig
+++ b/resources/views/v1/emails/admin-test-text.twig
@@ -1,3 +1,3 @@
-{% include 'emails.header-text' %}
+{% include 'v1.emails.header-text' %}
 {{ trans('email.admin_test_body', {email: email })|raw }}
-{% include 'emails.footer-text' %}
+{% include 'v1.emails.footer-text' %}
diff --git a/resources/views/v1/emails/confirm-email-change-html.twig b/resources/views/v1/emails/confirm-email-change-html.twig
index 7eb907c421..284c607e4b 100644
--- a/resources/views/v1/emails/confirm-email-change-html.twig
+++ b/resources/views/v1/emails/confirm-email-change-html.twig
@@ -1,4 +1,4 @@
-{% include 'emails.header-html' %}
+{% include 'v1.emails.header-html' %}
 <p style="font-family: 'Helvetica Neue', Helvetica, Arial, sans-serif;font-size:13px;">
     {{ trans('email.email_change_body_to_new')}}
 </p>
@@ -15,4 +15,4 @@
 <p style="font-family: 'Helvetica Neue', Helvetica, Arial, sans-serif;font-size:13px;">
     <a href="{{ uri }}">{{ uri }}</a>
 </p>
-{% include 'emails.footer-html' %}
+{% include 'v1.emails.footer-html' %}
diff --git a/resources/views/v1/emails/confirm-email-change-text.twig b/resources/views/v1/emails/confirm-email-change-text.twig
index 1fd8695814..13d523efef 100644
--- a/resources/views/v1/emails/confirm-email-change-text.twig
+++ b/resources/views/v1/emails/confirm-email-change-text.twig
@@ -1,4 +1,4 @@
-{% include 'emails.header-text' %}
+{% include 'v1.emails.header-text' %}
 {{ trans('email.email_change_body_to_new')|raw }}
 
 {{trans('email.email_change_old', { email: oldEmail })|raw }}
@@ -7,4 +7,4 @@
 
 {{ trans('email.email_change_instructions')|raw }}
 {{ uri }}
-{% include 'emails.footer-text' %}
+{% include 'v1.emails.footer-text' %}
diff --git a/resources/views/v1/emails/error-html.twig b/resources/views/v1/emails/error-html.twig
index d90bc67879..9f72be1ad4 100644
--- a/resources/views/v1/emails/error-html.twig
+++ b/resources/views/v1/emails/error-html.twig
@@ -1,4 +1,4 @@
-{% include 'emails.header-html' %}
+{% include 'v1.emails.header-html' %}
 <p style="font-family: 'Helvetica Neue', Helvetica, Arial, sans-serif;font-size:13px;">
     {{ trans('email.error_intro', { version: version, errorMessage: errorMessage })|raw }}
 </p>
@@ -42,4 +42,4 @@
 <p style="font-family: monospace;font-size:11px;color:#aaa">
     {{ stackTrace|nl2br }}
 </p>
-{% include 'emails.footer-html' %}
+{% include 'v1.emails.footer-html' %}
diff --git a/resources/views/v1/emails/error-text.twig b/resources/views/v1/emails/error-text.twig
index 35e4a46334..4d394ccc9e 100644
--- a/resources/views/v1/emails/error-text.twig
+++ b/resources/views/v1/emails/error-text.twig
@@ -1,4 +1,4 @@
-{% include 'emails.header-text' %}
+{% include 'v1.emails.header-text' %}
 {{ trans('email.error_intro', { version: version, errorMessage: errorMessage })|striptags|raw }}
 
 {{ trans('email.error_type', {class: class })|raw }}
@@ -24,4 +24,4 @@
 {{ trans('email.error_stacktrace_below')|raw }}
 
 {{ stackTrace|raw }}
-{% include 'emails.footer-text' %}
+{% include 'v1.emails.footer-text' %}
diff --git a/resources/views/v1/emails/new-ip-html.twig b/resources/views/v1/emails/new-ip-html.twig
index 7c0c56e6b0..d5a0444497 100644
--- a/resources/views/v1/emails/new-ip-html.twig
+++ b/resources/views/v1/emails/new-ip-html.twig
@@ -1,4 +1,4 @@
-{% include 'emails.header-html' %}
+{% include 'v1.emails.header-html' %}
 <p style="font-family: 'Helvetica Neue', Helvetica, Arial, sans-serif;font-size:13px;">
     {{ trans('email.new_ip_body') }}
 </p>
@@ -13,4 +13,4 @@
     {{ trans('email.new_ip_warning') }}
 </p>
 
-{% include 'emails.footer-html' %}
+{% include 'v1.emails.footer-html' %}
diff --git a/resources/views/v1/emails/new-ip-text.twig b/resources/views/v1/emails/new-ip-text.twig
index b5b55dfe4a..5e50ccc282 100644
--- a/resources/views/v1/emails/new-ip-text.twig
+++ b/resources/views/v1/emails/new-ip-text.twig
@@ -1,4 +1,4 @@
-{% include 'emails.header-text' %}
+{% include 'v1.emails.header-text' %}
 {{ trans('email.new_ip_body') }}
 
 {{ trans('email.ip_address') }}: {{ ipAddress }}
@@ -7,4 +7,4 @@
 
 {{ trans('email.new_ip_warning') }}
 
-{% include 'emails.footer-text' %}
+{% include 'v1.emails.footer-text' %}
diff --git a/resources/views/v1/emails/oauth-client-created-html.twig b/resources/views/v1/emails/oauth-client-created-html.twig
index 03906957f1..d308830220 100644
--- a/resources/views/v1/emails/oauth-client-created-html.twig
+++ b/resources/views/v1/emails/oauth-client-created-html.twig
@@ -1,4 +1,4 @@
-{% include 'emails.header-html' %}
+{% include 'v1.emails.header-html' %}
 <p style="font-family: 'Helvetica Neue', Helvetica, Arial, sans-serif;font-size:13px;">
     {{ trans('email.oauth_created_body', { name:client.name, url: client.redirect })|raw }}
 </p>
@@ -10,4 +10,4 @@
 <p style="font-family: 'Helvetica Neue', Helvetica, Arial, sans-serif;font-size:13px;">
     {{ trans('email.oauth_created_undo', { url:route('profile.index')}) }}
 </p>
-{% include 'emails.footer-html' %}
+{% include 'v1.emails.footer-html' %}
diff --git a/resources/views/v1/emails/oauth-client-created-text.twig b/resources/views/v1/emails/oauth-client-created-text.twig
index 566f2ad89b..050525320c 100644
--- a/resources/views/v1/emails/oauth-client-created-text.twig
+++ b/resources/views/v1/emails/oauth-client-created-text.twig
@@ -1,7 +1,7 @@
-{% include 'emails.header-text' %}
+{% include 'v1.emails.header-text' %}
 {{ trans('email.oauth_created_body', {name:  client.name, url: client.redirect })|striptags|raw }}
 
 {{ trans('email.oauth_created_explanation')|striptags|raw }}
 
 {{ trans('email.oauth_created_undo', { url:route('profile.index')})|raw }}
-{% include 'emails.footer-text' %}
+{% include 'v1.emails.footer-text' %}
diff --git a/resources/views/v1/emails/password-html.twig b/resources/views/v1/emails/password-html.twig
index 2f020fb924..fc761744f0 100644
--- a/resources/views/v1/emails/password-html.twig
+++ b/resources/views/v1/emails/password-html.twig
@@ -1,4 +1,4 @@
-{% include 'emails.header-html' %}
+{% include 'v1.emails.header-html' %}
 <p style="font-family: 'Helvetica Neue', Helvetica, Arial, sans-serif;font-size:13px;">
     {{ trans('email.reset_pw_instructions') }}
 </p>
@@ -10,4 +10,4 @@
 <p style="font-family: 'Helvetica Neue', Helvetica, Arial, sans-serif;font-size:13px;">
     <a href="{{ url }}">{{ url }}</a>
 </p>
-{% include 'emails.footer-html' %}
+{% include 'v1.emails.footer-html' %}
diff --git a/resources/views/v1/emails/password-text.twig b/resources/views/v1/emails/password-text.twig
index 258521ea99..1d8a35caf3 100644
--- a/resources/views/v1/emails/password-text.twig
+++ b/resources/views/v1/emails/password-text.twig
@@ -1,7 +1,7 @@
-{% include 'emails.header-text' %}
+{% include 'v1.emails.header-text' %}
 {{ trans('email.reset_pw_instructions')|raw }}
 
 {{ trans('email.reset_pw_warning')|striptags|raw }}
 
 {{ url }}
-{% include 'emails.footer-text' %}
+{% include 'v1.emails.footer-text' %}
diff --git a/resources/views/v1/emails/registered-html.twig b/resources/views/v1/emails/registered-html.twig
index 78d8b1052e..c7ffcd303d 100644
--- a/resources/views/v1/emails/registered-html.twig
+++ b/resources/views/v1/emails/registered-html.twig
@@ -1,4 +1,4 @@
-{% include 'emails.header-html' %}
+{% include 'v1.emails.header-html' %}
 <p style="font-family: 'Helvetica Neue', Helvetica, Arial, sans-serif;font-size:13px;">
     {{ trans('email.registered_welcome', {address: address})|raw }}
 </p>
@@ -17,4 +17,4 @@
 <p style="font-family: 'Helvetica Neue', Helvetica, Arial, sans-serif;font-size:13px;">
     {{ trans('email.registered_closing')}}
 </p>
-{% include 'emails.footer-html' %}
+{% include 'v1.emails.footer-html' %}
diff --git a/resources/views/v1/emails/registered-text.twig b/resources/views/v1/emails/registered-text.twig
index 78c696b065..ef9acd6f45 100644
--- a/resources/views/v1/emails/registered-text.twig
+++ b/resources/views/v1/emails/registered-text.twig
@@ -1,4 +1,4 @@
-{% include 'emails.header-text' %}
+{% include 'v1.emails.header-text' %}
 
 {{ trans('email.registered_welcome')|striptags|raw }}
 
@@ -18,4 +18,4 @@
 https://github.com/firefly-iii/firefly-iii
 https://firefly-iii.org/
 
-{% include 'emails.footer-text' %}
+{% include 'v1.emails.footer-text' %}
diff --git a/resources/views/v1/emails/report-new-journals-html.twig b/resources/views/v1/emails/report-new-journals-html.twig
index c4414ae4ed..50e0a80b02 100644
--- a/resources/views/v1/emails/report-new-journals-html.twig
+++ b/resources/views/v1/emails/report-new-journals-html.twig
@@ -1,4 +1,4 @@
-{% include 'emails.header-html' %}
+{% include 'v1.emails.header-html' %}
 <p style="font-family: 'Helvetica Neue', Helvetica, Arial, sans-serif;font-size:13px;">
     {{ trans_choice('email.new_journals_header', transformed|length ) }}
 </p>
@@ -75,4 +75,4 @@
     {% endfor %}
 </ol>
 
-{% include 'emails.footer-html' %}
+{% include 'v1.emails.footer-html' %}
diff --git a/resources/views/v1/emails/report-new-journals-text.twig b/resources/views/v1/emails/report-new-journals-text.twig
index fe6455141c..78ca2ae5a8 100644
--- a/resources/views/v1/emails/report-new-journals-text.twig
+++ b/resources/views/v1/emails/report-new-journals-text.twig
@@ -1,4 +1,4 @@
-{% include 'emails.header-text' %}
+{% include 'v1.emails.header-text' %}
 {{ trans_choice('email.new_journals_header', transformed|length )|raw }}
 
 
@@ -13,4 +13,4 @@
 {% endfor %}
 {% endif %}
 {% endfor %}
-{% include 'emails.footer-text' %}
+{% include 'v1.emails.footer-text' %}
diff --git a/resources/views/v1/emails/undo-email-change-html.twig b/resources/views/v1/emails/undo-email-change-html.twig
index 00bc5bb7a4..557ad4c3b6 100644
--- a/resources/views/v1/emails/undo-email-change-html.twig
+++ b/resources/views/v1/emails/undo-email-change-html.twig
@@ -1,4 +1,4 @@
-{% include 'emails.header-html' %}
+{% include 'v1.emails.header-html' %}
 <p style="font-family: 'Helvetica Neue', Helvetica, Arial, sans-serif;font-size:13px;">
     {{ trans('email.email_change_body_to_old')|raw }}
 </p>
@@ -14,4 +14,4 @@
 <p style="font-family: 'Helvetica Neue', Helvetica, Arial, sans-serif;font-size:13px;">
     {{trans('email.email_change_undo_link')}} <a href="{{ uri }}">{{ uri }}</a>
 </p>
-{% include 'emails.footer-html' %}
+{% include 'v1.emails.footer-html' %}
diff --git a/resources/views/v1/emails/undo-email-change-text.twig b/resources/views/v1/emails/undo-email-change-text.twig
index 2c719b9e4d..f795ef3a95 100644
--- a/resources/views/v1/emails/undo-email-change-text.twig
+++ b/resources/views/v1/emails/undo-email-change-text.twig
@@ -1,4 +1,4 @@
-{% include 'emails.header-text' %}
+{% include 'v1.emails.header-text' %}
 {{ trans('email.email_change_body_to_old')|striptags|raw }}
 
 {{ trans('email.email_change_ignore')|raw }}
@@ -8,4 +8,4 @@
 {{trans('email.email_change_new', { email: newEmail })|raw }}
 
 {{ trans('email.email_change_undo_link')|raw }} {{ uri }}
-{% include 'emails.footer-text' %}
+{% include 'v1.emails.footer-text' %}
diff --git a/resources/views/v1/errors/404.twig b/resources/views/v1/errors/404.twig
index ff730e26f1..00227a8162 100644
--- a/resources/views/v1/errors/404.twig
+++ b/resources/views/v1/errors/404.twig
@@ -23,7 +23,7 @@
     <link href="v1/css/error.css?v={{ FF_VERSION }}" rel="stylesheet" type="text/css"/>
 
     {# favicons #}
-    {% include('partials.favicons') %}
+    {% include('v1.partials.favicons') %}
 
 </head>
 <body class="container">
diff --git a/resources/views/v1/errors/500.twig b/resources/views/v1/errors/500.twig
index 5c999bbba8..814fbb71c2 100644
--- a/resources/views/v1/errors/500.twig
+++ b/resources/views/v1/errors/500.twig
@@ -23,7 +23,7 @@
     <link href="v1/css/error.css?v={{ FF_VERSION }}" rel="stylesheet" type="text/css"/>
 
     {# favicons #}
-    {% include('partials.favicons') %}
+    {% include('v1.partials.favicons') %}
 
 </head>
 <body class="container">
diff --git a/resources/views/v1/errors/503.twig b/resources/views/v1/errors/503.twig
index d63c7043e6..515e4726b9 100644
--- a/resources/views/v1/errors/503.twig
+++ b/resources/views/v1/errors/503.twig
@@ -19,7 +19,7 @@
     <link href="v1/css/error.css?v={{ FF_VERSION }}" rel="stylesheet" type="text/css"/>
 
     {# favicons #}
-    {% include('partials.favicons') %}
+    {% include('v1.partials.favicons') %}
 
 </head>
 <body class="container">
diff --git a/resources/views/v1/errors/FireflyException.twig b/resources/views/v1/errors/FireflyException.twig
index 8cccb71bd8..de24cb9b7c 100644
--- a/resources/views/v1/errors/FireflyException.twig
+++ b/resources/views/v1/errors/FireflyException.twig
@@ -23,7 +23,7 @@
     <link href="v1/css/error.css?v={{ FF_VERSION }}" rel="stylesheet" type="text/css"/>
 
     {# favicons #}
-    {% include('partials.favicons') %}
+    {% include('v1.partials.favicons') %}
 
 </head>
 <body class="container">
diff --git a/resources/views/v1/export/index.twig b/resources/views/v1/export/index.twig
index 5f93768f95..1671d28b1f 100644
--- a/resources/views/v1/export/index.twig
+++ b/resources/views/v1/export/index.twig
@@ -1,4 +1,4 @@
-{% extends "./layout/default" %}
+{% extends './v1/layout/default' %}
 
 {% block breadcrumbs %}
     {{ Breadcrumbs.render(Route.getCurrentRoute.getName) }}
diff --git a/resources/views/v1/index.twig b/resources/views/v1/index.twig
index 74ec0c20eb..76dc2c612f 100644
--- a/resources/views/v1/index.twig
+++ b/resources/views/v1/index.twig
@@ -1,10 +1,10 @@
-{% extends "./layout/default" %}
+{% extends "./v1/layout/default" %}
 
 {% block breadcrumbs %}
     {{ Breadcrumbs.render }}
 {% endblock %}
 {% block content %}
-    {% include 'partials.boxes' %}
+    {% include 'v1.partials.boxes' %}
     <div class="row">
         <div class="col-lg-8 col-md-12 col-sm-12">
             {# ACCOUNTS #}
@@ -65,7 +65,7 @@
 
                         {% if data.transactions|length > 0 %}
                             <div class="box-body no-padding">
-                                {% include 'list.groups-tiny' with {'transactions': data.transactions,'account': data.account} %}
+                                {% include 'v1.list.groups-tiny' with {'transactions': data.transactions,'account': data.account} %}
                             </div>
                         {% else %}
                             <div class="box-body">
diff --git a/resources/views/v1/layout/default.twig b/resources/views/v1/layout/default.twig
index 7e3f1d340c..1506dbab53 100644
--- a/resources/views/v1/layout/default.twig
+++ b/resources/views/v1/layout/default.twig
@@ -49,7 +49,7 @@
     <script type="text/javascript" nonce="{{ JS_NONCE }}">var forceDemoOff = false;</script>
 
     {# favicons #}
-    {% include('partials.favicons') %}
+    {% include 'v1.partials.favicons' %}
 
 </head>
 <body class="skin-blue-light sidebar-mini hold-transition">
@@ -107,13 +107,13 @@
               </span>
                 </div>
             </form>
-            {% include('partials.menu-sidebar') %}
+            {% include('v1.partials.menu-sidebar') %}
         </section>
     </aside>
 
     <div class="content-wrapper">
         <section class="content-header">
-            {% include('partials.page-header') %}
+            {% include('v1.partials.page-header') %}
             {% block breadcrumbs %}{% endblock %}
         </section>
 
@@ -128,7 +128,7 @@
                 </div>
             {% endif %}
 
-            {% include('partials.flashes') %}
+            {% include('v1.partials.flashes') %}
 
             {% block content %}{% endblock %}
         </section>
@@ -143,7 +143,7 @@
         {% if FF_IS_BETA %}<small class="text-warning hidden-xs"><br>{{ 'is_beta_warning'|_ }}</small>{% endif %}
     </footer>
 
-    {% include('partials.control-bar') %}
+    {% include('v1.partials.control-bar') %}
 
 </div>
 <div class="modal fade" id="defaultModal" tabindex="-1" role="dialog">
diff --git a/resources/views/v1/layout/empty.twig b/resources/views/v1/layout/empty.twig
index d90638e5f3..537cf4f48e 100644
--- a/resources/views/v1/layout/empty.twig
+++ b/resources/views/v1/layout/empty.twig
@@ -30,7 +30,7 @@
     <![endif]-->
 
     {# favicons #}
-    {% include('partials.favicons') %}
+    {% include('v1.partials.favicons') %}
 
 </head>
 <body class="login-page">
diff --git a/resources/views/v1/layout/guest.twig b/resources/views/v1/layout/guest.twig
index 8a269a8fc3..fc5f4a2f02 100644
--- a/resources/views/v1/layout/guest.twig
+++ b/resources/views/v1/layout/guest.twig
@@ -40,7 +40,7 @@
     <![endif]-->
 
     {# favicons #}
-    {% include('partials.favicons') %}
+    {% include('v1.partials.favicons') %}
 
 </head>
 <body class="login-page">
diff --git a/resources/views/v1/layout/install.twig b/resources/views/v1/layout/install.twig
index 075cf0ca4d..ffe4c20b7d 100644
--- a/resources/views/v1/layout/install.twig
+++ b/resources/views/v1/layout/install.twig
@@ -23,7 +23,7 @@
     <![endif]-->
 
     {# favicons #}
-    {% include('partials.favicons') %}
+    {% include('v1.partials.favicons') %}
 
 </head>
 <body class="login-page">
diff --git a/resources/views/v1/new-user/index.twig b/resources/views/v1/new-user/index.twig
index 316bb7c5b5..80f0eb1125 100644
--- a/resources/views/v1/new-user/index.twig
+++ b/resources/views/v1/new-user/index.twig
@@ -1,4 +1,4 @@
-{% extends "./layout/default" %}
+{% extends './v1/layout/default' %}
 
 {% block breadcrumbs %}
     {{ Breadcrumbs.render(Route.getCurrentRoute.getName) }}
diff --git a/resources/views/v1/object-groups/delete.twig b/resources/views/v1/object-groups/delete.twig
index aee112d1a9..2358f07b7c 100644
--- a/resources/views/v1/object-groups/delete.twig
+++ b/resources/views/v1/object-groups/delete.twig
@@ -1,4 +1,4 @@
-{% extends "./layout/default" %}
+{% extends './v1/layout/default' %}
 
 {% block breadcrumbs %}
     {{ Breadcrumbs.render(Route.getCurrentRoute.getName, objectGroup) }}
diff --git a/resources/views/v1/object-groups/edit.twig b/resources/views/v1/object-groups/edit.twig
index c0b4f8144f..a16fee9a8a 100644
--- a/resources/views/v1/object-groups/edit.twig
+++ b/resources/views/v1/object-groups/edit.twig
@@ -1,4 +1,4 @@
-{% extends "./layout/default" %}
+{% extends './v1/layout/default' %}
 
 {% block breadcrumbs %}
     {{ Breadcrumbs.render(Route.getCurrentRoute.getName, objectGroup) }}
diff --git a/resources/views/v1/object-groups/index.twig b/resources/views/v1/object-groups/index.twig
index 62fe0db1a1..53ab37bc19 100644
--- a/resources/views/v1/object-groups/index.twig
+++ b/resources/views/v1/object-groups/index.twig
@@ -1,4 +1,4 @@
-{% extends "./layout/default" %}
+{% extends './v1/layout/default' %}
 
 {% block breadcrumbs %}
     {{ Breadcrumbs.render }}
diff --git a/resources/views/v1/piggy-banks/add-mobile.twig b/resources/views/v1/piggy-banks/add-mobile.twig
index 586e932204..cf1c811d1c 100644
--- a/resources/views/v1/piggy-banks/add-mobile.twig
+++ b/resources/views/v1/piggy-banks/add-mobile.twig
@@ -1,4 +1,4 @@
-{% extends "./layout/default" %}
+{% extends './v1/layout/default' %}
 
 {% block breadcrumbs %}
     {{ Breadcrumbs.render(Route.getCurrentRoute.getName, piggyBank) }}
diff --git a/resources/views/v1/piggy-banks/create.twig b/resources/views/v1/piggy-banks/create.twig
index 0b8a2dad0e..b0e6231e4c 100644
--- a/resources/views/v1/piggy-banks/create.twig
+++ b/resources/views/v1/piggy-banks/create.twig
@@ -1,4 +1,4 @@
-{% extends "./layout/default" %}
+{% extends './v1/layout/default' %}
 
 {% block breadcrumbs %}
     {{ Breadcrumbs.render(Route.getCurrentRoute.getName) }}
diff --git a/resources/views/v1/piggy-banks/delete.twig b/resources/views/v1/piggy-banks/delete.twig
index 561acd6592..2cb1982a74 100644
--- a/resources/views/v1/piggy-banks/delete.twig
+++ b/resources/views/v1/piggy-banks/delete.twig
@@ -1,4 +1,4 @@
-{% extends "./layout/default" %}
+{% extends './v1/layout/default' %}
 
 {% block breadcrumbs %}
     {{ Breadcrumbs.render(Route.getCurrentRoute.getName, piggyBank) }}
diff --git a/resources/views/v1/piggy-banks/edit.twig b/resources/views/v1/piggy-banks/edit.twig
index a7c5d0670f..f1040bd94b 100644
--- a/resources/views/v1/piggy-banks/edit.twig
+++ b/resources/views/v1/piggy-banks/edit.twig
@@ -1,4 +1,4 @@
-{% extends "./layout/default" %}
+{% extends './v1/layout/default' %}
 
 {% block breadcrumbs %}
     {{ Breadcrumbs.render(Route.getCurrentRoute.getName, piggyBank) }}
diff --git a/resources/views/v1/piggy-banks/index.twig b/resources/views/v1/piggy-banks/index.twig
index dcaf17d05d..6bae280bec 100644
--- a/resources/views/v1/piggy-banks/index.twig
+++ b/resources/views/v1/piggy-banks/index.twig
@@ -1,4 +1,4 @@
-{% extends "./layout/default" %}
+{% extends './v1/layout/default' %}
 
 {% block breadcrumbs %}
     {{ Breadcrumbs.render(Route.getCurrentRoute.getName) }}
@@ -6,7 +6,7 @@
 
 {% block content %}
     {% if piggyBanks|length == 0 %}
-        {% include 'partials.empty' with {objectType: 'default', type: 'piggies',route: route('piggy-banks.create')} %}
+        {% include 'v1.partials.empty' with {objectType: 'default', type: 'piggies',route: route('piggy-banks.create')} %}
     {% else %}
 <div class="row">
     <div class="col-lg-12 col-md-12 col-sm-12">
@@ -18,7 +18,7 @@
                 <div style="padding:8px;">
                     <a class="btn btn-success" href="{{ route('piggy-banks.create') }}"><i class="fa fa-plus fa-fw"></i> {{ 'create_new_piggy_bank'|_ }}</a>
                 </div>
-                {% include 'list/piggy-banks' %}
+                {% include 'v1.list/piggy-banks' %}
             </div>
             <div class="box-footer">
                 <a class="btn btn-success" href="{{ route('piggy-banks.create') }}"><i class="fa fa-plus fa-fw"></i> {{ 'create_new_piggy_bank'|_ }}</a>
diff --git a/resources/views/v1/piggy-banks/remove-mobile.twig b/resources/views/v1/piggy-banks/remove-mobile.twig
index f5fbe224e2..71594408bb 100644
--- a/resources/views/v1/piggy-banks/remove-mobile.twig
+++ b/resources/views/v1/piggy-banks/remove-mobile.twig
@@ -1,4 +1,4 @@
-{% extends "./layout/default" %}
+{% extends './v1/layout/default' %}
 {% block breadcrumbs %}
     {{ Breadcrumbs.render(Route.getCurrentRoute.getName, piggyBank) }}
 {% endblock %}
diff --git a/resources/views/v1/piggy-banks/show.twig b/resources/views/v1/piggy-banks/show.twig
index 7401539b6e..f44e86d7f3 100644
--- a/resources/views/v1/piggy-banks/show.twig
+++ b/resources/views/v1/piggy-banks/show.twig
@@ -1,4 +1,4 @@
-{% extends "./layout/default" %}
+{% extends './v1/layout/default' %}
 
 {% block breadcrumbs %}
     {{ Breadcrumbs.render(Route.getCurrentRoute.getName, piggyBank) }}
@@ -97,7 +97,7 @@
                     <h3 class="box-title">{{ 'transactions'|_ }}</h3>
                 </div>
                 <div class="box-body no-padding" id="piggyEvents">
-                    {% include 'list/piggy-bank-events' %}
+                    {% include 'v1.list/piggy-bank-events' %}
                 </div>
             </div>
         </div>
@@ -126,7 +126,7 @@
                         </h3>
                     </div>
                     <div class="box-body no-padding">
-                        {% include 'list.attachments' %}
+                        {% include 'v1.list.attachments' %}
                     </div>
                 </div>
             </div>
diff --git a/resources/views/v1/preferences/index.twig b/resources/views/v1/preferences/index.twig
index c469e17f8c..58a9061ff8 100644
--- a/resources/views/v1/preferences/index.twig
+++ b/resources/views/v1/preferences/index.twig
@@ -1,4 +1,4 @@
-{% extends "./layout/default" %}
+{% extends './v1/layout/default' %}
 
 {% block breadcrumbs %}
     {{ Breadcrumbs.render(Route.getCurrentRoute.getName) }}
diff --git a/resources/views/v1/profile/change-email.twig b/resources/views/v1/profile/change-email.twig
index e4ffd1cd3a..d0bd49ab5d 100644
--- a/resources/views/v1/profile/change-email.twig
+++ b/resources/views/v1/profile/change-email.twig
@@ -1,4 +1,4 @@
-{% extends "./layout/default" %}
+{% extends './v1/layout/default' %}
 
 {% block breadcrumbs %}
     {{ Breadcrumbs.render(Route.getCurrentRoute.getName) }}
diff --git a/resources/views/v1/profile/change-password.twig b/resources/views/v1/profile/change-password.twig
index 01832fc6a5..9f34ca585b 100644
--- a/resources/views/v1/profile/change-password.twig
+++ b/resources/views/v1/profile/change-password.twig
@@ -1,4 +1,4 @@
-{% extends "./layout/default" %}
+{% extends './v1/layout/default' %}
 
 {% block breadcrumbs %}
     {{ Breadcrumbs.render(Route.getCurrentRoute.getName) }}
@@ -65,5 +65,5 @@
             </div>
         </div>
     </form>
-    {% include 'partials.password-modal' %}
+    {% include 'v1.partials.password-modal' %}
 {% endblock %}
diff --git a/resources/views/v1/profile/code.twig b/resources/views/v1/profile/code.twig
index 5cd4ee10b5..2e8edf81d0 100644
--- a/resources/views/v1/profile/code.twig
+++ b/resources/views/v1/profile/code.twig
@@ -1,4 +1,4 @@
-{% extends "./layout/default" %}
+{% extends './v1/layout/default' %}
 
 {% block breadcrumbs %}
     {{ Breadcrumbs.render(Route.getCurrentRoute.getName) }}
diff --git a/resources/views/v1/profile/delete-account.twig b/resources/views/v1/profile/delete-account.twig
index 0b937630d3..64bb5cf8e0 100644
--- a/resources/views/v1/profile/delete-account.twig
+++ b/resources/views/v1/profile/delete-account.twig
@@ -1,4 +1,4 @@
-{% extends "./layout/default" %}
+{% extends './v1/layout/default' %}
 
 {% block breadcrumbs %}
     {{ Breadcrumbs.render(Route.getCurrentRoute.getName) }}
diff --git a/resources/views/v1/profile/index.twig b/resources/views/v1/profile/index.twig
index 5da60c94c2..1c2026d1cc 100644
--- a/resources/views/v1/profile/index.twig
+++ b/resources/views/v1/profile/index.twig
@@ -1,5 +1,5 @@
 {% set VUE_SCRIPT_NAME = 'profile' %}
-{% extends "./layout/default" %}
+{% extends './v1/layout/default' %}
 
 {% block breadcrumbs %}
     {{ Breadcrumbs.render(Route.getCurrentRoute.getName) }}
diff --git a/resources/views/v1/profile/logout-other-sessions.twig b/resources/views/v1/profile/logout-other-sessions.twig
index 1dbc5fddb9..06a60c3807 100644
--- a/resources/views/v1/profile/logout-other-sessions.twig
+++ b/resources/views/v1/profile/logout-other-sessions.twig
@@ -1,4 +1,4 @@
-{% extends "./layout/default" %}
+{% extends './v1/layout/default' %}
 
 {% block breadcrumbs %}
     {{ Breadcrumbs.render(Route.getCurrentRoute.getName) }}
@@ -31,5 +31,5 @@
             </div>
         </div>
     </form>
-    {% include 'partials.password-modal' %}
+    {% include 'v1.partials.password-modal' %}
 {% endblock %}
diff --git a/resources/views/v1/profile/new-backup-codes.twig b/resources/views/v1/profile/new-backup-codes.twig
index 79056c54bb..a8fffec93d 100644
--- a/resources/views/v1/profile/new-backup-codes.twig
+++ b/resources/views/v1/profile/new-backup-codes.twig
@@ -1,4 +1,4 @@
-{% extends "./layout/default" %}
+{% extends './v1/layout/default' %}
 
 {% block breadcrumbs %}
     {{ Breadcrumbs.render(Route.getCurrentRoute.getName) }}
diff --git a/resources/views/v1/recurring/create.twig b/resources/views/v1/recurring/create.twig
index e7b041f9aa..152e825ad0 100644
--- a/resources/views/v1/recurring/create.twig
+++ b/resources/views/v1/recurring/create.twig
@@ -1,4 +1,4 @@
-{% extends "./layout/default" %}
+{% extends './v1/layout/default' %}
 {% block breadcrumbs %}
     {{ Breadcrumbs.render(Route.getCurrentRoute.getName) }}
 {% endblock %}
diff --git a/resources/views/v1/recurring/delete.twig b/resources/views/v1/recurring/delete.twig
index 2843a5705e..bb0ba4005d 100644
--- a/resources/views/v1/recurring/delete.twig
+++ b/resources/views/v1/recurring/delete.twig
@@ -1,4 +1,4 @@
-{% extends "./layout/default" %}
+{% extends './v1/layout/default' %}
 
 {% block breadcrumbs %}
     {{ Breadcrumbs.render(Route.getCurrentRoute.getName, recurrence) }}
diff --git a/resources/views/v1/recurring/edit.twig b/resources/views/v1/recurring/edit.twig
index 244cd3d9bf..d89aa9b501 100644
--- a/resources/views/v1/recurring/edit.twig
+++ b/resources/views/v1/recurring/edit.twig
@@ -1,4 +1,4 @@
-{% extends "./layout/default" %}
+{% extends './v1/layout/default' %}
 {% block breadcrumbs %}
     {{ Breadcrumbs.render(Route.getCurrentRoute.getName, recurrence) }}
 {% endblock %}
diff --git a/resources/views/v1/recurring/index.twig b/resources/views/v1/recurring/index.twig
index b59f02b817..1a9d68b5ea 100644
--- a/resources/views/v1/recurring/index.twig
+++ b/resources/views/v1/recurring/index.twig
@@ -1,4 +1,4 @@
-{% extends "./layout/default" %}
+{% extends './v1/layout/default' %}
 
 {% block breadcrumbs %}
     {{ Breadcrumbs.render(Route.getCurrentRoute.getName) }}
@@ -155,7 +155,7 @@
 
 
     {% if total == 0 and page == 1 %}
-        {% include 'partials.empty' with {objectType: 'default', type: 'recurring',route: route('recurring.create')} %}
+        {% include 'v1.partials.empty' with {objectType: 'default', type: 'recurring',route: route('recurring.create')} %}
     {% endif %}
 {% endblock %}
 
diff --git a/resources/views/v1/recurring/show.twig b/resources/views/v1/recurring/show.twig
index 1669c522aa..0921ef1cc6 100644
--- a/resources/views/v1/recurring/show.twig
+++ b/resources/views/v1/recurring/show.twig
@@ -1,4 +1,4 @@
-{% extends "./layout/default" %}
+{% extends './v1/layout/default' %}
 
 {% block breadcrumbs %}
     {{ Breadcrumbs.render(Route.getCurrentRoute.getName, recurrence) }}
@@ -167,7 +167,7 @@
                     </h3>
                 </div>
                 <div class="box-body">
-                    {% include 'list.groups' %}
+                    {% include 'v1.list.groups' %}
                 </div>
             </div>
         </div>
diff --git a/resources/views/v1/reports/audit/report.twig b/resources/views/v1/reports/audit/report.twig
index aea2bc4c76..5f6764f62c 100644
--- a/resources/views/v1/reports/audit/report.twig
+++ b/resources/views/v1/reports/audit/report.twig
@@ -1,4 +1,4 @@
-{% extends "./layout/default" %}
+{% extends './v1/layout/default' %}
 
 {% block breadcrumbs %}
     {{ Breadcrumbs.render(Route.getCurrentRoute.getName, accountIds, start, end) }}
diff --git a/resources/views/v1/reports/budget/month.twig b/resources/views/v1/reports/budget/month.twig
index 1b2537fad1..71d49cde21 100644
--- a/resources/views/v1/reports/budget/month.twig
+++ b/resources/views/v1/reports/budget/month.twig
@@ -1,4 +1,4 @@
-{% extends "./layout/default" %}
+{% extends './v1/layout/default' %}
 
 {% block breadcrumbs %}
     {{ Breadcrumbs.render(Route.getCurrentRoute.getName, accountIds, budgetIds, start, end) }}
diff --git a/resources/views/v1/reports/category/month.twig b/resources/views/v1/reports/category/month.twig
index eb7b04b868..f9d4760b89 100644
--- a/resources/views/v1/reports/category/month.twig
+++ b/resources/views/v1/reports/category/month.twig
@@ -1,4 +1,4 @@
-{% extends "./layout/default" %}
+{% extends './v1/layout/default' %}
 
 {% block breadcrumbs %}
     {{ Breadcrumbs.render(Route.getCurrentRoute.getName, accountIds, categoryIds, start, end) }}
diff --git a/resources/views/v1/reports/default/month.twig b/resources/views/v1/reports/default/month.twig
index 51de27277b..5e89a5f1a4 100644
--- a/resources/views/v1/reports/default/month.twig
+++ b/resources/views/v1/reports/default/month.twig
@@ -1,4 +1,4 @@
-{% extends "./layout/default" %}
+{% extends './v1/layout/default' %}
 
 {% block breadcrumbs %}
     {{ Breadcrumbs.render(Route.getCurrentRoute.getName, accountIds, start, end) }}
diff --git a/resources/views/v1/reports/default/multi-year.twig b/resources/views/v1/reports/default/multi-year.twig
index 760e3e4b1d..8da87db864 100644
--- a/resources/views/v1/reports/default/multi-year.twig
+++ b/resources/views/v1/reports/default/multi-year.twig
@@ -1,4 +1,4 @@
-{% extends "./layout/default" %}
+{% extends './v1/layout/default' %}
 
 {% block breadcrumbs %}
     {{ Breadcrumbs.render(Route.getCurrentRoute.getName, accountIds, start, end) }}
diff --git a/resources/views/v1/reports/default/year.twig b/resources/views/v1/reports/default/year.twig
index cd44bc6d77..1ca30adc85 100644
--- a/resources/views/v1/reports/default/year.twig
+++ b/resources/views/v1/reports/default/year.twig
@@ -1,4 +1,4 @@
-{% extends "./layout/default" %}
+{% extends './v1/layout/default' %}
 
 {% block breadcrumbs %}
     {{ Breadcrumbs.render(Route.getCurrentRoute.getName, accountIds, start, end) }}
diff --git a/resources/views/v1/reports/double/report.twig b/resources/views/v1/reports/double/report.twig
index a9ce539098..e182629195 100644
--- a/resources/views/v1/reports/double/report.twig
+++ b/resources/views/v1/reports/double/report.twig
@@ -1,4 +1,4 @@
-{% extends "./layout/default" %}
+{% extends './v1/layout/default' %}
 
 {% block breadcrumbs %}
     {{ Breadcrumbs.render(Route.getCurrentRoute.getName, accountIds, doubleIds, start, end) }}
diff --git a/resources/views/v1/reports/index.twig b/resources/views/v1/reports/index.twig
index 8bda4e698b..c32a07bb92 100644
--- a/resources/views/v1/reports/index.twig
+++ b/resources/views/v1/reports/index.twig
@@ -1,4 +1,4 @@
-{% extends "./layout/default" %}
+{% extends './v1/layout/default' %}
 
 {% block breadcrumbs %}
     {{ Breadcrumbs.render(Route.getCurrentRoute.getName) }}
diff --git a/resources/views/v1/reports/tag/month.twig b/resources/views/v1/reports/tag/month.twig
index 5ed152ee39..1d42dfd6e8 100644
--- a/resources/views/v1/reports/tag/month.twig
+++ b/resources/views/v1/reports/tag/month.twig
@@ -1,4 +1,4 @@
-{% extends "./layout/default" %}
+{% extends './v1/layout/default' %}
 
 {% block breadcrumbs %}
     {{ Breadcrumbs.render(Route.getCurrentRoute.getName, accountIds, tagIds, start, end) }}
diff --git a/resources/views/v1/rules/index.twig b/resources/views/v1/rules/index.twig
index 29099c31a5..c24e8aa28f 100644
--- a/resources/views/v1/rules/index.twig
+++ b/resources/views/v1/rules/index.twig
@@ -1,4 +1,4 @@
-{% extends "./layout/default" %}
+{% extends './v1/layout/default' %}
 {% block breadcrumbs %}
     {{ Breadcrumbs.render(Route.getCurrentRoute.getName) }}
 {% endblock %}
diff --git a/resources/views/v1/rules/rule-group/create.twig b/resources/views/v1/rules/rule-group/create.twig
index 1ce63b0337..019a7cb858 100644
--- a/resources/views/v1/rules/rule-group/create.twig
+++ b/resources/views/v1/rules/rule-group/create.twig
@@ -1,4 +1,4 @@
-{% extends "./layout/default" %}
+{% extends './v1/layout/default' %}
 
 {% block breadcrumbs %}
     {{ Breadcrumbs.render(Route.getCurrentRoute.getName) }}
diff --git a/resources/views/v1/rules/rule-group/delete.twig b/resources/views/v1/rules/rule-group/delete.twig
index 32e5b472cf..ae74987cdf 100644
--- a/resources/views/v1/rules/rule-group/delete.twig
+++ b/resources/views/v1/rules/rule-group/delete.twig
@@ -1,4 +1,4 @@
-{% extends "./layout/default" %}
+{% extends './v1/layout/default' %}
 
 {% block breadcrumbs %}
     {{ Breadcrumbs.render(Route.getCurrentRoute.getName, ruleGroup) }}
diff --git a/resources/views/v1/rules/rule-group/edit.twig b/resources/views/v1/rules/rule-group/edit.twig
index 5a89eb509f..43a72103e5 100644
--- a/resources/views/v1/rules/rule-group/edit.twig
+++ b/resources/views/v1/rules/rule-group/edit.twig
@@ -1,4 +1,4 @@
-{% extends "./layout/default" %}
+{% extends './v1/layout/default' %}
 
 {% block breadcrumbs %}
     {{ Breadcrumbs.render(Route.getCurrentRoute.getName, ruleGroup) }}
diff --git a/resources/views/v1/rules/rule-group/select-transactions.twig b/resources/views/v1/rules/rule-group/select-transactions.twig
index e0838d9374..79c4f8e41a 100644
--- a/resources/views/v1/rules/rule-group/select-transactions.twig
+++ b/resources/views/v1/rules/rule-group/select-transactions.twig
@@ -1,4 +1,4 @@
-{% extends "./layout/default" %}
+{% extends './v1/layout/default' %}
 
 {% block breadcrumbs %}
     {{ Breadcrumbs.render(Route.getCurrentRoute.getName, ruleGroup) }}
diff --git a/resources/views/v1/rules/rule/create.twig b/resources/views/v1/rules/rule/create.twig
index cb3e0acc28..9c13a2fd4d 100644
--- a/resources/views/v1/rules/rule/create.twig
+++ b/resources/views/v1/rules/rule/create.twig
@@ -1,4 +1,4 @@
-{% extends "./layout/default" %}
+{% extends './v1/layout/default' %}
 
 {% block breadcrumbs %}
     {{ Breadcrumbs.render(Route.getCurrentRoute.getName, ruleGroup) }}
diff --git a/resources/views/v1/rules/rule/delete.twig b/resources/views/v1/rules/rule/delete.twig
index e091e40664..7013e30a94 100644
--- a/resources/views/v1/rules/rule/delete.twig
+++ b/resources/views/v1/rules/rule/delete.twig
@@ -1,4 +1,4 @@
-{% extends "./layout/default" %}
+{% extends './v1/layout/default' %}
 
 {% block breadcrumbs %}
     {{ Breadcrumbs.render(Route.getCurrentRoute.getName, rule) }}
diff --git a/resources/views/v1/rules/rule/edit.twig b/resources/views/v1/rules/rule/edit.twig
index 451496da71..cbada66a52 100644
--- a/resources/views/v1/rules/rule/edit.twig
+++ b/resources/views/v1/rules/rule/edit.twig
@@ -1,4 +1,4 @@
-{% extends "./layout/default" %}
+{% extends './v1/layout/default' %}
 
 {% block breadcrumbs %}
     {{ Breadcrumbs.render(Route.getCurrentRoute.getName, rule) }}
diff --git a/resources/views/v1/rules/rule/select-transactions.twig b/resources/views/v1/rules/rule/select-transactions.twig
index 224bbe4570..aa553e9712 100644
--- a/resources/views/v1/rules/rule/select-transactions.twig
+++ b/resources/views/v1/rules/rule/select-transactions.twig
@@ -1,4 +1,4 @@
-{% extends "./layout/default" %}
+{% extends './v1/layout/default' %}
 
 {% block breadcrumbs %}
     {{ Breadcrumbs.render(Route.getCurrentRoute.getName, rule) }}
diff --git a/resources/views/v1/search/index.twig b/resources/views/v1/search/index.twig
index 384984d046..f173e84eca 100644
--- a/resources/views/v1/search/index.twig
+++ b/resources/views/v1/search/index.twig
@@ -1,4 +1,4 @@
-{% extends "./layout/default" %}
+{% extends './v1/layout/default' %}
 
 {% block breadcrumbs %}
     {{ Breadcrumbs.render(Route.getCurrentRoute.getName, fullQuery) }}
diff --git a/resources/views/v1/search/search.twig b/resources/views/v1/search/search.twig
index 4a3e8ddb0f..7acb12274c 100644
--- a/resources/views/v1/search/search.twig
+++ b/resources/views/v1/search/search.twig
@@ -8,4 +8,4 @@
     {% endif %}
 </p>
 
-{% include 'list.groups' %}
+{% include 'v1.list.groups' %}
diff --git a/resources/views/v1/tags/create.twig b/resources/views/v1/tags/create.twig
index 96805de641..2363809642 100644
--- a/resources/views/v1/tags/create.twig
+++ b/resources/views/v1/tags/create.twig
@@ -1,4 +1,4 @@
-{% extends "./layout/default" %}
+{% extends './v1/layout/default' %}
 
 {% block breadcrumbs %}
     {{ Breadcrumbs.render(Route.getCurrentRoute.getName) }}
diff --git a/resources/views/v1/tags/delete.twig b/resources/views/v1/tags/delete.twig
index ddaad19c3f..e9519698a1 100644
--- a/resources/views/v1/tags/delete.twig
+++ b/resources/views/v1/tags/delete.twig
@@ -1,4 +1,4 @@
-{% extends "./layout/default" %}
+{% extends './v1/layout/default' %}
 
 {% block breadcrumbs %}
     {{ Breadcrumbs.render(Route.getCurrentRoute.getName, tag) }}
diff --git a/resources/views/v1/tags/edit.twig b/resources/views/v1/tags/edit.twig
index cc1bb5d50b..c7f927855e 100644
--- a/resources/views/v1/tags/edit.twig
+++ b/resources/views/v1/tags/edit.twig
@@ -1,4 +1,4 @@
-{% extends "./layout/default" %}
+{% extends './v1/layout/default' %}
 
 {% block breadcrumbs %}
     {{ Breadcrumbs.render(Route.getCurrentRoute.getName, tag) }}
diff --git a/resources/views/v1/tags/index.twig b/resources/views/v1/tags/index.twig
index 63995ce74e..0e07bb70b0 100644
--- a/resources/views/v1/tags/index.twig
+++ b/resources/views/v1/tags/index.twig
@@ -1,4 +1,4 @@
-{% extends "./layout/default" %}
+{% extends './v1/layout/default' %}
 
 {% block breadcrumbs %}
     {{ Breadcrumbs.render(Route.getCurrentRoute.getName) }}
@@ -6,7 +6,7 @@
 
 {% block content %}
     {% if count == 0 %}
-        {% include 'partials.empty' with {objectType: 'default', type: 'tags',route: route('tags.create')} %}
+        {% include 'v1.partials.empty' with {objectType: 'default', type: 'tags',route: route('tags.create')} %}
     {% else %}
         <div class="row">
             <div class="col-lg-12 col-md-12 col-sm-12 col-xs-12">
diff --git a/resources/views/v1/tags/show.twig b/resources/views/v1/tags/show.twig
index 597b16adcf..1b3295a445 100644
--- a/resources/views/v1/tags/show.twig
+++ b/resources/views/v1/tags/show.twig
@@ -1,4 +1,4 @@
-{% extends "./layout/default" %}
+{% extends './v1/layout/default' %}
 
 {% block breadcrumbs %}
     {{ Breadcrumbs.render(Route.getCurrentRoute.getName, tag, start, end) }}
@@ -213,7 +213,7 @@
                         </h3>
                     </div>
                     <div class="box-body no-padding">
-                        {% include 'list.attachments' %}
+                        {% include 'v1.list.attachments' %}
                     </div>
                 </div>
             </div>
@@ -251,7 +251,7 @@
                     </div>
                 </div>
                 <div class="box-body">
-                    {% include 'list.groups' with {showBudget:true, showCategory: true} %}
+                    {% include 'v1.list.groups' with {showBudget:true, showCategory: true} %}
 
                     {% if periods|length > 0 %}
                         <p>
@@ -273,7 +273,7 @@
         </div>
         {% if periods|length > 0 %}
             <div class="col-lg-2 col-md-2 col-sm-12 col-xs-12">
-                {% include 'list.periods' %}
+                {% include 'v1.list.periods' %}
             </div>
         {% endif %}
     </div>
diff --git a/resources/views/v1/transactions/bulk/edit.twig b/resources/views/v1/transactions/bulk/edit.twig
index 9c32011ac9..b94c9ed2be 100644
--- a/resources/views/v1/transactions/bulk/edit.twig
+++ b/resources/views/v1/transactions/bulk/edit.twig
@@ -1,4 +1,4 @@
-{% extends "./layout/default" %}
+{% extends './v1/layout/default' %}
 
 {% block breadcrumbs %}
     {{ Breadcrumbs.render(Route.getCurrentRoute.getName, journals) }}
diff --git a/resources/views/v1/transactions/convert.twig b/resources/views/v1/transactions/convert.twig
index 266cf37c06..dfb37d0618 100644
--- a/resources/views/v1/transactions/convert.twig
+++ b/resources/views/v1/transactions/convert.twig
@@ -1,4 +1,4 @@
-{% extends "./layout/default" %}
+{% extends './v1/layout/default' %}
 
 {% block breadcrumbs %}
     {{ Breadcrumbs.render(Route.getCurrentRoute.getName, group, groupTitle) }}
diff --git a/resources/views/v1/transactions/create.twig b/resources/views/v1/transactions/create.twig
index 414ab24a84..89ae2a29b3 100644
--- a/resources/views/v1/transactions/create.twig
+++ b/resources/views/v1/transactions/create.twig
@@ -1,5 +1,5 @@
 {% set VUE_SCRIPT_NAME = 'create_transaction' %}
-{% extends "./layout/default" %}
+{% extends './v1/layout/default' %}
 {% block breadcrumbs %}
     {{ Breadcrumbs.render(Route.getCurrentRoute.getName, objectType) }}
 {% endblock %}
diff --git a/resources/views/v1/transactions/delete.twig b/resources/views/v1/transactions/delete.twig
index 5d0b80117f..3b636fe5ba 100644
--- a/resources/views/v1/transactions/delete.twig
+++ b/resources/views/v1/transactions/delete.twig
@@ -1,4 +1,4 @@
-{% extends "./layout/default" %}
+{% extends './v1/layout/default' %}
 
 {% block breadcrumbs %}
     {{ Breadcrumbs.render(Route.getCurrentRoute.getName, group) }}
diff --git a/resources/views/v1/transactions/edit.twig b/resources/views/v1/transactions/edit.twig
index 2324837ec1..5b78a8f438 100644
--- a/resources/views/v1/transactions/edit.twig
+++ b/resources/views/v1/transactions/edit.twig
@@ -1,5 +1,5 @@
 {% set VUE_SCRIPT_NAME = 'edit_transaction' %}
-{% extends "./layout/default" %}
+{% extends './v1/layout/default' %}
 {% block breadcrumbs %}
     {{ Breadcrumbs.render(Route.getCurrentRoute.getName, transactionGroup) }}
 {% endblock %}
diff --git a/resources/views/v1/transactions/index.twig b/resources/views/v1/transactions/index.twig
index f50ffd01a4..5ad54c611b 100644
--- a/resources/views/v1/transactions/index.twig
+++ b/resources/views/v1/transactions/index.twig
@@ -1,4 +1,4 @@
-{% extends "./layout/default" %}
+{% extends './v1/layout/default' %}
 
 {% block breadcrumbs %}
     {{ Breadcrumbs.render(Route.getCurrentRoute.getName, objectType, start, end) }}
@@ -81,7 +81,7 @@
                         <a href="{{ route('transactions.create', [objectType]) }}" class="btn btn-success"><i class="fa fa-plus fa-fw"></i> {{ 'create_new_transaction'|_ }}</a>
                     </div>
                     {# actual list #}
-                    {% include 'list.groups' %}
+                    {% include 'v1.list.groups' %}
                 </div>
                 <div class="box-footer">
                     {# links for other views #}
@@ -103,7 +103,7 @@
         {# boxes with info #}
         {% if periods|length > 0 %}
             <div class="col-lg-2 col-md-2 col-sm-12 col-xs-12">
-                {% include 'list.periods' %}
+                {% include 'v1.list.periods' %}
             </div>
         {% endif %}
 
diff --git a/resources/views/v1/transactions/links/delete.twig b/resources/views/v1/transactions/links/delete.twig
index 0f343125da..fb18fb1c19 100644
--- a/resources/views/v1/transactions/links/delete.twig
+++ b/resources/views/v1/transactions/links/delete.twig
@@ -1,4 +1,4 @@
-{% extends "./layout/default" %}
+{% extends './v1/layout/default' %}
 
 {% block breadcrumbs %}
     {{ Breadcrumbs.render(Route.getCurrentRoute.getName, link) }}
diff --git a/resources/views/v1/transactions/mass/delete.twig b/resources/views/v1/transactions/mass/delete.twig
index ce460512c3..12217051bc 100644
--- a/resources/views/v1/transactions/mass/delete.twig
+++ b/resources/views/v1/transactions/mass/delete.twig
@@ -1,4 +1,4 @@
-{% extends "./layout/default" %}
+{% extends './v1/layout/default' %}
 
 {% block breadcrumbs %}
     {{ Breadcrumbs.render(Route.getCurrentRoute.getName, journals) }}
diff --git a/resources/views/v1/transactions/mass/edit.twig b/resources/views/v1/transactions/mass/edit.twig
index 84bc1a78ed..937807b34a 100644
--- a/resources/views/v1/transactions/mass/edit.twig
+++ b/resources/views/v1/transactions/mass/edit.twig
@@ -1,4 +1,4 @@
-{% extends "./layout/default" %}
+{% extends './v1/layout/default' %}
 
 {% block breadcrumbs %}
     {{ Breadcrumbs.render(Route.getCurrentRoute.getName, journals) }}
diff --git a/resources/views/v1/transactions/show.twig b/resources/views/v1/transactions/show.twig
index 70fbf99cd2..5eb5002909 100644
--- a/resources/views/v1/transactions/show.twig
+++ b/resources/views/v1/transactions/show.twig
@@ -1,4 +1,4 @@
-{% extends "./layout/default" %}
+{% extends './v1/layout/default' %}
 
 {% block breadcrumbs %}
     {{ Breadcrumbs.render(Route.getCurrentRoute.getName, transactionGroup) }}
@@ -382,7 +382,7 @@
                             <h3 class="box-title">{{ 'attachments'|_ }}</h3>
                         </div>
                         <div class="box-body no-padding">
-                            {% include 'list.attachments' with {attachments: attachments[journal.transaction_journal_id]} %}
+                            {% include 'v1.list.attachments' with {attachments: attachments[journal.transaction_journal_id]} %}
                         </div>
                     </div>
                 {% endif %}
diff --git a/resources/views/v1/transactions/single/delete.twig b/resources/views/v1/transactions/single/delete.twig
index c834df3496..8bf7ffd3e2 100644
--- a/resources/views/v1/transactions/single/delete.twig
+++ b/resources/views/v1/transactions/single/delete.twig
@@ -1,4 +1,4 @@
-{% extends "./layout/default" %}
+{% extends './v1/layout/default' %}
 
 {% block breadcrumbs %}
     {{ Breadcrumbs.render(Route.getCurrentRoute.getName, journal) }}
diff --git a/resources/views/v2/auth/register.twig b/resources/views/v2/auth/register.twig
index 0d47e63345..0810f5f4bf 100644
--- a/resources/views/v2/auth/register.twig
+++ b/resources/views/v2/auth/register.twig
@@ -105,7 +105,7 @@
         </div>
     </div>
 
-    {% include 'partials.auth.password-modal' %}
+    {% include 'v2.partials.auth.password-modal' %}
 
     <!-- /.login-box -->
 {% endblock %}
diff --git a/resources/views/v2/budgets/index.twig b/resources/views/v2/budgets/indexx.twig
similarity index 100%
rename from resources/views/v2/budgets/index.twig
rename to resources/views/v2/budgets/indexx.twig
diff --git a/resources/views/v2/emails/access-token-created-html.twig b/resources/views/v2/emails/access-token-created-html.twig
index ede3a2f044..bfead45f6a 100644
--- a/resources/views/v2/emails/access-token-created-html.twig
+++ b/resources/views/v2/emails/access-token-created-html.twig
@@ -1,4 +1,4 @@
-{% include 'emails.header-html' %}
+{% include 'v2.emails.header-html' %}
 <p style="font-family: 'Helvetica Neue', Helvetica, Arial, sans-serif;font-size:13px;">
     {{ trans('email.access_token_created_body') }}
 </p>
@@ -10,4 +10,4 @@
 <p style="font-family: 'Helvetica Neue', Helvetica, Arial, sans-serif;font-size:13px;">
     {{ trans('email.access_token_created_revoke', {url: route('profile.index') }) }}
 </p>
-{% include 'emails.footer-html' %}
+{% include 'v2.emails.footer-html' %}
diff --git a/resources/views/v2/emails/access-token-created-text.twig b/resources/views/v2/emails/access-token-created-text.twig
index 04d85cdf35..8f5608e2cc 100644
--- a/resources/views/v2/emails/access-token-created-text.twig
+++ b/resources/views/v2/emails/access-token-created-text.twig
@@ -1,7 +1,7 @@
-{% include 'emails.header-text' %}
+{% include 'v2.emails.header-text' %}
 {{ trans('email.access_token_created_body')|raw }}
 
 {{ trans('email.access_token_created_explanation')|striptags|raw }}
 
 {{ trans('email.access_token_created_revoke', {url: route('profile.index') })|raw }}
-{% include 'emails.footer-text' %}
+{% include 'v2.emails.footer-text' %}
diff --git a/resources/views/v2/emails/admin-test-html.twig b/resources/views/v2/emails/admin-test-html.twig
index 6d343085b8..6d653716d6 100644
--- a/resources/views/v2/emails/admin-test-html.twig
+++ b/resources/views/v2/emails/admin-test-html.twig
@@ -1,5 +1,5 @@
-{% include 'emails.header-html' %}
+{% include 'v2.emails.header-html' %}
 <p style="font-family: 'Helvetica Neue', Helvetica, Arial, sans-serif;font-size:13px;">
     {{ trans('email.admin_test_body', {email: email })}}
 </p>
-{% include 'emails.footer-html' %}
+{% include 'v2.emails.footer-html' %}
diff --git a/resources/views/v2/emails/admin-test-text.twig b/resources/views/v2/emails/admin-test-text.twig
index e6c5aca702..7f8c39aedd 100644
--- a/resources/views/v2/emails/admin-test-text.twig
+++ b/resources/views/v2/emails/admin-test-text.twig
@@ -1,3 +1,3 @@
-{% include 'emails.header-text' %}
+{% include 'v2.emails.header-text' %}
 {{ trans('email.admin_test_body', {email: email })|raw }}
-{% include 'emails.footer-text' %}
+{% include 'v2.emails.footer-text' %}
diff --git a/resources/views/v2/emails/confirm-email-change-html.twig b/resources/views/v2/emails/confirm-email-change-html.twig
index 7eb907c421..5007f263d0 100644
--- a/resources/views/v2/emails/confirm-email-change-html.twig
+++ b/resources/views/v2/emails/confirm-email-change-html.twig
@@ -1,4 +1,4 @@
-{% include 'emails.header-html' %}
+{% include 'v2.emails.header-html' %}
 <p style="font-family: 'Helvetica Neue', Helvetica, Arial, sans-serif;font-size:13px;">
     {{ trans('email.email_change_body_to_new')}}
 </p>
@@ -15,4 +15,4 @@
 <p style="font-family: 'Helvetica Neue', Helvetica, Arial, sans-serif;font-size:13px;">
     <a href="{{ uri }}">{{ uri }}</a>
 </p>
-{% include 'emails.footer-html' %}
+{% include 'v2.emails.footer-html' %}
diff --git a/resources/views/v2/emails/confirm-email-change-text.twig b/resources/views/v2/emails/confirm-email-change-text.twig
index 1fd8695814..dfdc70e02f 100644
--- a/resources/views/v2/emails/confirm-email-change-text.twig
+++ b/resources/views/v2/emails/confirm-email-change-text.twig
@@ -1,4 +1,4 @@
-{% include 'emails.header-text' %}
+{% include 'v2.emails.header-text' %}
 {{ trans('email.email_change_body_to_new')|raw }}
 
 {{trans('email.email_change_old', { email: oldEmail })|raw }}
@@ -7,4 +7,4 @@
 
 {{ trans('email.email_change_instructions')|raw }}
 {{ uri }}
-{% include 'emails.footer-text' %}
+{% include 'v2.emails.footer-text' %}
diff --git a/resources/views/v2/emails/error-html.twig b/resources/views/v2/emails/error-html.twig
index d90bc67879..050cc51417 100644
--- a/resources/views/v2/emails/error-html.twig
+++ b/resources/views/v2/emails/error-html.twig
@@ -1,4 +1,4 @@
-{% include 'emails.header-html' %}
+{% include 'v2.emails.header-html' %}
 <p style="font-family: 'Helvetica Neue', Helvetica, Arial, sans-serif;font-size:13px;">
     {{ trans('email.error_intro', { version: version, errorMessage: errorMessage })|raw }}
 </p>
@@ -42,4 +42,4 @@
 <p style="font-family: monospace;font-size:11px;color:#aaa">
     {{ stackTrace|nl2br }}
 </p>
-{% include 'emails.footer-html' %}
+{% include 'v2.emails.footer-html' %}
diff --git a/resources/views/v2/emails/error-text.twig b/resources/views/v2/emails/error-text.twig
index 35e4a46334..297530b1e2 100644
--- a/resources/views/v2/emails/error-text.twig
+++ b/resources/views/v2/emails/error-text.twig
@@ -1,4 +1,4 @@
-{% include 'emails.header-text' %}
+{% include 'v2.emails.header-text' %}
 {{ trans('email.error_intro', { version: version, errorMessage: errorMessage })|striptags|raw }}
 
 {{ trans('email.error_type', {class: class })|raw }}
@@ -24,4 +24,4 @@
 {{ trans('email.error_stacktrace_below')|raw }}
 
 {{ stackTrace|raw }}
-{% include 'emails.footer-text' %}
+{% include 'v2.emails.footer-text' %}
diff --git a/resources/views/v2/emails/oauth-client-created-html.twig b/resources/views/v2/emails/oauth-client-created-html.twig
index 03906957f1..b13f472276 100644
--- a/resources/views/v2/emails/oauth-client-created-html.twig
+++ b/resources/views/v2/emails/oauth-client-created-html.twig
@@ -1,4 +1,4 @@
-{% include 'emails.header-html' %}
+{% include 'v2.emails.header-html' %}
 <p style="font-family: 'Helvetica Neue', Helvetica, Arial, sans-serif;font-size:13px;">
     {{ trans('email.oauth_created_body', { name:client.name, url: client.redirect })|raw }}
 </p>
@@ -10,4 +10,4 @@
 <p style="font-family: 'Helvetica Neue', Helvetica, Arial, sans-serif;font-size:13px;">
     {{ trans('email.oauth_created_undo', { url:route('profile.index')}) }}
 </p>
-{% include 'emails.footer-html' %}
+{% include 'v2.emails.footer-html' %}
diff --git a/resources/views/v2/emails/oauth-client-created-text.twig b/resources/views/v2/emails/oauth-client-created-text.twig
index 566f2ad89b..6b324e7f9a 100644
--- a/resources/views/v2/emails/oauth-client-created-text.twig
+++ b/resources/views/v2/emails/oauth-client-created-text.twig
@@ -1,7 +1,7 @@
-{% include 'emails.header-text' %}
+{% include 'v2.emails.header-text' %}
 {{ trans('email.oauth_created_body', {name:  client.name, url: client.redirect })|striptags|raw }}
 
 {{ trans('email.oauth_created_explanation')|striptags|raw }}
 
 {{ trans('email.oauth_created_undo', { url:route('profile.index')})|raw }}
-{% include 'emails.footer-text' %}
+{% include 'v2.emails.footer-text' %}
diff --git a/resources/views/v2/emails/password-html.twig b/resources/views/v2/emails/password-html.twig
index 2f020fb924..57cc8533be 100644
--- a/resources/views/v2/emails/password-html.twig
+++ b/resources/views/v2/emails/password-html.twig
@@ -1,4 +1,4 @@
-{% include 'emails.header-html' %}
+{% include 'v2.emails.header-html' %}
 <p style="font-family: 'Helvetica Neue', Helvetica, Arial, sans-serif;font-size:13px;">
     {{ trans('email.reset_pw_instructions') }}
 </p>
@@ -10,4 +10,4 @@
 <p style="font-family: 'Helvetica Neue', Helvetica, Arial, sans-serif;font-size:13px;">
     <a href="{{ url }}">{{ url }}</a>
 </p>
-{% include 'emails.footer-html' %}
+{% include 'v2.emails.footer-html' %}
diff --git a/resources/views/v2/emails/password-text.twig b/resources/views/v2/emails/password-text.twig
index 258521ea99..6fd891c572 100644
--- a/resources/views/v2/emails/password-text.twig
+++ b/resources/views/v2/emails/password-text.twig
@@ -1,7 +1,7 @@
-{% include 'emails.header-text' %}
+{% include 'v2.emails.header-text' %}
 {{ trans('email.reset_pw_instructions')|raw }}
 
 {{ trans('email.reset_pw_warning')|striptags|raw }}
 
 {{ url }}
-{% include 'emails.footer-text' %}
+{% include 'v2.emails.footer-text' %}
diff --git a/resources/views/v2/emails/registered-html.twig b/resources/views/v2/emails/registered-html.twig
index 78d8b1052e..d61ce16349 100644
--- a/resources/views/v2/emails/registered-html.twig
+++ b/resources/views/v2/emails/registered-html.twig
@@ -1,4 +1,4 @@
-{% include 'emails.header-html' %}
+{% include 'v2.emails.header-html' %}
 <p style="font-family: 'Helvetica Neue', Helvetica, Arial, sans-serif;font-size:13px;">
     {{ trans('email.registered_welcome', {address: address})|raw }}
 </p>
@@ -17,4 +17,4 @@
 <p style="font-family: 'Helvetica Neue', Helvetica, Arial, sans-serif;font-size:13px;">
     {{ trans('email.registered_closing')}}
 </p>
-{% include 'emails.footer-html' %}
+{% include 'v2.emails.footer-html' %}
diff --git a/resources/views/v2/emails/registered-text.twig b/resources/views/v2/emails/registered-text.twig
index 78c696b065..c77938858d 100644
--- a/resources/views/v2/emails/registered-text.twig
+++ b/resources/views/v2/emails/registered-text.twig
@@ -1,4 +1,4 @@
-{% include 'emails.header-text' %}
+{% include 'v2.emails.header-text' %}
 
 {{ trans('email.registered_welcome')|striptags|raw }}
 
@@ -18,4 +18,4 @@
 https://github.com/firefly-iii/firefly-iii
 https://firefly-iii.org/
 
-{% include 'emails.footer-text' %}
+{% include 'v2.emails.footer-text' %}
diff --git a/resources/views/v2/emails/report-new-journals-html.twig b/resources/views/v2/emails/report-new-journals-html.twig
index c4414ae4ed..e3d39ffa7f 100644
--- a/resources/views/v2/emails/report-new-journals-html.twig
+++ b/resources/views/v2/emails/report-new-journals-html.twig
@@ -1,4 +1,4 @@
-{% include 'emails.header-html' %}
+{% include 'v2.emails.header-html' %}
 <p style="font-family: 'Helvetica Neue', Helvetica, Arial, sans-serif;font-size:13px;">
     {{ trans_choice('email.new_journals_header', transformed|length ) }}
 </p>
@@ -75,4 +75,4 @@
     {% endfor %}
 </ol>
 
-{% include 'emails.footer-html' %}
+{% include 'v2.emails.footer-html' %}
diff --git a/resources/views/v2/emails/report-new-journals-text.twig b/resources/views/v2/emails/report-new-journals-text.twig
index fe6455141c..c8cab16b1d 100644
--- a/resources/views/v2/emails/report-new-journals-text.twig
+++ b/resources/views/v2/emails/report-new-journals-text.twig
@@ -1,4 +1,4 @@
-{% include 'emails.header-text' %}
+{% include 'v2.emails.header-text' %}
 {{ trans_choice('email.new_journals_header', transformed|length )|raw }}
 
 
@@ -13,4 +13,4 @@
 {% endfor %}
 {% endif %}
 {% endfor %}
-{% include 'emails.footer-text' %}
+{% include 'v2.emails.footer-text' %}
diff --git a/resources/views/v2/emails/undo-email-change-html.twig b/resources/views/v2/emails/undo-email-change-html.twig
index 00bc5bb7a4..4c0c86a64d 100644
--- a/resources/views/v2/emails/undo-email-change-html.twig
+++ b/resources/views/v2/emails/undo-email-change-html.twig
@@ -1,4 +1,4 @@
-{% include 'emails.header-html' %}
+{% include 'v2.emails.header-html' %}
 <p style="font-family: 'Helvetica Neue', Helvetica, Arial, sans-serif;font-size:13px;">
     {{ trans('email.email_change_body_to_old')|raw }}
 </p>
@@ -14,4 +14,4 @@
 <p style="font-family: 'Helvetica Neue', Helvetica, Arial, sans-serif;font-size:13px;">
     {{trans('email.email_change_undo_link')}} <a href="{{ uri }}">{{ uri }}</a>
 </p>
-{% include 'emails.footer-html' %}
+{% include 'v2.emails.footer-html' %}
diff --git a/resources/views/v2/emails/undo-email-change-text.twig b/resources/views/v2/emails/undo-email-change-text.twig
index 2c719b9e4d..e8c39eb120 100644
--- a/resources/views/v2/emails/undo-email-change-text.twig
+++ b/resources/views/v2/emails/undo-email-change-text.twig
@@ -1,4 +1,4 @@
-{% include 'emails.header-text' %}
+{% include 'v2.emails.header-text' %}
 {{ trans('email.email_change_body_to_old')|striptags|raw }}
 
 {{ trans('email.email_change_ignore')|raw }}
@@ -8,4 +8,4 @@
 {{trans('email.email_change_new', { email: newEmail })|raw }}
 
 {{ trans('email.email_change_undo_link')|raw }} {{ uri }}
-{% include 'emails.footer-text' %}
+{% include 'v2.emails.footer-text' %}
diff --git a/resources/views/v2/index.twig b/resources/views/v2/index.twig
index bc51c77476..e582497c01 100644
--- a/resources/views/v2/index.twig
+++ b/resources/views/v2/index.twig
@@ -1,4 +1,4 @@
-{% extends "./layout/default" %}
+{% extends "./v2/layout/default" %}
 {% block breadcrumbs %}
     {{ Breadcrumbs.render }}
 {% endblock %}
diff --git a/resources/views/v2/layout/default.twig b/resources/views/v2/layout/default.twig
index c962e0db5a..c6133ba36b 100644
--- a/resources/views/v2/layout/default.twig
+++ b/resources/views/v2/layout/default.twig
@@ -10,10 +10,10 @@
     <meta name="apple-mobile-web-app-capable" content="yes">
 
     {# favicons #}
-    {% include('partials.layout.favicons') %}
+    {% include('v2.partials.layout.favicons') %}
 
     <title>
-        {% if subTitle %}
+        {% if subTitle|default(false) %}
             {{ subTitle }} »
         {% endif %}
         {% if title != "Firefly III" %}
@@ -31,10 +31,10 @@
 <div class="wrapper">
 
     <!-- Navbar -->
-    {% include('partials.layout.navbar') %}
+    {% include('v2.partials.layout.navbar') %}
 
     <!-- Main Sidebar Container -->
-    {% include('partials.layout.sidebar') %}
+    {% include('v2.partials.layout.sidebar') %}
 
     <!-- Content Wrapper. Contains page content -->
     <div class="content-wrapper">
@@ -43,10 +43,10 @@
             <div class="container-fluid">
                 <div class="row mb-2">
                     <div class="col-sm-6">
-                        <h1 class="m-0 text-dark">{% if mainTitleIcon %}<i class="fa fas {{ mainTitleIcon }}"></i>{% endif %}
+                        <h1 class="m-0 text-dark">{% if mainTitleIcon|default(false) %}<i class="fa fas {{ mainTitleIcon }}"></i>{% endif %}
                             {{ title }} <small class="text-muted">
-                                {% if subTitleIcon %}<i class="fa fas {{ subTitleIcon }}"></i>{% endif %}
-                                {{ subTitle }}</small></h1>
+                                {% if subTitleIcon|default(false) %}<i class="fa fas {{ subTitleIcon }}"></i>{% endif %}
+                                {{ subTitle|default('') }}</small></h1>
                     </div><!-- /.col -->
                     <div class="col-sm-6">
                         {% block breadcrumbs %}{% endblock %}
@@ -65,7 +65,7 @@
         <!-- /.content -->
     </div>
     <!-- /.content-wrapper -->
-    {% include('partials.layout.footer') %}
+    {% include('v2.partials.layout.footer') %}
 
     <!-- Control Sidebar -->
     <aside class="control-sidebar control-sidebar-dark">