Merge remote-tracking branch 'upstream/master'

55 files changed, 2129 insertions, 7140 deletions

diff --git a/view/theme/fancyred/css/style.css b/view/theme/fancyred/css/style.css
deleted file mode 100644
index c9da4b730..000000000
--- a/view/theme/fancyred/css/style.css
+++ /dev/null
@@ -1,3917 +0,0 @@
-/**
- * duepuntozero Frindika style
- * Fabio Comuni <fabrix.xm@gmail.com>
- */
-
-
-/* generals */
-body {
-	font-family: helvetica,arial,freesans,clean,sans-serif;
-	font-size: 12px;
-	background-color: #ffffff;
-	background-repeat: repeat;
-	color: #000000;
-	margin: 0px;
-}
-
-abbr {
-	border-bottom: none;
-}
-
-aside {
-border: none;
-border-radius: 0px 0px 20px 0px;
-width: 160px;
-color: #d00;
-background: #fff;
-}
-
-
-/* icons */
-.icon {
-  background-color: transparent ;
-  background-repeat: no-repeat;
-  display: block;
-  overflow: hidden;
-  text-indent: -9999px;
-/*  min-width: 22px;
-  height: 22px; */
-}
-.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; 
-  background-position: left center;
-  padding: 1px;
-}
-
-.icon.home {
-  background-image: url("../img/home.png");
- min-width: 22px;
-  height: 22px; 
-  background-position: left center;
-  padding: 1px;
-}
-
-.icon.network {
-  background-image: url("../img/network.png");
- min-width: 22px;
-  height: 22px; 
-  background-position: left center;
-  padding: 1px;
-}
-
-.icon.introductions {
-  background-image: url("../img/introductions.png");
- min-width: 22px;
-  height: 22px; 
-  background-position: left center;
-  padding: 1px;
-}
-
-.icon.mail {
-  background-image: url("../img/message.png");
- min-width: 22px;
-  height: 22px; 
-  background-position: left center;
-  padding: 1px;
-}
-
-.icon.events {
-  background-image: url("../img/events.png");
-  min-width: 22px;
-  height: 22px; 
-  background-position: left center;
-  padding: 1px;
-}
-
-a, a:visited, a:link { color: #dd0000; text-decoration: none; }
-a:hover { color: #dd0000; text-decoration: underline; }
-
-input {
-	border: 1px solid #666666;
-	-moz-border-radius: 5px;
-	border-radius: 5px;	
-	padding: 3px;
-}
-
-img { border :0px; }
-
-
-
-
-code {
-	font-family: Courier, monospace;
-	display: block;
-	overflow: auto;
-	border: 1px solid #444;
-	background: #EEE;
-	color: #444;
-	padding: 10px;
-	margin-top: 20px; 
-	max-width: 80%;
-	box-shadow: 5px 5px 5px #111;
-	border-radius: 5px;
-}
-
-blockquote {
-	background-color: #f4f8f9;
-	border-left: 4px solid #dae4ee;
-	padding: 0.4em;
-}
-
-.icollapse-wrapper, .ccollapse-wrapper {
-	border: 1px solid #CCC;
-	padding: 5px;
-}
-
-.hide-comments {
-	margin-left: 5px;
-}
-
-#panel {
-	background-color: ivory;
-	position: absolute;
-	z-index: 2;
-	width: 30%;
-	padding: 25px;
-	border: 1px solid #444;
-}
-
-.heart {
-	color: #FF0000;
-	font-size: 100%;
-	margin-right: 5px;
-}
-
-
-
-/* nav */
-nav {
-	display: block;
-/*	margin: 0px 10%; */
-	border-bottom: 1px solid #d00;
-}
-nav #site-location {
-	color: #888a85;
-	font-size: 0.8em;
-	position: absolute;
-	border-radius: 1px solid #d00;
-}
-
-.error-message {
-	color: #FF0000;
-	font-size: 1.1em;
-	border: 1px solid #FF8888;
-	background-color: #FFEEEE;
-	padding: 10px;
-}
-
-.info-message {
-	color: #fff;
-	font-size: 1.1em;
-	background-color: #f00;
-	padding: 10px;
-}
-
-
-nav #banner #logo-text a {
-	font-size: 40px;
-	font-weight: bold;
-	margin-left: 3px;
- 	color: #000000;
-
-}
-nav #banner #logo-text a:hover { text-decoration: none; }
-
-header #site-location {
-  display: none;
-}
-header #banner {
-  overflow: hidden;
-  text-align: center;
-  width: 100%;
-  font-size: 2.2em;
-  font-family: tahoma, "Lucida Sans", sans;
-  color: #eec;
-  font-weight: bold;
-
-}
-header #banner a,
-header #banner a:active,
-header #banner a:visited,
-header #banner a:link,
-header #banner a:hover {
-  color: #eec;
-  text-decoration: none;
-  outline: none;
-  vertical-align: bottom;
-}
-header #banner #logo-img {
-  height: 22px;
-  margin-top: 5px;
-}
-header #banner #logo-text {
-  font-size: 22px;
-}
-
-
-
-
-.nav-commlink, .nav-login-link {
-    display: block;
-    height: 15px;
-	margin-top: 67px;
-	margin-right: 2px;
-	//padding: 6px 10px;
-       padding: 6px 3px;
-	float: left;
-	bottom: 140px;
-	border: 1px solid #babdb6;
-	border-bottom: 0px;
-	background-color: #aec0d3;
-	color: #565854;		
-	-moz-border-radius: 5px 5px 0px 0px;
-	border-radius: 5px 5px 0px 0px;	
-}
-nav .nav-link {
-	float: right;
-	margin: 0.2em 0em;
-	padding: 0em 0.5em;
-	background-color: transparent !important;
-}
-
-.nav-commlink.selected {
-	background-color: #ffffff;
-	border-bottom: 1px solid #ffffff;
-	color: #000000 !important;
-	margin-top: 64px;
-	padding-top: 6px;
-	padding-bottom: 8px;
-}
-.nav-ajax-left {
-	font-size: 0.8em;
-	float: left;
-	margin-top: 62px;	
-}
-
-
-nav #nav-link-wrapper .nav-link {
-	border-right: 1px solid #babdb6;
-}
-
-
-
-#dfrn-request-link {
-	display: block;
-	color: #FFFFFF;
-	-webkit-border-radius: 5px ;
-	-moz-border-radius: 5px;
-	border-radius: 5px;
-	padding: 5px;
-	font-weight: bold;
-	background: #3465a4 url('../img/friendika-16.png') no-repeat 95% center;
-}
-#wallmessage-link {
-	display: block;
-	color: #FFFFFF;
-	-webkit-border-radius: 5px ;
-	-moz-border-radius: 5px;
-	border-radius: 5px;
-	padding: 5px;
-	font-weight: bold;
-	background-color: #3465a4;
-}
-.tabs {
-    list-style: none;
-    margin: 15px 0px;
-    padding: 0;
-   }
-.tabs li {
-    display: inline;
-    font-weight: bold;
-}
-.tab {
-    height: auto;
-    background-color: #f00;
-    color: #fff !important;
-    font-weight: bold;
-    -webkit-border-radius: 5px;
-    -moz-border-radius: 5px;
-    border-radius: 20px;
-    margin: 0;
-    width: auto;
-    box-shadow: 5px 5px 5px #444;
-    margin-left: 8px;
-    padding: 4px;
-}
-.tab:hover, .tab.active:hover {
-    background: #d00;
-    color: #fff; 
- ;
-}
-.tab:active {
-    background: #fff;
-    color: #f00;
-}
-.tab.active {
-    background: #f00;
-    color: #fff; 
-    box-shadow: 3px 3px 3px #333 inset;
-    padding: 5px; /* another strageness of the human mind - has to be larger than inactive tabs, or it looks smaller than them */
-}
-
-.tab a, .settings-widget a {
-    border: 0;
-    text-decoration: none;
-    color: #fff;
-}
-
-/* footer */
-footer {
-	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;
-}
-
-div.wall-item-content-wrapper.shiny {
-	opacity: 1;
-}
-
-.preview {
-	background: #FFFFC8;
-}
-
-#theme-preview {
-	margin: 15px 0 15px 150px;
-}
-
-/* from default */
-#jot-perms-icon, 
-#profile-location,
-#profile-nolocation,
-#profile-youtube, 
-#profile-video, 
-#profile-audio,
-#profile-link,
-#profile-title, 
-#wall-image-upload,
-#wall-file-upload,
-#profile-upload-wrapper,
-#wall-image-upload-div,
-#wall-file-upload-div,
-.hover, .focus {
-	cursor: pointer;
-}
-
-#jot-perms-icon {
-	float: left;
-}
-
-#jot-title, #jot-category {
-	border: 0px;
-	margin: 0px;
-	padding: 8px;
-	height: 20px;
-	width: 530px;
-	margin-bottom: 5px;
-	font-weight: bold;
-	border: solid 1px #ccc;
-	box-shadow: 5px 5px 5px #666 inset;
-}
-
-#jot-title::-webkit-input-placeholder{font-weight: normal;}
-#jot-category::-webkit-input-placeholder{font-weight: normal;}
-#jot-title:-moz-placeholder{font-weight: normal;}
-#jot-category:-moz-placeholder{font-weight: normal;}
-		
-	
-#jot-title:hover,
-#jot-title:focus,
-#jot-category:hover,
-#jot-category:focus {
-	border: 1px solid #cccccc; 
-}
-
-.jothidden { display:none; }
-
-
-.fakelink, .fakelink:visited, .fakelink:link {
-	color: #335577;
-	text-decoration: none;
-	cursor: pointer;
-}
-.fakebutton {
-	margin-top: 15px;
-	margin-bottom: 15px;
-}
-
-.lockview {
-	cursor: pointer;
-}
-
-
-#group-sidebar {
-	margin-bottom: 10px;
-}
-
-.group-selected, .nets-selected, .fileas-selected, .categories-selected {
-	padding: 3px;
-	-moz-border-radius: 5px;
-	border-radius: 5px;	
-	border: 1px solid #CCCCCC;
-	background: #F8F8F8;
-	font-weight: bold;
-}
-
-.settings-widget .selected {
-	padding: 3px;
-	-moz-border-radius: 5px;
-	border-radius: 5px;	
-	font-weight: bold;	
-	color: #FFD700;
-}
-
-.fakelink:hover {
-	color: #5588aa;
-	text-decoration: underline;
-	cursor: pointer;
-}
-.smalltext {
-	font-size: 0.7em;
-}
-#sysmsg {
-	/*width: 600px;*/
-	margin-bottom: 10px;
-}
-
-#register-fill-ext {
-	margin-bottom: 25px;
-}
-
-#label-register-name, #label-register-nickname, #label-register-openid {
-	float: left;
-	width: 350px;
-	margin-top: 10px;
-}
-
-#register-name, #register-nickname {
-	float: left;
-	margin-top: 10px;
-	width: 150px;
-}
-
-#register-openid {
-	float: left;
-	margin-top: 10px;
-	width: 130px;
-}
-
-#register-name-end, #register-email-end, #register-nickname-end, #register-submit-end, #register-openid-end {
-	clear: both;
-}
-
-#register-nickname-desc {
-	margin-top: 30px;
-	width: 650px;
-}
-#register-sitename {
-	float: left;
-	margin-top: 10px;
-}
-
-#register-submit-button {
-	margin-top: 10px;
-}
-
-#main-login {
-	margin-left: 100px;
-	margin-top: 50px;
-}
-
-#main-login #id_username, #main-login #id_password {
-	width: 200px;
-	padding: 10px;
-	float: left;
-}
-
-#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;
-}
-
-#register-link, #lost-password-link {
-	float: left;
-	font-size: 90%;
-	margin-left: 100px;
-}
-
-#login-standard-end {
-	clear: both;
-}
-
-#login-submit-button {
-
-	margin-left: 100px;
-	margin-top: 10px;
-/*	margin-left: 200px; */
-}
-
-
-input#dfrn-url {
-	float: left;
-	background: url(../img/friendika-16.png) no-repeat;
-	background-position: 2px center;
-	font-size: 17px;
-	padding-left: 21px;
-	height: 21px;
-	background-color: #FFFFFF;
-	color: #000000;
-	margin-bottom: 20px;
-}
-
-#dfrn-url-label {
-	float: left;
-	width: 250px;
-}
-
-#dfrn-request-url-end {
-	clear: both;
-}
-
-#knowyouyes, #knowyouno {
-	float: left;
-}
-
-#dfrn-request-knowyou-yes-wrapper, #dfrn-request-knowyou-no-wrapper {
-
-	float: none;
-}
-#dfrn-request-knowyou-yes-label, #dfrn-request-knowyou-no-label {
-	float: left;
-	width: 75px;
-	margin-left: 50px;
-	margin-bottom: 7px;
-}
-#dfrn-request-knowyou-break, #dfrn-request-knowyou-end {
-	clear: both;
-
-}
-
-#dfrn-request-message-wrapper {
-	margin-bottom: 50px;
-}
-#dfrn-request-submit-wrapper {
-	clear: both;
-	margin-left: 50px;
-}
-
-#dfrn-request-info-wrapper {
-	margin-left: 50px;
-}
-
-
-
-#cropimage-wrapper, #cropimage-preview-wrapper {
-	float: left;
-	padding: 30px;
-}
-
-#crop-image-form {
-	margin-top: 30px;
-	clear: both;
-}
-
-.intro-wrapper {
-	margin-top: 20px;
-}
-
-.intro-fullname {
-	font-size: 1.1em;
-	font-weight: bold;
-
-}
-.intro-desc {
-	margin-bottom: 20px;
-	font-weight: bold;
-}
-
-.intro-note {
-	padding: 10px;
-}
-
-.intro-end {
-	padding: 30px;
-}
-
-.intro-form {
-	float: left;
-}
-.intro-approve-form {
-	clear: both;
-}
-.intro-approve-as-friend-end {
-	clear: both;
-}
-.intro-submit-approve, .intro-submit-ignore {
-	margin-right: 20px;
-}
-.intro-submit-approve {
-	margin-top: 15px;
-}
-
-.intro-approve-as-friend-label, .intro-approve-as-fan-label {
-	float: left;
-	width: 100px;
-	margin-left: 20px;
-}
-.intro-approve-as-friend, .intro-approve-as-fan {
-	float: left;
-}
-.intro-form-end {
-	clear: both;
-}
-.intro-approve-as-friend-desc {
-	margin-top: 15px;
-}
-.intro-approve-as-end {
-	clear: both;
-	margin-bottom: 10px;
-}
-
-.intro-end {
-	clear: both;
-	margin-bottom: 30px;
-}
-.aprofile dt {
-	font-weight: bold;
-}
-#page-profile .title {
-	font-weight: bold;
-}
-#profile-vcard-break {
-	clear: both;
-}
-#profile-extra-links {
-	clear: both;
-	margin-top: 10px;
-}
-
-#profile-extra-links ul {
-	list-style-type: none;
-	padding: 0px;
-}
-
-
-#profile-extra-links li {
-	margin-top: 5px;
-}
-
-#profile-edit-links ul {
-	list-style-type: none;
-}
-
-#profile-edit-links li {
-	margin-top: 10px;
-}
-.profile-edit-side-div {
-	float: right;
-}
-.profile-edit-side-link {
-	opacity: 0.3;
-	filter:alpha(opacity=30);
-	float: right;
-}
-.profile-edit-side-link:hover {
-	opacity: 1.0;
-	filter:alpha(opacity=100);
-}
-
-.view-contact-wrapper {
-	margin-top: 20px;
-	float: left;
-	margin-left: 20px;
-	width: 180px;
-}
-
-.contact-wrapper {
-	float: left;
-	width: 150px;
-	height: 150px;
-	overflow: auto;
-}
-
-#view-contact-end {
-	clear: both;
-}
-
-
-#viewcontacts {
-	margin-top: 15px;
-}
-#profile-edit-default-desc {
-	color: #FF0000;
-	border: 1px solid #FF8888;
-	background-color: #FFEEEE;
-	padding: 7px;
-}
-
-#profile-edit-clone-link-wrapper {
-	float: left;
-	margin-left: 50px;
-	margin-bottom: 20px;
-	width: 300px;
-}
-
-
-#profile-edit-links-end {
-	clear: both;
-	margin-bottom: 15px;
-}
-
-.profile-listing-photo {
-	border: none;
-}
-
-.profile-edit-submit-wrapper {
-	margin-top: 20px;
-	margin-bottom: 20px;
-}
-
-#profile-photo-link-select-wrapper {
-	margin-top: 2em;
-}
-
-#profile-photo-submit-wrapper {
-	margin-top: 10px;
-}
-
-#profile-photo-wrapper img {
-	width:120px;
-	height:120px;
-	padding: 12px;
-}
-
-#profile-edit-profile-name-label,
-#profile-edit-name-label,
-#profile-edit-pdesc-label,
-#profile-edit-gender-label,
-#profile-edit-dob-label,
-#profile-edit-address-label,
-#profile-edit-locality-label,
-#profile-edit-region-label,
-#profile-edit-postal-code-label,
-#profile-edit-country-name-label,
-#profile-edit-marital-label,
-#profile-edit-sexual-label,
-#profile-edit-politic-label,
-#profile-edit-religion-label,
-#profile-edit-pubkeywords-label,
-#profile-edit-prvkeywords-label,
-#profile-edit-homepage-label,
-#profile-edit-hometown-label {
-	float: left;
-	width: 175px;
-}
-
-#profile-edit-profile-name,
-#profile-edit-name,
-#profile-edit-pdesc,
-#gender-select,
-#profile-edit-dob,
-#profile-edit-address,
-#profile-edit-locality,
-#profile-edit-region,
-#profile-edit-postal-code,
-#profile-edit-country-name,
-#marital-select,
-#sexual-select,
-#profile-edit-politic,
-#profile-edit-religion,
-#profile-edit-pubkeywords,
-#profile-edit-prvkeywords,
-#profile-in-dir-yes,
-#profile-in-dir-no,
-#profile-in-netdir-yes,
-#profile-in-netdir-no,
-#hide-wall-yes,
-#hide-wall-no,
-#hide-friends-yes,
-#hide-friends-no {
-	float: left;
-	margin-bottom: 20px;
-}
-#settings-normal,
-#settings-soapbox,
-#settings-freelove,
-#settings-community {
-	float: left;
-}
-#settings-notifications label {
-	margin-left: 20px;
-}
-#settings-notify-desc, #settings-activity-desc {
-	font-weight: bold;
-	margin-bottom: 15px;
-}
-#settings-pagetype-desc {
-	color: #666666;
-	margin-bottom: 15px;
-}
-
-#profile-in-dir-yes-label,
-#profile-in-dir-no-label,
-#profile-in-netdir-yes-label,
-#profile-in-netdir-no-label,
-#hide-wall-yes-label,
-#hide-wall-no-label,
-#hide-friends-yes-label,
-#hide-friends-no-label {
-	margin-left: 125px;
-	float: left;
-	width: 50px;
-}
-
-#profile-edit-with-label {
-	width: 175px;
-	margin-left: 20px;
-}
-
-#profile-publish-yes-reg,
-#profile-publish-no-reg {
-	float: left;
-	margin-bottom: 10px;
-}
-
-#profile-publish-yes-label-reg,
-#profile-publish-no-label-reg {
-	margin-left: 350px;
-	float: left;
-	width: 50px;
-}
-
-#profile-publish-break-reg,
-#profile-publish-end-reg {
-	clear: both;
-}
-
-
-#profile-edit-pdesc-desc,
-#profile-edit-pubkeywords-desc,
-#profile-edit-prvkeywords-desc {
-	float: left;
-	margin-left: 20px;
-}
-
-
-#profile-edit-homepage, #profile-edit-hometown {
-	float: left;
-	margin-bottom: 35px;
-}
-#settings-normal-label,
-#settings-soapbox-label,
-#settings-community-label,
-#settings-freelove-label {
-	float: left;
-	width: 200px;
-}
-#settings-normal-desc,
-#settings-soapbox-desc,
-#settings-community-desc,
-#settings-freelove-desc {
-	/*float: left;
-	margin-left: 75px;*/
-    clear: left;
-    color: #666666;
-    display: block;
-    margin-bottom: 20px	
-}
-
-#profile-edit-profile-name-end,
-#profile-edit-name-end,
-#profile-edit-pdesc-end,
-#profile-edit-gender-end,
-#profile-edit-dob-end,
-#profile-edit-address-end,
-#profile-edit-locality-end,
-#profile-edit-region-end,
-#profile-edit-postal-code-end,
-#profile-edit-country-name-end,
-#profile-edit-marital-end,
-#profile-edit-sexual-end,
-#profile-edit-politic-end,
-#profile-edit-religion-end,
-#profile-edit-pubkeywords-end,
-#profile-edit-prvkeywords-end,
-#profile-edit-homepage-end,
-#profile-edit-hometown-end,
-#profile-in-dir-break,
-#profile-in-dir-end,
-#profile-in-netdir-break,
-#profile-in-netdir-end,
-#hide-wall-break,
-#hide-wall-end,
-#hide-friends-break,
-#hide-friends-end,
-#settings-normal-break,
-#settings-soapbox-break,
-#settings-community-break,
-#settings-freelove-break {
-	clear: both;
-}
-
-.settings-widget ul {
-	list-style-type: none;
-	padding: 0px;
-}
-
-.settings-widget li {
-    height: auto;
-    background-color: #f00;
-    color: #fff !important;
-    font-weight: bold;
-    -webkit-border-radius: 5px;
-    -moz-border-radius: 5px;
-    border-radius: 5px;
-    margin-bottom: 12px;
-    width: auto;
-    box-shadow: 5px 5px 5px #444;
-    margin-left: 8px;
-    padding: 4px;
-}
-
-
-#gender-select, #marital-select, #sexual-select {
-	width: 220px;
-}
-
-#profile-edit-profile-name-wrapper .required {
-	color: #FF0000;
-	float: left;
-}
-
-#contacts-main {
-	margin-top: 20px;
-	margin-bottom: 20px;
-}
-
-.contact-entry-wrapper {
-	float: left;
-	width: 120px;
-	height: 120px;
-}
-#contacts-search-end {
-	margin-bottom: 10px;
-}
-
-.contact-entry-direction-icon {
-	margin-top: 24px;
-	margin-right: 2px;
-}
-
-.contact-entry-photo img {
-	border: none;
-}
-.contact-entry-photo-end {
-	clear: both;
-}
-.contact-entry-name {
-	float: left;
-	margin-left: 0px;
-	margin-right: 10px;
-	width: 120px;
-	overflow: hidden;
-}
-.contact-entry-edit-links {
-	margin-top: 6px;
-	margin-left: 10px;
-	width: 16px;
-}
-.contact-entry-nav-wrapper {
-	float: left;
-	margin-left: 10px;
-}
-
-.contact-entry-edit-links img {
-	border: none;
-	margin-right: 15px;
-}
-.contact-entry-photo {
-	float: left;
-	position: relative;
-}
-.contact-entry-end {
-	clear: both;
-}
-
-#fsuggest-desc, #fsuggest-submit-wrapper {
-	margin-top: 15px;
-	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 {
-	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 {
-	position: relative;
-	background: #fff;
-	border-radius: 10px;
-	box-shadow: 8px 8px 8px #000;
-	border: 1px solid #eec;
-	opacity: 0.8;
-}
-
-.wall-item-content-wrapper:hover {
-	opacity: 1;
-}
-.thread-wrapper .thread-wrapper {
-	margin-left: 50px;
-}
-
-.thread-end-wrapper {
-    margin-left: 50px;
-}
-
-
-/* This shadow isn't quite right - not sure if it's colour or size */
-
-.wall-item-content-wrapper.comment {
-	background: #fff;
-	border-left: 1px solid #e0e0e0;
-	margin-left: 50px;
-	margin-top: 15px;
-	box-shadow: 5px 5px 5px #222;
-
-}
-
-.wall-item-like.comment, .wall-item-dislike.comment {
-	margin-left: 50px;
-}
-
-.wall-item-info {
-	display: block;
-	float: left;
-	width:110px;
-	margin-right:10px;
-}
-.comment .wall-item-info {
-	width: 70px;
-}
-
-.wall-item-photo-wrapper {
-	margin-top: 10px;
-	margin-left: 10px;
-	margin-bottom: 10px;
-	width: 100px;
-}
-.wall-item-photo-menu-button {
-	display: block;
-	position: absolute;
-	background-image: url("../img/photo-menu.jpg");
-	background-position: top left; 
-	background-repeat: no-repeat;
-	margin: 0px; padding: 0px;
-	width: 16px;
-	height: 16px;
-	top: 74px; left:10px;
-	overflow: hidden;
-	text-indent: 40px;
-	display: none;
-	
-}
-.wall-item-photo-menu {
-	width: auto;
-	border: 2px solid #444444;
-	background: #FFFFFF;
-	position: absolute;
-	left: 10px; top: 90px;
-	display: none;
-	z-index: 10000;
-}
-.wall-item-photo-menu ul { margin:0px; padding: 0px; list-style: none }
-.wall-item-photo-menu li a { display: block; padding: 2px; }
-.wall-item-photo-menu li a:hover { color: #FFFFFF; background: #3465A4; text-decoration: none; }
-
-
-.comment .wall-item-photo-menu-button {	top: 44px;}
-.comment .wall-item-photo-menu { top: 60px; }
-
-.wallwall .wwto {
-    left: 50px;
-    margin: 0;
-    position: absolute;
-    top: 70px;
-    width: 30px
-}
-.wallwall .wwto img {
-	width: 30px !important;
-	height: 30px !important;
-}
-
-.wallwall .wall-item-photo-end {
-	clear: both;
-}
-
-.wall-item-arrowphoto-wrapper {
-    position: absolute;
-    left: 75px;
-    top: 70px;
-    z-index: 100;
-}
-.wall-item-wrapper {
-	/*float: left;
-    margin-right: 5px;
-    width: 250px;*/
-    margin-left:10px;
-}
-.wall-item-lock {
-	/*height: 20px;*/
-	/*margin-top: 10px;*/
-    left: 105px;
-    position: absolute;
-    top: 1px;	
-}
-.comment .wall-item-lock {
-	left: 65px;
-}
-
-.wall-item-ago {
-	color: #888888;
-	font-size: 0.8em;
-}
-
-.wall-item-location {
-	overflow: hidden;
-	/* add ellipsis on text overflow               */
-	/* this work on safari, opera, ie, chrome.     */
-	/* firefox users have to wait support or we    */
-	/* can use a jquery plugin http://bit.ly/zJskg */
-	text-overflow: ellipsis;
-	-o-text-overflow: ellipsis;
-	width: 100%;
-}
-
-
-.item-tool {
-	float: left;
-	margin-right: 8px;
-}
-
-.like-rotator {
-	margin-left: 5px;
-}
-
-.wall-item-delete-wrapper {
-	float: right;
-}
-
-.wall-item-delete-end {
-	clear: both;
-}
-
-.wall-item-delete-icon {
-	border: none;
-}
-
-.wall-item-wrapper-end {
-	clear: both;
-}
-.wall-item-name-link {
-	font-weight: bold;
-	text-decoration: none;
-	color: #3172BD;
-}
-.wall-item-photo {
-	border: none;
-}
-.comment .wall-item-photo {
-	width: 50px !important; 
-	height: 50px !important;
-}
-.wall-item-content {
-	margin-left: 10px;
-	overflow: auto;
-}
-
-.wall-item-content img {
-  max-height: 95% !important;
-  max-width: 95% !important;
-  box-shadow: 8px 8px 8px #666;
-}
-
-.wall-item-content img.smiley {
-  box-shadow: none;
-}
-
-a.divgrow-showmore {
-bottom: 0pt;
-left: 0pt;
-cursor: pointer;
-/*TODO make this work in not-Firefox */
-background-image: -moz-linear-gradient(center top, #ccc 0%, #000 95%);
-height: 30px;
-text-shadow: 0pt 0pt 7px #000;
-background-color: transparent;
-border-radius: 0pt 0pt 3px 3px;
-border-bottom: 2px solid #ff0;
-color: #ff0;
-font-size: 0.8em;
-line-height: 48px;
-text-align: center;
-right: 0pt;
-position: absolute;
-/*Stop it blocking wall-item-tools*/
-margin-bottom: 24px;
-/*Make it work with non-shiny posts */
-opacity: 0.6;
-
-}
-
-.wall-item-title {
-	float: left;
-	font-weight: bold;
-	/*width: 450px;*/
-}
-
-.wall-item-title-end {
-	clear: both;
-}
-
-.thread-wrapper.toplevel_item {
-padding: 30px;
-width: 90%;
-}
-
-.wall-item-body {
-/*	float: left; */
-	/*width: 450px;*/
-	margin-top: 10px;
-	margin-right: 10px;
-}
-
-.wall-item-tools {
-	clear: both;
-/*	background-image: url("../img/head.jpg"); */
-    background-position: 0 -20px;
-    background-repeat: repeat-x;
-    background: #eee;
-    padding: 5px 10px;
-    border-radius: 0px 0px 10px 10px;
-    border: 1px #eec solid;
-}
-
-.wall-item-like {
-margin: 15px;
-opacity: 0.6;
-}
-
-.wall-item-like:hover {
-margin: 15px;
-opacity: 1;
-}
-
-.wall-item-author {
-	margin-top: 10px;
-}
-
-.comment-edit-wrapper {
-	margin-top: 15px;
-	background: #ffffff;
-	margin-left: 50px;
-}
-
-.comment-wwedit-wrapper {
-	
-}
-
-.comment-edit-photo {
-	margin-top: 10px;
-	margin-left: 10px;
-	margin-bottom: 10px;
-	width: 100px;
-	float: left;
-}
-.comment-wwedit-wrapper.threaded > .comment-edit-form > .comment-edit-photo {
-	width: 40px;
-}
-
-.comment-edit-photo img {
-	width: 25px;
-}
-.comment-edit-text-empty, .comment-edit-text-full {
-	float: left;
-	margin-top: 10px;
-	padding: 3px 1px 1px 3px;
-	border: 1px solid #ccc;
-	padding: 8px;
-	border-radius: 5px 5px 5px 5px;
-	box-shadow: 5px 5px 5px #666 inset;
-}
-
-.comment-edit-text-empty {
-color: gray;
-height: 1.5em;
-width: 80%; /*Too wide? */
-overflow: auto;
-margin-bottom: 10px;
-}
-
-.comment-wwedit-wrapper.threaded > .comment-edit-form > .comment-edit-text-empty {
-	height: 1.5em;
-}
-
-.comment-edit-text-full {
-	color: black;
-	height: 150px;
-	width: 80%;
-	overflow: auto;
-}
-
-
-.comment-edit-text-end {
-	clear: both;
-}
-
-.comment-edit-submit {
-	margin: 10px 0px 10px 110px;
-}
-
-.comment-wwedit-wrapper.threaded > .comment-edit-form > .comment-edit-submit-wrapper > .comment-edit-submit {
-	margin-left: 50px;
-}
-
-#profile-jot-plugin-wrapper,
-#profile-jot-submit-wrapper {
-	margin-top: 15px;
-	width:90%;
-}
-
-#profile-jot-submit {
-	float: left;
-}
-#profile-upload-wrapper {
-	float: left;
-	margin-left: 30px;
-}
-#profile-attach-wrapper {
-	float: left;
-	margin-left: 30px;
-}
-#profile-rotator {
-	float: left;
-	margin-left: 30px;
-}
-#profile-link-wrapper {
-	float: left;
-	margin-left: 15px;
-}
-#profile-youtube-wrapper {
-	float: left;
-	margin-left: 15px;
-}
-#profile-video-wrapper {
-	float: left;
-	margin-left: 15px;
-}
-#profile-audio-wrapper {
-	float: left;
-	margin-left: 15px;
-}
-#profile-location-wrapper {
-	float: left;
-	margin-left: 15px;
-}
-#jot-preview-link {
-	float: left;
-	margin-left: 45px;
-	margin-top: 0px !important;
-}
-
-
-#profile-nolocation-wrapper {
-	float: left;
-	margin-left: 15px;
-}
-#profile-title-wrapper {
-	float: left;
-	margin-left: 15px;
-}
-
-#profile-jot-perms {
-	float: right;
-	margin-left: 100px;
-	font-weight: bold;
-	font-size: 1.2em;
-	height: auto;
-	width: auto;
-	background-color: #dd0000;
-	border-radius: 5px;
-	border: 2px outset;
-	box-shadow: 5px 5px 5px #666;
-	margin-right: 8px;
-	padding: 4px;
-}
-
-#profile-jot-perms:active {
-    box-shadow: 0 0 0 0;
-}
-
-#profile-jot-perms-end {
-	/*clear: left;*/
-	height: 30px;
-}
-
-#profile-jot-plugin-end{
-  clear: both;
-}
-.profile-jot-net {
-	float: left;
-	margin-right: 10px;
-	margin-top: 5px;
-	margin-bottom: 5px;
-}
-
-#profile-jot-networks-end {
-	clear: both;
-}
-
-#profile-jot-end {
-	/*clear: both;*/
-	margin-bottom: 30px;
-}
-#about-jot-submit-wrapper {
-	margin-top: 15px;
-}
-#about-jot-end {
-	margin-bottom: 30px;
-}
-#contacts-main {
-	margin-bottom: 30px;
-}
-
-#profile-listing-desc {
-	margin-left: 30px;
-}
-
-#profile-listing-new-link-wrapper {
-	margin-left: 30px;
-	margin-bottom: 30px;
-}
-.profile-listing-photo-wrapper {
-	float: left;
-}
-
-.profile-listing-edit-buttons-wrapper {
-	clear: both;
-}
-.profile-listing-photo-edit-link {
-	float: left;
-	width: 125px;
-}
-.profile-listing-end {
-	clear: both;
-}
-.profile-listing-edit-buttons-wrapper img{
-	border: none;
-	margin-right: 20px;
-}
-.profile-listing {
-	margin-top: 25px;
-}
-.profile-listing-name {
-	float: left;
-	margin-left: 32px;
-	margin-top: 10px;
-	color: #3172BD;
-	font-weight: bold;
-	width: 200px;
-
-}
-.fortune {
-	margin-top: 50px;
-	color: #4444FF;
-	font-weight: bold;
-	margin-bottom: 20px;
-}
-
-
-.directory-end {
-	clear: both;
-}
-.directory-name {
-	text-align: center;
-}
-.directory-photo {
-	margin-left: 25px;
-}
-.directory-details {
-	font-size: 0.7em;
-	text-align: center;
-	margin-left: 5px;
-	margin-right: 5px;
-}
-.directory-item {
-	float: left;
-	width: 225px;
-	height: 260px;
-	overflow: auto;
-}
-
-#directory-search-wrapper {
-	margin-top: 20px;
-	margin-right: 20px;
-	margin-bottom: 50px;
-}
-
-#directory-search-end {
-}
-
-.directory-photo-img {
-	border: none;
-}
-
-
-.pager {
-  padding: 10px;
-  text-align: center;
-  font-size: 1.0em;
-}
-
-
-.pager_first,
-.pager_last,
-.pager_prev,
-.pager_next,
-.pager_n {
-	border: 1px solid black;
-	background: #EEE;
-	padding: 4px;
-}
-
-.pager_first a,
-.pager_last a,
-.pager_prev a,
-.pager_next a,
-.pager_n a {
-	text-decoration: none;
-}
-
-.pager_current {
-  border: 1px solid black;
-  background: #FFCCCC;
-  padding: 4px;
-}
-
-
-#advanced-profile-name-wrapper,
-#advanced-profile-gender-wrapper,
-#advanced-profile-dob-wrapper,
-#advanced-profile-age-wrapper,
-#advanced-profile-marital-wrapper,
-#advanced-profile-sexual-wrapper,
-#advanced-profile-homepage-wrapper,
-#advanced-profile-politic-wrapper,
-#advanced-profile-religion-wrapper,
-#advanced-profile-about-wrapper,
-#advanced-profile-interest-wrapper,
-#advanced-profile-contact-wrapper,
-#advanced-profile-music-wrapper,
-#advanced-profile-book-wrapper,
-#advanced-profile-tv-wrapper,
-#advanced-profile-film-wrapper,
-#advanced-profile-romance-wrapper,
-#advanced-profile-work-wrapper,
-#advanced-profile-education-wrapper {
-	margin-top: 20px;
-}
-
-#advanced-profile-name-text,
-#advanced-profile-gender-text,
-#advanced-profile-dob-text,
-#advanced-profile-age-text,
-#advanced-profile-marital-text,
-#advanced-profile-sexual-text,
-#advanced-profile-homepage-text,
-#advanced-profile-politic-text,
-#advanced-profile-religion-text,
-#advanced-profile-about-text,
-#advanced-profile-interest-text,
-#advanced-profile-contact-text,
-#advanced-profile-music-text,
-#advanced-profile-book-text,
-#advanced-profile-tv-text,
-#advanced-profile-film-text,
-#advanced-profile-romance-text,
-#advanced-profile-work-text,
-#advanced-profile-education-text {
-	width: 300px;
-	float: left;
-}
-
-#advanced-profile-name-end,
-#advanced-profile-gender-end,
-#advanced-profile-dob-end,
-#advanced-profile-age-end,
-#advanced-profile-marital-end,
-#advanced-profile-sexual-end,
-#advanced-profile-homepage-end,
-#advanced-profile-politic-end,
-#advanced-profile-religion-end {
-	height: 10px;
-}
-
-#advanced-profile-about-end,
-#advanced-profile-interest-end,
-#advanced-profile-contact-end,
-#advanced-profile-music-end,
-#advanced-profile-book-end,
-#advanced-profile-tv-end,
-#advanced-profile-film-end,
-#advanced-profile-romance-end,
-#advanced-profile-work-end,
-#advanced-profile-education-end {
-
-
-}
-
-#advanced-profile-name,
-#advanced-profile-gender,
-#advanced-profile-dob,
-#advanced-profile-age,
-#advanced-profile-marital,
-#advanced-profile-sexual,
-#advanced-profile-homepage,
-#advanced-profile-politic,
-#advanced-profile-religion {
-	float: left;
-
-}
-
-
-#advanced-profile-about,
-#advanced-profile-interest,
-#advanced-profile-contact,
-#advanced-profile-music,
-#advanced-profile-book,
-#advanced-profile-tv,
-#advanced-profile-film,
-#advanced-profile-romance,
-#advanced-profile-work,
-#advanced-profile-education {
-	margin-top: 10px;
-	margin-left: 50px;
-	margin-right: 20px;
-	padding: 10px;
-	border: 1px solid #CCCCCC;
-}
-
-#advanced-profile-with {
-	float: left;
-	margin-left: 15px;
-}
-
-#contact-edit-wrapper {
-	margin-top: 10px;
-}
-
-#contact-edit-banner-name {
-	font-size: 1.4em;
-	font-weight: bold;
-}
-
-#contact-edit-poll-wrapper {
-	margin-top: 15px;
-}
-
-#contact-edit-poll-text {
-	margin-top: 15px;
-	margin-bottom: 5px;
-}
-
-#contact-edit-update-now {
-	margin-top: 15px;
-}
-
-#contact-edit-links{
-	clear: both;
-}
-
-#contact-edit-links ul {
-	list-style: none;
-	list-style-type: none;
-	margin-left: 0px;
-	padding-left: 0px;
-}
-
-#contact-edit-links li {
-	margin-top: 5px;
-}
-
-#contact-edit-drop-link {
-	float: right;
-	margin-right: 20px;
-}
-
-#contact-edit-nav-end {
-	clear: both;
-}
-
-#contact-edit-wrapper {
-	width: 100%;
-}
-
-#contact-edit-end {
-	clear: both;
-	margin-top: 15px;
-}
-
-#contact-profile-selector {
-	width: 175px;
-	margin-left: 175px;
-}
-
-.contact-edit-submit {
-	margin-top: 20px;
-}
-
-
-.contact-photo-menu-button {
-	position: absolute;
-	background-image: url("../img/photo-menu.jpg");
-	background-position: top left; 
-	background-repeat: no-repeat;
-	margin: 0px; padding: 0px;
-	width: 16px;
-	height: 16px;
-	top: 64px; left:0px;
-	overflow: hidden;
-	text-indent: 40px;
-	display: none;
-	
-}
-.contact-photo-menu {
-	width: auto;
-	border: 2px solid #444444;
-	background: #FFFFFF;
-	position: absolute;
-	left: 0px; top: 90px;
-	display: none;
-	z-index: 10000;
-}
-.contact-photo-menu ul { margin:0px; padding: 0px; list-style: none }
-.contact-photo-menu li a { display: block; padding: 2px; }
-.contact-photo-menu li a:hover { color: #FFFFFF; background: #3465A4; text-decoration: none; }
-
-
-#block-message, #ignore-message, #archive-message, #lost-contact-message {
-	color: #FF0000;
-}
-
-#profile-edit-insecure {
-	margin-top: 20px;
-	color: #FF0000;
-	font-size: 1.1em;
-	border: 1px solid #FF8888;
-	background-color: #FFEEEE;
-	padding-left: 5px;
-	/*: 3px 3px 3px 5px; */
-	width: 587px;
-}
-
-/* TinyMCE */
-
-DIV#profile-jot-text_toolbargroup{
-background: #FFF;
-border: 1px #111;
-/*box-shadow: 5px 5px 5px #000 inset;*/
-}
-
-/*
-#profile-jot-text_parent, .mceLayout {
-    border-radius: 5px;
-    -moz-border-radius: 5px;
-    box-shadow: 4px 4px 3px 0 #444444;
-}
-*/
-
-
-iframe#profile-jot-text_ifr {
-width: 100% !important;
-height: 100% !important;
-box-shadow: 5px 5px 5px #000 inset !important;}
-
-tr.mceLast {
-
-}
-
-/* Not MCE */
-
-#profile-jot-text {
-	height: 20px;
-	color:#000;
-	border: 1px solid #cccccc;
-	padding: 10px;
-	width: 90%;
-	border-radius: 20px;	
-	box-shadow: 4px 4px 3px 0 #666 inset;
-}
-#profile-jot-text:hover {
-	color: #000000;
-}
-
-.wall-item-photo, .photo, .contact-block-img, .my-comment-photo {
-    border-radius: 5px;
-    -moz-border-radius: 5px;
-    box-shadow: 4px 4px 3px 0 #444444;
-}
-
-
-#datebrowse-sidebar select {
-    margin-left: 25px;
-    border-radius: 5px;
-    -moz-border-radius: 5px;
-    opacity: 0.3;
-    filter:alpha(opacity=30);
-}
-
-#datebrowse-sidebar select:hover {
-    opacity: 1.0;
-    filter:alpha(opacity=100);
-}
-
-#posted-date-selector {
-    margin-left: 30px !important;
-    margin-top: 5px !important;
-    margin-right: 0px !important;
-    margin-bottom: 0px !important;
-}
-
-#posted-date-selector:hover {
-    box-shadow: 4px 4px 3px 0 #444444;
-    margin-left: 25px !important;
-    margin-top: 0px !important;
-    margin-right: 5px !important;
-    margin-bottom: 5px !important;
-
-}
-
-#side-bar-photos-albums {
-	margin-top: 15px;
-}
-
-#side-bar-photos-albums ul {
-	list-style: none;
-}
-
-.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 {
-    border-radius: 5px;
-    -moz-border-radius: 5px;
-    box-shadow: 4px 4px 3px 0 #444444;
-}
-
-#profile-jot-submit {
-    height: auto;
-    background-color: #dd0000;
-    color: #eeeeec;
-    font-weight: bold;
-    -webkit-border-radius: 5px;
-    -moz-border-radius: 5px;
-    border-radius: 5px;
-    border: 2px outset #222420 !important;
-    margin: 0;
-    float: right;
-    text-shadow: 1px 1px #111;
-    width: auto;
-    box-shadow: 5px 5px 5px #444;
-}
-
-#profile-jot-submit:active {
-    box-shadow: 0 0 0 0;
-}
-
-#sidebar-page-list .label {
-    margin-left: 5px;
-}
-
-
-.photo {
-    border: 1px solid #AAAAAA;
-}
-
-.photo-top-photo, .photo-album-photo {
-    padding: 10px;
-    max-width: 300px;
-    border: 1px solid #888888;
-}
-
-.rotleft1 {
--webkit-transform: rotate(-1deg);
--moz-transform: rotate(-1deg);
--ms-transform: rotate(-1deg);
--o-transform: rotate(-1deg);
-}
-
-.rotleft2 {
--webkit-transform: rotate(-2deg);
--moz-transform: rotate(-2deg);
--ms-transform: rotate(-2deg);
--o-transform: rotate(-2deg);
-}
-
-.rotleft3 {
--webkit-transform: rotate(-3deg);
--moz-transform: rotate(-3deg);
--ms-transform: rotate(-3deg);
--o-transform: rotate(-3deg);
-}
-
-.rotleft4 {
--webkit-transform: rotate(-4deg);
--moz-transform: rotate(-4deg);
--ms-transform: rotate(-4deg);
--o-transform: rotate(-4deg);
-}
-
-
-.rotright1 {
--webkit-transform: rotate(1deg);
--moz-transform: rotate(1deg);
--ms-transform: rotate(1deg);
--o-transform: rotate(1deg);
-}
-
-.rotright2 {
--webkit-transform: rotate(2deg);
--moz-transform: rotate(2deg);
--ms-transform: rotate(2deg);
--o-transform: rotate(2deg);
-}
-
-.rotright3 {
--webkit-transform: rotate(3deg);
--moz-transform: rotate(3deg);
--ms-transform: rotate(3deg);
--o-transform: rotate(3deg);
-}
-
-.rotright4 {
--webkit-transform: rotate(4deg);
--moz-transform: rotate(4deg);
--ms-transform: rotate(4deg);
--o-transform: rotate(4deg);
-}
-
-
-
-/** acl **/
-#photo-edit-perms-select,
-#photos-upload-permissions-wrapper,
-#profile-jot-acl-wrapper{
-	display:block!important;
-}
-
-#photos-usage-message {
-	margin-bottom: 15px;
-}
-
-
-#acl-wrapper {
-	width: 690px;
-	float:left;
-}
-#acl-search {
-	float:right;
-	background: #ffffff url("../../../../images/search_18.png") no-repeat right center;
-	padding-right:20px;
-}
-#acl-showall {
-	float: left;
-	display: block;
-	width: auto;
-	height: 18px;
-	background-color: #cccccc;
-	background-image: url("../../../../images/show_all_off.png");
-	background-position: 7px 7px;
-	background-repeat: no-repeat;
-	padding: 7px 5px 0px 30px;
-	-webkit-border-radius: 5px ;
-	-moz-border-radius: 5px;
-	border-radius: 5px;
-	color: #999999;
-}
-#acl-showall.selected {
-	color: #000000;
-	background-color: #ff9900;
-	background-image: url("../../../../images/show_all_on.png");
-}
-
-#acl-list {
-	height: 210px;
-	border: 1px solid #cccccc;
-	clear: both;
-	margin-top: 30px;
-	overflow: auto;
-}
-#acl-list-content {
-	
-}
-.acl-list-item {
-	display: block;
-	width: 150px;
-	height: 30px;
-	border: 1px solid #cccccc;
-	margin: 5px;
-	float: left;
-}
-.acl-list-item img{
-	width:22px;
-	height: 22px;
-	float: left;
-	margin: 4px;
-}
-.acl-list-item p { height: 12px; font-size: 10px; margin: 0px; padding: 2px 0px 1px; overflow: hidden;}
-.acl-list-item a { 
-	font-size: 8px;
-	display: block;
-	width: 40px;
-	height: 10px;
-	float: left;
-	color: #999999;
-	background-color: #cccccc;
-	background-position: 3px 3px;
-	background-repeat: no-repeat;
-	margin-right: 5px;
-	-webkit-border-radius: 5px ;
-	-moz-border-radius: 5px;
-	border-radius: 5px;
-	padding-left: 15px;
-}
-#acl-wrapper a:hover {
-	text-decoration: none;
-	color:#000000;
-}
-.acl-button-show { background-image: url("../../../../images/show_off.png"); }
-.acl-button-hide { background-image: url("../../../../images/hide_off.png"); }
-
-.acl-button-show.selected {
-	color: #000000;
-	background-color: #9ade00;
-	background-image: url("../../../../images/show_on.png");
-}
-.acl-button-hide.selected {
-	color: #000000;
-	background-color: #ff4141;
-	background-image: url("../../../../images/hide_on.png");
-}
-.acl-list-item.groupshow { border-color: #9ade00; }
-.acl-list-item.grouphide { border-color: #ff4141; }
-/** /acl **/
-
-
-
-#group-new-submit-wrapper {
-	margin-top: 30px;
-}
-
-#group-edit-name-label {
-	float: left;
-	width: 175px;
-	margin-top: 20px;
-	margin-bottom: 20px;
-}
-
-#group-edit-name {
-	float: left;
-	width: 225px;
-	margin-top: 20px;
-	margin-bottom: 20px;
-}
-
-#group-edit-name-wrapper {
-
-
-}
-
-
-#group_members_select_label {
-	display: block;
-	float: left;
-	width: 175px;
-}
-
-.group_members_select {
-	float: left;
-	width: 230px;
-	overflow: auto;
-}
-
-#group_members_select_end {
-	clear: both;
-}
-#group-edit-name-end {
-	clear: both;
-}
-
-#prvmail-to-label, #prvmail-subject-label, #prvmail-message-label {
-	margin-bottom: 10px;
-	margin-top: 20px;
-}
-
-#prvmail-submit {
-	float: left;
-	margin-top: 10px;
-	margin-right: 30px;
-}
-#prvmail-upload-wrapper,
-#prvmail-link-wrapper,
-#prvmail-rotator-wrapper {
-	float: left;
-	margin-top: 10px;
-	margin-right: 10px;
-	width: 24px;
-}
-
-#prvmail-end {
-	clear: both;
-}
-
-.mail-list-sender,
-.mail-list-detail {
-	float: left;
-}
-.mail-list-detail {
-	margin-left: 20px;
-}
-
-.mail-list-subject {
-	font-size: 1.1em;
-	margin-top: 10px;
-}
-a.mail-list-link {
-    display: block;
-    font-size: 1.3em;
-    padding: 4px 0;
-}
-
-/*
-*a.mail-list-link:hover {
-*	background-color: #15607B;
-*	color: #F5F6FB;
-*}
-*/
-
-.mail-list-outside-wrapper-end {
-	clear: both;
-}
-
-.mail-list-outside-wrapper {
-	margin-top: 30px;
-}
-
-.mail-list-delete-wrapper {
-	float: right;
-	margin-right: 30px;
-	margin-top: 15px;
-}
-
-.mail-list-delete-icon {
-	border: none;
-}
-
-.mail-conv-sender,
-.mail-conv-detail {
-	float: left;
-}
-.mail-conv-detail {
-	margin-left: 20px;
-	width: 500px;
-}
-
-.mail-conv-subject {
-    font-size: 1.4em;
-    margin: 10px 0;
-}
-
-.mail-conv-outside-wrapper-end {
-	clear: both;
-}
-
-.mail-conv-outside-wrapper {
-	margin-top: 30px;
-}
-
-.mail-conv-delete-wrapper {
-	float: right;
-	margin-right: 30px;
-	margin-top: 15px;
-}
-.mail-conv-break {
-	clear: both;
-}
-
-.mail-conv-delete-icon {
-	border: none;
-}
-
-.message-links ul {
-	list-style-type: none;
-	padding: 0px;
-}
-
-.message-links li {
-	margin-top: 10px;
-	float: left;
-}
-.message-links a {
-	padding: 3px 5px;
-}
-
-.message-links-end {
-	clear: both;
-}
-
-#sidebar-group-list ul {
-	list-style-type: none;
-}
-
-#sidebar-group-list .icon, #sidebar-group-list .iconspacer {
-	display: inline-block;
-	height: 12px;
-	width: 12px;
-}
-
-#sidebar-group-list li {
-	margin-top: 10px;
-}
-
-.nets-ul, .fileas-ul, .categories-ul {
-	list-style-type: none;
-}
-
-.nets-ul li, .fileas-ul li, .categories-ul li {
-	margin-top: 10px;
-}
-
-.nets-link {
-	margin-left: 24px;
-}
-.nets-all {
-	margin-left: 42px;
-}
-
-.fileas-link, .categories-link {
-	margin-left: 24px;
-}
-
-.fileas-all, .categories-all {
-	margin-left: 0px;
-}
-
-#search-save {
-	margin-left: 5px;
-}
-.groupsideedit {
-	margin-right: 10px;
-}
-#saved-search-ul {
-	list-style-type: none;
-}
-.savedsearchdrop, .savedsearchterm {
-	float: left;
-	margin-top: 10px;
-}
-.savedsearchterm {
-	margin-left: 10px;
-}
-
-
-#side-follow-wrapper {
-	margin-top: 20px;
-}
-#side-follow-url, #side-peoplefind-url {
-	margin-top: 5px;
-}
-#side-follow-submit, #side-peoplefind-submit {
-	margin-top: 15px;
-}
-
-#side-match-link {
-	margin-top: 10px;
-}
-
-aside input[type='text'] {
- width: 174px;
-}
-
-.widget {
-	border-bottom: 1px solid #eec;
-	padding: 8px;
-	margin-top: 5px;
-	-moz-border-radius:5px;
-	-webkit-border-radius:5px;
-	border-radius:5px;
-
-}
-
-
-/*.photos {
-	height: auto;
-	overflow: auto;
-}*/
-
-.photos-end {
-	clear: both;
-	margin-bottom: 25px;
-}
-
-.photo-album-image-wrapper {
-	float: left;
-	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);
- 	border-bottom: 2px solid #CCC;
- 	margin: 0px;
-}
-.photo-album-image-wrapper a:hover .caption {
-	display:block;
-}
-
-#photo-album-end {
-	clear: both;
-	margin-bottom: 25px;
-}
-
-.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;
- 	background-color: rgb(255, 255, 255);
-}
-#photo-top-end {
-	clear: both;
-}
-
-#photo-top-links {
-	margin-bottom: 30px;
-	margin-left: 30px;
-}
-
-#photos-upload-newalbum-div {
-	float: left;
-	width: 175px;
-}
-
-#photos-upload-noshare {
-	margin-bottom: 10px;
-}
-#photos-upload-existing-album-text {
-	float: left;
-	width: 175px;
-}
-#photos-upload-newalbum {
-	float: left;
-}
-#photos-upload-album-select {
-	float: left;
-}
-
-#photos-upload-spacer {
-	margin-top: 25px;
-}
-#photos-upload-new-end, #photos-upload-exist-end {
-	clear: both;
-}
-#photos-upload-exist-end {
-	margin-bottom: 15px;
-}
-#photos-upload-submit {
-	margin-top: 15px;
-}
-
-#photos_upload_applet_wrapper {
-	margin-bottom: 15px;
-}
-
-#photos-upload-no-java-message {
-	margin-bottom: 15px;
-}
-
-#profile-jot-desc {
-	/*float: left;*/
-	width: 480px;
-	color: #FF0000;
-	margin-top: 10px;
-	margin-bottom: 10px;
-}
-
-#character-counter {
-	float: right;
-	font-size: 120%;
-}
-
-#character-counter.grey {
-	color: #888888;
-}
-
-#character-counter.orange {
-	color: orange;
-}
-#character-counter.red {
-	color: red;
-}
-
-#profile-jot-banner-end {
-	/* clear: both; */ 
-}
-
-#photos-upload-select-files-text {
-	margin-top: 15px;
-	margin-bottom: 15px;
-}
-
-#photos-upload-perms-menu, #photos-upload-perms-menu:visited, #photos-upload-perms-menu:link {
-	color: #8888FF;
-	text-decoration: none;
-	cursor: pointer;
-}
-
-#photos-upload-perms-menu:hover {
-	color: #0000FF;
-	text-decoration: underline;
-	cursor: pointer;
-}
-
-
-#settings-default-perms-menu {
-	margin-top: 15px;
-	margin-bottom: 15px;
-}
-
-#photo-edit-caption-label, #photo-edit-tags-label, #photo-edit-albumname-label, #photo-edit-rotate-label {
-	float: left;
-	width: 150px;
-}
-
-#photo-edit-perms-end {
-	margin-bottom: 15px;
-}
-
-#photo-edit-caption, #photo-edit-newtag, #photo-edit-albumname, #photo-edit-rotate {
-	float: left;
-	margin-bottom: 25px;
-}
-#photo-edit-link-wrap {
-	margin-bottom: 15px;
-}
-#photo-like-div {
-	margin-bottom: 25px;
-}
-
-#photo-edit-caption-end, #photo-edit-tags-end, #photo-edit-albumname-end, #photo-edit-rotate-end {
-	clear: both;
-}
-
-#photo-edit-rotate-end {
-	margin-bottom: 15px;
-}
-
-#photo-edit-delete-button {
-	margin-left: 200px;
-}
-#photo-edit-end {
-	margin-bottom: 35px;
-}
-#photo-caption {
-	font-size: 110%;
-	font-weight: bold;
-	margin-top: 15px;
-	margin-bottom: 15px;
-}
-
-#in-this-photo-text {
-	color: #0000FF;
-	margin-left: 30px;
-}
-
-#in-this-photo {
-	margin-left: 60px;
-	margin-top: 10px;
-	margin-bottom: 20px;
-}
-
-#photo-album-edit-submit, #photo-album-edit-drop {
-	margin-top: 15px;
-	margin-bottom: 15px;
-}
-
-#photo-album-edit-drop {
-	margin-left: 200px;
-}
-
-.group-delete-wrapper {
-	float: right;
-	margin-right: 50px;
-}
-
-#install-dbhost-label,
-#install-dbuser-label,
-#install-dbpass-label,
-#install-dbdata-label,
-#install-tz-desc {
-       float: left;
-       width: 250px;
-       margin-top: 10px;
-       margin-bottom: 10px;
-
-}
-
-#install-dbhost,
-#install-dbuser,
-#install-dbpass,
-#install-dbdata {
-       float: left;
-       width: 200px;
-       margin-left: 20px;
-}
-
-#install-dbhost-end,
-#install-dbuser-end,
-#install-dbpass-end,
-#install-dbdata-end,
-#install-tz-end {
-       clear: both;
-}
-
-#install-form select#timezone_select {
-       float: left;
-       margin-top: 18px;
-       margin-left: 20px;
-}
-
-#dfrn-request-networks {
-	margin-bottom: 30px;
-}
-
-#pause {
-  position: fixed;
-  bottom: 5px;
-  right: 5px;
-}
-
-.sparkle {
-	cursor: url('../img/lock.cur'), pointer;
-/*	cursor: pointer !important; */
-}
-
-.contact-block-div {
-	float: left;
-	width: 52px;
-	height: 52px;
-}
-.contact-block-textdiv {
-	float: left;
-	width: 150px;
-	height: 34px;
-}
-
-#contact-block-end {
-	clear: both;
-}
-.contact-block-link {
-	float: left;
-}
-.contact-block-img {
-	width:30px;
-	height:30px;
-}
-
-#tag-remove {
-	margin-bottom: 15px;
-}
-
-#tagrm li {
-	margin-bottom: 10px;
-}
-
-#tagrm-submit, #tagrm-cancel {
-	margin-top: 25px;
-}
-
-#tagrm-cancel {
-	margin-left: 15px;
-}
-
-.wall-item-conv {
-	margin-top: 5px;
-	margin-bottom: 25px;
-}
-
-#search-submit {
-	margin-left: 15px;
-}
-
-#search-box {
-	margin-bottom: 25px;
-}
-
-#nav-searchbar {
-	float: right;
-	margin-top: 4px;
-}
-
-#nav-search-text:hover {
-	background-color: #FFF;
-	opacity: 1;
-}
-
-#nav-search-text {
-	border-radius: 14px;
-	background-color: #fff;
-	opacity: 0.92;
-}
-
-#nav-user-linkmenu img {
-	border-radius: 5px;
-}
-
-.location-label, .gender-label, .marital-label, .homepage-label {
-	float: left;
-	text-align: right;
-	display: block;
-	width: 65px;
-}
-
-.adr, .x-gender, .marital-text, .homepage-url {
-	float: left;
-	display: block;
-	margin-left: 8px;
-}
-
-.profile-clear {
-	clear: both;
-}
-
-
-.clear {
-	clear: both;
-}
-
-.cc-license {
-	margin-top: 50px;
-	font-size: 70%;
-}
-
-
-#plugin-settings-link, #account-settings-link {
-	margin-bottom: 10px;
-}
-
-#uexport-link {
-	margin-bottom: 20px;
-}
-
-/* end from default */
-	
-
-.fn {
-	padding: 0px 0px 5px 0px;
-	font-size: 120%;
-	font-weight: bold;
-	color: #dd0000;
-}
-
-.vcard .title {
-	margin-bottom: 5px;
-	margin-left: 12px;
-}
-
-.vcard dl {
-	clear: both;
-}
-
-#birthday-title {
-	float: left;
-	font-weight: bold;	
-}
-
-#birthday-adjust {
-	float: left;
-	font-size: 75%;
-	margin-left: 10px;
-}
-
-#birthday-title-end {
-	clear: both;
-}
-
-.birthday-list {
-	margin-left: 15px;
-}
-
-#birthday-wrapper {
-	margin-bottom: 20px;
-}
-
-#network-new-link {
-	margin-top: 15px;
-	margin-bottom: 15px;
-}
-
-
-.tool-wrapper {
-  float: left;
-  margin-left: 15px;
-}
-
-.tool-link {
-  cursor: pointer;
-}
-
-.eventcal {
-	float: left;
-	font-size: 20px;
-}
-
-#event-summary-text {
-	margin-top: 15px;
-}
-
-#event-share-checkbox {
-	float: left;
-	margin-top: 10px;
-}
-
-#event-share-text {
-	float: left;
-	margin-top: 10px;
-	margin-left: 5px;
-}
-
-#event-share-break {
-	clear: both;
-	margin-bottom: 10px;
-}
-
-#event-summary {
-	width: 400px;
-}
-
-.vevent {
-	border: 1px solid #CCCCCC;
-}
-
-.vevent .event-summary {
-	margin-left: 10px;
-	margin-right: 10px;
-	font-weight: bold;
-}
-
-.vevent .event-description, .vevent .event-location {
-	margin-left: 10px;
-	margin-right: 10px;
-}
-.vevent .event-start {
-	margin-left: 10px;
-	margin-right: 10px;
-}
-
-#new-event-link {
-	margin-bottom: 10px;
-}
-
-.edit-event-link, .plink-event-link {
-	float: left;
-	margin-top: 4px;
-	margin-right: 4px;
-	margin-bottom: 15px;
-}
-
-.event-description:before {
-	content: url('../../../../images/calendar.png');
-	margin-right: 15px;
-}
-
-.event-start, .event-end {
-	margin-left: 10px;
-	width: 330px;
-	clear: both;
-}
-
-.event-start .dtstart, .event-end .dtend {
-	float: right;
-}
-
-.event-list-date {
-	margin-bottom: 10px;
-}
-
-.prevcal, .nextcal {
-	float: left;
-	margin-left: 32px;
-	margin-right: 32px;
-	margin-top: 64px;
-}
-.event-calendar-end {
-	clear: both;
-}
-
- 
-.calendar {
-	font-family: Courier, monospace;
-}
-.today {
-	font-weight: bold;
-	color: #FF0000;
-}
-
-.settings-block {
-	border: 1px solid #AAA;
-	margin: 10px;
-	padding: 10px;
-}
-
-.app-title {
-	margin: 10px;
-}
-
-#identity-manage-desc {
-	margin-top:15px;
-	margin-bottom: 15px;
-}
-
-#identity-manage-choose {
-	margin-bottom: 15px;
-}
-
-#identity-submit {
-	margin-top: 20px;
-}
-
-#photo-prev-link, #photo-next-link {
-	padding: 10px;
-	float: left;
-}
-
-#photo-photo {
-	float: left;
-}
-
-#photo-photo-end {
-	clear: both;
-}
-
-.profile-match-photo {
-	float: left;
-	text-align: center;
-	width: 120px;
-}
-
-.profile-match-name {
-	float: left;
-	text-align: center;
-	width: 120px;
-	overflow: hidden;
-}
-
-.profile-match-break,
-.profile-match-end {
-	clear: both;
-}
-
-.profile-match-connect {
-	text-align: center;
-	font-weight: bold;
-}
-
-.profile-match-wrapper {
-	float: left;
-	padding: 10px;
-	width: 120px;
-	height: 120px;
-	scroll: auto;
-}
-#profile-match-wrapper-end {
-	clear: both;
-}
-.side-link {
-	margin-bottom: 15px;
-}
-
-#language-selector {
-	position: absolute;
-	top: 0px;
-	left: 16px;
-}
-
-#group-members {
-	margin-top: 20px;
-	padding: 10px;
-	height: 250px;
-	overflow: auto;
-	border: 1px solid #ddd;
-}
-
-#group-members-end {
-	clear: both;
-}
-
-#group-separator {
-	margin-top: 10px;
-	margin-bottom: 10px;
-}
-
-#group-all-contacts {
-	padding: 10px;
-	height: 450px;
-	overflow: auto;
-	border: 1px solid #ddd;
-}
-
-#group-all-contacts-end {
-	clear: both;
-	margin-bottom: 10px;
-}
-
-#group-edit-desc {
-	margin-top: 15px;
-}
-
-
-#prof-members {
-	margin-top: 20px;
-	padding: 10px;
-	height: 250px;
-	overflow: auto;
-	border: 1px solid #ddd;
-}
-
-#prof-members-end {
-	clear: both;
-}
-
-#prof-separator {
-	margin-top: 10px;
-	margin-bottom: 10px;
-}
-
-#prof-all-contacts {
-	padding: 10px;
-	height: 450px;
-	overflow: auto;
-	border: 1px solid #ddd;
-}
-
-#prof-all-contacts-end {
-	clear: both;
-	margin-bottom: 10px;
-}
-
-#prof-edit-desc {
-	margin-top: 15px;
-}
-
-#crepair-name-label,
-#crepair-nick-label,
-#crepair-attag-label,
-#crepair-url-label,
-#crepair-request-label,
-#crepair-confirm-label,
-#crepair-notify-label,
-#crepair-photo-label,
-#crepair-poll-label {
-	float: left;
-	width: 200px;
-	margin-bottom: 15px;
-}
-
-#crepair-name,
-#crepair-nick,
-#crepair-attag,
-#crepair-url,
-#crepair-request,
-#crepair-confirm,
-#crepair-notify,
-#crepair-photo,
-#crepair-poll {
-	float: left;
-	width: 300px;
-}
-
-
-#netsearch-box {
-	margin-top: 20px;	
-}
-
-#netsearch-box #search-submit {
-	margin: 5px 0px 0px 0px;
-}
-
-.required {
-	color: #FF0000;
-}
-
-#event-start-text, #event-finish-text {
-	margin-top: 10px;
-	margin-bottom: 5px;
-}
-
-#event-nofinish-checkbox, #event-nofinish-text, #event-adjust-checkbox, #event-adjust-text {
-	float: left;
-}
-#event-datetime-break {
-	margin-bottom: 10px;
-}
-
-#event-nofinish-break, #event-adjust-break {
-	clear: both;
-}
-
-#event-desc-text, #event-location-text {
-	margin-top: 10px;
-	margin-bottom: 5px;
-}
-#event-submit {
-	margin-top: 10px;
-}
-
-.body-tag, .filesavetags, .categorytags {
-	opacity: 0.5;
-	filter:alpha(opacity=50);
-}
-
-.body-tag:hover, .filesavetags:hover, .categorytags:hover {
-	opacity: 1.0 !important;
-	filter:alpha(opacity=100) !important;
-}
-
-.item-select {
-	opacity: 0.1;
-	filter:alpha(opacity=10);
-	float: right;
-	margin-right: 10px;
-
-}
-.item-select:hover, .checkeditem {
-	opacity: 1;
-	filter:alpha(opacity=100);
-}
-
-
-#item-delete-selected {
-	margin-top: 30px;
-}
-
-#item-delete-selected-end {
-	clear: both;
-}
-#item-delete-selected-icon, #item-delete-selected-desc {
-	float: left;
-	margin-right: 5px;
-}
-#item-delete-selected-desc:hover {
-	text-decoration: underline;
-}
-
-#lang-select-icon {
-	cursor: pointer;
-	position: absolute;
-	left: 4px;
-/*because of the shape, if this is lined up properly it looks like it's lined up wrong...
-lining it up too high is the only way to make it look correctly aligned.  The human
-brain is weird like that */
-	top: 2px;
-}
-
-#lang-select-icon:hover {
-	opacity: 1;
-	filter:alpha(opacity=100);
-}
-
-.notif-image {
-	height: 80px;
-	width: 80px;
-	margin-right: 15px;
-}
-.notification-listing-end {
-	clear: both;
-	margin-bottom: 15px;
-}
-
-
-
-/**
- * Plugins settings
- */
-
-.settings-block > h3,
-.settings-heading {
-	border-bottom: 1px solid #babdb6;
-}
- 
-
-/**
- * Form fields
- */
-.field {
-	margin-bottom: 10px;
-	padding-bottom: 10px;
-	overflow: auto;
-	width: 100%
-}
-
-.field label {
-	float: left;
-	width: 200px;
-}
-
-.field input,
-.field textarea {
-	width: 400px;
-}
-.field textarea { height: 100px; }
-.field_help {
-	display: block;
-	margin-left: 200px;
-	color: #666666;
-	
-}
-
-.field_abook_help {
-	color: #888;
-}
-.abook-them {
-	margin-left: 225px;
-	margin-bottom: 15px;
-}
-.abook-me {
-	margin-left: 36px;
-	margin-bottom: 15px;
-}
-.acheckbox {
-	margin-bottom: 5px !important;
-}
-
-#contact-slider {
-	width: 600px !important;
-}
-
-.abook-edit-them, .abook-edit-me {
-	float: left;
-	width: 100px !important;
-}
-.field_abook_help {
-	float: left;
-}
-
-.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: 16px;
-	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; }
-
-/**
- * ADMIN
- */
-#pending-update {
-	float:right;
-	color: #ffffff;
-	font-weight: bold;
-	background-color: #FF0000;
-	padding: 0em 0.3em;
-	
-}
-#adminpage dl {
-	clear: left;
-	margin-bottom: 2px;
-	padding-bottom: 2px;
-	border-bottom: 1px solid black;
-}
-#adminpage dt {
-	width: 200px;
-	float: left;
-	font-weight: bold;
-}
-#adminpage dd {
-	margin-left: 200px;
-}
-
-#adminpage h3 {
-	border-bottom: 1px solid #cccccc;
-}
-#adminpage .field label {
-	font-weight: bold;
-}
-#adminpage .submit {
-	clear:left;
-	text-align: right;
-}
-
-#adminpage #pluginslist {
-	margin: 0px; padding: 0px;
-}
-#adminpage .plugin {
-	list-style: none;
-	display: block;
-	border: 1px solid #888888;
-	padding: 1em;
-	margin-bottom: 5px;
-	clear: left;
-}
-#adminpage .plugin .desc { margin-left: 2.5em;}
-#adminpage .toggleplugin {
-	float:left;
-	margin-right: 1em;
-}
-
-#adminpage table {width:100%; border-bottom: 1px solid #000000; margin: 5px 0px;}
-#adminpage table th { text-align: left;}
-#adminpage td .icon { float: left;}
-#adminpage table#users img { width: 16px; height: 16px; }
-#adminpage table tr:hover { background-color: #bbc7d7; }
-#adminpage .selectall { text-align: right; }
-
-/*
- * UPDATE
- */
-.popup { 	
-	width: 100%; height: 100%;
-	top:0px; left:0px;
-	position: absolute;
-	display: none;
-}
-
-.popup .background {
-	background-color: rgba(0,0,0,128);
-	opacity: 0.5;
-	width: 100%; height: 100%;
-	position: absolute;
-	top:0px; left:0px;
-}
-.popup .panel {
-	top:25%;left:25%;width:50%;height:50%;
-	padding: 1em;
-	position: absolute;
-	border: 4px solid #000000;
-	background-color: #FFFFFF;
-}
-.popup .panel .panel_text { display: block; overflow: auto; height: 80%; } 
-.popup .panel .panel_in { width: 100%; height: 100%;	position: relative; }
-.popup .panel .panel_actions {  width: 100%; bottom: 4px; left: 0px; position: absolute; }
-.panel_text .progress { width: 50%; overflow: hidden; height: auto; border: 1px solid #cccccc; margin-bottom: 5px}
-.panel_text .progress span {float: right; display: block; width: 25%; background-color: #eeeeee; text-align: right;}
-
-/**
- * OAuth
- */
-.oauthapp {
-	height: auto; overflow: auto;
-	border-bottom: 2px solid #cccccc;
-	padding-bottom: 1em;
-	margin-bottom: 1em;	
-}
-.oauthapp img {
-	float: left;
-	width: 48px; height: 48px;
-	margin: 10px;
-}
-.oauthapp img.noicon {
-	background-image: url("../../../../images/icons/48/plugin.png");
-	background-position: center center;
-	background-repeat: no-repeat;
-}
-.oauthapp a {
-	float: left;
-}
-
-/**
- * ICONS
- */
-.iconspacer {
-	display: block; width: 16px; height: 16px;
-}
-
-.icon {
-	display: block; width: 16px; height: 16px;
-	background-image: url('../../../../images/icons.png');
-}
-.article { background-position: 0px 0px;}
-.audio { background-position: -16px 0px;}
-.block { background-position: -32px 0px;}
-.drop { background-position: -48px 0px;}
-.drophide { background-position: -64px 0px;}
-.edit { background-position: -80px 0px;}
-.camera { background-position: -96px 0px;}
-.dislike { background-position: -112px 0px;}
-.like { background-position: -128px 0px;}
-.link { background-position: -144px 0px;}
-
-.globe { background-position: 0px -16px;}
-.noglobe { background-position: -16px -16px;}
-.no { background-position: -32px -16px;}
-.pause { background-position: -48px -16px;}
-.play { background-position: -64px -16px;}
-.pencil { background-position: -80px -16px;}
-.small-pencil { background-position: -96px -16px;}
-.recycle { background-position: -112px -16px;}
-.remote-link { background-position: -128px -16px;}
-.share { background-position: -144px -16px;}
-
-.tools { background-position: 0px -32px;}
-.lock { background-position: -16px -32px;}
-.unlock { background: url(../img/jotperms.png) no-repeat;}
-.video { background-position: -48px -32px;}
-.youtube { background-position: -64px -32px;}
-.attach { background-position: -80px -32px; }
-.language { background-position: -96px -32px; }
-.prev { background-position: -112px -32px; }
-.next { background-position: -128px -32px; }
-.on { background-position: -144px -32px; }
-
-.off { background-position: 0px -48px; }
-.starred { background-position: -16px -48px; }
-.unstarred { background-position: -32px -48px; }
-.tagged { background-position: -48px -48px; }
-.yellow { background-position: -64px -48px; }
-
-
-.filer-icon {
-	display: block; width: 16px; height: 16px;
-	background-image: url('../img/file.gif');
-}
-
-.icon.dim { opacity: 0.3;filter:alpha(opacity=30); }
-[class^="comment-edit-bb"] {
-	list-style: none;
-	display: none;
-	margin: 0px 0 -5px 0px;
-	padding: 0px;
-	width: 75%;
-}
-[class^="comment-edit-bb"] > li {
-	display: inline-block;
-	margin: 10px 10px 0 0;
-	visibility: none;
-}
-[class^="comment-edit-bb-end"] {
-	clear: both;
-}
-.editicon {
-    display: inline-block;
-    width: 16px;
-    height: 16px;
-    background-image: url(../img/bbedit.png);
-	background-color: #fff;
-    text-decoration: none;
-}
-.editicon:hover {
-	background-color: #ccc;
-}
-.boldbb {
-	background-position: 0px 0px;
-}
-.boldbb:hover {
-	background-position: 0px -16px;
-}
-.italicbb {
-	background-position: -16px 0px;
-}
-.italicbb:hover {
-	background-position: -16px -16px;
-}
-.underlinebb {
-	background-position: -32px 0px;
-}
-.underlinebb:hover {
-	background-position: -32px -16px;
-}
-.quotebb {
-	background-position: -48px 0px;
-}
-.quotebb:hover {
-	background-position: -48px -16px;
-}
-.codebb {
-	background-position: -64px 0px;
-}
-.codebb:hover {
-	background-position: -64px -16px;
-}
-.imagebb {
-	background-position: -80px 0px;
-}
-.imagebb:hover {
-	background-position: -80px -16px;
-}
-.urlbb {
-	background-position: -96px 0px;
-}
-.urlbb:hover {
-	background-position: -96px -16px;
-}
-.videobb {
-	background-position: -112px 0px;
-}
-.videobb:hover {
-	background-position: -112px -16px;
-}
-
-.attachtype {
-	display: block; width: 20px; height: 23px;
-	float: left;
-	background-image: url('../../../../images/content-types.png');
-}
-
-.body-attach {
-	margin-top: 10px;
-}
-
-.type-video { background-position: 0px 0px; }
-.type-image { background-position: -20px 0px; }
-.type-audio { background-position: -40px 0px; }
-.type-text  { background-position: -60px 0px; }
-.type-unkn  { background-position: -80px 0px; }
-
-
-/* autocomplete popup */
-.acpopup {
-	max-height:150px;
-	background-color:#ffffff;
-	overflow:auto;
-	z-index:100000;
-	border:1px solid #cccccc;
-}
-.acpopupitem {
-	background-color:#ffffff; padding: 4px;
-	clear:left;
-}
-.acpopupitem img {
-	float: left;
-	margin-right: 4px;
-}
-
-.acpopupitem.selected {
-	color: #FFFFFF; background: #3465A4;
-}
-
-/* popup notifications */
-div.jGrowl div.notice {
-  background: #511919 url("../../../../images/icons/48/notice.png") no-repeat 5px center;
-  color: #ffffff;
-  padding-left: 58px;
-}
-div.jGrowl div.info {
-  background: #364e59 url("../../../../images/icons/48/info.png") no-repeat 5px center;
-  color: #ffffff;
-  padding-left: 58px;
-}
-#jGrowl.top-right {
-	top: 15px;
-	right: 15px;
-}
-.qcomment {
-	border: 1px solid #EEE;
-	padding: 3px;
-	margin-top: 15px;
-	margin-left: 25px;
-	width: 125px;
-	overflow-y: auto;
-}
-
-
-.qcomment option {
-	width: 125px;
-	overflow-x: hidden;
-}
-
-.qcomment {
-	opacity: 0.3;
-	filter:alpha(opacity=30);
-}
-.qcomment:hover {
-	opacity: 1.0;
-	filter:alpha(opacity=100);
-}
-
-
-#id_term_label {
-	width:75px;
-}
-#id_term {
-	width:100px;
-}
-
-#recip {
-	
-}
-.autocomplete-w1 { background: #ffffff; no-repeat bottom right; position:absolute; top:0px; left:0px; margin:6px 0 0 6px; /* IE6 fix: */ _background:none; _margin:1px 0 0 0; }
-.autocomplete { color:#000; border:1px solid #999; background:#FFF; cursor:default; text-align:left; max-height:350px; overflow:auto; margin:-6px 6px 6px -6px; /* IE6 specific: */ _height:350px;  _margin:0; _overflow-x:hidden; }
-.autocomplete .selected { background:#F0F0F0; }
-.autocomplete div { padding:2px 5px; white-space:nowrap; overflow:hidden; }
-
-#datebrowse-sidebar select {
-	margin-left: 25px;
-}
-
-
-.jslider .jslider-scale ins {
-    color: #333;
-	font-size: 12px;
-	width: 100px;
-	text-align: center;
-}
-
-/*
-Where did this come from?  There isn't a ../img/slider.png.  I don't remember adding this, but it used to work...
-
-.jslider .jslider-bg,
-.jslider .jslider-pointer {
-  background: url("../img/slider.png") !important;
-}
-*/
-
-
-.slider {
-	margin-top: 10px;
-	margin-bottom: 30px;
-}
-
-
-#main-slider {
-	position: relative; 
-	left: 5%; 
-	width: 90%;
-}
-
-
-#contact-slider {
-	position: relative; 
-	left: 5%; 
-	width: 90%;
-}
-
-/* nav */
-nav {
-  width: 100%;
-  height: 32px;
-  position: fixed;
-  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, #f00 26%, #b00 82%);
-  background-image: -o-linear-gradient(bottom, #f00 26%, #b00 82%);
-  background-image: -moz-linear-gradient(bottom, #000 26%, #2e2f2e 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,
-nav a:visited,
-nav a:link,
-nav a:hover {
-  color: #ffffff;
-  text-decoration: none;
-  outline: none;
-}
-nav ul {
-  margin: 0px;
-  padding: 0px 20px;
-}
-nav ul li {
-  list-style: none;
-  margin: 0px;
-  padding: 0px;
-  float: left;
-}
-nav ul li .menu-popup {
-  left: 0px;
-  right: auto;
-  top: 33px;
-}
-nav .nav-menu-icon {
-  position: relative;
-  height: 22px;
-  padding: 5px;
-  margin: 0px 10px;
-  -moz-border-radius: 5px 5px 0 0;
-  -webkit-border-radius: 5px 5px 0 0;
-  border-radius: 5px 5px 0 0;
-}
-nav .nav-menu-icon.selected {
-  background-color: #FF0000;
-}
-nav .nav-menu-icon img {
-  width: 22px;
-  height: 22px;
-}
-nav .nav-menu-icon .nav-notify {
-  top: 3px;
-}
-nav .nav-menu {
-  position: relative;
-  height: 16px;
-  padding: 5px;
-  margin: 0px 15px;
-  font-size: 14px;
-}
-nav .nav-menu.selected {
-border-bottom: 3px solid #f00;
-
-}
-nav .nav-notify {
-  background-color: #0d0;
-  color: #fff;
-  -moz-border-radius: 5px 5px 5px 5px;
-  -webkit-border-radius: 5px 5px 5px 5px;
-  border-radius: 5px 5px 5px 5px;
-}
-nav .nav-notify.show {
-  display: block;
-}
-nav #nav-help-link,
-nav #nav-search-link,
-nav #nav-directory-link,
-nav #nav-apps-link,
-nav #nav-user-linkmenu,
-nav #nav-site-linkmenu {
-  float: right;
-}
-nav #nav-help-link .menu-popup,
-nav #nav-search-link .menu-popup,
-nav #nav-directory-link .menu-popup,
-nav #nav-apps-link .menu-popup,
-nav #nav-site-linkmenu .menu-popup {
-  right: 0px;
-  left: auto;
-}
-nav #nav-notifications-linkmenu.on .icon.s22.notify,
-nav #nav-notifications-linkmenu.selected .icon.s22.notify {
-  background-image: url("../../../../images/icons/22/notify_on.png");
-}
-nav #nav-apps-link.selected {
-  background-color: #364e59;
-}
-ul.menu-popup {
-  position: absolute;
-  display: none;
-  width: 10em;
-  background: #dd0000;
-  color: #eec;
-  padding: 0px;
-  list-style: none;
-  border-radius: 0px 0px 20px 20px;
-  z-index: 100000;
-  -webkit-box-shadow: 0px 5px 10px rgba(0, 0, 0, 0.7);
-  -moz-box-shadow: 0px 5px 10px rgba(0, 0, 0, 0.7);
-  box-shadow: 0px 5px 10px rgba(0, 0, 0, 0.7);
-}
-ul.menu-popup a {
-  display: block;
-  color: #eec;
-  padding: 5px 10px;
-  text-decoration: none;
-}
-ul.menu-popup a:hover {
-  background-color: #eec;
-  color: #f00;
-}
-ul.menu-popup .menu-sep {
-  border-top: 1px solid #9eabb0;
-}
-ul.menu-popup li {
-  float: none;
-  overflow: auto;
-  height: auto;
-  display: block;
-}
-ul.menu-popup li img {
-  float: left;
-  width: 16px;
-  height: 16px;
-  padding-right: 5px;
-}
-ul.menu-popup .empty {
-  padding: 5px;
-  text-align: center;
-  color: #9eabb0;
-}
-ul.menu-popup .toolbar {
-  background-color: #9eabb0;
-  height: auto;
-  overflow: auto;
-}
-ul.menu-popup .toolbar a {
-  float: right;
-}
-ul.menu-popup .toolbar a:hover {
-  background-color: #ffffff;
-}
-/* header */
-header {
-  position: fixed;
-  left: 43%;
-  right: 43%;
-  top: 0px;
-  margin: 0px;
-  padding: 0px;
-  /*width: 100%; height: 12px; */
-
-  z-index: 110;
-  color: #ffffff;
-}
-
-
-/* notifications popup menu */
-.nav-notify {
-	display: none;
-	position: absolute;
-	font-size: 10px;
-	padding: 1px 3px;
-	top: 0px;
-	right: -10px;
-	min-width: 15px;
-	text-align: right;
-}
-.nav-notify.show {
-	display: block;
-}
-ul.menu-popup {
-	position: absolute;
-	display: none;
-	width: 10em;
-	margin: 0px;
-	padding: 0px;
-	list-style: none;
-	z-index: 100000;
-/*	top: 90px; */
-/*	left: 400px; */
-}
-#nav-notifications-menu {
-	width: 320px;
-	max-height: 400px;
-	overflow-y: scroll;overflow-style:scrollbar;
-	background-color:#FFFFFF;
-	-moz-border-radius: 5px;
-	-webkit-border-radius: 5px;
-	border-radius:5px;
-	border: 1px solid #888;
-}
-#nav-notifications-menu .contactname { font-weight: bold; font-size: 0.9em; }
-#nav-notifications-menu img { float: left; margin-right: 5px; }
-#nav-notifications-menu .notif-when { font-size: 0.8em; display: block; }
-#nav-notifications-menu li {
-	padding: 7px 0px 7px 10px;
-	word-wrap:normal;
-	border-bottom: 1px solid #000;
-}
-
-#nav-notifications-menu li:hover {
-
-}
-
-#nav-notifications-menu a:hover {
-	text-decoration: underline;
-}
-
-.notif-item a {
-	color: #000000;
-}
-
-.notif-item a:hover {
-	text-decoration: underline;
-}
-
-.notif-image {
-	width: 32px;
-	height: 32px;
-	padding: 7px 7px 0px 0px;
-}
-
-.notify-seen {
-	background: #DDDDDD;
-}
-
diff --git a/view/theme/fancyred/img/bbedit.png b/view/theme/fancyred/img/bbedit.png
deleted file mode 100644
index b89f2f7a8..000000000
--- a/view/theme/fancyred/img/bbedit.png
+++ /dev/null
diff --git a/view/theme/fancyred/img/bg.png b/view/theme/fancyred/img/bg.png
deleted file mode 100644
index eae49e037..000000000
--- a/view/theme/fancyred/img/bg.png
+++ /dev/null
diff --git a/view/theme/fancyred/img/border.jpg b/view/theme/fancyred/img/border.jpg
deleted file mode 100644
index 034a1cb63..000000000
--- a/view/theme/fancyred/img/border.jpg
+++ /dev/null
diff --git a/view/theme/fancyred/img/editicons.png b/view/theme/fancyred/img/editicons.png
deleted file mode 100644
index 171a40876..000000000
--- a/view/theme/fancyred/img/editicons.png
+++ /dev/null
diff --git a/view/theme/fancyred/img/events.png b/view/theme/fancyred/img/events.png
deleted file mode 100644
index 96dd86899..000000000
--- a/view/theme/fancyred/img/events.png
+++ /dev/null
diff --git a/view/theme/fancyred/img/ff-16.jpg b/view/theme/fancyred/img/ff-16.jpg
deleted file mode 100644
index 3621f5914..000000000
--- a/view/theme/fancyred/img/ff-16.jpg
+++ /dev/null
diff --git a/view/theme/fancyred/img/file.gif b/view/theme/fancyred/img/file.gif
deleted file mode 100644
index c532335ed..000000000
--- a/view/theme/fancyred/img/file.gif
+++ /dev/null
diff --git a/view/theme/fancyred/img/friendika-16.png b/view/theme/fancyred/img/friendika-16.png
deleted file mode 100644
index 1a742ecdc..000000000
--- a/view/theme/fancyred/img/friendika-16.png
+++ /dev/null
diff --git a/view/theme/fancyred/img/head.jpg b/view/theme/fancyred/img/head.jpg
deleted file mode 100644
index 6210b76be..000000000
--- a/view/theme/fancyred/img/head.jpg
+++ /dev/null
diff --git a/view/theme/fancyred/img/home.png b/view/theme/fancyred/img/home.png
deleted file mode 100644
index d1ba7b3f3..000000000
--- a/view/theme/fancyred/img/home.png
+++ /dev/null
diff --git a/view/theme/fancyred/img/introductions.png b/view/theme/fancyred/img/introductions.png
deleted file mode 100644
index 18ba5dc81..000000000
--- a/view/theme/fancyred/img/introductions.png
+++ /dev/null
diff --git a/view/theme/fancyred/img/jotperms.png b/view/theme/fancyred/img/jotperms.png
deleted file mode 100644
index d133a6e01..000000000
--- a/view/theme/fancyred/img/jotperms.png
+++ /dev/null
diff --git a/view/theme/fancyred/img/lock.cur b/view/theme/fancyred/img/lock.cur
deleted file mode 100644
index 892c5e851..000000000
--- a/view/theme/fancyred/img/lock.cur
+++ /dev/null
diff --git a/view/theme/fancyred/img/login-bg.gif b/view/theme/fancyred/img/login-bg.gif
deleted file mode 100644
index cde836c89..000000000
--- a/view/theme/fancyred/img/login-bg.gif
+++ /dev/null
diff --git a/view/theme/fancyred/img/message.png b/view/theme/fancyred/img/message.png
deleted file mode 100644
index f3fea75ee..000000000
--- a/view/theme/fancyred/img/message.png
+++ /dev/null
diff --git a/view/theme/fancyred/img/network.png b/view/theme/fancyred/img/network.png
deleted file mode 100644
index c213cee04..000000000
--- a/view/theme/fancyred/img/network.png
+++ /dev/null
diff --git a/view/theme/fancyred/img/notify_on.png b/view/theme/fancyred/img/notify_on.png
deleted file mode 100644
index 18002e15c..000000000
--- a/view/theme/fancyred/img/notify_on.png
+++ /dev/null
diff --git a/view/theme/fancyred/img/photo-menu.jpg b/view/theme/fancyred/img/photo-menu.jpg
deleted file mode 100644
index fde5eb535..000000000
--- a/view/theme/fancyred/img/photo-menu.jpg
+++ /dev/null
diff --git a/view/theme/fancyred/img/screenshot.jpg b/view/theme/fancyred/img/screenshot.jpg
deleted file mode 100644
index 5f00ec39e..000000000
--- a/view/theme/fancyred/img/screenshot.jpg
+++ /dev/null
diff --git a/view/theme/fancyred/img/settings.png b/view/theme/fancyred/img/settings.png
deleted file mode 100644
index a935b225e..000000000
--- a/view/theme/fancyred/img/settings.png
+++ /dev/null
diff --git a/view/theme/fancyred/img/shiny.png b/view/theme/fancyred/img/shiny.png
deleted file mode 100644
index 994c0d05d..000000000
--- a/view/theme/fancyred/img/shiny.png
+++ /dev/null
diff --git a/view/theme/fancyred/js/fancyred.js b/view/theme/fancyred/js/fancyred.js
deleted file mode 100644
index 00b8fa39f..000000000
--- a/view/theme/fancyred/js/fancyred.js
+++ /dev/null
@@ -1,89 +0,0 @@
-
-
-function insertFormatting(comment,BBcode,id) {
-	
-		var tmpStr = $("#comment-edit-text-" + id).val();
-		if(tmpStr == comment) {
-			tmpStr = "";
-			$("#comment-edit-text-" + id).addClass("comment-edit-text-full");
-			$("#comment-edit-text-" + id).removeClass("comment-edit-text-empty");
-			openMenu("comment-edit-submit-wrapper-" + id);
-			$("#comment-edit-text-" + id).val(tmpStr);
-		}
-
-	textarea = document.getElementById("comment-edit-text-" +id);
-	if (document.selection) {
-		textarea.focus();
-		selected = document.selection.createRange();
-		if (BBcode == "url"){
-			selected.text = "["+BBcode+"]" + "http://" +  selected.text + "[/"+BBcode+"]";
-			} else			
-		selected.text = "["+BBcode+"]" + selected.text + "[/"+BBcode+"]";
-	} else if (textarea.selectionStart || textarea.selectionStart == "0") {
-		var start = textarea.selectionStart;
-		var end = textarea.selectionEnd;
-		if (BBcode == "url"){
-			textarea.value = textarea.value.substring(0, start) + "["+BBcode+"]" + "http://" + textarea.value.substring(start, end) + "[/"+BBcode+"]" + textarea.value.substring(end, textarea.value.length);
-			} else
-		textarea.value = textarea.value.substring(0, start) + "["+BBcode+"]" + textarea.value.substring(start, end) + "[/"+BBcode+"]" + textarea.value.substring(end, textarea.value.length);
-	}
-	return true;
-}
-
-function cmtBbOpen(comment, id) {
-	if($(comment).hasClass('comment-edit-text-full')) {
-		$(".comment-edit-bb-" + id).show();
-		return true;
-	}
-	return false;
-}
-
-function cmtBbClose(comment, id) {
-//	if($(comment).hasClass('comment-edit-text-empty')) {
-//		$(".comment-edit-bb-" + id).hide();
-//		return true;
-//	}
-	return false;
-}
-
-$(document).ready(function() {
-
-$('.group-edit-icon').hover(
-	function() {
-		$(this).addClass('icon'); $(this).removeClass('iconspacer');},
-	function() {
-		$(this).removeClass('icon'); $(this).addClass('iconspacer');}
-	);
-
-$('.sidebar-group-element').hover(
-	function() {
-		id = $(this).attr('id');
-		$('#edit-' + id).addClass('icon'); $('#edit-' + id).removeClass('iconspacer');},
-
-	function() {
-		id = $(this).attr('id');
-		$('#edit-' + id).removeClass('icon');$('#edit-' + id).addClass('iconspacer');}
-	);
-
-
-$('.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');}
-	);
-
-});
-
-
-
diff --git a/view/theme/fancyred/php/config.php b/view/theme/fancyred/php/config.php
deleted file mode 100644
index 48035f507..000000000
--- a/view/theme/fancyred/php/config.php
+++ /dev/null
@@ -1,80 +0,0 @@
-<?php
-/**
- * Theme settings
- */
-
-function theme_content(&$a) {
-	if(!local_user()) { return;	}
-
-	$font_size = get_pconfig(local_user(),'fancyred', 'font_size' );
-	$line_height = get_pconfig(local_user(), 'fancyred', 'line_height' );
-	$colour = get_pconfig(local_user(), 'fancyred', 'colour' );
-	
-	return fancyred_form($a, $font_size, $line_height, $colour);
-}
-
-function theme_post(&$a) {
-	if(!local_user()) { return; }
-	
-	if (isset($_POST['fancyred-settings-submit'])) {
-		set_pconfig(local_user(), 'fancyred', 'font_size', $_POST['fancyred_font_size']);
-		set_pconfig(local_user(), 'fancyred', 'line_height', $_POST['fancyred_line_height']);
-		set_pconfig(local_user(), 'fancyred', 'colour', $_POST['fancyred_colour']);	
-	}
-}
-
-function theme_admin(&$a) {
-	$font_size = get_config('fancyred', 'font_size' );
-	$line_height = get_config('fancyred', 'line_height' );
-	$colour = get_config('fancyred', 'colour' );	
-	
-	return fancyred_form($a, $font_size, $line_height, $colour);
-}
-
-function theme_admin_post(&$a) {
-	if (isset($_POST['fancyred-settings-submit'])) {
-		set_config('fancyred', 'font_size', $_POST['fancyred_font_size']);
-		set_config('fancyred', 'line_height', $_POST['fancyred_line_height']);
-		set_config('fancyred', 'colour', $_POST['fancyred_colour']);
-	}
-}
-
-function fancyred_form(&$a, $font_size, $line_height, $colour) {
-	$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',						
-	);
-
-	$t = file_get_contents( dirname(__file__). "/../tpl/theme_settings.tpl" );
-	$o .= replace_macros($t, array(
-		'$submit' => t('Submit'),
-		'$baseurl' => $a->get_baseurl(),
-		'$title' => t("Theme settings"),
-		'$font_size' => array('fancyred_font_size', t('Set font-size for posts and comments'), $font_size, '', $font_sizes),
-		'$line_height' => array('fancyred_line_height', t('Set line-height for posts and comments'), $line_height, '', $line_heights),
-		'$colour' => array('fancyred_colour', t('Set colour scheme'), $colour, '', $colours),	
-	));
-
-	return $o;
-}
-
diff --git a/view/theme/fancyred/php/style.php b/view/theme/fancyred/php/style.php
deleted file mode 100644
index 15ac47247..000000000
--- a/view/theme/fancyred/php/style.php
+++ /dev/null
@@ -1,99 +0,0 @@
-<?php
-    $line_height = false;
-    $fancyred_font_size = false;
-    $resolution = false;
-    $colour = false;
-    $site_line_height = get_config("fancyred","line_height");
-    $site_fancyred_font_size = get_config("fancyred", "font_size" );
-    $site_colour = get_config("fancyred", "colour" );
-
-    if (local_user()) {
-        $line_height = get_pconfig(local_user(), "fancyred","line_height");
-        $fancyred_font_size = get_pconfig(local_user(), "fancyred", "font_size");
-        $colour = get_pconfig(local_user(), "fancyred", "colour");
-    }
-
-    if ($line_height === false) {
-		$line_height = $site_line_height;
-	}
-    if ($line_height === false) {
-		$line_height = "1.2";
-	}
-    if ($fancyred_font_size === false) {
-		$fancyred_font_size = $site_fancyred_font_size;
-	}
-    if ($fancyred_font_size === false) {
-		$fancyred_font_size = "12";
-	}
-    if ($colour === false) {
-		$colour = $site_colour;
-	}
-		$colour = "light";
-
-    
-        if (file_exists("$THEMEPATH/css/style.css")) {
-            echo file_get_contents("$THEMEPATH/css/style.css");
-        }
-    
-
-	if($fancyred_font_size == "16") {
-		echo ".wall-item-content {
-				font-size: 16px;
-			}";
-	}
-	if($fancyred_font_size == "15") {
-		echo ".wall-item-content {
-				font-size: 15px;
-			}";
-	}	
-	if($fancyred_font_size == "14") {
-		echo ".wall-item-content {
-				font-size: 14px;
-			}";
-	}
-	if($fancyred_font_size == "13.5") {
-		echo ".wall-item-content {
-				font-size: 13.5px;
-			}";
-	}
-	if($fancyred_font_size == "13") {
-		echo ".wall-item-content {
-				font-size: 13px;
-			}";
-	}
-	if($fancyred_font_size == "12.5") {
-		echo ".wall-item-content {
-				font-size: 12.5px;
-			}";
-	}
-	if($fancyred_font_size == "12") {
-		echo ".wall-item-content {
-				font-size: 12px;
-			}";
-	}
-	if($line_height == "1.5") {
-		echo ".wall-item-content {
-				line-height: 1.5;
-			}";
-	}	
-	if($line_height == "1.4") {
-		echo ".wall-item-content {
-				line-height: 1.4;
-			}";
-	}
-	if($line_height == "1.3") {
-		echo ".wall-item-content {
-				line-height: 1.3;
-			}";
-	}
-	if($line_height == "1.2") {
-		echo ".wall-item-content {
-				line-height: 1.2;
-			}";
-	}
-	if($line_height == "1.1") {
-		echo ".wall-item-content {
-				line-height: 1.1;
-			}";
-	}
-
diff --git a/view/theme/fancyred/php/theme.php b/view/theme/fancyred/php/theme.php
deleted file mode 100644
index b77664567..000000000
--- a/view/theme/fancyred/php/theme.php
+++ /dev/null
@@ -1,5 +0,0 @@
-<?php
-
-function fancyred_init(&$a) {
-//	head_add_js('redbasic.js');
-}
diff --git a/view/theme/fancyred/tpl/conv_item.tpl b/view/theme/fancyred/tpl/conv_item.tpl
deleted file mode 100644
index 4e877bb07..000000000
--- a/view/theme/fancyred/tpl/conv_item.tpl
+++ /dev/null
@@ -1,117 +0,0 @@
-{{if $item.comment_firstcollapsed}}
-	<div class="hide-comments-outer">
-	<span id="hide-comments-total-$item.id" class="hide-comments-total">$item.num_comments</span> <span id="hide-comments-$item.id" class="hide-comments fakelink" onclick="showHideComments($item.id);">$item.hide_text</span>
-	</div>
-	<div id="collapsed-comments-$item.id" class="collapsed-comments" style="display: none;">
-{{endif}}
-<div id="thread-wrapper-$item.id" class="thread-wrapper $item.toplevel">
-<a name="$item.id" ></a>
-<div class="wall-item-outside-wrapper $item.indent$item.previewing{{ if $item.owner_url }} wallwall{{ endif }}" id="wall-item-outside-wrapper-$item.id" >
-	<div class="wall-item-content-wrapper $item.indent" id="wall-item-content-wrapper-$item.id" >
-		<div class="wall-item-info{{ if $item.owner_url }} wallwall{{ endif }}" id="wall-item-info-$item.id">
-			{{ if $item.owner_url }}
-			<div class="wall-item-photo-wrapper wwto" id="wall-item-ownerphoto-wrapper-$item.id" >
-				<a href="$item.owner_url" title="$item.olinktitle" class="wall-item-photo-link" id="wall-item-ownerphoto-link-$item.id">
-				<img src="$item.owner_photo" class="wall-item-photo$item.osparkle" id="wall-item-ownerphoto-$item.id" style="height: 80px; width: 80px;" alt="$item.owner_name" /></a>
-			</div>
-			<div class="wall-item-arrowphoto-wrapper" ><img src="images/larrow.gif" alt="$item.wall" /></div>
-			{{ endif }}
-			<div class="wall-item-photo-wrapper{{ if $item.owner_url }} wwfrom{{ endif }}" id="wall-item-photo-wrapper-$item.id" 
-				onmouseover="if (typeof t$item.id != 'undefined') clearTimeout(t$item.id); openMenu('wall-item-photo-menu-button-$item.id')"
-                onmouseout="t$item.id=setTimeout('closeMenu(\'wall-item-photo-menu-button-$item.id\'); closeMenu(\'wall-item-photo-menu-$item.id\');',200)">
-				<a href="$item.profile_url" title="$item.linktitle" class="wall-item-photo-link" id="wall-item-photo-link-$item.id">
-				<img src="$item.thumb" class="wall-item-photo$item.sparkle" id="wall-item-photo-$item.id" style="height: 80px; width: 80px;" alt="$item.name" /></a>
-				<span onclick="openClose('wall-item-photo-menu-$item.id');" class="fakelink wall-item-photo-menu-button" id="wall-item-photo-menu-button-$item.id">menu</span>
-                <div class="wall-item-photo-menu" id="wall-item-photo-menu-$item.id">
-                    <ul>
-                        $item.item_photo_menu
-                    </ul>
-                </div>
-
-			</div>
-			<div class="wall-item-photo-end"></div>
-			<div class="wall-item-wrapper" id="wall-item-wrapper-$item.id" >
-				{{ if $item.lock }}<div class="wall-item-lock"><img src="images/lock_icon.gif" class="lockview" alt="$item.lock" onclick="lockview(event,$item.id);" /></div>
-				{{ else }}<div class="wall-item-lock"></div>{{ endif }}	
-				<div class="wall-item-location" id="wall-item-location-$item.id">$item.location</div>
-			</div>
-		</div>
-		<div class="wall-item-author">
-				<a href="$item.profile_url" title="$item.linktitle" class="wall-item-name-link"><span class="wall-item-name$item.sparkle" id="wall-item-name-$item.id" >$item.name</span></a>{{ if $item.owner_url }} $item.to <a href="$item.owner_url" title="$item.olinktitle" class="wall-item-name-link"><span class="wall-item-name$item.osparkle" id="wall-item-ownername-$item.id">$item.owner_name</span></a> $item.vwall{{ endif }}<br />
-				<div class="wall-item-ago"  id="wall-item-ago-$item.id" title="$item.localtime">$item.ago</div>				
-		</div>			
-		<div class="wall-item-content" id="wall-item-content-$item.id" >
-			<div class="wall-item-title" id="wall-item-title-$item.id">$item.title</div>
-			<div class="wall-item-title-end"></div>
-			<div class="wall-item-body" id="wall-item-body-$item.id" >$item.body
-					<div class="body-tag">
-						{{ for $item.tags as $tag }}
-							<span class='tag'>$tag</span>
-						{{ endfor }}
-					</div>
-			{{ if $item.has_cats }}
-			<div class="categorytags"><span>$item.txt_cats {{ for $item.categories as $cat }}$cat.name <a href="$cat.removeurl" title="$remove">[$remove]</a> {{ if $cat.last }}{{ else }}, {{ endif }}{{ endfor }}
-			</div>
-			{{ endif }}
-
-			{{ if $item.has_folders }}
-			<div class="filesavetags"><span>$item.txt_folders {{ for $item.folders as $cat }}$cat.name <a href="$cat.removeurl" title="$remove">[$remove]</a> {{ if $cat.last }}{{ else }}, {{ endif }}{{ endfor }}
-			</div>
-			{{ endif }}
-			</div>
-		</div>
-
-        <div class="wall-item-like $item.indent" id="wall-item-like-$item.id">$item.showlike</div>
-        <div class="wall-item-dislike $item.indent" id="wall-item-dislike-$item.id">$item.showdislike</div>
-
-		<div class="wall-item-tools" id="wall-item-tools-$item.id">
-			{{ if $item.like }}
-				<a href="#" class="icon like item-tool" title="$item.like.0" onclick="dolike($item.id,'like'); return false"></a>
-			{{ endif }}
-			{{ if $item.dislike }}
-				<a href="#" class="icon dislike item-tool" title="$item.dislike.0" onclick="dolike($item.id,'dislike'); return false"></a>
-			{{ endif }}
-			{{ if $item.share }}
-				<a href="#" class="icon recycle item-tool" title="$item.share.0" onclick="jotShare($item.id); return false"></a>
-			{{ endif }}
-			{{ if $item.plink }}
-				<a href="$item.plink.href" title="$item.plink.title" target="external-link" class="icon item-tool remote-link$item.sparkle"></a>
-			{{ endif }}
-			{{ if $item.edpost }}
-				<a class="editpost icon pencil item-tool" href="$item.edpost.0" title="$item.edpost.1"></a>
-			{{ endif }}			 
-			{{ if $item.star }}
-			<a href="#" id="starred-$item.id" onclick="dostar($item.id); return false;" class="star-item icon item-tool $item.star.isstarred" title="$item.star.toggle"></a>
-			{{ endif }}
-			{{ if $item.tagger }}
-			<a href="#" id="tagger-$item.id" onclick="itemTag($item.id); return false;" class="tag-item icon item-tool tagged" title="$item.tagger.tagit"></a>
-			{{ endif }}
-			{{ if $item.filer }}
-			<a href="#" id="filer-$item.id" onclick="itemFiler($item.id); return false;" class="filer-item filer-icon item-tool" title="$item.filer"></a>
-			{{ endif }}			
-			<img id="like-rotator-$item.id" class="like-rotator" src="images/rotator.gif" alt="$item.wait" title="$item.wait" style="display: none;" />
-
-			<div class="wall-item-delete-wrapper" id="wall-item-delete-wrapper-$item.id" >
-				{{ if $item.drop.dropping }}<a href="item/drop/$item.id" onclick="return confirmDelete();" class="icon drophide" title="$item.drop.delete" onmouseover="imgbright(this);" onmouseout="imgdull(this);" ></a>{{ endif }}
-			</div>
-				{{ if $item.drop.pagedrop }}<input type="checkbox" onclick="checkboxhighlight(this);" title="$item.drop.select" class="item-select" name="itemselected[]" value="$item.id" />{{ endif }}
-			<div class="wall-item-delete-end"></div>
-       		</div>
-	</div>	
- <div class="wall-item-wrapper-end"></div>
-
-<div class="wall-item-outside-wrapper-end $item.indent" ></div>
-</div>
-{{ if $item.toplevel }}
-{{ for $item.children as $item }}
-	{{ inc $item.template }}{{ endinc }}
-{{ endfor }}
-{{ endif }}
-
-<div class="wall-item-comment-wrapper" >
-	$item.comment
-</div>
-
-
-</div>
-{{if $item.comment_lastcollapsed}}</div>{{endif}}
diff --git a/view/theme/fancyred/tpl/theme_settings.tpl b/view/theme/fancyred/tpl/theme_settings.tpl
deleted file mode 100644
index 797b29962..000000000
--- a/view/theme/fancyred/tpl/theme_settings.tpl
+++ /dev/null
@@ -1,7 +0,0 @@
-{{inc field_select.tpl with $field=$font_size}}{{endinc}}
-
-{{inc field_select.tpl with $field=$line_height}}{{endinc}}
-
-<div class="settings-submit-wrapper">
-	<input type="submit" value="$submit" class="settings-submit" name="fancyred-settings-submit" />
-</div>
diff --git a/view/theme/redbasic/css/converse_center.css b/view/theme/redbasic/css/converse_center.css
new file mode 100644
index 000000000..3b3ecddc9
--- /dev/null
+++ b/view/theme/redbasic/css/converse_center.css
@@ -0,0 +1,5 @@
+body {
+	margin-left: auto;
+	margin-right: auto;
+	max-width: $body_width;
+}
diff --git a/view/theme/redbasic/css/mod_page.css b/view/theme/redbasic/css/mod_page.css
new file mode 100644
index 000000000..37f597fac
--- /dev/null
+++ b/view/theme/redbasic/css/mod_page.css
@@ -0,0 +1,24 @@
+/*
+section {
+left: 0px;
+width: 800px;
+margin-left: auto;
+margin-right: auto;
+}
+body {background-color: #d00 !important;}
+
+.page-content-wrapper {background: #fff;
+		color: #000;
+		border-radius: 20px;
+		box-shadow: 5px 5px 5px #111;
+}
+
+h3.page-title {
+padding-top: 30px;
+		color: #033}
+.page-body {padding: 40px;}
+
+.page-body strong {color: #033;}
+
+.nav-links {margin-top: 5px;}
+*/
\ No newline at end of file
diff --git a/view/theme/redbasic/css/narrow_navbar.css b/view/theme/redbasic/css/narrow_navbar.css
new file mode 100644
index 000000000..cfda9760e
--- /dev/null
+++ b/view/theme/redbasic/css/narrow_navbar.css
@@ -0,0 +1,29 @@
+@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-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/sloppy_photos.css b/view/theme/redbasic/css/sloppy_photos.css
new file mode 100644
index 000000000..78aedc9cc
--- /dev/null
+++ b/view/theme/redbasic/css/sloppy_photos.css
@@ -0,0 +1,58 @@
+
+.rotleft1 {
+-webkit-transform: rotate(-1deg);
+-moz-transform: rotate(-1deg);
+-ms-transform: rotate(-1deg);
+-o-transform: rotate(-1deg);
+}
+
+.rotleft2 {
+-webkit-transform: rotate(-2deg);
+-moz-transform: rotate(-2deg);
+-ms-transform: rotate(-2deg);
+-o-transform: rotate(-2deg);
+}
+
+.rotleft3 {
+-webkit-transform: rotate(-3deg);
+-moz-transform: rotate(-3deg);
+-ms-transform: rotate(-3deg);
+-o-transform: rotate(-3deg);
+}
+
+.rotleft4 {
+-webkit-transform: rotate(-4deg);
+-moz-transform: rotate(-4deg);
+-ms-transform: rotate(-4deg);
+-o-transform: rotate(-4deg);
+}
+
+
+.rotright1 {
+-webkit-transform: rotate(1deg);
+-moz-transform: rotate(1deg);
+-ms-transform: rotate(1deg);
+-o-transform: rotate(1deg);
+}
+
+.rotright2 {
+-webkit-transform: rotate(2deg);
+-moz-transform: rotate(2deg);
+-ms-transform: rotate(2deg);
+-o-transform: rotate(2deg);
+}
+
+.rotright3 {
+-webkit-transform: rotate(3deg);
+-moz-transform: rotate(3deg);
+-ms-transform: rotate(3deg);
+-o-transform: rotate(3deg);
+}
+
+.rotright4 {
+-webkit-transform: rotate(4deg);
+-moz-transform: rotate(4deg);
+-ms-transform: rotate(4deg);
+-o-transform: rotate(4deg);
+}
+
diff --git a/view/theme/redbasic/css/style.css b/view/theme/redbasic/css/style.css
index f600f5272..4ee8a7477 100644
--- a/view/theme/redbasic/css/style.css
+++ b/view/theme/redbasic/css/style.css
@@ -1,34 +1,35 @@
 /**
- * duepuntozero Frindika style
- * Fabio Comuni <fabrix.xm@gmail.com>
+ * Redbasic
+ *
+ * Based on duepuntozero Friendica style
+ * by Fabio Comuni <fabrix.xm@gmail.com>
  */
 
 
 /* generals */
