diff --git a/resources/views/accounts/create.twig b/resources/views/accounts/create.twig
index cc48551a42..b068c909c4 100644
--- a/resources/views/accounts/create.twig
+++ b/resources/views/accounts/create.twig
@@ -1,4 +1,4 @@
-{% extends "./layout/default.twig" %}
+{% extends "./layout/default" %}
 {% block breadcrumbs %}
     {{ Breadcrumbs.renderIfExists(Route.getCurrentRoute.getName, what) }}
 {% endblock %}
diff --git a/resources/views/accounts/delete.twig b/resources/views/accounts/delete.twig
index ac4771189c..3fe4850f90 100644
--- a/resources/views/accounts/delete.twig
+++ b/resources/views/accounts/delete.twig
@@ -1,4 +1,4 @@
-{% extends "./layout/default.twig" %}
+{% extends "./layout/default" %}
 
 {% block breadcrumbs %}
     {{ Breadcrumbs.renderIfExists(Route.getCurrentRoute().getName(), account) }}
diff --git a/resources/views/accounts/edit.twig b/resources/views/accounts/edit.twig
index 5e31575226..4ccd0f3a22 100644
--- a/resources/views/accounts/edit.twig
+++ b/resources/views/accounts/edit.twig
@@ -1,4 +1,4 @@
-{% extends "./layout/default.twig" %}
+{% extends "./layout/default" %}
 
 {% block breadcrumbs %}
     {{ Breadcrumbs.renderIfExists(Route.getCurrentRoute().getName(), account) }}
diff --git a/resources/views/accounts/index.twig b/resources/views/accounts/index.twig
index af0a8d246d..f5b6bda9e6 100644
--- a/resources/views/accounts/index.twig
+++ b/resources/views/accounts/index.twig
@@ -1,4 +1,4 @@
-{% extends "./layout/default.twig" %}
+{% extends "./layout/default" %}
 
 {% block breadcrumbs %}
     {{ Breadcrumbs.renderIfExists(Route.getCurrentRoute.getName, what) }}
@@ -26,7 +26,7 @@
 
                 </div>
                 <div class="box-body table-responsive no-padding">
-                    {% include 'list/accounts.twig' %}
+                    {% include 'list/accounts' %}
                 </div>
             </div>
         </div>
diff --git a/resources/views/accounts/show.twig b/resources/views/accounts/show.twig
index 61d41da0c5..ac18d8a0cd 100644
--- a/resources/views/accounts/show.twig
+++ b/resources/views/accounts/show.twig
@@ -1,4 +1,4 @@
-{% extends "./layout/default.twig" %}
+{% extends "./layout/default" %}
 
 {% block breadcrumbs %}
     {{ Breadcrumbs.renderIfExists(Route.getCurrentRoute.getName, account) }}
diff --git a/resources/views/accounts/show_with_date.twig b/resources/views/accounts/show_with_date.twig
index 89ae367972..957e3b5e98 100644
--- a/resources/views/accounts/show_with_date.twig
+++ b/resources/views/accounts/show_with_date.twig
@@ -1,4 +1,4 @@
-{% extends "./layout/default.twig" %}
+{% extends "./layout/default" %}
 
 {% block breadcrumbs %}
 
diff --git a/resources/views/admin/configuration/index.twig b/resources/views/admin/configuration/index.twig
index 412fb2459b..73e183c8b2 100644
--- a/resources/views/admin/configuration/index.twig
+++ b/resources/views/admin/configuration/index.twig
@@ -1,4 +1,4 @@
-{% extends "./layout/default.twig" %}
+{% extends "./layout/default" %}
 
 {% block breadcrumbs %}
     {{ Breadcrumbs.renderIfExists }}
diff --git a/resources/views/admin/domains/index.twig b/resources/views/admin/domains/index.twig
index ad854f3c52..5245f5901c 100644
--- a/resources/views/admin/domains/index.twig
+++ b/resources/views/admin/domains/index.twig
@@ -1,4 +1,4 @@
-{% extends "./layout/default.twig" %}
+{% extends "./layout/default" %}
 
 {% block breadcrumbs %}
     {{ Breadcrumbs.renderIfExists }}
diff --git a/resources/views/admin/index.twig b/resources/views/admin/index.twig
index 0c7d5f3dfb..8ca383246f 100644
--- a/resources/views/admin/index.twig
+++ b/resources/views/admin/index.twig
@@ -1,4 +1,4 @@
-{% extends "./layout/default.twig" %}
+{% extends "./layout/default" %}
 
 {% block breadcrumbs %}
     {{ Breadcrumbs.renderIfExists }}
diff --git a/resources/views/admin/users/index.twig b/resources/views/admin/users/index.twig
index 60708d175c..602c4dba48 100644
--- a/resources/views/admin/users/index.twig
+++ b/resources/views/admin/users/index.twig
@@ -1,4 +1,4 @@
-{% extends "./layout/default.twig" %}
+{% extends "./layout/default" %}
 
 {% block breadcrumbs %}
     {{ Breadcrumbs.renderIfExists }}
diff --git a/resources/views/admin/users/show.twig b/resources/views/admin/users/show.twig
index e008708de1..38794f32c2 100644
--- a/resources/views/admin/users/show.twig
+++ b/resources/views/admin/users/show.twig
@@ -1,4 +1,4 @@
-{% extends "./layout/default.twig" %}
+{% extends "./layout/default" %}
 
 {% block breadcrumbs %}
     {{ Breadcrumbs.renderIfExists(Route.getCurrentRoute.getName, user) }}
diff --git a/resources/views/attachments/delete.twig b/resources/views/attachments/delete.twig
index a6191d5c6e..3e854f8bde 100644
--- a/resources/views/attachments/delete.twig
+++ b/resources/views/attachments/delete.twig
@@ -1,4 +1,4 @@
-{% extends "./layout/default.twig" %}
+{% extends "./layout/default" %}
 
 {% block breadcrumbs %}
     {{ Breadcrumbs.renderIfExists(Route.getCurrentRoute().getName(), attachment) }}
diff --git a/resources/views/attachments/edit.twig b/resources/views/attachments/edit.twig
index 976e3b2981..199b39b64f 100644
--- a/resources/views/attachments/edit.twig
+++ b/resources/views/attachments/edit.twig
@@ -1,4 +1,4 @@
-{% extends "./layout/default.twig" %}
+{% extends "./layout/default" %}
 
 {% block breadcrumbs %}
     {{ Breadcrumbs.renderIfExists(Route.getCurrentRoute().getName(), attachment) }}
diff --git a/resources/views/auth/confirmation/error.twig b/resources/views/auth/confirmation/error.twig
index d95de0b214..3a5888d4d3 100644
--- a/resources/views/auth/confirmation/error.twig
+++ b/resources/views/auth/confirmation/error.twig
@@ -13,7 +13,7 @@
     <link href="css/firefly.css" rel="stylesheet" type="text/css"/>
 
     <!-- favicons -->
-    {% include('partials/favicons.twig') %}
+    {% include('partials/favicons') %}
 
 </head>
 <body class="ff-error-page">
diff --git a/resources/views/auth/confirmation/no-resent.twig b/resources/views/auth/confirmation/no-resent.twig
index 01e079cbad..7d23f394ae 100644
--- a/resources/views/auth/confirmation/no-resent.twig
+++ b/resources/views/auth/confirmation/no-resent.twig
@@ -13,7 +13,7 @@
     <link href="css/firefly.css" rel="stylesheet" type="text/css"/>
 
     <!-- favicons -->
-    {% include('partials/favicons.twig') %}
+    {% include('partials/favicons') %}
 
 </head>
 <body class="ff-error-page">
diff --git a/resources/views/auth/confirmation/resent.twig b/resources/views/auth/confirmation/resent.twig
index c7e0307d3d..da8f9272e4 100644
--- a/resources/views/auth/confirmation/resent.twig
+++ b/resources/views/auth/confirmation/resent.twig
@@ -13,7 +13,7 @@
     <link href="css/firefly.css" rel="stylesheet" type="text/css"/>
 
     <!-- favicons -->
-    {% include('partials/favicons.twig') %}
+    {% include('partials/favicons') %}
 
 </head>
 <body class="ff-error-page">
