Merge branch '7.8RC'7.8

7 files changed, 109 insertions, 564 deletions

diff --git a/view/theme/redbasic/css/style.css b/view/theme/redbasic/css/style.css
index d282e1a3b..d408b5d92 100644
--- a/view/theme/redbasic/css/style.css
+++ b/view/theme/redbasic/css/style.css
@@ -6,6 +6,31 @@
  */
 
 
+/* bootstrap variable */
+
+:root {
+	--bs-border-radius: $radius;
+	--bs-link-color: $link_colour;
+	--bs-link-hover-color: $link_hover_colour;
+}
+
+.nav-tabs {
+	--bs-nav-tabs-border-radius: $radius;
+}
+
+.nav-pills {
+	--bs-nav-pills-border-radius: $radius;
+}
+
+.btn {
+	--bs-btn-border-radius: $radius;
+}
+
+.card {
+	--bs-card-border-radius: $radius;
+}
+
+
 /* generals */
 
 html {
@@ -105,7 +130,7 @@ abbr {
 
 a,
 .fakelink {
-  color: $link_colour;
+	color: var(--bs-link-color);
 }
 
 
@@ -113,7 +138,7 @@ a:hover,
 a:focus,
 .fakelink:hover,
 .fakelink:focus {
-  color: $link_colour;
+	color: var(--bs-link-hover-color);
 }
 
 .fakelink,
@@ -605,7 +630,7 @@ nav .acpopup {
 #cboxContent {
 	padding: 3px;
 	border: 0px solid #fff;
-	border-radius: $radius;
+	border-radius: var(--bs-border-radius);
 	background-color: #fff;
 	z-index: 1052;
 }
@@ -827,7 +852,7 @@ div.jGrowl div.jGrowl-notification {
 }
 
 .shared_header img {
-	border-radius: $radius;
+	border-radius: var(--bs-border-radius);
 	margin-right: .75rem;
 }
 
@@ -973,7 +998,7 @@ th,td {
 /* mail */
 
 img.mail-conv-sender-photo {
-	border-radius: $radius;
+	border-radius: var(--bs-border-radius);
 }
 
 /* jot */
@@ -993,15 +1018,11 @@ img.mail-conv-sender-photo {
 #profile-jot-wrapper {
 	background-color: rgba(254, 254, 254, 1);
 	border: 1px solid rgba(0, 0, 0, .2);
-	border-radius: $radius;
+	border-radius: var(--bs-border-radius);
 
 }
 
-#jot-title,
-#jot-pagetitle,
-#profile-jot-text {
-	border-radius: $radius;
-}
+
 
 #profile-jot-text::-webkit-input-placeholder {
 	font-size: 1.2rem;
@@ -1032,22 +1053,22 @@ img.mail-conv-sender-photo {
 /* conversation */
 
 .top-radius {
-	border-top-right-radius: $radius;
-	border-top-left-radius: $radius;
+	border-top-right-radius: var(--bs-border-radius);
+	border-top-left-radius: var(--bs-border-radius);
 }
 
 .wall-event-item {
 	padding: 10px;
 	color: #fff;
 	background-color: #3A87AD; /* should reflect calendar color */
-	border-top-left-radius: $radius;
-	border-top-right-radius: $radius;
+	border-top-left-radius: var(--bs-border-radius);
+	border-top-right-radius: var(--bs-border-radius);
 }
 
 .wall-photo-item img {
 	max-width: 100% !important;
-	border-top-right-radius: $radius;
-	border-top-left-radius: $radius;
+	border-top-right-radius: var(--bs-border-radius);
+	border-top-left-radius: var(--bs-border-radius);
 }
 
 .wall-item-footer {
@@ -1057,8 +1078,8 @@ img.mail-conv-sender-photo {
 
 .wall-item-content-wrapper {
 	background-color: $item_colour;
-	border-top-right-radius: $radius;
-	border-top-left-radius: $radius;
+	border-top-right-radius: var(--bs-border-radius);
+	border-top-left-radius: var(--bs-border-radius);
 }
 
 .wall-item-content-wrapper.comment {
@@ -1085,8 +1106,8 @@ img.mail-conv-sender-photo {
 	padding: 7px 10px;
 	background-color: $item_colour;
 	border-radius: 0px;
-	border-bottom-right-radius: $radius;
-	border-bottom-left-radius: $radius;
+	border-bottom-right-radius: var(--bs-border-radius);
+	border-bottom-left-radius: var(--bs-border-radius);
 	border-top: 3px solid $comment_item_colour;
 }
 
@@ -1099,7 +1120,7 @@ img.mail-conv-sender-photo {
 	width: $top_photo;
 	height: $top_photo;
 	border: none;
-	border-radius: $radius;
+	border-radius: var(--bs-border-radius);
 	box-shadow: $shadowpx $shadowpx $shadowpx 0 #444444;
 }
 
@@ -1124,7 +1145,7 @@ img.mail-conv-sender-photo {
 
 .comment-edit-text {
 	border: 1px solid #e0e0e0;
-	border-radius: $radius;
+	border-radius: var(--bs-border-radius);
 }
 
 .divgrow-showmore {
@@ -1145,7 +1166,7 @@ img.mail-conv-sender-photo {
 
 .widget {
 	background-color: rgba(254,254,254,.5);
-	border-radius: $radius;
+	border-radius: var(--bs-border-radius);
 }
 
 .widget h3 {
@@ -1155,7 +1176,7 @@ img.mail-conv-sender-photo {
 
 
 #note-text {
-	border-radius: $radius;
+	border-radius: var(--bs-border-radius);
 }
 
 .fileas-ul {
@@ -1164,7 +1185,7 @@ img.mail-conv-sender-photo {
 
 #datebrowse-sidebar select {
 	border: 1px solid #e0e0e0;
-	border-radius: $radius;
+	border-radius: var(--bs-border-radius);
 }
 
 .thing-show img {
@@ -1186,24 +1207,24 @@ img.mail-conv-sender-photo {
 
 .chat-item-photo,
 .chat-item-photo-self {
-	border-radius: $radius;
+	border-radius: var(--bs-border-radius);
 }
 
 .chat-item-title,
 .chat-item-title-self {
-	border-radius: $radius;
+	border-radius: var(--bs-border-radius);
 	background-color: $item_colour;
 }
 
 #chatMembers img {
-	border-radius: $radius;
+	border-radius: var(--bs-border-radius);
 }
 
 .menu-img-3 {
 	width: 2.7rem;
 	height: 2.7rem;
 	margin-right: 5px;
-	border-radius: $radius;
+	border-radius: var(--bs-border-radius);
 	float: left;
 }
 
@@ -1211,14 +1232,14 @@ img.mail-conv-sender-photo {
 	height: 1.8rem;
 	width: 1.8rem;
 	margin-right: 5px;
-	border-radius: $radius;
+	border-radius: var(--bs-border-radius);
 	float: left;
 }
 
 .menu-img-1 {
 	height: 1.1rem;
 	width: 1.1rem;
-	border-radius: $radius;
+	border-radius: var(--bs-border-radius);
 }
 
 .usermenu {
@@ -1228,7 +1249,7 @@ img.mail-conv-sender-photo {
 #avatar {
 	width: 2.35rem;
 	height: 2.35rem;
-	border-radius: $radius;
+	border-radius: var(--bs-border-radius);
 }
 
 #nav-app-link-wrapper.has_location .nav-link {
@@ -1244,20 +1265,20 @@ img.mail-conv-sender-photo {
 .generic-content-wrapper-styled {
 	background-color: $bgcolour;
 	padding: 10px;
-	border-radius: $radius;
+	border-radius: var(--bs-border-radius);
 }
 
 .generic-content-wrapper {
 	border: 1px solid #e0e0e0;
-	border-radius: $radius;
+	border-radius: var(--bs-border-radius);
 	margin-bottom: 1.5rem;
 }
 
 .section-title-wrapper {
 	padding: 7px 10px;
 	background-color: $item_colour;
-	border-top-left-radius: $radius;
-	border-top-right-radius: $radius;
+	border-top-left-radius: var(--bs-border-radius);
+	border-top-right-radius: var(--bs-border-radius);
 	border-bottom: 3px solid $comment_item_colour;
 }
 
@@ -1327,22 +1348,22 @@ img.mail-conv-sender-photo {
 .section-content-wrapper .section-content-danger-wrapper {
 	margin-bottom: 10px;
 	border-bottom: none;
-	border-radius: $radius;
+	border-radius: var(--bs-border-radius);
 }
 
 
 .section-content-wrapper {
 	padding: 7px 10px;
 	background-color: $comment_item_colour;
-	border-bottom-left-radius: $radius;
-	border-bottom-right-radius: $radius;
+	border-bottom-left-radius: var(--bs-border-radius);
+	border-bottom-right-radius: var(--bs-border-radius);
 	word-wrap: break-word;
 }
 
 .section-content-wrapper-np {
 	background-color: $comment_item_colour;
-	border-bottom-left-radius: $radius;
-	border-bottom-right-radius: $radius;
+	border-bottom-left-radius: var(--bs-border-radius);
+	border-bottom-right-radius: var(--bs-border-radius);
 	word-wrap: break-word;
 }
 
@@ -1403,20 +1424,13 @@ main.fullscreen .section-content-wrapper-np {
 .notify-seen {
 	background-color: $item_colour;
 }
+
 /* bootstrap overrides */
 
-.btn,
-.form-control,
-.nav-pills .nav-link,
-.nav-tabs .nav-link {
+.form-control {
 	border-radius: $radius;
 }
 
-.rounded-top {
-	border-top-left-radius: $radius !important;
-	border-top-right-radius: $radius !important;
-}
-
 blockquote {
 	font-size: 1rem;
 	font-style: italic;
@@ -1427,7 +1441,6 @@ blockquote {
 
 .dropdown-menu {
 	color: $font_colour;
-	border-radius: $radius;
 }
 
 .dropdown-item {
@@ -1561,7 +1574,7 @@ dl.bb-dl > dd > li {
 	margin-bottom: 0px;
 	box-shadow: none;
 	display: inline-block;
-	border-radius: $radius;
+	border-radius: var(--bs-border-radius);
 	cursor: text;
 	padding: 0px 10px;
 	width: 100%;
@@ -1605,11 +1618,11 @@ dl.bb-dl > dd > li {
 }
 
 .onoffswitch.checkbox:hover label {
-	color: $link_colour;
+	color: var(--bs-link-color);
 }
 
 .onoffswitch.checkbox:hover > div label {
-	border-color: $link_colour;
+	border-color: var(--bs-link-color);
 }
 
 .onoffswitch-inner {
@@ -1653,7 +1666,7 @@ dl.bb-dl > dd > li {
 
 .onoffswitch.checkbox > div > input:checked + label .onoffswitch-switch {
     right: 0px;
-    background-color: $link_colour;
+    background-color: var(--bs-link-color);
 }
 
 
@@ -1685,8 +1698,8 @@ dl.bb-dl > dd > li {
 
 #ace-editor,
 #editor {
-	border-bottom-left-radius: $radius;
-	border-bottom-right-radius: $radius;
+	border-bottom-left-radius: var(--bs-border-radius);
+	border-bottom-right-radius: var(--bs-border-radius);
 }
 
 .sub-menu-wrapper {
@@ -1733,7 +1746,7 @@ dl.bb-dl > dd > li {
 	width: 64px;
 	height: 64px;
 	border: 1px solid #eee;
-	border-radius: $radius;
+	border-radius: var(--bs-border-radius);
 }
 
 .cloud-icon i {
@@ -1746,7 +1759,7 @@ dl.bb-dl > dd > li {
 .cloud-icon img {
 	max-width: 64px;
 	max-height: 64px;
-	border-radius: $radius;
+	border-radius: var(--bs-border-radius);
 }
 
 .cloud-title {
@@ -1786,5 +1799,5 @@ span.default-highlight {
 }
 
 .jg-entry img {
-	border-radius: $radius;
+	border-radius: var(--bs-border-radius);
 }
diff --git a/view/theme/redbasic/img/screenshot.png b/view/theme/redbasic/img/screenshot.png
index 60d7e23f6..80b217a21 100644
--- a/view/theme/redbasic/img/screenshot.png
+++ b/view/theme/redbasic/img/screenshot.png
diff --git a/view/theme/redbasic/php/config.php b/view/theme/redbasic/php/config.php
index 0de475fe5..9d242fab0 100644
--- a/view/theme/redbasic/php/config.php
+++ b/view/theme/redbasic/php/config.php
@@ -42,6 +42,7 @@ class RedbasicConfig {
 		$arr['nav_icon_colour'] = get_pconfig(local_channel(),'redbasic', 'nav_icon_colour' );
 		$arr['nav_active_icon_colour'] = get_pconfig(local_channel(),'redbasic', 'nav_active_icon_colour' );
 		$arr['link_colour'] = get_pconfig(local_channel(),'redbasic', 'link_colour' );
+		$arr['link_hover_colour'] = get_pconfig(local_channel(),'redbasic', 'link_hover_colour' );
 		$arr['banner_colour'] = get_pconfig(local_channel(),'redbasic', 'banner_colour' );
 		$arr['bgcolour'] = get_pconfig(local_channel(),'redbasic', 'background_colour' );
 		$arr['background_image'] = get_pconfig(local_channel(),'redbasic', 'background_image' );
@@ -69,6 +70,7 @@ class RedbasicConfig {
 			set_pconfig(local_channel(), 'redbasic', 'nav_icon_colour', $_POST['redbasic_nav_icon_colour']);
 			set_pconfig(local_channel(), 'redbasic', 'nav_active_icon_colour', $_POST['redbasic_nav_active_icon_colour']);
 			set_pconfig(local_channel(), 'redbasic', 'link_colour', $_POST['redbasic_link_colour']);
+			set_pconfig(local_channel(), 'redbasic', 'link_hover_colour', $_POST['redbasic_link_hover_colour']);
 			set_pconfig(local_channel(), 'redbasic', 'background_colour', $_POST['redbasic_background_colour']);
 			set_pconfig(local_channel(), 'redbasic', 'banner_colour', $_POST['redbasic_banner_colour']);
 			set_pconfig(local_channel(), 'redbasic', 'background_image', $_POST['redbasic_background_image']);
@@ -100,7 +102,8 @@ class RedbasicConfig {
 			'$nav_bg' => array('redbasic_nav_bg', t('Navigation bar background color'), $arr['nav_bg']),
 			'$nav_icon_colour' => array('redbasic_nav_icon_colour', t('Navigation bar icon color '), $arr['nav_icon_colour']),
 			'$nav_active_icon_colour' => array('redbasic_nav_active_icon_colour', t('Navigation bar active icon color '), $arr['nav_active_icon_colour']),
-			'$link_colour' => array('redbasic_link_colour', t('Link color'), $arr['link_colour'], '', $link_colours),
+			'$link_colour' => array('redbasic_link_colour', t('Link color'), $arr['link_colour'], '', $link_colour),
+			'$link_hover_colour' => array('redbasic_link_hover_colour', t('Link hover color'), $arr['link_hover_colour'], '', $link_hover_colour),
 			'$banner_colour' => array('redbasic_banner_colour', t('Set font-color for banner'), $arr['banner_colour']),
 			'$bgcolour' => array('redbasic_background_colour', t('Set the background color'), $arr['bgcolour']),
 			'$background_image' => array('redbasic_background_image', t('Set the background image'), $arr['background_image']),
diff --git a/view/theme/redbasic/php/style.php b/view/theme/redbasic/php/style.php
index fd79b02a9..667377838 100644
--- a/view/theme/redbasic/php/style.php
+++ b/view/theme/redbasic/php/style.php
@@ -16,11 +16,13 @@ if(! App::$install) {
 	$banner_colour = get_pconfig($uid,'redbasic','banner_colour');
 	$narrow_navbar = get_pconfig($uid,'redbasic','narrow_navbar');
 	$link_colour = get_pconfig($uid, 'redbasic', 'link_colour');
+	$link_hover_colour = get_pconfig($uid, 'redbasic', 'link_hover_colour');
 	$schema = get_pconfig($uid,'redbasic','schema');
 	$bgcolour = get_pconfig($uid, 'redbasic', 'background_colour');
 	$background_image = get_pconfig($uid, 'redbasic', 'background_image');
 	$item_colour = get_pconfig($uid, 'redbasic', 'item_colour');
 	$comment_item_colour = get_pconfig($uid, 'redbasic', 'comment_item_colour');
+	$item_opacity = get_pconfig($uid, 'redbasic', 'item_opacity');
 	$font_size = get_pconfig($uid, 'redbasic', 'font_size');
 	$font_colour = get_pconfig($uid, 'redbasic', 'font_colour');
 	$radius = get_pconfig($uid, 'redbasic', 'radius');
@@ -63,6 +65,7 @@ if ((!$schema) || ($schema == '---')) {
 		require_once ($schemefile);
 	}
 
+	$schemecss = '';
 	if(file_exists('view/theme/redbasic/schema/default.css')) {
 		$schemecss = file_get_contents('view/theme/redbasic/schema/default.css');
 	}
@@ -79,6 +82,8 @@ if (! $nav_active_icon_colour)
 	$nav_active_icon_colour = 'rgba(255, 255, 255, 0.75)';
 if (! $link_colour)
 	$link_colour = '#0d6efd';
+if (! $link_hover_colour)
+	$link_hover_colour = '#0a58ca;';
 if (! $banner_colour)
 	$banner_colour = '#efefef';
 if (! $bgcolour)
@@ -96,7 +101,7 @@ if (! $font_size)
 if (! $font_colour)
 	$font_colour = '#4d4d4d';
 if (! $radius)
-	$radius = '0.25rem';
+	$radius = '0.375rem';
 if (! $shadow)
 	$shadow = '0';
 if (! $converse_width)
@@ -111,9 +116,9 @@ if(file_exists('view/theme/redbasic/css/style.css')) {
 
 	$x = file_get_contents('view/theme/redbasic/css/style.css');
 
-  if($schema === 'dark' && file_exists('view/theme/redbasic/schema/bootstrap-nightfall.css')) {
-    $x .= file_get_contents('view/theme/redbasic/schema/bootstrap-nightfall.css');
-  }
+	if($schema === 'dark' && file_exists('view/theme/redbasic/schema/bootstrap-nightfall.css')) {
+		$x .= file_get_contents('view/theme/redbasic/schema/bootstrap-nightfall.css');
+	}
 
 	if($narrow_navbar && file_exists('view/theme/redbasic/css/narrow_navbar.css')) {
 		$x .= file_get_contents('view/theme/redbasic/css/narrow_navbar.css');
@@ -136,6 +141,7 @@ if(file_exists('view/theme/redbasic/css/style.css')) {
 		'$nav_icon_colour' => $nav_icon_colour,
 		'$nav_active_icon_colour' => $nav_active_icon_colour,
 		'$link_colour' => $link_colour,
+		'$link_hover_colour' => $link_hover_colour,
 		'$banner_colour' => $banner_colour,
 		'$bgcolour' => $bgcolour,
 		'$background_image' => $background_image,
@@ -146,12 +152,8 @@ if(file_exists('view/theme/redbasic/css/style.css')) {
 		'$radius' => $radius,
 		'$shadow' => $shadow,
 		'$converse_width' => $converse_width,
-		'$nav_float_min_opacity' => $nav_float_min_opacity,
-		'$nav_percent_min_opacity' => $nav_percent_min_opacity,
 		'$top_photo' => $top_photo,
 		'$reply_photo' => $reply_photo,
-		'$pmenu_top' => $pmenu_top,
-		'$pmenu_reply' => $pmenu_reply,
 		'$main_width' => $main_width,
 		'$left_aside_width' => $left_aside_width,
 		'$right_aside_width' => $right_aside_width
diff --git a/view/theme/redbasic/schema/dark.css b/view/theme/redbasic/schema/dark.css
index 8e6035e13..806f0ff43 100644
--- a/view/theme/redbasic/schema/dark.css
+++ b/view/theme/redbasic/schema/dark.css
@@ -1,509 +1,33 @@
-.generic-content-wrapper {
-	background-color: transparent;
-	border: 1px solid #333;
-}
-
-textarea, input, select
-{
-  color: #BBB !important;
-  background: #333 !important;
-  border-color: #2B2B2B !important;
- }
-
-#profile-jot-submit-wrapper {
-	border-top: none;
-	padding: 10px 0;
-}
-
-#jot-title {
-	border-radius: 3px;
-}
-
-#jot-title-wrap {
-	border-bottom: none;
-	margin-bottom: 5px;
-}
-
-#jot-category-wrap {
-	border-bottom: none;
-	margin-bottom: 5px;
-}
-
-.bootstrap-tagsinput {
-	background: #333;
-}
-
-optgroup {
-	color: #CCC !important;
-}
-
-option {
-	color: $link_colour !important;
-}
 
-.vcard,
-#contact-block,
-.widget {
-	background-color: transparent;
-	border: none;
-	border-bottom: 1px solid #333;
-	border-radius: 0px
+:root {
+  color-scheme: dark;
+  --bs-dark-rgb: #e1e1e1;
 }
 
+.widget,
 .vcard-card {
-	background-color: transparent;
-}
-
-#profile-photo-wrapper {
-	border: none;
-}
-
-#profile-edit-default-desc {
-	background-color: #665029;
-	color: #FFF;
-	padding: 20px;
-}
-
-.photo {
-	box-shadow: none;
-}
-
-.abook-pending-contact, .abook-permschange {
-	background: #402900;
-}
-
-.contact-entry-wrapper {
-	border: 1px solid #333;
-}
-
-#cboxContent a {
-	color: #000;
-}
-
-#cboxContent {
-	color: #111;
-}
-
-#adminpage table tr:hover {
-    background-color: #222;
-}
-
-#colorbox {
-	border: 0px solid #1E1E1E;
-	background-color: #1E1E1E;
-}
-
-.chat-item-text {
-	background-color: #222;
-}
-
-.fc-state-highlight {
-    background: none repeat scroll 0% 0% #333 !important;
-}
-
-.well {
-	background-color: #1E1E1E;
-	border: 1px solid #222;
-	background-image: linear-gradient(to bottom, #1E1E1E 0px, #1E1E1E 100%);
-}
-
-.alert-info, .section-content-info-wrapper {
-	color: #CCC;
-	background-color:#333;
-	border-color: #444;
-	background-image: linear-gradient(to bottom, #333 0px, #333 100%);
-}
-
-.abook-self {
-	background-color: #251111;
-}
-
-.acl-button-show,
-.acl-button-hide {
-	color: #fff;
-}
-
-#acl-select {
-	background-color:#333;
-	border: 1px solid #444;
-	color: #FFF;
-}
-
-#acl-showall {
-	color: #FFF;
-}
-
-
-#acl-list {
-	border: 1px solid #444;
-}
-
-#acl-search-wrapper {
-	border-bottom: 1px solid #444;
-}
-
-.acl-list-item {
-	border: 1px solid #222;
-	color: #CCC;
-	background-color:#333;
-}
-
-.abook-self {
-	border: 1px solid #222;
-	color: #555;
-	background-color:#111;
-}
-
-.modal-content,
-#notifications_wrapper {
-    background-color: #111;
-}
-
-.dropdown-header.text-black-50,
-.nav-link.active {
-	color:#fff !important;
-}
-
-.dropdown-item {
-  color: $font_colour;
-}
-
-a.btn, aside a {
-	font-weight: 400 !important;
-}
-
-.btn {
-	background-color: #1e1e1e;
-	border-color: #222;
-	color: $font_colour;
-	text-shadow: none;
-	box-shadow: none;
-}
-
-.btn:hover, .btn:focus, .btn:active {
-	background-color: #222;
-	border-color: #222;
-	color: #fff;
-	text-decoration: underline;
-}
-
-.btn-default.btn-sm:hover, .btn-default.btn-sm:focus, .btn-default.btn-sm:active .btn-default.btn-sm.active {
-	text-decoration: none;
-}
-
-.btn-primary, input#event-submit, input#rmagic-submit-button, input#lostpass-submit-button {
-    background-color: #20537E;
-    color: #FFF;
-}
-
-.btn-primary:hover, .btn-primary:focus, input#event-submit:hover, input#event-submit:focus, input#rmagic-submit-button:hover, input#rmagic-submit-button:focus, input#lostpass-submit-button:hover, input#lostpass-submit-button:focus {
-    border-color: #204D74;
-    background-color: #286090;
-    color: #FFF;
-}
-
-.btn-success {
-    color: #ccc !important;
-    background-color: #336A33 !important;
-    border-color: #4CAE4C !important;
-}
-
-.btn-success:hover, .btn-success:focus {
-    color: #FFF !important;
-    background-color: #449D44 !important;
-    border-color: #398439 !important;
-}
-
-.btn-warning {
-    color: #FFF !important;
-    background-color: #F0AD4E !important;
-    border-color: #EEA236 !important;
-}
-
-.btn-warning:hover, .btn-warning:focus {
-	color: #FFF !important;
-	background-color: #EC971F !important;
-	border-color: #D58512 !important;
-}
-
-.btn-danger, form#chat-destroy > input {
-    background-color: #B22A26 !important;
-    border-color: #D43F3A !important;
-	color: #FFF !important;
-}
-.btn-danger:hover, .btn-danger:focus, form#chat-destroy > input:hover, form#chat-destroy > input:focus {
-	color: #FFF !important;
-    background-color: #C9302C !important;
-    border-color: #AC2925 !important;
-}
-
-.pager_first,
-.pager_last,
-.pager_prev,
-.pager_next,
-.pager-prev,
-.pager-next,
-.pager_n {
-	border: 1px solid #222;
-	background: #1e1e1e;
-}
-
-input {
-	border: 1px solid #222;
-}
-
-input[type="submit"] {
-	background-color: #333;
-	color: #fff;
+	background-color: unset;
 }
 
-.notify-seen a {
-	background: #111;
-	color: #222 !important;
+.comment-edit-text {
+	border: 1px solid rgba(250, 250, 250, 0.125);
 }
 
-.notify-seen a:hover {
-	background: #222;
-	color: #ccc !important;
-}
-
-nav .dropdown-menu>li>a{
-	color: #fff;
-}
-
-nav .dropdown-menu>li>a:hover,nav .dropdown-menu>li>a:focus{
-	color: #fff;
-	background-color: #222;
-	background-image: none;
-}
-
-nav .dropdown-menu .divider{
-	background-color: #222;
-}
-
-nav .dropdown-menu>li>a:hover,nav .dropdown-menu>li>a:focus{
-	color: #fff;
-	background-color: #222;
-	background-image: none;
-}
-
-nav .dropdown-menu {
-	background-color: #000;
-}
-
-#nav-search-text {
-	background-color: #999;
-}
-
-.autocomplete .selected {
-	background: #999;
-}
-
-.nav-tabs {
-	border-bottom:1px solid #333;
-}
-
-.nav-tabs .nav-link.active {
-	color: #fff;
-	background-color: #111;
-	border-color: #333;
-}
-
-.nav-tabs .nav-link:hover,
-.nav-tabs .nav-link:focus {
-	text-decoration: underline;
-	background-color: #222;
-	color: #ccc;
-	border-color: #333;
-}
-
-aside .nav > li > a:hover, aside .nav > li > a:focus {
-	text-decoration: underline;
-	background-color: #222;
-}
-
-a, a:visited, a:link, .fakelink, .fakelink:visited, .fakelink:link {
-	font-weight: bold;
-}
-
-.list-group-item {
-	background-color: #222;
-}
-
-.group-selected, .fileas-selected, .categories-selected, .search-selected, a.active {
-	color: #fff !important;
-	text-decoration: underline !important;
-}
-
-.generic-content-wrapper-styled {
-	background-color: rgba(28,28,28,0.8);
-}
-
-.autocomplete {
-	background: #222;
-}
-
-blockquote {
-	background-color: #1e1e1e;
-	border-left: 3px solid #666;
-	color: #ccc;
-}
-
-code {
-	border: 1px solid #090909;
-	background: #000;
-	color: #fff;
-}
-
-pre {
-	background: #000;
-	color: #fff;
-	border:1px solid #090909;
-}
-
-#wiki-content-container code {
-	background: #000;
-}
-
-.notif-item a {
-	color: #ccc;
-}
-
-.notif-item a:hover {
-	color: #fff;
-}
-
-.dropdown-menu {
-	background-color: #222;
-}
-
-.dropdown-menu >li > a {
-	color: #ccc !important;
-}
-
-.dropdown-menu > li > a:hover, .dropdown-menu > li > a:focus {
-    	color: #ddd;
-    	background-color: #333;
-	background-image: none;
-}
-
-.open .dropdown-toggle.btn-default, .open .dropdown-toggle.btn-default:focus {
-    color: #ccc;
-    background-color: #222;
-    border-color: #222;
-}
-
-.pmenu-item:hover a {
-	background-color: #333 !important;
-	color: #ddd;
-}
-
-.preview {
-	background: url('../img/gray_and_black_diagonal_stripes_background_seamless.gif');
-}
-
-.xdsoft_datepicker.active {
-	color: #222 !important;
-	text-decoration: none !important;
-}
-
-.xdsoft_datepicker.active:hover, .xdsoft_datepicker.active:focus {
-	color: #222 !important;
-	text-decoration: underline;
-}
-
-@media (min-width: 768px) {
-  .nav-tabs.nav-justified > li > a {
-    border-bottom: 1px solid #333;
-  }
+.generic-content-wrapper {
+	border: 1px solid rgba(250, 250, 250, 0.125);
 }
 
 #profile-jot-wrapper {
-	background-color: inherit;
-	border: none;
-}
-
-.nav-tabs.nav-justified {
-	background-color: inherit;
-	border: none;
-}
-
-.table-striped > tbody > tr:nth-of-type(2n+1), .table-hover > tbody > tr:hover {
-	background-color: #191919;
-}
-
-.table > tbody > tr > td {
-	border-color: #888;
+	background-color: unset;
+	border: 1px solid rgba(250, 250, 250, 0.125);
 }
 
-.help-content {
-	border-bottom: #222 thin solid;
-}
-
-.help-content-open {
-  	-moz-box-shadow: 0px 3px 3px #222;
-  	-webkit-box-shadow: 0px 3px 3px #222;
-  	box-shadow: 0px 3px 3px #222;
-}
-
-.contextual-help-content-open {
-	background: $nav_bg;
-	border-bottom: #555 1px solid;
-	box-shadow: 0px 3px 3px rgba(85,85,85,0.2);
-}
-
-.contextual-help-tool {
-	opacity: 0.5;
-}
-
-.contextual-help-tool:hover {
-	opacity: 1;
-}
-
-.contextual-help-tool i {
-	color: $link_colour;
-}
-
-
-.profile-match-wrapper {
-	width: 150px;
-	height: 120px;
-	border: none;
-}
-
-.profile-match-name {
-    	width: 144px;
-    	white-space: nowrap;
-    	text-overflow: ellipsis;
-}
-
-.widget-nav-pills-icons:hover + a {
-	background-color: #222;
+.bootstrap-tagsinput {
+	background-color: unset;
 }
 
-.widget-nav-pills-checkbox:hover + a {
-	background-color: #222;
+a,
+.fakelink {
+	color: var(--bs-link-color);
 }
 
-
-/* category badge fix: */
-
-.bg-warning {
-    background-color: #e38916;
-}
-.bg-warning:hover, .bg-warning:focus {
-	background-color: #ffc927 !important;
-}
-.bg-warning a.text-dark {
-    color: #111 !important;
-}
-.bg-warning a.text-dark:focus, .bg-warning a.text-dark:hover {
-    color: #bd0000 !important;
-    text-decoration: none;
-}
-
-/* fix color for highlithed text */
-span.default-highlight {
-	color: #333;
-	border-radius: 4px;
-}
diff --git a/view/theme/redbasic/schema/dark.php b/view/theme/redbasic/schema/dark.php
index 18e92ac93..cd9653a23 100644
--- a/view/theme/redbasic/schema/dark.php
+++ b/view/theme/redbasic/schema/dark.php
@@ -17,7 +17,9 @@
 	if (! $nav_active_icon_colour)
 		$nav_active_icon_colour = "#fff";
 	if (! $link_colour)
-		$link_colour = "#fff";
+		$link_colour = "#5f7b99;";
+	if (! $link_hover_colour)
+		$link_hover_colour = "#4b6b8c";
 	if (! $banner_colour)
 		$banner_colour = "#999";
 	if (! $bgcolour)
diff --git a/view/theme/redbasic/tpl/theme_settings.tpl b/view/theme/redbasic/tpl/theme_settings.tpl
index cc403f0a7..65b3a7883 100644
--- a/view/theme/redbasic/tpl/theme_settings.tpl
+++ b/view/theme/redbasic/tpl/theme_settings.tpl
@@ -15,6 +15,7 @@
 	{{*include file="field_input.tpl" field=$comment_indent*}}
 	{{include file="field_colorinput.tpl" field=$font_colour}}
 	{{include file="field_colorinput.tpl" field=$link_colour}}
+	{{include file="field_colorinput.tpl" field=$link_hover_colour}}
 	{{include file="field_input.tpl" field=$radius}}
 	{{include file="field_input.tpl" field=$shadow}}
 	{{include file="field_input.tpl" field=$top_photo}}
@@ -23,7 +24,7 @@
 <script>
 	$(function(){
 		$('#id_redbasic_nav_bg, #id_redbasic_nav_icon_colour, #id_redbasic_nav_active_icon_colour, #id_redbasic_banner_colour').colorpicker({format: 'rgba'});
-		$('#id_redbasic_link_colour,#id_redbasic_background_colour').colorpicker();
+		$('#id_redbasic_link_colour,#id_redbasic_link_hover_colour,#id_redbasic_background_colour').colorpicker();
 		$('#id_redbasic_toolicon_colour,#id_redbasic_toolicon_activecolour,#id_redbasic_font_colour').colorpicker();
 		$('#id_redbasic_item_colour,#id_redbasic_comment_item_colour,#id_redbasic_comment_border_colour').colorpicker({format: 'rgba'});
 	});