diff --git a/app/helpers.php b/app/helpers.php
index eadd706b..8eb45b72 100644
--- a/app/helpers.php
+++ b/app/helpers.php
@@ -54,11 +54,19 @@ if (!function_exists('skin_view')) {
     /**
      * Render a skin
      * @param $template
+     * @param array $vars
+     * @param array $merge_data
      * @return \Illuminate\Contracts\View\Factory|\Illuminate\View\View
      */
     function skin_view($template, array $vars = [], $merge_data = [])
     {
+        # Add the current skin name so we don't need to hardcode it in the templates
+        # Makes it a bit easier to create a new skin by modifying an existing one
+        $merge_data['SKIN_NAME'] = config('phpvms.skin');
         $tpl = 'layouts/' . config('phpvms.skin') . '/' . $template;
+
+        # TODO: Look for an overridden template in a special folder
+
         return view($tpl, $vars, $merge_data);
     }
 }
diff --git a/resources/views/layouts/default/acars/index.blade.php b/resources/views/layouts/default/acars/index.blade.php
index 2c4eecbf..0c0b54f8 100644
--- a/resources/views/layouts/default/acars/index.blade.php
+++ b/resources/views/layouts/default/acars/index.blade.php
@@ -1,6 +1,6 @@
-@extends('layouts.default.app')
-
+@extends("layouts.${SKIN_NAME}.app")
 @section('title', 'live map')
+
 @section('content')
     {{ Widget::liveMap() }}
 @endsection
diff --git a/resources/views/layouts/default/app.blade.php b/resources/views/layouts/default/app.blade.php
index 3edbd086..8edd5534 100644
--- a/resources/views/layouts/default/app.blade.php
+++ b/resources/views/layouts/default/app.blade.php
@@ -48,7 +48,7 @@
             </p>
         </div>
         <div class="collapse navbar-collapse justify-content-end" id="navigation">
-            @include('layouts.default.nav')
+            @include("layouts.${SKIN_NAME}.nav")
         </div>
     </div>
 </nav>
@@ -57,7 +57,7 @@
 <div class="wrapper">
     <div class="clear"></div>
     <div class="container-fluid" style="width: 85%!important;">
-        @include('layouts.default.flash.message')
+        @include("layouts.${SKIN_NAME}.flash.message")
         @yield('content')
     </div>
     <div class="clearfix" style="height: 200px;"></div>
diff --git a/resources/views/layouts/default/auth/login.blade.php b/resources/views/layouts/default/auth/login.blade.php
index bcc4b845..b671534a 100644
--- a/resources/views/layouts/default/auth/login.blade.php
+++ b/resources/views/layouts/default/auth/login.blade.php
@@ -1,5 +1,6 @@
-@extends('layouts.default.auth.layout')
+@extends("layouts.${SKIN_NAME}.auth.layout")
 @section('title', 'log in')
+
 @section('content')
 <div class="col-md-4 content-center">
     <div class="card card-login card-plain">
diff --git a/resources/views/layouts/default/auth/passwords/email.blade.php b/resources/views/layouts/default/auth/passwords/email.blade.php
index f6b073ba..6128cad4 100644
--- a/resources/views/layouts/default/auth/passwords/email.blade.php
+++ b/resources/views/layouts/default/auth/passwords/email.blade.php
@@ -1,4 +1,4 @@
-@extends('layouts.default.app')
+@extends("layouts.${SKIN_NAME}.app")
 
 <!-- Main Content -->
 @section('content')
diff --git a/resources/views/layouts/default/auth/passwords/reset.blade.php b/resources/views/layouts/default/auth/passwords/reset.blade.php
index 26c1d06a..5f5dc510 100644
--- a/resources/views/layouts/default/auth/passwords/reset.blade.php
+++ b/resources/views/layouts/default/auth/passwords/reset.blade.php
@@ -1,4 +1,4 @@
-@extends('layouts.default.app')
+@extends("layouts.${SKIN_NAME}.app")
 
 @section('content')
 <div class="container">
diff --git a/resources/views/layouts/default/auth/pending.blade.php b/resources/views/layouts/default/auth/pending.blade.php
index 533f6929..ba22bc12 100644
--- a/resources/views/layouts/default/auth/pending.blade.php
+++ b/resources/views/layouts/default/auth/pending.blade.php
@@ -1,6 +1,6 @@
-@extends('layouts.default.app')
-
+@extends("layouts.${SKIN_NAME}.app")
 @section('title', 'registration pending')
+
 @section('content')
 <div class="row">
     <div class="col-md-12 " style="text-align: center;">
