diff --git a/resources/twig/auth/register.twig b/resources/twig/auth/register.twig
index ea209c35d5..03970a73b9 100644
--- a/resources/twig/auth/register.twig
+++ b/resources/twig/auth/register.twig
@@ -26,10 +26,10 @@
             <input type="hidden" name="_token" value="{{ csrf_token() }}">
 
             <div class="form-group has-feedback">
-                <input type="email" name="email" class="form-control" placeholder="Email" />
+                <input type="email" name="email" class="form-control" placeholder="Email"/>
                 {% if host == 'geld.nder.be' or host == 'firefly.app' %}
                     <p class="help-block">You will receive an email from Firefly III. If your email address
-                    is incorrect, your account may not work.</p>
+                        is incorrect, your account may not work.</p>
                 {% endif %}
             </div>
             <div class="form-group has-feedback">
diff --git a/resources/twig/budgets/index.twig b/resources/twig/budgets/index.twig
index e98a252672..562663d137 100644
--- a/resources/twig/budgets/index.twig
+++ b/resources/twig/budgets/index.twig
@@ -24,7 +24,8 @@
                         </div>
                         <div class="col-lg-6 col-md-4 col-sm-3" style="text-align:right;">
                             <small>{{ trans('firefly.availableIn',{date : period }) }}:
-                                <a href="#" class="updateIncome"><span id="budgetIncomeTotal" data-value="{{ budgetIncomeTotal }}">{{ budgetIncomeTotal|formatAmount }}</span></a>
+                                <a href="#" class="updateIncome"><span id="budgetIncomeTotal"
+                                                                       data-value="{{ budgetIncomeTotal }}">{{ budgetIncomeTotal|formatAmount }}</span></a>
                             </small>
                         </div>
                     </div>
diff --git a/resources/twig/budgets/show.twig b/resources/twig/budgets/show.twig
index 9ed53830ce..173b9a1d4e 100644
--- a/resources/twig/budgets/show.twig
+++ b/resources/twig/budgets/show.twig
@@ -45,7 +45,7 @@
 
             {% for limit in limits %}
                 {% for rep in limit.limitRepetitions %}
-                {% set spentInRep = spentInRepetition(rep) %}
+                    {% set spentInRep = spentInRepetition(rep) %}
                     <div class="box">
                         <div class="box-header with-border">
                             <h3 class="box-title"><a href="{{ route('budgets.show',[budget.id,rep.id]) }}">{{ rep.startdate.formatLocalized(monthFormat) }}</a>
@@ -97,12 +97,12 @@
 {% endblock %}
 {% block scripts %}
     <script type="text/javascript">
-        var budgetID = {{budget.id}};
+        var budgetID = {{ budget.id }};
         {% if repetition.id %}
-        var repetitionID = {{repetition.id}};
-        var year = {{repetition.startdate.format('Y')}};
+        var repetitionID = {{ repetition.id }};
+        var year = {{ repetition.startdate.format('Y') }};
         {% else %}
-        var year = {{Session.get('start').format('Y')}};
+        var year = {{ Session.get('start').format('Y') }};
         {% endif %}
 
     </script>
diff --git a/resources/twig/emails/registered-html.twig b/resources/twig/emails/registered-html.twig
index 82d4050d96..48edb4ffc0 100644
--- a/resources/twig/emails/registered-html.twig
+++ b/resources/twig/emails/registered-html.twig
@@ -59,6 +59,7 @@
 }
 
 
+
 </script>
 
 </body>
diff --git a/resources/twig/errors/503.twig b/resources/twig/errors/503.twig
index 365a8698e3..a6bea4e28b 100644
--- a/resources/twig/errors/503.twig
+++ b/resources/twig/errors/503.twig
@@ -51,7 +51,7 @@
         m.parentNode.insertBefore(a, m)
     })(window, document, 'script', '//www.google-analytics.com/analytics.js', 'ga');
 
-    ga('create', '{{ env('ANALYTICS_ID', 'XXX-XX-X')  }}', 'auto');
+    ga('create', '{{ env('ANALYTICS_ID', 'XXX-XX-X') }}', 'auto');
     ga('send', 'pageview');
 
 </script>
