Merge pull request #8 from friendica/master

merging red master into nuvola.red

20 files changed, 791 insertions, 756 deletions

diff --git a/view/theme/redbasic/css/converse_center.css b/view/theme/redbasic/css/converse_center.css
index 3b3ecddc9..8e595e7ff 100644
--- a/view/theme/redbasic/css/converse_center.css
+++ b/view/theme/redbasic/css/converse_center.css
@@ -1,5 +1,4 @@
-body {
+main {
 	margin-left: auto;
 	margin-right: auto;
-	max-width: $body_width;
 }
diff --git a/view/theme/redbasic/css/narrow_navbar.css b/view/theme/redbasic/css/narrow_navbar.css
index cfda9760e..f403fabbf 100644
--- a/view/theme/redbasic/css/narrow_navbar.css
+++ b/view/theme/redbasic/css/narrow_navbar.css
@@ -1,29 +1,60 @@
 @media screen and (min-width: 760px) {
-.navbar-nav > li > a {padding-top:5px !important; padding-bottom:5px !important;}
-.navbar {min-height:25px !important;}
-nav img {
-height: 30px;
-width: 30px;
-margin: 2px 0px 1px 10px;
-border-radius: 0px;
+	.navbar-nav > li > a {
+		padding-top:7px !important;
+		padding-bottom:3px !important;
+	}
+
+	.navbar {
+		min-height:25px !important;
+	}
+
+	nav img {
+		height: 30px;
+		width: 30px;
+		margin-top: 1px;
+		border-radius: 4px;
+	}
+
+	.navbar-left {
+		height: 30px;
+	}
+
+	.container-fluid {
+		min-height:30px;
+	}
+
+	.collapse .navbar-collapse {
+		min-height:30px;
+	}
+
+	#nav-search-text {
+		margin:6px 15px 4px 15px;
+	}
+
+	#nav-search-spinner {
+		margin: 16px 0px 0px 25px;
+	}
+
+	header #banner {
+		margin-top:5px;
+	}
+
+	nav .dropdown-menu,
+	nav .acpopup {
+		top: 31px !important;
+	}
+
+	nav .badge {
+		position: relative;
+		top: -31px;
+		float: right;
+		font-size: 10px;
+		padding: 2px 6px;
+		cursor: pointer;
+	}
+
+	#jGrowl.top-right {
+		top: 30px;
+		right: 15px;
+	}
 }
-.navbar-left{height: 30px;}
-.container-fluid {min-height:30px;}
-.collapse .navbar-collapse {min-height:30px;}
-#nav-search-text {margin:5px;}
-header #banner {margin-top:5px;}
-nav .dropdown-menu {
-top: 33px;}
-nav .badge {
-    position: relative;
-    top: -30px;
-    float: right;
-    font-size: 10px;
-    padding: 2px 6px;
-    cursor: pointer;
-}
-#jGrowl.top-right {
-	top: 30px;
-	right: 15px;
-}
-}
\ No newline at end of file
diff --git a/view/theme/redbasic/css/style.css b/view/theme/redbasic/css/style.css
index 1ad0d5d71..f72b8a0bb 100644
--- a/view/theme/redbasic/css/style.css
+++ b/view/theme/redbasic/css/style.css
@@ -24,6 +24,10 @@ body {
 	height: 100%;
 }
 
+main {
+	max-width: $main_width;
+}
+
 h1, .h1, h2, .h2 {
 	font-size: 1.667em;
 }
@@ -81,7 +85,11 @@ a.btn-default {
 	color: #333;
 }
 
-a.btn-success {
+a.btn-success,
+a.btn-danger,
+a.btn-info,
+a.btn-warning,
+a.btn-primary {
 	color: #fff;
 }
 
@@ -98,21 +106,21 @@ textarea {
 input {
 	padding: 5px;
 	line-height: 1.5;
-	border: 1px solid $input_border;
+	border: 1px solid #ccc;
 	-moz-border-radius: $radiuspx;
 	border-radius: $radiuspx;	
 }
 
 input[type="submit"] {
-	background-color: $input_bgsubmit;
+	background-color: #F0F0F0;
 	font-weight: bold;
-	color: $input_linksubmit;
+	color: #0080FF;
 	text-decoration: none;
 	padding: 6px 12px;
 }
 
-button, input, optgroup, select, textarea {
-	color: #000;
+input, optgroup, select, textarea {
+	color: #333;
 }
 
 pre code {
@@ -183,17 +191,6 @@ header {
 	padding: 10px;
 }
 
-.info-message {
-	font-size: 1.1em;
-	border: 1px solid #444;
-	background-color: $infomess_bgcolour;
-	padding: 10px;
-	-moz-border-radius: $radiuspx;
-	border-radius: $radiuspx;	
-
-}
-
-
 nav #banner #logo-text a {
 	font-size: 40px;
 	font-weight: bold;
@@ -262,7 +259,7 @@ footer {
 }
 
 #theme-preview {
-	margin: 15px 0 15px 150px;
+	margin: 15px 0px;
 }
 
 .fakebutton {
@@ -288,75 +285,11 @@ footer {
 	margin-bottom: 10px;
 }
 
-#main-login {
+#login-main {
+	max-width: 300px;
 	margin-top: 50px;
 }
 
-#main-login #id_username, #main-login #id_password {
-	width: 200px;
-	padding: 10px;
-	float: left;
-}
-
-#main-login #id_remember {
-	float: left;
-	padding: 0;
-	margin-bottom: 0;
-	margin-left: 0;
-	width: 20px;
-}
-
-#main-login .field.checkbox > label {
-	margin-bottom: 0;
-	float: left;
-	width: 100px;
-	padding-left: 0;
-}
-
-#main-login .field_end {
-	clear: both;
-}
-
-#main-login .field.input label, #main-login .field.password label {
-	float: left;
-	width: 100px;
-}
-
-#login_standard {
-	width: 350px;
-	float: left;
-}
-
-
-#login_standard input,
-#login_openid input {
-	width: 180px;
-}
-
-#login-extra-links {
-	clear: both;
-	width: 300px;
-}
-
-#register-link {
-	float: left;
-	margin-left: 100px;
-}
-#lost-password-link {
-	float: right;
-}
-
-#login-standard-end {
-	clear: both;
-}
-
-#login-submit-button {
-
-	margin-left: 100px;
-	margin-top: 10px;
-}
-
-
 #cropimage-wrapper, #cropimage-preview-wrapper {
 	float: left;
 	padding: 30px;
@@ -371,20 +304,7 @@ footer {
 	font-weight: bold;
 }
 
-#profile-edit-wrapper .field {
-	margin-top: 20px;
-}
-#profile-edit-wrapper .field > label {
-	width: 175px;
-}
-
-#profile-edit-wrapper .field input[type="text"] {
-	width: 220px;
-}
-
-
 #profile-edit-links {
-	max-width: $converse_width;
 	padding-top: 15px;
 	padding-bottom: 15px;
 }
@@ -422,7 +342,7 @@ footer {
 	margin-bottom: 10px;
 	padding: 10px;
 	background-color: $comment_item_colour;
-	border-bottom: 1px solid $widget_brdrcolour;
+	border-bottom: 1px solid rgba(238,238,238,0.8);
 	-moz-border-radius: $radiuspx;
 	-webkit-border-radius: $radiuspx;
 	border-radius: $radiuspx;
@@ -573,18 +493,10 @@ footer {
 	font-size: 0.7em;
 }
 
-#cboxContent {
-    color: $dirpopup_txtcol;
-}
-
 #colorbox {
 	padding: 5px;
 }
 