+html {
+	height: 100%;
+}
+
 body {
-	font-family: helvetica,arial,freesans,clean,sans-serif;
-	font-size: 12px;
-	background-color: #ffffff;
-/*	background-image: url(../img/head.jpg); */
-	background-repeat: repeat-x;
-	color: #000000;
+	font-family: arial,freesans,sans-serif;
+	font-size: $body_font_size;
+	background-color: $bgcolour;
+	background-image: url('$background_image');
+	background-attachment: fixed;
+	background-size: cover;
+	color: $font_colour;
 	margin: 0px;
+	height: 100%;
+}
+.jslider {
+	font-family: arial,freesans,sans-serif;
 }
 
 abbr {
 	border-bottom: none;
 }
 
-/*Should we be doing this here, or should we be changing default.css? */
-
-aside {
-/*box-shadow: 3px 3px 3px #ccc;*/
-border: none;
-/*border-radius: 0px 0px 20px 0px;*/
-width: 210px;
-color: #d00;
-}
-
 /* icons */
 .icon {
   background-color: transparent ;
@@ -36,143 +37,112 @@ color: #d00;
   display: block;
   overflow: hidden;
   text-indent: -9999px;
-/*  min-width: 22px;
-  height: 22px; */
 }
+
 .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: -4px; 