diff --git a/resources/views/auth/login.twig b/resources/views/auth/login.twig
index 435870685a..1411157599 100644
--- a/resources/views/auth/login.twig
+++ b/resources/views/auth/login.twig
@@ -1,4 +1,4 @@
-{% extends "./layout/guest.twig" %}
+{% extends "./layout/guest" %}
 
 {% block content %}
 
diff --git a/resources/views/auth/lost-two-factor.twig b/resources/views/auth/lost-two-factor.twig
index 7f64e57379..fa71e19f8b 100644
--- a/resources/views/auth/lost-two-factor.twig
+++ b/resources/views/auth/lost-two-factor.twig
@@ -13,7 +13,7 @@
     <link href="css/firefly.css" rel="stylesheet" type="text/css"/>
 
     <!-- favicons -->
-    {% include('partials/favicons.twig') %}
+    {% include('partials/favicons') %}
 
 </head>
 <body class="ff-error-page">
diff --git a/resources/views/auth/passwords/email.twig b/resources/views/auth/passwords/email.twig
index 3f9a286116..475f9bb7e6 100644
--- a/resources/views/auth/passwords/email.twig
+++ b/resources/views/auth/passwords/email.twig
@@ -1,4 +1,4 @@
-{% extends "./layout/guest.twig" %}
+{% extends "./layout/guest" %}
 
 {% block content %}
 
diff --git a/resources/views/auth/passwords/reset.twig b/resources/views/auth/passwords/reset.twig
index c70b06e8a8..bbe9a732d8 100644
--- a/resources/views/auth/passwords/reset.twig
+++ b/resources/views/auth/passwords/reset.twig
@@ -1,4 +1,4 @@
-{% extends "./layout/guest.twig" %}
+{% extends "./layout/guest" %}
 
 {% block content %}
 
diff --git a/resources/views/auth/register.twig b/resources/views/auth/register.twig
index fc3f7bf51b..532dc26d91 100644
--- a/resources/views/auth/register.twig
+++ b/resources/views/auth/register.twig
@@ -1,4 +1,4 @@
-{% extends "./layout/guest.twig" %}
+{% extends "./layout/guest" %}
 
 {% block content %}
 
diff --git a/resources/views/auth/two-factor.twig b/resources/views/auth/two-factor.twig
index e7148d811e..65a29bed85 100644
--- a/resources/views/auth/two-factor.twig
+++ b/resources/views/auth/two-factor.twig
@@ -1,4 +1,4 @@
-{% extends "./layout/guest.twig" %}
+{% extends "./layout/guest" %}
 
 {% block content %}
 
diff --git a/resources/views/bills/create.twig b/resources/views/bills/create.twig
index eb1a970b22..69ccaa19fb 100644
--- a/resources/views/bills/create.twig
+++ b/resources/views/bills/create.twig
@@ -1,4 +1,4 @@
-{% extends "./layout/default.twig" %}
+{% extends "./layout/default" %}
 
 {% block breadcrumbs %}
     {{ Breadcrumbs.renderIfExists(Route.getCurrentRoute.getName, piggyBank) }}
diff --git a/resources/views/bills/delete.twig b/resources/views/bills/delete.twig
index d9185aa759..344779bdc7 100644
--- a/resources/views/bills/delete.twig
+++ b/resources/views/bills/delete.twig
@@ -1,4 +1,4 @@
-{% extends "./layout/default.twig" %}
+{% extends "./layout/default" %}
 
 {% block breadcrumbs %}
     {{ Breadcrumbs.renderIfExists(Route.getCurrentRoute.getName, bill) }}
diff --git a/resources/views/bills/edit.twig b/resources/views/bills/edit.twig
index ed8d331b82..53c1d7a717 100644
--- a/resources/views/bills/edit.twig
+++ b/resources/views/bills/edit.twig
@@ -1,4 +1,4 @@
-{% extends "./layout/default.twig" %}
+{% extends "./layout/default" %}
 
 {% block breadcrumbs %}
     {{ Breadcrumbs.renderIfExists(Route.getCurrentRoute.getName, bill) }}
diff --git a/resources/views/bills/index.twig b/resources/views/bills/index.twig
index 644c0f243e..28bc6261fe 100644
--- a/resources/views/bills/index.twig
+++ b/resources/views/bills/index.twig
@@ -1,4 +1,4 @@
-{% extends "./layout/default.twig" %}
+{% extends "./layout/default" %}
 
 {% block breadcrumbs %}
     {{ Breadcrumbs.renderIfExists(Route.getCurrentRoute.getName) }}
@@ -22,7 +22,7 @@
                     </div>
                 </div>
                 <div class="box-body table-responsive no-padding">
-                    {% include 'list/bills.twig' %}
+                    {% include 'list/bills' %}
                 </div>
             </div>
         </div>
diff --git a/resources/views/bills/show.twig b/resources/views/bills/show.twig
index 7622ee694d..5730340721 100644
--- a/resources/views/bills/show.twig
+++ b/resources/views/bills/show.twig
@@ -1,4 +1,4 @@
-{% extends "./layout/default.twig" %}
+{% extends "./layout/default" %}
 
 {% block breadcrumbs %}
     {{ Breadcrumbs.renderIfExists(Route.getCurrentRoute.getName, bill) }}
diff --git a/resources/views/budgets/create.twig b/resources/views/budgets/create.twig
index 24f47d7ac2..3974791a23 100644
--- a/resources/views/budgets/create.twig
+++ b/resources/views/budgets/create.twig
@@ -1,4 +1,4 @@
-{% extends "./layout/default.twig" %}
+{% extends "./layout/default" %}
 
 {% block breadcrumbs %}
     {{ Breadcrumbs.renderIfExists(Route.getCurrentRoute.getName) }}
diff --git a/resources/views/budgets/delete.twig b/resources/views/budgets/delete.twig
index 10601310ee..297cef882a 100644
--- a/resources/views/budgets/delete.twig
+++ b/resources/views/budgets/delete.twig
@@ -1,4 +1,4 @@
-{% extends "./layout/default.twig" %}
+{% extends "./layout/default" %}
 
 {% block breadcrumbs %}
     {{ Breadcrumbs.renderIfExists(Route.getCurrentRoute.getName, budget) }}
diff --git a/resources/views/budgets/edit.twig b/resources/views/budgets/edit.twig
index 0bf5ec3daa..e8010bc424 100644
--- a/resources/views/budgets/edit.twig
+++ b/resources/views/budgets/edit.twig
@@ -1,4 +1,4 @@
-{% extends "./layout/default.twig" %}
+{% extends "./layout/default" %}
 
 {% block breadcrumbs %}
     {{ Breadcrumbs.renderIfExists(Route.getCurrentRoute.getName, budget) }}
diff --git a/resources/views/budgets/index.twig b/resources/views/budgets/index.twig
index e9524e6acf..66e95d7f1f 100644
--- a/resources/views/budgets/index.twig
+++ b/resources/views/budgets/index.twig
@@ -1,4 +1,4 @@
-{% extends "./layout/default.twig" %}
+{% extends "./layout/default" %}
 
 {% block breadcrumbs %}
     {{ Breadcrumbs.renderIfExists(Route.getCurrentRoute.getName) }}
diff --git a/resources/views/budgets/no-budget.twig b/resources/views/budgets/no-budget.twig
index 33223893ba..e8e1f0809b 100644
--- a/resources/views/budgets/no-budget.twig
+++ b/resources/views/budgets/no-budget.twig
@@ -1,4 +1,4 @@
-{% extends "./layout/default.twig" %}
+{% extends "./layout/default" %}
 
 {% block breadcrumbs %}
     {{ Breadcrumbs.renderIfExists(Route.getCurrentRoute.getName, subTitle) }}
diff --git a/resources/views/budgets/show.twig b/resources/views/budgets/show.twig
index 65ba0465fa..b0331ae279 100644
--- a/resources/views/budgets/show.twig
+++ b/resources/views/budgets/show.twig
@@ -1,4 +1,4 @@
-{% extends "./layout/default.twig" %}
+{% extends "./layout/default" %}
 
 {% block breadcrumbs %}
     {{ Breadcrumbs.renderIfExists(Route.getCurrentRoute.getName, budget, repetition) }}
