diff --git a/CSS/themes/kitana/aquamarine.css b/CSS/themes/kitana/aquamarine.css
index 7f499e28..90f52499 100644
--- a/CSS/themes/kitana/aquamarine.css
+++ b/CSS/themes/kitana/aquamarine.css
@@ -13,15 +13,4 @@
 
 /* KITANA AQUAMARINE THEME */
 @import url(https://theme-park.dev/CSS/themes/kitana/kitana-base.css);
-: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: #009688;
-  --button-color-hover: #12afa0;
-  --button-text: #eee;
-  --accent-color:  #12afa0;
-  --accent-color-hover: #fff;
-  --text: #eee;
-  --text-hover: #fff;
-  --link-color: #12afa0;
-}
\ No newline at end of file
+@import url(https://theme-park.dev/CSS/variables/aquamarine.css);
\ No newline at end of file
diff --git a/CSS/themes/kitana/dark.css b/CSS/themes/kitana/dark.css
index 431815a4..aa2f048a 100644
--- a/CSS/themes/kitana/dark.css
+++ b/CSS/themes/kitana/dark.css
@@ -13,15 +13,4 @@
 
 /* KITANA DARK THEME */
 @import url(https://theme-park.dev/CSS/themes/kitana/kitana-base.css);
-:root {
-  --main-bg-color: radial-gradient(circle, #3a3a3a, #2d2d2d, #202020, #141414, #000000) center center/cover no-repeat fixed;
-  --modal-bg-color: radial-gradient(circle , #3a3a3a, #2d2d2d, #202020, #141414, #000000) center center/cover no-repeat fixed;
-  --button-color: hsla(0,0%,100%,.15);
-  --button-color-hover: hsla(0,0%,100%,.30);
-  --button-text: #eee;
-  --accent-color:  #fff;
-  --accent-color-hover: rgba(255, 255, 255, 0.45);
-  --text: #eee;
-  --text-hover: #fff;
-  --link-hover: rgba(255, 255, 255, 0.45);
-}
\ No newline at end of file
+@import url(https://theme-park.dev/CSS/variables/dark.css);
\ No newline at end of file
diff --git a/CSS/themes/kitana/dracula.css b/CSS/themes/kitana/dracula.css
new file mode 100644
index 00000000..3ad03045
--- /dev/null
+++ b/CSS/themes/kitana/dracula.css
@@ -0,0 +1,16 @@
+
+/*    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			 */
+
+/* KITANA DRACULA THEME */
+@import url(https://theme-park.dev/CSS/themes/kitana/kitana-base.css);
+@import url(https://theme-park.dev/CSS/variables/dracula.css);
\ No newline at end of file
diff --git a/CSS/themes/kitana/hotline.css b/CSS/themes/kitana/hotline.css
index f2d74c41..9dbf1166 100644
--- a/CSS/themes/kitana/hotline.css
+++ b/CSS/themes/kitana/hotline.css
@@ -13,15 +13,4 @@
 
 /* KITANA HOTLINE THEME */
 @import url(https://theme-park.dev/CSS/themes/kitana/kitana-base.css);
-: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: hsla(0,0%,100%,.15);
-  --button-color-hover: hsla(0,0%,100%,.30);
-  --button-text: #eee;
-  --accent-color:  #F44336;
-  --accent-color-hover: #0b3161;
-  --text: #eee;
-  --text-hover: #fff;
-  --link-hover: #F44336;
-}
\ No newline at end of file
+@import url(https://theme-park.dev/CSS/variables/hotline.css);
\ No newline at end of file
diff --git a/CSS/themes/kitana/kitana-base.css b/CSS/themes/kitana/kitana-base.css
index d53b80a6..e93ddcee 100644
--- a/CSS/themes/kitana/kitana-base.css
+++ b/CSS/themes/kitana/kitana-base.css
@@ -18,7 +18,8 @@ body {
     background-size: auto, cover;
     -webkit-background-size: auto, cover;
     -moz-background-size: auto, cover;
-    -o-background-size: auto, cover; 
+    -o-background-size: auto, cover;
+    color: var(--text);
 }
 
 a {
@@ -26,7 +27,12 @@ a {
 }
 
 a:hover {
-    color: #fff;
+    color: var(--link-color-hover);
+}
+
+a.ml-2,
+a.mx-2 {
+    color: rgb(var(--accent-color)) !important;
 }
 
 #content:before {
@@ -37,7 +43,7 @@ a:hover {
     background-size: auto, cover;
     -webkit-background-size: auto, cover;
     -moz-background-size: auto, cover;
-    -o-background-size: auto, cover; 
+    -o-background-size: auto, cover;
 }
 
 * {
@@ -50,10 +56,20 @@ body,
     color: var(--text);
 }
 
+h1,
+h2,
+h3,
+h4,
+h5,
+h6,
+label {
+    color: var(--text-hover);
+}
+
 /* ACCENTS */
 .badge-dark {
-    color: var(--button-text);
-    background-color: var(--accent-color);
+    color: var(--label-text-color);
+    background-color: rgb(rgb(var(--accent-color)));
 }
 
 /* NAVBAR */
@@ -85,7 +101,7 @@ body,
     background-size: auto, cover;
     -webkit-background-size: auto, cover;
     -moz-background-size: auto, cover;
-    -o-background-size: auto, cover; 
+    -o-background-size: auto, cover;
     border: 1px solid transparent;
 }
 
@@ -115,6 +131,7 @@ body,
 }
 
 .card-header {
+    color: var(--text-hover);
     background-color: rgb(0 0 0 / 25%);
     border-bottom: 1px solid rgba(255, 255, 255, .125) !important;
 }
@@ -160,14 +177,14 @@ ul li:hover {
 .btn-primary:not(:disabled):not(.disabled).active,
 .show>.btn-primary.dropdown-toggle {
     border-color: var(--button-color-hover);
-    color: var(--text-hover);
+    color: var(--button-text-hover);
     background-color: var(--button-color-hover);
     box-shadow: none !important;
 }
 
 .badge-primary {
-    color: var(--button-text);
-    background-color: var(--accent-color);
+    color: var(--label-text-color);
+    background-color: rgb(var(--accent-color));
 }
 
 .badge-secondary {
@@ -189,6 +206,31 @@ ul li:hover {
     color: var(--text-hover) !important;
 }
 
+.custom-control-input:checked~.custom-control-label::before {
+    color: var(--label-text-color);
+    border-color: rgb(var(--accent-color));
+    background-color: rgb(var(--accent-color));
+}
+
+.custom-checkbox .custom-control-input:checked~.custom-control-label::after {
+    filter: invert(1);
+}
+
+.custom-control-input:focus~.custom-control-label::before {
+    box-shadow: 0 0 0 .2rem rgba(55, 90, 127, 0.25)
+}
+
+.custom-control-input:focus:not(:checked)~.custom-control-label::before {
+    border-color: rgb(var(--accent-color));
+}
+
+.custom-control-input:not(:disabled):active~.custom-control-label::before {
+    color: #fff;
+    background-color: #97b3d2;
+    border-color: #97b3d2
+}
+
+
 /* PLACEHOLDER TEXT */
 ::placeholder {
     color: var(--text) !important;
diff --git a/CSS/themes/kitana/organizr-dark.css b/CSS/themes/kitana/organizr-dark.css
index 9ec66577..3f49ee23 100644
--- a/CSS/themes/kitana/organizr-dark.css
+++ b/CSS/themes/kitana/organizr-dark.css
@@ -13,15 +13,4 @@
 
 /* KITANA ORGANIZR-DARK THEME */
 @import url(https://theme-park.dev/CSS/themes/kitana/kitana-base.css);
-:root {
-  --main-bg-color: #1f1f1f;
-  --modal-bg-color: #1b1b1b;
-  --button-color: #2cabe3;
-  --button-color-hover: rgb(44 171 227 / .8);
-  --button-text: #eee;
-  --accent-color:#2cabe3;
-  --accent-color-hover: #fff;
-  --text:#96a2b4;
-  --text-hover: #fff;
-  --link-color: #2cabe3;
-}
\ No newline at end of file
+@import url(https://theme-park.dev/CSS/variables/organizr-dark.css);
\ No newline at end of file
diff --git a/CSS/themes/kitana/plex.css b/CSS/themes/kitana/plex.css
index 3aca9268..47cb7e07 100644
--- a/CSS/themes/kitana/plex.css
+++ b/CSS/themes/kitana/plex.css
@@ -13,15 +13,4 @@
 
 /* KITANA PLEX THEME */
 @import url(https://theme-park.dev/CSS/themes/kitana/kitana-base.css);
-: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;
-  --button-color: #cc7b19;
-  --button-color-hover: #e59029;
-  --button-text: #eee;
-  --accent-color:  #e5a00d;
-  --accent-color-hover: #ffc107;
-  --text: #eee;
-  --text-hover: #fff;
-  --link-color:#fff;
-}
\ No newline at end of file
+@import url(https://theme-park.dev/CSS/variables/plex.css);
\ No newline at end of file
diff --git a/CSS/themes/kitana/space-gray.css b/CSS/themes/kitana/space-gray.css
index 8f7c4baa..79220b18 100644
--- a/CSS/themes/kitana/space-gray.css
+++ b/CSS/themes/kitana/space-gray.css
@@ -13,15 +13,4 @@
 
 /* KITANA SPACE GRAY THEME */
 @import url(https://theme-park.dev/CSS/themes/kitana/kitana-base.css);
-:root {
-  --main-bg-color:  radial-gradient( ellipse at center,  rgba(87,108,117,1) 0%, rgba(37,50,55,1) 100.2% ) center center/cover no-repeat fixed;
-  --modal-bg-color: radial-gradient( ellipse at top,  rgba(87,108,117,1) 0%, rgba(37,50,55,1) 100.2% ) center center/cover no-repeat fixed; 
-  --button-color: #607D8B;
-  --button-color-hover: #81a6b7;
-  --button-text: #eee;
-  --accent-color: #81a6b7;
-  --accent-color-hover: #81a6b7;
-  --text: #eee;
-  --text-hover: #fff;
-  --link-color: #81a6b7;
-}
\ No newline at end of file
+@import url(https://theme-park.dev/CSS/variables/space-gray.css);
\ No newline at end of file