Merge branch 'master' of https://github.com/redmatrix/redmatrix

Conflicts:
	util/messages.po

11 files changed, 619 insertions, 793 deletions

diff --git a/view/theme/redbasic/css/style.css b/view/theme/redbasic/css/style.css
index 83b10b527..f391c84e3 100644
--- a/view/theme/redbasic/css/style.css
+++ b/view/theme/redbasic/css/style.css
@@ -69,28 +69,20 @@ abbr {
 	margin-right: 5px;
 }
 
-a, a:visited, a:link, .fakelink, .fakelink:visited, .fakelink:link { 
-	font-weight: $link_font_weight;
-	color: $link_colour; 
-	text-decoration: none; 
-}
-
-a:hover, .fakelink:hover { color: $link_colour; text-decoration: underline; }
-
+a,
 .fakelink {
-	cursor: pointer;
+  color: $link_colour;
 }
 
-a.btn-default {
-	color: #333;
+a:hover,
+a:focus,
+.fakelink:hover,
+.fakelink:focus {
+  color: $link_colour;
 }
 
-a.btn-success,
-a.btn-danger,
-a.btn-info,
-a.btn-warning,
-a.btn-primary {
-	color: #fff;
+.fakelink {
+	cursor: pointer;
 }
 
 input[type="text"],
@@ -130,19 +122,17 @@ pre code {
 code {
 	font-size: 1em;
 	padding: 5px;
-	border: 1px solid $code_borderc;
-	background: $code_bgcolour;
-	color: $code_txtcolour;
+	border: 1px solid #ccc;
+	background: #ccc;
+	color: #000;
 }
 
 pre {
-	background: $pre_bgcolour;
-	color: $pre_txtcolour;
-	border:1px solid $pre_borderc;
+	background: #F5F5F5;
+	color: #333;
+	border:1px solid #ccc;
 }
 
-
-
 .ccollapse-wrapper {
 	border: 1px solid #CCC;
 	padding: 5px;
@@ -255,7 +245,7 @@ footer {
 }
 
 .preview {
-	background: url('../img/$preview_backgroundimg');
+	background: url('../img/gray_and_white_diagonal_stripes_background_seamless.gif');
 }
 
 #theme-preview {
@@ -268,10 +258,12 @@ footer {
 }
 
 /*TODO: we should use one class for all this. */
+/*
 .group-selected, .fileas-selected, .categories-selected, .search-selected, .active {
-	color: $selected_active_colour !important;
-	text-decoration: $selected_active_deco !important;
+	color: #444 !important;
+	text-decoration: none !important;
 }
+*/
 
 .fileas-all {
 	text-decoration: none !important;
@@ -777,7 +769,7 @@ a.rateme, div.rateme {
 	padding: 0px 5px 0px 5px;
 	border-radius: $radiuspx;
 	border-color: $nav_bd;
-	background-color: $search_background;
+	background-color: #eee;
     	transition: background-color 300ms ease 0s;
 }
 
@@ -1250,7 +1242,6 @@ div.jGrowl div.jGrowl-notification {
 
 .autocomplete {
 	color: $font_colour;
-	background: $dropdown_bgcolour;
 	cursor: pointer;
 	text-align: left;
 	max-height: 350px;
@@ -1260,7 +1251,7 @@ div.jGrowl div.jGrowl-notification {
 }
 
 .autocomplete .selected {
-	background: $search_background;
+	background: #eee;
 }
 
 .autocomplete div {
@@ -1312,12 +1303,12 @@ header {
 }
 
 .notif-item a {
-	color: $notif_itemcolour;
+	color: #000;
 }
 
 .notif-item a:hover {
 	text-decoration: underline;
-	color: $notif_itemhovercolour;
+	color: #000;
 }
 
 .notif-image {
@@ -1506,6 +1497,7 @@ margin-right: 50px;
 .admin-icons {
 	font-size: 1.2em;
 	color: $toolicon_colour;
+	margin-right: 10px;
 }
 
 a .drop-icons {
@@ -1548,11 +1540,6 @@ a .drop-icons:hover {
 	list-style-type: none;
 }
 
-.admin-icons {
-	color: $toolicon_colour;
-	margin-right: 10px;
-}
-
 #adminpage table tr:hover {
 	background-color: #BBC7D7;
 }
@@ -1654,7 +1641,7 @@ img.mail-list-sender-photo {
 }
 
 .generic-content-wrapper-styled {
-	background-color: $genericcontent_bgcolour;
+	background-color: $comment_item_colour;
 	padding: 10px;
 	border-radius: $radiuspx;
 }
@@ -1968,10 +1955,9 @@ nav ul li .notify-unseen
 blockquote {
 	font-size: $font_size;
 	font-style: italic;
-	background-color: $blockquote_bgcolour;
-	border-left: 3px solid $blockquote_bordercolour;
+	border-left: 3px solid #ccc;
 	padding: 0.4em;
-	color: $blockquote_colour;
+	color: #4d4d4d;
 	margin: 0px 0px 0px 20px;
 }
 
@@ -2000,35 +1986,12 @@ nav .badge.mail-update:hover {
 .dropdown-menu {
 	font-size: $body_font_size;
 	border-radius: $radiuspx;
-	background-color: $dropdown_bgcolour; 
-}
-
-.dropdown-menu >li > a {
-	color: $dropdown_textcolour; 
-}
-
-
-.dropdown-menu > li > a:hover, .dropdown-menu > li > a:focus {
-    	color: $dropdown_txtcolhover; 
-    	background-color: $dropdown_bgcolhover; 
-	$dropdown_bgimghover
-}
-
-aside .nav > li > a:hover, aside .nav > li > a:focus {
-	text-decoration: $navtabs_decohover;
-	background-color: $navaside_bghover;
 }
 
 .dropdown-menu img {
 	border-radius: $radiuspx;
 }
 
-.open .dropdown-toggle.btn-default {
-    color: $dropdown_togglecol; 
-    background-color: $dropdown_togglebgcol; 
-    border-color: $dropdown_bordercol; 
-}
-
 .navbar-inverse {
 	background-image: -webkit-linear-gradient(top, $nav_gradient_top 0%, $nav_gradient_bottom 100%);
 	background-image:         linear-gradient(to bottom, $nav_gradient_top 0%, $nav_gradient_bottom 100%);
@@ -2097,41 +2060,6 @@ aside .nav > li > a:hover, aside .nav > li > a:focus {
 	box-shadow: none;
 }
 
-.nav-tabs{
-	border-bottom:1px solid $navtabs_borderc;
-}
-
-.nav-tabs>li.active>a,.nav-tabs>li.active>a:hover,.nav-tabs>li.active>a:focus{
-	color: $navtabs_fontcolour;
-	background-color: $navtabs_bgcolour; 
-}
-
-.nav-tabs.nav-justified>.active>a,.nav-tabs.nav-justified>.active>a:hover,.nav-tabs.nav-justified>.active>a:focus{
-	border:1px solid $navtabs_borderc;
-}
-
-.nav-tabs.nav-justified > li > a {
-	$navtabs_linkcolour
-}
-
-.nav-tabs > li > a:hover, .nav-tabs > li > a:focus {
-    	text-decoration: $navtabs_decohover;
-    	background-color: $navtabs_bgchover;
-	border-color: transparent;
-	$navtabs_linkchover
-}
-
-@media (min-width: 768px) {
-  .nav-tabs.nav-justified > li > a {
-    border-bottom: 1px solid $navtabs_borderc;
-  }
-  .nav-tabs.nav-justified > .active > a,
-  .nav-tabs.nav-justified > .active > a:hover,
-  .nav-tabs.nav-justified > .active > a:focus {
-    border-bottom-color: transparent;
-  }
-}
-
 .btn {
 	font-size: $body_font_size;
 }
diff --git a/view/theme/redbasic/php/style.php b/view/theme/redbasic/php/style.php
index 2133331c6..c6231e690 100644
--- a/view/theme/redbasic/php/style.php
+++ b/view/theme/redbasic/php/style.php
@@ -1,311 +1,200 @@
 <?php
 
 if(! $a->install) {
+
 	// Get the UID of the channel owner
 	$uid = get_theme_uid();
 
-	if($uid)
-	    load_pconfig($uid,'redbasic');
+	if($uid) {
+		load_pconfig($uid,'redbasic');
+	}
 
-// Load the owners pconfig
-		$nav_bg = get_pconfig($uid, "redbasic", "nav_bg");
-		$nav_gradient_top = get_pconfig($uid, "redbasic", "nav_gradient_top");
-		$nav_gradient_bottom = get_pconfig($uid, "redbasic", "nav_gradient_bottom");
-		$nav_active_gradient_top = get_pconfig($uid, "redbasic", "nav_active_gradient_top");
-		$nav_active_gradient_bottom = get_pconfig($uid, "redbasic", "nav_active_gradient_bottom");
-		$nav_bd = get_pconfig($uid, "redbasic", "nav_bd");
-		$nav_icon_colour = get_pconfig($uid, "redbasic", "nav_icon_colour");
-		$nav_active_icon_colour = get_pconfig($uid, "redbasic", "nav_active_icon_colour");
-		$narrow_navbar = get_pconfig($uid,'redbasic','narrow_navbar');
-		$banner_colour = get_pconfig($uid,'redbasic','banner_colour');
-		$link_colour = get_pconfig($uid, "redbasic", "link_colour");	
-		$schema = get_pconfig($uid,'redbasic','schema');
-		$bgcolour = get_pconfig($uid, "redbasic", "background_colour");	
-		$background_image = get_pconfig($uid, "redbasic", "background_image");	
-		$toolicon_colour = get_pconfig($uid,'redbasic','toolicon_colour');
-		$toolicon_activecolour = get_pconfig($uid,'redbasic','toolicon_activecolour');
-		$item_colour = get_pconfig($uid, "redbasic", "item_colour");
-		$comment_item_colour = get_pconfig($uid, "redbasic", "comment_item_colour");
-		$comment_border_colour = get_pconfig($uid, "redbasic", "comment_border_colour");
-		$comment_indent = get_pconfig($uid, "redbasic", "comment_indent");
-		$body_font_size = get_pconfig($uid, "redbasic", "body_font_size");	
-		$font_size = get_pconfig($uid, "redbasic", "font_size");	
-		$font_colour = get_pconfig($uid, "redbasic", "font_colour");	
-		$radius = get_pconfig($uid, "redbasic", "radius");	
-		$shadow = get_pconfig($uid,"redbasic","photo_shadow");
-		$converse_width=get_pconfig($uid,"redbasic","converse_width");
-		$converse_center=get_pconfig($uid,"redbasic","converse_center");
-		$nav_min_opacity=get_pconfig($uid,'redbasic','nav_min_opacity');
-		$top_photo=get_pconfig($uid,'redbasic','top_photo');
-		$reply_photo=get_pconfig($uid,'redbasic','reply_photo');
+	// Load the owners pconfig
+	$nav_bg = get_pconfig($uid, "redbasic", "nav_bg");
+	$nav_gradient_top = get_pconfig($uid, "redbasic", "nav_gradient_top");
+	$nav_gradient_bottom = get_pconfig($uid, "redbasic", "nav_gradient_bottom");
+	$nav_active_gradient_top = get_pconfig($uid, "redbasic", "nav_active_gradient_top");
+	$nav_active_gradient_bottom = get_pconfig($uid, "redbasic", "nav_active_gradient_bottom");
+	$nav_bd = get_pconfig($uid, "redbasic", "nav_bd");
+	$nav_icon_colour = get_pconfig($uid, "redbasic", "nav_icon_colour");
+	$nav_active_icon_colour = get_pconfig($uid, "redbasic", "nav_active_icon_colour");
+	$narrow_navbar = get_pconfig($uid,'redbasic','narrow_navbar');
+	$banner_colour = get_pconfig($uid,'redbasic','banner_colour');
+	$link_colour = get_pconfig($uid, "redbasic", "link_colour");
+	$schema = get_pconfig($uid,'redbasic','schema');
+	$bgcolour = get_pconfig($uid, "redbasic", "background_colour");
+	$background_image = get_pconfig($uid, "redbasic", "background_image");
+	$toolicon_colour = get_pconfig($uid,'redbasic','toolicon_colour');
+	$toolicon_activecolour = get_pconfig($uid,'redbasic','toolicon_activecolour');
+	$item_colour = get_pconfig($uid, "redbasic", "item_colour");
+	$comment_item_colour = get_pconfig($uid, "redbasic", "comment_item_colour");
+	$comment_border_colour = get_pconfig($uid, "redbasic", "comment_border_colour");
+	$comment_indent = get_pconfig($uid, "redbasic", "comment_indent");
+	$body_font_size = get_pconfig($uid, "redbasic", "body_font_size");
+	$font_size = get_pconfig($uid, "redbasic", "font_size");
+	$font_colour = get_pconfig($uid, "redbasic", "font_colour");
+	$radius = get_pconfig($uid, "redbasic", "radius");
+	$shadow = get_pconfig($uid,"redbasic","photo_shadow");
+	$converse_width=get_pconfig($uid,"redbasic","converse_width");
+	$converse_center=get_pconfig($uid,"redbasic","converse_center");
+	$nav_min_opacity=get_pconfig($uid,'redbasic','nav_min_opacity');
+	$top_photo=get_pconfig($uid,'redbasic','top_photo');
+	$reply_photo=get_pconfig($uid,'redbasic','reply_photo');
 
 }
 
-	// Now load the scheme.  If a value is changed above, we'll keep the settings
-	// If not, we'll keep those defined by the schema
-	// Setting $schema to '' wasn't working for some reason, so we'll check it's
-	// not --- like the mobile theme does instead.
-
+// Now load the scheme.  If a value is changed above, we'll keep the settings
+// If not, we'll keep those defined by the schema
+// Setting $schema to '' wasn't working for some reason, so we'll check it's
+// not --- like the mobile theme does instead.
 
-	// Allow layouts to over-ride the schema
+// Allow layouts to over-ride the schema
 
-	if($_REQUEST['schema'])
-		$schema = $_REQUEST['schema'];
+if($_REQUEST['schema']) {
+	$schema = $_REQUEST['schema'];
+}
 
-	if (($schema) && ($schema != '---')) {
-		// Check it exists, because this setting gets distributed to clones
-		if(file_exists('view/theme/redbasic/schema/' . $schema . '.php')) {
-			$schemefile = 'view/theme/redbasic/schema/' . $schema . '.php';
-			require_once ($schemefile);
-		}
-		if(file_exists('view/theme/redbasic/schema/' . $schema . '.css')) {
-			$schemecss = file_get_contents('view/theme/redbasic/schema/' . $schema . '.css');
-		}
+if (($schema) && ($schema != '---')) {
 
+	// Check it exists, because this setting gets distributed to clones
+	if(file_exists('view/theme/redbasic/schema/' . $schema . '.php')) {
+		$schemefile = 'view/theme/redbasic/schema/' . $schema . '.php';
+		require_once ($schemefile);
 	}
 
-	// If we haven't got a schema, load the default.  We shouldn't touch this - we
-	// should leave it for admins to define for themselves.
-	if (! $schema) {
-		if(file_exists('view/theme/redbasic/schema/default.php')) {
-			$schemefile = 'view/theme/redbasic/schema/default.php';
-			require_once ($schemefile);
-		}
-		if(file_exists('view/theme/redbasic/schema/default.css')) {
-			$schemecss = file_get_contents('view/theme/redbasic/schema/default.css');
-		}
+	if(file_exists('view/theme/redbasic/schema/' . $schema . '.css')) {
+		$schemecss = file_get_contents('view/theme/redbasic/schema/' . $schema . '.css');
 	}
-		
-		
-//Set some defaults - we have to do this after pulling owner settings, and we have to check for each setting
-//individually.  If we don't, we'll have problems if a user has set one, but not all options.
 
-	if (! $nav_bg)
-		$nav_bg = "#222";
-	if (! $nav_gradient_top)
-		$nav_gradient_top = "#3c3c3c";
-	if (! $nav_gradient_bottom)
-		$nav_gradient_bottom = "#222";
-	if (! $nav_active_gradient_top)
-		$nav_active_gradient_top = "#222";
-	if (! $nav_active_gradient_bottom)
-		$nav_active_gradient_bottom = "#282828";
-	if (! $nav_bd)
-		$nav_bd = "#222";
-	if (! $nav_icon_colour)
-		$nav_icon_colour = "#999";
-	if (! $nav_active_icon_colour)
-		$nav_active_icon_colour = "#fff";
-	if (! $navtabs_borderc)
-		$navtabs_borderc = "rgba(204,204,204,0.8)";
-	if (! $navtabs_fontcolour)
-		$navtabs_fontcolour = "#555";
-	if (! $navtabs_bgcolour)
-		$navtabs_bgcolour = "rgba(254,254,254,0.4)";
-	if (! $navtabs_linkcolour)
-		$navtabs_linkcolour = "";
-	if (! $navtabs_linkchover)
-		$navtabs_linkchover = "";
-	if (! $navtabs_decohover)
-		$navtabs_decohover = "none";
-	if (! $navtabs_bgchover)
-		$navtabs_bgchover = "rgba(238,238,238,0.8)";
-	if (! $link_colour)
-		$link_colour = "#337AB7";
-	if (! $navaside_bghover)
-		$navaside_bghover = "#eee";
-	if (! $link_font_weight)
-		$link_font_weight = "normal";
-	if (! $banner_colour)
-		$banner_colour = "#fff";
-	if (! $search_background)
-		$search_background = "#eee";
-	if (! $bgcolour)
-		$bgcolour = "#fdfdfd";
-	if (! $background_image)
-		$background_image ='';
-	if (! $item_colour)
-		$item_colour = "rgba(238,238,238,0.8)";
-	if (! $comment_item_colour)
-		$comment_item_colour = "rgba(254,254,254,0.4)";
-	if (! $genericcontent_bgcolour)
-		$genericcontent_bgcolour = $comment_item_colour;
-	if (! $comment_border_colour)
-		$comment_border_colour = "rgba(238,238,238,0.8)";
-	if (! $toolicon_colour)
-		$toolicon_colour = '#777';
-	if (! $toolicon_activecolour)
-		$toolicon_activecolour = '#000';
-	if (! $item_opacity)
-		$item_opacity = "1";
-	if (! $font_size)
-		$font_size = "0.9rem";
-	if (! $body_font_size)
-		$body_font_size = "0.75rem";
-	if (! $font_colour)
-		$font_colour = "#4d4d4d";
-	if (! $selected_active_colour)
-		$selected_active_colour = "#444";
-	if (! $selected_active_deco)
-		$selected_active_deco = "none";
-	if (! $blockquote_colour)
-		$blockquote_colour = "#4d4d4d";
-	if (! $blockquote_bgcolour)
-		$blockquote_bgcolour = "";
-	if (! $blockquote_bordercolour)
-		$blockquote_bordercolour = "#ccc";
-	if (! $code_borderc)
-		$code_borderc = "#ccc";
-	if (! $code_bgcolour)
-		$code_bgcolour = "#ccc";
-	if (! $code_txtcolour)
-		$code_txtcolour = "#000";
-	if (! $pre_borderc)
-		$pre_borderc = "#ccc";
-	if (! $pre_bgcolour)
-		$pre_bgcolour = "#F5F5F5";
-	if (! $pre_txtcolour)
-		$pre_txtcolour = "#333";
-	if (! $notif_itemcolour)
-		$notif_itemcolour = "#000";
-	if (! $notif_itemhovercolour)
-		$notif_itemhovercolour = "#000";
-	if (! $dropdown_bgcolour)
-		$dropdown_bgcolour = "#FFF";
-	if (! $dropdown_textcolour)
-		$dropdown_textcolour = "#333";
-	if (! $dropdown_txtcolhover)
-		$dropdown_txtcolhover = "#262626";
-	if (! $dropdown_bgcolhover)
-		$dropdown_bgcolhover = "#F5F5F5";
-	if (! $dropdown_bgimghover)
-		$dropdown_bgimghover = "";
-	if (! $dropdown_togglecol)
-		$dropdown_togglecol = "#333";
-	if (! $dropdown_togglebgcol)
-		$dropdown_togglebgcol = "#EBEBEB";
-	if (! $dropdown_bordercol)
-		$dropdown_bordercol = "#ADADAD";
-	if (! $preview_backgroundimg)
-		$preview_backgroundimg = "gray_and_white_diagonal_stripes_background_seamless.gif";
-	if (! $acpopup_bgcolour)
-		$acpopup_bgcolour = "#fff";
-	if (! $acpopup_bordercolour)
-		$acpopup_bordercolour = "#ccc";
-	if (! $acpopup_tgbl_bgcolour)
-		$acpopup_tgbl_bgcolour = "#ddddff";
-	if (! $acpopup_hovercolour)
-		$acpopup_hovercolour = "#000";
+}
 
-	if (! $radius)
-		$radius = "4";
-	if (! $shadow)
-		$shadow = "0";
-	if(! $active_colour)
-		$active_colour = "#fff";
-	if (! $converse_width)
-		$converse_width = "1024";
-	if(! $top_photo)
-		$top_photo = '48px';
-	if(! $comment_indent)
-		$comment_indent = '0px';
-	if(! $reply_photo)
-		$reply_photo = '32px';
+// If we haven't got a schema, load the default.  We shouldn't touch this - we
+// should leave it for admins to define for themselves.
+if (! $schema) {
 
-	if($nav_min_opacity === false || $nav_min_opacity === '') {
-		$nav_float_min_opacity = 1.0;
-		$nav_percent_min_opacity = 100;
-	}
-	else {
-		$nav_float_min_opacity = (float) $nav_min_opacity;
-		$nav_percent_min_opacity = (int) 100 * $nav_min_opacity;
+	if(file_exists('view/theme/redbasic/schema/default.php')) {
+		$schemefile = 'view/theme/redbasic/schema/default.php';
+		require_once ($schemefile);
 	}
 
-// Apply the settings
-	if(file_exists('view/theme/redbasic/css/style.css')) {
-		$x = file_get_contents('view/theme/redbasic/css/style.css');
-
-
-// left aside is 231px + converse width
-$main_width = (231 + intval($converse_width));
+	if(file_exists('view/theme/redbasic/schema/default.css')) {
+		$schemecss = file_get_contents('view/theme/redbasic/schema/default.css');
+	}
 
-// prevent main_width smaller than 768px
-$main_width = (($main_width < 768) ? 768 : $main_width) . 'px';
+}
+		
+//Set some defaults - we have to do this after pulling owner settings, and we have to check for each setting
+//individually.  If we don't, we'll have problems if a user has set one, but not all options.
+if (! $nav_bg)
+	$nav_bg = "#222";
+if (! $nav_gradient_top)
+	$nav_gradient_top = "#3c3c3c";
+if (! $nav_gradient_bottom)
+	$nav_gradient_bottom = "#222";
+if (! $nav_active_gradient_top)
+	$nav_active_gradient_top = "#222";
+if (! $nav_active_gradient_bottom)
+	$nav_active_gradient_bottom = "#282828";
+if (! $nav_bd)
+	$nav_bd = "#222";
+if (! $nav_icon_colour)
+	$nav_icon_colour = "#999";
+if (! $nav_active_icon_colour)
+	$nav_active_icon_colour = "#fff";
+if (! $link_colour)
+	$link_colour = "#337AB7";
+if (! $banner_colour)
+	$banner_colour = "#fff";
+if (! $bgcolour)
+	$bgcolour = "#fdfdfd";
+if (! $background_image)
+	$background_image ='';
+if (! $item_colour)
+	$item_colour = "rgba(238,238,238,0.8)";
+if (! $comment_item_colour)
+	$comment_item_colour = "rgba(254,254,254,0.4)";
+if (! $comment_border_colour)
+	$comment_border_colour = "rgba(238,238,238,0.8)";
+if (! $toolicon_colour)
+	$toolicon_colour = '#777';
+if (! $toolicon_activecolour)
+	$toolicon_activecolour = '#000';
+if (! $item_opacity)
+	$item_opacity = "1";
+if (! $font_size)
+	$font_size = "0.9rem";
+if (! $body_font_size)
+	$body_font_size = "0.75rem";
+if (! $font_colour)
+	$font_colour = "#4d4d4d";
+if (! $radius)
+	$radius = "4";
+if (! $shadow)
+	$shadow = "0";
+if (! $converse_width)
+	$converse_width = "1024";
+if(! $top_photo)
+	$top_photo = '48px';
+if(! $comment_indent)
+	$comment_indent = '0px';
+if(! $reply_photo)
+	$reply_photo = '32px';
+if($nav_min_opacity === false || $nav_min_opacity === '') {
+	$nav_float_min_opacity = 1.0;
+	$nav_percent_min_opacity = 100;
+}
+else {
+	$nav_float_min_opacity = (float) $nav_min_opacity;
+	$nav_percent_min_opacity = (int) 100 * $nav_min_opacity;
+}
 
-$options = array (
-'$nav_bg' => $nav_bg,
-'$nav_gradient_top' => $nav_gradient_top,
-'$nav_gradient_bottom' => $nav_gradient_bottom,
-'$nav_active_gradient_top' => $nav_active_gradient_top,
-'$nav_active_gradient_bottom' => $nav_active_gradient_bottom,
-'$nav_bd' => $nav_bd,
-'$nav_icon_colour' => $nav_icon_colour,
-'$nav_active_icon_colour' => $nav_active_icon_colour,
-'$navtabs_borderc' => $navtabs_borderc,
-'$navtabs_fontcolour' => $navtabs_fontcolour,
-'$navtabs_bgcolour' => $navtabs_bgcolour,
-'$navtabs_linkcolour' => $navtabs_linkcolour,
-'$navtabs_linkchover' => $navtabs_linkchover,
-'$navtabs_bgchover' => $navtabs_bgchover,
-'$navtabs_decohover' => $navtabs_decohover,
-'$navaside_bghover' => $navaside_bghover,
-'$link_colour' => $link_colour,
-'$link_font_weight' => $link_font_weight,
-'$banner_colour' => $banner_colour,
-'$search_background' => $search_background,
-'$bgcolour' => $bgcolour,
-'$background_image' => $background_image,
-'$genericcontent_bgcolour' => $genericcontent_bgcolour,
-'$item_colour' => $item_colour,
-'$comment_item_colour' => $comment_item_colour,
-'$comment_border_colour' => $comment_border_colour,
-'$toolicon_colour' => $toolicon_colour,
-'$toolicon_activecolour' => $toolicon_activecolour,
-'$font_size' => $font_size,
-'$font_colour' => $font_colour,
-'$selected_active_colour' => $selected_active_colour,
-'$selected_active_deco' => $selected_active_deco,
-'$body_font_size' => $body_font_size,
-'$blockquote_colour' => $blockquote_colour,
-'$blockquote_bgcolour' => $blockquote_bgcolour,
-'$blockquote_bordercolour' => $blockquote_bordercolour,
-'$blockquote_bgcolourhover' => $blockquote_bgcolourhover,
-'$code_borderc' => $code_borderc,
-'$code_bgcolour' => $code_bgcolour,
-'$code_txtcolour' => $code_txtcolour,
-'$pre_borderc' => $pre_borderc,
-'$pre_bgcolour' => $pre_bgcolour,
-'$pre_txtcolour' => $pre_txtcolour,
-'$notif_itemcolour' => $notif_itemcolour,
-'$notif_itemhovercolour' => $notif_itemhovercolour,
-'$dropdown_bgcolour' => $dropdown_bgcolour,
-'$dropdown_textcolour' => $dropdown_textcolour,
-'$dropdown_txtcolhover' => $dropdown_txtcolhover,
-'$dropdown_bgcolhover' => $dropdown_bgcolhover,
-'$dropdown_bgimghover' => $dropdown_bgimghover,
-'$dropdown_togglecol' => $dropdown_togglecol,
-'$dropdown_togglebgcol' => $dropdown_togglebgcol,
-'$dropdown_bordercol' => $dropdown_bordercol,
-'$preview_backgroundimg' => $preview_backgroundimg,
-'$acpopup_bgcolour' => $acpopup_bgcolour,
-'$acpopup_bordercolour' => $acpopup_bordercolour,
-'$acpopup_tgbl_bgcolour' => $acpopup_tgbl_bgcolour,
-'$acpopup_hovercolour' => $acpopup_hovercolour,
-'$radius' => $radius,
-'$shadow' => $shadow,
-'$active_colour' => $active_colour,
-'$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,
-'$comment_indent' => $comment_indent,
-'$main_width' => $main_width,
-);
+// Apply the settings
+if(file_exists('view/theme/redbasic/css/style.css')) {
+
+	$x = file_get_contents('view/theme/redbasic/css/style.css');
+
+	// left aside is 231px + converse width
+	$main_width = (231 + intval($converse_width));
+
+	// prevent main_width smaller than 768px
+	$main_width = (($main_width < 768) ? 768 : $main_width) . 'px';
+
+	$options = array (
+		'$nav_bg' => $nav_bg,
+		'$nav_gradient_top' => $nav_gradient_top,
+		'$nav_gradient_bottom' => $nav_gradient_bottom,
+		'$nav_active_gradient_top' => $nav_active_gradient_top,
+		'$nav_active_gradient_bottom' => $nav_active_gradient_bottom,
+		'$nav_bd' => $nav_bd,
+		'$nav_icon_colour' => $nav_icon_colour,
+		'$nav_active_icon_colour' => $nav_active_icon_colour,
+		'$link_colour' => $link_colour,
+		'$banner_colour' => $banner_colour,
+		'$bgcolour' => $bgcolour,
+		'$background_image' => $background_image,
+		'$item_colour' => $item_colour,
+		'$comment_item_colour' => $comment_item_colour,
+		'$comment_border_colour' => $comment_border_colour,
+		'$toolicon_colour' => $toolicon_colour,
+		'$toolicon_activecolour' => $toolicon_activecolour,
+		'$font_size' => $font_size,
+		'$font_colour' => $font_colour,
+		'$body_font_size' => $body_font_size,
+		'$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,
+		'$comment_indent' => $comment_indent,
+		'$main_width' => $main_width,
+	);
+
+	echo str_replace(array_keys($options), array_values($options), $x);
 
-echo str_replace(array_keys($options), array_values($options), $x);    
 }
 
 if($narrow_navbar && file_exists('view/theme/redbasic/css/narrow_navbar.css')) {
diff --git a/view/theme/redbasic/schema/dark.css b/view/theme/redbasic/schema/dark.css
index 78aa27d38..02ee4707e 100644
--- a/view/theme/redbasic/schema/dark.css
+++ b/view/theme/redbasic/schema/dark.css
@@ -1,13 +1,5 @@
-.vcard {
-	border-bottom: 1px solid #333;
-}
-
-#contact-block {
-	border-bottom: 1px solid #333;
-}
-
-.widget {
-	border-bottom: 1px solid #333;
+.vcard, #contact-block, .widget {
+	border-bottom: 1px solid #fff;
 }
 
 .abook-pending-contact, .abook-permschange {
@@ -136,7 +128,6 @@ nav .dropdown-menu>li>a:hover,nav .dropdown-menu>li>a:focus{
 	background-image: none;
 }
 
-
 nav .dropdown-menu .divider{
 	background-color: #222;
 }
@@ -150,3 +141,113 @@ nav .dropdown-menu>li>a:hover,nav .dropdown-menu>li>a:focus{
 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-justified>.active>a,.nav-tabs.nav-justified>.active>a:hover,.nav-tabs.nav-justified>.active>a:focus{
+	border:1px solid #333;
+}
+
+.nav-tabs>li.active>a,.nav-tabs>li.active>a:hover,.nav-tabs>li.active>a:focus { 
+	color: #fff;
+	background-color: #111; 
+}
+
+.nav-tabs.nav-justified > li > a {
+	color: #ccc;
+}
+
+.nav-tabs > li > a:hover, .nav-tabs > li > a:focus {
+    text-decoration: underline;
+    background-color: #222;
+	color: #ccc;
+}
+
+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;
+}
+
+.group-selected, .fileas-selected, .categories-selected, .search-selected, .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;
+}
+
+.notif-item a {
+	color: #ccc;
+}
+
+.notif-item a:hover {
+	color: #fff;
+}
+
+.dropdown-menu {
+	background-color: #222; 
+}
+
+.dropdown-menu >li > a {
+	color: #ccc; 
+}
+
+.dropdown-menu > li > a:hover, .dropdown-menu > li > a:focus {
+    	color: #ddd; 
+    	background-color: #333; 
+	background-image: none;
+}
+
+.open .dropdown-toggle.btn-default {
+    color: #ccc; 
+    background-color: #222; 
+    border-color: #222; 
+}
+
+.preview {
+	background: url('../img/gray_and_black_diagonal_stripes_background_seamless.gif');
+}
+
+@media (min-width: 768px) {
+  .nav-tabs.nav-justified > li > a {
+    border-bottom: 1px solid #333;
+  }
+}
+
diff --git a/view/theme/redbasic/schema/dark.php b/view/theme/redbasic/schema/dark.php
index b3addcfff..92e703325 100644
--- a/view/theme/redbasic/schema/dark.php
+++ b/view/theme/redbasic/schema/dark.php
@@ -16,42 +16,16 @@
 		$nav_icon_colour = "#999";
 	if (! $nav_active_icon_colour)
 		$nav_active_icon_colour = "#fff";
-	if (! $navtabs_borderc)
-		$navtabs_borderc = "#333";
-	if (! $navtabs_fontcolour)
-		$navtabs_fontcolour = "#fff";
-	if (! $navtabs_bgcolour)
-		$navtabs_bgcolour = "#111";
-	if (! $navtabs_linkcolour)
-		$navtabs_linkcolour = "color: #ccc;";
-	if (! $navtabs_linkchover)
-		$navtabs_linkchover = "color: #fff;";
-	if (! $navtabs_bgchover)
-		$navtabs_bgchover = "#222";
-	if (! $navtabs_decohover)
-		$navtabs_decohover = "underline";
-	if (! $navaside_bghover)
-		$navaside_bghover = "#222";
 	if (! $link_colour)
 		$link_colour = "#fff";
-	if (! $link_font_weight)
-		$link_font_weight = "bold";
-	if (! $selected_active_colour)
-		$selected_active_colour = "#fff";
-	if (! $selected_active_deco)
-		$selected_active_deco = "underline";
 	if (! $banner_colour)
 		$banner_colour = "#999";
-	if (! $search_background)
-		$search_background = "#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 (! $genericcontent_bgcolour)
-		$genericcontent_bgcolour = "rgba(28,28,28,0.8)";
 	if (! $comment_border_colour)
 		$comment_border_colour = "rgba(28,28,28,0.8)";
 	if (! $toolicon_colour)
@@ -60,55 +34,5 @@
 		$toolicon_activecolour = '#fff';
 	if (! $font_colour)
 		$font_colour = "#ccc";
-	if (! $blockquote_colour)
-		$blockquote_colour = "#ccc";
-	if (! $blockquote_bgcolour)
-		$blockquote_bgcolour = "#1e1e1e";
-	if (! $blockquote_bordercolour)
-		$blockquote_bordercolour = "#666";
-	if (! $code_borderc)
-		$code_borderc = "#090909";
-	if (! $code_bgcolour)
-		$code_bgcolour = "#000";
-	if (! $code_txtcolour)
-		$code_txtcolour = "#fff";
-	if (! $pre_borderc)
-		$pre_borderc = "#090909";
-	if (! $pre_bgcolour)
-		$pre_bgcolour = "#000";
-	if (! $pre_txtcolour)
-		$pre_txtcolour = "#fff";
-	if (! $item_bordercolour)
-		$item_bordercolour = "#333";
-	if (! $notif_itemcolour)
-		$notif_itemcolour = "#ccc";
-	if (! $notif_itemhovercolour)
-		$notif_itemhovercolour = "#fff";
-	if (! $acpopup_bgcolour)
-		$acpopup_bgcolour = "#222";
-	if (! $acpopup_bordercolour)
-		$acpopup_bordercolour = "#333";
-	if (! $acpopup_tgbl_bgcolour)
-		$acpopup_tgbl_bgcolour = "#333";
-	if (! $acpopup_hovercolour)
-		$acpopup_hovercolour = "#fff";
-	if (! $editbuttons_bghover)
-		$editbuttons_bghover = "#222";
-	if (! $dropdown_bgcolour)
-		$dropdown_bgcolour = "#222";
-	if (! $dropdown_textcolour)
-		$dropdown_textcolour = "#ccc";
-	if (! $dropdown_txtcolhover)
-		$dropdown_txtcolhover = "#ddd";
-	if (! $dropdown_bgcolhover)
-		$dropdown_bgcolhover = "#333";
-	if (! $dropdown_bgimghover)
-		$dropdown_bgimghover = "background-image: none;";
-	if (! $dropdown_togglecol)
-		$dropdown_togglecol = "#ccc";
-	if (! $dropdown_togglebgcol)
-		$dropdown_togglebgcol = "#222";
-	if (! $dropdown_bordercol)
-		$dropdown_bordercol = "#222";
-	if (! $preview_backgroundimg)
-		$preview_backgroundimg = "gray_and_black_diagonal_stripes_background_seamless.gif";
+
+
diff --git a/view/theme/redbasic/schema/simple_black_on_white.css b/view/theme/redbasic/schema/simple_black_on_white.css
index dd47a3280..c00f3c260 100644
--- a/view/theme/redbasic/schema/simple_black_on_white.css
+++ b/view/theme/redbasic/schema/simple_black_on_white.css
@@ -1,12 +1,4 @@
-.vcard {
-	border-bottom: 1px solid #fff;
-}
-
-#contact-block {
-	border-bottom: 1px solid #fff;
-}
-
-.widget {
+.vcard, #contact-block, .widget {
 	border-bottom: 1px solid #fff;
 }
 
@@ -136,7 +128,6 @@ nav .dropdown-menu>li>a:hover,nav .dropdown-menu>li>a:focus{
 	background-image: none;
 }
 
-
 nav .dropdown-menu .divider{
 	background-color: #F5F5F5;
 }
@@ -150,3 +141,118 @@ nav .dropdown-menu>li>a:hover,nav .dropdown-menu>li>a:focus{
 nav .dropdown-menu {
 	background-color: #fff;
 }
+
+a.rateme, div.rateme {
+	border: 1px solid #fff;
+}
+
+#nav-search-text {
+	background-color: #F5F5F5;
+}
+
+.autocomplete .selected {
+	background: #F5F5F5;
+}
+
+.nav-tabs{
+	border-bottom:1px solid #000;
+}
+
+.nav-tabs.nav-justified>.active>a,.nav-tabs.nav-justified>.active>a:hover,.nav-tabs.nav-justified>.active>a:focus{
+	border:1px solid #000;
+}
+
+.nav-tabs>li.active>a,.nav-tabs>li.active>a:hover,.nav-tabs>li.active>a:focus { 
+	color: #000;
+	background-color: #fff; 
+}
+
+.nav-tabs.nav-justified > li > a {
+	color: #000;
+}
+
+.nav-tabs > li > a:hover, .nav-tabs > li > a:focus {
+    text-decoration: underline;
+    background-color: #fff;
+	color: #000;
+}
+
+aside .nav > li > a:hover, aside .nav > li > a:focus {
+	text-decoration: underline;
+	background-color: #F5F5F5;
+}
+
+a, a:visited, a:link, .fakelink, .fakelink:visited, .fakelink:link { 
+	font-weight: bold;
+}
+
+.group-selected, .fileas-selected, .categories-selected, .search-selected, .active {
+	color: #000 !important;
+	text-decoration: underline !important;
+}
+
+.generic-content-wrapper-styled {
+	background-color: rgba(255,255,255,0.8);
+}
+
+.autocomplete {
+	background: #fff;
+}
+
+blockquote {
+	background-color: #fff;
+	border-left: 3px solid #000;
+	color: #111;
+}
+
+code {
+	border: 1px solid #000;
+	background: #fff;
+	color: #000;
+}
+
+pre {
+	background: #fff;
+	color: #111;
+	border:1px solid #000;
+}
+
+.notif-item a {
+	color: #000;
+}
+
+.notif-item a:hover {
+	color: #000;
+}
+
+.dropdown-menu {
+	background-color: #fff; 
+}
+
+.dropdown-menu >li > a {
+	color: #000; 
+}
+
+.dropdown-menu > li > a:hover, .dropdown-menu > li > a:focus {
+    color: #000; 
+    background-color: #F5F5F5; 
+	background-image: none;
+}
+
+.open .dropdown-toggle.btn-default {
+    color: #000; 
+    background-color: #fff; 
+    border-color: #fff; 
+}
+
+.preview {
+	background: url('../img/gray_and_white_diagonal_stripes_background_seamless.gif');
+}
+
+@media (min-width: 768px) {
+  .nav-tabs.nav-justified > li > a {
+    border-bottom: 1px solid #000;
+  }
+}
+
+
diff --git a/view/theme/redbasic/schema/simple_black_on_white.php b/view/theme/redbasic/schema/simple_black_on_white.php
index 7c1c99a32..6853a0ed5 100644
--- a/view/theme/redbasic/schema/simple_black_on_white.php
+++ b/view/theme/redbasic/schema/simple_black_on_white.php
@@ -16,98 +16,24 @@
 		$nav_icon_colour = "#111";
 	if (! $nav_active_icon_colour)
 		$nav_active_icon_colour = "#000";
-
-	if (! $navtabs_borderc)
-		$navtabs_borderc = "#000";
-	if (! $navtabs_fontcolour)
-		$navtabs_fontcolour = "#000";
-	if (! $navtabs_bgcolour)
-		$navtabs_bgcolour = "#fff";
-	if (! $navtabs_linkcolour)
-		$navtabs_linkcolour = "color: #000;";
-	if (! $navtabs_linkchover)
-		$navtabs_linkchover = "color: #000;";
-	if (! $navtabs_bgchover)
-		$navtabs_bgchover = "#fff";
-	if (! $navtabs_decohover)
-		$navtabs_decohover = "underline";
-	if (! $navaside_bghover)
-		$navaside_bghover = "#F5F5F5";
-	if (! $link_colour)
-		$link_colour = "#000";
-	if (! $link_font_weight)
-		$link_font_weight = "bold";
-	if (! $selected_active_colour)
-		$selected_active_colour = "#000";
-	if (! $selected_active_deco)
-		$selected_active_deco = "underline";
 	if (! $banner_colour)
 		$banner_colour = "#fff";
-	if (! $search_background)
-		$search_background = "#F5F5F5";
+	if (! $link_colour)
+		$link_colour = "#000";
 	if (! $bgcolour)
 		$bgcolour = "#fff";
-	if (! $genericcontent_bgcolour)
-		$genericcontent_bgcolour = 'rgba(255,255,255,0.8)';		
+	if (! $toolicon_colour)
+		$toolicon_colour = "#111";
+	if (! $toolicon_activecolour)
+		$toolicon_activecolour = "#000";
 	if (! $item_colour)
 		$item_colour = "rgba(255,255,255,0.8)";
 	if (! $comment_item_colour)
 		$comment_item_colour = "rgba(255,255,255,0.4)";
 	if (! $comment_border_colour)
 		$comment_border_colour = "rgba(255,255,255,0.8)";
-	if (! $toolicon_colour)
-		$toolicon_colour = '#111';
-	if (! $toolicon_activecolour)
-		$toolicon_activecolour = '#000';
 	if (! $font_colour)
 		$font_colour = "#000";
-	if (! $blockquote_colour)
-		$blockquote_colour = "#111";
-	if (! $blockquote_bgcolour)
-		$blockquote_bgcolour = "#fff";
-	if (! $blockquote_bordercolour)
-		$blockquote_bordercolour = "#000";
-	if (! $code_borderc)
-		$code_borderc = "#000";
-	if (! $code_bgcolour)
-		$code_bgcolour = "#fff";
-	if (! $code_txtcolour)
-		$code_txtcolour = "#000";
-	if (! $pre_borderc)
-		$pre_borderc = "#000";
-	if (! $pre_bgcolour)
-		$pre_bgcolour = "#fff";
-	if (! $pre_txtcolour)
-		$pre_txtcolour = "#111";
-	if (! $item_bordercolour)
-		$item_bordercolour = "#000";
-	if (! $notif_itemcolour)
-		$notif_itemcolour = "#000";
-	if (! $notif_itemhovercolour)
-		$notif_itemhovercolour = "#000";
-	if (! $acpopup_bgcolour)
-		$acpopup_bgcolour = "#fff";
-	if (! $acpopup_bordercolour)
-		$acpopup_bordercolour = "#000";
-	if (! $acpopup_tgbl_bgcolour)
-		$acpopup_tgbl_bgcolour = "#fff";
-	if (! $acpopup_hovercolour)
-		$acpopup_hovercolour = "#000";
-	if (! $dropdown_bgcolour)
-		$dropdown_bgcolour = "#fff";
-	if (! $dropdown_textcolour)
-		$dropdown_textcolour = "#000";
-	if (! $dropdown_txtcolhover)
-		$dropdown_txtcolhover = "#000";
-	if (! $dropdown_bgcolhover)
-		$dropdown_bgcolhover = "#F5F5F5";
-	if (! $dropdown_bgimghover)
-		$dropdown_bgimghover = "background-image: none;";
-	if (! $dropdown_togglecol)
-		$dropdown_togglecol = "#000";
-	if (! $dropdown_togglebgcol)
-		$dropdown_togglebgcol = "#fff";
-	if (! $dropdown_bordercol)
-		$dropdown_bordercol = "#fff";
-	if (! $preview_backgroundimg)
-		$preview_backgroundimg = "gray_and_white_diagonal_stripes_background_seamless.gif";
+		
+
+		
diff --git a/view/theme/redbasic/schema/simple_green_on_black.css b/view/theme/redbasic/schema/simple_green_on_black.css
index 671465529..ce4465930 100644
--- a/view/theme/redbasic/schema/simple_green_on_black.css
+++ b/view/theme/redbasic/schema/simple_green_on_black.css
@@ -1,13 +1,5 @@
-.vcard {
-	border-bottom: 1px solid #000;
-}
-
-#contact-block {
-	border-bottom: 1px solid #000;
-}
-
-.widget {
-	border-bottom: 1px solid #000;
+.vcard, #contact-block, .widget {
+	border-bottom: 1px solid #fff;
 }
 
 .abook-pending-contact, .abook-permschange {
@@ -150,3 +142,134 @@ nav .dropdown-menu>li>a:hover,nav .dropdown-menu>li>a:focus{
 nav .dropdown-menu {
 	background-color: #000;
 }
+
+.rconnect {
+	color: #50f148;
+}
+
+a.rateme, div.rateme {
+	color: #50f148;
+	border: 1px solid #000;
+}
+
+a.rconnect, a.rateme, div.rateme {
+	color: #50f148;
+}
+
+.navbar-inverse .navbar-nav > .open > a,
+.navbar-inverse .navbar-nav > .open > a:hover,
+.navbar-inverse .navbar-nav > .open > a:focus {
+	color: #50f148;
+}
+
+#nav-search-text {
+	background-color: #000;
+}
+
+.autocomplete .selected {
+	background: #000;
+}
+
+.nav-tabs{
+	border-bottom:1px solid #143D12;
+}
+
+.nav-tabs.nav-justified>.active>a,.nav-tabs.nav-justified>.active>a:hover,.nav-tabs.nav-justified>.active>a:focus{
+	border:1px solid #143D12;
+}
+
+.nav-tabs>li.active>a,.nav-tabs>li.active>a:hover,.nav-tabs>li.active>a:focus { 
+	color: #46D43F;
+	background-color: #000; 
+}
+
+.nav-tabs.nav-justified > li > a {
+	color: #50f148;
+}
+
+.nav-tabs > li > a:hover, .nav-tabs > li > a:focus {
+    text-decoration: underline;
+    background-color: #000;
+	color: #50f148;
+}
+
+aside .nav > li > a:hover, aside .nav > li > a:focus {
+	text-decoration: underline;
+	background-color: #143D12;
+}
+
+a, a:visited, a:link, .fakelink, .fakelink:visited, .fakelink:link { 
+	font-weight: bold;
+}
+
+.group-selected, .fileas-selected, .categories-selected, .search-selected, .active {
+	color: #50f148 !important;
+	text-decoration: underline !important;
+}
+
+.generic-content-wrapper-styled {
+	background-color: rgba(0,0,0,0.8);
+}
+
+.autocomplete {
+	background: #000;
+}
+
+blockquote {
+	background-color: #000;
+	border-left: 3px solid #143D12;
+	color: #32962D;
+}
+
+code {
+	border: 1px solid #143D12;
+	background: #000;
+	color: #32962D;
+}
+
+pre {
+	background: #000;
+	color: #32962D;
+	border:1px solid #143D12;
+}
+
+.notif-item a {
+	color: #50f148;
+}
+
+.notif-item a:hover {
+	color: #50f148;
+}
+
+.dropdown-menu {
+	background-color: #000; 
+}
+
+.dropdown-menu >li > a {
+	color: #32962D; 
+}
+
+.dropdown-menu > li > a:hover, .dropdown-menu > li > a:focus {
+    color: #50f148; 
+    background-color: #143D12; 
+	background-image: none;
+}
+
+.open .dropdown-toggle.btn-default {
+    color: #50f148; 
+    background-color: #000; 
+    border-color: #143D12; 
+}
+
+.preview {
+	background: url('../img/gray_and_black_diagonal_stripes_background_seamless.gif');
+}
+
+
+@media (min-width: 768px) {
+  .nav-tabs.nav-justified > li > a {
+    border-bottom: 1px solid #143D12;
+  }
+}
+
+
diff --git a/view/theme/redbasic/schema/simple_green_on_black.php b/view/theme/redbasic/schema/simple_green_on_black.php
index 6b104a4e6..2660624d6 100644
--- a/view/theme/redbasic/schema/simple_green_on_black.php
+++ b/view/theme/redbasic/schema/simple_green_on_black.php
@@ -16,108 +16,21 @@
 		$nav_icon_colour = "#32962D";
 	if (! $nav_active_icon_colour)
 		$nav_active_icon_colour = "#50f148";
-	if (! $navtabs_borderc)
-		$navtabs_borderc = "#143D12";
-	if (! $navtabs_fontcolour)
-		$navtabs_fontcolour = "#46D43F";
-	if (! $navtabs_bgcolour)
-		$navtabs_bgcolour = "#000";
-	if (! $navtabs_linkcolour)
-		$navtabs_linkcolour = "color: #50f148;";
-	if (! $navtabs_linkchover)
-		$navtabs_linkchover = "color: #50f148;";
-	if (! $navtabs_bgchover)
-		$navtabs_bgchover = "#000";
-	if (! $navtabs_decohover)
-		$navtabs_decohover = "underline";
-if (! $navaside_bghover)
-		$navaside_bghover = "#143D12";
-	if (! $link_colour)
-		$link_colour = "#50f148";
-	if (! $link_font_weight)
-		$link_font_weight = "bold";
-	if (! $selected_active_colour)
-		$selected_active_colour = "#50f148";
-	if (! $selected_active_deco)
-		$selected_active_deco = "underline";
 	if (! $banner_colour)
 		$banner_colour = "#000";
-	if (! $search_background)
-		$search_background = "#000";
+	if (! $link_colour)
+		$link_colour = "#50f148";
 	if (! $bgcolour)
-		$bgcolour = "#000";
-	if (! $genericcontent_bgcolour)
-		$genericcontent_bgcolour = 'rgba(0,0,0,0.8)';
+		$bgcolour = "#000";		
+	if (! $toolicon_colour)
+		$toolicon_colour = "#32962D";
+	if (! $toolicon_activecolour)
+		$toolicon_activecolour = "#50f148";
 	if (! $item_colour)
 		$item_colour = "rgba(0,0,0,0.8)";
 	if (! $comment_item_colour)
 		$comment_item_colour = "rgba(0,0,0,0.4)";
 	if (! $comment_border_colour)
 		$comment_border_colour = "rgba(0,0,0,0.8)";
-	if (! $toolicon_colour)
-		$toolicon_colour = '#32962D';
-	if (! $toolicon_activecolour)
-		$toolicon_activecolour = '#50f148';
 	if (! $font_colour)
 		$font_colour = "#46D43F";
-	if (! $blockquote_colour)
-		$blockquote_colour = "#32962D";
-	if (! $blockquote_bgcolour)
-		$blockquote_bgcolour = "#000";
-	if (! $blockquote_bordercolour)
-		$blockquote_bordercolour = "#143D12";
-	if (! $code_borderc)
-		$code_borderc = "#143D12";
-	if (! $code_bgcolour)
-		$code_bgcolour = "#000";
-	if (! $code_txtcolour)
-		$code_txtcolour = "#32962D";
-	if (! $pre_borderc)
-		$pre_borderc = "#143D12";
-	if (! $pre_bgcolour)
-		$pre_bgcolour = "#000";
-	if (! $pre_txtcolour)
-		$pre_txtcolour = "#32962D";
-	if (! $item_bordercolour)
-		$item_bordercolour = "#143D12";
-	if (! $notif_itemcolour)
-		$notif_itemcolour = "#50f148";
-	if (! $notif_itemhovercolour)
-		$notif_itemhovercolour = "#50f148";
-	if (! $acpopup_bgcolour)
-		$acpopup_bgcolour = "#000";
-	if (! $acpopup_bordercolour)
-		$acpopup_bordercolour = "#143D12";
-	if (! $acpopup_tgbl_bgcolour)
-		$acpopup_tgbl_bgcolour = "#000";
-	if (! $acpopup_hovercolour)
-		$acpopup_hovercolour = "#50f148";
-	if (! $dropdown_bgcolour)
-		$dropdown_bgcolour = "#000";
-	if (! $dropdown_textcolour)
-		$dropdown_textcolour = "#32962D";
-	if (! $dropdown_txtcolhover)
-		$dropdown_txtcolhover = "#50f148";
-	if (! $dropdown_bgcolhover)
-		$dropdown_bgcolhover = "#143D12";
-	if (! $dropdown_bgimghover)
-		$dropdown_bgimghover = "background-image: none;";
-	if (! $dropdown_togglecol)
-		$dropdown_togglecol = "#50f148";
-	if (! $dropdown_togglebgcol)
-		$dropdown_togglebgcol = "#000";
-	if (! $dropdown_bordercol)
-		$dropdown_bordercol = "#143D12";
-	if (! $preview_backgroundimg)
-		$preview_backgroundimg = "gray_and_black_diagonal_stripes_background_seamless.gif";
-
-
-
-
-
-
-
-
-
-
-
diff --git a/view/theme/redbasic/schema/simple_white_on_black.css b/view/theme/redbasic/schema/simple_white_on_black.css
index 90fafd76e..3504265b9 100644
--- a/view/theme/redbasic/schema/simple_white_on_black.css
+++ b/view/theme/redbasic/schema/simple_white_on_black.css
@@ -1,6 +1,5 @@
 .vcard, #contact-block, .widget {
 	border-bottom: 1px solid #fff;
-	background-color: rgba(0,0,0,0.4);
 }
 
 .abook-pending-contact, .abook-permschange {
@@ -143,53 +142,11 @@ nav .dropdown-menu {
 	background-color: #000;
 }
 
-.rconnect {
-	color: #fff;
-	background-color: #000;
-}
-
 a.rateme, div.rateme {
-	color: #fff;
-	background-color: #000;
 	border: 1px solid #000;
 }
 
-a.rconnect, a.rateme, div.rateme {
-  color: #fff;
-}
-
-.navbar-inverse {
-	background-image: -webkit-linear-gradient(top, #000 0%, #000 100%);
-	background-image:         linear-gradient(to bottom, #000 0%, #000 100%);
-	filter: progid:DXImageTransform.Microsoft.gradient(startColorstr=#000, endColorstr=#000, GradientType=0);
-	background-color: #000;
-	border-color: #000;
-}
-
-.navbar-inverse .navbar-collapse, .navbar-inverse .navbar-toggle {
-	border-color: #000;
-}
-
-.navbar-inverse .navbar-nav > .active > a {
-	background-image: -webkit-linear-gradient(top, #000 0%, #000 100%);
-	background-image: linear-gradient(to bottom, #000 0%, #000 100%);
-	filter: progid:DXImageTransform.Microsoft.gradient(startColorstr=#000, endColorstr=#000, GradientType=0);
-}
-
-.navbar-inverse .navbar-nav > .open > a,
-.navbar-inverse .navbar-nav > .open > a:hover,
-.navbar-inverse .navbar-nav > .open > a:focus {
-	background-color: #000;
-	color: #fff;
-}
-
-.navbar-inverse .navbar-toggle:hover,
-.navbar-inverse .navbar-toggle:focus {
-	background-color: #000;
-}
-
 #nav-search-text {
-	border-color: #000;
 	background-color: #000;
 }
 
@@ -197,18 +154,6 @@ a.rconnect, a.rateme, div.rateme {
 	background: #000;
 }
 
-#nav-search-text-ac .autocomplete {
-	border: 1px solid #000;
-}
-
-#usermenu-caret, .navbar-inverse .navbar-nav > li > a {
-	color: #eee;
-}
-
-.navbar-inverse .navbar-nav > li > a:hover, .navbar-inverse .navbar-nav > li > a:focus, .navbar-inverse .navbar-nav > .active > a, .navbar-inverse .navbar-nav > .active > a:hover, .navbar-inverse .navbar-nav > .active > a:focus, .navbar-inverse .navbar-toggle .icon-bar, #nav-search-spinner, #avatar:hover + #usermenu-caret, #expand-aside, #expand-tabs {
-	color: #fff;
-}
-
 .nav-tabs{
 	border-bottom:1px solid #fff;
 }
@@ -239,19 +184,6 @@ aside .nav > li > a:hover, aside .nav > li > a:focus {
 
 a, a:visited, a:link, .fakelink, .fakelink:visited, .fakelink:link { 
 	font-weight: bold;
-	color: #fff; 
-}
-
-a:hover, .fakelink:hover, .profile-import b, .field.checkbox:hover label {
-	color: #fff; 
-}
-
-.divgrow-showmore {
-	color: #fff;
-}
-
-.field.checkbox:hover > div label {
-	border-color: #fff;
 }
 
 .group-selected, .fileas-selected, .categories-selected, .search-selected, .active {
@@ -259,58 +191,11 @@ a:hover, .fakelink:hover, .profile-import b, .field.checkbox:hover label {
 	text-decoration: underline !important;
 }
 
-header #banner {
-  color: #000;
-}
-
-body {
-	background-color: #000;
-	color: #fff;
-}
-
-.jothidden > input {
-	border: 1px solid #000;
-	background-color: #000;
-}
-
-.jothidden .bootstrap-tagsinput {
-	border-color: #000;
-	background-color: #000;
-}
-
 .generic-content-wrapper-styled {
 	background-color: rgba(0,0,0,0.8);
 }
 
-.wall-item-content-wrapper.comment, .hide-comments-outer {
-	background-color: rgba(0,0,0,0.4);
-	border-color: rgba(0,0,0,0.8);
-}
-
-#photo-view-wrapper, .wall-item-content-wrapper, .wall-item-comment-wrapper, .section-title-wrapper, .section-subtitle-wrapper, .section-content-tools-wrapper, [id^="cloud-index-"]:hover td, .cloud-index-active, [id^="webpage-list-item-"]:hover td, [id^="block-list-item-"]:hover td,
-[id^="layout-list-item-"]:hover td, [id^="menu-list-item-"]:hover td, [id^="mitem-list-item-"]:hover td, .onoffswitch-inner:after {
-	background-color: rgba(0,0,0,0.8);
-}
-
-.onoffswitch-inner:before {
-    background-color: rgba(0,0,0,0.8);
-	color: #fff;
-}
-
-.section-content-tools-wrapper, .section-content-wrapper, .section-content-wrapper-np {
-	background-color: rgba(0,0,0,0.4);
-}
-
-.tool-icons, .admin-icons, a .drop-icons, .jot-icons, .item-tool, .like-rotator, .comment-icon, .widget h3 {
-	color: #eee;
-}
-
-.profile-import input {
-	color: #fff;
-}
-
 .autocomplete {
-	color: #fff;
 	background: #000;
 }
 
@@ -364,15 +249,10 @@ pre {
 	background: url('../img/gray_and_black_diagonal_stripes_background_seamless.gif');
 }
 
-
 @media (min-width: 768px) {
   .nav-tabs.nav-justified > li > a {
     border-bottom: 1px solid #fff;
   }
 }
 
-@media screen and (max-width: 767px) {
-	aside#region_1 {
-		border-right: 1px solid #000;
-	}
-	}
+
diff --git a/view/theme/redbasic/schema/simple_white_on_black.php b/view/theme/redbasic/schema/simple_white_on_black.php
new file mode 100644
index 000000000..a76709ac9
--- /dev/null
+++ b/view/theme/redbasic/schema/simple_white_on_black.php
@@ -0,0 +1,36 @@
+<?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 = "#000";
+	if (! $nav_active_gradient_bottom)
+		$nav_active_gradient_bottom = "#000";
+	if (! $nav_bd)
+		$nav_bd = "#000";
+	if (! $nav_icon_colour)
+		$nav_icon_colour = "#eee";
+	if (! $nav_active_icon_colour)
+		$nav_active_icon_colour = "#fff";
+	if (! $banner_colour)
+		$banner_colour = "#000";
+	if (! $link_colour)
+		$link_colour = "#fff";
+	if (! $bgcolour)
+		$bgcolour = "#000";
+	if (! $toolicon_colour)
+		$toolicon_colour = "#eee";
+	if (! $toolicon_activecolour)
+		$toolicon_activecolour = "#fff";
+	if (! $item_colour)
+		$item_colour = "rgba(0,0,0,0.8)";
+	if (! $comment_item_colour)
+		$comment_item_colour = "rgba(0,0,0,0.4)";
+	if (! $comment_border_colour)
+		$comment_border_colour = "rgba(0,0,0,0.8)";
+	if (! $font_colour)
+		$font_colour = "#fff";
diff --git a/view/tpl/settings_display.tpl b/view/tpl/settings_display.tpl
index 6532b4ec1..02f679852 100755
--- a/view/tpl/settings_display.tpl
+++ b/view/tpl/settings_display.tpl
@@ -11,7 +11,7 @@
 				<div class="section-subtitle-wrapper" role="tab" id="theme-settings-title">
 					<h3>
 						<a data-toggle="collapse" data-parent="#settings" href="#theme-settings-content" aria-expanded="true" aria-controls="theme-settings-content">
-							Theme Settings
+							{{$d_tset}}
 						</a>
 					</h3>
 				</div>
@@ -34,7 +34,7 @@
 				<div class="section-subtitle-wrapper" role="tab" id="custom-settings-title">
 					<h3>
 						<a data-toggle="collapse" data-parent="#settings" href="#custom-settings-content" aria-expanded="true" aria-controls="custom-settings-content">
-							Custom Theme Settings
+							{{$d_ctset}}
 						</a>
 					</h3>
 				</div>
@@ -50,7 +50,7 @@
 				<div class="section-subtitle-wrapper" role="tab" id="content-settings-title">
 					<h3>
 						<a data-toggle="collapse" data-parent="#settings" href="#content-settings-content" aria-expanded="true" aria-controls="content-settings-content">
-							Content Settings
+							{{$d_cset}}
 						</a>
 					</h3>
 				</div>