diff --git a/resources/views/categories/create.twig b/resources/views/categories/create.twig
index a7911555fd..e99d27b20a 100644
--- a/resources/views/categories/create.twig
+++ b/resources/views/categories/create.twig
@@ -1,4 +1,4 @@
-{% extends "./layout/default.twig" %}
+{% extends "./layout/default" %}
 
 {% block breadcrumbs %}
     {{ Breadcrumbs.renderIfExists(Route.getCurrentRoute.getName) }}
diff --git a/resources/views/categories/delete.twig b/resources/views/categories/delete.twig
index 858af38417..ffe9a5b0ef 100644
--- a/resources/views/categories/delete.twig
+++ b/resources/views/categories/delete.twig
@@ -1,4 +1,4 @@
-{% extends "./layout/default.twig" %}
+{% extends "./layout/default" %}
 
 {% block breadcrumbs %}
     {{ Breadcrumbs.renderIfExists(Route.getCurrentRoute.getName, category) }}
diff --git a/resources/views/categories/edit.twig b/resources/views/categories/edit.twig
index 5e40a3254e..3a465adf1b 100644
--- a/resources/views/categories/edit.twig
+++ b/resources/views/categories/edit.twig
@@ -1,4 +1,4 @@
-{% extends "./layout/default.twig" %}
+{% extends "./layout/default" %}
 
 {% block breadcrumbs %}
     {{ Breadcrumbs.renderIfExists(Route.getCurrentRoute.getName, category) }}
diff --git a/resources/views/categories/index.twig b/resources/views/categories/index.twig
index 95428b52a3..18a1e08314 100644
--- a/resources/views/categories/index.twig
+++ b/resources/views/categories/index.twig
@@ -1,4 +1,4 @@
-{% extends "./layout/default.twig" %}
+{% extends "./layout/default" %}
 
 {% block breadcrumbs %}
     {{ Breadcrumbs.renderIfExists(Route.getCurrentRoute.getName) }}
@@ -23,7 +23,7 @@
 
                 </div>
                 <div class="box-body no-padding">
-                    {% include 'list/categories.twig' %}
+                    {% include 'list/categories' %}
                 </div>
             </div>
         </div>
diff --git a/resources/views/categories/no-category.twig b/resources/views/categories/no-category.twig
index 93db7971a8..c302ca0203 100644
--- a/resources/views/categories/no-category.twig
+++ b/resources/views/categories/no-category.twig
@@ -1,4 +1,4 @@
-{% extends "./layout/default.twig" %}
+{% extends "./layout/default" %}
 
 {% block breadcrumbs %}
     {{ Breadcrumbs.renderIfExists(Route.getCurrentRoute.getName, subTitle) }}
diff --git a/resources/views/categories/show.twig b/resources/views/categories/show.twig
index 0800aaf7b9..311b857d6e 100644
--- a/resources/views/categories/show.twig
+++ b/resources/views/categories/show.twig
@@ -1,4 +1,4 @@
-{% extends "./layout/default.twig" %}
+{% extends "./layout/default" %}
 
 {% block breadcrumbs %}
     {{ Breadcrumbs.renderIfExists(Route.getCurrentRoute.getName, category) }}
diff --git a/resources/views/categories/show_with_date.twig b/resources/views/categories/show_with_date.twig
index 6b906643d1..624a933957 100644
--- a/resources/views/categories/show_with_date.twig
+++ b/resources/views/categories/show_with_date.twig
@@ -1,4 +1,4 @@
-{% extends "./layout/default.twig" %}
+{% extends "./layout/default" %}
 
 {% block breadcrumbs %}
     {{ Breadcrumbs.renderIfExists(Route.getCurrentRoute.getName, category, carbon) }}
diff --git a/resources/views/csv/column-roles.twig b/resources/views/csv/column-roles.twig
index f25a0a2ea7..92b2590df7 100644
--- a/resources/views/csv/column-roles.twig
+++ b/resources/views/csv/column-roles.twig
@@ -1,4 +1,4 @@
-{% extends "./layout/default.twig" %}
+{% extends "./layout/default" %}
 
 {% block breadcrumbs %}
     {{ Breadcrumbs.renderIfExists(Route.getCurrentRoute.getName) }}
diff --git a/resources/views/csv/download-config.twig b/resources/views/csv/download-config.twig
index bd317bea7c..1dd7a94795 100644
--- a/resources/views/csv/download-config.twig
+++ b/resources/views/csv/download-config.twig
@@ -1,4 +1,4 @@
-{% extends "./layout/default.twig" %}
+{% extends "./layout/default" %}
 
 {% block breadcrumbs %}
     {{ Breadcrumbs.renderIfExists(Route.getCurrentRoute.getName) }}
diff --git a/resources/views/csv/index.twig b/resources/views/csv/index.twig
index cfa3f6450a..141566dff6 100644
--- a/resources/views/csv/index.twig
+++ b/resources/views/csv/index.twig
@@ -1,4 +1,4 @@
-{% extends "./layout/default.twig" %}
+{% extends "./layout/default" %}
 
 {% block breadcrumbs %}
     {{ Breadcrumbs.renderIfExists(Route.getCurrentRoute.getName) }}
diff --git a/resources/views/csv/map.twig b/resources/views/csv/map.twig
index f8562205bd..3f1cca1587 100644
--- a/resources/views/csv/map.twig
+++ b/resources/views/csv/map.twig
@@ -1,4 +1,4 @@
-{% extends "./layout/default.twig" %}
+{% extends "./layout/default" %}
 
 {% block breadcrumbs %}
     {{ Breadcrumbs.renderIfExists(Route.getCurrentRoute.getName) }}
diff --git a/resources/views/csv/process.twig b/resources/views/csv/process.twig
index 8ca39b64c9..2561268912 100644
--- a/resources/views/csv/process.twig
+++ b/resources/views/csv/process.twig
@@ -1,4 +1,4 @@
-{% extends "./layout/default.twig" %}
+{% extends "./layout/default" %}
 
 {% block breadcrumbs %}
     {{ Breadcrumbs.renderIfExists(Route.getCurrentRoute.getName) }}
diff --git a/resources/views/currency/create.twig b/resources/views/currency/create.twig
index 70943d3e15..26dec5a0b1 100644
--- a/resources/views/currency/create.twig
+++ b/resources/views/currency/create.twig
@@ -1,4 +1,4 @@
-{% extends "./layout/default.twig" %}
+{% extends "./layout/default" %}
 
 {% block breadcrumbs %}
     {{ Breadcrumbs.renderIfExists(Route.getCurrentRoute.getName) }}
diff --git a/resources/views/currency/delete.twig b/resources/views/currency/delete.twig
index 492f33b6e0..5874f126f2 100644
--- a/resources/views/currency/delete.twig
+++ b/resources/views/currency/delete.twig
@@ -1,4 +1,4 @@
-{% extends "./layout/default.twig" %}
+{% extends "./layout/default" %}
 
 {% block breadcrumbs %}
     {{ Breadcrumbs.renderIfExists(Route.getCurrentRoute.getName, currency) }}
diff --git a/resources/views/currency/edit.twig b/resources/views/currency/edit.twig
index a39ab1b0e4..e54d5f5ca1 100644
--- a/resources/views/currency/edit.twig
+++ b/resources/views/currency/edit.twig
@@ -1,4 +1,4 @@
-{% extends "./layout/default.twig" %}
+{% extends "./layout/default" %}
 
 {% block breadcrumbs %}
     {{ Breadcrumbs.renderIfExists(Route.getCurrentRoute.getName, currency) }}
diff --git a/resources/views/currency/index.twig b/resources/views/currency/index.twig
index 4effcba0a5..7720779d98 100644
--- a/resources/views/currency/index.twig
+++ b/resources/views/currency/index.twig
@@ -1,4 +1,4 @@
-{% extends "./layout/default.twig" %}
+{% extends "./layout/default" %}
 
 {% block breadcrumbs %}
     {{ Breadcrumbs.renderIfExists(Route.getCurrentRoute.getName) }}
diff --git a/resources/views/error.twig b/resources/views/error.twig
index 4390f9c05c..6d5f52c6ab 100644
--- a/resources/views/error.twig
+++ b/resources/views/error.twig
@@ -1,4 +1,4 @@
-{% extends "./layout/guest.twig" %}
+{% extends "./layout/guest" %}
 
 {% block content %}
 