diff --git a/resources/views/layouts/default/auth/register.blade.php b/resources/views/layouts/default/auth/register.blade.php
index d87c54d4..e8b77ca2 100644
--- a/resources/views/layouts/default/auth/register.blade.php
+++ b/resources/views/layouts/default/auth/register.blade.php
@@ -1,5 +1,6 @@
-@extends('layouts.default.app')
+@extends("layouts.${SKIN_NAME}.app")
 @section('title', 'register')
+
 @section('content')
 <div class="row">
 <div class="col-sm-3"></div>
@@ -66,7 +67,7 @@
             <p class="text-danger">{{ $errors->first('password_confirmation') }}</p>
             @endif
 
-            @include('layouts.default.auth.toc')
+            @include("layouts.${SKIN_NAME}.auth.toc")
 
             <div style="width: 100%; text-align: right; padding-top: 20px;">
                 By registering, you agree to the Term and Conditions<br /><br />
diff --git a/resources/views/layouts/default/auth/registered.blade.php b/resources/views/layouts/default/auth/registered.blade.php
index a29f86d7..ffb91257 100644
--- a/resources/views/layouts/default/auth/registered.blade.php
+++ b/resources/views/layouts/default/auth/registered.blade.php
@@ -1,11 +1,12 @@
-@extends('layouts.default.app')
-
+@extends("layouts.${SKIN_NAME}.app")
 @section('title', 'registration submitted')
+
 @section('content')
-
 <div class="container registered-page">
-<h3>Registration Confirmation</h3>
-<p>Your application has been submitted. It requires staff member approval, once a staff member has reviewed your application, you will receive an email confirmation.</p>
+    <h3>Registration Confirmation</h3>
+    <p>
+        Your application has been submitted. It requires staff member approval, once a
+        staff member has reviewed your application, you will receive an email confirmation.
+    </p>
 </div>
-
 @endsection
diff --git a/resources/views/layouts/default/auth/rejected.blade.php b/resources/views/layouts/default/auth/rejected.blade.php
index 93e99664..4e3cffb6 100644
--- a/resources/views/layouts/default/auth/rejected.blade.php
+++ b/resources/views/layouts/default/auth/rejected.blade.php
@@ -1,16 +1,16 @@
-@extends('layouts.default.app')
-
+@extends("layouts.${SKIN_NAME}.app")
 @section('title', 'registration denied')
+
 @section('content')
-    <div class="row">
-        <div class="col-md-12 " style="text-align: center;">
-            <div class="flex-center position-ref full-height">
-                <div class="title m-b-md">
-                    <h2 class="description">
-                        your registration was denied. please contact an administrator
-                    </h2>
-                </div>
+<div class="row">
+    <div class="col-md-12 " style="text-align: center;">
+        <div class="flex-center position-ref full-height">
+            <div class="title m-b-md">
+                <h2 class="description">
+                    your registration was denied. please contact an administrator
+                </h2>
             </div>
         </div>
     </div>
-@endsection()
+</div>
+@endsection
diff --git a/resources/views/layouts/default/auth/suspended.blade.php b/resources/views/layouts/default/auth/suspended.blade.php
index e1644794..7e20974c 100644
--- a/resources/views/layouts/default/auth/suspended.blade.php
+++ b/resources/views/layouts/default/auth/suspended.blade.php
@@ -1,16 +1,16 @@
-@extends('layouts.default.app')
-
+@extends("layouts.${SKIN_NAME}.app")
 @section('title', 'account suspended')
+
 @section('content')
-    <div class="row">
-        <div class="col-md-12 " style="text-align: center;">
-            <div class="flex-center position-ref full-height">
-                <div class="title m-b-md">
-                    <h2 class="description">
-                        your has been suspended. please contact an administrator
-                    </h2>
-                </div>
+<div class="row">
+    <div class="col-md-12 " style="text-align: center;">
+        <div class="flex-center position-ref full-height">
+            <div class="title m-b-md">
+                <h2 class="description">
+                    your has been suspended. please contact an administrator
+                </h2>
             </div>
         </div>
     </div>
-@endsection()
+</div>
+@endsection
diff --git a/resources/views/layouts/default/dashboard/index.blade.php b/resources/views/layouts/default/dashboard/index.blade.php
index 6b77d0b7..4027ef06 100644
--- a/resources/views/layouts/default/dashboard/index.blade.php
+++ b/resources/views/layouts/default/dashboard/index.blade.php
@@ -1,6 +1,6 @@
-@extends('layouts.default.app')
-
+@extends("layouts.${SKIN_NAME}.app")
 @section('title', 'dashboard')
+
 @section('content')
 <div class="row">
     <div class="col-sm-8">