-#cboxContent a {
-    color: $dirpopup_linkcol;
-}
-
 .app-name {
 	overflow: none;
 }
@@ -612,8 +524,8 @@ footer {
 .pager-prev,
 .pager-next,
 .pager_n { 
-	border: 1px solid $editbuttons_bordercolour;
-	background: $editbuttons_bgcolour;
+	border: 1px solid #ccc;
+	background: transparent;
 	padding: 4px;
 }
 
@@ -749,7 +661,6 @@ footer {
 
 .group-delete-wrapper {
 	float: right;
-	margin-right: 50px;
 }
 
 .rconnect {
@@ -793,7 +704,7 @@ a.rateme, div.rateme {
 	width: 100%;
 	float: left;
 	background-color: $comment_item_colour;
-	border-bottom: 1px solid $widget_brdrcolour;
+	border-bottom: 1px solid rgba(238,238,238,0.8);
 	-moz-border-radius: $radiuspx;
 	-webkit-border-radius: $radiuspx;
 	border-radius: $radiuspx;
@@ -1048,12 +959,12 @@ nav .acpopup {
 }
 
 .fc-state-highlight {
-    background: none repeat scroll 0% 0% $cal_bgcolour !important;
+	background: none repeat scroll 0% 0% #FCF8E3 !important;
 }
 
 #colorbox {
-	border: 0px solid $fancybox_bgcolour;
-	background-color: $fancybox_bgcolour;
+	border: 0px solid #fff;
+	background-color: #fff;
 	z-index: 9;
 }
 
@@ -1258,71 +1169,6 @@ nav .acpopup {
 }
  
 
-/**
- * Form fields
- */
-.field {
-	margin-bottom: 10px;
-/*	padding-bottom: 10px; */
-	overflow: auto;
-	width: 100%
-}
-
-.field > label {
-	float: left;
-	width: 350px;
-}
-
-.field input,
-.field textarea {
-	width: 400px;
-}
-.field textarea { height: 100px; }
-.field_help {
-	display: block;
-	margin-left: 350px;
-	color: #666666;
-	
-}
-
-.field input[type="checkbox"] {
-	width: 16px;
-}
-
-.field .onoff {
-	float: left;
-	width: 80px;
-	margin-right: 15px;
-}
-.field .onoff a {
-	display: block;
-	border:1px solid #666666;
-	background-image:url("../../../../images/onoff.jpg");
-	background-repeat: no-repeat;
-	padding: 4px 2px 2px 2px;
-	height: 24px;
-	text-decoration: none;
-}
-.field .onoff .off {
-	border-color:#666666;
-	padding-left: 40px;
-	background-position: left center;
-	background-color: #cccccc;
-	color: #666666;
-	text-align: right;
-}
-.field .onoff .on {
-	border-color:#204A87;
-	padding-right: 40px;
-	background-position: right center;
-	background-color: #D7E3F1;
-	color: #204A87;
-	text-align: left;
-}
-.hidden { display: none!important; }
-
-.field.radio .field_help { margin-left: 0px; }
-.field.checkbox .field_help { display: inline; margin-left: 10px; }
 
 
 /**
@@ -1519,10 +1365,6 @@ header {
 	clear: both;
 }
 
-.modal-content {
-    background-color: $acl_bgcolour;
-}
-
 #acl-search {
 	margin-top: 20px;
 	padding: 8px;
@@ -1540,7 +1382,7 @@ header {
 
 #acl-list {
 	display: block;
-	border: 1px solid $acl_bordercolour;
+	border: 1px solid #ccc;
 	overflow: auto;
 	clear: both;
 	min-height: 62px;
@@ -1554,7 +1396,7 @@ header {
 .acl-list-item {
 	width: 48%; /* fallback if browser does not support calc() */
 	width: calc(50% - 10px);
-	border: 1px solid $acl_bordercolour;
+	border: 1px solid #ccc;
 	margin: 0px 0px 10px 10px;
 	padding: 5px;
 	float: left;
@@ -1590,11 +1432,6 @@ header {
 .acl-button-hide {
 	float: right;
 	margin-left: 5px;
-	$aclbutton_linkcolour
-}
-
-#acl-showall {
-	$aclbutton_linkcolour
 }
 
 .contact-block-content {
@@ -1611,50 +1448,50 @@ header {
 .shared_header img { margin-right: 10px; }
 
 .tag1 {
-    font-size : 1.0em !important;
+    font-size : 0.9em !important;
   }
 .tag2 {
-    font-size : 1.2em !important;
+    font-size : 1.0em !important;
   }
 
 
 .tag3 {
-    font-size : 1.4em !important;
+    font-size : 1.1em !important;
   }
 
 
 .tag4 {
-    font-size : 1.6em !important;
+    font-size : 1.2em !important;
   }
 
 
 .tag5 {
-    font-size : 1.8em !important;
+    font-size : 1.3em !important;
   }
 
 
 .tag6 {
-    font-size : 2.0em !important;
+    font-size : 1.4em !important;
   }
 
 
 .tag7 {
-    font-size : 2.2em !important;
+    font-size : 1.5em !important;
   }
 
 
 .tag8 {
-    font-size : 2.4em !important;
+    font-size : 1.6em !important;
   }
 
 
 .tag9 {
-    font-size : 2.6em !important;
+    font-size : 1.7em !important;
   }
 
 
 .tag10 {
-    font-size : 2.8em !important;
+    font-size : 1.8em !important;
   }
 
 
@@ -1736,7 +1573,16 @@ text-decoration: none;
 }
 
 #adminpage table tr:hover {
-    background-color: $admintable_hoverbgcol;
+	background-color: #BBC7D7;
+}
+
+table {
+	border-spacing: 2px;
+	max-width: 100%;
+}
+
+th,td {
+	padding: 3px;
 }
 
 /* message */
@@ -1748,10 +1594,6 @@ img.mail-list-sender-photo {
 
 /* jot */
 
-#profile-jot-wrapper {
-	max-width: $converse_width;
-}
-
 .jothidden {
 	font-weight: bold;
 	border-radius: $radiuspx;
@@ -1820,10 +1662,6 @@ img.mail-list-sender-photo {
 	margin-left: $comment_indent;
 }
 
-.thread-wrapper.toplevel_item {
-	max-width: $converse_width;
-}
-
 .wall-item-content-wrapper {
 	background-color: $item_colour;
 	padding: 10px;
@@ -1837,25 +1675,22 @@ img.mail-list-sender-photo {
 	border-radius: $radiuspx;
 }
 
-.comment .wall-item-body {
-	padding-left: $comment_padding;
-}
-
 .wall-item-content-wrapper.comment {
 	background-color: $comment_item_colour;
-	border-left: $comment_border_left $comment_border_colour;
-	border-right: $comment_border_right $comment_border_colour;
-	border-bottom: $comment_border_bottom $comment_border_colour;
+	border-color: $comment_border_colour;
+	border-style: solid;
+	border-width: 0px 0px 0px 3px;
 	border-radius: 0px;
 	padding: 7px 10px 7px 7px;
 }
 
 .hide-comments-outer {
 	background-color: $comment_item_colour;
-	border-left: $comment_border_left $comment_border_colour;
-	border-right: $comment_border_right $comment_border_colour;
-	border-bottom: $comment_border_bottom $comment_border_colour;
-	border-top: 1px dashed #ccc;
+	border-color: $comment_border_colour;
+	border-top-color: #ccc;
+	border-style: solid;
+	border-top-style: dashed;
+	border-width: 1px 0px 0px 3px;
 	text-align: center;
 	border-radius: 0px;
 }
@@ -1965,7 +1800,7 @@ img.mail-list-sender-photo {
 
 .widget {
 	background-color: $comment_item_colour;
-	border-bottom: 1px solid $widget_brdrcolour;
+	border-bottom: 1px solid rgba(238,238,238,0.8);
 	-moz-border-radius: $radiuspx;
 	-webkit-border-radius: $radiuspx;
 	border-radius: $radiuspx;
@@ -1997,11 +1832,11 @@ img.mail-list-sender-photo {
 }
 
 .abook-self {
-	background-color: $abookself_bgcolour;
+	background-color: #ffdddd;
 }
 
 .abook-pending-contact, .abook-permschange {
-	background: $abook_changebg;
+	background: orange;
 }
 
 .online-now {
@@ -2015,7 +1850,7 @@ img.mail-list-sender-photo {
 
 .chat-item-text {
 	border-radius: $radiuspx;
-	background-color: $chat_txtbgcol;
+	background-color: #eee;
 }
 
 /* nav bootstrap */
@@ -2064,15 +1899,49 @@ nav .dropdown-menu>li>a:hover,nav .dropdown-menu>li>a:focus{
 	margin-bottom: 3px;
 }
 
-.section-title-wrapper h2 {
+.section-title-wrapper h2,
+.section-subtitle-wrapper h3 {
 	margin-top: 0px;
 	margin-bottom: 0px;
 }
 
+.section-subtitle-wrapper {
+	padding: 7px 10px;
+	background-color: $item_colour;
+	margin-bottom: 3px;
+}
+
 .section-content-tools-wrapper {
 	padding: 7px 10px;
 	background-color: $comment_item_colour;
+	margin-bottom: 3px
+}
+
+.section-content-info-wrapper {
+	padding: 21px 10px;
+	color: #31708f;
+	background-color: #d9edf7;
 	margin-bottom: 3px;
+	border-radius: $radiuspx;
+	text-align: center;
+}
+
+.section-content-warning-wrapper {
+	padding: 21px 10px;
+	color: #8a6d3b;
+	background-color: #fcf8e3;
+	margin-bottom: 3px;
+	border-radius: $radiuspx;
+	text-align: center;
+}
+
+.section-content-danger-wrapper {
+	padding: 21px 10px;
+	color: #a94442;
+	background-color: #f2dede;
+	margin-bottom: 3px;
+	border-radius: $radiuspx;
+	text-align: center;
 }
 
 .section-content-wrapper {
@@ -2102,6 +1971,18 @@ nav ul li .notify-unseen
 
 /* bootstrap overrides */
 
+.panel {
+  background-color: transparent;
+  border: 0px solid transparent;
+  border-radius: 0px;
+  -webkit-box-shadow: 0 0px 0px rgba(0, 0, 0, .0);
+          box-shadow: 0 0px 0px rgba(0, 0, 0, .0);
+}
+
+.panel-group .panel + .panel {
+	margin-top: 0px;
+}
+
 blockquote {
 	font-size: $font_size;
 	font-style: italic;
@@ -2278,35 +2159,7 @@ aside .nav > li > a:hover, aside .nav > li > a:focus {
 }
 
 .btn-default {
-    	background-color: $editbuttons_bgcolour;
-    	border-color: $editbuttons_bordercolour;
-	color: $editbuttons_colour;
-    	text-shadow: none;
-    	box-shadow: none;
-}
-
-.btn-default:hover, .btn-default:focus, .btn-default:active .btn-default.active {
-	background-color: $editbuttons_bghover;
-	border-color: $editbuttons_bordercolourhover;
-	color: $input_colourhover;
-	text-decoration: $input_decohover;
-}
-
-.btn-default.btn-sm:hover, .btn-default.btn-sm:focus, .btn-default.btn-sm:active .btn-default.btn-sm.active {
-    	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%);
+	background-color: transparent;
 }
 
 @media screen and (max-width: 767px) {
@@ -2402,9 +2255,8 @@ aside .nav > li > a:hover, aside .nav > li > a:focus {
 
 
 /* Turn checkboxes into switches */
-.field.checkbox .fieldhelp { vertical-align:top; }
 .field.checkbox > div {
-    position: relative; width: 70px;
+    position: relative; width: 60px;
     -webkit-user-select:none; -moz-user-select:none; -ms-user-select: none;
     display:inline-block;
 }
@@ -2415,9 +2267,20 @@ aside .nav > li > a:hover, aside .nav > li > a:focus {
 
 .field.checkbox > div label {
     display: block; overflow: hidden; cursor: pointer;
-    border: 2px solid #999999;
-    border-radius: 20px;
+    border: 1px solid #ccc;
+    border-radius: 4px;
     margin:0px;
+	-webkit-transition: border-color ease-in-out .15s, -webkit-box-shadow ease-in-out .15s;
+	-o-transition: border-color ease-in-out .15s, box-shadow ease-in-out .15s;
+	transition: border-color ease-in-out .15s, box-shadow ease-in-out .15s;
+}
+
+.field.checkbox:hover label {
+	color: $link_colour;
+}
+
+.field.checkbox:hover > div label {
+	border-color: $link_colour;
 }
 
 .onoffswitch-inner {
@@ -2433,31 +2296,37 @@ aside .nav > li > a:hover, aside .nav > li > a:focus {
 
 .onoffswitch-inner:before {
     content: attr(data-on);
-    padding-left: 10px;
-    background-color: #EEEEEE;
+    padding-right: 21px;
+    background-color: $item_colour;
+	color: $font_colour;
+    text-align: right;
 }
 
 .onoffswitch-inner:after {
     content: attr(data-off);
-    padding-right: 10px;
-    background-color: #EEEEEE; color: #999999;
-    text-align: right;
+    padding-left: 21px;
+    background-color: $item_colour; color: #ccc;
+    text-align: left;
 }
 
 .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;
+    display: block; width: 15px; margin:4px;
+    background: #ccc;
+    border-radius: 10px;
     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;
+    margin-left: 0px;
 }
 
 .field.checkbox > div > input:checked + label .onoffswitch-switch {
-    right: -2px;
-    background-color: #27A1CA;
+    right: 0px;
+    background-color: #337AB7;
+}
+
+.channels_ckbx, .pending_ckbx, .users_ckbx {
+	margin-top: -5px !important;
 }
diff --git a/view/theme/redbasic/img/screenshot.jpg b/view/theme/redbasic/img/screenshot.jpg
index 51d4cbb0d..ac9258bd6 100644
--- a/view/theme/redbasic/img/screenshot.jpg
+++ b/view/theme/redbasic/img/screenshot.jpg
diff --git a/view/theme/redbasic/js/redbasic.js b/view/theme/redbasic/js/redbasic.js
index 3db67dc87..c825b0485 100644
--- a/view/theme/redbasic/js/redbasic.js
+++ b/view/theme/redbasic/js/redbasic.js
@@ -1,52 +1,51 @@
-
+/**
+ * redbasic theme specific JavaScript
+ */
 $(document).ready(function() {
+	// CSS3 calc() fallback (for unsupported browsers)
+	$('body').append('<div id="css3-calc" style="width: 10px; width: calc(10px + 10px); display: none;"></div>');
+	if( $('#css3-calc').width() == 10) {
+		$(window).resize(function() {
+			if($(window).width() < 767) {
+				$('main').css('width', $(window).width() + 231 );
+			} else {
+				$('main').css('width', '100%' );
+			}
+		});
+	}
+	$('#css3-calc').remove(); // Remove the test element
 
-// CSS3 calc() fallback (for unsupported browsers)
-$('body').append('<div id="css3-calc" style="width: 10px; width: calc(10px + 10px); display: none;"></div>');
-if( $('#css3-calc').width() == 10) {
-	$(window).resize(function() {
-		if($(window).width() < 767) {
-			$('main').css('width', $(window).width() + 231 );
-		} else {
-			$('main').css('width', '100%' );
-		}
+	$('#expand-aside').click(function() {
+		$('#expand-aside-icon').toggleClass('icon-circle-arrow-right').toggleClass('icon-circle-arrow-left');
+		$('main').toggleClass('region_1-on');
 	});
-}
-$('#css3-calc').remove(); // Remove the test element
 
-$('#expand-aside').click(function() {
-	$('#expand-aside-icon').toggleClass('icon-circle-arrow-right').toggleClass('icon-circle-arrow-left');
-	$('main').toggleClass('region_1-on');
-});
-
-if($('aside').length && $('aside').html().length == 0) {
-	$('#expand-aside').hide();
-}
-
-$('#expand-tabs').click(function() {
-	if(!$('#tabs-collapse-1').hasClass('in')){
-		$('html, body').animate({ scrollTop: 0 }, 'slow');
+	if($('aside').length && $('aside').html().length === 0) {
+		$('#expand-aside').hide();
 	}
-	$('#expand-tabs-icon').toggleClass('icon-circle-arrow-down').toggleClass('icon-circle-arrow-up');
-});
 
-if($('#tabs-collapse-1').length == 0) {
-	$('#expand-tabs').hide();
-}
+	$('#expand-tabs').click(function() {
+		if(!$('#tabs-collapse-1').hasClass('in')){
+			$('html, body').animate({ scrollTop: 0 }, 'slow');
+		}
+		$('#expand-tabs-icon').toggleClass('icon-circle-arrow-down').toggleClass('icon-circle-arrow-up');
+	});
 
+	if($('#tabs-collapse-1').length === 0) {
+		$('#expand-tabs').hide();
+	}
 });
 
-
 $(document).ready(function(){
 	var doctitle = document.title;
 	function checkNotify() {
 		var notifyUpdateElem = document.getElementById('notify-update');
 		if(notifyUpdateElem !== null) { 
-	        if(notifyUpdateElem.innerHTML != "")
-    		    document.title = "("+notifyUpdateElem.innerHTML+") " + doctitle;
-	        else
-    		    document.title = doctitle;
+			if(notifyUpdateElem.innerHTML !== "")
+				document.title = "(" + notifyUpdateElem.innerHTML + ") " + doctitle;
+			else
+				document.title = doctitle;
 		}
-	};
+	}
 	setInterval(function () {checkNotify();}, 10 * 1000);
-});
+});
\ No newline at end of file
diff --git a/view/theme/redbasic/php/config.php b/view/theme/redbasic/php/config.php
index b072f5782..8ab31efc0 100644
--- a/view/theme/redbasic/php/config.php
+++ b/view/theme/redbasic/php/config.php
@@ -35,7 +35,6 @@ function theme_content(&$a) {
 	$arr['nav_min_opacity']=get_pconfig(local_channel(),"redbasic","nav_min_opacity");
 	$arr['top_photo']=get_pconfig(local_channel(),"redbasic","top_photo");
 	$arr['reply_photo']=get_pconfig(local_channel(),"redbasic","reply_photo");
-	$arr['sloppy_photos']=get_pconfig(local_channel(),"redbasic","sloppy_photos");
 	return redbasic_form($a, $arr);
 }
 
@@ -73,7 +72,6 @@ function theme_post(&$a) {
 		set_pconfig(local_channel(), 'redbasic', 'nav_min_opacity', $_POST['redbasic_nav_min_opacity']);
 		set_pconfig(local_channel(), 'redbasic', 'top_photo', $_POST['redbasic_top_photo']);
 		set_pconfig(local_channel(), 'redbasic', 'reply_photo', $_POST['redbasic_reply_photo']);
-		set_pconfig(local_channel(), 'redbasic', 'sloppy_photos', $_POST['redbasic_sloppy_photos']);
 	}
 }
 
@@ -100,8 +98,8 @@ if(feature_enabled(local_channel(),'expert'))
 		'$baseurl' => $a->get_baseurl(),
 		'$expert' => $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']),		
+		'$schema' => array('redbasic_schema', t('Select scheme'), $arr['schema'], '', $scheme_choices),
+		'$narrow_navbar' => array('redbasic_narrow_navbar',t('Narrow navbar'),$arr['narrow_navbar'], '', array(t('No'),t('Yes'))),
 		'$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']),
@@ -120,17 +118,16 @@ if(feature_enabled(local_channel(),'expert'))
 		'$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 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']),
+		'$body_font_size' => array('redbasic_body_font_size', t('Set font-size for the entire application'), $arr['body_font_size'], t('Example: 14px')),
 		'$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-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']),
-		'$converse_center' => array('redbasic_converse_center',t('Center conversation regions'),$arr['converse_center']),
+		'$converse_width' => array('redbasic_converse_width',t('Set maximum width of content region in pixel'),$arr['converse_width'], t('Leave empty for default width')),
+		'$converse_center' => array('redbasic_converse_center',t('Center page content'),$arr['converse_center'], '', array(t('No'),t('Yes'))),
 		'$nav_min_opacity' => array('redbasic_nav_min_opacity',t('Set minimum opacity of nav bar - to hide it'),$arr['nav_min_opacity']),
 		'$top_photo' => array('redbasic_top_photo', t('Set size of conversation author photo'), $arr['top_photo']),
 		'$reply_photo' => array('redbasic_reply_photo', t('Set size of followup author photos'), $arr['reply_photo']),
-		'$sloppy_photos' => array('redbasic_sloppy_photos',t('Sloppy photo albums'),$arr['sloppy_photos'],t('Are you a clean desk or a messy desk person?')),
 		));
 
 	return $o;
diff --git a/view/theme/redbasic/php/style.php b/view/theme/redbasic/php/style.php
index 5bc702d8c..a1b22f583 100644
--- a/view/theme/redbasic/php/style.php
+++ b/view/theme/redbasic/php/style.php
@@ -36,7 +36,6 @@ if(! $a->install) {
 		$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');
-		$sloppy_photos=get_pconfig($uid,'redbasic','sloppy_photos');
 		$top_photo=get_pconfig($uid,'redbasic','top_photo');
 		$reply_photo=get_pconfig($uid,'redbasic','reply_photo');
 
@@ -59,15 +58,23 @@ if(! $a->install) {
 			$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 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 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);
-				    }
-			}
 		
 		
 //Set some defaults - we have to do this after pulling owner settings, and we have to check for each setting
@@ -145,8 +152,6 @@ if(! $a->install) {
 		$selected_active_colour = "#444";
 	if (! $selected_active_deco)
 		$selected_active_deco = "none";
-	if (! $widget_brdrcolour)
-		$widget_brdrcolour = "rgba(238,238,238,0.8)";
 	if (! $blockquote_colour)
 		$blockquote_colour = "#4d4d4d";
 	if (! $blockquote_bgcolour)
@@ -169,16 +174,6 @@ if(! $a->install) {
 		$notif_itemcolour = "#000";
 	if (! $notif_itemhovercolour)
 		$notif_itemhovercolour = "#000";
-	if (! $editbuttons_bgcolour)
-		$editbuttons_bgcolour = "transparent";
-	if (! $editbuttons_bordercolour)
-		$editbuttons_bordercolour = "#ccc";
-	if (! $editbuttons_bordercolourhover)
-		$editbuttons_bordercolourhover = "#adadad";
-	if (! $editbuttons_colour)
-		$editbuttons_colour = "#333";
-	if (! $editbuttons_bghover)
-		$editbuttons_bghover = "#ebebeb";
 	if (! $dropdown_bgcolour)
 		$dropdown_bgcolour = "#FFF";
 	if (! $dropdown_textcolour)
@@ -221,79 +216,22 @@ if(! $a->install) {
 		$notifyseen_linkhover = "#333";
 	if (! $notify_topmargin)
 		$notify_topmargin = "1px";
-	if (! $input_bgsubmit)
-		$input_bgsubmit = "#F0F0F0";
-	if (! $input_linksubmit)
-		$input_linksubmit = "#0080FF";
-	if (! $input_border)
-		$input_border = "#ccc";
-	if (! $input_colourhover)
-		$input_colourhover = "#333";
-	if (! $input_decohover)
-		$input_decohover = "none";
+
+
 	if (! $radius)
 		$radius = "4";
 	if (! $shadow)
 		$shadow = "0";
 	if(! $active_colour)
 		$active_colour = "#fff";
-	if (! $converse_width) {
-		$converse_width = "1024px";
-	}
-	if (! $acl_bgcolour)
-		$acl_bgcolour = "#fff";
-	if (! $acl_bordercolour)
-		$acl_bordercolour = "#ccc";
-	if (! $aclbutton_linkcolour)
-		$aclbutton_linkcolour = "";
-	if (! $abookself_bgcolour)
-		$abookself_bgcolour = "#ffdddd";
+	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(! $infomess_bgcolour)
-		$infomess_bgcolour = "#F0F0F0";
-	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 = "#FFFFFF";
-	if (!$comment_padding)
-		$comment_padding="0px";	
-	if (!$comment_border_left)
-		$comment_border_left="3px solid";
-	if (!$comment_border_right)
-		$comment_border_right="0px solid";	
-	if (!$comment_border_top)
-		$comment_border_top="0px solid";		
-	if (!$comment_border_bottom)
-		$comment_border_bottom="0px solid";
-	if (!$admintable_hoverbgcol)
-		$admintable_hoverbgcol="#BBC7D7";
-	if (!$dirpopup_txtcol)
-		$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;
@@ -308,7 +246,12 @@ if(! $a->install) {
 	if(file_exists('view/theme/redbasic/css/style.css')) {
 		$x = file_get_contents('view/theme/redbasic/css/style.css');
 
-$body_width = (231 + $converse_width) . 'px'; // aside is 231px + converse width; have to find a way for calculation with 'px', cannot handle '%'
+
+// 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,
@@ -346,7 +289,6 @@ $options = array (
 '$selected_active_colour' => $selected_active_colour,
 '$selected_active_deco' => $selected_active_deco,
 '$body_font_size' => $body_font_size,
-'$widget_brdrcolour' => $widget_brdrcolour,
 '$blockquote_colour' => $blockquote_colour,
 '$blockquote_bgcolour' => $blockquote_bgcolour,
 '$blockquote_bordercolour' => $blockquote_bordercolour,
@@ -359,11 +301,6 @@ $options = array (
 '$pre_txtcolour' => $pre_txtcolour,
 '$notif_itemcolour' => $notif_itemcolour,
 '$notif_itemhovercolour' => $notif_itemhovercolour,
-'$editbuttons_bgcolour' => $editbuttons_bgcolour,
-'$editbuttons_bordercolour' => $editbuttons_bordercolour,
-'$editbuttons_bordercolourhover' => $editbuttons_bordercolourhover,
-'$editbuttons_colour' => $editbuttons_colour,
-'$editbuttons_bghover' => $editbuttons_bghover,
 '$dropdown_bgcolour' => $dropdown_bgcolour,
 '$dropdown_textcolour' => $dropdown_textcolour,
 '$dropdown_txtcolhover' => $dropdown_txtcolhover,
@@ -385,60 +322,30 @@ $options = array (
 '$notifyseen_bghover' => $notifyseen_bghover,
 '$notifyseen_linkhover' => $notifyseen_linkhover,
 '$notify_topmargin' => $notify_topmargin,
-'$input_bgsubmit' => $input_bgsubmit,
-'$input_linksubmit' => $input_linksubmit,
-'$input_border' => $input_border,
-'$input_colourhover' => $input_colourhover,
-'$input_decohover' => $input_decohover,
 '$radius' => $radius,
 '$shadow' => $shadow,
 '$active_colour' => $active_colour,
 '$converse_width' => $converse_width,
-'$acl_bgcolour' => $acl_bgcolour,
-'$acl_bordercolour' => $acl_bordercolour,
-'$aclbutton_linkcolour' => $aclbutton_linkcolour,
-'$abookself_bgcolour' => $abookself_bgcolour,
 '$nav_float_min_opacity' => $nav_float_min_opacity,
 '$nav_percent_min_opacity' => $nav_percent_min_opacity,
 '$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,
-'$wwtop' => $wwtop,
 '$comment_indent' => $comment_indent,
-'$body_width' => $body_width,
-'$comment_padding' => $comment_padding,
-'$comment_border_left' => $comment_border_left,
-'$comment_border_right' => $comment_border_right,
-'$comment_border_top' => $comment_border_top,
-'$comment_border_bottom' => $comment_border_bottom,
-'$admintable_hoverbgcol' => $admintable_hoverbgcol,
-'$dirpopup_txtcol' => $dirpopup_txtcol,
-'$dirpopup_linkcol' => $dirpopup_linkcol,
-'$abook_changebg' => $abook_changebg,
+'$main_width' => $main_width,
 );
 
 echo str_replace(array_keys($options), array_values($options), $x);    
 }
 
-if($sloppy_photos && file_exists('view/theme/redbasic/css/sloppy_photos.css')) {
-	echo file_get_contents('view/theme/redbasic/css/sloppy_photos.css');
-} 
 if($narrow_navbar && file_exists('view/theme/redbasic/css/narrow_navbar.css')) {
 	echo file_get_contents('view/theme/redbasic/css/narrow_navbar.css');
 } 
 if($converse_center && file_exists('view/theme/redbasic/css/converse_center.css')) {
-	$x = file_get_contents('view/theme/redbasic/css/converse_center.css');
 	echo str_replace(array_keys($options), array_values($options), $x);
-} 
+}
+
+if($schemecss) {
+	echo $schemecss;
+}
diff --git a/view/theme/redbasic/php/theme_init.php b/view/theme/redbasic/php/theme_init.php
index dd4542e8a..498d1ee15 100644
--- a/view/theme/redbasic/php/theme_init.php
+++ b/view/theme/redbasic/php/theme_init.php
@@ -1,7 +1,6 @@
 <?php
 
 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/datetimepicker/jquery.datetimepicker.css');
@@ -10,7 +9,7 @@ head_add_css('library/bootstrap-colorpicker/dist/css/bootstrap-colorpicker.min.c
 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/bootbox/bootbox.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');
diff --git a/view/theme/redbasic/schema/boxy.css b/view/theme/redbasic/schema/boxy.css
new file mode 100644
index 000000000..f3da9b262
--- /dev/null
+++ b/view/theme/redbasic/schema/boxy.css
@@ -0,0 +1,11 @@
+.comment .wall-item-body {
+	padding-left: 42px;
+}
+
+.wall-item-content-wrapper.comment {
+	border-width: 0px 1px 1px 1px;
+}
+
+.hide-comments-outer {
+	border-width: 1px 1px 1px 1px;
+}
diff --git a/view/theme/redbasic/schema/boxy.php b/view/theme/redbasic/schema/boxy.php
index 1de2f98cd..d609ccd25 100644
--- a/view/theme/redbasic/schema/boxy.php
+++ b/view/theme/redbasic/schema/boxy.php
@@ -1,19 +1,4 @@
 <?php
 
-if (!$comment_padding)
-	$comment_padding="42px";
-	
-if (!$comment_border_left)
-	$comment_border_left="1px solid";	
-
-if (!$comment_border_right)
-	$comment_border_right="1px solid";	
-
-if (!$comment_border_top)
-	$comment_border_top="1px solid";		
-
-if (!$comment_border_bottom)
-	$comment_border_bottom="1px solid";
 if (! $radiuspx)
 	$radiuspx = "4";
-	
\ No newline at end of file
diff --git a/view/theme/redbasic/schema/dark.css b/view/theme/redbasic/schema/dark.css
new file mode 100644
index 000000000..7af859db6
--- /dev/null
+++ b/view/theme/redbasic/schema/dark.css
@@ -0,0 +1,117 @@
+.vcard {
+	border-bottom: 1px solid #333;
+}
+
+#contact-block {
+	border-bottom: 1px solid #333;
+}
+
+.widget {
+	border-bottom: 1px solid #333;
+}
+
+.abook-pending-contact, .abook-permschange {
+	background: #402900;
+}
+
+#cboxContent a {
+	color: #000;
+}
+
+#cboxContent {
+	color: #111;
+}
+
+#adminpage table tr:hover {
+    background-color: #222;
+}
+
+#colorbox {
+	border: 0px solid #1E1E1E;
+	background-color: #1E1E1E;
+}
+
+.chat-item-text {
+	background-color: #222;
+}
+
+.fc-state-highlight {
+    background: none repeat scroll 0% 0% #333 !important;
+}
+
+.well {
+	background-color: #1E1E1E;
+	border: 1px solid #222;
+	background-image: linear-gradient(to bottom, #1E1E1E 0px, #1E1E1E 100%);
+}
+
+.alert-info {
+	color: #CCC;
+	background-color:#333;
+	border-color: #444;
+	background-image: linear-gradient(to bottom, #333 0px, #333 100%);
+}
+
+.abook-self {
+	background-color: #251111;
+}
+
+.acl-button-show,
+.acl-button-hide {
+	color: #fff;
+}
+
+#acl-showall {
+	color: #fff;
+}
+
+#acl-list {
+	border: 1px solid #333;
+}
+
+.acl-list-item {
+	border: 1px solid #333;
+}
+
+.modal-content {
+    background-color: #111;
+}
+
+.btn-default {
+	background-color: #1e1e1e;
+	border-color: #222;
+	color: #ccc;
+	text-shadow: none;
+	box-shadow: none;
+}
+
+.btn-default:hover, .btn-default:focus, .btn-default:active .btn-default.active {
+	background-color: #222;
+	border-color: #222;
+	color: #fff;
+	text-decoration: underline;
+}
+
+.btn-default.btn-sm:hover, .btn-default.btn-sm:focus, .btn-default.btn-sm:active .btn-default.btn-sm.active {
+	text-decoration: none;
+}
+
+.pager_first,
+.pager_last,
+.pager_prev,
+.pager_next,
+.pager-prev,
+.pager-next,
+.pager_n {
+	border: 1px solid #222;
+	background: #1e1e1e;
+}
+
+input {
+	border: 1px solid #222;
+}
+
+input[type="submit"] {
+	background-color: #333;
+	color: #fff;
+}
diff --git a/view/theme/redbasic/schema/dark.php b/view/theme/redbasic/schema/dark.php
index 0203d30cd..b6cc53504 100644
--- a/view/theme/redbasic/schema/dark.php
+++ b/view/theme/redbasic/schema/dark.php
@@ -64,8 +64,6 @@
 		$toolicon_activecolour = '#fff';
 	if (! $font_colour)
 		$font_colour = "#ccc";
-	if (! $widget_brdrcolour)
-		$widget_brdrcolour = "#333";
 	if (! $blockquote_colour)
 		$blockquote_colour = "#ccc";
 	if (! $blockquote_bgcolour)
@@ -98,12 +96,6 @@
 		$acpopup_tgbl_bgcolour = "#333";
 	if (! $acpopup_hovercolour)
 		$acpopup_hovercolour = "#fff";
-	if (! $editbuttons_bgcolour)
-		$editbuttons_bgcolour = "#1e1e1e";
-	if (! $editbuttons_bordercolour)
-		$editbuttons_bordercolour = "#222";
-	if (! $editbuttons_colour)
-		$editbuttons_colour = "#ccc";
 	if (! $editbuttons_bghover)
 		$editbuttons_bghover = "#222";
 	if (! $dropdown_bgcolour)
@@ -140,51 +132,4 @@
 		$notifyseen_bghover = "#222";
 	if (! $notifyseen_linkhover)
 		$notifyseen_linkhover = "#CCC";
-	if (! $input_bgsubmit)
-		$input_bgsubmit = "#333";
-	if (! $input_linksubmit)
-		$input_linksubmit = "#fff";
-	if (! $input_border)
-		$input_border = "#222";
-	if (! $input_colourhover)
-		$input_colourhover = "#fff";
-	if (! $input_decohover)
-		$input_decohover = "underline";
-	if (! $acl_bgcolour)
-		$acl_bgcolour = "#111";
-	if (! $acl_bordercolour)
-		$acl_bordercolour = "#333";
-	if (! $aclbutton_linkcolour)
-		$aclbutton_linkcolour = "color: #fff;";
-	if (! $abookself_bgcolour)
-		$abookself_bgcolour = "#251111";
-	if(! $infomess_bgcolour)
-		$infomess_bgcolour = "#333";
-	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/notred.php b/view/theme/redbasic/schema/notred.php
deleted file mode 100644
index 5a6dda336..000000000
--- a/view/theme/redbasic/schema/notred.php
+++ /dev/null
@@ -1,5 +0,0 @@
-<?php
-
-	if (! $nav_colour)
-		$nav_colour = "black";
-
diff --git a/view/theme/redbasic/schema/simple_black_on_white.css b/view/theme/redbasic/schema/simple_black_on_white.css
new file mode 100644
index 000000000..e23053858
--- /dev/null
+++ b/view/theme/redbasic/schema/simple_black_on_white.css
@@ -0,0 +1,117 @@
+.vcard {
+	border-bottom: 1px solid #fff;
+}
+
+#contact-block {
+	border-bottom: 1px solid #fff;
+}
+
+.widget {
+	border-bottom: 1px solid #fff;
+}
+
+.abook-pending-contact, .abook-permschange {
+	background: #fff;
+}
+
+#cboxContent a {
+	color: #fff;
+}
+
+#cboxContent {
+	color: #fff;
+}
+
+#adminpage table tr:hover {
+    background-color: #fff;
+}
+
+#colorbox {
+	border: 0px solid #fff;
+	background-color: #fff;
+}
+
+.chat-item-text {
+	background-color: #fff;
+}
+
+.fc-state-highlight {
+    background: none repeat scroll 0% 0% #fff !important;
+}
+
+.well {
+	background-color: #fff;
+	border: 1px solid #000;
+	background-image: linear-gradient(to bottom, #fff 0px, #fff 100%);
+}
+
+.alert-info {
+	color: #000;
+	background-color:#fff;
+	border-color: #000;
+	background-image: linear-gradient(to bottom, #fff 0px, #fff 100%);
+}
+
+.abook-self {
+	background-color: #fff;
+}
+
+.acl-button-show,
+.acl-button-hide {
+	color: #000;
+}
+
+#acl-showall {
+	color: #000;
+}
+
+#acl-list {
+	border: 1px solid #fff;
+}
+
+.acl-list-item {
+	border: 1px solid #fff;
+}
+
+.modal-content {
+    background-color: #fff;
+}
+
+.btn-default {
+    	background-color: #fff;
+    	border-color: #000;
+	color: #111;
+    	text-shadow: none;
+    	box-shadow: none;
+}
+
+.btn-default:hover, .btn-default:focus, .btn-default:active .btn-default.active {
+	background-color: #fff;
+	border-color: #000;
+	color: #000;
+	text-decoration: underline;
+}
+
+.btn-default.btn-sm:hover, .btn-default.btn-sm:focus, .btn-default.btn-sm:active .btn-default.btn-sm.active {
+    	text-decoration: none;
+}
+
+.pager_first,
+.pager_last,
+.pager_prev,
+.pager_next,
+.pager-prev,
+.pager-next,
+.pager_n { 
+	border: 1px solid #000;
+	background: #fff;
+}
+
+input {
+	border: 1px solid #000;
+}
+
+input[type="submit"] {
+	background-color: #fff;
+	color: #000;
+}
diff --git a/view/theme/redbasic/schema/simple_black_on_white.php b/view/theme/redbasic/schema/simple_black_on_white.php
index ddbcae495..76db1bb1f 100644
--- a/view/theme/redbasic/schema/simple_black_on_white.php
+++ b/view/theme/redbasic/schema/simple_black_on_white.php
@@ -64,8 +64,6 @@
 		$toolicon_activecolour = '#000';
 	if (! $font_colour)
 		$font_colour = "#000";
-	if (! $widget_brdrcolour)
-		$widget_brdrcolour = "#fff";
 	if (! $blockquote_colour)
 		$blockquote_colour = "#111";
 	if (! $blockquote_bgcolour)
@@ -98,14 +96,6 @@
 		$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)
