Merge pull request #1 from friendica/master

test pull request

10 files changed, 1069 insertions, 438 deletions

diff --git a/view/theme/redbasic/css/blockmode.css b/view/theme/redbasic/css/blockmode.css
new file mode 100644
index 000000000..cc1db209e
--- /dev/null
+++ b/view/theme/redbasic/css/blockmode.css
@@ -0,0 +1,15 @@
+
+.wall-item-content.conv-list-mode {
+	max-width: 280px;
+	height:200px;
+	min-height: 200px;
+	overflow: hidden;
+}
+
+.thread-wrapper.toplevel_item.conv-list-mode {
+	width: 300px;
+	height: 300px; 
+	float: left;
+	margin-left: 5px;
+	margin-bottom: 35px;
+}
diff --git a/view/theme/redbasic/css/style.css b/view/theme/redbasic/css/style.css
index 26bb4ef92..842e7063a 100644
--- a/view/theme/redbasic/css/style.css
+++ b/view/theme/redbasic/css/style.css
@@ -9,10 +9,11 @@
 /* generals */
 html {
 	height: 100%;
+	font-size: 100%;
 }
 
 body {
-	font-family: arial,freesans,sans-serif;
+	font-family: sans-serif, arial, freesans;
 	font-size: $body_font_size;
 	background-color: $bgcolour;
 	background-image: url('$background_image');
@@ -22,8 +23,21 @@ body {
 	margin: 0px;
 	height: 100%;
 }
+
+h1, .h1, h2, .h2 {
+	font-size: 1.667em;
+}
+
+h3, .h3, h4, .h4 {
+	font-size: 1.334em;
+}
+
+h5, .h5, h6, .h6 {
+	font-size: 0.75rem;
+}
+
 .jslider {
-	font-family: arial,freesans,sans-serif;
+	font-family: sans-serif, arial, freesans;
 }
 
 abbr {
@@ -31,6 +45,10 @@ abbr {
 }
 
 /* icons */
+.tool-icons {
+	color: $toolicon_colour;
+}
+
 .icon {
   background-color: transparent ;
   background-repeat: no-repeat;
@@ -48,7 +66,7 @@ abbr {
 }
 
 a, a:visited, a:link, .fakelink, .fakelink:visited, .fakelink:link { 
-	font-weight: bold;
+	font-weight: $link_font_weight;
 	color: $link_colour; 
 	text-decoration: none; 
 }
@@ -59,21 +77,30 @@ a:hover, .fakelink:hover { color: $link_colour; text-decoration: underline; }
 	cursor: pointer;
 }
 
+a.btn-default {
+	color: #333;
+}
+
+a.btn-success {
+	color: #fff;
+}
 
 input[type="text"],
 input[type="password"],
 input[type="submit"],
+input[type="file"],
 select,
 textarea {
-	font-family: arial,freesans,sans-serif;
+	font-family: sans-serif, arial, freesans;
 	font-size: $body_font_size;
 }
 
 input {
+	padding: 5px;
+	line-height: 1.5;
 	border: 1px solid $input_border;
 	-moz-border-radius: $radiuspx;
 	border-radius: $radiuspx;	
-	padding: 3px;
 }
 
 input[type="submit"] {
@@ -81,27 +108,23 @@ input[type="submit"] {
 	font-weight: bold;
 	color: $input_linksubmit;
 	text-decoration: none;
+	padding: 6px 12px;
 }
 
 button, input, optgroup, select, textarea {
 	color: #000;
 }
 
-
 pre code {
 	border: none;
 }
 
 code {
-	font-family: Courier, monospace;
-	display: block;
-	overflow: auto;
+	font-size: 1em;
+	padding: 5px;
 	border: 1px solid $code_borderc;
 	background: $code_bgcolour;
 	color: $code_txtcolour;
-	padding: 10px;
-	margin-top: 20px; 
-	max-width: 80%;
 }
 
 pre {
@@ -110,13 +133,7 @@ pre {
 	border:1px solid $pre_borderc;
 }
 
-blockquote {
-	background-color: $blockquote_bgcolour;
-	border-left: 4px solid $blockquote_bordercolour;
-	padding: 0.4em;
-	color: $blockquote_colour;
-	margin-left: 20px;
-}
+
 
 .ccollapse-wrapper {
 	border: 1px solid #CCC;
@@ -145,6 +162,19 @@ header {
 	filter:alpha(opacity=$nav_percent_min_opacity);
 }
 
+#powered-by {
+	font-size: 0.5rem;
+	position: absolute;
+	top: 50px;
+	left: 16px;
+}
+
+#powered-by img {
+	margin-top: -2px;
+	height: 10px;
+	width: 10px;
+}
+
 .error-message {
 	color: #FF0000;
 	font-size: 1.1em;
@@ -173,6 +203,8 @@ nav #banner #logo-text a {
 }
 nav #banner #logo-text a:hover { text-decoration: none; }
 
+.nav-channel-select { margin-left: 8px; }
+
 header #banner {
 /*  overflow: hidden; */
   text-align: center;
@@ -238,21 +270,6 @@ footer {
 	margin-bottom: 15px;
 }
 
-aside ul {
-	list-style-type: none;
-	margin: 0;
-	padding: 0;
-	/* border-left: 1px solid #eee; This and a 5px left border on the li is "interesting" 
-	   to delineate the list from the surrounding bits 
-	*/
-}
-
-aside li {
-	margin-top: 5px;
-	/* in order to achieve consistent indentation cross-browser, set margin-left on the li element e.g. */
-	/* margin-left: 10px; */
-}
-
 /*TODO: we should use one class for all this. */
 .group-selected, .fileas-selected, .categories-selected, .search-selected, .active {
 	color: $selected_active_colour !important;
@@ -284,16 +301,16 @@ aside li {
 #main-login #id_remember {
 	float: left;
 	padding: 0;
-	margin-top: 15px;
 	margin-bottom: 0;
+	margin-left: 0;
 	width: 20px;
 }
 
-#main-login .field.checkbox label {
-	margin-top: 15px;
+#main-login .field.checkbox > label {
 	margin-bottom: 0;
 	float: left;
 	width: 100px;
+	padding-left: 0;
 }
 
 #main-login .field_end {
@@ -350,68 +367,70 @@ aside li {
 	clear: both;
 }
 
-
-.aprofile dt {
-	font-weight: bold;
-}
 #page-profile .title {
 	font-weight: bold;
 }
 
+#profile-edit-wrapper .field {
+	margin-top: 20px;
+}
+#profile-edit-wrapper .field > label {
+	width: 175px;
+}
 
-#profile-vcard-break {
-	clear: both;
+#profile-edit-wrapper .field input[type="text"] {
+	width: 220px;
 }
 
 
-#profile-edit-links ul {
-	list-style-type: none;
+#profile-edit-links {
+	max-width: $converse_width;
+	padding-top: 15px;
+	padding-bottom: 15px;
 }
 
-#profile-edit-links li {
-	margin-top: 10px;
+#profile-edit-links .btn {
+	margin: 0 10px 15px 0;
 }
 
-#profile-like {
-	margin-left: 15px;
+.profile-import {
+	vertical-align: top;
+	text-align: left;
 }
 
-#profile-like-wrapper {
-	margin-bottom: 15px;
+.profile-import b {
+	color: $link_colour;
 }
 
+.profile-import input {
+	color: $font_colour;
+	border: none;
+}
+
+#profile-edit-drop-link {
+	color: #FFF;
+	font-weight: normal;
+}
 
 .fn {
-	padding: 0px 0px 5px 0px;
-	font-size: 120%;
 	font-weight: bold;
+	font-size: 16px;
 	color: #444444;
 }
 
 .vcard {
-	padding: 8px;
-}
-
-.vcard .title {
-	margin-bottom: 5px;
-}
-
-.vcard dl {
-	clear: both;
-	word-wrap:break-word;
-}
-
-.vcard-profile-edit-icon {
-	font-size: 1.2em;
-}
-.vcard-profile-edit-icon:hover {
-	text-decoration: none;
+	margin-bottom: 10px;
+	padding: 10px;
+	background-color: $comment_item_colour;
+	border-bottom: 1px solid $widget_brdrcolour;
+	-moz-border-radius: $radiuspx;
+	-webkit-border-radius: $radiuspx;
+	border-radius: $radiuspx;
 }
 