-  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 { color: #dd0000; text-decoration: none; }
-a:hover { color: #dd0000; text-decoration: underline; }
+
+.connect-icon {
+	margin-right: 5px;
+}
+
+a, a:visited, a:link, .fakelink, .fakelink:visited, .fakelink:link { 
+	font-weight: bold;
+	color: $link_colour; 
+	text-decoration: none; 
+}
+
+a:hover, .fakelink:hover { color: $link_colour; text-decoration: underline; }
+
+.fakelink {
+	cursor: pointer;
+}
+
+
+input[type="text"],
+input[type="password"],
+input[type="submit"],
+select,
+textarea {
+	font-family: arial,freesans,sans-serif;
+	font-size: $body_font_size;
+}
 
 input {
-	border: 1px solid #666666;
-	-moz-border-radius: 5px;
-	border-radius: 5px;	
+	border: 1px solid $input_border;
+	-moz-border-radius: $radiuspx;
+	border-radius: $radiuspx;	
 	padding: 3px;
 }
 
-img { border :0px; }
+input[type="submit"] {
+	background-color: $input_bgsubmit;
+	font-weight: bold;
+	color: $input_linksubmit;
+	text-decoration: none;
+}
 
+button, input, optgroup, select, textarea {
+	color: #000;
+}
 
 
+pre code {
+	border: none;
+}
 
 code {
 	font-family: Courier, monospace;
 	display: block;
 	overflow: auto;
-	border: 1px solid #444;
-	background: #EEE;
-	color: #444;
+	border: 1px solid $code_borderc;
+	background: $code_bgcolour;
+	color: $code_txtcolour;
 	padding: 10px;
 	margin-top: 20px; 
 	max-width: 80%;
 }
 
+pre {
+	background: $pre_bgcolour;
+	color: $pre_txtcolour;
+	border:1px solid $pre_borderc;
+}
+
 blockquote {
-	background-color: #f4f8f9;
-	border-left: 4px solid #dae4ee;
+	background-color: $blockquote_bgcolour;
+	border-left: 4px solid $blockquote_bordercolour;
 	padding: 0.4em;
+	color: $blockquote_colour;
+	margin-left: 20px;
 }
 
-.icollapse-wrapper, .ccollapse-wrapper {
+.ccollapse-wrapper {
 	border: 1px solid #CCC;
 	padding: 5px;
 }
 
-.hide-comments {
-	margin-left: 5px;
-}
-
-#panel {
-	background-color: ivory;
-	position: absolute;
-	z-index: 2;
-	width: 30%;
-	padding: 25px;
-	border: 1px solid #444;
-}
-
 .heart {
 	color: #FF0000;
 	font-size: 100%;
 	margin-right: 5px;
 }
 
+.subdued {
+	opacity: 0.3;
+	filter:alpha(opacity=30);
+}
 
-
-/* nav */
-nav {
-	display: block;
-/*	margin: 0px 10%; */
-	border-bottom: 1px solid #d00;
+.subdued:hover {
+	opacity: 1.0;
+	filter:alpha(opacity=100);
 }
-nav #site-location {
-	color: #888a85;
-	font-size: 0.8em;
-	position: absolute;
+
+nav,
+header {
+	opacity: $nav_float_min_opacity;
+	filter:alpha(opacity=$nav_percent_min_opacity);
 }
 
 .error-message {
@@ -184,11 +154,13 @@ nav #site-location {
 }
 
 .info-message {
-	color: #204a87;
 	font-size: 1.1em;
-	border: 1px solid #3465a4;
-	background-color: #d7e3f1;
+	border: 1px solid #444;
+	background-color: $infomess_bgcolour;
 	padding: 10px;
+	-moz-border-radius: $radiuspx;
+	border-radius: $radiuspx;	
+
 }
 
 
@@ -201,25 +173,22 @@ nav #banner #logo-text a {
 }
 nav #banner #logo-text a:hover { text-decoration: none; }
 
-header #site-location {
-  display: none;
-}
 header #banner {
-  overflow: hidden;
+/*  overflow: hidden; */
   text-align: center;
-  width: 100%;
-  font-size: 2.2em;
+  font-size: 14px;
   font-family: tahoma, "Lucida Sans", sans;
-  color: #eec;
+  color: $banner_colour;
   font-weight: bold;
-
+  margin-top: 14px;
 }