diff --git a/resources/twig/layout/default.twig b/resources/twig/layout/default.twig
index 9542222ad3..30c21850fb 100644
--- a/resources/twig/layout/default.twig
+++ b/resources/twig/layout/default.twig
@@ -164,11 +164,11 @@
 
     // date range picker configuration:
     var dateRangeConfig = {
-        startDate: moment("{{Session.get('start').format('Y-m-d')}}"),
-        endDate: moment("{{Session.get('end').format('Y-m-d')}}"),
-        linkTitle: "{{Session.get('start').formatLocalized(monthAndDayFormat)}} - {{Session.get('end').formatLocalized(monthAndDayFormat)}}",
-        URL: "{{route('daterange')}}",
-        firstDate: moment("{{Session.get('first').format('Y-m-d')}}"),
+        startDate: moment("{{ Session.get('start').format('Y-m-d') }}"),
+        endDate: moment("{{ Session.get('end').format('Y-m-d') }}"),
+        linkTitle: "{{ Session.get('start').formatLocalized(monthAndDayFormat) }} - {{ Session.get('end').formatLocalized(monthAndDayFormat) }}",
+        URL: "{{ route('daterange') }}",
+        firstDate: moment("{{ Session.get('first').format('Y-m-d') }}"),
         currentMonth: "{{ currentMonthName }}",
         previousMonth: "{{ previousMonthName }}",
         nextMonth: "{{ nextMonthName }}",
@@ -180,10 +180,10 @@
         toLabel: '{{ 'to'|_ }}'
     };
 
-    var token = "{{csrf_token()}}";
+    var token = "{{ csrf_token() }}";
     var language = "{{ language }}";
-    var currencyCode = '{{getCurrencyCode() }}';
-    var currencySymbol = '{{getCurrencySymbol()|raw }}';
+    var currencyCode = '{{ getCurrencyCode() }}';
+    var currencySymbol = '{{ getCurrencySymbol()|raw }}';
 
 </script>
 
@@ -205,17 +205,17 @@
             a.src = g;
             m.parentNode.insertBefore(a, m)
         })(window, document, 'script', '//www.google-analytics.com/analytics.js', 'ga');
-        ga('create', '{{ env('ANALYTICS_ID', 'XXX-XX-X')  }}', {'siteSpeedSampleRate': 100});
+        ga('create', '{{ env('ANALYTICS_ID', 'XXX-XX-X') }}', {'siteSpeedSampleRate': 100});
         ga('send', 'pageview');
 
         // send an event if relevant:
         {% if Session.has('gaEventCategory') and Session.has('gaEventAction') and not Session.has('gaEventLabel') %}
-        ga('send', 'event', '{{Session.get('gaEventCategory')}}', '{{Session.get('gaEventAction')}}');
+        ga('send', 'event', '{{ Session.get('gaEventCategory') }}', '{{ Session.get('gaEventAction') }}');
         {% endif %}
 
         // send event if relevant:
         {% if Session.has('gaEventCategory') and Session.has('gaEventAction') and Session.has('gaEventLabel') %}
-        ga('send', 'event', '{{Session.get('gaEventCategory')}}', '{{Session.get('gaEventAction')}}', '{{ Session.get('gaEventLabel') }}');
+        ga('send', 'event', '{{ Session.get('gaEventCategory') }}', '{{ Session.get('gaEventAction') }}', '{{ Session.get('gaEventLabel') }}');
         {% endif %}
     </script>
 {% endif %}
diff --git a/resources/twig/layout/empty.twig b/resources/twig/layout/empty.twig
index 7fd5ef6c46..3c32d46d3b 100644
--- a/resources/twig/layout/empty.twig
+++ b/resources/twig/layout/empty.twig
@@ -62,17 +62,17 @@
             a.src = g;
             m.parentNode.insertBefore(a, m)
         })(window, document, 'script', '//www.google-analytics.com/analytics.js', 'ga');
-        ga('create', '{{ env('ANALYTICS_ID', 'XXX-XX-X')  }}', {'siteSpeedSampleRate': 100});
+        ga('create', '{{ env('ANALYTICS_ID', 'XXX-XX-X') }}', {'siteSpeedSampleRate': 100});
         ga('send', 'pageview');
 
         // send an event if relevant:
         {% if Session.has('gaEventCategory') and Session.has('gaEventAction') and not Session.has('gaEventLabel') %}
-        ga('send', 'event', '{{Session.get('gaEventCategory')}}', '{{Session.get('gaEventAction')}}');
+        ga('send', 'event', '{{ Session.get('gaEventCategory') }}', '{{ Session.get('gaEventAction') }}');
         {% endif %}
 
         // send event if relevant:
         {% if Session.has('gaEventCategory') and Session.has('gaEventAction') and Session.has('gaEventLabel') %}
