Merge pull request #2 from friendica/master

Upgraded to latest red

9 files changed, 340 insertions, 648 deletions

diff --git a/view/theme/redbasic/css/dark.css b/view/theme/redbasic/css/dark.css
index 43912be69..3bcf15bc9 100644
--- a/view/theme/redbasic/css/dark.css
+++ b/view/theme/redbasic/css/dark.css
@@ -1,3 +1,7 @@
+/* This file is deprecated.  We'll keep it here as reference until somebody
+defines a dark colour scheme */
+
+
 body {	font-family: sans-serif;
 	font-size: 12px;
 	background-color: #101010;
diff --git a/view/theme/redbasic/css/fancy.css b/view/theme/redbasic/css/fancy.css
index 2da9d68d1..9b8899d2f 100644
--- a/view/theme/redbasic/css/fancy.css
+++ b/view/theme/redbasic/css/fancy.css
@@ -1,4 +1,5 @@
-/* There's probably some stuff in here we don't need, and maybe some missing stuff we do need.  We can clean it up incrementaly, just get the heavy lifting done for now */
+/*This file is deprecated.  We'll keep it for reference until we provide window decorations */
+
 
 aside {
 border-radius: $radiuspx;}
diff --git a/view/theme/redbasic/css/style.css b/view/theme/redbasic/css/style.css
index f4c399735..f1f58cc44 100644
--- a/view/theme/redbasic/css/style.css
+++ b/view/theme/redbasic/css/style.css
@@ -8,25 +8,23 @@
 
 /* generals */
 body {
-	font-family: arial,freesans,clean,sans-serif;
+	font-family: arial,freesans,sans-serif;
 	font-size: 12px;
-	background-color: #FFFFFF;
-	color: #000000;
+	background-color: $bgcolour;
+	background-image: url('$background_image');
+	background-attachment: fixed;
+	background-size: cover;
+	color: $font_colour;
 	margin: 0px;
 }
 .jslider {
-	font-family: arial,freesans,clean,sans-serif;
+	font-family: arial,freesans,sans-serif;
 }
 
 abbr {
 	border-bottom: none;
 }
 
-aside {
-border: none;
-color: #444444;
-}
-
 /* icons */
 .icon {
   background-color: transparent ;
@@ -39,67 +37,6 @@ color: #444444;
 .icon.text {
   text-indent: 0px;
 }
-.icon.notify {
-  background-image: url("../img/notify_on.png");
-  min-width: 22px;
-  height: 22px;
-  margin-top: -4px; 
-  background-position: left center;
-  padding: 1px;
-}
-.icon.gear {
-  background-image: url("../img/settings.png");
-  min-width: 22px;
-  height: 22px; 
-  margin-top: -2px; 
-  background-position: left center;
-  padding: 1px;
-}
-
-.icon.home {
-  background-image: url("../img/home.png");
-  min-width: 22px;
-  height: 22px; 
-  margin-top: -4px; 
-  background-position: left center;
-  padding: 1px;
-}
-
-.icon.network {
-  background-image: url("../img/network.png");
-  min-width: 22px;
-  height: 22px; 
-  margin-top: -3px; 
-  background-position: left center;
-  padding: 1px;
-}
-
-.icon.introductions {
-  background-image: url("../img/introductions.png");
-  min-width: 22px;
-  height: 22px; 
-  margin-top: -4px; 
-  background-position: left center;
-  padding: 1px;
-}
-
-.icon.mail {
-  background-image: url("../img/message.png");
-  min-width: 22px;
-  height: 22px; 
-  margin-top: -2px; 
-  background-position: left center;
-  padding: 1px;
-}
-
-.icon.events {
-  background-image: url("../img/events.png");
-  min-width: 22px;
-  height: 22px; 
-  margin-top: -4px; 
-  background-position: left center;
-  padding: 1px;
-}
 
 a, a:visited, a:link, .fakelink, .fakelink:visited, .fakelink:link { 
 	font-weight: bold;
@@ -120,8 +57,6 @@ input {
 	padding: 3px;
 }
 
-img { border :0px; }
-
 
 code {
 	font-family: Courier, monospace;
@@ -167,13 +102,6 @@ blockquote {
 
 
 
-/* nav */
-
-nav {
-	display: block;
-
-}
-
 #langselector {
 	position: fixed; 
 	top: 3px; 
@@ -189,6 +117,21 @@ nav {
 	filter:alpha(opacity=100);
 }
 
+nav {background-image: linear-gradient(bottom, $nav_bg_1 26%, $nav_bg_2 82%);
+	      background-image: -o-linear-gradient(bottom, $nav_bg_1 26%, $nav_bg_2 82%);
+	      background-image: -moz-linear-gradient(bottom,$nav_bg_1 26%, $nav_bg_2 82%);
+	      background-image: -webkit-linear-gradient(bottom, $nav_bg_1 26%, $nav_bg_2 82%);
+	      background-image: -ms-linear-gradient(bottom, $nav_bg_1 26%, $nav_bg_2 82%);
+}
+
+
+nav:hover {background-image: linear-gradient(bottom, $nav_bg_3 26%, $nav_bg_4 82%);
+	      background-image: -o-linear-gradient(bottom, $nav_bg_3 26%, $nav_bg_4 82%);
+	      background-image: -moz-linear-gradient(bottom, $nav_bg_3 26%, $nav_bg_4 82%);
+	      background-image: -webkit-linear-gradient(bottom, $nav_bg_3 26%, $nav_bg_4 82%);
+	      background-image: -ms-linear-gradient(bottom, $nav_bg_3 26%, $nav_bg_4 82%);
+}
+
 
 nav #site-location {
 	color: #888a85;
@@ -234,7 +177,7 @@ header #banner {
   text-align: center;
   font-size: 1.4em;
   font-family: tahoma, "Lucida Sans", sans;
-  color: #eec;
+  color: #FFF;
   font-weight: bold;
   margin-top: 1px;
 }
@@ -243,7 +186,7 @@ header #banner a:active,
 header #banner a:visited,
 header #banner a:link,
 header #banner a:hover {
-  color: #eec;
+  color: #FFF;
   text-decoration: none;
   outline: none;
   vertical-align: bottom;
@@ -279,7 +222,7 @@ nav .nav-link {
 	background-color: transparent !important;
 }
 
-.nav-commlink.selected {
+.nav-commlink.active {
 	background-color: #ffffff;
 	border-bottom: 1px solid #ffffff;
 	color: #000000 !important;
@@ -304,19 +247,16 @@ nav #nav-link-wrapper .nav-link {
 	border-bottom: 1px solid #aaaaaa;
 	padding:0px;
 	width: 90%; 
-/*	margin-right: 5px; */
 }
 
 .tabs li { margin: 0px; list-style: none; }
 .tab {
 	display:block;
 	float:left;
-/*	padding: 0.4em; */
 	margin-right: 15px ;
 }
 
 .tab.active {
-/*	font-weight: bold;	*/
 	color: #444444;
 }
 
@@ -331,20 +271,13 @@ ul.tabs {
 /* footer */
 
 footer {
+	position:fixed;
+	bottom:1px;
 	text-align: right;
 	padding-bottom: 1em;
 	padding-right: 3em; 
 }
 
-#powered-by {
-	position: fixed;
-	bottom: 1px;
-	left: 15px;
-	opacity: 0.3;
-	filter:alpha(opacity=30);
-
-}
-
 .birthday-today, .event-today {
 	font-weight: bold;
 }
@@ -435,7 +368,7 @@ footer {
 	margin-bottom: 10px;
 }
 
-.group-selected, .nets-selected, .fileas-selected, .categories-selected, .settings-widget .selected {
+.group-selected, .nets-selected, .fileas-selected, .categories-selected, .settings-widget .active {
 	color: #444444 !important;
 }
 
@@ -511,7 +444,6 @@ footer {
 
 	margin-left: 100px;
 	margin-top: 10px;
-/*	margin-left: 200px; */
 }
 
 
@@ -882,40 +814,17 @@ footer {
 	margin-bottom: 15px;
 }
 
-#network-star-link{
-	margin-top: 10px;
-}
-.network-star {
-	float: left;
-	margin-right: 5px;
-}
-#network-bmark-link {
-	margin-top: 10px;
-}
 
-.thread-wrapper .wall-item-comment-wrapper {
+.thread-wrapper .wall-item-comment-wrapper, .wall-item-content-wrapper.comment {
 	margin-left: 50px;
 }
 
-/* Give the top level post bigger shadows than the comments.  This makes them appear "higher" and the comments "lower", which separates posts from each other reasonably without literally drawing a line under it */
-
 .wall-item-content-wrapper {
 	margin-top: 10px;
 	position: relative;
 	border-radius: $radiuspx;
-	border: 1px solid #eec;
-
-/*	background: #fff; */
-/*	border-radius: 5px; */
-/*	box-shadow: 12px 12px 12px #111; */
-/*	border-left: 1px solid #eec; */
-
-}
-.wall-item-content-wrapper.comment {
-/*	background: #fff; */
-/*	border-left: 1px solid #e0e0e0; */
-	margin-left: 50px;
-/*	box-shadow: 5px 5px 5px #222; */
+	background-color: $item_colour;
+	opacity: $item_opacity;
 }
 
 .thread-end-wrapper {
@@ -923,12 +832,6 @@ footer {
 }
 
 
-.wall-item-content-wrapper.comment {
-/*	background: #ffffff;
-	border-left: 1px solid #e0e0e0;
-*/
-}
-
 .wall-item-like.comment, .wall-item-dislike.comment {
 	margin-left: 50px;
 }
@@ -1004,14 +907,16 @@ footer {
     z-index: 99;
 }
 .wall-item-wrapper {
-	/*float: left;
-    margin-right: 5px;
-    width: 250px;*/
     margin-left:10px;
 }
+
+.wall-item-ago .icon-ok {
+	cursor: pointer;
+	color: darkgreen;
+}
+
 .wall-item-lock {
-	/*height: 20px;*/
-	/*margin-top: 10px;*/
+	font-size: 1.4em;
     left: 105px;
     position: absolute;
     top: 1px;	
@@ -1040,6 +945,8 @@ footer {
 .item-tool {
 	float: left;
 	margin-right: 8px;
+	font-size: 1.2em;
+	cursor: pointer;
 }
 
 .like-rotator {
@@ -1063,11 +970,7 @@ footer {
 .wall-item-wrapper-end {
 	clear: both;
 }
-.wall-item-name-link {
-	font-weight: bold;
-	text-decoration: none;
-	color: #3172BD;
-}
+
 .wall-item-photo {
 	border: none;
 }
@@ -1078,20 +981,16 @@ footer {
 .wall-item-content {
 	margin-left: 10px;
 	overflow: auto;
+	font-size: $font_sizepx;
 }
 
 .wall-item-content img {
     max-width: 95% !important;
-/*  box-shadow: 8px 8px 8px #666; can't really have this because of smileys */
 }
 
-.wall-item-content img.smiley {
-    box-shadow: none;
-}
 .wall-item-title {
 	float: left;
 	font-weight: bold;
-	/*width: 450px;*/
 }
 
 .wall-item-title-end {
@@ -1099,13 +998,10 @@ footer {
 }
 
 .thread-wrapper.toplevel_item {
-
 	width: 92%; 
 }
 
 .wall-item-body {
-/*	float: left; */
-	/*width: 450px;*/
 	margin-top: 10px;
 }
 
@@ -1119,23 +1015,13 @@ footer {
 }    
 
 .wall-item-like, .wall-item-dislike {
-	margin-left: 0px;
-	margin-top: 3px;
+	margin-top: 5px;
 }
 
 .wall-item-author {
 	margin-top: 10px;
 }
 
-.comment-edit-wrapper {
-	margin-top: 15px;
-	margin-left: 50px;
-}
-
-.comment-wwedit-wrapper {
-	margin-top: 2px;
-}
-
 .comment-edit-photo {
 	margin-top: 10px;
 	margin-left: 10px;
@@ -1157,7 +1043,6 @@ footer {
 	border: 1px solid #ccc;
 	padding: 8px;
 	border-radius: $radiuspx;
-/*	box-shadow: 5px 5px 5px #666 inset; */
 }
 
 .comment-edit-text-empty {
@@ -1198,9 +1083,6 @@ footer {
 	width:90%;
 }
 
-#profile-jot-submit {
-	float: left;
-}
 #profile-upload-wrapper {
 	float: left;
 	margin-left: 15px;
@@ -1269,7 +1151,6 @@ footer {
 }
 
 #profile-jot-perms-end {
-	/*clear: left;*/
 	height: 30px;
 }
 
@@ -1288,7 +1169,6 @@ footer {
 }
 
 #profile-jot-end {
-	/*clear: both;*/
 	margin-bottom: 30px;
 }
 #about-jot-submit-wrapper {
@@ -1377,6 +1257,9 @@ footer {
 	border: none;
 }
 
+div.dirtagblock.widget {
+  overflow: hidden;
+}
 
 .pager {
   padding: 10px;
@@ -1495,16 +1378,7 @@ footer {
 DIV#profile-jot-text_toolbargroup{
 background: #FFF;
 border: 1px #111;
-/*box-shadow: 5px 5px 5px #000 inset;*/
-}
-
-/*
-#profile-jot-text_parent, .mceLayout {
-    border-radius: $radiuspx;
-    -moz-border-radius: $radiuspx;
-    box-shadow: 4px 4px 3px 0 #444444;
 }
-*/
 
 
 iframe#profile-jot-text_ifr {
@@ -1526,7 +1400,6 @@ tr.mceLast {
 	width: 90%; 
 	-moz-border-radius: $radiuspx;
 	border-radius: $radiuspx;	
-/*	box-shadow: 4px 4px 3px 0 #666 inset; */
 }
 #profile-jot-text:hover {
 	color: #000000;
@@ -1541,7 +1414,7 @@ tr.mceLast {
 .wall-item-photo, .photo, .contact-block-img, .my-comment-photo {
     border-radius: $radiuspx;
     -moz-border-radius: $radiuspx;
-    box-shadow: 4px 4px 3px 0 #444444;
+    box-shadow: $shadowpx $shadowpx $shadowpx 0 #444444;
 }
 
 
@@ -1699,14 +1572,10 @@ tr.mceLast {
 	margin-top: 15px;
 	margin-right: 15px;
 	margin-left: 15px;
-/*	width: 200px; height: 200px; 
-	overflow: hidden; 
-	position: relative; */
 }
 .photo-album-image-wrapper .caption {
 	display: none; 
  	width: 100%;
-/* 	position: absolute; */
  	bottom: 0px; 
  	padding: 0.5em 0.5em 0px 0.5em;
  	background-color: rgba(245, 245, 255, 0.8);
@@ -1723,19 +1592,15 @@ tr.mceLast {
 }
 
 .photo-top-image-wrapper {
-/*	position: relative; */
 	float: left;
 	margin-top: 15px;
 	margin-right: 15px;
 	margin-left: 15px;
 	margin-bottom: 15px;
-/*	width: 200px; height: 200px; 
-	overflow: hidden; */
 }
 .photo-top-album-name {
  	width: 100%;
  	min-height: 2em;
-/* 	position: absolute;  */
  	bottom: 0px; 
  	padding: 0px 3px;
  	padding-top: 0.5em;
@@ -1916,13 +1781,6 @@ a.mail-list-link {
 
 
 
-/*
-*a.mail-list-link:hover {
-*	background-color: #15607B;
-*	color: #F5F6FB;
-*}
-*/
-
 .mail-list-outside-wrapper-end {
 	clear: both;
 }
@@ -2062,9 +1920,6 @@ a.mail-list-link {
 	margin-top: 10px;
 }
 
-aside input[type='text'] {
- width: 174px;
-}
 
 .widget, .pmenu {
 	border-bottom: 1px solid #eec;
@@ -2096,7 +1951,7 @@ aside input[type='text'] {
 	display: block;
 	color: #FFFFFF;
 	margin-top: 15px;
-	background-color: #FF6666;
+	background-color: #F80000;
 	-webkit-border-radius: $radiuspx ;
 	-moz-border-radius: $radiuspx;
 	border-radius: $radiuspx;
@@ -2105,21 +1960,12 @@ aside input[type='text'] {
 }
 
 
-#dfrn-request-networks {
-	margin-bottom: 30px;
-}
-
 #pause {
   position: fixed;
   bottom: 5px;
   right: 5px;
 }
 
-.sparkle {
-	cursor: url('../img/lock.cur'), pointer;
-/*	cursor: pointer !important; */
-}
-
 #vcard-end {
 	clear: both;
 }
@@ -2186,33 +2032,30 @@ aside input[type='text'] {
 
 #nav-searchbar {
 	float: right;
-	margin-top: 3px;
+	margin-top: 2px;
+	margin-right: 10px;
 }
 
 #nav-search-spinner {
 	float: right;
 	margin: 12px 12px 0px 0px;
+	color: #fff;
 }
 
-#nav-search-text:hover {
-	background-color: #FFF;
+#nav-search-text:hover,
+#nav-search-text:focus {
+	background-color: #fff;
 	color: #000; 
 }
 
 #nav-search-text {
-	margin-top: -1px;
-	font-size: 0.8em;
-	border-radius: 14px;
+	height: 20px;
+	padding: 0px 5px 0px 5px;
+	font-size: 0.9em;
+	border-radius: 10px;
 	border: none;
-	background-color: #FFDDDD;
-	color: #eec; 
-}
-
-/* this doesn't seem to work */
-
-#nav-search-text::-moz-placeholder { color: #444; }
-#nav-search-text::-webkit-input-placeholder {
-	color: #444 !important;
+	background-color: $search_background;
+    	transition: background-color 300ms ease 0s;
 }
 
 #nav-user-linkmenu img {
@@ -2679,7 +2522,7 @@ brain is weird like that */
 }
 
 .field_abook_help {
-	color: #888;
+	color: #000;
 }
 .abook-them {
 	margin-left: 225px;
@@ -2693,6 +2536,13 @@ brain is weird like that */
 	margin-bottom: 5px !important;
 }
 
+.abook-pending-contact {
+	background: orange;
+	font-weight: bold;
+	margin: 10px;
+	padding: 20px 5px 10px;
+}
+
 #contact-slider {
 	width: 600px !important;
 }
@@ -2785,6 +2635,10 @@ brain is weird like that */
 	width: 48px; height: 48px;
 	margin: 10px;
 }
+.oauthapp .icon {
+	margin-right: 20px;
+}
+
 .oauthapp img.noicon {
 	background-image: url("../../../../images/icons/48/plugin.png");
 	background-position: center center;
@@ -2799,6 +2653,15 @@ brain is weird like that */
  */
 .iconspacer {
 	display: block; width: 16px; height: 16px;
+/*	visibility: hidden; */
+}
+
+.iconspacer:hover {
+/*	visibility: visible; */
+}
+
+.wall-item-ago i {
+	font-size: 0.6em;
 }
 
 .icon {
@@ -2810,6 +2673,7 @@ brain is weird like that */
 .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;}
@@ -2839,11 +2703,14 @@ brain is weird like that */
 .on { background-position: -144px -32px; }
 
 .off { background-position: 0px -48px; }
-.starred { background-position: -16px -48px; }
-.unstarred { background-position: -32px -48px; }
+/*.starred { background-position: -16px -48px; }
+.unstarred { background-position: -32px -48px; }*/
 .tagged { background-position: -48px -48px; }
 .yellow { background-position: -64px -48px; }
 
+.starred {
+	color: gold;
+}
 
 .filer-icon {
 	display: block; width: 16px; height: 16px;
@@ -3056,61 +2923,6 @@ div.jGrowl div.info {
 	width: 90%;
 }
 
-/* nav */
-nav {
-  width: 100%;
-  height: 24px;
-  position: fixed;
-//	opacity: 0.6;
-//	filter:alpha(opacity=60);
-
-  left: 0px;
-  top: 0px;
-  padding: 0px;
-  background-color: #d00;
-  color: #eec;
-  z-index: 100;
-/*  -webkit-box-shadow: 0px 0px 10px rgba(0, 0, 0, 0.7);
-  -moz-box-shadow: 0px 0px 10px rgba(0, 0, 0, 0.7);
-  box-shadow: 0px 0px 10px rgba(0, 0, 0, 0.7); */
-
-/* TODO find a better way to do this without different code for every single browser.  */
-
-  background-image: linear-gradient(bottom, #f88 26%, #b00 82%);
-  background-image: -o-linear-gradient(bottom, #f88 26%, #b00 82%);
-  background-image: -moz-linear-gradient(bottom, #f88 26%, #b00 82%);
-  background-image: -webkit-linear-gradient(bottom, #f88 26%, #b00 82%);
-  background-image: -ms-linear-gradient(bottom, #f88 26%, #b00 82%);
-
-  background-image: -webkit-gradient(
-linear,
-left bottom,
-left top,
-color-stop(0.26, #f88),
-color-stop(0.82, #b00)
-);
-}
-
-/*
-
-nav:hover {
-
-  background-image: linear-gradient(bottom, #f00 26%, #b00 82%);
-  background-image: -o-linear-gradient(bottom, #f00 26%, #b00 82%);
-  background-image: -moz-linear-gradient(bottom, #f00 26%, #b00 82%);
-  background-image: -webkit-linear-gradient(bottom, #f00 26%, #b00 82%);
-  background-image: -ms-linear-gradient(bottom, #f00 26%, #b00 82%);
-
-  background-image: -webkit-gradient(
-linear,
-left bottom,
-left top,
-color-stop(0.26, #f00),
-color-stop(0.82, #b00)
-);
-}
-
-*/
 
 nav a,
 nav a:active,
@@ -3124,6 +2936,11 @@ nav a:link {
 nav a:hover {
 	color: #0080FF;
 }
+nav .fakelink {
+  color: #ffffff;
+  text-decoration: none;
+  outline: none;
+}
 nav .fakelink:hover { text-decoration: none; }
 
 #profiles-menu li a {
@@ -3163,7 +2980,7 @@ nav .nav-menu-icon {
   -webkit-border-radius: $radiuspx;
   border-radius: $radiuspx;
 }
-nav .nav-menu-icon.selected {
+nav .nav-menu-icon.active {
   background-color: #FF0000;
 }
 nav .nav-menu-icon img {
@@ -3186,8 +3003,8 @@ nav:hover .nav-menu {
 /*  border-bottom: 3px solid #f00; */
 }
 
-nav .nav-menu.selected a {
-	color: #444444;
+nav .nav-menu.active i {
+	color: $active_colour;
 }
 
 nav .nav-notify {
@@ -3196,11 +3013,11 @@ nav .nav-notify {
   -moz-border-radius: $radiuspx;
   -webkit-border-radius: $radiuspx;
   border-radius: $radiuspx;
-  opacity: 0.6;
-  filter:alpha(opacity=60);
+/*  opacity: 0.6;
+  filter:alpha(opacity=60); */
 
 }
-.nav-notify:hover, nav .nav-notify.selected span {
+.nav-notify:hover, nav .nav-notify.active span {
 	color: #ffffff;
 }
 
@@ -3223,10 +3040,10 @@ nav #nav-site-linkmenu .menu-popup {
   left: auto;
 }
 nav #nav-notifications-linkmenu.on .icon.s22.notify,
-nav #nav-notifications-linkmenu.selected .icon.s22.notify {
+nav #nav-notifications-linkmenu.active .icon.s22.notify {
   background-image: url("../../../../images/icons/22/notify_on.png");
 }
-nav #nav-apps-link.selected {
+nav #nav-apps-link.active {
   background-color: #364e59;
 }
 ul.menu-popup {
@@ -3308,7 +3125,7 @@ header {
 	font-size: 10px;
 	padding: 1px 3px;
 	top: 0px;
-	right: -10px;
+	right: -5px;
 	min-width: 15px;
 	text-align: right;
 }
@@ -3493,44 +3310,27 @@ ul.menu-popup {
 .shared_header img { margin-right: 10px; }
 
 
-.mail-list-wrapper {
+#mail-list-wrapper {
 
 border-bottom: 1px solid #ccc;
 padding: 20px;
 }
 
-span.mail-delete {
-float: left;
-width: 30px;
-}
-
-a.mail-list-sender-url {
-float: left;
-width: 35px;
-}
-	
-img.mail-list-sender-photo {
-height: 16px;
-width: 16px;
-}
-
-
-span.mail-from {
+span.mail-list {
 float: left;
-width: 200px;
+width: 20%;
 }
 
-span.mail-subject.unseen{ 
+span.mail-delete {
 float: left;
-width: 200px;
+width: 30px;
 }
 
-span.mail-date {
-float:left;
-width: 200px;
+img.mail-list-sender-photo {
+height: 24px;
+width: 24px;
 }
 
-
 .tag1 {
     font-size : 1.0em !important;
   }
@@ -3600,10 +3400,41 @@ div.page-list-item {
 margin: 20px;
 }
 
+div#write-pages {
+display: block;
+position: fixed;
+top: 24px;
+z-index: 99;
+background: silver;
+width: 100%;
+}
+
+div#write-pages a {
+color: #000;
+margin-right: 50px;
+}
+
 .pmenu ul {
 	list-style-type: none;
 }
 
 .pmenu li {
 	margin-left: -20px;
-}
\ No newline at end of file
+}
+
+.comment-icon, .jot-icons {
+	font-size: 1.2em;
+}
+.nav-icon {
+	font-size: 1.4em;
+	margin-right: 15px;
+}
+
+a .drop-icons {
+	color: #000000;
+	font-size: 1.2em;
+}
+ 
+.drop-icons:hover {
+	color: #FF0000;
+}
diff --git a/view/theme/redbasic/js/redbasic.js b/view/theme/redbasic/js/redbasic.js
index 10ca4cfa3..e7a682911 100644
--- a/view/theme/redbasic/js/redbasic.js
+++ b/view/theme/redbasic/js/redbasic.js
@@ -66,22 +66,24 @@ $('.sidebar-group-element').hover(
 	);
 
 
-$('.savedsearchdrop').hover(
-	function() {
-		$(this).addClass('drop'); $(this).addClass('icon'); $(this).removeClass('iconspacer');},
-	function() {
-		$(this).removeClass('drop'); $(this).removeClass('icon'); $(this).addClass('iconspacer');}
-	);
-
-$('.savedsearchterm').hover(
-	function() {
-		id = $(this).attr('id');
-		$('#drop-' + id).addClass('icon'); 	$('#drop-' + id).addClass('drophide'); $('#drop-' + id).removeClass('iconspacer');},
-
-	function() {
-		id = $(this).attr('id');
-		$('#drop-' + id).removeClass('icon');$('#drop-' + id).removeClass('drophide'); $('#drop-' + id).addClass('iconspacer');}
-	);
+//$('.saved-search-li a').hover(
+//	function() {
+//		id = $(this).attr('id');
+//		$('#dropicon-' + id).css('visibility','visible');},
+//	function() {
+//		id = $(this).attr('id');
+//		$('#dropicon-' + id).css('visibility','hidden');}
+//	);
+
+//$('.savedsearchterm').hover(
+//	function() {
+//		id = $(this).attr('id');
+//		$('#dropicon-' + id).css('visibility','visible');},
+//
+//	function() {
+//		id = $(this).attr('id');
+//		$('#dropicon-' + id).css('visibility','hidden');
+//	});
 
 });
 
diff --git a/view/theme/redbasic/php/config.php b/view/theme/redbasic/php/config.php
index 4e7363362..be021e85c 100644
--- a/view/theme/redbasic/php/config.php
+++ b/view/theme/redbasic/php/config.php
@@ -1,164 +1,81 @@
 <?php
-/**
- * Theme settings
- */
 
 function theme_content(&$a) {
-	// Doesn't yet work for anyone other than the channel owner, and stupid mode isn't finished, so return both for now.
-	if(!local_user()) { return;	}
-	$font_size = get_pconfig(local_user(),'redbasic', 'font_size' );
-	$line_height = get_pconfig(local_user(), 'redbasic', 'line_height' );
-	$colour = get_pconfig(local_user(), 'redbasic', 'colour' );
-	$shadow = get_pconfig(local_user(), 'redbasic', 'shadow' );
-	$navcolour = get_pconfig(local_user(), 'redbasic', 'navcolour');
-	$displaystyle = get_pconfig(local_user(), 'redbasic', 'displaystyle');
-	$linkcolour = get_pconfig(local_user(), 'redbasic', 'linkcolour');
-	$iconset = get_pconfig(local_user(), 'redbasic', 'iconset');
-	$shiny = get_pconfig(local_user(), 'redbasic', 'shiny');
-	$colour_scheme = get_pconfig(local_user(), 'redbasic', 'colour_scheme');
-	$radius = get_pconfig(local_user(),'redbasic','radius');
+	if(!local_user()) { return;}
 
-	return redbasic_form($a, $font_size, $line_height, $colour, $shadow, $navcolour, $opaquenav, $displaystyle, $linkcolour, $iconset, $shiny, $colour_scheme,$radius);
+	$schema = get_pconfig(local_user(),'redbasic', 'schema' );
+	$nav_colour = get_pconfig(local_user(),'redbasic', 'nav_colour' );
+	$bgcolour = get_pconfig(local_user(),'redbasic', 'bgcolour' );
+	$background_image = get_pconfig(local_user(),'redbasic', 'background_image' );
+	$item_colour = get_pconfig(local_user(),'redbasic', 'item_colour' );
+	$item_opacity = get_pconfig(local_user(),'redbasic', 'item_opacity' );
+	$font_size = get_pconfig(local_user(),'redbasic', 'font_size' );
+	$font_colour = get_pconfig(local_user(),'redbasic', 'font_colour' );
+	$radius = get_pconfig(local_user(),'redbasic', 'radius' );
+	$shadow = get_pconfig(local_user(),'redbasic', 'photo_shadow' );
+	return redbasic_form($a, $schema, $nav_colour, $bgcolour, $background_image, $item_colour, $item_opacity, 
+		$font_size, $font_colour, $radius, $shadow);
 }
 
 function theme_post(&$a) {
-	if(!local_user()) { return; }
+	if(!local_user()) { return;}
 
 	if (isset($_POST['redbasic-settings-submit'])) {
+		set_pconfig(local_user(), 'redbasic', 'schema', $_POST['redbasic_schema']);
+		set_pconfig(local_user(), 'redbasic', 'nav_colour', $_POST['redbasic_nav_colour']);
+		set_pconfig(local_user(), 'redbasic', 'background_colour', $_POST['redbasic_background_colour']);
+		set_pconfig(local_user(), 'redbasic', 'background_image', $_POST['redbasic_background_image']);
+		set_pconfig(local_user(), 'redbasic', 'item_colour', $_POST['redbasic_item_colour']);
+		set_pconfig(local_user(), 'redbasic', 'item_opacity', $_POST['redbasic_item_opacity']);
 		set_pconfig(local_user(), 'redbasic', 'font_size', $_POST['redbasic_font_size']);
-		set_pconfig(local_user(), 'redbasic', 'line_height', $_POST['redbasic_line_height']);
-		set_pconfig(local_user(), 'redbasic', 'colour', $_POST['redbasic_colour']);	
-		set_pconfig(local_user(), 'redbasic', 'shadow', $_POST['redbasic_shadow']);	
-		set_pconfig(local_user(), 'redbasic', 'navcolour', $_POST['redbasic_navcolour']);
-		set_pconfig(local_user(), 'redbasic', 'displaystyle', $_POST['redbasic_displaystyle']);
-		set_pconfig(local_user(), 'redbasic', 'linkcolour', $_POST['redbasic_linkcolour']);
-		set_pconfig(local_user(), 'redbasic', 'iconset', $_POST['redbasic_iconset']);
-		set_pconfig(local_user(), 'redbasic', 'shiny', $_POST['redbasic_shiny']);
-		set_pconfig(local_user(), 'redbasic', 'colour_scheme', $_POST['redbasic_colour_scheme']);
+		set_pconfig(local_user(), 'redbasic', 'font_colour', $_POST['redbasic_font_colour']);
 		set_pconfig(local_user(), 'redbasic', 'radius', $_POST['redbasic_radius']);
+		set_pconfig(local_user(), 'redbasic', 'photo_shadow', $_POST['redbasic_shadow']);
 	}
-
 }
 
-// We probably don't want these if we're having global settings, but we'll comment out for now, just in case
-//function theme_admin(&$a) {	$font_size = get_config('redbasic', 'font_size' );
-//	$line_height = get_config('redbasic', 'line_height' );
-//	$colour = get_config('redbasic', 'colour' );	
-//	$shadow = get_config('redbasic', 'shadow' );	
-//	$navcolour = get_config('redbasic', 'navcolour' );
-//	$opaquenav = get_config('redbasic', 'opaquenav' );
-//	$itemstyle = get_config('redbasic', 'itemstyle' );
-//	$linkcolour = get_config('redbasic', 'linkcolour' );
-//	$iconset = get_config('redbasic', 'iconset' );
-//	$shiny = get_config('redbasic', 'shiny' );
-//	
-//	return redbasic_form($a, $font_size, $line_height, $colour, $shadow, $navcolour, $opaquenav, $itemstyle, $linkcolour, $iconset, $shiny);
-//}
-
-//function theme_admin_post(&$a) {
-//	if (isset($_POST['redbasic-settings-submit'])) {
-//		set_config('redbasic', 'font_size', $_POST['redbasic_font_size']);
-//		set_config('redbasic', 'line_height', $_POST['redbasic_line_height']);
-//		set_config('redbasic', 'colour', $_POST['redbasic_colour']);
-//		set_config('redbasic', 'shadow', $_POST['redbasic_shadow']);
-//		set_config('redbasic', 'navcolour', $_POST['redbasic_navcolour']);
-//		set_config('redbasic', 'opaquenav', $_POST['redbasic_opaquenav']);
-//		set_config('redbasic', 'itemstyle', $_POST['redbasic_itemstyle']);
-//		set_config('redbasic', 'linkcolour', $_POST['redbasic_linkcolour']);
-//		set_config('redbasic', 'iconset', $_POST['redbasic_iconset']);
-//		set_config('redbasic', 'shiny', $_POST['redbasic_shiny']);
-//	}
-//}
+function redbasic_form(&$a, $schema, $nav_colour, $bgcolour, $background_image, $item_colour, $item_opacity, 
+		$font_size, $font_colour, $radius, $shadow) {
 
-// These aren't all used yet, but they're not bloat - we'll use drop down menus in idiot mode.
-function redbasic_form(&$a, $font_size, $line_height, $colour, $shadow, $navcolour, $opaquenav, $displaystyle, $linkcolour, $iconset, $shiny, $colour_scheme,$radius) {
-	$line_heights = array(
-		"1.3" => "1.3",
-		"---" => "---",
-		"1.6" => "1.6",				
-		"1.5" => "1.5",		
-		"1.4" => "1.4",
-		"1.2" => "1.2",
-		"1.1" => "1.1",
-	);	
-	$font_sizes = array(
-		'12' => '12',
-		'14' => '14',
-		"---" => "---",
-		"16" => "16",		
-		"15" => "15",
-		'13.5' => '13.5',
-		'13' => '13',		
-		'12.5' => '12.5',
-		'12' => '12',
-	);
-	$colours = array(
-		'light' => 'light',		
-		'dark' => 'dark',						
-	);
-
-	$colour_schemes = array(
-		'redbasic' => 'redbasic',		
-		'fancyred' => 'fancyred',						
-		'dark' => 'dark',	
-	);
-	$shadows = array(
-		  'true' => 'Yes',
-		  'false' => 'No',
-	);
-
-	$navcolours = array (
+	$scheme_choices = array();
+	$scheme_choices["---"] = t("Default");
+	$files = glob('view/theme/' . current_theme() . '/schema/*');
+	if($files) {
+		foreach($files as $file) {
+			$f = basename($file, ".php");
+			$scheme_name = $f;
+			$scheme_choices[$f] = $scheme_name;
+		}
+	}
+		
+		
+		$nav_colours = array (
+		  '' => 'Scheme Default',
 		  'red' => 'red',
 		  'black' => 'black',	
-	);
-	
-	$displaystyles = array (
-		    'fancy' => 'fancy',
-		    'classic' => 'classic',
-	);
-	
-	$linkcolours = array (
-		    'blue' => 'blue',
-		    'red' => 'red',
-	);
-	
-	$iconsets = array (
-		    'default' => 'default',
-	);
-	
-	$shinys = array (
-		    'none' => 'none',
-		    'opaque' => 'opaque',
-	);
-	if(feature_enabled(local_user(),'expert')) {
+		  'silver' => 'silver',	
+		);
+
+if(feature_enabled(local_user(),'expert')) 
+				$expert = 1;
+					
 	  $t = get_markup_template('theme_settings.tpl');
 	  $o .= replace_macros($t, array(
 		'$submit' => t('Submit'),
 		'$baseurl' => $a->get_baseurl(),
+		'$expert' => $expert,
 		'$title' => t("Theme settings"),
-		'$font_size' => array('redbasic_font_size', t('Set font-size for posts and comments'), $font_size, '', $font_sizes),
-		'$line_height' => array('redbasic_line_height', t('Set line-height for posts and comments'), $line_height, '', $line_heights),
-		'$colour' => array('redbasic_colour', t('Set colour scheme'), $colour, '', $colours),	
-		'$shadow' => array('redbasic_shadow', t('Draw shadows'), $shadow, '', $shadows),
-		'$navcolour' => array('redbasic_navcolour', t('Navigation bar colour'), $navcolour, '', $navcolours),
-		'$displaystyle' => array('redbasic_displaystyle', t('Display style'), $displaystyle, '', $displaystyles),
-		'$linkcolour' => array('redbasic_linkcolour', t('Display colour of links - hex value, do not include the #'), $linkcolour, '', $linkcolours),
-		'$iconset' => array('redbasic_iconset', t('Icons'), $iconset, '', $iconsets),
-		'$shiny' => array('redbasic_shiny', t('Shiny style'), $shiny, '', $shinys),
-		'$radius' => array('redbasic_radius', t('Corner radius'), $radius, t('0-99 default: 5')),
-	  ));}
-	 
-	 if(! feature_enabled(local_user(),'expert')) {
-	    $t = get_markup_template('basic_theme_settings.tpl');
-	    $o .= replace_macros($t, array(
-		'$submit' => t('Submit'),
-		'$baseurl' => $a->get_baseurl(),
-		'$title' => t("Theme settings"),
-		'$font_size' => array('redbasic_font_size', t('Set font-size for posts and comments'), $font_size, '', $font_sizes),
-		'$line_height' => array('redbasic_line_height', t('Set line-height for posts and comments'), $line_height, '', $line_heights),
-		'$colour_scheme' => array('redbasic_colour_scheme', t('Set colour scheme'), $colour_scheme, '', $colour_schemes),	
-	 ));}
-	 
+		'$schema' => array('redbasic_schema', t('Set scheme'), $schema, '', $scheme_choices),
+		'$nav_colour' => array('redbasic_nav_colour', t('Navigation bar colour'), $nav_colour, '', $nav_colours),
+		'$bgcolour' => array('redbasic_background_colour', t('Set the background colour'), $bgcolour),
+		'$background_image' => array('redbasic_background_image', t('Set the background image'), $background_image),
+		'$item_colour' => array('redbasic_item_colour', t('Set the background colour of items'), $item_colour),
+		'$item_opacity' => array('redbasic_item_opacity', t('Set the opacity of items'), $item_opacity),
+		'$font_size' => array('redbasic_font_size', t('Set font-size for posts and comments'), $font_size),
+		'$font_colour' => array('redbasic_font_colour', t('Set font-colour for posts and comments'), $font_colour),
+		'$radius' => array('redbasic_radius', t('Set radius of corners'), $radius),
+		'$shadow' => array('redbasic_shadow', t('Set shadow depth of photos'), $shadow),
+		));
+
 	return $o;
 }
-
diff --git a/view/theme/redbasic/php/style.php b/view/theme/redbasic/php/style.php
index 8643925d3..b80a3e764 100644
--- a/view/theme/redbasic/php/style.php
+++ b/view/theme/redbasic/php/style.php
@@ -1,159 +1,117 @@
 <?php
-  // This needs changing now, if we're going for global settings.  Admin settings have been removed in preparation, You *should* just be able to remove all 
-  // the get_config bits, though this is untested.  
-  // We also need to eventually.  Use the page owners settings for everybody - get_pconfig(page_owner()) or whatever that would look like.
-
 
+// Get the UID of the channel owner
 	$uid = get_theme_uid();
 
 	if($uid)
 	    load_pconfig($uid,'redbasic');
 
-    $line_height = false;
-    $redbasic_font_size = false;
-    $resolution = false;
-    $colour = false;
-    $shadows = false;
-    $navcolour = false;
-    $nav_bg_1 = "f88";
-    $nav_bg_2 = "b00";
-	$nav_bg_3 = "f00";
-	$nav_bg_4 = "b00";
-    $displaystyle = false;
-    $linkcolour = false;
-    $shiny = false;
-	$radius = 5;
-    $site_line_height = get_config("redbasic","line_height");
-    $site_redbasic_font_size = get_config("redbasic", "font_size" );
-    $site_colour = get_config("redbasic", "colour" );
-    $shadows = get_config("redbasic", "shadow" );
-    $navcolour = get_config("redbasic", "navcolour" );
-    $displaystyle = get_config("redbasic", "displaystyle" );
-    $linkcolour = get_config("redbasic", "linkcolour" );
-    $shiny = get_config("redbasic", "shiny" );
-
-	$x = get_config('redbasic','radius');
-	if($x !== false)
-		$radius = $x;
-    
-    if ($uid) {
-        $line_height = get_pconfig($uid, "redbasic","line_height");
-        $redbasic_font_size = get_pconfig($uid, "redbasic", "font_size");
-        $colour = get_pconfig($uid, "redbasic", "colour");
-        $shadows = get_pconfig($uid, "redbasic", "shadow");
-        $navcolour = get_pconfig($uid, "redbasic", "navcolour");
-        $displaystyle = get_pconfig($uid, "redbasic", "displaystyle");
-        $linkcolour = get_pconfig($uid, "redbasic", "linkcolour");
-        $shiny = get_pconfig($uid, "redbasic", "shiny");
-		$x = get_pconfig($uid,'redbasic','radius');
-		if($x !== false)
-			$radius = $x;
-
-        if (! feature_enabled($uid,'expert')) {$colour_scheme = get_pconfig($uid, "redbasic", "colour_scheme");}
-    }
-
-    // In non-expert mode, we just let them choose font size, line height, and a colour scheme.  A colour scheme is just a pre-defined set of the above variables.
-    // But only apply these settings in non-expert mode to prevent confusion when turning expert mode on and off.
-    if(! feature_enabled($uid,'expert')) {
-	    if ($colour_scheme === 'fancyred') {$shadows = true; $navcolour = 'black'; $displaystyle = 'fancy'; $linkcolour = 'f00'; $shiny = "opaque";}
-	    // Dark themes are very different - we need to do some of these from scratch, so don't bother setting vars for anything else
-	    if ($colour_scheme === 'dark') {$colour = 'dark'; $navcolour = 'black';}
-	    if ($colour_scheme === 'redbasic'){$navcolour = 'red';}
-		$shadows = false;
-		$radius = 5;
-}
-
-// This is probably the easiest place to apply global settings.  Don't bother with site line height and such.  Instead, check pconfig for global user settings.  
-// eg, if ($redbasic_font_size === false) {$redbasic_font_size = get_pconfig($uid, "global", "font_size");  If it's not set, we'll just use the CSS with no changes.
-// Then all you need to do is add a "Global Settings" tab to settings/display, and make an equivalent of theme_settings.tpl and config.php to be loaded there.  Easy.
-
-    if ($line_height === false) {$line_height = $site_line_height;}
-    if ($line_height === false) {$line_height = "1.2";}
-    if ($redbasic_font_size === false) {$redbasic_font_size = $site_redbasic_font_size;}
-    if ($redbasic_font_size === false) {$redbasic_font_size = "12";}
-    if ($colour === false) {$colour = $site_colour;}
-    if ($colour === false) {$colour = "light";}
-	    if ($navcolour === "black") {$nav_bg_1 = "000";
-			      $nav_bg_2 = "2e2f2e";}
-
-	if(file_exists('view/theme/' . current_theme() . '/css/style.css')) {
-		$x = file_get_contents('view/theme/' . current_theme() . '/css/style.css');
-		if(get_config('system','pcss_compress')) {
-			// this shaves off about 10%, probably not enough to worry about right now.
-			logger('pcss compress: original size: ' . strlen($x), LOGGER_DEBUG);
-			$x = str_replace(array("\r","\t","  "),array("",' ',' '),$x);
-			$x = preg_replace('/(\n[ ]+?)/s',"\n",$x);
-			$x = str_replace("\n","",$x);
-			logger('pcss compress: final size: ' . strlen($x), LOGGER_DEBUG);
+// Nav colours are mess.  Set $nav_colour as a single word for the sake of letting folk pick one
+// but it actually consists of at least two colours to form a gradient - $nav_bg_1 and $nav_bg_2
+// A further two - $nav_bg_3 and $nav_bg_4 are used to create the hover, if any particular scheme
+// wants to implement that
+	    $nav_colour = get_pconfig($uid, "redbasic", "nav_colour");	
+		if ($nav_colour == "red") {
+					$nav_bg_1 = "#f88";
+					$nav_bg_2 = "#b00";
+					$nav_bg_3 = "#f00";
+					$nav_bg_4 = "#b00";
+					$search_background = '#FFDDDD';
+					$active_colour = '#444444';
 		}
-		echo str_replace(array('$radius'),array($radius),$x);
-    }
-    echo "\r\n";
-
-// use $colour_scheme for idiot mode.
-    if($colour === "dark") {if (file_exists('view/theme/' . current_theme() . '/css/dark.css')) {
-		  $dark = (file_get_contents('view/theme/' . current_theme() . '/css/dark.css'));
-	      echo "$dark";}
-	  }
-
-
-
-// Enforce sane limits for expert mode - otherwise we'll end up with "experts" who think font size is a percentage.
-
-	if(($redbasic_font_size >= 8.0) && ($redbasic_font_size <= 20.0)) {
-		echo ".wall-item-content { font-size: ${redbasic_font_size}px;}\r\n";
-	}
-
-	if(($line_height >= 1.0) && ($line_height <= 2.0)) {
-		echo ".wall-item-content { line-height: $line_height; }\r\n";
-	}	
 
+		if ($nav_colour == "black") {
+				    $nav_bg_1 = $nav_bg_3 = "#000";
+		      		    $nav_bg_2 = $nav_bg_4 = "#222";
+					$search_background = '#EEEEEE';
+					$active_colour = '#AAAAAA';
+		}
+		if ($nav_colour == "silver") {
+				    $nav_bg_1 = $nav_bg_2 = $nav_bg_3 = $nav_bg_4 = "silver";
+					$search_background = '#EEEEEE';
+		}
 
-// Minimum value shadows - they shouldn't all be the same size; just get it working, clean up later.
-	if($shadows === "true") {
-		echo "code, blockquote, .wall-item-content-wrapper, .wall-item-content-wrapper.comment, .wall-item-content img, #profile-jot-perms, #profile-jot-submit, .tab, .tab.active, .settings-widget li, .wall-item-photo, .photo, .contact-block-img, .my-comment-photo, #posted-date-selector:hover, .contact-entry-photo img, .profile-match-photo img, #photo-photo img, .directory-photo-img, .photo-album-photo, .photo-top-photo, .group-selected, .nets-selected, .fileas-selected, .categories-selected {
-		box-shadow: 5px 5px 5px #111;}\r\n
+// Load the owners pconfig
+		$schema = get_pconfig($uid,'redbasic','schema');
+	    $bgcolour = get_pconfig($uid, "redbasic", "background_colour");	
+	    $background_image = get_pconfig($uid, "redbasic", "background_image");	
+	    $item_colour = get_pconfig($uid, "redbasic", "item_colour");	
+	    $item_opacity = get_pconfig($uid, "redbasic", "item_opacity");	
+	    $font_size = get_pconfig($uid, "redbasic", "font_size");	
+	    $font_colour = get_pconfig($uid, "redbasic", "font_colour");	
+	    $radius = get_pconfig($uid, "redbasic", "radius");	
+	    $shadow = get_pconfig($uid,"redbasic","photo_shadow");
+
+// Now load the scheme.  If a value is changed above, we'll keep the settings
+// If not, we'll keep those defined by the schema
+// Setting $scheme to '' wasn't working for some reason, so we'll check it's
+// not --- like the mobile theme does instead.
+
+		if (($schema) && ($schema != '---')) {
+			$schemefile = 'view/theme/' . current_theme() . '/schema/' . $schema . '.php';
+			require_once ($schemefile);
+		}
+		// If we haven't got a schema, load the default.  We shouldn't touch this - we
+		// should leave it for admins to define for themselves.
+			if (! $schema) {
+			      if(file_exists('view/theme/' . current_theme() . '/schema/default.php')) {
+				    $schemefile = 'view/theme/' . current_theme() . '/schema/' . 'default.php';
+				    require_once ($schemefile);
+				    }
+			}
 		
-		.tab.active, #jot-title, #jot-category, .comment-edit-text-empty, .comment-edit-text-full, iframe#profile-jot-text_ifr, #profile-jot-text {
-		box-shadow: 5px 5px 5px #666 inset;}\r\n";
-	
-	}
-	
-// Since every change would otherwise require five lines, it's simpler to just set a default and echo this without first checking if we've set it.  
-	echo "nav {background-image: linear-gradient(bottom, #$nav_bg_1 26%, #$nav_bg_2 82%);
-	      background-image: -o-linear-gradient(bottom, #$nav_bg_1 26%, #$nav_bg_2 82%);
-	      background-image: -moz-linear-gradient(bottom, #$nav_bg_1 26%, #$nav_bg_2 82%) !important;
-	      background-image: -webkit-linear-gradient(bottom, #$nav_bg_1 26%, #$nav_bg_2 82%);
-	      background-image: -ms-linear-gradient(bottom, #$nav_bg_1 26%, #$nav_bg_2 82%);}";
-
-	if($navcolour === false || $navcolour === 'red') {
-		echo "nav:hover {background-image: linear-gradient(bottom, #$nav_bg_3 26%, #$nav_bg_4 82%);
-	      background-image: -o-linear-gradient(bottom, #$nav_bg_3 26%, #$nav_bg_4 82%);
-	      background-image: -moz-linear-gradient(bottom, #$nav_bg_3 26%, #$nav_bg_4 82%) !important;
-	      background-image: -webkit-linear-gradient(bottom, #$nav_bg_3 26%, #$nav_bg_4 82%);
-	      background-image: -ms-linear-gradient(bottom, #$nav_bg_3 26%, #$nav_bg_4 82%);}";
-	}
-
-// This takes quite a lot of code, so we'll keep it in a separate file, and echo the lot.  Devs still don't have to worry about - it's just overrides.
-// Theme devs can play with it without facing scary PHP.
-
-	if ($displaystyle === "fancy") 
-	      {if (file_exists('view/theme/' . current_theme() . '/css/fancy.css')) {
-		  $fancy = (file_get_contents('view/theme/' . current_theme() . '/css/fancy.css'));
-			echo str_replace(array('$radius'),array($radius),$fancy);
-	      }
-	  }
-    
-// Put the # here to force hex colours - if we don't, somebody is going to do something odd, using RGB and we're all going to be confused on the support forums
-// until one of us works out what they've done.
+		
+//Set some defaults - we have to do this after pulling owner settings, and we have to check for each setting
+//individually.  If we don't, we'll have problems if a user has set one, but not all options.
+
+	if (! $nav_colour) {
+		$nav_colour = "red";
+			$nav_bg_1 = "#f88";
+			$nav_bg_2 = "#b00";
+			$nav_bg_3 = "#f00";
+			$nav_bg_4 = "#b00";
+		}
+	if (! $bgcolour)
+		$bgcolour = "fff";
+	if (! $background_image)
+		$background_image ='';
+	if (! $item_colour)
+		$item_colour = "fff";
+	if (! $item_opacity)
+		$item_opacity = "1";
+	if (! $font_size)
+		$font_size = "12";
+	if (! $font_colour)
+		$font_colour = "000";
+	if (! $radius)
+		$radius = "5";
+	if (! $shadow)
+		$shadow = "0";
+	if(! $active_colour)
+		$active_colour = '#FFFFFF';
+
+
+// Apply the settings
+	if(file_exists('view/theme/' . current_theme() . '/css/style.css')) {
+		$x = file_get_contents('view/theme/' . current_theme() . '/css/style.css');
 
-	  if ($linkcolour != false) {
-		    echo "a, a:visited, a:link, .fakelink, .fakelink:visited, .fakelink:link {color: #$linkcolour;}\r\n";
-	}
-	
-// If you want a shiny that just sets a different colour, add an if $shiny != false and handle it as the linkcolour above.
+$options = array (
+'$nav_bg_1' => $nav_bg_1,
+'$nav_bg_2' => $nav_bg_2,
+'$nav_bg_3' => $nav_bg_3,
+'$nav_bg_4' => $nav_bg_4,
+'$search_background' => $search_background,
+'$bgcolour' => $bgcolour,
+'$background_image' => $background_image,
+'$item_colour' => $item_colour,
+'$item_opacity' => $item_opacity,
+'$font_size' => $font_size,
+'$font_colour' => $font_colour,
+'$radius' => $radius,
+'$shadow' => $shadow,
+'$active_colour' => $active_colour
+);
+
+echo str_replace(array_keys($options), array_values($options), $x);    
 
-	if ($shiny === 'opaque') {
-		    echo "div.wall-item-content-wrapper.shiny {opacity: 1;}\r\n
-			 .wall-item-content-wrapper {opacity: 0.8;}";
-	}
\ No newline at end of file
+}
diff --git a/view/theme/redbasic/php/theme.php b/view/theme/redbasic/php/theme.php
index 3d69a7e22..ca280ef6a 100644
--- a/view/theme/redbasic/php/theme.php
+++ b/view/theme/redbasic/php/theme.php
@@ -1,9 +1,5 @@
 <?php
 
 function redbasic_init(&$a) {
-	if($a->config['system']['theme_engine'])
-		$a->set_template_engine($a->config['system']['theme_engine']);
-	else
-		$a->set_template_engine('smarty3');
-//	head_add_js('redbasic.js');
+
 }
diff --git a/view/theme/redbasic/tpl/basic_theme_settings.tpl b/view/theme/redbasic/tpl/basic_theme_settings.tpl
deleted file mode 100755
index 33a34b292..000000000
--- a/view/theme/redbasic/tpl/basic_theme_settings.tpl
+++ /dev/null
@@ -1,14 +0,0 @@
-{{*
- *	AUTOMATICALLY GENERATED TEMPLATE
- *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
- *
- *}}
-{{include file="field_select.tpl" field=$font_size}}
-
-{{include file="field_select.tpl" field=$line_height}}
-
-{{include file="field_select.tpl" field=$colour_scheme}}
-
-<div class="settings-submit-wrapper">
-	<input type="submit" value="{{$submit}}" class="settings-submit" name="redbasic-settings-submit" />
-</div>
diff --git a/view/theme/redbasic/tpl/theme_settings.tpl b/view/theme/redbasic/tpl/theme_settings.tpl
index cd980fbc3..45dd529fa 100755..100644
--- a/view/theme/redbasic/tpl/theme_settings.tpl
+++ b/view/theme/redbasic/tpl/theme_settings.tpl
@@ -1,23 +1,20 @@
-{{include file="field_select.tpl" field=$colour}}
+{{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_select.tpl" field=$nav_colour}}
+{{include file="field_input.tpl" field=$bgcolour}}
+{{include file="field_input.tpl" field=$background_image}}
+{{include file="field_input.tpl" field=$item_colour}}
+{{include file="field_input.tpl" field=$item_opacity}}
 {{include file="field_input.tpl" field=$font_size}}
-
-{{include file="field_input.tpl" field=$line_height}}
-
-{{include file="field_select.tpl" field=$shadow}}
-
-{{include file="field_select.tpl" field=$navcolour}}
-
-{{include file="field_select.tpl" field=$displaystyle}}
-
-{{include file="field_input.tpl" field=$linkcolour}}
-
-{{include file="field_select.tpl" field=$iconset}}
-
-{{include file="field_select.tpl" field=$shiny}}
-
+{{include file="field_input.tpl" field=$font_colour}}
 {{include file="field_input.tpl" field=$radius}}
+{{include file="field_input.tpl" field=$shadow}}
 
 <div class="settings-submit-wrapper">
 	<input type="submit" value="{{$submit}}" class="settings-submit" name="redbasic-settings-submit" />
 </div>
+{{/if}}
\ No newline at end of file