diff --git a/.styleci.yml b/.styleci.yml
index 6a678b7d2..7474500f1 100644
--- a/.styleci.yml
+++ b/.styleci.yml
@@ -1,3 +1,7 @@
 preset: laravel
 enabled:
-    - fully_qualified_strict_types
\ No newline at end of file
+    - fully_qualified_strict_types
+finder:
+  not-name:
+    - index.php
+    - server.php
diff --git a/app/Console/Scheduling/CronEvent.php b/app/Console/Scheduling/CronEvent.php
index c9f7b8f29..15b32ec13 100644
--- a/app/Console/Scheduling/CronEvent.php
+++ b/app/Console/Scheduling/CronEvent.php
@@ -41,6 +41,7 @@ class CronEvent
      */
     public static function command(string $command) : self
     {
+        /** @var \App\Models\Instance\Cron $cron */
         $cron = Cron::firstOrCreate(['command' => $command]);
 
         return new self($cron);
diff --git a/app/Http/Controllers/Auth/RegisterController.php b/app/Http/Controllers/Auth/RegisterController.php
index da01e9dea..ca34dc2b9 100644
--- a/app/Http/Controllers/Auth/RegisterController.php
+++ b/app/Http/Controllers/Auth/RegisterController.php
@@ -113,8 +113,9 @@ class RegisterController extends Controller
      */
     protected function registered(Request $request, $user)
     {
-        $first = Account::count() == 1;
-        if (! config('monica.signup_double_optin') || $first) {
+        /** @var int $count */
+        $count = Account::count();
+        if (! config('monica.signup_double_optin') || $count == 1) {
             // if signup_double_optin is disabled, skip the confirm email part
             $user->markEmailAsVerified();
         }
diff --git a/app/Models/Account/Account.php b/app/Models/Account/Account.php
index 07ababe12..ae8da86dd 100644
--- a/app/Models/Account/Account.php
+++ b/app/Models/Account/Account.php
@@ -794,7 +794,7 @@ class Account extends Model
      * Gets the RelationshipType object matching the given type.
      *
      * @param  string $relationshipTypeName
-     * @return RelationshipType
+     * @return RelationshipType|null
      */
     public function getRelationshipTypeByType(string $relationshipTypeName)
     {
diff --git a/app/Models/Contact/Contact.php b/app/Models/Contact/Contact.php
index 4c4d71482..c996bb061 100644
--- a/app/Models/Contact/Contact.php
+++ b/app/Models/Contact/Contact.php
@@ -465,14 +465,14 @@ class Contact extends Model
                 $builder->leftJoin('activity_contact', 'contacts.id', '=', 'activity_contact.contact_id');
                 $builder->leftJoin('activities', 'activity_contact.activity_id', '=', 'activities.id');
                 $builder->orderBy('activities.date_it_happened', 'desc');
-                $builder->select('*', 'contacts.id as id');
+                $builder->select(['*', 'contacts.id as id']);
 
                 return $builder;
             case 'lastactivitydateOldtoNew':
                 $builder->leftJoin('activity_contact', 'contacts.id', '=', 'activity_contact.contact_id');
                 $builder->leftJoin('activities', 'activity_contact.activity_id', '=', 'activities.id');
                 $builder->orderBy('activities.date_it_happened', 'asc');
-                $builder->select('*', 'contacts.id as id');
+                $builder->select(['*', 'contacts.id as id']);
 
                 return $builder;
             default:
@@ -1154,6 +1154,7 @@ class Contact extends Model
         }
 
         try {
+            /** @var Contact $contact */
             $contact = self::where('account_id', $this->account_id)
                 ->findOrFail($this->first_met_through_contact_id);
         } catch (ModelNotFoundException $e) {
diff --git a/app/Models/Relationship/RelationshipType.php b/app/Models/Relationship/RelationshipType.php
index f4c7eb82d..7ca5c63d3 100644
--- a/app/Models/Relationship/RelationshipType.php
+++ b/app/Models/Relationship/RelationshipType.php
@@ -51,7 +51,7 @@ class RelationshipType extends Model
     /**
      * Get the reverser relationship type of this one.
      *
-     * @return self
+     * @return self|null
      */
     public function reverseRelationshipType()
     {
diff --git a/app/Notifications/ConfirmEmail.php b/app/Notifications/ConfirmEmail.php
index 448d45652..30f3ce100 100644
--- a/app/Notifications/ConfirmEmail.php
+++ b/app/Notifications/ConfirmEmail.php
@@ -36,8 +36,9 @@ class ConfirmEmail extends LaravelNotification implements ShouldQueue, MailNotif
     public function via()
     {
         if (! $this->force) {
-            $first = Account::count() == 1;
-            if (! config('monica.signup_double_optin') || $first) {
+            /** @var int $count */
+            $count = Account::count();
+            if (! config('monica.signup_double_optin') || $count == 1) {
                 return [];
             }
         }
diff --git a/artisan b/artisan
index df630d0d6..f80e64147 100644
--- a/artisan
+++ b/artisan
@@ -1,6 +1,8 @@
 #!/usr/bin/env php
 <?php
 
+define('LARAVEL_START', microtime(true));
+
 /*
 |--------------------------------------------------------------------------
 | Register The Auto Loader
@@ -13,7 +15,7 @@
 |
 */
 
-require __DIR__.'/bootstrap/autoload.php';
+require __DIR__.'/vendor/autoload.php';
 
 $app = require_once __DIR__.'/bootstrap/app.php';
 
diff --git a/bootstrap/autoload.php b/bootstrap/autoload.php
deleted file mode 100644
index 383013796..000000000
--- a/bootstrap/autoload.php
+++ /dev/null
@@ -1,34 +0,0 @@
-<?php
-
-define('LARAVEL_START', microtime(true));
-
-/*
-|--------------------------------------------------------------------------
-| Register The Composer Auto Loader
-|--------------------------------------------------------------------------
-|
-| Composer provides a convenient, automatically generated class loader
-| for our application. We just need to utilize it! We'll require it
-| into the script here so that we do not have to worry about the
-| loading of any our classes "manually". Feels great to relax.
-|
-*/
-
-require __DIR__.'/../vendor/autoload.php';
-
-/*
-|--------------------------------------------------------------------------
-| Include The Compiled Class File
-|--------------------------------------------------------------------------
-|
-| To dramatically increase your application's performance, you may use a
-| compiled class file which contains all of the classes commonly used
-| by a request. The Artisan "optimize" is used to create this file.
-|
-*/
-
-$compiledPath = __DIR__.'/cache/compiled.php';
-
-if (file_exists($compiledPath)) {
-    require $compiledPath;
-}
diff --git a/phpstan.neon b/phpstan.neon
index 22afebcfa..bcd345ba3 100644
--- a/phpstan.neon
+++ b/phpstan.neon
@@ -3,6 +3,7 @@ includes:
     - ./vendor/thecodingmachine/phpstan-safe-rule/phpstan-safe-rule.neon
 
 parameters:
+    inferPrivatePropertyTypeFromConstructor: true
     level: 5
     ignoreErrors:
         # Level 1
diff --git a/phpunit.xml b/phpunit.xml
index 7390cf5ee..60ff07144 100644
--- a/phpunit.xml
+++ b/phpunit.xml
@@ -1,7 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<phpunit backupGlobals="false"
+<phpunit xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xsi:noNamespaceSchemaLocation="./vendor/phpunit/phpunit/phpunit.xsd"
+         backupGlobals="false"
          backupStaticAttributes="false"
-         bootstrap="bootstrap/autoload.php"
+         bootstrap="vendor/autoload.php"
          colors="true"
          convertErrorsToExceptions="true"
          convertNoticesToExceptions="true"
diff --git a/phpunitpostgres.xml b/phpunitpostgres.xml
index 1ea6fbaa5..34c8471aa 100644
--- a/phpunitpostgres.xml
+++ b/phpunitpostgres.xml
@@ -1,7 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<phpunit backupGlobals="false"
+<phpunit xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xsi:noNamespaceSchemaLocation="./vendor/phpunit/phpunit/phpunit.xsd"
+         backupGlobals="false"
          backupStaticAttributes="false"
-         bootstrap="bootstrap/autoload.php"
+         bootstrap="vendor/autoload.php"
          colors="true"
          convertErrorsToExceptions="true"
          convertNoticesToExceptions="true"
diff --git a/public/index.php b/public/index.php
index fc6eb491e..6e58bdc27 100644
--- a/public/index.php
+++ b/public/index.php
@@ -3,9 +3,12 @@
 /**
  * Laravel - A PHP Framework For Web Artisans.
  *
+ * @package  Laravel
  * @author   Taylor Otwell <taylorotwell@gmail.com>
  */
 
+define('LARAVEL_START', microtime(true));
+
 /*
 |--------------------------------------------------------------------------
 | Register The Auto Loader
@@ -18,7 +21,7 @@
 |
 */
 
-require __DIR__.'/../bootstrap/autoload.php';
+require __DIR__.'/../vendor/autoload.php';
 
 /*
 |--------------------------------------------------------------------------
diff --git a/resources/views/activities/form.blade.php b/resources/views/activities/form.blade.php
index 523917c21..09a298a07 100644
--- a/resources/views/activities/form.blade.php
+++ b/resources/views/activities/form.blade.php
@@ -1,6 +1,6 @@
 <form method="POST" action="{{ $action }}">
-    {{ method_field($method) }}
-    {{ csrf_field() }}
+    @method($method)
+    @csrf
 
     <h2>{{ trans('people.activities_add_title', ['name' => $contact->first_name]) }}</h2>
 
diff --git a/resources/views/activities/index.blade.php b/resources/views/activities/index.blade.php
index 0f9845228..ecb20c001 100644
--- a/resources/views/activities/index.blade.php
+++ b/resources/views/activities/index.blade.php
@@ -44,8 +44,8 @@
         </div>
 
         <form method="POST" action="{{ route('activities.delete', [$activity, $contact]) }}" class="entry-delete-form hidden">
-          {{ method_field('DELETE') }}
-          {{ csrf_field() }}
+          @method('DELETE')
+          @csrf
         </form>
       </li>
 
diff --git a/resources/views/auth/emailchange1.blade.php b/resources/views/auth/emailchange1.blade.php
index 88845d409..ec933edcb 100644
--- a/resources/views/auth/emailchange1.blade.php
+++ b/resources/views/auth/emailchange1.blade.php
@@ -23,7 +23,7 @@
             @endif
 
             <form action="settings/emailchange1" method="post">
-              {{ csrf_field() }}
+              @csrf
 
               <div class="form-group">
                 <label>{{ trans('auth.email_change_current_email') }}</label>
diff --git a/resources/views/auth/emailchange2.blade.php b/resources/views/auth/emailchange2.blade.php
index 395864348..2f53b083a 100644
--- a/resources/views/auth/emailchange2.blade.php
+++ b/resources/views/auth/emailchange2.blade.php
@@ -23,7 +23,7 @@
             @endif
 
             <form action="settings/emailchange2" method="POST">
-              {{ csrf_field() }}
+              @csrf
 
               <div class="form-group">
                 <label>{{ trans('auth.email_change_current_email') }}</label>
diff --git a/resources/views/auth/login.blade.php b/resources/views/auth/login.blade.php
index 3f2bc87e5..fcc4f5b78 100644
--- a/resources/views/auth/login.blade.php
+++ b/resources/views/auth/login.blade.php
@@ -35,7 +35,7 @@
             @endif
 
             <form action="login" method="post">
-              {{ csrf_field() }}
+              @csrf
 
               <div class="form-group">
                 <label for="email">{{ trans('auth.email') }}</label>
diff --git a/resources/views/auth/passwords/email.blade.php b/resources/views/auth/passwords/email.blade.php
index 76351b06b..248dd5437 100644
--- a/resources/views/auth/passwords/email.blade.php
+++ b/resources/views/auth/passwords/email.blade.php
@@ -16,7 +16,7 @@
                   @endif
 
                   <form class="form-horizontal" role="form" method="POST" action="{{ '/password/email' }}">
-                      {{ csrf_field() }}
+                      @csrf
 
                       <div class="form-group{{ $errors->has('email') ? ' has-error' : '' }}">
                           <label for="email" class="col-md-4 col-form-label">{{ trans('auth.password_reset_email') }}</label>
diff --git a/resources/views/auth/passwords/reset.blade.php b/resources/views/auth/passwords/reset.blade.php
index ef5bdc8f7..4ca533e5c 100644
--- a/resources/views/auth/passwords/reset.blade.php
+++ b/resources/views/auth/passwords/reset.blade.php
@@ -12,7 +12,7 @@
 
                     <div class="panel-body">
                         <form class="form-horizontal" role="form" method="POST" action="{{ '/password/reset' }}">
-                            {{ csrf_field() }}
+                            @csrf
 
                             <input type="hidden" name="token" value="{{ $token }}">
 
diff --git a/resources/views/auth/recovery/login.blade.php b/resources/views/auth/recovery/login.blade.php
index 36d4c7ea4..dfe19e9dd 100644
--- a/resources/views/auth/recovery/login.blade.php
+++ b/resources/views/auth/recovery/login.blade.php
@@ -22,7 +22,7 @@
             @endif
 
             <form action="{{ route('recovery.login') }}" method="post">
-              {{ csrf_field() }}
+              @csrf
 
               <div class="form-group">
                 <label for="recovery">{{ trans('auth.recovery') }}</label>
diff --git a/resources/views/auth/register.blade.php b/resources/views/auth/register.blade.php
index d1ad394e1..ce71d3c35 100644
--- a/resources/views/auth/register.blade.php
+++ b/resources/views/auth/register.blade.php
@@ -51,7 +51,7 @@
             @endif
 
             <form action="register" method="post">
-              {{ csrf_field() }}
+              @csrf
 
               <div class="form-group">
                 <label for="email">{{ trans('auth.register_email') }}</label>
diff --git a/resources/views/compliance/index.blade.php b/resources/views/compliance/index.blade.php
index 82ac56dea..e6b42910f 100644
--- a/resources/views/compliance/index.blade.php
+++ b/resources/views/compliance/index.blade.php
@@ -9,7 +9,7 @@
       <p>{{ trans('app.compliance_desc_end') }}</p>
 
       <form action="compliance/sign" method="POST" class="tc mt4">
-        {{ csrf_field() }}
+        @csrf
         <button class="btn btn-primary" name="save" type="submit">{{ trans('app.compliance_terms') }}</button>
       </form>
     </div>
diff --git a/resources/views/journal/add.blade.php b/resources/views/journal/add.blade.php
index 834579589..4c8a84ba4 100644
--- a/resources/views/journal/add.blade.php
+++ b/resources/views/journal/add.blade.php
@@ -26,7 +26,7 @@
         <div class="row">
           <div class="col-12 col-sm-6 offset-sm-3 offset-sm-3-right">
             <form method="POST" action="{{ route('journal.save') }}">
-              {{ csrf_field() }}
+              @csrf
 
               @include('partials.errors')
 
diff --git a/resources/views/journal/edit.blade.php b/resources/views/journal/edit.blade.php
index a0f72c5a9..905ba3cea 100644
--- a/resources/views/journal/edit.blade.php
+++ b/resources/views/journal/edit.blade.php
@@ -27,7 +27,7 @@
           <div class="col-xs-12 col-sm-6 col-sm-offset-3 col-sm-offset-3-right">
             <form method="POST" action="{{ route('journal.update', ['entryId' => $entry->id]) }}">
               @method('PUT')
-              {{ csrf_field() }}
+              @csrf
 
               @include('partials.errors')
 
diff --git a/resources/views/people/avatar/edit.blade.php b/resources/views/people/avatar/edit.blade.php
index c229e51d4..26adb209c 100644
--- a/resources/views/people/avatar/edit.blade.php
+++ b/resources/views/people/avatar/edit.blade.php
@@ -11,7 +11,7 @@
 
     <div class="mw7 center br3 ba b--gray-monica bg-white mb5">
       <form method="POST" action="{{ route('people.avatar.update', $contact) }}" enctype="multipart/form-data">
-        {{ csrf_field() }}
+        @csrf
 
         @include('partials.errors')
 
diff --git a/resources/views/people/conversations/edit.blade.php b/resources/views/people/conversations/edit.blade.php
index 2a86f3d28..b3da48e1a 100644
--- a/resources/views/people/conversations/edit.blade.php
+++ b/resources/views/people/conversations/edit.blade.php
@@ -11,8 +11,8 @@
       <h3 class="f3 fw5">{{ trans('people.conversation_edit_title') }}</h3>
       <p><a href="#" onclick="if (confirm('{{ trans('people.conversation_edit_delete') }}')) { $('#conversation-delete-form').submit(); } return false;" class="w-auto-ns w-100 mb2 pb0-ns">{{ trans('people.conversation_delete_link') }}</a></p>
       <form method="POST" action="{{ route('people.conversations.destroy', [$contact, $conversation]) }}" id="conversation-delete-form" class="hidden">
-        {{ method_field('DELETE') }}
-        {{ csrf_field() }}
+        @method('DELETE')
+        @csrf
       </form>
     </div>
   </div>
@@ -29,7 +29,7 @@
 
     <form action="{{ route('people.conversations.update', [$contact, $conversation]) }}" method="POST" enctype="multipart/form-data">
       @method('PUT')
-      {{ csrf_field() }}
+      @csrf
 
       {{-- When did it take place --}}
       <div class="pa4-ns ph3 pv2 mb3 mb0-ns bb b--gray-monica">
diff --git a/resources/views/people/conversations/new.blade.php b/resources/views/people/conversations/new.blade.php
index 162c50404..90fde2df4 100644
--- a/resources/views/people/conversations/new.blade.php
+++ b/resources/views/people/conversations/new.blade.php
@@ -23,7 +23,7 @@
     @include('partials.errors')
 
     <form action="{{ route('people.conversations.store', $contact) }}" method="POST">
-      {{ csrf_field() }}
+      @csrf
 
       {{-- When did it take place --}}
       <div class="pa4-ns ph3 pv2 mb3 mb0-ns bb b--gray-monica">
diff --git a/resources/views/people/create.blade.php b/resources/views/people/create.blade.php
index 6b9d63997..389a690ad 100644
--- a/resources/views/people/create.blade.php
+++ b/resources/views/people/create.blade.php
@@ -26,7 +26,7 @@
     @include('partials.errors')
 
     <form action="{{ route('people.store') }}" method="POST">
-      {{ csrf_field() }}
+      @csrf
 
       <div class="pa4-ns ph3 pv2 bb b--gray-monica">
         {{-- This check is for the cultures that are used to say the last name first --}}
diff --git a/resources/views/people/debt/form.blade.php b/resources/views/people/debt/form.blade.php
index 89c9c9b5e..fbf807ab7 100755
--- a/resources/views/people/debt/form.blade.php
+++ b/resources/views/people/debt/form.blade.php
@@ -1,6 +1,6 @@
 <form method="POST" action="{{ $action }}">
-    {{ method_field($method) }}
-    {{ csrf_field() }}
+    @method($method)
+    @csrf
 
     @include('partials.errors')
 
diff --git a/resources/views/people/debt/index.blade.php b/resources/views/people/debt/index.blade.php
index a073a8ea7..cf7564d1d 100644
--- a/resources/views/people/debt/index.blade.php
+++ b/resources/views/people/debt/index.blade.php
@@ -55,8 +55,8 @@
         </div>
 
         <form method="POST" action="{{ route('people.debts.destroy', [$contact, $debt]) }}" class="entry-delete-form hidden">
-          {{ method_field('DELETE') }}
-          {{ csrf_field() }}
+          @method('DELETE')
+          @csrf
         </form>
       </li>
       @endforeach
diff --git a/resources/views/people/edit.blade.php b/resources/views/people/edit.blade.php
index c131c0161..1e8712f5a 100644
--- a/resources/views/people/edit.blade.php
+++ b/resources/views/people/edit.blade.php
@@ -16,7 +16,7 @@
     <div class="mw7 center br3 ba b--gray-monica bg-white mb5">
       <form method="POST" action="{{ route('people.update', $contact) }}" enctype="multipart/form-data">
         @method('PUT')
-        {{ csrf_field() }}
+        @csrf
 
         @include('partials.errors')
 
@@ -155,7 +155,7 @@
   </div>
 
   <form method="POST" action="{{ route('people.destroy', $contact) }}" id="contact-delete-form" class="hidden">
-    {{ method_field('DELETE') }}
-    {{ csrf_field() }}
+    @method('DELETE')
+    @csrf
   </form>
 @endsection
diff --git a/resources/views/people/food-preferences/edit.blade.php b/resources/views/people/food-preferences/edit.blade.php
index 880260585..8ce7fa11e 100644
--- a/resources/views/people/food-preferences/edit.blade.php
+++ b/resources/views/people/food-preferences/edit.blade.php
@@ -33,7 +33,7 @@
         <div class="row">
           <div class="col-12 col-sm-6 offset-sm-3 offset-sm-3-right">
             <form method="POST" action="{{ route('people.food.update', $contact) }}">
-              {{ csrf_field() }}
+              @csrf
 
               <h2>{{ trans('people.food_preferences_edit_title') }}</h2>
 
diff --git a/resources/views/people/gifts/form.blade.php b/resources/views/people/gifts/form.blade.php
index 452794e14..33204b790 100644
--- a/resources/views/people/gifts/form.blade.php
+++ b/resources/views/people/gifts/form.blade.php
@@ -1,6 +1,6 @@
 <form method="POST" action="{{ $action }}">
-    {{ method_field($method) }}
-    {{ csrf_field() }}
+    @method($method)
+    @csrf
 
     <h2>{{ trans('people.gifts_add_title', ['name' => $contact->first_name]) }}</h2>
 
diff --git a/resources/views/people/index.blade.php b/resources/views/people/index.blade.php
index 60c64426c..c339b719a 100644
--- a/resources/views/people/index.blade.php
+++ b/resources/views/people/index.blade.php
@@ -2,7 +2,7 @@
 
 @section('content')
   <div class="people-list">
-    {{ csrf_field() }}
+    @csrf
 
     {{-- Breadcrumb --}}
     <div class="breadcrumb">
diff --git a/resources/views/people/introductions/edit.blade.php b/resources/views/people/introductions/edit.blade.php
index 2909ed541..2fdc99e82 100644
--- a/resources/views/people/introductions/edit.blade.php
+++ b/resources/views/people/introductions/edit.blade.php
@@ -35,7 +35,7 @@
             <h2>{{ trans('people.introductions_title_edit', ['name' => $contact->first_name]) }}</h2>
 
               <form method="POST" action="{{ route('people.introductions.update', $contact) }}">
-                {{ csrf_field() }}
+                @csrf
 
                 @include('partials.errors')
 
diff --git a/resources/views/people/modal/log_call.blade.php b/resources/views/people/modal/log_call.blade.php
index 5c07a396b..0a5dedc2b 100644
--- a/resources/views/people/modal/log_call.blade.php
+++ b/resources/views/people/modal/log_call.blade.php
@@ -10,7 +10,7 @@
       </div>
       <div class="modal-body">
         <form method="POST" action="{{ route('people.calls.store', $contact) }}">
-          {{ csrf_field() }}
+          @csrf
 
           <div class="form-group">
             <label for="content" class="col-form-label b">{{ trans('people.modal_call_comment') }}</label>
diff --git a/resources/views/people/profile.blade.php b/resources/views/people/profile.blade.php
index 1d4cd683b..3b2326507 100644
--- a/resources/views/people/profile.blade.php
+++ b/resources/views/people/profile.blade.php
@@ -4,7 +4,7 @@
 
 @section('content')
   <div class="people-show" >
-    {{ csrf_field() }}
+    @csrf
 
     {{-- Breadcrumb --}}
     <div class="breadcrumb">
@@ -70,8 +70,8 @@
               <li>
                 <a id="link-delete-contact" class="pointer" onclick="if (confirm('{{ trans('people.people_delete_confirmation') }}')) { $('#contact-delete-form').submit(); } return false;" href="">{{ trans('people.people_delete_message') }}</a>
                 <form method="POST" action="{{ route('people.destroy', $contact) }}" id="contact-delete-form" class="hidden">
-                  {{ method_field('DELETE') }}
-                  {{ csrf_field() }}
+                  @method('DELETE')
+                  @csrf
                 </form>
               </li>
             </ul>
diff --git a/resources/views/people/relationship/_relationship.blade.php b/resources/views/people/relationship/_relationship.blade.php
index 884991d0b..f365d9f7d 100644
--- a/resources/views/people/relationship/_relationship.blade.php
+++ b/resources/views/people/relationship/_relationship.blade.php
@@ -28,8 +28,8 @@
     </a>
 
     <form method="POST" action="{{ route('people.relationships.destroy', [$contact, $relationship]) }}" class="entry-delete-form hidden">
-      {{ method_field('DELETE') }}
-      {{ csrf_field() }}
+      @method('DELETE')
+      @csrf
     </form>
   </div>
   <div class="cb"></div>
diff --git a/resources/views/people/relationship/new.blade.php b/resources/views/people/relationship/new.blade.php
index 687e890fc..a510c50f4 100644
--- a/resources/views/people/relationship/new.blade.php
+++ b/resources/views/people/relationship/new.blade.php
@@ -23,7 +23,7 @@
     @include('partials.errors')
 
     <form action="{{ route('people.relationships.store', $contact) }}" method="POST">
-      {{ csrf_field() }}
+      @csrf
 
       {{-- New contact / link existing --}}
       <div class="pa4-ns ph3 pv2 mb3 mb0-ns bb b--gray-monica">
diff --git a/resources/views/people/reminders/form.blade.php b/resources/views/people/reminders/form.blade.php
index 5d28f87e3..07f411a1d 100644
--- a/resources/views/people/reminders/form.blade.php
+++ b/resources/views/people/reminders/form.blade.php
@@ -1,6 +1,6 @@
 <form method="POST" action="{{ $action }}">
-    {{ method_field($method) }}
-    {{ csrf_field() }}
+    @method($method)
+    @csrf
 
     <h2>{{ trans('people.reminders_add_title', ['name' => $contact->first_name]) }}</h2>
 
diff --git a/resources/views/people/reminders/index.blade.php b/resources/views/people/reminders/index.blade.php
index 637466c6b..7bba51d25 100644
--- a/resources/views/people/reminders/index.blade.php
+++ b/resources/views/people/reminders/index.blade.php
@@ -68,8 +68,8 @@
         </div>
 
         <form method="POST" action="{{ route('people.reminders.destroy', [$contact, $reminder]) }}" class="entry-delete-form hidden">
-          {{ method_field('DELETE') }}
-          {{ csrf_field() }}
+          @method('DELETE')
+          @csrf
         </form>
       </li>
       @endforeach
diff --git a/resources/views/people/work/edit.blade.php b/resources/views/people/work/edit.blade.php
index bc9a3b482..0d0ea530f 100644
--- a/resources/views/people/work/edit.blade.php
+++ b/resources/views/people/work/edit.blade.php
@@ -30,7 +30,7 @@
         <div class="row">
           <div class="col-12 col-sm-6 offset-sm-3 offset-sm-3-right">
             <form method="POST" action="{{ route('people.work.update', $contact) }}" enctype="multipart/form-data">
-              {{ csrf_field() }}
+              @csrf
 
               @include('partials.errors')
 
diff --git a/resources/views/settings/imports/upload.blade.php b/resources/views/settings/imports/upload.blade.php
index 82a5767b7..4447b251a 100644
--- a/resources/views/settings/imports/upload.blade.php
+++ b/resources/views/settings/imports/upload.blade.php
@@ -56,7 +56,7 @@
               @include('partials.errors')
 
               <form action="{{ route('settings.storeImport') }}" method="POST" enctype="multipart/form-data">
-                {{ csrf_field() }}
+                @csrf
 
                   <div class="form-group">
                       <label for="vcard">{!! trans('settings.import_upload_form_file') !!}</label>
diff --git a/resources/views/settings/index.blade.php b/resources/views/settings/index.blade.php
index abe8debd8..b9f5d17b0 100644
--- a/resources/views/settings/index.blade.php
+++ b/resources/views/settings/index.blade.php
@@ -40,7 +40,7 @@
             @endif
 
             <form action="{{ route('settings.save') }}" method="POST">
-              {{ csrf_field() }}
+              @csrf
 
               {{-- id --}}
               <input type="hidden" name="id" value="{{ auth()->user()->id }}" />
@@ -123,7 +123,7 @@
         </div>
 
         <form method="POST" action="{{ route('settings.reset') }}" class="settings-reset bg-white" onsubmit="return confirm('{{ trans('settings.reset_notice') }}')">
-          {{ csrf_field() }}
+          @csrf
 
           <h2>{{ trans('settings.reset_title') }}</h2>
           <p>{{ trans('settings.reset_desc') }}</p>
@@ -131,7 +131,7 @@
         </form>
 
         <form method="POST" action="{{ route('settings.delete') }}" class="settings-delete bg-white" onsubmit="return confirm('{{ trans('settings.delete_notice') }}')">
-          {{ csrf_field() }}
+          @csrf
 
           <h2>{{ trans('settings.delete_title') }}</h2>
           <p>{{ trans('settings.delete_desc') }}</p>
diff --git a/resources/views/settings/security/index.blade.php b/resources/views/settings/security/index.blade.php
index 64ef5bfb4..dd712595b 100644
--- a/resources/views/settings/security/index.blade.php
+++ b/resources/views/settings/security/index.blade.php
@@ -46,7 +46,7 @@
             <p>{{ trans('settings.security_help') }}</p>
 
             <form method="POST" action="{{ route('settings.security.passwordChange') }}" class="settings-reset">
-              {{ csrf_field() }}
+              @csrf
 
               <h2>{{ trans('settings.password_change') }}</h2>
 
diff --git a/resources/views/settings/subscriptions/downgrade-checklist.blade.php b/resources/views/settings/subscriptions/downgrade-checklist.blade.php
index 99fcb96a6..9a27e83f5 100644
--- a/resources/views/settings/subscriptions/downgrade-checklist.blade.php
+++ b/resources/views/settings/subscriptions/downgrade-checklist.blade.php
@@ -58,7 +58,7 @@
           </ul>
 
           <form method="POST" action="{{ route('settings.subscriptions.downgrade') }}">
-            {{ csrf_field() }}
+            @csrf
 
             @if (auth()->user()->account->canDowngrade())
             <p class="mb4"><button href="" class="btn btn-primary">{{ trans('settings.subscriptions_downgrade_cta') }}</button></p>
diff --git a/resources/views/settings/tags.blade.php b/resources/views/settings/tags.blade.php
index 31993ae5b..924f71e8b 100644
--- a/resources/views/settings/tags.blade.php
+++ b/resources/views/settings/tags.blade.php
@@ -78,8 +78,8 @@
                   </div>
 
                   <form method="POST" action="{{ route('settings.tags.delete', $tag) }}" class="entry-delete-form hidden">
-                    {{ method_field('DELETE') }}
-                    {{ csrf_field() }}
+                    @method('DELETE')
+                    @csrf
                   </form>
                 </li>
               @endforeach
diff --git a/resources/views/settings/users/accept.blade.php b/resources/views/settings/users/accept.blade.php
index b141968f1..5bb9be57e 100644
--- a/resources/views/settings/users/accept.blade.php
+++ b/resources/views/settings/users/accept.blade.php
@@ -17,7 +17,7 @@
             @include ('partials.errors')
 
             <form action="{{ route('invitations.accept', $key) }}" method="post">
-              {{ csrf_field() }}
+              @csrf
 
               <div class="form-group">
                 <label for="email">{{ trans('auth.register_email') }}</label>
diff --git a/resources/views/settings/users/add.blade.php b/resources/views/settings/users/add.blade.php
index e4ac6d014..e25a0d948 100644
--- a/resources/views/settings/users/add.blade.php
+++ b/resources/views/settings/users/add.blade.php
@@ -35,7 +35,7 @@
             <div class="br3 ba b--gray-monica bg-white mb4">
               <div class="pa3 bb b--gray-monica">
                 <form method="POST" action="{{ route('settings.users.store') }}">
-                  {{ csrf_field() }}
+                  @csrf
 
                   <h2>{{ trans('settings.users_add_title') }}</h2>
 
diff --git a/resources/views/settings/users/index.blade.php b/resources/views/settings/users/index.blade.php
index d3f6ca2d6..f6e26d760 100644
--- a/resources/views/settings/users/index.blade.php
+++ b/resources/views/settings/users/index.blade.php
@@ -55,8 +55,8 @@
                 </div>
 
                 <form method="POST" action="{{ route('settings.users.destroy', $user) }}" class="entry-delete-form hidden">
-                  {{ method_field('DELETE') }}
-                  {{ csrf_field() }}
+                  @method('DELETE')
+                  @csrf
                 </form>
               </li>
             @endforeach
@@ -86,8 +86,8 @@
                     </div>
 
                     <form method="POST" action="{{ route('settings.users.invitation.delete', $invitation) }}" class="entry-delete-form hidden">
-                      {{ method_field('DELETE') }}
-                      {{ csrf_field() }}
+                      @method('DELETE')
+                      @csrf
                     </form>
                   </li>
               @endforeach
diff --git a/resources/views/vendor/passport/authorize.blade.php b/resources/views/vendor/passport/authorize.blade.php
index 918b54314..b0e10cf50 100644
--- a/resources/views/vendor/passport/authorize.blade.php
+++ b/resources/views/vendor/passport/authorize.blade.php
@@ -28,7 +28,7 @@
 
             <!-- Authorize Button -->
             <form method="post" action="oauth/authorize">
-              {{ csrf_field() }}
+              @csrf
 
               <input type="hidden" name="state" value="{{ $request->state }}">
               <input type="hidden" name="client_id" value="{{ $client->id }}">
@@ -37,8 +37,8 @@
 
             <!-- Cancel Button -->
             <form method="post" action="oauth/authorize">
-              {{ csrf_field() }}
-              {{ method_field('DELETE') }}
+              @csrf
+              @method('DELETE')
 
               <input type="hidden" name="state" value="{{ $request->state }}">
               <input type="hidden" name="client_id" value="{{ $client->id }}">
diff --git a/tests/Feature/ContactTest.php b/tests/Feature/ContactTest.php
index 3c9705811..470d521df 100644
--- a/tests/Feature/ContactTest.php
+++ b/tests/Feature/ContactTest.php
@@ -8,6 +8,7 @@ use Illuminate\Support\Arr;
 use App\Models\Contact\Gift;
 use App\Helpers\StringHelper;
 use App\Models\Contact\Contact;
+use App\Models\Account\Activity;
 use App\Models\Contact\Reminder;
 use Illuminate\Foundation\Testing\WithFaker;
 use Illuminate\Foundation\Testing\DatabaseTransactions;
@@ -231,6 +232,48 @@ class ContactTest extends FeatureTestCase
         $response->assertSee('1 contact');
     }
 
+    public function test_user_can_see_contacts_sorted_by_lastactivitydateNewtoOld()
+    {
+        $user = $this->signIn();
+
+        $contacts = factory(Contact::class, 10)->create([
+            'account_id' => $user->account_id,
+        ]);
+
+        foreach ($contacts as $contact) {
+            factory(Activity::class)->create([
+                'account_id' => $contact->account_id,
+            ]);
+        }
+
+        $response = $this->get('/people/list?sort=lastactivitydateNewtoOld');
+
+        $response->assertJsonFragment([
+            'totalRecords' => 10,
+        ]);
+    }
+
+    public function test_user_can_see_contacts_sorted_by_lastactivitydateOldtoNew()
+    {
+        $user = $this->signIn();
+
+        $contacts = factory(Contact::class, 10)->create([
+            'account_id' => $user->account_id,
+        ]);
+
+        foreach ($contacts as $contact) {
+            factory(Activity::class)->create([
+                'account_id' => $contact->account_id,
+            ]);
+        }
+
+        $response = $this->get('/people/list?sort=lastactivitydateOldtoNew');
+
+        $response->assertJsonFragment([
+            'totalRecords' => 10,
+        ]);
+    }
+
     public function test_user_can_be_reminded_about_an_event_once()
     {
         [$user, $contact] = $this->fetchUser();