-        ga('send', 'event', '{{Session.get('gaEventCategory')}}', '{{Session.get('gaEventAction')}}', '{{ Session.get('gaEventLabel') }}');
+        ga('send', 'event', '{{ Session.get('gaEventCategory') }}', '{{ Session.get('gaEventAction') }}', '{{ Session.get('gaEventLabel') }}');
         {% endif %}
     </script>
 {% endif %}
diff --git a/resources/twig/layout/guest.twig b/resources/twig/layout/guest.twig
index 43da3fc880..95fdcf293a 100644
--- a/resources/twig/layout/guest.twig
+++ b/resources/twig/layout/guest.twig
@@ -63,17 +63,17 @@
             a.src = g;
             m.parentNode.insertBefore(a, m)
         })(window, document, 'script', '//www.google-analytics.com/analytics.js', 'ga');
-        ga('create', '{{ env('ANALYTICS_ID', 'XXX-XX-X')  }}', {'siteSpeedSampleRate': 100});
+        ga('create', '{{ env('ANALYTICS_ID', 'XXX-XX-X') }}', {'siteSpeedSampleRate': 100});
         ga('send', 'pageview');
 
         // send an event if relevant:
         {% if Session.has('gaEventCategory') and Session.has('gaEventAction') and not Session.has('gaEventLabel') %}
-        ga('send', 'event', '{{Session.get('gaEventCategory')}}', '{{Session.get('gaEventAction')}}');
+        ga('send', 'event', '{{ Session.get('gaEventCategory') }}', '{{ Session.get('gaEventAction') }}');
         {% endif %}
 
         // send event if relevant:
         {% if Session.has('gaEventCategory') and Session.has('gaEventAction') and Session.has('gaEventLabel') %}
-        ga('send', 'event', '{{Session.get('gaEventCategory')}}', '{{Session.get('gaEventAction')}}', '{{ Session.get('gaEventLabel') }}');
+        ga('send', 'event', '{{ Session.get('gaEventCategory') }}', '{{ Session.get('gaEventAction') }}', '{{ Session.get('gaEventLabel') }}');
         {% endif %}
     </script>
 {% endif %}
diff --git a/resources/twig/list/journals.twig b/resources/twig/list/journals.twig
index ddc9c6e64c..e8014c2f88 100644
--- a/resources/twig/list/journals.twig
+++ b/resources/twig/list/journals.twig
@@ -115,24 +115,24 @@
     {% endfor %}
     </tbody>
     <tfoot>
-        {% if showPageSum %}
-            <tr>
-                <td colspan="3" style="text-align: right;"><em>{{ 'sum'|_ }}</em></td>
-                <td colspan="2">{{ _sum|formatAmount }}</td>
-            </tr>
-        {% endif %}
-        {% if showPeriodSum %}
-            <tr>
-                <td colspan="3" style="text-align: right;"><em>{{ 'period_sum'|_ }}</em></td>
-                <td colspan="2">{{ periodSum|formatAmount }}</td>
-            </tr>
-        {% endif %}
-        {% if showTotalSum %}
-            <tr>
-                <td colspan="3" style="text-align: right;"><em>{{ 'total_sum'|_ }}</em></td>
-                <td colspan="2">{{ totalSum|formatAmount }}</td>
-            </tr>
-        {% endif %}
+    {% if showPageSum %}
+        <tr>
+            <td colspan="3" style="text-align: right;"><em>{{ 'sum'|_ }}</em></td>
+            <td colspan="2">{{ _sum|formatAmount }}</td>
+        </tr>
+    {% endif %}
+    {% if showPeriodSum %}
+        <tr>
+            <td colspan="3" style="text-align: right;"><em>{{ 'period_sum'|_ }}</em></td>
+            <td colspan="2">{{ periodSum|formatAmount }}</td>
+        </tr>
+    {% endif %}
+    {% if showTotalSum %}
+        <tr>
+            <td colspan="3" style="text-align: right;"><em>{{ 'total_sum'|_ }}</em></td>
+            <td colspan="2">{{ totalSum|formatAmount }}</td>
+        </tr>
+    {% endif %}
     </tfoot>
 </table>
 
diff --git a/resources/twig/preferences/index.twig b/resources/twig/preferences/index.twig
index 366d64be45..da4aaac469 100644
--- a/resources/twig/preferences/index.twig
+++ b/resources/twig/preferences/index.twig
@@ -104,7 +104,7 @@
                                         {% if language == key %}
                                             checked
                                         {% endif %}
-                                        />
+                                />
                                 {{ lang }}
                             </label>
                         </div>