-.vcard .dropdown-menu {
-	position: absolute;
-	left: 200px;
-	top: 18px;
+.vcard dl  {
+	margin-top: 10px;
+	margin-bottom: 0px;
 }
 
 #profile-extra-links {
@@ -426,20 +445,23 @@ aside li {
 
 
 #profile-extra-links li {
-	margin-top: 5px;
+	margin-top: 10px;
 }
 
 
 .profile-edit-side-link {
-	opacity: 0.3;
+	padding: 3px 0px;
+	opacity: 0;
 	filter:alpha(opacity=30);
 	float: right;
 }
-.profile-edit-side-link:hover {
-	opacity: 1.0;
+
+.vcard:hover .profile-edit-side-link {
+	opacity: 1;
 	filter:alpha(opacity=100);
 }
 
+
 .view-contact-wrapper {
 	margin-top: 20px;
 	float: left;
@@ -465,11 +487,16 @@ aside li {
 
 
 #profile-photo-wrapper img {
-	padding: 12px;
-	width: 201px;
-	height: 201px;
+	padding: 10px;
+	width: 197px;
+	height: 197px;
+}
+
+#profile-photo-wrapper {
+	margin-top: 10px;
 }
 
+
 #profile-in-dir-yes-label,
 #profile-in-dir-no-label,
 #profile-in-netdir-yes-label,
@@ -555,10 +582,17 @@ aside li {
 }
 
 .app-name {
-	width: 125px;
 	overflow: none;
 }
 
+.app-container img {
+	margin-left: auto;
+	margin-right: auto;
+	width: 80px;
+	height: 80px;
+	display: block;
+}
+
 
 .pager {
   padding: 10px;
@@ -610,7 +644,7 @@ aside li {
 	list-style: none;
 }
 
-.profile-match-photo img, #photo-photo img, .directory-photo-img, .photo-album-photo, .photo-top-photo {
+.profile-match-photo img, .directory-photo-img, .photo-album-photo, .photo-top-photo {
     border-radius: $radiuspx;
     -moz-border-radius: $radiuspx;
     box-shadow: $shadowpx $shadowpx $shadowpx 0 #444444;
@@ -630,43 +664,34 @@ aside li {
 }
 
 .photo-top-photo, .photo-album-photo {
-    padding: 10px;
+ /*   padding: 10px;
     max-width: 300px;
     border: 1px solid #888888;
+*/
+  position: absolute;
+  display: block;
+/*  max-width: 100%;
+  max-height: 100%; */
+  left: 0;
+  right: 0;
+  top: 0;
+  bottom: 0;
+  margin: auto;
 }
 
-
-.photo-album-image-wrapper .caption {
- 	background-color: rgba(245, 245, 255, 0.8);
- 	border-bottom: 2px solid #CCC;
-}
-
-.photo-top-album-name {
- 	background-color: rgb(255, 255, 255);
-}
-
-#photos-upload-perms-menu, #photos-upload-perms-menu:visited, #photos-upload-perms-menu:link {
-	color: #8888FF;
-	text-decoration: none;
-	cursor: pointer;
-}
-
-#photos-upload-perms-menu:hover {
-	color: #0000FF;
-	text-decoration: underline;
-	cursor: pointer;
-}
-
-#photo-caption {
-	font-size: 110%;
-	font-weight: bold;
+.photo-top-photo-link, .photo-album-photo-link {
+  display: block;
+  width: 100%;
+  position: relative;
+  height: 0;
+  padding: 75% 0 0 0;
+  overflow: hidden;
 }
 
-#in-this-photo-text {
-	color: #0080FF;
+#photo-view-wrapper {
+	background-color: $item_colour;
 }
 
-
 #side-follow-wrapper {
 	margin-top: 20px;
 }
@@ -748,19 +773,26 @@ aside li {
 }
 
 #contact-block {
-	margin-top: 25px;
-	padding: 8px;
+	width: 100%;
+	float: left;
+	background-color: $comment_item_colour;
+	border-bottom: 1px solid $widget_brdrcolour;
+	-moz-border-radius: $radiuspx;
+	-webkit-border-radius: $radiuspx;
+	border-radius: $radiuspx;
+	padding: 10px;
+	margin-bottom:10px;
 }
 
 #contact-block-numcontacts {
 	font-weight: bold;
-	margin-bottom:8px;
+	margin-bottom:10px;
 }
 
 .contact-block-div {
 	float: left;
-	width: 50px;
-	height: 50px;
+	width: 49px;
+	height: 49px;
 }
 .contact-block-textdiv {
 	float: left;
@@ -775,8 +807,8 @@ aside li {
 	float: left;
 }
 .contact-block-img {
-	width:48px;
-	height:48px;
+	width:47px;
+	height:47px;
 }
 
 #tag-remove {
@@ -800,12 +832,9 @@ aside li {
 	margin-bottom: 25px;
 }
 
-#search-submit {
-	margin-left: 15px;
-}
 
-#search-box {
-	margin-bottom: 25px;
+#conversation-end {
+	clear: both;
 }
 
 #nav-searchbar {
@@ -827,6 +856,7 @@ aside li {
 }
 
 #nav-search-text {
+	font-size: 12px;
 	height: 20px;
 	margin: 15px;
 	padding: 0px 5px 0px 5px;
@@ -844,32 +874,6 @@ aside li {
 	font-family: FontAwesome;
 }
 
-#search-text {
-	border: 1px solid #ccc;
-	font-size: 1em;
-}
-
-#search-text::-webkit-input-placeholder {
-	font-family: FontAwesome;
-}
-
-#search-text::-moz-placeholder {
-	font-family: FontAwesome;
-}
-
-.location-label, .gender-label, .marital-label, .homepage-label {
-	float: left;
-	display: block;
-	width: 70px;
-
-}
-
-.adr, .x-gender, .marital-text, .homepage-url {
-	float: left;
-	display: block;
-	width: 130px;
-}
-
 .profile-clear {
 	clear: both;
 }
@@ -1024,7 +1028,7 @@ aside li {
     background: none repeat scroll 0% 0% $cal_bgcolour !important;
 }
 
-#fancybox-content {
+#colorbox {
 	border: 0px solid $fancybox_bgcolour;
 	background-color: $fancybox_bgcolour;
 }
@@ -1207,21 +1211,6 @@ aside li {
 	text-decoration: underline;
 }
 
-#lang-select-icon {
-	cursor: pointer;
-	position: absolute;
-	left: 4px;
-/*because of the shape, if this is lined up properly it looks like it's lined up wrong...
-lining it up too high is the only way to make it look correctly aligned.  The human
-brain is weird like that */
-	top: 2px;
-}
-
-#lang-select-icon:hover {
-	opacity: 1;
-	filter:alpha(opacity=100);
-}
-
 .notif-image {
 	height: 80px;
 	width: 80px;
@@ -1232,11 +1221,6 @@ brain is weird like that */
 	margin-bottom: 15px;
 }
 
-#cloud-index td {
-	padding:5px;
-}
-
-
 /**
  * Plugins settings
  */
@@ -1257,7 +1241,7 @@ brain is weird like that */
 	width: 100%
 }
 