diff --git a/resources/views/errors/FireflyException.twig b/resources/views/errors/FireflyException.twig
index 3e0a701038..aee457c80d 100644
--- a/resources/views/errors/FireflyException.twig
+++ b/resources/views/errors/FireflyException.twig
@@ -13,7 +13,7 @@
     <link href="css/firefly.css" rel="stylesheet" type="text/css"/>
 
     <!-- favicons -->
-    {% include('partials/favicons.twig') %}
+    {% include('partials/favicons') %}
 
 </head>
 <body class="ff-error-page">
diff --git a/resources/views/export/index.twig b/resources/views/export/index.twig
index 1b599e19d5..50b0123c5d 100644
--- a/resources/views/export/index.twig
+++ b/resources/views/export/index.twig
@@ -1,4 +1,4 @@
-{% extends "./layout/default.twig" %}
+{% extends "./layout/default" %}
 
 {% block breadcrumbs %}
     {{ Breadcrumbs.renderIfExists(Route.getCurrentRoute.getName) }}
diff --git a/resources/views/form/amount.twig b/resources/views/form/amount.twig
index 46f9fec160..c28227d1f7 100644
--- a/resources/views/form/amount.twig
+++ b/resources/views/form/amount.twig
@@ -26,7 +26,7 @@
 
         </div>
 
-        {% include 'form/feedback.twig' %}
+        {% include 'form/feedback' %}
     </div>
 
     <input type="hidden" name="amount_currency_id_{{ name }}" value="{{ defaultCurrency.id }}"/>
diff --git a/resources/views/form/balance.twig b/resources/views/form/balance.twig
index 46f9fec160..c28227d1f7 100644
--- a/resources/views/form/balance.twig
+++ b/resources/views/form/balance.twig
@@ -26,7 +26,7 @@
 
         </div>
 
-        {% include 'form/feedback.twig' %}
+        {% include 'form/feedback' %}
     </div>
 
     <input type="hidden" name="amount_currency_id_{{ name }}" value="{{ defaultCurrency.id }}"/>
diff --git a/resources/views/form/checkbox.twig b/resources/views/form/checkbox.twig
index 9e2d718b81..d4a0143871 100644
--- a/resources/views/form/checkbox.twig
+++ b/resources/views/form/checkbox.twig
@@ -13,7 +13,7 @@
                 {{ Form.checkbox(name, value, options.checked, options) }}
             </label>
         </div>
-        {% include 'form/help.twig' %}
-        {% include 'form/feedback.twig' %}
+        {% include 'form/help' %}
+        {% include 'form/feedback' %}
     </div>
 </div>
diff --git a/resources/views/form/date.twig b/resources/views/form/date.twig
index 3f08f20e3b..0e86cf5a07 100644
--- a/resources/views/form/date.twig
+++ b/resources/views/form/date.twig
@@ -8,7 +8,7 @@
             </div>
             {{ Form.input('date', name, value, options) }}
         </div>
-        {% include 'form/help.twig' %}
-        {% include 'form/feedback.twig' %}
+        {% include 'form/help' %}
+        {% include 'form/feedback' %}
     </div>
 </div>
diff --git a/resources/views/form/file.twig b/resources/views/form/file.twig
index 0596ef7dbd..21da01da64 100644
--- a/resources/views/form/file.twig
+++ b/resources/views/form/file.twig
@@ -3,7 +3,7 @@
 
     <div class="col-sm-8">
         {{ Form.file(name, options) }}
-        {% include 'form/help.twig' %}
-        {% include 'form/feedback.twig' %}
+        {% include 'form/help' %}
+        {% include 'form/feedback' %}
     </div>
 </div>
diff --git a/resources/views/form/integer.twig b/resources/views/form/integer.twig
index 6b0b94fe09..9ce0e38f5b 100644
--- a/resources/views/form/integer.twig
+++ b/resources/views/form/integer.twig
@@ -4,7 +4,7 @@
     <div class="col-sm-8">
         <div class="input-group">
             {{ Form.input('number', name, value, options) }}
-            {% include 'form/feedback.twig' %}
+            {% include 'form/feedback' %}
         </div>
     </div>
 </div>
diff --git a/resources/views/form/location.twig b/resources/views/form/location.twig
index 0f57303f3b..34503bab77 100644
--- a/resources/views/form/location.twig
+++ b/resources/views/form/location.twig
@@ -10,6 +10,6 @@
         <input type="hidden" name="longitude" value=""/>
         <input type="hidden" name="zoomLevel" value="6"/>
         <input type="hidden" name="setTag" value=""/>
-        {% include 'form/feedback.twig' %}
+        {% include 'form/feedback' %}
     </div>
 </div>
diff --git a/resources/views/form/multiCheckbox.twig b/resources/views/form/multiCheckbox.twig
index 5687551004..39776e2be0 100644
--- a/resources/views/form/multiCheckbox.twig
+++ b/resources/views/form/multiCheckbox.twig
@@ -15,8 +15,8 @@
                 </label>
             </div>
         {% endfor %}
-        {% include 'form/help.twig' %}
-        {% include 'form/feedback.twig' %}
+        {% include 'form/help' %}
+        {% include 'form/feedback' %}
 
     </div>
 </div>
diff --git a/resources/views/form/multiRadio.twig b/resources/views/form/multiRadio.twig
index 1bef4bec1e..f321eda908 100644
--- a/resources/views/form/multiRadio.twig
+++ b/resources/views/form/multiRadio.twig
@@ -10,8 +10,8 @@
                 </label>
             </div>
         {% endfor %}
-        {% include 'form/help.twig' %}
-        {% include 'form/feedback.twig' %}
+        {% include 'form/help' %}
+        {% include 'form/feedback' %}
 
     </div>
 </div>
diff --git a/resources/views/form/select.twig b/resources/views/form/select.twig
index e5b6a7874f..2d48ddfcaa 100644
--- a/resources/views/form/select.twig
+++ b/resources/views/form/select.twig
@@ -3,8 +3,8 @@
 
     <div class="col-sm-8">
         {{ Form.select(name, list, selected , options ) }}
-        {% include 'form/help.twig' %}
-        {% include 'form/feedback.twig' %}
+        {% include 'form/help' %}
+        {% include 'form/feedback' %}
 
     </div>
 </div>
diff --git a/resources/views/form/tags.twig b/resources/views/form/tags.twig
index 0b199f9117..e504f6c452 100644
--- a/resources/views/form/tags.twig
+++ b/resources/views/form/tags.twig
@@ -3,6 +3,6 @@
 
     <div class="col-sm-8">
         {{ Form.input('text', name, value, options) }}
-        {% include 'form/feedback.twig' %}
+        {% include 'form/feedback' %}
     </div>
 </div>
diff --git a/resources/views/form/text.twig b/resources/views/form/text.twig
index c2f890c0fe..e94cee84fb 100644
--- a/resources/views/form/text.twig
+++ b/resources/views/form/text.twig
@@ -3,7 +3,7 @@
 
     <div class="col-sm-8">
         {{ Form.input('text', name, value, options) }}
-        {% include 'form/help.twig' %}
-        {% include 'form/feedback.twig' %}
+        {% include 'form/help' %}
+        {% include 'form/feedback' %}
     </div>
 </div>
diff --git a/resources/views/form/textarea.twig b/resources/views/form/textarea.twig
index 9bed7883e2..c765ee4eee 100644
--- a/resources/views/form/textarea.twig
+++ b/resources/views/form/textarea.twig
@@ -3,7 +3,7 @@
 
     <div class="col-sm-8">
         {{ Form.textarea(name, value, options) }}
-        {% include 'form/help.twig' %}
-        {% include 'form/feedback.twig' %}
+        {% include 'form/help' %}
+        {% include 'form/feedback' %}
     </div>
 </div>
diff --git a/resources/views/import/complete.twig b/resources/views/import/complete.twig
index 4272cc3648..9a95c16620 100644
--- a/resources/views/import/complete.twig
+++ b/resources/views/import/complete.twig
@@ -1,4 +1,4 @@
-{% extends "./layout/default.twig" %}
+{% extends "./layout/default" %}
 
 {% block breadcrumbs %}
     {{ Breadcrumbs.renderIfExists }}
