diff --git a/Bootstrap.Admin/Views/Shared/_Layout.cshtml b/Bootstrap.Admin/Views/Shared/_Layout.cshtml
index 5229add0..620ab5c8 100644
--- a/Bootstrap.Admin/Views/Shared/_Layout.cshtml
+++ b/Bootstrap.Admin/Views/Shared/_Layout.cshtml
@@ -12,6 +12,7 @@
     </environment>
     <link href="~/css/nprogress.css" rel="stylesheet" />
     @RenderSection("css", false)
+    <link href="~/css/theme.css" rel="stylesheet" />
     <link href="~/css/site.css" rel="stylesheet" />
     <link href="~/css/site-responsive.css" rel="stylesheet" />
 }
diff --git a/Bootstrap.Admin/Views/Shared/_Login.cshtml b/Bootstrap.Admin/Views/Shared/_Login.cshtml
index 74b5cf4e..e6ba7a65 100644
--- a/Bootstrap.Admin/Views/Shared/_Login.cshtml
+++ b/Bootstrap.Admin/Views/Shared/_Login.cshtml
@@ -12,6 +12,7 @@
         <link href="~/css/bootstrap.min.css" rel="stylesheet">
         <link href="~/css/font-awesome.min.css" rel="stylesheet" />
     </environment>
+    <link href="~/css/theme.css" rel="stylesheet" />
     @RenderSection("css", false)
 }
 @section javascript {
diff --git a/Bootstrap.Admin/wwwroot/css/login.css b/Bootstrap.Admin/wwwroot/css/login.css
index ffdbab06..ecd31516 100644
--- a/Bootstrap.Admin/wwwroot/css/login.css
+++ b/Bootstrap.Admin/wwwroot/css/login.css
@@ -16,8 +16,6 @@
     padding: 28px 0;
     text-align: center;
     color: #fff;
-    font-size: 2rem;
-    font-weight: 300;
 }
 
 .login-wrap {
@@ -38,22 +36,6 @@
             float: right;
         }
 
-.input-group {
-    margin-bottom: 15px;
-    -webkit-border-radius: 5px;
-    border-radius: 5px;
-    border: solid 1px #1ca0e9;
-}
-
-    .input-group > span {
-        top: 0;
-        background-color: #5bc0de;
-    }
-
-    .input-group > span, div.input-group > input {
-        border-color: #5bc0de;
-    }
-
 .btn-login {
     background: #f67a6e;
     color: #fff;
@@ -64,40 +46,16 @@
     margin-bottom: 20px;
 }
 