@@ -140,51 +130,4 @@
 		$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.css b/view/theme/redbasic/schema/simple_green_on_black.css
new file mode 100644
index 000000000..f9bde2a71
--- /dev/null
+++ b/view/theme/redbasic/schema/simple_green_on_black.css
@@ -0,0 +1,117 @@
+.vcard {
+	border-bottom: 1px solid #000;
+}
+
+#contact-block {
+	border-bottom: 1px solid #000;
+}
+
+.widget {
+	border-bottom: 1px solid #000;
+}
+
+.abook-pending-contact, .abook-permschange {
+	background: #000;
+}
+
+#cboxContent a {
+	color: #000;
+}
+
+#cboxContent {
+	color: #000;
+}
+
+#adminpage table tr:hover {
+    background-color: #000;
+}
+
+#colorbox {
+	border: 0px solid #000;
+	background-color: #000;
+}
+
+.chat-item-text {
+	background-color: #000;
+}
+
+.fc-state-highlight {
+    background: none repeat scroll 0% 0% #000 !important;
+}
+
+.well {
+	background-color: #000;
+	border: 1px solid #143D12;
+	background-image: linear-gradient(to bottom, #000 0px, #000 100%);
+}
+
+.alert-info {
+	color: #50f148;
+	background-color:#000;
+	border-color: #143D12;
+	background-image: linear-gradient(to bottom, #000 0px, #000 100%);
+}
+
+.abook-self {
+	background-color: #000;
+}
+
+.acl-button-show,
+.acl-button-hide {
+	color: #fff;
+}
+
+#acl-showall {
+	color: #fff;
+}
+
+#acl-list {
+	border: 1px solid #000;
+}
+
+.acl-list-item {
+	border: 1px solid #000;
+}
+
+.modal-content {
+    background-color: #000;
+}
+
+.btn-default {
+    	background-color: #000;
+    	border-color: #143D12;
+	color: #32962D;
+    	text-shadow: none;
+    	box-shadow: none;
+}
+
+.btn-default:hover, .btn-default:focus, .btn-default:active .btn-default.active {
+	background-color: #000;
+	border-color: #143D12;
+	color: #50f148;
+	text-decoration: underline;
+}
+
+.btn-default.btn-sm:hover, .btn-default.btn-sm:focus, .btn-default.btn-sm:active .btn-default.btn-sm.active {
+    	text-decoration: none;
+}
+
+.pager_first,
+.pager_last,
+.pager_prev,
+.pager_next,
+.pager-prev,
+.pager-next,
+.pager_n { 
+	border: 1px solid #143D12;
+	background: #000;
+}
+
+input {
+	border: 1px solid #143D12;
+}
+
+input[type="submit"] {
+	background-color: #000;
+	color: #50f148;
+}
diff --git a/view/theme/redbasic/schema/simple_green_on_black.php b/view/theme/redbasic/schema/simple_green_on_black.php
index f034185f7..8c8a58619 100644
--- a/view/theme/redbasic/schema/simple_green_on_black.php
+++ b/view/theme/redbasic/schema/simple_green_on_black.php
@@ -64,8 +64,6 @@ if (! $navaside_bghover)
 		$toolicon_activecolour = '#50f148';
 	if (! $font_colour)
 		$font_colour = "#46D43F";