+
 header #banner a,
 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;
@@ -232,277 +201,77 @@ header #banner #logo-text {
   font-size: 22px;
 }
 
-
-
-
-.nav-commlink {
-    display: block;
-    height: 15px;
-	margin-top: 67px;
-	margin-right: 2px;
-	//padding: 6px 10px;
-       padding: 6px 3px;
-	float: left;
-	bottom: 140px;
-	border: 1px solid #babdb6;
-	border-bottom: 0px;
-	background-color: #aec0d3;
-	color: #565854;		
-	-moz-border-radius: 5px 5px 0px 0px;
-	border-radius: 5px 5px 0px 0px;	
-}
-nav .nav-link {
-	float: right;
-	margin: 0.2em 0em;
-	padding: 0em 0.5em;
-	background-color: transparent !important;
-}
-
-.nav-commlink.selected {
-	background-color: #ffffff;
-	border-bottom: 1px solid #ffffff;
-	color: #000000 !important;
-	margin-top: 64px;
-	padding-top: 6px;
-	padding-bottom: 8px;
-}
-.nav-ajax-left {
-	font-size: 0.8em;
-	float: left;
-	margin-top: 62px;	
-}
-
-
-nav #nav-link-wrapper .nav-link {
-	border-right: 1px solid #babdb6;
-}
-
-
-
-#dfrn-request-link {
-	display: block;
-	color: #FFFFFF;
-	-webkit-border-radius: 5px ;
-	-moz-border-radius: 5px;
-	border-radius: 5px;
-	padding: 5px;
-	font-weight: bold;
-	background: #3465a4 url('../img/friendika-16.png') no-repeat 95% center;
-}
-#wallmessage-link {
-	display: block;
-	color: #FFFFFF;
-	-webkit-border-radius: 5px ;
-	-moz-border-radius: 5px;
-	border-radius: 5px;
-	padding: 5px;
-	font-weight: bold;
-	background-color: #3465a4;
-}
-
-.tabs {
-	height: 22px;
-/*	background-image: url(../img/head.jpg);
-	background-repeat: repeat-x;	
-	background-position: 0px -20px; */
-	border-bottom: 1px solid #aaaaaa;
-	padding:0px;
-	margin-right: 10px;
-}
-.tabs li { margin: 0px; list-style: none; }
-.tab {
-	display:block;
-	float:left;
-	padding: 0.4em;
-	//margin-right: 1em;
-	margin-right: 3px ;
-}
-.tab.active {
-	font-weight: bold;
-	
-}
-ul.tabs {
-	margin-top: 0px;
-	margin-bottom: 0px;
-	list-style-type: none;
-	padding: 0px;
-}
-
 /* 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;
 }
 
-.birthday-today, .event-today {
+.warning-text {
+	font-size: 1.2em;
 	font-weight: bold;
+	color: #ff0000;
 }
 
-div.wall-item-content-wrapper.shiny {
-	background: #f4f4f4;
-	border: none;
+#noperm-msg {
+	margin-top: 15px;
 }
 
 .preview {
-	background: #FFFFC8;
+	background: url('../img/$preview_backgroundimg');
 }
 
 #theme-preview {
 	margin: 15px 0 15px 150px;
 }
 
-/* from default */
-#jot-perms-icon, 
-#profile-location,
-#profile-nolocation,
-#profile-youtube, 
-#profile-video, 
-#profile-audio,
-#profile-link,
-#profile-title, 
-#wall-image-upload,
-#wall-file-upload,
-#profile-upload-wrapper,
-#wall-image-upload-div,
-#wall-file-upload-div,
-.hover, .focus {
-	cursor: pointer;
-}
-
-#jot-perms-icon {
-	float: left;
-}
-
-#jot-title, #jot-category {
-	border: 0px;
-	margin: 0px;
-	padding: 8px;
-	height: 20px;
-	width: 530px;
-	margin-bottom: 5px;
-	font-weight: bold;
-	border: solid 1px #ccc;
-/*	box-shadow: 5px 5px 5px #666 inset; */
-	border-radius: 5px;
-}
-
-#jot-title::-webkit-input-placeholder{font-weight: normal;}
-#jot-category::-webkit-input-placeholder{font-weight: normal;}
-#jot-title:-moz-placeholder{font-weight: normal;}
-#jot-category:-moz-placeholder{font-weight: normal;}
-		
-	
-#jot-title:hover,
-#jot-title:focus,
-#jot-category:hover,
-#jot-category:focus {
-	border: 1px solid #cccccc; 
-}
-
-.jothidden { display:none; }
-
-
-.fakelink, .fakelink:visited, .fakelink:link {
-	color: #335577;
-	text-decoration: none;
-	cursor: pointer;
-}
 .fakebutton {
 	margin-top: 15px;
 	margin-bottom: 15px;
 }
 
-.lockview {
-	cursor: pointer;
+aside ul {
+	list-style-type: none;
+	margin: 0;
+	padding: 0;
+	/* border-left: 1px solid #eee; This and a 5px left border on the li is "interesting" 
+	   to delineate the list from the surrounding bits 
+	*/
 }
 
-
-#group-sidebar {
-	margin-bottom: 10px;
+aside li {
+	margin-top: 5px;
+	/* in order to achieve consistent indentation cross-browser, set margin-left on the li element e.g. */
+	/* margin-left: 10px; */
 }
 
-.group-selected, .nets-selected, .fileas-selected, .categories-selected {
-	padding: 3px;
-	-moz-border-radius: 5px;
-	border-radius: 5px;	
-	border: 1px solid #CCCCCC;
-	background: #F8F8F8;
-	font-weight: bold;
+/*TODO: we should use one class for all this. */
+.group-selected, .fileas-selected, .categories-selected, .search-selected, .active {
+	color: $selected_active_colour !important;
+	text-decoration: $selected_active_deco !important;
 }
 
-.settings-widget .selected {
-	padding: 3px;
-	-moz-border-radius: 5px;
-	border-radius: 5px;	
-	border: 1px solid #CCCCCC;
-	background: #F8F8F8;
-	font-weight: bold;
+.fileas-all {
+	text-decoration: none !important;
 }
 
-.fakelink:hover {
-	color: #5588aa;
-	text-decoration: underline;
-	cursor: pointer;
-}
-.smalltext {
-	font-size: 0.7em;
+.fileas-all:hover {
+	text-decoration: underline !important;
 }
+
 #sysmsg {
-	/*width: 600px;*/
 	margin-bottom: 10px;
 }
 
-#register-fill-ext {
-	margin-bottom: 25px;
-}
-
-#label-register-name, #label-register-nickname, #label-register-openid {
-	float: left;
-	width: 350px;
-	margin-top: 10px;
-}
-
-#register-name, #register-nickname {
-	float: left;
-	margin-top: 10px;
-	width: 150px;
-}
-
-#register-openid {
-	float: left;
-	margin-top: 10px;
-	width: 130px;
-}
-
-#register-name-end, #register-email-end, #register-nickname-end, #register-submit-end, #register-openid-end {
-	clear: both;
-}
-
-#register-nickname-desc {
-	margin-top: 30px;
-	width: 650px;
-}
-#register-sitename {
-	float: left;
-	margin-top: 10px;
-}
-
-#register-submit-button {
-	margin-top: 10px;
-}
-
 #main-login {
-	margin-left: 100px;
 	margin-top: 50px;
 }
 
@@ -549,13 +318,16 @@ div.wall-item-content-wrapper.shiny {
 
 #login-extra-links {
 	clear: both;
+	width: 300px;
 }
 
-#register-link, #lost-password-link {
+#register-link {
 	float: left;
-	font-size: 90%;
 	margin-left: 100px;
 }
+#lost-password-link {
+	float: right;
+}
 
 #login-standard-end {
 	clear: both;
@@ -565,65 +337,8 @@ div.wall-item-content-wrapper.shiny {
 
 	margin-left: 100px;
 	margin-top: 10px;
-/*	margin-left: 200px; */
-}
-
-
-/* TODO - we don't use DFRN anymore.  These probably have different names now.  Check and clean up later */
-
-input#dfrn-url {
-	float: left;
-	background: url(../img/friendika-16.png) no-repeat;
-	background-position: 2px center;
-	font-size: 17px;
-	padding-left: 21px;
-	height: 21px;
-	background-color: #FFFFFF;
-	color: #000000;
-	margin-bottom: 20px;
-}
-
-#dfrn-url-label {
-	float: left;
-	width: 250px;
-}
-
-#dfrn-request-url-end {
-	clear: both;
 }
 
-#knowyouyes, #knowyouno {
-	float: left;
-}
-
-#dfrn-request-knowyou-yes-wrapper, #dfrn-request-knowyou-no-wrapper {
-
-	float: none;
-}
-#dfrn-request-knowyou-yes-label, #dfrn-request-knowyou-no-label {
-	float: left;
-	width: 75px;
-	margin-left: 50px;
-	margin-bottom: 7px;
-}
-#dfrn-request-knowyou-break, #dfrn-request-knowyou-end {
-	clear: both;
-
-}
-
-#dfrn-request-message-wrapper {
-	margin-bottom: 50px;
-}
-#dfrn-request-submit-wrapper {
-	clear: both;
-	margin-left: 50px;
-}
-
-#dfrn-request-info-wrapper {
-	margin-left: 50px;
-}
-
-
 
 #cropimage-wrapper, #cropimage-preview-wrapper {
 	float: left;
@@ -635,67 +350,7 @@ input#dfrn-url {
 	clear: both;
 }
 
-.intro-wrapper {
-	margin-top: 20px;
-}
-
-.intro-fullname {
-	font-size: 1.1em;
-	font-weight: bold;
-
-}
-.intro-desc {
-	margin-bottom: 20px;
-	font-weight: bold;
-}
-
-.intro-note {
-	padding: 10px;
-}
-
-.intro-end {
-	padding: 30px;
-}
-
-.intro-form {
-	float: left;
-}
-.intro-approve-form {
-	clear: both;
-}
-.intro-approve-as-friend-end {
-	clear: both;
-}
-.intro-submit-approve, .intro-submit-ignore {
-	margin-right: 20px;
-}
-.intro-submit-approve {
-	margin-top: 15px;
-}
 