-.field label {
+.field > label {
 	float: left;
 	width: 350px;
 }
@@ -1311,39 +1295,9 @@ brain is weird like that */
 .hidden { display: none!important; }
 
 .field.radio .field_help { margin-left: 0px; }
+.field.checkbox .field_help { display: inline; margin-left: 10px; }
 
 
-
-/*
- * UPDATE
- */
-.popup { 	
-	width: 100%; height: 100%;
-	top:0px; left:0px;
-	position: absolute;
-	display: none;
-}
-
-.popup .background {
-	background-color: rgba(0,0,0,128);
-	opacity: 0.5;
-	width: 100%; height: 100%;
-	position: absolute;
-	top:0px; left:0px;
-}
-.popup .panel {
-	top:25%;left:25%;width:50%;height:50%;
-	padding: 1em;
-	position: absolute;
-	border: 4px solid #000000;
-	background-color: #FFFFFF;
-}
-.popup .panel .panel_text { display: block; overflow: auto; height: 80%; } 
-.popup .panel .panel_in { width: 100%; height: 100%;	position: relative; }
-.popup .panel .panel_actions {  width: 100%; bottom: 4px; left: 0px; position: absolute; }
-.panel_text .progress { width: 50%; overflow: hidden; height: auto; border: 1px solid #cccccc; margin-bottom: 5px}
-.panel_text .progress span {float: right; display: block; width: 25%; background-color: #eeeeee; text-align: right;}
-
 /**
  * OAuth
  */
@@ -1371,97 +1325,13 @@ brain is weird like that */
 	float: left;
 }
 
-/**
- * ICONS
- */
-.iconspacer {
-	display: block; width: 16px; height: 16px;
-/*	visibility: hidden; */
-}
-
-.iconspacer:hover {
-/*	visibility: visible; */
-}
-
-.icon {
-	display: block; width: 16px; height: 16px;
-	background-image: url('../../../../images/icons.png');
-}
-.article { background-position: 0px 0px;}
-.audio { background-position: -16px 0px;}
-.block { background-position: -32px 0px;}
-.drop { background-position: -48px 0px;}
-.drophide { background-position: -64px 0px;}
-.delete { background-position: -64px 0px;}
-.edit { background-position: -80px 0px;}
-.camera { background-position: -96px 0px;}
-.dislike { background-position: -112px 0px;}
-.like { background-position: -128px 0px;}
-.link { background-position: -144px 0px;}
-
-.globe { background-position: 0px -16px;}
-.noglobe { background-position: -16px -16px;}
-.no { background-position: -32px -16px;}
-.pause { background-position: -48px -16px;}
-.play { background-position: -64px -16px;}
-.pencil { background-position: -80px -16px;}
-.small-pencil { background-position: -96px -16px;}
-.recycle { background-position: -112px -16px;}
-.remote-link { background-position: -128px -16px;}
-.share { background-position: -144px -16px;}
-
-.tools { background-position: 0px -32px;}
-.lock { background-position: -16px -32px;}
-.unlock { background-position: -32px -32px; }
-.video { background-position: -48px -32px;}
-.youtube { background-position: -64px -32px;}
-.attach { background-position: -80px -32px; }
-.language { background-position: -96px -32px; }
-.prev { background-position: -112px -32px; }
-.next { background-position: -128px -32px; }
-.on { background-position: -144px -32px; }
-
-.off { background-position: 0px -48px; }
-.tagged { background-position: -48px -48px; }
-.yellow { background-position: -64px -48px; }
-
-.icon.dim { opacity: 0.3;filter:alpha(opacity=30); }
-
-
 
 .body-attach {
 	margin-top: 10px;
 }
 
-
-
-/* autocomplete popup */
-.acpopup {
-	max-height:150px;
-	background-color:$acpopup_bgcolour;
-	overflow:auto;
-	border:1px solid $acpopup_bordercolour;
-}
-.acpopupitem {
-	background-color:$acpopup_bgcolour;
-	clear:left;
-}
-.acpopupitem.taggable {
-	background-color: $acpopup_tgbl_bgcolour;
-}
-.acpopupitem img {
-	float: left;
-	margin-right: 4px;
-}
-
-.acpopupitem:hover {
-	text-decoration: underline;
-	color: $acpopup_hovercolour;
-	cursor:pointer;
-}
-
-.acpopupitem.selected {
-	color: #FFFFFF; background: #3465A4;
+.acpopup li div.taggable {
+	color:#cc0000;
 }
 
 /* popup notifications */
@@ -1493,7 +1363,7 @@ div.jGrowl div.jGrowl-notification {
 
 #nav-search-text-ac .autocomplete {
 	position: fixed;
-	top: 51px;
+	top: 50px;
 	border: 1px solid $nav_bd;
 	border-top: none;
 }
@@ -1503,6 +1373,7 @@ div.jGrowl div.jGrowl-notification {
 	margin-left: $radiuspx;
 	border: 1px solid #ccc;
 	border-top: none;
+	width: calc(197px - $radiuspx * 2) !important;
 }
 
 #recip-ac .autocomplete,
@@ -1562,14 +1433,6 @@ a.rconnect:hover {
 	color: #0080FF;
 }
 
-#profiles-menu li a {
-	color: #ffffff;
-}
-
-#profiles-menu li a:hover {
-	color: #000000;
-}
-
 
 /* header */
 header {
@@ -1694,7 +1557,7 @@ header {
 }
 
 .contact-block-content {
-	margin-top: 8px;
+	margin-top: 10px;
 }
 .contact-block-img.archived {
 	opacity: 0.3;
@@ -1753,17 +1616,6 @@ header {
     font-size : 2.8em !important;
   }
 
-.profile-thing-list {
-	list-style-type: none;
-}
-
-.profile-thing-list img {
-	margin-bottom: 5px;
-}
-
-.profile-thing-list li {
-	margin-bottom: 15px;
-}
 
 div.page-list-item {
 margin: 20px;
@@ -1859,44 +1711,23 @@ img.mail-list-sender-photo {
 	max-width: $converse_width;
 }
 
-#jot-title,
-#jot-category,
-#jot-pagetitle {
+.jothidden {
 	font-weight: bold;
-	border: solid 1px #ffffff;
 	border-radius: $radiuspx;
 }
 
-#jot-category::-webkit-input-placeholder {
+.jothidden input::-webkit-input-placeholder {
 	font-weight: bold;
 }
 
-#jot-category:-moz-placeholder {
+.jothidden input::-moz-placeholder {
 	font-weight: bold;
 }
 
-#jot-title::-webkit-input-placeholder {
-	font-weight: bold;
+.jothidden >input, .jothidden >input {
+	border: 1px solid #fff;
 }
-
-#jot-title:-moz-placeholder {
-	font-weight: bold;
-}
-
-#jot-pagetitle::-webkit-input-placeholder {
-	font-weight: bold;
-}
-
-#jot-pagetitle:-moz-placeholder {
-	font-weight: bold;
-}
-
-#jot-title:hover,
-#jot-title:focus,
-#jot-pagetitle:hover,
-#jot-pagetitle:focus,
-#jot-category:hover,
-#jot-category:focus {
+.jothidden >input:hover, .jothidden >input:focus {
 	border: 1px solid #cccccc;
 }
 
@@ -1908,11 +1739,11 @@ img.mail-list-sender-photo {
 }
 
 #profile-jot-text::-webkit-input-placeholder {
-	font-size:18px;
+	font-size:16px;
 }
 
 #profile-jot-text::-moz-placeholder {
-	font-size:18px;
+	font-size:16px;
 }
 
 #profile-jot-text:focus::-webkit-input-placeholder {
@@ -1932,13 +1763,16 @@ img.mail-list-sender-photo {
 	color: #777;
 }
 
-#jot-perms-icon,
 .jot-icons {
 	color: $toolicon_colour;
 }
 
 /* conversation */
 