diff --git a/resources/views/import/csv/configure.twig b/resources/views/import/csv/configure.twig
index 7dccd35ede..d650adbbb8 100644
--- a/resources/views/import/csv/configure.twig
+++ b/resources/views/import/csv/configure.twig
@@ -1,4 +1,4 @@
-{% extends "./layout/default.twig" %}
+{% extends "./layout/default" %}
 
 {% block breadcrumbs %}
     {{ Breadcrumbs.renderIfExists(Route.getCurrentRoute.getName, job) }}
diff --git a/resources/views/import/csv/map.twig b/resources/views/import/csv/map.twig
index 5f21f1a9d0..159f73edd6 100644
--- a/resources/views/import/csv/map.twig
+++ b/resources/views/import/csv/map.twig
@@ -1,4 +1,4 @@
-{% extends "./layout/default.twig" %}
+{% extends "./layout/default" %}
 
 {% block breadcrumbs %}
     {{ Breadcrumbs.renderIfExists(Route.getCurrentRoute.getName) }}
diff --git a/resources/views/import/csv/roles.twig b/resources/views/import/csv/roles.twig
index f10122ea1e..aad820fbbd 100644
--- a/resources/views/import/csv/roles.twig
+++ b/resources/views/import/csv/roles.twig
@@ -1,4 +1,4 @@
-{% extends "./layout/default.twig" %}
+{% extends "./layout/default" %}
 
 {% block breadcrumbs %}
     {{ Breadcrumbs.renderIfExists(Route.getCurrentRoute.getName) }}
diff --git a/resources/views/import/finished.twig b/resources/views/import/finished.twig
index abf47a20c6..63e5b450fc 100644
--- a/resources/views/import/finished.twig
+++ b/resources/views/import/finished.twig
@@ -1,4 +1,4 @@
-{% extends "./layout/default.twig" %}
+{% extends "./layout/default" %}
 
 {% block breadcrumbs %}
     {{ Breadcrumbs.renderIfExists }}
diff --git a/resources/views/import/index.twig b/resources/views/import/index.twig
index d3188651b3..922a3fa12e 100644
--- a/resources/views/import/index.twig
+++ b/resources/views/import/index.twig
@@ -1,4 +1,4 @@
-{% extends "./layout/default.twig" %}
+{% extends "./layout/default" %}
 
 {% block breadcrumbs %}
     {{ Breadcrumbs.renderIfExists }}
diff --git a/resources/views/import/status.twig b/resources/views/import/status.twig
index c2bb550fff..fbddfa8421 100644
--- a/resources/views/import/status.twig
+++ b/resources/views/import/status.twig
@@ -1,4 +1,4 @@
-{% extends "./layout/default.twig" %}
+{% extends "./layout/default" %}
 
 {% block breadcrumbs %}
     {{ Breadcrumbs.renderIfExists }}
diff --git a/resources/views/index.twig b/resources/views/index.twig
index 14a14c66e3..b13beb55b7 100644
--- a/resources/views/index.twig
+++ b/resources/views/index.twig
@@ -1,4 +1,4 @@
-{% extends "./layout/default.twig" %}
+{% extends "./layout/default" %}
 
 {% block breadcrumbs %}
     {{ Breadcrumbs.renderIfExists }}
@@ -8,7 +8,7 @@
 
 
 
-    {% include 'partials/boxes.twig' %}
+    {% include 'partials/boxes' %}
 
     <div class="row">
         <div class="col-lg-8 col-md-12 col-sm-12">
diff --git a/resources/views/layout/default.twig b/resources/views/layout/default.twig
index cd63a16aa3..40e3644cee 100644
--- a/resources/views/layout/default.twig
+++ b/resources/views/layout/default.twig
@@ -29,7 +29,7 @@
     <![endif]-->
 
     <!-- favicons -->
-    {% include('partials/favicons.twig') %}
+    {% include('partials/favicons') %}
 
 </head>
 <body class="skin-blue-light sidebar-mini hold-transition">
@@ -98,7 +98,7 @@
             </form>
             <!-- /.search form -->
             <!-- sidebar menu: : style can be found in sidebar.less -->
-            {% include('partials/menu-sidebar.twig') %}
+            {% include('partials/menu-sidebar') %}
         </section>
         <!-- /.sidebar -->
     </aside>
@@ -107,14 +107,14 @@
     <div class="content-wrapper">
         <!-- Content Header (Page header) -->
         <section class="content-header">
-            {% include('partials/page-header.twig') %}
+            {% include('partials/page-header') %}
             {% block breadcrumbs %}{% endblock %}
 
         </section>
 
         <!-- Main content -->
         <section class="content">
-            {% include('partials/flashes.twig') %}
+            {% include('partials/flashes') %}
 
             <!-- actual content -->
             {% block content %}{% endblock %}
@@ -130,7 +130,7 @@
         <strong><a href="https://github.com/JC5/firefly-iii">Firefly III</a></strong>
     </footer>
 
-    {% include('partials/control-bar.twig') %}
+    {% include('partials/control-bar') %}
 
 </div>
 <!-- ./wrapper -->
diff --git a/resources/views/layout/empty.twig b/resources/views/layout/empty.twig
index 6545719f45..9fa7600bdc 100644
--- a/resources/views/layout/empty.twig
+++ b/resources/views/layout/empty.twig
@@ -17,7 +17,7 @@
     <![endif]-->
 
     <!-- favicons -->
-    {% include('partials/favicons.twig') %}
+    {% include('partials/favicons') %}
 
 </head>
 <body class="login-page">
diff --git a/resources/views/layout/guest.twig b/resources/views/layout/guest.twig
index a55e49c412..e0e0ccc07f 100644
--- a/resources/views/layout/guest.twig
+++ b/resources/views/layout/guest.twig
@@ -27,7 +27,7 @@
     <![endif]-->
 
     <!-- favicons -->
-    {% include('partials/favicons.twig') %}
+    {% include('partials/favicons') %}
 
 </head>
 <body class="login-page">
diff --git a/resources/views/new-user/index.twig b/resources/views/new-user/index.twig
index 7dbb572dcc..3dbcdb81ae 100644
--- a/resources/views/new-user/index.twig
+++ b/resources/views/new-user/index.twig
@@ -1,4 +1,4 @@
-{% extends "./layout/default.twig" %}
+{% extends "./layout/default" %}
 
 {% block breadcrumbs %}
     {{ Breadcrumbs.renderIfExists(Route.getCurrentRoute.getName) }}
diff --git a/resources/views/piggy-banks/add-mobile.twig b/resources/views/piggy-banks/add-mobile.twig
index 8839178622..29460b3e47 100644
--- a/resources/views/piggy-banks/add-mobile.twig
+++ b/resources/views/piggy-banks/add-mobile.twig
@@ -1,4 +1,4 @@
-{% extends "./layout/default.twig" %}
+{% extends "./layout/default" %}
 
 {% block breadcrumbs %}
     {{ Breadcrumbs.renderIfExists(Route.getCurrentRoute.getName) }}
diff --git a/resources/views/piggy-banks/create.twig b/resources/views/piggy-banks/create.twig
index c2d5480ef1..4d462164bc 100644
--- a/resources/views/piggy-banks/create.twig
+++ b/resources/views/piggy-banks/create.twig
@@ -1,4 +1,4 @@
-{% extends "./layout/default.twig" %}
+{% extends "./layout/default" %}
 
 {% block breadcrumbs %}
     {{ Breadcrumbs.renderIfExists(Route.getCurrentRoute.getName) }}
diff --git a/resources/views/piggy-banks/delete.twig b/resources/views/piggy-banks/delete.twig
index 6c52087c91..3b7b88beef 100644
--- a/resources/views/piggy-banks/delete.twig
+++ b/resources/views/piggy-banks/delete.twig
@@ -1,4 +1,4 @@
-{% extends "./layout/default.twig" %}
+{% extends "./layout/default" %}
 
 {% block breadcrumbs %}
     {{ Breadcrumbs.renderIfExists(Route.getCurrentRoute.getName, piggyBank) }}
