4 files changed, 12 insertions, 101 deletions
diff --git a/view/theme/redbasic/schema/Focus-Boxy.css b/view/theme/redbasic/schema/Focus-Boxy.css
index 1b09137a9..e9fa0381d 100644
--- a/view/theme/redbasic/schema/Focus-Boxy.css
+++ b/view/theme/redbasic/schema/Focus-Boxy.css
@@ -2,8 +2,8 @@
 	padding-left: 3rem;
 }
 
-.wall-item-content-wrapper {
-	border-bottom: 1px solid rgba(0,0,0,.125);
+.wall-item-content-wrapper.comment {
+	border-bottom: 1px solid var(--bs-border-color);
 }
 
 .hide-comments-outer,
@@ -12,7 +12,7 @@
 }
 
 .widget {
-	border: 1px solid rgba(0,0,0,.125);
+	border: 1px solid var(--bs-border-color);
 }
 
 #note-text {
@@ -20,7 +20,7 @@
 }
 
 .vcard-card {
-	border: 1px solid rgba(0,0,0,.125);
+	border: 1px solid var(--bs-border-color);
 	border-bottom: 0;
 }
 
@@ -31,7 +31,7 @@
 }
 
 .vcard-card .vcard {
-	border: 1px solid rgba(0,0,0,.125);
+	border: 1px solid var(--bs-border-color);
 	border-top: 0;
 	border-right: 0;
 	border-left: 0;
diff --git a/view/theme/redbasic/schema/Focus-Light.css b/view/theme/redbasic/schema/Focus-Light.css
index 7289acffe..bc5da2a1d 100644
--- a/view/theme/redbasic/schema/Focus-Light.css
+++ b/view/theme/redbasic/schema/Focus-Light.css
@@ -1,5 +1,10 @@
 .dropdown-header.text-white-50,
 .navbar-dark .navbar-toggler,
-.navbar-dark .nav-link.active {
-	color: rgba(0,0,0,0.7) !important;
+.navbar-dark .nav-link:active, .navbar-dark .nav-link.active,
+.navbar-dark .navbar-text, .navbar-dark .nav-link, .navbar-dark .nav-link:hover {
+	color: var(--bs-secondary) !important;
+}
+
+.navbar-dark.bg-dark {
+	background-color: var(--bs-tertiary-bg) !important;
 }
diff --git a/view/theme/redbasic/schema/dark.css b/view/theme/redbasic/schema/dark.css
deleted file mode 100644
index bc1a84ec8..000000000
--- a/view/theme/redbasic/schema/dark.css
+++ /dev/null
@@ -1,51 +0,0 @@
-
-:root {
-  color-scheme: dark;
-  --bs-dark-rgb: #e1e1e1;
-  --bs-border-color: rgba(250, 250, 250, 0.125);
-  --bs-body-bg: #111;
-}
-
-.widget,
-.vcard-card {
-	background-color: unset;
-}
-
-.comment-edit-text {
-	border: 1px solid var(--bs-border-color);
-}
-
-.generic-content-wrapper {
-	border: 1px solid var(--bs-border-color);
-}
-
-#profile-jot-wrapper {
-	background-color: unset;
-	border: 1px solid var(--bs-border-color);
-}
-
-.bootstrap-tagsinput {
-	background-color: unset;
-}
-
-a,
-.fakelink {
-	color: var(--bs-link-color);
-}
-.item-category {
-	background-color: #293a4f !important;
-}
-#cboxContent {
-	background-color: #273039;
-}
-#jot-title-wrap,
-#jot-summary-wrap,
-#jot-pagetitle-wrap,
-#jot-category-wrap,
-#jot-customjotheaders-wrap {
-	border-bottom: 1px solid var(--bs-border-color);
-}
-#adminpage table tr:hover {
-	background-color: #2E3136;
-}
-
diff --git a/view/theme/redbasic/schema/dark.php b/view/theme/redbasic/schema/dark.php
deleted file mode 100644
index cd9653a23..000000000
--- a/view/theme/redbasic/schema/dark.php
+++ /dev/null
@@ -1,43 +0,0 @@
-<?php
-
-	if (! $nav_bg)
-		$nav_bg = "#000";
-	if (! $nav_gradient_top)
-		$nav_gradient_top = "#000";
-	if (! $nav_gradient_bottom)
-		$nav_gradient_bottom = "#000";
-	if (! $nav_active_gradient_top)
-		$nav_active_gradient_top = "#333";
-	if (! $nav_active_gradient_bottom)
-		$nav_active_gradient_bottom = "#111";
-	if (! $nav_bd)
-		$nav_bd = "#111";
-	if (! $nav_icon_colour)
-		$nav_icon_colour = "#999";
-	if (! $nav_active_icon_colour)
-		$nav_active_icon_colour = "#fff";
-	if (! $link_colour)
-		$link_colour = "#5f7b99;";
-	if (! $link_hover_colour)
-		$link_hover_colour = "#4b6b8c";
-	if (! $banner_colour)
-		$banner_colour = "#999";
-	if (! $bgcolour)
-		$bgcolour = "#111";
-	if (! $item_colour)
-		$item_colour = "rgba(28,28,28,0.8)";
-	if (! $comment_item_colour)
-		$comment_item_colour = "rgba(18,18,18,0.4)";
-	if (! $comment_border_colour)
-		$comment_border_colour = "rgba(28,28,28,0.8)";
-	if (! $toolicon_colour)
-		$toolicon_colour = '#999';
-	if (! $toolicon_activecolour)
-		$toolicon_activecolour = '#fff';
-	if (! $font_colour)
-		$font_colour = "#ccc";
-	if (! $converse_width)
-		$converse_width = '52'; //unit: rem;
-
-
-