+.wall-item-title {
+   font-size: $font_size;
+}
+
 .hide-comments-outer,
 .thread-wrapper .wall-item-comment-wrapper,
 .wall-item-content-wrapper.comment {
@@ -1952,13 +1786,16 @@ img.mail-list-sender-photo {
 .wall-item-content-wrapper {
 	background-color: $item_colour;
 	padding: 10px;
-}
-
-.wall-item-content-wrapper {
 	border-top-right-radius: $radiuspx;
 	border-top-left-radius: $radiuspx;
 }
 
+.generic-content-wrapper-styled {
+	background-color: $genericcontent_bgcolour;
+	padding: 10px;
+	border-radius: $radiuspx;
+}
+
 .comment .wall-item-body {
 	padding-left: $comment_padding;
 }
@@ -2028,11 +1865,11 @@ img.mail-list-sender-photo {
 
 .wall-item-ago {
 	color: #777;
-	font-size: 0.8em;
+	font-size: 0.833em;
 }
 
 .wall-item-ago i {
-	font-size: 0.8em;
+	font-size: 0.833em;
 }
 
 .wall-item-content {
@@ -2050,7 +1887,7 @@ img.mail-list-sender-photo {
 }
 
 .comment-icon {
-	font-size: 0.8em;
+	font-size: 0.833em;
 	color: $toolicon_colour;
 }
 
@@ -2062,7 +1899,7 @@ img.mail-list-sender-photo {
 
 .comment-edit-text-empty {
 	color: gray;
-	font-size: 11px;
+	font-size: 12px;
 }
 
 .comment-edit-text-full {
@@ -2076,7 +1913,7 @@ img.mail-list-sender-photo {
 	border-bottom-right-radius: $radiuspx;
 	border-bottom-left-radius: $radiuspx;
 	text-align: center;
-	font-weight: bold;
+	font-size: $body_font_size;
 	color: $link_colour;
 	cursor: pointer;	
 }
@@ -2090,6 +1927,7 @@ img.mail-list-sender-photo {
 /* widgets */
 
 .widget {
+	background-color: $comment_item_colour;
 	border-bottom: 1px solid $widget_brdrcolour;
 	-moz-border-radius: $radiuspx;
 	-webkit-border-radius: $radiuspx;
@@ -2106,10 +1944,6 @@ img.mail-list-sender-photo {
 	-moz-border-radius: $radiuspx;
 }
 
-#saved-search-ul {
-	list-style-type: none;
-}
-
 .fileas-ul {
 	list-style-type: none;
 }
@@ -2119,15 +1953,6 @@ img.mail-list-sender-photo {
 	border-radius: $radiuspx;
 	-moz-border-radius: $radiuspx;
 }
-/*
-.categories-ul {
-	list-style-type: none;
-}
-
-#sidebar-group-list ul, #posted-date-selector {
-	list-style-type: none;
-}
-*/
 
 .profile-thing-list img, .thing-show img, .thing-edit-links a {
 	margin-top: 8px;
@@ -2138,6 +1963,10 @@ img.mail-list-sender-photo {
 	background-color: $abookself_bgcolour;
 }
 
+.abook-pending-contact, .abook-permschange {
+	background: $abook_changebg;
+}
+
 .online-now {
 	color: red;
 	cursor: pointer;
@@ -2149,27 +1978,13 @@ img.mail-list-sender-photo {
 
 .chat-item-text {
 	border-radius: $radiuspx;
-	background-color: #eee;
+	background-color: $chat_txtbgcol;
 }
 
 /* nav bootstrap */
 
-nav i {
-	font-size: 14px;
-}
 
 nav img {
-	height: 47px;
-	width: 47px;
-	margin-top: 2px;
-	border-radius: $radiuspx;
-}
-
-nav ul li {
-	max-height: 50px
-}
-
-nav .badge {
 	border-radius: $radiuspx;
 }
 
@@ -2204,18 +2019,75 @@ nav .dropdown-menu>li>a:hover,nav .dropdown-menu>li>a:focus{
 	color: $nav_active_icon_colour;
 }
 
-/* Files */
+.section-title-wrapper {
+	padding: 7px 10px;
+	background-color: $item_colour;
+	border-top-left-radius: $radiuspx;
+	border-top-right-radius: $radiuspx;
+	margin-bottom: 3px;
+}
 
-#attach-edit-perms {
-	margin-top: 25px;
-	margin-bottom: 20px;
-	font-weight: bold;
-	font-size: 17px;
+.section-title-wrapper h2 {
+	margin-top: 0px;
+	margin-bottom: 0px;
+}
+
+.section-content-tools-wrapper {
+	padding: 7px 10px;
+	background-color: $comment_item_colour;
+	margin-bottom: 3px;
+}
+
+.section-content-wrapper {
+	padding: 7px 10px;
+	background-color: $comment_item_colour;
+	border-bottom-left-radius: $radiuspx;
+	border-bottom-right-radius: $radiuspx;
+}
+
+.section-content-wrapper-np {
+	background-color: $comment_item_colour;
+	border-bottom-left-radius: $radiuspx;
+	border-bottom-right-radius: $radiuspx;
+}
+
+[id^="cloud-index-"]:hover,
+.cloud-index-active {
+	background-color: $item_colour;
 }
 
 /* bootstrap overrides */
+
 blockquote {
-	font-size: $body_font_size;
+	font-size: $font_size;
+	font-style: italic;
+	background-color: $blockquote_bgcolour;
+	border-left: 3px solid $blockquote_bordercolour;
+	padding: 0.4em;
+	color: $blockquote_colour;
+	margin: 0px 0px 0px 20px;
+}
+
+.badge {
+	border-radius: $radiuspx;
+}
+
+nav .badge:hover {
+	background-color: #999;
+}
+
+nav .badge.home-update,
+nav .badge.notify-update,
+nav .badge.intro-update,
+nav .badge.mail-update {
+	background-color:#C9302C;
+}
+
+nav .badge.home-update:hover,
+nav .badge.notify-update:hover,
+nav .badge.intro-update:hover,
+nav .badge.mail-update:hover {
+	background-color:#D9534F;
 }
 
 .dropdown-menu {
@@ -2235,6 +2107,11 @@ blockquote {
 	$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;
 }
@@ -2265,6 +2142,7 @@ blockquote {
 
 
 .navbar-inverse .navbar-nav > li > a {
+	font-size: 12px;
 	color: $nav_icon_colour;
 	text-shadow: 0px 0px 0px;
 }
@@ -2347,6 +2225,14 @@ blockquote {
   }
 }
 
+.btn {
+	font-size: $body_font_size;
+}
+
+.btn-xs {
+	font-size: 0.75rem;
+}
+
 .btn-default {
     	background-color: $editbuttons_bgcolour;
     	border-color: $editbuttons_bordercolour;
@@ -2356,7 +2242,7 @@ blockquote {
 }
 
 .btn-default:hover, .btn-default:focus, .btn-default:active .btn-default.active {
-    	background-color: $editbuttons_bghover;
+	background-color: $editbuttons_bghover;
 	border-color: $editbuttons_bordercolourhover;
 	color: $input_colourhover;
 	text-decoration: $input_decohover;
@@ -2366,13 +2252,19 @@ blockquote {
     	text-decoration: none;
 }
 
+.alert-info {
+	color: $alert_txtcolour;
+	background-color:$alert_bgcolour;
+	border-color: $alert_bordercol;
+	background-image: linear-gradient(to bottom, $alert_bgcolour 0px, $alert_gradientcol 100%);
+}
+
 .well {
 	background-color: $advperm_bgcolour;
 	border: 1px solid $advperm_bordercol;
 	background-image: linear-gradient(to bottom, $advperm_gradientcol 0px, $advperm_bgcolour 100%);
 }
 
-
 @media screen and (max-width: 767px) {
 	aside#region_1 {
 		background: rgba(0, 0, 0, .1);
@@ -2414,3 +2306,113 @@ blockquote {
 	}
 
 }
+
+/* release the navbar in landscape view on small devices */
+@media screen and (max-height: 320px) {
+	.navbar-fixed-top {
+		position: absolute;
+	}
+}
+
+.shareable_element_text {
+	height: 300px;
+	width: 300px;
+}
+
+.bb_observer {
+	color: red;
+}
+
+.bb_observer img {
+	border: 3px solid red !important;
+}
+
+.bootstrap-tagsinput .tag:before {
+	/* Copied from icon-asterisk, is there a better way to do it? */
+	font-family: FontAwesome;
+	font-weight: normal;
+	font-style: normal;
+	text-decoration: inherit;
+	content:"\f069";
+}
+
+/* Modified original CSS to match input in Redbasic */
+.bootstrap-tagsinput {
+	border-color:#fff;
+	background-color: #fff;
+	box-shadow: none;
+	display: inline-block;
+	border-radius: $radiuspx;
+	cursor: text;
+	padding: 0 6px;
+	width: 70% !important;
+}
+
+.jothidden .bootstrap-tagsinput:hover, .jothidden .bootstrap-tagsinput:focus {
+	border: 1px solid #cccccc;
+}
+
+/* Abusing theme-green is less work than makeing a new new one */
+.theme-green .back-bar .selected-bar { background-color: #000000; background-image: none; !important }
+
+
+/* Turn checkboxes into switches */
+.field.checkbox .fieldhelp { vertical-align:top; }
+.field.checkbox > div {
+    position: relative; width: 70px;
+    -webkit-user-select:none; -moz-user-select:none; -ms-user-select: none;
+    display:inline-block;
+}
+
+.field.checkbox input {
+    display: none;
+}
+
+.field.checkbox > div label {
+    display: block; overflow: hidden; cursor: pointer;
+    border: 2px solid #999999;
+    border-radius: 20px;
+    margin:0px;
+}
+
+.onoffswitch-inner {
+    display: block; width: 200%; margin-left: -100%;
+    -moz-transition: margin 0.3s ease-in 0s; -webkit-transition: margin 0.3s ease-in 0s;
+    -o-transition: margin 0.3s ease-in 0s; transition: margin 0.3s ease-in 0s;
+}
+
+.onoffswitch-inner:before, .onoffswitch-inner:after {
+    display: block; float: left; width: 50%; height: 20px; padding: 0; line-height:20px;
+    -moz-box-sizing: border-box; -webkit-box-sizing: border-box; box-sizing: border-box;
+}
+
+.onoffswitch-inner:before {
+    content: attr(data-on);
+    padding-left: 10px;
+    background-color: #EEEEEE;
+}
+
+.onoffswitch-inner:after {
+    content: attr(data-off);
+    padding-right: 10px;
+    background-color: #EEEEEE; color: #999999;
+    text-align: right;
+}
+
+.onoffswitch-switch {
+    display: block; width: 25px; margin-left: 6px; margin-right: 6px; margin-top:5%; margin-bottom:5%;
+    background: #A1A1A1;
+    border: 2px solid #999999; border-radius: 20px;
+    position: absolute; top: 0; bottom: 0; right: 36px;
+    -moz-transition: all 0.3s ease-in 0s; -webkit-transition: all 0.3s ease-in 0s;
+    -o-transition: all 0.3s ease-in 0s; transition: all 0.3s ease-in 0s;
+}
+
+.field.checkbox > div > input:checked + label .onoffswitch-inner {
+    margin-left: 0;
+}
+
+.field.checkbox > div > input:checked + label .onoffswitch-switch {
+    right: -2px;
+    background-color: #27A1CA;
+}
diff --git a/view/theme/redbasic/php/config.php b/view/theme/redbasic/php/config.php
index f02e2ad3d..bfef8216c 100644
--- a/view/theme/redbasic/php/config.php
+++ b/view/theme/redbasic/php/config.php
@@ -102,27 +102,27 @@ if(feature_enabled(local_user(),'expert'))
 		'$title' => t("Theme settings"),
 		'$schema' => array('redbasic_schema', t('Set scheme'), $arr['schema'], '', $scheme_choices),
 		'$narrow_navbar' => array('redbasic_narrow_navbar',t('Narrow navbar'),$arr['narrow_navbar']),		
-		'$nav_bg' => array('redbasic_nav_bg', t('Navigation bar background colour'), $arr['nav_bg']),
-		'$nav_gradient_top' => array('redbasic_nav_gradient_top', t('Navigation bar gradient top colour'), $arr['nav_gradient_top']),
-		'$nav_gradient_bottom' => array('redbasic_nav_gradient_bottom', t('Navigation bar gradient bottom colour'), $arr['nav_gradient_bottom']),
-		'$nav_active_gradient_top' => array('redbasic_nav_active_gradient_top', t('Navigation active button gradient top colour'), $arr['nav_active_gradient_top']),
-		'$nav_active_gradient_bottom' => array('redbasic_nav_active_gradient_bottom', t('Navigation active button gradient bottom colour'), $arr['nav_active_gradient_bottom']),
-		'$nav_bd' => array('redbasic_nav_bd', t('Navigation bar border colour '), $arr['nav_bd']),
-		'$nav_icon_colour' => array('redbasic_nav_icon_colour', t('Navigation bar icon colour '), $arr['nav_icon_colour']),
-		'$nav_active_icon_colour' => array('redbasic_nav_active_icon_colour', t('Navigation bar active icon colour '), $arr['nav_active_icon_colour']),
-		'$link_colour' => array('redbasic_link_colour', t('link colour'), $arr['link_colour'], '', $link_colours),
-		'$banner_colour' => array('redbasic_banner_colour', t('Set font-colour for banner'), $arr['banner_colour']),
-		'$bgcolour' => array('redbasic_background_colour', t('Set the background colour'), $arr['bgcolour']),
+		'$nav_bg' => array('redbasic_nav_bg', t('Navigation bar background color'), $arr['nav_bg']),
+		'$nav_gradient_top' => array('redbasic_nav_gradient_top', t('Navigation bar gradient top color'), $arr['nav_gradient_top']),
+		'$nav_gradient_bottom' => array('redbasic_nav_gradient_bottom', t('Navigation bar gradient bottom color'), $arr['nav_gradient_bottom']),
+		'$nav_active_gradient_top' => array('redbasic_nav_active_gradient_top', t('Navigation active button gradient top color'), $arr['nav_active_gradient_top']),
+		'$nav_active_gradient_bottom' => array('redbasic_nav_active_gradient_bottom', t('Navigation active button gradient bottom color'), $arr['nav_active_gradient_bottom']),
+		'$nav_bd' => array('redbasic_nav_bd', t('Navigation bar border color '), $arr['nav_bd']),
+		'$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),
+		'$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']),
-		'$item_colour' => array('redbasic_item_colour', t('Set the background colour of items'), $arr['item_colour']),
-		'$comment_item_colour' => array('redbasic_comment_item_colour', t('Set the background colour of comments'), $arr['comment_item_colour']),
-		'$comment_border_colour' => array('redbasic_comment_border_colour', t('Set the border colour of comments'), $arr['comment_border_colour']),
+		'$item_colour' => array('redbasic_item_colour', t('Set the background color of items'), $arr['item_colour']),
+		'$comment_item_colour' => array('redbasic_comment_item_colour', t('Set the background color of comments'), $arr['comment_item_colour']),
+		'$comment_border_colour' => array('redbasic_comment_border_colour', t('Set the border color of comments'), $arr['comment_border_colour']),
 		'$comment_indent' => array('redbasic_comment_indent', t('Set the indent for comments'), $arr['comment_indent']),
-		'$toolicon_colour' => array('redbasic_toolicon_colour',t('Set the basic colour for item icons'),$arr['toolicon_colour']),
-		'$toolicon_activecolour' => array('redbasic_toolicon_activecolour',t('Set the hover colour for item icons'),$arr['toolicon_activecolour']),
+		'$toolicon_colour' => array('redbasic_toolicon_colour',t('Set the basic color for item icons'),$arr['toolicon_colour']),
+		'$toolicon_activecolour' => array('redbasic_toolicon_activecolour',t('Set the hover color for item icons'),$arr['toolicon_activecolour']),
 		'$body_font_size' => array('redbasic_body_font_size', t('Set font-size for the entire application'), $arr['body_font_size']),
 		'$font_size' => array('redbasic_font_size', t('Set font-size for posts and comments'), $arr['font_size']),
-		'$font_colour' => array('redbasic_font_colour', t('Set font-colour for posts and comments'), $arr['font_colour']),
+		'$font_colour' => array('redbasic_font_colour', t('Set font-color for posts and comments'), $arr['font_colour']),
 		'$radius' => array('redbasic_radius', t('Set radius of corners'), $arr['radius']),
 		'$shadow' => array('redbasic_shadow', t('Set shadow depth of photos'), $arr['shadow']),
 		'$converse_width' => array('redbasic_converse_width',t('Set maximum width of conversation regions'),$arr['converse_width']),
diff --git a/view/theme/redbasic/php/style.php b/view/theme/redbasic/php/style.php
index 23d9c695f..5d44a9b9d 100644
--- a/view/theme/redbasic/php/style.php
+++ b/view/theme/redbasic/php/style.php
@@ -64,7 +64,7 @@ if(! $a->install) {
 		// 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';
+				    $schemefile = 'view/theme/redbasic/schema/default.php';
 				    require_once ($schemefile);
 				    }
 			}
@@ -108,7 +108,11 @@ if(! $a->install) {
 	if (! $navtabs_bgchover)
 		$navtabs_bgchover = "rgba(238,238,238,0.8)";
 	if (! $link_colour)
-		$link_colour = "#428BCA";
+		$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)
@@ -121,6 +125,8 @@ if(! $a->install) {
 		$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)
@@ -130,9 +136,9 @@ if(! $a->install) {
 	if (! $item_opacity)
 		$item_opacity = "1";
 	if (! $font_size)
-		$font_size = "1.0em";
+		$font_size = "0.9rem";
 	if (! $body_font_size)
-		$body_font_size = "11px";
+		$body_font_size = "0.75rem";
 	if (! $font_colour)
 		$font_colour = "#4d4d4d";
 	if (! $selected_active_colour)
@@ -140,19 +146,19 @@ if(! $a->install) {
 	if (! $selected_active_deco)
 		$selected_active_deco = "none";
 	if (! $widget_brdrcolour)
-		$widget_brdrcolour = "#eec";
+		$widget_brdrcolour = "rgba(238,238,238,0.8)";
 	if (! $blockquote_colour)
-		$blockquote_colour = "#000";
+		$blockquote_colour = "#4d4d4d";
 	if (! $blockquote_bgcolour)
-		$blockquote_bgcolour = "#f4f8f9";
+		$blockquote_bgcolour = "";
 	if (! $blockquote_bordercolour)
-		$blockquote_bordercolour = "#dae4ee";
+		$blockquote_bordercolour = "#ccc";
 	if (! $code_borderc)
-		$code_borderc = "#444";
+		$code_borderc = "#ccc";
 	if (! $code_bgcolour)
-		$code_bgcolour = "#EEE";
+		$code_bgcolour = "#ccc";
 	if (! $code_txtcolour)
-		$code_txtcolour = "#444";
+		$code_txtcolour = "#000";
 	if (! $pre_borderc)
 		$pre_borderc = "#ccc";
 	if (! $pre_bgcolour)
@@ -220,7 +226,7 @@ if(! $a->install) {
 	if (! $input_linksubmit)
 		$input_linksubmit = "#0080FF";
 	if (! $input_border)
-		$input_border = "#666";
+		$input_border = "#ccc";
 	if (! $input_colourhover)
 		$input_colourhover = "#333";
 	if (! $input_decohover)
@@ -250,16 +256,26 @@ if(! $a->install) {
 		$reply_photo = '32px';
 	if(! $infomess_bgcolour)
 		$infomess_bgcolour = "#F0F0F0";
-       	if(! $advperm_bgcolour)
-                $advperm_bgcolour = "#F5F5F5";
-        if(! $advperm_bordercol)
-                $advperm_bordercol = "#E3E3E3";
-        if(! $advperm_gradientcol)
-                $advperm_gradientcol = "#E8E8E8";
-        if(! $cal_bgcolour)
-		 $cal_bgcolour = "#FCF8E3";
-        if(! $fancybox_bgcolour)
-                $fancybox_bgcolour = "#FFF";
+	if(! $alert_txtcolour)
+      $alert_txtcolour = "#31708F";	
+	if(! $alert_bgcolour)
+      $alert_bgcolour = "#D9EDF7";
+   if(! $alert_bordercol)
+      $alert_bordercol = "#BCE8F1";
+   if(! $alert_gradientcol)
+      $alert_gradientcol = "#B9DEF0";		
+	if(! $advperm_bgcolour)
+      $advperm_bgcolour = "#F5F5F5";
+   if(! $advperm_bordercol)
+      $advperm_bordercol = "#E3E3E3";
+   if(! $advperm_gradientcol)
+      $advperm_gradientcol = "#E8E8E8";
+   if(! $cal_bgcolour)
+		$cal_bgcolour = "#FCF8E3";
+   if(! $chat_txtbgcol)
+		$chat_txtbgcol = "#EEE";
+   if(! $fancybox_bgcolour)
+      $fancybox_bgcolour = "#FFF";
 	if (!$comment_padding)
 		$comment_padding="0px";	
 	if (!$comment_border_left)
@@ -276,6 +292,8 @@ if(! $a->install) {
 		$dirpopup_txtcol="";
 	if (!$dirpopup_linkcol)
 		$dirpopup_linkcol="";
+	if (!$abook_changebg)
+		$abook_changebg="orange";
 
 	if($nav_min_opacity === false || $nav_min_opacity === '') {
 		$nav_float_min_opacity = 1.0;
@@ -310,11 +328,14 @@ $options = array (
 '$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,
@@ -382,10 +403,15 @@ $options = array (
 '$top_photo' => $top_photo,
 '$reply_photo' => $reply_photo,
 '$infomess_bgcolour' => $infomess_bgcolour,
+'$alert_txtcolour' => $alert_txtcolour,
+'$alert_bgcolour' => $alert_bgcolour,
+'$alert_bordercol' => $alert_bordercol,
+'$alert_gradientcol' => $alert_gradientcol,
 '$advperm_bgcolour' => $advperm_bgcolour,
 '$advperm_bordercol' => $advperm_bordercol,
 '$advperm_gradientcol' => $advperm_gradientcol,
 '$cal_bgcolour' => $cal_bgcolour,
+'$chat_txtbgcol' => $chat_txtbgcol,
 '$fancybox_bgcolour' => $fancybox_bgcolour,
 '$pmenu_top' => $pmenu_top,
 '$pmenu_reply' => $pmenu_reply,
@@ -400,6 +426,7 @@ $options = array (
 '$admintable_hoverbgcol' => $admintable_hoverbgcol,
 '$dirpopup_txtcol' => $dirpopup_txtcol,
 '$dirpopup_linkcol' => $dirpopup_linkcol,
+'$abook_changebg' => $abook_changebg,
 );
 
 echo str_replace(array_keys($options), array_values($options), $x);    
diff --git a/view/theme/redbasic/php/theme_init.php b/view/theme/redbasic/php/theme_init.php
index 2da04a389..dd4542e8a 100644
--- a/view/theme/redbasic/php/theme_init.php
+++ b/view/theme/redbasic/php/theme_init.php
@@ -4,15 +4,14 @@ head_add_css('library/font_awesome/css/font-awesome.min.css');
 head_add_css('library/bootstrap/css/bootstrap-theme.min.css');
 head_add_css('library/bootstrap/css/bootstrap.min.css'); 
 head_add_css('view/css/bootstrap-red.css');
-head_add_css('library/bootstrap-datetimepicker/css/bootstrap-datetimepicker.min.css');
+head_add_css('library/datetimepicker/jquery.datetimepicker.css');
 //head_add_css('library/colorpicker/css/colorpicker.css');
 head_add_css('library/bootstrap-colorpicker/dist/css/bootstrap-colorpicker.min.css');
 require_once('view/php/theme_init.php');
 
 head_add_js('library/bootstrap/js/bootstrap.min.js');
 head_add_js('library/bootstrap/js/bootbox.min.js');
-head_add_js('library/bootstrap-datetimepicker/js/moment.js');
-head_add_js('library/bootstrap-datetimepicker/js/bootstrap-datetimepicker.min.js');
+head_add_js('library/datetimepicker/jquery.datetimepicker.js');
 //head_add_js('library/colorpicker/js/colorpicker.js');
 head_add_js('library/bootstrap-colorpicker/dist/js/bootstrap-colorpicker.js');
 //head_add_js('library/bootstrap-colorpicker/src/js/docs.js');
diff --git a/view/theme/redbasic/schema/dark.php b/view/theme/redbasic/schema/dark.php
index 69fcf403f..0203d30cd 100644
--- a/view/theme/redbasic/schema/dark.php
+++ b/view/theme/redbasic/schema/dark.php
@@ -34,8 +34,12 @@
 		$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)
@@ -50,6 +54,8 @@
 		$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)
@@ -154,19 +160,31 @@
 		$abookself_bgcolour = "#251111";
 	if(! $infomess_bgcolour)
 		$infomess_bgcolour = "#333";
-        if(! $advperm_bgcolour)
-                $advperm_bgcolour = "#1E1E1E";
-        if(! $advperm_bordercol)
-                $advperm_bordercol = "#222";
-        if(! $advperm_gradientcol)
-                $advperm_gradientcol = "#111";
-        if(! $cal_bgcolour)
-                 $cal_bgcolour = "#333";
-        if(! $fancybox_bgcolour)
-                $fancybox_bgcolour = "#1E1E1E";
+	if(! $alert_txtcolour)
+      $alert_txtcolour = "#CCC";	
+	if(! $alert_bgcolour)
+      $alert_bgcolour = "#333";
+   if(! $alert_bordercol)
+      $alert_bordercol = "#444";
+   if(! $alert_gradientcol)
+      $alert_gradientcol = "#333";		
+   if(! $advperm_bgcolour)
+      $advperm_bgcolour = "#1E1E1E";
+   if(! $advperm_bordercol)
+      $advperm_bordercol = "#222";
+   if(! $advperm_gradientcol)
+      $advperm_gradientcol = "#1E1E1E";
+   if(! $cal_bgcolour)
+      $cal_bgcolour = "#333";
+   if(! $chat_txtbgcol)
+      $chat_txtbgcol = "#222";
+   if(! $fancybox_bgcolour)
+      $fancybox_bgcolour = "#1E1E1E";
 	if (!$admintable_hoverbgcol)
 		$admintable_hoverbgcol="#222";
 	if (!$dirpopup_txtcol)
 		$dirpopup_txtcol="#111";
 	if (!$dirpopup_linkcol)
 		$dirpopup_linkcol="#000";
+	if (!$abook_changebg)
+		$abook_changebg="#402900";
diff --git a/view/theme/redbasic/schema/simple_black_on_white.php b/view/theme/redbasic/schema/simple_black_on_white.php
new file mode 100644
index 000000000..ddbcae495
--- /dev/null
+++ b/view/theme/redbasic/schema/simple_black_on_white.php
@@ -0,0 +1,190 @@
+<?php
+	
+	if (! $nav_bg)
+		$nav_bg = "#fff";
+	if (! $nav_gradient_top)
+		$nav_gradient_top = "#fff";
+	if (! $nav_gradient_bottom)
+		$nav_gradient_bottom = "#fff";
+	if (! $nav_active_gradient_top)
+		$nav_active_gradient_top = "#fff";
+	if (! $nav_active_gradient_bottom)
+		$nav_active_gradient_bottom = "#fff";
+	if (! $nav_bd)
+		$nav_bd = "#fff";
+	if (! $nav_icon_colour)
+		$nav_icon_colour = "#111";
+	if (! $nav_active_icon_colour)
+		$nav_active_icon_colour = "#000";
+	if (! $navmenu_bgchover)
+		$navmenu_bgchover = "#F5F5F5";
+	if (! $navmenu_bgimage)
+		$navmenu_bgimage = "background-image: none;";
+	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 (! $bgcolour)
+		$bgcolour = "#fff";
+	if (! $genericcontent_bgcolour)
+		$genericcontent_bgcolour = 'rgba(255,255,255,0.8)';		
+	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 (! $widget_brdrcolour)
+		$widget_brdrcolour = "#fff";
+	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 (! $editbuttons_bgcolour)
+		$editbuttons_bgcolour = "#fff";
+	if (! $editbuttons_bordercolour)
+		$editbuttons_bordercolour = "#000";
+	if (! $editbuttons_colour)
+		$editbuttons_colour = "#111";
+	if (! $editbuttons_bghover)
+		$editbuttons_bghover = "#fff";
+	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";
+	if (! $notify_bgcolour)
+		$notify_bgcolour = "#fff";
+	if (! $notify_linkcolour)
+		$notify_linkcolour = "#000";	
+	if (! $notify_bghover)
+		$notify_bghover = "#fff";
+	if (! $notify_topmargin)
+		$notify_topmargin = "-1px";
+	if (! $notifyseen_bgcolour)
+		$notifyseen_bgcolour = "#fff";
+	if (! $notifyseen_linkcolour)
+		$notifyseen_linkcolour = "#fff";
+	if (! $notifyseen_bghover)
+		$notifyseen_bghover = "#fff";
+	if (! $notifyseen_linkhover)
+		$notifyseen_linkhover = "#000";
+	if (! $input_bgsubmit)
+		$input_bgsubmit = "#fff";
+	if (! $input_linksubmit)
+		$input_linksubmit = "#000";
+	if (! $input_border)
+		$input_border = "#000";
+	if (! $input_colourhover)
+		$input_colourhover = "#000";
+	if (! $input_decohover)
+		$input_decohover = "underline";
+	if (! $acl_bgcolour)
+		$acl_bgcolour = "#fff";
+	if (! $acl_bordercolour)
+		$acl_bordercolour = "#fff";
+	if (! $aclbutton_linkcolour)
+		$aclbutton_linkcolour = "color: #000;";
+	if (! $abookself_bgcolour)
+		$abookself_bgcolour = "#fff";
+	if(! $infomess_bgcolour)
+		$infomess_bgcolour = "#fff";
+	if(! $alert_txtcolour)
+      $alert_txtcolour = "#000";	
+	if(! $alert_bgcolour)
+      $alert_bgcolour = "#fff";
+   if(! $alert_bordercol)
+      $alert_bordercol = "#000";
+   if(! $alert_gradientcol)
+      $alert_gradientcol = "#fff";		
+   if(! $advperm_bgcolour)
+      $advperm_bgcolour = "#fff";
+   if(! $advperm_bordercol)
+      $advperm_bordercol = "#000";
+   if(! $advperm_gradientcol)
+      $advperm_gradientcol = "#fff";
+   if(! $cal_bgcolour)
+      $cal_bgcolour = "#fff";
+   if(! $chat_txtbgcol)
+      $chat_txtbgcol = "#fff";
+   if(! $fancybox_bgcolour)
+      $fancybox_bgcolour = "#fff";
+	if (!$admintable_hoverbgcol)
+		$admintable_hoverbgcol="#fff";
+	if (!$dirpopup_txtcol)
+		$dirpopup_txtcol="#fff";
+	if (!$dirpopup_linkcol)
+		$dirpopup_linkcol="#fff";
+	if (!$abook_changebg)
+		$abook_changebg="#fff";
diff --git a/view/theme/redbasic/schema/simple_green_on_black.php b/view/theme/redbasic/schema/simple_green_on_black.php
new file mode 100644
index 000000000..f034185f7
--- /dev/null
+++ b/view/theme/redbasic/schema/simple_green_on_black.php
@@ -0,0 +1,190 @@
+<?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 = "#32962D";
+	if (! $nav_active_icon_colour)
+		$nav_active_icon_colour = "#50f148";
+	if (! $navmenu_bgchover)
+		$navmenu_bgchover = "#143D12";
+	if (! $navmenu_bgimage)
+		$navmenu_bgimage = "background-image: none;";
+	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 (! $bgcolour)
+		$bgcolour = "#000";
+	if (! $genericcontent_bgcolour)
+		$genericcontent_bgcolour = 'rgba(0,0,0,0.8)';
+	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 (! $widget_brdrcolour)
+		$widget_brdrcolour = "#000";
+	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 (! $editbuttons_bgcolour)
+		$editbuttons_bgcolour = "#000";
+	if (! $editbuttons_bordercolour)
+		$editbuttons_bordercolour = "#143D12";
+	if (! $editbuttons_colour)
+		$editbuttons_colour = "#32962D";
+	if (! $editbuttons_bghover)
+		$editbuttons_bghover = "#000";
+	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";
+	if (! $notify_bgcolour)
+		$notify_bgcolour = "#000";
+	if (! $notify_linkcolour)
+		$notify_linkcolour = "#50f148";	
+	if (! $notify_bghover)
+		$notify_bghover = "#000";
+	if (! $notify_topmargin)
+		$notify_topmargin = "-1px";
+	if (! $notifyseen_bgcolour)
+		$notifyseen_bgcolour = "#000";
+	if (! $notifyseen_linkcolour)
+		$notifyseen_linkcolour = "#000";
+	if (! $notifyseen_bghover)
+		$notifyseen_bghover = "#000";
+	if (! $notifyseen_linkhover)
+		$notifyseen_linkhover = "#50f148";
+	if (! $input_bgsubmit)
+		$input_bgsubmit = "#000";
+	if (! $input_linksubmit)
+		$input_linksubmit = "#50f148";
+	if (! $input_border)
+		$input_border = "#143D12";
+	if (! $input_colourhover)
+		$input_colourhover = "#50f148";
+	if (! $input_decohover)
+		$input_decohover = "underline";
+	if (! $acl_bgcolour)
+		$acl_bgcolour = "#000";
+	if (! $acl_bordercolour)
+		$acl_bordercolour = "#000";
+	if (! $aclbutton_linkcolour)
+		$aclbutton_linkcolour = "color: #fff;";
+	if (! $abookself_bgcolour)
+		$abookself_bgcolour = "#000";
+	if(! $infomess_bgcolour)
+		$infomess_bgcolour = "#000";
+	if(! $alert_txtcolour)
+      $alert_txtcolour = "#50f148";	
+	if(! $alert_bgcolour)
+      $alert_bgcolour = "#000";
+   if(! $alert_bordercol)
+      $alert_bordercol = "#143D12";
+   if(! $alert_gradientcol)
+      $alert_gradientcol = "#000";		
+   if(! $advperm_bgcolour)
+      $advperm_bgcolour = "#000";
+   if(! $advperm_bordercol)
+      $advperm_bordercol = "#143D12";
+   if(! $advperm_gradientcol)
+      $advperm_gradientcol = "#000";
+   if(! $cal_bgcolour)
+      $cal_bgcolour = "#000";
+   if(! $chat_txtbgcol)
+      $chat_txtbgcol = "#000";
+   if(! $fancybox_bgcolour)
+      $fancybox_bgcolour = "#000";
+	if (!$admintable_hoverbgcol)
+		$admintable_hoverbgcol="#000";
+	if (!$dirpopup_txtcol)
+		$dirpopup_txtcol="#000";
+	if (!$dirpopup_linkcol)
+		$dirpopup_linkcol="#000";
+	if (!$abook_changebg)
+		$abook_changebg="#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..95ede29ed
--- /dev/null
+++ b/view/theme/redbasic/schema/simple_white_on_black.php
@@ -0,0 +1,190 @@
+<?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 (! $navmenu_bgchover)
+		$navmenu_bgchover = "#030303";
+	if (! $navmenu_bgimage)
+		$navmenu_bgimage = "background-image: none;";
+	if (! $navtabs_borderc)
+		$navtabs_borderc = "#fff";
+	if (! $navtabs_fontcolour)
+		$navtabs_fontcolour = "#fff";
+	if (! $navtabs_bgcolour)
+		$navtabs_bgcolour = "#000";
+	if (! $navtabs_linkcolour)
+		$navtabs_linkcolour = "color: #fff;";
+	if (! $navtabs_linkchover)
+		$navtabs_linkchover = "color: #fff;";
+	if (! $navtabs_bgchover)
+		$navtabs_bgchover = "#000";
+	if (! $navtabs_decohover)
+		$navtabs_decohover = "underline";
+	if (! $navaside_bghover)
+		$navaside_bghover = "#030303";
+	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 = "#000";
+	if (! $search_background)
+		$search_background = "#000";
+	if (! $bgcolour)
+		$bgcolour = "#000";
+	if (! $genericcontent_bgcolour)
+		$genericcontent_bgcolour ='rgba(0,0,0,0.8)';
+	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 = '#eee';
+	if (! $toolicon_activecolour)
+		$toolicon_activecolour = '#fff';
+	if (! $font_colour)
+		$font_colour = "#fff";
+	if (! $widget_brdrcolour)
+		$widget_brdrcolour = "#000";
+	if (! $blockquote_colour)
+		$blockquote_colour = "#eee";
+	if (! $blockquote_bgcolour)
+		$blockquote_bgcolour = "#000";
+	if (! $blockquote_bordercolour)
+		$blockquote_bordercolour = "#fff";
+	if (! $code_borderc)
+		$code_borderc = "#eee";
+	if (! $code_bgcolour)
+		$code_bgcolour = "#000";
+	if (! $code_txtcolour)
+		$code_txtcolour = "#eee";
+	if (! $pre_borderc)
+		$pre_borderc = "#fff";
+	if (! $pre_bgcolour)
+		$pre_bgcolour = "#000";
+	if (! $pre_txtcolour)
+		$pre_txtcolour = "#eee";
+	if (! $item_bordercolour)
+		$item_bordercolour = "#fff";
+	if (! $notif_itemcolour)
+		$notif_itemcolour = "#fff";
+	if (! $notif_itemhovercolour)
+		$notif_itemhovercolour = "#fff";
+	if (! $acpopup_bgcolour)
+		$acpopup_bgcolour = "#000";
+	if (! $acpopup_bordercolour)
+		$acpopup_bordercolour = "#fff";
+	if (! $acpopup_tgbl_bgcolour)
+		$acpopup_tgbl_bgcolour = "#000";
+	if (! $acpopup_hovercolour)
+		$acpopup_hovercolour = "#fff";
+	if (! $editbuttons_bgcolour)
+		$editbuttons_bgcolour = "#000";
+	if (! $editbuttons_bordercolour)
+		$editbuttons_bordercolour = "#fff";
+	if (! $editbuttons_colour)
+		$editbuttons_colour = "#eee";
+	if (! $editbuttons_bghover)
+		$editbuttons_bghover = "#000";
+	if (! $dropdown_bgcolour)
+		$dropdown_bgcolour = "#000";
+	if (! $dropdown_textcolour)
+		$dropdown_textcolour = "#fff";
+	if (! $dropdown_txtcolhover)
+		$dropdown_txtcolhover = "#fff";
+	if (! $dropdown_bgcolhover)
+		$dropdown_bgcolhover = "#030303";
+	if (! $dropdown_bgimghover)
+		$dropdown_bgimghover = "background-image: none;";
+	if (! $dropdown_togglecol)
+		$dropdown_togglecol = "#fff";
+	if (! $dropdown_togglebgcol)
+		$dropdown_togglebgcol = "#000";
+	if (! $dropdown_bordercol)
+		$dropdown_bordercol = "#000";
+	if (! $preview_backgroundimg)
+		$preview_backgroundimg = "gray_and_black_diagonal_stripes_background_seamless.gif";
+	if (! $notify_bgcolour)
+		$notify_bgcolour = "#000";
+	if (! $notify_linkcolour)
+		$notify_linkcolour = "#fff";	
+	if (! $notify_bghover)
+		$notify_bghover = "#000";
+	if (! $notify_topmargin)
+		$notify_topmargin = "-1px";
+	if (! $notifyseen_bgcolour)
+		$notifyseen_bgcolour = "#000";
+	if (! $notifyseen_linkcolour)
+		$notifyseen_linkcolour = "#000";
+	if (! $notifyseen_bghover)
+		$notifyseen_bghover = "#000";
+	if (! $notifyseen_linkhover)
+		$notifyseen_linkhover = "#fff";
+	if (! $input_bgsubmit)
+		$input_bgsubmit = "#000";
+	if (! $input_linksubmit)
+		$input_linksubmit = "#fff";
+	if (! $input_border)
+		$input_border = "#fff";
+	if (! $input_colourhover)
+		$input_colourhover = "#fff";
+	if (! $input_decohover)
+		$input_decohover = "underline";
+	if (! $acl_bgcolour)
+		$acl_bgcolour = "#000";
+	if (! $acl_bordercolour)
+		$acl_bordercolour = "#000";
+	if (! $aclbutton_linkcolour)
+		$aclbutton_linkcolour = "color: #fff;";
+	if (! $abookself_bgcolour)
+		$abookself_bgcolour = "#000";
+	if(! $infomess_bgcolour)
+		$infomess_bgcolour = "#000";
+	if(! $alert_txtcolour)
+      $alert_txtcolour = "#fff";	
+	if(! $alert_bgcolour)
+      $alert_bgcolour = "#000";
+   if(! $alert_bordercol)
+      $alert_bordercol = "#fff";
+   if(! $alert_gradientcol)
+      $alert_gradientcol = "#000";		
+   if(! $advperm_bgcolour)
+      $advperm_bgcolour = "#000";
+   if(! $advperm_bordercol)
+      $advperm_bordercol = "#fff";
+   if(! $advperm_gradientcol)
+      $advperm_gradientcol = "#000";
+   if(! $cal_bgcolour)
+      $cal_bgcolour = "#000";
+   if(! $chat_txtbgcol)
+      $chat_txtbgcol = "#000";
+   if(! $fancybox_bgcolour)
+      $fancybox_bgcolour = "#000";
+	if (!$admintable_hoverbgcol)
+		$admintable_hoverbgcol="#000";
+	if (!$dirpopup_txtcol)
+		$dirpopup_txtcol="#000";
+	if (!$dirpopup_linkcol)
+		$dirpopup_linkcol="#000";
+	if (!$abook_changebg)
+		$abook_changebg="#000";
diff --git a/view/theme/redbasic/tpl/theme_settings.tpl b/view/theme/redbasic/tpl/theme_settings.tpl
index 70b42b6cd..adf2e632d 100644
--- a/view/theme/redbasic/tpl/theme_settings.tpl
+++ b/view/theme/redbasic/tpl/theme_settings.tpl
@@ -34,7 +34,7 @@
 {{include file="field_input.tpl" field=$nav_min_opacity}}
 {{include file="field_input.tpl" field=$top_photo}}
 {{include file="field_input.tpl" field=$reply_photo}}
-{{include file="field_checkbox.tpl" field=$sloppy_photos}}
+{{*include file="field_checkbox.tpl" field=$sloppy_photos*}}
 <script>
 	$(function(){
 		$('#id_redbasic_nav_bg,#id_redbasic_nav_gradient_top,#id_redbasic_nav_gradient_bottom,#id_redbasic_nav_active_gradient_top,#id_redbasic_nav_active_gradient_bottom').colorpicker();