diff --git a/CSS/themes/nzbget/aquamarine.css b/CSS/themes/nzbget/aquamarine.css
index 1ecd12e3..8beaf506 100644
--- a/CSS/themes/nzbget/aquamarine.css
+++ b/CSS/themes/nzbget/aquamarine.css
@@ -16,6 +16,6 @@
 :root {
   --main-bg-color: radial-gradient(ellipse at center, #47918a 0%, #0b3161 100%) center center/cover no-repeat fixed;
   --modal-bg-color: radial-gradient(ellipse at top, #47918a 0%, #0b3161 100%) center center/cover no-repeat fixed;
-
+  --button-color: #00bcd4;
   --accent-color: #FFEB3B;
 }
\ No newline at end of file
diff --git a/CSS/themes/nzbget/dark.css b/CSS/themes/nzbget/dark.css
index 23b41edb..395ac671 100644
--- a/CSS/themes/nzbget/dark.css
+++ b/CSS/themes/nzbget/dark.css
@@ -16,6 +16,6 @@
 :root {
   --main-bg-color: #1f1f1f;
   --modal-bg-color: radial-gradient(ellipse at top, #1f1f1f 0%, #1f1f1f 100%) center center/cover no-repeat fixed;
-
-  --accent-color: #FFCC00;
+  --accent-color: #f9be03;
+  --button-color: #cc7b19;
   }
\ No newline at end of file
diff --git a/CSS/themes/nzbget/hotline.css b/CSS/themes/nzbget/hotline.css
index b46d01cd..6aa773f2 100644
--- a/CSS/themes/nzbget/hotline.css
+++ b/CSS/themes/nzbget/hotline.css
@@ -16,6 +16,6 @@
 :root {
   --main-bg-color: radial-gradient(ellipse at center, #F44336 0%, #0b3161 100%) center center/cover no-repeat fixed;
   --modal-bg-color: radial-gradient(ellipse at top, #F44336 0%, #0b3161 100%) center center/cover no-repeat fixed;
-
+  --button-color: #F44336;
   --accent-color: #FFEB3B;
 }
\ No newline at end of file
diff --git a/CSS/themes/nzbget/nzbget-plex.css b/CSS/themes/nzbget/nzbget-base.css
similarity index 87%
rename from CSS/themes/nzbget/nzbget-plex.css
rename to CSS/themes/nzbget/nzbget-base.css
index c03bf2dc..6ff48edc 100644
--- a/CSS/themes/nzbget/nzbget-plex.css
+++ b/CSS/themes/nzbget/nzbget-base.css
@@ -12,8 +12,7 @@
 /*			      https://github.com/gilbN/theme.park			 */
 
 body {
-	background-image: url("https://raw.githubusercontent.com/gilbN/theme.park/master/Resources/blur-noise.png"),
-	url("https://raw.githubusercontent.com/gilbN/theme.park/master/Resources/blur-light.png") !important;
+	background: var(--main-bg-color) !important;
 	background-repeat: repeat, no-repeat;
 	background-attachment: fixed, fixed;
 	background-position: center center, center center;
@@ -21,7 +20,7 @@ body {
 	-webkit-background-size: auto, cover;
 	-moz-background-size: auto, cover;
 	-o-background-size: auto, cover;
-	background-color: rgba(0,0,0,.0) !important;
+	background-color: rgba(0,0,0,.0);
 	color:#FFFFFF !important;
 }
 
@@ -41,8 +40,7 @@ body {
     background-color: hsla(0,0%,100%,.08);
 }
 .modal {
-	background-image: url("https://raw.githubusercontent.com/gilbN/theme.park/master/Resources/blur-noise.png"),
-	url("https://raw.githubusercontent.com/gilbN/theme.park/master/Resources/blur-light.png") !important;
+	background: var(--modal-bg-color) !important;
 	background-repeat: repeat, no-repeat;
 	background-attachment: fixed, fixed;
 	background-position: center center, center center;
@@ -121,16 +119,19 @@ tr.checked, tr.checked td, tr.checked:nth-child(odd) .progress {
 .navbar-fixed-top .navbar-inner {
     color: #fff !important;
 }
-.navbar-inner {
-    background-color: rgba(0,0,0,.7);
-	    background-image: none;
+.navbar-inner {  
+	background-image: none;
+	background-color: transparent;
+}
+.navbar-container {
+    background: var(--main-bg-color);
 }
 .navbar .nav > li > a:hover {
-    color: #f9be03;
+    color: var(--accent-color);
 }
 .navbar .nav .active > a, .navbar .nav .active > a:hover {
     background: hsla(0,0%,100%,.08);
-    color: #f9be03;
+    color: var(--accent-color);
 }
 
 [class^="icon-"], [class*=" icon-"], [class^="img-"], [class*=" img-"] {
@@ -138,17 +139,25 @@ tr.checked, tr.checked td, tr.checked:nth-child(odd) .progress {
 }
 .navbar-search .search-query {
     color: #ffffff;
-    background-color: rgba(0, 0, 0, 0.25);
+    background-color: rgba(0, 0, 0, 0.25) !important;
     border: 0px solid #151515;
 
 }
 .navbar-search .search-query:focus, .navbar-search .search-query.focused {
-    color: #fff;
+    color: #000 !important;
     text-shadow: none;
     background-color: white !important;
 }
+.search-caret-button {
+    outline: none;
+}
+.menu-header {
+    color: #ffffff;
+}
 .dropdown-menu {
     background-color: #191a1c;
+	background: var(--modal-bg-color);
+	color: #FFF;
 }
 .dropdown-menu a {
     color: #ffffff;
@@ -224,7 +233,7 @@ tr.checked, tr.checked td, tr.checked:nth-child(odd) .progress {
   color:white;
 }
 #ConfigData input.btn.btn-primary{
-  background:#cc7b19 !important;
+  background: var(--button-color) !important;
   text-shadow:unset;
   color:white;
 }
@@ -284,7 +293,7 @@ tr.checked, tr.checked td, tr.checked:nth-child(odd) .progress {
 input, textarea, select, .uneditable-input {
     color: #ffffff;
     background-color: rgb(0, 0, 0);
-    background-image: url(https://raw.githubusercontent.com/gilbN/theme.park/master/Resources/blur-noise.png), url(https://raw.githubusercontent.com/gilbN/theme.park/master/Resources/blur-light-dark.png) !important;
+    background-image: var(main-bg-color) !important;
     background-repeat: repeat, no-repeat;
     background-attachment: fixed, fixed;
     background-position: center center, center center;
@@ -292,10 +301,14 @@ input, textarea, select, .uneditable-input {
     -webkit-background-size: auto, cover;
     -moz-background-size: auto, cover;
     -o-background-size: auto, cover;
-    background-color: #191a1c !important;
+    background-color: rgba(0, 0, 0, 0.25) !important;
     color: #FFFFFF !important;
     border: none;
 }
+select:focus {
+	background: #191a1c !important;
+	color: #FFF !important;
+}
 input[type="file"]:focus, input[type="radio"]:focus, input[type="checkbox"]:focus, select:focus {
     outline: thin dotted #333;
     outline: none;
@@ -322,7 +335,7 @@ input:focus, textarea:focus {
 }
 .alert-inverse {
 	background-color: #414141;
-    background-image: url(https://raw.githubusercontent.com/gilbN/theme.park/master/Resources/blur-noise.png), url(https://raw.githubusercontent.com/gilbN/theme.park/master/Resources/blur-light-dark.png) !important;
+    background-image: var(--main-bg-color) !important;
     background-repeat: repeat, no-repeat;
     background-attachment: fixed, fixed;
     background-position: center center, center center;
@@ -358,7 +371,7 @@ label {
     background-color: #0088cc;
 }
 .nav-list > .active > a, .nav-list > .active > a:hover {
-    color: #f9be03 !important;
+    color: var(--accent-color) !important;
     background-color: transparent;
 }
 .nav > li > a:hover {
@@ -378,7 +391,7 @@ span.help-option-title {
 }
 .input-prepend .add-on, .input-append .add-on {
     background-color: rgba(0, 0, 0, 0.25);
-    background-image: url(https://raw.githubusercontent.com/gilbN/theme.park/master/Resources/blur-noise.png), url(https://raw.githubusercontent.com/gilbN/theme.park/master/Resources/blur-light-dark.png) !important;
+    background-image: var(--main-bg-color) !important;
     background-repeat: repeat, no-repeat;
     background-attachment: fixed, fixed;
     background-position: center center, center center;
@@ -395,7 +408,7 @@ span.help-option-title {
     border-bottom: none;
 }
 a {
-    color: #f9be03;
+    color: var(--accent-color);
     text-decoration: none;
 }
 a:hover {
@@ -403,7 +416,7 @@ a:hover {
     text-decoration: underline;
 }
 .label-warning, .badge-warning {
-    background-color: #cc7b19;
+    background-color: var(--button-color);
 }
 .caret {
     border-top: 4px solid #ffffff;
diff --git a/CSS/themes/nzbget/nzborg.css b/CSS/themes/nzbget/nzborg.css
deleted file mode 100644
index cef853f9..00000000
--- a/CSS/themes/nzbget/nzborg.css
+++ /dev/null
@@ -1,380 +0,0 @@
-
-/*    dP   dP                                                                  dP        */
-/*    88   88                                                                  88        */
-/*  d8888P 88d888b. .d8888b. 88d8b.d8b. .d8888b.    88d888b. .d8888b. 88d888b. 88  .dP   */
-/*    88   88'  `88 88ooood8 88'`88'`88 88ooood8    88'  `88 88'  `88 88'  `88 88888"    */
-/*    88   88    88 88.  ... 88  88  88 88.  ...    88.  .88 88.  .88 88       88  `8b.  */
-/*    dP   dP    dP `88888P' dP  dP  dP `88888P' 88 88Y888P' `88888P8 dP       dP   `YP  */
-/*                                                  88                                   */
-/*                                                  dP					 */
-
-/*		   		        Made by @gilbN					 */
-/*			      https://github.com/gilbN/theme.park			 */
-
-body {
-	background-color: #1f1f1f !important;
-	color:#FFFFFF !important;
-}
-/* scroller */
-::-webkit-scrollbar-corner {
-    background-color: rgba(0, 0, 0, .25);
-}
-::-webkit-scrollbar {
-    width: 10px;
-    height: 10px;
-    background: #0c1218;
-}
-::-webkit-scrollbar-thumb {
-    -webkit-border-radius: 2px;
-    border-radius: 2px;
-    background-color: hsla(0,0%,100%,.09);
-}
-.modal {
-	background-color: #232323 !important;
-	color:#FFFFFF !important;
-}
-.modal-footer {
-    background-color: transparent;
-    border-top: none;
-}
-
-/* TABLES */
-.table a {
-    color: #ffffff;
-}
-.table a:hover {
-    color: #e5a00d;
-}
-.table-striped tbody tr:nth-child(odd) {
-    background-color: rgba(0, 0, 0, 0.25);
-}
-.table-striped tbody tr:nth-child(odd) td, .table-striped tbody tr:nth-child(odd) th {
-    background-color: transparent;
-}
-.table tbody tr:hover, .table tbody tr:hover td, .table tbody tr:hover a  {
-    color: white;
-	background-color: hsla(0,0%,100%,.08);
-}
-.table-striped tbody tr.checked:nth-child(2n+1) td, .checked .progress {
-    background-color: hsla(0,0%,100%,.08);
-}
-tr.checked, tr.checked td, tr.checked:nth-child(odd) .progress {
-    background-color: hsla(0,0%,100%,.08);
-}
-.table tbody tr.checked:hover, .table tbody tr.checked:hover td {
-    background-color: hsla(0,0%,100%,.08);
-}
-.table tbody tr.checked:hover, .table tbody tr.checked:hover td {
-    background-color: hsla(0,0%,100%,.08);
-}
-.table th, .table td {
-    border-top: none;
-}
-.table-bordered {
-    border-left: none;
-	border: none;
-}
-
-.pagination a {
-    border: none;
-    background: rgba(0, 0, 0, .25);
-}
-.pagination a:hover, .pagination .active a {
-    background-color: hsla(0,0%,100%,.08);
-}
-.pagination .active a {
-    color: #ffffff;
-}
-
-/* PROGRESS BAR */
-.progress {
-    background: hsla(0,0%,100%,.08);
-}
-.progress-warning.progress-striped .bar {
-    background-color: #cc7b19;
-}
-.progress-success.progress-striped .bar {
-    background-color: #51a351;
-}
-
-/* NAVBAR */
-.navbar-fixed-top .navbar-inner {
-    color: #fff !important;
-}
-.navbar-inner {
-    background-color: rgba(0,0,0,.7);
-	    background-image: none;
-}
-.navbar .nav > li > a:hover {
-    color: #f9be03;
-}
-.navbar .nav .active > a, .navbar .nav .active > a:hover {
-    background: hsla(0,0%,100%,.08);
-    color: #f9be03;
-}
-
-[class^="icon-"], [class*=" icon-"], [class^="img-"], [class*=" img-"] {
-    background-image: url(https://raw.githubusercontent.com/gilbN/theme.park/master/Resources/nzbget/icons.png);
-}
-.navbar-search .search-query {
-    color: #ffffff;
-    background-color: rgba(0, 0, 0, 0.25);
-    border: 0px solid #151515;
-
-}
-.navbar-search .search-query:focus, .navbar-search .search-query.focused {
-    color: #000 !important;
-    text-shadow: none;
-    background-color: white !important;
-}
-.dropdown-menu {
-    background-color: #191a1c;
-}
-.dropdown-menu a {
-    color: #ffffff;
-}
-.dropdown-menu li > a:hover, .dropdown-menu .active > a, .dropdown-menu .active > a:hover {
-    color: #ffffff;
-    background-color: hsla(0,0%,100%,.05);
-}
-.dropdown-menu .divider {
-    height: 0px;
-    border-bottom: none;
-}
-
-/* BUTTONS */
-.btn-group > .dropdown-toggle {
-	box-shadow: none;
-}
-
-.config-header .btn{
-  background:#FFF;
-  color:#adb1b1;
-  text-shadow:unset;
-  }
-
-#ConfigData > div > button.btn{
-  background: rgba(0, 0, 0, .25) !important;
-  color: #FFF !important;
-  font-weight:bold;
-  text-shadow:unset;
-}
-#ConfigData > div > button.btn:hover{
-  background: hsla(0,0%,100%,.08) !important;
-  color: #FFF !important;
-  font-weight:bold;
-  text-shadow:unset;
-}
-
-#ConfigData > div > div > table > tbody > tr > td>.btn{
-  background:#414141;
-  color:#adb1b1;
-  text-shadow:unset;
-  font-weight:bold;
-}
-#Config_Save:hover{
-  background-color:#51a351;
-  color:#FFF;
-}
-#Config_Save {
-  background:rgba(0, 0, 0, 0.25);
-  color:#FFF;
-  margin:auto;
-}
-#ConfigData > div> div > button.btn.btn-danger {
-  background:#ad292c;
-  text-shadow:unset;
-}
-#ConfigData > div> div > button.btn.btn-danger:hover {
-  background:#d33a3e;
-  text-shadow:unset;
-}
-#ConfigData > div:nth-child(3) > div > button,
-#ConfigData > div:nth-child(4) > div > button,
-#ConfigData > div:nth-child(5) > div > button {
-  text-shadow:unset;
-  background: rgba(0, 0, 0, 0.25);
-  color:white;
-}
-#ConfigData > div:nth-child(3) > div > button:hover,
-#ConfigData > div:nth-child(4) > div > button:hover,
-#ConfigData > div:nth-child(5) > div > button:hover {
-  text-shadow:unset;
-  background: hsla(0,0%,100%,.08);
-  color:white;
-}
-#ConfigData input.btn.btn-primary{
-  background:#cc7b19 !important;
-  text-shadow:unset;
-  color:white;
-}
-#ConfigData input.btn{
-  background: rgba(0, 0, 0, 0.25) !important;
-  text-shadow:unset;
-  color:#a8a8a8;
-}
-#Config_ViewButton{
-  background:rgba(0, 0, 0, 0.25);
-  color:#FFF;
-}
-
-#Config_ViewButton:hover{
-  background: hsla(0,0%,100%,.08);
-  color:#FFF;
-}
-
-	.btn {
-    color: #ffffff;
-    text-shadow: none;
-	background-color: rgba(0, 0, 0, 0.25);
-
-    background-image: none;
-    border-color: transparent;
-    border-bottom-color: transparent;
-    -webkit-box-shadow: none;
-    -moz-box-shadow: none;
-    box-shadow: none;
-}
-.btn:hover {
-    color: #FFF;
-	background-color: hsla(0,0%,100%,.08);
-
-}
-
-.config-header .btn {
-    background-color: rgba(0, 0, 0, 0.25);
-}
-
-.btn-group.open .btn.dropdown-toggle {
-    background-color: #FFF;
-	background-color: hsla(0,0%,100%,.08);
-}
-
-#ConfigData > div > div > table > tbody > tr > td>.btn{
-  background:rgba(0, 0, 0, 0.25);
-  color:#FFF;
-  text-shadow:unset;
-  font-weight:bold;
-}
-#ConfigData > div > div > table > tbody > tr > td>.btn:hover{
-  background: hsla(0,0%,100%,.08);
-  color:#FFF;
-}
-
-input, textarea, select, .uneditable-input {
-    background-color: #1b1a1a !important;
-    color: #FFFFFF !important;
-    border: none;
-}
-input[type="file"]:focus, input[type="radio"]:focus, input[type="checkbox"]:focus, select:focus {
-    outline: thin dotted #333;
-    outline: none;
-    outline-offset: -2px;
-    -webkit-box-shadow: none;
-    -moz-box-shadow: none;
-    box-shadow: none;
-}
-input:focus, textarea:focus {
-    -webkit-box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075), 0 0 8px rgba(0, 0, 0, 0.6);
-    -moz-box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075), 0 0 8px rgba(0, 0, 0, 0.6);
-    box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075), 0 0 8px rgba(0, 0, 0, 0.6);
-}
-.alert-info {
-	font-weight: bold;
-     border-radius: unset;
-     border-bottom-left-radius: 0px;
-     border-bottom-right-radius: 0px;
-     border:0px;
-     background-color:hsla(0,0%,100%,.05);
-     text-shadow:unset;
-     color:#FFF;
-     text-transform:capitalize;
-}
-.alert-inverse {
-	background-color: #414141;
-    background-image: url(https://raw.githubusercontent.com/gilbN/theme.park/master/Resources/blur-noise.png), url(https://raw.githubusercontent.com/gilbN/theme.park/master/Resources/blur-light-dark.png) !important;
-    background-repeat: repeat, no-repeat;
-    background-attachment: fixed, fixed;
-    background-position: center center, center center;
-    background-size: auto, cover;
-    -webkit-background-size: auto, cover;
-    -moz-background-size: auto, cover;
-    -o-background-size: auto, cover;
-    border-color: transparent;
-	opacity: 1;
-
-}
-
-/* SETTINGS */
-
-label {
-    color: #FFF;
-}
-
-#ConfigNav {
-	border: 1px solid rgba(0, 0, 0, .25);
-    background-color: rgba(0, 0, 0, .25);
-}
-#ConfigNav.nav-list a {
-    color: #fff;
-    text-decoration: none;
-}
-.nav-list > li > a, .nav-list .nav-header {
-    text-shadow: none;
-}
-.nav-list > .active > a, .nav-list > .active > a:hover {
-    color: #ffffff;
-    text-shadow: 0 -1px 0 rgba(0, 0, 0, 0.2);
-    background-color: #0088cc;
-}
-.nav-list > .active > a, .nav-list > .active > a:hover {
-    color: #f9be03 !important;
-    background-color: transparent;
-}
-.nav > li > a:hover {
-    background-color: hsla(0,0%,100%,.08);
-}
-span.help-option-title {
-    color: #eee;
-}
-.help-block, .help-inline {
-    color: #eee;
-}
-.confirm-help-block {
-    color: #eee;
-    font-size: 13px;
-    line-height: 16px;
-    margin-bottom: 0;
-}
-.input-prepend .add-on, .input-append .add-on {
-    background-color: rgba(0, 0, 0, 0.25);
-    background-image: url(https://raw.githubusercontent.com/gilbN/theme.park/master/Resources/blur-noise.png), url(https://raw.githubusercontent.com/gilbN/theme.park/master/Resources/blur-light-dark.png) !important;
-    background-repeat: repeat, no-repeat;
-    background-attachment: fixed, fixed;
-    background-position: center center, center center;
-    background-size: auto, cover;
-    -webkit-background-size: auto, cover;
-    -moz-background-size: auto, cover;
-    -o-background-size: auto, cover;
-    background-color: transparent;
-    color: #FFFFFF !important;
-    border: none;
-}
-.config-settitle {
-    background-color: rgba(0, 0, 0, 0.25);
-    border-bottom: none;
-}
-a {
-    color: #f9be03;
-    text-decoration: none;
-}
-a:hover {
-    color: #fff;
-    text-decoration: underline;
-}
-.label-warning, .badge-warning {
-    background-color: #cc7b19;
-}
-.caret {
-    border-top: 4px solid #ffffff;
-}
diff --git a/CSS/themes/nzbget/plex.css b/CSS/themes/nzbget/plex.css
index 2e9b791d..34fd38c5 100644
--- a/CSS/themes/nzbget/plex.css
+++ b/CSS/themes/nzbget/plex.css
@@ -16,6 +16,6 @@
 :root {
   --main-bg-color: url("https://raw.githubusercontent.com/gilbN/theme.park/master/Resources/blur-noise.png"), url("https://raw.githubusercontent.com/gilbN/theme.park/master/Resources/preset-light2.png") center center/cover no-repeat fixed;
   --modal-bg-color: url("https://raw.githubusercontent.com/gilbN/theme.park/master/Resources/blur-noise.png"), url("https://raw.githubusercontent.com/gilbN/theme.park/master/Resources/preset-dark2.png") center center/cover no-repeat fixed;
-
-  --accent-color: #cc7b19;
+  --accent-color: #f9be03;
+  --button-color: #cc7b19;
   }
\ No newline at end of file