14 files changed, 527 insertions, 632 deletions
diff --git a/include/group.php b/include/group.php
index fdcdc4416..6568af0c7 100644
--- a/include/group.php
+++ b/include/group.php
@@ -280,10 +280,9 @@ function group_side($every="contacts",$each="group",$edit = false, $group_id = 0
 function expand_groups($a) {
 	if(! (is_array($a) && count($a)))
 		return array();
+	stringify_array_elms($groups);
 	$groups = implode(',', $a);
-
 	$groups = dbesc($groups);
-	stringify_array_elms($groups);
 	$r = q("SELECT xchan FROM `group_member` WHERE `gid` IN ( $groups )");
 	$ret = array();
 	if(count($r))
diff --git a/view/theme/fancyred/php/config.php b/view/theme/fancyred/php/config.php
index 03844c3b6..48035f507 100644
--- a/view/theme/fancyred/php/config.php
+++ b/view/theme/fancyred/php/config.php
@@ -65,7 +65,7 @@ function fancyred_form(&$a, $font_size, $line_height, $colour) {
 		'dark' => 'dark',						
 	);
 
-	$t = file_get_contents( dirname(__file__). "/theme_settings.tpl" );
+	$t = file_get_contents( dirname(__file__). "/../tpl/theme_settings.tpl" );
 	$o .= replace_macros($t, array(
 		'$submit' => t('Submit'),
 		'$baseurl' => $a->get_baseurl(),
diff --git a/view/theme/redbasic/css/mod_admin.css b/view/theme/redbasic/css/mod_admin.css
deleted file mode 100644
index 2a6fdf41a..000000000
--- a/view/theme/redbasic/css/mod_admin.css
+++ /dev/null
@@ -1,62 +0,0 @@
- 
-
-/**
- * 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; }
diff --git a/view/theme/redbasic/css/mod_channel.css b/view/theme/redbasic/css/mod_channel.css
deleted file mode 100644
index 1fd1225d4..000000000
--- a/view/theme/redbasic/css/mod_channel.css
+++ /dev/null
@@ -1,53 +0,0 @@
- 
-#profile-vcard-break {
-	clear: both;
-}
-
-
-#profile-edit-links ul {
-	list-style-type: none;
-}
-
-#profile-edit-links li {
-	margin-top: 10px;
-}
-
-
-.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;
-}
diff --git a/view/theme/redbasic/css/mod_directory.css b/view/theme/redbasic/css/mod_directory.css
deleted file mode 100644
index 6cc8d83cb..000000000
--- a/view/theme/redbasic/css/mod_directory.css
+++ /dev/null
@@ -1,36 +0,0 @@
-/* TODO - FRed only just got a directory.  These are probably all wrong.  For now, just make style.css smaller, discover what we do and don't need later */
-
-.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;
-}
-\ No newline at end of file
diff --git a/view/theme/redbasic/css/mod_events.css b/view/theme/redbasic/css/mod_events.css
deleted file mode 100644
index 1a69059a8..000000000
--- a/view/theme/redbasic/css/mod_events.css
+++ /dev/null
@@ -1,97 +0,0 @@
-
-.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;
-}
diff --git a/view/theme/redbasic/css/mod_help.css b/view/theme/redbasic/css/mod_help.css
deleted file mode 100644
index a4a1c8e20..000000000
--- a/view/theme/redbasic/css/mod_help.css
+++ /dev/null
@@ -1 +0,0 @@
-h1 {color: #f00;}
-\ No newline at end of file
diff --git a/view/theme/redbasic/css/mod_lostpass.css b/view/theme/redbasic/css/mod_lostpass.css
deleted file mode 100644
index 667495c35..000000000
--- a/view/theme/redbasic/css/mod_lostpass.css
+++ /dev/null
@@ -1,3 +0,0 @@
-/* Not really useful for now - we'll need this when people start adding turing numbers and such */
-
-h3 {color: #f00} 
diff --git a/view/theme/redbasic/css/mod_message.css b/view/theme/redbasic/css/mod_message.css
deleted file mode 100644
index 5d38c9b09..000000000
--- a/view/theme/redbasic/css/mod_message.css
+++ /dev/null
@@ -1,78 +0,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;
-}
-\ No newline at end of file
diff --git a/view/theme/redbasic/css/mod_network.css b/view/theme/redbasic/css/mod_network.css
deleted file mode 100644
index 8d1c8b69c..000000000
--- a/view/theme/redbasic/css/mod_network.css
+++ /dev/null
@@ -1 +0,0 @@
- 
diff --git a/view/theme/redbasic/css/mod_photos.css b/view/theme/redbasic/css/mod_photos.css
deleted file mode 100644
index c61ba9f69..000000000
--- a/view/theme/redbasic/css/mod_photos.css
+++ /dev/null
@@ -1,256 +0,0 @@
-/*TODO - there appears to be significant redundancy here */
-
-.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);
-}
-
-
-
-/*.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;
-	text-decoration: none;
-	cursor: pointer;
-}
-
-#photos-upload-perms-menu:hover {
-	color: #0000FF;
-	text-decoration: underline;
-	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;
-}
-\ No newline at end of file
diff --git a/view/theme/redbasic/css/mod_register.css b/view/theme/redbasic/css/mod_register.css
deleted file mode 100644
index e10b54ac3..000000000
--- a/view/theme/redbasic/css/mod_register.css
+++ /dev/null
@@ -1,41 +0,0 @@
-/*TODO - we don't actually want all of this, and we do want some new bits.  For now, just make style.css smaller, we'll clean it up later */
-
-
-#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;
-}
-\ No newline at end of file
diff --git a/view/theme/redbasic/css/style.css b/view/theme/redbasic/css/style.css
index 4f9931057..25e0a8e9d 100644
--- a/view/theme/redbasic/css/style.css
+++ b/view/theme/redbasic/css/style.css
@@ -417,6 +417,44 @@ div.wall-item-content-wrapper.shiny {
 	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;
@@ -605,6 +643,60 @@ input#dfrn-url {
 	font-weight: bold;
 }
 