@@ -54,7 +54,7 @@
             <div class="nav nav-tabs" role="tablist" style="background: #067ec1; color: #FFF;">
                 Your Last Report
             </div>
-            @include('layouts.default.pireps.pirep_card', ['pirep' => $last_pirep])
+            @include("layouts.${SKIN_NAME}.pireps.pirep_card", ['pirep' => $last_pirep])
         @endif
 
         {{ Widget::latestNews(['count' => 1]) }}
diff --git a/resources/views/layouts/default/datatables_css.blade.php b/resources/views/layouts/default/datatables_css.blade.php
deleted file mode 100644
index 9dffbf77..00000000
--- a/resources/views/layouts/default/datatables_css.blade.php
+++ /dev/null
@@ -1,4 +0,0 @@
-<!-- DataTable Bootstrap -->
-<link href="https://cdn.datatables.net/1.10.12/css/dataTables.bootstrap.min.css" rel="stylesheet">
-<link rel="stylesheet" href="//cdn.datatables.net/1.10.12/css/jquery.dataTables.min.css">
-<link rel="stylesheet" href="https://cdn.datatables.net/buttons/1.2.2/css/buttons.bootstrap.min.css">
\ No newline at end of file
diff --git a/resources/views/layouts/default/datatables_js.blade.php b/resources/views/layouts/default/datatables_js.blade.php
deleted file mode 100644
index 82b3220a..00000000
--- a/resources/views/layouts/default/datatables_js.blade.php
+++ /dev/null
@@ -1,7 +0,0 @@
-<!-- Datatables -->
-<script src="https://cdn.datatables.net/1.10.12/js/jquery.dataTables.min.js"></script>
-<script src="https://cdn.datatables.net/1.10.12/js/dataTables.bootstrap.min.js"></script>
-<script src="https://cdn.datatables.net/buttons/1.2.2/js/dataTables.buttons.min.js"></script>
-<script src="https://cdn.datatables.net/buttons/1.2.2/js/buttons.bootstrap.min.js"></script>
-<script src="https://cdn.datatables.net/buttons/1.2.2/js/buttons.colVis.min.js"></script>
-<script src="{{ asset('vendor/datatables/buttons.server-side.js') }}"></script>
\ No newline at end of file
diff --git a/resources/views/layouts/default/errors/401.blade.php b/resources/views/layouts/default/errors/401.blade.php
index b20ad0af..32c54cc2 100644
--- a/resources/views/layouts/default/errors/401.blade.php
+++ b/resources/views/layouts/default/errors/401.blade.php
@@ -1,8 +1,12 @@
-@extends('layouts.default.app')
+@extends("layouts.${SKIN_NAME}.app")
 @section('title', 'not authorized')
+
 @section('content')
 <div class="container registered-page">
-<h3>Unauthorized</h3>
-<p>Well, this is embarrassing, you are not authorized to access or perform this function. Click <a href="{{ url()->previous() }}">here</a> to go back to the home page.</p>
+    <h3>Unauthorized</h3>
+    <p>
+        Well, this is embarrassing, you are not authorized to access or perform this function.
+        Click <a href="{{ url()->previous() }}">here</a> to go back to the home page.
+    </p>
 </div>
 @endsection
diff --git a/resources/views/layouts/default/errors/404.blade.php b/resources/views/layouts/default/errors/404.blade.php
index 0448d042..79896f31 100644
--- a/resources/views/layouts/default/errors/404.blade.php
+++ b/resources/views/layouts/default/errors/404.blade.php
@@ -1,11 +1,13 @@
-@extends('layouts.default.app')
+@extends("layouts.${SKIN_NAME}.app")
 @section('title', 'not found')
+
 @section('content')
 <div class="container registered-page">
-<h3>Page Not Found</h3>
-<p>Well, this is embarrassing, the page you requested does not exist. Click <a href="{{ url()->previous() }}">here</a> to go back to the home page.
-
-{{ $exception->getMessage() }}
-</p>
+    <h3>Page Not Found</h3>
+    <p>
+        Well, this is embarrassing, the page you requested does not exist.
+        Click <a href="{{ url()->previous() }}">here</a> to go back to the home page.
+        {{ $exception->getMessage() }}
+    </p>
 </div>
 @endsection
diff --git a/resources/views/layouts/default/flights/index.blade.php b/resources/views/layouts/default/flights/index.blade.php
index a3ee2f7e..7485ae98 100644
--- a/resources/views/layouts/default/flights/index.blade.php
+++ b/resources/views/layouts/default/flights/index.blade.php
@@ -1,23 +1,24 @@
-@extends('layouts.default.app')
-
+@extends("layouts.${SKIN_NAME}.app")
 @section('title', 'flights')