-.checkbox {
-    padding-left: 24px;
-}
-
-    .checkbox > input {
-        top: -1px;
-    }
-
-    .checkbox > label {
-        padding-left: 4px;
-    }
-
-.is-invalid .tooltip-inner {
-    background-color: #a94442;
-}
-
-.is-invalid .arrow:before {
-    border-top-color: #a94442;
-}
-
-.form-control:focus {
+.form-control:focus, .form-control.is-valid:focus, .form-control.is-invalid:focus, .btn:focus, .btn:focus:active {
     box-shadow: none;
 }
 
 .input-group-text {
     background-color: #6bc3f4;
-    border: 1px solid #6bc3f4;
+    border-color: #1ca0e9;
     line-height: 1.5;
 }
 
-.form-check-input {
-    margin-top: 0.4rem;
-}
-
-.btn:focus {
-    box-shadow: 1px 1px #e56b60;
+.form-control {
+    border-color: #1ca0e9;
 }
diff --git a/Bootstrap.Admin/wwwroot/css/loginm.css b/Bootstrap.Admin/wwwroot/css/loginm.css
index 36739b5b..6af9a07f 100644
--- a/Bootstrap.Admin/wwwroot/css/loginm.css
+++ b/Bootstrap.Admin/wwwroot/css/loginm.css
@@ -12,74 +12,41 @@
     border: solid 1px #ddd;
 }
 
-    .form-signin .form-signin-heading {
-        margin: 0;
-        padding: 20px 15px;
-        text-align: center;
-        background: #41cac0;
-        border-radius: 5px 5px 0 0;
-        color: #fff;
-        font-size: 32px;
-        font-weight: 300;
-        font-family: 'Open Sans', sans-serif;
+.form-signin-heading {
+    margin: 0;
+    padding: 20px 15px;
+    text-align: center;
+    background: #41cac0;
+    border-radius: 5px 5px 0 0;
+    color: #fff;
+}
+
+.login-wrap {
+    padding: 20px;
+}
+
+    .login-wrap .login-footer {
+        padding-bottom: 15px;
     }
 
-    .form-signin div.login-wrap {
-        padding: 20px;
-    }
-
-        .form-signin div.login-wrap .login-footer {
-            padding-bottom: 15px;
+        .login-wrap .login-footer .login-create {
+            float: left;
         }
 
-            .form-signin div.login-wrap .login-footer .login-create {
-                float: left;
-            }
-
-            .form-signin div.login-wrap .login-footer .login-reset {
-                float: right;
-            }
-
-    .form-signin div.input-group {
-        margin-bottom: 15px;
-        border-radius: 5px;
-        -webkit-border-radius: 5px;
-        border: 1px solid #eaeaea;
-        box-shadow: none;
-        font-size: 12px;
-    }
-
-        .form-signin div.input-group > span {
-            top: 0;
-            background-color: #5bc0de;
+        .login-wrap .login-footer .login-reset {
+            float: right;
         }
 
-        .form-signin div.input-group > span, div.input-group > input {
-            border-color: #5bc0de;
-        }
-
-    .form-signin .btn-login {
-        background: #f67a6e;
-        color: #fff;
-        text-transform: uppercase;
-        font-weight: 300;
-        font-family: 'Open Sans', sans-serif;
-        box-shadow: 0 4px #e56b60;
-        margin-bottom: 20px;
-        outline: none !important;
-    }
-
-    .form-signin .checkbox {
-        padding-left: 24px;
-    }
-
-        .form-signin .checkbox > input {
-            top: -1px;
-        }
-
-        .form-signin .checkbox > label {
-            padding-left: 4px;
-        }
+.btn-login {
+    background: #f67a6e;
+    color: #fff;
+    text-transform: uppercase;
+    font-weight: 300;
+    font-family: 'Open Sans', sans-serif;
+    box-shadow: 0 4px #e56b60;
+    margin-bottom: 20px;
+    outline: none !important;
+}
 
 @media (min-width: 375px) {
     .form-signin {
@@ -87,24 +54,16 @@
     }
 }
 
-.is-invalid .tooltip-inner {
-    background-color: #a94442;
-}
-
-.is-invalid .arrow:before {
-    border-top-color: #a94442;
-}
-
-.form-control:focus {
+.form-control:focus, .form-control.is-valid:focus, .form-control.is-invalid:focus, .btn:focus, .btn:focus:active {
     box-shadow: none;
 }
 
 .input-group-text {
     background-color: #6bc3f4;
-    border: 1px solid #6bc3f4;
-    line-height: 2;
+    border-color: #1ca0e9;
+    line-height: 1.5;
 }
 
-.form-check-input {
-    margin-top: 0.4rem;
+.form-control {
+    border-color: #1ca0e9;
 }
diff --git a/Bootstrap.Admin/wwwroot/css/site.css b/Bootstrap.Admin/wwwroot/css/site.css
index 6344a55a..1ad195e8 100644
--- a/Bootstrap.Admin/wwwroot/css/site.css
+++ b/Bootstrap.Admin/wwwroot/css/site.css
@@ -469,19 +469,6 @@ a, a:hover, a:focus {
     background-size: 100% 100%;
 }
 
-.tooltip-inner {
-    max-width: 768px;
-}
-
-.is-invalid .tooltip-inner {
-    background-color: #dc3545;
-}
-
-.is-invalid .arrow:before {
-    border-top-color: #dc3545;
-    border-bottom-color: #dc3545;
-}
-
 .file-drop-zone.clickable:hover {
     border: 1px dashed #999;
 }
diff --git a/Bootstrap.Admin/wwwroot/css/theme.css b/Bootstrap.Admin/wwwroot/css/theme.css
new file mode 100644
index 00000000..34f8bb7a
--- /dev/null
+++ b/Bootstrap.Admin/wwwroot/css/theme.css
@@ -0,0 +1,16 @@
+.tooltip-inner {
+    max-width: 768px;
+}
+
+.is-invalid .tooltip-inner {
+    background-color: #dc3545;
+}
+
+.is-invalid .arrow:before {
+    border-top-color: #dc3545;
+    border-bottom-color: #dc3545;
+}
+
+.form-check-input {
+    margin-top: 6.4px;
+}