diff --git a/app/Http/Controllers/SettingsController.php b/app/Http/Controllers/SettingsController.php
index 17625ab7b7..121143b677 100755
--- a/app/Http/Controllers/SettingsController.php
+++ b/app/Http/Controllers/SettingsController.php
@@ -386,6 +386,7 @@ class SettingsController extends Controller
         $setting->header_color = $request->input('header_color');
         $setting->support_footer = $request->input('support_footer');
         $setting->footer_text = $request->input('footer_text');
+        $setting->skin = $request->input('skin');
         $setting->show_url_in_emails = $request->input('show_url_in_emails', '0');
 
 
diff --git a/database/migrations/2018_03_03_011032_add_theme_to_settings.php b/database/migrations/2018_03_03_011032_add_theme_to_settings.php
new file mode 100644
index 0000000000..876b618d8b
--- /dev/null
+++ b/database/migrations/2018_03_03_011032_add_theme_to_settings.php
@@ -0,0 +1,32 @@
+<?php
+
+use Illuminate\Support\Facades\Schema;
+use Illuminate\Database\Schema\Blueprint;
+use Illuminate\Database\Migrations\Migration;
+
+class AddThemeToSettings extends Migration
+{
+    /**
+     * Run the migrations.
+     *
+     * @return void
+     */
+    public function up()
+    {
+        Schema::table('settings', function (Blueprint $table) {
+            $table->char('skin')->nullable()->default(null);
+        });
+    }
+
+    /**
+     * Reverse the migrations.
+     *
+     * @return void
+     */
+    public function down()
+    {
+        Schema::table('settings', function (Blueprint $table) {
+            $table->dropColumn('skin');
+        });
+    }
+}
diff --git a/public/css/skins/skin-black-light.css b/public/css/skins/skin-black-light.css
deleted file mode 100755
index f132dc8839..0000000000
Binary files a/public/css/skins/skin-black-light.css and /dev/null differ
diff --git a/public/css/skins/skin-black-light.min.css b/public/css/skins/skin-black-light.min.css
deleted file mode 100755
index c631ec5e90..0000000000
Binary files a/public/css/skins/skin-black-light.min.css and /dev/null differ
diff --git a/public/css/skins/skin-black.css b/public/css/skins/skin-black.css
deleted file mode 100755
index d33b1f9d08..0000000000
Binary files a/public/css/skins/skin-black.css and /dev/null differ
diff --git a/public/css/skins/skin-black.min.css b/public/css/skins/skin-black.min.css
deleted file mode 100755
index a7d188822c..0000000000
Binary files a/public/css/skins/skin-black.min.css and /dev/null differ
diff --git a/public/css/skins/skin-blue.min.css b/public/css/skins/skin-blue.min.css
deleted file mode 100755
index 123c04f470..0000000000
Binary files a/public/css/skins/skin-blue.min.css and /dev/null differ
diff --git a/public/assets/css/themes/dark-green.css b/public/css/skins/skin-green-dark.css
similarity index 100%
rename from public/assets/css/themes/dark-green.css
rename to public/css/skins/skin-green-dark.css
diff --git a/public/css/skins/skin-green-light.css b/public/css/skins/skin-green-light.css
deleted file mode 100755
index f6fc137f76..0000000000
Binary files a/public/css/skins/skin-green-light.css and /dev/null differ
diff --git a/public/css/skins/skin-green-light.min.css b/public/css/skins/skin-green-light.min.css
deleted file mode 100755
index 43ceea49c5..0000000000
Binary files a/public/css/skins/skin-green-light.min.css and /dev/null differ
diff --git a/public/css/skins/skin-green.css b/public/css/skins/skin-green.css
deleted file mode 100755
index 3562493045..0000000000
Binary files a/public/css/skins/skin-green.css and /dev/null differ
diff --git a/public/css/skins/skin-green.min.css b/public/css/skins/skin-green.min.css
deleted file mode 100755
index 8f885edb9d..0000000000
Binary files a/public/css/skins/skin-green.min.css and /dev/null differ
diff --git a/public/css/skins/skin-purple-light.css b/public/css/skins/skin-purple-light.css
deleted file mode 100755
index 551eacb738..0000000000
Binary files a/public/css/skins/skin-purple-light.css and /dev/null differ
diff --git a/public/css/skins/skin-purple-light.min.css b/public/css/skins/skin-purple-light.min.css
deleted file mode 100755
index 53333c4eca..0000000000
Binary files a/public/css/skins/skin-purple-light.min.css and /dev/null differ
diff --git a/public/css/skins/skin-purple.css b/public/css/skins/skin-purple.css
deleted file mode 100755
index b1d6c8a3e4..0000000000
Binary files a/public/css/skins/skin-purple.css and /dev/null differ
diff --git a/public/css/skins/skin-purple.min.css b/public/css/skins/skin-purple.min.css
deleted file mode 100755
index 1eff3d9dd4..0000000000
Binary files a/public/css/skins/skin-purple.min.css and /dev/null differ
diff --git a/public/css/skins/skin-red-light.css b/public/css/skins/skin-red-light.css
deleted file mode 100755
index 4ba687f0a0..0000000000
Binary files a/public/css/skins/skin-red-light.css and /dev/null differ
diff --git a/public/css/skins/skin-red-light.min.css b/public/css/skins/skin-red-light.min.css
deleted file mode 100755
index 7ab4c1fde3..0000000000
Binary files a/public/css/skins/skin-red-light.min.css and /dev/null differ
diff --git a/public/css/skins/skin-red.css b/public/css/skins/skin-red.css
deleted file mode 100755
index 6071511e98..0000000000
Binary files a/public/css/skins/skin-red.css and /dev/null differ
diff --git a/public/css/skins/skin-red.min.css b/public/css/skins/skin-red.min.css
deleted file mode 100755
index 3252b273b8..0000000000
Binary files a/public/css/skins/skin-red.min.css and /dev/null differ
diff --git a/public/css/skins/skin-yellow-light.css b/public/css/skins/skin-yellow-light.css
deleted file mode 100755
index 1c977d4aa0..0000000000
Binary files a/public/css/skins/skin-yellow-light.css and /dev/null differ
diff --git a/public/css/skins/skin-yellow-light.min.css b/public/css/skins/skin-yellow-light.min.css
deleted file mode 100755
index 773b254fef..0000000000
Binary files a/public/css/skins/skin-yellow-light.min.css and /dev/null differ
diff --git a/public/css/skins/skin-yellow.css b/public/css/skins/skin-yellow.css
deleted file mode 100755
index df00a41606..0000000000
Binary files a/public/css/skins/skin-yellow.css and /dev/null differ
diff --git a/public/css/skins/skin-yellow.min.css b/public/css/skins/skin-yellow.min.css
deleted file mode 100755
index 67fc2e2a0b..0000000000
Binary files a/public/css/skins/skin-yellow.min.css and /dev/null differ
diff --git a/resources/lang/en/general.php b/resources/lang/en/general.php
index 843d4af53e..60ebf250e7 100644
--- a/resources/lang/en/general.php
+++ b/resources/lang/en/general.php
@@ -177,6 +177,7 @@
     'settings'				=> 'Settings',
     'sign_in'				=> 'Sign in',
     'signature'             => 'Signature',
