diff --git a/app/Database/migrations/2020_03_28_174238_page_icon_nullable.php b/app/Database/migrations/2020_03_28_174238_page_icon_nullable.php
index aa2becf9..a8dd355e 100644
--- a/app/Database/migrations/2020_03_28_174238_page_icon_nullable.php
+++ b/app/Database/migrations/2020_03_28_174238_page_icon_nullable.php
@@ -15,6 +15,5 @@ class PageIconNullable extends Migration
 
     public function down()
     {
-
     }
 }
diff --git a/app/Http/Kernel.php b/app/Http/Kernel.php
index d67df2a7..c04016be 100755
--- a/app/Http/Kernel.php
+++ b/app/Http/Kernel.php
@@ -7,6 +7,7 @@ use App\Http\Middleware\EncryptCookies;
 use App\Http\Middleware\InstalledCheck;
 use App\Http\Middleware\JsonResponse;
 use App\Http\Middleware\RedirectIfAuthenticated;
+use App\Http\Middleware\SetActiveTheme;
 use App\Http\Middleware\TrustProxies;
 use App\Http\Middleware\UpdatePending;
 use Illuminate\Auth\Middleware\Authenticate;
@@ -54,6 +55,7 @@ class Kernel extends HttpKernel
         'can'            => Authorize::class,
         'guest'          => RedirectIfAuthenticated::class,
         'json'           => JsonResponse::class,
+        'theme'          => SetActiveTheme::class,
         'throttle'       => ThrottleRequests::class,
         'update_pending' => UpdatePending::class,
     ];
diff --git a/app/Providers/RouteServiceProvider.php b/app/Providers/RouteServiceProvider.php
index cb2819a4..e5c56e77 100755
--- a/app/Providers/RouteServiceProvider.php
+++ b/app/Providers/RouteServiceProvider.php
@@ -2,7 +2,6 @@
 
 namespace App\Providers;
 
-use App\Http\Middleware\SetActiveTheme;
 use Illuminate\Foundation\Support\Providers\RouteServiceProvider as ServiceProvider;
 use Illuminate\Support\Facades\Auth;
 use Illuminate\Support\Facades\Route;
@@ -40,14 +39,14 @@ class RouteServiceProvider extends ServiceProvider
     private function mapWebRoutes()
     {
         Route::group([
-            'middleware' => 'web',
+            'middleware' => ['web', 'theme'],
             'namespace'  => $this->namespace,
         ], function ($router) {
             Route::group([
                 'namespace'  => 'Frontend',
                 'prefix'     => '',
                 'as'         => 'frontend.',
-                'middleware' => ['auth', SetActiveTheme::class],
+                'middleware' => ['auth'],
             ], function () {
                 Route::resource('dashboard', 'DashboardController');
 
@@ -85,10 +84,9 @@ class RouteServiceProvider extends ServiceProvider
             });
 
             Route::group([
-                'namespace'  => 'Frontend',
-                'prefix'     => '',
-                'as'         => 'frontend.',
-                'middleware' => [SetActiveTheme::class],
+                'namespace' => 'Frontend',
+                'prefix'    => '',
+                'as'        => 'frontend.',
             ], function () {
                 Route::get('/', 'HomeController@index')->name('home');
                 Route::get('r/{id}', 'PirepController@show')->name('pirep.show.public');