diff --git a/assets/css/blue/overrides.css b/assets/css/blue/overrides.css
index 2d16265b..545b8e09 100644
--- a/assets/css/blue/overrides.css
+++ b/assets/css/blue/overrides.css
@@ -3,10 +3,11 @@
 */
 :root {
 	--cl-bg: #2b3e50;
+	--cl-border-btn-pwd: var(--cl-bg);
 }
 
 body {
-	background-color: #2b3e50;
+	background-color: var(--cl-bg);
 }
 
 .table {
@@ -15,7 +16,7 @@ body {
 	--bs-table-active-color: #fff;
 	--bs-table-hover-color: #fff;
 	--bs-table-bg: #3d4e5e;
-	--bs-table-accent-bg: #2b3e50;
+	--bs-table-accent-bg: var(--cl-bg);
 }
 
 .table-striped tbody > tr.activeRow {
@@ -109,7 +110,7 @@ div.alert-danger {
 }
 
 .bootstrap-dialog.type-primary .modal-header {
-	background-color: #2b3e50;
+	background-color: var(--cl-bg);
 }
 
 .selectize-dropdown,
@@ -178,3 +179,15 @@ div.alert-danger {
 #edit_qso:not(.btn) {
 	float: left;
 }
+
+.accordion {
+	--bs-accordion-bg: var(--cl-bg);
+	--bs-accordion-btn-bg: #4e5e6c;
+	--bs-accordion-active-bg: #4e5e6c;
+}
+.accordion-button.collapsed {
+	border-bottom: 1px solid var(--cl-bg);
+}
+.accordion-body {
+	border: 1px solid #4e5e6c;
+}
diff --git a/assets/css/blue_wide/overrides.css b/assets/css/blue_wide/overrides.css
index f356c767..75bd3269 100644
--- a/assets/css/blue_wide/overrides.css
+++ b/assets/css/blue_wide/overrides.css
@@ -1,9 +1,13 @@
 /*!
  * No overrides for the default theme as it aligns with general.css
 */
+:root {
+	--cl-bg: #2b3e50;
+	--cl-border-btn-pwd: var(--cl-bg);
+}
 
 body {
-	background-color: #2b3e50;
+	background-color: var(--cl-bg);
 }
 
 .table {
@@ -12,7 +16,7 @@ body {
 	--bs-table-active-color: #fff;
 	--bs-table-hover-color: #fff;
 	--bs-table-bg: #3d4e5e;
-	--bs-table-accent-bg: #2b3e50;
+	--bs-table-accent-bg: var(--cl-bg);
 }
 
 .table-striped tbody > tr.activeRow {
@@ -106,7 +110,7 @@ div.alert-danger {
 }
 
 .bootstrap-dialog.type-primary .modal-header {
-	background-color: #2b3e50;
+	background-color: var(--cl-bg);
 }
 
 .selectize-dropdown,
@@ -229,3 +233,15 @@ div.alert-danger {
 #qsomap {
 	height: 400px !important;
 }
+
+.accordion {
+	--bs-accordion-bg: var(--cl-bg);
+	--bs-accordion-btn-bg: #4e5e6c;
+	--bs-accordion-active-bg: #4e5e6c;
+}
+.accordion-button.collapsed {
+	border-bottom: 1px solid var(--cl-bg);
+}
+.accordion-body {
+	border: 1px solid #4e5e6c;
+}
\ No newline at end of file
diff --git a/assets/css/cosmo/overrides.css b/assets/css/cosmo/overrides.css
index 15c914e3..a30ec2ab 100644
--- a/assets/css/cosmo/overrides.css
+++ b/assets/css/cosmo/overrides.css
@@ -2,6 +2,10 @@
  * No overrides for the default theme as it aligns with general.css
 */
 
+:root{
+	--cl-border-btn-pwd:var(--bs-border-color);
+}
+
 .selectize-input {
 	border-radius: 0;
 }
@@ -29,4 +33,9 @@
 
 TD.qrz {
 	white-space: nowrap;
+}
+
+.accordion {
+	--bs-accordion-btn-bg: #f9f9f9;
+	--bs-accordion-active-bg: #f9f9f9;
 }
\ No newline at end of file
diff --git a/assets/css/cosmo_wide/overrides.css b/assets/css/cosmo_wide/overrides.css
index 5e0d8f97..b6742d6c 100644
--- a/assets/css/cosmo_wide/overrides.css
+++ b/assets/css/cosmo_wide/overrides.css
@@ -2,6 +2,10 @@
  * No overrides for the default theme as it aligns with general.css
 */
 
+:root{
+	--cl-border-btn-pwd:var(--bs-border-color);
+}
+
 .selectize-input {
 	border-radius: 0;
 }
@@ -92,4 +96,10 @@
 
 TD.qrz {
 	white-space: nowrap;
-}
\ No newline at end of file
+}
+
+.accordion {
+	--bs-accordion-btn-bg: #f9f9f9;
+	--bs-accordion-active-bg: #f9f9f9;
+}
+
diff --git a/assets/css/cyborg/overrides.css b/assets/css/cyborg/overrides.css
index 04347ff1..b8dac00b 100644
--- a/assets/css/cyborg/overrides.css
+++ b/assets/css/cyborg/overrides.css
@@ -1,6 +1,9 @@
 /*!
  * No overrides for the default theme as it aligns with general.css
 */
+:root{
+	--cl-border-btn-pwd:#333;
+}
 
 .awardsBgDanger a {
 	color: white;
@@ -168,3 +171,16 @@ path.grid-worked {
 	text-align: left !important;
 	white-space: nowrap;
 }
+
+.accordion {
+	--bs-accordion-active-color: #FFFFFF;
+	--bs-accordion-bg: var(--bs-body-bg);
+	--bs-accordion-btn-bg: #2c2c2c;
+	--bs-accordion-active-bg: #2c2c2c;
+	--bs-accordion-btn-focus-border-color: #FFFFFF;
+	--bs-accordion-btn-focus-box-shadow: initial;
+	--bs-accordion-border-color: #2c2c2c;
+}
+.accordion-button.collapsed {
+	border-bottom: 1px solid var(--bs-body-bg);
+}
\ No newline at end of file
diff --git a/assets/css/cyborg_wide/overrides.css b/assets/css/cyborg_wide/overrides.css
index c849ac0a..935194c5 100644
--- a/assets/css/cyborg_wide/overrides.css
+++ b/assets/css/cyborg_wide/overrides.css
@@ -1,6 +1,9 @@
 /*!
  * No overrides for the default theme as it aligns with general.css
 */
+:root{
+	--cl-border-btn-pwd:#333;
+}
 
 .awardsBgDanger a {
 	color: white;
@@ -222,3 +225,17 @@ path.grid-worked {
 #qsomap {
 	height: 400px !important;
 }
+
+
+.accordion {
+	--bs-accordion-active-color: #FFFFFF;
+	--bs-accordion-bg: var(--bs-body-bg);
+	--bs-accordion-btn-bg: #2c2c2c;
+	--bs-accordion-active-bg: #2c2c2c;
+	--bs-accordion-btn-focus-border-color: #FFFFFF;
+	--bs-accordion-btn-focus-box-shadow: initial;
+	--bs-accordion-border-color: #2c2c2c;
+}
+.accordion-button.collapsed {
+	border-bottom: 1px solid var(--bs-body-bg);
+}
\ No newline at end of file
diff --git a/assets/css/darkly/overrides.css b/assets/css/darkly/overrides.css
index 919eb531..a5cf98bf 100644
--- a/assets/css/darkly/overrides.css
+++ b/assets/css/darkly/overrides.css
@@ -1,6 +1,9 @@
 /*!
  * No overrides for the default theme as it aligns with general.css
 */
+:root {
+	--cl-border-btn-pwd: var(--bs-body-bg);
+}
 
 .table {
 	--bs-table-border-color: #444444;
@@ -187,3 +190,14 @@ div.alert-danger {
 	white-space: nowrap;
 }
 
+.accordion {
+	--bs-accordion-active-color: #FFFFFF;
+	--bs-accordion-btn-bg: #444444;
+	--bs-accordion-active-bg: #444444;
+	--bs-accordion-border-color: #444444;
+}
+.accordion-button.collapsed {
+	border-bottom:1px solid var(--bs-body-bg);
+}
+
+
diff --git a/assets/css/darkly_wide/overrides.css b/assets/css/darkly_wide/overrides.css
index 5027a0fb..fd50f4b1 100644
--- a/assets/css/darkly_wide/overrides.css
+++ b/assets/css/darkly_wide/overrides.css
@@ -1,6 +1,9 @@
 /*!
  * No overrides for the default theme as it aligns with general.css
 */
+:root {
+	--cl-border-btn-pwd: var(--bs-body-bg);
+}
 
 .table {
 	--bs-table-border-color: #444444;
@@ -242,3 +245,13 @@ div.alert-danger {
 #qsomap {
 	height: 400px !important;
 }
+
+.accordion {
+	--bs-accordion-active-color: #FFFFFF;
+	--bs-accordion-btn-bg: #444444;
+	--bs-accordion-active-bg: #444444;
+	--bs-accordion-border-color: #444444;
+}
+.accordion-button.collapsed {
+	border-bottom:1px solid var(--bs-body-bg);
+}
\ No newline at end of file
diff --git a/assets/css/default/overrides.css b/assets/css/default/overrides.css
index c8b304fc..97cdbb74 100644
--- a/assets/css/default/overrides.css
+++ b/assets/css/default/overrides.css
@@ -1,3 +1,7 @@
+:root {
+	--cl-border-btn-pwd:var(--bs-border-color);
+}
+
 thead > tr > td {
 	background-color: aliceblue !important;
 }
@@ -48,3 +52,8 @@ thead > tr > td {
 	text-align: left !important;
 	white-space: nowrap;
 }
+
+.accordion {
+	--bs-accordion-btn-bg: #f9f9f9;
+	--bs-accordion-active-bg: #f9f9f9;
+}
\ No newline at end of file
diff --git a/assets/css/default_wide/overrides.css b/assets/css/default_wide/overrides.css
index 4178bdbb..9e5ba3dc 100644
--- a/assets/css/default_wide/overrides.css
+++ b/assets/css/default_wide/overrides.css
@@ -1,3 +1,7 @@
+:root {
+	--cl-border-btn-pwd:var(--bs-border-color);
+}
+
 thead > tr > td {
 	background-color: aliceblue !important;
 }
@@ -88,3 +92,8 @@ thead > tr > td {
 #qsomap {
 	height: 400px !important;
 }
+
+.accordion {
+	--bs-accordion-btn-bg: #f9f9f9;
+	--bs-accordion-active-bg: #f9f9f9;
+}
\ No newline at end of file
diff --git a/assets/css/superhero/overrides.css b/assets/css/superhero/overrides.css
index b8f883a8..3f2770a6 100644
--- a/assets/css/superhero/overrides.css
+++ b/assets/css/superhero/overrides.css
@@ -1,9 +1,13 @@
 /*!
  * No overrides for the default theme as it aligns with general.css
 */
+:root {
+	--cl-bg: #2b3e50;
+	--cl-border-btn-pwd: var(--cl-bg);
+}
 
 body {
-	background-color: #2b3e50;
+	background-color: var(--cl-bg);
 }
 
 .table {
@@ -12,7 +16,7 @@ body {
 	--bs-table-active-color: #fff;
 	--bs-table-hover-color: #fff;
 	--bs-table-bg: #3d4e5e;
-	--bs-table-accent-bg: #2b3e50;
+	--bs-table-accent-bg: var(--cl-bg);
 }
 
 .table-striped tbody > tr.activeRow {
@@ -106,7 +110,7 @@ div.alert-danger {
 }
 
 .bootstrap-dialog.type-primary .modal-header {
-	background-color: #2b3e50;
+	background-color: var(--cl-bg);
 }
 
 .selectize-dropdown,
@@ -175,3 +179,15 @@ div.alert-danger {
 #edit_qso:not(.btn) {
 	float: left;
 }
+
+.accordion {
+	--bs-accordion-bg: var(--cl-bg);
+	--bs-accordion-btn-bg: #4e5e6c;
+	--bs-accordion-active-bg: #4e5e6c;
+}
+.accordion-button.collapsed {
+	border-bottom: 1px solid var(--cl-bg);
+}
+.accordion-body {
+	border: 1px solid #4e5e6c;
+}
\ No newline at end of file
diff --git a/assets/css/superhero_wide/overrides.css b/assets/css/superhero_wide/overrides.css
index 1d8fb064..b3302bb4 100644
--- a/assets/css/superhero_wide/overrides.css
+++ b/assets/css/superhero_wide/overrides.css
@@ -1,9 +1,13 @@
 /*!
  * No overrides for the default theme as it aligns with general.css
 */
+:root {
+	--cl-bg: #2b3e50;
+	--cl-border-btn-pwd: var(--cl-bg);
+}
 
 body {
-	background-color: #2b3e50;
+	background-color: var(--cl-bg);
 }
 
 .table {
@@ -12,7 +16,7 @@ body {
 	--bs-table-active-color: #fff;
 	--bs-table-hover-color: #fff;
 	--bs-table-bg: #3d4e5e;
-	--bs-table-accent-bg: #2b3e50;
+	--bs-table-accent-bg: var(--cl-bg);
 }
 
 .table-striped tbody > tr.activeRow {
@@ -148,7 +152,7 @@ div.alert-danger {
 }
 
 .bootstrap-dialog.type-primary .modal-header {
-	background-color: #2b3e50;
+	background-color: var(--cl-bg);
 }
 
 .selectize-dropdown,
@@ -229,3 +233,15 @@ div.alert-danger {
 		max-width: 1800px
 	}
 }
+
+.accordion {
+	--bs-accordion-bg: var(--cl-bg);
+	--bs-accordion-btn-bg: #4e5e6c;
+	--bs-accordion-active-bg: #4e5e6c;
+}
+.accordion-button.collapsed {
+	border-bottom: 1px solid var(--cl-bg);
+}
+.accordion-body {
+	border: 1px solid #4e5e6c;
+}
\ No newline at end of file