Merge pull request #4 from friendica/master

Fork aligned to red master

23 files changed, 442 insertions, 169 deletions

diff --git a/view/css/full.css b/view/css/full.css
index 5819b6b3a..2e710df1d 100644
--- a/view/css/full.css
+++ b/view/css/full.css
@@ -1,6 +1,6 @@
 
 nav {
-	height: 94px;
+	height: 24px;
 	display: block;
 }
 
diff --git a/view/de/messages.po b/view/de/messages.po
index 70d5efa2a..58cc1e25c 100644
--- a/view/de/messages.po
+++ b/view/de/messages.po
@@ -37,7 +37,7 @@ msgstr "Verbergen"
 
 #: ../../include/activities.php:37
 msgid " and "
-msgstr "und"
+msgstr " und "
 
 #: ../../include/activities.php:45
 msgid "public profile"
diff --git a/view/de/strings.php b/view/de/strings.php
index 7d7639966..2aa913484 100644
--- a/view/de/strings.php
+++ b/view/de/strings.php
@@ -7,7 +7,7 @@ function string_plural_select_de($n){
 $a->strings["Visible to everybody"] = "Für jeden sichtbar";
 $a->strings["show"] = "zeigen";
 $a->strings["don't show"] = "Verbergen";
-$a->strings[" and "] = "und";
+$a->strings[" and "] = " und ";
 $a->strings["public profile"] = "öffentliches Profil";
 $a->strings["%1\$s changed %2\$s to “%3\$s”"] = "%1\$s hat %2\$s auf “%3\$s” geändert";
 $a->strings["Visit %1\$s's %2\$s"] = "Besuche %1\$s's %2\$s";
diff --git a/view/en/htconfig.tpl b/view/en/htconfig.tpl
index 4896376e5..28fdd04f0 100644
--- a/view/en/htconfig.tpl
+++ b/view/en/htconfig.tpl
@@ -88,3 +88,14 @@ $a->config['system']['directory_mode']  = DIRECTORY_MODE_NORMAL;
 
 $a->config['system']['theme'] = 'redbasic';
 
+
+// PHP error logging setup
+// Before doing this ensure that the webserver has permission
+// to create and write to php.out in the top level Red directory,
+// or change the name (below) to a file/path where this is allowed.
+
+// Uncomment the following 4 lines to turn on PHP error logging.
+//error_reporting(E_ERROR | E_WARNING | E_PARSE ); 
+//ini_set('error_log','php.out'); 
+//ini_set('log_errors','1'); 
+//ini_set('display_errors', '0');
diff --git a/view/php/theme_init.php b/view/php/theme_init.php
index 8b75bc940..0867c989d 100644
--- a/view/php/theme_init.php
+++ b/view/php/theme_init.php
@@ -25,9 +25,14 @@ head_add_js('library/jquery_ac/friendica.complete.js');
 head_add_js('library/tiptip/jquery.tipTip.minified.js');
 head_add_js('library/jgrowl/jquery.jgrowl_minimized.js');
 head_add_js('library/tinymce/jscripts/tiny_mce/tiny_mce_src.js');
+head_add_js('library/cryptojs/components/core-min.js');
+head_add_js('library/cryptojs/rollups/aes.js');
+head_add_js('library/cryptojs/rollups/rabbit.js');
+head_add_js('library/cryptojs/rollups/tripledes.js');
 head_add_js('js/acl.js');
 head_add_js('js/webtoolkit.base64.js');
 head_add_js('js/main.js');
+head_add_js('js/crypto.js');
 head_add_js('library/jslider/bin/jquery.slider.min.js');
 head_add_js('docready.js');
 head_add_js('library/prettyphoto/js/jquery.prettyPhoto.js');
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 669f73f42..ee3534a11 100644
--- a/view/theme/redbasic/css/style.css
+++ b/view/theme/redbasic/css/style.css
@@ -118,21 +118,31 @@ blockquote {
 	filter:alpha(opacity=100);
 }
 
-nav {background-image: linear-gradient(bottom, $nav_bg_1 26%, $nav_bg_2 82%);
-	      background-image: -o-linear-gradient(bottom, $nav_bg_1 26%, $nav_bg_2 82%);
-	      background-image: -moz-linear-gradient(bottom,$nav_bg_1 26%, $nav_bg_2 82%);
-	      background-image: -webkit-linear-gradient(bottom, $nav_bg_1 26%, $nav_bg_2 82%);
-	      background-image: -ms-linear-gradient(bottom, $nav_bg_1 26%, $nav_bg_2 82%);
+nav {
+	background-image: linear-gradient(bottom, $nav_bg_1 26%, $nav_bg_2 82%);
+	background-image: -o-linear-gradient(bottom, $nav_bg_1 26%, $nav_bg_2 82%);
+	background-image: -moz-linear-gradient(bottom,$nav_bg_1 26%, $nav_bg_2 82%);
+	background-image: -webkit-linear-gradient(bottom, $nav_bg_1 26%, $nav_bg_2 82%);
+	background-image: -ms-linear-gradient(bottom, $nav_bg_1 26%, $nav_bg_2 82%);
+	opacity: $nav_float_min_opacity;
+	filter:alpha(opacity=$nav_percent_min_opacity);
+
 }
 
+/*
 section {width: $section_width;
 }
+*/
+
+nav:hover {
+	background-image: linear-gradient(bottom, $nav_bg_3 26%, $nav_bg_4 82%);
+	background-image: -o-linear-gradient(bottom, $nav_bg_3 26%, $nav_bg_4 82%);
+	background-image: -moz-linear-gradient(bottom, $nav_bg_3 26%, $nav_bg_4 82%);
+	background-image: -webkit-linear-gradient(bottom, $nav_bg_3 26%, $nav_bg_4 82%);
+	background-image: -ms-linear-gradient(bottom, $nav_bg_3 26%, $nav_bg_4 82%);
+	opacity: 1.0;
+	filter:alpha(opacity=100);
 
-nav:hover {background-image: linear-gradient(bottom, $nav_bg_3 26%, $nav_bg_4 82%);
-	      background-image: -o-linear-gradient(bottom, $nav_bg_3 26%, $nav_bg_4 82%);
-	      background-image: -moz-linear-gradient(bottom, $nav_bg_3 26%, $nav_bg_4 82%);
-	      background-image: -webkit-linear-gradient(bottom, $nav_bg_3 26%, $nav_bg_4 82%);
-	      background-image: -ms-linear-gradient(bottom, $nav_bg_3 26%, $nav_bg_4 82%);
 }
 
 
@@ -180,7 +190,7 @@ header #banner {
   text-align: center;
   font-size: 1.4em;
   font-family: tahoma, "Lucida Sans", sans;
-  color: #FFF;
+  color: $banner_colour;
   font-weight: bold;
   margin-top: 1px;
 }
@@ -311,7 +321,9 @@ footer {
 #profile-video, 
 #profile-audio,
 #profile-link,
-#profile-title, 
+#profile-title,
+#profile-expires, 
+#profile-encrypt, 
 #wall-image-upload,
 #wall-file-upload,
 #profile-upload-wrapper,
@@ -922,7 +934,8 @@ footer {
 	font-size: 1.4em;
     left: 105px;
     position: absolute;
-    top: 1px;	
+    top: 1px;
+	color: $toolicon_colour;	
 }
 .comment .wall-item-lock {
 	left: 65px;
@@ -950,17 +963,21 @@ footer {
 	margin-right: 8px;
 	font-size: 1.2em;
 	cursor: pointer;
-	color: #777; 
+	color: $toolicon_colour; 
 }
 
 .item-tool:hover {
-	color: #000; 
+	color: $toolicon_activecolour; 
+}
+
+.drop-icons.item-tool {
+	color: $toolicon_colour;
 }
 
 .like-rotator {
 	float: left;
 	margin: 8px;
-	color: #777;
+	color: $toolicon_colour;
 }
 
 .wall-item-delete-wrapper {
@@ -1007,6 +1024,7 @@ footer {
 
 .thread-wrapper.toplevel_item {
 	width: 92%; 
+	max-width: 1024px;
 }
 
 .wall-item-body {
@@ -1124,6 +1142,14 @@ footer {
 	float: left;
 	margin-left: 15px;
 }
+#profile-expire-wrapper {
+	float: left;
+	margin-left: 15px;
+}
+#profile-encrypt-wrapper {
+	float: left;
+	margin-left: 15px;
+}
 #jot-preview-link {
 	float: left;
 	margin-left: 45px;
@@ -1505,64 +1531,6 @@ 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-end {
 	clear: both;
@@ -1738,7 +1706,7 @@ tr.mceLast {
 }
 
 
-#prvmail-to-label, #prvmail-subject-label, #prvmail-message-label {
+#prvmail-to-label, #prvmail-subject-label, #prvmail-expires-label, #prvmail-message-label {
 	margin-bottom: 10px;
 	margin-top: 20px;
 }
@@ -1751,11 +1719,13 @@ tr.mceLast {
 #prvmail-upload-wrapper,
 #prvmail-attach-wrapper,
 #prvmail-link-wrapper,
+#prvmail-expire-wrapper,
 #prvmail-rotator-wrapper {
 	float: left;
 	margin-top: 10px;
 	margin-right: 10px;
 	width: 24px;
+	cursor: pointer;
 }
 
 #prvmail-end {
@@ -2892,10 +2862,34 @@ div.jGrowl div.info {
 #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; }
+
+.autocomplete-w1 {
+	position:fixed;
+	top:24px;
+}
+
+.autocomplete { 
+	color: $font_colour;
+	border: 1px solid $nav_bg_1;
+	border-top: none;
+	background: #FFF;
+	cursor: pointer;
+	text-align: left;
+	max-height: 350px;
+	overflow: auto;
+	border-bottom-left-radius:$radiuspx;
+	border-bottom-right-radius:$radiuspx;
+}
+
+.autocomplete .selected {
+	background:$bgcolour;
+}
+
+.autocomplete div {
+	padding:2px 5px;
+	white-space:nowrap;
+	overflow:hidden;
+}
 
 #datebrowse-sidebar select {
 	margin-left: 25px;
@@ -3440,12 +3434,12 @@ margin-right: 50px;
 .comment-icon,
 .jot-icons {
 	font-size: 1.2em;
-	color: #777;
+	color: $toolicon_colour;
 }
 
 .comment-icon:hover,
 .jot-icons:hover {
-	color: #000; 
+	color: $toolicon_activecolour; 
 }
 
 .nav-icon {
@@ -3498,4 +3492,8 @@ text-decoration: none;
 
 #menulist {
 	list-style-type: none;
-}
\ No newline at end of file
+}
+
+.savedsearchdrop {
+	opacity: 0;
+}
diff --git a/view/theme/redbasic/js/redbasic.js b/view/theme/redbasic/js/redbasic.js
index e7a682911..a97e906bf 100644
--- a/view/theme/redbasic/js/redbasic.js
+++ b/view/theme/redbasic/js/redbasic.js
@@ -66,24 +66,22 @@ $('.sidebar-group-element').hover(
 	);
 
 
-//$('.saved-search-li a').hover(
-//	function() {
-//		id = $(this).attr('id');
-//		$('#dropicon-' + id).css('visibility','visible');},
-//	function() {
-//		id = $(this).attr('id');
-//		$('#dropicon-' + id).css('visibility','hidden');}
-//	);
-
-//$('.savedsearchterm').hover(
-//	function() {
-//		id = $(this).attr('id');
-//		$('#dropicon-' + id).css('visibility','visible');},
-//
-//	function() {
-//		id = $(this).attr('id');
-//		$('#dropicon-' + id).css('visibility','hidden');
-//	});
+$('.savedsearchdrop').hover(
+	function() {
+		$(this).css('opacity','1.0');},
+	function() {
+		$(this).css('opacity','0');}
+	);
+
+$('.savedsearchterm').hover(
+	function() {
+		id = $(this).attr('id');
+		$('#dropicon-' + id).css('opacity','1.0');},
+
+	function() {
+		id = $(this).attr('id');
+		$('#dropicon-' + id).css('opacity','0');
+	});
 
 });
 
diff --git a/view/theme/redbasic/php/config.php b/view/theme/redbasic/php/config.php
index 053940219..eb583d9bf 100644
--- a/view/theme/redbasic/php/config.php
+++ b/view/theme/redbasic/php/config.php
@@ -3,19 +3,25 @@
 function theme_content(&$a) {
 	if(!local_user()) { return;}
 
-	$schema = get_pconfig(local_user(),'redbasic', 'schema' );
-	$nav_colour = get_pconfig(local_user(),'redbasic', 'nav_colour' );
-	$bgcolour = get_pconfig(local_user(),'redbasic', 'background_colour' );
-	$background_image = get_pconfig(local_user(),'redbasic', 'background_image' );
-	$item_colour = get_pconfig(local_user(),'redbasic', 'item_colour' );
-	$item_opacity = get_pconfig(local_user(),'redbasic', 'item_opacity' );
-	$font_size = get_pconfig(local_user(),'redbasic', 'font_size' );
-	$font_colour = get_pconfig(local_user(),'redbasic', 'font_colour' );
-	$radius = get_pconfig(local_user(),'redbasic', 'radius' );
-	$shadow = get_pconfig(local_user(),'redbasic', 'photo_shadow' );
-	$section_width=get_pconfig(local_user(),"redbasic","section_width");
-	return redbasic_form($a, $schema, $nav_colour, $bgcolour, $background_image, $item_colour, $item_opacity, 
-		$font_size, $font_colour, $radius, $shadow, $section_width);
+	$arr = array();
+
+	$arr['schema'] = get_pconfig(local_user(),'redbasic', 'schema' );
+	$arr['nav_colour'] = get_pconfig(local_user(),'redbasic', 'nav_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['item_opacity'] = get_pconfig(local_user(),'redbasic', 'item_opacity' );
+	$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['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['section_width']=get_pconfig(local_user(),"redbasic","section_width");
+	$arr['nav_min_opacity']=get_pconfig(local_user(),"redbasic","nav_min_opacity");
+	$arr['sloppy_photos']=get_pconfig(local_user(),"redbasic","sloppy_photos");
+	return redbasic_form($a, $arr);
 }
 
 function theme_post(&$a) {
@@ -25,19 +31,26 @@ function theme_post(&$a) {
 		set_pconfig(local_user(), 'redbasic', 'schema', $_POST['redbasic_schema']);
 		set_pconfig(local_user(), 'redbasic', 'nav_colour', $_POST['redbasic_nav_colour']);
 		set_pconfig(local_user(), 'redbasic', 'background_colour', $_POST['redbasic_background_colour']);
+		set_pconfig(local_user(), 'redbasic', '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', 'item_opacity', $_POST['redbasic_item_opacity']);
+		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', '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', 'section_width', $_POST['redbasic_section_width']);
+		set_pconfig(local_user(), 'redbasic', 'nav_min_opacity', $_POST['redbasic_nav_min_opacity']);
+		set_pconfig(local_user(), 'redbasic', 'sloppy_photos', $_POST['redbasic_sloppy_photos']);
 	}
 }
 
-function redbasic_form(&$a, $schema, $nav_colour, $bgcolour, $background_image, $item_colour, $item_opacity, 
-		$font_size, $font_colour, $radius, $shadow, $section_width) {
+
+
+function redbasic_form(&$a, $arr) {
+
 
 	$scheme_choices = array();
 	$scheme_choices["---"] = t("Default");
@@ -52,10 +65,10 @@ function redbasic_form(&$a, $schema, $nav_colour, $bgcolour, $background_image,
 		
 		
 		$nav_colours = array (
-		  '' => 'Scheme Default',
-		  'red' => 'red',
-		  'black' => 'black',	
-		  'silver' => 'silver',	
+		  '' => t('Scheme Default'),
+		  'red' => t('red'),
+		  'black' => t('black'),	
+		  'silver' => t('silver'),	
 		);
 
 if(feature_enabled(local_user(),'expert')) 
@@ -67,17 +80,22 @@ if(feature_enabled(local_user(),'expert'))
 		'$baseurl' => $a->get_baseurl(),
 		'$expert' => $expert,
 		'$title' => t("Theme settings"),
-		'$schema' => array('redbasic_schema', t('Set scheme'), $schema, '', $scheme_choices),
-		'$nav_colour' => array('redbasic_nav_colour', t('Navigation bar colour'), $nav_colour, '', $nav_colours),
-		'$bgcolour' => array('redbasic_background_colour', t('Set the background colour'), $bgcolour),
-		'$background_image' => array('redbasic_background_image', t('Set the background image'), $background_image),
-		'$item_colour' => array('redbasic_item_colour', t('Set the background colour of items'), $item_colour),
-		'$item_opacity' => array('redbasic_item_opacity', t('Set the opacity of items'), $item_opacity),
-		'$font_size' => array('redbasic_font_size', t('Set font-size for posts and comments'), $font_size),
-		'$font_colour' => array('redbasic_font_colour', t('Set font-colour for posts and comments'), $font_colour),
-		'$radius' => array('redbasic_radius', t('Set radius of corners'), $radius),
-		'$shadow' => array('redbasic_shadow', t('Set shadow depth of photos'), $shadow),
-		'$section_width' => array('redbasic_section_width',t('Set width of main section'),$section_width),
+		'$schema' => array('redbasic_schema', t('Set scheme'), $arr['schema'], '', $scheme_choices),
+		'$nav_colour' => array('redbasic_nav_colour', t('Navigation bar colour'), $arr['nav_colour'], '', $nav_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']),
+		'$item_opacity' => array('redbasic_item_opacity', t('Set the opacity of items'), $arr['item_opacity']),
+		'$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']),
+		'$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']),
+		'$section_width' => array('redbasic_section_width',t('Set width of main section'),$arr['section_width']),
+		'$nav_min_opacity' => array('redbasic_nav_min_opacity',t('Set minimum opacity of nav bar - to hide it'),$arr['nav_min_opacity']),
+		'$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 c4bd2e15a..716a2dd9e 100644
--- a/view/theme/redbasic/php/style.php
+++ b/view/theme/redbasic/php/style.php
@@ -12,9 +12,12 @@
 	    $nav_colour = get_pconfig($uid, "redbasic", "nav_colour");	
 
 // Load the owners pconfig
+		$banner_colour = get_pconfig($uid,'redbasic','banner_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");	
 	    $item_opacity = get_pconfig($uid, "redbasic", "item_opacity");	
 	    $font_size = get_pconfig($uid, "redbasic", "font_size");	
@@ -22,16 +25,21 @@
 	    $radius = get_pconfig($uid, "redbasic", "radius");	
 	    $shadow = get_pconfig($uid,"redbasic","photo_shadow");
 	    $section_width=get_pconfig($uid,"redbasic","section_width");
+		$nav_min_opacity=get_pconfig($uid,'redbasic','nav_min_opacity');
+		$sloppy_photos=get_pconfig($uid,'redbasic','sloppy_photos');
 
 // Now load the scheme.  If a value is changed above, we'll keep the settings
 // If not, we'll keep those defined by the schema
 // Setting $scheme to '' wasn't working for some reason, so we'll check it's
 // not --- like the mobile theme does instead.
 
-		if (($schema) && ($schema != '---')) {
+	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 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) {
@@ -52,18 +60,24 @@
 			$nav_bg_3 = "#f00";
 			$nav_bg_4 = "#b00";
 		}
+	if (! $banner_colour)
+		$banner_colour = "fff";
 	if (! $bgcolour)
-		$bgcolour = "fff";
+		$bgcolour = "#f8f8f8";
 	if (! $background_image)
 		$background_image ='';
 	if (! $item_colour)
-		$item_colour = "fff";
+		$item_colour = "#f8f8f8";
+	if (! $toolicon_colour)
+		$toolicon_colour = '#777777';
+	if (! $toolicon_activecolour)
+		$toolicon_activecolour = '#000';
 	if (! $item_opacity)
 		$item_opacity = "1";
 	if (! $font_size)
 		$font_size = "12";
 	if (! $font_colour)
-		$font_colour = "000";
+		$font_colour = "#4D4D4D";
 	if (! $radius)
 		$radius = "5";
 	if (! $shadow)
@@ -72,8 +86,15 @@
 		$active_colour = '#FFFFFF';
     if (! $section_width)
     	$section_width="72%";
-
-		
+	if($nav_min_opacity === false || $nav_min_opacity === '') {
+		$nav_float_min_opacity = 1.0;
+		$nav_percent_min_opacity = 100;
+	}
+	else {
+		$nav_float_min_opacity = (float) $nav_min_opacity;
+		$nav_percent_min_opacity = (int) 100 * $nav_min_opacity;
+	}
+			
 
 // Nav colours have nested values, so we have to define the actual variables
 // used in the CSS from the higher level "red", "black", etc here
@@ -107,19 +128,28 @@ $options = array (
 '$nav_bg_2' => $nav_bg_2,
 '$nav_bg_3' => $nav_bg_3,
 '$nav_bg_4' => $nav_bg_4,
+'$banner_colour' => $banner_colour,
 '$search_background' => $search_background,
 '$bgcolour' => $bgcolour,
 '$background_image' => $background_image,
 '$item_colour' => $item_colour,
 '$item_opacity' => $item_opacity,
+'$toolicon_colour' => $toolicon_colour,
+'$toolicon_activecolour' => $toolicon_activecolour,
 '$font_size' => $font_size,
 '$font_colour' => $font_colour,
 '$radius' => $radius,
 '$shadow' => $shadow,
 '$active_colour' => $active_colour,
-'$section_width' => $section_width
+'$section_width' => $section_width,
+'$nav_float_min_opacity' => $nav_float_min_opacity,
+'$nav_percent_min_opacity' => $nav_percent_min_opacity
 );
 
 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');
+} 
diff --git a/view/theme/redbasic/tpl/theme_settings.tpl b/view/theme/redbasic/tpl/theme_settings.tpl
index 4e4b6002c..237637770 100644
--- a/view/theme/redbasic/tpl/theme_settings.tpl
+++ b/view/theme/redbasic/tpl/theme_settings.tpl
@@ -5,16 +5,21 @@
 
 {{if $expert}}
 {{include file="field_select.tpl" field=$nav_colour}}
+{{include file="field_input.tpl" field=$banner_colour}}
 {{include file="field_input.tpl" field=$bgcolour}}
 {{include file="field_input.tpl" field=$background_image}}
 {{include file="field_input.tpl" field=$item_colour}}
 {{include file="field_input.tpl" field=$item_opacity}}
+{{include file="field_input.tpl" field=$toolicon_colour}}
+{{include file="field_input.tpl" field=$toolicon_activecolour}}
 {{include file="field_input.tpl" field=$font_size}}
 {{include file="field_input.tpl" field=$font_colour}}
 {{include file="field_input.tpl" field=$radius}}
 {{include file="field_input.tpl" field=$shadow}}
 {{include file="field_input.tpl" field=$section_width}}
+{{include file="field_input.tpl" field=$nav_min_opacity}}
+{{include file="field_checkbox.tpl" field=$sloppy_photos}}
 <div class="settings-submit-wrapper">
 	<input type="submit" value="{{$submit}}" class="settings-submit" name="redbasic-settings-submit" />
 </div>
-{{/if}}
\ No newline at end of file
+{{/if}}
diff --git a/view/tpl/conv_item.tpl b/view/tpl/conv_item.tpl
index 095bd0df3..781746b4b 100755
--- a/view/tpl/conv_item.tpl
+++ b/view/tpl/conv_item.tpl
@@ -39,7 +39,7 @@
 		<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.via}} <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>{{/if}}<br />
 
-				<div class="wall-item-ago"  id="wall-item-ago-{{$item.id}}">{{if $item.verified}}<i class="icon-ok" title="{{$item.verified}}"></i>&nbsp;{{/if}}<span class="autotime" title="{{$item.isotime}}">{{$item.localtime}}</span>{{if $item.app}}<span class="item.app">{{$item.str_app}}</span>{{/if}}</div>
+				<div class="wall-item-ago"  id="wall-item-ago-{{$item.id}}">{{if $item.verified}}<i class="icon-ok" title="{{$item.verified}}"></i>&nbsp;{{/if}}<span class="autotime" title="{{$item.isotime}}">{{$item.localtime}}{{if $item.editedtime}} {{$item.editedtime}}{{/if}}</span>{{if $item.app}}<span class="item.app">{{$item.str_app}}</span>{{/if}}</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>
@@ -89,7 +89,7 @@
 			<div id="like-rotator-{{$item.id}}" class="like-rotator"></div>
 
 			<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();" title="{{$item.drop.delete}}" onmouseover="imgbright(this);" onmouseout="imgdull(this);" ><i class="icon-remove drop-icons"></i></a>{{/if}}
+				{{if $item.drop.dropping}}<a href="item/drop/{{$item.id}}" onclick="return confirmDelete();" title="{{$item.drop.delete}}" onmouseover="imgbright(this);" onmouseout="imgdull(this);" ><i class="icon-remove drop-icons item-tool"></i></a>{{/if}}
 			</div>
 				{{if $item.drop.pagedrop}}<input type="checkbox" onclick="checkboxhighlight(this);" title="{{$item.drop.select}}" class="item-select" name="itemselected[]" value="{{$item.id}}" />{{/if}}
 			<div class="wall-item-delete-end"></div>
diff --git a/view/tpl/dir_sort_links.tpl b/view/tpl/dir_sort_links.tpl
index 58498e4d8..d78aec1f5 100644
--- a/view/tpl/dir_sort_links.tpl
+++ b/view/tpl/dir_sort_links.tpl
@@ -1,6 +1,6 @@
 <div class="widget" id="dir_sort_links">
 <h3>{{$header}}</h3>
-<a href="directory?f=&order=">{{$normal}}</a><br />
+<a href="directory?f=&order=normal">{{$normal}}</a><br />
 <a href="directory?f=&order=reverse">{{$reverse}}</a><br />
 <a href="directory?f=&order=date">{{$date}}</a><br />
 </div>
diff --git a/view/tpl/head.tpl b/view/tpl/head.tpl
index 4211eeab3..eb4c6c2ad 100755
--- a/view/tpl/head.tpl
+++ b/view/tpl/head.tpl
@@ -23,6 +23,7 @@
 
 	var updateInterval = {{$update_interval}};
 	var localUser = {{if $local_user}}{{$local_user}}{{else}}false{{/if}};
+	var zid = {{if $zid}}'{{$zid}}'{{else}}null{{/if}};
 
 </script>
 
diff --git a/view/tpl/jot-header.tpl b/view/tpl/jot-header.tpl
index 810ec866f..c3e020619 100755
--- a/view/tpl/jot-header.tpl
+++ b/view/tpl/jot-header.tpl
@@ -191,6 +191,13 @@ function enableOnUser(){
 		}
 	}
 
+	function jotGetExpiry() {
+		reply = prompt("{{$expirewhen}}", $('#jot-expire').val());
+		if(reply && reply.length) {
+			$('#jot-expire').val(reply);
+		}
+	}
+
 	function jotShare(id) {
 		if ($('#jot-popup').length != 0) $('#jot-popup').show();
 
@@ -284,15 +291,131 @@ function enableOnUser(){
 		$('#profile-nolocation-wrapper').hide();
 	}
 
+
+	function addhtmltext(data) {
+		data = h2b(data);
+		addeditortext(data);
+	}
+
+
 	function addeditortext(data) {
-		if(plaintext == 'none') {
+		if(typeof tinyMCE !== "undefined") {
+			tinyMCE.execCommand('mceInsertRawHTML',false,data);
+		}
+		else {
 			var currentText = $("#profile-jot-text").val();
 			$("#profile-jot-text").val(currentText + data);
 		}
-		else
-			tinyMCE.execCommand('mceInsertRawHTML',false,data);
 	}	
 
+    function h2b(s) {
+		var y = s;
+		function rep(re, str) {
+			y = y.replace(re,str);
+		};
+
+		rep(/<a.*?href=\"(.*?)\".*?>(.*?)<\/a>/gi,"[url=$1]$2[/url]");
+		rep(/<span style=\"font-size:(.*?);\">(.*?)<\/span>/gi,"[size=$1]$2[/size]");
+		rep(/<span style=\"color:(.*?);\">(.*?)<\/span>/gi,"[color=$1]$2[/color]");
+		rep(/<font>(.*?)<\/font>/gi,"$1");
+		rep(/<img.*?width=\"(.*?)\".*?height=\"(.*?)\".*?src=\"(.*?)\".*?\/>/gi,"[img=$1x$2]$3[/img]");
+		rep(/<img.*?height=\"(.*?)\".*?width=\"(.*?)\".*?src=\"(.*?)\".*?\/>/gi,"[img=$2x$1]$3[/img]");
+		rep(/<img.*?src=\"(.*?)\".*?height=\"(.*?)\".*?width=\"(.*?)\".*?\/>/gi,"[img=$3x$2]$1[/img]");
+		rep(/<img.*?src=\"(.*?)\".*?width=\"(.*?)\".*?height=\"(.*?)\".*?\/>/gi,"[img=$2x$3]$1[/img]");
+		rep(/<img.*?src=\"(.*?)\".*?\/>/gi,"[img]$1[/img]");
+
+
+		rep(/<ul class=\"listbullet\" style=\"list-style-type\: circle\;\">(.*?)<\/ul>/gi,"[list]$1[/list]");
+		rep(/<ul class=\"listnone\" style=\"list-style-type\: none\;\">(.*?)<\/ul>/gi,"[list=]$1[/list]");
+		rep(/<ul class=\"listdecimal\" style=\"list-style-type\: decimal\;\">(.*?)<\/ul>/gi,"[list=1]$1[/list]");
+		rep(/<ul class=\"listlowerroman\" style=\"list-style-type\: lower-roman\;\">(.*?)<\/ul>/gi,"[list=i]$1[/list]");
+		rep(/<ul class=\"listupperroman\" style=\"list-style-type\: upper-roman\;\">(.*?)<\/ul>/gi,"[list=I]$1[/list]");
+		rep(/<ul class=\"listloweralpha\" style=\"list-style-type\: lower-alpha\;\">(.*?)<\/ul>/gi,"[list=a]$1[/list]");
+		rep(/<ul class=\"listupperalpha\" style=\"list-style-type\: upper-alpha\;\">(.*?)<\/ul>/gi,"[list=A]$1[/list]");
+		rep(/<li>(.*?)<\/li>/gi,"[li]$1[/li]");
+
+		rep(/<code>(.*?)<\/code>/gi,"[code]$1[/code]");
+		rep(/<\/(strong|b)>/gi,"[/b]");
+		rep(/<(strong|b)>/gi,"[b]");
+		rep(/<\/(em|i)>/gi,"[/i]");
+		rep(/<(em|i)>/gi,"[i]");
+		rep(/<\/u>/gi,"[/u]");
+
+
+		rep(/<span style=\"text-decoration: ?underline;\">(.*?)<\/span>/gi,"[u]$1[/u]");
+		rep(/<u>/gi,"[u]");
+		rep(/<blockquote[^>]*>/gi,"[quote]");
+		rep(/<\/blockquote>/gi,"[/quote]");
+		rep(/<hr \/>/gi,"[hr]");
+		rep(/<br (.*?)\/>/gi,"\n");
+		rep(/<br\/>/gi,"\n");
+		rep(/<br>/gi,"\n");
+		rep(/<p>/gi,"");
+		rep(/<\/p>/gi,"\n");
+		rep(/&nbsp;/gi," ");
+		rep(/&quot;/gi,"\"");
+		rep(/&lt;/gi,"<");
+		rep(/&gt;/gi,">");
+		rep(/&amp;/gi,"&");
+
+		return y; 
+	};
+
+
+    function b2h(s) {
+		var y = s;
+		function rep(re, str) {
+			y = y.replace(re,str);
+		};
+
+		rep(/\&/gi,"&amp;");
+		rep(/\</gi,"&lt;");
+		rep(/\>/gi,"&gt;");
+		rep(/\"/gi,"&quot;");
+
+		rep(/\n/gi,"<br />");
+		rep(/\[b\]/gi,"<strong>");
+		rep(/\[\/b\]/gi,"</strong>");
+		rep(/\[i\]/gi,"<em>");
+		rep(/\[\/i\]/gi,"</em>");
+		rep(/\[u\]/gi,"<u>");
+		rep(/\[\/u\]/gi,"</u>");
+		rep(/\[hr\]/gi,"<hr />");
+		rep(/\[url=([^\]]+)\](.*?)\[\/url\]/gi,"<a href=\"$1\">$2</a>");
+		rep(/\[url\](.*?)\[\/url\]/gi,"<a href=\"$1\">$1</a>");
+		rep(/\[img=(.*?)x(.*?)\](.*?)\[\/img\]/gi,"<img width=\"$1\" height=\"$2\" src=\"$3\" />");
+		rep(/\[img\](.*?)\[\/img\]/gi,"<img src=\"$1\" />");
+
+		// FIXME - add zid
+		rep(/\[zrl=([^\]]+)\](.*?)\[\/zrl\]/gi,"<a href=\"$1\">$2</a>");
+		rep(/\[zrl\](.*?)\[\/zrl\]/gi,"<a href=\"$1\">$1</a>");
+		rep(/\[zmg=(.*?)x(.*?)\](.*?)\[\/zmg\]/gi,"<img width=\"$1\" height=\"$2\" src=\"$3\" />");
+		rep(/\[zmg\](.*?)\[\/zmg\]/gi,"<img src=\"$1\" />");
+
+		rep(/\[list\](.*?)\[\/list\]/gi, '<ul class="listbullet" style="list-style-type: circle;">$1</ul>');
+		rep(/\[list=\](.*?)\[\/list\]/gi, '<ul class="listnone" style="list-style-type: none;">$1</ul>');
+		rep(/\[list=1\](.*?)\[\/list\]/gi, '<ul class="listdecimal" style="list-style-type: decimal;">$1</ul>');
+		rep(/\[list=i\](.*?)\[\/list\]/gi,'<ul class="listlowerroman" style="list-style-type: lower-roman;">$1</ul>');
+		rep(/\[list=I\](.*?)\[\/list\]/gi, '<ul class="listupperroman" style="list-style-type: upper-roman;">$1</ul>');
+		rep(/\[list=a\](.*?)\[\/list\]/gi, '<ul class="listloweralpha" style="list-style-type: lower-alpha;">$1</ul>');
+		rep(/\[list=A\](.*?)\[\/list\]/gi, '<ul class="listupperalpha" style="list-style-type: upper-alpha;">$1</ul>');
+		rep(/\[li\](.*?)\[\/li\]/gi, '<li>$1</li>');
+		rep(/\[color=(.*?)\](.*?)\[\/color\]/gi,"<span style=\"color: $1;\">$2</span>");
+		rep(/\[size=(.*?)\](.*?)\[\/size\]/gi,"<span style=\"font-size: $1;\">$2</span>");
+		rep(/\[code\](.*?)\[\/code\]/gi,"<code>$1</code>");
+		rep(/\[quote.*?\](.*?)\[\/quote\]/gi,"<blockquote>$1</blockquote>");
+
+		rep(/\[video\](.*?)\[\/video\]/gi,"<a href=\"$1\">$1</a>");
+		rep(/\[audio\](.*?)\[\/audio\]/gi,"<a href=\"$1\">$1</a>");
+
+		rep(/\[\&amp\;([#a-z0-9]+)\;\]/gi,'&$1;');
+
+		rep(/\<(.*?)(src|href)=\"[^hfm](.*?)\>/gi,'<$1$2="">');
+
+		return y; 
+	};
+
+
 	{{$geotag}}
 
 </script>
diff --git a/view/tpl/jot.tpl b/view/tpl/jot.tpl
index 12978038c..924f7d9bc 100755
--- a/view/tpl/jot.tpl
+++ b/view/tpl/jot.tpl
@@ -5,6 +5,7 @@
 		<input type="hidden" name="profile_uid" value="{{$profile_uid}}" />
 		<input type="hidden" name="return" value="{{$return_path}}" />
 		<input type="hidden" name="location" id="jot-location" value="{{$defloc}}" />
+		<input type="hidden" name="expire" id="jot-expire" value="{{$defexpire}}" />
 		<input type="hidden" name="coord" id="jot-coord" value="" />
 		<input type="hidden" name="post_id" value="{{$post_id}}" />
 		<input type="hidden" name="webpage" value="{{$webpage}}" />
@@ -50,6 +51,14 @@
 	<div id="profile-nolocation-wrapper" style="display: none;" >
 		<i id="profile-nolocation" class="icon-circle-blank jot-icons" title="{{$noloc}}" onclick="jotClearLocation();return false;"></i>
 	</div>
+	<div id="profile-expire-wrapper" style="display: {{$feature_expire}};" >
+		<i id="profile-expires" class="icon-eraser jot-icons" title="{{$expires}}" onclick="jotGetExpiry();return false;"></i>
+	</div> 
+	<div id="profile-encrypt-wrapper" style="display: {{$feature_encrypt}};" >
+		<i id="profile-encrypt" class="icon-key jot-icons" title="{{$encrypt}}" onclick="red_encrypt('{{$cipher}}','#profile-jot-text',$('#profile-jot-text').val());return false;"></i>
+	</div> 
+
+
 	<div id="profile-rotator-wrapper" style="display: {{$visitor}};" >
 		<div id="profile-rotator"></div>
 	</div>  
diff --git a/view/tpl/js_strings.tpl b/view/tpl/js_strings.tpl
index b61c69b90..144ecb17c 100755
--- a/view/tpl/js_strings.tpl
+++ b/view/tpl/js_strings.tpl
@@ -2,13 +2,15 @@
 
 	var aStr = {
 
-		'delitem'   : '{{$delitem}}',
-		'comment'   : '{{$comment}}',
-		'showmore'  : '{{$showmore}}',
-		'showfewer' : '{{$showfewer}}',
-		'pwshort'   : '{{$pwshort}}',
-		'pwnomatch' : '{{$pwnomatch}}',
-		'everybody' : '{{$everybody}}',
+		'delitem'    : '{{$delitem}}',
+		'comment'    : '{{$comment}}',
+		'showmore'   : '{{$showmore}}',
+		'showfewer'  : '{{$showfewer}}',
+		'pwshort'    : '{{$pwshort}}',
+		'pwnomatch'  : '{{$pwnomatch}}',
+		'everybody'  : '{{$everybody}}',
+		'passphrase' : '{{$passphrase}}',
+		'passhint'   : '{{$passhint}}',
 
 		't01' :  {{$t01}},
 		't02' :  {{$t02}},
diff --git a/view/tpl/msg-header.tpl b/view/tpl/msg-header.tpl
index 5e2597605..79f9e23c1 100755
--- a/view/tpl/msg-header.tpl
+++ b/view/tpl/msg-header.tpl
@@ -85,6 +85,13 @@ else
 		}
 	}
 
+	function prvmailGetExpiry() {
+		reply = prompt("{{$expireswhen}}", $('#inp-prvmail-expires').val());
+		if(reply && reply.length) {
+			$('#inp-prvmail-expires').val(reply);
+		}
+	}
+
 	function linkdropper(event) {
 		var linkFound = event.dataTransfer.types.contains("text/uri-list");
 		if(linkFound)
diff --git a/view/tpl/peoplefind.tpl b/view/tpl/peoplefind.tpl
index c3cbb064b..aef341d41 100755
--- a/view/tpl/peoplefind.tpl
+++ b/view/tpl/peoplefind.tpl
@@ -1,16 +1,14 @@
 <div id="peoplefind-sidebar" class="widget">
 	<h3>{{$findpeople}}</h3>
-	<div id="peoplefind-desc">{{$desc}}</div>
+	{{$desc}}
 	<form action="directory" method="post" />
-		<input id="side-peoplefind-url" type="text" name="search" size="24" title="{{$hint}}" /><input id="side-peoplefind-submit" type="submit" name="submit" value="{{$findthem}}" />
+		<input class="icon-search" id="side-peoplefind-url" type="text" name="search" size="24" title="{{$hint}}" placeholder="&#xf002;"/>
+		<input id="side-peoplefind-submit" type="submit" name="submit" value="{{$findthem}}" />
 	</form>
-	{{if $similar}}
-	<div class="side-link" id="side-match-link"><a href="match" >{{$similar}}</a></div>
-	{{/if}}
-	<div class="side-link" id="side-suggest-link"><a href="suggest" >{{$suggest}}</a></div>
-	<div class="side-link" id="side-random-profile-link" ><a href="randprof" >{{$random}}</a></div>
-	{{if $inv}} 
-	<div class="side-link" id="side-invite-link" ><a href="invite" >{{$inv}}</a></div>
-	{{/if}}
+	<br />
+	{{if $similar}}<a href="match" >{{$similar}}</a><br />{{/if}}
+	<a href="suggest" >{{$suggest}}</a><br />
+	<a href="randprof" >{{$random}}</a><br />
+	{{if $inv}}<a href="invite" >{{$inv}}</a>{{/if}}
 </div>
 
diff --git a/view/tpl/photo_top.tpl b/view/tpl/photo_top.tpl
index 902f74232..944928f85 100755
--- a/view/tpl/photo_top.tpl
+++ b/view/tpl/photo_top.tpl
@@ -1,6 +1,6 @@
-<div class="photo-top-image-wrapper lframe" id="photo-top-image-wrapper-{{$photo.id}}">
+<div class="photo-top-image-wrapper lframe {{$photo.twist}}" id="photo-top-image-wrapper-{{$photo.id}}">
 	<a href="{{$photo.link}}" class="photo-top-photo-link" id="photo-top-photo-link-{{$photo.id}}" title="{{$photo.title}}">
-		<img src="{{$photo.src}}" alt="{{$photo.alt}}" title="{{$photo.title}}" class="photo-top-photo{{$photo.twist}}" id="photo-top-photo-{{$photo.id}}" />
+		<img src="{{$photo.src}}" alt="{{$photo.alt}}" title="{{$photo.title}}" class="photo-top-photo" id="photo-top-photo-{{$photo.id}}" />
 	</a>
 	<div class="photo-top-album-name"><a href="{{$photo.album.link}}" class="photo-top-album-link" title="{{$photo.album.alt}}" >{{$photo.album.name}}</a></div>
 </div>
diff --git a/view/tpl/prv_message.tpl b/view/tpl/prv_message.tpl
index d65bc3570..621f56be7 100755
--- a/view/tpl/prv_message.tpl
+++ b/view/tpl/prv_message.tpl
@@ -14,6 +14,8 @@
 {{$select}}
 {{/if}}
 
+<input type="hidden" id="inp-prvmail-expires" name="expires" value="{{$defexpire}}" />
+
 <div id="prvmail-subject-label">{{$subject}}</div>
 <input type="text" size="64" maxlength="255" id="prvmail-subject" name="subject" value="{{$subjtxt}}" {{$readonly}} tabindex="11" />
 
@@ -31,10 +33,15 @@
 		<i id="prvmail-attach" class="icon-paper-clip jot-icons" title="{{$attach}}"></i>
 	</div> 
 
-
 	<div id="prvmail-link-wrapper" >
 		<i id="prvmail-link" class="icon-link jot-icons" title="{{$insert}}" onclick="jotGetLink(); return false;"></i>
 	</div> 
+
+    <div id="prvmail-expire-wrapper" style="display: {{$feature_expire}};" >
+        <i id="prvmail-expires" class="icon-eraser jot-icons" title="{{$expires}}" onclick="prvmailGetExpiry();return false;"></i>
+    </div>
+
+
 	<div id="prvmail-rotator-wrapper" >
 		<img id="prvmail-rotator" src="images/rotator.gif" alt="{{$wait}}" title="{{$wait}}" style="display: none;" />
 	</div> 
diff --git a/view/tpl/safesearch.tpl b/view/tpl/safesearch.tpl
new file mode 100644
index 000000000..e0b2ab538
--- /dev/null
+++ b/view/tpl/safesearch.tpl
@@ -0,0 +1,4 @@
+<div id="directory_safemode" class="widget">
+<h3>{{$safemode}}</h3>
+<a href="toggle_safesearch">{{$toggle}}</a>
+</div>
diff --git a/view/tpl/search_item.tpl b/view/tpl/search_item.tpl
index 5953522dc..853bbfdcd 100755
--- a/view/tpl/search_item.tpl
+++ b/view/tpl/search_item.tpl
@@ -24,8 +24,7 @@
 		</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><br />
-				<div class="wall-item-ago" id="wall-item-ago-{{$item.id}}">{{if $item.verified}}<i class="icon-ok" title="{{$item.verified}}"></i>&nbsp;{{/if}}<span class="autotime" title="{{$item.isotime}}">{{$item.localtime}}</span>{{if $item.app}}<span class="item.app">{{$item.str_app}}</span>{{/if}}</div>
-				
+				<div class="wall-item-ago"  id="wall-item-ago-{{$item.id}}">{{if $item.verified}}<i class="icon-ok" title="{{$item.verified}}"></i>&nbsp;{{/if}}<span class="autotime" title="{{$item.isotime}}">{{$item.localtime}}{{if $item.editedtime}} {{$item.editedtime}}{{/if}}</span>{{if $item.app}}<span class="item.app">{{$item.str_app}}</span>{{/if}}</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>