diff --git a/resources/twig/reports/default/year.twig b/resources/twig/reports/default/year.twig
index 4fa3f92df1..34d7d31efc 100644
--- a/resources/twig/reports/default/year.twig
+++ b/resources/twig/reports/default/year.twig
@@ -102,7 +102,7 @@
     <script type="text/javascript" src="js/Chart.StackedBar.js"></script>
     <script type="text/javascript" src="js/charts.js"></script>
     <script type="text/javascript">
-        var year = '{{start.year}}';
+        var year = '{{ start.year }}';
 
         // to report another URL:
         var startDate = '{{ start.format('Ymd') }}';
diff --git a/resources/twig/reports/index.twig b/resources/twig/reports/index.twig
index acb99e3a61..773de4e3d8 100644
--- a/resources/twig/reports/index.twig
+++ b/resources/twig/reports/index.twig
@@ -14,7 +14,7 @@
                 <div class="box-body">
 
                     <form class="form-horizontal" id="report-form" action="{{ route('reports.index') }}" method="post">
-                        <input type="hidden" name="_token" value="{{ csrf_token() }}" />
+                        <input type="hidden" name="_token" value="{{ csrf_token() }}"/>
                         <div class="form-group">
                             <label for="inputReportType" class="col-sm-3 control-label">{{ 'report_type'|_ }}</label>
 
@@ -64,7 +64,8 @@
                                     <ul class="list-inline">
                                         {% for month in data.months %}
                                             <li>
-                                                <a data-start="{{ month.start }}" data-end="{{ month.end }}" class="date-select" href="#">{{ month.formatted }}</a>
+                                                <a data-start="{{ month.start }}" data-end="{{ month.end }}" class="date-select"
+                                                   href="#">{{ month.formatted }}</a>
                                             </li>
                                         {% endfor %}
                                     </ul>
@@ -96,7 +97,7 @@
                             ['default',
                             Session.get('start').startOfMonth.format('Ymd'),
                             Session.get('start').endOfMonth.format('Ymd'),
-                                accountList
+                            accountList
                             ]) }}">{{ 'report_this_month_quick'|_ }}</a>
                         </li>
                         <li>
diff --git a/resources/twig/tags/create.twig b/resources/twig/tags/create.twig
index a7e7def346..a17502ef4c 100644
--- a/resources/twig/tags/create.twig
+++ b/resources/twig/tags/create.twig
@@ -55,7 +55,7 @@
 {% block scripts %}
     <script type="text/javascript">
         {% if Input.old('latitude') %}
-        var latitude = "{{Input.old('latitude')}}";
+        var latitude = "{{ Input.old('latitude') }}";
         {% else %}
         var latitude = "52.3167";
         {% endif %}
@@ -67,13 +67,13 @@
         {% endif %}
 
         {% if Input.old('longitude') %}
-        var longitude = "{{Input.old('longitude')}}";
+        var longitude = "{{ Input.old('longitude') }}";
         {% else %}
         var longitude = "5.5500";
         {% endif %}
 
         {% if Input.old('zoomLevel') %}
-        var zoomLevel = {{Input.old('zoomLevel')}};
+        var zoomLevel = {{ Input.old('zoomLevel') }};
         {% else %}
         var zoomLevel = 6;
         {% endif %}
diff --git a/resources/twig/tags/edit.twig b/resources/twig/tags/edit.twig
index 6eabbebade..e03c331366 100644
--- a/resources/twig/tags/edit.twig
+++ b/resources/twig/tags/edit.twig
@@ -59,7 +59,7 @@
 {% block scripts %}
     <script type="text/javascript">
         {% if Input.old('latitude') %}
-        var latitude = "{{Input.old('latitude')}}";
+        var latitude = "{{ Input.old('latitude') }}";
         {% else %}
         var latitude = "52.3167";
         {% endif %}
@@ -71,13 +71,13 @@
         {% endif %}
 
         {% if Input.old('longitude') %}
-        var longitude = "{{Input.old('longitude')}}";
+        var longitude = "{{ Input.old('longitude') }}";
         {% else %}
         var longitude = "5.5500";
         {% endif %}
 
         {% if Input.old('zoomLevel') %}
-        var zoomLevel = {{Input.old('zoomLevel')}};
+        var zoomLevel = {{ Input.old('zoomLevel') }};
         {% else %}
         var zoomLevel = 6;
         {% endif %}
