diff --git a/CSS/themes/bitwarden/aquamarine.css b/CSS/themes/bitwarden/aquamarine.css
index 555d2a58..c35a6d00 100644
--- a/CSS/themes/bitwarden/aquamarine.css
+++ b/CSS/themes/bitwarden/aquamarine.css
@@ -1,2 +1,2 @@
-@import url("https://develop.theme-park.dev/css/base/bitwarden/bitwarden-base.css?sha=5ddb2023dc9a0e2b55e6acc71acd784decff65ea");
+@import url("https://develop.theme-park.dev/css/base/bitwarden/bitwarden-base.css?sha=987fa5ed04665d94f568245cbbad9d367480a60d");
 @import url("https://develop.theme-park.dev/css/theme-options/aquamarine.css?sha=5cdf3f13a57669f3732b64a7573580bcaa9ac6fc");
\ No newline at end of file
diff --git a/CSS/themes/bitwarden/bitwarden-base.css b/CSS/themes/bitwarden/bitwarden-base.css
index 5ddb2023..987fa5ed 100644
--- a/CSS/themes/bitwarden/bitwarden-base.css
+++ b/CSS/themes/bitwarden/bitwarden-base.css
@@ -19,8 +19,8 @@ img.logo {
 }
 
 body.layout_frontend,
-body,
-html.theme_light body.layout_frontend,
+html[class*="theme_"] body,
+html[class*="theme_"] body.layout_frontend,
 html {
     background: var(--main-bg-color);
     background-repeat: repeat, no-repeat;
@@ -41,18 +41,22 @@ app-org-vault-groupings .card .card-body a,
     color: var(--link-color);
 }
 
-a:hover:not(.btn-secondary),
+a:hover:not(.btn-secondary):not(.btn-outline-primary),
 app-vault-groupings .card li.active>a:first-of-type,
 app-vault-groupings .card li.active>div a:first-of-type,
 app-org-vault-groupings .card li.active>a:first-of-type,
 app-org-vault-groupings .card li.active>div a:first-of-type,
 .groupings .card li.active>a:first-of-type,
 .groupings .card li.active>div a:first-of-type,
-html.theme_light a {
+html[class*="theme_"] a {
     color: var(--link-color-hover) !important;
 }
+html[class*="theme_"] #totpImage {
+    background: lightgray;
+}
 
 /* TEXT */
+html[class*="theme_"] .text-muted,
 .text-muted,
 .form-check-block .form-check-label>small,
 .modal-header small,