-.intro-approve-as-friend-label, .intro-approve-as-fan-label {
-	float: left;
-	width: 100px;
-	margin-left: 20px;
-}
-.intro-approve-as-friend, .intro-approve-as-fan {
-	float: left;
-}
-.intro-form-end {
-	clear: both;
-}
-.intro-approve-as-friend-desc {
-	margin-top: 15px;
-}
-.intro-approve-as-end {
-	clear: both;
-	margin-bottom: 10px;
-}
-
-.intro-end {
-	clear: both;
-	margin-bottom: 30px;
-}
 .aprofile dt {
 	font-weight: bold;
 }
@@ -717,44 +372,46 @@ input#dfrn-url {
 	margin-top: 10px;
 }
 
+#profile-like {
+	margin-left: 15px;
+}
+
+#profile-like-wrapper {
+	margin-bottom: 15px;
+}
+
 
 .fn {
 	padding: 0px 0px 5px 0px;
 	font-size: 120%;
 	font-weight: bold;
-	color: #dd0000;
+	color: #444444;
+}
+
+.vcard {
+	padding: 8px;
 }
 
 .vcard .title {
 	margin-bottom: 5px;
-	margin-left: 12px;
 }
 
 .vcard dl {
 	clear: both;
+	word-wrap:break-word;
 }
 
-#birthday-title {
-	float: left;
-	font-weight: bold;	
-}
-
-#birthday-adjust {
-	float: left;
-	font-size: 75%;
-	margin-left: 10px;
-}
-
-#birthday-title-end {
-	clear: both;
+.vcard-profile-edit-icon {
+	font-size: 1.2em;
 }
-
-.birthday-list {
-	margin-left: 15px;
+.vcard-profile-edit-icon:hover {
+	text-decoration: none;
 }
 
-#birthday-wrapper {
-	margin-bottom: 20px;
+.vcard .dropdown-menu {
+	position: absolute;
+	left: 200px;
+	top: 18px;
 }
 
 #profile-extra-links {
@@ -772,9 +429,7 @@ input#dfrn-url {
 	margin-top: 5px;
 }
 
-.profile-edit-side-div {
-	float: right;
-}
+
 .profile-edit-side-link {
 	opacity: 0.3;
 	filter:alpha(opacity=30);
@@ -804,124 +459,15 @@ input#dfrn-url {
 }
 
 
-#viewcontacts {
+#viewconnections {
 	margin-top: 15px;
 }
-#profile-edit-default-desc {
-	color: #FF0000;
-	border: 1px solid #FF8888;
-	background-color: #FFEEEE;
-	padding: 7px;
-}
-
-#profile-edit-clone-link-wrapper {
-	float: left;
-	margin-left: 50px;
-	margin-bottom: 20px;
-	width: 300px;
-}
-
-
-#profile-edit-links-end {
-	clear: both;
-	margin-bottom: 15px;
-}
-
-.profile-listing-photo {
-	border: none;
-}
-
-.profile-edit-submit-wrapper {
-	margin-top: 20px;
-	margin-bottom: 20px;
-}
 
-#profile-photo-link-select-wrapper {
-	margin-top: 2em;
-}
-
-#profile-photo-submit-wrapper {
-	margin-top: 10px;
-}
 
 #profile-photo-wrapper img {
-	width:175px;
-	height:175px;
 	padding: 12px;
-}
-
-#profiles-menu.menu-popup {
-  left: 200px;
-  right: auto;
-  top: 22px;
-}
-
-
-#profile-edit-profile-name-label,
-#profile-edit-name-label,
-#profile-edit-pdesc-label,
-#profile-edit-gender-label,
-#profile-edit-dob-label,
-#profile-edit-address-label,
-#profile-edit-locality-label,
-#profile-edit-region-label,
-#profile-edit-postal-code-label,
-#profile-edit-country-name-label,
-#profile-edit-marital-label,
-#profile-edit-sexual-label,
-#profile-edit-politic-label,
-#profile-edit-religion-label,
-#profile-edit-pubkeywords-label,
-#profile-edit-prvkeywords-label,
-#profile-edit-homepage-label,
-#profile-edit-hometown-label {
-	float: left;
-	width: 175px;
-}
-
-#profile-edit-profile-name,
-#profile-edit-name,
-#profile-edit-pdesc,
-#gender-select,
-#profile-edit-dob,
-#profile-edit-address,
-#profile-edit-locality,
-#profile-edit-region,
-#profile-edit-postal-code,
-#profile-edit-country-name,
-#marital-select,
-#sexual-select,
-#profile-edit-politic,
-#profile-edit-religion,
-#profile-edit-pubkeywords,
-#profile-edit-prvkeywords,
-#profile-in-dir-yes,
-#profile-in-dir-no,
-#profile-in-netdir-yes,
-#profile-in-netdir-no,
-#hide-wall-yes,
-#hide-wall-no,
-#hide-friends-yes,
-#hide-friends-no {
-	float: left;
-	margin-bottom: 20px;
-}
-#settings-normal,
-#settings-soapbox,
-#settings-freelove,
-#settings-community {
-	float: left;
-}
-#settings-notifications label {
-	margin-left: 20px;
-}
-#settings-notify-desc, #settings-activity-desc {
-	font-weight: bold;
-	margin-bottom: 15px;
-}
-#settings-pagetype-desc {
-	color: #666666;
-	margin-bottom: 15px;
+	width: 201px;
+	height: 201px;
 }
 
 #profile-in-dir-yes-label,
@@ -937,10 +483,6 @@ input#dfrn-url {
 	width: 50px;
 }
 
-#profile-edit-with-label {
-	width: 175px;
-	margin-left: 20px;
-}
 
 #profile-publish-yes-reg,
 #profile-publish-no-reg {
@@ -961,570 +503,14 @@ input#dfrn-url {
 }
 
 
-#profile-edit-pdesc-desc,
-#profile-edit-pubkeywords-desc,
-#profile-edit-prvkeywords-desc {
-	float: left;
-	margin-left: 20px;
-}
-
-
-#profile-edit-homepage, #profile-edit-hometown {
-	float: left;
-	margin-bottom: 35px;
-}
-#settings-normal-label,
-#settings-soapbox-label,
-#settings-community-label,
-#settings-freelove-label {
-	float: left;
-	width: 200px;
-}
-#settings-normal-desc,
-#settings-soapbox-desc,
-#settings-community-desc,
-#settings-freelove-desc {
-	/*float: left;
-	margin-left: 75px;*/
-    clear: left;
-    color: #666666;
-    display: block;
-    margin-bottom: 20px	
-}
-
-#profile-edit-profile-name-end,
-#profile-edit-name-end,
-#profile-edit-pdesc-end,
-#profile-edit-gender-end,
-#profile-edit-dob-end,
-#profile-edit-address-end,
-#profile-edit-locality-end,
-#profile-edit-region-end,
-#profile-edit-postal-code-end,
-#profile-edit-country-name-end,
-#profile-edit-marital-end,
-#profile-edit-sexual-end,
-#profile-edit-politic-end,
-#profile-edit-religion-end,
-#profile-edit-pubkeywords-end,
-#profile-edit-prvkeywords-end,
-#profile-edit-homepage-end,
-#profile-edit-hometown-end,
-#profile-in-dir-break,
-#profile-in-dir-end,
-#profile-in-netdir-break,
-#profile-in-netdir-end,
-#hide-wall-break,
-#hide-wall-end,
-#hide-friends-break,
-#hide-friends-end,
-#settings-normal-break,
-#settings-soapbox-break,
-#settings-community-break,
-#settings-freelove-break {
-	clear: both;
-}
-
-.settings-widget ul {
-	list-style-type: none;
-	padding: 0px;
-}
-
-.settings-widget li {
-	margin-left: 24px;
-	margin-bottom: 8px;
-}
-
-
-#gender-select, #marital-select, #sexual-select {
-	width: 220px;
-}
-
-#profile-edit-profile-name-wrapper .required {
-	color: #FF0000;
-	float: left;
-}
-
-#contacts-main {
-	margin-top: 20px;
-	margin-bottom: 20px;
-}
-
-.contact-entry-wrapper {
-	float: left;
-	width: 120px;
-	height: 120px;
-	padding: 10px;
-}
-#contacts-search-end {
-	margin-bottom: 10px;
-}
-
-.contact-entry-direction-icon {
-	margin-top: 24px;
-	margin-right: 2px;
-}
-
-.contact-entry-photo img {
-	border: none;
-}
-.contact-entry-photo-end {
-	clear: both;
-}
-.contact-entry-name {
-	float: left;
-	margin-left: 0px;
-	margin-right: 10px;
-	width: 120px;
-	overflow: hidden;
-}
-.contact-entry-edit-links {
-	margin-top: 6px;
-	margin-left: 10px;
-	width: 16px;
-}
-.contact-entry-nav-wrapper {
-	float: left;
-	margin-left: 10px;
-}
-
-.contact-entry-edit-links img {
-	border: none;
-	margin-right: 15px;
-}
-.contact-entry-photo {
-	float: left;
-	position: relative;
-}
-.contact-entry-end {
-	clear: both;
-}
-
 #fsuggest-desc, #fsuggest-submit-wrapper {
 	margin-top: 15px;
 	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 {
-	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: 30px;
-	position: relative;
-	background: #fff;
-	border-radius: 5px;
-/*	box-shadow: 12px 12px 12px #111; */
-	border: 1px solid #eec;
-
-}
-.wall-item-content-wrapper.comment {
-	background: #fff;
-	border-left: 1px solid #e0e0e0;
-	margin-left: 50px;
-/*	box-shadow: 5px 5px 5px #222; */
-}
-
 .thread-end-wrapper {
     margin-left: 50px;
 }
-
-
-.wall-item-content-wrapper.comment {
-	background: #ffffff;
-	border-left: 1px solid #e0e0e0;
-
-}
-
-.wall-item-like.comment, .wall-item-dislike.comment {
-	margin-left: 50px;
-}
-
-.wall-item-info {
-	display: block;
-	float: left;
-	width:110px;
-	margin-right:10px;
-}
-.comment .wall-item-info {
-	width: 70px;
-}
-
-.wall-item-photo-wrapper {
-	margin-top: 10px;
-	margin-left: 10px;
-	margin-bottom: 10px;
-	width: 100px;
-}
-.wall-item-photo-menu-button {
-	display: block;
-	position: absolute;
-	background-image: url("../img/photo-menu.jpg");
-	background-position: top left; 
-	background-repeat: no-repeat;
-	margin: 0px; padding: 0px;
-	width: 16px;
-	height: 16px;
-	top: 74px; left:10px;
-	overflow: hidden;
-	text-indent: 40px;
-	display: none;
-	
-}
-.wall-item-photo-menu {
-	width: auto;
-	border: 2px solid #444444;
-	background: #FFFFFF;
-	position: absolute;
-	left: 10px; top: 90px;
-	display: none;
-	z-index: 10000;
-}
-.wall-item-photo-menu ul { margin:0px; padding: 0px; list-style: none }
-.wall-item-photo-menu li a { display: block; padding: 2px; }
-.wall-item-photo-menu li a:hover { color: #FFFFFF; background: #3465A4; text-decoration: none; }
-
-
-.comment .wall-item-photo-menu-button {	top: 44px;}
-.comment .wall-item-photo-menu { top: 60px; }
-
-.wallwall .wwto {
-    left: 50px;
-    margin: 0;
-    position: absolute;
-    top: 70px;
-    width: 30px
-}
-.wallwall .wwto img {
-	width: 30px !important;
-	height: 30px !important;
-}
-
-.wallwall .wall-item-photo-end {
-	clear: both;
-}
-
-.wall-item-arrowphoto-wrapper {
-    position: absolute;
-    left: 75px;
-    top: 70px;
-    z-index: 100;
-}
-.wall-item-wrapper {
-	/*float: left;
-    margin-right: 5px;
-    width: 250px;*/
-    margin-left:10px;
-}
-.wall-item-lock {
-	/*height: 20px;*/
-	/*margin-top: 10px;*/
-    left: 105px;
-    position: absolute;
-    top: 1px;	
-}
-.comment .wall-item-lock {
-	left: 65px;
-}
-
-.wall-item-ago {
-	color: #888888;
-	font-size: 0.8em;
-}
-
-.wall-item-location {
-	overflow: hidden;
-	/* add ellipsis on text overflow               */
-	/* this work on safari, opera, ie, chrome.     */
-	/* firefox users have to wait support or we    */
-	/* can use a jquery plugin http://bit.ly/zJskg */
-	text-overflow: ellipsis;
-	-o-text-overflow: ellipsis;
-	width: 100%;
-}
-
-
-.item-tool {
-	float: left;
-	margin-right: 8px;
-}
-
-.like-rotator {
-	margin-left: 5px;
-}
-
-.wall-item-delete-wrapper {
-	float: right;
-}
-
-.wall-item-delete-end {
-	clear: both;
-}
-
-.wall-item-delete-icon {
-	border: none;
-}
-
-.wall-item-wrapper-end {
-	clear: both;
-}
-.wall-item-name-link {
-	font-weight: bold;
-	text-decoration: none;
-	color: #3172BD;
-}
-.wall-item-photo {
-	border: none;
-}
-.comment .wall-item-photo {
-	width: 50px !important; 
-	height: 50px !important;
-}
-.wall-item-content {
-	margin-left: 10px;
-	overflow: auto;
-}
-
-.wall-item-content img {
-  max-height: 95% !important;
-  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 {
-	clear: both;
-}
-
-.thread-wrapper.toplevel_item {
-/*padding: 30px; */
-width: 90%;
-}
-
-.wall-item-body {
-/*	float: left; */
-	/*width: 450px;*/
-	margin-top: 10px;
-}
-
-.wall-item-tools {
-	clear: both;
-/*	background-image: url("../img/head.jpg"); */
-    background: #eee;
-    padding: 5px 10px;
-}    
-
-.wall-item-like {
-margin: 15px;
-}
-
-.wall-item-author {
-	margin-top: 10px;
-}
-
-.comment-edit-wrapper {
-	margin-top: 15px;
-	background: #ffffff;
-	margin-left: 50px;
-}
-
-.comment-wwedit-wrapper {
-	background: #ffffff;
-}
-
-.comment-edit-photo {
-	margin-top: 10px;
-	margin-left: 10px;
-	margin-bottom: 10px;
-	width: 100px;
-	float: left;
-}
-.comment-wwedit-wrapper.threaded > .comment-edit-form > .comment-edit-photo {
-	width: 40px;
-}
-
-.comment-edit-photo img {
-	width: 25px;
-}
-.comment-edit-text-empty, .comment-edit-text-full {
-	float: left;
-	margin-top: 10px;
-	padding: 3px 1px 1px 3px;
-	border: 1px solid #ccc;
-	padding: 8px;
-	border-radius: 5px 5px 5px 5px;
-/*	box-shadow: 5px 5px 5px #666 inset; */
-}
-
-.comment-edit-text-empty {
-	color: gray;
-	height: 1.5em;
-	width: 80%;  /*Too wide? */
-	overflow: auto;
-	margin-bottom: 10px;
-}
-
-.comment-wwedit-wrapper.threaded > .comment-edit-form > .comment-edit-text-empty {
-	height: 1.5em;
-}
-
-.comment-edit-text-full {
-	color: black;
-	height: 150px;
-	width: 80%;
-	overflow: auto;
-}
-
-
-.comment-edit-text-end {
-	clear: both;
-}
-
-.comment-edit-submit {
-	margin: 10px 0px 10px 110px;
-}
-
-.comment-wwedit-wrapper.threaded > .comment-edit-form > .comment-edit-submit-wrapper > .comment-edit-submit {
-	margin-left: 50px;
-}
-
-#profile-jot-plugin-wrapper,
-#profile-jot-submit-wrapper {
-	margin-top: 15px;
-	width:90%;
-}
-
-#profile-jot-submit {
-	float: left;
-}
-#profile-upload-wrapper {
-	float: left;
-	margin-left: 30px;
-}
-#profile-attach-wrapper {
-	float: left;
-	margin-left: 30px;
-}
-#profile-rotator {
-	float: left;
-	margin-left: 30px;
-}
-#profile-link-wrapper {
-	float: left;
-	margin-left: 15px;
-}
-#profile-youtube-wrapper {
-	float: left;
-	margin-left: 15px;
-}
-#profile-video-wrapper {
-	float: left;
-	margin-left: 15px;
-}
-#profile-audio-wrapper {
-	float: left;
-	margin-left: 15px;
-}
-#profile-location-wrapper {
-	float: left;
-	margin-left: 15px;
-}
-#jot-preview-link {
-	float: left;
-	margin-left: 45px;
-	margin-top: 0px !important;
-}
-
-
-#profile-nolocation-wrapper {
-	float: left;
-	margin-left: 15px;
-}
-#profile-title-wrapper {
-	float: left;
-	margin-left: 15px;
-}
-
-#profile-jot-perms {
-	float: right;
-	margin-left: 100px;
-	font-weight: bold;
-	font-size: 1.2em;
-	height: auto;
-	width: auto;
-	background-color: #dd0000;
-	border-radius: 5px;
-	border: 2px outset;
-	box-shadow: 5px 5px 5px #666;
-	margin-right: 8px;
-	padding: 4px;
-}
-
-#profile-jot-perms:active {
-    box-shadow: 0 0 0 0;
-}
-
-#profile-jot-perms-end {
-	/*clear: left;*/
-	height: 30px;
-}
-
-#profile-jot-plugin-end{
-  clear: both;
-}
-.profile-jot-net {
-	float: left;
-	margin-right: 10px;
-	margin-top: 5px;
-	margin-bottom: 5px;
-}
-
-#profile-jot-networks-end {
-	clear: both;
-}
-
-#profile-jot-end {
-	/*clear: both;*/
-	margin-bottom: 30px;
-}
-#about-jot-submit-wrapper {
-	margin-top: 15px;
-}
-#about-jot-end {
-	margin-bottom: 30px;
-}
-#contacts-main {
-	margin-bottom: 30px;
-}
-
-#profile-listing-desc {
-	margin-left: 30px;
-}
-
-#profile-listing-new-link-wrapper {
-	margin-left: 30px;
-	margin-bottom: 30px;
-}
 .profile-listing-photo-wrapper {
 	float: left;
 }
@@ -1555,46 +541,22 @@ margin: 15px;
 	width: 200px;
 
 }
-.fortune {
-	margin-top: 50px;
-	color: #4444FF;
-	font-weight: bold;
-	margin-bottom: 20px;
-}
 
-.directory-end {
-	clear: both;
-}
-.directory-name {
-	text-align: center;
-}
-.directory-photo {
-	margin-left: 25px;
-}
 .directory-details {
 	font-size: 0.7em;
-	text-align: center;
-	margin-left: 5px;
-	margin-right: 5px;
-}
-.directory-item {
-	float: left;
-	width: 225px;
-	height: 260px;
-	overflow: auto;
 }
 
-#directory-search-wrapper {
-	margin-top: 20px;
-	margin-right: 20px;
-	margin-bottom: 50px;
+#cboxContent {
+    color: $dirpopup_txtcol;
 }
 
-#directory-search-end {
+#cboxContent a {
+    color: $dirpopup_linkcol;
 }
 
-.directory-photo-img {
-	border: none;
+.app-name {
+	width: 125px;
+	overflow: none;
 }
 
 
@@ -1609,9 +571,11 @@ margin: 15px;
 .pager_last,
 .pager_prev,
 .pager_next,
-.pager_n {
-	border: 1px solid black;
-	background: #EEE;
+.pager-prev,
+.pager-next,
+.pager_n { 
+	border: 1px solid $editbuttons_bordercolour;
+	background: $editbuttons_bgcolour;
 	padding: 4px;
 }
 
@@ -1620,307 +584,22 @@ margin: 15px;
 .pager_prev a,
 .pager_next a,
 .pager_n a {
-	text-decoration: none;
 }
 
 .pager_current {
-  border: 1px solid black;
-  background: #FFCCCC;
+  border: 1px solid transparent;
+  background: transparent;
   padding: 4px;
 }
 
-
-#advanced-profile-name-wrapper,
-#advanced-profile-gender-wrapper,
-#advanced-profile-dob-wrapper,
-#advanced-profile-age-wrapper,
-#advanced-profile-marital-wrapper,
-#advanced-profile-sexual-wrapper,
-#advanced-profile-homepage-wrapper,
-#advanced-profile-politic-wrapper,
-#advanced-profile-religion-wrapper,
-#advanced-profile-about-wrapper,
-#advanced-profile-interest-wrapper,
-#advanced-profile-contact-wrapper,
-#advanced-profile-music-wrapper,
-#advanced-profile-book-wrapper,
-#advanced-profile-tv-wrapper,
-#advanced-profile-film-wrapper,
-#advanced-profile-romance-wrapper,
-#advanced-profile-work-wrapper,
-#advanced-profile-education-wrapper {
-	margin-top: 20px;
-}
-
-#advanced-profile-name-text,
-#advanced-profile-gender-text,
-#advanced-profile-dob-text,
-#advanced-profile-age-text,
-#advanced-profile-marital-text,
-#advanced-profile-sexual-text,
-#advanced-profile-homepage-text,
-#advanced-profile-politic-text,
-#advanced-profile-religion-text,
-#advanced-profile-about-text,
-#advanced-profile-interest-text,
-#advanced-profile-contact-text,
-#advanced-profile-music-text,
-#advanced-profile-book-text,
-#advanced-profile-tv-text,
-#advanced-profile-film-text,
-#advanced-profile-romance-text,
-#advanced-profile-work-text,
-#advanced-profile-education-text {
-	width: 300px;
-	float: left;
-}
-
-#advanced-profile-name-end,
-#advanced-profile-gender-end,
-#advanced-profile-dob-end,
-#advanced-profile-age-end,
-#advanced-profile-marital-end,
-#advanced-profile-sexual-end,
-#advanced-profile-homepage-end,
-#advanced-profile-politic-end,
-#advanced-profile-religion-end {
-	height: 10px;
-}
-
-#advanced-profile-about-end,
-#advanced-profile-interest-end,
-#advanced-profile-contact-end,
-#advanced-profile-music-end,
-#advanced-profile-book-end,
-#advanced-profile-tv-end,
-#advanced-profile-film-end,
-#advanced-profile-romance-end,
-#advanced-profile-work-end,
-#advanced-profile-education-end {
-
-
-}
-
-#advanced-profile-name,
-#advanced-profile-gender,
-#advanced-profile-dob,
-#advanced-profile-age,
-#advanced-profile-marital,
-#advanced-profile-sexual,
-#advanced-profile-homepage,
-#advanced-profile-politic,
-#advanced-profile-religion {
-	float: left;
-
-}
-
-
-#advanced-profile-about,
-#advanced-profile-interest,
-#advanced-profile-contact,
-#advanced-profile-music,
-#advanced-profile-book,
-#advanced-profile-tv,
-#advanced-profile-film,
-#advanced-profile-romance,
-#advanced-profile-work,
-#advanced-profile-education {
-	margin-top: 10px;
-	margin-left: 50px;
-	margin-right: 20px;
-	padding: 10px;
-	border: 1px solid #CCCCCC;
-}
-
-#advanced-profile-with {
-	float: left;
-	margin-left: 15px;
-}
-
-#contact-edit-wrapper {
-	margin-top: 10px;
-}
-
-#contact-edit-banner-name {
-	font-size: 1.4em;
-	font-weight: bold;
-}
-
-#contact-edit-poll-wrapper {
-	margin-top: 15px;
-}
-
-#contact-edit-poll-text {
-	margin-top: 15px;
-	margin-bottom: 5px;
-}
-
-#contact-edit-update-now {
-	margin-top: 15px;
-}
-
-#contact-edit-links{
-	clear: both;
-}
-
-#contact-edit-links ul {
-	list-style: none;
-	list-style-type: none;
-	margin-left: 0px;
-	padding-left: 0px;
-}
-
-#contact-edit-links li {
-	margin-top: 5px;
-}
-
-#contact-edit-drop-link {
-	float: right;
-	margin-right: 20px;
-}
-
-#contact-edit-nav-end {
-	clear: both;
-}
-
-#contact-edit-wrapper {
-	width: 100%;
-}
-
-#contact-edit-end {
-	clear: both;
-	margin-top: 15px;
-}
-
-#contact-profile-selector {
-	width: 175px;
-	margin-left: 175px;
-}
-
-.contact-edit-submit {
-	margin-top: 20px;
-}
-
-
-.contact-photo-menu-button {
-	position: absolute;
-	background-image: url("../img/photo-menu.jpg");
-	background-position: top left; 
-	background-repeat: no-repeat;
-	margin: 0px; padding: 0px;
-	width: 16px;
-	height: 16px;
-	top: 64px; left:0px;
-	overflow: hidden;
-	text-indent: 40px;
-	display: none;
-	
-}
-.contact-photo-menu {
-	width: auto;
-	border: 2px solid #444444;
-	background: #FFFFFF;
-	position: absolute;
-	left: 0px; top: 90px;
-	display: none;
-	z-index: 10000;
-}
-.contact-photo-menu ul { margin:0px; padding: 0px; list-style: none }
-.contact-photo-menu li a { display: block; padding: 2px; }
-.contact-photo-menu li a:hover { color: #FFFFFF; background: #3465A4; text-decoration: none; }
-
-
 #block-message, #ignore-message, #archive-message, #lost-contact-message {
 	color: #FF0000;
 }
 
-#profile-edit-insecure {
-	margin-top: 20px;
-	color: #FF0000;
-	font-size: 1.1em;
-	border: 1px solid #FF8888;
-	background-color: #FFEEEE;
-	padding-left: 5px;
-	/*: 3px 3px 3px 5px; */
-	width: 587px;
-}
-
-/* TinyMCE */
-
-DIV#profile-jot-text_toolbargroup{
-background: #FFF;
-border: 1px #111;
-/*box-shadow: 5px 5px 5px #000 inset;*/
-}
-
-/*
-#profile-jot-text_parent, .mceLayout {
-    border-radius: 5px;
-    -moz-border-radius: 5px;
-    box-shadow: 4px 4px 3px 0 #444444;
-}
-*/
-
-
-iframe#profile-jot-text_ifr {
-width: 100% !important;
-height: 100% !important;
-box-shadow: 5px 5px 5px #000 inset !important;}
-
-tr.mceLast {
-
-}
-
-/* Not MCE */
-
-#profile-jot-text {
-	height: 20px;
-	color:#000;
-	border: 1px solid #cccccc;
-	padding: 8px;
-	width: 90%;
-	-moz-border-radius: 5px;
-	border-radius: 5px;	
-/*	box-shadow: 4px 4px 3px 0 #666 inset; */
-}
-#profile-jot-text:hover {
-	color: #000000;
-}
-
-.wall-item-photo, .photo, .contact-block-img, .my-comment-photo {
-    border-radius: 5px;
-    -moz-border-radius: 5px;
-    box-shadow: 4px 4px 3px 0 #444444;
-}
-
-
-#datebrowse-sidebar select {
-    margin-left: 25px;
-    border-radius: 5px;
-    -moz-border-radius: 5px;
-    opacity: 0.3;
-    filter:alpha(opacity=30);
-}
-
-#datebrowse-sidebar select:hover {
-    opacity: 1.0;
-    filter:alpha(opacity=100);
-}
-
-#posted-date-selector {
-    margin-left: 30px !important;
-    margin-top: 5px !important;
-    margin-right: 0px !important;
-    margin-bottom: 0px !important;
-}
-
-#posted-date-selector:hover {
-    box-shadow: 4px 4px 3px 0 #444444;
-    margin-left: 25px !important;
-    margin-top: 0px !important;
-    margin-right: 5px !important;
-    margin-bottom: 5px !important;
-
+.photo, .contact-block-img {
+    border-radius: $radiuspx;
+    -moz-border-radius: $radiuspx;
+    box-shadow: $shadowpx $shadowpx $shadowpx 0 #444444;
 }
 
 #side-bar-photos-albums {
@@ -1931,44 +610,21 @@ tr.mceLast {
 	list-style: none;
 }
 
-.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 {
-    border-radius: 5px;
-    -moz-border-radius: 5px;
-    box-shadow: 4px 4px 3px 0 #444444;
-}
-
-#profile-jot-submit {
-    height: auto;
-    background-color: #dd0000;
-    color: #eeeeec;
-    font-weight: bold;
-    -webkit-border-radius: 5px;
-    -moz-border-radius: 5px;
-    border-radius: 5px;
-    border: 2px outset #222420 !important;
-    margin: 0;
-    float: right;
-    text-shadow: 1px 1px #111;
-    width: auto;
-    box-shadow: 5px 5px 5px #444;
+.profile-match-photo img, #photo-photo img, .directory-photo-img, .photo-album-photo, .photo-top-photo {
+    border-radius: $radiuspx;
+    -moz-border-radius: $radiuspx;
+    box-shadow: $shadowpx $shadowpx $shadowpx 0 #444444;
 }
 
-#profile-jot-submit:active {
-    box-shadow: 0 0 0 0;
-}
-
-.settings-widget .selected {
-    border-radius: 5px;
-    -moz-border-radius: 5px;
-    box-shadow: 4px 4px 3px 0 #444444;
+.profile-match-photo img {
+	width: $top_photo !important;
+	height: $top_photo !important;
 }
 
 #sidebar-page-list .label {
     margin-left: 5px;
 }
 
-/*TODO - there appears to be significant redundancy here */
-
 .photo {
     border: 1px solid #AAAAAA;
 }
@@ -1979,176 +635,15 @@ tr.mceLast {
     border: 1px solid #888888;
 }
 
-.rotleft1 {
--webkit-transform: rotate(-1deg);
--moz-transform: rotate(-1deg);
--ms-transform: rotate(-1deg);
--o-transform: rotate(-1deg);
-}
-
-.rotleft2 {
--webkit-transform: rotate(-2deg);
--moz-transform: rotate(-2deg);
--ms-transform: rotate(-2deg);
--o-transform: rotate(-2deg);
-}
-
-.rotleft3 {
--webkit-transform: rotate(-3deg);
--moz-transform: rotate(-3deg);
--ms-transform: rotate(-3deg);
--o-transform: rotate(-3deg);
-}
-
-.rotleft4 {
--webkit-transform: rotate(-4deg);
--moz-transform: rotate(-4deg);
--ms-transform: rotate(-4deg);
--o-transform: rotate(-4deg);
-}
-
-
-.rotright1 {
--webkit-transform: rotate(1deg);
--moz-transform: rotate(1deg);
--ms-transform: rotate(1deg);
--o-transform: rotate(1deg);
-}
-
-.rotright2 {
--webkit-transform: rotate(2deg);
--moz-transform: rotate(2deg);
--ms-transform: rotate(2deg);
--o-transform: rotate(2deg);
-}
-
-.rotright3 {
--webkit-transform: rotate(3deg);
--moz-transform: rotate(3deg);
--ms-transform: rotate(3deg);
--o-transform: rotate(3deg);
-}
 
-.rotright4 {
--webkit-transform: rotate(4deg);
--moz-transform: rotate(4deg);
--ms-transform: rotate(4deg);
--o-transform: rotate(4deg);
-}
-
-
-
-/*.photos {
-	height: auto;
-	overflow: auto;
-}*/
-
-.photos-end {
-	clear: both;
-	margin-bottom: 25px;
-}
-
-.photo-album-image-wrapper {
-	float: left;
-	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);
  	border-bottom: 2px solid #CCC;
- 	margin: 0px;
-}
-.photo-album-image-wrapper a:hover .caption {
-	display:block;
-}
-
-#photo-album-end {
-	clear: both;
-	margin-bottom: 25px;
 }
 
-.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;
  	background-color: rgb(255, 255, 255);
 }