diff --git a/resources/twig/tags/show.twig b/resources/twig/tags/show.twig
index fbced572a2..b92431307f 100644
--- a/resources/twig/tags/show.twig
+++ b/resources/twig/tags/show.twig
@@ -19,8 +19,10 @@
                         <div class="btn-group">
                             <button class="btn btn-box-tool dropdown-toggle" data-toggle="dropdown"><i class="fa fa-ellipsis-v"></i></button>
                             <ul class="dropdown-menu" role="menu">
-                                <li><a href="{{ route('tags.edit',tag.id) }}"><i class="fa fa-pencil fa-fw"></i> {{ trans('firefly.edit_tag',{tag: tag.tag}) }}</a></li>
-                                <li><a href="{{ route('tags.delete',tag.id) }}"><i class="fa fa-trash fa-fw"></i> {{ trans('firefly.delete_tag',{tag: tag.tag}) }}</a></li>
+                                <li><a href="{{ route('tags.edit',tag.id) }}"><i class="fa fa-pencil fa-fw"></i> {{ trans('firefly.edit_tag',{tag: tag.tag}) }}
+                                    </a></li>
+                                <li><a href="{{ route('tags.delete',tag.id) }}"><i
+                                                class="fa fa-trash fa-fw"></i> {{ trans('firefly.delete_tag',{tag: tag.tag}) }}</a></li>
                             </ul>
                         </div>
                     </div>
@@ -50,8 +52,10 @@
                         <div class="btn-group">
                             <button class="btn btn-box-tool dropdown-toggle" data-toggle="dropdown"><i class="fa fa-ellipsis-v"></i></button>
                             <ul class="dropdown-menu" role="menu">
-                                <li><a href="{{ route('tags.edit',tag.id) }}"><i class="fa fa-pencil fa-fw"></i> {{ trans('firefly.edit_tag',{tag: tag.tag}) }}</a></li>
-                                <li><a href="{{ route('tags.delete',tag.id) }}"><i class="fa fa-trash fa-fw"></i> {{ trans('firefly.delete_tag',{tag: tag.tag}) }}</a></li>
+                                <li><a href="{{ route('tags.edit',tag.id) }}"><i class="fa fa-pencil fa-fw"></i> {{ trans('firefly.edit_tag',{tag: tag.tag}) }}
+                                    </a></li>
+                                <li><a href="{{ route('tags.delete',tag.id) }}"><i
+                                                class="fa fa-trash fa-fw"></i> {{ trans('firefly.delete_tag',{tag: tag.tag}) }}</a></li>
                             </ul>
                         </div>
                     </div>
@@ -80,8 +84,10 @@
                         <div class="btn-group">
                             <button class="btn btn-box-tool dropdown-toggle" data-toggle="dropdown"><i class="fa fa-ellipsis-v"></i></button>
                             <ul class="dropdown-menu" role="menu">
-                                <li><a href="{{ route('tags.edit',tag.id) }}"><i class="fa fa-pencil fa-fw"></i> {{ trans('firefly.edit_tag',{tag: tag.tag}) }}</a></li>
-                                <li><a href="{{ route('tags.delete',tag.id) }}"><i class="fa fa-trash fa-fw"></i> {{ trans('firefly.delete_tag',{tag: tag.tag}) }}</a></li>
+                                <li><a href="{{ route('tags.edit',tag.id) }}"><i class="fa fa-pencil fa-fw"></i> {{ trans('firefly.edit_tag',{tag: tag.tag}) }}
+                                    </a></li>
+                                <li><a href="{{ route('tags.delete',tag.id) }}"><i
+                                                class="fa fa-trash fa-fw"></i> {{ trans('firefly.delete_tag',{tag: tag.tag}) }}</a></li>
                             </ul>
                         </div>
                     </div>
@@ -96,6 +102,6 @@
 {% endblock %}
 {% block scripts %}
     <script type="text/javascript">
-        var tagID = {{tag.id}};
+        var tagID = {{ tag.id }};
     </script>
 {% endblock %}
diff --git a/resources/twig/transactions/edit.twig b/resources/twig/transactions/edit.twig
index 524e0df51d..8b53b6f2a2 100644
--- a/resources/twig/transactions/edit.twig
+++ b/resources/twig/transactions/edit.twig
@@ -103,7 +103,7 @@
 {% endblock %}
 {% block scripts %}
     <script type="text/javascript">
-        var what = "{{what}}";
+        var what = "{{ what }}";
     </script>
     <script type="text/javascript" src="js/bootstrap3-typeahead.min.js"></script>
     <script type="text/javascript" src="js/bootstrap-tagsinput.min.js"></script>