+
 @section('content')
 <div class="row">
     @include('flash::message')
     <div class="col-md-9">
         <h2 class="description">flights</h2>
-        @include('layouts.default.flights.table')
+        @include("layouts.${SKIN_NAME}.flights.table")
     </div>
     <div class="col-md-3">
-        @include('layouts.default.flights.search')
+        @include("layouts.${SKIN_NAME}.flights.search")
     </div>
 </div>
 <div class="row">
     <div class="col-12 text-center">
-        {{ $flights->links('layouts.default.pagination.default') }}
+        {{ $flights->links("layouts.${SKIN_NAME}.pagination.default") }}
     </div>
 </div>
 @endsection
+
 @section('scripts')
 <script>
 $(document).ready(function() {
diff --git a/resources/views/layouts/default/flights/show.blade.php b/resources/views/layouts/default/flights/show.blade.php
index 35b1d244..3a02e533 100644
--- a/resources/views/layouts/default/flights/show.blade.php
+++ b/resources/views/layouts/default/flights/show.blade.php
@@ -1,4 +1,4 @@
-@extends('layouts.default.app')
+@extends("layouts.${SKIN_NAME}.app")
 @section('title', 'Flight '.$flight->ident)
 
 @section('content')
@@ -49,5 +49,5 @@
         </table>
     </div>
 </div>
-@include('layouts.default.flights.map')
+@include("layouts.${SKIN_NAME}.flights.map")
 @endsection
diff --git a/resources/views/layouts/default/home.blade.php b/resources/views/layouts/default/home.blade.php
index 190b7b05..ffa664ae 100644
--- a/resources/views/layouts/default/home.blade.php
+++ b/resources/views/layouts/default/home.blade.php
@@ -1,5 +1,6 @@
-@extends('layouts.default.app')
+@extends("layouts.${SKIN_NAME}.app")
 @section('title', 'welcome!')
+
 @section('content')
     <div class="row">
         <div class="col-sm-12">
diff --git a/resources/views/layouts/default/pireps/create.blade.php b/resources/views/layouts/default/pireps/create.blade.php
index ba31123d..455eebfc 100644
--- a/resources/views/layouts/default/pireps/create.blade.php
+++ b/resources/views/layouts/default/pireps/create.blade.php
@@ -1,5 +1,6 @@
-@extends('layouts.default.app')
+@extends("layouts.${SKIN_NAME}.app")
 @section('title', 'file pirep')
+
 @section('content')
     <div class="row">
         <div class="col-md-12">
@@ -7,12 +8,13 @@
             @include('flash::message')
             {!! Form::open(['route' => 'frontend.pireps.store']) !!}
 
-            @include('layouts.default.pireps.fields')
+            @include("layouts.${SKIN_NAME}.pireps.fields")
 
             {!! Form::close() !!}
         </div>
     </div>
 @endsection
+
 @section('scripts')
 <script>
 $(document).ready(function() {
diff --git a/resources/views/layouts/default/pireps/fields.blade.php b/resources/views/layouts/default/pireps/fields.blade.php
index 3d8a9438..055f6619 100644
--- a/resources/views/layouts/default/pireps/fields.blade.php
+++ b/resources/views/layouts/default/pireps/fields.blade.php
@@ -1,4 +1,3 @@
-
 <div class="row">
     <div class="col-12">
         <table class="table table-full-width">
diff --git a/resources/views/layouts/default/pireps/index.blade.php b/resources/views/layouts/default/pireps/index.blade.php
index 568476ee..5321ecac 100644
--- a/resources/views/layouts/default/pireps/index.blade.php
+++ b/resources/views/layouts/default/pireps/index.blade.php
@@ -1,5 +1,6 @@
-@extends('layouts.default.app')
+@extends("layouts.${SKIN_NAME}.app")
 @section('title', 'pireps')
+
 @section('content')
 <div class="row">
     <div class="col-md-12">
@@ -10,12 +11,12 @@
         </div>
         <h2 class="description">pilot reports</h2>
         @include('flash::message')
-        @include('layouts.default.pireps.table')
+        @include("layouts.${SKIN_NAME}.pireps.table")
     </div>
 </div>
 <div class="row">
     <div class="col-12 text-center">
-        {{ $pireps->links('layouts.default.pagination.default') }}
+        {{ $pireps->links("layouts.${SKIN_NAME}.pagination.default") }}
     </div>
 </div>
 @endsection
diff --git a/resources/views/layouts/default/pireps/show.blade.php b/resources/views/layouts/default/pireps/show.blade.php
index c29807ab..d9b81bf5 100644
--- a/resources/views/layouts/default/pireps/show.blade.php
+++ b/resources/views/layouts/default/pireps/show.blade.php
@@ -1,6 +1,6 @@
-@extends('layouts.default.app')
-
+@extends("layouts.${SKIN_NAME}.app")
 @section('title', 'PIREP '.$pirep->ident)
+
 @section('content')
     <div class="row">
         <div class="col-md-12">
@@ -72,27 +72,27 @@
     </div>
 
     @if(count($pirep->fields) > 0)
-    <div class="row">
-        <div class="col-md-12">
-            <h3 class="description">fields</h3>
-            <table class="table">
-                <thead>
-                    <th>Name</th>
-                    <th>Value</th>
-                </thead>
-                <tbody>
-                @foreach($pirep->fields as $field)
-                    <tr>
-                        <td>{!! $field->name !!}</td>
-                        <td>{!! $field->value !!}</td>
-                    </tr>
-                @endforeach
-                </tbody>
-            </table>
+        <div class="row">
+            <div class="col-md-12">
+                <h3 class="description">fields</h3>
+                <table class="table">
+                    <thead>
+                        <th>Name</th>
+                        <th>Value</th>
+                    </thead>
+                    <tbody>
+                    @foreach($pirep->fields as $field)
+                        <tr>
+                            <td>{!! $field->name !!}</td>
+                            <td>{!! $field->value !!}</td>
+                        </tr>
+                    @endforeach
+                    </tbody>
+                </table>
+            </div>
         </div>
-    </div>
     @endif
 
-    @include('layouts.default.pireps.map')
+    @include("layouts.${SKIN_NAME}.pireps.map")
 @endsection
 
diff --git a/resources/views/layouts/default/pireps/table.blade.php b/resources/views/layouts/default/pireps/table.blade.php
index e10adecd..ed043377 100644
--- a/resources/views/layouts/default/pireps/table.blade.php
+++ b/resources/views/layouts/default/pireps/table.blade.php
@@ -1 +1,2 @@
-@each('layouts.default.pireps.pirep_card', $pireps, 'pirep')
+@each("layouts.${SKIN_NAME}.pireps.pirep_card", $pireps, 'pirep')
+
diff --git a/resources/views/layouts/default/profile/edit.blade.php b/resources/views/layouts/default/profile/edit.blade.php
index b8203c5c..4cf12a3a 100644
--- a/resources/views/layouts/default/profile/edit.blade.php
+++ b/resources/views/layouts/default/profile/edit.blade.php
@@ -1,12 +1,13 @@
-@extends('layouts.default.app')
+@extends("layouts.${SKIN_NAME}.app")
 @section('title', 'edit profile')
+
 @section('content')
 <div class="row">
     <div class="col-md-12">
         <h2 class="description">edit your profile</h2>
           @include('flash::message')
           {!! Form::model($user, ['route' => ['frontend.profile.update', $user->id], 'method' => 'patch']) !!}
-             @include('layouts.default.profile.fields')
+             @include("layouts.${SKIN_NAME}.profile.fields")
           {!! Form::close() !!}
     </div>
 </div>
diff --git a/resources/views/layouts/default/profile/index.blade.php b/resources/views/layouts/default/profile/index.blade.php
index f98a7644..032e1079 100644
--- a/resources/views/layouts/default/profile/index.blade.php
+++ b/resources/views/layouts/default/profile/index.blade.php
@@ -1,5 +1,6 @@
-@extends('layouts.default.app')
+@extends("layouts.${SKIN_NAME}.app")
 @section('title', 'profile')
+
 @section('content')
 <div class="row profile-page content-center text-color-dark-beige">
     <div class="col-md-4" style="text-align:center;">
diff --git a/resources/views/layouts/default/users/index.blade.php b/resources/views/layouts/default/users/index.blade.php
index ef4860d3..a6c9137e 100644
--- a/resources/views/layouts/default/users/index.blade.php
+++ b/resources/views/layouts/default/users/index.blade.php
@@ -1,17 +1,16 @@
-@extends('layouts.default.app')
+@extends("layouts.${SKIN_NAME}.app")
 @section('title', 'Pilots')
 
 @section('content')
 <div class="row">
     <div class="col-md-12">
         <h2 class="description">pilots</h2>
-        @include('layouts.default.users.table')
+        @include("layouts.${SKIN_NAME}.users.table")
     </div>
 </div>
     <div class="row">
         <div class="col-12 text-center">
-            {{ $users->links('layouts.default.pagination.default') }}
+            {{ $users->links("layouts.${SKIN_NAME}.pagination.default") }}
         </div>
     </div>
 @endsection
-