diff --git a/resources/views/piggy-banks/edit.twig b/resources/views/piggy-banks/edit.twig
index 8daeef739f..35f8f26cc5 100644
--- a/resources/views/piggy-banks/edit.twig
+++ b/resources/views/piggy-banks/edit.twig
@@ -1,4 +1,4 @@
-{% extends "./layout/default.twig" %}
+{% extends "./layout/default" %}
 
 {% block breadcrumbs %}
     {{ Breadcrumbs.renderIfExists(Route.getCurrentRoute.getName, piggyBank) }}
diff --git a/resources/views/piggy-banks/index.twig b/resources/views/piggy-banks/index.twig
index b01ceac8b7..6c4afac57b 100644
--- a/resources/views/piggy-banks/index.twig
+++ b/resources/views/piggy-banks/index.twig
@@ -1,4 +1,4 @@
-{% extends "./layout/default.twig" %}
+{% extends "./layout/default" %}
 
 {% block breadcrumbs %}
     {{ Breadcrumbs.renderIfExists(Route.getCurrentRoute.getName) }}
@@ -11,7 +11,7 @@
                 <div class="box-header with-border">
                     <h3 class="box-title">{{ 'piggyBanks'|_ }}</h3></div>
                 <div class="box-body table-responsive no-padding">
-                    {% include 'list/piggy-banks.twig' %}
+                    {% include 'list/piggy-banks' %}
                 </div>
                 <div class="box-footer">
                     <a href="{{ route('piggy-banks.create') }}" class="btn btn-success pull-right">{{ 'new_piggy_bank'|_ }}</a>
diff --git a/resources/views/piggy-banks/remove-mobile.twig b/resources/views/piggy-banks/remove-mobile.twig
index f24c064661..9b1574983a 100644
--- a/resources/views/piggy-banks/remove-mobile.twig
+++ b/resources/views/piggy-banks/remove-mobile.twig
@@ -1,4 +1,4 @@
-{% extends "./layout/default.twig" %}
+{% extends "./layout/default" %}
 {% block breadcrumbs %}
     {{ Breadcrumbs.renderIfExists(Route.getCurrentRoute.getName) }}
 {% endblock %}
diff --git a/resources/views/piggy-banks/show.twig b/resources/views/piggy-banks/show.twig
index 5f9211d093..5e240a242d 100644
--- a/resources/views/piggy-banks/show.twig
+++ b/resources/views/piggy-banks/show.twig
@@ -1,4 +1,4 @@
-{% extends "./layout/default.twig" %}
+{% extends "./layout/default" %}
 
 {% block breadcrumbs %}
     {{ Breadcrumbs.renderIfExists(Route.getCurrentRoute.getName, piggyBank) }}
diff --git a/resources/views/popup/report/balance-amount.twig b/resources/views/popup/report/balance-amount.twig
index 1707235ee7..1f5bd820bb 100644
--- a/resources/views/popup/report/balance-amount.twig
+++ b/resources/views/popup/report/balance-amount.twig
@@ -10,7 +10,7 @@
         <div class="modal-body">
             {% set hideSource = true %}
             {% set hideBudget = true %}
-            {% include 'popup/list/journals-tasker.twig' %}
+            {% include 'popup/list/journals-tasker' %}
         </div>
         <div class="modal-footer">
             <button type="button" class="btn btn-default" data-dismiss="modal">{{ 'close'|_ }}</button>
diff --git a/resources/views/popup/report/category-entry.twig b/resources/views/popup/report/category-entry.twig
index d1ca6ef55a..7efcc01ad7 100644
--- a/resources/views/popup/report/category-entry.twig
+++ b/resources/views/popup/report/category-entry.twig
@@ -8,7 +8,7 @@
         </div>
         <div class="modal-body">
             {% set hideCategory = true %}
-            {% include 'popup/list/journals-tasker.twig' %}
+            {% include 'popup/list/journals-tasker' %}
         </div>
         <div class="modal-footer">
             <button type="button" class="btn btn-default" data-dismiss="modal">{{ 'close'|_ }}</button>
diff --git a/resources/views/popup/report/expense-entry.twig b/resources/views/popup/report/expense-entry.twig
index 6af2fd25fd..72a415de0b 100644
--- a/resources/views/popup/report/expense-entry.twig
+++ b/resources/views/popup/report/expense-entry.twig
@@ -8,7 +8,7 @@
         </div>
         <div class="modal-body">
             {% set hideDestination = true %}
-            {% include 'popup/list/journals-tasker.twig' %}
+            {% include 'popup/list/journals-tasker' %}
         </div>
         <div class="modal-footer">
             <button type="button" class="btn btn-default" data-dismiss="modal">{{ 'close'|_ }}</button>
diff --git a/resources/views/popup/report/income-entry.twig b/resources/views/popup/report/income-entry.twig
index a9f57c3731..f32dc9e697 100644
--- a/resources/views/popup/report/income-entry.twig
+++ b/resources/views/popup/report/income-entry.twig
@@ -10,7 +10,7 @@
             {% set hideBudget = true %}
             {% set hideSource = true %}
             {% set accountPerspective = account %}
-            {% include 'popup/list/journals-tasker.twig' %}
+            {% include 'popup/list/journals-tasker' %}
         </div>
         <div class="modal-footer">
             <button type="button" class="btn btn-default" data-dismiss="modal">{{ 'close'|_ }}</button>
diff --git a/resources/views/preferences/code.twig b/resources/views/preferences/code.twig
index 8931babd46..84eca53ae7 100644
--- a/resources/views/preferences/code.twig
+++ b/resources/views/preferences/code.twig
@@ -1,4 +1,4 @@
-{% extends "./layout/default.twig" %}
+{% extends "./layout/default" %}
 
 {% block breadcrumbs %}
     {{ Breadcrumbs.renderIfExists(Route.getCurrentRoute.getName) }}
diff --git a/resources/views/preferences/index.twig b/resources/views/preferences/index.twig
index 9f9556f3ab..96c0b98b3d 100644
--- a/resources/views/preferences/index.twig
+++ b/resources/views/preferences/index.twig
@@ -1,4 +1,4 @@
-{% extends "./layout/default.twig" %}
+{% extends "./layout/default" %}
 
 {% block breadcrumbs %}
     {{ Breadcrumbs.renderIfExists(Route.getCurrentRoute.getName) }}
diff --git a/resources/views/profile/change-password.twig b/resources/views/profile/change-password.twig
index 29835429f3..d313e31e36 100644
--- a/resources/views/profile/change-password.twig
+++ b/resources/views/profile/change-password.twig
@@ -1,4 +1,4 @@
-{% extends "./layout/default.twig" %}
+{% extends "./layout/default" %}
 
 {% block breadcrumbs %}
     {{ Breadcrumbs.renderIfExists(Route.getCurrentRoute.getName) }}
diff --git a/resources/views/profile/delete-account.twig b/resources/views/profile/delete-account.twig
index 9006950e63..46ac6758bc 100644
--- a/resources/views/profile/delete-account.twig
+++ b/resources/views/profile/delete-account.twig
@@ -1,4 +1,4 @@
-{% extends "./layout/default.twig" %}
+{% extends "./layout/default" %}
 
 {% block breadcrumbs %}
     {{ Breadcrumbs.renderIfExists(Route.getCurrentRoute.getName) }}
diff --git a/resources/views/profile/index.twig b/resources/views/profile/index.twig
index 2be9d63b54..f86a713205 100644
--- a/resources/views/profile/index.twig
+++ b/resources/views/profile/index.twig
@@ -1,4 +1,4 @@
-{% extends "./layout/default.twig" %}
+{% extends "./layout/default" %}
 
 {% block breadcrumbs %}
     {{ Breadcrumbs.renderIfExists(Route.getCurrentRoute.getName) }}
diff --git a/resources/views/reminders/index.twig b/resources/views/reminders/index.twig
index 2eb2a6e8ae..13816030ab 100644
--- a/resources/views/reminders/index.twig
+++ b/resources/views/reminders/index.twig
@@ -1,4 +1,4 @@
-{% extends "./layout/default.twig" %}
+{% extends "./layout/default" %}
 
 <p>
     No longer used.