-#photo-top-end {
-	clear: both;
-}
-
-#photo-top-links {
-	margin-bottom: 30px;
-	margin-left: 30px;
-}
-
-#photos-upload-newalbum-div {
-	float: left;
-	width: 175px;
-}
-
-#photos-upload-noshare {
-	margin-bottom: 10px;
-}
-#photos-upload-existing-album-text {
-	float: left;
-	width: 175px;
-}
-#photos-upload-newalbum {
-	float: left;
-}
-#photos-upload-album-select {
-	float: left;
-}
-
-#photos-upload-spacer {
-	margin-top: 25px;
-}
-#photos-upload-new-end, #photos-upload-exist-end {
-	clear: both;
-}
-#photos-upload-exist-end {
-	margin-bottom: 15px;
-}
-#photos-upload-submit {
-	margin-top: 15px;
-}
-
-#photos_upload_applet_wrapper {
-	margin-bottom: 15px;
-}
-
-#photos-upload-no-java-message {
-	margin-bottom: 15px;
-}
-
-
-#photos-upload-select-files-text {
-	margin-top: 15px;
-	margin-bottom: 15px;
-}
 
 #photos-upload-perms-menu, #photos-upload-perms-menu:visited, #photos-upload-perms-menu:link {
 	color: #8888FF;
@@ -2162,394 +657,84 @@ tr.mceLast {
 	cursor: pointer;
 }
 
-
-#photo-edit-caption-label, #photo-edit-tags-label, #photo-edit-albumname-label, #photo-edit-rotate-label {
-	float: left;
-	width: 150px;
-}
-
-#photo-edit-perms-end {
-	margin-bottom: 15px;
-}
-
-#photo-edit-caption, #photo-edit-newtag, #photo-edit-albumname, #photo-edit-rotate {
-	float: left;
-	margin-bottom: 25px;
-}
-#photo-edit-link-wrap {
-	margin-bottom: 15px;
-}
-#photo-like-div {
-	margin-bottom: 25px;
-}
-
-#photo-edit-caption-end, #photo-edit-tags-end, #photo-edit-albumname-end, #photo-edit-rotate-end {
-	clear: both;
-}
-
-#photo-edit-rotate-end {
-	margin-bottom: 15px;
-}
-
-#photo-edit-delete-button {
-	margin-left: 200px;
-}
-#photo-edit-end {
-	margin-bottom: 35px;
-}
 #photo-caption {
 	font-size: 110%;
 	font-weight: bold;
-	margin-top: 15px;
-	margin-bottom: 15px;
 }
 
 #in-this-photo-text {
-	color: #0000FF;
-	margin-left: 30px;
-}
-
-#in-this-photo {
-	margin-left: 60px;
-	margin-top: 10px;
-	margin-bottom: 20px;
-}
-
-#photo-album-edit-submit, #photo-album-edit-drop {
-	margin-top: 15px;
-	margin-bottom: 15px;
-}
-
-#photo-album-edit-drop {
-	margin-left: 200px;
-}
-
-
-#group-new-submit-wrapper {
-	margin-top: 30px;
-}
-
-#group-edit-name-label {
-	float: left;
-	width: 175px;
-	margin-top: 20px;
-	margin-bottom: 20px;
-}
-
-#group-edit-name {
-	float: left;
-	width: 225px;
-	margin-top: 20px;
-	margin-bottom: 20px;
-}
-
-#group-edit-name-wrapper {
-
-
-}
-
-
-#group_members_select_label {
-	display: block;
-	float: left;
-	width: 175px;
+	color: #0080FF;
 }
 
-.group_members_select {
-	float: left;
-	width: 230px;
-	overflow: auto;
-}
-
-#group_members_select_end {
-	clear: both;
-}
-#group-edit-name-end {
-	clear: both;
-}
 
-#prvmail-to-label, #prvmail-subject-label, #prvmail-message-label {
-	margin-bottom: 10px;
+#side-follow-wrapper {
 	margin-top: 20px;
 }
 
-#prvmail-submit {
-	float: left;
-	margin-top: 10px;
-	margin-right: 30px;
-}
-#prvmail-upload-wrapper,
-#prvmail-link-wrapper,
-#prvmail-rotator-wrapper {
-	float: left;
-	margin-top: 10px;
-	margin-right: 10px;
-	width: 24px;
-}
-
-#prvmail-end {
-	clear: both;
-}
-
-.mail-list-sender,
-.mail-list-detail {
-	float: left;
-}
-.mail-list-detail {
-	margin-left: 20px;
-}
-
-.mail-list-subject {
-	font-size: 1.1em;
-	margin-top: 10px;
-}
-a.mail-list-link {
-    display: block;
-    font-size: 1.3em;
-    padding: 4px 0;
+#side-peoplefind-url::-webkit-input-placeholder, #side-advanced-peoplefind-url::-webkit-input-placeholder {
+	font-family: FontAwesome;
 }
 
-
-
-/*
-*a.mail-list-link:hover {
-*	background-color: #15607B;
-*	color: #F5F6FB;
-*}
-*/
-
-.mail-list-outside-wrapper-end {
-	clear: both;
+#side-peoplefind-url::-moz-placeholder, #side-advanced-peoplefind-url::-moz-placeholder {
+	font-family: FontAwesome;
 }
 
-.mail-list-outside-wrapper {
-	margin-top: 30px;
-}
-
-.mail-list-delete-wrapper {
-	float: right;
-	margin-right: 30px;
-	margin-top: 15px;
-}
-
-.mail-list-delete-icon {
-	border: none;
-}
-
-.mail-conv-sender,
-.mail-conv-detail {
-	float: left;
-}
-.mail-conv-detail {
-	margin-left: 20px;
-	width: 500px;
-}
-
-.mail-conv-subject {
-    font-size: 1.4em;
-    margin: 10px 0;
-}
-
-.mail-conv-outside-wrapper-end {
-	clear: both;
-}
-
-.mail-conv-outside-wrapper {
-	margin-top: 30px;
-}
-
-.mail-conv-delete-wrapper {
-	float: right;
-	margin-right: 30px;
-	margin-top: 15px;
-}
-.mail-conv-break {
-	clear: both;
-}
-
-.mail-conv-delete-icon {
-	border: none;
-}
-
-.message-links ul {
-	list-style-type: none;
-	padding: 0px;
-}
-
-.message-links li {
-	margin-top: 10px;
-	float: left;
-}
-.message-links a {
-	padding: 3px 5px;
-}
-
-.message-links-end {
-	clear: both;
-}
-
-#sidebar-group-list ul {
-	list-style-type: none;
-}
-
-#sidebar-group-list .icon, #sidebar-group-list .iconspacer {
-	display: inline-block;
-	height: 12px;
-	width: 12px;
-}
-
-#sidebar-group-list li {
-	margin-top: 10px;
-}
-
-.nets-ul, .fileas-ul, .categories-ul {
-	list-style-type: none;
-}
-
-.nets-ul li, .fileas-ul li, .categories-ul li {
-	margin-top: 10px;
-}
-
-.nets-link {
-	margin-left: 24px;
-}
-.nets-all {
-	margin-left: 42px;
-}
-
-.fileas-link, .categories-link {
-	margin-left: 24px;
-}
-
-.fileas-all, .categories-all {
-	margin-left: 0px;
-}
-
-#search-save {
-	margin-left: 5px;
-}
-.groupsideedit {
-	margin-right: 10px;
-}
-#saved-search-ul {
-	list-style-type: none;
-}
-.savedsearchdrop, .savedsearchterm {
-	float: left;
-	margin-top: 10px;
-}
-.savedsearchterm {
-	margin-left: 10px;
-}
-
-
-#side-follow-wrapper {
-	margin-top: 20px;
-}
-#side-follow-url, #side-peoplefind-url {
-	margin-top: 5px;
-}
-#side-follow-submit, #side-peoplefind-submit {
-	margin-top: 15px;
-}
 
 #side-match-link {
 	margin-top: 10px;
 }
 
-aside input[type='text'] {
- width: 174px;
-}
 
-.widget {
+.pmenu {
 	border-bottom: 1px solid #eec;
 	padding: 8px;
 	margin-top: 5px;
-	-moz-border-radius:5px;
-	-webkit-border-radius:5px;
-	border-radius:5px;
+	-moz-border-radius: $radiuspx;
+	-webkit-border-radius: $radiuspx;
+	border-radius: $radiuspx;
 
 }
 
-
-#profile-jot-desc {
-	/*float: left;*/
-	width: 480px;
-	color: #FF0000;
-	margin-top: 10px;
-	margin-bottom: 10px;
-}
-
-#character-counter {
-	float: right;
-	font-size: 120%;
-}
-
-#character-counter.grey {
-	color: #888888;
+.pmenu.horizontal {
+	padding: 0 0 0 0;
+	border-bottom: none;
 }
 
-#character-counter.orange {
-	color: orange;
+.pmenu.horizontal .pmenu-title {
+	display: none;
 }
-#character-counter.red {
-	color: red;
+.pmenu.horizontal ul {
+	-moz-padding-start: 0;
 }
 
-#profile-jot-banner-end {
-	/* clear: both; */ 
+.pmenu.horizontal li {
+	margin-left: 0;
+	display: inline;
+	padding-right: 15px;
 }
 
-
-
 #settings-default-perms-menu {
 	margin-top: 15px;
 	margin-bottom: 15px;
 }
 
-
 .group-delete-wrapper {
 	float: right;
 	margin-right: 50px;
 }
 
-#install-dbhost-label,
-#install-dbuser-label,
-#install-dbpass-label,
-#install-dbdata-label,
-#install-tz-desc {
-       float: left;
-       width: 250px;
-       margin-top: 10px;
-       margin-bottom: 10px;
-
-}
-
-#install-dbhost,
-#install-dbuser,
-#install-dbpass,
-#install-dbdata {
-       float: left;
-       width: 200px;
-       margin-left: 20px;
-}
-
-#install-dbhost-end,
-#install-dbuser-end,
-#install-dbpass-end,
-#install-dbdata-end,
-#install-tz-end {
-       clear: both;
-}
-
-#install-form select#timezone_select {
-       float: left;
-       margin-top: 18px;
-       margin-left: 20px;
-}
-
-#dfrn-request-networks {
-	margin-bottom: 30px;
+.rconnect {
+	display: block;
+	color: $nav_active_icon_colour;
+	margin-top: 15px;
+	background-color: $nav_bg;
+	-webkit-border-radius: $radiuspx ;
+	-moz-border-radius: $radiuspx;
+	border-radius: $radiuspx;
+	border: 1px solid $nav_bd;
+	padding: 5px;
+	font-weight: bold;
+	clear: both;
 }
 
 #pause {
@@ -2558,17 +743,13 @@ aside input[type='text'] {
   right: 5px;
 }
 
-.sparkle {
-	cursor: url('../img/lock.cur'), pointer;
-/*	cursor: pointer !important; */
-}
-
 #vcard-end {
 	clear: both;
 }
 
 #contact-block {
 	margin-top: 25px;
+	padding: 8px;
 }
 
 #contact-block-numcontacts {
@@ -2578,8 +759,8 @@ aside input[type='text'] {
 
 .contact-block-div {
 	float: left;
-	width: 52px;
-	height: 52px;
+	width: 50px;
+	height: 50px;
 }
 .contact-block-textdiv {
 	float: left;
@@ -2629,42 +810,64 @@ aside input[type='text'] {
 
 #nav-searchbar {
 	float: right;
-	margin-top: 4px;
+	margin-top: 2px;
+	margin-right: 10px;
 }
 
-#nav-search-text:hover {
-	background-color: #FFF;
+#nav-search-spinner {
+	float: left;
+	margin: 25px 0px 0px 25px;
+	color: $nav_active_icon_colour;
+}
+
+#nav-search-text:hover,
+#nav-search-text:focus {
+	background-color: #fff;
 	color: #000; 
 }
 
 #nav-search-text {
-	border-radius: 14px;
-	background-color: #AAAAAA;
-	color: #eec; 
+	height: 20px;
+	margin: 15px;
+	padding: 0px 5px 0px 5px;
+	border-radius: 10px;
+	border-color: $nav_bd;
+	background-color: $search_background;
+    	transition: background-color 300ms ease 0s;
 }
 
-/* this doesn't seem to work */
-
-#nav-search-text::-moz-placeholder { color: #444; }
 #nav-search-text::-webkit-input-placeholder {
-	color: #444 !important;
+	font-family: FontAwesome;
+}
+
+#nav-search-text::-moz-placeholder {
+	font-family: FontAwesome;
+}
+
+#search-text {
+	border: 1px solid #ccc;
+	font-size: 1em;
 }
 
-#nav-user-linkmenu img {
-	border-radius: 5px;
+#search-text::-webkit-input-placeholder {
+	font-family: FontAwesome;
+}
+
+#search-text::-moz-placeholder {
+	font-family: FontAwesome;
 }
 
 .location-label, .gender-label, .marital-label, .homepage-label {
 	float: left;
-	text-align: right;
 	display: block;
-	width: 65px;
+	width: 70px;
+
 }
 
 .adr, .x-gender, .marital-text, .homepage-url {
 	float: left;
 	display: block;
-	margin-left: 8px;
+	width: 130px;
 }
 
 .profile-clear {
@@ -2676,12 +879,10 @@ aside input[type='text'] {
 	clear: both;
 }
 
-.cc-license {
-	margin-top: 50px;
-	font-size: 70%;
+.descriptive-text {
+	color: #888;
 }
 
-
 #plugin-settings-link, #account-settings-link {
 	margin-bottom: 10px;
 }
@@ -2805,6 +1006,15 @@ aside input[type='text'] {
 	color: #FF0000;
 }
 
+.fc-state-highlight {
+    background: none repeat scroll 0% 0% $cal_bgcolour !important;
+}
+
+#fancybox-content {
+	border: 0px solid $fancybox_bgcolour;
+	background-color: $fancybox_bgcolour;
+}
+
 .settings-block {
 	border: 1px solid #AAA;
 	margin: 10px;
@@ -2828,30 +1038,18 @@ aside input[type='text'] {
 	margin-top: 20px;
 }
 
-#photo-prev-link, #photo-next-link {
-	padding: 10px;
-	float: left;
-}
-
-#photo-photo {
+.profile-match-photo {
 	float: left;
 }
 
-#photo-photo-end {
-	clear: both;
-}
-
-.profile-match-photo {
-	float: left;
-	text-align: center;
+.profile-match-name {
 	width: 120px;
+	height: 1.5em;
+	overflow: hidden !important;
 }
 
-.profile-match-name {
-	float: left;
+.profile-match-note {
 	text-align: center;
-	width: 120px;
-	overflow: hidden;
 }
 
 .profile-match-break,
@@ -2865,12 +1063,18 @@ aside input[type='text'] {
 }
 
 .profile-match-wrapper {
-	float: left;
-	padding: 10px;
-	width: 120px;
-	height: 120px;
-	scroll: auto;
+    float: left;
+    width: 120px;
+    height: 150px;
+    padding: 10px;
+    margin: 8px 10px 0 0;
+    border-top: 1px solid #eee;
+    border-left: 2px solid #eee;
 }
+.profile-match-ignore {
+	float: right;
+}
+
 #profile-match-wrapper-end {
 	clear: both;
 }
@@ -2878,12 +1082,6 @@ aside input[type='text'] {
 	margin-bottom: 15px;
 }
 
-#language-selector {
-	position: absolute;
-	top: 0px;
-	left: 16px;
-}
-
 #group-members {
 	margin-top: 20px;
 	padding: 10px;
@@ -2951,41 +1149,6 @@ aside input[type='text'] {
 	margin-top: 15px;
 }
 
-#crepair-name-label,
-#crepair-nick-label,
-#crepair-attag-label,
-#crepair-url-label,
-#crepair-request-label,
-#crepair-confirm-label,
-#crepair-notify-label,
-#crepair-photo-label,
-#crepair-poll-label {
-	float: left;
-	width: 200px;
-	margin-bottom: 15px;
-}
-
-#crepair-name,
-#crepair-nick,
-#crepair-attag,
-#crepair-url,
-#crepair-request,
-#crepair-confirm,
-#crepair-notify,
-#crepair-photo,
-#crepair-poll {
-	float: left;
-	width: 300px;
-}
-
-
-#netsearch-box {
-	margin-top: 20px;	
-}
-
-#netsearch-box #search-submit {
-	margin: 5px 0px 0px 0px;
-}
 
 .required {
 	color: #FF0000;
@@ -3015,29 +1178,6 @@ aside input[type='text'] {
 	margin-top: 10px;
 }
 
-.body-tag, .filesavetags, .categorytags {
-	opacity: 0.5;
-	filter:alpha(opacity=50);
-}
-
-.body-tag:hover, .filesavetags:hover, .categorytags:hover {
-	opacity: 1.0 !important;
-	filter:alpha(opacity=100) !important;
-}
-
-.item-select {
-	opacity: 0.1;
-	filter:alpha(opacity=10);
-	float: right;
-	margin-right: 10px;
-
-}
-.item-select:hover, .checkeditem {
-	opacity: 1;
-	filter:alpha(opacity=100);
-}
-
-
 #item-delete-selected {
 	margin-top: 30px;
 }
@@ -3078,6 +1218,9 @@ brain is weird like that */
 	margin-bottom: 15px;
 }
 
+#cloud-index td {
+	padding:5px;
+}
 
 
 /**
@@ -3102,7 +1245,7 @@ brain is weird like that */
 
 .field label {
 	float: left;
-	width: 200px;
+	width: 350px;
 }
 
 .field input,
@@ -3112,36 +1255,13 @@ brain is weird like that */
 .field textarea { height: 100px; }
 .field_help {
 	display: block;
-	margin-left: 200px;
+	margin-left: 350px;
 	color: #666666;
 	
 }
 
-.field_abook_help {
-	color: #888;
-}
-.abook-them {
-	margin-left: 225px;
-	margin-bottom: 15px;
-}
-.abook-me {
-	margin-left: 36px;
-	margin-bottom: 15px;
-}
-.acheckbox {
-	margin-bottom: 5px !important;
-}
-
-#contact-slider {
-	width: 600px !important;
-}
-
-.abook-edit-them, .abook-edit-me {
-	float: left;
-	width: 100px !important;
-}
-.field_abook_help {
-	float: left;
+.field input[type="checkbox"] {
+	width: 16px;
 }
 
 .field .onoff {
@@ -3155,7 +1275,7 @@ brain is weird like that */
 	background-image:url("../../../../images/onoff.jpg");
 	background-repeat: no-repeat;
 	padding: 4px 2px 2px 2px;
-	height: 16px;
+	height: 24px;
 	text-decoration: none;
 }
 .field .onoff .off {
@@ -3179,69 +1299,6 @@ brain is weird like that */
 .field.radio .field_help { margin-left: 0px; }
 
 
- 
-
-/**
- * ADMIN
- */
-#pending-update {
-	float:right;
-	color: #ffffff;
-	font-weight: bold;
-	background-color: #FF0000;
-	padding: 0em 0.3em;
-	
-}
-#adminpage dl {
-	clear: left;
-	margin-bottom: 2px;
-	padding-bottom: 2px;
-	border-bottom: 1px solid black;
-}
-#adminpage dt {
-	width: 200px;
-	float: left;
-	font-weight: bold;
-}
-#adminpage dd {
-	margin-left: 200px;
-}
-
-#adminpage h3 {
-	border-bottom: 1px solid #cccccc;
-}
-#adminpage .field label {
-	font-weight: bold;
-}
-#adminpage .submit {
-	clear:left;
-	text-align: right;
-}
-
-#adminpage #pluginslist {
-	margin: 0px; padding: 0px;
-}
-#adminpage .plugin {
-	list-style: none;
-	display: block;
-	border: 1px solid #888888;
-	padding: 1em;
-	margin-bottom: 5px;
-	clear: left;
-}
-#adminpage .plugin .desc { margin-left: 2.5em;}
-#adminpage .toggleplugin {
-	float:left;
-	margin-right: 1em;
-}
-
-#adminpage table {width:100%; border-bottom: 1px solid #000000; margin: 5px 0px;}
-#adminpage table th { text-align: left;}
-#adminpage td .icon { float: left;}
-#adminpage table#users img { width: 16px; height: 16px; }
-#adminpage table tr:hover { background-color: #bbc7d7; }
-#adminpage .selectall { text-align: right; }
-
 
 /*
  * UPDATE
@@ -3287,6 +1344,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;
@@ -3301,6 +1362,11 @@ brain is weird like that */
  */
 .iconspacer {
 	display: block; width: 16px; height: 16px;
+/*	visibility: hidden; */
+}
+
+.iconspacer:hover {
+/*	visibility: visible; */
 }
 
 .icon {
@@ -3312,6 +1378,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;}
@@ -3341,127 +1408,44 @@ 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; }
 .tagged { background-position: -48px -48px; }
 .yellow { background-position: -64px -48px; }
 
-
-.filer-icon {
-	display: block; width: 16px; height: 16px;
-	background-image: url('../img/file.gif');
-}
-
 .icon.dim { opacity: 0.3;filter:alpha(opacity=30); }
-[class^="comment-edit-bb"] {
-	list-style: none;
-	display: none;
-	margin: 0px 0 -5px 0px;
-	padding: 0px;
-	width: 75%;
-}
-[class^="comment-edit-bb"] > li {
-	display: inline-block;
-	margin: 10px 10px 0 0;
-	visibility: none;
-}
-[class^="comment-edit-bb-end"] {
-	clear: both;
-}
-.editicon {
-    display: inline-block;
-    width: 16px;
-    height: 16px;
-    background-image: url(../img/bbedit.png);
-	background-color: #fff;
-    text-decoration: none;
-}
-.editicon:hover {
-	background-color: #ccc;
-}
-.boldbb {
-	background-position: 0px 0px;
-}
-.boldbb:hover {
-	background-position: 0px -16px;
-}
-.italicbb {
-	background-position: -16px 0px;
-}
-.italicbb:hover {
-	background-position: -16px -16px;
-}
-.underlinebb {
-	background-position: -32px 0px;
-}
-.underlinebb:hover {
-	background-position: -32px -16px;
-}
-.quotebb {
-	background-position: -48px 0px;
-}
-.quotebb:hover {
-	background-position: -48px -16px;
-}
-.codebb {
-	background-position: -64px 0px;
-}
-.codebb:hover {
-	background-position: -64px -16px;
-}
-.imagebb {
-	background-position: -80px 0px;
-}
-.imagebb:hover {
-	background-position: -80px -16px;
-}
-.urlbb {
-	background-position: -96px 0px;
-}
-.urlbb:hover {
-	background-position: -96px -16px;
-}
-.videobb {
-	background-position: -112px 0px;
-}
-.videobb:hover {
-	background-position: -112px -16px;
-}
 
-.attachtype {
-	display: block; width: 20px; height: 23px;
-	float: left;
-	background-image: url('../../../../images/content-types.png');
-}
+
 
 .body-attach {
 	margin-top: 10px;
 }
 
-.type-video { background-position: 0px 0px; }
-.type-image { background-position: -20px 0px; }
-.type-audio { background-position: -40px 0px; }
-.type-text  { background-position: -60px 0px; }
-.type-unkn  { background-position: -80px 0px; }
 
 
 /* autocomplete popup */
 .acpopup {
 	max-height:150px;
-	background-color:#ffffff;
+	background-color:$acpopup_bgcolour;
 	overflow:auto;
-	z-index:100000;
-	border:1px solid #cccccc;
+	border:1px solid $acpopup_bordercolour;
 }
 .acpopupitem {
-	background-color:#ffffff; padding: 4px;
+	background-color:$acpopup_bgcolour;
 	clear:left;
 }
+.acpopupitem.taggable {
+	background-color: $acpopup_tgbl_bgcolour;
+}
 .acpopupitem img {
 	float: left;
 	margin-right: 4px;
 }
 
+.acpopupitem:hover {
+	text-decoration: underline;
+	color: $acpopup_hovercolour;
+	cursor:pointer;
+}
+
 .acpopupitem.selected {
 	color: #FFFFFF; background: #3465A4;
 }
@@ -3478,34 +1462,14 @@ div.jGrowl div.info {
   padding-left: 58px;
 }
 #jGrowl.top-right {
-	top: 15px;
+	top: 65px;
 	right: 15px;
 }
-.qcomment {
-	border: 1px solid #EEE;
-	padding: 3px;
-	margin-top: 15px;
-	margin-left: 25px;
-	width: 125px;
-	overflow-y: auto;
-}
-
 
-.qcomment option {
-	width: 125px;
-	overflow-x: hidden;
+div.jGrowl div.jGrowl-notification {
+    min-height: 60px;
 }
 
-.qcomment {
-	opacity: 0.3;
-	filter:alpha(opacity=30);
-}
-.qcomment:hover {
-	opacity: 1.0;
-	filter:alpha(opacity=100);
-}
-
-
 #id_term_label {
 	width:75px;
 }
@@ -3513,43 +1477,60 @@ div.jGrowl div.info {
 	width:100px;
 }
 
-#recip {
-	
+#nav-search-text-ac .autocomplete {
+	position: fixed;
+	top: 51px;
+	border: 1px solid $nav_bd;
+	border-top: none;
 }
-.autocomplete-w1 { background: #ffffff; no-repeat bottom right; position:absolute; top:0px; left:0px; margin:6px 0 0 6px; /* IE6 fix: */ _background:none; _margin:1px 0 0 0; }
-.autocomplete { color:#000; border:1px solid #999; background:#FFF; cursor:default; text-align:left; max-height:350px; overflow:auto; margin:-6px 6px 6px -6px; /* IE6 specific: */ _height:350px;  _margin:0; _overflow-x:hidden; }
-.autocomplete .selected { background:#F0F0F0; }
-.autocomplete div { padding:2px 5px; white-space:nowrap; overflow:hidden; }
 
-#datebrowse-sidebar select {
-	margin-left: 25px;
+#search-text-ac .autocomplete {
+	margin-top: 2px;
+	margin-left: $radiuspx;
+	border: 1px solid #ccc;
+	border-top: none;
 }
 
+#recip-ac .autocomplete,
+#poke-recip-ac .autocomplete,
+#id-name-ac .autocomplete,
+#contact-search-ac .autocomplete {
+	margin-top: 2px;
+	margin-left: $radiuspx;
+	margin-right: $radiuspx;
+	border: 1px solid #666;
+	border-top: none;
 
-.jslider .jslider-scale ins {
-    color: #333;
-	font-size: 12px;
-	width: 100px;
-	text-align: center;
 }
 
-.jslider .jslider-bg,
-.jslider .jslider-pointer {
-  background: url("../img/slider.png") !important;
+.autocomplete {
+	color: $font_colour;
+	background: $dropdown_bgcolour;
+	cursor: pointer;
+	text-align: left;
+	max-height: 350px;
+	overflow: auto;
+	border-bottom-left-radius: $radiuspx;
+	border-bottom-right-radius: $radiuspx;
 }
 
-.slider {
-	margin-top: 10px;
-	margin-bottom: 30px;
+.autocomplete .selected {
+	background: $search_background;
 }
 
-
-#main-slider {
-	position: relative; 
-	left: 5%; 
-	width: 90%;
+.autocomplete div {
+	padding: 2px 5px;
+	white-space: nowrap;
+	overflow: hidden;
+	text-overflow: ellipsis;
 }
 
+.jslider .jslider-scale ins {
+    color: #333;
+	font-size: $body_font_size;
+	width: 100px;
+	text-align: center;
+}
 
 #contact-slider {
 	position: relative; 
@@ -3557,270 +1538,861 @@ div.jGrowl div.info {
 	width: 90%;
 }
 
-/* nav */
-nav {
-  width: 100%;
-  height: 32px;
-  position: fixed;
-  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, #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,
-nav a:visited,
-nav a:link,
-nav a:hover {
-  color: #ffffff;
+a.rconnect {
+  color: $nav_active_icon_colour;
   text-decoration: none;
   outline: none;
 }
-nav ul {
-  margin: 0px;
-  padding: 0px 20px;
+
+a.rconnect:hover {
+	color: #0080FF;
 }
-nav ul li {
-  list-style: none;
+
+#profiles-menu li a {
+	color: #ffffff;
+}
+
+#profiles-menu li a:hover {
+	color: #000000;
+}
+
+
+/* header */
+header {
+  position: fixed;
+  left: 43%;
+  right: 43%;
   margin: 0px;
   padding: 0px;
-  float: left;
+  z-index: 1040;
+  color: #fff;
 }
-nav ul li .menu-popup {
-  left: 0px;
-  right: auto;
-  top: 33px;
+
+.notif-item a {
+	color: $notif_itemcolour;
 }
-nav .nav-menu-icon {
-  position: relative;
-  height: 22px;
-  padding: 5px;
-  margin: 3px 10px;
-  -moz-border-radius: 5px 5px 0 0;
-  -webkit-border-radius: 5px 5px 0 0;
-  border-radius: 5px 5px 0 0;
+
+.notif-item a:hover {
+	text-decoration: underline;
+	color: $notif_itemhovercolour;
 }
-nav .nav-menu-icon.selected {
-  background-color: #FF0000;
+
+.notif-image {
+	width: 32px;
+	height: 32px;
+	padding: 7px 7px 0px 0px;
 }
-nav .nav-menu-icon img {
-  width: 22px;
-  height: 22px;
+
+.notify-seen a {
+	background: $notifyseen_bgcolour;
+	color: $notifyseen_linkcolour !important;
 }
-nav .nav-menu-icon .nav-notify {
-  top: 3px;
+
+.notify-seen a:hover {
+	background: $notifyseen_bghover;
+	color: $notifyseen_linkhover !important;
 }
-nav .nav-menu {
-  position: relative;
-  height: 16px;
-  padding: 5px;
-  margin: 3px 15px 0px;
-  font-size: 14px;
-  border-bottom: 3px solid #ff0000;
+
+#page-spinner {
+	color: #777;
+	margin: 24px;
 }
-nav .nav-menu.selected {
-  border-bottom: 4px solid #CCCCCC;
+
+.tabs-end {
+	clear: both;
 }
-nav .nav-notify {
-  background-color: #0d0;
-  color: #fff;
-  -moz-border-radius: 5px 5px 5px 5px;
-  -webkit-border-radius: 5px 5px 5px 5px;
-  border-radius: 5px 5px 5px 5px;
+
+.modal-content {
+    background-color: $acl_bgcolour;
 }
-nav .nav-notify.show {
-  display: block;
+
+#acl-search {
+	margin-top: 20px;
+	padding: 8px;
+	border: 1px solid #ccc;
+	width: 100%;
 }
-nav #nav-help-link,
-nav #nav-login-link,
-nav #nav-search-link,
-nav #nav-directory-link,
-nav #nav-apps-link,
-nav #nav-user-linkmenu,
-nav #nav-site-linkmenu {
-  float: right;
-}
-nav #nav-help-link .menu-popup,
-nav #nav-search-link .menu-popup,
-nav #nav-directory-link .menu-popup,
-nav #nav-apps-link .menu-popup,
-nav #nav-site-linkmenu .menu-popup {
-  right: 0px;
-  left: auto;
-}
-nav #nav-notifications-linkmenu.on .icon.s22.notify,
-nav #nav-notifications-linkmenu.selected .icon.s22.notify {
-  background-image: url("../../../../images/icons/22/notify_on.png");
-}
-nav #nav-apps-link.selected {
-  background-color: #364e59;
-}
-ul.menu-popup {
-  position: absolute;
-  display: none;
-  width: 10em;
-  background: #dd0000;
-  color: #eec;
-  padding: 0px;
-  list-style: none;
-/*  border-radius: 0px 0px 20px 20px; */
-  z-index: 100000;
-  -webkit-box-shadow: 0px 5px 10px rgba(0, 0, 0, 0.7);
-  -moz-box-shadow: 0px 5px 10px rgba(0, 0, 0, 0.7);
-  box-shadow: 0px 5px 10px rgba(0, 0, 0, 0.7);
-}
-ul.menu-popup a {
-  display: block;
-  color: #eec;
-  padding: 5px 10px;
-  text-decoration: none;
+
+#acl-search::-webkit-input-placeholder {
+	font-family: FontAwesome;
 }
-ul.menu-popup a:hover {
-  background-color: #eec;
-  color: #d00;
+
+#acl-search::-moz-placeholder {
+	font-family: FontAwesome;
 }
-ul.menu-popup .menu-sep {
-  border-top: 1px solid #9eabb0;
+
+#acl-list {
+	display: block;
+	border: 1px solid $acl_bordercolour;
+	overflow: auto;
+	clear: both;
+	min-height: 62px;
+	margin-top: 20px;
+	padding: 10px 10px 0px 0px;
+	-webkit-border-radius: $radiuspx ;
+	-moz-border-radius: $radiuspx;
+	border-radius: $radiuspx;
 }
-ul.menu-popup li {
-  float: none;
-  overflow: auto;
-  height: auto;
-  display: block;
+
+.acl-list-item {
+	width: calc(50% - 10px);
+	border: 1px solid $acl_bordercolour;
+	margin: 0px 0px 10px 10px;
+	padding: 5px;
+	float: left;
+	-webkit-border-radius: $radiuspx ;
+	-moz-border-radius: $radiuspx;
+	border-radius: $radiuspx;
 }
-ul.menu-popup li img {
-  float: left;
-  width: 16px;
-  height: 16px;
-  padding-right: 5px;
+
+.acl-list-item img{
+	width: 40px;
+	height: 40px;
+	float: left;
+	margin-right: 5px;
+	-webkit-border-radius: $radiuspx ;
+	-moz-border-radius: $radiuspx;
+	border-radius: $radiuspx;
 }
-ul.menu-popup .empty {
-  padding: 5px;
-  text-align: center;
-  color: #9eabb0;
+
+.acl-list-item.taggable {
+	background-color: #ddddff;
 }
-ul.menu-popup .toolbar {
-  background-color: #9eabb0;
-  height: auto;
-  overflow: auto;
+
+.acl-list-item p {
+	font-size: $font_size;
+	margin: 0px;
+	overflow: ellipsis;
+	white-space: nowrap;
+	overflow: hidden;
+	text-overflow: ellipsis;
 }
-ul.menu-popup .toolbar a {
-  float: right;
+
+.acl-button-show,
+.acl-button-hide {
+	float: right;
+	margin-left: 5px;
+	$aclbutton_linkcolour
 }
-ul.menu-popup .toolbar a:hover {
-  background-color: #ffffff;
+
+#acl-showall {
+	$aclbutton_linkcolour
 }
-/* header */
-header {
-  position: fixed;
-  left: 43%;
-  right: 43%;
-  top: 0px;
-  margin: 0px;
-  padding: 0px;
-  /*width: 100%; height: 12px; */
 
-  z-index: 110;
-  color: #ffffff;
+.contact-block-content {
+	margin-top: 8px;
+}
+.contact-block-img.archived {
+	opacity: 0.3;
+	filter:alpha(opacity=30);
 }
 
+.profile-match-connect { margin-top: 5px; }
+
+.reshared-content { margin-left: 20px; }
+.shared_header img { margin-right: 10px; }
+
+.tag1 {
+    font-size : 1.0em !important;
+  }
+.tag2 {
+    font-size : 1.2em !important;
+  }
+
+
+.tag3 {
+    font-size : 1.4em !important;
+  }
+
+
+.tag4 {
+    font-size : 1.6em !important;
+  }
+
+
+.tag5 {
+    font-size : 1.8em !important;
+  }
+
+
+.tag6 {
+    font-size : 2.0em !important;
+  }
+
+
+.tag7 {
+    font-size : 2.2em !important;
+  }
+
+
+.tag8 {
+    font-size : 2.4em !important;
+  }
+
+
+.tag9 {
+    font-size : 2.6em !important;
+  }
+
+
+.tag10 {
+    font-size : 2.8em !important;
+  }
+
+.profile-thing-list {
+	list-style-type: none;
+}
+
+.profile-thing-list img {
+	margin-bottom: 5px;
+}
+
+.profile-thing-list li {
+	margin-bottom: 15px;
+}
 
-/* notifications popup menu */
-.nav-notify {
+div.page-list-item {
+margin: 20px;
+}
+
+div#write-pages {
+display: block;
+background: silver;
+width: 100%;
+}
+
+div#write-pages a {
+color: #000;
+margin-right: 50px;
+}
+
+.pmenu ul {
+	list-style-type: none;
+}
+
+.admin-icons {
+	font-size: 1.2em;
+	color: $toolicon_colour;
+}
+
+a .drop-icons {
+	color: $toolicon_colour;;
+	font-size: 1.2em;
+	text-decoration: none;
+}
+ 
+a .drop-icons:hover {
+	color: #FF0000;
+}
+
+.permission-inherited {
+	float: left;
+	margin-right: 10px;
+	color: #FF0000;
+}
+ 
+.attachlink {
+	float: left;
+	border: 1px solid black;
+	padding: 5px;
+	margin-right: 8px;
+}
+
+.attach-icons {
+	font-size: 1.4em;
+}
+
+.attach-clip {
+	margin-right: 3px;
+	font-size: 1.8em;
+}
+
+.design-tools ul {
+	list-style-type: none;
+}
+
+.design-icons {
+	margin-right: 10px;
+}
+
+.design-icons:hover { 
+text-decoration: none; 
+}
+
+#menulist {
+	list-style-type: none;
+}
+
+.admin-icons {
+	color: $toolicon_colour;
+	margin-right: 10px;
+}
+
+#adminpage table tr:hover {
+    background-color: $admintable_hoverbgcol;
+}
+
+/* message */
+
+img.mail-list-sender-photo {
+	-moz-border-radius: $radiuspx;
+	border-radius: $radiuspx;
+}
+
+/* jot */
+
+#profile-jot-wrapper {
+	max-width: $converse_width;
+}
+
+#jot-title,
+#jot-category,
+#jot-pagetitle {
+	font-weight: bold;
+	border: solid 1px #ffffff;
+	border-radius: $radiuspx;
+}
+
+#jot-category::-webkit-input-placeholder {
+	font-weight: bold;
+}
+
+#jot-category:-moz-placeholder {
+	font-weight: bold;
+}
+
+#jot-title::-webkit-input-placeholder {
+	font-weight: bold;
+}
+
+#jot-title:-moz-placeholder {
+	font-weight: bold;
+}
+
+#jot-pagetitle::-webkit-input-placeholder {
+	font-weight: bold;
+}
+
+#jot-pagetitle:-moz-placeholder {
+	font-weight: bold;
+}
+
+#jot-title:hover,
+#jot-title:focus,
+#jot-pagetitle:hover,
+#jot-pagetitle:focus,
+#jot-category:hover,
+#jot-category:focus {
+	border: 1px solid #cccccc;
+}
+
+#profile-jot-text {
+	color:#000;
+	border: 1px solid #cccccc;
+	-moz-border-radius: $radiuspx;
+	border-radius: $radiuspx;
+}
+
+#profile-jot-text::-webkit-input-placeholder {
+	font-size:18px;
+}
+
+#profile-jot-text::-moz-placeholder {
+	font-size:18px;
+}
+
+#profile-jot-text:focus::-webkit-input-placeholder {
+	color: transparent;
+}
+
+#profile-jot-text:focus::-moz-placeholder {
+	color: transparent;
+}
+
+#profile-jot-text-loading {
+	color: #777;
 	display: none;