-	if (! $widget_brdrcolour)
-		$widget_brdrcolour = "#000";
 	if (! $blockquote_colour)
 		$blockquote_colour = "#32962D";
 	if (! $blockquote_bgcolour)
@@ -98,14 +96,6 @@ if (! $navaside_bghover)
 		$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)
@@ -140,51 +130,9 @@ if (! $navaside_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.css b/view/theme/redbasic/schema/simple_white_on_black.css
new file mode 100644
index 000000000..0a6c17f1b
--- /dev/null
+++ b/view/theme/redbasic/schema/simple_white_on_black.css
@@ -0,0 +1,118 @@
+.vcard {
+	border-bottom: 1px solid #000;
+}
+
+#contact-block {
+	border-bottom: 1px solid #000;
+}
+
+.widget {
+	border-bottom: 1px solid #000;
+}
+
+.abook-pending-contact, .abook-permschange {
+	background: #000;
+}
+
+
+#cboxContent a {
+	color: #000;
+}
+
+#cboxContent {
+	color: #000;
+}
+
+#adminpage table tr:hover {
+    background-color: #000;
+}
+
+#colorbox {
+	border: 0px solid #000;
+	background-color: #000;
+}
+
+.chat-item-text {
+	background-color: #000;
+}
+
+.fc-state-highlight {
+    background: none repeat scroll 0% 0% #000 !important;
+}
+
+.well {
+	background-color: #000;
+	border: 1px solid #fff;
+	background-image: linear-gradient(to bottom, #000 0px, #000 100%);
+}
+
+.alert-info {
+	color: #fff;
+	background-color:#000;
+	border-color: #fff;
+	background-image: linear-gradient(to bottom, #000 0px, #000 100%);
+}
+
+.abook-self {
+	background-color: #000;
+}
+
+.acl-button-show,
+.acl-button-hide {
+	color: #fff;
+}
+
+#acl-showall {
+	color: #fff;
+}
+
+#acl-list {
+	border: 1px solid #000;
+}
+
+.acl-list-item {
+	border: 1px solid #000;
+}
+
+.modal-content {
+    background-color: #000;
+}
+
+.btn-default {
+    	background-color: #000;
+    	border-color: #fff;
+	color: #eee;
+    	text-shadow: none;
+    	box-shadow: none;
+}
+
+.btn-default:hover, .btn-default:focus, .btn-default:active .btn-default.active {
+	background-color: #000;
+	border-color: #fff;
+	color: #fff;
+	text-decoration: underline;
+}
+
+.btn-default.btn-sm:hover, .btn-default.btn-sm:focus, .btn-default.btn-sm:active .btn-default.btn-sm.active {
+    	text-decoration: none;
+}
+
+.pager_first,
+.pager_last,
+.pager_prev,
+.pager_next,
+.pager-prev,
+.pager-next,
+.pager_n { 
+	border: 1px solid #fff;
+	background: #000;
+}
+
+input {
+	border: 1px solid #fff;
+}
+
+input[type="submit"] {
+	background-color: #000;
+	color: #fff;
+}
diff --git a/view/theme/redbasic/schema/simple_white_on_black.php b/view/theme/redbasic/schema/simple_white_on_black.php
index 95ede29ed..29b176b09 100644
--- a/view/theme/redbasic/schema/simple_white_on_black.php
+++ b/view/theme/redbasic/schema/simple_white_on_black.php
@@ -64,8 +64,6 @@
 		$toolicon_activecolour = '#fff';
 	if (! $font_colour)
 		$font_colour = "#fff";