@@ -81,7 +85,7 @@ h6,
 label:not(#g_advanced > div:nth-child(13) > label):not(#g_advanced > div:nth-child(12) > div.col-sm-8 > div > label),
 label:not(.form-check-label):not(.btn):not(#g_advanced > div:nth-child(13) > label),
 label.bold .card-header:first-child,
-.card-header,
+html[class*="theme_"] .card-header,
 .modal-header {
     color: var(--text-hover) !important;
 }
@@ -99,13 +103,19 @@ label.bold .card-header:first-child,
 }
 
 /* CARDS */
+
+html[class*="theme_"] .card-header {
+    background-color: rgb(0 0 0 / 45%);
+    color: #fff;
+}
+
 .card {
     background-color: rgba(255, 255, 255, 0.07) !important;
     border-color: rgba(255, 255, 255, 0.1) !important;
     color: var(--text) !important;
 }
 
-html.theme_light .card-body:not(.bg-light>.card-body) {
+html[class*="theme_"] .card-body:not(.bg-light>.card-body) {
     background-color: transparent;
     color: var(--text);
 }
@@ -116,17 +126,31 @@ app-vault-groupings .card li.active>div>.fa {
     color: rgb(var(--accent-color));
 }
 
-body>app-root>app-user-layout>app-tools>div>div>div.col-9>app-password-generator>div.card.card-password.bg-light.my-4 {
+body>app-root>app-user-layout>app-tools>div>div>div.col-9>app-password-generator>div.card.card-password.bg-light.my-4,
+body > app-root > app-user-layout > app-tools > div > div > div.col-9 > app-password-generator > div.card.card-password.bg-light.my-4 > div {
     background-color: rgb(0 0 0 / 15%) !important;
 }
 
-.password-number {
+html[class*="theme_"] .password-number {
     color: rgb(var(--accent-color));
 }
+html[class*="theme_"] .password-letter {
+    color: white;
+}
 
 /* MODALS */
-.modal-content,
-.modal-footer {
+html[class*="theme_"] .modal-header {
+    border-bottom: 1px solid rgba(255, 255, 255, 0.1);
+    background: var(--modal-header-color);
+    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;
+}
+html[class*="theme_"] .modal-body {
     background: var(--modal-bg-color);
     background-repeat: repeat, no-repeat;
     background-attachment: fixed, fixed;
@@ -136,6 +160,17 @@ body>app-root>app-user-layout>app-tools>div>div>div.col-9>app-password-generator
     -moz-background-size: auto, cover;
     -o-background-size: auto, cover;
 }
+html[class*="theme_"] .modal-footer {
+    border-top: 1px solid rgba(255, 255, 255, 0.1);
+    background: var(--modal-footer-color);
+    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;
+}
 
 .close,
 .close:hover {
@@ -193,26 +228,35 @@ body>app-root>app-user-layout>app-tools>div>div>div.col-9>app-password-generator
 }
 
 /* FORMS */
-.form-control:focus {
+html[class*="theme_"] label.form-check-label, html[class*="theme_"] .form-control-file {
+    color: var(--text);
+}
+
+html[class*="theme_"] .form-control:focus {
     box-shadow: none;
     border-color: transparent;
+    background: rgb(253 253 253 / 15%);
 }
 
-.form-control {
+html[class*="theme_"] .form-control {
     color: var(--text);
     background-color: rgb(0 0 0 / 0.25);
     border: 1px solid transparent;
 
 }
 
-.form-control:disabled,
+html[class*="theme_"] .form-control:disabled,
 .form-control[readonly] {
     background-color: rgb(255 255 255 / 25%);
     opacity: 1;
 }
 
+select:focus {
+    background: #1f1f1f !important;
+}
+
 /* DROPDOWN MENU */
-.dropdown-menu {
+/* html[class*="theme_"] .dropdown-menu {
     background: var(--modal-bg-color);
     background-repeat: repeat, no-repeat;
     background-attachment: fixed, fixed;
@@ -223,15 +267,20 @@ body>app-root>app-user-layout>app-tools>div>div>div.col-9>app-password-generator
     -o-background-size: auto, cover;
     border: 1px solid transparent;
     box-shadow: 3px 3px 10px rgba(0, 0, 0, .2);
+} */
+
+html[class*="theme_"] .dropdown-menu, html[class*="theme_"] .dropdown-item {
+    background: #1f1f1f;
+    color: #fff;
 }
 
-.dropdown-item,
-.dropdown-item-text {
+html[class*="theme_"] .dropdown-item,
+html[class*="theme_"] .dropdown-item-text {
     color: var(--text);
 }
 
-.dropdown-item:hover,
-.dropdown-item:focus {
+html[class*="theme_"] .dropdown-item:hover,
+html[class*="theme_"] .dropdown-item:focus {
     color: var(--text-hover);
     text-decoration: none;
     background-color: rgb(255 255 255 / 0.08);
@@ -249,19 +298,32 @@ a.text-danger:focus {
 }
 
 /* SETTINGS */
-.list-group-item.active {
+
+html[class*="theme_"] .page-header, html[class*="theme_"] .secondary-header {
+    border-bottom: 1px solid rgb(255 255 255 / 30%);
+}
+
+html[class*="theme_"] .list-group-item.active {
     color: var(--text);
     background-color: rgb(255 255 255 / 10%);
     border-left: 3px solid rgb(var(--accent-color));
+    border-color: rgba(255, 255, 255, 0.1);
 }
 
-.callout {
+html[class*="theme_"] .callout {
     background-color: rgb(255 255 255 / 15%);
+    border: 1px solid rgba(255, 255, 255, 0.1);
+    color: var(--text);
 }
 
-.list-group-item {
+html[class*="theme_"] .list-group-item {
     background-color: rgb(0 0 0 / 25%);
     border: 1px solid rgb(255 255 255 / 8%);
+    color: var(--text);
+}
+
+html[class*="theme_"] .progress {
+    background-color: rgba(0, 0, 0, 0.25);
 }
 
 /* BUTTONS */
@@ -306,8 +368,8 @@ a.text-danger:focus {
 .btn[class*="btn-outline-"]:not(:hover),
 .swal2-popup .swal2-actions button[class*="btn-outline-"]:not(:hover),
 .swal2-popup .swal2-actions button.swal2-cancel,
-html.theme_light .btn-primary,
-html.theme_light .swal2-confirm {
+html[class*="theme_"] .btn-primary,
+html[class*="theme_"] .swal2-confirm {
     border-color: var(--button-color) !important;
     background-color: var(--button-color) !important;
     color: var(--button-text) !important;
@@ -315,8 +377,8 @@ html.theme_light .swal2-confirm {
 
 .btn-outline-secondary:hover,
 .swal2-popup .swal2-actions button.swal2-cancel:hover,
-html.theme_light .btn-primary,
-html.theme_light .swal2-confirm {
+html[class*="theme_"] .btn-primary,
+html[class*="theme_"] .swal2-confirm {
     color: var(--button-text-hover) !important;
     background-color: var(--button-color-hover) !important;
     border-color: var(--button-color-hover) !important;
@@ -361,8 +423,8 @@ html.theme_light .swal2-confirm {
 .swal2-popup .swal2-actions button.swal2-cancel:not(:disabled):not(.disabled).active,
 .show>.btn-outline-secondary.dropdown-toggle,
 .swal2-popup .swal2-actions .show>button.dropdown-toggle.swal2-cancel,
-html.theme_light .btn-outline-secondary:hover:not(:disabled),
-html.theme_light .btn-outline-secondary:active {
+html[class*="theme_"] .btn-outline-secondary:hover:not(:disabled),
+html[class*="theme_"] .btn-outline-secondary:active {
     color: var(--button-text-hover) !important;
     background-color: var(--button-color-hover) !important;
     border-color: var(--button-color-hover) !important;
@@ -524,4 +586,7 @@ input:focus:-ms-input-placeholder {
 .table-striped>tbody>tr:nth-of-type(odd)>* {
     --bs-table-accent-bg: var(--bs-table-striped-bg);
     color: var(--text-hover);
+}
+html[class*="theme_"] .table td {
+    color: var(--text);
 }
\ No newline at end of file
diff --git a/CSS/themes/bitwarden/blackberry-abyss.css b/CSS/themes/bitwarden/blackberry-abyss.css
index acb2bd15..674c4ff2 100644
--- a/CSS/themes/bitwarden/blackberry-abyss.css
+++ b/CSS/themes/bitwarden/blackberry-abyss.css
@@ -1,2 +1,2 @@
-@import url("https://develop.theme-park.dev/css/base/bitwarden/bitwarden-base.css?sha=5ddb2023dc9a0e2b55e6acc71acd784decff65ea");
+@import url("https://develop.theme-park.dev/css/base/bitwarden/bitwarden-base.css?sha=987fa5ed04665d94f568245cbbad9d367480a60d");
 @import url("https://develop.theme-park.dev/css/community-theme-options/blackberry-abyss.css?sha=5e806cb7efad3e1ac97e985f71d7a631a1b7f02b");
\ No newline at end of file
diff --git a/CSS/themes/bitwarden/blackberry-amethyst.css b/CSS/themes/bitwarden/blackberry-amethyst.css
index 5de76388..6e63aa6d 100644
--- a/CSS/themes/bitwarden/blackberry-amethyst.css
+++ b/CSS/themes/bitwarden/blackberry-amethyst.css
@@ -1,2 +1,2 @@
-@import url("https://develop.theme-park.dev/css/base/bitwarden/bitwarden-base.css?sha=5ddb2023dc9a0e2b55e6acc71acd784decff65ea");
+@import url("https://develop.theme-park.dev/css/base/bitwarden/bitwarden-base.css?sha=987fa5ed04665d94f568245cbbad9d367480a60d");
 @import url("https://develop.theme-park.dev/css/community-theme-options/blackberry-amethyst.css?sha=bfb208569a57c23e562781bcbcc25c05779421de");
\ No newline at end of file
diff --git a/CSS/themes/bitwarden/blackberry-carol.css b/CSS/themes/bitwarden/blackberry-carol.css
index 3a56d65e..52e23c71 100644
--- a/CSS/themes/bitwarden/blackberry-carol.css
+++ b/CSS/themes/bitwarden/blackberry-carol.css
@@ -1,2 +1,2 @@
-@import url("https://develop.theme-park.dev/css/base/bitwarden/bitwarden-base.css?sha=5ddb2023dc9a0e2b55e6acc71acd784decff65ea");
+@import url("https://develop.theme-park.dev/css/base/bitwarden/bitwarden-base.css?sha=987fa5ed04665d94f568245cbbad9d367480a60d");
 @import url("https://develop.theme-park.dev/css/community-theme-options/blackberry-carol.css?sha=39e2106043161e407b4e509e8d8323121fef6950");
\ No newline at end of file
diff --git a/CSS/themes/bitwarden/blackberry-dreamscape.css b/CSS/themes/bitwarden/blackberry-dreamscape.css
index 17fc164a..a61414c1 100644
--- a/CSS/themes/bitwarden/blackberry-dreamscape.css
+++ b/CSS/themes/bitwarden/blackberry-dreamscape.css
@@ -1,2 +1,2 @@
-@import url("https://develop.theme-park.dev/css/base/bitwarden/bitwarden-base.css?sha=5ddb2023dc9a0e2b55e6acc71acd784decff65ea");
+@import url("https://develop.theme-park.dev/css/base/bitwarden/bitwarden-base.css?sha=987fa5ed04665d94f568245cbbad9d367480a60d");
 @import url("https://develop.theme-park.dev/css/community-theme-options/blackberry-dreamscape.css?sha=0ad15b8d2215b7528e27f3bd65f1cb0c42453be0");
\ No newline at end of file
diff --git a/CSS/themes/bitwarden/blackberry-flamingo.css b/CSS/themes/bitwarden/blackberry-flamingo.css
index 7ed0aac0..a5d67648 100644
--- a/CSS/themes/bitwarden/blackberry-flamingo.css
+++ b/CSS/themes/bitwarden/blackberry-flamingo.css
@@ -1,2 +1,2 @@
-@import url("https://develop.theme-park.dev/css/base/bitwarden/bitwarden-base.css?sha=5ddb2023dc9a0e2b55e6acc71acd784decff65ea");
+@import url("https://develop.theme-park.dev/css/base/bitwarden/bitwarden-base.css?sha=987fa5ed04665d94f568245cbbad9d367480a60d");
 @import url("https://develop.theme-park.dev/css/community-theme-options/blackberry-flamingo.css?sha=4ddeb117541753969da70820d8205aef771e37b4");
\ No newline at end of file
diff --git a/CSS/themes/bitwarden/blackberry-hearth.css b/CSS/themes/bitwarden/blackberry-hearth.css
index 22908fc5..476c8495 100644
--- a/CSS/themes/bitwarden/blackberry-hearth.css
+++ b/CSS/themes/bitwarden/blackberry-hearth.css
@@ -1,2 +1,2 @@
-@import url("https://develop.theme-park.dev/css/base/bitwarden/bitwarden-base.css?sha=5ddb2023dc9a0e2b55e6acc71acd784decff65ea");
+@import url("https://develop.theme-park.dev/css/base/bitwarden/bitwarden-base.css?sha=987fa5ed04665d94f568245cbbad9d367480a60d");
 @import url("https://develop.theme-park.dev/css/community-theme-options/blackberry-hearth.css?sha=979626f867e9a9a91664f2b6da66d478040dc8fb");
\ No newline at end of file
diff --git a/CSS/themes/bitwarden/blackberry-martian.css b/CSS/themes/bitwarden/blackberry-martian.css
index 5f302671..98d540d8 100644
--- a/CSS/themes/bitwarden/blackberry-martian.css
+++ b/CSS/themes/bitwarden/blackberry-martian.css
@@ -1,2 +1,2 @@
-@import url("https://develop.theme-park.dev/css/base/bitwarden/bitwarden-base.css?sha=5ddb2023dc9a0e2b55e6acc71acd784decff65ea");
+@import url("https://develop.theme-park.dev/css/base/bitwarden/bitwarden-base.css?sha=987fa5ed04665d94f568245cbbad9d367480a60d");
 @import url("https://develop.theme-park.dev/css/community-theme-options/blackberry-martian.css?sha=f6fcaa104ff119d049fb72cebe2e6e620db1aa04");
\ No newline at end of file
diff --git a/CSS/themes/bitwarden/blackberry-pumpkin.css b/CSS/themes/bitwarden/blackberry-pumpkin.css
index ccb66965..4bf6a9b6 100644
--- a/CSS/themes/bitwarden/blackberry-pumpkin.css
+++ b/CSS/themes/bitwarden/blackberry-pumpkin.css
@@ -1,2 +1,2 @@
-@import url("https://develop.theme-park.dev/css/base/bitwarden/bitwarden-base.css?sha=5ddb2023dc9a0e2b55e6acc71acd784decff65ea");
+@import url("https://develop.theme-park.dev/css/base/bitwarden/bitwarden-base.css?sha=987fa5ed04665d94f568245cbbad9d367480a60d");
 @import url("https://develop.theme-park.dev/css/community-theme-options/blackberry-pumpkin.css?sha=0ba03cc3999c36f3ef7c0eae7f381cdcbdfd7f33");
\ No newline at end of file
diff --git a/CSS/themes/bitwarden/blackberry-royal.css b/CSS/themes/bitwarden/blackberry-royal.css
index c743da69..a165a0da 100644
--- a/CSS/themes/bitwarden/blackberry-royal.css
+++ b/CSS/themes/bitwarden/blackberry-royal.css
@@ -1,2 +1,2 @@
-@import url("https://develop.theme-park.dev/css/base/bitwarden/bitwarden-base.css?sha=5ddb2023dc9a0e2b55e6acc71acd784decff65ea");
+@import url("https://develop.theme-park.dev/css/base/bitwarden/bitwarden-base.css?sha=987fa5ed04665d94f568245cbbad9d367480a60d");
 @import url("https://develop.theme-park.dev/css/community-theme-options/blackberry-royal.css?sha=4bb56762e9469e831edf005100b9bd04849ad55c");
\ No newline at end of file
diff --git a/CSS/themes/bitwarden/blackberry-shadow.css b/CSS/themes/bitwarden/blackberry-shadow.css
index 671f2aa7..9dae3456 100644
--- a/CSS/themes/bitwarden/blackberry-shadow.css
+++ b/CSS/themes/bitwarden/blackberry-shadow.css
@@ -1,2 +1,2 @@
-@import url("https://develop.theme-park.dev/css/base/bitwarden/bitwarden-base.css?sha=5ddb2023dc9a0e2b55e6acc71acd784decff65ea");
+@import url("https://develop.theme-park.dev/css/base/bitwarden/bitwarden-base.css?sha=987fa5ed04665d94f568245cbbad9d367480a60d");
 @import url("https://develop.theme-park.dev/css/community-theme-options/blackberry-shadow.css?sha=f8e59fbf4720063a949e1be5cb16ebef094dc724");
\ No newline at end of file
diff --git a/CSS/themes/bitwarden/blackberry-solar.css b/CSS/themes/bitwarden/blackberry-solar.css
index 795d5115..a08e6d73 100644
--- a/CSS/themes/bitwarden/blackberry-solar.css
+++ b/CSS/themes/bitwarden/blackberry-solar.css
@@ -1,2 +1,2 @@
-@import url("https://develop.theme-park.dev/css/base/bitwarden/bitwarden-base.css?sha=5ddb2023dc9a0e2b55e6acc71acd784decff65ea");
+@import url("https://develop.theme-park.dev/css/base/bitwarden/bitwarden-base.css?sha=987fa5ed04665d94f568245cbbad9d367480a60d");
 @import url("https://develop.theme-park.dev/css/community-theme-options/blackberry-solar.css?sha=429071cc7b6204555899a4942d47446f54cc19c5");
\ No newline at end of file
diff --git a/CSS/themes/bitwarden/blackberry-vanta.css b/CSS/themes/bitwarden/blackberry-vanta.css
index edec717b..eab05444 100644
--- a/CSS/themes/bitwarden/blackberry-vanta.css
+++ b/CSS/themes/bitwarden/blackberry-vanta.css
@@ -1,2 +1,2 @@
-@import url("https://develop.theme-park.dev/css/base/bitwarden/bitwarden-base.css?sha=5ddb2023dc9a0e2b55e6acc71acd784decff65ea");
+@import url("https://develop.theme-park.dev/css/base/bitwarden/bitwarden-base.css?sha=987fa5ed04665d94f568245cbbad9d367480a60d");
 @import url("https://develop.theme-park.dev/css/community-theme-options/blackberry-vanta.css?sha=45a001fcfcf1fae8d40216146f38595fcfc76738");
\ No newline at end of file
diff --git a/CSS/themes/bitwarden/dark.css b/CSS/themes/bitwarden/dark.css
index 7813b96f..7298a91d 100644
--- a/CSS/themes/bitwarden/dark.css
+++ b/CSS/themes/bitwarden/dark.css
@@ -1,2 +1,2 @@
-@import url("https://develop.theme-park.dev/css/base/bitwarden/bitwarden-base.css?sha=5ddb2023dc9a0e2b55e6acc71acd784decff65ea");
+@import url("https://develop.theme-park.dev/css/base/bitwarden/bitwarden-base.css?sha=987fa5ed04665d94f568245cbbad9d367480a60d");
 @import url("https://develop.theme-park.dev/css/theme-options/dark.css?sha=dc21605e303d094fed0564a15fb983d81bcd33dd");
\ No newline at end of file
diff --git a/CSS/themes/bitwarden/dracula.css b/CSS/themes/bitwarden/dracula.css
index 1f57a0c7..df893387 100644
--- a/CSS/themes/bitwarden/dracula.css
+++ b/CSS/themes/bitwarden/dracula.css
@@ -1,2 +1,2 @@
-@import url("https://develop.theme-park.dev/css/base/bitwarden/bitwarden-base.css?sha=5ddb2023dc9a0e2b55e6acc71acd784decff65ea");
+@import url("https://develop.theme-park.dev/css/base/bitwarden/bitwarden-base.css?sha=987fa5ed04665d94f568245cbbad9d367480a60d");
 @import url("https://develop.theme-park.dev/css/theme-options/dracula.css?sha=5abf85508d87243007cf5f4fda34a60340583466");
\ No newline at end of file
diff --git a/CSS/themes/bitwarden/hotline-old.css b/CSS/themes/bitwarden/hotline-old.css
index 567b1e5d..b15e8e71 100644
--- a/CSS/themes/bitwarden/hotline-old.css
+++ b/CSS/themes/bitwarden/hotline-old.css
@@ -1,2 +1,2 @@
-@import url("https://develop.theme-park.dev/css/base/bitwarden/bitwarden-base.css?sha=5ddb2023dc9a0e2b55e6acc71acd784decff65ea");
+@import url("https://develop.theme-park.dev/css/base/bitwarden/bitwarden-base.css?sha=987fa5ed04665d94f568245cbbad9d367480a60d");
 @import url("https://develop.theme-park.dev/css/community-theme-options/hotline-old.css?sha=73fce8f3f316c64b864e8b0502de0005f3883df4");
\ No newline at end of file
diff --git a/CSS/themes/bitwarden/hotline.css b/CSS/themes/bitwarden/hotline.css
index 5c54dfa5..2212e5ef 100644
--- a/CSS/themes/bitwarden/hotline.css
+++ b/CSS/themes/bitwarden/hotline.css
@@ -1,2 +1,2 @@
-@import url("https://develop.theme-park.dev/css/base/bitwarden/bitwarden-base.css?sha=5ddb2023dc9a0e2b55e6acc71acd784decff65ea");
+@import url("https://develop.theme-park.dev/css/base/bitwarden/bitwarden-base.css?sha=987fa5ed04665d94f568245cbbad9d367480a60d");
 @import url("https://develop.theme-park.dev/css/theme-options/hotline.css?sha=e027feaeea0f623144af4c45b61e332a0757f5fb");
\ No newline at end of file
diff --git a/CSS/themes/bitwarden/hotpink.css b/CSS/themes/bitwarden/hotpink.css
index fd2092e9..3c8dc801 100644
--- a/CSS/themes/bitwarden/hotpink.css
+++ b/CSS/themes/bitwarden/hotpink.css
@@ -1,2 +1,2 @@
-@import url("https://develop.theme-park.dev/css/base/bitwarden/bitwarden-base.css?sha=5ddb2023dc9a0e2b55e6acc71acd784decff65ea");
+@import url("https://develop.theme-park.dev/css/base/bitwarden/bitwarden-base.css?sha=987fa5ed04665d94f568245cbbad9d367480a60d");
 @import url("https://develop.theme-park.dev/css/theme-options/hotpink.css?sha=2f3974c084d053521362bae34d415f3614dba2e2");
\ No newline at end of file
diff --git a/CSS/themes/bitwarden/mind.css b/CSS/themes/bitwarden/mind.css
index d34d6c07..d47aa787 100644
--- a/CSS/themes/bitwarden/mind.css
+++ b/CSS/themes/bitwarden/mind.css
@@ -1,2 +1,2 @@
-@import url("https://develop.theme-park.dev/css/base/bitwarden/bitwarden-base.css?sha=5ddb2023dc9a0e2b55e6acc71acd784decff65ea");
+@import url("https://develop.theme-park.dev/css/base/bitwarden/bitwarden-base.css?sha=987fa5ed04665d94f568245cbbad9d367480a60d");
 @import url("https://develop.theme-park.dev/css/community-theme-options/mind.css?sha=fb9b9d13dcaae0d46499acbbae405bbc23ae37cb");
\ No newline at end of file
diff --git a/CSS/themes/bitwarden/nord.css b/CSS/themes/bitwarden/nord.css
index fe5ae900..ee56bd1e 100644
--- a/CSS/themes/bitwarden/nord.css
+++ b/CSS/themes/bitwarden/nord.css
@@ -1,2 +1,2 @@
-@import url("https://develop.theme-park.dev/css/base/bitwarden/bitwarden-base.css?sha=5ddb2023dc9a0e2b55e6acc71acd784decff65ea");
+@import url("https://develop.theme-park.dev/css/base/bitwarden/bitwarden-base.css?sha=987fa5ed04665d94f568245cbbad9d367480a60d");
 @import url("https://develop.theme-park.dev/css/theme-options/nord.css?sha=353cb0383f78b2afa4de7784d536d637f3c3666d");
\ No newline at end of file
diff --git a/CSS/themes/bitwarden/onedark.css b/CSS/themes/bitwarden/onedark.css
index 52cea4d5..ad5245be 100644
--- a/CSS/themes/bitwarden/onedark.css
+++ b/CSS/themes/bitwarden/onedark.css
@@ -1,2 +1,2 @@
-@import url("https://develop.theme-park.dev/css/base/bitwarden/bitwarden-base.css?sha=5ddb2023dc9a0e2b55e6acc71acd784decff65ea");
+@import url("https://develop.theme-park.dev/css/base/bitwarden/bitwarden-base.css?sha=987fa5ed04665d94f568245cbbad9d367480a60d");
 @import url("https://develop.theme-park.dev/css/community-theme-options/onedark.css?sha=cbccbf4366ab59bd2b9253c221b1f093c2e85118");
\ No newline at end of file
diff --git a/CSS/themes/bitwarden/organizr.css b/CSS/themes/bitwarden/organizr.css
index f410c3e8..aa2b4461 100644
--- a/CSS/themes/bitwarden/organizr.css
+++ b/CSS/themes/bitwarden/organizr.css
@@ -1,2 +1,2 @@
-@import url("https://develop.theme-park.dev/css/base/bitwarden/bitwarden-base.css?sha=5ddb2023dc9a0e2b55e6acc71acd784decff65ea");
+@import url("https://develop.theme-park.dev/css/base/bitwarden/bitwarden-base.css?sha=987fa5ed04665d94f568245cbbad9d367480a60d");
 @import url("https://develop.theme-park.dev/css/theme-options/organizr.css?sha=aa8d9d5c1b897b8f6d27ff274b073595b3d45741");
\ No newline at end of file
diff --git a/CSS/themes/bitwarden/overseerr.css b/CSS/themes/bitwarden/overseerr.css
index 2dde0659..0a60c846 100644
--- a/CSS/themes/bitwarden/overseerr.css
+++ b/CSS/themes/bitwarden/overseerr.css
@@ -1,2 +1,2 @@
-@import url("https://develop.theme-park.dev/css/base/bitwarden/bitwarden-base.css?sha=5ddb2023dc9a0e2b55e6acc71acd784decff65ea");
+@import url("https://develop.theme-park.dev/css/base/bitwarden/bitwarden-base.css?sha=987fa5ed04665d94f568245cbbad9d367480a60d");
 @import url("https://develop.theme-park.dev/css/theme-options/overseerr.css?sha=7e3a8e3ca21dd82641113cf53f071a89252c7235");
\ No newline at end of file
diff --git a/CSS/themes/bitwarden/plex.css b/CSS/themes/bitwarden/plex.css
index 3adc93fd..9a77fbf3 100644
--- a/CSS/themes/bitwarden/plex.css
+++ b/CSS/themes/bitwarden/plex.css
@@ -1,2 +1,2 @@
-@import url("https://develop.theme-park.dev/css/base/bitwarden/bitwarden-base.css?sha=5ddb2023dc9a0e2b55e6acc71acd784decff65ea");
+@import url("https://develop.theme-park.dev/css/base/bitwarden/bitwarden-base.css?sha=987fa5ed04665d94f568245cbbad9d367480a60d");
 @import url("https://develop.theme-park.dev/css/theme-options/plex.css?sha=6059a0bddd6ce8c60be5cd95b302a00654e92dfa");
\ No newline at end of file
diff --git a/CSS/themes/bitwarden/power.css b/CSS/themes/bitwarden/power.css
index e61acef1..71ed3603 100644
--- a/CSS/themes/bitwarden/power.css
+++ b/CSS/themes/bitwarden/power.css
@@ -1,2 +1,2 @@
-@import url("https://develop.theme-park.dev/css/base/bitwarden/bitwarden-base.css?sha=5ddb2023dc9a0e2b55e6acc71acd784decff65ea");
+@import url("https://develop.theme-park.dev/css/base/bitwarden/bitwarden-base.css?sha=987fa5ed04665d94f568245cbbad9d367480a60d");
 @import url("https://develop.theme-park.dev/css/community-theme-options/power.css?sha=b5e32f47b689d875d059da53f047527531aa0b68");
\ No newline at end of file
diff --git a/CSS/themes/bitwarden/reality.css b/CSS/themes/bitwarden/reality.css
index 16f23466..d8e6fcb9 100644
--- a/CSS/themes/bitwarden/reality.css
+++ b/CSS/themes/bitwarden/reality.css
@@ -1,2 +1,2 @@
-@import url("https://develop.theme-park.dev/css/base/bitwarden/bitwarden-base.css?sha=5ddb2023dc9a0e2b55e6acc71acd784decff65ea");
+@import url("https://develop.theme-park.dev/css/base/bitwarden/bitwarden-base.css?sha=987fa5ed04665d94f568245cbbad9d367480a60d");
 @import url("https://develop.theme-park.dev/css/community-theme-options/reality.css?sha=8eadacd5602439f8430ccad8dba4e2465d87629f");
\ No newline at end of file
diff --git a/CSS/themes/bitwarden/soul.css b/CSS/themes/bitwarden/soul.css
index 5bbbbbf0..680f3222 100644
--- a/CSS/themes/bitwarden/soul.css
+++ b/CSS/themes/bitwarden/soul.css
@@ -1,2 +1,2 @@
-@import url("https://develop.theme-park.dev/css/base/bitwarden/bitwarden-base.css?sha=5ddb2023dc9a0e2b55e6acc71acd784decff65ea");
+@import url("https://develop.theme-park.dev/css/base/bitwarden/bitwarden-base.css?sha=987fa5ed04665d94f568245cbbad9d367480a60d");
 @import url("https://develop.theme-park.dev/css/community-theme-options/soul.css?sha=2ce22d7b1fd2867393fd066ea97ed3adbf15764f");
\ No newline at end of file
diff --git a/CSS/themes/bitwarden/space-gray.css b/CSS/themes/bitwarden/space-gray.css
index d78e2e54..8447f3a6 100644
--- a/CSS/themes/bitwarden/space-gray.css
+++ b/CSS/themes/bitwarden/space-gray.css
@@ -1,2 +1,2 @@
-@import url("https://develop.theme-park.dev/css/base/bitwarden/bitwarden-base.css?sha=5ddb2023dc9a0e2b55e6acc71acd784decff65ea");
+@import url("https://develop.theme-park.dev/css/base/bitwarden/bitwarden-base.css?sha=987fa5ed04665d94f568245cbbad9d367480a60d");
 @import url("https://develop.theme-park.dev/css/theme-options/space-gray.css?sha=566e5616a8e48be2d0670d3f4d1ce106d2616ea2");
\ No newline at end of file
diff --git a/CSS/themes/bitwarden/space.css b/CSS/themes/bitwarden/space.css
index 79e38168..9c58d0ee 100644
--- a/CSS/themes/bitwarden/space.css
+++ b/CSS/themes/bitwarden/space.css
@@ -1,2 +1,2 @@
-@import url("https://develop.theme-park.dev/css/base/bitwarden/bitwarden-base.css?sha=5ddb2023dc9a0e2b55e6acc71acd784decff65ea");
+@import url("https://develop.theme-park.dev/css/base/bitwarden/bitwarden-base.css?sha=987fa5ed04665d94f568245cbbad9d367480a60d");
 @import url("https://develop.theme-park.dev/css/community-theme-options/space.css?sha=59325481dd9ca66fba178e67cd83311abbc72b91");
\ No newline at end of file
diff --git a/CSS/themes/bitwarden/time.css b/CSS/themes/bitwarden/time.css
index a85c8fc1..d9bb8972 100644
--- a/CSS/themes/bitwarden/time.css
+++ b/CSS/themes/bitwarden/time.css
@@ -1,2 +1,2 @@
-@import url("https://develop.theme-park.dev/css/base/bitwarden/bitwarden-base.css?sha=5ddb2023dc9a0e2b55e6acc71acd784decff65ea");
+@import url("https://develop.theme-park.dev/css/base/bitwarden/bitwarden-base.css?sha=987fa5ed04665d94f568245cbbad9d367480a60d");
 @import url("https://develop.theme-park.dev/css/community-theme-options/time.css?sha=80ade11270c72eca1a32c2c47f8bbf2c75308681");
\ No newline at end of file
diff --git a/css/base/bitwarden/aquamarine.css b/css/base/bitwarden/aquamarine.css
index 555d2a58..c35a6d00 100644
--- a/css/base/bitwarden/aquamarine.css
+++ b/css/base/bitwarden/aquamarine.css
@@ -1,2 +1,2 @@
-@import url("https://develop.theme-park.dev/css/base/bitwarden/bitwarden-base.css?sha=5ddb2023dc9a0e2b55e6acc71acd784decff65ea");
+@import url("https://develop.theme-park.dev/css/base/bitwarden/bitwarden-base.css?sha=987fa5ed04665d94f568245cbbad9d367480a60d");
 @import url("https://develop.theme-park.dev/css/theme-options/aquamarine.css?sha=5cdf3f13a57669f3732b64a7573580bcaa9ac6fc");
\ No newline at end of file
diff --git a/css/base/bitwarden/bitwarden-base.css b/css/base/bitwarden/bitwarden-base.css
index 5ddb2023..987fa5ed 100644
--- a/css/base/bitwarden/bitwarden-base.css
+++ b/css/base/bitwarden/bitwarden-base.css
@@ -19,8 +19,8 @@ img.logo {
 }
 
 body.layout_frontend,
-body,
-html.theme_light body.layout_frontend,
+html[class*="theme_"] body,
+html[class*="theme_"] body.layout_frontend,
 html {
     background: var(--main-bg-color);
     background-repeat: repeat, no-repeat;
@@ -41,18 +41,22 @@ app-org-vault-groupings .card .card-body a,
     color: var(--link-color);
 }
 
-a:hover:not(.btn-secondary),
+a:hover:not(.btn-secondary):not(.btn-outline-primary),
 app-vault-groupings .card li.active>a:first-of-type,
 app-vault-groupings .card li.active>div a:first-of-type,
 app-org-vault-groupings .card li.active>a:first-of-type,
 app-org-vault-groupings .card li.active>div a:first-of-type,
 .groupings .card li.active>a:first-of-type,
 .groupings .card li.active>div a:first-of-type,
-html.theme_light a {
+html[class*="theme_"] a {
     color: var(--link-color-hover) !important;
 }
+html[class*="theme_"] #totpImage {
+    background: lightgray;
+}
 
 /* TEXT */
+html[class*="theme_"] .text-muted,
 .text-muted,
 .form-check-block .form-check-label>small,
 .modal-header small,
@@ -81,7 +85,7 @@ h6,
 label:not(#g_advanced > div:nth-child(13) > label):not(#g_advanced > div:nth-child(12) > div.col-sm-8 > div > label),
 label:not(.form-check-label):not(.btn):not(#g_advanced > div:nth-child(13) > label),
 label.bold .card-header:first-child,
-.card-header,
+html[class*="theme_"] .card-header,
 .modal-header {
     color: var(--text-hover) !important;
 }
@@ -99,13 +103,19 @@ label.bold .card-header:first-child,
 }
 
 /* CARDS */
+
+html[class*="theme_"] .card-header {
+    background-color: rgb(0 0 0 / 45%);
+    color: #fff;
+}
+
 .card {
     background-color: rgba(255, 255, 255, 0.07) !important;
     border-color: rgba(255, 255, 255, 0.1) !important;
     color: var(--text) !important;
 }
 
-html.theme_light .card-body:not(.bg-light>.card-body) {
+html[class*="theme_"] .card-body:not(.bg-light>.card-body) {
     background-color: transparent;
     color: var(--text);
 }
@@ -116,17 +126,31 @@ app-vault-groupings .card li.active>div>.fa {
     color: rgb(var(--accent-color));
 }
 
-body>app-root>app-user-layout>app-tools>div>div>div.col-9>app-password-generator>div.card.card-password.bg-light.my-4 {
+body>app-root>app-user-layout>app-tools>div>div>div.col-9>app-password-generator>div.card.card-password.bg-light.my-4,
+body > app-root > app-user-layout > app-tools > div > div > div.col-9 > app-password-generator > div.card.card-password.bg-light.my-4 > div {
     background-color: rgb(0 0 0 / 15%) !important;
 }
 
-.password-number {
+html[class*="theme_"] .password-number {
     color: rgb(var(--accent-color));
 }
+html[class*="theme_"] .password-letter {
+    color: white;
+}
 
 /* MODALS */
-.modal-content,
-.modal-footer {
+html[class*="theme_"] .modal-header {
+    border-bottom: 1px solid rgba(255, 255, 255, 0.1);
+    background: var(--modal-header-color);
+    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;
+}
+html[class*="theme_"] .modal-body {
     background: var(--modal-bg-color);
     background-repeat: repeat, no-repeat;
     background-attachment: fixed, fixed;
@@ -136,6 +160,17 @@ body>app-root>app-user-layout>app-tools>div>div>div.col-9>app-password-generator
     -moz-background-size: auto, cover;
     -o-background-size: auto, cover;
 }
+html[class*="theme_"] .modal-footer {
+    border-top: 1px solid rgba(255, 255, 255, 0.1);
+    background: var(--modal-footer-color);
+    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;
+}
 
 .close,
 .close:hover {
@@ -193,26 +228,35 @@ body>app-root>app-user-layout>app-tools>div>div>div.col-9>app-password-generator
 }
 
 /* FORMS */
-.form-control:focus {
+html[class*="theme_"] label.form-check-label, html[class*="theme_"] .form-control-file {
+    color: var(--text);
+}
+
+html[class*="theme_"] .form-control:focus {
     box-shadow: none;
     border-color: transparent;
+    background: rgb(253 253 253 / 15%);
 }
 
-.form-control {
+html[class*="theme_"] .form-control {
     color: var(--text);
     background-color: rgb(0 0 0 / 0.25);
     border: 1px solid transparent;
 
 }
 
-.form-control:disabled,
+html[class*="theme_"] .form-control:disabled,
 .form-control[readonly] {
     background-color: rgb(255 255 255 / 25%);
     opacity: 1;
 }
 
+select:focus {
+    background: #1f1f1f !important;
+}
+
 /* DROPDOWN MENU */
-.dropdown-menu {
+/* html[class*="theme_"] .dropdown-menu {
     background: var(--modal-bg-color);
     background-repeat: repeat, no-repeat;
     background-attachment: fixed, fixed;
@@ -223,15 +267,20 @@ body>app-root>app-user-layout>app-tools>div>div>div.col-9>app-password-generator
     -o-background-size: auto, cover;
     border: 1px solid transparent;
     box-shadow: 3px 3px 10px rgba(0, 0, 0, .2);
+} */
+
+html[class*="theme_"] .dropdown-menu, html[class*="theme_"] .dropdown-item {
+    background: #1f1f1f;
+    color: #fff;
 }
 
-.dropdown-item,
-.dropdown-item-text {
+html[class*="theme_"] .dropdown-item,
+html[class*="theme_"] .dropdown-item-text {
     color: var(--text);
 }
 
-.dropdown-item:hover,
-.dropdown-item:focus {
+html[class*="theme_"] .dropdown-item:hover,
+html[class*="theme_"] .dropdown-item:focus {
     color: var(--text-hover);
     text-decoration: none;
     background-color: rgb(255 255 255 / 0.08);
@@ -249,19 +298,32 @@ a.text-danger:focus {
 }
 
 /* SETTINGS */
-.list-group-item.active {
+
+html[class*="theme_"] .page-header, html[class*="theme_"] .secondary-header {
+    border-bottom: 1px solid rgb(255 255 255 / 30%);
+}
+
+html[class*="theme_"] .list-group-item.active {
     color: var(--text);
     background-color: rgb(255 255 255 / 10%);
     border-left: 3px solid rgb(var(--accent-color));
+    border-color: rgba(255, 255, 255, 0.1);
 }
 
-.callout {
+html[class*="theme_"] .callout {
     background-color: rgb(255 255 255 / 15%);
+    border: 1px solid rgba(255, 255, 255, 0.1);
+    color: var(--text);
 }
 
-.list-group-item {
+html[class*="theme_"] .list-group-item {
     background-color: rgb(0 0 0 / 25%);
     border: 1px solid rgb(255 255 255 / 8%);
+    color: var(--text);
+}
+
+html[class*="theme_"] .progress {
+    background-color: rgba(0, 0, 0, 0.25);
 }
 
 /* BUTTONS */
@@ -306,8 +368,8 @@ a.text-danger:focus {
 .btn[class*="btn-outline-"]:not(:hover),
 .swal2-popup .swal2-actions button[class*="btn-outline-"]:not(:hover),
 .swal2-popup .swal2-actions button.swal2-cancel,
-html.theme_light .btn-primary,
-html.theme_light .swal2-confirm {
+html[class*="theme_"] .btn-primary,
+html[class*="theme_"] .swal2-confirm {
     border-color: var(--button-color) !important;
     background-color: var(--button-color) !important;
     color: var(--button-text) !important;
@@ -315,8 +377,8 @@ html.theme_light .swal2-confirm {
 
 .btn-outline-secondary:hover,
 .swal2-popup .swal2-actions button.swal2-cancel:hover,
-html.theme_light .btn-primary,
-html.theme_light .swal2-confirm {
+html[class*="theme_"] .btn-primary,
+html[class*="theme_"] .swal2-confirm {
     color: var(--button-text-hover) !important;
     background-color: var(--button-color-hover) !important;
     border-color: var(--button-color-hover) !important;
@@ -361,8 +423,8 @@ html.theme_light .swal2-confirm {
 .swal2-popup .swal2-actions button.swal2-cancel:not(:disabled):not(.disabled).active,
 .show>.btn-outline-secondary.dropdown-toggle,
 .swal2-popup .swal2-actions .show>button.dropdown-toggle.swal2-cancel,
-html.theme_light .btn-outline-secondary:hover:not(:disabled),
-html.theme_light .btn-outline-secondary:active {
+html[class*="theme_"] .btn-outline-secondary:hover:not(:disabled),
+html[class*="theme_"] .btn-outline-secondary:active {
     color: var(--button-text-hover) !important;
     background-color: var(--button-color-hover) !important;
     border-color: var(--button-color-hover) !important;
@@ -524,4 +586,7 @@ input:focus:-ms-input-placeholder {
 .table-striped>tbody>tr:nth-of-type(odd)>* {
     --bs-table-accent-bg: var(--bs-table-striped-bg);
     color: var(--text-hover);
+}
+html[class*="theme_"] .table td {
+    color: var(--text);
 }
\ No newline at end of file
diff --git a/css/base/bitwarden/blackberry-abyss.css b/css/base/bitwarden/blackberry-abyss.css
index acb2bd15..674c4ff2 100644
--- a/css/base/bitwarden/blackberry-abyss.css
+++ b/css/base/bitwarden/blackberry-abyss.css
@@ -1,2 +1,2 @@
-@import url("https://develop.theme-park.dev/css/base/bitwarden/bitwarden-base.css?sha=5ddb2023dc9a0e2b55e6acc71acd784decff65ea");
+@import url("https://develop.theme-park.dev/css/base/bitwarden/bitwarden-base.css?sha=987fa5ed04665d94f568245cbbad9d367480a60d");
 @import url("https://develop.theme-park.dev/css/community-theme-options/blackberry-abyss.css?sha=5e806cb7efad3e1ac97e985f71d7a631a1b7f02b");
\ No newline at end of file
diff --git a/css/base/bitwarden/blackberry-amethyst.css b/css/base/bitwarden/blackberry-amethyst.css
index 5de76388..6e63aa6d 100644
--- a/css/base/bitwarden/blackberry-amethyst.css
+++ b/css/base/bitwarden/blackberry-amethyst.css
@@ -1,2 +1,2 @@
-@import url("https://develop.theme-park.dev/css/base/bitwarden/bitwarden-base.css?sha=5ddb2023dc9a0e2b55e6acc71acd784decff65ea");
+@import url("https://develop.theme-park.dev/css/base/bitwarden/bitwarden-base.css?sha=987fa5ed04665d94f568245cbbad9d367480a60d");
 @import url("https://develop.theme-park.dev/css/community-theme-options/blackberry-amethyst.css?sha=bfb208569a57c23e562781bcbcc25c05779421de");
\ No newline at end of file
diff --git a/css/base/bitwarden/blackberry-carol.css b/css/base/bitwarden/blackberry-carol.css
index 3a56d65e..52e23c71 100644
--- a/css/base/bitwarden/blackberry-carol.css
+++ b/css/base/bitwarden/blackberry-carol.css
@@ -1,2 +1,2 @@
-@import url("https://develop.theme-park.dev/css/base/bitwarden/bitwarden-base.css?sha=5ddb2023dc9a0e2b55e6acc71acd784decff65ea");
+@import url("https://develop.theme-park.dev/css/base/bitwarden/bitwarden-base.css?sha=987fa5ed04665d94f568245cbbad9d367480a60d");
 @import url("https://develop.theme-park.dev/css/community-theme-options/blackberry-carol.css?sha=39e2106043161e407b4e509e8d8323121fef6950");
\ No newline at end of file
diff --git a/css/base/bitwarden/blackberry-dreamscape.css b/css/base/bitwarden/blackberry-dreamscape.css
index 17fc164a..a61414c1 100644
--- a/css/base/bitwarden/blackberry-dreamscape.css
+++ b/css/base/bitwarden/blackberry-dreamscape.css
@@ -1,2 +1,2 @@
-@import url("https://develop.theme-park.dev/css/base/bitwarden/bitwarden-base.css?sha=5ddb2023dc9a0e2b55e6acc71acd784decff65ea");
+@import url("https://develop.theme-park.dev/css/base/bitwarden/bitwarden-base.css?sha=987fa5ed04665d94f568245cbbad9d367480a60d");
 @import url("https://develop.theme-park.dev/css/community-theme-options/blackberry-dreamscape.css?sha=0ad15b8d2215b7528e27f3bd65f1cb0c42453be0");
\ No newline at end of file
diff --git a/css/base/bitwarden/blackberry-flamingo.css b/css/base/bitwarden/blackberry-flamingo.css
index 7ed0aac0..a5d67648 100644
--- a/css/base/bitwarden/blackberry-flamingo.css
+++ b/css/base/bitwarden/blackberry-flamingo.css
@@ -1,2 +1,2 @@
-@import url("https://develop.theme-park.dev/css/base/bitwarden/bitwarden-base.css?sha=5ddb2023dc9a0e2b55e6acc71acd784decff65ea");
+@import url("https://develop.theme-park.dev/css/base/bitwarden/bitwarden-base.css?sha=987fa5ed04665d94f568245cbbad9d367480a60d");
 @import url("https://develop.theme-park.dev/css/community-theme-options/blackberry-flamingo.css?sha=4ddeb117541753969da70820d8205aef771e37b4");
\ No newline at end of file
diff --git a/css/base/bitwarden/blackberry-hearth.css b/css/base/bitwarden/blackberry-hearth.css
index 22908fc5..476c8495 100644
--- a/css/base/bitwarden/blackberry-hearth.css
+++ b/css/base/bitwarden/blackberry-hearth.css
@@ -1,2 +1,2 @@
-@import url("https://develop.theme-park.dev/css/base/bitwarden/bitwarden-base.css?sha=5ddb2023dc9a0e2b55e6acc71acd784decff65ea");
+@import url("https://develop.theme-park.dev/css/base/bitwarden/bitwarden-base.css?sha=987fa5ed04665d94f568245cbbad9d367480a60d");
 @import url("https://develop.theme-park.dev/css/community-theme-options/blackberry-hearth.css?sha=979626f867e9a9a91664f2b6da66d478040dc8fb");
\ No newline at end of file
diff --git a/css/base/bitwarden/blackberry-martian.css b/css/base/bitwarden/blackberry-martian.css
index 5f302671..98d540d8 100644
--- a/css/base/bitwarden/blackberry-martian.css
+++ b/css/base/bitwarden/blackberry-martian.css
@@ -1,2 +1,2 @@
-@import url("https://develop.theme-park.dev/css/base/bitwarden/bitwarden-base.css?sha=5ddb2023dc9a0e2b55e6acc71acd784decff65ea");
+@import url("https://develop.theme-park.dev/css/base/bitwarden/bitwarden-base.css?sha=987fa5ed04665d94f568245cbbad9d367480a60d");
 @import url("https://develop.theme-park.dev/css/community-theme-options/blackberry-martian.css?sha=f6fcaa104ff119d049fb72cebe2e6e620db1aa04");
\ No newline at end of file
diff --git a/css/base/bitwarden/blackberry-pumpkin.css b/css/base/bitwarden/blackberry-pumpkin.css
index ccb66965..4bf6a9b6 100644
--- a/css/base/bitwarden/blackberry-pumpkin.css
+++ b/css/base/bitwarden/blackberry-pumpkin.css
@@ -1,2 +1,2 @@
-@import url("https://develop.theme-park.dev/css/base/bitwarden/bitwarden-base.css?sha=5ddb2023dc9a0e2b55e6acc71acd784decff65ea");
+@import url("https://develop.theme-park.dev/css/base/bitwarden/bitwarden-base.css?sha=987fa5ed04665d94f568245cbbad9d367480a60d");
 @import url("https://develop.theme-park.dev/css/community-theme-options/blackberry-pumpkin.css?sha=0ba03cc3999c36f3ef7c0eae7f381cdcbdfd7f33");
\ No newline at end of file
diff --git a/css/base/bitwarden/blackberry-royal.css b/css/base/bitwarden/blackberry-royal.css
index c743da69..a165a0da 100644
--- a/css/base/bitwarden/blackberry-royal.css
+++ b/css/base/bitwarden/blackberry-royal.css
@@ -1,2 +1,2 @@
-@import url("https://develop.theme-park.dev/css/base/bitwarden/bitwarden-base.css?sha=5ddb2023dc9a0e2b55e6acc71acd784decff65ea");
+@import url("https://develop.theme-park.dev/css/base/bitwarden/bitwarden-base.css?sha=987fa5ed04665d94f568245cbbad9d367480a60d");
 @import url("https://develop.theme-park.dev/css/community-theme-options/blackberry-royal.css?sha=4bb56762e9469e831edf005100b9bd04849ad55c");
\ No newline at end of file
diff --git a/css/base/bitwarden/blackberry-shadow.css b/css/base/bitwarden/blackberry-shadow.css
index 671f2aa7..9dae3456 100644
--- a/css/base/bitwarden/blackberry-shadow.css
+++ b/css/base/bitwarden/blackberry-shadow.css
@@ -1,2 +1,2 @@
-@import url("https://develop.theme-park.dev/css/base/bitwarden/bitwarden-base.css?sha=5ddb2023dc9a0e2b55e6acc71acd784decff65ea");
+@import url("https://develop.theme-park.dev/css/base/bitwarden/bitwarden-base.css?sha=987fa5ed04665d94f568245cbbad9d367480a60d");
 @import url("https://develop.theme-park.dev/css/community-theme-options/blackberry-shadow.css?sha=f8e59fbf4720063a949e1be5cb16ebef094dc724");
\ No newline at end of file
diff --git a/css/base/bitwarden/blackberry-solar.css b/css/base/bitwarden/blackberry-solar.css
index 795d5115..a08e6d73 100644
--- a/css/base/bitwarden/blackberry-solar.css
+++ b/css/base/bitwarden/blackberry-solar.css
@@ -1,2 +1,2 @@
-@import url("https://develop.theme-park.dev/css/base/bitwarden/bitwarden-base.css?sha=5ddb2023dc9a0e2b55e6acc71acd784decff65ea");
+@import url("https://develop.theme-park.dev/css/base/bitwarden/bitwarden-base.css?sha=987fa5ed04665d94f568245cbbad9d367480a60d");
 @import url("https://develop.theme-park.dev/css/community-theme-options/blackberry-solar.css?sha=429071cc7b6204555899a4942d47446f54cc19c5");
\ No newline at end of file
diff --git a/css/base/bitwarden/blackberry-vanta.css b/css/base/bitwarden/blackberry-vanta.css
index edec717b..eab05444 100644
--- a/css/base/bitwarden/blackberry-vanta.css
+++ b/css/base/bitwarden/blackberry-vanta.css
@@ -1,2 +1,2 @@
-@import url("https://develop.theme-park.dev/css/base/bitwarden/bitwarden-base.css?sha=5ddb2023dc9a0e2b55e6acc71acd784decff65ea");
+@import url("https://develop.theme-park.dev/css/base/bitwarden/bitwarden-base.css?sha=987fa5ed04665d94f568245cbbad9d367480a60d");
 @import url("https://develop.theme-park.dev/css/community-theme-options/blackberry-vanta.css?sha=45a001fcfcf1fae8d40216146f38595fcfc76738");
\ No newline at end of file
diff --git a/css/base/bitwarden/dark.css b/css/base/bitwarden/dark.css
index 7813b96f..7298a91d 100644
--- a/css/base/bitwarden/dark.css
+++ b/css/base/bitwarden/dark.css
@@ -1,2 +1,2 @@
-@import url("https://develop.theme-park.dev/css/base/bitwarden/bitwarden-base.css?sha=5ddb2023dc9a0e2b55e6acc71acd784decff65ea");
+@import url("https://develop.theme-park.dev/css/base/bitwarden/bitwarden-base.css?sha=987fa5ed04665d94f568245cbbad9d367480a60d");
 @import url("https://develop.theme-park.dev/css/theme-options/dark.css?sha=dc21605e303d094fed0564a15fb983d81bcd33dd");
\ No newline at end of file
diff --git a/css/base/bitwarden/dracula.css b/css/base/bitwarden/dracula.css
index 1f57a0c7..df893387 100644
--- a/css/base/bitwarden/dracula.css
+++ b/css/base/bitwarden/dracula.css
@@ -1,2 +1,2 @@
-@import url("https://develop.theme-park.dev/css/base/bitwarden/bitwarden-base.css?sha=5ddb2023dc9a0e2b55e6acc71acd784decff65ea");
+@import url("https://develop.theme-park.dev/css/base/bitwarden/bitwarden-base.css?sha=987fa5ed04665d94f568245cbbad9d367480a60d");
 @import url("https://develop.theme-park.dev/css/theme-options/dracula.css?sha=5abf85508d87243007cf5f4fda34a60340583466");
\ No newline at end of file
diff --git a/css/base/bitwarden/hotline-old.css b/css/base/bitwarden/hotline-old.css
index 567b1e5d..b15e8e71 100644
--- a/css/base/bitwarden/hotline-old.css
+++ b/css/base/bitwarden/hotline-old.css
@@ -1,2 +1,2 @@
-@import url("https://develop.theme-park.dev/css/base/bitwarden/bitwarden-base.css?sha=5ddb2023dc9a0e2b55e6acc71acd784decff65ea");
+@import url("https://develop.theme-park.dev/css/base/bitwarden/bitwarden-base.css?sha=987fa5ed04665d94f568245cbbad9d367480a60d");
 @import url("https://develop.theme-park.dev/css/community-theme-options/hotline-old.css?sha=73fce8f3f316c64b864e8b0502de0005f3883df4");
\ No newline at end of file
diff --git a/css/base/bitwarden/hotline.css b/css/base/bitwarden/hotline.css
index 5c54dfa5..2212e5ef 100644
--- a/css/base/bitwarden/hotline.css
+++ b/css/base/bitwarden/hotline.css
@@ -1,2 +1,2 @@
-@import url("https://develop.theme-park.dev/css/base/bitwarden/bitwarden-base.css?sha=5ddb2023dc9a0e2b55e6acc71acd784decff65ea");
+@import url("https://develop.theme-park.dev/css/base/bitwarden/bitwarden-base.css?sha=987fa5ed04665d94f568245cbbad9d367480a60d");
 @import url("https://develop.theme-park.dev/css/theme-options/hotline.css?sha=e027feaeea0f623144af4c45b61e332a0757f5fb");
\ No newline at end of file
diff --git a/css/base/bitwarden/hotpink.css b/css/base/bitwarden/hotpink.css
index fd2092e9..3c8dc801 100644
--- a/css/base/bitwarden/hotpink.css
+++ b/css/base/bitwarden/hotpink.css
@@ -1,2 +1,2 @@
-@import url("https://develop.theme-park.dev/css/base/bitwarden/bitwarden-base.css?sha=5ddb2023dc9a0e2b55e6acc71acd784decff65ea");
+@import url("https://develop.theme-park.dev/css/base/bitwarden/bitwarden-base.css?sha=987fa5ed04665d94f568245cbbad9d367480a60d");
 @import url("https://develop.theme-park.dev/css/theme-options/hotpink.css?sha=2f3974c084d053521362bae34d415f3614dba2e2");
\ No newline at end of file
diff --git a/css/base/bitwarden/mind.css b/css/base/bitwarden/mind.css
index d34d6c07..d47aa787 100644
--- a/css/base/bitwarden/mind.css
+++ b/css/base/bitwarden/mind.css
@@ -1,2 +1,2 @@
-@import url("https://develop.theme-park.dev/css/base/bitwarden/bitwarden-base.css?sha=5ddb2023dc9a0e2b55e6acc71acd784decff65ea");
+@import url("https://develop.theme-park.dev/css/base/bitwarden/bitwarden-base.css?sha=987fa5ed04665d94f568245cbbad9d367480a60d");
 @import url("https://develop.theme-park.dev/css/community-theme-options/mind.css?sha=fb9b9d13dcaae0d46499acbbae405bbc23ae37cb");
\ No newline at end of file
diff --git a/css/base/bitwarden/nord.css b/css/base/bitwarden/nord.css
index fe5ae900..ee56bd1e 100644
--- a/css/base/bitwarden/nord.css
+++ b/css/base/bitwarden/nord.css
@@ -1,2 +1,2 @@
-@import url("https://develop.theme-park.dev/css/base/bitwarden/bitwarden-base.css?sha=5ddb2023dc9a0e2b55e6acc71acd784decff65ea");
+@import url("https://develop.theme-park.dev/css/base/bitwarden/bitwarden-base.css?sha=987fa5ed04665d94f568245cbbad9d367480a60d");
 @import url("https://develop.theme-park.dev/css/theme-options/nord.css?sha=353cb0383f78b2afa4de7784d536d637f3c3666d");
\ No newline at end of file
diff --git a/css/base/bitwarden/onedark.css b/css/base/bitwarden/onedark.css
index 52cea4d5..ad5245be 100644
--- a/css/base/bitwarden/onedark.css
+++ b/css/base/bitwarden/onedark.css
@@ -1,2 +1,2 @@
-@import url("https://develop.theme-park.dev/css/base/bitwarden/bitwarden-base.css?sha=5ddb2023dc9a0e2b55e6acc71acd784decff65ea");
+@import url("https://develop.theme-park.dev/css/base/bitwarden/bitwarden-base.css?sha=987fa5ed04665d94f568245cbbad9d367480a60d");
 @import url("https://develop.theme-park.dev/css/community-theme-options/onedark.css?sha=cbccbf4366ab59bd2b9253c221b1f093c2e85118");
\ No newline at end of file
diff --git a/css/base/bitwarden/organizr.css b/css/base/bitwarden/organizr.css
index f410c3e8..aa2b4461 100644
--- a/css/base/bitwarden/organizr.css
+++ b/css/base/bitwarden/organizr.css
@@ -1,2 +1,2 @@
-@import url("https://develop.theme-park.dev/css/base/bitwarden/bitwarden-base.css?sha=5ddb2023dc9a0e2b55e6acc71acd784decff65ea");
+@import url("https://develop.theme-park.dev/css/base/bitwarden/bitwarden-base.css?sha=987fa5ed04665d94f568245cbbad9d367480a60d");
 @import url("https://develop.theme-park.dev/css/theme-options/organizr.css?sha=aa8d9d5c1b897b8f6d27ff274b073595b3d45741");
\ No newline at end of file
diff --git a/css/base/bitwarden/overseerr.css b/css/base/bitwarden/overseerr.css
index 2dde0659..0a60c846 100644
--- a/css/base/bitwarden/overseerr.css
+++ b/css/base/bitwarden/overseerr.css
@@ -1,2 +1,2 @@
-@import url("https://develop.theme-park.dev/css/base/bitwarden/bitwarden-base.css?sha=5ddb2023dc9a0e2b55e6acc71acd784decff65ea");
+@import url("https://develop.theme-park.dev/css/base/bitwarden/bitwarden-base.css?sha=987fa5ed04665d94f568245cbbad9d367480a60d");
 @import url("https://develop.theme-park.dev/css/theme-options/overseerr.css?sha=7e3a8e3ca21dd82641113cf53f071a89252c7235");
\ No newline at end of file
diff --git a/css/base/bitwarden/plex.css b/css/base/bitwarden/plex.css
index 3adc93fd..9a77fbf3 100644
--- a/css/base/bitwarden/plex.css
+++ b/css/base/bitwarden/plex.css
@@ -1,2 +1,2 @@
-@import url("https://develop.theme-park.dev/css/base/bitwarden/bitwarden-base.css?sha=5ddb2023dc9a0e2b55e6acc71acd784decff65ea");
+@import url("https://develop.theme-park.dev/css/base/bitwarden/bitwarden-base.css?sha=987fa5ed04665d94f568245cbbad9d367480a60d");
 @import url("https://develop.theme-park.dev/css/theme-options/plex.css?sha=6059a0bddd6ce8c60be5cd95b302a00654e92dfa");
\ No newline at end of file
diff --git a/css/base/bitwarden/power.css b/css/base/bitwarden/power.css
index e61acef1..71ed3603 100644
--- a/css/base/bitwarden/power.css
+++ b/css/base/bitwarden/power.css
@@ -1,2 +1,2 @@
-@import url("https://develop.theme-park.dev/css/base/bitwarden/bitwarden-base.css?sha=5ddb2023dc9a0e2b55e6acc71acd784decff65ea");
+@import url("https://develop.theme-park.dev/css/base/bitwarden/bitwarden-base.css?sha=987fa5ed04665d94f568245cbbad9d367480a60d");
 @import url("https://develop.theme-park.dev/css/community-theme-options/power.css?sha=b5e32f47b689d875d059da53f047527531aa0b68");
\ No newline at end of file
diff --git a/css/base/bitwarden/reality.css b/css/base/bitwarden/reality.css
index 16f23466..d8e6fcb9 100644
--- a/css/base/bitwarden/reality.css
+++ b/css/base/bitwarden/reality.css
@@ -1,2 +1,2 @@
-@import url("https://develop.theme-park.dev/css/base/bitwarden/bitwarden-base.css?sha=5ddb2023dc9a0e2b55e6acc71acd784decff65ea");
+@import url("https://develop.theme-park.dev/css/base/bitwarden/bitwarden-base.css?sha=987fa5ed04665d94f568245cbbad9d367480a60d");
 @import url("https://develop.theme-park.dev/css/community-theme-options/reality.css?sha=8eadacd5602439f8430ccad8dba4e2465d87629f");
\ No newline at end of file
diff --git a/css/base/bitwarden/soul.css b/css/base/bitwarden/soul.css
index 5bbbbbf0..680f3222 100644
--- a/css/base/bitwarden/soul.css
+++ b/css/base/bitwarden/soul.css
@@ -1,2 +1,2 @@
-@import url("https://develop.theme-park.dev/css/base/bitwarden/bitwarden-base.css?sha=5ddb2023dc9a0e2b55e6acc71acd784decff65ea");
+@import url("https://develop.theme-park.dev/css/base/bitwarden/bitwarden-base.css?sha=987fa5ed04665d94f568245cbbad9d367480a60d");
 @import url("https://develop.theme-park.dev/css/community-theme-options/soul.css?sha=2ce22d7b1fd2867393fd066ea97ed3adbf15764f");
\ No newline at end of file
diff --git a/css/base/bitwarden/space-gray.css b/css/base/bitwarden/space-gray.css
index d78e2e54..8447f3a6 100644
--- a/css/base/bitwarden/space-gray.css
+++ b/css/base/bitwarden/space-gray.css
@@ -1,2 +1,2 @@
-@import url("https://develop.theme-park.dev/css/base/bitwarden/bitwarden-base.css?sha=5ddb2023dc9a0e2b55e6acc71acd784decff65ea");
+@import url("https://develop.theme-park.dev/css/base/bitwarden/bitwarden-base.css?sha=987fa5ed04665d94f568245cbbad9d367480a60d");
 @import url("https://develop.theme-park.dev/css/theme-options/space-gray.css?sha=566e5616a8e48be2d0670d3f4d1ce106d2616ea2");
\ No newline at end of file
diff --git a/css/base/bitwarden/space.css b/css/base/bitwarden/space.css
index 79e38168..9c58d0ee 100644
--- a/css/base/bitwarden/space.css
+++ b/css/base/bitwarden/space.css
@@ -1,2 +1,2 @@
-@import url("https://develop.theme-park.dev/css/base/bitwarden/bitwarden-base.css?sha=5ddb2023dc9a0e2b55e6acc71acd784decff65ea");
+@import url("https://develop.theme-park.dev/css/base/bitwarden/bitwarden-base.css?sha=987fa5ed04665d94f568245cbbad9d367480a60d");
 @import url("https://develop.theme-park.dev/css/community-theme-options/space.css?sha=59325481dd9ca66fba178e67cd83311abbc72b91");
\ No newline at end of file
diff --git a/css/base/bitwarden/time.css b/css/base/bitwarden/time.css
index a85c8fc1..d9bb8972 100644
--- a/css/base/bitwarden/time.css
+++ b/css/base/bitwarden/time.css
@@ -1,2 +1,2 @@
-@import url("https://develop.theme-park.dev/css/base/bitwarden/bitwarden-base.css?sha=5ddb2023dc9a0e2b55e6acc71acd784decff65ea");
+@import url("https://develop.theme-park.dev/css/base/bitwarden/bitwarden-base.css?sha=987fa5ed04665d94f568245cbbad9d367480a60d");
 @import url("https://develop.theme-park.dev/css/community-theme-options/time.css?sha=80ade11270c72eca1a32c2c47f8bbf2c75308681");
\ No newline at end of file
diff --git a/themes.json b/themes.json
index f11c5656..7dd290cd 100644
--- a/themes.json
+++ b/themes.json
@@ -182,7 +182,7 @@
     },
     "bitwarden": {
       "addons": {},
-      "base_css": "https://develop.theme-park.dev/css/base/bitwarden/bitwarden-base.css?sha=5ddb2023dc9a0e2b55e6acc71acd784decff65ea"
+      "base_css": "https://develop.theme-park.dev/css/base/bitwarden/bitwarden-base.css?sha=987fa5ed04665d94f568245cbbad9d367480a60d"
     },
     "calibreweb": {
       "addons": {},