+     'skin'       			=> 'Skin',
     'some_features_disabled' => 'DEMO MODE: Some features are disabled for this installation.',
     'site_name'				=> 'Site Name',
     'state'  				=> 'State',
diff --git a/resources/macros/macros.php b/resources/macros/macros.php
index faeb4de1ff..5711699658 100644
--- a/resources/macros/macros.php
+++ b/resources/macros/macros.php
@@ -511,3 +511,22 @@ Form::macro('customfield_elements', function ($name = "customfield_elements", $s
     return $select;
 
 });
+
+
+
+Form::macro('skin', function ($name = "skin", $selected = null, $class = null) {
+
+    $formats = array(
+        '' => 'Default Blue',
+        'skin-green-dark.css' => 'Green Dark',
+    );
+
+    $select = '<select name="'.$name.'" class="'.$class.'" style="width: 250px">';
+    foreach ($formats as $format => $label) {
+        $select .= '<option value="'.$format.'"'.($selected == $format ? ' selected="selected"' : '').'>'.$label.'</option> '."\n";
+    }
+
+    $select .= '</select>';
+    return $select;
+
+});
diff --git a/resources/views/layouts/default.blade.php b/resources/views/layouts/default.blade.php
index 8b8e676ee3..782dde3e4b 100644
--- a/resources/views/layouts/default.blade.php
+++ b/resources/views/layouts/default.blade.php
@@ -31,30 +31,33 @@
 
     </script>
 