-	if (! $widget_brdrcolour)
-		$widget_brdrcolour = "#000";
 	if (! $blockquote_colour)
 		$blockquote_colour = "#eee";
 	if (! $blockquote_bgcolour)
@@ -98,14 +96,6 @@
 		$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)
@@ -140,51 +130,4 @@
 		$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 adf2e632d..8a4fc666e 100644
--- a/view/theme/redbasic/tpl/theme_settings.tpl
+++ b/view/theme/redbasic/tpl/theme_settings.tpl
@@ -1,50 +1,45 @@
 {{include file="field_select.tpl" field=$schema}}
-<div class="settings-submit-wrapper">
-	<input type="submit" value="{{$submit}}" class="settings-submit" name="redbasic-settings-submit" />
-</div>
-
 {{if $expert}}
-
-{{include file="field_checkbox.tpl" field=$narrow_navbar}}
-{{include file="field_colorinput.tpl" field=$nav_bg}}
-{{include file="field_colorinput.tpl" field=$nav_gradient_top}}
-{{include file="field_colorinput.tpl" field=$nav_gradient_bottom}}
-{{include file="field_colorinput.tpl" field=$nav_active_gradient_top}}
-{{include file="field_colorinput.tpl" field=$nav_active_gradient_bottom}}
-{{include file="field_colorinput.tpl" field=$nav_bd}}
-{{include file="field_colorinput.tpl" field=$nav_icon_colour}}
-{{include file="field_colorinput.tpl" field=$nav_active_icon_colour}}
-{{include file="field_colorinput.tpl" field=$banner_colour}}
-{{include file="field_colorinput.tpl" field=$link_colour}}
-{{include file="field_colorinput.tpl" field=$bgcolour}}
-{{include file="field_colorinput.tpl" field=$background_image}}
-{{include file="field_colorinput.tpl" field=$item_colour}}
-{{include file="field_colorinput.tpl" field=$comment_item_colour}}
-{{include file="field_colorinput.tpl" field=$comment_border_colour}}
-{{include file="field_input.tpl" field=$comment_indent}}
-{{include file="field_colorinput.tpl" field=$toolicon_colour}}
-{{include file="field_colorinput.tpl" field=$toolicon_activecolour}}
-{{include file="field_input.tpl" field=$body_font_size}}
-{{include file="field_input.tpl" field=$font_size}}
-{{include file="field_colorinput.tpl" field=$font_colour}}
-{{include file="field_input.tpl" field=$radius}}
-{{include file="field_input.tpl" field=$shadow}}
+	{{include file="field_colorinput.tpl" field=$nav_bg}}
+	{{include file="field_colorinput.tpl" field=$nav_gradient_top}}
+	{{include file="field_colorinput.tpl" field=$nav_gradient_bottom}}
+	{{include file="field_colorinput.tpl" field=$nav_active_gradient_top}}
+	{{include file="field_colorinput.tpl" field=$nav_active_gradient_bottom}}
+	{{include file="field_colorinput.tpl" field=$nav_bd}}
+	{{include file="field_colorinput.tpl" field=$nav_icon_colour}}
+	{{include file="field_colorinput.tpl" field=$nav_active_icon_colour}}
+	{{include file="field_input.tpl" field=$nav_min_opacity}}
+	{{include file="field_colorinput.tpl" field=$bgcolour}}
+	{{include file="field_colorinput.tpl" field=$background_image}}
+	{{include file="field_colorinput.tpl" field=$item_colour}}
+	{{include file="field_colorinput.tpl" field=$comment_item_colour}}
+	{{include file="field_colorinput.tpl" field=$comment_border_colour}}
+	{{include file="field_input.tpl" field=$comment_indent}}
+	{{include file="field_input.tpl" field=$body_font_size}}
+	{{include file="field_input.tpl" field=$font_size}}
+	{{include file="field_colorinput.tpl" field=$font_colour}}
+	{{include file="field_colorinput.tpl" field=$link_colour}}
+	{{include file="field_colorinput.tpl" field=$banner_colour}}
+	{{include file="field_colorinput.tpl" field=$toolicon_colour}}
+	{{include file="field_colorinput.tpl" field=$toolicon_activecolour}}
+	{{include file="field_input.tpl" field=$radius}}
+	{{include file="field_input.tpl" field=$shadow}}
+	{{include file="field_input.tpl" field=$top_photo}}
+	{{include file="field_input.tpl" field=$reply_photo}}
+{{/if}}
 {{include file="field_input.tpl" field=$converse_width}}
 {{include file="field_checkbox.tpl" field=$converse_center}}
-{{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=$narrow_navbar}}
+{{if $expert}}
 <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();
+		$('#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({format: 'rgba'});
 		$('#id_redbasic_nav_bd,#id_redbasic_nav_icon_colour ,#id_redbasic_nav_active_icon_colour,#id_redbasic_banner_colour,#id_redbasic_link_colour,#id_redbasic_background_colour').colorpicker();
 		$('#id_redbasic_toolicon_colour,#id_redbasic_toolicon_activecolour,#id_redbasic_font_colour').colorpicker();
 		$('#id_redbasic_item_colour,#id_redbasic_comment_item_colour,#id_redbasic_comment_border_colour').colorpicker({format: 'rgba'});
 	});
 </script>
-
-<div class="settings-submit-wrapper">
-	<input type="submit" value="{{$submit}}" class="settings-submit" name="redbasic-settings-submit" />
-</div>
 {{/if}}
+<div class="settings-submit-wrapper" >
+	<button type="submit" name="redbasic-settings-submit" class="btn btn-primary">{{$submit}}</button>
+</div>