diff --git a/resources/views/reminders/show.twig b/resources/views/reminders/show.twig
index f1c7e1cff1..ef9fbe8ebe 100644
--- a/resources/views/reminders/show.twig
+++ b/resources/views/reminders/show.twig
@@ -1,4 +1,4 @@
-{% extends "./layout/default.twig" %}
+{% extends "./layout/default" %}
 <p>
     No longer used.
 </p>
diff --git a/resources/views/reports/audit/report.twig b/resources/views/reports/audit/report.twig
index 8f57ea5fd6..7c266182cf 100644
--- a/resources/views/reports/audit/report.twig
+++ b/resources/views/reports/audit/report.twig
@@ -1,4 +1,4 @@
-{% extends "./layout/default.twig" %}
+{% extends "./layout/default" %}
 
 {% block breadcrumbs %}
     {{ Breadcrumbs.renderIfExists(Route.getCurrentRoute.getName, start, end, reportType, accountIds) }}
@@ -62,7 +62,7 @@
                                     balance: auditData[account.id].endBalance|formatAmount
                                 })|raw }}
                             </p>
-                            {% include 'reports/partials/journals-audit-tasker.twig'  with {'journals': auditData[account.id].journals,'account':account} %}
+                            {% include 'reports/partials/journals-audit-tasker'  with {'journals': auditData[account.id].journals,'account':account} %}
                             <p style="padding:10px;">
                                 {{ trans('firefly.audit_end_balance',
                                 {
diff --git a/resources/views/reports/default/month.twig b/resources/views/reports/default/month.twig
index 69285bff64..c3f7b4e56d 100644
--- a/resources/views/reports/default/month.twig
+++ b/resources/views/reports/default/month.twig
@@ -1,4 +1,4 @@
-{% extends "./layout/default.twig" %}
+{% extends "./layout/default" %}
 
 {% block breadcrumbs %}
     {{ Breadcrumbs.renderIfExists(Route.getCurrentRoute.getName, start, end, reportType, accountIds) }}
@@ -62,7 +62,7 @@
 
         </div>
         <div class="col-lg-6 col-md-6 col-sm-6">
-            {% include 'reports/partials/tags.twig' %}
+            {% include 'reports/partials/tags' %}
         </div>
     </div>
     <div class="row">
@@ -108,7 +108,7 @@
     </div>
     <div class="row">
         <div class="col-lg-12 col-md-12 col-sm-12">
-            {% include 'reports/partials/bills.twig' %}
+            {% include 'reports/partials/bills' %}
 
         </div>
     </div>
diff --git a/resources/views/reports/default/multi-year.twig b/resources/views/reports/default/multi-year.twig
index d4a059577a..f48272e92c 100644
--- a/resources/views/reports/default/multi-year.twig
+++ b/resources/views/reports/default/multi-year.twig
@@ -1,4 +1,4 @@
-{% extends "./layout/default.twig" %}
+{% extends "./layout/default" %}
 
 {% block breadcrumbs %}
     {{ Breadcrumbs.renderIfExists(Route.getCurrentRoute.getName, start, end, reportType, accountIds) }}
diff --git a/resources/views/reports/default/year.twig b/resources/views/reports/default/year.twig
index 99a9a75d11..bce36d9970 100644
--- a/resources/views/reports/default/year.twig
+++ b/resources/views/reports/default/year.twig
@@ -1,4 +1,4 @@
-{% extends "./layout/default.twig" %}
+{% extends "./layout/default" %}
 
 {% block breadcrumbs %}
     {{ Breadcrumbs.renderIfExists(Route.getCurrentRoute.getName, start, end, reportType, accountIds) }}
@@ -67,7 +67,7 @@
     </div>
     <div class="row">
         <div class="col-lg-6 col-md-6 col-sm-6">
-            {% include 'reports/partials/tags.twig' %}
+            {% include 'reports/partials/tags' %}
         </div>
     </div>
 
diff --git a/resources/views/reports/index.twig b/resources/views/reports/index.twig
index 0fe5cfbbc7..4877fffc62 100644
--- a/resources/views/reports/index.twig
+++ b/resources/views/reports/index.twig
@@ -1,4 +1,4 @@
-{% extends "./layout/default.twig" %}
+{% extends "./layout/default" %}
 
 {% block breadcrumbs %}
     {{ Breadcrumbs.renderIfExists(Route.getCurrentRoute.getName) }}
diff --git a/resources/views/rules/index.twig b/resources/views/rules/index.twig
index 5c0dee4ef9..803575e88a 100644
--- a/resources/views/rules/index.twig
+++ b/resources/views/rules/index.twig
@@ -1,4 +1,4 @@
-{% extends "./layout/default.twig" %}
+{% extends "./layout/default" %}
 {% block breadcrumbs %}
     {{ Breadcrumbs.renderIfExists(Route.getCurrentRoute.getName) }}
 {% endblock %}
diff --git a/resources/views/rules/rule-group/create.twig b/resources/views/rules/rule-group/create.twig
index 5cb21384f7..e8243d4d4c 100644
--- a/resources/views/rules/rule-group/create.twig
+++ b/resources/views/rules/rule-group/create.twig
@@ -1,4 +1,4 @@
-{% extends "./layout/default.twig" %}
+{% extends "./layout/default" %}
 
 {% block breadcrumbs %}
     {{ Breadcrumbs.renderIfExists(Route.getCurrentRoute.getName) }}
diff --git a/resources/views/rules/rule-group/delete.twig b/resources/views/rules/rule-group/delete.twig
index 123977b5c1..6690c83efc 100644
--- a/resources/views/rules/rule-group/delete.twig
+++ b/resources/views/rules/rule-group/delete.twig
@@ -1,4 +1,4 @@
-{% extends "./layout/default.twig" %}
+{% extends "./layout/default" %}
 
 {% block breadcrumbs %}
     {{ Breadcrumbs.renderIfExists(Route.getCurrentRoute.getName, ruleGroup) }}
diff --git a/resources/views/rules/rule-group/edit.twig b/resources/views/rules/rule-group/edit.twig
index 4156879820..e556feabb5 100644
--- a/resources/views/rules/rule-group/edit.twig
+++ b/resources/views/rules/rule-group/edit.twig
@@ -1,4 +1,4 @@
-{% extends "./layout/default.twig" %}
+{% extends "./layout/default" %}
 
 {% block breadcrumbs %}
     {{ Breadcrumbs.renderIfExists(Route.getCurrentRoute.getName, ruleGroup) }}
diff --git a/resources/views/rules/rule-group/select-transactions.twig b/resources/views/rules/rule-group/select-transactions.twig
index 2dccd88379..90a85ee0d7 100644
--- a/resources/views/rules/rule-group/select-transactions.twig
+++ b/resources/views/rules/rule-group/select-transactions.twig
@@ -1,4 +1,4 @@
-{% extends "./layout/default.twig" %}
+{% extends "./layout/default" %}
 
 {% block breadcrumbs %}
     {{ Breadcrumbs.renderIfExists(Route.getCurrentRoute.getName, ruleGroup) }}
diff --git a/resources/views/rules/rule/create.twig b/resources/views/rules/rule/create.twig
index 7b1e55736f..15b80d88af 100644
--- a/resources/views/rules/rule/create.twig
+++ b/resources/views/rules/rule/create.twig
@@ -1,4 +1,4 @@
-{% extends "./layout/default.twig" %}
+{% extends "./layout/default" %}
 
 {% block breadcrumbs %}
     {{ Breadcrumbs.renderIfExists(Route.getCurrentRoute.getName, ruleGroup) }}
@@ -71,7 +71,7 @@
             </div>
         </div>
 
-        {% include '/rules/partials/test-trigger-modal.twig' %}
+        {% include '/rules/partials/test-trigger-modal' %}
 
         <!-- RULE ACTIONS -->
         <div class="row">
diff --git a/resources/views/rules/rule/delete.twig b/resources/views/rules/rule/delete.twig
index 3c37f0da08..0d01f303b8 100644
--- a/resources/views/rules/rule/delete.twig
+++ b/resources/views/rules/rule/delete.twig
@@ -1,4 +1,4 @@
-{% extends "./layout/default.twig" %}
+{% extends "./layout/default" %}
 
 {% block breadcrumbs %}
     {{ Breadcrumbs.renderIfExists(Route.getCurrentRoute.getName, rule) }}
diff --git a/resources/views/rules/rule/edit.twig b/resources/views/rules/rule/edit.twig
index 69559d895d..1260c34b52 100644
--- a/resources/views/rules/rule/edit.twig
+++ b/resources/views/rules/rule/edit.twig
@@ -1,4 +1,4 @@
-{% extends "./layout/default.twig" %}
+{% extends "./layout/default" %}
 
 {% block breadcrumbs %}
     {{ Breadcrumbs.renderIfExists(Route.getCurrentRoute.getName, rule) }}
@@ -69,7 +69,7 @@
         </div>
     </div>
 
-    {% include '/rules/partials/test-trigger-modal.twig' %}
+    {% include '/rules/partials/test-trigger-modal' %}
 
     <!-- RULE ACTIONS -->
     <div class="row">
diff --git a/resources/views/search/index.twig b/resources/views/search/index.twig
index 2f9b8afdc5..35bf5a3d28 100644
--- a/resources/views/search/index.twig
+++ b/resources/views/search/index.twig
@@ -1,4 +1,4 @@
-{% extends "./layout/default.twig" %}
+{% extends "./layout/default" %}
 
 {% block breadcrumbs %}
     {{ Breadcrumbs.renderIfExists(Route.getCurrentRoute.getName, query) }}
diff --git a/resources/views/tags/create.twig b/resources/views/tags/create.twig
index ea9c4e12ac..95b99f7d9d 100644
--- a/resources/views/tags/create.twig
+++ b/resources/views/tags/create.twig
@@ -1,4 +1,4 @@
-{% extends "./layout/default.twig" %}
+{% extends "./layout/default" %}
 
 {% block breadcrumbs %}
     {{ Breadcrumbs.renderIfExists(Route.getCurrentRoute.getName) }}
diff --git a/resources/views/tags/delete.twig b/resources/views/tags/delete.twig
index 966ad7e011..e6cd27f096 100644
--- a/resources/views/tags/delete.twig
+++ b/resources/views/tags/delete.twig
@@ -1,4 +1,4 @@
-{% extends "./layout/default.twig" %}
+{% extends "./layout/default" %}
 
 {% block breadcrumbs %}
     {{ Breadcrumbs.renderIfExists(Route.getCurrentRoute.getName, tag) }}
diff --git a/resources/views/tags/edit.twig b/resources/views/tags/edit.twig
index 0fc6ec210d..e6a089d269 100644
--- a/resources/views/tags/edit.twig
+++ b/resources/views/tags/edit.twig
@@ -1,4 +1,4 @@
-{% extends "./layout/default.twig" %}
+{% extends "./layout/default" %}
 
 {% block breadcrumbs %}
     {{ Breadcrumbs.renderIfExists(Route.getCurrentRoute.getName, tag) }}
diff --git a/resources/views/tags/index.twig b/resources/views/tags/index.twig
index 22358ac738..78512e056d 100644
--- a/resources/views/tags/index.twig
+++ b/resources/views/tags/index.twig
@@ -1,4 +1,4 @@
-{% extends "./layout/default.twig" %}
+{% extends "./layout/default" %}
 
 {% block breadcrumbs %}
     {{ Breadcrumbs.renderIfExists(Route.getCurrentRoute.getName) }}
diff --git a/resources/views/tags/show.twig b/resources/views/tags/show.twig
index fbdc4432d4..e78b69f5b1 100644
--- a/resources/views/tags/show.twig
+++ b/resources/views/tags/show.twig
@@ -1,4 +1,4 @@
-{% extends "./layout/default.twig" %}
+{% extends "./layout/default" %}
 
 {% block breadcrumbs %}
     {{ Breadcrumbs.renderIfExists(Route.getCurrentRoute.getName, tag) }}
diff --git a/resources/views/transactions/convert.twig b/resources/views/transactions/convert.twig
index c5c7c95429..40c8429b71 100644
--- a/resources/views/transactions/convert.twig
+++ b/resources/views/transactions/convert.twig
@@ -1,4 +1,4 @@
-{% extends "./layout/default.twig" %}
+{% extends "./layout/default" %}
 
 {% block breadcrumbs %}
     {{ Breadcrumbs.renderIfExists(Route.getCurrentRoute.getName, destinationType, journal) }}
diff --git a/resources/views/transactions/create.twig b/resources/views/transactions/create.twig
index 78de00ecd4..38c961ccc0 100644
--- a/resources/views/transactions/create.twig
+++ b/resources/views/transactions/create.twig
@@ -1,4 +1,4 @@
-{% extends "./layout/default.twig" %}
+{% extends "./layout/default" %}
 
 {% block breadcrumbs %}
     {{ Breadcrumbs.renderIfExists(Route.getCurrentRoute.getName, what) }}
diff --git a/resources/views/transactions/delete.twig b/resources/views/transactions/delete.twig
index 0ce9edbec9..69e019d0e8 100644
--- a/resources/views/transactions/delete.twig
+++ b/resources/views/transactions/delete.twig
@@ -1,4 +1,4 @@
-{% extends "./layout/default.twig" %}
+{% extends "./layout/default" %}
 
 {% block breadcrumbs %}
     {{ Breadcrumbs.renderIfExists(Route.getCurrentRoute.getName, journal) }}
diff --git a/resources/views/transactions/edit-split.twig b/resources/views/transactions/edit-split.twig
index 451371820b..1ceb75baf3 100644
--- a/resources/views/transactions/edit-split.twig
+++ b/resources/views/transactions/edit-split.twig
@@ -1,4 +1,4 @@
-{% extends "./layout/default.twig" %}
+{% extends "./layout/default" %}
 
 {% block breadcrumbs %}
     {{ Breadcrumbs.renderIfExists(Route.getCurrentRoute.getName, journal) }}
diff --git a/resources/views/transactions/edit.twig b/resources/views/transactions/edit.twig
index bd8a39cf54..edf11ef10b 100644
--- a/resources/views/transactions/edit.twig
+++ b/resources/views/transactions/edit.twig
@@ -1,4 +1,4 @@
-{% extends "./layout/default.twig" %}
+{% extends "./layout/default" %}
 
 {% block breadcrumbs %}
     {{ Breadcrumbs.renderIfExists(Route.getCurrentRoute.getName, journal) }}
diff --git a/resources/views/transactions/index.twig b/resources/views/transactions/index.twig
index ab081e5514..3d63c4e0b1 100644
--- a/resources/views/transactions/index.twig
+++ b/resources/views/transactions/index.twig
@@ -1,4 +1,4 @@
-{% extends "./layout/default.twig" %}
+{% extends "./layout/default" %}
 
 {% block breadcrumbs %}
     {{ Breadcrumbs.renderIfExists(Route.getCurrentRoute.getName, what) }}
diff --git a/resources/views/transactions/mass-delete.twig b/resources/views/transactions/mass-delete.twig
index 2be459dbbc..0cc411b8d0 100644
--- a/resources/views/transactions/mass-delete.twig
+++ b/resources/views/transactions/mass-delete.twig
@@ -1,4 +1,4 @@
-{% extends "./layout/default.twig" %}
+{% extends "./layout/default" %}
 
 {% block breadcrumbs %}
     {{ Breadcrumbs.renderIfExists(Route.getCurrentRoute.getName) }}
diff --git a/resources/views/transactions/mass-edit.twig b/resources/views/transactions/mass-edit.twig
index 59260f2603..b42592d13a 100644
--- a/resources/views/transactions/mass-edit.twig
+++ b/resources/views/transactions/mass-edit.twig
@@ -1,4 +1,4 @@
-{% extends "./layout/default.twig" %}
+{% extends "./layout/default" %}
 
 {% block breadcrumbs %}
     {{ Breadcrumbs.renderIfExists(Route.getCurrentRoute.getName) }}
diff --git a/resources/views/transactions/show.twig b/resources/views/transactions/show.twig
index f4928d89f4..2ade2b2752 100644
--- a/resources/views/transactions/show.twig
+++ b/resources/views/transactions/show.twig
@@ -1,4 +1,4 @@
-{% extends "./layout/default.twig" %}
+{% extends "./layout/default" %}
 
 {% block breadcrumbs %}
     {{ Breadcrumbs.renderIfExists(Route.getCurrentRoute.getName, journal) }}