+
+#profile-vcard-break {
+	clear: both;
+}
+
+
+#profile-edit-links ul {
+	list-style-type: none;
+}
+
+#profile-edit-links li {
+	margin-top: 10px;
+}
+
+
+.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;
+}
+
 #profile-extra-links {
 	clear: both;
 	margin-top: 10px;
@@ -1417,6 +1509,41 @@ margin: 15px;
 	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;
@@ -1787,7 +1914,262 @@ tr.mceLast {
     margin-left: 5px;
 }
 
+/*TODO - there appears to be significant redundancy here */
+
+.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);
+}
+
+
+
+/*.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;
+	text-decoration: none;
+	cursor: pointer;
+}
+
+#photos-upload-perms-menu:hover {
+	color: #0000FF;
+	text-decoration: underline;
+	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 {
@@ -1876,6 +2258,83 @@ a.mail-list-link {
 
 
 
+/*
+*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;
 }
@@ -2666,6 +3125,71 @@ 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
  */
diff --git a/view/theme/redbasic/php/config.php b/view/theme/redbasic/php/config.php
index dd82f8ec3..1ca9cc5ed 100644
--- a/view/theme/redbasic/php/config.php
+++ b/view/theme/redbasic/php/config.php
@@ -65,7 +65,7 @@ function redbasic_form(&$a, $font_size, $line_height, $colour) {
 		'dark' => 'dark',						
 	);
 
-	$t = file_get_contents( dirname(__file__). "/theme_settings.tpl" );
+	$t = file_get_contents( dirname(__file__). "/../tpl/theme_settings.tpl" );
 	$o .= replace_macros($t, array(
 		'$submit' => t('Submit'),
 		'$baseurl' => $a->get_baseurl(),