-	position: absolute;
-	font-size: 10px;
-	padding: 1px 3px;
-	top: 0px;
-	right: -10px;
-	min-width: 15px;
-	text-align: right;
 }
-.nav-notify.show {
+
+#profile-rotator {
+	color: #777;
+}
+
+#jot-perms-icon,
+.jot-icons {
+	color: $toolicon_colour;
+}
+
+/* conversation */
+
+.hide-comments-outer,
+.thread-wrapper .wall-item-comment-wrapper,
+.wall-item-content-wrapper.comment {
+	margin-left: $comment_indent;
+}
+
+.thread-wrapper.toplevel_item {
+	max-width: $converse_width;
+}
+
+.wall-item-content-wrapper {
+	background-color: $item_colour;
+	padding: 10px;
+}
+
+.wall-item-content-wrapper {
+	border-top-right-radius: $radiuspx;
+	border-top-left-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-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;
+	text-align: center;
+	border-radius: 0px;
+}
+
+.hide-comments-outer:hover {
+	border-top: 1px dashed #adadad;
+}
+
+.wall-item-comment-wrapper {
+	padding: 7px 10px;
+	background-color: $item_colour;
+	border-radius: 0px;
+	border-bottom-right-radius: $radiuspx;
+	border-bottom-left-radius: $radiuspx;
+	margin-top: 3px;
+}
+
+.wall-item-comment-wrapper-wc {
+	margin-top: 0px;
+}
+
+.wall-item-like,
+.wall-item-dislike {
+	font-size: 11px;
+}
+
+.wall-item-photo {
+	border: none;
+	width: $top_photo !important;
+	height: $top_photo !important;
+
+}
+
+.comment .wall-item-photo {
+	width: $reply_photo !important;
+	height: $reply_photo !important;
+}
+
+.wall-item-photo {
+    border-radius: $radiuspx;
+    -moz-border-radius: $radiuspx;
+    box-shadow: $shadowpx $shadowpx $shadowpx 0 #444444;
+}
+
+.wall-item-ago .icon-ok {
+	color: darkgreen;
+}
+
+.wall-item-ago {
+	color: #777;
+	font-size: 0.8em;
+}
+
+.wall-item-ago i {
+	font-size: 0.8em;
+}
+
+.wall-item-content {
+	font-size: $font_size;
+	clear: both;
+}
+
+.item-tool {
+	font-size: 1.2em;
+	color: $toolicon_colour;
+}
+
+.like-rotator {
+	color: $toolicon_colour;
+}
+
+.comment-icon {
+	font-size: 0.8em;
+	color: $toolicon_colour;
+}
+
+.comment-edit-text-empty,
+.comment-edit-text-full {
+	border: 1px solid #ccc;
+	border-radius: $radiuspx;
+}
+
+.comment-edit-text-empty {
+	color: gray;
+	font-size: 11px;
+}
+
+.comment-edit-text-full {
+	color: black;
+}
+
+.divgrow-showmore {
 	display: block;
+	width: 100%;
+	border-top: 1px dashed #ccc;
+	border-bottom-right-radius: $radiuspx;
+	border-bottom-left-radius: $radiuspx;
+	text-align: center;
 }
-ul.menu-popup {
-	position: absolute;
-	display: none;
-	width: 10em;
-	margin: 0px;
+
+.divgrow-showmore:hover {
+	border-top: 1px dashed #adadad;
+}
+
+
+/* widgets */
+
+.widget {
+	border-bottom: 1px solid $widget_brdrcolour;
+	-moz-border-radius: $radiuspx;
+	-webkit-border-radius: $radiuspx;
+	border-radius: $radiuspx;
+}
+
+.widget h3 {
+	color: $toolicon_colour;
+}
+
+#note-text {
+	border: 1px solid #ccc;
+	border-radius: $radiuspx;
+	-moz-border-radius: $radiuspx;
+}
+
+#saved-search-ul {
+	list-style-type: none;
+}
+
+.fileas-ul {
+	list-style-type: none;
+}
+
+#datebrowse-sidebar select {
+	border: 1px solid #ccc;
+	border-radius: $radiuspx;
+	-moz-border-radius: $radiuspx;
+}
+/*
+.categories-ul {
+	list-style-type: none;
+}
+
+#sidebar-group-list ul, #posted-date-selector {
+	list-style-type: none;
+}
+*/
+
+.profile-thing-list img, .thing-show img, .thing-edit-links a {
+	margin-top: 8px;
+	margin-right: 15px;
+}
+
+.abook-self {
+	background-color: $abookself_bgcolour;
+}
+
+.online-now {
+	color: red;
+	cursor: pointer;
+}
+
+.chat-item-photo {
+	border-radius: $radiuspx;
+}
+
+.chat-item-text {
+	border-radius: $radiuspx;
+	background-color: #eee;
+}
+
+/* nav bootstrap */
+
+nav i {
+	font-size: 14px;
+}
+
+nav img {
+	height: 47px;
+	width: 47px;
+	margin-top: 2px;
+	border-radius: $radiuspx;
+}
+
+nav ul li {
+	max-height: 50px
+}
+
+nav .badge {
+	border-radius: $radiuspx;
+}
+
+nav .dropdown-menu {
+	font-size: $body_font_size;
+	border-top-right-radius: 0px;
+	border-top-left-radius: 0px;
+	border-bottom-right-radius: $radiuspx;
+	border-bottom-left-radius: $radiuspx;
+	background-color: $notify_bgcolour;
+}
+
+nav .dropdown-menu .divider{
+	background-color: $navmenu_bgchover;
+}
+
+nav .dropdown-menu>li>a{
+	color: $notify_linkcolour;
+}
+
+nav .dropdown-menu>li>a:hover,nav .dropdown-menu>li>a:focus{
+	color: $notify_linkcolour;
+	background-color: $navmenu_bgchover;
+	$navmenu_bgimage
+}
+
+#usermenu-caret {
+	color: $nav_icon_colour;
+}
+
+#avatar:hover + #usermenu-caret {
+	color: $nav_active_icon_colour;
+}
+
+/* Files */
+
+#attach-edit-perms {
+	margin-top: 25px;
+	margin-bottom: 20px;
+	font-weight: bold;
+	font-size: 17px;
+}
+
+/* bootstrap overrides */
+blockquote {
+	font-size: $body_font_size;
+}
+
+.dropdown-menu {
+	font-size: $body_font_size;
+	border-radius: $radiuspx;
+	background-color: $dropdown_bgcolour; 
+}
+
+.dropdown-menu >li > a {
+	color: $dropdown_textcolour; 
+}
+
+
+.dropdown-menu > li > a:hover, .dropdown-menu > li > a:focus {
+    	color: $dropdown_txtcolhover; 
+    	background-color: $dropdown_bgcolhover; 
+	$dropdown_bgimghover
+}
+
+.dropdown-menu img {
+	border-radius: $radiuspx;
+}
+
+.open .dropdown-toggle.btn-default {
+    color: $dropdown_togglecol; 
+    background-color: $dropdown_togglebgcol; 
+    border-color: $dropdown_bordercol; 
+}
+
+.navbar-inverse {
+	background-image: -webkit-linear-gradient(top, $nav_gradient_top 0%, $nav_gradient_bottom 100%);
+	background-image:         linear-gradient(to bottom, $nav_gradient_top 0%, $nav_gradient_bottom 100%);
+	filter: progid:DXImageTransform.Microsoft.gradient(startColorstr=$nav_gradient_top, endColorstr=$nav_gradient_bottom, GradientType=0);
+	background-color: $nav_bg;
+	border-color: $nav_bd;
+}
+
+.navbar-inverse .navbar-collapse {
+	border-color: $nav_bd;
+}
+
+.navbar-inverse .navbar-nav > .active > a {
+	background-image: -webkit-linear-gradient(top, $nav_active_gradient_top 0%, $nav_active_gradient_bottom 100%);
+	background-image:         linear-gradient(to bottom, $nav_active_gradient_top 0%, $nav_active_gradient_bottom 100%);
+	filter: progid:DXImageTransform.Microsoft.gradient(startColorstr=$nav_active_gradient_top, endColorstr=$nav_active_gradient_bottom, GradientType=0);
+}
+
+
+.navbar-inverse .navbar-nav > li > a {
+	color: $nav_icon_colour;
+	text-shadow: 0px 0px 0px;
+}
+
+.navbar-inverse .navbar-nav > li > a:hover,
+.navbar-inverse .navbar-nav > li > a:focus {
+	color: $nav_active_icon_colour;
+}
+
+.navbar-inverse .navbar-nav > .active > a,
+.navbar-inverse .navbar-nav > .active > a:hover,
+.navbar-inverse .navbar-nav > .active > a:focus {
+	color: $nav_active_icon_colour;
+}
+
+.navbar-inverse .navbar-nav > .open > a,
+.navbar-inverse .navbar-nav > .open > a:hover,
+.navbar-inverse .navbar-nav > .open > a:focus {
+	background-color: $nav_bd;
+	color: $nav_active_icon_colour;
+}
+
+.navbar-inverse .navbar-toggle {
+	border-color: $nav_bd;
+}
+.navbar-inverse .navbar-toggle:hover,
+.navbar-inverse .navbar-toggle:focus {
+	background-color: $nav_bg;
+}
+
+.navbar-inverse .navbar-toggle .icon-bar {
+	background-color: $nav_active_icon_colour;
+}
+
+#expand-aside,
+#expand-tabs {
+	color: $nav_active_icon_colour;
+	padding: 7px 10px;
+}
+
+#tabs-collapse-1 {
 	padding: 0px;
-	list-style: none;
-	z-index: 100000;
-/*	top: 90px; */
-/*	left: 400px; */
+	margin-bottom: 25px;
+	border-top: none;
+	box-shadow: none;
 }
-#nav-notifications-menu {
-	width: 320px;
-	max-height: 400px;
-	overflow-y: scroll;overflow-style:scrollbar;
-	background-color:#FFFFFF;
-	-moz-border-radius: 5px;
-	-webkit-border-radius: 5px;
-	border-radius:5px;
-	border: 1px solid #888;
+
+.nav-tabs{
+	border-bottom:1px solid $navtabs_borderc;
 }
-#nav-notifications-menu .contactname { font-weight: bold; font-size: 0.9em; }
-#nav-notifications-menu img { float: left; margin-right: 5px; }
-#nav-notifications-menu .notif-when { font-size: 0.8em; display: block; }
-#nav-notifications-menu li {
-	padding: 7px 0px 7px 10px;
-	word-wrap:normal;
-	border-bottom: 1px solid #000;
+
+.nav-tabs>li.active>a,.nav-tabs>li.active>a:hover,.nav-tabs>li.active>a:focus{
+	color: $navtabs_fontcolour;
+	background-color: $navtabs_bgcolour; 
 }
 
-#nav-notifications-menu li:hover {
+.nav-tabs.nav-justified>.active>a,.nav-tabs.nav-justified>.active>a:hover,.nav-tabs.nav-justified>.active>a:focus{
+	border:1px solid $navtabs_borderc;
+}
 
+.nav-tabs.nav-justified > li > a {
+	$navtabs_linkcolour
 }
 
-#nav-notifications-menu a:hover {
-	text-decoration: underline;
+.nav-tabs > li > a:hover, .nav-tabs > li > a:focus {
+    	text-decoration: $navtabs_decohover;
+    	background-color: $navtabs_bgchover;
+	border-color: transparent;
+	$navtabs_linkchover
 }
 
-.notif-item a {
-	color: #000000;
+@media (min-width: 768px) {
+  .nav-tabs.nav-justified > li > a {
+    border-bottom: 1px solid $navtabs_borderc;
+  }
+  .nav-tabs.nav-justified > .active > a,
+  .nav-tabs.nav-justified > .active > a:hover,
+  .nav-tabs.nav-justified > .active > a:focus {
+    border-bottom-color: transparent;
+  }
 }
 
-.notif-item a:hover {
-	text-decoration: underline;
+.btn-default {
+    	background-color: $editbuttons_bgcolour;
+    	border-color: $editbuttons_bordercolour;
+	color: $editbuttons_colour;
+    	text-shadow: none;
+    	box-shadow: none;
 }
 
-.notif-image {
-	width: 32px;
-	height: 32px;
-	padding: 7px 7px 0px 0px;
+.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;
 }
 
-.notify-seen {
-	background: #DDDDDD;
+.btn-default.btn-sm:hover, .btn-default.btn-sm:focus, .btn-default.btn-sm:active .btn-default.btn-sm.active {
+    	text-decoration: none;
 }
 
-#page-spinner {
-	margin-left: 50%;
+.well {
+	background-color: $advperm_bgcolour;
+	border: 1px solid $advperm_bordercol;
+	background-image: linear-gradient(to bottom, $advperm_gradientcol 0px, $advperm_bgcolour 100%);
 }
 
-.tabs-end {
-	clear: both;
-}
\ No newline at end of file
+
+@media screen and (max-width: 767px) {
+	aside#region_1 {
+		background: rgba(0, 0, 0, .1);
+		border-right: 1px solid $nav_bd;
+	}
+
+	main {
+		-webkit-transition: all 0.25s ease-out;
+		-moz-transition: all 0.25s ease-out;
+		transition: all 0.25s ease-out;
+	}
+
+	main {
+		left: -231px;
+		width: calc( 100% + 231px );
+	}
+
+	main.region_1-on {
+		left: 0px;
+	}
+
+	.thread-wrapper.toplevel_item {
+		width: 100%;
+		border:1px;
+	}
+
+	.wall-item-photo {
+		width: 48px !important;
+		height: 48px !important;
+	}
+
+	.comment .wall-item-photo {
+		width: 32px !important;
+		height: 32px !important;
+	}
+
+	.acl-list-item {
+		width: calc(100% - 10px);
+	}
+
+}
diff --git a/view/theme/redbasic/img/bg.png b/view/theme/redbasic/img/bg.png
deleted file mode 100644
index eae49e037..000000000
--- a/view/theme/redbasic/img/bg.png
+++ /dev/null
diff --git a/view/theme/redbasic/img/events.png b/view/theme/redbasic/img/events.png
deleted file mode 100644
index 96dd86899..000000000
--- a/view/theme/redbasic/img/events.png
+++ /dev/null
diff --git a/view/theme/redbasic/img/gray_and_black_diagonal_stripes_background_seamless.gif b/view/theme/redbasic/img/gray_and_black_diagonal_stripes_background_seamless.gif
new file mode 100644
index 000000000..615c986bd
--- /dev/null
+++ b/view/theme/redbasic/img/gray_and_black_diagonal_stripes_background_seamless.gif
diff --git a/view/theme/redbasic/img/gray_and_white_diagonal_stripes_background_seamless.gif b/view/theme/redbasic/img/gray_and_white_diagonal_stripes_background_seamless.gif
new file mode 100644
index 000000000..144369257
--- /dev/null
+++ b/view/theme/redbasic/img/gray_and_white_diagonal_stripes_background_seamless.gif
diff --git a/view/theme/redbasic/img/head.jpg b/view/theme/redbasic/img/head.jpg
deleted file mode 100644
index 6210b76be..000000000
--- a/view/theme/redbasic/img/head.jpg
+++ /dev/null
diff --git a/view/theme/redbasic/img/home.png b/view/theme/redbasic/img/home.png
deleted file mode 100644
index d1ba7b3f3..000000000
--- a/view/theme/redbasic/img/home.png
+++ /dev/null
diff --git a/view/theme/redbasic/img/introductions.png b/view/theme/redbasic/img/introductions.png
deleted file mode 100644
index 18ba5dc81..000000000
--- a/view/theme/redbasic/img/introductions.png
+++ /dev/null
diff --git a/view/theme/redbasic/img/lock.cur b/view/theme/redbasic/img/lock.cur
deleted file mode 100644
index 892c5e851..000000000
--- a/view/theme/redbasic/img/lock.cur
+++ /dev/null
diff --git a/view/theme/redbasic/img/message.png b/view/theme/redbasic/img/message.png
deleted file mode 100644
index f3fea75ee..000000000
--- a/view/theme/redbasic/img/message.png
+++ /dev/null
diff --git a/view/theme/redbasic/img/network.png b/view/theme/redbasic/img/network.png
deleted file mode 100644
index c213cee04..000000000
--- a/view/theme/redbasic/img/network.png
+++ /dev/null
diff --git a/view/theme/redbasic/img/screenshot.jpg b/view/theme/redbasic/img/screenshot.jpg
index 5f00ec39e..51d4cbb0d 100644
--- a/view/theme/redbasic/img/screenshot.jpg
+++ b/view/theme/redbasic/img/screenshot.jpg
diff --git a/view/theme/redbasic/img/settings.png b/view/theme/redbasic/img/settings.png
deleted file mode 100644
index a935b225e..000000000
--- a/view/theme/redbasic/img/settings.png
+++ /dev/null
diff --git a/view/theme/redbasic/js/redbasic.js b/view/theme/redbasic/js/redbasic.js
index 00b8fa39f..4f70752c0 100644
--- a/view/theme/redbasic/js/redbasic.js
+++ b/view/theme/redbasic/js/redbasic.js
@@ -1,89 +1,39 @@
 
+$(document).ready(function() {
 
-function insertFormatting(comment,BBcode,id) {
-	
-		var tmpStr = $("#comment-edit-text-" + id).val();
-		if(tmpStr == comment) {
-			tmpStr = "";
-			$("#comment-edit-text-" + id).addClass("comment-edit-text-full");
-			$("#comment-edit-text-" + id).removeClass("comment-edit-text-empty");
-			openMenu("comment-edit-submit-wrapper-" + id);
-			$("#comment-edit-text-" + id).val(tmpStr);
-		}
+$('#expand-aside').click(function() {
+	$('#expand-aside-icon').toggleClass('icon-circle-arrow-right').toggleClass('icon-circle-arrow-left');
+	$('main').toggleClass('region_1-on');
+});
 
-	textarea = document.getElementById("comment-edit-text-" +id);
-	if (document.selection) {
-		textarea.focus();
-		selected = document.selection.createRange();
-		if (BBcode == "url"){
-			selected.text = "["+BBcode+"]" + "http://" +  selected.text + "[/"+BBcode+"]";
-			} else			
-		selected.text = "["+BBcode+"]" + selected.text + "[/"+BBcode+"]";
-	} else if (textarea.selectionStart || textarea.selectionStart == "0") {
-		var start = textarea.selectionStart;
-		var end = textarea.selectionEnd;
-		if (BBcode == "url"){
-			textarea.value = textarea.value.substring(0, start) + "["+BBcode+"]" + "http://" + textarea.value.substring(start, end) + "[/"+BBcode+"]" + textarea.value.substring(end, textarea.value.length);
-			} else
-		textarea.value = textarea.value.substring(0, start) + "["+BBcode+"]" + textarea.value.substring(start, end) + "[/"+BBcode+"]" + textarea.value.substring(end, textarea.value.length);
-	}
-	return true;
+if($('aside').length && $('aside').html().length == 0) {
+	$('#expand-aside').hide();
 }
 
-function cmtBbOpen(comment, id) {
-	if($(comment).hasClass('comment-edit-text-full')) {
-		$(".comment-edit-bb-" + id).show();
-		return true;
+$('#expand-tabs').click(function() {
+	if(!$('#tabs-collapse-1').hasClass('in')){
+		$('html, body').animate({ scrollTop: 0 }, 'slow');
 	}
-	return false;
-}
+	$('#expand-tabs-icon').toggleClass('icon-circle-arrow-down').toggleClass('icon-circle-arrow-up');
+});
 
-function cmtBbClose(comment, id) {
-//	if($(comment).hasClass('comment-edit-text-empty')) {
-//		$(".comment-edit-bb-" + id).hide();
-//		return true;
-//	}
-	return false;
+if($('#tabs-collapse-1').length == 0) {
+	$('#expand-tabs').hide();
 }
 
-$(document).ready(function() {
-
-$('.group-edit-icon').hover(
-	function() {
-		$(this).addClass('icon'); $(this).removeClass('iconspacer');},
-	function() {
-		$(this).removeClass('icon'); $(this).addClass('iconspacer');}
-	);
-
-$('.sidebar-group-element').hover(
-	function() {
-		id = $(this).attr('id');
-		$('#edit-' + id).addClass('icon'); $('#edit-' + id).removeClass('iconspacer');},
-
-	function() {
-		id = $(this).attr('id');
-		$('#edit-' + id).removeClass('icon');$('#edit-' + id).addClass('iconspacer');}
-	);
-
-
-$('.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');}
-	);
-
 });
 
 
-
+$(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;
+		}
+	};
+	setInterval(function () {checkNotify();}, 10 * 1000);
+});
diff --git a/view/theme/redbasic/php/config.php b/view/theme/redbasic/php/config.php
index 1ca9cc5ed..6855c8c32 100644
--- a/view/theme/redbasic/php/config.php
+++ b/view/theme/redbasic/php/config.php
@@ -1,80 +1,137 @@
 <?php
-/**
- * Theme settings
- */
 
 function theme_content(&$a) {
-	if(!local_user()) { return;	}
+	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' );
-	
-	return redbasic_form($a, $font_size, $line_height, $colour);
+	$arr = array();
+
+	$arr['schema'] = get_pconfig(local_user(),'redbasic', 'schema' );
+	$arr['narrow_navbar'] = get_pconfig(local_user(),'redbasic', 'narrow_navbar' );
+	$arr['nav_bg'] = get_pconfig(local_user(),'redbasic', 'nav_bg' );
+	$arr['nav_gradient_top'] = get_pconfig(local_user(),'redbasic', 'nav_gradient_top' );
+	$arr['nav_gradient_bottom'] = get_pconfig(local_user(),'redbasic', 'nav_gradient_bottom' );
+	$arr['nav_active_gradient_top'] = get_pconfig(local_user(),'redbasic', 'nav_active_gradient_top' );
+	$arr['nav_active_gradient_bottom'] = get_pconfig(local_user(),'redbasic', 'nav_active_gradient_bottom' );
+	$arr['nav_bd'] = get_pconfig(local_user(),'redbasic', 'nav_bd' );
+	$arr['nav_icon_colour'] = get_pconfig(local_user(),'redbasic', 'nav_icon_colour' );
+	$arr['nav_active_icon_colour'] = get_pconfig(local_user(),'redbasic', 'nav_active_icon_colour' );
+	$arr['link_colour'] = get_pconfig(local_user(),'redbasic', 'link_colour' );
+	$arr['banner_colour'] = get_pconfig(local_user(),'redbasic', 'banner_colour' );
+	$arr['bgcolour'] = get_pconfig(local_user(),'redbasic', 'background_colour' );
+	$arr['background_image'] = get_pconfig(local_user(),'redbasic', 'background_image' );
+	$arr['item_colour'] = get_pconfig(local_user(),'redbasic', 'item_colour' );
+	$arr['comment_item_colour'] = get_pconfig(local_user(),'redbasic', 'comment_item_colour' );
+	$arr['comment_border_colour'] = get_pconfig(local_user(),'redbasic', 'comment_border_colour' );
+	$arr['comment_indent'] = get_pconfig(local_user(),'redbasic', 'comment_indent' );
+	$arr['toolicon_colour'] = get_pconfig(local_user(),'redbasic','toolicon_colour');
+	$arr['toolicon_activecolour'] = get_pconfig(local_user(),'redbasic','toolicon_activecolour');
+	$arr['font_size'] = get_pconfig(local_user(),'redbasic', 'font_size' );
+	$arr['body_font_size'] = get_pconfig(local_user(),'redbasic', 'body_font_size' );
+	$arr['font_colour'] = get_pconfig(local_user(),'redbasic', 'font_colour' );
+	$arr['radius'] = get_pconfig(local_user(),'redbasic', 'radius' );
+	$arr['shadow'] = get_pconfig(local_user(),'redbasic', 'photo_shadow' );
+	$arr['converse_width']=get_pconfig(local_user(),"redbasic","converse_width");
+	$arr['converse_center']=get_pconfig(local_user(),"redbasic","converse_center");
+	$arr['nav_min_opacity']=get_pconfig(local_user(),"redbasic","nav_min_opacity");
+	$arr['top_photo']=get_pconfig(local_user(),"redbasic","top_photo");
+	$arr['reply_photo']=get_pconfig(local_user(),"redbasic","reply_photo");
+	$arr['sloppy_photos']=get_pconfig(local_user(),"redbasic","sloppy_photos");
+	return redbasic_form($a, $arr);
 }
 
 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', 'narrow_navbar', $_POST['redbasic_narrow_navbar']);
+		set_pconfig(local_user(), 'redbasic', 'nav_bg', $_POST['redbasic_nav_bg']);
+		set_pconfig(local_user(), 'redbasic', 'nav_gradient_top', $_POST['redbasic_nav_gradient_top']);
+		set_pconfig(local_user(), 'redbasic', 'nav_gradient_bottom', $_POST['redbasic_nav_gradient_bottom']);
+		set_pconfig(local_user(), 'redbasic', 'nav_active_gradient_top', $_POST['redbasic_nav_active_gradient_top']);
+		set_pconfig(local_user(), 'redbasic', 'nav_active_gradient_bottom', $_POST['redbasic_nav_active_gradient_bottom']);
+		set_pconfig(local_user(), 'redbasic', 'nav_bd', $_POST['redbasic_nav_bd']);
+		set_pconfig(local_user(), 'redbasic', 'nav_icon_colour', $_POST['redbasic_nav_icon_colour']);
+		set_pconfig(local_user(), 'redbasic', 'nav_active_icon_colour', $_POST['redbasic_nav_active_icon_colour']);
+		set_pconfig(local_user(), 'redbasic', 'link_colour', $_POST['redbasic_link_colour']);
+		set_pconfig(local_user(), 'redbasic', 'background_colour', $_POST['redbasic_background_colour']);
+		set_pconfig(local_user(), 'redbasic', 'banner_colour', $_POST['redbasic_banner_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', 'comment_item_colour', $_POST['redbasic_comment_item_colour']);
+		set_pconfig(local_user(), 'redbasic', 'comment_border_colour', $_POST['redbasic_comment_border_colour']);
+		set_pconfig(local_user(), 'redbasic', 'comment_indent', $_POST['redbasic_comment_indent']);
+		set_pconfig(local_user(), 'redbasic', 'toolicon_colour', $_POST['redbasic_toolicon_colour']);
+		set_pconfig(local_user(), 'redbasic', 'toolicon_activecolour', $_POST['redbasic_toolicon_activecolour']);
 		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', 'body_font_size', $_POST['redbasic_body_font_size']);
+		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']);
+		set_pconfig(local_user(), 'redbasic', 'converse_width', $_POST['redbasic_converse_width']);
+		set_pconfig(local_user(), 'redbasic', 'converse_center', $_POST['redbasic_converse_center']);
+		set_pconfig(local_user(), 'redbasic', 'nav_min_opacity', $_POST['redbasic_nav_min_opacity']);
+		set_pconfig(local_user(), 'redbasic', 'top_photo', $_POST['redbasic_top_photo']);
+		set_pconfig(local_user(), 'redbasic', 'reply_photo', $_POST['redbasic_reply_photo']);
+		set_pconfig(local_user(), 'redbasic', 'sloppy_photos', $_POST['redbasic_sloppy_photos']);
 	}
 }
 
-function theme_admin(&$a) {
-	$font_size = get_config('redbasic', 'font_size' );
-	$line_height = get_config('redbasic', 'line_height' );
-	$colour = get_config('redbasic', 'colour' );	
-	
-	return redbasic_form($a, $font_size, $line_height, $colour);
-}
 
-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']);
-	}
-}
 