+
+      @if (($snipeSettings) && ($snipeSettings->skin!=''))
+          <link rel="stylesheet" href="{{ url('css/skins/'.$snipeSettings->skin) }}">
+      @endif
+
     <style nonce="{{ csrf_token() }}">
-        @if ($snipeSettings)
-            @if ($snipeSettings->header_color)
-            .main-header .navbar, .main-header .logo {
-            background-color: {{ $snipeSettings->header_color }};
-            background: -webkit-linear-gradient(top,  {{ $snipeSettings->header_color }} 0%,{{ $snipeSettings->header_color }} 100%);
-            background: linear-gradient(to bottom, {{ $snipeSettings->header_color }} 0%,{{ $snipeSettings->header_color }} 100%);
-            border-color: {{ $snipeSettings->header_color }};
-            }
-            .skin-blue .sidebar-menu > li:hover > a, .skin-blue .sidebar-menu > li.active > a {
-              border-left-color: {{ $snipeSettings->header_color }};
-            }
+        @if (($snipeSettings) && ($snipeSettings->header_color!=''))
+        .main-header .navbar, .main-header .logo {
+        background-color: {{ $snipeSettings->header_color }};
+        background: -webkit-linear-gradient(top,  {{ $snipeSettings->header_color }} 0%,{{ $snipeSettings->header_color }} 100%);
+        background: linear-gradient(to bottom, {{ $snipeSettings->header_color }} 0%,{{ $snipeSettings->header_color }} 100%);
+        border-color: {{ $snipeSettings->header_color }};
+        }
+        .skin-blue .sidebar-menu > li:hover > a, .skin-blue .sidebar-menu > li.active > a {
+          border-left-color: {{ $snipeSettings->header_color }};
+        }
 
-            .btn-primary {
-              background-color: {{ $snipeSettings->header_color }};
-              border-color: {{ $snipeSettings->header_color }};
-            }
+        .btn-primary {
+          background-color: {{ $snipeSettings->header_color }};
+          border-color: {{ $snipeSettings->header_color }};
+        }
+        @endif
 
-            @endif
-
-        @if ($snipeSettings->custom_css)
+        @if (($snipeSettings) && ($snipeSettings->custom_css!=''))
             {!! $snipeSettings->show_custom_css() !!}
         @endif
-     @endif
+
     @media (max-width: 400px) {
       .navbar-left {
        margin: 2px;
diff --git a/resources/views/settings/branding.blade.php b/resources/views/settings/branding.blade.php
index 1f724f9ebc..d8a0c2d47b 100644
--- a/resources/views/settings/branding.blade.php
+++ b/resources/views/settings/branding.blade.php
@@ -120,6 +120,18 @@
                             </div>
                         </div>
 
+                        <!-- Email format -->
+                        <div class="form-group {{ $errors->has('skin') ? 'error' : '' }}">
+                            <div class="col-md-3">
+                                {{ Form::label('skin', trans('general.skin')) }}
+                            </div>
+                            <div class="col-md-9">
+                                {!! Form::skin('skin', Input::old('skin', $setting->skin), 'select2') !!}
+                                {!! $errors->first('skin', '<span class="alert-msg">:message</span>') !!}
+                            </div>
+                        </div>
+
+
                         <!-- Custom css -->
                         <div class="form-group {{ $errors->has('custom_css') ? 'error' : '' }}">
                             <div class="col-md-3">