-function redbasic_form(&$a, $font_size, $line_height, $colour) {
-	$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',						
-	);
+function redbasic_form(&$a, $arr) {
+	$scheme_choices = array();
+	$scheme_choices["---"] = t("Default");
+	$files = glob('view/theme/redbasic/schema/*.php');
+	if($files) {
+		foreach($files as $file) {
+			$f = basename($file, ".php");
+			$scheme_name = $f;
+			$scheme_choices[$f] = $scheme_name;
+		}
+	}
 
-	$t = file_get_contents( dirname(__file__). "/../tpl/theme_settings.tpl" );
-	$o .= replace_macros($t, array(
+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),	
-	));
+		'$schema' => array('redbasic_schema', t('Set scheme'), $arr['schema'], '', $scheme_choices),
+		'$narrow_navbar' => array('redbasic_narrow_navbar',t('Narrow navbar'),$arr['narrow_navbar']),		
+		'$nav_bg' => array('redbasic_nav_bg', t('Navigation bar background colour'), $arr['nav_bg']),
+		'$nav_gradient_top' => array('redbasic_nav_gradient_top', t('Navigation bar gradient top colour'), $arr['nav_gradient_top']),
+		'$nav_gradient_bottom' => array('redbasic_nav_gradient_bottom', t('Navigation bar gradient bottom colour'), $arr['nav_gradient_bottom']),
+		'$nav_active_gradient_top' => array('redbasic_nav_active_gradient_top', t('Navigation active button gradient top colour'), $arr['nav_active_gradient_top']),
+		'$nav_active_gradient_bottom' => array('redbasic_nav_active_gradient_bottom', t('Navigation active button gradient bottom colour'), $arr['nav_active_gradient_bottom']),
+		'$nav_bd' => array('redbasic_nav_bd', t('Navigation bar border colour '), $arr['nav_bd']),
+		'$nav_icon_colour' => array('redbasic_nav_icon_colour', t('Navigation bar icon colour '), $arr['nav_icon_colour']),
+		'$nav_active_icon_colour' => array('redbasic_nav_active_icon_colour', t('Navigation bar active icon colour '), $arr['nav_active_icon_colour']),
+		'$link_colour' => array('redbasic_link_colour', t('link colour'), $arr['link_colour'], '', $link_colours),
+		'$banner_colour' => array('redbasic_banner_colour', t('Set font-colour for banner'), $arr['banner_colour']),
+		'$bgcolour' => array('redbasic_background_colour', t('Set the background colour'), $arr['bgcolour']),
+		'$background_image' => array('redbasic_background_image', t('Set the background image'), $arr['background_image']),
+		'$item_colour' => array('redbasic_item_colour', t('Set the background colour of items'), $arr['item_colour']),
+		'$comment_item_colour' => array('redbasic_comment_item_colour', t('Set the background colour of comments'), $arr['comment_item_colour']),
+		'$comment_border_colour' => array('redbasic_comment_border_colour', t('Set the border colour of comments'), $arr['comment_border_colour']),
+		'$comment_indent' => array('redbasic_comment_indent', t('Set the indent for comments'), $arr['comment_indent']),
+		'$toolicon_colour' => array('redbasic_toolicon_colour',t('Set the basic colour for item icons'),$arr['toolicon_colour']),
+		'$toolicon_activecolour' => array('redbasic_toolicon_activecolour',t('Set the hover colour for item icons'),$arr['toolicon_activecolour']),
+		'$body_font_size' => array('redbasic_body_font_size', t('Set font-size for the entire application'), $arr['body_font_size']),
+		'$font_size' => array('redbasic_font_size', t('Set font-size for posts and comments'), $arr['font_size']),
+		'$font_colour' => array('redbasic_font_colour', t('Set font-colour for posts and comments'), $arr['font_colour']),
+		'$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']),
+		'$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 f2bc8e500..23d9c695f 100644
--- a/view/theme/redbasic/php/style.php
+++ b/view/theme/redbasic/php/style.php
@@ -1,99 +1,417 @@
 <?php
-    $line_height = false;
-    $redbasic_font_size = false;
-    $resolution = false;
-    $colour = false;
-    $site_line_height = get_config("redbasic","line_height");
-    $site_redbasic_font_size = get_config("redbasic", "font_size" );
-    $site_colour = get_config("redbasic", "colour" );
-
-    if (local_user()) {
-        $line_height = get_pconfig(local_user(), "redbasic","line_height");
-        $redbasic_font_size = get_pconfig(local_user(), "redbasic", "font_size");
-        $colour = get_pconfig(local_user(), "redbasic", "colour");
-    }
-
-    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;
-	}
-		$colour = "light";
-
-    
-        if (file_exists("$THEMEPATH/css/style.css")) {
-            echo file_get_contents("$THEMEPATH/css/style.css");
-        }
-    
-
-	if($redbasic_font_size == "16") {
-		echo ".wall-item-content {
-				font-size: 16px;
-			}";
-	}
-	if($redbasic_font_size == "15") {
-		echo ".wall-item-content {
-				font-size: 15px;
-			}";
-	}	
-	if($redbasic_font_size == "14") {
-		echo ".wall-item-content {
-				font-size: 14px;
-			}";
-	}
-	if($redbasic_font_size == "13.5") {
-		echo ".wall-item-content {
-				font-size: 13.5px;
-			}";
-	}
-	if($redbasic_font_size == "13") {
-		echo ".wall-item-content {
-				font-size: 13px;
-			}";
-	}
-	if($redbasic_font_size == "12.5") {
-		echo ".wall-item-content {
-				font-size: 12.5px;
-			}";
-	}
-	if($redbasic_font_size == "12") {
-		echo ".wall-item-content {
-				font-size: 12px;
-			}";
-	}
-	if($line_height == "1.5") {
-		echo ".wall-item-content {
-				line-height: 1.5;
-			}";
-	}	
-	if($line_height == "1.4") {
-		echo ".wall-item-content {
-				line-height: 1.4;
-			}";
+
+if(! $a->install) {
+	// Get the UID of the channel owner
+	$uid = get_theme_uid();
+
+	if($uid)
+	    load_pconfig($uid,'redbasic');
+
+// Load the owners pconfig
+		$nav_bg = get_pconfig($uid, "redbasic", "nav_bg");
+		$nav_gradient_top = get_pconfig($uid, "redbasic", "nav_gradient_top");
+		$nav_gradient_bottom = get_pconfig($uid, "redbasic", "nav_gradient_bottom");
+		$nav_active_gradient_top = get_pconfig($uid, "redbasic", "nav_active_gradient_top");
+		$nav_active_gradient_bottom = get_pconfig($uid, "redbasic", "nav_active_gradient_bottom");
+		$nav_bd = get_pconfig($uid, "redbasic", "nav_bd");
+		$nav_icon_colour = get_pconfig($uid, "redbasic", "nav_icon_colour");
+		$nav_active_icon_colour = get_pconfig($uid, "redbasic", "nav_active_icon_colour");
+		$narrow_navbar = get_pconfig($uid,'redbasic','narrow_navbar');
+		$banner_colour = get_pconfig($uid,'redbasic','banner_colour');
+		$link_colour = get_pconfig($uid, "redbasic", "link_colour");	
+		$schema = get_pconfig($uid,'redbasic','schema');
+		$bgcolour = get_pconfig($uid, "redbasic", "background_colour");	
+		$background_image = get_pconfig($uid, "redbasic", "background_image");	
+		$toolicon_colour = get_pconfig($uid,'redbasic','toolicon_colour');
+		$toolicon_activecolour = get_pconfig($uid,'redbasic','toolicon_activecolour');
+		$item_colour = get_pconfig($uid, "redbasic", "item_colour");
+		$comment_item_colour = get_pconfig($uid, "redbasic", "comment_item_colour");
+		$comment_border_colour = get_pconfig($uid, "redbasic", "comment_border_colour");
+		$comment_indent = get_pconfig($uid, "redbasic", "comment_indent");
+		$body_font_size = get_pconfig($uid, "redbasic", "body_font_size");	
+		$font_size = get_pconfig($uid, "redbasic", "font_size");	
+		$font_colour = get_pconfig($uid, "redbasic", "font_colour");	
+		$radius = get_pconfig($uid, "redbasic", "radius");	
+		$shadow = get_pconfig($uid,"redbasic","photo_shadow");
+		$converse_width=get_pconfig($uid,"redbasic","converse_width");
+		$converse_center=get_pconfig($uid,"redbasic","converse_center");
+		$nav_min_opacity=get_pconfig($uid,'redbasic','nav_min_opacity');
+		$sloppy_photos=get_pconfig($uid,'redbasic','sloppy_photos');
+		$top_photo=get_pconfig($uid,'redbasic','top_photo');
+		$reply_photo=get_pconfig($uid,'redbasic','reply_photo');
+
+}
+
+	// Now load the scheme.  If a value is changed above, we'll keep the settings
+	// If not, we'll keep those defined by the schema
+	// Setting $schema to '' wasn't working for some reason, so we'll check it's
+	// not --- like the mobile theme does instead.
+
+
+	// Allow layouts to over-ride the schema
+
+	if($_REQUEST['schema'])
+		$schema = $_REQUEST['schema'];
+
+	if (($schema) && ($schema != '---')) {
+		// Check it exists, because this setting gets distributed to clones
+		if(file_exists('view/theme/redbasic/schema/' . $schema . '.php')) {
+			$schemefile = 'view/theme/redbasic/schema/' . $schema . '.php';
+			require_once ($schemefile);
+		}
 	}
-	if($line_height == "1.3") {
-		echo ".wall-item-content {
-				line-height: 1.3;
-			}";
+		// 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
+//individually.  If we don't, we'll have problems if a user has set one, but not all options.
+
+	if (! $nav_bg)
+		$nav_bg = "#222";
+	if (! $nav_gradient_top)
+		$nav_gradient_top = "#3c3c3c";
+	if (! $nav_gradient_bottom)
+		$nav_gradient_bottom = "#222";
+	if (! $nav_active_gradient_top)
+		$nav_active_gradient_top = "#222";
+	if (! $nav_active_gradient_bottom)
+		$nav_active_gradient_bottom = "#282828";
+	if (! $nav_bd)
+		$nav_bd = "#222";
+	if (! $nav_icon_colour)
+		$nav_icon_colour = "#999";
+	if (! $nav_active_icon_colour)
+		$nav_active_icon_colour = "#fff";
+	if (! $navmenu_bgchover)
+		$navmenu_bgchover = "#f5f5f5";
+	if (! $navmenu_bgimage)
+		$navmenu_bgimage = "";
+	if (! $navtabs_borderc)
+		$navtabs_borderc = "rgba(204,204,204,0.8)";
+	if (! $navtabs_fontcolour)
+		$navtabs_fontcolour = "#555";
+	if (! $navtabs_bgcolour)
+		$navtabs_bgcolour = "rgba(254,254,254,0.4)";
+	if (! $navtabs_linkcolour)
+		$navtabs_linkcolour = "";
+	if (! $navtabs_linkchover)
+		$navtabs_linkchover = "";
+	if (! $navtabs_decohover)
+		$navtabs_decohover = "none";
+	if (! $navtabs_bgchover)
+		$navtabs_bgchover = "rgba(238,238,238,0.8)";
+	if (! $link_colour)
+		$link_colour = "#428BCA";
+	if (! $banner_colour)
+		$banner_colour = "#fff";
+	if (! $search_background)
+		$search_background = "#eee";
+	if (! $bgcolour)
+		$bgcolour = "#fdfdfd";
+	if (! $background_image)
+		$background_image ='';
+	if (! $item_colour)
+		$item_colour = "rgba(238,238,238,0.8)";
+	if (! $comment_item_colour)
+		$comment_item_colour = "rgba(254,254,254,0.4)";
+	if (! $comment_border_colour)
+		$comment_border_colour = "rgba(238,238,238,0.8)";
+	if (! $toolicon_colour)
+		$toolicon_colour = '#777';
+	if (! $toolicon_activecolour)
+		$toolicon_activecolour = '#000';
+	if (! $item_opacity)
+		$item_opacity = "1";
+	if (! $font_size)
+		$font_size = "1.0em";
+	if (! $body_font_size)
+		$body_font_size = "11px";
+	if (! $font_colour)
+		$font_colour = "#4d4d4d";
+	if (! $selected_active_colour)
+		$selected_active_colour = "#444";
+	if (! $selected_active_deco)
+		$selected_active_deco = "none";
+	if (! $widget_brdrcolour)
+		$widget_brdrcolour = "#eec";
+	if (! $blockquote_colour)
+		$blockquote_colour = "#000";
+	if (! $blockquote_bgcolour)
+		$blockquote_bgcolour = "#f4f8f9";
+	if (! $blockquote_bordercolour)
+		$blockquote_bordercolour = "#dae4ee";
+	if (! $code_borderc)
+		$code_borderc = "#444";
+	if (! $code_bgcolour)
+		$code_bgcolour = "#EEE";
+	if (! $code_txtcolour)
+		$code_txtcolour = "#444";
+	if (! $pre_borderc)
+		$pre_borderc = "#ccc";
+	if (! $pre_bgcolour)
+		$pre_bgcolour = "#F5F5F5";
+	if (! $pre_txtcolour)
+		$pre_txtcolour = "#333";
+	if (! $notif_itemcolour)
+		$notif_itemcolour = "#000";
+	if (! $notif_itemhovercolour)
+		$notif_itemhovercolour = "#000";
+	if (! $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)
+		$dropdown_textcolour = "#333";
+	if (! $dropdown_txtcolhover)
+		$dropdown_txtcolhover = "#262626";
+	if (! $dropdown_bgcolhover)
+		$dropdown_bgcolhover = "#F5F5F5";
+	if (! $dropdown_bgimghover)
+		$dropdown_bgimghover = "";
+	if (! $dropdown_togglecol)
+		$dropdown_togglecol = "#333";
+	if (! $dropdown_togglebgcol)
+		$dropdown_togglebgcol = "#EBEBEB";
+	if (! $dropdown_bordercol)
+		$dropdown_bordercol = "#ADADAD";
+	if (! $preview_backgroundimg)
+		$preview_backgroundimg = "gray_and_white_diagonal_stripes_background_seamless.gif";
+	if (! $acpopup_bgcolour)
+		$acpopup_bgcolour = "#fff";
+	if (! $acpopup_bordercolour)
+		$acpopup_bordercolour = "#ccc";
+	if (! $acpopup_tgbl_bgcolour)
+		$acpopup_tgbl_bgcolour = "#ddddff";
+	if (! $acpopup_hovercolour)
+		$acpopup_hovercolour = "#000";
+	if (! $notify_bgcolour)
+		$notify_bgcolour = "#fff";
+	if (! $notify_linkcolour)
+		$notify_linkcolour = "#333";	
+	if (! $notify_bghover)
+		$notify_bghover = "#e7e7e7";
+	if (! $notifyseen_bgcolour)
+		$notifyseen_bgcolour = "#ddd";
+	if (! $notifyseen_linkcolour)
+		$notifyseen_linkcolour = "#333";
+	if (! $notifyseen_bghover)
+		$notifyseen_bghover = "#e7e7e7";
+	if (! $notifyseen_linkhover)
+		$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 = "#666";
+	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($line_height == "1.2") {
-		echo ".wall-item-content {
-				line-height: 1.2;
-			}";
+	if (! $acl_bgcolour)
+		$acl_bgcolour = "#fff";
+	if (! $acl_bordercolour)
+		$acl_bordercolour = "#ccc";
+	if (! $aclbutton_linkcolour)
+		$aclbutton_linkcolour = "";
+	if (! $abookself_bgcolour)
+		$abookself_bgcolour = "#ffdddd";
+	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(! $advperm_bgcolour)
+                $advperm_bgcolour = "#F5F5F5";
+        if(! $advperm_bordercol)
+                $advperm_bordercol = "#E3E3E3";
+        if(! $advperm_gradientcol)
+                $advperm_gradientcol = "#E8E8E8";
+        if(! $cal_bgcolour)
+		 $cal_bgcolour = "#FCF8E3";
+        if(! $fancybox_bgcolour)
+                $fancybox_bgcolour = "#FFF";
+	if (!$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($nav_min_opacity === false || $nav_min_opacity === '') {
+		$nav_float_min_opacity = 1.0;
+		$nav_percent_min_opacity = 100;
 	}
-	if($line_height == "1.1") {
-		echo ".wall-item-content {
-				line-height: 1.1;
-			}";
+	else {
+		$nav_float_min_opacity = (float) $nav_min_opacity;
+		$nav_percent_min_opacity = (int) 100 * $nav_min_opacity;
 	}
 
+// Apply the settings
+	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 '%'
+
+$options = array (
+'$nav_bg' => $nav_bg,
+'$nav_gradient_top' => $nav_gradient_top,
+'$nav_gradient_bottom' => $nav_gradient_bottom,
+'$nav_active_gradient_top' => $nav_active_gradient_top,
+'$nav_active_gradient_bottom' => $nav_active_gradient_bottom,
+'$nav_bd' => $nav_bd,
+'$nav_icon_colour' => $nav_icon_colour,
+'$nav_active_icon_colour' => $nav_active_icon_colour,
+'$navmenu_bgchover' => $navmenu_bgchover,
+'$navmenu_bgimage' => $navmenu_bgimage,
+'$navtabs_borderc' => $navtabs_borderc,
+'$navtabs_fontcolour' => $navtabs_fontcolour,
+'$navtabs_bgcolour' => $navtabs_bgcolour,
+'$navtabs_linkcolour' => $navtabs_linkcolour,
+'$navtabs_linkchover' => $navtabs_linkchover,
+'$navtabs_bgchover' => $navtabs_bgchover,
+'$navtabs_decohover' => $navtabs_decohover,
+'$link_colour' => $link_colour,
+'$banner_colour' => $banner_colour,
+'$search_background' => $search_background,
+'$bgcolour' => $bgcolour,
+'$background_image' => $background_image,
+'$item_colour' => $item_colour,
+'$comment_item_colour' => $comment_item_colour,
+'$comment_border_colour' => $comment_border_colour,
+'$toolicon_colour' => $toolicon_colour,
+'$toolicon_activecolour' => $toolicon_activecolour,
+'$font_size' => $font_size,
+'$font_colour' => $font_colour,
+'$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,
+'$blockquote_bgcolourhover' => $blockquote_bgcolourhover,
+'$code_borderc' => $code_borderc,
+'$code_bgcolour' => $code_bgcolour,
+'$code_txtcolour' => $code_txtcolour,
+'$pre_borderc' => $pre_borderc,
+'$pre_bgcolour' => $pre_bgcolour,
+'$pre_txtcolour' => $pre_txtcolour,
+'$notif_itemcolour' => $notif_itemcolour,
+'$notif_itemhovercolour' => $notif_itemhovercolour,
+'$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,
+'$dropdown_bgcolhover' => $dropdown_bgcolhover,
+'$dropdown_bgimghover' => $dropdown_bgimghover,
+'$dropdown_togglecol' => $dropdown_togglecol,
+'$dropdown_togglebgcol' => $dropdown_togglebgcol,
+'$dropdown_bordercol' => $dropdown_bordercol,
+'$preview_backgroundimg' => $preview_backgroundimg,
+'$acpopup_bgcolour' => $acpopup_bgcolour,
+'$acpopup_bordercolour' => $acpopup_bordercolour,
+'$acpopup_tgbl_bgcolour' => $acpopup_tgbl_bgcolour,
+'$acpopup_hovercolour' => $acpopup_hovercolour,
+'$notify_bgcolour' => $notify_bgcolour,
+'$notify_linkcolour' => $notify_linkcolour,
+'$notify_bghover' => $notify_bghover,
+'$notifyseen_bgcolour' => $notifyseen_bgcolour,
+'$notifyseen_linkcolour' => $notifyseen_linkcolour,
+'$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,
+'$advperm_bgcolour' => $advperm_bgcolour,
+'$advperm_bordercol' => $advperm_bordercol,
+'$advperm_gradientcol' => $advperm_gradientcol,
+'$cal_bgcolour' => $cal_bgcolour,
+'$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,
+);
+
+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);
+} 
diff --git a/view/theme/redbasic/php/theme.php b/view/theme/redbasic/php/theme.php
index 47e1df5d1..e68533bb4 100644
--- a/view/theme/redbasic/php/theme.php
+++ b/view/theme/redbasic/php/theme.php
@@ -1,5 +1,15 @@
 <?php
 
+/**
+ *   * Name: Redbasic
+ *   * Description: RedMatrix standard theme
+ * 	 * Version: 1.0
+ *   * Author: Fabrixxm
+ *   * Maintainer: Mike Macgirvin
+ *   * Compat: Red [*]
+ *
+ */
+
 function redbasic_init(&$a) {
-//	head_add_js('redbasic.js');
+
 }
diff --git a/view/theme/redbasic/php/theme_init.php b/view/theme/redbasic/php/theme_init.php
new file mode 100644
index 000000000..2da04a389
--- /dev/null
+++ b/view/theme/redbasic/php/theme_init.php
@@ -0,0 +1,19 @@
+<?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/bootstrap-datetimepicker/css/bootstrap-datetimepicker.min.css');
+//head_add_css('library/colorpicker/css/colorpicker.css');
+head_add_css('library/bootstrap-colorpicker/dist/css/bootstrap-colorpicker.min.css');
+require_once('view/php/theme_init.php');
+
+head_add_js('library/bootstrap/js/bootstrap.min.js');
+head_add_js('library/bootstrap/js/bootbox.min.js');
+head_add_js('library/bootstrap-datetimepicker/js/moment.js');
+head_add_js('library/bootstrap-datetimepicker/js/bootstrap-datetimepicker.min.js');
+//head_add_js('library/colorpicker/js/colorpicker.js');
+head_add_js('library/bootstrap-colorpicker/dist/js/bootstrap-colorpicker.js');
+//head_add_js('library/bootstrap-colorpicker/src/js/docs.js');
+
diff --git a/view/theme/redbasic/schema/BS-Default.php b/view/theme/redbasic/schema/BS-Default.php
new file mode 100644
index 000000000..ce464fe2c
--- /dev/null
+++ b/view/theme/redbasic/schema/BS-Default.php
@@ -0,0 +1,22 @@
+<?php
+	
+	if (! $nav_bg)
+		$nav_bg = "#f8f8f8";
+	if (! $nav_bd)
+		$nav_bd = "#e7e7e7";
+	if (! $nav_gradient_top)
+		$nav_gradient_top = "#fff";
+	if (! $nav_gradient_bottom)
+		$nav_gradient_bottom = "#f8f8f8";
+	if (! $nav_active_gradient_top)
+		$nav_active_gradient_top = "#ebebeb";
+	if (! $nav_active_gradient_bottom)
+		$nav_active_gradient_bottom = "#f3f3f3";
+	if (! $nav_icon_colour)
+		$nav_icon_colour = "#777";
+	if (! $nav_active_icon_colour)
+		$nav_active_icon_colour = "#555";
+	if (! $radius)
+		$radius = "4";
+	if (! $banner_colour)
+		$banner_colour = "#777";
diff --git a/view/theme/redbasic/schema/boxy.php b/view/theme/redbasic/schema/boxy.php
new file mode 100644
index 000000000..1de2f98cd
--- /dev/null
+++ b/view/theme/redbasic/schema/boxy.php
@@ -0,0 +1,19 @@
+<?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.php b/view/theme/redbasic/schema/dark.php
new file mode 100644
index 000000000..69fcf403f
--- /dev/null
+++ b/view/theme/redbasic/schema/dark.php
@@ -0,0 +1,172 @@
+<?php
+	
+	if (! $nav_bg)
+		$nav_bg = "#000";
+	if (! $nav_gradient_top)
+		$nav_gradient_top = "#000";
+	if (! $nav_gradient_bottom)
+		$nav_gradient_bottom = "#000";
+	if (! $nav_active_gradient_top)
+		$nav_active_gradient_top = "#333";
+	if (! $nav_active_gradient_bottom)
+		$nav_active_gradient_bottom = "#111";
+	if (! $nav_bd)
+		$nav_bd = "#111";
+	if (! $nav_icon_colour)
+		$nav_icon_colour = "#999";
+	if (! $nav_active_icon_colour)
+		$nav_active_icon_colour = "#fff";
+	if (! $navmenu_bgchover)
+		$navmenu_bgchover = "#222";
+	if (! $navmenu_bgimage)
+		$navmenu_bgimage = "background-image: none;";
+	if (! $navtabs_borderc)
+		$navtabs_borderc = "#333";
+	if (! $navtabs_fontcolour)
+		$navtabs_fontcolour = "#fff";
+	if (! $navtabs_bgcolour)
+		$navtabs_bgcolour = "#111";
+	if (! $navtabs_linkcolour)
+		$navtabs_linkcolour = "color: #ccc;";
+	if (! $navtabs_linkchover)
+		$navtabs_linkchover = "color: #fff;";
+	if (! $navtabs_bgchover)
+		$navtabs_bgchover = "#222";
+	if (! $navtabs_decohover)
+		$navtabs_decohover = "underline";
+	if (! $link_colour)
+		$link_colour = "#fff";
+	if (! $selected_active_colour)
+		$selected_active_colour = "#fff";
+	if (! $selected_active_deco)
+		$selected_active_deco = "underline";
+	if (! $banner_colour)
+		$banner_colour = "#999";
+	if (! $search_background)
+		$search_background = "#999";
+	if (! $bgcolour)
+		$bgcolour = "#111";
+	if (! $item_colour)
+		$item_colour = "rgba(28,28,28,0.8)";
+	if (! $comment_item_colour)
+		$comment_item_colour = "rgba(18,18,18,0.4)";
+	if (! $comment_border_colour)
+		$comment_border_colour = "rgba(28,28,28,0.8)";
+	if (! $toolicon_colour)
+		$toolicon_colour = '#999';
+	if (! $toolicon_activecolour)
+		$toolicon_activecolour = '#fff';
+	if (! $font_colour)
+		$font_colour = "#ccc";
+	if (! $widget_brdrcolour)
+		$widget_brdrcolour = "#333";
+	if (! $blockquote_colour)
+		$blockquote_colour = "#ccc";
+	if (! $blockquote_bgcolour)
+		$blockquote_bgcolour = "#1e1e1e";
+	if (! $blockquote_bordercolour)
+		$blockquote_bordercolour = "#666";
+	if (! $code_borderc)
+		$code_borderc = "#090909";
+	if (! $code_bgcolour)
+		$code_bgcolour = "#000";
+	if (! $code_txtcolour)
+		$code_txtcolour = "#fff";
+	if (! $pre_borderc)
+		$pre_borderc = "#090909";
+	if (! $pre_bgcolour)
+		$pre_bgcolour = "#000";
+	if (! $pre_txtcolour)
+		$pre_txtcolour = "#fff";
+	if (! $item_bordercolour)
+		$item_bordercolour = "#333";
+	if (! $notif_itemcolour)
+		$notif_itemcolour = "#ccc";
+	if (! $notif_itemhovercolour)
+		$notif_itemhovercolour = "#fff";
+	if (! $acpopup_bgcolour)
+		$acpopup_bgcolour = "#222";
+	if (! $acpopup_bordercolour)
+		$acpopup_bordercolour = "#333";
+	if (! $acpopup_tgbl_bgcolour)
+		$acpopup_tgbl_bgcolour = "#333";
+	if (! $acpopup_hovercolour)
+		$acpopup_hovercolour = "#fff";
+	if (! $editbuttons_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)
+		$dropdown_bgcolour = "#222";
+	if (! $dropdown_textcolour)
+		$dropdown_textcolour = "#ccc";
+	if (! $dropdown_txtcolhover)
+		$dropdown_txtcolhover = "#ddd";
+	if (! $dropdown_bgcolhover)
+		$dropdown_bgcolhover = "#333";
+	if (! $dropdown_bgimghover)
+		$dropdown_bgimghover = "background-image: none;";
+	if (! $dropdown_togglecol)
+		$dropdown_togglecol = "#ccc";
+	if (! $dropdown_togglebgcol)
+		$dropdown_togglebgcol = "#222";
+	if (! $dropdown_bordercol)
+		$dropdown_bordercol = "#222";
+	if (! $preview_backgroundimg)
+		$preview_backgroundimg = "gray_and_black_diagonal_stripes_background_seamless.gif";
+	if (! $notify_bgcolour)
+		$notify_bgcolour = "#000";
+	if (! $notify_linkcolour)
+		$notify_linkcolour = "#FFF";	
+	if (! $notify_bghover)
+		$notify_bghover = "#222";
+	if (! $notify_topmargin)
+		$notify_topmargin = "-1px";
+	if (! $notifyseen_bgcolour)
+		$notifyseen_bgcolour = "#111";
+	if (! $notifyseen_linkcolour)
+		$notifyseen_linkcolour = "#222";
+	if (! $notifyseen_bghover)
+		$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(! $advperm_bgcolour)
+                $advperm_bgcolour = "#1E1E1E";
+        if(! $advperm_bordercol)
+                $advperm_bordercol = "#222";
+        if(! $advperm_gradientcol)
+                $advperm_gradientcol = "#111";
+        if(! $cal_bgcolour)
+                 $cal_bgcolour = "#333";
+        if(! $fancybox_bgcolour)
+                $fancybox_bgcolour = "#1E1E1E";
+	if (!$admintable_hoverbgcol)
+		$admintable_hoverbgcol="#222";
+	if (!$dirpopup_txtcol)
+		$dirpopup_txtcol="#111";
+	if (!$dirpopup_linkcol)
+		$dirpopup_linkcol="#000";
diff --git a/view/theme/redbasic/schema/notred.php b/view/theme/redbasic/schema/notred.php
new file mode 100644
index 000000000..5a6dda336
--- /dev/null
+++ b/view/theme/redbasic/schema/notred.php
@@ -0,0 +1,5 @@
+<?php
+
+	if (! $nav_colour)
+		$nav_colour = "black";
+
diff --git a/view/theme/redbasic/tpl/theme_settings.tpl b/view/theme/redbasic/tpl/theme_settings.tpl
index d0d153e73..70b42b6cd 100644
--- a/view/theme/redbasic/tpl/theme_settings.tpl
+++ b/view/theme/redbasic/tpl/theme_settings.tpl
@@ -1,7 +1,50 @@
-{{inc field_select.tpl with $field=$font_size}}{{endinc}}
+{{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}}
 
-{{inc field_select.tpl with $field=$line_height}}{{endinc}}
+{{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_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}}
+<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_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" />
+	<input type="submit" value="{{$submit}}" class="settings-submit" name="redbasic-settings-submit" />
 </div>
+{{/if}}