Merge branch 'master' of git://github.com/friendica/friendica

380 files changed, 12285 insertions, 21533 deletions

diff --git a/view/theme/cleanzero/cleanzero-green/style.css b/view/theme/cleanzero/cleanzero-green/style.css
new file mode 100644
index 000000000..73feb5e60
--- /dev/null
+++ b/view/theme/cleanzero/cleanzero-green/style.css
@@ -0,0 +1,127 @@
+@import url('../greenzero/style.css');
+body {background-image:none;
+
+}
+
+.wall-item-content-wrapper {
+	  border-top: 1px solid #ccc;
+//border-top:none;
+border-left:none;
+border-right:none;
+border-radius:0px;
+//border:none;
+	//background: #f8f8f8 !important;
+}
+
+.wall-item-content-wrapper.comment {
+	// background: #f8f8f8 !important;
+	// border-left: 1px solid #ccc;
+	 border-top: 1px solid #ccc;
+border-left:none;
+border-right:none;
+border-radius:0px;
+ }
+
+ .wall-item-tools {
+// border-top: 1px solid #ccc;	
+//  background: #f8f8f8 !important;
+background: #ffffff !important;
+ }
+
+.comment-edit-text-empty, .comment-edit-text-full {
+	border: 1px solid #ccc;
+	border-left: 1px solid #EEE;
+	background: #ffffff;
+}
+
+.comment-edit-wrapper, .comment-wwedit-wrapper {
+	// background: #ffffff; !important;
+//background: #f8f8f8 !important;
+}
+
+
+
+
+
+section {
+	 margin: 0px 10%;
+margin-right:12%;
+	background-image:none;
+}
+
+aside {
+	margin-left: 10%;
+	background-image:none;
+}
+nav {
+	margin-left: 32px;
+	margin-right: 5%;
+
+}
+
+nav #site-location {
+	top: 80px;
+	right: 5%;
+
+}
+
+.wall-item-photo, .photo, .contact-block-img, .my-comment-photo {
+	border-radius: 3px;
+	-moz-border-radius: 3px;
+}
+
+.tabs {	background-image:none; 
+
+}
+.tab.active {
+	padding: 3px;
+	-moz-border-radius: 3px;
+	border-radius: 3px;	
+	border: 1px solid #CCCCCC;
+	//background: #F8F8F8;
+	font-weight: bold;
+}
+.tab { margin-right: 1px ;
+
+}
+
+#group-sidebar {
+	margin-bottom: 10px;
+	border:none;
+}
+
+#nets-sidebar {
+	margin-bottom: 10px;
+	border:none;
+}
+
+#saved-search-list {
+	border:none;
+}
+blockquote {
+	//background-color: #f8f8f8;
+	border: 1px solid #ccc;
+	-moz-border-radius: 3px;
+	
+	border-radius: 3px;
+}
+.widget { 
+border: none;
+}
+
+
+.wall-item-content {
+max-height: 20000px;
+overflow: none;
+}
+
+.nav-commlink, .nav-login-link {
+margin-top: 67px;
+height: 15px;
+float:left;
+padding: 6px 3px;
+}
+
+nav .nav-link {
+	//float: left;
+}
\ No newline at end of file
diff --git a/view/theme/cleanzero/cleanzero-purple/style.css b/view/theme/cleanzero/cleanzero-purple/style.css
new file mode 100644
index 000000000..1de6e076e
--- /dev/null
+++ b/view/theme/cleanzero/cleanzero-purple/style.css
@@ -0,0 +1,127 @@
+@import url('../purplezero/style.css');
+body {background-image:none;
+
+}
+
+.wall-item-content-wrapper {
+	  border-top: 1px solid #ccc;
+//border-top:none;
+border-left:none;
+border-right:none;
+border-radius:0px;
+//border:none;
+	//background: #f8f8f8 !important;
+}
+
+.wall-item-content-wrapper.comment {
+	// background: #f8f8f8 !important;
+	// border-left: 1px solid #ccc;
+	 border-top: 1px solid #ccc;
+border-left:none;
+border-right:none;
+border-radius:0px;
+ }
+
+ .wall-item-tools {
+// border-top: 1px solid #ccc;	
+//  background: #f8f8f8 !important;
+background: #ffffff !important;
+ }
+
+.comment-edit-text-empty, .comment-edit-text-full {
+	border: 1px solid #ccc;
+	border-left: 1px solid #EEE;
+	background: #ffffff;
+}
+
+.comment-edit-wrapper, .comment-wwedit-wrapper {
+	// background: #ffffff; !important;
+// background: #f8f8f8 !important;
+}
+
+
+
+
+
+section {
+	 margin: 0px 10%;
+margin-right:12%;
+	background-image:none;
+}
+
+aside {
+	margin-left: 10%;
+	background-image:none;
+}
+nav {
+	margin-left: 32px;
+	margin-right: 5%;
+
+}
+
+nav #site-location {
+	top: 80px;
+	right: 5%;
+
+}
+
+.wall-item-photo, .photo, .contact-block-img, .my-comment-photo {
+	border-radius: 3px;
+	-moz-border-radius: 3px;
+}
+
+.tabs {	background-image:none; 
+
+}
+.tab.active {
+	padding: 3px;
+	-moz-border-radius: 3px;
+	border-radius: 3px;	
+	border: 1px solid #CCCCCC;
+	// background: #F8F8F8;
+	font-weight: bold;
+}
+.tab { margin-right: 1px ;
+
+}
+
+#group-sidebar {
+	margin-bottom: 10px;
+	border:none;
+}
+
+#nets-sidebar {
+	margin-bottom: 10px;
+	border:none;
+}
+
+#saved-search-list {
+	border:none;
+}
+blockquote {
+	background-color: #f8f8f8;
+	border: 1px solid #ccc;
+	-moz-border-radius: 3px;
+	
+	border-radius: 3px;
+}
+.widget { 
+border: none;
+}
+
+
+.wall-item-content {
+max-height: 20000px;
+overflow: none;
+}
+
+.nav-commlink, .nav-login-link {
+margin-top: 67px;
+height: 15px;
+float:left;
+padding: 6px 3px;
+}
+
+nav .nav-link {
+	//float: left;
+}
\ No newline at end of file
diff --git a/view/theme/cleanzero/cleanzero/style.css b/view/theme/cleanzero/cleanzero/style.css
new file mode 100644
index 000000000..3efb8a25c
--- /dev/null
+++ b/view/theme/cleanzero/cleanzero/style.css
@@ -0,0 +1,127 @@
+@import url('../duepuntozero/style.css');
+body {background-image:none;
+
+}
+
+.wall-item-content-wrapper {
+	  border-top: 1px solid #ccc;
+//border-top:none;
+border-left:none;
+border-right:none;
+border-radius:0px;
+//border:none;
+	//background: #f8f8f8 !important;
+}
+
+.wall-item-content-wrapper.comment {
+	background: #f8f8f8 !important;
+	// border-left: 1px solid #ccc;
+	 border-top: 1px solid #ccc;
+border-left:none;
+border-right:none;
+border-radius:0px;
+ }
+
+ .wall-item-tools {
+// border-top: 1px solid #ccc;	
+//  background: #f8f8f8 !important;
+background: #ffffff !important;
+ }
+
+.comment-edit-text-empty, .comment-edit-text-full {
+	border: 1px solid #ccc;
+	border-left: 1px solid #EEE;
+	background: #ffffff;
+}
+
+.comment-edit-wrapper, .comment-wwedit-wrapper {
+	// background: #ffffff; !important;
+background: #f8f8f8 !important;
+}
+
+
+
+
+
+section {
+	 margin: 0px 10%;
+margin-right:12%;
+	background-image:none;
+}
+
+aside {
+	margin-left: 10%;
+	background-image:none;
+}
+nav {
+	margin-left: 32px;
+	margin-right: 5%;
+
+}
+
+nav #site-location {
+	top: 80px;
+	right: 5%;
+
+}
+
+.wall-item-photo, .photo, .contact-block-img, .my-comment-photo {
+	border-radius: 3px;
+	-moz-border-radius: 3px;
+}
+
+.tabs {	background-image:none; 
+
+}
+.tab.active {
+	padding: 3px;
+	-moz-border-radius: 3px;
+	border-radius: 3px;	
+	border: 1px solid #CCCCCC;
+	background: #F8F8F8;
+	font-weight: bold;
+}
+.tab { margin-right: 1px ;
+
+}
+
+#group-sidebar {
+	margin-bottom: 10px;
+	border:none;
+}
+
+#nets-sidebar {
+	margin-bottom: 10px;
+	border:none;
+}
+
+#saved-search-list {
+	border:none;
+}
+blockquote {
+	background-color: #f8f8f8;
+	border: 1px solid #ccc;
+	-moz-border-radius: 3px;
+	
+	border-radius: 3px;
+}
+.widget { 
+border: none;
+}
+
+
+.wall-item-content {
+max-height: 20000px;
+overflow: none;
+}
+
+.nav-commlink, .nav-login-link {
+margin-top: 67px;
+height: 15px;
+float:left;
+padding: 6px 3px;
+}
+
+nav .nav-link {
+	//float: left;
+}
\ No newline at end of file
diff --git a/view/theme/cleanzero/config.php b/view/theme/cleanzero/config.php
new file mode 100644
index 000000000..7982a75c5
--- /dev/null
+++ b/view/theme/cleanzero/config.php
@@ -0,0 +1,79 @@
+<?php
+/**
+ * Theme settings
+ */
+
+
+
+function theme_content(&$a){
+	if(!local_user())
+		return;		
+	
+	$resize = get_pconfig(local_user(), 'cleanzero', 'resize' );
+	$color = get_pconfig(local_user(), 'cleanzero', 'color' );
+       $font_size = get_pconfig(local_user(), 'cleanzero', 'font_size' );
+	
+	return cleanzero_form($a,$color,$font_size,$resize);
+}
+
+function theme_post(&$a){
+	if(! local_user())
+		return;
+	
+	if (isset($_POST['cleanzero-settings-submit'])){
+		set_pconfig(local_user(), 'cleanzero', 'resize', $_POST['cleanzero_resize']);	
+		set_pconfig(local_user(), 'cleanzero', 'color', $_POST['cleanzero_color']);
+		set_pconfig(local_user(), 'cleanzero', 'font_size', $_POST['cleanzero_font_size']);
+	}
+}
+
+
+function theme_admin(&$a){
+	$resize = get_config('cleanzero', 'resize' );
+	$color = get_config('cleanzero', 'color' );
+	$font_size = get_config('cleanzero', 'font_size' );
+	
+	return cleanzero_form($a,$color,$font_size,$resize);
+}
+
+function theme_admin_post(&$a){
+	if (isset($_POST['cleanzero-settings-submit'])){
+		set_config('cleanzero', 'resize', $_POST['cleanzero_resize']);
+		set_config('cleanzero', 'color', $_POST['cleanzero_color']);
+		set_config('cleanzero', 'font_size', $_POST['cleanzero_font_size']);
+	}
+}
+
+
+function cleanzero_form(&$a, $color,$font_size,$resize){
+	$colors = array(
+		"cleanzero"=>"cleanzero", 
+		"cleanzero-green"=>"green",
+		"cleanzero-purple"=>"purple"
+	);
+	$font_sizes = array(
+		'12'=>'12',
+		"---"=>"---",
+		"16"=>"16",		
+		"14"=>"14",
+		'10'=>'10',
+		);
+	$resizes = array(
+		"0"=>"0 (no resizing)",
+		"600"=>"1 (600px)",
+		"300"=>"2 (300px)",
+		"250"=>"3 (250px)",
+		"150"=>"4 (150px)",
+	       );
+	
+	$t = file_get_contents( dirname(__file__). "/theme_settings.tpl" );
+	$o .= replace_macros($t, array(
+		'$submit' => t('Submit'),
+		'$baseurl' => $a->get_baseurl(),
+		'$title' => t("Theme settings"),
+		'$resize' => array('cleanzero_resize',t ('Set resize level for images in posts and comments (width and height)'),$resize,'',$resizes),
+		'$font_size' => array('cleanzero_font_size', t('Set font-size for posts and comments'), $font_size, '', $font_sizes),
+		'$color' => array('cleanzero_color', t('Color scheme'), $color, '', $colors),
+	));
+	return $o;
+}
diff --git a/view/theme/diabook/diabook-aerith/js/jquery.ae.image.resize.js b/view/theme/cleanzero/js/jquery.ae.image.resize.js
index bac09cd45..bac09cd45 100644
--- a/view/theme/diabook/diabook-aerith/js/jquery.ae.image.resize.js
+++ b/view/theme/cleanzero/js/jquery.ae.image.resize.js
diff --git a/view/theme/diabook/diabook-aerith/js/jquery.ae.image.resize.min.js b/view/theme/cleanzero/js/jquery.ae.image.resize.min.js
index 16c30b123..16c30b123 100644
--- a/view/theme/diabook/diabook-aerith/js/jquery.ae.image.resize.min.js
+++ b/view/theme/cleanzero/js/jquery.ae.image.resize.min.js
diff --git a/view/theme/cleanzero/nav.tpl b/view/theme/cleanzero/nav.tpl
new file mode 100644
index 000000000..4dacf3858
--- /dev/null
+++ b/view/theme/cleanzero/nav.tpl
@@ -0,0 +1,71 @@
+<nav>
+	$langselector
+
+	<div id="site-location">$sitelocation</div>
+
+	{{ if $nav.logout }}<a id="nav-logout-link" class="nav-link $nav.logout.2" href="$nav.logout.0" title="$nav.logout.3" >$nav.logout.1</a> {{ endif }}
+	{{ if $nav.login }}<a id="nav-login-link" class="nav-login-link $nav.login.2" href="$nav.login.0" title="$nav.login.3" >$nav.login.1</a> {{ endif }}
+
+	<span id="nav-link-wrapper" >
+
+	{{ if $nav.register }}<a id="nav-register-link" class="nav-commlink $nav.register.2 $sel.register" href="$nav.register.0" title="$nav.register.3" >$nav.register.1</a>{{ endif }}
+		
+	{{ if $nav.help }} <a id="nav-help-link" class="nav-link $nav.help.2" target="friendika-help" href="$nav.help.0" title="$nav.help.3" >$nav.help.1</a>{{ endif }}
+		
+	{{ if $nav.apps }}<a id="nav-apps-link" class="nav-link $nav.apps.2" href="$nav.apps.0" title="$nav.apps.3" >$nav.apps.1</a>{{ endif }}
+
+	<a id="nav-search-link" class="nav-link $nav.search.2" href="$nav.search.0" title="$nav.search.3" >$nav.search.1</a>
+	<a id="nav-directory-link" class="nav-link $nav.directory.2" href="$nav.directory.0" title="$nav.directory.3" >$nav.directory.1</a>
+
+	{{ if $nav.admin }}<a id="nav-admin-link" class="nav-link $nav.admin.2" href="$nav.admin.0" title="$nav.admin.3" >$nav.admin.1</a>{{ endif }}
+
+	{{ if $nav.network }}
+	<a id="nav-network-link" class="nav-commlink $nav.network.2 $sel.network" href="$nav.network.0" title="$nav.network.3" >$nav.network.1</a>
+	<span id="net-update" class="nav-ajax-left"></span>
+	{{ endif }}
+	{{ if $nav.home }}
+	<a id="nav-home-link" class="nav-commlink $nav.home.2 $sel.home" href="$nav.home.0" title="$nav.home.3" >$nav.home.1</a>
+	<span id="home-update" class="nav-ajax-left"></span>
+	{{ endif }}
+
+	{{ if $nav.introductions }}
+	<a id="nav-notify-link" class="nav-commlink $nav.introductions.2 $sel.introductions" href="$nav.introductions.0" title="$nav.introductions.3" >$nav.introductions.1</a>
+	<span id="intro-update" class="nav-ajax-left"></span>
+	{{ endif }}
+	{{ if $nav.messages }}
+	<a id="nav-messages-link" class="nav-commlink $nav.messages.2 $sel.messages" href="$nav.messages.0" title="$nav.messages.3" >$nav.messages.1</a>
+	<span id="mail-update" class="nav-ajax-left"></span>
+	{{ endif }}
+
+
+
+
+
+		{{ if $nav.notifications }}
+			<a id="nav-notifications-linkmenu" class="nav-commlink" href="$nav.notifications.0" rel="#nav-notifications-menu" title="$nav.notifications.1">$nav.notifications.1</a>
+				<span id="notify-update" class="nav-ajax-left"></span>
+				<ul id="nav-notifications-menu" class="menu-popup">
+					<li id="nav-notifications-see-all"><a href="$nav.notifications.all.0">$nav.notifications.all.1</a></li>
+					<li id="nav-notifications-mark-all"><a href="#" onclick="notifyMarkAll(); return false;">$nav.notifications.mark.1</a></li>
+					<li class="empty">$emptynotifications</li>
+				</ul>
+		{{ endif }}		
+
+	{{ if $nav.settings }}<a id="nav-settings-link" class="nav-link $nav.settings.2" href="$nav.settings.0" title="$nav.settings.3">$nav.settings.1</a>{{ endif }}
+	{{ if $nav.profiles }}<a id="nav-profiles-link" class="nav-link $nav.profiles.2" href="$nav.profiles.0" title="$nav.profiles.3" >$nav.profiles.1</a>{{ endif }}
+
+	{{ if $nav.contacts }}<a id="nav-contacts-link" class="nav-link $nav.contacts.2" href="$nav.contacts.0" title="$nav.contacts.3" >$nav.contacts.1</a>{{ endif }}
+
+
+	{{ if $nav.manage }}<a id="nav-manage-link" class="nav-link $nav.manage.2 $sel.manage" href="$nav.manage.0" title="$nav.manage.3">$nav.manage.1</a>{{ endif }}
+	{{ if $nav.community }}
+	<a id="nav-community-link" class="nav-link $nav.community.2 $sel.community" href="$nav.community.0" title="$nav.community.3" >$nav.community.1</a>
+	{{ endif }}
+	</span>
+	<span id="nav-end"></span>
+	<span id="banner">$banner</span>
+</nav>
+
+<ul id="nav-notifications-template" style="display:none;" rel="template">
+	<li class="{4}"><a href="{0}"><img src="{1}" height="24" width="24" alt="" />{2} <span class="notif-when">{3}</span></a></li>
+</ul>
diff --git a/view/theme/cleanzero/screenshot.png b/view/theme/cleanzero/screenshot.png
new file mode 100644
index 000000000..d259e2e4d
--- /dev/null
+++ b/view/theme/cleanzero/screenshot.png
diff --git a/view/theme/cleanzero/style.css b/view/theme/cleanzero/style.css
new file mode 100644
index 000000000..3efb8a25c
--- /dev/null
+++ b/view/theme/cleanzero/style.css
@@ -0,0 +1,127 @@
+@import url('../duepuntozero/style.css');
+body {background-image:none;
+
+}
+
+.wall-item-content-wrapper {
+	  border-top: 1px solid #ccc;
+//border-top:none;
+border-left:none;
+border-right:none;
+border-radius:0px;
+//border:none;
+	//background: #f8f8f8 !important;
+}
+
+.wall-item-content-wrapper.comment {
+	background: #f8f8f8 !important;
+	// border-left: 1px solid #ccc;
+	 border-top: 1px solid #ccc;
+border-left:none;
+border-right:none;
+border-radius:0px;
+ }
+
+ .wall-item-tools {
+// border-top: 1px solid #ccc;	
+//  background: #f8f8f8 !important;
+background: #ffffff !important;
+ }
+
+.comment-edit-text-empty, .comment-edit-text-full {
+	border: 1px solid #ccc;
+	border-left: 1px solid #EEE;
+	background: #ffffff;
+}
+
+.comment-edit-wrapper, .comment-wwedit-wrapper {
+	// background: #ffffff; !important;
+background: #f8f8f8 !important;
+}
+
+
+
+
+
+section {
+	 margin: 0px 10%;
+margin-right:12%;
+	background-image:none;
+}
+
+aside {
+	margin-left: 10%;
+	background-image:none;
+}
+nav {
+	margin-left: 32px;
+	margin-right: 5%;
+
+}
+
+nav #site-location {
+	top: 80px;
+	right: 5%;
+
+}
+
+.wall-item-photo, .photo, .contact-block-img, .my-comment-photo {
+	border-radius: 3px;
+	-moz-border-radius: 3px;
+}
+
+.tabs {	background-image:none; 
+
+}
+.tab.active {
+	padding: 3px;
+	-moz-border-radius: 3px;
+	border-radius: 3px;	
+	border: 1px solid #CCCCCC;
+	background: #F8F8F8;
+	font-weight: bold;
+}
+.tab { margin-right: 1px ;
+
+}
+
+#group-sidebar {
+	margin-bottom: 10px;
+	border:none;
+}
+
+#nets-sidebar {
+	margin-bottom: 10px;
+	border:none;
+}
+
+#saved-search-list {
+	border:none;
+}
+blockquote {
+	background-color: #f8f8f8;
+	border: 1px solid #ccc;
+	-moz-border-radius: 3px;
+	
+	border-radius: 3px;
+}
+.widget { 
+border: none;
+}
+
+
+.wall-item-content {
+max-height: 20000px;
+overflow: none;
+}
+
+.nav-commlink, .nav-login-link {
+margin-top: 67px;
+height: 15px;
+float:left;
+padding: 6px 3px;
+}
+
+nav .nav-link {
+	//float: left;
+}
\ No newline at end of file
diff --git a/view/theme/cleanzero/style.php b/view/theme/cleanzero/style.php
new file mode 100644
index 000000000..b820d3b7a
--- /dev/null
+++ b/view/theme/cleanzero/style.php
@@ -0,0 +1,71 @@
+<?php
+	$color=false;
+	$cleanzero_font_size=false;
+
+	$site_color = get_config("cleanzero","color");
+	$site_cleanzero_font_size = get_config("cleanzero", "font_size" );
+
+	
+	if (local_user()) {
+		$color = get_pconfig(local_user(), "cleanzero","color");
+		$cleanzero_font_size = get_pconfig(local_user(), "cleanzero", "font_size");
+	
+	}
+	
+	if ($color===false) $color=$site_color;
+	if ($color===false) $color="cleanzero";
+	if ($cleanzero_font_size===false) $cleanzero_font_size=$site_cleanzero_font_size;
+
+	
+		
+	if (file_exists("$THEMEPATH/$color/style.css")){
+		echo file_get_contents("$THEMEPATH/$color/style.css");
+	}
+
+
+
+	if($cleanzero_font_size == "16"){
+		echo "
+			.wall-item-content-wrapper {
+  					font-size: 16px;
+  					}
+  					
+			.wall-item-content-wrapper.comment {
+  					font-size: 16px;
+  					}
+		";  
+       }
+       if($cleanzero_font_size == "14"){
+		echo "
+			.wall-item-content-wrapper {
+  					font-size: 14px;
+  					}
+  					
+			.wall-item-content-wrapper.comment {
+  					font-size: 14px;
+  					}
+		";
+	}	
+	if($cleanzero_font_size == "12"){
+		echo "
+			.wall-item-content-wrapper {
+  					font-size: 12px;
+  					}
+  					
+			.wall-item-content-wrapper.comment {
+  					font-size: 12px;
+  					}
+		";
+	}
+	if($cleanzero_font_size == "10"){
+		echo "
+			.wall-item-content-wrapper {
+  					font-size: 10px;
+  					}
+  					
+			.wall-item-content-wrapper.comment {
+  					font-size: 10px;
+  					}
+		";
+	}
+
diff --git a/view/theme/cleanzero/theme.php b/view/theme/cleanzero/theme.php
new file mode 100644
index 000000000..cc924539e
--- /dev/null
+++ b/view/theme/cleanzero/theme.php
@@ -0,0 +1,114 @@
+<?php
+/*
+ * Name: cleanzero
+ * Description: Theme with clean design derived from the zero theme family. Including options to set color schemes, font sizes and resizing of images in posts 
+ * Version:
+ * Author: Christian Vogeley (https://christian-vogeley.de/profile/christian)
+ */
+$a->theme_info = array(
+  'extends' => 'duepuntozero',
+);
+function cleanzero_init(&$a) {
+$a->page['htmlhead'] .= <<< EOT
+<script>
+
+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(id) {
+	$(".comment-edit-bb-" + id).show();
+}
+function cmtBbClose(comment, id) {
+	$(".comment-edit-bb-" + id).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');}
+	);
+
+});
+
+
+</script>
+EOT;
+// get resize configuration
+
+$resize=false;
+$site_resize = get_config('cleanzero', 'resize' );
+if(local_user()) $resize = get_pconfig(local_user(), 'cleanzero', 'resize' );
+
+if ($resize===false) $resize=$site_resize;
+if ($resize===false) $resize=0;
+
+if (intval($resize) > 0) {
+//load jquery.ae.image.resize.js
+$imageresizeJS = $a->get_baseurl($ssl_state)."/view/theme/cleanzero/js/jquery.ae.image.resize.js";
+$a->page['htmlhead'] .= sprintf('<script language="JavaScript" src="%s" ></script>', $imageresizeJS);
+$a->page['htmlhead'] .= '
+<script>
+
+ $(function() {
+	$(".wall-item-content-wrapper  img").aeImageResize({height: '.$resize.', width: '.$resize.'});
+  });
+</script>';}
+}
diff --git a/view/theme/diabook/diabook-blue/theme_settings.tpl b/view/theme/cleanzero/theme_settings.tpl
index 0e5f4eb21..07e7cba05 100644
--- a/view/theme/diabook/diabook-blue/theme_settings.tpl
+++ b/view/theme/cleanzero/theme_settings.tpl
@@ -1,10 +1,10 @@
+{{inc field_select.tpl with $field=$color}}{{endinc}}
 {{inc field_select.tpl with $field=$font_size}}{{endinc}}
+{{inc field_select.tpl with $field=$resize}}{{endinc}}
 
-{{inc field_select.tpl with $field=$line_height}}{{endinc}}
 
-{{inc field_select.tpl with $field=$resolution}}{{endinc}}
 
 <div class="settings-submit-wrapper">
-	<input type="submit" value="$submit" class="settings-submit" name="diabook-blue-settings-submit" />
+	<input type="submit" value="$submit" class="settings-submit" name="cleanzero-settings-submit" />
 </div>
 
diff --git a/view/theme/darkzero-NS/editicons.png b/view/theme/darkzero-NS/editicons.png
new file mode 100644
index 000000000..171a40876
--- /dev/null
+++ b/view/theme/darkzero-NS/editicons.png
diff --git a/view/theme/darkzero-NS/theme.php b/view/theme/darkzero-NS/theme.php
index 6c1aa7f12..211c552c5 100644
--- a/view/theme/darkzero-NS/theme.php
+++ b/view/theme/darkzero-NS/theme.php
@@ -14,6 +14,42 @@ $a->theme_info = array(
 function darkzero_NS_init(&$a) {
 $a->page['htmlhead'] .= <<< EOT
 <script>
+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(id) {
+	$(".comment-edit-bb-" + id).show();
+}
+function cmtBbClose(id) {
+	$(".comment-edit-bb-" + id).hide();
+}
 $(document).ready(function() {
 
 $('html').click(function() { $("#nav-notifications-menu" ).hide(); });
diff --git a/view/theme/darkzero/editicons.png b/view/theme/darkzero/editicons.png
new file mode 100644
index 000000000..171a40876
--- /dev/null
+++ b/view/theme/darkzero/editicons.png
diff --git a/view/theme/darkzero/theme.php b/view/theme/darkzero/theme.php
index bbba3ef74..e6b469bff 100644
--- a/view/theme/darkzero/theme.php
+++ b/view/theme/darkzero/theme.php
@@ -15,6 +15,43 @@ $a->theme_info = array(
 function darkzero_init(&$a) {
 $a->page['htmlhead'] .= <<< EOT
 <script>
+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(id) {
+	$(".comment-edit-bb-" + id).show();
+}
+function cmtBbClose(id) {
+	$(".comment-edit-bb-" + id).hide();
+}
+
 $(document).ready(function() {
 
 $('html').click(function() { $("#nav-notifications-menu" ).hide(); });
diff --git a/view/theme/diabook/admin_site.tpl b/view/theme/diabook/admin_site.tpl
index 33d0f508c..dd89b81a9 100644
--- a/view/theme/diabook/admin_site.tpl
+++ b/view/theme/diabook/admin_site.tpl
@@ -8,7 +8,7 @@
 	<h1>$title - $page</h1>
 	
 	<form action="$baseurl/admin/site" method="post">
-	
+	    <input type='hidden' name='form_security_token' value='$form_security_token'>
 	{{ inc field_input.tpl with $field=$sitename }}{{ endinc }}
 	{{ inc field_textarea.tpl with $field=$banner }}{{ endinc }}
 	{{ inc field_select.tpl with $field=$language }}{{ endinc }}
diff --git a/view/theme/diabook/admin_users.tpl b/view/theme/diabook/admin_users.tpl
index b465dc1b0..8aabb51ec 100644
--- a/view/theme/diabook/admin_users.tpl
+++ b/view/theme/diabook/admin_users.tpl
@@ -14,8 +14,7 @@
 	<h1>$title - $page</h1>
 	
 	<form action="$baseurl/admin/users" method="post">
-        <input type='hidden' name='form_security_token' value='$form_security_token'>
-		
+		        <input type='hidden' name='form_security_token' value='$form_security_token'>
 		<h3>$h_pending</h3>
 		{{ if $pending }}
 			<table id='pending'>
diff --git a/view/theme/diabook/comment_item.tpl b/view/theme/diabook/comment_item.tpl
index 6843f958c..e10b86845 100644
--- a/view/theme/diabook/comment_item.tpl
+++ b/view/theme/diabook/comment_item.tpl
@@ -11,15 +11,15 @@
 					<a class="comment-edit-photo-link" href="$mylink" title="$mytitle"><img class="my-comment-photo" src="$myphoto" alt="$mytitle" title="$mytitle" /></a>
 				</div>
 				<div class="comment-edit-photo-end"></div>
-				<textarea id="comment-edit-text-$id" class="comment-edit-text-empty" name="body" onFocus="commentOpen(this,$id);tautogrow($id);cmtBbOpen($id);" onBlur="commentClose(this,$id);cmtBbClose($id);" >$comment</textarea>
+				<textarea id="comment-edit-text-$id" class="comment-edit-text-empty" name="body" onFocus="commentOpen(this,$id);tautogrow($id);cmtBbOpen($id);"  >$comment</textarea>
 				<div class="comment-edit-bb-$id" style="display:none;">				
-				<a class="icon bb-image" style="cursor: pointer;" onclick="insertFormatting('img',$id);">img</a>	
-				<a class="icon bb-url" style="cursor: pointer;" onclick="insertFormatting('url',$id);">url</a>
-				<a class="icon bb-video" style="cursor: pointer;" onclick="insertFormatting('video',$id);">video</a>														
-				<a class="icon underline" style="cursor: pointer;" onclick="insertFormatting('u',$id);">u</a>
-				<a class="icon italic" style="cursor: pointer;" onclick="insertFormatting('i',$id);">i</a>
-				<a class="icon bold" style="cursor: pointer;" onclick="insertFormatting('b',$id);">b</a>
-				<a class="icon quote" style="cursor: pointer;" onclick="insertFormatting('quote',$id);">quote</a>																			
+				<a class="icon bb-image" style="cursor: pointer;" onclick="insertFormatting('$comment','img',$id);">img</a>	
+				<a class="icon bb-url" style="cursor: pointer;" onclick="insertFormatting('$comment','url',$id);">url</a>
+				<a class="icon bb-video" style="cursor: pointer;" onclick="insertFormatting('$comment','video',$id);">video</a>														
+				<a class="icon underline" style="cursor: pointer;" onclick="insertFormatting('$comment','u',$id);">u</a>
+				<a class="icon italic" style="cursor: pointer;" onclick="insertFormatting('$comment','i',$id);">i</a>
+				<a class="icon bold" style="cursor: pointer;" onclick="insertFormatting('$comment','b',$id);">b</a>
+				<a class="icon quote" style="cursor: pointer;" onclick="insertFormatting('$comment','quote',$id);">quote</a>																			
 				</div>				
 				{{ if $qcomment }}
 					<select id="qcomment-select-$id" name="qcomment-$id" class="qcomment" onchange="qCommentInsert(this,$id);" >
diff --git a/view/theme/diabook/diabook-aerith/admin_users.tpl b/view/theme/diabook/diabook-aerith/admin_users.tpl
deleted file mode 100644
index 40f94f5fe..000000000
--- a/view/theme/diabook/diabook-aerith/admin_users.tpl
+++ /dev/null
@@ -1,88 +0,0 @@
-<script>
-	function confirm_delete(uname){
-		return confirm( "$confirm_delete".format(uname));
-	}
-	function confirm_delete_multi(){
-		return confirm("$confirm_delete_multi");
-	}
-	function selectall(cls){
-		$("."+cls).attr('checked','checked');
-		return false;
-	}
-</script>
-<div id='adminpage'>
-	<h1>$title - $page</h1>
-	
-	<form action="$baseurl/admin/users" method="post">
-		
-		<h3>$h_pending</h3>
-		{{ if $pending }}
-			<table id='pending'>
-				<thead>
-				<tr>
-					{{ for $th_pending as $th }}<th>$th</th>{{ endfor }}
-					<th></th>
-					<th></th>
-				</tr>
-				</thead>
-				<tbody>
-			{{ for $pending as $u }}
-				<tr>
-					<td class="created">$u.created</td>
-					<td class="name">$u.name</td>
-					<td class="email">$u.email</td>
-					<td class="checkbox"><input type="checkbox" class="pending_ckbx" id="id_pending_$u.hash" name="pending[]" value="$u.hash" /></td>
-					<td class="tools">
-						<a href="$baseurl/regmod/allow/$u.hash" title='$approve'><span class='icon like'></span></a>
-						<a href="$baseurl/regmod/deny/$u.hash" title='$deny'><span class='icon dislike'></span></a>
-					</td>
-				</tr>
-			{{ endfor }}
-				</tbody>
-			</table>
-			<div class='selectall'><a href='#' onclick="return selectall('pending_ckbx');">$select_all</a></div>
-			<div class="submit"><input type="submit" name="page_users_deny" value="$deny"/> <input type="submit" name="page_users_approve" value="$approve" /></div>			
-		{{ else }}
-			<p>$no_pending</p>
-		{{ endif }}
-	
-	
-		
-	
-		<h3>$h_users</h3>
-		{{ if $users }}
-			<table id='users'>
-				<thead>
-				<tr>
-					<th></th>
-					{{ for $th_users as $th }}<th>$th</th>{{ endfor }}
-					<th></th>
-					<th></th>
-				</tr>
-				</thead>
-				<tbody>
-				{{ for $users as $u }}
-					<tr>
-						<td><img src="$u.micro" alt="$u.nickname" title="$u.nickname"></td>
-						<td class='name'><a href="$u.url" title="$u.nickname" >$u.name</a></td>
-						<td class='email'>$u.email</td>
-						<td class='register_date'>$u.register_date</td>
-						<td class='login_date'>$u.login_date</td>
-						<td class='lastitem_date'>$u.lastitem_date</td>
-						<td class='login_date'>$u.page-flags</td>
-						<td class="checkbox"><input type="checkbox" class="users_ckbx" id="id_user_$u.uid" name="user[]" value="$u.uid"/></td>
-						<td class="tools" style="width:60px;">
-							<a href="$baseurl/admin/users/block/$u.uid" title='{{ if $u.blocked }}$unblock{{ else }}$block{{ endif }}'><span class='icon block {{ if $u.blocked==0 }}dim{{ endif }}'></span></a>
-							<a href="$baseurl/admin/users/delete/$u.uid" title='$delete' onclick="return confirm_delete('$u.name')"><span class='icon ad_drop'></span></a>
-						</td>
-					</tr>
-				{{ endfor }}
-				</tbody>
-			</table>
-			<div class='selectall'><a href='#' onclick="return selectall('users_ckbx');">$select_all</a></div>
-			<div class="submit"><input type="submit" name="page_users_block" value="$block/$unblock" /> <input type="submit" name="page_users_delete" value="$delete" onclick="return confirm_delete_multi()" /></div>						
-		{{ else }}
-			NO USERS?!?
-		{{ endif }}
-	</form>
-</div>
diff --git a/view/theme/diabook/diabook-aerith/ch_directory_item.tpl b/view/theme/diabook/diabook-aerith/ch_directory_item.tpl
deleted file mode 100644
index db1936e4b..000000000
--- a/view/theme/diabook/diabook-aerith/ch_directory_item.tpl
+++ /dev/null
@@ -1,10 +0,0 @@
-
-<div class="directory-item" id="directory-item-$id" >
-	<div class="directory-photo-wrapper" id="directory-photo-wrapper-$id" > 
-		<div class="directory-photo" id="directory-photo-$id" >
-			<a href="$profile-link" class="directory-profile-link" id="directory-profile-link-$id" >
-				<img class="directory-photo-img" src="$photo" alt="$alt-text" title="$alt-text" />
-			</a>
-		</div>
-	</div>
-</div>
diff --git a/view/theme/diabook/diabook-aerith/comment_item.tpl b/view/theme/diabook/diabook-aerith/comment_item.tpl
deleted file mode 100644
index ee4dfba45..000000000
--- a/view/theme/diabook/diabook-aerith/comment_item.tpl
+++ /dev/null
@@ -1,41 +0,0 @@
-		<div class="comment-wwedit-wrapper" id="comment-edit-wrapper-$id" style="display: block;">
-			<form class="comment-edit-form" id="comment-edit-form-$id" action="item" method="post" onsubmit="post_comment($id); return false;">
-				<input type="hidden" name="type" value="$type" />
-				<input type="hidden" name="profile_uid" value="$profile_uid" />
-				<input type="hidden" name="parent" value="$parent" />
-				<input type="hidden" name="return" value="$return_path" />
-				<input type="hidden" name="jsreload" value="$jsreload" />
-				<input type="hidden" name="preview" id="comment-preview-inp-$id" value="0" />
-
-				<div class="comment-edit-photo" id="comment-edit-photo-$id" >
-					<a class="comment-edit-photo-link" href="$mylink" title="$mytitle"><img class="my-comment-photo" src="$myphoto" alt="$mytitle" title="$mytitle" /></a>
-				</div>
-				<div class="comment-edit-photo-end"></div>
-				<textarea id="comment-edit-text-$id" class="comment-edit-text-empty" name="body" onFocus="commentOpen(this,$id);tautogrow($id)" onBlur="commentClose(this,$id);" >$comment</textarea>
-				<a class="icon bb-image" style="cursor: pointer;" onclick="insertFormatting('$comment','img',$id);">img</a>	
-				<a class="icon bb-url" style="cursor: pointer;" onclick="insertFormatting('$comment','url',$id);">url</a>
-				<a class="icon bb-video" style="cursor: pointer;" onclick="insertFormatting('$comment','video',$id);">video</a>														
-				<a class="icon underline" style="cursor: pointer;" onclick="insertFormatting('$comment','u',$id);">u</a>
-				<a class="icon italic" style="cursor: pointer;" onclick="insertFormatting('$comment','i',$id);">i</a>
-				<a class="icon bold" style="cursor: pointer;" onclick="insertFormatting('$comment','b',$id);">b</a>
-				<a class="icon quote" style="cursor: pointer;" onclick="insertFormatting('$comment','quote',$id);">quote</a>																			
-				{{ if $qcomment }}
-					<select id="qcomment-select-$id" name="qcomment-$id" class="qcomment" onchange="qCommentInsert(this,$id);" >
-					<option value=""></option>
-				{{ for $qcomment as $qc }}
-					<option value="$qc">$qc</option>				
-				{{ endfor }}
-					</select>
-				{{ endif }}
-
-				<div class="comment-edit-text-end"></div>
-				<div class="comment-edit-submit-wrapper" id="comment-edit-submit-wrapper-$id" style="display: none;" >
-					<input type="submit" onclick="post_comment($id); return false;" id="comment-edit-submit-$id" class="comment-edit-submit" name="submit" value="$submit" />
-					<span onclick="preview_comment($id);" id="comment-edit-preview-link-$id" class="fakelink">$preview</span>
-					<div id="comment-edit-preview-$id" class="comment-edit-preview" style="display:none;"></div>
-				</div>
-
-				<div class="comment-edit-end"></div>
-			</form>
-
-		</div>
diff --git a/view/theme/diabook/diabook-aerith/communityhome.tpl b/view/theme/diabook/diabook-aerith/communityhome.tpl
deleted file mode 100644
index 875d83f1b..000000000
--- a/view/theme/diabook/diabook-aerith/communityhome.tpl
+++ /dev/null
@@ -1,86 +0,0 @@
-<div id="close_pages">
-{{ if $page }}
-<div>$page</div>
-{{ endif }}
-</div>
-
-<div id="close_helpers">
-{{ if $lastusers_title }}
-<h3 style="margin-top:0px;">$helpers.title.1<a id="close_helpers_icon"  onClick="close_helpers()" class="icon close_box" title="close"></a></h3>
-<a href="http://kakste.com/profile/newhere" title="#NewHere" style="margin-left: 10px; " target="blank">NewHere</a><br>
-<a href="https://helpers.pyxis.uberspace.de/profile/helpers" style="margin-left: 10px; " title="Friendica Support" target="blank">Friendica Support</a><br>
-<a href="https://letstalk.pyxis.uberspace.de/profile/letstalk" style="margin-left: 10px; " title="Let's talk" target="blank">Let's talk</a><br>
-<a href="http://newzot.hydra.uberspace.de/profile/newzot" title="Local Friendica" style="margin-left: 10px; " target="blank">Local Friendica</a>
-{{ endif }}
-</div>
-
-<div id="close_services">
-{{ if $lastusers_title }}
-<h3>$con_services.title.1<a id="close_services_icon" onClick="close_services()" class="icon close_box" title="close"></a></h3>
-<div id="right_service_icons" style="margin-left: 16px; margin-top: 5px;">
-<a href="$url/facebook"><img alt="Facebook" src="view/theme/diabook-aerith/icons/facebook.png" title="Facebook"></a>
-<a href="$url/settings/connectors"><img alt="StatusNet" src="view/theme/diabook-aerith/icons/StatusNet.png?" title="StatusNet"></a>
-<a href="$url/settings/connectors"><img alt="LiveJournal" src="view/theme/diabook-aerith/icons/livejournal.png?" title="LiveJournal"></a>
-<a href="$url/settings/connectors"><img alt="Posterous" src="view/theme/diabook-aerith/icons/posterous.png?" title="Posterous"></a>
-<a href="$url/settings/connectors"><img alt="Tumblr" src="view/theme/diabook-aerith/icons/tumblr.png?" title="Tumblr"></a>
-<a href="$url/settings/connectors"><img alt="Twitter" src="view/theme/diabook-aerith/icons/twitter.png?" title="Twitter"></a>
-<a href="$url/settings/connectors"><img alt="WordPress" src="view/theme/diabook-aerith/icons/wordpress.png?" title="WordPress"></a>
-<a href="$url/settings/connectors"><img alt="E-Mail" src="view/theme/diabook-aerith/icons/email.png?" title="E-Mail"></a>
-</div>
-{{ endif }}
-</div>
-
-<div id="close_friends" style="margin-bottom:53px;">
-{{ if $nv }}
-<h3>$nv.title.1<a id="close_friends_icon" onClick="close_friends()"  class="icon close_box" title="close"></a></h3>
-<a class="$nv.directory.2" href="$nv.directory.0" style="margin-left: 10px; " title="$nv.directory.3" >$nv.directory.1</a><br>
-<a class="$nv.global_directory.2" href="$nv.global_directory.0" target="blank" style="margin-left: 10px; " title="$nv.global_directory.3" >$nv.global_directory.1</a><br>
-<a class="$nv.match.2" href="$nv.match.0" style="margin-left: 10px; " title="$nv.match.3" >$nv.match.1</a><br>
-<a class="$nv.suggest.2" href="$nv.suggest.0" style="margin-left: 10px; " title="$nv.suggest.3" >$nv.suggest.1</a><br>
-<a class="$nv.invite.2" href="$nv.invite.0" style="margin-left: 10px; " title="$nv.invite.3" >$nv.invite.1</a>			
-$nv.search
-{{ endif }}
-</div>
-
-<div id="close_lastusers">
-{{ if $lastusers_title }}
-<h3>$lastusers_title<a id="close_lastusers_icon" onClick="close_lastusers()" class="icon close_box" title="close"></a></h3>
-<div id='lastusers-wrapper' class='items-wrapper'>
-{{ for $lastusers_items as $i }}
-	$i
-{{ endfor }}
-</div>
-{{ endif }}
-</div>
-
-
-{{ if $activeusers_title }}
-<h3>$activeusers_title</h3>
-<div class='items-wrapper'>
-{{ for $activeusers_items as $i }}
-	$i
-{{ endfor }}
-</div>
-{{ endif }}
-
-<div id="close_lastphotos">
-{{ if $photos_title }}
-<h3>$photos_title<a id="close_photos_icon" onClick="close_lastphotos()"  class="icon close_box" title="close"></a></h3>
-<div id='ra-photos-wrapper' class='items-wrapper'>
-{{ for $photos_items as $i }}
-	$i
-{{ endfor }}
-</div>
-{{ endif }}
-</div>
-
-<div id="close_lastlikes">
-{{ if $like_title }}
-<h3>$like_title<a id="close_lastlikes_icon" onClick="close_lastlikes()" class="icon close_box" title="close"></a></h3>
-<ul id='likes'>
-{{ for $like_items as $i }}
-	<li id='ra-photos-wrapper'>$i</li>
-{{ endfor }}
-</ul>
-{{ endif }}
-</div>
diff --git a/view/theme/diabook/diabook-aerith/config.php b/view/theme/diabook/diabook-aerith/config.php
deleted file mode 100644
index 0083a4df7..000000000
--- a/view/theme/diabook/diabook-aerith/config.php
+++ /dev/null
@@ -1,84 +0,0 @@
-<?php
-/**
- * Theme settings
- */
-
-
-
-function theme_content(&$a){
-	if(!local_user())
-		return;		
-	
-	$font_size = get_pconfig(local_user(), 'diabook-aerith', 'font_size' );
-	$line_height = get_pconfig(local_user(), 'diabook-aerith', 'line_height' );
-	$resolution = get_pconfig(local_user(), 'diabook-aerith', 'resolution' );
-	
-	return diabook_form($a,$font_size, $line_height,$resolution);
-}
-
-function theme_post(&$a){
-	if(! local_user())
-		return;
-	
-	if (isset($_POST['diabook-aerith-settings-submit'])){
-		set_pconfig(local_user(), 'diabook-aerith', 'font_size', $_POST['diabook-aerith_font_size']);
-		set_pconfig(local_user(), 'diabook-aerith', 'line_height', $_POST['diabook-aerith_line_height']);
-		set_pconfig(local_user(), 'diabook-aerith', 'resolution', $_POST['diabook-aerith_resolution']);	
-	}
-}
-
-
-function theme_admin(&$a){
-	$font_size = get_config('diabook-aerith', 'font_size' );
-	$line_height = get_config('diabook-aerith', 'line_height' );
-	$resolution = get_config('diabook-aerith', 'resolution' );
-	
-	return diabook_form($a,$font_size, $line_height,$resolution);
-}
-
-function theme_admin_post(&$a){
-	if (isset($_POST['diabook-aerith-settings-submit'])){
-		set_config('diabook-aerith', 'font_size', $_POST['diabook-aerith_font_size']);
-		set_config('diabook-aerith', 'line_height', $_POST['diabook-aerith_line_height']);
-		set_config('diabook-aerith', 'resolution', $_POST['diabook-aerith_resolution']);
-	}
-}
-
-
-function diabook_form(&$a, $font_size, $line_height, $resolution){
-	$line_heights = array(
-		"1.3"=>"1.3",
-		"---"=>"---",
-		"1.5"=>"1.5",		
-		"1.4"=>"1.4",
-		"1.2"=>"1.2",
-		"1.1"=>"1.1",
-	);
-	
-	$font_sizes = array(
-		'13'=>'13',
-		"---"=>"---",
-		"15"=>"15",
-		'14'=>'14',
-		'13.5'=>'13.5',		
-		'12.5'=>'12.5',
-		'12'=>'12',
-		);
-	$resolutions = array(
-		'normal'=>'normal',
-		'wide'=>'wide',		
-		);
-	
-	
-	
-	$t = file_get_contents( dirname(__file__). "/theme_settings.tpl" );
-	$o .= replace_macros($t, array(
-		'$submit' => t('Submit'),
-		'$baseurl' => $a->get_baseurl(),
-		'$title' => t("Theme settings"),
-		'$font_size' => array('diabook-aerith_font_size', t('Set font-size for posts and comments'), $font_size, '', $font_sizes),
-		'$line_height' => array('diabook-aerith_line_height', t('Set line-height for posts and comments'), $line_height, '', $line_heights),
-		'$resolution' => array('diabook-aerith_resolution', t('Set resolution for middle column'), $resolution, '', $resolutions),	
-	));
-	return $o;
-}
diff --git a/view/theme/diabook/diabook-aerith/contact_template.tpl b/view/theme/diabook/diabook-aerith/contact_template.tpl
deleted file mode 100644
index 48930b48a..000000000
--- a/view/theme/diabook/diabook-aerith/contact_template.tpl
+++ /dev/null
@@ -1,25 +0,0 @@
-
-<div class="contact-entry-wrapper" id="contact-entry-wrapper-$contact.id" >
-	<div class="contact-entry-photo-wrapper" >
-		<div class="contact-entry-photo mframe" id="contact-entry-photo-$contact.id"
-		onmouseover="if (typeof t$contact.id != 'undefined') clearTimeout(t$contact.id); openMenu('contact-photo-menu-button-$contact.id')" 
-		onmouseout="t$contact.id=setTimeout('closeMenu(\'contact-photo-menu-button-$contact.id\'); closeMenu(\'contact-photo-menu-$contact.id\');',200)" >
-
-			<a href="$contact.url" title="$contact.img_hover" /><img src="$contact.thumb" $contact.sparkle alt="$contact.name" /></a>
-
-			{{ if $contact.photo_menu }}
-			<span onclick="openClose('contact-photo-menu-$contact.id');" class="fakelink contact-photo-menu-button" id="contact-photo-menu-button-$contact.id">menu</span>
-                <div class="contact-photo-menu" id="contact-photo-menu-$contact.id">
-                    <ul>
-                        $contact.photo_menu
-                    </ul>
-                </div>
-			{{ endif }}
-		</div>
-			
-	</div>
-	<div class="contact-entry-photo-end" ></div>
-		<div class="contact-entry-name" id="contact-entry-name-$contact.id" >$contact.name</div>
-
-	<div class="contact-entry-end" ></div>
-</div>
diff --git a/view/theme/diabook/diabook-aerith/directory_item.tpl b/view/theme/diabook/diabook-aerith/directory_item.tpl
deleted file mode 100644
index bc2af16c2..000000000
--- a/view/theme/diabook/diabook-aerith/directory_item.tpl
+++ /dev/null
@@ -1,11 +0,0 @@
-
-<div class="directory-item" id="directory-item-$id" >
-	<div class="directory-photo-wrapper" id="directory-photo-wrapper-$id" > 
-		<div class="directory-photo" id="directory-photo-$id" >
-			<a href="$profile-link" class="directory-profile-link" id="directory-profile-link-$id" >
-				<img class="directory-photo-img" src="$photo" alt="$alt-text" title="$alt-text" />
-			</a>
-		</div>
-	</div>
-	<div class="contact-name" id="directory-name-$id">$name</div>
-</div>
diff --git a/view/theme/diabook/diabook-aerith/generic_links_widget.tpl b/view/theme/diabook/diabook-aerith/generic_links_widget.tpl
deleted file mode 100644
index 001c1395e..000000000
--- a/view/theme/diabook/diabook-aerith/generic_links_widget.tpl
+++ /dev/null
@@ -1,11 +0,0 @@
-<div id="widget_$title">
-	{{if $title}}<h3 style="border-bottom: 1px solid #D2D2D2;">$title</h3>{{endif}}
-	{{if $desc}}<div class="desc">$desc</div>{{endif}}
-	
-	<ul  class="rs_tabs">
-		{{ for $items as $item }}
-			<li><a href="$item.url" class="rs_tab button {{ if $item.selected }}selected{{ endif }}">$item.label</a></li>
-		{{ endfor }}
-	</ul>
-	
-</div>
diff --git a/view/theme/diabook/diabook-aerith/group_side.tpl b/view/theme/diabook/diabook-aerith/group_side.tpl
deleted file mode 100644
index 8600402f2..000000000
--- a/view/theme/diabook/diabook-aerith/group_side.tpl
+++ /dev/null
@@ -1,34 +0,0 @@
-<div id="profile_side" >
-	<div class="">
-		<h3 style="margin-left: 2px;">$title<a href="group/new" title="$createtext" class="icon text_add"></a></h3>
-	</div>
-
-	<div id="sidebar-group-list">
-		<ul class="menu-profile-side">
-			{{ for $groups as $group }}
-			<li class="menu-profile-list">
-				<span class="menu-profile-icon {{ if $group.selected }}group_selected{{else}}group_unselected{{ endif }}"></span>
-				<a href="$group.href" class="menu-profile-list-item">
-					$group.text
-				</a>
-				{{ if $group.edit }}
-					<a href="$group.edit.href" class="action"><span class="icon text_edit" ></span></a>
-				{{ endif }}
-				{{ if $group.cid }}
-					<input type="checkbox" 
-						class="{{ if $group.selected }}ticked{{ else }}unticked {{ endif }} action" 
-						onclick="contactgroupChangeMember('$group.id','$group.cid');return true;"
-						{{ if $group.ismember }}checked="checked"{{ endif }}
-					/>
-				{{ endif }}
-			</li>
-			{{ endfor }}
-		</ul>
-	</div>
-	 {{ if $ungrouped }}
-  <div id="sidebar-ungrouped">
-  <a href="nogroup">$ungrouped</a>
-  </div>
-  {{ endif }}
-</div>	
-
diff --git a/view/theme/diabook/diabook-aerith/jot.tpl b/view/theme/diabook/diabook-aerith/jot.tpl
deleted file mode 100644
index 0928c9f36..000000000
--- a/view/theme/diabook/diabook-aerith/jot.tpl
+++ /dev/null
@@ -1,85 +0,0 @@
-
-<div id="profile-jot-wrapper" >
-	<div id="profile-jot-banner-wrapper">
-		<div id="profile-jot-desc" >&nbsp;</div>
-	</div>
-	<div id="profile-jot-banner-end"></div>
-
-	<form id="profile-jot-form" action="$action" method="post" >
-		<input type="hidden" name="type" value="$ptyp" />
-		<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="coord" id="jot-coord" value="" />
-		<input type="hidden" name="post_id" value="$post_id" />
-		<input type="hidden" name="preview" id="jot-preview" value="0" />
-		<input name="title" id="jot-title" type="text" placeholder="$placeholdertitle" value="$title" class="jothidden" style="display:none">
-		<div id="jot-category-wrap"><input name="category" id="jot-category" type="text" placeholder="$placeholdercategory" value="$category" class="jothidden" style="display:none" /></div>				
-		<div id="character-counter" class="grey"></div>		
-		<img id="profile-jot-text-loading" src="images/rotator.gif" alt="$wait" title="$wait" style="display: none;" />
-		<textarea rows="5" cols="64" class="profile-jot-text" id="profile-jot-text" name="body" >{{ if $content }}$content{{ else }}$share{{ endif }}</textarea>
-
-
-<div id="profile-jot-submit-wrapper" class="jothidden">
-	
-	<div id="profile-upload-wrapper" style="display: $visitor;" >
-		<div id="wall-image-upload-div" ><a href="#" onclick="return false;" id="wall-image-upload" class="camera" title="$upload"></a></div>
-	</div> 
-	<div id="profile-attach-wrapper" style="display: $visitor;" >
-		<div id="wall-file-upload-div" ><a href="#" onclick="return false;" id="wall-file-upload" class="attach" title="$attach"></a></div>
-	</div> 
-
-	<div id="profile-link-wrapper" style="display: $visitor;" ondragenter="linkdropper(event);" ondragover="linkdropper(event);" ondrop="linkdrop(event);" >
-		<a id="profile-link" class="weblink" title="$weblink" ondragenter="return linkdropper(event);" ondragover="return linkdropper(event);" ondrop="linkdrop(event);" onclick="jotGetLink(); return false;"></a>
-	</div> 
-	<div id="profile-video-wrapper" style="display: $visitor;" >
-		<a id="profile-video" class="video2" title="$video" onclick="jotVideoURL();return false;"></a>
-	</div> 
-	<div id="profile-audio-wrapper" style="display: $visitor;" >
-		<a id="profile-audio" class="audio2" title="$audio" onclick="jotAudioURL();return false;"></a>
-	</div> 
-	<div id="profile-location-wrapper" style="display: $visitor;" >
-		<a id="profile-location" class="globe" title="$setloc" onclick="jotGetLocation();return false;"></a>
-	</div> 
-	<div id="profile-nolocation-wrapper" style="display: none;" >
-		<a id="profile-nolocation" class="noglobe" title="$noloc" onclick="jotClearLocation();return false;"></a>
-	</div> 
-
-	<input type="submit" id="profile-jot-submit" class="button creation2" name="submit" value="$share" />
-  
-   <span onclick="preview_post();" id="jot-preview-link" class="tab button">$preview</span>
-   
-	<div id="profile-jot-perms" class="profile-jot-perms" style="display: $pvisit;" >
-		<a href="#profile-jot-acl-wrapper" id="jot-perms-icon" class="icon $lockstate"  title="$permset" ></a>$bang
-	</div>
-
-
-	<div id="profile-jot-plugin-wrapper">
-  	$jotplugins
-	</div>
-	
-	<div id="profile-rotator-wrapper" style="display: $visitor;" >
-		<img id="profile-rotator" src="images/rotator.gif" alt="$wait" title="$wait" style="display: none;" />
-	</div> 
-	
-	</div>
-   <div id="profile-jot-perms-end"></div>
-	
-	<div id="jot-preview-content" style="display:none;"></div>
-
-	<div style="display: none;">
-		<div id="profile-jot-acl-wrapper" style="width:auto;height:auto;overflow:auto;">
-			$acl
-			<hr style="clear:both"/>
-			<div id="profile-jot-email-label">$emailcc</div><input type="text" name="emailcc" id="profile-jot-email" title="$emtitle" />
-			<div id="profile-jot-email-end"></div>
-			$jotnets
-		</div>
-	</div>
-
-
-
-
-</form>
-</div>
-		{{ if $content }}<script>initEditor();</script>{{ endif }}
diff --git a/view/theme/diabook/diabook-aerith/js/README b/view/theme/diabook/diabook-aerith/js/README
deleted file mode 100644
index c93b2118e..000000000
--- a/view/theme/diabook/diabook-aerith/js/README
+++ /dev/null
@@ -1,22 +0,0 @@
-jQuery Resize Plugin Demo
-
-Version: v2.1.1
-Author: Adeel Ejaz (http://adeelejaz.com/)
-License: Dual licensed under MIT and GPL licenses.
-
-Introduction
-aeImageResize is a jQuery plugin to dynamically resize the images without distorting the proportions.
-
-Usage:
-.aeImageResize( height, width )
-
-height
-An integer representing the maximum height for the image.
-
-width
-An integer representing the maximum width for the image.
-
-Example
-$(function() {
-  $( ".resizeme" ).aeImageResize({ height: 250, width: 250 });
-});
\ No newline at end of file
diff --git a/view/theme/diabook/diabook-aerith/js/jquery.autogrow.textarea.js b/view/theme/diabook/diabook-aerith/js/jquery.autogrow.textarea.js
deleted file mode 100644
index 806e34f51..000000000
--- a/view/theme/diabook/diabook-aerith/js/jquery.autogrow.textarea.js
+++ /dev/null
@@ -1,46 +0,0 @@
-(function($) {
-
-    /*
-     * Auto-growing textareas; technique ripped from Facebook
-     */
-    $.fn.autogrow = function(options) {
-        
-        this.filter('textarea').each(function() {
-            
-            var $this       = $(this),
-                minHeight   = $this.height(),
-                lineHeight  = $this.css('lineHeight');
-            
-            var shadow = $('<div></div>').css({
-                position:   'absolute',
-                top:        -10000,
-                left:       -10000,
-                width:      $(this).width(),
-                fontSize:   $this.css('fontSize'),
-                fontFamily: $this.css('fontFamily'),
-                lineHeight: $this.css('lineHeight'),
-                resize:     'none'
-            }).appendTo(document.body);
-            
-            var update = function() {
-                
-                var val = this.value.replace(/</g, '&lt;')
-                                    .replace(/>/g, '&gt;')
-                                    .replace(/&/g, '&amp;')
-                                    .replace(/\n/g, '<br/>');
-                
-                shadow.html(val);
-                $(this).css('height', Math.max(shadow.height() + 20, minHeight));
-            }
-            
-            $(this).change(update).keyup(update).keydown(update);
-            
-            update.apply(this);
-            
-        });
-        
-        return this;
-        
-    }
-    
-})(jQuery);
\ No newline at end of file
diff --git a/view/theme/diabook/diabook-aerith/js/jquery.cookie.js b/view/theme/diabook/diabook-aerith/js/jquery.cookie.js
deleted file mode 100644
index 6d5974a2c..000000000
--- a/view/theme/diabook/diabook-aerith/js/jquery.cookie.js
+++ /dev/null
@@ -1,47 +0,0 @@
-/*!
- * jQuery Cookie Plugin
- * https://github.com/carhartl/jquery-cookie
- *
- * Copyright 2011, Klaus Hartl
- * Dual licensed under the MIT or GPL Version 2 licenses.
- * http://www.opensource.org/licenses/mit-license.php
- * http://www.opensource.org/licenses/GPL-2.0
- */
-(function($) {
-    $.cookie = function(key, value, options) {
-
-        // key and at least value given, set cookie...
-        if (arguments.length > 1 && (!/Object/.test(Object.prototype.toString.call(value)) || value === null || value === undefined)) {
-            options = $.extend({}, options);
-
-            if (value === null || value === undefined) {
-                options.expires = -1;
-            }
-
-            if (typeof options.expires === 'number') {
-                var days = options.expires, t = options.expires = new Date();
-                t.setDate(t.getDate() + days);
-            }
-
-            value = String(value);
-
-            return (document.cookie = [
-                encodeURIComponent(key), '=', options.raw ? value : encodeURIComponent(value),
-                options.expires ? '; expires=' + options.expires.toUTCString() : '', // use expires attribute, max-age is not supported by IE
-                options.path    ? '; path=' + options.path : '',
-                options.domain  ? '; domain=' + options.domain : '',
-                options.secure  ? '; secure' : ''
-            ].join(''));
-        }
-
-        // key and possibly options given, get cookie...
-        options = value || {};
-        var decode = options.raw ? function(s) { return s; } : decodeURIComponent;
-
-        var pairs = document.cookie.split('; ');
-        for (var i = 0, pair; pair = pairs[i] && pairs[i].split('='); i++) {
-            if (decode(pair[0]) === key) return decode(pair[1] || ''); // IE saves cookies with empty string as "c; ", e.g. without "=" as opposed to EOMB, thus pair[1] may be undefined
-        }
-        return null;
-    };
-})(jQuery);
diff --git a/view/theme/diabook/diabook-aerith/login.tpl b/view/theme/diabook/diabook-aerith/login.tpl
deleted file mode 100644
index efa7c2d6d..000000000
--- a/view/theme/diabook/diabook-aerith/login.tpl
+++ /dev/null
@@ -1,33 +0,0 @@
-
-<form action="$dest_url" method="post" >
-	<input type="hidden" name="auth-params" value="login" />
-
-	<div id="login_standard">
-	{{ inc field_input.tpl with $field=$lname }}{{ endinc }}
-	{{ inc field_password.tpl with $field=$lpassword }}{{ endinc }}
-	</div>
-	
-	{{ if $openid }}
-			<div id="login_openid">
-			{{ inc field_openid.tpl with $field=$lopenid }}{{ endinc }}
-			</div>
-	{{ endif }}
-	
-	<div id="login-submit-wrapper" >
-		<input type="submit" name="submit" id="login-submit-button" value="$login" />
-	</div>
-	
-   <div id="login-extra-links">
-		{{ if $register }}<a href="register" title="$register.title" id="register-link">$register.desc</a>{{ endif }}
-        <a href="lostpass" title="$lostpass" id="lost-password-link" >$lostlink</a>
-	</div>	
-	
-	{{ for $hiddens as $k=>$v }}
-		<input type="hidden" name="$k" value="$v" />
-	{{ endfor }}
-	
-	
-</form>
-
-
-<script type="text/javascript"> $(document).ready(function() { $("#id_$lname.0").focus();} );</script>
diff --git a/view/theme/diabook/diabook-aerith/mail_conv.tpl b/view/theme/diabook/diabook-aerith/mail_conv.tpl
deleted file mode 100644
index 989f17878..000000000
--- a/view/theme/diabook/diabook-aerith/mail_conv.tpl
+++ /dev/null
@@ -1,60 +0,0 @@
-<div class="wall-item-container $item.indent">
-	<div class="wall-item-item">
-		<div class="wall-item-info">
-			<div class="contact-photo-wrapper"
-				<a href="$mail.profile_url" target="redir" title="$mail.from_name" class="contact-photo-link" id="wall-item-photo-link-$mail.id">
-					<img src="$mail.from_photo" class="contact-photo$mail.sparkle" id="wall-item-photo-$mail.id" alt="$mail.from_name" />
-				</a>
-			</div>
-		</div>
-		<div class="wall-item-content">
-			$mail.body
-		</div>
-	</div>
-	<div class="wall-item-bottom">
-		<div class="wall-item-links">
-		</div>
-		<div class="wall-item-tags">
-		</div>
-	</div>
-	<div class="wall-item-bottom">
-		<div class="">
-		</div>
-		<div class="wall-item-actions">
-			<div class="wall-item-actions-author">
-				<a href="$mail.from_url" target="redir" class="wall-item-name-link"><span class="wall-item-name$mail.sparkle">$mail.from_name</span></a> <span class="wall-item-ago">$mail.date</span>
-			</div>
-			
-			<div class="wall-item-actions-social">
-			</div>
-			
-			<div class="wall-item-actions-tools">
-				<a href="message/drop/$mail.id" onclick="return confirmDelete();" class="icon delete s16" title="$mail.delete">$mail.delete</a>
-			</div>
-			
-		</div>
-	</div>
-	<div class="wall-item-bottom">
-	</div>
-</div>
-
-
-{#
-
-
-<div class="mail-conv-outside-wrapper">
-	<div class="mail-conv-sender" >
-		<a href="$mail.from_url" class="mail-conv-sender-url" ><img class="mframe mail-conv-sender-photo$mail.sparkle" src="$mail.from_photo" heigth="80" width="80" alt="$mail.from_name" /></a>
-	</div>
-	<div class="mail-conv-detail" >
-		<div class="mail-conv-sender-name" >$mail.from_name</div>
-		<div class="mail-conv-date">$mail.date</div>
-		<div class="mail-conv-subject">$mail.subject</div>
-		<div class="mail-conv-body">$mail.body</div>
-	<div class="mail-conv-delete-wrapper" id="mail-conv-delete-wrapper-$mail.id" ><a href="message/drop/$mail.id" class="icon drophide delete-icon mail-list-delete-icon" onclick="return confirmDelete();" title="$mail.delete" id="mail-conv-delete-icon-$mail.id" class="mail-conv-delete-icon" onmouseover="imgbright(this);" onmouseout="imgdull(this);" ></a></div><div class="mail-conv-delete-end"></div>
-	<div class="mail-conv-outside-wrapper-end"></div>
-</div>
-</div>
-<hr class="mail-conv-break" />
-
-#}
diff --git a/view/theme/diabook/diabook-aerith/mail_display.tpl b/view/theme/diabook/diabook-aerith/mail_display.tpl
deleted file mode 100644
index 8b82e95c6..000000000
--- a/view/theme/diabook/diabook-aerith/mail_display.tpl
+++ /dev/null
@@ -1,12 +0,0 @@
-<div id="mail-display-subject">
-	<span class="{{if $thread_seen}}seen{{else}}unseen{{endif}}">$thread_subject</span>
-	<a href="message/dropconv/$thread_id" onclick="return confirmDelete();"  title="$delete" class="mail-delete icon s22 delete"></a>
-</div>
-
-{{ for $mails as $mail }}
-	<div id="tread-wrapper-$mail.id" class="tread-wrapper">
-		{{ inc mail_conv.tpl }}{{endinc}}
-	</div>
-{{ endfor }}
-
-{{ inc prv_message.tpl }}{{ endinc }}
diff --git a/view/theme/diabook/diabook-aerith/mail_list.tpl b/view/theme/diabook/diabook-aerith/mail_list.tpl
deleted file mode 100644
index 6bc6c84f6..000000000
--- a/view/theme/diabook/diabook-aerith/mail_list.tpl
+++ /dev/null
@@ -1,8 +0,0 @@
-<div class="mail-list-wrapper">
-	<span class="mail-subject {{if $seen}}seen{{else}}unseen{{endif}}"><a href="message/$id" class="mail-link">$subject</a></span>
-	<span class="mail-from">$from_name</span>
-	<span class="mail-date">$date</span>
-	<span class="mail-count">$count</span>
-	
-	<a href="message/dropconv/$id" onclick="return confirmDelete();"  title="$delete" class="mail-delete icon s22 delete"></a>
-</div>
diff --git a/view/theme/diabook/diabook-aerith/message_side.tpl b/view/theme/diabook/diabook-aerith/message_side.tpl
deleted file mode 100644
index 9f1587096..000000000
--- a/view/theme/diabook/diabook-aerith/message_side.tpl
+++ /dev/null
@@ -1,10 +0,0 @@
-<div id="message-sidebar" class="widget">
-	<div id="message-new" class="{{ if $new.sel }}selected{{ endif }}"><a href="$new.url">$new.label</a> </div>
-	
-	<ul class="message-ul">
-		{{ for $tabs as $t }}
-			<li class="tool {{ if $t.sel }}selected{{ endif }}"><a href="$t.url" class="message-link">$t.label</a></li>
-		{{ endfor }}
-	</ul>
-	
-</div>
diff --git a/view/theme/diabook/diabook-aerith/nav.tpl b/view/theme/diabook/diabook-aerith/nav.tpl
deleted file mode 100644
index 5f316bcdd..000000000
--- a/view/theme/diabook/diabook-aerith/nav.tpl
+++ /dev/null
@@ -1,190 +0,0 @@
-<header>
-	<div id="site-location">$sitelocation</div>
-	<div id="banner">$banner</div>
-</header>
-<nav>
-			
-			
-	<ul>
-			
-			
-			{{ if $nav.network }}
-			<li id="nav-network-link" class="nav-menu-icon">
-				<a class="$nav.network.2" href="$nav.network.0" title="$nav.network.3" >
-				<span class="icon notifications">Benachrichtigungen</span>
-				<span id="net-update" class="nav-notify"></span></a>
-			</li>
-		    {{ endif }}
-	
-			{{ if $nav.contacts }}
-			<li class="nav-menu-icon" id="nav-contacts-linkmenu">
-				<a href="$nav.contacts.0" rel="#nav-contacts-menu" title="$nav.contacts.1">
-				<span class="icon contacts">$nav.contacts.1</span>
-				<span id="intro-update" class="nav-notify"></span></a>
-				<ul id="nav-contacts-menu" class="menu-popup">
-					<li id="nav-contacts-see-intro"><a href="$nav.notifications.0">$nav.introductions.1</a><span id="intro-update-li" class="nav-notify"></span></li>
-					<li id="nav-contacts-all"><a href="contacts">$nav.contacts.1</a></li> 
-				</ul>
-			</li>	
-
-			{{ endif }}
-			
-			{{ if $nav.messages }}
-			<li  id="nav-messages-linkmenu" class="nav-menu-icon">
-			  <a href="$nav.messages.0" rel="#nav-messages-menu" title="$nav.messages.1">
-			  <span class="icon messages">$nav.messages.1</span>
-				<span id="mail-update" class="nav-notify"></span></a>
-				<ul id="nav-messages-menu" class="menu-popup">
-					<li id="nav-messages-see-all"><a href="$nav.messages.0">$nav.messages.1</a></li>
-					<li id="nav-messages-see-all"><a href="$nav.messages.new.0">$nav.messages.new.1</a></li>
-				</ul>
-			</li>		
-			{{ endif }}
-		
-      {{ if $nav.notifications }}
-			<li  id="nav-notifications-linkmenu" class="nav-menu-icon">
-			<a href="$nav.notifications.0" rel="#nav-notifications-menu" title="$nav.notifications.1">
-			<span class="icon notify">$nav.notifications.1</span>
-				<span id="notify-update" class="nav-notify"></span></a>
-				<ul id="nav-notifications-menu" class="menu-popup">
-					<li id="nav-notifications-mark-all"><a href="#" onclick="notifyMarkAll(); return false;">$nav.notifications.mark.1</a></li>
-					<li id="nav-notifications-see-all"><a href="$nav.notifications.all.0">$nav.notifications.all.1</a></li>
-					<li class="empty">$emptynotifications</li>
-				</ul>
-			</li>		
-		{{ endif }}	
-			
-		{{ if $nav.search}}
-		<li id="search-box">
-			<form method="get" action="$nav.search.0">
-				<input id="search-text" class="nav-menu-search" type="text" value="" name="search">
-			</form>
-		</li>		
-		{{ endif }}	
-		
-		<li  style="width: 1%; height: 1px;float: right;"></li>	
-		
-		<li id="nav-site-linkmenu" class="nav-menu-icon"><a href="#" rel="#nav-site-menu"><span class="icon s22 gear">Site</span></a>
-			<ul id="nav-site-menu" class="menu-popup">
-				{{ if $nav.manage }}<li><a class="$nav.manage.2" href="$nav.manage.0" title="$nav.manage.3">$nav.manage.1</a></li>{{ endif }}				
-
-				{{ if $nav.settings }} <li><a class="$nav.search.2" onClick="restore_boxes()" title="Restore right-hand column" style="cursor: pointer;">Restore right-hand column</a></li>{{ endif }}
-										
-				{{ if $nav.help }} <li><a class="$nav.help.2" target="friendika-help" href="$nav.help.0" title="$nav.help.3" >$nav.help.1</a></li>{{ endif }}									
-										
-										 <li><a class="$nav.search.2" href="friendica" title="Site Info / Impressum" >Info/Impressum</a></li>
-										
-				{{ if $nav.settings }}<li><a class="menu-sep $nav.settings.2" href="$nav.settings.0" title="$nav.settings.3">$nav.settings.1</a></li>{{ endif }}
-				{{ if $nav.admin }}<li><a class="$nav.admin.2" href="$nav.admin.0" title="$nav.admin.3" >$nav.admin.1</a></li>{{ endif }}
-
-				{{ if $nav.logout }}<li><a class="menu-sep $nav.logout.2" href="$nav.logout.0" title="$nav.logout.3" >$nav.logout.1</a></li>{{ endif }}
-
-				
-			</ul>		
-		</li>
-		
-		
-		{{ if $nav.directory }}
-		<li id="nav-directory-link" class="nav-menu $sel.directory">
-			<a class="$nav.directory.2" href="$nav.directory.0" title="$nav.directory.3" >$nav.directory.1</a>
-		</li>
-		{{ endif }}
-		
-		{{ if $nav.apps }}
-			<li id="nav-apps-link" class="nav-menu $sel.apps">
-				<a class=" $nav.apps.2" href="#" rel="#nav-apps-menu" title="$nav.apps.3" >$nav.apps.1</a>
-				<ul id="nav-apps-menu" class="menu-popup">
-					{{ for $apps as $ap }}
-					<li>$ap</li>
-					{{ endfor }}
-				</ul>
-			</li>	
-		{{ endif }}		
-		
-      {{ if $nav.home }}
-			<li id="nav-home-link" class="nav-menu $sel.home">
-				<a class="$nav.home.2" href="$nav.home.0" title="$nav.home.3" >$nav.home.1
-				<span id="home-update" class="nav-notify"></span></a>
-			</li>
-		{{ endif }}		
-		
-		{{ if $userinfo }}
-			<li id="nav-user-linkmenu" class="nav-menu-icon"><a href="#" rel="#nav-user-menu" title="$sitelocation"><img src="$userinfo.icon" alt="$userinfo.name"></a>
-				<ul id="nav-user-menu" class="menu-popup">
-					{{ for $nav.usermenu as $usermenu }}
-						<li><a class="$usermenu.2" href="$usermenu.0" title="$usermenu.3">$usermenu.1</a></li>
-					{{ endfor }}
-					
-					{{ if $nav.profiles }}<li><a class="menu-sep $nav.profiles.2" href="$nav.profiles.0" title="$nav.profiles.3" >$nav.profiles.3</a></li>{{ endif }}
-					{{ if $nav.notifications }}<li><a class="$nav.notifications.2" href="$nav.notifications.0" title="$nav.notifications.3" >$nav.notifications.1</a></li>{{ endif }}
-					{{ if $nav.messages }}<li><a class="$nav.messages.2" href="$nav.messages.0" title="$nav.messages.3" >$nav.messages.1</a></li>{{ endif }}
-					{{ if $nav.contacts }}<li><a class="$nav.contacts.2" href="$nav.contacts.0" title="$nav.contacts.3" >$nav.contacts.1</a></li>{{ endif }}	
-				</ul>
-			</li>
-		{{ endif }}
-		
-					{{ if $nav.login }}
-					<li id="nav-home-link" class="nav-menu $sel.home">
-						<a class="$nav.login.2" href="$nav.login.0" title="$nav.login.3" >$nav.login.1</a>
-					<li>
-					{{ endif }}
-		
-		
-		
-	</ul>	
-
-
-	
-</nav>
-
-
-<div style="position: fixed; bottom: 5px; right: 10px;"><a href="javascript:scroll(0,0); "><img src="view/theme/diabook/icons/scroll_top.png" title="scroll to top"></a></div>
-<div style="position: fixed; bottom: 3px; left: 25px;">$langselector</div>
-<div style="position: fixed; bottom: 23px; left: 5px;"><a href="http://pad.toktan.org/p/diabook" target="blank" ><img src="view/theme/diabook/icons/bluebug.png" title="report bugs for the theme diabook"/></a></div>
-
-
-
-
-<ul id="nav-notifications-template" style="display:none;" rel="template">
-	<li class="{4}"><a href="{0}"><img src="{1}">{2} <span class="notif-when">{3}</span></a></li>
-</ul>
-
-
-
-{#
-
-{{ if $nav.logout }}<a id="nav-logout-link" class="nav-link $nav.logout.2" href="$nav.logout.0" title="$nav.logout.3" >$nav.logout.1</a> {{ endif }}
-{{ if $nav.login }}<a id="nav-login-link" class="nav-login-link $nav.login.2" href="$nav.login.0" title="$nav.login.3" >$nav.login.1</a> {{ endif }}
-
-<span id="nav-link-wrapper" >
-
-{{ if $nav.register }}<a id="nav-register-link" class="nav-commlink $nav.register.2" href="$nav.register.0" title="$nav.register.3" >$nav.register.1</a>{{ endif }}
-	
-<a id="nav-help-link" class="nav-link $nav.help.2" target="friendika-help" href="$nav.help.0" title="$nav.help.3" >$nav.help.1</a>
-	
-{{ if $nav.apps }}<a id="nav-apps-link" class="nav-link $nav.apps.2" href="$nav.apps.0" title="$nav.apps.3" >$nav.apps.1</a>{{ endif }}
-
-<a id="nav-search-link" class="nav-link $nav.search.2" href="$nav.search.0" title="$nav.search.3" >$nav.search.1</a>
-<a id="nav-directory-link" class="nav-link $nav.directory.2" href="$nav.directory.0" title="$nav.directory.3" >$nav.directory.1</a>
-
-{{ if $nav.admin }}<a id="nav-admin-link" class="nav-link $nav.admin.2" href="$nav.admin.0" title="$nav.admin.3" >$nav.admin.1</a>{{ endif }}
-
-{{ if $nav.notifications }}
-<a id="nav-notify-link" class="nav-commlink $nav.notifications.2" href="$nav.notifications.0" title="$nav.notifications.3" >$nav.notifications.1</a>
-<span id="notify-update" class="nav-ajax-left"></span>
-{{ endif }}
-{{ if $nav.messages }}
-<a id="nav-messages-link" class="nav-commlink $nav.messages.2" href="$nav.messages.0" title="$nav.messages.3" >$nav.messages.1</a>
-<span id="mail-update" class="nav-ajax-left"></span>
-{{ endif }}
-
-{{ if $nav.manage }}<a id="nav-manage-link" class="nav-commlink $nav.manage.2" href="$nav.manage.0" title="$nav.manage.3">$nav.manage.1</a>{{ endif }}
-
-{{ if $nav.settings }}<a id="nav-settings-link" class="nav-link $nav.settings.2" href="$nav.settings.0" title="$nav.settings.3">$nav.settings.1</a>{{ endif }}
-{{ if $nav.profiles }}<a id="nav-profiles-link" class="nav-link $nav.profiles.2" href="$nav.profiles.0" title="$nav.profiles.3" >$nav.profiles.1</a>{{ endif }}
-
-
-</span>
-<span id="nav-end"></span>
-<span id="banner">$banner</span>
-#}
diff --git a/view/theme/diabook/diabook-aerith/nets.tpl b/view/theme/diabook/diabook-aerith/nets.tpl
deleted file mode 100644
index be25ddee1..000000000
--- a/view/theme/diabook/diabook-aerith/nets.tpl
+++ /dev/null
@@ -1,15 +0,0 @@
-<div id="profile_side">
-	<h3 style="margin-left: 2px;">$title</h3>
-	<div id="nets-desc">$desc</div>
-   
-	<ul class="menu-profile-side">
-	<li class="menu-profile-list">
-	<span class="menu-profile-icon {{ if $sel_all }}group_selected{{else}}group_unselected{{ endif }}"></span>	
-	<a style="text-decoration: none;" href="$base" class="menu-profile-list-item">$all</a></li>
-	{{ for $nets as $net }}
-	<li class="menu-profile-list">
-	<span class="menu-profile-icon {{ if $net.selected }}group_selected{{else}}group_unselected{{ endif }}"></span>	
-	<a href="$base?nets=$net.ref" class="menu-profile-list-item">$net.name</a></li>
-	{{ endfor }}
-	</ul>
-</div>
diff --git a/view/theme/diabook/diabook-aerith/oembed_video.tpl b/view/theme/diabook/diabook-aerith/oembed_video.tpl
deleted file mode 100644
index d6d29f724..000000000
--- a/view/theme/diabook/diabook-aerith/oembed_video.tpl
+++ /dev/null
@@ -1,4 +0,0 @@
-<a class="embed_yt" href='$embedurl' onclick='this.innerHTML=Base64.decode("$escapedhtml"); yt_iframe(); return false;' style='float:left; margin: 1em; position: relative;'>
-	<img width='$tw' height='$th' src='$turl' >
-	<div style='position: absolute; top: 0px; left: 0px; width: $twpx; height: $thpx; background: url(images/icons/48/play.png) no-repeat center center;'></div>
-</a>
diff --git a/view/theme/diabook/diabook-aerith/photo_item.tpl b/view/theme/diabook/diabook-aerith/photo_item.tpl
deleted file mode 100644
index 5d65a89b7..000000000
--- a/view/theme/diabook/diabook-aerith/photo_item.tpl
+++ /dev/null
@@ -1,65 +0,0 @@
-{{ if $indent }}{{ else }}
-<div class="wall-item-decor">
-	<img id="like-rotator-$id" class="like-rotator" src="images/rotator.gif" alt="$wait" title="$wait" style="display: none;" />
-</div>
-{{ endif }}
-
-<div class="wall-item-photo-container $indent">
-	<div class="wall-item-item">
-		<div class="wall-item-info">
-			<div class="contact-photo-wrapper" >
-				<a href="$profile_url" target="redir" title="" class="contact-photo-link" id="wall-item-photo-link-$id">
-					<img src="$thumb" class="contact-photo$sparkle" id="wall-item-photo-$id" alt="$name" />
-				</a>
-				<a href="#" rel="#wall-item-photo-menu-$id" class="contact-photo-menu-button icon s16 menu" id="wall-item-photo-menu-button-$id">menu</a>
-				<ul class="contact-menu menu-popup" id="wall-item-photo-menu-$id">
-				$photo_menu
-				</ul>
-				
-			</div>
-		</div>
-			<div class="wall-item-actions-author">
-				<a href="$profile_url" target="redir" title="$name" class="wall-item-name-link"><span class="wall-item-name$sparkle">$name</span></a> 
-			<span class="wall-item-ago">-
-			{{ if $plink }}<a class="link" title="$plink.title" href="$plink.href" style="color: #999">$ago</a>{{ else }} $ago {{ endif }}
-			{{ if $lock }} - <span class="fakelink" style="color: #999" onclick="lockview(event,$id);">$lock</span> {{ endif }}
-			</span>
-			</div>
-		<div class="wall-item-content">
-			{{ if $title }}<h2><a href="$plink.href">$title</a></h2>{{ endif }}
-			$body
-		</div>
-	</div>
-	<div class="wall-item-bottom">
-		<div class="wall-item-links">
-		</div>
-		<div class="wall-item-tags">
-			{{ for $tags as $tag }}
-				<span class='tag'>$tag</span>
-			{{ endfor }}
-		</div>
-	</div>
-	
-	<div class="wall-item-bottom" style="display: table-row;">
-		<div class="wall-item-actions">
-	   </div>
-		<div class="wall-item-actions">
-			
-			<div class="wall-item-actions-tools">
-
-				{{ if $drop.dropping }}
-					<input type="checkbox" title="$drop.select" name="itemselected[]" class="item-select" value="$id" />
-					<a href="item/drop/$id" onclick="return confirmDelete();" class="icon drop" title="$drop.delete">$drop.delete</a>
-				{{ endif }}
-				{{ if $edpost }}
-					<a class="icon pencil" href="$edpost.0" title="$edpost.1"></a>
-				{{ endif }}
-			</div>
-
-		</div>
-	</div>
-	<div class="wall-item-bottom">
-			
-	</div>
-</div>
-
diff --git a/view/theme/diabook/diabook-aerith/photo_view.tpl b/view/theme/diabook/diabook-aerith/photo_view.tpl
deleted file mode 100644
index 071972e0c..000000000
--- a/view/theme/diabook/diabook-aerith/photo_view.tpl
+++ /dev/null
@@ -1,35 +0,0 @@
-<div id="live-display"></div>
-<h3><a href="$album.0">$album.1</a></h3>
-
-<div id="photo-edit-link-wrap">
-{{ if $tools }}
-<a id="photo-edit-link" href="$tools.edit.0">$tools.edit.1</a>
--
-<a id="photo-toprofile-link" href="$tools.profile.0">$tools.profile.1</a>
-{{ endif }}
-{{ if $lock }} - <img src="images/lock_icon.gif" class="lockview" alt="$lock" onclick="lockview(event,'photo$id');" /> {{ endif }}
-</div>
-
-<div id="photo-photo">
-	{{ if $prevlink }}<div id="photo-prev-link"><a href="$prevlink.0">$prevlink.1</a></div>{{ endif }}
-	<a href="$photo.href" class="lightbox" title="$photo.title"><img src="$photo.src" /></a>
-	{{ if $nextlink }}<div id="photo-next-link"><a href="$nextlink.0">$nextlink.1</a></div>{{ endif }}
-</div>
-
-<div id="photo-photo-end"></div>
-<div id="photo-caption" >$desc</div>
-{{ if $tags }}
-<div id="in-this-photo-text">$tags.0</div>
-<div id="in-this-photo">$tags.1</div>
-{{ endif }}
-{{ if $tags.2 }}<div id="tag-remove"><a href="$tags.2">$tags.3</a></div>{{ endif }}
-
-{{ if $edit }}$edit{{ endif }}
-
-<div style="margin-top:20px">
-</div>
-<div id="wall-photo-container">
-$comments
-</div>
-
-$paginate
diff --git a/view/theme/diabook/diabook-aerith/profile_side.tpl b/view/theme/diabook/diabook-aerith/profile_side.tpl
deleted file mode 100644
index 01e80f238..000000000
--- a/view/theme/diabook/diabook-aerith/profile_side.tpl
+++ /dev/null
@@ -1,21 +0,0 @@
-<div id="profile_side">
-	<div id="ps-usernameicon">
-		<a href="$ps.usermenu.status.0" title="$userinfo.name">
-			<img src="$userinfo.icon" id="ps-usericon" alt="$userinfo.name">
-		</a>
-		<a href="$ps.usermenu.status.0" id="ps-username" title="$userinfo.name">$userinfo.name</a>
-	</div>
-	
-<ul id="profile-side-menu" class="menu-profile-side">
-	<li id="profile-side-status" class="menu-profile-list"><a class="menu-profile-list-item" href="$ps.usermenu.status.0">$ps.usermenu.status.1<span class="menu-profile-icon home"></span></a></li>
-	<li id="profile-side-photos" class="menu-profile-list photos"><a class="menu-profile-list-item" href="$ps.usermenu.photos.0">$ps.usermenu.photos.1<span class="menu-profile-icon photos"></span></a></li>
-	<li id="profile-side-photos" class="menu-profile-list pscontacts"><a class="menu-profile-list-item" href="$ps.usermenu.contacts.0">$ps.usermenu.contacts.1<span class="menu-profile-icon pscontacts"></span></a></li>		
-	<li id="profile-side-events" class="menu-profile-list events"><a class="menu-profile-list-item" href="$ps.usermenu.events.0">$ps.usermenu.events.1<span class="menu-profile-icon events"></span></a></li>
-	<li id="profile-side-notes" class="menu-profile-list notes"><a class="menu-profile-list-item" href="$ps.usermenu.notes.0">$ps.usermenu.notes.1<span class="menu-profile-icon notes"></span></a></li>
-	<li id="profile-side-foren" class="menu-profile-list foren"><a class="menu-profile-list-item" href="$ps.usermenu.pgroups.0" target="blanc">$ps.usermenu.pgroups.1<span class="menu-profile-icon foren"></span></a></li>
-	<li id="profile-side-foren" class="menu-profile-list com_side"><a class="menu-profile-list-item" href="$ps.usermenu.community.0">$ps.usermenu.community.1<span class="menu-profile-icon com_side"></span></a></li>
-</ul>
-
-</div>
-
-				
diff --git a/view/theme/diabook/diabook-aerith/profile_vcard.tpl b/view/theme/diabook/diabook-aerith/profile_vcard.tpl
deleted file mode 100644
index 6fcffcc9b..000000000
--- a/view/theme/diabook/diabook-aerith/profile_vcard.tpl
+++ /dev/null
@@ -1,64 +0,0 @@
-<div class="vcard">
-
-	<div class="tool">
-		<div class="fn label">$profile.name</div>
-		{{ if $profile.edit }}
-			<div class="action">
-			<a class="icon s16 edit ttright" href="#" rel="#profiles-menu" title="$profile.edit.3"><span>$profile.edit.1</span></a>
-			<ul id="profiles-menu" class="menu-popup">
-				{{ for $profile.menu.entries as $e }}
-				<li>
-					<a href="profiles/$e.id"><img src='$e.photo'>$e.profile_name</a>
-				</li>
-				{{ endfor }}
-				<li><a href="profile_photo" >$profile.menu.chg_photo</a></li>
-				<li><a href="profiles/new" id="profile-listing-new-link">$profile.menu.cr_new</a></li>
-				<li><a href="profiles" >$profile.edit.3</a></li>
-								
-			</ul>
-			</div>
-		{{ endif }}
-	</div>
-				
-	
-
-	<div id="profile-photo-wrapper"><img class="photo"  src="$profile.photo?rev=$profile.picdate" alt="$profile.name" /></div>
-	{{ if $pdesc }}<div class="title">$profile.pdesc</div>{{ endif }}
-
-
-	{{ if $location }}
-		<dl class="location"><dt class="location-label">$location</dt><br> 
-		<dd class="adr">
-			{{ if $profile.address }}<div class="street-address">$profile.address</div>{{ endif }}
-			<span class="city-state-zip">
-				<span class="locality">$profile.locality</span>{{ if $profile.locality }}, {{ endif }}
-				<span class="region">$profile.region</span>
-				<span class="postal-code">$profile.postal-code</span>
-			</span>
-			{{ if $profile.country-name }}<span class="country-name">$profile.country-name</span>{{ endif }}
-		</dd>
-		</dl>
-	{{ endif }}
-
-	{{ if $gender }}<dl class="mf"><dt class="gender-label">$gender</dt> <dd class="x-gender">$profile.gender</dd></dl>{{ endif }}
-	
-	{{ if $profile.pubkey }}<div class="key" style="display:none;">$profile.pubkey</div>{{ endif }}
-
-	{{ if $marital }}<dl class="marital"><dt class="marital-label"><span class="heart">&hearts;</span>$marital</dt><dd class="marital-text">$profile.marital</dd></dl>{{ endif }}
-
-	{{ if $homepage }}<dl class="homepage"><dt class="homepage-label">$homepage</dt><dd class="homepage-url"><a href="$profile.homepage" target="external-link">$profile.homepage</a></dd></dl>{{ endif }}
-
-	{{ inc diaspora_vcard.tpl }}{{ endinc }}
-	
-	<div id="profile-extra-links">
-		<ul>
-			{{ if $connect }}
-				<li><a id="dfrn-request-link" href="dfrn_request/$profile.nickname">$connect</a></li>
-			{{ endif }}
-		</ul>
-	</div>
-</div>
-
-$contact_block
-
-
diff --git a/view/theme/diabook/diabook-aerith/right_aside.tpl b/view/theme/diabook/diabook-aerith/right_aside.tpl
deleted file mode 100644
index a65677696..000000000
--- a/view/theme/diabook/diabook-aerith/right_aside.tpl
+++ /dev/null
@@ -1,20 +0,0 @@
-<div id="profile_side">
-	<div id="ps-usernameicon">
-		<a href="$ps.usermenu.status.0" title="$userinfo.name">
-			<img src="$userinfo.icon" id="ps-usericon" alt="$userinfo.name">
-		</a>
-		<a href="$ps.usermenu.status.0" id="ps-username" title="$userinfo.name">$userinfo.name</a>
-	</div>
-	
-<ul id="profile-side-menu" class="menu-profile-side">
-	<li id="profile-side-status" class="menu-profile-list home"><a class="menu-profile-list-item" href="$ps.usermenu.status.0">$ps.usermenu.status.1</a></li>
-	<li id="profile-side-photos" class="menu-profile-list photos"><a class="menu-profile-list-item" href="$ps.usermenu.photos.0">$ps.usermenu.photos.1</a></li>
-	<li id="profile-side-events" class="menu-profile-list events"><a class="menu-profile-list-item" href="$ps.usermenu.events.0">$ps.usermenu.events.1</a></li>
-	<li id="profile-side-notes" class="menu-profile-list notes"><a class="menu-profile-list-item" href="$ps.usermenu.notes.0">$ps.usermenu.notes.1</a></li>
-	<li id="profile-side-foren" class="menu-profile-list foren"><a class="menu-profile-list-item" href="http://dir.friendika.com/directory/forum" target="blanc">Public Groups</a></li>
-	<li id="profile-side-foren" class="menu-profile-list com_side"><a class="menu-profile-list-item" href="$ps.usermenu.community.0">$ps.usermenu.community.1</a></li>
-</ul>
-
-</div>
-
-				
\ No newline at end of file
diff --git a/view/theme/diabook/diabook-aerith/screenshot.png b/view/theme/diabook/diabook-aerith/screenshot.png
deleted file mode 100644
index 4eee5be5a..000000000
--- a/view/theme/diabook/diabook-aerith/screenshot.png
+++ /dev/null
diff --git a/view/theme/diabook/diabook-aerith/search_item.tpl b/view/theme/diabook/diabook-aerith/search_item.tpl
deleted file mode 100644
index 123834064..000000000
--- a/view/theme/diabook/diabook-aerith/search_item.tpl
+++ /dev/null
@@ -1,100 +0,0 @@
-{{ if $item.indent }}{{ else }}
-<div class="wall-item-decor">
-	<img id="like-rotator-$item.id" class="like-rotator" src="images/rotator.gif" alt="$item.wait" title="$item.wait" style="display: none;" />
-</div>
-{{ endif }}
-<div class="wall-item-container $item.indent">
-	<div class="wall-item-item">
-		<div class="wall-item-info">
-			<div class="contact-photo-wrapper"
-				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" target="redir" title="$item.linktitle" class="contact-photo-link" id="wall-item-photo-link-$item.id">
-					<img src="$item.thumb" class="contact-photo$item.sparkle" id="wall-item-photo-$item.id" alt="$item.name" />
-				</a>
-				<a href="#" rel="#wall-item-photo-menu-$item.id" class="contact-photo-menu-button icon s16 menu" id="wall-item-photo-menu-button-$item.id">menu</a>
-				<ul class="contact-menu menu-popup" id="wall-item-photo-menu-$item.id">
-				$item.item_photo_menu
-				</ul>
-				
-			</div>
-		</div>
-			<div class="wall-item-actions-author">
-				<a href="$item.profile_url" target="redir" title="$item.linktitle" class="wall-item-name-link"><span class="wall-item-name$item.sparkle">$item.name</span></a> 
-			<span class="wall-item-ago">-
-			{{ if $item.plink }}<a class="link" title="$item.plink.title" href="$item.plink.href" style="color: #999">$item.ago</a>{{ else }} $item.ago {{ endif }}
-			{{ if $item.lock }} - <span class="fakelink" style="color: #999" onclick="lockview(event,$item.id);">$item.lock</span> {{ endif }}
-			</span>
-			</div>
-		<div class="wall-item-content">
-			{{ if $item.title }}<h2><a href="$item.plink.href">$item.title</a></h2>{{ endif }}
-			$item.body
-		</div>
-	</div>
-	<div class="wall-item-bottom">
-		<div class="wall-item-links">
-		</div>
-		<div class="wall-item-tags">
-			{{ for $item.tags as $tag }}
-				<span class='tag'>$tag</span>
-			{{ endfor }}
-		</div>
-	</div>
-	<div class="wall-item-bottom">
-		<div class="">
-
-		</div>
-		<div class="wall-item-actions">
-
-			<div class="wall-item-actions-social">
-			
-			
-			{{ if $item.vote }}
-				<a href="#" id="like-$item.id" class="icon like" title="$item.vote.like.0" onclick="dolike($item.id,'like'); return false">$item.vote.like.1</a>
-				<a href="#" id="dislike-$item.id" class="icon dislike" title="$item.vote.dislike.0" onclick="dolike($item.id,'dislike'); return false"></a>
-			{{ endif }}
-						
-			{{ if $item.vote.share }}
-				<a href="#" id="share-$item.id" class="icon recycle" title="$item.vote.share.0" onclick="jotShare($item.id); return false"></a>
-			{{ endif }}	
-
-
-			{{ if $item.star }}
-				<a href="#" id="starred-$item.id" onclick="dostar($item.id); return false;" class="star-item icon $item.isstarred" title="$item.star.toggle">
-				<img src="images/star_dummy.png" class="icon star" alt="$item.star.do" /> </a>
-				<a href="#" id="tagger-$item.id" onclick="itemTag($item.id); return false;" class="tag-item icon tagged" title="$item.star.tagger"></a>					  
-			{{ endif }}	
-			
-			{{ if $item.filer }}
-			<a href="#" id="filer-$item.id" onclick="itemFiler($item.id); return false;" class="filer-item icon file-as" title="$item.star.filer"></a>
-			{{ endif }}				
-			
-			{{ if $item.plink }}<a class="icon link" title="$item.plink.title" href="$item.plink.href">$item.plink.title</a>{{ endif }}
-			
-					
-					
-			</div>
-			
-			<div class="wall-item-actions-tools">
-
-				{{ if $item.drop.dropping }}
-					<input type="checkbox" title="$item.drop.select" name="itemselected[]" class="item-select" value="$item.id" />
-					<a href="item/drop/$item.id" onclick="return confirmDelete();" class="icon drop" title="$item.drop.delete">$item.drop.delete</a>
-				{{ endif }}
-				{{ if $item.edpost }}
-					<a class="icon pencil" href="$item.edpost.0" title="$item.edpost.1"></a>
-				{{ endif }}
-			</div>
-			<div class="wall-item-location">$item.location&nbsp;</div>
-		</div>
-	</div>
-	<div class="wall-item-bottom">
-		<div class="wall-item-links"></div>
-		<div class="wall-item-like" id="wall-item-like-$item.id">$item.like</div>
-		<div class="wall-item-dislike" id="wall-item-dislike-$item.id">$item.dislike</div>	
-	</div>
-</div>
-
-<div class="wall-item-comment-wrapper" >
-	$item.comment
-</div>
diff --git a/view/theme/diabook/diabook-aerith/style-network-wide.css b/view/theme/diabook/diabook-aerith/style-network-wide.css
index 28f47552e..d5c91c9a4 100644
--- a/view/theme/diabook/diabook-aerith/style-network-wide.css
+++ b/view/theme/diabook/diabook-aerith/style-network-wide.css
@@ -121,7 +121,7 @@
 			  display: block; width: 28px; height: 28px; background-repeat: no-repeat;
 			  }	
 .video 	{ background-image: url("../diabook-aerith/icons/video.png"); 
-			  display: block; width: 100%; height: 28px; background-repeat: no-repeat;
+			  display: block; width: 100%; height: 140px; background-repeat: no-repeat;
 			  }
 .audio2 	{ background-image: url("../diabook-aerith/icons/audio.png"); 
 			  display: block; width: 28px; height: 28px; background-repeat: no-repeat;
@@ -1395,7 +1395,7 @@ transition: all 0.2s ease-in-out;
   max-width: 690px;
   word-wrap: break-word;
 
-  margin-bottom: 14px;
+
 }
 /*marker*/
 .wall-item-container .wall-item-content img {
diff --git a/view/theme/diabook/diabook-aerith/style-network.css b/view/theme/diabook/diabook-aerith/style-network.css
index c78ed53d9..21273c19c 100644
--- a/view/theme/diabook/diabook-aerith/style-network.css
+++ b/view/theme/diabook/diabook-aerith/style-network.css
@@ -121,7 +121,7 @@
 			  display: block; width: 28px; height: 28px; background-repeat: no-repeat;
 			  }	
 .video 	{ background-image: url("../diabook-aerith/icons/video.png"); 
-			  display: block; width: 100%; height: 28px; background-repeat: no-repeat;
+			  display: block; width: 100%; height: 140px; background-repeat: no-repeat;
 			  }
 .audio2 	{ background-image: url("../diabook-aerith/icons/audio.png"); 
 			  display: block; width: 28px; height: 28px; background-repeat: no-repeat;
@@ -1388,7 +1388,7 @@ transition: all 0.2s ease-in-out;
   max-width: 420px;
   word-wrap: break-word;
 
-  margin-bottom: 14px;
+
 }
 
 .wall-item-container .wall-item-content img {
diff --git a/view/theme/diabook/diabook-aerith/style-profile-wide.css b/view/theme/diabook/diabook-aerith/style-profile-wide.css
index 19ebd9569..1b8e38481 100644
--- a/view/theme/diabook/diabook-aerith/style-profile-wide.css
+++ b/view/theme/diabook/diabook-aerith/style-profile-wide.css
@@ -121,7 +121,7 @@
 			  display: block; width: 28px; height: 28px; background-repeat: no-repeat;
 			  }	
 .video 	{ background-image: url("../diabook-aerith/icons/video.png"); 
-			  display: block; width: 100%; height: 28px; background-repeat: no-repeat;
+			  display: block; width: 100%; height: 140px; background-repeat: no-repeat;
 			  }
 .audio2 	{ background-image: url("../diabook-aerith/icons/audio.png"); 
 			  display: block; width: 28px; height: 28px; background-repeat: no-repeat;
@@ -1370,7 +1370,7 @@ transition: all 0.2s ease-in-out;
   max-width: 690px;
   word-wrap: break-word;
 
-  margin-bottom: 14px;
+
 }
 /*marker*/
 .wall-item-container .wall-item-content img {
diff --git a/view/theme/diabook/diabook-aerith/style-profile.css b/view/theme/diabook/diabook-aerith/style-profile.css
index 4dc84e95c..e21432d4e 100644
--- a/view/theme/diabook/diabook-aerith/style-profile.css
+++ b/view/theme/diabook/diabook-aerith/style-profile.css
@@ -121,7 +121,7 @@
 			  display: block; width: 28px; height: 28px; background-repeat: no-repeat;
 			  }	
 .video 	{ background-image: url("../diabook-aerith/icons/video.png"); 
-			  display: block; width: 100%; height: 28px; background-repeat: no-repeat;
+			  display: block; width: 100%; height: 140px; background-repeat: no-repeat;
 			  }
 .audio2 	{ background-image: url("../diabook-aerith/icons/audio.png"); 
 			  display: block; width: 28px; height: 28px; background-repeat: no-repeat;
@@ -1362,7 +1362,7 @@ transition: all 0.2s ease-in-out;
   max-width: 420px;
   word-wrap: break-word;
 
-  margin-bottom: 14px;
+
 }
 
 .wall-item-container .wall-item-content img {
diff --git a/view/theme/diabook/diabook-aerith/style-wide.css b/view/theme/diabook/diabook-aerith/style-wide.css
index 759e2a15a..b8ff1fe25 100644
--- a/view/theme/diabook/diabook-aerith/style-wide.css
+++ b/view/theme/diabook/diabook-aerith/style-wide.css
@@ -150,7 +150,7 @@
 			  display: block; width: 28px; height: 28px; background-repeat: no-repeat;
 			  }	
 .video 	{ background-image: url("../../../view/theme/diabook/diabook-aerith/icons/video.png"); 
-			  display: block; width: 100%; height: 28px; background-repeat: no-repeat;
+			  display: block; width: 100%; height: 140px; background-repeat: no-repeat;
 			  }
 .audio2 	{ background-image: url("../../../view/theme/diabook/diabook-aerith/icons/audio.png"); 
 			  display: block; width: 28px; height: 28px; background-repeat: no-repeat;
@@ -1243,7 +1243,14 @@ aside #likes a:hover{
   margin-right: 20px;		
 	}
 #login-submit-wrapper{
-margin-bottom: 15px;
+  padding-top: 120px;
+  margin-bottom: 12px;
+	}
+aside #login-submit-button{
+  margin-left: 0px!important;	
+	}
+aside #login-extra-links{
+  padding-top: 0px!important;	
 	}
 .group_selected {
   background: url("../../../view/theme/diabook/icons/selected.png") no-repeat left center;
@@ -1624,7 +1631,7 @@ body .pageheader{
   max-width: 690px;
   word-wrap: break-word;
 
-  margin-bottom: 14px;
+
 }
 
 .wall-item-container .wall-item-content img {
diff --git a/view/theme/diabook/diabook-aerith/style.css b/view/theme/diabook/diabook-aerith/style.css
index 18873ebc5..01d35b754 100644
--- a/view/theme/diabook/diabook-aerith/style.css
+++ b/view/theme/diabook/diabook-aerith/style.css
@@ -150,7 +150,7 @@
 			  display: block; width: 28px; height: 28px; background-repeat: no-repeat;
 			  }	
 .video 	{ background-image: url("../../../view/theme/diabook/diabook-aerith/icons/video.png"); 
-			  display: block; width: 100%; height: 28px; background-repeat: no-repeat;
+			  display: block; width: 100%; height: 140px; background-repeat: no-repeat;
 			  }
 .audio2 	{ background-image: url("../../../view/theme/diabook/diabook-aerith/icons/audio.png"); 
 			  display: block; width: 28px; height: 28px; background-repeat: no-repeat;
@@ -1241,7 +1241,14 @@ aside #likes a:hover{
   margin-right: 20px;		
 	}
 #login-submit-wrapper{
-margin-bottom: 15px;
+  padding-top: 120px;
+  margin-bottom: 12px;
+	}
+aside #login-submit-button{
+  margin-left: 0px!important;	
+	}
+aside #login-extra-links{
+  padding-top: 0px!important;	
 	}
 .group_selected {
   background: url("../../../view/theme/diabook/icons/selected.png") no-repeat left center;
@@ -1616,7 +1623,7 @@ body .pageheader{
   max-width: 720px;
   word-wrap: break-word;
 
-  margin-bottom: 14px;
+
 }
 
 .wall-item-container .wall-item-content img {
diff --git a/view/theme/diabook/diabook-aerith/style.php b/view/theme/diabook/diabook-aerith/style.php
deleted file mode 100644
index b8c37fc96..000000000
--- a/view/theme/diabook/diabook-aerith/style.php
+++ /dev/null
@@ -1,277 +0,0 @@
-<?php
-	$line_height=false;
-	$diabook_font_size=false;
-	$resolution=false;
-	$site_line_height = get_config("diabook-aerith","line_height");
-	$site_diabook_font_size = get_config("diabook-aerith", "font_size" );
-	$site_resolution = get_config("diabook-aerith", "resolution" );
-	
-	
-	if (local_user()) {
-		$line_height = get_pconfig(local_user(), "diabook-aerith","line_height");
-		$diabook_font_size = get_pconfig(local_user(), "diabook-aerith", "font_size");
-		$resolution = get_pconfig(local_user(), "diabook-aerith", "resolution");
-	}
-	
-	if ($line_height===false) $line_height=$site_line_height;
-	if ($line_height===false) $line_height="1.3";
-	if ($diabook_font_size===false) $diabook_font_size=$site_diabook_font_size;
-	if ($diabook_font_size===false) $diabook_font_size="13";
-	if ($resolution===false) $resolution=$site_resolution;
-	if ($resolution===false) $resolution="normal";
-	
-	
-	if($resolution == "normal") {	
-	if (file_exists("$THEMEPATH/style.css")){
-		echo file_get_contents("$THEMEPATH/style.css");
-	}
-
-   if($diabook_font_size == "15"){
-		echo "
-			.wall-item-container .wall-item-content {
-  					font-size: 15px;
-  					}
-  					
-			.wall-item-photo-container .wall-item-content {
-  					font-size: 15px;
-  					}
-		";
-	}	
-	if($diabook_font_size == "14"){
-		echo "
-			.wall-item-container .wall-item-content {
-  					font-size: 14px;
-  					}
-  					
-			.wall-item-photo-container .wall-item-content {
-  					font-size: 14px;
-  					}
-		";
-	}
-	if($diabook_font_size == "13.5"){
-		echo "
-			.wall-item-container .wall-item-content {
-  					font-size: 13.5px;
-  					}
-  					
-			.wall-item-photo-container .wall-item-content {
-  					font-size: 13.5px;
-  					}
-		";
-	}
-	if($diabook_font_size == "13"){
-		echo "
-			.wall-item-container .wall-item-content {
-  					font-size: 13px;
-  					}
-  					
-			.wall-item-photo-container .wall-item-content {
-  					font-size: 13px;
-  					}
-		";
-	}
-	if($diabook_font_size == "12.5"){
-		echo "
-			.wall-item-container .wall-item-content {
-  					font-size: 12.5px;
-  					}
-  					
-			.wall-item-photo-container .wall-item-content {
-  					font-size: 12.5px;
-  					}
-		";
-	}
-	if($diabook_font_size == "12"){
-		echo "
-			.wall-item-container .wall-item-content {
-  					font-size: 12px;
-  					}
-  					
-			.wall-item-photo-container .wall-item-content {
-  					font-size: 12px;
-  					}
-		";
-	}
-	if($line_height == "1.5"){
-		echo "
-			.wall-item-container .wall-item-content {
-  					line-height: 1.5;
-  					}
-  					
-			.wall-item-photo-container .wall-item-content {
- 					line-height: 1.5;
-  					}
-		";
-	}	
-	if($line_height == "1.4"){
-		echo "
-			.wall-item-container .wall-item-content {
-  					line-height: 1.4;
-  					}
-  					
-			.wall-item-photo-container .wall-item-content {
- 					line-height: 1.4;
-  					}
-		";
-	}
-	if($line_height == "1.3"){
-		echo "
-			.wall-item-container .wall-item-content {
-  					line-height: 1.3;
-  					}
-  					
-			.wall-item-photo-container .wall-item-content {
- 					line-height: 1.3;
-  					}
-		";
-	}
-	if($line_height == "1.2"){
-		echo "
-			.wall-item-container .wall-item-content {
-  					line-height: 1.2;
-  					}
-  					
-			.wall-item-photo-container .wall-item-content {
- 					line-height: 1.2;
-  					}
-		";
-	}
-	if($line_height == "1.1"){
-		echo "
-			.wall-item-container .wall-item-content {
-  					line-height: 1.1;
-  					}
-  					
-			.wall-item-photo-container .wall-item-content {
- 					line-height: 1.1;
-  					}
-		";
-	}
-	}
-	
-	if($resolution == "wide") {	
-	if (file_exists("$THEMEPATH/style-wide.css")){
-		echo file_get_contents("$THEMEPATH/style-wide.css");
-	}
-	if($diabook_font_size == "15"){
-		echo "
-			.wall-item-container .wall-item-content {
-  					font-size: 15px;
-  					}
-  					
-			.wall-item-photo-container .wall-item-content {
-  					font-size: 15px;
-  					}
-		";
-	}
-	if($diabook_font_size == "14"){
-		echo "
-			.wall-item-container .wall-item-content {
-  					font-size: 14px;
-  					}
-  					
-			.wall-item-photo-container .wall-item-content {
-  					font-size: 14px;
-  					}
-		";
-	}
-	if($diabook_font_size == "13.5"){
-		echo "
-			.wall-item-container .wall-item-content {
-  					font-size: 13.5px;
-  					}
-  					
-			.wall-item-photo-container .wall-item-content {
-  					font-size: 13.5px;
-  					}
-		";
-	}
-	if($diabook_font_size == "13"){
-		echo "
-			.wall-item-container .wall-item-content {
-  					font-size: 13px;
-  					}
-  					
-			.wall-item-photo-container .wall-item-content {
-  					font-size: 13px;
-  					}
-		";
-	}
-	if($diabook_font_size == "12.5"){
-		echo "
-			.wall-item-container .wall-item-content {
-  					font-size: 12.5px;
-  					}
-  					
-			.wall-item-photo-container .wall-item-content {
-  					font-size: 12.5px;
-  					}
-		";
-	}
-	if($diabook_font_size == "12"){
-		echo "
-			.wall-item-container .wall-item-content {
-  					font-size: 12px;
-  					}
-  					
-			.wall-item-photo-container .wall-item-content {
-  					font-size: 12px;
-  					}
-		";
-	}
-	if($line_height == "1.5"){
-		echo "
-			.wall-item-container .wall-item-content {
-  					line-height: 1.5;
-  					}
-  					
-			.wall-item-photo-container .wall-item-content {
- 					line-height: 1.5;
-  					}
-		";
-	}	
-	if($line_height == "1.4"){
-		echo "
-			.wall-item-container .wall-item-content {
-  					line-height: 1.4;
-  					}
-  					
-			.wall-item-photo-container .wall-item-content {
- 					line-height: 1.4;
-  					}
-		";
-	}
-	if($line_height == "1.3"){
-		echo "
-			.wall-item-container .wall-item-content {
-  					line-height: 1.3;
-  					}
-  					
-			.wall-item-photo-container .wall-item-content {
- 					line-height: 1.3;
-  					}
-		";
-	}
-	if($line_height == "1.2"){
-		echo "
-			.wall-item-container .wall-item-content {
-  					line-height: 1.2;
-  					}
-  					
-			.wall-item-photo-container .wall-item-content {
- 					line-height: 1.2;
-  					}
-		";
-	}
-	if($line_height == "1.1"){
-		echo "
-			.wall-item-container .wall-item-content {
-  					line-height: 1.1;
-  					}
-  					
-			.wall-item-photo-container .wall-item-content {
- 					line-height: 1.1;
-  					}
-		";
-	}
-	}
\ No newline at end of file
diff --git a/view/theme/diabook/diabook-aerith/theme.php b/view/theme/diabook/diabook-aerith/theme.php
deleted file mode 100644
index 1518d7e8e..000000000
--- a/view/theme/diabook/diabook-aerith/theme.php
+++ /dev/null
@@ -1,488 +0,0 @@
-<?php
-
-/*
- * Name: Diabook-aerith
- * Description: Diabook-aerith : report bugs and request here: http://pad.toktan.org/p/diabook or contact me : thomas_bierey@friendica.eu
- * Version: (Version: 1.020)
- * Author: 
- */
-
-
-//print diabook-version for debugging
-$diabook_version = "Diabook-aerith (Version: 1.020)";
-$a->page['htmlhead'] .= sprintf('<script "%s" ></script>', $diabook_version);
-
-
-//change css on network and profilepages
-$cssFile = null;
-$resolution=false;
-$resolution = get_pconfig(local_user(), "diabook-aerith", "resolution");
-if ($resolution===false) $resolution="normal";
-
-/**
- * prints last community activity
- */
-function diabook_aerith_community_info(){
-	$a = get_app();
-
-	// last 12 users
-	$aside['$lastusers_title'] = t('Last users');
-	$aside['$lastusers_items'] = array();
-	$sql_extra = "";
-	$publish = (get_config('system','publish_all') ? '' : " AND `publish` = 1 " );
-	$order = " ORDER BY `register_date` DESC ";
-
-	$r = q("SELECT `profile`.*, `profile`.`uid` AS `profile_uid`, `user`.`nickname`
-			FROM `profile` LEFT JOIN `user` ON `user`.`uid` = `profile`.`uid` 
-			WHERE `is-default` = 1 $publish AND `user`.`blocked` = 0 $sql_extra $order LIMIT %d , %d ",
-		0,
-		9
-	);
-	$tpl = file_get_contents( dirname(__file__).'/ch_directory_item.tpl');
-	if(count($r)) {
-		$photo = 'thumb';
-		foreach($r as $rr) {
-			$profile_link = $a->get_baseurl() . '/profile/' . ((strlen($rr['nickname'])) ? $rr['nickname'] : $rr['profile_uid']);
-			$entry = replace_macros($tpl,array(
-				'$id' => $rr['id'],
-				'$profile-link' => $profile_link,
-				'$photo' => $rr[$photo],
-				'$alt-text' => $rr['name'],
-			));
-			$aside['$lastusers_items'][] = $entry;
-		}
-	}
-	
-	
-	// last 10 liked items
-	$aside['$like_title'] = t('Last likes');
-	$aside['$like_items'] = array();
-	$r = q("SELECT `T1`.`created`, `T1`.`liker`, `T1`.`liker-link`, `item`.* FROM 
-			(SELECT `parent-uri`, `created`, `author-name` AS `liker`,`author-link` AS `liker-link` 
-				FROM `item` WHERE `verb`='http://activitystrea.ms/schema/1.0/like' GROUP BY `parent-uri` ORDER BY `created` DESC) AS T1
-			INNER JOIN `item` ON `item`.`uri`=`T1`.`parent-uri` 
-			WHERE `T1`.`liker-link` LIKE '%s%%' OR `item`.`author-link` LIKE '%s%%'
-			GROUP BY `uri`
-			ORDER BY `T1`.`created` DESC
-			LIMIT 0,5",
-			$a->get_baseurl(),$a->get_baseurl()
-			);
-
-	foreach ($r as $rr) {
-		$author	 = '<a href="' . $rr['liker-link'] . '">' . $rr['liker'] . '</a>';
-		$objauthor =  '<a href="' . $rr['author-link'] . '">' . $rr['author-name'] . '</a>';
-		
-		//var_dump($rr['verb'],$rr['object-type']); killme();
-		switch($rr['verb']){
-			case 'http://activitystrea.ms/schema/1.0/post':
-				switch ($rr['object-type']){
-					case 'http://activitystrea.ms/schema/1.0/event':
-						$post_type = t('event');
-						break;
-					default:
-						$post_type = t('status');
-				}
-				break;
-			default:
-				if ($rr['resource-id']){
-					$post_type = t('photo');
-					$m=array();	preg_match("/\[url=([^]]*)\]/", $rr['body'], $m);
-					$rr['plink'] = $m[1];
-				} else {
-					$post_type = t('status');
-				}
-		}
-		$plink = '<a href="' . $rr['plink'] . '">' . $post_type . '</a>';
-
-		$aside['$like_items'][] = sprintf( t('%1$s likes %2$s\'s %3$s'), $author, $objauthor, $plink);
-		
-	}
-	
-	
-	// last 12 photos
-	$aside['$photos_title'] = t('Last photos');
-	$aside['$photos_items'] = array();
-	$r = q("SELECT `photo`.`id`, `photo`.`resource-id`, `photo`.`scale`, `photo`.`desc`, `user`.`nickname`, `user`.`username` FROM 
-				(SELECT `resource-id`, MAX(`scale`) as maxscale FROM `photo` 
-					WHERE `profile`=0 AND `contact-id`=0 AND `album` NOT IN ('Contact Photos', '%s', 'Profile Photos', '%s')
-						AND `allow_cid`='' AND `allow_gid`='' AND `deny_cid`='' AND `deny_gid`='' GROUP BY `resource-id`) AS `t1`
-				INNER JOIN `photo` ON `photo`.`resource-id`=`t1`.`resource-id` AND `photo`.`scale` = `t1`.`maxscale`,
-				`user` 
-				WHERE `user`.`uid` = `photo`.`uid`
-				AND `user`.`blockwall`=0
-				AND `user`.`hidewall`=0
-				ORDER BY `photo`.`edited` DESC
-				LIMIT 0, 9",
-				dbesc(t('Contact Photos')),
-				dbesc(t('Profile Photos'))
-				);
-		if(count($r)) {
-		$tpl = file_get_contents( dirname(__file__).'/ch_directory_item.tpl');
-		foreach($r as $rr) {
-			$photo_page = $a->get_baseurl() . '/photos/' . $rr['nickname'] . '/image/' . $rr['resource-id'];
-			$photo_url = $a->get_baseurl() . '/photo/' .  $rr['resource-id'] . '-' . $rr['scale'] .'.jpg';
-		
-			$entry = replace_macros($tpl,array(
-				'$id' => $rr['id'],
-				'$profile-link' => $photo_page,
-				'$photo' => $photo_url,
-				'$alt-text' => $rr['username']." : ".$rr['desc'],
-			));
-
-			$aside['$photos_items'][] = $entry;
-		}
-	}
-	
-	
-   
-   //nav FIND FRIENDS
-	if(local_user()) {
-	$nv = array();
-   $nv['title'] = Array("", t('Find Friends'), "", "");
-	$nv['directory'] = Array('directory', t('Local Directory'), "", "");
-	$nv['global_directory'] = Array('http://dir.friendica.com/', t('Global Directory'), "", "");
-	$nv['match'] = Array('match', t('Similar Interests'), "", "");
-	$nv['suggest'] = Array('suggest', t('Friend Suggestions'), "", "");
-	$nv['invite'] = Array('invite', t('Invite Friends'), "", "");
-	
-	$nv['search'] = '<form name="simple_bar" method="get" action="http://dir.friendika.com/directory">
-						<span class="sbox_l"></span>
-						<span class="sbox">
-						<input type="text" name="search" size="13" maxlength="50">
-						</span>
-						<span class="sbox_r" id="srch_clear"></span>';
-						
-	$aside['$nv'] = $nv;
-	};
-	//Community Page
-	if(local_user()) {
-   $page = '<div id="page-sidebar-right_aside" class="widget">
-			<div class="title tool">
-			<h3>'.t("Community Pages").'<a id="close_pages_icon"  onClick="close_pages()" class="icon close_box" title="close"></a></h3></div>
-			<div id="sidebar-page-list"><ul>';
-
-	$pagelist = array();
-
-	$contacts = q("SELECT `id`, `url`, `name`, `micro`FROM `contact`
-			WHERE `network`= 'dfrn' AND `forum` = 1 AND `uid` = %d
-			ORDER BY `name` ASC",
-			intval($a->user['uid'])
-	);
-
-	$pageD = array();
-
-	// Look if the profile is a community page
-	foreach($contacts as $contact) {
-		$pageD[] = array("url"=>$contact["url"], "name"=>$contact["name"], "id"=>$contact["id"], "micro"=>$contact['micro']);
-	};
-	
-
-	$contacts = $pageD;
-
-	foreach($contacts as $contact) {
-		$page .= '<li style="list-style-type: none;" class="tool"><img height="20" width="20" style="float: left; margin-right: 3px;" src="' . $contact['micro'] .'" alt="' . $contact['url'] . '" /> <a href="'.$a->get_baseurl().'/redir/'.$contact["id"].'" style="margin-top: 2px;" title="' . $contact['url'] . '" class="label" target="external-link">'.
-				$contact["name"]."</a></li>";
-	}
-	$page .= '</ul></div></div>';
-	//if (sizeof($contacts) > 0)
-		
-		$aside['$page'] = $page;
-	}		
-  //END Community Page	
-  //helpers
-   $helpers = array();
-	$helpers['title'] = Array("", t('Help or @NewHere ?'), "", "");
-	
-	$aside['$helpers'] = $helpers;
-   //end helpers
-   //connectable services
-   $con_services = array();
-	$con_services['title'] = Array("", t('Connect Services'), "", "");
-	
-	$aside['$con_services'] = $con_services;
-   //end connectable services
-   
-  
-   //get_baseurl	      
-   $url = $a->get_baseurl($ssl_state);   
-   $aside['$url'] = $url;
-
-	$tpl = file_get_contents(dirname(__file__).'/communityhome.tpl');
-	$a->page['right_aside'] = replace_macros($tpl, $aside);
-	
-}
-
-
-//profile_side at networkpages
-if ($a->argv[0] === "network" && local_user()){
-
-	// USER MENU
-	if(local_user()) {
-		
-		$r = q("SELECT micro FROM contact WHERE uid=%d AND self=1", intval($a->user['uid']));
-				
-		$userinfo = array(
-					'icon' => (count($r) ? $r[0]['micro']: $a->get_baseurl()."/images/default-profile-mm.jpg"),
-					'name' => $a->user['username'],
-				);	
-		$ps = array('usermenu'=>array());
-		$ps['usermenu']['status'] = Array('profile/' . $a->user['nickname'], t('Home'), "", t('Your posts and conversations'));
-		$ps['usermenu']['profile'] = Array('profile/' . $a->user['nickname']. '?tab=profile', t('Profile'), "", t('Your profile page'));
-		$ps['usermenu']['contacts'] = Array('contacts' , t('Contacts'), "", t('Your contacts'));		
-		$ps['usermenu']['photos'] = Array('photos/' . $a->user['nickname'], t('Photos'), "", t('Your photos'));
-		$ps['usermenu']['events'] = Array('events/', t('Events'), "", t('Your events'));
-		$ps['usermenu']['notes'] = Array('notes/', t('Personal notes'), "", t('Your personal photos'));
-		$ps['usermenu']['community'] = Array('community/', t('Community'), "", "");
-		$ps['usermenu']['pgroups'] = Array('http://dir.friendika.com/directory/forum', t('Community Pages'), "", "");
-
-		$tpl = get_markup_template('profile_side.tpl');
-
-		$a->page['aside'] .= replace_macros($tpl, array(
-				'$userinfo' => $userinfo,
-				'$ps' => $ps,
-			));
-
-	}
-	
-	$ccCookie = $_COOKIE['close_pages'] + $_COOKIE['close_helpers'] + $_COOKIE['close_services'] + $_COOKIE['close_friends'] + $_COOKIE['close_lastusers'] + $_COOKIE['close_lastphotos'] + $_COOKIE['close_lastlikes'];
-	
-	if($ccCookie != "7") {
-	// COMMUNITY
-	diabook_aerith_community_info();
-	
-	// CUSTOM CSS
-	if($resolution == "normal") {$cssFile = $a->get_baseurl($ssl_state)."/view/theme/diabook-aerith/style-network.css";}
-	if($resolution == "wide") {$cssFile = $a->get_baseurl($ssl_state)."/view/theme/diabook-aerith/style-network-wide.css";}
-	}
-}
-
-
-
-//right_aside at profile pages
-if ($a->argv[0].$a->argv[1] === "profile".$a->user['nickname']){
-	if($ccCookie != "7") {
-	// COMMUNITY
-	diabook_aerith_community_info();
-	
-	// CUSTOM CSS
-	if($resolution == "normal") {$cssFile = $a->get_baseurl($ssl_state)."/view/theme/diabook-aerith/style-profile.css";}
-	if($resolution == "wide") {$cssFile = $a->get_baseurl($ssl_state)."/view/theme/diabook-aerith/style-profile-wide.css";}
-	}
-}
-
-
-
-// custom css
-if (!is_null($cssFile)) $a->page['htmlhead'] .= sprintf('<link rel="stylesheet" type="text/css" href="%s" />', $cssFile);
-
-//load jquery.cookie.js
-$cookieJS = $a->get_baseurl($ssl_state)."/view/theme/diabook-aerith/js/jquery.cookie.js";
-$a->page['htmlhead'] .= sprintf('<script language="JavaScript" src="%s" ></script>', $cookieJS);
-
-//load jquery.ae.image.resize.js
-$imageresizeJS = $a->get_baseurl($ssl_state)."/view/theme/diabook-aerith/js/jquery.ae.image.resize.js";
-$a->page['htmlhead'] .= sprintf('<script language="JavaScript" src="%s" ></script>', $imageresizeJS);
-
-//load jquery.autogrow-textarea.js
-$autogrowJS = $a->get_baseurl($ssl_state)."/view/theme/diabook-aerith/js/jquery.autogrow.textarea.js";
-$a->page['htmlhead'] .= sprintf('<script language="JavaScript" src="%s" ></script>', $autogrowJS);
-
-//js scripts
-//comment-edit-wrapper on photo_view
-if ($a->argv[0].$a->argv[2] === "photos"."image"){
-
-$a->page['htmlhead'] .= '
-<script>
-	$(function(){
-	
-		$(".comment-edit-form").css("display","table");
-			
-			});
-    </script>';
-	
-}
-
-$a->page['htmlhead'] .= '
-
-<script>
- $(function() {
-	$("a.lightbox").fancybox(); // Select all links with lightbox class
- });
-  
- </script>';
- 
-$a->page['htmlhead'] .= '
-
-<script type="text/javascript">
-
-function tautogrow(id){
-		$("textarea#comment-edit-text-" +id).autogrow(); 	
- 	};
- </script>';
-
-$a->page['htmlhead'] .= '
- <script>
- 
-$(document).ready(function() {
-    $("iframe").each(function(){
-        var ifr_source = $(this).attr("src");
-        var wmode = "wmode=transparent";
-        if(ifr_source.indexOf("?") != -1) {
-            var getQString = ifr_source.split("?");
-            var oldString = getQString[1];
-            var newString = getQString[0];
-            $(this).attr("src",newString+"?"+wmode+"&"+oldString);
-        }
-        else $(this).attr("src",ifr_source+"?"+wmode);
-    });
-      
-
-});
-
-function yt_iframe() {
-	
-	$("iframe").load(function() { 
-	var ifr_src = $(this).contents().find("body iframe").attr("src");
-	$("iframe").contents().find("body iframe").attr("src", ifr_src+"&wmode=transparent");
-    });
-
-	};
-  
- </script>';
-
-if ($a->argv[0].$a->argv[1] === "profile".$a->user['nickname'] or $a->argv[0] === "network" && local_user()){
-$a->page['htmlhead'] .= '
-<script>
-
- $(function() {
-	$(".oembed.photo img").aeImageResize({height: 400, width: 400});
-  });
-</script>';
-
-
-	if($ccCookie != "7") {
-$a->page['htmlhead'] .= '
-<script>
-$("right_aside").ready(function(){
-	
-	if($.cookie("close_pages") == "1") 
-		{
-		document.getElementById( "close_pages" ).style.display = "none";
-			};
-	
-	if($.cookie("close_helpers") == "1") 
-		{
-		document.getElementById( "close_helpers" ).style.display = "none";
-			};
-			
-	if($.cookie("close_services") == "1") 
-		{
-		document.getElementById( "close_services" ).style.display = "none";
-			};
-			
-	if($.cookie("close_friends") == "1") 
-		{
-		document.getElementById( "close_friends" ).style.display = "none";
-			};
-	
-			
-	if($.cookie("close_lastusers") == "1") 
-		{
-		document.getElementById( "close_lastusers" ).style.display = "none";
-			};
-			
-	if($.cookie("close_lastphotos") == "1") 
-		{
-		document.getElementById( "close_lastphotos" ).style.display = "none";
-			};
-			
-	if($.cookie("close_lastlikes") == "1") 
-		{
-		document.getElementById( "close_lastlikes" ).style.display = "none";
-			};}
-
-);
-
-function close_pages(){
- document.getElementById( "close_pages" ).style.display = "none";
- $.cookie("close_pages","1", { expires: 365, path: "/" });
- };
- 
-function close_helpers(){
- document.getElementById( "close_helpers" ).style.display = "none";
-  $.cookie("close_helpers","1", { expires: 365, path: "/" });
- };
-
-function close_services(){
- document.getElementById( "close_services" ).style.display = "none";
- $.cookie("close_services","1", { expires: 365, path: "/" });
- };
- 
-function close_friends(){
- document.getElementById( "close_friends" ).style.display = "none";
- $.cookie("close_friends","1", { expires: 365, path: "/" });
- };
-
- 
-function close_lastusers(){
- document.getElementById( "close_lastusers" ).style.display = "none";
- $.cookie("close_lastusers","1", { expires: 365, path: "/" });
- };
-
-function close_lastphotos(){
- document.getElementById( "close_lastphotos" ).style.display = "none";
- $.cookie("close_lastphotos","1", { expires: 365, path: "/" });
- };
- 
-function close_lastlikes(){
- document.getElementById( "close_lastlikes" ).style.display = "none";
- $.cookie("close_lastlikes","1", { expires: 365, path: "/" });
- };
-</script>';}
-
-$a->page['htmlhead'] .= ' 
-<script>
-function restore_boxes(){
-	$.cookie("close_pages","2", { expires: 365, path: "/" });
-	$.cookie("close_helpers","2", { expires: 365, path: "/" });
-	$.cookie("close_services","2", { expires: 365, path: "/" });
-	$.cookie("close_friends","2", { expires: 365, path: "/" });
-	$.cookie("close_lastusers","2", { expires: 365, path: "/" });
-	$.cookie("close_lastphotos","2", { expires: 365, path: "/" });
-	$.cookie("close_lastlikes","2", { expires: 365, path: "/" });
-	alert("Right-hand column was restored. Please refresh your browser");
-  }
-</script>';}
-
-$a->page['htmlhead'] .= ' 
-
-<script type="text/javascript">
-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);
-											}
-
-	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;
-}
-</script> ';
\ No newline at end of file
diff --git a/view/theme/diabook/diabook-aerith/theme_settings.tpl b/view/theme/diabook/diabook-aerith/theme_settings.tpl
deleted file mode 100644
index 472232cf0..000000000
--- a/view/theme/diabook/diabook-aerith/theme_settings.tpl
+++ /dev/null
@@ -1,10 +0,0 @@
-{{inc field_select.tpl with $field=$font_size}}{{endinc}}
-
-{{inc field_select.tpl with $field=$line_height}}{{endinc}}
-
-{{inc field_select.tpl with $field=$resolution}}{{endinc}}
-
-<div class="settings-submit-wrapper">
-	<input type="submit" value="$submit" class="settings-submit" name="diabook-aerith-settings-submit" />
-</div>
-
diff --git a/view/theme/diabook/diabook-aerith/wall_item.tpl b/view/theme/diabook/diabook-aerith/wall_item.tpl
deleted file mode 100644
index 123834064..000000000
--- a/view/theme/diabook/diabook-aerith/wall_item.tpl
+++ /dev/null
@@ -1,100 +0,0 @@
-{{ if $item.indent }}{{ else }}
-<div class="wall-item-decor">
-	<img id="like-rotator-$item.id" class="like-rotator" src="images/rotator.gif" alt="$item.wait" title="$item.wait" style="display: none;" />
-</div>
-{{ endif }}
-<div class="wall-item-container $item.indent">
-	<div class="wall-item-item">
-		<div class="wall-item-info">
-			<div class="contact-photo-wrapper"
-				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" target="redir" title="$item.linktitle" class="contact-photo-link" id="wall-item-photo-link-$item.id">
-					<img src="$item.thumb" class="contact-photo$item.sparkle" id="wall-item-photo-$item.id" alt="$item.name" />
-				</a>
-				<a href="#" rel="#wall-item-photo-menu-$item.id" class="contact-photo-menu-button icon s16 menu" id="wall-item-photo-menu-button-$item.id">menu</a>
-				<ul class="contact-menu menu-popup" id="wall-item-photo-menu-$item.id">
-				$item.item_photo_menu
-				</ul>
-				
-			</div>
-		</div>
-			<div class="wall-item-actions-author">
-				<a href="$item.profile_url" target="redir" title="$item.linktitle" class="wall-item-name-link"><span class="wall-item-name$item.sparkle">$item.name</span></a> 
-			<span class="wall-item-ago">-
-			{{ if $item.plink }}<a class="link" title="$item.plink.title" href="$item.plink.href" style="color: #999">$item.ago</a>{{ else }} $item.ago {{ endif }}
-			{{ if $item.lock }} - <span class="fakelink" style="color: #999" onclick="lockview(event,$item.id);">$item.lock</span> {{ endif }}
-			</span>
-			</div>
-		<div class="wall-item-content">
-			{{ if $item.title }}<h2><a href="$item.plink.href">$item.title</a></h2>{{ endif }}
-			$item.body
-		</div>
-	</div>
-	<div class="wall-item-bottom">
-		<div class="wall-item-links">
-		</div>
-		<div class="wall-item-tags">
-			{{ for $item.tags as $tag }}
-				<span class='tag'>$tag</span>
-			{{ endfor }}
-		</div>
-	</div>
-	<div class="wall-item-bottom">
-		<div class="">
-
-		</div>
-		<div class="wall-item-actions">
-
-			<div class="wall-item-actions-social">
-			
-			
-			{{ if $item.vote }}
-				<a href="#" id="like-$item.id" class="icon like" title="$item.vote.like.0" onclick="dolike($item.id,'like'); return false">$item.vote.like.1</a>
-				<a href="#" id="dislike-$item.id" class="icon dislike" title="$item.vote.dislike.0" onclick="dolike($item.id,'dislike'); return false"></a>
-			{{ endif }}
-						
-			{{ if $item.vote.share }}
-				<a href="#" id="share-$item.id" class="icon recycle" title="$item.vote.share.0" onclick="jotShare($item.id); return false"></a>
-			{{ endif }}	
-
-
-			{{ if $item.star }}
-				<a href="#" id="starred-$item.id" onclick="dostar($item.id); return false;" class="star-item icon $item.isstarred" title="$item.star.toggle">
-				<img src="images/star_dummy.png" class="icon star" alt="$item.star.do" /> </a>
-				<a href="#" id="tagger-$item.id" onclick="itemTag($item.id); return false;" class="tag-item icon tagged" title="$item.star.tagger"></a>					  
-			{{ endif }}	
-			
-			{{ if $item.filer }}
-			<a href="#" id="filer-$item.id" onclick="itemFiler($item.id); return false;" class="filer-item icon file-as" title="$item.star.filer"></a>
-			{{ endif }}				
-			
-			{{ if $item.plink }}<a class="icon link" title="$item.plink.title" href="$item.plink.href">$item.plink.title</a>{{ endif }}
-			
-					
-					
-			</div>
-			
-			<div class="wall-item-actions-tools">
-
-				{{ if $item.drop.dropping }}
-					<input type="checkbox" title="$item.drop.select" name="itemselected[]" class="item-select" value="$item.id" />
-					<a href="item/drop/$item.id" onclick="return confirmDelete();" class="icon drop" title="$item.drop.delete">$item.drop.delete</a>
-				{{ endif }}
-				{{ if $item.edpost }}
-					<a class="icon pencil" href="$item.edpost.0" title="$item.edpost.1"></a>
-				{{ endif }}
-			</div>
-			<div class="wall-item-location">$item.location&nbsp;</div>
-		</div>
-	</div>
-	<div class="wall-item-bottom">
-		<div class="wall-item-links"></div>
-		<div class="wall-item-like" id="wall-item-like-$item.id">$item.like</div>
-		<div class="wall-item-dislike" id="wall-item-dislike-$item.id">$item.dislike</div>	
-	</div>
-</div>
-
-<div class="wall-item-comment-wrapper" >
-	$item.comment
-</div>
diff --git a/view/theme/diabook/diabook-aerith/wallwall_item.tpl b/view/theme/diabook/diabook-aerith/wallwall_item.tpl
deleted file mode 100644
index 6a0c93f88..000000000
--- a/view/theme/diabook/diabook-aerith/wallwall_item.tpl
+++ /dev/null
@@ -1,106 +0,0 @@
-{{ if $item.indent }}{{ else }}
-<div class="wall-item-decor">
-	<img id="like-rotator-$item.id" class="like-rotator" src="images/rotator.gif" alt="$item.wait" title="$item.wait" style="display: none;" />
-</div>
-{{ endif }}
-<div class="wall-item-container $item.indent">
-	<div class="wall-item-item">
-		<div class="wall-item-info">
-			<div class="contact-photo-wrapper mframe wwto" id="wall-item-ownerphoto-wrapper-$item.id" >
-				<a href="$item.owner_url" target="redir" title="$item.olinktitle" class="contact-photo-link" id="wall-item-ownerphoto-link-$item.id">
-					<img src="$item.owner_photo" class="contact-photo $item.osparkle" id="wall-item-ownerphoto-$item.id" alt="$item.owner_name" />
-				</a>
-			</div>
-			<div class="contact-photo-wrapper mframe wwfrom"
-				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" target="redir" title="$item.linktitle" class="contact-photo-link" id="wall-item-photo-link-$item.id">
-					<img src="$item.thumb" class="contact-photo$item.sparkle" id="wall-item-photo-$item.id" alt="$item.name" />
-				</a>
-				<a href="#" rel="#wall-item-photo-menu-$item.id" class="contact-photo-menu-button icon s16 menu" id="wall-item-photo-menu-button-$item.id">menu</a>
-				<ul class="contact-menu menu-popup" id="wall-item-photo-menu-$item.id">
-				$item.item_photo_menu
-				</ul>
-				
-			</div>
-		</div>
-			<div class="wall-item-actions-author">
-				<a href="$item.profile_url" target="redir" title="$item.linktitle" class="wall-item-name-link"><span class="wall-item-name$item.sparkle">$item.name</span></a>
-				$item.to <a href="$item.owner_url" target="redir" 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 <span class="wall-item-ago">- &nbsp;
-			{{ if $item.plink }}<a class="link" title="$item.plink.title" href="$item.plink.href" style="color: #999">$item.ago</a>{{ else }} $item.ago {{ endif }}
-			{{ if $item.lock }} - <span class="fakelink" style="color: #999" onclick="lockview(event,$item.id);">$item.lock</span> {{ endif }}
-			</span>
-			</div>
-		<div class="wall-item-content">
-			{{ if $item.title }}<h2><a href="$item.plink.href">$item.title</a></h2>{{ endif }}
-			$item.body
-		</div>
-	</div>
-	<div class="wall-item-bottom">
-		<div class="wall-item-links">
-		</div>
-		<div class="wall-item-tags">
-			{{ for $item.tags as $tag }}
-				<span class='tag'>$tag</span>
-			{{ endfor }}
-		</div>
-	</div>
-	<div class="wall-item-bottom">
-		<div class="">
-
-		</div>
-		<div class="wall-item-actions">
-
-			<div class="wall-item-actions-social">
-			
-			
-			{{ if $item.vote }}
-				<a href="#" id="like-$item.id" class="icon like" title="$item.vote.like.0" onclick="dolike($item.id,'like'); return false">$item.vote.like.1</a>
-				<a href="#" id="dislike-$item.id" class="icon dislike" title="$item.vote.dislike.0" onclick="dolike($item.id,'dislike'); return false"></a>
-			{{ endif }}
-						
-			{{ if $item.vote.share }}
-				<a href="#" id="share-$item.id" class="icon recycle" title="$item.vote.share.0" onclick="jotShare($item.id); return false"></a>
-			{{ endif }}	
-
-
-			{{ if $item.star }}
-				<a href="#" id="starred-$item.id" onclick="dostar($item.id); return false;" class="star-item icon $item.isstarred" title="$item.star.toggle">
-				<img src="images/star_dummy.png" class="icon star" alt="$item.star.do" /> </a>
-				<a href="#" id="tagger-$item.id" onclick="itemTag($item.id); return false;" class="tag-item icon tagged" title="$item.star.tagger"></a>
-			{{ endif }}	
-			
-			{{ if $item.filer }}
-			<a href="#" id="filer-$item.id" onclick="itemFiler($item.id); return false;" class="filer-item icon file-as" title="$item.star.filer"></a>
-			{{ endif }}				
-			
-			{{ if $item.plink }}<a class="icon link" title="$item.plink.title" href="$item.plink.href">$item.plink.title</a>{{ endif }}
-			
-					
-					
-			</div>
-			
-			<div class="wall-item-actions-tools">
-
-				{{ if $item.drop.dropping }}
-					<input type="checkbox" title="$item.drop.select" name="itemselected[]" class="item-select" value="$item.id" />
-					<a href="item/drop/$item.id" onclick="return confirmDelete();" class="icon drop" title="$item.drop.delete">$item.drop.delete</a>
-				{{ endif }}
-				{{ if $item.edpost }}
-					<a class="icon pencil" href="$item.edpost.0" title="$item.edpost.1"></a>
-				{{ endif }}
-			</div>
-			<div class="wall-item-location">$item.location&nbsp;</div>
-		</div>
-	</div>
-	<div class="wall-item-bottom">
-		<div class="wall-item-links"></div>
-		<div class="wall-item-like" id="wall-item-like-$item.id">$item.like</div>
-		<div class="wall-item-dislike" id="wall-item-dislike-$item.id">$item.dislike</div>	
-	</div>
-</div>
-
-<div class="wall-item-comment-wrapper" >
-	$item.comment
-</div>
\ No newline at end of file
diff --git a/view/theme/diabook/diabook-blue/admin_users.tpl b/view/theme/diabook/diabook-blue/admin_users.tpl
deleted file mode 100644
index 40f94f5fe..000000000
--- a/view/theme/diabook/diabook-blue/admin_users.tpl
+++ /dev/null
@@ -1,88 +0,0 @@
-<script>
-	function confirm_delete(uname){
-		return confirm( "$confirm_delete".format(uname));
-	}
-	function confirm_delete_multi(){
-		return confirm("$confirm_delete_multi");
-	}
-	function selectall(cls){
-		$("."+cls).attr('checked','checked');
-		return false;
-	}
-</script>
-<div id='adminpage'>
-	<h1>$title - $page</h1>
-	
-	<form action="$baseurl/admin/users" method="post">
-		
-		<h3>$h_pending</h3>
-		{{ if $pending }}
-			<table id='pending'>
-				<thead>
-				<tr>
-					{{ for $th_pending as $th }}<th>$th</th>{{ endfor }}
-					<th></th>
-					<th></th>
-				</tr>
-				</thead>
-				<tbody>
-			{{ for $pending as $u }}
-				<tr>
-					<td class="created">$u.created</td>
-					<td class="name">$u.name</td>
-					<td class="email">$u.email</td>
-					<td class="checkbox"><input type="checkbox" class="pending_ckbx" id="id_pending_$u.hash" name="pending[]" value="$u.hash" /></td>
-					<td class="tools">
-						<a href="$baseurl/regmod/allow/$u.hash" title='$approve'><span class='icon like'></span></a>
-						<a href="$baseurl/regmod/deny/$u.hash" title='$deny'><span class='icon dislike'></span></a>
-					</td>
-				</tr>
-			{{ endfor }}
-				</tbody>
-			</table>
-			<div class='selectall'><a href='#' onclick="return selectall('pending_ckbx');">$select_all</a></div>
-			<div class="submit"><input type="submit" name="page_users_deny" value="$deny"/> <input type="submit" name="page_users_approve" value="$approve" /></div>			
-		{{ else }}
-			<p>$no_pending</p>
-		{{ endif }}
-	
-	
-		
-	
-		<h3>$h_users</h3>
-		{{ if $users }}
-			<table id='users'>
-				<thead>
-				<tr>
-					<th></th>
-					{{ for $th_users as $th }}<th>$th</th>{{ endfor }}
-					<th></th>
-					<th></th>
-				</tr>
-				</thead>
-				<tbody>
-				{{ for $users as $u }}
-					<tr>
-						<td><img src="$u.micro" alt="$u.nickname" title="$u.nickname"></td>
-						<td class='name'><a href="$u.url" title="$u.nickname" >$u.name</a></td>
-						<td class='email'>$u.email</td>
-						<td class='register_date'>$u.register_date</td>
-						<td class='login_date'>$u.login_date</td>
-						<td class='lastitem_date'>$u.lastitem_date</td>
-						<td class='login_date'>$u.page-flags</td>
-						<td class="checkbox"><input type="checkbox" class="users_ckbx" id="id_user_$u.uid" name="user[]" value="$u.uid"/></td>
-						<td class="tools" style="width:60px;">
-							<a href="$baseurl/admin/users/block/$u.uid" title='{{ if $u.blocked }}$unblock{{ else }}$block{{ endif }}'><span class='icon block {{ if $u.blocked==0 }}dim{{ endif }}'></span></a>
-							<a href="$baseurl/admin/users/delete/$u.uid" title='$delete' onclick="return confirm_delete('$u.name')"><span class='icon ad_drop'></span></a>
-						</td>
-					</tr>
-				{{ endfor }}
-				</tbody>
-			</table>
-			<div class='selectall'><a href='#' onclick="return selectall('users_ckbx');">$select_all</a></div>
-			<div class="submit"><input type="submit" name="page_users_block" value="$block/$unblock" /> <input type="submit" name="page_users_delete" value="$delete" onclick="return confirm_delete_multi()" /></div>						
-		{{ else }}
-			NO USERS?!?
-		{{ endif }}
-	</form>
-</div>
diff --git a/view/theme/diabook/diabook-blue/ch_directory_item.tpl b/view/theme/diabook/diabook-blue/ch_directory_item.tpl
deleted file mode 100644
index db1936e4b..000000000
--- a/view/theme/diabook/diabook-blue/ch_directory_item.tpl
+++ /dev/null
@@ -1,10 +0,0 @@
-
-<div class="directory-item" id="directory-item-$id" >
-	<div class="directory-photo-wrapper" id="directory-photo-wrapper-$id" > 
-		<div class="directory-photo" id="directory-photo-$id" >
-			<a href="$profile-link" class="directory-profile-link" id="directory-profile-link-$id" >
-				<img class="directory-photo-img" src="$photo" alt="$alt-text" title="$alt-text" />
-			</a>
-		</div>
-	</div>
-</div>
diff --git a/view/theme/diabook/diabook-blue/comment_item.tpl b/view/theme/diabook/diabook-blue/comment_item.tpl
deleted file mode 100644
index ee4dfba45..000000000
--- a/view/theme/diabook/diabook-blue/comment_item.tpl
+++ /dev/null
@@ -1,41 +0,0 @@
-		<div class="comment-wwedit-wrapper" id="comment-edit-wrapper-$id" style="display: block;">
-			<form class="comment-edit-form" id="comment-edit-form-$id" action="item" method="post" onsubmit="post_comment($id); return false;">
-				<input type="hidden" name="type" value="$type" />
-				<input type="hidden" name="profile_uid" value="$profile_uid" />
-				<input type="hidden" name="parent" value="$parent" />
-				<input type="hidden" name="return" value="$return_path" />
-				<input type="hidden" name="jsreload" value="$jsreload" />
-				<input type="hidden" name="preview" id="comment-preview-inp-$id" value="0" />
-
-				<div class="comment-edit-photo" id="comment-edit-photo-$id" >
-					<a class="comment-edit-photo-link" href="$mylink" title="$mytitle"><img class="my-comment-photo" src="$myphoto" alt="$mytitle" title="$mytitle" /></a>
-				</div>
-				<div class="comment-edit-photo-end"></div>
-				<textarea id="comment-edit-text-$id" class="comment-edit-text-empty" name="body" onFocus="commentOpen(this,$id);tautogrow($id)" onBlur="commentClose(this,$id);" >$comment</textarea>
-				<a class="icon bb-image" style="cursor: pointer;" onclick="insertFormatting('$comment','img',$id);">img</a>	
-				<a class="icon bb-url" style="cursor: pointer;" onclick="insertFormatting('$comment','url',$id);">url</a>
-				<a class="icon bb-video" style="cursor: pointer;" onclick="insertFormatting('$comment','video',$id);">video</a>														
-				<a class="icon underline" style="cursor: pointer;" onclick="insertFormatting('$comment','u',$id);">u</a>
-				<a class="icon italic" style="cursor: pointer;" onclick="insertFormatting('$comment','i',$id);">i</a>
-				<a class="icon bold" style="cursor: pointer;" onclick="insertFormatting('$comment','b',$id);">b</a>
-				<a class="icon quote" style="cursor: pointer;" onclick="insertFormatting('$comment','quote',$id);">quote</a>																			
-				{{ if $qcomment }}
-					<select id="qcomment-select-$id" name="qcomment-$id" class="qcomment" onchange="qCommentInsert(this,$id);" >
-					<option value=""></option>
-				{{ for $qcomment as $qc }}
-					<option value="$qc">$qc</option>				
-				{{ endfor }}
-					</select>
-				{{ endif }}
-
-				<div class="comment-edit-text-end"></div>
-				<div class="comment-edit-submit-wrapper" id="comment-edit-submit-wrapper-$id" style="display: none;" >
-					<input type="submit" onclick="post_comment($id); return false;" id="comment-edit-submit-$id" class="comment-edit-submit" name="submit" value="$submit" />
-					<span onclick="preview_comment($id);" id="comment-edit-preview-link-$id" class="fakelink">$preview</span>
-					<div id="comment-edit-preview-$id" class="comment-edit-preview" style="display:none;"></div>
-				</div>
-
-				<div class="comment-edit-end"></div>
-			</form>
-
-		</div>
diff --git a/view/theme/diabook/diabook-blue/communityhome.tpl b/view/theme/diabook/diabook-blue/communityhome.tpl
deleted file mode 100644
index 6ac414ef4..000000000
--- a/view/theme/diabook/diabook-blue/communityhome.tpl
+++ /dev/null
@@ -1,87 +0,0 @@
-<div id="close_pages">
-{{ if $page }}
-<div>$page</div>
-{{ endif }}
-</div>
-
-<div id="close_helpers">
-{{ if $lastusers_title }}
-<h3 style="margin-top:0px;">$helpers.title.1<a id="close_helpers_icon"  onClick="close_helpers()" class="icon close_box" title="close"></a></h3>
-<a href="http://kakste.com/profile/newhere" title="#NewHere" style="margin-left: 10px; " target="blank">NewHere</a><br>
-<a href="https://helpers.pyxis.uberspace.de/profile/helpers" style="margin-left: 10px; " title="Friendica Support" target="blank">Friendica Support</a><br>
-<a href="https://letstalk.pyxis.uberspace.de/profile/letstalk" style="margin-left: 10px; " title="Let's talk" target="blank">Let's talk</a><br>
-<a href="http://newzot.hydra.uberspace.de/profile/newzot" title="Local Friendica" style="margin-left: 10px; " target="blank">Local Friendica</a>
-{{ endif }}
-</div>
-
-<div id="close_services">
-{{ if $lastusers_title }}
-<h3>$con_services.title.1<a id="close_services_icon" onClick="close_services()" class="icon close_box" title="close"></a></h3>
-<div id="right_service_icons" style="margin-left: 11px; margin-top: 5px;">
-<a href="$url/facebook"><img alt="Facebook" src="view/theme/diabook-blue/icons/facebook.png" title="Facebook"></a>
-<a href="$url/settings/connectors"><img alt="StatusNet" src="view/theme/diabook-blue/icons/StatusNet.png?" title="StatusNet"></a>
-<a href="$url/settings/connectors"><img alt="LiveJournal" src="view/theme/diabook-blue/icons/livejournal.png?" title="LiveJournal"></a>
-<a href="$url/settings/connectors"><img alt="Posterous" src="view/theme/diabook-blue/icons/posterous.png?" title="Posterous"></a>
-<a href="$url/settings/connectors"><img alt="Tumblr" src="view/theme/diabook-blue/icons/tumblr.png?" title="Tumblr"></a>
-<a href="$url/settings/connectors"><img alt="Twitter" src="view/theme/diabook-blue/icons/twitter.png?" title="Twitter"></a>
-<a href="$url/settings/connectors"><img alt="WordPress" src="view/theme/diabook-blue/icons/wordpress.png?" title="WordPress"></a>
-<a href="$url/settings/connectors"><img alt="E-Mail" src="view/theme/diabook-blue/icons/email.png?" title="E-Mail"></a>
-</div>
-{{ endif }}
-</div>
-
-<div id="close_friends" style="margin-bottom:53px;">
-{{ if $nv }}
-<h3>$nv.title.1<a id="close_friends_icon" onClick="close_friends()"  class="icon close_box" title="close"></a></h3>
-<a class="$nv.directory.2" href="$nv.directory.0" style="margin-left: 10px; " title="$nv.directory.3" >$nv.directory.1</a><br>
-<a class="$nv.global_directory.2" href="$nv.global_directory.0" target="blank" style="margin-left: 10px; " title="$nv.global_directory.3" >$nv.global_directory.1</a><br>
-<a class="$nv.match.2" href="$nv.match.0" style="margin-left: 10px; " title="$nv.match.3" >$nv.match.1</a><br>
-<a class="$nv.suggest.2" href="$nv.suggest.0" style="margin-left: 10px; " title="$nv.suggest.3" >$nv.suggest.1</a><br>
-<a class="$nv.invite.2" href="$nv.invite.0" style="margin-left: 10px; " title="$nv.invite.3" >$nv.invite.1</a>			
-$nv.search
-{{ endif }}
-</div>
-
-
-<div id="close_lastusers">
-{{ if $lastusers_title }}
-<h3>$lastusers_title<a id="close_lastusers_icon" onClick="close_lastusers()" class="icon close_box" title="close"></a></h3>
-<div id='lastusers-wrapper' class='items-wrapper'>
-{{ for $lastusers_items as $i }}
-	$i
-{{ endfor }}
-</div>
-{{ endif }}
-</div>
-
-
-{{ if $activeusers_title }}
-<h3>$activeusers_title</h3>
-<div class='items-wrapper'>
-{{ for $activeusers_items as $i }}
-	$i
-{{ endfor }}
-</div>
-{{ endif }}
-
-<div id="close_lastphotos">
-{{ if $photos_title }}
-<h3>$photos_title<a id="close_photos_icon" onClick="close_lastphotos()"  class="icon close_box" title="close"></a></h3>
-<div id='ra-photos-wrapper' class='items-wrapper'>
-{{ for $photos_items as $i }}
-	$i
-{{ endfor }}
-</div>
-{{ endif }}
-</div>
-
-<div id="close_lastlikes">
-{{ if $like_title }}
-<h3>$like_title<a id="close_lastlikes_icon" onClick="close_lastlikes()" class="icon close_box" title="close"></a></h3>
-<ul id='likes'>
-{{ for $like_items as $i }}
-	<li id='ra-photos-wrapper'>$i</li>
-{{ endfor }}
-</ul>
-{{ endif }}
-</div>
diff --git a/view/theme/diabook/diabook-blue/config.php b/view/theme/diabook/diabook-blue/config.php
deleted file mode 100644
index 40a6415f0..000000000
--- a/view/theme/diabook/diabook-blue/config.php
+++ /dev/null
@@ -1,84 +0,0 @@
-<?php
-/**
- * Theme settings
- */
-
-
-
-function theme_content(&$a){
-	if(!local_user())
-		return;		
-	
-	$font_size = get_pconfig(local_user(), 'diabook-blue', 'font_size' );
-	$line_height = get_pconfig(local_user(), 'diabook-blue', 'line_height' );
-	$resolution = get_pconfig(local_user(), 'diabook-blue', 'resolution' );
-	
-	return diabook_form($a,$font_size, $line_height,$resolution);
-}
-
-function theme_post(&$a){
-	if(! local_user())
-		return;
-	
-	if (isset($_POST['diabook-blue-settings-submit'])){
-		set_pconfig(local_user(), 'diabook-blue', 'font_size', $_POST['diabook-blue_font_size']);
-		set_pconfig(local_user(), 'diabook-blue', 'line_height', $_POST['diabook-blue_line_height']);
-		set_pconfig(local_user(), 'diabook-blue', 'resolution', $_POST['diabook-blue_resolution']);	
-	}
-}
-
-
-function theme_admin(&$a){
-	$font_size = get_config('diabook-blue', 'font_size' );
-	$line_height = get_config('diabook-blue', 'line_height' );
-	$resolution = get_config('diabook-blue', 'resolution' );
-	
-	return diabook_form($a,$font_size, $line_height,$resolution);
-}
-
-function theme_admin_post(&$a){
-	if (isset($_POST['diabook-blue-settings-submit'])){
-		set_config('diabook-blue', 'font_size', $_POST['diabook-blue_font_size']);
-		set_config('diabook-blue', 'line_height', $_POST['diabook-blue_line_height']);
-		set_config('diabook-blue', 'resolution', $_POST['diabook-blue_resolution']);
-	}
-}
-
-
-function diabook_form(&$a, $font_size, $line_height, $resolution){
-	$line_heights = array(
-		"1.3"=>"1.3",
-		"---"=>"---",
-		"1.5"=>"1.5",		
-		"1.4"=>"1.4",
-		"1.2"=>"1.2",
-		"1.1"=>"1.1",
-	);
-	
-	$font_sizes = array(
-		'13'=>'13',
-		"---"=>"---",
-		"15"=>"15",
-		'14'=>'14',
-		'13.5'=>'13.5',		
-		'12.5'=>'12.5',
-		'12'=>'12',
-		);
-	$resolutions = array(
-		'normal'=>'normal',
-		'wide'=>'wide',		
-		);
-	
-	
-	
-	$t = file_get_contents( dirname(__file__). "/theme_settings.tpl" );
-	$o .= replace_macros($t, array(
-		'$submit' => t('Submit'),
-		'$baseurl' => $a->get_baseurl(),
-		'$title' => t("Theme settings"),
-		'$font_size' => array('diabook-blue_font_size', t('Set font-size for posts and comments'), $font_size, '', $font_sizes),
-		'$line_height' => array('diabook-blue_line_height', t('Set line-height for posts and comments'), $line_height, '', $line_heights),
-		'$resolution' => array('diabook-blue_resolution', t('Set resolution for middle column'), $resolution, '', $resolutions),	
-	));
-	return $o;
-}
diff --git a/view/theme/diabook/diabook-blue/contact_template.tpl b/view/theme/diabook/diabook-blue/contact_template.tpl
deleted file mode 100644
index 48930b48a..000000000
--- a/view/theme/diabook/diabook-blue/contact_template.tpl
+++ /dev/null
@@ -1,25 +0,0 @@
-
-<div class="contact-entry-wrapper" id="contact-entry-wrapper-$contact.id" >
-	<div class="contact-entry-photo-wrapper" >
-		<div class="contact-entry-photo mframe" id="contact-entry-photo-$contact.id"
-		onmouseover="if (typeof t$contact.id != 'undefined') clearTimeout(t$contact.id); openMenu('contact-photo-menu-button-$contact.id')" 
-		onmouseout="t$contact.id=setTimeout('closeMenu(\'contact-photo-menu-button-$contact.id\'); closeMenu(\'contact-photo-menu-$contact.id\');',200)" >
-
-			<a href="$contact.url" title="$contact.img_hover" /><img src="$contact.thumb" $contact.sparkle alt="$contact.name" /></a>
-
-			{{ if $contact.photo_menu }}
-			<span onclick="openClose('contact-photo-menu-$contact.id');" class="fakelink contact-photo-menu-button" id="contact-photo-menu-button-$contact.id">menu</span>
-                <div class="contact-photo-menu" id="contact-photo-menu-$contact.id">
-                    <ul>
-                        $contact.photo_menu
-                    </ul>
-                </div>
-			{{ endif }}
-		</div>
-			
-	</div>
-	<div class="contact-entry-photo-end" ></div>
-		<div class="contact-entry-name" id="contact-entry-name-$contact.id" >$contact.name</div>
-
-	<div class="contact-entry-end" ></div>
-</div>
diff --git a/view/theme/diabook/diabook-blue/directory_item.tpl b/view/theme/diabook/diabook-blue/directory_item.tpl
deleted file mode 100644
index bc2af16c2..000000000
--- a/view/theme/diabook/diabook-blue/directory_item.tpl
+++ /dev/null
@@ -1,11 +0,0 @@
-
-<div class="directory-item" id="directory-item-$id" >
-	<div class="directory-photo-wrapper" id="directory-photo-wrapper-$id" > 
-		<div class="directory-photo" id="directory-photo-$id" >
-			<a href="$profile-link" class="directory-profile-link" id="directory-profile-link-$id" >
-				<img class="directory-photo-img" src="$photo" alt="$alt-text" title="$alt-text" />
-			</a>
-		</div>
-	</div>
-	<div class="contact-name" id="directory-name-$id">$name</div>
-</div>
diff --git a/view/theme/diabook/diabook-blue/generic_links_widget.tpl b/view/theme/diabook/diabook-blue/generic_links_widget.tpl
deleted file mode 100644
index 001c1395e..000000000
--- a/view/theme/diabook/diabook-blue/generic_links_widget.tpl
+++ /dev/null
@@ -1,11 +0,0 @@
-<div id="widget_$title">
-	{{if $title}}<h3 style="border-bottom: 1px solid #D2D2D2;">$title</h3>{{endif}}
-	{{if $desc}}<div class="desc">$desc</div>{{endif}}
-	
-	<ul  class="rs_tabs">
-		{{ for $items as $item }}
-			<li><a href="$item.url" class="rs_tab button {{ if $item.selected }}selected{{ endif }}">$item.label</a></li>
-		{{ endfor }}
-	</ul>
-	
-</div>
diff --git a/view/theme/diabook/diabook-blue/group_side.tpl b/view/theme/diabook/diabook-blue/group_side.tpl
deleted file mode 100644
index 8600402f2..000000000
--- a/view/theme/diabook/diabook-blue/group_side.tpl
+++ /dev/null
@@ -1,34 +0,0 @@
-<div id="profile_side" >
-	<div class="">
-		<h3 style="margin-left: 2px;">$title<a href="group/new" title="$createtext" class="icon text_add"></a></h3>
-	</div>
-
-	<div id="sidebar-group-list">
-		<ul class="menu-profile-side">
-			{{ for $groups as $group }}
-			<li class="menu-profile-list">
-				<span class="menu-profile-icon {{ if $group.selected }}group_selected{{else}}group_unselected{{ endif }}"></span>
-				<a href="$group.href" class="menu-profile-list-item">
-					$group.text
-				</a>
-				{{ if $group.edit }}
-					<a href="$group.edit.href" class="action"><span class="icon text_edit" ></span></a>
-				{{ endif }}
-				{{ if $group.cid }}
-					<input type="checkbox" 
-						class="{{ if $group.selected }}ticked{{ else }}unticked {{ endif }} action" 
-						onclick="contactgroupChangeMember('$group.id','$group.cid');return true;"
-						{{ if $group.ismember }}checked="checked"{{ endif }}
-					/>
-				{{ endif }}
-			</li>
-			{{ endfor }}
-		</ul>
-	</div>
-	 {{ if $ungrouped }}
-  <div id="sidebar-ungrouped">
-  <a href="nogroup">$ungrouped</a>
-  </div>
-  {{ endif }}
-</div>	
-
diff --git a/view/theme/diabook/diabook-blue/jot.tpl b/view/theme/diabook/diabook-blue/jot.tpl
deleted file mode 100644
index 982201f56..000000000
--- a/view/theme/diabook/diabook-blue/jot.tpl
+++ /dev/null
@@ -1,85 +0,0 @@
-
-<div id="profile-jot-wrapper" >
-	<div id="profile-jot-banner-wrapper">
-		<div id="profile-jot-desc" >&nbsp;</div>
-	</div>
-	<div id="profile-jot-banner-end"></div>
-
-	<form id="profile-jot-form" action="$action" method="post" >
-		<input type="hidden" name="type" value="$ptyp" />
-		<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="coord" id="jot-coord" value="" />
-		<input type="hidden" name="post_id" value="$post_id" />
-		<input type="hidden" name="preview" id="jot-preview" value="0" />
-		<input name="title" id="jot-title" type="text" placeholder="$placeholdertitle" value="$title" class="jothidden" style="display:none">
-		<div id="jot-category-wrap"><input name="category" id="jot-category" type="text" placeholder="$placeholdercategory" value="$category" class="jothidden" style="display:none" /></div>				
-		<div id="character-counter" class="grey"></div>		
-		<img id="profile-jot-text-loading" src="images/rotator.gif" alt="$wait" title="$wait" style="display: none;" />
-		<textarea rows="5" cols="64" class="profile-jot-text" id="profile-jot-text" name="body" >{{ if $content }}$content{{ else }}$share{{ endif }}</textarea>
-
-
-<div id="profile-jot-submit-wrapper" class="jothidden">
-	
-	<div id="profile-upload-wrapper" style="display: $visitor;" >
-		<div id="wall-image-upload-div" ><a href="#" onclick="return false;" id="wall-image-upload" class="camera" title="$upload"></a></div>
-	</div> 
-	<div id="profile-attach-wrapper" style="display: $visitor;" >
-		<div id="wall-file-upload-div" ><a href="#" onclick="return false;" id="wall-file-upload" class="attach" title="$attach"></a></div>
-	</div> 
-
-	<div id="profile-link-wrapper" style="display: $visitor;" ondragenter="linkdropper(event);" ondragover="linkdropper(event);" ondrop="linkdrop(event);" >
-		<a id="profile-link" class="weblink" title="$weblink" ondragenter="return linkdropper(event);" ondragover="return linkdropper(event);" ondrop="linkdrop(event);" onclick="jotGetLink(); return false;"></a>
-	</div> 
-	<div id="profile-video-wrapper" style="display: $visitor;" >
-		<a id="profile-video" class="video2" title="$video" onclick="jotVideoURL();return false;"></a>
-	</div> 
-	<div id="profile-audio-wrapper" style="display: $visitor;" >
-		<a id="profile-audio" class="audio2" title="$audio" onclick="jotAudioURL();return false;"></a>
-	</div> 
-	<div id="profile-location-wrapper" style="display: $visitor;" >
-		<a id="profile-location" class="globe" title="$setloc" onclick="jotGetLocation();return false;"></a>
-	</div> 
-	<div id="profile-nolocation-wrapper" style="/*display: none;*/" >
-		<a id="profile-nolocation" class="noglobe" title="$noloc" onclick="jotClearLocation();return false;"></a>
-	</div> 
-
-	<input type="submit" id="profile-jot-submit" class="button creation2" name="submit" value="$share" />
-  
-   <span onclick="preview_post();" id="jot-preview-link" class="tab button">$preview</span>
-   
-	<div id="profile-jot-perms" class="profile-jot-perms" style="display: $pvisit;" >
-		<a href="#profile-jot-acl-wrapper" id="jot-perms-icon" class="icon $lockstate"  title="$permset" ></a>$bang
-	</div>
-
-
-	<div id="profile-jot-plugin-wrapper">
-  	$jotplugins
-	</div>
-	
-	<div id="profile-rotator-wrapper" style="display: $visitor;" >
-		<img id="profile-rotator" src="images/rotator.gif" alt="$wait" title="$wait" style="display: none;" />
-	</div> 
-	
-	</div>
-   <div id="profile-jot-perms-end"></div>
-	
-	<div id="jot-preview-content" style="display:none;"></div>
-
-	<div style="display: none;">
-		<div id="profile-jot-acl-wrapper" style="width:auto;height:auto;overflow:auto;">
-			$acl
-			<hr style="clear:both"/>
-			<div id="profile-jot-email-label">$emailcc</div><input type="text" name="emailcc" id="profile-jot-email" title="$emtitle" />
-			<div id="profile-jot-email-end"></div>
-			$jotnets
-		</div>
-	</div>
-
-
-
-
-</form>
-</div>
-		{{ if $content }}<script>initEditor();</script>{{ endif }}
diff --git a/view/theme/diabook/diabook-blue/js/README b/view/theme/diabook/diabook-blue/js/README
deleted file mode 100644
index c93b2118e..000000000
--- a/view/theme/diabook/diabook-blue/js/README
+++ /dev/null
@@ -1,22 +0,0 @@
-jQuery Resize Plugin Demo
-
-Version: v2.1.1
-Author: Adeel Ejaz (http://adeelejaz.com/)
-License: Dual licensed under MIT and GPL licenses.
-
-Introduction
-aeImageResize is a jQuery plugin to dynamically resize the images without distorting the proportions.
-
-Usage:
-.aeImageResize( height, width )
-
-height
-An integer representing the maximum height for the image.
-
-width
-An integer representing the maximum width for the image.
-
-Example
-$(function() {
-  $( ".resizeme" ).aeImageResize({ height: 250, width: 250 });
-});
\ No newline at end of file
diff --git a/view/theme/diabook/diabook-blue/js/jquery.ae.image.resize.js b/view/theme/diabook/diabook-blue/js/jquery.ae.image.resize.js
deleted file mode 100644
index bac09cd45..000000000
--- a/view/theme/diabook/diabook-blue/js/jquery.ae.image.resize.js
+++ /dev/null
@@ -1,69 +0,0 @@
-(function( $ ) {
-
-  $.fn.aeImageResize = function( params ) {
-
-    var aspectRatio = 0
-      // Nasty I know but it's done only once, so not too bad I guess
-      // Alternate suggestions welcome :)
-      ,	isIE6 = $.browser.msie && (6 == ~~ $.browser.version)
-      ;
-
-    // We cannot do much unless we have one of these
-    if ( !params.height && !params.width ) {
-      return this;
-    }
-
-    // Calculate aspect ratio now, if possible
-    if ( params.height && params.width ) {
-      aspectRatio = params.width / params.height;
-    }
-
-    // Attach handler to load
-    // Handler is executed just once per element
-    // Load event required for Webkit browsers
-    return this.one( "load", function() {
-
-      // Remove all attributes and CSS rules
-      this.removeAttribute( "height" );
-      this.removeAttribute( "width" );
-      this.style.height = this.style.width = "";
-
-      var imgHeight = this.height
-        , imgWidth = this.width
-        , imgAspectRatio = imgWidth / imgHeight
-        , bxHeight = params.height
-        , bxWidth = params.width
-        , bxAspectRatio = aspectRatio;
-				
-      // Work the magic!
-      // If one parameter is missing, we just force calculate it
-      if ( !bxAspectRatio ) {
-        if ( bxHeight ) {
-          bxAspectRatio = imgAspectRatio + 1;
-        } else {
-          bxAspectRatio = imgAspectRatio - 1;
-        }
-      }
-
-      // Only resize the images that need resizing
-      if ( (bxHeight && imgHeight > bxHeight) || (bxWidth && imgWidth > bxWidth) ) {
-
-        if ( imgAspectRatio > bxAspectRatio ) {
-          bxHeight = ~~ ( imgHeight / imgWidth * bxWidth );
-        } else {
-          bxWidth = ~~ ( imgWidth / imgHeight * bxHeight );
-        }
-
-        this.height = bxHeight;
-        this.width = bxWidth;
-      }
-    })
-    .each(function() {
-
-      // Trigger load event (for Gecko and MSIE)
-      if ( this.complete || isIE6 ) {
-        $( this ).trigger( "load" );
-      }
-    });
-  };
-})( jQuery );
\ No newline at end of file
diff --git a/view/theme/diabook/diabook-blue/js/jquery.ae.image.resize.min.js b/view/theme/diabook/diabook-blue/js/jquery.ae.image.resize.min.js
deleted file mode 100644
index 16c30b123..000000000
--- a/view/theme/diabook/diabook-blue/js/jquery.ae.image.resize.min.js
+++ /dev/null
@@ -1 +0,0 @@
-(function(d){d.fn.aeImageResize=function(a){var i=0,j=d.browser.msie&&6==~~d.browser.version;if(!a.height&&!a.width)return this;if(a.height&&a.width)i=a.width/a.height;return this.one("load",function(){this.removeAttribute("height");this.removeAttribute("width");this.style.height=this.style.width="";var e=this.height,f=this.width,g=f/e,b=a.height,c=a.width,h=i;h||(h=b?g+1:g-1);if(b&&e>b||c&&f>c){if(g>h)b=~~(e/f*c);else c=~~(f/e*b);this.height=b;this.width=c}}).each(function(){if(this.complete||j)d(this).trigger("load")})}})(jQuery);
\ No newline at end of file
diff --git a/view/theme/diabook/diabook-blue/js/jquery.autogrow.textarea.js b/view/theme/diabook/diabook-blue/js/jquery.autogrow.textarea.js
deleted file mode 100644
index 806e34f51..000000000
--- a/view/theme/diabook/diabook-blue/js/jquery.autogrow.textarea.js
+++ /dev/null
@@ -1,46 +0,0 @@
-(function($) {
-
-    /*
-     * Auto-growing textareas; technique ripped from Facebook
-     */
-    $.fn.autogrow = function(options) {
-        
-        this.filter('textarea').each(function() {
-            
-            var $this       = $(this),
-                minHeight   = $this.height(),
-                lineHeight  = $this.css('lineHeight');
-            
-            var shadow = $('<div></div>').css({
-                position:   'absolute',
-                top:        -10000,
-                left:       -10000,
-                width:      $(this).width(),
-                fontSize:   $this.css('fontSize'),
-                fontFamily: $this.css('fontFamily'),
-                lineHeight: $this.css('lineHeight'),
-                resize:     'none'
-            }).appendTo(document.body);
-            
-            var update = function() {
-                
-                var val = this.value.replace(/</g, '&lt;')
-                                    .replace(/>/g, '&gt;')
-                                    .replace(/&/g, '&amp;')
-                                    .replace(/\n/g, '<br/>');
-                
-                shadow.html(val);
-                $(this).css('height', Math.max(shadow.height() + 20, minHeight));
-            }
-            
-            $(this).change(update).keyup(update).keydown(update);
-            
-            update.apply(this);
-            
-        });
-        
-        return this;
-        
-    }
-    
-})(jQuery);
\ No newline at end of file
diff --git a/view/theme/diabook/diabook-blue/js/jquery.cookie.js b/view/theme/diabook/diabook-blue/js/jquery.cookie.js
deleted file mode 100644
index 6d5974a2c..000000000
--- a/view/theme/diabook/diabook-blue/js/jquery.cookie.js
+++ /dev/null
@@ -1,47 +0,0 @@
-/*!
- * jQuery Cookie Plugin
- * https://github.com/carhartl/jquery-cookie
- *
- * Copyright 2011, Klaus Hartl
- * Dual licensed under the MIT or GPL Version 2 licenses.
- * http://www.opensource.org/licenses/mit-license.php
- * http://www.opensource.org/licenses/GPL-2.0
- */
-(function($) {
-    $.cookie = function(key, value, options) {
-
-        // key and at least value given, set cookie...
-        if (arguments.length > 1 && (!/Object/.test(Object.prototype.toString.call(value)) || value === null || value === undefined)) {
-            options = $.extend({}, options);
-
-            if (value === null || value === undefined) {
-                options.expires = -1;
-            }
-
-            if (typeof options.expires === 'number') {
-                var days = options.expires, t = options.expires = new Date();
-                t.setDate(t.getDate() + days);
-            }
-
-            value = String(value);
-
-            return (document.cookie = [
-                encodeURIComponent(key), '=', options.raw ? value : encodeURIComponent(value),
-                options.expires ? '; expires=' + options.expires.toUTCString() : '', // use expires attribute, max-age is not supported by IE
-                options.path    ? '; path=' + options.path : '',
-                options.domain  ? '; domain=' + options.domain : '',
-                options.secure  ? '; secure' : ''
-            ].join(''));
-        }
-
-        // key and possibly options given, get cookie...
-        options = value || {};
-        var decode = options.raw ? function(s) { return s; } : decodeURIComponent;
-
-        var pairs = document.cookie.split('; ');
-        for (var i = 0, pair; pair = pairs[i] && pairs[i].split('='); i++) {
-            if (decode(pair[0]) === key) return decode(pair[1] || ''); // IE saves cookies with empty string as "c; ", e.g. without "=" as opposed to EOMB, thus pair[1] may be undefined
-        }
-        return null;
-    };
-})(jQuery);
diff --git a/view/theme/diabook/diabook-blue/login.tpl b/view/theme/diabook/diabook-blue/login.tpl
deleted file mode 100644
index efa7c2d6d..000000000
--- a/view/theme/diabook/diabook-blue/login.tpl
+++ /dev/null
@@ -1,33 +0,0 @@
-
-<form action="$dest_url" method="post" >
-	<input type="hidden" name="auth-params" value="login" />
-
-	<div id="login_standard">
-	{{ inc field_input.tpl with $field=$lname }}{{ endinc }}
-	{{ inc field_password.tpl with $field=$lpassword }}{{ endinc }}
-	</div>
-	
-	{{ if $openid }}
-			<div id="login_openid">
-			{{ inc field_openid.tpl with $field=$lopenid }}{{ endinc }}
-			</div>
-	{{ endif }}
-	
-	<div id="login-submit-wrapper" >
-		<input type="submit" name="submit" id="login-submit-button" value="$login" />
-	</div>
-	
-   <div id="login-extra-links">
-		{{ if $register }}<a href="register" title="$register.title" id="register-link">$register.desc</a>{{ endif }}
-        <a href="lostpass" title="$lostpass" id="lost-password-link" >$lostlink</a>
-	</div>	
-	
-	{{ for $hiddens as $k=>$v }}
-		<input type="hidden" name="$k" value="$v" />
-	{{ endfor }}
-	
-	
-</form>
-
-
-<script type="text/javascript"> $(document).ready(function() { $("#id_$lname.0").focus();} );</script>
diff --git a/view/theme/diabook/diabook-blue/mail_conv.tpl b/view/theme/diabook/diabook-blue/mail_conv.tpl
deleted file mode 100644
index 989f17878..000000000
--- a/view/theme/diabook/diabook-blue/mail_conv.tpl
+++ /dev/null
@@ -1,60 +0,0 @@
-<div class="wall-item-container $item.indent">
-	<div class="wall-item-item">
-		<div class="wall-item-info">
-			<div class="contact-photo-wrapper"
-				<a href="$mail.profile_url" target="redir" title="$mail.from_name" class="contact-photo-link" id="wall-item-photo-link-$mail.id">
-					<img src="$mail.from_photo" class="contact-photo$mail.sparkle" id="wall-item-photo-$mail.id" alt="$mail.from_name" />
-				</a>
-			</div>
-		</div>
-		<div class="wall-item-content">
-			$mail.body
-		</div>
-	</div>
-	<div class="wall-item-bottom">
-		<div class="wall-item-links">
-		</div>
-		<div class="wall-item-tags">
-		</div>
-	</div>
-	<div class="wall-item-bottom">
-		<div class="">
-		</div>
-		<div class="wall-item-actions">
-			<div class="wall-item-actions-author">
-				<a href="$mail.from_url" target="redir" class="wall-item-name-link"><span class="wall-item-name$mail.sparkle">$mail.from_name</span></a> <span class="wall-item-ago">$mail.date</span>
-			</div>
-			
-			<div class="wall-item-actions-social">
-			</div>
-			
-			<div class="wall-item-actions-tools">
-				<a href="message/drop/$mail.id" onclick="return confirmDelete();" class="icon delete s16" title="$mail.delete">$mail.delete</a>
-			</div>
-			
-		</div>
-	</div>
-	<div class="wall-item-bottom">
-	</div>
-</div>
-
-
-{#
-
-
-<div class="mail-conv-outside-wrapper">
-	<div class="mail-conv-sender" >
-		<a href="$mail.from_url" class="mail-conv-sender-url" ><img class="mframe mail-conv-sender-photo$mail.sparkle" src="$mail.from_photo" heigth="80" width="80" alt="$mail.from_name" /></a>
-	</div>
-	<div class="mail-conv-detail" >
-		<div class="mail-conv-sender-name" >$mail.from_name</div>
-		<div class="mail-conv-date">$mail.date</div>
-		<div class="mail-conv-subject">$mail.subject</div>
-		<div class="mail-conv-body">$mail.body</div>
-	<div class="mail-conv-delete-wrapper" id="mail-conv-delete-wrapper-$mail.id" ><a href="message/drop/$mail.id" class="icon drophide delete-icon mail-list-delete-icon" onclick="return confirmDelete();" title="$mail.delete" id="mail-conv-delete-icon-$mail.id" class="mail-conv-delete-icon" onmouseover="imgbright(this);" onmouseout="imgdull(this);" ></a></div><div class="mail-conv-delete-end"></div>
-	<div class="mail-conv-outside-wrapper-end"></div>
-</div>
-</div>
-<hr class="mail-conv-break" />
-
-#}
diff --git a/view/theme/diabook/diabook-blue/mail_display.tpl b/view/theme/diabook/diabook-blue/mail_display.tpl
deleted file mode 100644
index 8b82e95c6..000000000
--- a/view/theme/diabook/diabook-blue/mail_display.tpl
+++ /dev/null
@@ -1,12 +0,0 @@
-<div id="mail-display-subject">
-	<span class="{{if $thread_seen}}seen{{else}}unseen{{endif}}">$thread_subject</span>
-	<a href="message/dropconv/$thread_id" onclick="return confirmDelete();"  title="$delete" class="mail-delete icon s22 delete"></a>
-</div>
-
-{{ for $mails as $mail }}
-	<div id="tread-wrapper-$mail.id" class="tread-wrapper">
-		{{ inc mail_conv.tpl }}{{endinc}}
-	</div>
-{{ endfor }}
-
-{{ inc prv_message.tpl }}{{ endinc }}
diff --git a/view/theme/diabook/diabook-blue/mail_list.tpl b/view/theme/diabook/diabook-blue/mail_list.tpl
deleted file mode 100644
index 6bc6c84f6..000000000
--- a/view/theme/diabook/diabook-blue/mail_list.tpl
+++ /dev/null
@@ -1,8 +0,0 @@
-<div class="mail-list-wrapper">
-	<span class="mail-subject {{if $seen}}seen{{else}}unseen{{endif}}"><a href="message/$id" class="mail-link">$subject</a></span>
-	<span class="mail-from">$from_name</span>
-	<span class="mail-date">$date</span>
-	<span class="mail-count">$count</span>
-	
-	<a href="message/dropconv/$id" onclick="return confirmDelete();"  title="$delete" class="mail-delete icon s22 delete"></a>
-</div>
diff --git a/view/theme/diabook/diabook-blue/message_side.tpl b/view/theme/diabook/diabook-blue/message_side.tpl
deleted file mode 100644
index 9f1587096..000000000
--- a/view/theme/diabook/diabook-blue/message_side.tpl
+++ /dev/null
@@ -1,10 +0,0 @@
-<div id="message-sidebar" class="widget">
-	<div id="message-new" class="{{ if $new.sel }}selected{{ endif }}"><a href="$new.url">$new.label</a> </div>
-	
-	<ul class="message-ul">
-		{{ for $tabs as $t }}
-			<li class="tool {{ if $t.sel }}selected{{ endif }}"><a href="$t.url" class="message-link">$t.label</a></li>
-		{{ endfor }}
-	</ul>
-	
-</div>
diff --git a/view/theme/diabook/diabook-blue/nav.tpl b/view/theme/diabook/diabook-blue/nav.tpl
deleted file mode 100644
index 5f316bcdd..000000000
--- a/view/theme/diabook/diabook-blue/nav.tpl
+++ /dev/null
@@ -1,190 +0,0 @@
-<header>
-	<div id="site-location">$sitelocation</div>
-	<div id="banner">$banner</div>
-</header>
-<nav>
-			
-			
-	<ul>
-			
-			
-			{{ if $nav.network }}
-			<li id="nav-network-link" class="nav-menu-icon">
-				<a class="$nav.network.2" href="$nav.network.0" title="$nav.network.3" >
-				<span class="icon notifications">Benachrichtigungen</span>
-				<span id="net-update" class="nav-notify"></span></a>
-			</li>
-		    {{ endif }}
-	
-			{{ if $nav.contacts }}
-			<li class="nav-menu-icon" id="nav-contacts-linkmenu">
-				<a href="$nav.contacts.0" rel="#nav-contacts-menu" title="$nav.contacts.1">
-				<span class="icon contacts">$nav.contacts.1</span>
-				<span id="intro-update" class="nav-notify"></span></a>
-				<ul id="nav-contacts-menu" class="menu-popup">
-					<li id="nav-contacts-see-intro"><a href="$nav.notifications.0">$nav.introductions.1</a><span id="intro-update-li" class="nav-notify"></span></li>
-					<li id="nav-contacts-all"><a href="contacts">$nav.contacts.1</a></li> 
-				</ul>
-			</li>	
-
-			{{ endif }}
-			
-			{{ if $nav.messages }}
-			<li  id="nav-messages-linkmenu" class="nav-menu-icon">
-			  <a href="$nav.messages.0" rel="#nav-messages-menu" title="$nav.messages.1">
-			  <span class="icon messages">$nav.messages.1</span>
-				<span id="mail-update" class="nav-notify"></span></a>
-				<ul id="nav-messages-menu" class="menu-popup">
-					<li id="nav-messages-see-all"><a href="$nav.messages.0">$nav.messages.1</a></li>
-					<li id="nav-messages-see-all"><a href="$nav.messages.new.0">$nav.messages.new.1</a></li>
-				</ul>
-			</li>		
-			{{ endif }}
-		
-      {{ if $nav.notifications }}
-			<li  id="nav-notifications-linkmenu" class="nav-menu-icon">
-			<a href="$nav.notifications.0" rel="#nav-notifications-menu" title="$nav.notifications.1">
-			<span class="icon notify">$nav.notifications.1</span>
-				<span id="notify-update" class="nav-notify"></span></a>
-				<ul id="nav-notifications-menu" class="menu-popup">
-					<li id="nav-notifications-mark-all"><a href="#" onclick="notifyMarkAll(); return false;">$nav.notifications.mark.1</a></li>
-					<li id="nav-notifications-see-all"><a href="$nav.notifications.all.0">$nav.notifications.all.1</a></li>
-					<li class="empty">$emptynotifications</li>
-				</ul>
-			</li>		
-		{{ endif }}	
-			
-		{{ if $nav.search}}
-		<li id="search-box">
-			<form method="get" action="$nav.search.0">
-				<input id="search-text" class="nav-menu-search" type="text" value="" name="search">
-			</form>
-		</li>		
-		{{ endif }}	
-		
-		<li  style="width: 1%; height: 1px;float: right;"></li>	
-		
-		<li id="nav-site-linkmenu" class="nav-menu-icon"><a href="#" rel="#nav-site-menu"><span class="icon s22 gear">Site</span></a>
-			<ul id="nav-site-menu" class="menu-popup">
-				{{ if $nav.manage }}<li><a class="$nav.manage.2" href="$nav.manage.0" title="$nav.manage.3">$nav.manage.1</a></li>{{ endif }}				
-
-				{{ if $nav.settings }} <li><a class="$nav.search.2" onClick="restore_boxes()" title="Restore right-hand column" style="cursor: pointer;">Restore right-hand column</a></li>{{ endif }}
-										
-				{{ if $nav.help }} <li><a class="$nav.help.2" target="friendika-help" href="$nav.help.0" title="$nav.help.3" >$nav.help.1</a></li>{{ endif }}									
-										
-										 <li><a class="$nav.search.2" href="friendica" title="Site Info / Impressum" >Info/Impressum</a></li>
-										
-				{{ if $nav.settings }}<li><a class="menu-sep $nav.settings.2" href="$nav.settings.0" title="$nav.settings.3">$nav.settings.1</a></li>{{ endif }}
-				{{ if $nav.admin }}<li><a class="$nav.admin.2" href="$nav.admin.0" title="$nav.admin.3" >$nav.admin.1</a></li>{{ endif }}
-
-				{{ if $nav.logout }}<li><a class="menu-sep $nav.logout.2" href="$nav.logout.0" title="$nav.logout.3" >$nav.logout.1</a></li>{{ endif }}
-
-				
-			</ul>		
-		</li>
-		
-		
-		{{ if $nav.directory }}
-		<li id="nav-directory-link" class="nav-menu $sel.directory">
-			<a class="$nav.directory.2" href="$nav.directory.0" title="$nav.directory.3" >$nav.directory.1</a>
-		</li>
-		{{ endif }}
-		
-		{{ if $nav.apps }}
-			<li id="nav-apps-link" class="nav-menu $sel.apps">
-				<a class=" $nav.apps.2" href="#" rel="#nav-apps-menu" title="$nav.apps.3" >$nav.apps.1</a>
-				<ul id="nav-apps-menu" class="menu-popup">
-					{{ for $apps as $ap }}
-					<li>$ap</li>
-					{{ endfor }}
-				</ul>
-			</li>	
-		{{ endif }}		
-		
-      {{ if $nav.home }}
-			<li id="nav-home-link" class="nav-menu $sel.home">
-				<a class="$nav.home.2" href="$nav.home.0" title="$nav.home.3" >$nav.home.1
-				<span id="home-update" class="nav-notify"></span></a>
-			</li>
-		{{ endif }}		
-		
-		{{ if $userinfo }}
-			<li id="nav-user-linkmenu" class="nav-menu-icon"><a href="#" rel="#nav-user-menu" title="$sitelocation"><img src="$userinfo.icon" alt="$userinfo.name"></a>
-				<ul id="nav-user-menu" class="menu-popup">
-					{{ for $nav.usermenu as $usermenu }}
-						<li><a class="$usermenu.2" href="$usermenu.0" title="$usermenu.3">$usermenu.1</a></li>
-					{{ endfor }}
-					
-					{{ if $nav.profiles }}<li><a class="menu-sep $nav.profiles.2" href="$nav.profiles.0" title="$nav.profiles.3" >$nav.profiles.3</a></li>{{ endif }}
-					{{ if $nav.notifications }}<li><a class="$nav.notifications.2" href="$nav.notifications.0" title="$nav.notifications.3" >$nav.notifications.1</a></li>{{ endif }}
-					{{ if $nav.messages }}<li><a class="$nav.messages.2" href="$nav.messages.0" title="$nav.messages.3" >$nav.messages.1</a></li>{{ endif }}
-					{{ if $nav.contacts }}<li><a class="$nav.contacts.2" href="$nav.contacts.0" title="$nav.contacts.3" >$nav.contacts.1</a></li>{{ endif }}	
-				</ul>
-			</li>
-		{{ endif }}
-		
-					{{ if $nav.login }}
-					<li id="nav-home-link" class="nav-menu $sel.home">
-						<a class="$nav.login.2" href="$nav.login.0" title="$nav.login.3" >$nav.login.1</a>
-					<li>
-					{{ endif }}
-		
-		
-		
-	</ul>	
-
-
-	
-</nav>
-
-
-<div style="position: fixed; bottom: 5px; right: 10px;"><a href="javascript:scroll(0,0); "><img src="view/theme/diabook/icons/scroll_top.png" title="scroll to top"></a></div>
-<div style="position: fixed; bottom: 3px; left: 25px;">$langselector</div>
-<div style="position: fixed; bottom: 23px; left: 5px;"><a href="http://pad.toktan.org/p/diabook" target="blank" ><img src="view/theme/diabook/icons/bluebug.png" title="report bugs for the theme diabook"/></a></div>
-
-
-
-
-<ul id="nav-notifications-template" style="display:none;" rel="template">
-	<li class="{4}"><a href="{0}"><img src="{1}">{2} <span class="notif-when">{3}</span></a></li>
-</ul>
-
-
-
-{#
-
-{{ if $nav.logout }}<a id="nav-logout-link" class="nav-link $nav.logout.2" href="$nav.logout.0" title="$nav.logout.3" >$nav.logout.1</a> {{ endif }}
-{{ if $nav.login }}<a id="nav-login-link" class="nav-login-link $nav.login.2" href="$nav.login.0" title="$nav.login.3" >$nav.login.1</a> {{ endif }}
-
-<span id="nav-link-wrapper" >
-
-{{ if $nav.register }}<a id="nav-register-link" class="nav-commlink $nav.register.2" href="$nav.register.0" title="$nav.register.3" >$nav.register.1</a>{{ endif }}
-	
-<a id="nav-help-link" class="nav-link $nav.help.2" target="friendika-help" href="$nav.help.0" title="$nav.help.3" >$nav.help.1</a>
-	
-{{ if $nav.apps }}<a id="nav-apps-link" class="nav-link $nav.apps.2" href="$nav.apps.0" title="$nav.apps.3" >$nav.apps.1</a>{{ endif }}
-
-<a id="nav-search-link" class="nav-link $nav.search.2" href="$nav.search.0" title="$nav.search.3" >$nav.search.1</a>
-<a id="nav-directory-link" class="nav-link $nav.directory.2" href="$nav.directory.0" title="$nav.directory.3" >$nav.directory.1</a>
-
-{{ if $nav.admin }}<a id="nav-admin-link" class="nav-link $nav.admin.2" href="$nav.admin.0" title="$nav.admin.3" >$nav.admin.1</a>{{ endif }}
-
-{{ if $nav.notifications }}
-<a id="nav-notify-link" class="nav-commlink $nav.notifications.2" href="$nav.notifications.0" title="$nav.notifications.3" >$nav.notifications.1</a>
-<span id="notify-update" class="nav-ajax-left"></span>
-{{ endif }}
-{{ if $nav.messages }}
-<a id="nav-messages-link" class="nav-commlink $nav.messages.2" href="$nav.messages.0" title="$nav.messages.3" >$nav.messages.1</a>
-<span id="mail-update" class="nav-ajax-left"></span>
-{{ endif }}
-
-{{ if $nav.manage }}<a id="nav-manage-link" class="nav-commlink $nav.manage.2" href="$nav.manage.0" title="$nav.manage.3">$nav.manage.1</a>{{ endif }}
-
-{{ if $nav.settings }}<a id="nav-settings-link" class="nav-link $nav.settings.2" href="$nav.settings.0" title="$nav.settings.3">$nav.settings.1</a>{{ endif }}
-{{ if $nav.profiles }}<a id="nav-profiles-link" class="nav-link $nav.profiles.2" href="$nav.profiles.0" title="$nav.profiles.3" >$nav.profiles.1</a>{{ endif }}
-
-
-</span>
-<span id="nav-end"></span>
-<span id="banner">$banner</span>
-#}
diff --git a/view/theme/diabook/diabook-blue/nets.tpl b/view/theme/diabook/diabook-blue/nets.tpl
deleted file mode 100644
index be25ddee1..000000000
--- a/view/theme/diabook/diabook-blue/nets.tpl
+++ /dev/null
@@ -1,15 +0,0 @@
-<div id="profile_side">
-	<h3 style="margin-left: 2px;">$title</h3>
-	<div id="nets-desc">$desc</div>
-   
-	<ul class="menu-profile-side">
-	<li class="menu-profile-list">
-	<span class="menu-profile-icon {{ if $sel_all }}group_selected{{else}}group_unselected{{ endif }}"></span>	
-	<a style="text-decoration: none;" href="$base" class="menu-profile-list-item">$all</a></li>
-	{{ for $nets as $net }}
-	<li class="menu-profile-list">
-	<span class="menu-profile-icon {{ if $net.selected }}group_selected{{else}}group_unselected{{ endif }}"></span>	
-	<a href="$base?nets=$net.ref" class="menu-profile-list-item">$net.name</a></li>
-	{{ endfor }}
-	</ul>
-</div>
diff --git a/view/theme/diabook/diabook-blue/oembed_video.tpl b/view/theme/diabook/diabook-blue/oembed_video.tpl
deleted file mode 100644
index d6d29f724..000000000
--- a/view/theme/diabook/diabook-blue/oembed_video.tpl
+++ /dev/null
@@ -1,4 +0,0 @@
-<a class="embed_yt" href='$embedurl' onclick='this.innerHTML=Base64.decode("$escapedhtml"); yt_iframe(); return false;' style='float:left; margin: 1em; position: relative;'>
-	<img width='$tw' height='$th' src='$turl' >
-	<div style='position: absolute; top: 0px; left: 0px; width: $twpx; height: $thpx; background: url(images/icons/48/play.png) no-repeat center center;'></div>
-</a>
diff --git a/view/theme/diabook/diabook-blue/photo_item.tpl b/view/theme/diabook/diabook-blue/photo_item.tpl
deleted file mode 100644
index 5d65a89b7..000000000
--- a/view/theme/diabook/diabook-blue/photo_item.tpl
+++ /dev/null
@@ -1,65 +0,0 @@
-{{ if $indent }}{{ else }}
-<div class="wall-item-decor">
-	<img id="like-rotator-$id" class="like-rotator" src="images/rotator.gif" alt="$wait" title="$wait" style="display: none;" />
-</div>
-{{ endif }}
-
-<div class="wall-item-photo-container $indent">
-	<div class="wall-item-item">
-		<div class="wall-item-info">
-			<div class="contact-photo-wrapper" >
-				<a href="$profile_url" target="redir" title="" class="contact-photo-link" id="wall-item-photo-link-$id">
-					<img src="$thumb" class="contact-photo$sparkle" id="wall-item-photo-$id" alt="$name" />
-				</a>
-				<a href="#" rel="#wall-item-photo-menu-$id" class="contact-photo-menu-button icon s16 menu" id="wall-item-photo-menu-button-$id">menu</a>
-				<ul class="contact-menu menu-popup" id="wall-item-photo-menu-$id">
-				$photo_menu
-				</ul>
-				
-			</div>
-		</div>
-			<div class="wall-item-actions-author">
-				<a href="$profile_url" target="redir" title="$name" class="wall-item-name-link"><span class="wall-item-name$sparkle">$name</span></a> 
-			<span class="wall-item-ago">-
-			{{ if $plink }}<a class="link" title="$plink.title" href="$plink.href" style="color: #999">$ago</a>{{ else }} $ago {{ endif }}
-			{{ if $lock }} - <span class="fakelink" style="color: #999" onclick="lockview(event,$id);">$lock</span> {{ endif }}
-			</span>
-			</div>
-		<div class="wall-item-content">
-			{{ if $title }}<h2><a href="$plink.href">$title</a></h2>{{ endif }}
-			$body
-		</div>
-	</div>
-	<div class="wall-item-bottom">
-		<div class="wall-item-links">
-		</div>
-		<div class="wall-item-tags">
-			{{ for $tags as $tag }}
-				<span class='tag'>$tag</span>
-			{{ endfor }}
-		</div>
-	</div>
-	
-	<div class="wall-item-bottom" style="display: table-row;">
-		<div class="wall-item-actions">
-	   </div>
-		<div class="wall-item-actions">
-			
-			<div class="wall-item-actions-tools">
-
-				{{ if $drop.dropping }}
-					<input type="checkbox" title="$drop.select" name="itemselected[]" class="item-select" value="$id" />
-					<a href="item/drop/$id" onclick="return confirmDelete();" class="icon drop" title="$drop.delete">$drop.delete</a>
-				{{ endif }}
-				{{ if $edpost }}
-					<a class="icon pencil" href="$edpost.0" title="$edpost.1"></a>
-				{{ endif }}
-			</div>
-
-		</div>
-	</div>
-	<div class="wall-item-bottom">
-			
-	</div>
-</div>
-
diff --git a/view/theme/diabook/diabook-blue/photo_view.tpl b/view/theme/diabook/diabook-blue/photo_view.tpl
deleted file mode 100644
index 93b01d623..000000000
--- a/view/theme/diabook/diabook-blue/photo_view.tpl
+++ /dev/null
@@ -1,37 +0,0 @@
-<div id="live-display"></div>
-<h3><a href="$album.0">$album.1</a></h3>
-
-<div id="photo-edit-link-wrap">
-{{ if $tools }}
-<a id="photo-edit-link" href="$tools.edit.0">$tools.edit.1</a>
--
-<a id="photo-toprofile-link" href="$tools.profile.0">$tools.profile.1</a>
-{{ endif }}
-{{ if $lock }} - <img src="images/lock_icon.gif" class="lockview" alt="$lock" onclick="lockview(event,'photo$id');" /> {{ endif }}
-</div>
-
-<div id="photo-photo">
-	{{ if $prevlink }}<div id="photo-prev-link"><a href="$prevlink.0">$prevlink.1</a></div>{{ endif }}
-	<a href="$photo.href" class="lightbox" title="$photo.title"><img src="$photo.src" /></a>
-	{{ if $nextlink }}<div id="photo-next-link"><a href="$nextlink.0">$nextlink.1</a></div>{{ endif }}
-</div>
-
-<div id="photo-photo-end"></div>
-<div id="photo-caption" >$desc</div>
-{{ if $tags }}
-<div id="in-this-photo-text">$tags.0</div>
-<div id="in-this-photo">$tags.1</div>
-{{ endif }}
-{{ if $tags.2 }}<div id="tag-remove"><a href="$tags.2">$tags.3</a></div>{{ endif }}
-
-{{ if $edit }}$edit{{ endif }}
-
-<div style="margin-top:20px">
-</div>
-<div id="wall-photo-container">
-$comments
-</div>
-
-$paginate
-
-
diff --git a/view/theme/diabook/diabook-blue/profile_side.tpl b/view/theme/diabook/diabook-blue/profile_side.tpl
deleted file mode 100644
index 01e80f238..000000000
--- a/view/theme/diabook/diabook-blue/profile_side.tpl
+++ /dev/null
@@ -1,21 +0,0 @@
-<div id="profile_side">
-	<div id="ps-usernameicon">
-		<a href="$ps.usermenu.status.0" title="$userinfo.name">
-			<img src="$userinfo.icon" id="ps-usericon" alt="$userinfo.name">
-		</a>
-		<a href="$ps.usermenu.status.0" id="ps-username" title="$userinfo.name">$userinfo.name</a>
-	</div>
-	
-<ul id="profile-side-menu" class="menu-profile-side">
-	<li id="profile-side-status" class="menu-profile-list"><a class="menu-profile-list-item" href="$ps.usermenu.status.0">$ps.usermenu.status.1<span class="menu-profile-icon home"></span></a></li>
-	<li id="profile-side-photos" class="menu-profile-list photos"><a class="menu-profile-list-item" href="$ps.usermenu.photos.0">$ps.usermenu.photos.1<span class="menu-profile-icon photos"></span></a></li>
-	<li id="profile-side-photos" class="menu-profile-list pscontacts"><a class="menu-profile-list-item" href="$ps.usermenu.contacts.0">$ps.usermenu.contacts.1<span class="menu-profile-icon pscontacts"></span></a></li>		
-	<li id="profile-side-events" class="menu-profile-list events"><a class="menu-profile-list-item" href="$ps.usermenu.events.0">$ps.usermenu.events.1<span class="menu-profile-icon events"></span></a></li>
-	<li id="profile-side-notes" class="menu-profile-list notes"><a class="menu-profile-list-item" href="$ps.usermenu.notes.0">$ps.usermenu.notes.1<span class="menu-profile-icon notes"></span></a></li>
-	<li id="profile-side-foren" class="menu-profile-list foren"><a class="menu-profile-list-item" href="$ps.usermenu.pgroups.0" target="blanc">$ps.usermenu.pgroups.1<span class="menu-profile-icon foren"></span></a></li>
-	<li id="profile-side-foren" class="menu-profile-list com_side"><a class="menu-profile-list-item" href="$ps.usermenu.community.0">$ps.usermenu.community.1<span class="menu-profile-icon com_side"></span></a></li>
-</ul>
-
-</div>
-
-				
diff --git a/view/theme/diabook/diabook-blue/profile_vcard.tpl b/view/theme/diabook/diabook-blue/profile_vcard.tpl
deleted file mode 100644
index 6fcffcc9b..000000000
--- a/view/theme/diabook/diabook-blue/profile_vcard.tpl
+++ /dev/null
@@ -1,64 +0,0 @@
-<div class="vcard">
-
-	<div class="tool">
-		<div class="fn label">$profile.name</div>
-		{{ if $profile.edit }}
-			<div class="action">
-			<a class="icon s16 edit ttright" href="#" rel="#profiles-menu" title="$profile.edit.3"><span>$profile.edit.1</span></a>
-			<ul id="profiles-menu" class="menu-popup">
-				{{ for $profile.menu.entries as $e }}
-				<li>
-					<a href="profiles/$e.id"><img src='$e.photo'>$e.profile_name</a>
-				</li>
-				{{ endfor }}
-				<li><a href="profile_photo" >$profile.menu.chg_photo</a></li>
-				<li><a href="profiles/new" id="profile-listing-new-link">$profile.menu.cr_new</a></li>
-				<li><a href="profiles" >$profile.edit.3</a></li>
-								
-			</ul>
-			</div>
-		{{ endif }}
-	</div>
-				
-	
-
-	<div id="profile-photo-wrapper"><img class="photo"  src="$profile.photo?rev=$profile.picdate" alt="$profile.name" /></div>
-	{{ if $pdesc }}<div class="title">$profile.pdesc</div>{{ endif }}
-
-
-	{{ if $location }}
-		<dl class="location"><dt class="location-label">$location</dt><br> 
-		<dd class="adr">
-			{{ if $profile.address }}<div class="street-address">$profile.address</div>{{ endif }}
-			<span class="city-state-zip">
-				<span class="locality">$profile.locality</span>{{ if $profile.locality }}, {{ endif }}
-				<span class="region">$profile.region</span>
-				<span class="postal-code">$profile.postal-code</span>
-			</span>
-			{{ if $profile.country-name }}<span class="country-name">$profile.country-name</span>{{ endif }}
-		</dd>
-		</dl>
-	{{ endif }}
-
-	{{ if $gender }}<dl class="mf"><dt class="gender-label">$gender</dt> <dd class="x-gender">$profile.gender</dd></dl>{{ endif }}
-	
-	{{ if $profile.pubkey }}<div class="key" style="display:none;">$profile.pubkey</div>{{ endif }}
-
-	{{ if $marital }}<dl class="marital"><dt class="marital-label"><span class="heart">&hearts;</span>$marital</dt><dd class="marital-text">$profile.marital</dd></dl>{{ endif }}
-
-	{{ if $homepage }}<dl class="homepage"><dt class="homepage-label">$homepage</dt><dd class="homepage-url"><a href="$profile.homepage" target="external-link">$profile.homepage</a></dd></dl>{{ endif }}
-
-	{{ inc diaspora_vcard.tpl }}{{ endinc }}
-	
-	<div id="profile-extra-links">
-		<ul>
-			{{ if $connect }}
-				<li><a id="dfrn-request-link" href="dfrn_request/$profile.nickname">$connect</a></li>
-			{{ endif }}
-		</ul>
-	</div>
-</div>
-
-$contact_block
-
-
diff --git a/view/theme/diabook/diabook-blue/right_aside.tpl b/view/theme/diabook/diabook-blue/right_aside.tpl
deleted file mode 100644
index a65677696..000000000
--- a/view/theme/diabook/diabook-blue/right_aside.tpl
+++ /dev/null
@@ -1,20 +0,0 @@
-<div id="profile_side">
-	<div id="ps-usernameicon">
-		<a href="$ps.usermenu.status.0" title="$userinfo.name">
-			<img src="$userinfo.icon" id="ps-usericon" alt="$userinfo.name">
-		</a>
-		<a href="$ps.usermenu.status.0" id="ps-username" title="$userinfo.name">$userinfo.name</a>
-	</div>
-	
-<ul id="profile-side-menu" class="menu-profile-side">
-	<li id="profile-side-status" class="menu-profile-list home"><a class="menu-profile-list-item" href="$ps.usermenu.status.0">$ps.usermenu.status.1</a></li>
-	<li id="profile-side-photos" class="menu-profile-list photos"><a class="menu-profile-list-item" href="$ps.usermenu.photos.0">$ps.usermenu.photos.1</a></li>
-	<li id="profile-side-events" class="menu-profile-list events"><a class="menu-profile-list-item" href="$ps.usermenu.events.0">$ps.usermenu.events.1</a></li>
-	<li id="profile-side-notes" class="menu-profile-list notes"><a class="menu-profile-list-item" href="$ps.usermenu.notes.0">$ps.usermenu.notes.1</a></li>
-	<li id="profile-side-foren" class="menu-profile-list foren"><a class="menu-profile-list-item" href="http://dir.friendika.com/directory/forum" target="blanc">Public Groups</a></li>
-	<li id="profile-side-foren" class="menu-profile-list com_side"><a class="menu-profile-list-item" href="$ps.usermenu.community.0">$ps.usermenu.community.1</a></li>
-</ul>
-
-</div>
-
-				
\ No newline at end of file
diff --git a/view/theme/diabook/diabook-blue/screenshot.png b/view/theme/diabook/diabook-blue/screenshot.png
deleted file mode 100644
index 5b719c701..000000000
--- a/view/theme/diabook/diabook-blue/screenshot.png
+++ /dev/null
diff --git a/view/theme/diabook/diabook-blue/search_item.tpl b/view/theme/diabook/diabook-blue/search_item.tpl
deleted file mode 100644
index 123834064..000000000
--- a/view/theme/diabook/diabook-blue/search_item.tpl
+++ /dev/null
@@ -1,100 +0,0 @@
-{{ if $item.indent }}{{ else }}
-<div class="wall-item-decor">
-	<img id="like-rotator-$item.id" class="like-rotator" src="images/rotator.gif" alt="$item.wait" title="$item.wait" style="display: none;" />
-</div>
-{{ endif }}
-<div class="wall-item-container $item.indent">
-	<div class="wall-item-item">
-		<div class="wall-item-info">
-			<div class="contact-photo-wrapper"
-				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" target="redir" title="$item.linktitle" class="contact-photo-link" id="wall-item-photo-link-$item.id">
-					<img src="$item.thumb" class="contact-photo$item.sparkle" id="wall-item-photo-$item.id" alt="$item.name" />
-				</a>
-				<a href="#" rel="#wall-item-photo-menu-$item.id" class="contact-photo-menu-button icon s16 menu" id="wall-item-photo-menu-button-$item.id">menu</a>
-				<ul class="contact-menu menu-popup" id="wall-item-photo-menu-$item.id">
-				$item.item_photo_menu
-				</ul>
-				
-			</div>
-		</div>
-			<div class="wall-item-actions-author">
-				<a href="$item.profile_url" target="redir" title="$item.linktitle" class="wall-item-name-link"><span class="wall-item-name$item.sparkle">$item.name</span></a> 
-			<span class="wall-item-ago">-
-			{{ if $item.plink }}<a class="link" title="$item.plink.title" href="$item.plink.href" style="color: #999">$item.ago</a>{{ else }} $item.ago {{ endif }}
-			{{ if $item.lock }} - <span class="fakelink" style="color: #999" onclick="lockview(event,$item.id);">$item.lock</span> {{ endif }}
-			</span>
-			</div>
-		<div class="wall-item-content">
-			{{ if $item.title }}<h2><a href="$item.plink.href">$item.title</a></h2>{{ endif }}
-			$item.body
-		</div>
-	</div>
-	<div class="wall-item-bottom">
-		<div class="wall-item-links">
-		</div>
-		<div class="wall-item-tags">
-			{{ for $item.tags as $tag }}
-				<span class='tag'>$tag</span>
-			{{ endfor }}
-		</div>
-	</div>
-	<div class="wall-item-bottom">
-		<div class="">
-
-		</div>
-		<div class="wall-item-actions">
-
-			<div class="wall-item-actions-social">
-			
-			
-			{{ if $item.vote }}
-				<a href="#" id="like-$item.id" class="icon like" title="$item.vote.like.0" onclick="dolike($item.id,'like'); return false">$item.vote.like.1</a>
-				<a href="#" id="dislike-$item.id" class="icon dislike" title="$item.vote.dislike.0" onclick="dolike($item.id,'dislike'); return false"></a>
-			{{ endif }}
-						
-			{{ if $item.vote.share }}
-				<a href="#" id="share-$item.id" class="icon recycle" title="$item.vote.share.0" onclick="jotShare($item.id); return false"></a>
-			{{ endif }}	
-
-
-			{{ if $item.star }}
-				<a href="#" id="starred-$item.id" onclick="dostar($item.id); return false;" class="star-item icon $item.isstarred" title="$item.star.toggle">
-				<img src="images/star_dummy.png" class="icon star" alt="$item.star.do" /> </a>
-				<a href="#" id="tagger-$item.id" onclick="itemTag($item.id); return false;" class="tag-item icon tagged" title="$item.star.tagger"></a>					  
-			{{ endif }}	
-			
-			{{ if $item.filer }}
-			<a href="#" id="filer-$item.id" onclick="itemFiler($item.id); return false;" class="filer-item icon file-as" title="$item.star.filer"></a>
-			{{ endif }}				
-			
-			{{ if $item.plink }}<a class="icon link" title="$item.plink.title" href="$item.plink.href">$item.plink.title</a>{{ endif }}
-			
-					
-					
-			</div>
-			
-			<div class="wall-item-actions-tools">
-
-				{{ if $item.drop.dropping }}
-					<input type="checkbox" title="$item.drop.select" name="itemselected[]" class="item-select" value="$item.id" />
-					<a href="item/drop/$item.id" onclick="return confirmDelete();" class="icon drop" title="$item.drop.delete">$item.drop.delete</a>
-				{{ endif }}
-				{{ if $item.edpost }}
-					<a class="icon pencil" href="$item.edpost.0" title="$item.edpost.1"></a>
-				{{ endif }}
-			</div>
-			<div class="wall-item-location">$item.location&nbsp;</div>
-		</div>
-	</div>
-	<div class="wall-item-bottom">
-		<div class="wall-item-links"></div>
-		<div class="wall-item-like" id="wall-item-like-$item.id">$item.like</div>
-		<div class="wall-item-dislike" id="wall-item-dislike-$item.id">$item.dislike</div>	
-	</div>
-</div>
-
-<div class="wall-item-comment-wrapper" >
-	$item.comment
-</div>
diff --git a/view/theme/diabook/diabook-blue/style-network-wide.css b/view/theme/diabook/diabook-blue/style-network-wide.css
index 9cf8bb3a7..eb1cee255 100644
--- a/view/theme/diabook/diabook-blue/style-network-wide.css
+++ b/view/theme/diabook/diabook-blue/style-network-wide.css
@@ -121,7 +121,7 @@
 			  display: block; width: 28px; height: 28px; background-repeat: no-repeat;
 			  }	
 .video 	{ background-image: url("../diabook-blue/icons/video.png"); 
-			  display: block; width: 100%; height: 28px; background-repeat: no-repeat;
+			  display: block; width: 100%; height: 140px; background-repeat: no-repeat;
 			  }
 .audio2 	{ background-image: url("../diabook-blue/icons/audio.png"); 
 			  display: block; width: 28px; height: 28px; background-repeat: no-repeat;
@@ -1357,7 +1357,7 @@ transition: all 0.2s ease-in-out;
   max-width: 690px;
   word-wrap: break-word;
 
-  margin-bottom: 14px;
+
 }
 /*marker*/
 .wall-item-container .wall-item-content img {
diff --git a/view/theme/diabook/diabook-blue/style-network.css b/view/theme/diabook/diabook-blue/style-network.css
index df646f456..3a972b832 100644
--- a/view/theme/diabook/diabook-blue/style-network.css
+++ b/view/theme/diabook/diabook-blue/style-network.css
@@ -121,7 +121,7 @@
 			  display: block; width: 28px; height: 28px; background-repeat: no-repeat;
 			  }	
 .video 	{ background-image: url("../diabook-blue/icons/video.png"); 
-			  display: block; width: 100%; height: 28px; background-repeat: no-repeat;
+			  display: block; width: 100%; height: 140px; background-repeat: no-repeat;
 			  }
 .audio2 	{ background-image: url("../diabook-blue/icons/audio.png"); 
 			  display: block; width: 28px; height: 28px; background-repeat: no-repeat;
@@ -1350,7 +1350,7 @@ transition: all 0.2s ease-in-out;
   max-width: 420px;
   word-wrap: break-word;
 
-  margin-bottom: 14px;
+
 }
 
 .wall-item-container .wall-item-content img {
diff --git a/view/theme/diabook/diabook-blue/style-profile-wide.css b/view/theme/diabook/diabook-blue/style-profile-wide.css
index 04d2a73ef..ad6b7ca21 100644
--- a/view/theme/diabook/diabook-blue/style-profile-wide.css
+++ b/view/theme/diabook/diabook-blue/style-profile-wide.css
@@ -121,7 +121,7 @@
 			  display: block; width: 28px; height: 28px; background-repeat: no-repeat;
 			  }	
 .video 	{ background-image: url("../diabook-blue/icons/video.png"); 
-			  display: block; width: 100%; height: 28px; background-repeat: no-repeat;
+			  display: block; width: 100%; height: 140px; background-repeat: no-repeat;
 			  }
 .audio2 	{ background-image: url("../diabook-blue/icons/audio.png"); 
 			  display: block; width: 28px; height: 28px; background-repeat: no-repeat;
@@ -1337,7 +1337,7 @@ transition: all 0.2s ease-in-out;
   max-width: 690px;
   word-wrap: break-word;
 
-  margin-bottom: 14px;
+
 }
 /*marker*/
 .wall-item-container .wall-item-content img {
diff --git a/view/theme/diabook/diabook-blue/style-profile.css b/view/theme/diabook/diabook-blue/style-profile.css
index 958b32f9c..50fb980d6 100644
--- a/view/theme/diabook/diabook-blue/style-profile.css
+++ b/view/theme/diabook/diabook-blue/style-profile.css
@@ -121,7 +121,7 @@
 			  display: block; width: 28px; height: 28px; background-repeat: no-repeat;
 			  }	
 .video 	{ background-image: url("../diabook-blue/icons/video.png"); 
-			  display: block; width: 100%; height: 28px; background-repeat: no-repeat;
+			  display: block; width: 100%; height: 140px; background-repeat: no-repeat;
 			  }
 .audio2 	{ background-image: url("../diabook-blue/icons/audio.png"); 
 			  display: block; width: 28px; height: 28px; background-repeat: no-repeat;
@@ -1329,7 +1329,7 @@ transition: all 0.2s ease-in-out;
   max-width: 420px;
   word-wrap: break-word;
 
-  margin-bottom: 14px;
+
 }
 
 .wall-item-container .wall-item-content img {
diff --git a/view/theme/diabook/diabook-blue/style-wide.css b/view/theme/diabook/diabook-blue/style-wide.css
index 92664ff86..c8c203347 100644
--- a/view/theme/diabook/diabook-blue/style-wide.css
+++ b/view/theme/diabook/diabook-blue/style-wide.css
@@ -149,7 +149,7 @@
 			  display: block; width: 28px; height: 28px; background-repeat: no-repeat;
 			  }	
 .video 	{ background-image: url("../../../view/theme/diabook/diabook-blue/icons/video.png"); 
-			  display: block; width: 100%; height: 28px; background-repeat: no-repeat;
+			  display: block; width: 100%; height: 140px; background-repeat: no-repeat;
 			  }
 .audio2 	{ background-image: url("../../../view/theme/diabook/diabook-blue/icons/audio.png"); 
 			  display: block; width: 28px; height: 28px; background-repeat: no-repeat;
@@ -1203,7 +1203,14 @@ aside #side-peoplefind-url {
   margin-right: 20px;		
 	}
 #login-submit-wrapper{
-margin-bottom: 15px;
+  padding-top: 120px;
+  margin-bottom: 12px;
+	}
+aside #login-submit-button{
+  margin-left: 0px!important;	
+	}
+aside #login-extra-links{
+  padding-top: 0px!important;	
 	}
 .group_selected {
   background: url("../../../view/theme/diabook/icons/selected.png") no-repeat left center;
@@ -1581,7 +1588,7 @@ body .pageheader{
   max-width: 690px;
   word-wrap: break-word;
 
-  margin-bottom: 14px;
+
 }
 
 .wall-item-container .wall-item-content img {
diff --git a/view/theme/diabook/diabook-blue/style.css b/view/theme/diabook/diabook-blue/style.css
index 7cecfd34d..7bf7e8eaa 100644
--- a/view/theme/diabook/diabook-blue/style.css
+++ b/view/theme/diabook/diabook-blue/style.css
@@ -149,7 +149,7 @@
 			  display: block; width: 28px; height: 28px; background-repeat: no-repeat;
 			  }	
 .video 	{ background-image: url("../../../view/theme/diabook/diabook-blue/icons/video.png"); 
-			  display: block; width: 100%; height: 28px; background-repeat: no-repeat;
+			  display: block; width: 100%; height: 140px; background-repeat: no-repeat;
 			  }
 .audio2 	{ background-image: url("../../../view/theme/diabook/diabook-blue/icons/audio.png"); 
 			  display: block; width: 28px; height: 28px; background-repeat: no-repeat;
@@ -1201,7 +1201,14 @@ aside #side-peoplefind-url {
   margin-right: 20px;		
 	}
 #login-submit-wrapper{
-margin-bottom: 15px;
+  padding-top: 120px;
+  margin-bottom: 12px;
+	}
+aside #login-submit-button{
+  margin-left: 0px!important;	
+	}
+aside #login-extra-links{
+  padding-top: 0px!important;	
 	}
 .group_selected {
   background: url("../../../view/theme/diabook/icons/selected.png") no-repeat left center;
@@ -1574,7 +1581,7 @@ body .pageheader{
   max-width: 720px;
   word-wrap: break-word;
 
-  margin-bottom: 14px;
+
 }
 
 .wall-item-container .wall-item-content img {
diff --git a/view/theme/diabook/diabook-blue/style.php b/view/theme/diabook/diabook-blue/style.php
deleted file mode 100644
index c6b467999..000000000
--- a/view/theme/diabook/diabook-blue/style.php
+++ /dev/null
@@ -1,277 +0,0 @@
-<?php
-	$line_height=false;
-	$diabook_font_size=false;
-	$resolution=false;
-	$site_line_height = get_config("diabook-blue","line_height");
-	$site_diabook_font_size = get_config("diabook-blue", "font_size" );
-	$site_resolution = get_config("diabook-blue", "resolution" );
-	
-	
-	if (local_user()) {
-		$line_height = get_pconfig(local_user(), "diabook-blue","line_height");
-		$diabook_font_size = get_pconfig(local_user(), "diabook-blue", "font_size");
-		$resolution = get_pconfig(local_user(), "diabook-blue", "resolution");
-	}
-	
-	if ($line_height===false) $line_height=$site_line_height;
-	if ($line_height===false) $line_height="1.3";
-	if ($diabook_font_size===false) $diabook_font_size=$site_diabook_font_size;
-	if ($diabook_font_size===false) $diabook_font_size="13";
-	if ($resolution===false) $resolution=$site_resolution;
-	if ($resolution===false) $resolution="normal";
-	
-	
-	if($resolution == "normal") {	
-	if (file_exists("$THEMEPATH/style.css")){
-		echo file_get_contents("$THEMEPATH/style.css");
-	}
-
-   if($diabook_font_size == "15"){
-		echo "
-			.wall-item-container .wall-item-content {
-  					font-size: 15px;
-  					}
-  					
-			.wall-item-photo-container .wall-item-content {
-  					font-size: 15px;
-  					}
-		";
-	}	
-	if($diabook_font_size == "14"){
-		echo "
-			.wall-item-container .wall-item-content {
-  					font-size: 14px;
-  					}
-  					
-			.wall-item-photo-container .wall-item-content {
-  					font-size: 14px;
-  					}
-		";
-	}
-	if($diabook_font_size == "13.5"){
-		echo "
-			.wall-item-container .wall-item-content {
-  					font-size: 13.5px;
-  					}
-  					
-			.wall-item-photo-container .wall-item-content {
-  					font-size: 13.5px;
-  					}
-		";
-	}
-	if($diabook_font_size == "13"){
-		echo "
-			.wall-item-container .wall-item-content {
-  					font-size: 13px;
-  					}
-  					
-			.wall-item-photo-container .wall-item-content {
-  					font-size: 13px;
-  					}
-		";
-	}
-	if($diabook_font_size == "12.5"){
-		echo "
-			.wall-item-container .wall-item-content {
-  					font-size: 12.5px;
-  					}
-  					
-			.wall-item-photo-container .wall-item-content {
-  					font-size: 12.5px;
-  					}
-		";
-	}
-	if($diabook_font_size == "12"){
-		echo "
-			.wall-item-container .wall-item-content {
-  					font-size: 12px;
-  					}
-  					
-			.wall-item-photo-container .wall-item-content {
-  					font-size: 12px;
-  					}
-		";
-	}
-	if($line_height == "1.5"){
-		echo "
-			.wall-item-container .wall-item-content {
-  					line-height: 1.5;
-  					}
-  					
-			.wall-item-photo-container .wall-item-content {
- 					line-height: 1.5;
-  					}
-		";
-	}	
-	if($line_height == "1.4"){
-		echo "
-			.wall-item-container .wall-item-content {
-  					line-height: 1.4;
-  					}
-  					
-			.wall-item-photo-container .wall-item-content {
- 					line-height: 1.4;
-  					}
-		";
-	}
-	if($line_height == "1.3"){
-		echo "
-			.wall-item-container .wall-item-content {
-  					line-height: 1.3;
-  					}
-  					
-			.wall-item-photo-container .wall-item-content {
- 					line-height: 1.3;
-  					}
-		";
-	}
-	if($line_height == "1.2"){
-		echo "
-			.wall-item-container .wall-item-content {
-  					line-height: 1.2;
-  					}
-  					
-			.wall-item-photo-container .wall-item-content {
- 					line-height: 1.2;
-  					}
-		";
-	}
-	if($line_height == "1.1"){
-		echo "
-			.wall-item-container .wall-item-content {
-  					line-height: 1.1;
-  					}
-  					
-			.wall-item-photo-container .wall-item-content {
- 					line-height: 1.1;
-  					}
-		";
-	}
-	}
-	
-	if($resolution == "wide") {	
-	if (file_exists("$THEMEPATH/style-wide.css")){
-		echo file_get_contents("$THEMEPATH/style-wide.css");
-	}
-	if($diabook_font_size == "15"){
-		echo "
-			.wall-item-container .wall-item-content {
-  					font-size: 15px;
-  					}
-  					
-			.wall-item-photo-container .wall-item-content {
-  					font-size: 15px;
-  					}
-		";
-	}
-	if($diabook_font_size == "14"){
-		echo "
-			.wall-item-container .wall-item-content {
-  					font-size: 14px;
-  					}
-  					
-			.wall-item-photo-container .wall-item-content {
-  					font-size: 14px;
-  					}
-		";
-	}
-	if($diabook_font_size == "13.5"){
-		echo "
-			.wall-item-container .wall-item-content {
-  					font-size: 13.5px;
-  					}
-  					
-			.wall-item-photo-container .wall-item-content {
-  					font-size: 13.5px;
-  					}
-		";
-	}
-	if($diabook_font_size == "13"){
-		echo "
-			.wall-item-container .wall-item-content {
-  					font-size: 13px;
-  					}
-  					
-			.wall-item-photo-container .wall-item-content {
-  					font-size: 13px;
-  					}
-		";
-	}
-	if($diabook_font_size == "12.5"){
-		echo "
-			.wall-item-container .wall-item-content {
-  					font-size: 12.5px;
-  					}
-  					
-			.wall-item-photo-container .wall-item-content {
-  					font-size: 12.5px;
-  					}
-		";
-	}
-	if($diabook_font_size == "12"){
-		echo "
-			.wall-item-container .wall-item-content {
-  					font-size: 12px;
-  					}
-  					
-			.wall-item-photo-container .wall-item-content {
-  					font-size: 12px;
-  					}
-		";
-	}
-	if($line_height == "1.5"){
-		echo "
-			.wall-item-container .wall-item-content {
-  					line-height: 1.5;
-  					}
-  					
-			.wall-item-photo-container .wall-item-content {
- 					line-height: 1.5;
-  					}
-		";
-	}	
-	if($line_height == "1.4"){
-		echo "
-			.wall-item-container .wall-item-content {
-  					line-height: 1.4;
-  					}
-  					
-			.wall-item-photo-container .wall-item-content {
- 					line-height: 1.4;
-  					}
-		";
-	}
-	if($line_height == "1.3"){
-		echo "
-			.wall-item-container .wall-item-content {
-  					line-height: 1.3;
-  					}
-  					
-			.wall-item-photo-container .wall-item-content {
- 					line-height: 1.3;
-  					}
-		";
-	}
-	if($line_height == "1.2"){
-		echo "
-			.wall-item-container .wall-item-content {
-  					line-height: 1.2;
-  					}
-  					
-			.wall-item-photo-container .wall-item-content {
- 					line-height: 1.2;
-  					}
-		";
-	}
-	if($line_height == "1.1"){
-		echo "
-			.wall-item-container .wall-item-content {
-  					line-height: 1.1;
-  					}
-  					
-			.wall-item-photo-container .wall-item-content {
- 					line-height: 1.1;
-  					}
-		";
-	}
-	}
\ No newline at end of file
diff --git a/view/theme/diabook/diabook-blue/theme.php b/view/theme/diabook/diabook-blue/theme.php
deleted file mode 100644
index 46ede2182..000000000
--- a/view/theme/diabook/diabook-blue/theme.php
+++ /dev/null
@@ -1,486 +0,0 @@
-<?php
-
-/*
- * Name: Diabook-blue
- * Description: Diabook-blue: report bugs and request here: http://pad.toktan.org/p/diabook or contact me : thomas_bierey@friendica.eu
- * Version: (Version: 1.020)
- * Author: 
- */
-
-
-//print diabook-version for debugging
-$diabook_version = "Diabook-blue (Version: 1.020)";
-$a->page['htmlhead'] .= sprintf('<script "%s" ></script>', $diabook_version);
-
-//change css on network and profilepages
-$cssFile = null;
-$resolution=false;
-$resolution = get_pconfig(local_user(), "diabook-blue", "resolution");
-if ($resolution===false) $resolution="normal";
-
-/**
- * prints last community activity
- */
-function diabook_blue_community_info(){
-	$a = get_app();
-
-	// last 12 users
-	$aside['$lastusers_title'] = t('Last users');
-	$aside['$lastusers_items'] = array();
-	$sql_extra = "";
-	$publish = (get_config('system','publish_all') ? '' : " AND `publish` = 1 " );
-	$order = " ORDER BY `register_date` DESC ";
-
-	$r = q("SELECT `profile`.*, `profile`.`uid` AS `profile_uid`, `user`.`nickname`
-			FROM `profile` LEFT JOIN `user` ON `user`.`uid` = `profile`.`uid` 
-			WHERE `is-default` = 1 $publish AND `user`.`blocked` = 0 $sql_extra $order LIMIT %d , %d ",
-		0,
-		9
-	);
-	$tpl = file_get_contents( dirname(__file__).'/ch_directory_item.tpl');
-	if(count($r)) {
-		$photo = 'thumb';
-		foreach($r as $rr) {
-			$profile_link = $a->get_baseurl() . '/profile/' . ((strlen($rr['nickname'])) ? $rr['nickname'] : $rr['profile_uid']);
-			$entry = replace_macros($tpl,array(
-				'$id' => $rr['id'],
-				'$profile-link' => $profile_link,
-				'$photo' => $rr[$photo],
-				'$alt-text' => $rr['name'],
-			));
-			$aside['$lastusers_items'][] = $entry;
-		}
-	}
-	
-	
-	// last 10 liked items
-	$aside['$like_title'] = t('Last likes');
-	$aside['$like_items'] = array();
-	$r = q("SELECT `T1`.`created`, `T1`.`liker`, `T1`.`liker-link`, `item`.* FROM 
-			(SELECT `parent-uri`, `created`, `author-name` AS `liker`,`author-link` AS `liker-link` 
-				FROM `item` WHERE `verb`='http://activitystrea.ms/schema/1.0/like' GROUP BY `parent-uri` ORDER BY `created` DESC) AS T1
-			INNER JOIN `item` ON `item`.`uri`=`T1`.`parent-uri` 
-			WHERE `T1`.`liker-link` LIKE '%s%%' OR `item`.`author-link` LIKE '%s%%'
-			GROUP BY `uri`
-			ORDER BY `T1`.`created` DESC
-			LIMIT 0,5",
-			$a->get_baseurl(),$a->get_baseurl()
-			);
-
-	foreach ($r as $rr) {
-		$author	 = '<a href="' . $rr['liker-link'] . '">' . $rr['liker'] . '</a>';
-		$objauthor =  '<a href="' . $rr['author-link'] . '">' . $rr['author-name'] . '</a>';
-		
-		//var_dump($rr['verb'],$rr['object-type']); killme();
-		switch($rr['verb']){
-			case 'http://activitystrea.ms/schema/1.0/post':
-				switch ($rr['object-type']){
-					case 'http://activitystrea.ms/schema/1.0/event':
-						$post_type = t('event');
-						break;
-					default:
-						$post_type = t('status');
-				}
-				break;
-			default:
-				if ($rr['resource-id']){
-					$post_type = t('photo');
-					$m=array();	preg_match("/\[url=([^]]*)\]/", $rr['body'], $m);
-					$rr['plink'] = $m[1];
-				} else {
-					$post_type = t('status');
-				}
-		}
-		$plink = '<a href="' . $rr['plink'] . '">' . $post_type . '</a>';
-
-		$aside['$like_items'][] = sprintf( t('%1$s likes %2$s\'s %3$s'), $author, $objauthor, $plink);
-		
-	}
-	
-	
-	// last 12 photos
-	$aside['$photos_title'] = t('Last photos');
-	$aside['$photos_items'] = array();
-	$r = q("SELECT `photo`.`id`, `photo`.`resource-id`, `photo`.`scale`, `photo`.`desc`, `user`.`nickname`, `user`.`username` FROM 
-				(SELECT `resource-id`, MAX(`scale`) as maxscale FROM `photo` 
-					WHERE `profile`=0 AND `contact-id`=0 AND `album` NOT IN ('Contact Photos', '%s', 'Profile Photos', '%s')
-						AND `allow_cid`='' AND `allow_gid`='' AND `deny_cid`='' AND `deny_gid`='' GROUP BY `resource-id`) AS `t1`
-				INNER JOIN `photo` ON `photo`.`resource-id`=`t1`.`resource-id` AND `photo`.`scale` = `t1`.`maxscale`,
-				`user` 
-				WHERE `user`.`uid` = `photo`.`uid`
-				AND `user`.`blockwall`=0
-				AND `user`.`hidewall`=0
-				ORDER BY `photo`.`edited` DESC
-				LIMIT 0, 9",
-				dbesc(t('Contact Photos')),
-				dbesc(t('Profile Photos'))
-				);
-		if(count($r)) {
-		$tpl = file_get_contents( dirname(__file__).'/ch_directory_item.tpl');
-		foreach($r as $rr) {
-			$photo_page = $a->get_baseurl() . '/photos/' . $rr['nickname'] . '/image/' . $rr['resource-id'];
-			$photo_url = $a->get_baseurl() . '/photo/' .  $rr['resource-id'] . '-' . $rr['scale'] .'.jpg';
-		
-			$entry = replace_macros($tpl,array(
-				'$id' => $rr['id'],
-				'$profile-link' => $photo_page,
-				'$photo' => $photo_url,
-				'$alt-text' => $rr['username']." : ".$rr['desc'],
-			));
-
-			$aside['$photos_items'][] = $entry;
-		}
-	}
-	
-   
-   //nav FIND FRIENDS
-	if(local_user()) {
-	$nv = array();
-	$nv['title'] = Array("", t('Find Friends'), "", "");
-	$nv['directory'] = Array('directory', t('Local Directory'), "", "");
-	$nv['global_directory'] = Array('http://dir.friendica.com/', t('Global Directory'), "", "");
-	$nv['match'] = Array('match', t('Similar Interests'), "", "");
-	$nv['suggest'] = Array('suggest', t('Friend Suggestions'), "", "");
-	$nv['invite'] = Array('invite', t('Invite Friends'), "", "");
-	
-	$nv['search'] = '<form name="simple_bar" method="get" action="http://dir.friendika.com/directory">
-						<span class="sbox_l"></span>
-						<span class="sbox">
-						<input type="text" name="search" size="13" maxlength="50">
-						</span>
-						<span class="sbox_r" id="srch_clear"></span>';
-						
-	$aside['$nv'] = $nv;
-	};
-	//Community Page
-	if(local_user()) {
-   $page = '<div id="page-sidebar-right_aside" class="widget">
-			<div class="title tool">
-			<h3>'.t("Community Pages").'<a id="close_pages_icon"  onClick="close_pages()" class="icon close_box" title="close"></a></h3></div>
-			<div id="sidebar-page-list"><ul>';
-
-	$pagelist = array();
-
-	$contacts = q("SELECT `id`, `url`, `name`, `micro`FROM `contact`
-			WHERE `network`= 'dfrn' AND `forum` = 1 AND `uid` = %d
-			ORDER BY `name` ASC",
-			intval($a->user['uid'])
-	);
-
-	$pageD = array();
-
-	// Look if the profile is a community page
-	foreach($contacts as $contact) {
-		$pageD[] = array("url"=>$contact["url"], "name"=>$contact["name"], "id"=>$contact["id"], "micro"=>$contact['micro']);
-	};
-	
-
-	$contacts = $pageD;
-
-	foreach($contacts as $contact) {
-		$page .= '<li style="list-style-type: none;" class="tool"><img height="20" width="20" style="float: left; margin-right: 3px;" src="' . $contact['micro'] .'" alt="' . $contact['url'] . '" /> <a href="'.$a->get_baseurl().'/redir/'.$contact["id"].'" style="margin-top: 2px;" title="' . $contact['url'] . '" class="label" target="external-link">'.
-				$contact["name"]."</a></li>";
-	}
-	$page .= '</ul></div></div>';
-	//if (sizeof($contacts) > 0)
-		
-		$aside['$page'] = $page;
-	}		
-  //END Community Page
-  //helpers
-   $helpers = array();
-	$helpers['title'] = Array("", t('Help or @NewHere ?'), "", "");
-	
-	$aside['$helpers'] = $helpers;
-   //end helpers
-   //connectable services
-   $con_services = array();
-	$con_services['title'] = Array("", t('Connect Services'), "", "");
-	
-	$aside['$con_services'] = $con_services;
-   //end connectable services
-   
-  
-   //get_baseurl   
-   $url = $a->get_baseurl($ssl_state);   
-   $aside['$url'] = $url;
-
-	$tpl = file_get_contents(dirname(__file__).'/communityhome.tpl');
-	$a->page['right_aside'] = replace_macros($tpl, $aside);
-	
-}
-
-
-//profile_side at networkpages
-if ($a->argv[0] === "network" && local_user()){
-
-	// USER MENU
-	if(local_user()) {
-		
-		$r = q("SELECT micro FROM contact WHERE uid=%d AND self=1", intval($a->user['uid']));
-				
-		$userinfo = array(
-					'icon' => (count($r) ? $r[0]['micro']: $a->get_baseurl()."/images/default-profile-mm.jpg"),
-					'name' => $a->user['username'],
-				);	
-		$ps = array('usermenu'=>array());
-		$ps['usermenu']['status'] = Array('profile/' . $a->user['nickname'], t('Home'), "", t('Your posts and conversations'));
-		$ps['usermenu']['profile'] = Array('profile/' . $a->user['nickname']. '?tab=profile', t('Profile'), "", t('Your profile page'));
-		$ps['usermenu']['contacts'] = Array('contacts' , t('Contacts'), "", t('Your contacts'));		
-		$ps['usermenu']['photos'] = Array('photos/' . $a->user['nickname'], t('Photos'), "", t('Your photos'));
-		$ps['usermenu']['events'] = Array('events/', t('Events'), "", t('Your events'));
-		$ps['usermenu']['notes'] = Array('notes/', t('Personal notes'), "", t('Your personal photos'));
-		$ps['usermenu']['community'] = Array('community/', t('Community'), "", "");
-		$ps['usermenu']['pgroups'] = Array('http://dir.friendika.com/directory/forum', t('Community Pages'), "", "");
-
-		$tpl = get_markup_template('profile_side.tpl');
-
-		$a->page['aside'] .= replace_macros($tpl, array(
-				'$userinfo' => $userinfo,
-				'$ps' => $ps,
-			));
-
-	}
-	
-	$ccCookie = $_COOKIE['close_pages'] + $_COOKIE['close_helpers'] + $_COOKIE['close_services'] + $_COOKIE['close_friends'] + $_COOKIE['close_lastusers'] + $_COOKIE['close_lastphotos'] + $_COOKIE['close_lastlikes'];
-	
-	if($ccCookie != "7") {
-	// COMMUNITY
-	diabook_blue_community_info();
-	
-	// CUSTOM CSS
-	if($resolution == "normal") {$cssFile = $a->get_baseurl($ssl_state)."/view/theme/diabook-blue/style-network.css";}
-	if($resolution == "wide") {$cssFile = $a->get_baseurl($ssl_state)."/view/theme/diabook-blue/style-network-wide.css";}
-	}
-}
-
-
-
-//right_aside at profile pages
-if ($a->argv[0].$a->argv[1] === "profile".$a->user['nickname']){
-	if($ccCookie != "7") {
-	// COMMUNITY
-	diabook_blue_community_info();
-	
-	// CUSTOM CSS
-	if($resolution == "normal") {$cssFile = $a->get_baseurl($ssl_state)."/view/theme/diabook-blue/style-profile.css";}
-	if($resolution == "wide") {$cssFile = $a->get_baseurl($ssl_state)."/view/theme/diabook-blue/style-profile-wide.css";}
-	}
-}
-
-
-// custom css
-if (!is_null($cssFile)) $a->page['htmlhead'] .= sprintf('<link rel="stylesheet" type="text/css" href="%s" />', $cssFile);
-
-//load jquery.cookie.js
-$cookieJS = $a->get_baseurl($ssl_state)."/view/theme/diabook-blue/js/jquery.cookie.js";
-$a->page['htmlhead'] .= sprintf('<script language="JavaScript" src="%s" ></script>', $cookieJS);
-
-//load jquery.ae.image.resize.js
-$imageresizeJS = $a->get_baseurl($ssl_state)."/view/theme/diabook-blue/js/jquery.ae.image.resize.js";
-$a->page['htmlhead'] .= sprintf('<script language="JavaScript" src="%s" ></script>', $imageresizeJS);
-
-//load jquery.autogrow-textarea.js
-$autogrowJS = $a->get_baseurl($ssl_state)."/view/theme/diabook-blue/js/jquery.autogrow.textarea.js";
-$a->page['htmlhead'] .= sprintf('<script language="JavaScript" src="%s" ></script>', $autogrowJS);
-
-//js scripts
-//comment-edit-wrapper on photo_view
-if ($a->argv[0].$a->argv[2] === "photos"."image"){
-
-$a->page['htmlhead'] .= '
-<script>
-	$(function(){
-	
-		$(".comment-edit-form").css("display","table");
-			
-			});
-    </script>';
-	
-}
-
-
-$a->page['htmlhead'] .= '
-
-<script>
- $(function() {
-	$("a.lightbox").fancybox(); // Select all links with lightbox class
- });
-  
- </script>';
- 
-$a->page['htmlhead'] .= '
-
-<script type="text/javascript">
-
-function tautogrow(id){
-		$("textarea#comment-edit-text-" +id).autogrow(); 	
- 	};
- </script>';
-
-$a->page['htmlhead'] .= '
- <script>
- 
-$(document).ready(function() {
-    $("iframe").each(function(){
-        var ifr_source = $(this).attr("src");
-        var wmode = "wmode=transparent";
-        if(ifr_source.indexOf("?") != -1) {
-            var getQString = ifr_source.split("?");
-            var oldString = getQString[1];
-            var newString = getQString[0];
-            $(this).attr("src",newString+"?"+wmode+"&"+oldString);
-        }
-        else $(this).attr("src",ifr_source+"?"+wmode);
-    });
-      
-
-});
-
-function yt_iframe() {
-	
-	$("iframe").load(function() { 
-	var ifr_src = $(this).contents().find("body iframe").attr("src");
-	$("iframe").contents().find("body iframe").attr("src", ifr_src+"&wmode=transparent");
-    });
-
-	};
-  
- </script>';
-
-
-if ($a->argv[0].$a->argv[1] === "profile".$a->user['nickname'] or $a->argv[0] === "network" && local_user()){
-$a->page['htmlhead'] .= '
-<script>
-
- $(function() {
-	$(".oembed.photo img").aeImageResize({height: 400, width: 400});
-  });
-</script>';
-
-
-	if($ccCookie != "7") {
-$a->page['htmlhead'] .= '
-<script>
-$("right_aside").ready(function(){
-	
-	if($.cookie("close_pages") == "1") 
-		{
-		document.getElementById( "close_pages" ).style.display = "none";
-			};
-	
-	if($.cookie("close_helpers") == "1") 
-		{
-		document.getElementById( "close_helpers" ).style.display = "none";
-			};
-			
-	if($.cookie("close_services") == "1") 
-		{
-		document.getElementById( "close_services" ).style.display = "none";
-			};
-			
-	if($.cookie("close_friends") == "1") 
-		{
-		document.getElementById( "close_friends" ).style.display = "none";
-			};
-	
-			
-	if($.cookie("close_lastusers") == "1") 
-		{
-		document.getElementById( "close_lastusers" ).style.display = "none";
-			};
-			
-	if($.cookie("close_lastphotos") == "1") 
-		{
-		document.getElementById( "close_lastphotos" ).style.display = "none";
-			};
-			
-	if($.cookie("close_lastlikes") == "1") 
-		{
-		document.getElementById( "close_lastlikes" ).style.display = "none";
-			};}
-
-);
-
-function close_pages(){
- document.getElementById( "close_pages" ).style.display = "none";
- $.cookie("close_pages","1", { expires: 365, path: "/" });
- };
- 
-function close_helpers(){
- document.getElementById( "close_helpers" ).style.display = "none";
-  $.cookie("close_helpers","1", { expires: 365, path: "/" });
- };
-
-function close_services(){
- document.getElementById( "close_services" ).style.display = "none";
- $.cookie("close_services","1", { expires: 365, path: "/" });
- };
- 
-function close_friends(){
- document.getElementById( "close_friends" ).style.display = "none";
- $.cookie("close_friends","1", { expires: 365, path: "/" });
- };
- 
-function close_lastusers(){
- document.getElementById( "close_lastusers" ).style.display = "none";
- $.cookie("close_lastusers","1", { expires: 365, path: "/" });
- };
-
-function close_lastphotos(){
- document.getElementById( "close_lastphotos" ).style.display = "none";
- $.cookie("close_lastphotos","1", { expires: 365, path: "/" });
- };
- 
-function close_lastlikes(){
- document.getElementById( "close_lastlikes" ).style.display = "none";
- $.cookie("close_lastlikes","1", { expires: 365, path: "/" });
- };
-</script>';}
-
-$a->page['htmlhead'] .= ' 
-<script>
-function restore_boxes(){
-	$.cookie("close_pages","2", { expires: 365, path: "/" });
-	$.cookie("close_helpers","2", { expires: 365, path: "/" });
-	$.cookie("close_services","2", { expires: 365, path: "/" });
-	$.cookie("close_friends","2", { expires: 365, path: "/" });
-	$.cookie("close_lastusers","2", { expires: 365, path: "/" });
-	$.cookie("close_lastphotos","2", { expires: 365, path: "/" });
-	$.cookie("close_lastlikes","2", { expires: 365, path: "/" });
-	alert("Right-hand column was restored. Please refresh your browser");
-  }
-</script>';}
-
-$a->page['htmlhead'] .= ' 
-
-<script type="text/javascript">
-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);
-											}
-
-	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;
-}
-</script> ';
diff --git a/view/theme/diabook/diabook-blue/wall_item.tpl b/view/theme/diabook/diabook-blue/wall_item.tpl
deleted file mode 100644
index 123834064..000000000
--- a/view/theme/diabook/diabook-blue/wall_item.tpl
+++ /dev/null
@@ -1,100 +0,0 @@
-{{ if $item.indent }}{{ else }}
-<div class="wall-item-decor">
-	<img id="like-rotator-$item.id" class="like-rotator" src="images/rotator.gif" alt="$item.wait" title="$item.wait" style="display: none;" />
-</div>
-{{ endif }}
-<div class="wall-item-container $item.indent">
-	<div class="wall-item-item">
-		<div class="wall-item-info">
-			<div class="contact-photo-wrapper"
-				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" target="redir" title="$item.linktitle" class="contact-photo-link" id="wall-item-photo-link-$item.id">
-					<img src="$item.thumb" class="contact-photo$item.sparkle" id="wall-item-photo-$item.id" alt="$item.name" />
-				</a>
-				<a href="#" rel="#wall-item-photo-menu-$item.id" class="contact-photo-menu-button icon s16 menu" id="wall-item-photo-menu-button-$item.id">menu</a>
-				<ul class="contact-menu menu-popup" id="wall-item-photo-menu-$item.id">
-				$item.item_photo_menu
-				</ul>
-				
-			</div>
-		</div>
-			<div class="wall-item-actions-author">
-				<a href="$item.profile_url" target="redir" title="$item.linktitle" class="wall-item-name-link"><span class="wall-item-name$item.sparkle">$item.name</span></a> 
-			<span class="wall-item-ago">-
-			{{ if $item.plink }}<a class="link" title="$item.plink.title" href="$item.plink.href" style="color: #999">$item.ago</a>{{ else }} $item.ago {{ endif }}
-			{{ if $item.lock }} - <span class="fakelink" style="color: #999" onclick="lockview(event,$item.id);">$item.lock</span> {{ endif }}
-			</span>
-			</div>
-		<div class="wall-item-content">
-			{{ if $item.title }}<h2><a href="$item.plink.href">$item.title</a></h2>{{ endif }}
-			$item.body
-		</div>
-	</div>
-	<div class="wall-item-bottom">
-		<div class="wall-item-links">
-		</div>
-		<div class="wall-item-tags">
-			{{ for $item.tags as $tag }}
-				<span class='tag'>$tag</span>
-			{{ endfor }}
-		</div>
-	</div>
-	<div class="wall-item-bottom">
-		<div class="">
-
-		</div>
-		<div class="wall-item-actions">
-
-			<div class="wall-item-actions-social">
-			
-			
-			{{ if $item.vote }}
-				<a href="#" id="like-$item.id" class="icon like" title="$item.vote.like.0" onclick="dolike($item.id,'like'); return false">$item.vote.like.1</a>
-				<a href="#" id="dislike-$item.id" class="icon dislike" title="$item.vote.dislike.0" onclick="dolike($item.id,'dislike'); return false"></a>
-			{{ endif }}
-						
-			{{ if $item.vote.share }}
-				<a href="#" id="share-$item.id" class="icon recycle" title="$item.vote.share.0" onclick="jotShare($item.id); return false"></a>
-			{{ endif }}	
-
-
-			{{ if $item.star }}
-				<a href="#" id="starred-$item.id" onclick="dostar($item.id); return false;" class="star-item icon $item.isstarred" title="$item.star.toggle">
-				<img src="images/star_dummy.png" class="icon star" alt="$item.star.do" /> </a>
-				<a href="#" id="tagger-$item.id" onclick="itemTag($item.id); return false;" class="tag-item icon tagged" title="$item.star.tagger"></a>					  
-			{{ endif }}	
-			
-			{{ if $item.filer }}
-			<a href="#" id="filer-$item.id" onclick="itemFiler($item.id); return false;" class="filer-item icon file-as" title="$item.star.filer"></a>
-			{{ endif }}				
-			
-			{{ if $item.plink }}<a class="icon link" title="$item.plink.title" href="$item.plink.href">$item.plink.title</a>{{ endif }}
-			
-					
-					
-			</div>
-			
-			<div class="wall-item-actions-tools">
-
-				{{ if $item.drop.dropping }}
-					<input type="checkbox" title="$item.drop.select" name="itemselected[]" class="item-select" value="$item.id" />
-					<a href="item/drop/$item.id" onclick="return confirmDelete();" class="icon drop" title="$item.drop.delete">$item.drop.delete</a>
-				{{ endif }}
-				{{ if $item.edpost }}
-					<a class="icon pencil" href="$item.edpost.0" title="$item.edpost.1"></a>
-				{{ endif }}
-			</div>
-			<div class="wall-item-location">$item.location&nbsp;</div>
-		</div>
-	</div>
-	<div class="wall-item-bottom">
-		<div class="wall-item-links"></div>
-		<div class="wall-item-like" id="wall-item-like-$item.id">$item.like</div>
-		<div class="wall-item-dislike" id="wall-item-dislike-$item.id">$item.dislike</div>	
-	</div>
-</div>
-
-<div class="wall-item-comment-wrapper" >
-	$item.comment
-</div>
diff --git a/view/theme/diabook/diabook-blue/wallwall_item.tpl b/view/theme/diabook/diabook-blue/wallwall_item.tpl
deleted file mode 100644
index bee75ad99..000000000
--- a/view/theme/diabook/diabook-blue/wallwall_item.tpl
+++ /dev/null
@@ -1,106 +0,0 @@
-{{ if $item.indent }}{{ else }}
-<div class="wall-item-decor">
-	<img id="like-rotator-$item.id" class="like-rotator" src="images/rotator.gif" alt="$item.wait" title="$item.wait" style="display: none;" />
-</div>
-{{ endif }}
-<div class="wall-item-container $item.indent">
-	<div class="wall-item-item">
-		<div class="wall-item-info">
-			<div class="contact-photo-wrapper mframe wwto" id="wall-item-ownerphoto-wrapper-$item.id" >
-				<a href="$item.owner_url" target="redir" title="$item.olinktitle" class="contact-photo-link" id="wall-item-ownerphoto-link-$item.id">
-					<img src="$item.owner_photo" class="contact-photo $item.osparkle" id="wall-item-ownerphoto-$item.id" alt="$item.owner_name" />
-				</a>
-			</div>
-			<div class="contact-photo-wrapper mframe wwfrom"
-				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" target="redir" title="$item.linktitle" class="contact-photo-link" id="wall-item-photo-link-$item.id">
-					<img src="$item.thumb" class="contact-photo$item.sparkle" id="wall-item-photo-$item.id" alt="$item.name" />
-				</a>
-				<a href="#" rel="#wall-item-photo-menu-$item.id" class="contact-photo-menu-button icon s16 menu" id="wall-item-photo-menu-button-$item.id">menu</a>
-				<ul class="contact-menu menu-popup" id="wall-item-photo-menu-$item.id">
-				$item.item_photo_menu
-				</ul>
-				
-			</div>
-		</div>
-			<div class="wall-item-actions-author">
-				<a href="$item.profile_url" target="redir" title="$item.linktitle" class="wall-item-name-link"><span class="wall-item-name$item.sparkle">$item.name</span></a>
-				$item.to <a href="$item.owner_url" target="redir" 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 <span class="wall-item-ago">- &nbsp;
-			{{ if $item.plink }}<a class="link" title="$item.plink.title" href="$item.plink.href" style="color: #999">$item.ago</a>{{ else }} $item.ago {{ endif }}
-			{{ if $item.lock }} - <span class="fakelink" style="color: #999" onclick="lockview(event,$item.id);">$item.lock</span> {{ endif }}
-			</span>
-			</div>
-		<div class="wall-item-content">
-			{{ if $item.title }}<h2><a href="$item.plink.href">$item.title</a></h2>{{ endif }}
-			$item.body
-		</div>
-	</div>
-	<div class="wall-item-bottom">
-		<div class="wall-item-links">
-		</div>
-		<div class="wall-item-tags">
-			{{ for $item.tags as $tag }}
-				<span class='tag'>$tag</span>
-			{{ endfor }}
-		</div>
-	</div>
-	<div class="wall-item-bottom">
-		<div class="">
-
-		</div>
-		<div class="wall-item-actions">
-
-			<div class="wall-item-actions-social">
-			
-			
-			{{ if $item.vote }}
-				<a href="#" id="like-$item.id" class="icon like" title="$item.vote.like.0" onclick="dolike($item.id,'like'); return false">$item.vote.like.1</a>
-				<a href="#" id="dislike-$item.id" class="icon dislike" title="$item.vote.dislike.0" onclick="dolike($item.id,'dislike'); return false"></a>
-			{{ endif }}
-						
-			{{ if $item.vote.share }}
-				<a href="#" id="share-$item.id" class="icon recycle" title="$item.vote.share.0" onclick="jotShare($item.id); return false"></a>
-			{{ endif }}	
-
-
-			{{ if $item.star }}
-				<a href="#" id="starred-$item.id" onclick="dostar($item.id); return false;" class="star-item icon $item.isstarred" title="$item.star.toggle">
-				<img src="images/star_dummy.png" class="icon star" alt="$item.star.do" /> </a>
-				<a href="#" id="tagger-$item.id" onclick="itemTag($item.id); return false;" class="tag-item icon tagged" title="$item.star.tagger"></a>
-			{{ endif }}	
-			
-			{{ if $item.filer }}
-			<a href="#" id="filer-$item.id" onclick="itemFiler($item.id); return false;" class="filer-item icon file-as" title="$item.star.filer"></a>
-			{{ endif }}	
-			
-			{{ if $item.plink }}<a class="icon link" title="$item.plink.title" href="$item.plink.href">$item.plink.title</a>{{ endif }}
-			
-					
-					
-			</div>
-			
-			<div class="wall-item-actions-tools">
-
-				{{ if $item.drop.dropping }}
-					<input type="checkbox" title="$item.drop.select" name="itemselected[]" class="item-select" value="$item.id" />
-					<a href="item/drop/$item.id" onclick="return confirmDelete();" class="icon drop" title="$item.drop.delete">$item.drop.delete</a>
-				{{ endif }}
-				{{ if $item.edpost }}
-					<a class="icon pencil" href="$item.edpost.0" title="$item.edpost.1"></a>
-				{{ endif }}
-			</div>
-			<div class="wall-item-location">$item.location&nbsp;</div>
-		</div>
-	</div>
-	<div class="wall-item-bottom">
-		<div class="wall-item-links"></div>
-		<div class="wall-item-like" id="wall-item-like-$item.id">$item.like</div>
-		<div class="wall-item-dislike" id="wall-item-dislike-$item.id">$item.dislike</div>	
-	</div>
-</div>
-
-<div class="wall-item-comment-wrapper" >
-	$item.comment
-</div>
\ No newline at end of file
diff --git a/view/theme/diabook/diabook-dark/admin_users.tpl b/view/theme/diabook/diabook-dark/admin_users.tpl
deleted file mode 100644
index 40f94f5fe..000000000
--- a/view/theme/diabook/diabook-dark/admin_users.tpl
+++ /dev/null
@@ -1,88 +0,0 @@
-<script>
-	function confirm_delete(uname){
-		return confirm( "$confirm_delete".format(uname));
-	}
-	function confirm_delete_multi(){
-		return confirm("$confirm_delete_multi");
-	}
-	function selectall(cls){
-		$("."+cls).attr('checked','checked');
-		return false;
-	}
-</script>
-<div id='adminpage'>
-	<h1>$title - $page</h1>
-	
-	<form action="$baseurl/admin/users" method="post">
-		
-		<h3>$h_pending</h3>
-		{{ if $pending }}
-			<table id='pending'>
-				<thead>
-				<tr>
-					{{ for $th_pending as $th }}<th>$th</th>{{ endfor }}
-					<th></th>
-					<th></th>
-				</tr>
-				</thead>
-				<tbody>
-			{{ for $pending as $u }}
-				<tr>
-					<td class="created">$u.created</td>
-					<td class="name">$u.name</td>
-					<td class="email">$u.email</td>
-					<td class="checkbox"><input type="checkbox" class="pending_ckbx" id="id_pending_$u.hash" name="pending[]" value="$u.hash" /></td>
-					<td class="tools">
-						<a href="$baseurl/regmod/allow/$u.hash" title='$approve'><span class='icon like'></span></a>
-						<a href="$baseurl/regmod/deny/$u.hash" title='$deny'><span class='icon dislike'></span></a>
-					</td>
-				</tr>
-			{{ endfor }}
-				</tbody>
-			</table>
-			<div class='selectall'><a href='#' onclick="return selectall('pending_ckbx');">$select_all</a></div>
-			<div class="submit"><input type="submit" name="page_users_deny" value="$deny"/> <input type="submit" name="page_users_approve" value="$approve" /></div>			
-		{{ else }}
-			<p>$no_pending</p>
-		{{ endif }}
-	
-	
-		
-	
-		<h3>$h_users</h3>
-		{{ if $users }}
-			<table id='users'>
-				<thead>
-				<tr>
-					<th></th>
-					{{ for $th_users as $th }}<th>$th</th>{{ endfor }}
-					<th></th>
-					<th></th>
-				</tr>
-				</thead>
-				<tbody>
-				{{ for $users as $u }}
-					<tr>
-						<td><img src="$u.micro" alt="$u.nickname" title="$u.nickname"></td>
-						<td class='name'><a href="$u.url" title="$u.nickname" >$u.name</a></td>
-						<td class='email'>$u.email</td>
-						<td class='register_date'>$u.register_date</td>
-						<td class='login_date'>$u.login_date</td>
-						<td class='lastitem_date'>$u.lastitem_date</td>
-						<td class='login_date'>$u.page-flags</td>
-						<td class="checkbox"><input type="checkbox" class="users_ckbx" id="id_user_$u.uid" name="user[]" value="$u.uid"/></td>
-						<td class="tools" style="width:60px;">
-							<a href="$baseurl/admin/users/block/$u.uid" title='{{ if $u.blocked }}$unblock{{ else }}$block{{ endif }}'><span class='icon block {{ if $u.blocked==0 }}dim{{ endif }}'></span></a>
-							<a href="$baseurl/admin/users/delete/$u.uid" title='$delete' onclick="return confirm_delete('$u.name')"><span class='icon ad_drop'></span></a>
-						</td>
-					</tr>
-				{{ endfor }}
-				</tbody>
-			</table>
-			<div class='selectall'><a href='#' onclick="return selectall('users_ckbx');">$select_all</a></div>
-			<div class="submit"><input type="submit" name="page_users_block" value="$block/$unblock" /> <input type="submit" name="page_users_delete" value="$delete" onclick="return confirm_delete_multi()" /></div>						
-		{{ else }}
-			NO USERS?!?
-		{{ endif }}
-	</form>
-</div>
diff --git a/view/theme/diabook/diabook-dark/ch_directory_item.tpl b/view/theme/diabook/diabook-dark/ch_directory_item.tpl
deleted file mode 100644
index db1936e4b..000000000
--- a/view/theme/diabook/diabook-dark/ch_directory_item.tpl
+++ /dev/null
@@ -1,10 +0,0 @@
-
-<div class="directory-item" id="directory-item-$id" >
-	<div class="directory-photo-wrapper" id="directory-photo-wrapper-$id" > 
-		<div class="directory-photo" id="directory-photo-$id" >
-			<a href="$profile-link" class="directory-profile-link" id="directory-profile-link-$id" >
-				<img class="directory-photo-img" src="$photo" alt="$alt-text" title="$alt-text" />
-			</a>
-		</div>
-	</div>
-</div>
diff --git a/view/theme/diabook/diabook-dark/comment_item.tpl b/view/theme/diabook/diabook-dark/comment_item.tpl
deleted file mode 100644
index ee4dfba45..000000000
--- a/view/theme/diabook/diabook-dark/comment_item.tpl
+++ /dev/null
@@ -1,41 +0,0 @@
-		<div class="comment-wwedit-wrapper" id="comment-edit-wrapper-$id" style="display: block;">
-			<form class="comment-edit-form" id="comment-edit-form-$id" action="item" method="post" onsubmit="post_comment($id); return false;">
-				<input type="hidden" name="type" value="$type" />
-				<input type="hidden" name="profile_uid" value="$profile_uid" />
-				<input type="hidden" name="parent" value="$parent" />
-				<input type="hidden" name="return" value="$return_path" />
-				<input type="hidden" name="jsreload" value="$jsreload" />
-				<input type="hidden" name="preview" id="comment-preview-inp-$id" value="0" />
-
-				<div class="comment-edit-photo" id="comment-edit-photo-$id" >
-					<a class="comment-edit-photo-link" href="$mylink" title="$mytitle"><img class="my-comment-photo" src="$myphoto" alt="$mytitle" title="$mytitle" /></a>
-				</div>
-				<div class="comment-edit-photo-end"></div>
-				<textarea id="comment-edit-text-$id" class="comment-edit-text-empty" name="body" onFocus="commentOpen(this,$id);tautogrow($id)" onBlur="commentClose(this,$id);" >$comment</textarea>
-				<a class="icon bb-image" style="cursor: pointer;" onclick="insertFormatting('$comment','img',$id);">img</a>	
-				<a class="icon bb-url" style="cursor: pointer;" onclick="insertFormatting('$comment','url',$id);">url</a>
-				<a class="icon bb-video" style="cursor: pointer;" onclick="insertFormatting('$comment','video',$id);">video</a>														
-				<a class="icon underline" style="cursor: pointer;" onclick="insertFormatting('$comment','u',$id);">u</a>
-				<a class="icon italic" style="cursor: pointer;" onclick="insertFormatting('$comment','i',$id);">i</a>
-				<a class="icon bold" style="cursor: pointer;" onclick="insertFormatting('$comment','b',$id);">b</a>
-				<a class="icon quote" style="cursor: pointer;" onclick="insertFormatting('$comment','quote',$id);">quote</a>																			
-				{{ if $qcomment }}
-					<select id="qcomment-select-$id" name="qcomment-$id" class="qcomment" onchange="qCommentInsert(this,$id);" >
-					<option value=""></option>
-				{{ for $qcomment as $qc }}
-					<option value="$qc">$qc</option>				
-				{{ endfor }}
-					</select>
-				{{ endif }}
-
-				<div class="comment-edit-text-end"></div>
-				<div class="comment-edit-submit-wrapper" id="comment-edit-submit-wrapper-$id" style="display: none;" >
-					<input type="submit" onclick="post_comment($id); return false;" id="comment-edit-submit-$id" class="comment-edit-submit" name="submit" value="$submit" />
-					<span onclick="preview_comment($id);" id="comment-edit-preview-link-$id" class="fakelink">$preview</span>
-					<div id="comment-edit-preview-$id" class="comment-edit-preview" style="display:none;"></div>
-				</div>
-
-				<div class="comment-edit-end"></div>
-			</form>
-
-		</div>
diff --git a/view/theme/diabook/diabook-dark/communityhome.tpl b/view/theme/diabook/diabook-dark/communityhome.tpl
deleted file mode 100644
index 875d83f1b..000000000
--- a/view/theme/diabook/diabook-dark/communityhome.tpl
+++ /dev/null
@@ -1,86 +0,0 @@
-<div id="close_pages">
-{{ if $page }}
-<div>$page</div>
-{{ endif }}
-</div>
-
-<div id="close_helpers">
-{{ if $lastusers_title }}
-<h3 style="margin-top:0px;">$helpers.title.1<a id="close_helpers_icon"  onClick="close_helpers()" class="icon close_box" title="close"></a></h3>
-<a href="http://kakste.com/profile/newhere" title="#NewHere" style="margin-left: 10px; " target="blank">NewHere</a><br>
-<a href="https://helpers.pyxis.uberspace.de/profile/helpers" style="margin-left: 10px; " title="Friendica Support" target="blank">Friendica Support</a><br>
-<a href="https://letstalk.pyxis.uberspace.de/profile/letstalk" style="margin-left: 10px; " title="Let's talk" target="blank">Let's talk</a><br>
-<a href="http://newzot.hydra.uberspace.de/profile/newzot" title="Local Friendica" style="margin-left: 10px; " target="blank">Local Friendica</a>
-{{ endif }}
-</div>
-
-<div id="close_services">
-{{ if $lastusers_title }}
-<h3>$con_services.title.1<a id="close_services_icon" onClick="close_services()" class="icon close_box" title="close"></a></h3>
-<div id="right_service_icons" style="margin-left: 16px; margin-top: 5px;">
-<a href="$url/facebook"><img alt="Facebook" src="view/theme/diabook-aerith/icons/facebook.png" title="Facebook"></a>
-<a href="$url/settings/connectors"><img alt="StatusNet" src="view/theme/diabook-aerith/icons/StatusNet.png?" title="StatusNet"></a>
-<a href="$url/settings/connectors"><img alt="LiveJournal" src="view/theme/diabook-aerith/icons/livejournal.png?" title="LiveJournal"></a>
-<a href="$url/settings/connectors"><img alt="Posterous" src="view/theme/diabook-aerith/icons/posterous.png?" title="Posterous"></a>
-<a href="$url/settings/connectors"><img alt="Tumblr" src="view/theme/diabook-aerith/icons/tumblr.png?" title="Tumblr"></a>
-<a href="$url/settings/connectors"><img alt="Twitter" src="view/theme/diabook-aerith/icons/twitter.png?" title="Twitter"></a>
-<a href="$url/settings/connectors"><img alt="WordPress" src="view/theme/diabook-aerith/icons/wordpress.png?" title="WordPress"></a>
-<a href="$url/settings/connectors"><img alt="E-Mail" src="view/theme/diabook-aerith/icons/email.png?" title="E-Mail"></a>
-</div>
-{{ endif }}
-</div>
-
-<div id="close_friends" style="margin-bottom:53px;">
-{{ if $nv }}
-<h3>$nv.title.1<a id="close_friends_icon" onClick="close_friends()"  class="icon close_box" title="close"></a></h3>
-<a class="$nv.directory.2" href="$nv.directory.0" style="margin-left: 10px; " title="$nv.directory.3" >$nv.directory.1</a><br>
-<a class="$nv.global_directory.2" href="$nv.global_directory.0" target="blank" style="margin-left: 10px; " title="$nv.global_directory.3" >$nv.global_directory.1</a><br>
-<a class="$nv.match.2" href="$nv.match.0" style="margin-left: 10px; " title="$nv.match.3" >$nv.match.1</a><br>
-<a class="$nv.suggest.2" href="$nv.suggest.0" style="margin-left: 10px; " title="$nv.suggest.3" >$nv.suggest.1</a><br>
-<a class="$nv.invite.2" href="$nv.invite.0" style="margin-left: 10px; " title="$nv.invite.3" >$nv.invite.1</a>			
-$nv.search
-{{ endif }}
-</div>
-
-<div id="close_lastusers">
-{{ if $lastusers_title }}
-<h3>$lastusers_title<a id="close_lastusers_icon" onClick="close_lastusers()" class="icon close_box" title="close"></a></h3>
-<div id='lastusers-wrapper' class='items-wrapper'>
-{{ for $lastusers_items as $i }}
-	$i
-{{ endfor }}
-</div>
-{{ endif }}
-</div>
-
-
-{{ if $activeusers_title }}
-<h3>$activeusers_title</h3>
-<div class='items-wrapper'>
-{{ for $activeusers_items as $i }}
-	$i
-{{ endfor }}
-</div>
-{{ endif }}
-
-<div id="close_lastphotos">
-{{ if $photos_title }}
-<h3>$photos_title<a id="close_photos_icon" onClick="close_lastphotos()"  class="icon close_box" title="close"></a></h3>
-<div id='ra-photos-wrapper' class='items-wrapper'>
-{{ for $photos_items as $i }}
-	$i
-{{ endfor }}
-</div>
-{{ endif }}
-</div>
-
-<div id="close_lastlikes">
-{{ if $like_title }}
-<h3>$like_title<a id="close_lastlikes_icon" onClick="close_lastlikes()" class="icon close_box" title="close"></a></h3>
-<ul id='likes'>
-{{ for $like_items as $i }}
-	<li id='ra-photos-wrapper'>$i</li>
-{{ endfor }}
-</ul>
-{{ endif }}
-</div>
diff --git a/view/theme/diabook/diabook-dark/config.php b/view/theme/diabook/diabook-dark/config.php
deleted file mode 100644
index a8dd1376a..000000000
--- a/view/theme/diabook/diabook-dark/config.php
+++ /dev/null
@@ -1,84 +0,0 @@
-<?php
-/**
- * Theme settings
- */
-
-
-
-function theme_content(&$a){
-	if(!local_user())
-		return;		
-	
-	$font_size = get_pconfig(local_user(), 'diabook-dark', 'font_size' );
-	$line_height = get_pconfig(local_user(), 'diabook-dark', 'line_height' );
-	$resolution = get_pconfig(local_user(), 'diabook-dark', 'resolution' );
-	
-	return diabook_form($a,$font_size, $line_height,$resolution);
-}
-
-function theme_post(&$a){
-	if(! local_user())
-		return;
-	
-	if (isset($_POST['diabook-dark-settings-submit'])){
-		set_pconfig(local_user(), 'diabook-dark', 'font_size', $_POST['diabook-dark_font_size']);
-		set_pconfig(local_user(), 'diabook-dark', 'line_height', $_POST['diabook-dark_line_height']);
-		set_pconfig(local_user(), 'diabook-dark', 'resolution', $_POST['diabook-dark_resolution']);	
-	}
-}
-
-
-function theme_admin(&$a){
-	$font_size = get_config('diabook-dark', 'font_size' );
-	$line_height = get_config('diabook-dark', 'line_height' );
-	$resolution = get_config('diabook-dark', 'resolution' );
-	
-	return diabook_form($a,$font_size, $line_height,$resolution);
-}
-
-function theme_admin_post(&$a){
-	if (isset($_POST['diabook-dark-settings-submit'])){
-		set_config('diabook-dark', 'font_size', $_POST['diabook-dark_font_size']);
-		set_config('diabook-dark', 'line_height', $_POST['diabook-dark_line_height']);
-		set_config('diabook-dark', 'resolution', $_POST['diabook-dark_resolution']);
-	}
-}
-
-
-function diabook_form(&$a, $font_size, $line_height, $resolution){
-	$line_heights = array(
-		"1.3"=>"1.3",
-		"---"=>"---",
-		"1.5"=>"1.5",		
-		"1.4"=>"1.4",
-		"1.2"=>"1.2",
-		"1.1"=>"1.1",
-	);
-	
-	$font_sizes = array(
-		'13'=>'13',
-		"---"=>"---",
-		"15"=>"15",
-		'14'=>'14',
-		'13.5'=>'13.5',		
-		'12.5'=>'12.5',
-		'12'=>'12',
-		);
-	$resolutions = array(
-		'normal'=>'normal',
-		'wide'=>'wide',		
-		);
-	
-	
-	
-	$t = file_get_contents( dirname(__file__). "/theme_settings.tpl" );
-	$o .= replace_macros($t, array(
-		'$submit' => t('Submit'),
-		'$baseurl' => $a->get_baseurl(),
-		'$title' => t("Theme settings"),
-		'$font_size' => array('diabook-dark_font_size', t('Set font-size for posts and comments'), $font_size, '', $font_sizes),
-		'$line_height' => array('diabook-dark_line_height', t('Set line-height for posts and comments'), $line_height, '', $line_heights),
-		'$resolution' => array('diabook-dark_resolution', t('Set resolution for middle column'), $resolution, '', $resolutions),	
-	));
-	return $o;
-}
diff --git a/view/theme/diabook/diabook-dark/contact_template.tpl b/view/theme/diabook/diabook-dark/contact_template.tpl
deleted file mode 100644
index 48930b48a..000000000
--- a/view/theme/diabook/diabook-dark/contact_template.tpl
+++ /dev/null
@@ -1,25 +0,0 @@
-
-<div class="contact-entry-wrapper" id="contact-entry-wrapper-$contact.id" >
-	<div class="contact-entry-photo-wrapper" >
-		<div class="contact-entry-photo mframe" id="contact-entry-photo-$contact.id"
-		onmouseover="if (typeof t$contact.id != 'undefined') clearTimeout(t$contact.id); openMenu('contact-photo-menu-button-$contact.id')" 
-		onmouseout="t$contact.id=setTimeout('closeMenu(\'contact-photo-menu-button-$contact.id\'); closeMenu(\'contact-photo-menu-$contact.id\');',200)" >
-
-			<a href="$contact.url" title="$contact.img_hover" /><img src="$contact.thumb" $contact.sparkle alt="$contact.name" /></a>
-
-			{{ if $contact.photo_menu }}
-			<span onclick="openClose('contact-photo-menu-$contact.id');" class="fakelink contact-photo-menu-button" id="contact-photo-menu-button-$contact.id">menu</span>
-                <div class="contact-photo-menu" id="contact-photo-menu-$contact.id">
-                    <ul>
-                        $contact.photo_menu
-                    </ul>
-                </div>
-			{{ endif }}
-		</div>
-			
-	</div>
-	<div class="contact-entry-photo-end" ></div>
-		<div class="contact-entry-name" id="contact-entry-name-$contact.id" >$contact.name</div>
-
-	<div class="contact-entry-end" ></div>
-</div>
diff --git a/view/theme/diabook/diabook-dark/directory_item.tpl b/view/theme/diabook/diabook-dark/directory_item.tpl
deleted file mode 100644
index bc2af16c2..000000000
--- a/view/theme/diabook/diabook-dark/directory_item.tpl
+++ /dev/null
@@ -1,11 +0,0 @@
-
-<div class="directory-item" id="directory-item-$id" >
-	<div class="directory-photo-wrapper" id="directory-photo-wrapper-$id" > 
-		<div class="directory-photo" id="directory-photo-$id" >
-			<a href="$profile-link" class="directory-profile-link" id="directory-profile-link-$id" >
-				<img class="directory-photo-img" src="$photo" alt="$alt-text" title="$alt-text" />
-			</a>
-		</div>
-	</div>
-	<div class="contact-name" id="directory-name-$id">$name</div>
-</div>
diff --git a/view/theme/diabook/diabook-dark/generic_links_widget.tpl b/view/theme/diabook/diabook-dark/generic_links_widget.tpl
deleted file mode 100644
index 001c1395e..000000000
--- a/view/theme/diabook/diabook-dark/generic_links_widget.tpl
+++ /dev/null
@@ -1,11 +0,0 @@
-<div id="widget_$title">
-	{{if $title}}<h3 style="border-bottom: 1px solid #D2D2D2;">$title</h3>{{endif}}
-	{{if $desc}}<div class="desc">$desc</div>{{endif}}
-	
-	<ul  class="rs_tabs">
-		{{ for $items as $item }}
-			<li><a href="$item.url" class="rs_tab button {{ if $item.selected }}selected{{ endif }}">$item.label</a></li>
-		{{ endfor }}
-	</ul>
-	
-</div>
diff --git a/view/theme/diabook/diabook-dark/group_side.tpl b/view/theme/diabook/diabook-dark/group_side.tpl
deleted file mode 100644
index 8600402f2..000000000
--- a/view/theme/diabook/diabook-dark/group_side.tpl
+++ /dev/null
@@ -1,34 +0,0 @@
-<div id="profile_side" >
-	<div class="">
-		<h3 style="margin-left: 2px;">$title<a href="group/new" title="$createtext" class="icon text_add"></a></h3>
-	</div>
-
-	<div id="sidebar-group-list">
-		<ul class="menu-profile-side">
-			{{ for $groups as $group }}
-			<li class="menu-profile-list">
-				<span class="menu-profile-icon {{ if $group.selected }}group_selected{{else}}group_unselected{{ endif }}"></span>
-				<a href="$group.href" class="menu-profile-list-item">
-					$group.text
-				</a>
-				{{ if $group.edit }}
-					<a href="$group.edit.href" class="action"><span class="icon text_edit" ></span></a>
-				{{ endif }}
-				{{ if $group.cid }}
-					<input type="checkbox" 
-						class="{{ if $group.selected }}ticked{{ else }}unticked {{ endif }} action" 
-						onclick="contactgroupChangeMember('$group.id','$group.cid');return true;"
-						{{ if $group.ismember }}checked="checked"{{ endif }}
-					/>
-				{{ endif }}
-			</li>
-			{{ endfor }}
-		</ul>
-	</div>
-	 {{ if $ungrouped }}
-  <div id="sidebar-ungrouped">
-  <a href="nogroup">$ungrouped</a>
-  </div>
-  {{ endif }}
-</div>	
-
diff --git a/view/theme/diabook/diabook-dark/icons/contacts.png b/view/theme/diabook/diabook-dark/icons/contacts.png
index 79f6d497c..08ea9c53e 100644
--- a/view/theme/diabook/diabook-dark/icons/contacts.png
+++ b/view/theme/diabook/diabook-dark/icons/contacts.png
diff --git a/view/theme/diabook/diabook-dark/icons/contacts2.png b/view/theme/diabook/diabook-dark/icons/contacts2.png
index cd0e289a7..2c6013ced 100644
--- a/view/theme/diabook/diabook-dark/icons/contacts2.png
+++ b/view/theme/diabook/diabook-dark/icons/contacts2.png
diff --git a/view/theme/diabook/diabook-dark/icons/contacts3.png b/view/theme/diabook/diabook-dark/icons/contacts3.png
index cd0e289a7..53ce579df 100644
--- a/view/theme/diabook/diabook-dark/icons/contacts3.png
+++ b/view/theme/diabook/diabook-dark/icons/contacts3.png
diff --git a/view/theme/diabook/diabook-dark/icons/dislike.png b/view/theme/diabook/diabook-dark/icons/dislike.png
index 23de426c5..e9db47780 100644
--- a/view/theme/diabook/diabook-dark/icons/dislike.png
+++ b/view/theme/diabook/diabook-dark/icons/dislike.png
diff --git a/view/theme/diabook/diabook-dark/icons/drop.png b/view/theme/diabook/diabook-dark/icons/drop.png
index 2abb82ef2..9799c31af 100644
--- a/view/theme/diabook/diabook-dark/icons/drop.png
+++ b/view/theme/diabook/diabook-dark/icons/drop.png
diff --git a/view/theme/diabook/diabook-dark/icons/file_as.png b/view/theme/diabook/diabook-dark/icons/file_as.png
index 16713fa53..6a7343642 100644
--- a/view/theme/diabook/diabook-dark/icons/file_as.png
+++ b/view/theme/diabook/diabook-dark/icons/file_as.png
diff --git a/view/theme/diabook/diabook-dark/icons/like.png b/view/theme/diabook/diabook-dark/icons/like.png
index b65edccc0..84b7db18a 100644
--- a/view/theme/diabook/diabook-dark/icons/like.png
+++ b/view/theme/diabook/diabook-dark/icons/like.png
diff --git a/view/theme/diabook/diabook-dark/icons/link.png b/view/theme/diabook/diabook-dark/icons/link.png
index 0ef666a67..ac3bde7db 100644
--- a/view/theme/diabook/diabook-dark/icons/link.png
+++ b/view/theme/diabook/diabook-dark/icons/link.png
diff --git a/view/theme/diabook/diabook-dark/icons/lock.png b/view/theme/diabook/diabook-dark/icons/lock.png
index 7e34bf279..641873ba2 100644
--- a/view/theme/diabook/diabook-dark/icons/lock.png
+++ b/view/theme/diabook/diabook-dark/icons/lock.png
diff --git a/view/theme/diabook/diabook-dark/icons/messages.png b/view/theme/diabook/diabook-dark/icons/messages.png
index c83ba186a..3076f43cd 100644
--- a/view/theme/diabook/diabook-dark/icons/messages.png
+++ b/view/theme/diabook/diabook-dark/icons/messages.png
diff --git a/view/theme/diabook/diabook-dark/icons/messages2.png b/view/theme/diabook/diabook-dark/icons/messages2.png
index e2bf7d24d..08af9f6b7 100644
--- a/view/theme/diabook/diabook-dark/icons/messages2.png
+++ b/view/theme/diabook/diabook-dark/icons/messages2.png
diff --git a/view/theme/diabook/diabook-dark/icons/messages3.png b/view/theme/diabook/diabook-dark/icons/messages3.png
index e2bf7d24d..e02888c34 100644
--- a/view/theme/diabook/diabook-dark/icons/messages3.png
+++ b/view/theme/diabook/diabook-dark/icons/messages3.png
diff --git a/view/theme/diabook/diabook-dark/icons/notifications.png b/view/theme/diabook/diabook-dark/icons/notifications.png
index 2bcd74927..4a0666f76 100644
--- a/view/theme/diabook/diabook-dark/icons/notifications.png
+++ b/view/theme/diabook/diabook-dark/icons/notifications.png
diff --git a/view/theme/diabook/diabook-dark/icons/notifications3.png b/view/theme/diabook/diabook-dark/icons/notifications3.png
index 2b4fbb818..a75d1b71f 100644
--- a/view/theme/diabook/diabook-dark/icons/notifications3.png
+++ b/view/theme/diabook/diabook-dark/icons/notifications3.png
diff --git a/view/theme/diabook/diabook-dark/icons/notify.png b/view/theme/diabook/diabook-dark/icons/notify.png
index 159cd2c59..610314941 100644
--- a/view/theme/diabook/diabook-dark/icons/notify.png
+++ b/view/theme/diabook/diabook-dark/icons/notify.png
diff --git a/view/theme/diabook/diabook-dark/icons/notify2.png b/view/theme/diabook/diabook-dark/icons/notify2.png
index 9765bfd53..9092d6d6b 100644
--- a/view/theme/diabook/diabook-dark/icons/notify2.png
+++ b/view/theme/diabook/diabook-dark/icons/notify2.png
diff --git a/view/theme/diabook/diabook-dark/icons/notify3.png b/view/theme/diabook/diabook-dark/icons/notify3.png
index 9765bfd53..4977b42f6 100644
--- a/view/theme/diabook/diabook-dark/icons/notify3.png
+++ b/view/theme/diabook/diabook-dark/icons/notify3.png
diff --git a/view/theme/diabook/diabook-dark/icons/pencil.png b/view/theme/diabook/diabook-dark/icons/pencil.png
index 772e49b17..cc316a7de 100644
--- a/view/theme/diabook/diabook-dark/icons/pencil.png
+++ b/view/theme/diabook/diabook-dark/icons/pencil.png
diff --git a/view/theme/diabook/diabook-dark/icons/pencil2.png b/view/theme/diabook/diabook-dark/icons/pencil2.png
index 3b47d1864..791433db7 100644
--- a/view/theme/diabook/diabook-dark/icons/pencil2.png
+++ b/view/theme/diabook/diabook-dark/icons/pencil2.png
diff --git a/view/theme/diabook/diabook-dark/icons/recycle.png b/view/theme/diabook/diabook-dark/icons/recycle.png
index c3b8d2bf4..94f5718e6 100644
--- a/view/theme/diabook/diabook-dark/icons/recycle.png
+++ b/view/theme/diabook/diabook-dark/icons/recycle.png
diff --git a/view/theme/diabook/diabook-dark/icons/scroll_top.png b/view/theme/diabook/diabook-dark/icons/scroll_top.png
index 0e7f7ae6a..fe20d1c4c 100644
--- a/view/theme/diabook/diabook-dark/icons/scroll_top.png
+++ b/view/theme/diabook/diabook-dark/icons/scroll_top.png
diff --git a/view/theme/diabook/diabook-dark/icons/tagged.png b/view/theme/diabook/diabook-dark/icons/tagged.png
index 144649ef8..ee347db47 100644
--- a/view/theme/diabook/diabook-dark/icons/tagged.png
+++ b/view/theme/diabook/diabook-dark/icons/tagged.png
diff --git a/view/theme/diabook/diabook-dark/icons/unstarred.png b/view/theme/diabook/diabook-dark/icons/unstarred.png
index ba3183f5c..b4c0bf679 100644
--- a/view/theme/diabook/diabook-dark/icons/unstarred.png
+++ b/view/theme/diabook/diabook-dark/icons/unstarred.png
diff --git a/view/theme/diabook/diabook-dark/jot.tpl b/view/theme/diabook/diabook-dark/jot.tpl
deleted file mode 100644
index 0928c9f36..000000000
--- a/view/theme/diabook/diabook-dark/jot.tpl
+++ /dev/null
@@ -1,85 +0,0 @@
-
-<div id="profile-jot-wrapper" >
-	<div id="profile-jot-banner-wrapper">
-		<div id="profile-jot-desc" >&nbsp;</div>
-	</div>
-	<div id="profile-jot-banner-end"></div>
-
-	<form id="profile-jot-form" action="$action" method="post" >
-		<input type="hidden" name="type" value="$ptyp" />
-		<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="coord" id="jot-coord" value="" />
-		<input type="hidden" name="post_id" value="$post_id" />
-		<input type="hidden" name="preview" id="jot-preview" value="0" />
-		<input name="title" id="jot-title" type="text" placeholder="$placeholdertitle" value="$title" class="jothidden" style="display:none">
-		<div id="jot-category-wrap"><input name="category" id="jot-category" type="text" placeholder="$placeholdercategory" value="$category" class="jothidden" style="display:none" /></div>				
-		<div id="character-counter" class="grey"></div>		
-		<img id="profile-jot-text-loading" src="images/rotator.gif" alt="$wait" title="$wait" style="display: none;" />
-		<textarea rows="5" cols="64" class="profile-jot-text" id="profile-jot-text" name="body" >{{ if $content }}$content{{ else }}$share{{ endif }}</textarea>
-
-
-<div id="profile-jot-submit-wrapper" class="jothidden">
-	
-	<div id="profile-upload-wrapper" style="display: $visitor;" >
-		<div id="wall-image-upload-div" ><a href="#" onclick="return false;" id="wall-image-upload" class="camera" title="$upload"></a></div>
-	</div> 
-	<div id="profile-attach-wrapper" style="display: $visitor;" >
-		<div id="wall-file-upload-div" ><a href="#" onclick="return false;" id="wall-file-upload" class="attach" title="$attach"></a></div>
-	</div> 
-
-	<div id="profile-link-wrapper" style="display: $visitor;" ondragenter="linkdropper(event);" ondragover="linkdropper(event);" ondrop="linkdrop(event);" >
-		<a id="profile-link" class="weblink" title="$weblink" ondragenter="return linkdropper(event);" ondragover="return linkdropper(event);" ondrop="linkdrop(event);" onclick="jotGetLink(); return false;"></a>
-	</div> 
-	<div id="profile-video-wrapper" style="display: $visitor;" >
-		<a id="profile-video" class="video2" title="$video" onclick="jotVideoURL();return false;"></a>
-	</div> 
-	<div id="profile-audio-wrapper" style="display: $visitor;" >
-		<a id="profile-audio" class="audio2" title="$audio" onclick="jotAudioURL();return false;"></a>
-	</div> 
-	<div id="profile-location-wrapper" style="display: $visitor;" >
-		<a id="profile-location" class="globe" title="$setloc" onclick="jotGetLocation();return false;"></a>
-	</div> 
-	<div id="profile-nolocation-wrapper" style="display: none;" >
-		<a id="profile-nolocation" class="noglobe" title="$noloc" onclick="jotClearLocation();return false;"></a>
-	</div> 
-
-	<input type="submit" id="profile-jot-submit" class="button creation2" name="submit" value="$share" />
-  
-   <span onclick="preview_post();" id="jot-preview-link" class="tab button">$preview</span>
-   
-	<div id="profile-jot-perms" class="profile-jot-perms" style="display: $pvisit;" >
-		<a href="#profile-jot-acl-wrapper" id="jot-perms-icon" class="icon $lockstate"  title="$permset" ></a>$bang
-	</div>
-
-
-	<div id="profile-jot-plugin-wrapper">
-  	$jotplugins
-	</div>
-	
-	<div id="profile-rotator-wrapper" style="display: $visitor;" >
-		<img id="profile-rotator" src="images/rotator.gif" alt="$wait" title="$wait" style="display: none;" />
-	</div> 
-	
-	</div>
-   <div id="profile-jot-perms-end"></div>
-	
-	<div id="jot-preview-content" style="display:none;"></div>
-
-	<div style="display: none;">
-		<div id="profile-jot-acl-wrapper" style="width:auto;height:auto;overflow:auto;">
-			$acl
-			<hr style="clear:both"/>
-			<div id="profile-jot-email-label">$emailcc</div><input type="text" name="emailcc" id="profile-jot-email" title="$emtitle" />
-			<div id="profile-jot-email-end"></div>
-			$jotnets
-		</div>
-	</div>
-
-
-
-
-</form>
-</div>
-		{{ if $content }}<script>initEditor();</script>{{ endif }}
diff --git a/view/theme/diabook/diabook-dark/js/README b/view/theme/diabook/diabook-dark/js/README
deleted file mode 100644
index c93b2118e..000000000
--- a/view/theme/diabook/diabook-dark/js/README
+++ /dev/null
@@ -1,22 +0,0 @@
-jQuery Resize Plugin Demo
-
-Version: v2.1.1
-Author: Adeel Ejaz (http://adeelejaz.com/)
-License: Dual licensed under MIT and GPL licenses.
-
-Introduction
-aeImageResize is a jQuery plugin to dynamically resize the images without distorting the proportions.
-
-Usage:
-.aeImageResize( height, width )
-
-height
-An integer representing the maximum height for the image.
-
-width
-An integer representing the maximum width for the image.
-
-Example
-$(function() {
-  $( ".resizeme" ).aeImageResize({ height: 250, width: 250 });
-});
\ No newline at end of file
diff --git a/view/theme/diabook/diabook-dark/js/jquery.ae.image.resize.js b/view/theme/diabook/diabook-dark/js/jquery.ae.image.resize.js
deleted file mode 100644
index bac09cd45..000000000
--- a/view/theme/diabook/diabook-dark/js/jquery.ae.image.resize.js
+++ /dev/null
@@ -1,69 +0,0 @@
-(function( $ ) {
-
-  $.fn.aeImageResize = function( params ) {
-
-    var aspectRatio = 0
-      // Nasty I know but it's done only once, so not too bad I guess
-      // Alternate suggestions welcome :)
-      ,	isIE6 = $.browser.msie && (6 == ~~ $.browser.version)
-      ;
-
-    // We cannot do much unless we have one of these
-    if ( !params.height && !params.width ) {
-      return this;
-    }
-
-    // Calculate aspect ratio now, if possible
-    if ( params.height && params.width ) {
-      aspectRatio = params.width / params.height;
-    }
-
-    // Attach handler to load
-    // Handler is executed just once per element
-    // Load event required for Webkit browsers
-    return this.one( "load", function() {
-
-      // Remove all attributes and CSS rules
-      this.removeAttribute( "height" );
-      this.removeAttribute( "width" );
-      this.style.height = this.style.width = "";
-
-      var imgHeight = this.height
-        , imgWidth = this.width
-        , imgAspectRatio = imgWidth / imgHeight
-        , bxHeight = params.height
-        , bxWidth = params.width
-        , bxAspectRatio = aspectRatio;
-				
-      // Work the magic!
-      // If one parameter is missing, we just force calculate it
-      if ( !bxAspectRatio ) {
-        if ( bxHeight ) {
-          bxAspectRatio = imgAspectRatio + 1;
-        } else {
-          bxAspectRatio = imgAspectRatio - 1;
-        }
-      }
-
-      // Only resize the images that need resizing
-      if ( (bxHeight && imgHeight > bxHeight) || (bxWidth && imgWidth > bxWidth) ) {
-
-        if ( imgAspectRatio > bxAspectRatio ) {
-          bxHeight = ~~ ( imgHeight / imgWidth * bxWidth );
-        } else {
-          bxWidth = ~~ ( imgWidth / imgHeight * bxHeight );
-        }
-
-        this.height = bxHeight;
-        this.width = bxWidth;
-      }
-    })
-    .each(function() {
-
-      // Trigger load event (for Gecko and MSIE)
-      if ( this.complete || isIE6 ) {
-        $( this ).trigger( "load" );
-      }
-    });
-  };
-})( jQuery );
\ No newline at end of file
diff --git a/view/theme/diabook/diabook-dark/js/jquery.ae.image.resize.min.js b/view/theme/diabook/diabook-dark/js/jquery.ae.image.resize.min.js
deleted file mode 100644
index 16c30b123..000000000
--- a/view/theme/diabook/diabook-dark/js/jquery.ae.image.resize.min.js
+++ /dev/null
@@ -1 +0,0 @@
-(function(d){d.fn.aeImageResize=function(a){var i=0,j=d.browser.msie&&6==~~d.browser.version;if(!a.height&&!a.width)return this;if(a.height&&a.width)i=a.width/a.height;return this.one("load",function(){this.removeAttribute("height");this.removeAttribute("width");this.style.height=this.style.width="";var e=this.height,f=this.width,g=f/e,b=a.height,c=a.width,h=i;h||(h=b?g+1:g-1);if(b&&e>b||c&&f>c){if(g>h)b=~~(e/f*c);else c=~~(f/e*b);this.height=b;this.width=c}}).each(function(){if(this.complete||j)d(this).trigger("load")})}})(jQuery);
\ No newline at end of file
diff --git a/view/theme/diabook/diabook-dark/js/jquery.autogrow.textarea.js b/view/theme/diabook/diabook-dark/js/jquery.autogrow.textarea.js
deleted file mode 100644
index 806e34f51..000000000
--- a/view/theme/diabook/diabook-dark/js/jquery.autogrow.textarea.js
+++ /dev/null
@@ -1,46 +0,0 @@
-(function($) {
-
-    /*
-     * Auto-growing textareas; technique ripped from Facebook
-     */
-    $.fn.autogrow = function(options) {
-        
-        this.filter('textarea').each(function() {
-            
-            var $this       = $(this),
-                minHeight   = $this.height(),
-                lineHeight  = $this.css('lineHeight');
-            
-            var shadow = $('<div></div>').css({
-                position:   'absolute',
-                top:        -10000,
-                left:       -10000,
-                width:      $(this).width(),
-                fontSize:   $this.css('fontSize'),
-                fontFamily: $this.css('fontFamily'),
-                lineHeight: $this.css('lineHeight'),
-                resize:     'none'
-            }).appendTo(document.body);
-            
-            var update = function() {
-                
-                var val = this.value.replace(/</g, '&lt;')
-                                    .replace(/>/g, '&gt;')
-                                    .replace(/&/g, '&amp;')
-                                    .replace(/\n/g, '<br/>');
-                
-                shadow.html(val);
-                $(this).css('height', Math.max(shadow.height() + 20, minHeight));
-            }
-            
-            $(this).change(update).keyup(update).keydown(update);
-            
-            update.apply(this);
-            
-        });
-        
-        return this;
-        
-    }
-    
-})(jQuery);
\ No newline at end of file
diff --git a/view/theme/diabook/diabook-dark/js/jquery.cookie.js b/view/theme/diabook/diabook-dark/js/jquery.cookie.js
deleted file mode 100644
index 6d5974a2c..000000000
--- a/view/theme/diabook/diabook-dark/js/jquery.cookie.js
+++ /dev/null
@@ -1,47 +0,0 @@
-/*!
- * jQuery Cookie Plugin
- * https://github.com/carhartl/jquery-cookie
- *
- * Copyright 2011, Klaus Hartl
- * Dual licensed under the MIT or GPL Version 2 licenses.
- * http://www.opensource.org/licenses/mit-license.php
- * http://www.opensource.org/licenses/GPL-2.0
- */
-(function($) {
-    $.cookie = function(key, value, options) {
-
-        // key and at least value given, set cookie...
-        if (arguments.length > 1 && (!/Object/.test(Object.prototype.toString.call(value)) || value === null || value === undefined)) {
-            options = $.extend({}, options);
-
-            if (value === null || value === undefined) {
-                options.expires = -1;
-            }
-
-            if (typeof options.expires === 'number') {
-                var days = options.expires, t = options.expires = new Date();
-                t.setDate(t.getDate() + days);
-            }
-
-            value = String(value);
-
-            return (document.cookie = [
-                encodeURIComponent(key), '=', options.raw ? value : encodeURIComponent(value),
-                options.expires ? '; expires=' + options.expires.toUTCString() : '', // use expires attribute, max-age is not supported by IE
-                options.path    ? '; path=' + options.path : '',
-                options.domain  ? '; domain=' + options.domain : '',
-                options.secure  ? '; secure' : ''
-            ].join(''));
-        }
-
-        // key and possibly options given, get cookie...
-        options = value || {};
-        var decode = options.raw ? function(s) { return s; } : decodeURIComponent;
-
-        var pairs = document.cookie.split('; ');
-        for (var i = 0, pair; pair = pairs[i] && pairs[i].split('='); i++) {
-            if (decode(pair[0]) === key) return decode(pair[1] || ''); // IE saves cookies with empty string as "c; ", e.g. without "=" as opposed to EOMB, thus pair[1] may be undefined
-        }
-        return null;
-    };
-})(jQuery);
diff --git a/view/theme/diabook/diabook-dark/login.tpl b/view/theme/diabook/diabook-dark/login.tpl
deleted file mode 100644
index efa7c2d6d..000000000
--- a/view/theme/diabook/diabook-dark/login.tpl
+++ /dev/null
@@ -1,33 +0,0 @@
-
-<form action="$dest_url" method="post" >
-	<input type="hidden" name="auth-params" value="login" />
-
-	<div id="login_standard">
-	{{ inc field_input.tpl with $field=$lname }}{{ endinc }}
-	{{ inc field_password.tpl with $field=$lpassword }}{{ endinc }}
-	</div>
-	
-	{{ if $openid }}
-			<div id="login_openid">
-			{{ inc field_openid.tpl with $field=$lopenid }}{{ endinc }}
-			</div>
-	{{ endif }}
-	
-	<div id="login-submit-wrapper" >
-		<input type="submit" name="submit" id="login-submit-button" value="$login" />
-	</div>
-	
-   <div id="login-extra-links">
-		{{ if $register }}<a href="register" title="$register.title" id="register-link">$register.desc</a>{{ endif }}
-        <a href="lostpass" title="$lostpass" id="lost-password-link" >$lostlink</a>
-	</div>	
-	
-	{{ for $hiddens as $k=>$v }}
-		<input type="hidden" name="$k" value="$v" />
-	{{ endfor }}
-	
-	
-</form>
-
-
-<script type="text/javascript"> $(document).ready(function() { $("#id_$lname.0").focus();} );</script>
diff --git a/view/theme/diabook/diabook-dark/mail_conv.tpl b/view/theme/diabook/diabook-dark/mail_conv.tpl
deleted file mode 100644
index 989f17878..000000000
--- a/view/theme/diabook/diabook-dark/mail_conv.tpl
+++ /dev/null
@@ -1,60 +0,0 @@
-<div class="wall-item-container $item.indent">
-	<div class="wall-item-item">
-		<div class="wall-item-info">
-			<div class="contact-photo-wrapper"
-				<a href="$mail.profile_url" target="redir" title="$mail.from_name" class="contact-photo-link" id="wall-item-photo-link-$mail.id">
-					<img src="$mail.from_photo" class="contact-photo$mail.sparkle" id="wall-item-photo-$mail.id" alt="$mail.from_name" />
-				</a>
-			</div>
-		</div>
-		<div class="wall-item-content">
-			$mail.body
-		</div>
-	</div>
-	<div class="wall-item-bottom">
-		<div class="wall-item-links">
-		</div>
-		<div class="wall-item-tags">
-		</div>
-	</div>
-	<div class="wall-item-bottom">
-		<div class="">
-		</div>
-		<div class="wall-item-actions">
-			<div class="wall-item-actions-author">
-				<a href="$mail.from_url" target="redir" class="wall-item-name-link"><span class="wall-item-name$mail.sparkle">$mail.from_name</span></a> <span class="wall-item-ago">$mail.date</span>
-			</div>
-			
-			<div class="wall-item-actions-social">
-			</div>
-			
-			<div class="wall-item-actions-tools">
-				<a href="message/drop/$mail.id" onclick="return confirmDelete();" class="icon delete s16" title="$mail.delete">$mail.delete</a>
-			</div>
-			
-		</div>
-	</div>
-	<div class="wall-item-bottom">
-	</div>
-</div>
-
-
-{#
-
-
-<div class="mail-conv-outside-wrapper">
-	<div class="mail-conv-sender" >
-		<a href="$mail.from_url" class="mail-conv-sender-url" ><img class="mframe mail-conv-sender-photo$mail.sparkle" src="$mail.from_photo" heigth="80" width="80" alt="$mail.from_name" /></a>
-	</div>
-	<div class="mail-conv-detail" >
-		<div class="mail-conv-sender-name" >$mail.from_name</div>
-		<div class="mail-conv-date">$mail.date</div>
-		<div class="mail-conv-subject">$mail.subject</div>
-		<div class="mail-conv-body">$mail.body</div>
-	<div class="mail-conv-delete-wrapper" id="mail-conv-delete-wrapper-$mail.id" ><a href="message/drop/$mail.id" class="icon drophide delete-icon mail-list-delete-icon" onclick="return confirmDelete();" title="$mail.delete" id="mail-conv-delete-icon-$mail.id" class="mail-conv-delete-icon" onmouseover="imgbright(this);" onmouseout="imgdull(this);" ></a></div><div class="mail-conv-delete-end"></div>
-	<div class="mail-conv-outside-wrapper-end"></div>
-</div>
-</div>
-<hr class="mail-conv-break" />
-
-#}
diff --git a/view/theme/diabook/diabook-dark/mail_display.tpl b/view/theme/diabook/diabook-dark/mail_display.tpl
deleted file mode 100644
index 8b82e95c6..000000000
--- a/view/theme/diabook/diabook-dark/mail_display.tpl
+++ /dev/null
@@ -1,12 +0,0 @@
-<div id="mail-display-subject">
-	<span class="{{if $thread_seen}}seen{{else}}unseen{{endif}}">$thread_subject</span>
-	<a href="message/dropconv/$thread_id" onclick="return confirmDelete();"  title="$delete" class="mail-delete icon s22 delete"></a>
-</div>
-
-{{ for $mails as $mail }}
-	<div id="tread-wrapper-$mail.id" class="tread-wrapper">
-		{{ inc mail_conv.tpl }}{{endinc}}
-	</div>
-{{ endfor }}
-
-{{ inc prv_message.tpl }}{{ endinc }}
diff --git a/view/theme/diabook/diabook-dark/mail_list.tpl b/view/theme/diabook/diabook-dark/mail_list.tpl
deleted file mode 100644
index 6bc6c84f6..000000000
--- a/view/theme/diabook/diabook-dark/mail_list.tpl
+++ /dev/null
@@ -1,8 +0,0 @@
-<div class="mail-list-wrapper">
-	<span class="mail-subject {{if $seen}}seen{{else}}unseen{{endif}}"><a href="message/$id" class="mail-link">$subject</a></span>
-	<span class="mail-from">$from_name</span>
-	<span class="mail-date">$date</span>
-	<span class="mail-count">$count</span>
-	
-	<a href="message/dropconv/$id" onclick="return confirmDelete();"  title="$delete" class="mail-delete icon s22 delete"></a>
-</div>
diff --git a/view/theme/diabook/diabook-dark/message_side.tpl b/view/theme/diabook/diabook-dark/message_side.tpl
deleted file mode 100644
index 9f1587096..000000000
--- a/view/theme/diabook/diabook-dark/message_side.tpl
+++ /dev/null
@@ -1,10 +0,0 @@
-<div id="message-sidebar" class="widget">
-	<div id="message-new" class="{{ if $new.sel }}selected{{ endif }}"><a href="$new.url">$new.label</a> </div>
-	
-	<ul class="message-ul">
-		{{ for $tabs as $t }}
-			<li class="tool {{ if $t.sel }}selected{{ endif }}"><a href="$t.url" class="message-link">$t.label</a></li>
-		{{ endfor }}
-	</ul>
-	
-</div>
diff --git a/view/theme/diabook/diabook-dark/nav.tpl b/view/theme/diabook/diabook-dark/nav.tpl
deleted file mode 100644
index 5f316bcdd..000000000
--- a/view/theme/diabook/diabook-dark/nav.tpl
+++ /dev/null
@@ -1,190 +0,0 @@
-<header>
-	<div id="site-location">$sitelocation</div>
-	<div id="banner">$banner</div>
-</header>
-<nav>
-			
-			
-	<ul>
-			
-			
-			{{ if $nav.network }}
-			<li id="nav-network-link" class="nav-menu-icon">
-				<a class="$nav.network.2" href="$nav.network.0" title="$nav.network.3" >
-				<span class="icon notifications">Benachrichtigungen</span>
-				<span id="net-update" class="nav-notify"></span></a>
-			</li>
-		    {{ endif }}
-	
-			{{ if $nav.contacts }}
-			<li class="nav-menu-icon" id="nav-contacts-linkmenu">
-				<a href="$nav.contacts.0" rel="#nav-contacts-menu" title="$nav.contacts.1">
-				<span class="icon contacts">$nav.contacts.1</span>
-				<span id="intro-update" class="nav-notify"></span></a>
-				<ul id="nav-contacts-menu" class="menu-popup">
-					<li id="nav-contacts-see-intro"><a href="$nav.notifications.0">$nav.introductions.1</a><span id="intro-update-li" class="nav-notify"></span></li>
-					<li id="nav-contacts-all"><a href="contacts">$nav.contacts.1</a></li> 
-				</ul>
-			</li>	
-
-			{{ endif }}
-			
-			{{ if $nav.messages }}
-			<li  id="nav-messages-linkmenu" class="nav-menu-icon">
-			  <a href="$nav.messages.0" rel="#nav-messages-menu" title="$nav.messages.1">
-			  <span class="icon messages">$nav.messages.1</span>
-				<span id="mail-update" class="nav-notify"></span></a>
-				<ul id="nav-messages-menu" class="menu-popup">
-					<li id="nav-messages-see-all"><a href="$nav.messages.0">$nav.messages.1</a></li>
-					<li id="nav-messages-see-all"><a href="$nav.messages.new.0">$nav.messages.new.1</a></li>
-				</ul>
-			</li>		
-			{{ endif }}
-		
-      {{ if $nav.notifications }}
-			<li  id="nav-notifications-linkmenu" class="nav-menu-icon">
-			<a href="$nav.notifications.0" rel="#nav-notifications-menu" title="$nav.notifications.1">
-			<span class="icon notify">$nav.notifications.1</span>
-				<span id="notify-update" class="nav-notify"></span></a>
-				<ul id="nav-notifications-menu" class="menu-popup">
-					<li id="nav-notifications-mark-all"><a href="#" onclick="notifyMarkAll(); return false;">$nav.notifications.mark.1</a></li>
-					<li id="nav-notifications-see-all"><a href="$nav.notifications.all.0">$nav.notifications.all.1</a></li>
-					<li class="empty">$emptynotifications</li>
-				</ul>
-			</li>		
-		{{ endif }}	
-			
-		{{ if $nav.search}}
-		<li id="search-box">
-			<form method="get" action="$nav.search.0">
-				<input id="search-text" class="nav-menu-search" type="text" value="" name="search">
-			</form>
-		</li>		
-		{{ endif }}	
-		
-		<li  style="width: 1%; height: 1px;float: right;"></li>	
-		
-		<li id="nav-site-linkmenu" class="nav-menu-icon"><a href="#" rel="#nav-site-menu"><span class="icon s22 gear">Site</span></a>
-			<ul id="nav-site-menu" class="menu-popup">
-				{{ if $nav.manage }}<li><a class="$nav.manage.2" href="$nav.manage.0" title="$nav.manage.3">$nav.manage.1</a></li>{{ endif }}				
-
-				{{ if $nav.settings }} <li><a class="$nav.search.2" onClick="restore_boxes()" title="Restore right-hand column" style="cursor: pointer;">Restore right-hand column</a></li>{{ endif }}
-										
-				{{ if $nav.help }} <li><a class="$nav.help.2" target="friendika-help" href="$nav.help.0" title="$nav.help.3" >$nav.help.1</a></li>{{ endif }}									
-										
-										 <li><a class="$nav.search.2" href="friendica" title="Site Info / Impressum" >Info/Impressum</a></li>
-										
-				{{ if $nav.settings }}<li><a class="menu-sep $nav.settings.2" href="$nav.settings.0" title="$nav.settings.3">$nav.settings.1</a></li>{{ endif }}
-				{{ if $nav.admin }}<li><a class="$nav.admin.2" href="$nav.admin.0" title="$nav.admin.3" >$nav.admin.1</a></li>{{ endif }}
-
-				{{ if $nav.logout }}<li><a class="menu-sep $nav.logout.2" href="$nav.logout.0" title="$nav.logout.3" >$nav.logout.1</a></li>{{ endif }}
-
-				
-			</ul>		
-		</li>
-		
-		
-		{{ if $nav.directory }}
-		<li id="nav-directory-link" class="nav-menu $sel.directory">
-			<a class="$nav.directory.2" href="$nav.directory.0" title="$nav.directory.3" >$nav.directory.1</a>
-		</li>
-		{{ endif }}
-		
-		{{ if $nav.apps }}
-			<li id="nav-apps-link" class="nav-menu $sel.apps">
-				<a class=" $nav.apps.2" href="#" rel="#nav-apps-menu" title="$nav.apps.3" >$nav.apps.1</a>
-				<ul id="nav-apps-menu" class="menu-popup">
-					{{ for $apps as $ap }}
-					<li>$ap</li>
-					{{ endfor }}
-				</ul>
-			</li>	
-		{{ endif }}		
-		
-      {{ if $nav.home }}
-			<li id="nav-home-link" class="nav-menu $sel.home">
-				<a class="$nav.home.2" href="$nav.home.0" title="$nav.home.3" >$nav.home.1
-				<span id="home-update" class="nav-notify"></span></a>
-			</li>
-		{{ endif }}		
-		
-		{{ if $userinfo }}
-			<li id="nav-user-linkmenu" class="nav-menu-icon"><a href="#" rel="#nav-user-menu" title="$sitelocation"><img src="$userinfo.icon" alt="$userinfo.name"></a>
-				<ul id="nav-user-menu" class="menu-popup">
-					{{ for $nav.usermenu as $usermenu }}
-						<li><a class="$usermenu.2" href="$usermenu.0" title="$usermenu.3">$usermenu.1</a></li>
-					{{ endfor }}
-					
-					{{ if $nav.profiles }}<li><a class="menu-sep $nav.profiles.2" href="$nav.profiles.0" title="$nav.profiles.3" >$nav.profiles.3</a></li>{{ endif }}
-					{{ if $nav.notifications }}<li><a class="$nav.notifications.2" href="$nav.notifications.0" title="$nav.notifications.3" >$nav.notifications.1</a></li>{{ endif }}
-					{{ if $nav.messages }}<li><a class="$nav.messages.2" href="$nav.messages.0" title="$nav.messages.3" >$nav.messages.1</a></li>{{ endif }}
-					{{ if $nav.contacts }}<li><a class="$nav.contacts.2" href="$nav.contacts.0" title="$nav.contacts.3" >$nav.contacts.1</a></li>{{ endif }}	
-				</ul>
-			</li>
-		{{ endif }}
-		
-					{{ if $nav.login }}
-					<li id="nav-home-link" class="nav-menu $sel.home">
-						<a class="$nav.login.2" href="$nav.login.0" title="$nav.login.3" >$nav.login.1</a>
-					<li>
-					{{ endif }}
-		
-		
-		
-	</ul>	
-
-
-	
-</nav>
-
-
-<div style="position: fixed; bottom: 5px; right: 10px;"><a href="javascript:scroll(0,0); "><img src="view/theme/diabook/icons/scroll_top.png" title="scroll to top"></a></div>
-<div style="position: fixed; bottom: 3px; left: 25px;">$langselector</div>
-<div style="position: fixed; bottom: 23px; left: 5px;"><a href="http://pad.toktan.org/p/diabook" target="blank" ><img src="view/theme/diabook/icons/bluebug.png" title="report bugs for the theme diabook"/></a></div>
-
-
-
-
-<ul id="nav-notifications-template" style="display:none;" rel="template">
-	<li class="{4}"><a href="{0}"><img src="{1}">{2} <span class="notif-when">{3}</span></a></li>
-</ul>
-
-
-
-{#
-
-{{ if $nav.logout }}<a id="nav-logout-link" class="nav-link $nav.logout.2" href="$nav.logout.0" title="$nav.logout.3" >$nav.logout.1</a> {{ endif }}
-{{ if $nav.login }}<a id="nav-login-link" class="nav-login-link $nav.login.2" href="$nav.login.0" title="$nav.login.3" >$nav.login.1</a> {{ endif }}
-
-<span id="nav-link-wrapper" >
-
-{{ if $nav.register }}<a id="nav-register-link" class="nav-commlink $nav.register.2" href="$nav.register.0" title="$nav.register.3" >$nav.register.1</a>{{ endif }}
-	
-<a id="nav-help-link" class="nav-link $nav.help.2" target="friendika-help" href="$nav.help.0" title="$nav.help.3" >$nav.help.1</a>
-	
-{{ if $nav.apps }}<a id="nav-apps-link" class="nav-link $nav.apps.2" href="$nav.apps.0" title="$nav.apps.3" >$nav.apps.1</a>{{ endif }}
-
-<a id="nav-search-link" class="nav-link $nav.search.2" href="$nav.search.0" title="$nav.search.3" >$nav.search.1</a>
-<a id="nav-directory-link" class="nav-link $nav.directory.2" href="$nav.directory.0" title="$nav.directory.3" >$nav.directory.1</a>
-
-{{ if $nav.admin }}<a id="nav-admin-link" class="nav-link $nav.admin.2" href="$nav.admin.0" title="$nav.admin.3" >$nav.admin.1</a>{{ endif }}
-
-{{ if $nav.notifications }}
-<a id="nav-notify-link" class="nav-commlink $nav.notifications.2" href="$nav.notifications.0" title="$nav.notifications.3" >$nav.notifications.1</a>
-<span id="notify-update" class="nav-ajax-left"></span>
-{{ endif }}
-{{ if $nav.messages }}
-<a id="nav-messages-link" class="nav-commlink $nav.messages.2" href="$nav.messages.0" title="$nav.messages.3" >$nav.messages.1</a>
-<span id="mail-update" class="nav-ajax-left"></span>
-{{ endif }}
-
-{{ if $nav.manage }}<a id="nav-manage-link" class="nav-commlink $nav.manage.2" href="$nav.manage.0" title="$nav.manage.3">$nav.manage.1</a>{{ endif }}
-
-{{ if $nav.settings }}<a id="nav-settings-link" class="nav-link $nav.settings.2" href="$nav.settings.0" title="$nav.settings.3">$nav.settings.1</a>{{ endif }}
-{{ if $nav.profiles }}<a id="nav-profiles-link" class="nav-link $nav.profiles.2" href="$nav.profiles.0" title="$nav.profiles.3" >$nav.profiles.1</a>{{ endif }}
-
-
-</span>
-<span id="nav-end"></span>
-<span id="banner">$banner</span>
-#}
diff --git a/view/theme/diabook/diabook-dark/nets.tpl b/view/theme/diabook/diabook-dark/nets.tpl
deleted file mode 100644
index be25ddee1..000000000
--- a/view/theme/diabook/diabook-dark/nets.tpl
+++ /dev/null
@@ -1,15 +0,0 @@
-<div id="profile_side">
-	<h3 style="margin-left: 2px;">$title</h3>
-	<div id="nets-desc">$desc</div>
-   
-	<ul class="menu-profile-side">
-	<li class="menu-profile-list">
-	<span class="menu-profile-icon {{ if $sel_all }}group_selected{{else}}group_unselected{{ endif }}"></span>	
-	<a style="text-decoration: none;" href="$base" class="menu-profile-list-item">$all</a></li>
-	{{ for $nets as $net }}
-	<li class="menu-profile-list">
-	<span class="menu-profile-icon {{ if $net.selected }}group_selected{{else}}group_unselected{{ endif }}"></span>	
-	<a href="$base?nets=$net.ref" class="menu-profile-list-item">$net.name</a></li>
-	{{ endfor }}
-	</ul>
-</div>
diff --git a/view/theme/diabook/diabook-dark/oembed_video.tpl b/view/theme/diabook/diabook-dark/oembed_video.tpl
deleted file mode 100644
index d6d29f724..000000000
--- a/view/theme/diabook/diabook-dark/oembed_video.tpl
+++ /dev/null
@@ -1,4 +0,0 @@
-<a class="embed_yt" href='$embedurl' onclick='this.innerHTML=Base64.decode("$escapedhtml"); yt_iframe(); return false;' style='float:left; margin: 1em; position: relative;'>
-	<img width='$tw' height='$th' src='$turl' >
-	<div style='position: absolute; top: 0px; left: 0px; width: $twpx; height: $thpx; background: url(images/icons/48/play.png) no-repeat center center;'></div>
-</a>
diff --git a/view/theme/diabook/diabook-dark/photo_item.tpl b/view/theme/diabook/diabook-dark/photo_item.tpl
deleted file mode 100644
index 5d65a89b7..000000000
--- a/view/theme/diabook/diabook-dark/photo_item.tpl
+++ /dev/null
@@ -1,65 +0,0 @@
-{{ if $indent }}{{ else }}
-<div class="wall-item-decor">
-	<img id="like-rotator-$id" class="like-rotator" src="images/rotator.gif" alt="$wait" title="$wait" style="display: none;" />
-</div>
-{{ endif }}
-
-<div class="wall-item-photo-container $indent">
-	<div class="wall-item-item">
-		<div class="wall-item-info">
-			<div class="contact-photo-wrapper" >
-				<a href="$profile_url" target="redir" title="" class="contact-photo-link" id="wall-item-photo-link-$id">
-					<img src="$thumb" class="contact-photo$sparkle" id="wall-item-photo-$id" alt="$name" />
-				</a>
-				<a href="#" rel="#wall-item-photo-menu-$id" class="contact-photo-menu-button icon s16 menu" id="wall-item-photo-menu-button-$id">menu</a>
-				<ul class="contact-menu menu-popup" id="wall-item-photo-menu-$id">
-				$photo_menu
-				</ul>
-				
-			</div>
-		</div>
-			<div class="wall-item-actions-author">
-				<a href="$profile_url" target="redir" title="$name" class="wall-item-name-link"><span class="wall-item-name$sparkle">$name</span></a> 
-			<span class="wall-item-ago">-
-			{{ if $plink }}<a class="link" title="$plink.title" href="$plink.href" style="color: #999">$ago</a>{{ else }} $ago {{ endif }}
-			{{ if $lock }} - <span class="fakelink" style="color: #999" onclick="lockview(event,$id);">$lock</span> {{ endif }}
-			</span>
-			</div>
-		<div class="wall-item-content">
-			{{ if $title }}<h2><a href="$plink.href">$title</a></h2>{{ endif }}
-			$body
-		</div>
-	</div>
-	<div class="wall-item-bottom">
-		<div class="wall-item-links">
-		</div>
-		<div class="wall-item-tags">
-			{{ for $tags as $tag }}
-				<span class='tag'>$tag</span>
-			{{ endfor }}
-		</div>
-	</div>
-	
-	<div class="wall-item-bottom" style="display: table-row;">
-		<div class="wall-item-actions">
-	   </div>
-		<div class="wall-item-actions">
-			
-			<div class="wall-item-actions-tools">
-
-				{{ if $drop.dropping }}
-					<input type="checkbox" title="$drop.select" name="itemselected[]" class="item-select" value="$id" />
-					<a href="item/drop/$id" onclick="return confirmDelete();" class="icon drop" title="$drop.delete">$drop.delete</a>
-				{{ endif }}
-				{{ if $edpost }}
-					<a class="icon pencil" href="$edpost.0" title="$edpost.1"></a>
-				{{ endif }}
-			</div>
-
-		</div>
-	</div>
-	<div class="wall-item-bottom">
-			
-	</div>
-</div>
-
diff --git a/view/theme/diabook/diabook-dark/photo_view.tpl b/view/theme/diabook/diabook-dark/photo_view.tpl
deleted file mode 100644
index 071972e0c..000000000
--- a/view/theme/diabook/diabook-dark/photo_view.tpl
+++ /dev/null
@@ -1,35 +0,0 @@
-<div id="live-display"></div>
-<h3><a href="$album.0">$album.1</a></h3>
-
-<div id="photo-edit-link-wrap">
-{{ if $tools }}
-<a id="photo-edit-link" href="$tools.edit.0">$tools.edit.1</a>
--
-<a id="photo-toprofile-link" href="$tools.profile.0">$tools.profile.1</a>
-{{ endif }}
-{{ if $lock }} - <img src="images/lock_icon.gif" class="lockview" alt="$lock" onclick="lockview(event,'photo$id');" /> {{ endif }}
-</div>
-
-<div id="photo-photo">
-	{{ if $prevlink }}<div id="photo-prev-link"><a href="$prevlink.0">$prevlink.1</a></div>{{ endif }}
-	<a href="$photo.href" class="lightbox" title="$photo.title"><img src="$photo.src" /></a>
-	{{ if $nextlink }}<div id="photo-next-link"><a href="$nextlink.0">$nextlink.1</a></div>{{ endif }}
-</div>
-
-<div id="photo-photo-end"></div>
-<div id="photo-caption" >$desc</div>
-{{ if $tags }}
-<div id="in-this-photo-text">$tags.0</div>
-<div id="in-this-photo">$tags.1</div>
-{{ endif }}
-{{ if $tags.2 }}<div id="tag-remove"><a href="$tags.2">$tags.3</a></div>{{ endif }}
-
-{{ if $edit }}$edit{{ endif }}
-
-<div style="margin-top:20px">
-</div>
-<div id="wall-photo-container">
-$comments
-</div>
-
-$paginate
diff --git a/view/theme/diabook/diabook-dark/profile_side.tpl b/view/theme/diabook/diabook-dark/profile_side.tpl
deleted file mode 100644
index 01e80f238..000000000
--- a/view/theme/diabook/diabook-dark/profile_side.tpl
+++ /dev/null
@@ -1,21 +0,0 @@
-<div id="profile_side">
-	<div id="ps-usernameicon">
-		<a href="$ps.usermenu.status.0" title="$userinfo.name">
-			<img src="$userinfo.icon" id="ps-usericon" alt="$userinfo.name">
-		</a>
-		<a href="$ps.usermenu.status.0" id="ps-username" title="$userinfo.name">$userinfo.name</a>
-	</div>
-	
-<ul id="profile-side-menu" class="menu-profile-side">
-	<li id="profile-side-status" class="menu-profile-list"><a class="menu-profile-list-item" href="$ps.usermenu.status.0">$ps.usermenu.status.1<span class="menu-profile-icon home"></span></a></li>
-	<li id="profile-side-photos" class="menu-profile-list photos"><a class="menu-profile-list-item" href="$ps.usermenu.photos.0">$ps.usermenu.photos.1<span class="menu-profile-icon photos"></span></a></li>
-	<li id="profile-side-photos" class="menu-profile-list pscontacts"><a class="menu-profile-list-item" href="$ps.usermenu.contacts.0">$ps.usermenu.contacts.1<span class="menu-profile-icon pscontacts"></span></a></li>		
-	<li id="profile-side-events" class="menu-profile-list events"><a class="menu-profile-list-item" href="$ps.usermenu.events.0">$ps.usermenu.events.1<span class="menu-profile-icon events"></span></a></li>
-	<li id="profile-side-notes" class="menu-profile-list notes"><a class="menu-profile-list-item" href="$ps.usermenu.notes.0">$ps.usermenu.notes.1<span class="menu-profile-icon notes"></span></a></li>
-	<li id="profile-side-foren" class="menu-profile-list foren"><a class="menu-profile-list-item" href="$ps.usermenu.pgroups.0" target="blanc">$ps.usermenu.pgroups.1<span class="menu-profile-icon foren"></span></a></li>
-	<li id="profile-side-foren" class="menu-profile-list com_side"><a class="menu-profile-list-item" href="$ps.usermenu.community.0">$ps.usermenu.community.1<span class="menu-profile-icon com_side"></span></a></li>
-</ul>
-
-</div>
-
-				
diff --git a/view/theme/diabook/diabook-dark/profile_vcard.tpl b/view/theme/diabook/diabook-dark/profile_vcard.tpl
deleted file mode 100644
index 6fcffcc9b..000000000
--- a/view/theme/diabook/diabook-dark/profile_vcard.tpl
+++ /dev/null
@@ -1,64 +0,0 @@
-<div class="vcard">
-
-	<div class="tool">
-		<div class="fn label">$profile.name</div>
-		{{ if $profile.edit }}
-			<div class="action">
-			<a class="icon s16 edit ttright" href="#" rel="#profiles-menu" title="$profile.edit.3"><span>$profile.edit.1</span></a>
-			<ul id="profiles-menu" class="menu-popup">
-				{{ for $profile.menu.entries as $e }}
-				<li>
-					<a href="profiles/$e.id"><img src='$e.photo'>$e.profile_name</a>
-				</li>
-				{{ endfor }}
-				<li><a href="profile_photo" >$profile.menu.chg_photo</a></li>
-				<li><a href="profiles/new" id="profile-listing-new-link">$profile.menu.cr_new</a></li>
-				<li><a href="profiles" >$profile.edit.3</a></li>
-								
-			</ul>
-			</div>
-		{{ endif }}
-	</div>
-				
-	
-
-	<div id="profile-photo-wrapper"><img class="photo"  src="$profile.photo?rev=$profile.picdate" alt="$profile.name" /></div>
-	{{ if $pdesc }}<div class="title">$profile.pdesc</div>{{ endif }}
-
-
-	{{ if $location }}
-		<dl class="location"><dt class="location-label">$location</dt><br> 
-		<dd class="adr">
-			{{ if $profile.address }}<div class="street-address">$profile.address</div>{{ endif }}
-			<span class="city-state-zip">
-				<span class="locality">$profile.locality</span>{{ if $profile.locality }}, {{ endif }}
-				<span class="region">$profile.region</span>
-				<span class="postal-code">$profile.postal-code</span>
-			</span>
-			{{ if $profile.country-name }}<span class="country-name">$profile.country-name</span>{{ endif }}
-		</dd>
-		</dl>
-	{{ endif }}
-
-	{{ if $gender }}<dl class="mf"><dt class="gender-label">$gender</dt> <dd class="x-gender">$profile.gender</dd></dl>{{ endif }}
-	
-	{{ if $profile.pubkey }}<div class="key" style="display:none;">$profile.pubkey</div>{{ endif }}
-
-	{{ if $marital }}<dl class="marital"><dt class="marital-label"><span class="heart">&hearts;</span>$marital</dt><dd class="marital-text">$profile.marital</dd></dl>{{ endif }}
-
-	{{ if $homepage }}<dl class="homepage"><dt class="homepage-label">$homepage</dt><dd class="homepage-url"><a href="$profile.homepage" target="external-link">$profile.homepage</a></dd></dl>{{ endif }}
-
-	{{ inc diaspora_vcard.tpl }}{{ endinc }}
-	
-	<div id="profile-extra-links">
-		<ul>
-			{{ if $connect }}
-				<li><a id="dfrn-request-link" href="dfrn_request/$profile.nickname">$connect</a></li>
-			{{ endif }}
-		</ul>
-	</div>
-</div>
-
-$contact_block
-
-
diff --git a/view/theme/diabook/diabook-dark/right_aside.tpl b/view/theme/diabook/diabook-dark/right_aside.tpl
deleted file mode 100644
index a65677696..000000000
--- a/view/theme/diabook/diabook-dark/right_aside.tpl
+++ /dev/null
@@ -1,20 +0,0 @@
-<div id="profile_side">
-	<div id="ps-usernameicon">
-		<a href="$ps.usermenu.status.0" title="$userinfo.name">
-			<img src="$userinfo.icon" id="ps-usericon" alt="$userinfo.name">
-		</a>
-		<a href="$ps.usermenu.status.0" id="ps-username" title="$userinfo.name">$userinfo.name</a>
-	</div>
-	
-<ul id="profile-side-menu" class="menu-profile-side">
-	<li id="profile-side-status" class="menu-profile-list home"><a class="menu-profile-list-item" href="$ps.usermenu.status.0">$ps.usermenu.status.1</a></li>
-	<li id="profile-side-photos" class="menu-profile-list photos"><a class="menu-profile-list-item" href="$ps.usermenu.photos.0">$ps.usermenu.photos.1</a></li>
-	<li id="profile-side-events" class="menu-profile-list events"><a class="menu-profile-list-item" href="$ps.usermenu.events.0">$ps.usermenu.events.1</a></li>
-	<li id="profile-side-notes" class="menu-profile-list notes"><a class="menu-profile-list-item" href="$ps.usermenu.notes.0">$ps.usermenu.notes.1</a></li>
-	<li id="profile-side-foren" class="menu-profile-list foren"><a class="menu-profile-list-item" href="http://dir.friendika.com/directory/forum" target="blanc">Public Groups</a></li>
-	<li id="profile-side-foren" class="menu-profile-list com_side"><a class="menu-profile-list-item" href="$ps.usermenu.community.0">$ps.usermenu.community.1</a></li>
-</ul>
-
-</div>
-
-				
\ No newline at end of file
diff --git a/view/theme/diabook/diabook-dark/search_item.tpl b/view/theme/diabook/diabook-dark/search_item.tpl
deleted file mode 100644
index 123834064..000000000
--- a/view/theme/diabook/diabook-dark/search_item.tpl
+++ /dev/null
@@ -1,100 +0,0 @@
-{{ if $item.indent }}{{ else }}
-<div class="wall-item-decor">
-	<img id="like-rotator-$item.id" class="like-rotator" src="images/rotator.gif" alt="$item.wait" title="$item.wait" style="display: none;" />
-</div>
-{{ endif }}
-<div class="wall-item-container $item.indent">
-	<div class="wall-item-item">
-		<div class="wall-item-info">
-			<div class="contact-photo-wrapper"
-				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" target="redir" title="$item.linktitle" class="contact-photo-link" id="wall-item-photo-link-$item.id">
-					<img src="$item.thumb" class="contact-photo$item.sparkle" id="wall-item-photo-$item.id" alt="$item.name" />
-				</a>
-				<a href="#" rel="#wall-item-photo-menu-$item.id" class="contact-photo-menu-button icon s16 menu" id="wall-item-photo-menu-button-$item.id">menu</a>
-				<ul class="contact-menu menu-popup" id="wall-item-photo-menu-$item.id">
-				$item.item_photo_menu
-				</ul>
-				
-			</div>
-		</div>
-			<div class="wall-item-actions-author">
-				<a href="$item.profile_url" target="redir" title="$item.linktitle" class="wall-item-name-link"><span class="wall-item-name$item.sparkle">$item.name</span></a> 
-			<span class="wall-item-ago">-
-			{{ if $item.plink }}<a class="link" title="$item.plink.title" href="$item.plink.href" style="color: #999">$item.ago</a>{{ else }} $item.ago {{ endif }}
-			{{ if $item.lock }} - <span class="fakelink" style="color: #999" onclick="lockview(event,$item.id);">$item.lock</span> {{ endif }}
-			</span>
-			</div>
-		<div class="wall-item-content">
-			{{ if $item.title }}<h2><a href="$item.plink.href">$item.title</a></h2>{{ endif }}
-			$item.body
-		</div>
-	</div>
-	<div class="wall-item-bottom">
-		<div class="wall-item-links">
-		</div>
-		<div class="wall-item-tags">
-			{{ for $item.tags as $tag }}
-				<span class='tag'>$tag</span>
-			{{ endfor }}
-		</div>
-	</div>
-	<div class="wall-item-bottom">
-		<div class="">
-
-		</div>
-		<div class="wall-item-actions">
-
-			<div class="wall-item-actions-social">
-			
-			
-			{{ if $item.vote }}
-				<a href="#" id="like-$item.id" class="icon like" title="$item.vote.like.0" onclick="dolike($item.id,'like'); return false">$item.vote.like.1</a>
-				<a href="#" id="dislike-$item.id" class="icon dislike" title="$item.vote.dislike.0" onclick="dolike($item.id,'dislike'); return false"></a>
-			{{ endif }}
-						
-			{{ if $item.vote.share }}
-				<a href="#" id="share-$item.id" class="icon recycle" title="$item.vote.share.0" onclick="jotShare($item.id); return false"></a>
-			{{ endif }}	
-
-
-			{{ if $item.star }}
-				<a href="#" id="starred-$item.id" onclick="dostar($item.id); return false;" class="star-item icon $item.isstarred" title="$item.star.toggle">
-				<img src="images/star_dummy.png" class="icon star" alt="$item.star.do" /> </a>
-				<a href="#" id="tagger-$item.id" onclick="itemTag($item.id); return false;" class="tag-item icon tagged" title="$item.star.tagger"></a>					  
-			{{ endif }}	
-			
-			{{ if $item.filer }}
-			<a href="#" id="filer-$item.id" onclick="itemFiler($item.id); return false;" class="filer-item icon file-as" title="$item.star.filer"></a>
-			{{ endif }}				
-			
-			{{ if $item.plink }}<a class="icon link" title="$item.plink.title" href="$item.plink.href">$item.plink.title</a>{{ endif }}
-			
-					
-					
-			</div>
-			
-			<div class="wall-item-actions-tools">
-
-				{{ if $item.drop.dropping }}
-					<input type="checkbox" title="$item.drop.select" name="itemselected[]" class="item-select" value="$item.id" />
-					<a href="item/drop/$item.id" onclick="return confirmDelete();" class="icon drop" title="$item.drop.delete">$item.drop.delete</a>
-				{{ endif }}
-				{{ if $item.edpost }}
-					<a class="icon pencil" href="$item.edpost.0" title="$item.edpost.1"></a>
-				{{ endif }}
-			</div>
-			<div class="wall-item-location">$item.location&nbsp;</div>
-		</div>
-	</div>
-	<div class="wall-item-bottom">
-		<div class="wall-item-links"></div>
-		<div class="wall-item-like" id="wall-item-like-$item.id">$item.like</div>
-		<div class="wall-item-dislike" id="wall-item-dislike-$item.id">$item.dislike</div>	
-	</div>
-</div>
-
-<div class="wall-item-comment-wrapper" >
-	$item.comment
-</div>
diff --git a/view/theme/diabook/diabook-dark/style-network-wide.css b/view/theme/diabook/diabook-dark/style-network-wide.css
index 87efd8aa7..23118a2cd 100644
--- a/view/theme/diabook/diabook-dark/style-network-wide.css
+++ b/view/theme/diabook/diabook-dark/style-network-wide.css
@@ -121,7 +121,7 @@
 			  display: block; width: 28px; height: 28px; background-repeat: no-repeat;
 			  }	
 .video 	{ background-image: url("../diabook-dark/icons/video.png"); 
-			  display: block; width: 100%; height: 28px; background-repeat: no-repeat;
+			  display: block; width: 100%; height: 140px; background-repeat: no-repeat;
 			  }
 .audio2 	{ background-image: url("../diabook-dark/icons/audio.png"); 
 			  display: block; width: 28px; height: 28px; background-repeat: no-repeat;
@@ -1372,7 +1372,7 @@ transition: all 0.2s ease-in-out;
   max-width: 690px;
   word-wrap: break-word;
 
-  margin-bottom: 14px;
+
 }
 /*marker*/
 .wall-item-container .wall-item-content img {
diff --git a/view/theme/diabook/diabook-dark/style-network.css b/view/theme/diabook/diabook-dark/style-network.css
index 4111bdb5b..6ff44748f 100644
--- a/view/theme/diabook/diabook-dark/style-network.css
+++ b/view/theme/diabook/diabook-dark/style-network.css
@@ -121,7 +121,7 @@
 			  display: block; width: 28px; height: 28px; background-repeat: no-repeat;
 			  }	
 .video 	{ background-image: url("../diabook-dark/icons/video.png"); 
-			  display: block; width: 100%; height: 28px; background-repeat: no-repeat;
+			  display: block; width: 100%; height: 140px; background-repeat: no-repeat;
 			  }
 .audio2 	{ background-image: url("../diabook-dark/icons/audio.png"); 
 			  display: block; width: 28px; height: 28px; background-repeat: no-repeat;
@@ -387,7 +387,7 @@
   margin-bottom: 1px;
   width: 484px;
   border-bottom: 1px solid #BDCDD4;
-  background-color: #fff;
+  background-color: #2e2e2f;
   padding: 8px;
 }
 
@@ -439,7 +439,7 @@ a:hover {
   clear: both;
 }
 .fakelink {
-  color: #1872A2;
+  color: #88a9d2;
   /* color: #3e3e8c; */
   text-decoration: none;
   cursor: pointer;
@@ -493,7 +493,7 @@ code {
   float: right;
 }
 .tool a {
-  color: ##3F8FBA;
+  color: #88a9d2;
 }
 .tool a:hover {
   text-decoration: none;
@@ -540,7 +540,7 @@ header #banner a:active,
 header #banner a:visited,
 header #banner a:link,
 header #banner a:hover {
-  color: #2e2f2e;
+  color: #eec;
   text-decoration: none;
   outline: none;
   vertical-align: middle;
@@ -776,7 +776,7 @@ nav #nav-apps-link.selected {
 }
 
 .notify-seen {
-	background: none repeat scroll 0 0 #DDDDDD;
+	background: none repeat scroll 0 0 #666;
 	}
 
 ul.menu-popup {
@@ -966,7 +966,7 @@ aside {
   vertical-align: top;
   width: 160px;
   padding: 0px 10px 0px 10px;
-  border-right: 1px solid #D2D2D2;
+  border-right: 1px solid #eec;
   float: left;
   /* background: #F1F1F1; */
 }
@@ -1241,7 +1241,7 @@ right_aside {
   
   /* background: #F1F1F1; */
 }
-right_aside a{color: #1872A2;}
+right_aside a{color: #88a9d2;}
 right_aside h3 {border-bottom: 1px solid #D2D2D2; padding-top: 5px; padding-bottom: 0px; padding-left: 9px; margin-bottom: 0px; 
 margin-top:30px;}
 right_aside .directory-item {	width: 50px; height: 50px; vertical-align: center; text-align: center; }
@@ -1283,7 +1283,7 @@ transition: all 0.2s ease-in-out;
   padding-top: 10px;
 }
 .tread-wrapper a{
-  color: #1872A2;
+  color: #88a9d2;
 }
 
 .wall-item-decor {
@@ -1351,7 +1351,7 @@ transition: all 0.2s ease-in-out;
   max-width: 420px;
   word-wrap: break-word;
 
-  margin-bottom: 14px;
+
 }
 
 .wall-item-container .wall-item-content img {
diff --git a/view/theme/diabook/diabook-dark/style-profile-wide.css b/view/theme/diabook/diabook-dark/style-profile-wide.css
index 04d2a73ef..ad6b7ca21 100644
--- a/view/theme/diabook/diabook-dark/style-profile-wide.css
+++ b/view/theme/diabook/diabook-dark/style-profile-wide.css
@@ -121,7 +121,7 @@
 			  display: block; width: 28px; height: 28px; background-repeat: no-repeat;
 			  }	
 .video 	{ background-image: url("../diabook-blue/icons/video.png"); 
-			  display: block; width: 100%; height: 28px; background-repeat: no-repeat;
+			  display: block; width: 100%; height: 140px; background-repeat: no-repeat;
 			  }
 .audio2 	{ background-image: url("../diabook-blue/icons/audio.png"); 
 			  display: block; width: 28px; height: 28px; background-repeat: no-repeat;
@@ -1337,7 +1337,7 @@ transition: all 0.2s ease-in-out;
   max-width: 690px;
   word-wrap: break-word;
 
-  margin-bottom: 14px;
+
 }
 /*marker*/
 .wall-item-container .wall-item-content img {
diff --git a/view/theme/diabook/diabook-dark/style-profile.css b/view/theme/diabook/diabook-dark/style-profile.css
index d4c99ac51..b052b77ff 100644
--- a/view/theme/diabook/diabook-dark/style-profile.css
+++ b/view/theme/diabook/diabook-dark/style-profile.css
@@ -121,7 +121,7 @@
 			  display: block; width: 28px; height: 28px; background-repeat: no-repeat;
 			  }	
 .video 	{ background-image: url("../diabook-dark/icons/video.png"); 
-			  display: block; width: 100%; height: 28px; background-repeat: no-repeat;
+			  display: block; width: 100%; height: 140px; background-repeat: no-repeat;
 			  }
 .audio2 	{ background-image: url("../diabook-dark/icons/audio.png"); 
 			  display: block; width: 28px; height: 28px; background-repeat: no-repeat;
@@ -440,7 +440,7 @@ a:hover {
   clear: both;
 }
 .fakelink {
-  color: #1872A2;
+  color: #88a9d2;
   /* color: #3e3e8c; */
   text-decoration: none;
   cursor: pointer;
@@ -493,7 +493,7 @@ code {
   float: right;
 }
 .tool a {
-  color: ##3F8FBA;
+  color: ##3465a4;
 }
 .tool a:hover {
   text-decoration: none;
@@ -1261,7 +1261,7 @@ transition: all 0.2s ease-in-out;
   padding-top: 10px;
 }
 .tread-wrapper a{
-  color: #1872A2;
+  color: #88a9d2;
 }
 
 .wall-item-decor {
@@ -1329,7 +1329,7 @@ transition: all 0.2s ease-in-out;
   max-width: 420px;
   word-wrap: break-word;
 
-  margin-bottom: 14px;
+
 }
 
 .wall-item-container .wall-item-content img {
diff --git a/view/theme/diabook/diabook-dark/style-wide.css b/view/theme/diabook/diabook-dark/style-wide.css
index 0a7cabcb0..73d0e4c0f 100644
--- a/view/theme/diabook/diabook-dark/style-wide.css
+++ b/view/theme/diabook/diabook-dark/style-wide.css
@@ -149,7 +149,7 @@
 			  display: block; width: 28px; height: 28px; background-repeat: no-repeat;
 			  }	
 .video 	{ background-image: url("../../../view/theme/diabook/diabook-blue/icons/video.png"); 
-			  display: block; width: 100%; height: 28px; background-repeat: no-repeat;
+			  display: block; width: 100%; height: 140px; background-repeat: no-repeat;
 			  }
 .audio2 	{ background-image: url("../../../view/theme/diabook/diabook-blue/icons/audio.png"); 
 			  display: block; width: 28px; height: 28px; background-repeat: no-repeat;
@@ -1581,7 +1581,7 @@ body .pageheader{
   max-width: 690px;
   word-wrap: break-word;
 
-  margin-bottom: 14px;
+
 }
 
 .wall-item-container .wall-item-content img {
diff --git a/view/theme/diabook/diabook-dark/style.css b/view/theme/diabook/diabook-dark/style.css
index 631628a07..638aeb455 100644
--- a/view/theme/diabook/diabook-dark/style.css
+++ b/view/theme/diabook/diabook-dark/style.css
@@ -149,7 +149,7 @@
 			  display: block; width: 28px; height: 28px; background-repeat: no-repeat;
 			  }	
 .video 	{ background-image: url("../../../view/theme/diabook/diabook-dark/icons/video.png"); 
-			  display: block; width: 100%; height: 28px; background-repeat: no-repeat;
+			  display: block; width: 100%; height: 140px; background-repeat: no-repeat;
 			  }
 .audio2 	{ background-image: url("../../../view/theme/diabook/diabook-dark/icons/audio.png"); 
 			  display: block; width: 28px; height: 28px; background-repeat: no-repeat;
@@ -1201,8 +1201,19 @@ aside #side-peoplefind-url {
   margin-right: 20px;		
 	}
 #login-submit-wrapper{
-margin-bottom: 15px;
+  padding-top: 120px;
+  margin-bottom: 12px;
+  }
+  
+aside #login-submit-button{
+  margin-left: 0px!important;  
+
+ }
+
+aside #login-extra-links{
+  padding-top: 0px!important;  
 	}
+
 .group_selected {
   background: url("../../../view/theme/diabook/icons/selected.png") no-repeat left center;
   float: left;
@@ -1574,7 +1585,7 @@ body .pageheader{
   max-width: 720px;
   word-wrap: break-word;
 
-  margin-bottom: 14px;
+
 }
 
 .wall-item-container .wall-item-content img {
diff --git a/view/theme/diabook/diabook-dark/style.php b/view/theme/diabook/diabook-dark/style.php
deleted file mode 100644
index 1f6e965a9..000000000
--- a/view/theme/diabook/diabook-dark/style.php
+++ /dev/null
@@ -1,277 +0,0 @@
-<?php
-	$line_height=false;
-	$diabook_font_size=false;
-	$resolution=false;
-	$site_line_height = get_config("diabook-dark","line_height");
-	$site_diabook_font_size = get_config("diabook-dark", "font_size" );
-	$site_resolution = get_config("diabook-dark", "resolution" );
-	
-	
-	if (local_user()) {
-		$line_height = get_pconfig(local_user(), "diabook-dark","line_height");
-		$diabook_font_size = get_pconfig(local_user(), "diabook-dark", "font_size");
-		$resolution = get_pconfig(local_user(), "diabook-dark", "resolution");
-	}
-	
-	if ($line_height===false) $line_height=$site_line_height;
-	if ($line_height===false) $line_height="1.3";
-	if ($diabook_font_size===false) $diabook_font_size=$site_diabook_font_size;
-	if ($diabook_font_size===false) $diabook_font_size="13";
-	if ($resolution===false) $resolution=$site_resolution;
-	if ($resolution===false) $resolution="normal";
-	
-	
-	if($resolution == "normal") {	
-	if (file_exists("$THEMEPATH/style.css")){
-		echo file_get_contents("$THEMEPATH/style.css");
-	}
-
-   if($diabook_font_size == "15"){
-		echo "
-			.wall-item-container .wall-item-content {
-  					font-size: 15px;
-  					}
-  					
-			.wall-item-photo-container .wall-item-content {
-  					font-size: 15px;
-  					}
-		";
-	}	
-	if($diabook_font_size == "14"){
-		echo "
-			.wall-item-container .wall-item-content {
-  					font-size: 14px;
-  					}
-  					
-			.wall-item-photo-container .wall-item-content {
-  					font-size: 14px;
-  					}
-		";
-	}
-	if($diabook_font_size == "13.5"){
-		echo "
-			.wall-item-container .wall-item-content {
-  					font-size: 13.5px;
-  					}
-  					
-			.wall-item-photo-container .wall-item-content {
-  					font-size: 13.5px;
-  					}
-		";
-	}
-	if($diabook_font_size == "13"){
-		echo "
-			.wall-item-container .wall-item-content {
-  					font-size: 13px;
-  					}
-  					
-			.wall-item-photo-container .wall-item-content {
-  					font-size: 13px;
-  					}
-		";
-	}
-	if($diabook_font_size == "12.5"){
-		echo "
-			.wall-item-container .wall-item-content {
-  					font-size: 12.5px;
-  					}
-  					
-			.wall-item-photo-container .wall-item-content {
-  					font-size: 12.5px;
-  					}
-		";
-	}
-	if($diabook_font_size == "12"){
-		echo "
-			.wall-item-container .wall-item-content {
-  					font-size: 12px;
-  					}
-  					
-			.wall-item-photo-container .wall-item-content {
-  					font-size: 12px;
-  					}
-		";
-	}
-	if($line_height == "1.5"){
-		echo "
-			.wall-item-container .wall-item-content {
-  					line-height: 1.5;
-  					}
-  					
-			.wall-item-photo-container .wall-item-content {
- 					line-height: 1.5;
-  					}
-		";
-	}	
-	if($line_height == "1.4"){
-		echo "
-			.wall-item-container .wall-item-content {
-  					line-height: 1.4;
-  					}
-  					
-			.wall-item-photo-container .wall-item-content {
- 					line-height: 1.4;
-  					}
-		";
-	}
-	if($line_height == "1.3"){
-		echo "
-			.wall-item-container .wall-item-content {
-  					line-height: 1.3;
-  					}
-  					
-			.wall-item-photo-container .wall-item-content {
- 					line-height: 1.3;
-  					}
-		";
-	}
-	if($line_height == "1.2"){
-		echo "
-			.wall-item-container .wall-item-content {
-  					line-height: 1.2;
-  					}
-  					
-			.wall-item-photo-container .wall-item-content {
- 					line-height: 1.2;
-  					}
-		";
-	}
-	if($line_height == "1.1"){
-		echo "
-			.wall-item-container .wall-item-content {
-  					line-height: 1.1;
-  					}
-  					
-			.wall-item-photo-container .wall-item-content {
- 					line-height: 1.1;
-  					}
-		";
-	}
-	}
-	
-	if($resolution == "wide") {	
-	if (file_exists("$THEMEPATH/style-wide.css")){
-		echo file_get_contents("$THEMEPATH/style-wide.css");
-	}
-	if($diabook_font_size == "15"){
-		echo "
-			.wall-item-container .wall-item-content {
-  					font-size: 15px;
-  					}
-  					
-			.wall-item-photo-container .wall-item-content {
-  					font-size: 15px;
-  					}
-		";
-	}
-	if($diabook_font_size == "14"){
-		echo "
-			.wall-item-container .wall-item-content {
-  					font-size: 14px;
-  					}
-  					
-			.wall-item-photo-container .wall-item-content {
-  					font-size: 14px;
-  					}
-		";
-	}
-	if($diabook_font_size == "13.5"){
-		echo "
-			.wall-item-container .wall-item-content {
-  					font-size: 13.5px;
-  					}
-  					
-			.wall-item-photo-container .wall-item-content {
-  					font-size: 13.5px;
-  					}
-		";
-	}
-	if($diabook_font_size == "13"){
-		echo "
-			.wall-item-container .wall-item-content {
-  					font-size: 13px;
-  					}
-  					
-			.wall-item-photo-container .wall-item-content {
-  					font-size: 13px;
-  					}
-		";
-	}
-	if($diabook_font_size == "12.5"){
-		echo "
-			.wall-item-container .wall-item-content {
-  					font-size: 12.5px;
-  					}
-  					
-			.wall-item-photo-container .wall-item-content {
-  					font-size: 12.5px;
-  					}
-		";
-	}
-	if($diabook_font_size == "12"){
-		echo "
-			.wall-item-container .wall-item-content {
-  					font-size: 12px;
-  					}
-  					
-			.wall-item-photo-container .wall-item-content {
-  					font-size: 12px;
-  					}
-		";
-	}
-	if($line_height == "1.5"){
-		echo "
-			.wall-item-container .wall-item-content {
-  					line-height: 1.5;
-  					}
-  					
-			.wall-item-photo-container .wall-item-content {
- 					line-height: 1.5;
-  					}
-		";
-	}	
-	if($line_height == "1.4"){
-		echo "
-			.wall-item-container .wall-item-content {
-  					line-height: 1.4;
-  					}
-  					
-			.wall-item-photo-container .wall-item-content {
- 					line-height: 1.4;
-  					}
-		";
-	}
-	if($line_height == "1.3"){
-		echo "
-			.wall-item-container .wall-item-content {
-  					line-height: 1.3;
-  					}
-  					
-			.wall-item-photo-container .wall-item-content {
- 					line-height: 1.3;
-  					}
-		";
-	}
-	if($line_height == "1.2"){
-		echo "
-			.wall-item-container .wall-item-content {
-  					line-height: 1.2;
-  					}
-  					
-			.wall-item-photo-container .wall-item-content {
- 					line-height: 1.2;
-  					}
-		";
-	}
-	if($line_height == "1.1"){
-		echo "
-			.wall-item-container .wall-item-content {
-  					line-height: 1.1;
-  					}
-  					
-			.wall-item-photo-container .wall-item-content {
- 					line-height: 1.1;
-  					}
-		";
-	}
-	}
\ No newline at end of file
diff --git a/view/theme/diabook/diabook-dark/theme.php b/view/theme/diabook/diabook-dark/theme.php
deleted file mode 100644
index 39f7a59e1..000000000
--- a/view/theme/diabook/diabook-dark/theme.php
+++ /dev/null
@@ -1,488 +0,0 @@
-<?php
-
-/*
- * Name: Diabook-dark
- * Description: Diabook-dark : Thoams Bierey's Diabook with Simon L'Nu's colours, abused by Thomas Willingham.
- * Version: (Version: 1.0)
- * Author: 
- */
-
-
-//print diabook-version for debugging
-$diabook_version = "Diabook-dark (Version: 1.0)";
-$a->page['htmlhead'] .= sprintf('<script "%s" ></script>', $diabook_version);
-
-
-//change css on network and profilepages
-$cssFile = null;
-$resolution=false;
-$resolution = get_pconfig(local_user(), "diabook-dark", "resolution");
-if ($resolution===false) $resolution="normal";
-
-/**
- * prints last community activity
- */
-function diabook_dark_community_info(){
-	$a = get_app();
-
-	// last 12 users
-	$aside['$lastusers_title'] = t('Last users');
-	$aside['$lastusers_items'] = array();
-	$sql_extra = "";
-	$publish = (get_config('system','publish_all') ? '' : " AND `publish` = 1 " );
-	$order = " ORDER BY `register_date` DESC ";
-
-	$r = q("SELECT `profile`.*, `profile`.`uid` AS `profile_uid`, `user`.`nickname`
-			FROM `profile` LEFT JOIN `user` ON `user`.`uid` = `profile`.`uid` 
-			WHERE `is-default` = 1 $publish AND `user`.`blocked` = 0 $sql_extra $order LIMIT %d , %d ",
-		0,
-		9
-	);
-	$tpl = file_get_contents( dirname(__file__).'/ch_directory_item.tpl');
-	if(count($r)) {
-		$photo = 'thumb';
-		foreach($r as $rr) {
-			$profile_link = $a->get_baseurl() . '/profile/' . ((strlen($rr['nickname'])) ? $rr['nickname'] : $rr['profile_uid']);
-			$entry = replace_macros($tpl,array(
-				'$id' => $rr['id'],
-				'$profile-link' => $profile_link,
-				'$photo' => $rr[$photo],
-				'$alt-text' => $rr['name'],
-			));
-			$aside['$lastusers_items'][] = $entry;
-		}
-	}
-	
-	
-	// last 10 liked items
-	$aside['$like_title'] = t('Last likes');
-	$aside['$like_items'] = array();
-	$r = q("SELECT `T1`.`created`, `T1`.`liker`, `T1`.`liker-link`, `item`.* FROM 
-			(SELECT `parent-uri`, `created`, `author-name` AS `liker`,`author-link` AS `liker-link` 
-				FROM `item` WHERE `verb`='http://activitystrea.ms/schema/1.0/like' GROUP BY `parent-uri` ORDER BY `created` DESC) AS T1
-			INNER JOIN `item` ON `item`.`uri`=`T1`.`parent-uri` 
-			WHERE `T1`.`liker-link` LIKE '%s%%' OR `item`.`author-link` LIKE '%s%%'
-			GROUP BY `uri`
-			ORDER BY `T1`.`created` DESC
-			LIMIT 0,5",
-			$a->get_baseurl(),$a->get_baseurl()
-			);
-
-	foreach ($r as $rr) {
-		$author	 = '<a href="' . $rr['liker-link'] . '">' . $rr['liker'] . '</a>';
-		$objauthor =  '<a href="' . $rr['author-link'] . '">' . $rr['author-name'] . '</a>';
-		
-		//var_dump($rr['verb'],$rr['object-type']); killme();
-		switch($rr['verb']){
-			case 'http://activitystrea.ms/schema/1.0/post':
-				switch ($rr['object-type']){
-					case 'http://activitystrea.ms/schema/1.0/event':
-						$post_type = t('event');
-						break;
-					default:
-						$post_type = t('status');
-				}
-				break;
-			default:
-				if ($rr['resource-id']){
-					$post_type = t('photo');
-					$m=array();	preg_match("/\[url=([^]]*)\]/", $rr['body'], $m);
-					$rr['plink'] = $m[1];
-				} else {
-					$post_type = t('status');
-				}
-		}
-		$plink = '<a href="' . $rr['plink'] . '">' . $post_type . '</a>';
-
-		$aside['$like_items'][] = sprintf( t('%1$s likes %2$s\'s %3$s'), $author, $objauthor, $plink);
-		
-	}
-	
-	
-	// last 12 photos
-	$aside['$photos_title'] = t('Last photos');
-	$aside['$photos_items'] = array();
-	$r = q("SELECT `photo`.`id`, `photo`.`resource-id`, `photo`.`scale`, `photo`.`desc`, `user`.`nickname`, `user`.`username` FROM 
-				(SELECT `resource-id`, MAX(`scale`) as maxscale FROM `photo` 
-					WHERE `profile`=0 AND `contact-id`=0 AND `album` NOT IN ('Contact Photos', '%s', 'Profile Photos', '%s')
-						AND `allow_cid`='' AND `allow_gid`='' AND `deny_cid`='' AND `deny_gid`='' GROUP BY `resource-id`) AS `t1`
-				INNER JOIN `photo` ON `photo`.`resource-id`=`t1`.`resource-id` AND `photo`.`scale` = `t1`.`maxscale`,
-				`user` 
-				WHERE `user`.`uid` = `photo`.`uid`
-				AND `user`.`blockwall`=0
-				AND `user`.`hidewall`=0
-				ORDER BY `photo`.`edited` DESC
-				LIMIT 0, 9",
-				dbesc(t('Contact Photos')),
-				dbesc(t('Profile Photos'))
-				);
-		if(count($r)) {
-		$tpl = file_get_contents( dirname(__file__).'/ch_directory_item.tpl');
-		foreach($r as $rr) {
-			$photo_page = $a->get_baseurl() . '/photos/' . $rr['nickname'] . '/image/' . $rr['resource-id'];
-			$photo_url = $a->get_baseurl() . '/photo/' .  $rr['resource-id'] . '-' . $rr['scale'] .'.jpg';
-		
-			$entry = replace_macros($tpl,array(
-				'$id' => $rr['id'],
-				'$profile-link' => $photo_page,
-				'$photo' => $photo_url,
-				'$alt-text' => $rr['username']." : ".$rr['desc'],
-			));
-
-			$aside['$photos_items'][] = $entry;
-		}
-	}
-	
-	
-   
-   //nav FIND FRIENDS
-	if(local_user()) {
-	$nv = array();
-   $nv['title'] = Array("", t('Find Friends'), "", "");
-	$nv['directory'] = Array('directory', t('Local Directory'), "", "");
-	$nv['global_directory'] = Array('http://dir.friendica.com/', t('Global Directory'), "", "");
-	$nv['match'] = Array('match', t('Similar Interests'), "", "");
-	$nv['suggest'] = Array('suggest', t('Friend Suggestions'), "", "");
-	$nv['invite'] = Array('invite', t('Invite Friends'), "", "");
-	
-	$nv['search'] = '<form name="simple_bar" method="get" action="http://dir.friendika.com/directory">
-						<span class="sbox_l"></span>
-						<span class="sbox">
-						<input type="text" name="search" size="13" maxlength="50">
-						</span>
-						<span class="sbox_r" id="srch_clear"></span>';
-						
-	$aside['$nv'] = $nv;
-	};
-	//Community Page
-	if(local_user()) {
-   $page = '<div id="page-sidebar-right_aside" class="widget">
-			<div class="title tool">
-			<h3>'.t("Community Pages").'<a id="close_pages_icon"  onClick="close_pages()" class="icon close_box" title="close"></a></h3></div>
-			<div id="sidebar-page-list"><ul>';
-
-	$pagelist = array();
-
-	$contacts = q("SELECT `id`, `url`, `name`, `micro`FROM `contact`
-			WHERE `network`= 'dfrn' AND `forum` = 1 AND `uid` = %d
-			ORDER BY `name` ASC",
-			intval($a->user['uid'])
-	);
-
-	$pageD = array();
-
-	// Look if the profile is a community page
-	foreach($contacts as $contact) {
-		$pageD[] = array("url"=>$contact["url"], "name"=>$contact["name"], "id"=>$contact["id"], "micro"=>$contact['micro']);
-	};
-	
-
-	$contacts = $pageD;
-
-	foreach($contacts as $contact) {
-		$page .= '<li style="list-style-type: none;" class="tool"><img height="20" width="20" style="float: left; margin-right: 3px;" src="' . $contact['micro'] .'" alt="' . $contact['url'] . '" /> <a href="'.$a->get_baseurl().'/redir/'.$contact["id"].'" style="margin-top: 2px;" title="' . $contact['url'] . '" class="label" target="external-link">'.
-				$contact["name"]."</a></li>";
-	}
-	$page .= '</ul></div></div>';
-	//if (sizeof($contacts) > 0)
-		
-		$aside['$page'] = $page;
-	}		
-  //END Community Page	
-  //helpers
-   $helpers = array();
-	$helpers['title'] = Array("", t('Help or @NewHere ?'), "", "");
-	
-	$aside['$helpers'] = $helpers;
-   //end helpers
-   //connectable services
-   $con_services = array();
-	$con_services['title'] = Array("", t('Connect Services'), "", "");
-	
-	$aside['$con_services'] = $con_services;
-   //end connectable services
-   
-  
-   //get_baseurl	      
-   $url = $a->get_baseurl($ssl_state);   
-   $aside['$url'] = $url;
-
-	$tpl = file_get_contents(dirname(__file__).'/communityhome.tpl');
-	$a->page['right_aside'] = replace_macros($tpl, $aside);
-	
-}
-
-
-//profile_side at networkpages
-if ($a->argv[0] === "network" && local_user()){
-
-	// USER MENU
-	if(local_user()) {
-		
-		$r = q("SELECT micro FROM contact WHERE uid=%d AND self=1", intval($a->user['uid']));
-				
-		$userinfo = array(
-					'icon' => (count($r) ? $r[0]['micro']: $a->get_baseurl()."/images/default-profile-mm.jpg"),
-					'name' => $a->user['username'],
-				);	
-		$ps = array('usermenu'=>array());
-		$ps['usermenu']['status'] = Array('profile/' . $a->user['nickname'], t('Home'), "", t('Your posts and conversations'));
-		$ps['usermenu']['profile'] = Array('profile/' . $a->user['nickname']. '?tab=profile', t('Profile'), "", t('Your profile page'));
-		$ps['usermenu']['contacts'] = Array('contacts' , t('Contacts'), "", t('Your contacts'));		
-		$ps['usermenu']['photos'] = Array('photos/' . $a->user['nickname'], t('Photos'), "", t('Your photos'));
-		$ps['usermenu']['events'] = Array('events/', t('Events'), "", t('Your events'));
-		$ps['usermenu']['notes'] = Array('notes/', t('Personal notes'), "", t('Your personal photos'));
-		$ps['usermenu']['community'] = Array('community/', t('Community'), "", "");
-		$ps['usermenu']['pgroups'] = Array('http://dir.friendika.com/directory/forum', t('Community Pages'), "", "");
-
-		$tpl = get_markup_template('profile_side.tpl');
-
-		$a->page['aside'] .= replace_macros($tpl, array(
-				'$userinfo' => $userinfo,
-				'$ps' => $ps,
-			));
-
-	}
-	
-	$ccCookie = $_COOKIE['close_pages'] + $_COOKIE['close_helpers'] + $_COOKIE['close_services'] + $_COOKIE['close_friends'] + $_COOKIE['close_lastusers'] + $_COOKIE['close_lastphotos'] + $_COOKIE['close_lastlikes'];
-	
-	if($ccCookie != "7") {
-	// COMMUNITY
-	diabook_dark_community_info();
-	
-	// CUSTOM CSS
-	if($resolution == "normal") {$cssFile = $a->get_baseurl($ssl_state)."/view/theme/diabook-dark/style-network.css";}
-	if($resolution == "wide") {$cssFile = $a->get_baseurl($ssl_state)."/view/theme/diabook-dark/style-network-wide.css";}
-	}
-}
-
-
-
-//right_aside at profile pages
-if ($a->argv[0].$a->argv[1] === "profile".$a->user['nickname']){
-	if($ccCookie != "7") {
-	// COMMUNITY
-	diabook_dark_community_info();
-	
-	// CUSTOM CSS
-	if($resolution == "normal") {$cssFile = $a->get_baseurl($ssl_state)."/view/theme/diabook-dark/style-profile.css";}
-	if($resolution == "wide") {$cssFile = $a->get_baseurl($ssl_state)."/view/theme/diabook-dark/style-profile-wide.css";}
-	}
-}
-
-
-
-// custom css
-if (!is_null($cssFile)) $a->page['htmlhead'] .= sprintf('<link rel="stylesheet" type="text/css" href="%s" />', $cssFile);
-
-//load jquery.cookie.js
-$cookieJS = $a->get_baseurl($ssl_state)."/view/theme/diabook-dark/js/jquery.cookie.js";
-$a->page['htmlhead'] .= sprintf('<script language="JavaScript" src="%s" ></script>', $cookieJS);
-
-//load jquery.ae.image.resize.js
-$imageresizeJS = $a->get_baseurl($ssl_state)."/view/theme/diabook-dark/js/jquery.ae.image.resize.js";
-$a->page['htmlhead'] .= sprintf('<script language="JavaScript" src="%s" ></script>', $imageresizeJS);
-
-//load jquery.autogrow-textarea.js
-$autogrowJS = $a->get_baseurl($ssl_state)."/view/theme/diabook-dark/js/jquery.autogrow.textarea.js";
-$a->page['htmlhead'] .= sprintf('<script language="JavaScript" src="%s" ></script>', $autogrowJS);
-
-//js scripts
-//comment-edit-wrapper on photo_view
-if ($a->argv[0].$a->argv[2] === "photos"."image"){
-
-$a->page['htmlhead'] .= '
-<script>
-	$(function(){
-	
-		$(".comment-edit-form").css("display","table");
-			
-			});
-    </script>';
-	
-}
-
-$a->page['htmlhead'] .= '
-
-<script>
- $(function() {
-	$("a.lightbox").fancybox(); // Select all links with lightbox class
- });
-  
- </script>';
- 
-$a->page['htmlhead'] .= '
-
-<script type="text/javascript">
-
-function tautogrow(id){
-		$("textarea#comment-edit-text-" +id).autogrow(); 	
- 	};
- </script>';
-
-$a->page['htmlhead'] .= '
- <script>
- 
-$(document).ready(function() {
-    $("iframe").each(function(){
-        var ifr_source = $(this).attr("src");
-        var wmode = "wmode=transparent";
-        if(ifr_source.indexOf("?") != -1) {
-            var getQString = ifr_source.split("?");
-            var oldString = getQString[1];
-            var newString = getQString[0];
-            $(this).attr("src",newString+"?"+wmode+"&"+oldString);
-        }
-        else $(this).attr("src",ifr_source+"?"+wmode);
-    });
-      
-
-});
-
-function yt_iframe() {
-	
-	$("iframe").load(function() { 
-	var ifr_src = $(this).contents().find("body iframe").attr("src");
-	$("iframe").contents().find("body iframe").attr("src", ifr_src+"&wmode=transparent");
-    });
-
-	};
-  
- </script>';
-
-if ($a->argv[0].$a->argv[1] === "profile".$a->user['nickname'] or $a->argv[0] === "network" && local_user()){
-$a->page['htmlhead'] .= '
-<script>
-
- $(function() {
-	$(".oembed.photo img").aeImageResize({height: 400, width: 400});
-  });
-</script>';
-
-
-	if($ccCookie != "7") {
-$a->page['htmlhead'] .= '
-<script>
-$("right_aside").ready(function(){
-	
-	if($.cookie("close_pages") == "1") 
-		{
-		document.getElementById( "close_pages" ).style.display = "none";
-			};
-	
-	if($.cookie("close_helpers") == "1") 
-		{
-		document.getElementById( "close_helpers" ).style.display = "none";
-			};
-			
-	if($.cookie("close_services") == "1") 
-		{
-		document.getElementById( "close_services" ).style.display = "none";
-			};
-			
-	if($.cookie("close_friends") == "1") 
-		{
-		document.getElementById( "close_friends" ).style.display = "none";
-			};
-	
-			
-	if($.cookie("close_lastusers") == "1") 
-		{
-		document.getElementById( "close_lastusers" ).style.display = "none";
-			};
-			
-	if($.cookie("close_lastphotos") == "1") 
-		{
-		document.getElementById( "close_lastphotos" ).style.display = "none";
-			};
-			
-	if($.cookie("close_lastlikes") == "1") 
-		{
-		document.getElementById( "close_lastlikes" ).style.display = "none";
-			};}
-
-);
-
-function close_pages(){
- document.getElementById( "close_pages" ).style.display = "none";
- $.cookie("close_pages","1", { expires: 365, path: "/" });
- };
- 
-function close_helpers(){
- document.getElementById( "close_helpers" ).style.display = "none";
-  $.cookie("close_helpers","1", { expires: 365, path: "/" });
- };
-
-function close_services(){
- document.getElementById( "close_services" ).style.display = "none";
- $.cookie("close_services","1", { expires: 365, path: "/" });
- };
- 
-function close_friends(){
- document.getElementById( "close_friends" ).style.display = "none";
- $.cookie("close_friends","1", { expires: 365, path: "/" });
- };
-
- 
-function close_lastusers(){
- document.getElementById( "close_lastusers" ).style.display = "none";
- $.cookie("close_lastusers","1", { expires: 365, path: "/" });
- };
-
-function close_lastphotos(){
- document.getElementById( "close_lastphotos" ).style.display = "none";
- $.cookie("close_lastphotos","1", { expires: 365, path: "/" });
- };
- 
-function close_lastlikes(){
- document.getElementById( "close_lastlikes" ).style.display = "none";
- $.cookie("close_lastlikes","1", { expires: 365, path: "/" });
- };
-</script>';}
-
-$a->page['htmlhead'] .= ' 
-<script>
-function restore_boxes(){
-	$.cookie("close_pages","2", { expires: 365, path: "/" });
-	$.cookie("close_helpers","2", { expires: 365, path: "/" });
-	$.cookie("close_services","2", { expires: 365, path: "/" });
-	$.cookie("close_friends","2", { expires: 365, path: "/" });
-	$.cookie("close_lastusers","2", { expires: 365, path: "/" });
-	$.cookie("close_lastphotos","2", { expires: 365, path: "/" });
-	$.cookie("close_lastlikes","2", { expires: 365, path: "/" });
-	alert("Right-hand column was restored. Please refresh your browser");
-  }
-</script>';}
-
-$a->page['htmlhead'] .= ' 
-
-<script type="text/javascript">
-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);
-											}
-
-	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;
-}
-</script> ';
\ No newline at end of file
diff --git a/view/theme/diabook/diabook-dark/theme_settings.tpl b/view/theme/diabook/diabook-dark/theme_settings.tpl
deleted file mode 100644
index 472232cf0..000000000
--- a/view/theme/diabook/diabook-dark/theme_settings.tpl
+++ /dev/null
@@ -1,10 +0,0 @@
-{{inc field_select.tpl with $field=$font_size}}{{endinc}}
-
-{{inc field_select.tpl with $field=$line_height}}{{endinc}}
-
-{{inc field_select.tpl with $field=$resolution}}{{endinc}}
-
-<div class="settings-submit-wrapper">
-	<input type="submit" value="$submit" class="settings-submit" name="diabook-aerith-settings-submit" />
-</div>
-
diff --git a/view/theme/diabook/diabook-dark/wall_item.tpl b/view/theme/diabook/diabook-dark/wall_item.tpl
deleted file mode 100644
index 123834064..000000000
--- a/view/theme/diabook/diabook-dark/wall_item.tpl
+++ /dev/null
@@ -1,100 +0,0 @@
-{{ if $item.indent }}{{ else }}
-<div class="wall-item-decor">
-	<img id="like-rotator-$item.id" class="like-rotator" src="images/rotator.gif" alt="$item.wait" title="$item.wait" style="display: none;" />
-</div>
-{{ endif }}
-<div class="wall-item-container $item.indent">
-	<div class="wall-item-item">
-		<div class="wall-item-info">
-			<div class="contact-photo-wrapper"
-				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" target="redir" title="$item.linktitle" class="contact-photo-link" id="wall-item-photo-link-$item.id">
-					<img src="$item.thumb" class="contact-photo$item.sparkle" id="wall-item-photo-$item.id" alt="$item.name" />
-				</a>
-				<a href="#" rel="#wall-item-photo-menu-$item.id" class="contact-photo-menu-button icon s16 menu" id="wall-item-photo-menu-button-$item.id">menu</a>
-				<ul class="contact-menu menu-popup" id="wall-item-photo-menu-$item.id">
-				$item.item_photo_menu
-				</ul>
-				
-			</div>
-		</div>
-			<div class="wall-item-actions-author">
-				<a href="$item.profile_url" target="redir" title="$item.linktitle" class="wall-item-name-link"><span class="wall-item-name$item.sparkle">$item.name</span></a> 
-			<span class="wall-item-ago">-
-			{{ if $item.plink }}<a class="link" title="$item.plink.title" href="$item.plink.href" style="color: #999">$item.ago</a>{{ else }} $item.ago {{ endif }}
-			{{ if $item.lock }} - <span class="fakelink" style="color: #999" onclick="lockview(event,$item.id);">$item.lock</span> {{ endif }}
-			</span>
-			</div>
-		<div class="wall-item-content">
-			{{ if $item.title }}<h2><a href="$item.plink.href">$item.title</a></h2>{{ endif }}
-			$item.body
-		</div>
-	</div>
-	<div class="wall-item-bottom">
-		<div class="wall-item-links">
-		</div>
-		<div class="wall-item-tags">
-			{{ for $item.tags as $tag }}
-				<span class='tag'>$tag</span>
-			{{ endfor }}
-		</div>
-	</div>
-	<div class="wall-item-bottom">
-		<div class="">
-
-		</div>
-		<div class="wall-item-actions">
-
-			<div class="wall-item-actions-social">
-			
-			
-			{{ if $item.vote }}
-				<a href="#" id="like-$item.id" class="icon like" title="$item.vote.like.0" onclick="dolike($item.id,'like'); return false">$item.vote.like.1</a>
-				<a href="#" id="dislike-$item.id" class="icon dislike" title="$item.vote.dislike.0" onclick="dolike($item.id,'dislike'); return false"></a>
-			{{ endif }}
-						
-			{{ if $item.vote.share }}
-				<a href="#" id="share-$item.id" class="icon recycle" title="$item.vote.share.0" onclick="jotShare($item.id); return false"></a>
-			{{ endif }}	
-
-
-			{{ if $item.star }}
-				<a href="#" id="starred-$item.id" onclick="dostar($item.id); return false;" class="star-item icon $item.isstarred" title="$item.star.toggle">
-				<img src="images/star_dummy.png" class="icon star" alt="$item.star.do" /> </a>
-				<a href="#" id="tagger-$item.id" onclick="itemTag($item.id); return false;" class="tag-item icon tagged" title="$item.star.tagger"></a>					  
-			{{ endif }}	
-			
-			{{ if $item.filer }}
-			<a href="#" id="filer-$item.id" onclick="itemFiler($item.id); return false;" class="filer-item icon file-as" title="$item.star.filer"></a>
-			{{ endif }}				
-			
-			{{ if $item.plink }}<a class="icon link" title="$item.plink.title" href="$item.plink.href">$item.plink.title</a>{{ endif }}
-			
-					
-					
-			</div>
-			
-			<div class="wall-item-actions-tools">
-
-				{{ if $item.drop.dropping }}
-					<input type="checkbox" title="$item.drop.select" name="itemselected[]" class="item-select" value="$item.id" />
-					<a href="item/drop/$item.id" onclick="return confirmDelete();" class="icon drop" title="$item.drop.delete">$item.drop.delete</a>
-				{{ endif }}
-				{{ if $item.edpost }}
-					<a class="icon pencil" href="$item.edpost.0" title="$item.edpost.1"></a>
-				{{ endif }}
-			</div>
-			<div class="wall-item-location">$item.location&nbsp;</div>
-		</div>
-	</div>
-	<div class="wall-item-bottom">
-		<div class="wall-item-links"></div>
-		<div class="wall-item-like" id="wall-item-like-$item.id">$item.like</div>
-		<div class="wall-item-dislike" id="wall-item-dislike-$item.id">$item.dislike</div>	
-	</div>
-</div>
-
-<div class="wall-item-comment-wrapper" >
-	$item.comment
-</div>
diff --git a/view/theme/diabook/diabook-dark/wallwall_item.tpl b/view/theme/diabook/diabook-dark/wallwall_item.tpl
deleted file mode 100644
index 6a0c93f88..000000000
--- a/view/theme/diabook/diabook-dark/wallwall_item.tpl
+++ /dev/null
@@ -1,106 +0,0 @@
-{{ if $item.indent }}{{ else }}
-<div class="wall-item-decor">
-	<img id="like-rotator-$item.id" class="like-rotator" src="images/rotator.gif" alt="$item.wait" title="$item.wait" style="display: none;" />
-</div>
-{{ endif }}
-<div class="wall-item-container $item.indent">
-	<div class="wall-item-item">
-		<div class="wall-item-info">
-			<div class="contact-photo-wrapper mframe wwto" id="wall-item-ownerphoto-wrapper-$item.id" >
-				<a href="$item.owner_url" target="redir" title="$item.olinktitle" class="contact-photo-link" id="wall-item-ownerphoto-link-$item.id">
-					<img src="$item.owner_photo" class="contact-photo $item.osparkle" id="wall-item-ownerphoto-$item.id" alt="$item.owner_name" />
-				</a>
-			</div>
-			<div class="contact-photo-wrapper mframe wwfrom"
-				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" target="redir" title="$item.linktitle" class="contact-photo-link" id="wall-item-photo-link-$item.id">
-					<img src="$item.thumb" class="contact-photo$item.sparkle" id="wall-item-photo-$item.id" alt="$item.name" />
-				</a>
-				<a href="#" rel="#wall-item-photo-menu-$item.id" class="contact-photo-menu-button icon s16 menu" id="wall-item-photo-menu-button-$item.id">menu</a>
-				<ul class="contact-menu menu-popup" id="wall-item-photo-menu-$item.id">
-				$item.item_photo_menu
-				</ul>
-				
-			</div>
-		</div>
-			<div class="wall-item-actions-author">
-				<a href="$item.profile_url" target="redir" title="$item.linktitle" class="wall-item-name-link"><span class="wall-item-name$item.sparkle">$item.name</span></a>
-				$item.to <a href="$item.owner_url" target="redir" 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 <span class="wall-item-ago">- &nbsp;
-			{{ if $item.plink }}<a class="link" title="$item.plink.title" href="$item.plink.href" style="color: #999">$item.ago</a>{{ else }} $item.ago {{ endif }}
-			{{ if $item.lock }} - <span class="fakelink" style="color: #999" onclick="lockview(event,$item.id);">$item.lock</span> {{ endif }}
-			</span>
-			</div>
-		<div class="wall-item-content">
-			{{ if $item.title }}<h2><a href="$item.plink.href">$item.title</a></h2>{{ endif }}
-			$item.body
-		</div>
-	</div>
-	<div class="wall-item-bottom">
-		<div class="wall-item-links">
-		</div>
-		<div class="wall-item-tags">
-			{{ for $item.tags as $tag }}
-				<span class='tag'>$tag</span>
-			{{ endfor }}
-		</div>
-	</div>
-	<div class="wall-item-bottom">
-		<div class="">
-
-		</div>
-		<div class="wall-item-actions">
-
-			<div class="wall-item-actions-social">
-			
-			
-			{{ if $item.vote }}
-				<a href="#" id="like-$item.id" class="icon like" title="$item.vote.like.0" onclick="dolike($item.id,'like'); return false">$item.vote.like.1</a>
-				<a href="#" id="dislike-$item.id" class="icon dislike" title="$item.vote.dislike.0" onclick="dolike($item.id,'dislike'); return false"></a>
-			{{ endif }}
-						
-			{{ if $item.vote.share }}
-				<a href="#" id="share-$item.id" class="icon recycle" title="$item.vote.share.0" onclick="jotShare($item.id); return false"></a>
-			{{ endif }}	
-
-
-			{{ if $item.star }}
-				<a href="#" id="starred-$item.id" onclick="dostar($item.id); return false;" class="star-item icon $item.isstarred" title="$item.star.toggle">
-				<img src="images/star_dummy.png" class="icon star" alt="$item.star.do" /> </a>
-				<a href="#" id="tagger-$item.id" onclick="itemTag($item.id); return false;" class="tag-item icon tagged" title="$item.star.tagger"></a>
-			{{ endif }}	
-			
-			{{ if $item.filer }}
-			<a href="#" id="filer-$item.id" onclick="itemFiler($item.id); return false;" class="filer-item icon file-as" title="$item.star.filer"></a>
-			{{ endif }}				
-			
-			{{ if $item.plink }}<a class="icon link" title="$item.plink.title" href="$item.plink.href">$item.plink.title</a>{{ endif }}
-			
-					
-					
-			</div>
-			
-			<div class="wall-item-actions-tools">
-
-				{{ if $item.drop.dropping }}
-					<input type="checkbox" title="$item.drop.select" name="itemselected[]" class="item-select" value="$item.id" />
-					<a href="item/drop/$item.id" onclick="return confirmDelete();" class="icon drop" title="$item.drop.delete">$item.drop.delete</a>
-				{{ endif }}
-				{{ if $item.edpost }}
-					<a class="icon pencil" href="$item.edpost.0" title="$item.edpost.1"></a>
-				{{ endif }}
-			</div>
-			<div class="wall-item-location">$item.location&nbsp;</div>
-		</div>
-	</div>
-	<div class="wall-item-bottom">
-		<div class="wall-item-links"></div>
-		<div class="wall-item-like" id="wall-item-like-$item.id">$item.like</div>
-		<div class="wall-item-dislike" id="wall-item-dislike-$item.id">$item.dislike</div>	
-	</div>
-</div>
-
-<div class="wall-item-comment-wrapper" >
-	$item.comment
-</div>
\ No newline at end of file
diff --git a/view/theme/diabook/diabook-green/admin_users.tpl b/view/theme/diabook/diabook-green/admin_users.tpl
deleted file mode 100644
index 40f94f5fe..000000000
--- a/view/theme/diabook/diabook-green/admin_users.tpl
+++ /dev/null
@@ -1,88 +0,0 @@
-<script>
-	function confirm_delete(uname){
-		return confirm( "$confirm_delete".format(uname));
-	}
-	function confirm_delete_multi(){
-		return confirm("$confirm_delete_multi");
-	}
-	function selectall(cls){
-		$("."+cls).attr('checked','checked');
-		return false;
-	}
-</script>
-<div id='adminpage'>
-	<h1>$title - $page</h1>
-	
-	<form action="$baseurl/admin/users" method="post">
-		
-		<h3>$h_pending</h3>
-		{{ if $pending }}
-			<table id='pending'>
-				<thead>
-				<tr>
-					{{ for $th_pending as $th }}<th>$th</th>{{ endfor }}
-					<th></th>
-					<th></th>
-				</tr>
-				</thead>
-				<tbody>
-			{{ for $pending as $u }}
-				<tr>
-					<td class="created">$u.created</td>
-					<td class="name">$u.name</td>
-					<td class="email">$u.email</td>
-					<td class="checkbox"><input type="checkbox" class="pending_ckbx" id="id_pending_$u.hash" name="pending[]" value="$u.hash" /></td>
-					<td class="tools">
-						<a href="$baseurl/regmod/allow/$u.hash" title='$approve'><span class='icon like'></span></a>
-						<a href="$baseurl/regmod/deny/$u.hash" title='$deny'><span class='icon dislike'></span></a>
-					</td>
-				</tr>
-			{{ endfor }}
-				</tbody>
-			</table>
-			<div class='selectall'><a href='#' onclick="return selectall('pending_ckbx');">$select_all</a></div>
-			<div class="submit"><input type="submit" name="page_users_deny" value="$deny"/> <input type="submit" name="page_users_approve" value="$approve" /></div>			
-		{{ else }}
-			<p>$no_pending</p>
-		{{ endif }}
-	
-	
-		
-	
-		<h3>$h_users</h3>
-		{{ if $users }}
-			<table id='users'>
-				<thead>
-				<tr>
-					<th></th>
-					{{ for $th_users as $th }}<th>$th</th>{{ endfor }}
-					<th></th>
-					<th></th>
-				</tr>
-				</thead>
-				<tbody>
-				{{ for $users as $u }}
-					<tr>
-						<td><img src="$u.micro" alt="$u.nickname" title="$u.nickname"></td>
-						<td class='name'><a href="$u.url" title="$u.nickname" >$u.name</a></td>
-						<td class='email'>$u.email</td>
-						<td class='register_date'>$u.register_date</td>
-						<td class='login_date'>$u.login_date</td>
-						<td class='lastitem_date'>$u.lastitem_date</td>
-						<td class='login_date'>$u.page-flags</td>
-						<td class="checkbox"><input type="checkbox" class="users_ckbx" id="id_user_$u.uid" name="user[]" value="$u.uid"/></td>
-						<td class="tools" style="width:60px;">
-							<a href="$baseurl/admin/users/block/$u.uid" title='{{ if $u.blocked }}$unblock{{ else }}$block{{ endif }}'><span class='icon block {{ if $u.blocked==0 }}dim{{ endif }}'></span></a>
-							<a href="$baseurl/admin/users/delete/$u.uid" title='$delete' onclick="return confirm_delete('$u.name')"><span class='icon ad_drop'></span></a>
-						</td>
-					</tr>
-				{{ endfor }}
-				</tbody>
-			</table>
-			<div class='selectall'><a href='#' onclick="return selectall('users_ckbx');">$select_all</a></div>
-			<div class="submit"><input type="submit" name="page_users_block" value="$block/$unblock" /> <input type="submit" name="page_users_delete" value="$delete" onclick="return confirm_delete_multi()" /></div>						
-		{{ else }}
-			NO USERS?!?
-		{{ endif }}
-	</form>
-</div>
diff --git a/view/theme/diabook/diabook-green/ch_directory_item.tpl b/view/theme/diabook/diabook-green/ch_directory_item.tpl
deleted file mode 100644
index db1936e4b..000000000
--- a/view/theme/diabook/diabook-green/ch_directory_item.tpl
+++ /dev/null
@@ -1,10 +0,0 @@
-
-<div class="directory-item" id="directory-item-$id" >
-	<div class="directory-photo-wrapper" id="directory-photo-wrapper-$id" > 
-		<div class="directory-photo" id="directory-photo-$id" >
-			<a href="$profile-link" class="directory-profile-link" id="directory-profile-link-$id" >
-				<img class="directory-photo-img" src="$photo" alt="$alt-text" title="$alt-text" />
-			</a>
-		</div>
-	</div>
-</div>
diff --git a/view/theme/diabook/diabook-green/comment_item.tpl b/view/theme/diabook/diabook-green/comment_item.tpl
deleted file mode 100644
index ee4dfba45..000000000
--- a/view/theme/diabook/diabook-green/comment_item.tpl
+++ /dev/null
@@ -1,41 +0,0 @@
-		<div class="comment-wwedit-wrapper" id="comment-edit-wrapper-$id" style="display: block;">
-			<form class="comment-edit-form" id="comment-edit-form-$id" action="item" method="post" onsubmit="post_comment($id); return false;">
-				<input type="hidden" name="type" value="$type" />
-				<input type="hidden" name="profile_uid" value="$profile_uid" />
-				<input type="hidden" name="parent" value="$parent" />
-				<input type="hidden" name="return" value="$return_path" />
-				<input type="hidden" name="jsreload" value="$jsreload" />
-				<input type="hidden" name="preview" id="comment-preview-inp-$id" value="0" />
-
-				<div class="comment-edit-photo" id="comment-edit-photo-$id" >
-					<a class="comment-edit-photo-link" href="$mylink" title="$mytitle"><img class="my-comment-photo" src="$myphoto" alt="$mytitle" title="$mytitle" /></a>
-				</div>
-				<div class="comment-edit-photo-end"></div>
-				<textarea id="comment-edit-text-$id" class="comment-edit-text-empty" name="body" onFocus="commentOpen(this,$id);tautogrow($id)" onBlur="commentClose(this,$id);" >$comment</textarea>
-				<a class="icon bb-image" style="cursor: pointer;" onclick="insertFormatting('$comment','img',$id);">img</a>	
-				<a class="icon bb-url" style="cursor: pointer;" onclick="insertFormatting('$comment','url',$id);">url</a>
-				<a class="icon bb-video" style="cursor: pointer;" onclick="insertFormatting('$comment','video',$id);">video</a>														
-				<a class="icon underline" style="cursor: pointer;" onclick="insertFormatting('$comment','u',$id);">u</a>
-				<a class="icon italic" style="cursor: pointer;" onclick="insertFormatting('$comment','i',$id);">i</a>
-				<a class="icon bold" style="cursor: pointer;" onclick="insertFormatting('$comment','b',$id);">b</a>
-				<a class="icon quote" style="cursor: pointer;" onclick="insertFormatting('$comment','quote',$id);">quote</a>																			
-				{{ if $qcomment }}
-					<select id="qcomment-select-$id" name="qcomment-$id" class="qcomment" onchange="qCommentInsert(this,$id);" >
-					<option value=""></option>
-				{{ for $qcomment as $qc }}
-					<option value="$qc">$qc</option>				
-				{{ endfor }}
-					</select>
-				{{ endif }}
-
-				<div class="comment-edit-text-end"></div>
-				<div class="comment-edit-submit-wrapper" id="comment-edit-submit-wrapper-$id" style="display: none;" >
-					<input type="submit" onclick="post_comment($id); return false;" id="comment-edit-submit-$id" class="comment-edit-submit" name="submit" value="$submit" />
-					<span onclick="preview_comment($id);" id="comment-edit-preview-link-$id" class="fakelink">$preview</span>
-					<div id="comment-edit-preview-$id" class="comment-edit-preview" style="display:none;"></div>
-				</div>
-
-				<div class="comment-edit-end"></div>
-			</form>
-
-		</div>
diff --git a/view/theme/diabook/diabook-green/communityhome.tpl b/view/theme/diabook/diabook-green/communityhome.tpl
deleted file mode 100644
index 875d83f1b..000000000
--- a/view/theme/diabook/diabook-green/communityhome.tpl
+++ /dev/null
@@ -1,86 +0,0 @@
-<div id="close_pages">
-{{ if $page }}
-<div>$page</div>
-{{ endif }}
-</div>
-
-<div id="close_helpers">
-{{ if $lastusers_title }}
-<h3 style="margin-top:0px;">$helpers.title.1<a id="close_helpers_icon"  onClick="close_helpers()" class="icon close_box" title="close"></a></h3>
-<a href="http://kakste.com/profile/newhere" title="#NewHere" style="margin-left: 10px; " target="blank">NewHere</a><br>
-<a href="https://helpers.pyxis.uberspace.de/profile/helpers" style="margin-left: 10px; " title="Friendica Support" target="blank">Friendica Support</a><br>
-<a href="https://letstalk.pyxis.uberspace.de/profile/letstalk" style="margin-left: 10px; " title="Let's talk" target="blank">Let's talk</a><br>
-<a href="http://newzot.hydra.uberspace.de/profile/newzot" title="Local Friendica" style="margin-left: 10px; " target="blank">Local Friendica</a>
-{{ endif }}
-</div>
-
-<div id="close_services">
-{{ if $lastusers_title }}
-<h3>$con_services.title.1<a id="close_services_icon" onClick="close_services()" class="icon close_box" title="close"></a></h3>
-<div id="right_service_icons" style="margin-left: 16px; margin-top: 5px;">
-<a href="$url/facebook"><img alt="Facebook" src="view/theme/diabook-aerith/icons/facebook.png" title="Facebook"></a>
-<a href="$url/settings/connectors"><img alt="StatusNet" src="view/theme/diabook-aerith/icons/StatusNet.png?" title="StatusNet"></a>
-<a href="$url/settings/connectors"><img alt="LiveJournal" src="view/theme/diabook-aerith/icons/livejournal.png?" title="LiveJournal"></a>
-<a href="$url/settings/connectors"><img alt="Posterous" src="view/theme/diabook-aerith/icons/posterous.png?" title="Posterous"></a>
-<a href="$url/settings/connectors"><img alt="Tumblr" src="view/theme/diabook-aerith/icons/tumblr.png?" title="Tumblr"></a>
-<a href="$url/settings/connectors"><img alt="Twitter" src="view/theme/diabook-aerith/icons/twitter.png?" title="Twitter"></a>
-<a href="$url/settings/connectors"><img alt="WordPress" src="view/theme/diabook-aerith/icons/wordpress.png?" title="WordPress"></a>
-<a href="$url/settings/connectors"><img alt="E-Mail" src="view/theme/diabook-aerith/icons/email.png?" title="E-Mail"></a>
-</div>
-{{ endif }}
-</div>
-
-<div id="close_friends" style="margin-bottom:53px;">
-{{ if $nv }}
-<h3>$nv.title.1<a id="close_friends_icon" onClick="close_friends()"  class="icon close_box" title="close"></a></h3>
-<a class="$nv.directory.2" href="$nv.directory.0" style="margin-left: 10px; " title="$nv.directory.3" >$nv.directory.1</a><br>
-<a class="$nv.global_directory.2" href="$nv.global_directory.0" target="blank" style="margin-left: 10px; " title="$nv.global_directory.3" >$nv.global_directory.1</a><br>
-<a class="$nv.match.2" href="$nv.match.0" style="margin-left: 10px; " title="$nv.match.3" >$nv.match.1</a><br>
-<a class="$nv.suggest.2" href="$nv.suggest.0" style="margin-left: 10px; " title="$nv.suggest.3" >$nv.suggest.1</a><br>
-<a class="$nv.invite.2" href="$nv.invite.0" style="margin-left: 10px; " title="$nv.invite.3" >$nv.invite.1</a>			
-$nv.search
-{{ endif }}
-</div>
-
-<div id="close_lastusers">
-{{ if $lastusers_title }}
-<h3>$lastusers_title<a id="close_lastusers_icon" onClick="close_lastusers()" class="icon close_box" title="close"></a></h3>
-<div id='lastusers-wrapper' class='items-wrapper'>
-{{ for $lastusers_items as $i }}
-	$i
-{{ endfor }}
-</div>
-{{ endif }}
-</div>
-
-
-{{ if $activeusers_title }}
-<h3>$activeusers_title</h3>
-<div class='items-wrapper'>
-{{ for $activeusers_items as $i }}
-	$i
-{{ endfor }}
-</div>
-{{ endif }}
-
-<div id="close_lastphotos">
-{{ if $photos_title }}
-<h3>$photos_title<a id="close_photos_icon" onClick="close_lastphotos()"  class="icon close_box" title="close"></a></h3>
-<div id='ra-photos-wrapper' class='items-wrapper'>
-{{ for $photos_items as $i }}
-	$i
-{{ endfor }}
-</div>
-{{ endif }}
-</div>
-
-<div id="close_lastlikes">
-{{ if $like_title }}
-<h3>$like_title<a id="close_lastlikes_icon" onClick="close_lastlikes()" class="icon close_box" title="close"></a></h3>
-<ul id='likes'>
-{{ for $like_items as $i }}
-	<li id='ra-photos-wrapper'>$i</li>
-{{ endfor }}
-</ul>
-{{ endif }}
-</div>
diff --git a/view/theme/diabook/diabook-green/config.php b/view/theme/diabook/diabook-green/config.php
deleted file mode 100644
index 0083a4df7..000000000
--- a/view/theme/diabook/diabook-green/config.php
+++ /dev/null
@@ -1,84 +0,0 @@
-<?php
-/**
- * Theme settings
- */
-
-
-
-function theme_content(&$a){
-	if(!local_user())
-		return;		
-	
-	$font_size = get_pconfig(local_user(), 'diabook-aerith', 'font_size' );
-	$line_height = get_pconfig(local_user(), 'diabook-aerith', 'line_height' );
-	$resolution = get_pconfig(local_user(), 'diabook-aerith', 'resolution' );
-	
-	return diabook_form($a,$font_size, $line_height,$resolution);
-}
-
-function theme_post(&$a){
-	if(! local_user())
-		return;
-	
-	if (isset($_POST['diabook-aerith-settings-submit'])){
-		set_pconfig(local_user(), 'diabook-aerith', 'font_size', $_POST['diabook-aerith_font_size']);
-		set_pconfig(local_user(), 'diabook-aerith', 'line_height', $_POST['diabook-aerith_line_height']);
-		set_pconfig(local_user(), 'diabook-aerith', 'resolution', $_POST['diabook-aerith_resolution']);	
-	}
-}
-
-
-function theme_admin(&$a){
-	$font_size = get_config('diabook-aerith', 'font_size' );
-	$line_height = get_config('diabook-aerith', 'line_height' );
-	$resolution = get_config('diabook-aerith', 'resolution' );
-	
-	return diabook_form($a,$font_size, $line_height,$resolution);
-}
-
-function theme_admin_post(&$a){
-	if (isset($_POST['diabook-aerith-settings-submit'])){
-		set_config('diabook-aerith', 'font_size', $_POST['diabook-aerith_font_size']);
-		set_config('diabook-aerith', 'line_height', $_POST['diabook-aerith_line_height']);
-		set_config('diabook-aerith', 'resolution', $_POST['diabook-aerith_resolution']);
-	}
-}
-
-
-function diabook_form(&$a, $font_size, $line_height, $resolution){
-	$line_heights = array(
-		"1.3"=>"1.3",
-		"---"=>"---",
-		"1.5"=>"1.5",		
-		"1.4"=>"1.4",
-		"1.2"=>"1.2",
-		"1.1"=>"1.1",
-	);
-	
-	$font_sizes = array(
-		'13'=>'13',
-		"---"=>"---",
-		"15"=>"15",
-		'14'=>'14',
-		'13.5'=>'13.5',		
-		'12.5'=>'12.5',
-		'12'=>'12',
-		);
-	$resolutions = array(
-		'normal'=>'normal',
-		'wide'=>'wide',		
-		);
-	
-	
-	
-	$t = file_get_contents( dirname(__file__). "/theme_settings.tpl" );
-	$o .= replace_macros($t, array(
-		'$submit' => t('Submit'),
-		'$baseurl' => $a->get_baseurl(),
-		'$title' => t("Theme settings"),
-		'$font_size' => array('diabook-aerith_font_size', t('Set font-size for posts and comments'), $font_size, '', $font_sizes),
-		'$line_height' => array('diabook-aerith_line_height', t('Set line-height for posts and comments'), $line_height, '', $line_heights),
-		'$resolution' => array('diabook-aerith_resolution', t('Set resolution for middle column'), $resolution, '', $resolutions),	
-	));
-	return $o;
-}
diff --git a/view/theme/diabook/diabook-green/contact_template.tpl b/view/theme/diabook/diabook-green/contact_template.tpl
deleted file mode 100644
index 48930b48a..000000000
--- a/view/theme/diabook/diabook-green/contact_template.tpl
+++ /dev/null
@@ -1,25 +0,0 @@
-
-<div class="contact-entry-wrapper" id="contact-entry-wrapper-$contact.id" >
-	<div class="contact-entry-photo-wrapper" >
-		<div class="contact-entry-photo mframe" id="contact-entry-photo-$contact.id"
-		onmouseover="if (typeof t$contact.id != 'undefined') clearTimeout(t$contact.id); openMenu('contact-photo-menu-button-$contact.id')" 
-		onmouseout="t$contact.id=setTimeout('closeMenu(\'contact-photo-menu-button-$contact.id\'); closeMenu(\'contact-photo-menu-$contact.id\');',200)" >
-
-			<a href="$contact.url" title="$contact.img_hover" /><img src="$contact.thumb" $contact.sparkle alt="$contact.name" /></a>
-
-			{{ if $contact.photo_menu }}
-			<span onclick="openClose('contact-photo-menu-$contact.id');" class="fakelink contact-photo-menu-button" id="contact-photo-menu-button-$contact.id">menu</span>
-                <div class="contact-photo-menu" id="contact-photo-menu-$contact.id">
-                    <ul>
-                        $contact.photo_menu
-                    </ul>
-                </div>
-			{{ endif }}
-		</div>
-			
-	</div>
-	<div class="contact-entry-photo-end" ></div>
-		<div class="contact-entry-name" id="contact-entry-name-$contact.id" >$contact.name</div>
-
-	<div class="contact-entry-end" ></div>
-</div>
diff --git a/view/theme/diabook/diabook-green/directory_item.tpl b/view/theme/diabook/diabook-green/directory_item.tpl
deleted file mode 100644
index bc2af16c2..000000000
--- a/view/theme/diabook/diabook-green/directory_item.tpl
+++ /dev/null
@@ -1,11 +0,0 @@
-
-<div class="directory-item" id="directory-item-$id" >
-	<div class="directory-photo-wrapper" id="directory-photo-wrapper-$id" > 
-		<div class="directory-photo" id="directory-photo-$id" >
-			<a href="$profile-link" class="directory-profile-link" id="directory-profile-link-$id" >
-				<img class="directory-photo-img" src="$photo" alt="$alt-text" title="$alt-text" />
-			</a>
-		</div>
-	</div>
-	<div class="contact-name" id="directory-name-$id">$name</div>
-</div>
diff --git a/view/theme/diabook/diabook-green/generic_links_widget.tpl b/view/theme/diabook/diabook-green/generic_links_widget.tpl
deleted file mode 100644
index 001c1395e..000000000
--- a/view/theme/diabook/diabook-green/generic_links_widget.tpl
+++ /dev/null
@@ -1,11 +0,0 @@
-<div id="widget_$title">
-	{{if $title}}<h3 style="border-bottom: 1px solid #D2D2D2;">$title</h3>{{endif}}
-	{{if $desc}}<div class="desc">$desc</div>{{endif}}
-	
-	<ul  class="rs_tabs">
-		{{ for $items as $item }}
-			<li><a href="$item.url" class="rs_tab button {{ if $item.selected }}selected{{ endif }}">$item.label</a></li>
-		{{ endfor }}
-	</ul>
-	
-</div>
diff --git a/view/theme/diabook/diabook-green/group_side.tpl b/view/theme/diabook/diabook-green/group_side.tpl
deleted file mode 100644
index 8600402f2..000000000
--- a/view/theme/diabook/diabook-green/group_side.tpl
+++ /dev/null
@@ -1,34 +0,0 @@
-<div id="profile_side" >
-	<div class="">
-		<h3 style="margin-left: 2px;">$title<a href="group/new" title="$createtext" class="icon text_add"></a></h3>
-	</div>
-
-	<div id="sidebar-group-list">
-		<ul class="menu-profile-side">
-			{{ for $groups as $group }}
-			<li class="menu-profile-list">
-				<span class="menu-profile-icon {{ if $group.selected }}group_selected{{else}}group_unselected{{ endif }}"></span>
-				<a href="$group.href" class="menu-profile-list-item">
-					$group.text
-				</a>
-				{{ if $group.edit }}
-					<a href="$group.edit.href" class="action"><span class="icon text_edit" ></span></a>
-				{{ endif }}
-				{{ if $group.cid }}
-					<input type="checkbox" 
-						class="{{ if $group.selected }}ticked{{ else }}unticked {{ endif }} action" 
-						onclick="contactgroupChangeMember('$group.id','$group.cid');return true;"
-						{{ if $group.ismember }}checked="checked"{{ endif }}
-					/>
-				{{ endif }}
-			</li>
-			{{ endfor }}
-		</ul>
-	</div>
-	 {{ if $ungrouped }}
-  <div id="sidebar-ungrouped">
-  <a href="nogroup">$ungrouped</a>
-  </div>
-  {{ endif }}
-</div>	
-
diff --git a/view/theme/diabook/diabook-green/jot.tpl b/view/theme/diabook/diabook-green/jot.tpl
deleted file mode 100644
index 0928c9f36..000000000
--- a/view/theme/diabook/diabook-green/jot.tpl
+++ /dev/null
@@ -1,85 +0,0 @@
-
-<div id="profile-jot-wrapper" >
-	<div id="profile-jot-banner-wrapper">
-		<div id="profile-jot-desc" >&nbsp;</div>
-	</div>
-	<div id="profile-jot-banner-end"></div>
-
-	<form id="profile-jot-form" action="$action" method="post" >
-		<input type="hidden" name="type" value="$ptyp" />
-		<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="coord" id="jot-coord" value="" />
-		<input type="hidden" name="post_id" value="$post_id" />
-		<input type="hidden" name="preview" id="jot-preview" value="0" />
-		<input name="title" id="jot-title" type="text" placeholder="$placeholdertitle" value="$title" class="jothidden" style="display:none">
-		<div id="jot-category-wrap"><input name="category" id="jot-category" type="text" placeholder="$placeholdercategory" value="$category" class="jothidden" style="display:none" /></div>				
-		<div id="character-counter" class="grey"></div>		
-		<img id="profile-jot-text-loading" src="images/rotator.gif" alt="$wait" title="$wait" style="display: none;" />
-		<textarea rows="5" cols="64" class="profile-jot-text" id="profile-jot-text" name="body" >{{ if $content }}$content{{ else }}$share{{ endif }}</textarea>
-
-
-<div id="profile-jot-submit-wrapper" class="jothidden">
-	
-	<div id="profile-upload-wrapper" style="display: $visitor;" >
-		<div id="wall-image-upload-div" ><a href="#" onclick="return false;" id="wall-image-upload" class="camera" title="$upload"></a></div>
-	</div> 
-	<div id="profile-attach-wrapper" style="display: $visitor;" >
-		<div id="wall-file-upload-div" ><a href="#" onclick="return false;" id="wall-file-upload" class="attach" title="$attach"></a></div>
-	</div> 
-
-	<div id="profile-link-wrapper" style="display: $visitor;" ondragenter="linkdropper(event);" ondragover="linkdropper(event);" ondrop="linkdrop(event);" >
-		<a id="profile-link" class="weblink" title="$weblink" ondragenter="return linkdropper(event);" ondragover="return linkdropper(event);" ondrop="linkdrop(event);" onclick="jotGetLink(); return false;"></a>
-	</div> 
-	<div id="profile-video-wrapper" style="display: $visitor;" >
-		<a id="profile-video" class="video2" title="$video" onclick="jotVideoURL();return false;"></a>
-	</div> 
-	<div id="profile-audio-wrapper" style="display: $visitor;" >
-		<a id="profile-audio" class="audio2" title="$audio" onclick="jotAudioURL();return false;"></a>
-	</div> 
-	<div id="profile-location-wrapper" style="display: $visitor;" >
-		<a id="profile-location" class="globe" title="$setloc" onclick="jotGetLocation();return false;"></a>
-	</div> 
-	<div id="profile-nolocation-wrapper" style="display: none;" >
-		<a id="profile-nolocation" class="noglobe" title="$noloc" onclick="jotClearLocation();return false;"></a>
-	</div> 
-
-	<input type="submit" id="profile-jot-submit" class="button creation2" name="submit" value="$share" />
-  
-   <span onclick="preview_post();" id="jot-preview-link" class="tab button">$preview</span>
-   
-	<div id="profile-jot-perms" class="profile-jot-perms" style="display: $pvisit;" >
-		<a href="#profile-jot-acl-wrapper" id="jot-perms-icon" class="icon $lockstate"  title="$permset" ></a>$bang
-	</div>
-
-
-	<div id="profile-jot-plugin-wrapper">
-  	$jotplugins
-	</div>
-	
-	<div id="profile-rotator-wrapper" style="display: $visitor;" >
-		<img id="profile-rotator" src="images/rotator.gif" alt="$wait" title="$wait" style="display: none;" />
-	</div> 
-	
-	</div>
-   <div id="profile-jot-perms-end"></div>
-	
-	<div id="jot-preview-content" style="display:none;"></div>
-
-	<div style="display: none;">
-		<div id="profile-jot-acl-wrapper" style="width:auto;height:auto;overflow:auto;">
-			$acl
-			<hr style="clear:both"/>
-			<div id="profile-jot-email-label">$emailcc</div><input type="text" name="emailcc" id="profile-jot-email" title="$emtitle" />
-			<div id="profile-jot-email-end"></div>
-			$jotnets
-		</div>
-	</div>
-
-
-
-
-</form>
-</div>
-		{{ if $content }}<script>initEditor();</script>{{ endif }}
diff --git a/view/theme/diabook/diabook-green/js/README b/view/theme/diabook/diabook-green/js/README
deleted file mode 100644
index c93b2118e..000000000
--- a/view/theme/diabook/diabook-green/js/README
+++ /dev/null
@@ -1,22 +0,0 @@
-jQuery Resize Plugin Demo
-
-Version: v2.1.1
-Author: Adeel Ejaz (http://adeelejaz.com/)
-License: Dual licensed under MIT and GPL licenses.
-
-Introduction
-aeImageResize is a jQuery plugin to dynamically resize the images without distorting the proportions.
-
-Usage:
-.aeImageResize( height, width )
-
-height
-An integer representing the maximum height for the image.
-
-width
-An integer representing the maximum width for the image.
-
-Example
-$(function() {
-  $( ".resizeme" ).aeImageResize({ height: 250, width: 250 });
-});
\ No newline at end of file
diff --git a/view/theme/diabook/diabook-green/js/jquery.ae.image.resize.js b/view/theme/diabook/diabook-green/js/jquery.ae.image.resize.js
deleted file mode 100644
index bac09cd45..000000000
--- a/view/theme/diabook/diabook-green/js/jquery.ae.image.resize.js
+++ /dev/null
@@ -1,69 +0,0 @@
-(function( $ ) {
-
-  $.fn.aeImageResize = function( params ) {
-
-    var aspectRatio = 0
-      // Nasty I know but it's done only once, so not too bad I guess
-      // Alternate suggestions welcome :)
-      ,	isIE6 = $.browser.msie && (6 == ~~ $.browser.version)
-      ;
-
-    // We cannot do much unless we have one of these
-    if ( !params.height && !params.width ) {
-      return this;
-    }
-
-    // Calculate aspect ratio now, if possible
-    if ( params.height && params.width ) {
-      aspectRatio = params.width / params.height;
-    }
-
-    // Attach handler to load
-    // Handler is executed just once per element
-    // Load event required for Webkit browsers
-    return this.one( "load", function() {
-
-      // Remove all attributes and CSS rules
-      this.removeAttribute( "height" );
-      this.removeAttribute( "width" );
-      this.style.height = this.style.width = "";
-
-      var imgHeight = this.height
-        , imgWidth = this.width
-        , imgAspectRatio = imgWidth / imgHeight
-        , bxHeight = params.height
-        , bxWidth = params.width
-        , bxAspectRatio = aspectRatio;
-				
-      // Work the magic!
-      // If one parameter is missing, we just force calculate it
-      if ( !bxAspectRatio ) {
-        if ( bxHeight ) {
-          bxAspectRatio = imgAspectRatio + 1;
-        } else {
-          bxAspectRatio = imgAspectRatio - 1;
-        }
-      }
-
-      // Only resize the images that need resizing
-      if ( (bxHeight && imgHeight > bxHeight) || (bxWidth && imgWidth > bxWidth) ) {
-
-        if ( imgAspectRatio > bxAspectRatio ) {
-          bxHeight = ~~ ( imgHeight / imgWidth * bxWidth );
-        } else {
-          bxWidth = ~~ ( imgWidth / imgHeight * bxHeight );
-        }
-
-        this.height = bxHeight;
-        this.width = bxWidth;
-      }
-    })
-    .each(function() {
-
-      // Trigger load event (for Gecko and MSIE)
-      if ( this.complete || isIE6 ) {
-        $( this ).trigger( "load" );
-      }
-    });
-  };
-})( jQuery );
\ No newline at end of file
diff --git a/view/theme/diabook/diabook-green/js/jquery.ae.image.resize.min.js b/view/theme/diabook/diabook-green/js/jquery.ae.image.resize.min.js
deleted file mode 100644
index 16c30b123..000000000
--- a/view/theme/diabook/diabook-green/js/jquery.ae.image.resize.min.js
+++ /dev/null
@@ -1 +0,0 @@
-(function(d){d.fn.aeImageResize=function(a){var i=0,j=d.browser.msie&&6==~~d.browser.version;if(!a.height&&!a.width)return this;if(a.height&&a.width)i=a.width/a.height;return this.one("load",function(){this.removeAttribute("height");this.removeAttribute("width");this.style.height=this.style.width="";var e=this.height,f=this.width,g=f/e,b=a.height,c=a.width,h=i;h||(h=b?g+1:g-1);if(b&&e>b||c&&f>c){if(g>h)b=~~(e/f*c);else c=~~(f/e*b);this.height=b;this.width=c}}).each(function(){if(this.complete||j)d(this).trigger("load")})}})(jQuery);
\ No newline at end of file
diff --git a/view/theme/diabook/diabook-green/js/jquery.autogrow.textarea.js b/view/theme/diabook/diabook-green/js/jquery.autogrow.textarea.js
deleted file mode 100644
index 806e34f51..000000000
--- a/view/theme/diabook/diabook-green/js/jquery.autogrow.textarea.js
+++ /dev/null
@@ -1,46 +0,0 @@
-(function($) {
-
-    /*
-     * Auto-growing textareas; technique ripped from Facebook
-     */
-    $.fn.autogrow = function(options) {
-        
-        this.filter('textarea').each(function() {
-            
-            var $this       = $(this),
-                minHeight   = $this.height(),
-                lineHeight  = $this.css('lineHeight');
-            
-            var shadow = $('<div></div>').css({
-                position:   'absolute',
-                top:        -10000,
-                left:       -10000,
-                width:      $(this).width(),
-                fontSize:   $this.css('fontSize'),
-                fontFamily: $this.css('fontFamily'),
-                lineHeight: $this.css('lineHeight'),
-                resize:     'none'
-            }).appendTo(document.body);
-            
-            var update = function() {
-                
-                var val = this.value.replace(/</g, '&lt;')
-                                    .replace(/>/g, '&gt;')
-                                    .replace(/&/g, '&amp;')
-                                    .replace(/\n/g, '<br/>');
-                
-                shadow.html(val);
-                $(this).css('height', Math.max(shadow.height() + 20, minHeight));
-            }
-            
-            $(this).change(update).keyup(update).keydown(update);
-            
-            update.apply(this);
-            
-        });
-        
-        return this;
-        
-    }
-    
-})(jQuery);
\ No newline at end of file
diff --git a/view/theme/diabook/diabook-green/js/jquery.cookie.js b/view/theme/diabook/diabook-green/js/jquery.cookie.js
deleted file mode 100644
index 6d5974a2c..000000000
--- a/view/theme/diabook/diabook-green/js/jquery.cookie.js
+++ /dev/null
@@ -1,47 +0,0 @@
-/*!
- * jQuery Cookie Plugin
- * https://github.com/carhartl/jquery-cookie
- *
- * Copyright 2011, Klaus Hartl
- * Dual licensed under the MIT or GPL Version 2 licenses.
- * http://www.opensource.org/licenses/mit-license.php
- * http://www.opensource.org/licenses/GPL-2.0
- */
-(function($) {
-    $.cookie = function(key, value, options) {
-
-        // key and at least value given, set cookie...
-        if (arguments.length > 1 && (!/Object/.test(Object.prototype.toString.call(value)) || value === null || value === undefined)) {
-            options = $.extend({}, options);
-
-            if (value === null || value === undefined) {
-                options.expires = -1;
-            }
-
-            if (typeof options.expires === 'number') {
-                var days = options.expires, t = options.expires = new Date();
-                t.setDate(t.getDate() + days);
-            }
-
-            value = String(value);
-
-            return (document.cookie = [
-                encodeURIComponent(key), '=', options.raw ? value : encodeURIComponent(value),
-                options.expires ? '; expires=' + options.expires.toUTCString() : '', // use expires attribute, max-age is not supported by IE
-                options.path    ? '; path=' + options.path : '',
-                options.domain  ? '; domain=' + options.domain : '',
-                options.secure  ? '; secure' : ''
-            ].join(''));
-        }
-
-        // key and possibly options given, get cookie...
-        options = value || {};
-        var decode = options.raw ? function(s) { return s; } : decodeURIComponent;
-
-        var pairs = document.cookie.split('; ');
-        for (var i = 0, pair; pair = pairs[i] && pairs[i].split('='); i++) {
-            if (decode(pair[0]) === key) return decode(pair[1] || ''); // IE saves cookies with empty string as "c; ", e.g. without "=" as opposed to EOMB, thus pair[1] may be undefined
-        }
-        return null;
-    };
-})(jQuery);
diff --git a/view/theme/diabook/diabook-green/login.tpl b/view/theme/diabook/diabook-green/login.tpl
deleted file mode 100644
index efa7c2d6d..000000000
--- a/view/theme/diabook/diabook-green/login.tpl
+++ /dev/null
@@ -1,33 +0,0 @@
-
-<form action="$dest_url" method="post" >
-	<input type="hidden" name="auth-params" value="login" />
-
-	<div id="login_standard">
-	{{ inc field_input.tpl with $field=$lname }}{{ endinc }}
-	{{ inc field_password.tpl with $field=$lpassword }}{{ endinc }}
-	</div>
-	
-	{{ if $openid }}
-			<div id="login_openid">
-			{{ inc field_openid.tpl with $field=$lopenid }}{{ endinc }}
-			</div>
-	{{ endif }}
-	
-	<div id="login-submit-wrapper" >
-		<input type="submit" name="submit" id="login-submit-button" value="$login" />
-	</div>
-	
-   <div id="login-extra-links">
-		{{ if $register }}<a href="register" title="$register.title" id="register-link">$register.desc</a>{{ endif }}
-        <a href="lostpass" title="$lostpass" id="lost-password-link" >$lostlink</a>
-	</div>	
-	
-	{{ for $hiddens as $k=>$v }}
-		<input type="hidden" name="$k" value="$v" />
-	{{ endfor }}
-	
-	
-</form>
-
-
-<script type="text/javascript"> $(document).ready(function() { $("#id_$lname.0").focus();} );</script>
diff --git a/view/theme/diabook/diabook-green/mail_conv.tpl b/view/theme/diabook/diabook-green/mail_conv.tpl
deleted file mode 100644
index 989f17878..000000000
--- a/view/theme/diabook/diabook-green/mail_conv.tpl
+++ /dev/null
@@ -1,60 +0,0 @@
-<div class="wall-item-container $item.indent">
-	<div class="wall-item-item">
-		<div class="wall-item-info">
-			<div class="contact-photo-wrapper"
-				<a href="$mail.profile_url" target="redir" title="$mail.from_name" class="contact-photo-link" id="wall-item-photo-link-$mail.id">
-					<img src="$mail.from_photo" class="contact-photo$mail.sparkle" id="wall-item-photo-$mail.id" alt="$mail.from_name" />
-				</a>
-			</div>
-		</div>
-		<div class="wall-item-content">
-			$mail.body
-		</div>
-	</div>
-	<div class="wall-item-bottom">
-		<div class="wall-item-links">
-		</div>
-		<div class="wall-item-tags">
-		</div>
-	</div>
-	<div class="wall-item-bottom">
-		<div class="">
-		</div>
-		<div class="wall-item-actions">
-			<div class="wall-item-actions-author">
-				<a href="$mail.from_url" target="redir" class="wall-item-name-link"><span class="wall-item-name$mail.sparkle">$mail.from_name</span></a> <span class="wall-item-ago">$mail.date</span>
-			</div>
-			
-			<div class="wall-item-actions-social">
-			</div>
-			
-			<div class="wall-item-actions-tools">
-				<a href="message/drop/$mail.id" onclick="return confirmDelete();" class="icon delete s16" title="$mail.delete">$mail.delete</a>
-			</div>
-			
-		</div>
-	</div>
-	<div class="wall-item-bottom">
-	</div>
-</div>
-
-
-{#
-
-
-<div class="mail-conv-outside-wrapper">
-	<div class="mail-conv-sender" >
-		<a href="$mail.from_url" class="mail-conv-sender-url" ><img class="mframe mail-conv-sender-photo$mail.sparkle" src="$mail.from_photo" heigth="80" width="80" alt="$mail.from_name" /></a>
-	</div>
-	<div class="mail-conv-detail" >
-		<div class="mail-conv-sender-name" >$mail.from_name</div>
-		<div class="mail-conv-date">$mail.date</div>
-		<div class="mail-conv-subject">$mail.subject</div>
-		<div class="mail-conv-body">$mail.body</div>
-	<div class="mail-conv-delete-wrapper" id="mail-conv-delete-wrapper-$mail.id" ><a href="message/drop/$mail.id" class="icon drophide delete-icon mail-list-delete-icon" onclick="return confirmDelete();" title="$mail.delete" id="mail-conv-delete-icon-$mail.id" class="mail-conv-delete-icon" onmouseover="imgbright(this);" onmouseout="imgdull(this);" ></a></div><div class="mail-conv-delete-end"></div>
-	<div class="mail-conv-outside-wrapper-end"></div>
-</div>
-</div>
-<hr class="mail-conv-break" />
-
-#}
diff --git a/view/theme/diabook/diabook-green/mail_display.tpl b/view/theme/diabook/diabook-green/mail_display.tpl
deleted file mode 100644
index 8b82e95c6..000000000
--- a/view/theme/diabook/diabook-green/mail_display.tpl
+++ /dev/null
@@ -1,12 +0,0 @@
-<div id="mail-display-subject">
-	<span class="{{if $thread_seen}}seen{{else}}unseen{{endif}}">$thread_subject</span>
-	<a href="message/dropconv/$thread_id" onclick="return confirmDelete();"  title="$delete" class="mail-delete icon s22 delete"></a>
-</div>
-
-{{ for $mails as $mail }}
-	<div id="tread-wrapper-$mail.id" class="tread-wrapper">
-		{{ inc mail_conv.tpl }}{{endinc}}
-	</div>
-{{ endfor }}
-
-{{ inc prv_message.tpl }}{{ endinc }}
diff --git a/view/theme/diabook/diabook-green/mail_list.tpl b/view/theme/diabook/diabook-green/mail_list.tpl
deleted file mode 100644
index 6bc6c84f6..000000000
--- a/view/theme/diabook/diabook-green/mail_list.tpl
+++ /dev/null
@@ -1,8 +0,0 @@
-<div class="mail-list-wrapper">
-	<span class="mail-subject {{if $seen}}seen{{else}}unseen{{endif}}"><a href="message/$id" class="mail-link">$subject</a></span>
-	<span class="mail-from">$from_name</span>
-	<span class="mail-date">$date</span>
-	<span class="mail-count">$count</span>
-	
-	<a href="message/dropconv/$id" onclick="return confirmDelete();"  title="$delete" class="mail-delete icon s22 delete"></a>
-</div>
diff --git a/view/theme/diabook/diabook-green/message_side.tpl b/view/theme/diabook/diabook-green/message_side.tpl
deleted file mode 100644
index 9f1587096..000000000
--- a/view/theme/diabook/diabook-green/message_side.tpl
+++ /dev/null
@@ -1,10 +0,0 @@
-<div id="message-sidebar" class="widget">
-	<div id="message-new" class="{{ if $new.sel }}selected{{ endif }}"><a href="$new.url">$new.label</a> </div>
-	
-	<ul class="message-ul">
-		{{ for $tabs as $t }}
-			<li class="tool {{ if $t.sel }}selected{{ endif }}"><a href="$t.url" class="message-link">$t.label</a></li>
-		{{ endfor }}
-	</ul>
-	
-</div>
diff --git a/view/theme/diabook/diabook-green/nav.tpl b/view/theme/diabook/diabook-green/nav.tpl
deleted file mode 100644
index 5f316bcdd..000000000
--- a/view/theme/diabook/diabook-green/nav.tpl
+++ /dev/null
@@ -1,190 +0,0 @@
-<header>
-	<div id="site-location">$sitelocation</div>
-	<div id="banner">$banner</div>
-</header>
-<nav>
-			
-			
-	<ul>
-			
-			
-			{{ if $nav.network }}
-			<li id="nav-network-link" class="nav-menu-icon">
-				<a class="$nav.network.2" href="$nav.network.0" title="$nav.network.3" >
-				<span class="icon notifications">Benachrichtigungen</span>
-				<span id="net-update" class="nav-notify"></span></a>
-			</li>
-		    {{ endif }}
-	
-			{{ if $nav.contacts }}
-			<li class="nav-menu-icon" id="nav-contacts-linkmenu">
-				<a href="$nav.contacts.0" rel="#nav-contacts-menu" title="$nav.contacts.1">
-				<span class="icon contacts">$nav.contacts.1</span>
-				<span id="intro-update" class="nav-notify"></span></a>
-				<ul id="nav-contacts-menu" class="menu-popup">
-					<li id="nav-contacts-see-intro"><a href="$nav.notifications.0">$nav.introductions.1</a><span id="intro-update-li" class="nav-notify"></span></li>
-					<li id="nav-contacts-all"><a href="contacts">$nav.contacts.1</a></li> 
-				</ul>
-			</li>	
-
-			{{ endif }}
-			
-			{{ if $nav.messages }}
-			<li  id="nav-messages-linkmenu" class="nav-menu-icon">
-			  <a href="$nav.messages.0" rel="#nav-messages-menu" title="$nav.messages.1">
-			  <span class="icon messages">$nav.messages.1</span>
-				<span id="mail-update" class="nav-notify"></span></a>
-				<ul id="nav-messages-menu" class="menu-popup">
-					<li id="nav-messages-see-all"><a href="$nav.messages.0">$nav.messages.1</a></li>
-					<li id="nav-messages-see-all"><a href="$nav.messages.new.0">$nav.messages.new.1</a></li>
-				</ul>
-			</li>		
-			{{ endif }}
-		
-      {{ if $nav.notifications }}
-			<li  id="nav-notifications-linkmenu" class="nav-menu-icon">
-			<a href="$nav.notifications.0" rel="#nav-notifications-menu" title="$nav.notifications.1">
-			<span class="icon notify">$nav.notifications.1</span>
-				<span id="notify-update" class="nav-notify"></span></a>
-				<ul id="nav-notifications-menu" class="menu-popup">
-					<li id="nav-notifications-mark-all"><a href="#" onclick="notifyMarkAll(); return false;">$nav.notifications.mark.1</a></li>
-					<li id="nav-notifications-see-all"><a href="$nav.notifications.all.0">$nav.notifications.all.1</a></li>
-					<li class="empty">$emptynotifications</li>
-				</ul>
-			</li>		
-		{{ endif }}	
-			
-		{{ if $nav.search}}
-		<li id="search-box">
-			<form method="get" action="$nav.search.0">
-				<input id="search-text" class="nav-menu-search" type="text" value="" name="search">
-			</form>
-		</li>		
-		{{ endif }}	
-		
-		<li  style="width: 1%; height: 1px;float: right;"></li>	
-		
-		<li id="nav-site-linkmenu" class="nav-menu-icon"><a href="#" rel="#nav-site-menu"><span class="icon s22 gear">Site</span></a>
-			<ul id="nav-site-menu" class="menu-popup">
-				{{ if $nav.manage }}<li><a class="$nav.manage.2" href="$nav.manage.0" title="$nav.manage.3">$nav.manage.1</a></li>{{ endif }}				
-
-				{{ if $nav.settings }} <li><a class="$nav.search.2" onClick="restore_boxes()" title="Restore right-hand column" style="cursor: pointer;">Restore right-hand column</a></li>{{ endif }}
-										
-				{{ if $nav.help }} <li><a class="$nav.help.2" target="friendika-help" href="$nav.help.0" title="$nav.help.3" >$nav.help.1</a></li>{{ endif }}									
-										
-										 <li><a class="$nav.search.2" href="friendica" title="Site Info / Impressum" >Info/Impressum</a></li>
-										
-				{{ if $nav.settings }}<li><a class="menu-sep $nav.settings.2" href="$nav.settings.0" title="$nav.settings.3">$nav.settings.1</a></li>{{ endif }}
-				{{ if $nav.admin }}<li><a class="$nav.admin.2" href="$nav.admin.0" title="$nav.admin.3" >$nav.admin.1</a></li>{{ endif }}
-
-				{{ if $nav.logout }}<li><a class="menu-sep $nav.logout.2" href="$nav.logout.0" title="$nav.logout.3" >$nav.logout.1</a></li>{{ endif }}
-
-				
-			</ul>		
-		</li>
-		
-		
-		{{ if $nav.directory }}
-		<li id="nav-directory-link" class="nav-menu $sel.directory">
-			<a class="$nav.directory.2" href="$nav.directory.0" title="$nav.directory.3" >$nav.directory.1</a>
-		</li>
-		{{ endif }}
-		
-		{{ if $nav.apps }}
-			<li id="nav-apps-link" class="nav-menu $sel.apps">
-				<a class=" $nav.apps.2" href="#" rel="#nav-apps-menu" title="$nav.apps.3" >$nav.apps.1</a>
-				<ul id="nav-apps-menu" class="menu-popup">
-					{{ for $apps as $ap }}
-					<li>$ap</li>
-					{{ endfor }}
-				</ul>
-			</li>	
-		{{ endif }}		
-		
-      {{ if $nav.home }}
-			<li id="nav-home-link" class="nav-menu $sel.home">
-				<a class="$nav.home.2" href="$nav.home.0" title="$nav.home.3" >$nav.home.1
-				<span id="home-update" class="nav-notify"></span></a>
-			</li>
-		{{ endif }}		
-		
-		{{ if $userinfo }}
-			<li id="nav-user-linkmenu" class="nav-menu-icon"><a href="#" rel="#nav-user-menu" title="$sitelocation"><img src="$userinfo.icon" alt="$userinfo.name"></a>
-				<ul id="nav-user-menu" class="menu-popup">
-					{{ for $nav.usermenu as $usermenu }}
-						<li><a class="$usermenu.2" href="$usermenu.0" title="$usermenu.3">$usermenu.1</a></li>
-					{{ endfor }}
-					
-					{{ if $nav.profiles }}<li><a class="menu-sep $nav.profiles.2" href="$nav.profiles.0" title="$nav.profiles.3" >$nav.profiles.3</a></li>{{ endif }}
-					{{ if $nav.notifications }}<li><a class="$nav.notifications.2" href="$nav.notifications.0" title="$nav.notifications.3" >$nav.notifications.1</a></li>{{ endif }}
-					{{ if $nav.messages }}<li><a class="$nav.messages.2" href="$nav.messages.0" title="$nav.messages.3" >$nav.messages.1</a></li>{{ endif }}
-					{{ if $nav.contacts }}<li><a class="$nav.contacts.2" href="$nav.contacts.0" title="$nav.contacts.3" >$nav.contacts.1</a></li>{{ endif }}	
-				</ul>
-			</li>
-		{{ endif }}
-		
-					{{ if $nav.login }}
-					<li id="nav-home-link" class="nav-menu $sel.home">
-						<a class="$nav.login.2" href="$nav.login.0" title="$nav.login.3" >$nav.login.1</a>
-					<li>
-					{{ endif }}
-		
-		
-		
-	</ul>	
-
-
-	
-</nav>
-
-
-<div style="position: fixed; bottom: 5px; right: 10px;"><a href="javascript:scroll(0,0); "><img src="view/theme/diabook/icons/scroll_top.png" title="scroll to top"></a></div>
-<div style="position: fixed; bottom: 3px; left: 25px;">$langselector</div>
-<div style="position: fixed; bottom: 23px; left: 5px;"><a href="http://pad.toktan.org/p/diabook" target="blank" ><img src="view/theme/diabook/icons/bluebug.png" title="report bugs for the theme diabook"/></a></div>
-
-
-
-
-<ul id="nav-notifications-template" style="display:none;" rel="template">
-	<li class="{4}"><a href="{0}"><img src="{1}">{2} <span class="notif-when">{3}</span></a></li>
-</ul>
-
-
-
-{#
-
-{{ if $nav.logout }}<a id="nav-logout-link" class="nav-link $nav.logout.2" href="$nav.logout.0" title="$nav.logout.3" >$nav.logout.1</a> {{ endif }}
-{{ if $nav.login }}<a id="nav-login-link" class="nav-login-link $nav.login.2" href="$nav.login.0" title="$nav.login.3" >$nav.login.1</a> {{ endif }}
-
-<span id="nav-link-wrapper" >
-
-{{ if $nav.register }}<a id="nav-register-link" class="nav-commlink $nav.register.2" href="$nav.register.0" title="$nav.register.3" >$nav.register.1</a>{{ endif }}
-	
-<a id="nav-help-link" class="nav-link $nav.help.2" target="friendika-help" href="$nav.help.0" title="$nav.help.3" >$nav.help.1</a>
-	
-{{ if $nav.apps }}<a id="nav-apps-link" class="nav-link $nav.apps.2" href="$nav.apps.0" title="$nav.apps.3" >$nav.apps.1</a>{{ endif }}
-
-<a id="nav-search-link" class="nav-link $nav.search.2" href="$nav.search.0" title="$nav.search.3" >$nav.search.1</a>
-<a id="nav-directory-link" class="nav-link $nav.directory.2" href="$nav.directory.0" title="$nav.directory.3" >$nav.directory.1</a>
-
-{{ if $nav.admin }}<a id="nav-admin-link" class="nav-link $nav.admin.2" href="$nav.admin.0" title="$nav.admin.3" >$nav.admin.1</a>{{ endif }}
-
-{{ if $nav.notifications }}
-<a id="nav-notify-link" class="nav-commlink $nav.notifications.2" href="$nav.notifications.0" title="$nav.notifications.3" >$nav.notifications.1</a>
-<span id="notify-update" class="nav-ajax-left"></span>
-{{ endif }}
-{{ if $nav.messages }}
-<a id="nav-messages-link" class="nav-commlink $nav.messages.2" href="$nav.messages.0" title="$nav.messages.3" >$nav.messages.1</a>
-<span id="mail-update" class="nav-ajax-left"></span>
-{{ endif }}
-
-{{ if $nav.manage }}<a id="nav-manage-link" class="nav-commlink $nav.manage.2" href="$nav.manage.0" title="$nav.manage.3">$nav.manage.1</a>{{ endif }}
-
-{{ if $nav.settings }}<a id="nav-settings-link" class="nav-link $nav.settings.2" href="$nav.settings.0" title="$nav.settings.3">$nav.settings.1</a>{{ endif }}
-{{ if $nav.profiles }}<a id="nav-profiles-link" class="nav-link $nav.profiles.2" href="$nav.profiles.0" title="$nav.profiles.3" >$nav.profiles.1</a>{{ endif }}
-
-
-</span>
-<span id="nav-end"></span>
-<span id="banner">$banner</span>
-#}
diff --git a/view/theme/diabook/diabook-green/nets.tpl b/view/theme/diabook/diabook-green/nets.tpl
deleted file mode 100644
index be25ddee1..000000000
--- a/view/theme/diabook/diabook-green/nets.tpl
+++ /dev/null
@@ -1,15 +0,0 @@
-<div id="profile_side">
-	<h3 style="margin-left: 2px;">$title</h3>
-	<div id="nets-desc">$desc</div>
-   
-	<ul class="menu-profile-side">
-	<li class="menu-profile-list">
-	<span class="menu-profile-icon {{ if $sel_all }}group_selected{{else}}group_unselected{{ endif }}"></span>	
-	<a style="text-decoration: none;" href="$base" class="menu-profile-list-item">$all</a></li>
-	{{ for $nets as $net }}
-	<li class="menu-profile-list">
-	<span class="menu-profile-icon {{ if $net.selected }}group_selected{{else}}group_unselected{{ endif }}"></span>	
-	<a href="$base?nets=$net.ref" class="menu-profile-list-item">$net.name</a></li>
-	{{ endfor }}
-	</ul>
-</div>
diff --git a/view/theme/diabook/diabook-green/oembed_video.tpl b/view/theme/diabook/diabook-green/oembed_video.tpl
deleted file mode 100644
index d6d29f724..000000000
--- a/view/theme/diabook/diabook-green/oembed_video.tpl
+++ /dev/null
@@ -1,4 +0,0 @@
-<a class="embed_yt" href='$embedurl' onclick='this.innerHTML=Base64.decode("$escapedhtml"); yt_iframe(); return false;' style='float:left; margin: 1em; position: relative;'>
-	<img width='$tw' height='$th' src='$turl' >
-	<div style='position: absolute; top: 0px; left: 0px; width: $twpx; height: $thpx; background: url(images/icons/48/play.png) no-repeat center center;'></div>
-</a>
diff --git a/view/theme/diabook/diabook-green/photo_item.tpl b/view/theme/diabook/diabook-green/photo_item.tpl
deleted file mode 100644
index 5d65a89b7..000000000
--- a/view/theme/diabook/diabook-green/photo_item.tpl
+++ /dev/null
@@ -1,65 +0,0 @@
-{{ if $indent }}{{ else }}
-<div class="wall-item-decor">
-	<img id="like-rotator-$id" class="like-rotator" src="images/rotator.gif" alt="$wait" title="$wait" style="display: none;" />
-</div>
-{{ endif }}
-
-<div class="wall-item-photo-container $indent">
-	<div class="wall-item-item">
-		<div class="wall-item-info">
-			<div class="contact-photo-wrapper" >
-				<a href="$profile_url" target="redir" title="" class="contact-photo-link" id="wall-item-photo-link-$id">
-					<img src="$thumb" class="contact-photo$sparkle" id="wall-item-photo-$id" alt="$name" />
-				</a>
-				<a href="#" rel="#wall-item-photo-menu-$id" class="contact-photo-menu-button icon s16 menu" id="wall-item-photo-menu-button-$id">menu</a>
-				<ul class="contact-menu menu-popup" id="wall-item-photo-menu-$id">
-				$photo_menu
-				</ul>
-				
-			</div>
-		</div>
-			<div class="wall-item-actions-author">
-				<a href="$profile_url" target="redir" title="$name" class="wall-item-name-link"><span class="wall-item-name$sparkle">$name</span></a> 
-			<span class="wall-item-ago">-
-			{{ if $plink }}<a class="link" title="$plink.title" href="$plink.href" style="color: #999">$ago</a>{{ else }} $ago {{ endif }}
-			{{ if $lock }} - <span class="fakelink" style="color: #999" onclick="lockview(event,$id);">$lock</span> {{ endif }}
-			</span>
-			</div>
-		<div class="wall-item-content">
-			{{ if $title }}<h2><a href="$plink.href">$title</a></h2>{{ endif }}
-			$body
-		</div>
-	</div>
-	<div class="wall-item-bottom">
-		<div class="wall-item-links">
-		</div>
-		<div class="wall-item-tags">
-			{{ for $tags as $tag }}
-				<span class='tag'>$tag</span>
-			{{ endfor }}
-		</div>
-	</div>
-	
-	<div class="wall-item-bottom" style="display: table-row;">
-		<div class="wall-item-actions">
-	   </div>
-		<div class="wall-item-actions">
-			
-			<div class="wall-item-actions-tools">
-
-				{{ if $drop.dropping }}
-					<input type="checkbox" title="$drop.select" name="itemselected[]" class="item-select" value="$id" />
-					<a href="item/drop/$id" onclick="return confirmDelete();" class="icon drop" title="$drop.delete">$drop.delete</a>
-				{{ endif }}
-				{{ if $edpost }}
-					<a class="icon pencil" href="$edpost.0" title="$edpost.1"></a>
-				{{ endif }}
-			</div>
-
-		</div>
-	</div>
-	<div class="wall-item-bottom">
-			
-	</div>
-</div>
-
diff --git a/view/theme/diabook/diabook-green/photo_view.tpl b/view/theme/diabook/diabook-green/photo_view.tpl
deleted file mode 100644
index 071972e0c..000000000
--- a/view/theme/diabook/diabook-green/photo_view.tpl
+++ /dev/null
@@ -1,35 +0,0 @@
-<div id="live-display"></div>
-<h3><a href="$album.0">$album.1</a></h3>
-
-<div id="photo-edit-link-wrap">
-{{ if $tools }}
-<a id="photo-edit-link" href="$tools.edit.0">$tools.edit.1</a>
--
-<a id="photo-toprofile-link" href="$tools.profile.0">$tools.profile.1</a>
-{{ endif }}
-{{ if $lock }} - <img src="images/lock_icon.gif" class="lockview" alt="$lock" onclick="lockview(event,'photo$id');" /> {{ endif }}
-</div>
-
-<div id="photo-photo">
-	{{ if $prevlink }}<div id="photo-prev-link"><a href="$prevlink.0">$prevlink.1</a></div>{{ endif }}
-	<a href="$photo.href" class="lightbox" title="$photo.title"><img src="$photo.src" /></a>
-	{{ if $nextlink }}<div id="photo-next-link"><a href="$nextlink.0">$nextlink.1</a></div>{{ endif }}
-</div>
-
-<div id="photo-photo-end"></div>
-<div id="photo-caption" >$desc</div>
-{{ if $tags }}
-<div id="in-this-photo-text">$tags.0</div>
-<div id="in-this-photo">$tags.1</div>
-{{ endif }}
-{{ if $tags.2 }}<div id="tag-remove"><a href="$tags.2">$tags.3</a></div>{{ endif }}
-
-{{ if $edit }}$edit{{ endif }}
-
-<div style="margin-top:20px">
-</div>
-<div id="wall-photo-container">
-$comments
-</div>
-
-$paginate
diff --git a/view/theme/diabook/diabook-green/profile_side.tpl b/view/theme/diabook/diabook-green/profile_side.tpl
deleted file mode 100644
index 01e80f238..000000000
--- a/view/theme/diabook/diabook-green/profile_side.tpl
+++ /dev/null
@@ -1,21 +0,0 @@
-<div id="profile_side">
-	<div id="ps-usernameicon">
-		<a href="$ps.usermenu.status.0" title="$userinfo.name">
-			<img src="$userinfo.icon" id="ps-usericon" alt="$userinfo.name">
-		</a>
-		<a href="$ps.usermenu.status.0" id="ps-username" title="$userinfo.name">$userinfo.name</a>
-	</div>
-	
-<ul id="profile-side-menu" class="menu-profile-side">
-	<li id="profile-side-status" class="menu-profile-list"><a class="menu-profile-list-item" href="$ps.usermenu.status.0">$ps.usermenu.status.1<span class="menu-profile-icon home"></span></a></li>
-	<li id="profile-side-photos" class="menu-profile-list photos"><a class="menu-profile-list-item" href="$ps.usermenu.photos.0">$ps.usermenu.photos.1<span class="menu-profile-icon photos"></span></a></li>
-	<li id="profile-side-photos" class="menu-profile-list pscontacts"><a class="menu-profile-list-item" href="$ps.usermenu.contacts.0">$ps.usermenu.contacts.1<span class="menu-profile-icon pscontacts"></span></a></li>		
-	<li id="profile-side-events" class="menu-profile-list events"><a class="menu-profile-list-item" href="$ps.usermenu.events.0">$ps.usermenu.events.1<span class="menu-profile-icon events"></span></a></li>
-	<li id="profile-side-notes" class="menu-profile-list notes"><a class="menu-profile-list-item" href="$ps.usermenu.notes.0">$ps.usermenu.notes.1<span class="menu-profile-icon notes"></span></a></li>
-	<li id="profile-side-foren" class="menu-profile-list foren"><a class="menu-profile-list-item" href="$ps.usermenu.pgroups.0" target="blanc">$ps.usermenu.pgroups.1<span class="menu-profile-icon foren"></span></a></li>
-	<li id="profile-side-foren" class="menu-profile-list com_side"><a class="menu-profile-list-item" href="$ps.usermenu.community.0">$ps.usermenu.community.1<span class="menu-profile-icon com_side"></span></a></li>
-</ul>
-
-</div>
-
-				
diff --git a/view/theme/diabook/diabook-green/profile_vcard.tpl b/view/theme/diabook/diabook-green/profile_vcard.tpl
deleted file mode 100644
index 6fcffcc9b..000000000
--- a/view/theme/diabook/diabook-green/profile_vcard.tpl
+++ /dev/null
@@ -1,64 +0,0 @@
-<div class="vcard">
-
-	<div class="tool">
-		<div class="fn label">$profile.name</div>
-		{{ if $profile.edit }}
-			<div class="action">
-			<a class="icon s16 edit ttright" href="#" rel="#profiles-menu" title="$profile.edit.3"><span>$profile.edit.1</span></a>
-			<ul id="profiles-menu" class="menu-popup">
-				{{ for $profile.menu.entries as $e }}
-				<li>
-					<a href="profiles/$e.id"><img src='$e.photo'>$e.profile_name</a>
-				</li>
-				{{ endfor }}
-				<li><a href="profile_photo" >$profile.menu.chg_photo</a></li>
-				<li><a href="profiles/new" id="profile-listing-new-link">$profile.menu.cr_new</a></li>
-				<li><a href="profiles" >$profile.edit.3</a></li>
-								
-			</ul>
-			</div>
-		{{ endif }}
-	</div>
-				
-	
-
-	<div id="profile-photo-wrapper"><img class="photo"  src="$profile.photo?rev=$profile.picdate" alt="$profile.name" /></div>
-	{{ if $pdesc }}<div class="title">$profile.pdesc</div>{{ endif }}
-
-
-	{{ if $location }}
-		<dl class="location"><dt class="location-label">$location</dt><br> 
-		<dd class="adr">
-			{{ if $profile.address }}<div class="street-address">$profile.address</div>{{ endif }}
-			<span class="city-state-zip">
-				<span class="locality">$profile.locality</span>{{ if $profile.locality }}, {{ endif }}
-				<span class="region">$profile.region</span>
-				<span class="postal-code">$profile.postal-code</span>
-			</span>
-			{{ if $profile.country-name }}<span class="country-name">$profile.country-name</span>{{ endif }}
-		</dd>
-		</dl>
-	{{ endif }}
-
-	{{ if $gender }}<dl class="mf"><dt class="gender-label">$gender</dt> <dd class="x-gender">$profile.gender</dd></dl>{{ endif }}
-	
-	{{ if $profile.pubkey }}<div class="key" style="display:none;">$profile.pubkey</div>{{ endif }}
-
-	{{ if $marital }}<dl class="marital"><dt class="marital-label"><span class="heart">&hearts;</span>$marital</dt><dd class="marital-text">$profile.marital</dd></dl>{{ endif }}
-
-	{{ if $homepage }}<dl class="homepage"><dt class="homepage-label">$homepage</dt><dd class="homepage-url"><a href="$profile.homepage" target="external-link">$profile.homepage</a></dd></dl>{{ endif }}
-
-	{{ inc diaspora_vcard.tpl }}{{ endinc }}
-	
-	<div id="profile-extra-links">
-		<ul>
-			{{ if $connect }}
-				<li><a id="dfrn-request-link" href="dfrn_request/$profile.nickname">$connect</a></li>
-			{{ endif }}
-		</ul>
-	</div>
-</div>
-
-$contact_block
-
-
diff --git a/view/theme/diabook/diabook-green/right_aside.tpl b/view/theme/diabook/diabook-green/right_aside.tpl
deleted file mode 100644
index a65677696..000000000
--- a/view/theme/diabook/diabook-green/right_aside.tpl
+++ /dev/null
@@ -1,20 +0,0 @@
-<div id="profile_side">
-	<div id="ps-usernameicon">
-		<a href="$ps.usermenu.status.0" title="$userinfo.name">
-			<img src="$userinfo.icon" id="ps-usericon" alt="$userinfo.name">
-		</a>
-		<a href="$ps.usermenu.status.0" id="ps-username" title="$userinfo.name">$userinfo.name</a>
-	</div>
-	
-<ul id="profile-side-menu" class="menu-profile-side">
-	<li id="profile-side-status" class="menu-profile-list home"><a class="menu-profile-list-item" href="$ps.usermenu.status.0">$ps.usermenu.status.1</a></li>
-	<li id="profile-side-photos" class="menu-profile-list photos"><a class="menu-profile-list-item" href="$ps.usermenu.photos.0">$ps.usermenu.photos.1</a></li>
-	<li id="profile-side-events" class="menu-profile-list events"><a class="menu-profile-list-item" href="$ps.usermenu.events.0">$ps.usermenu.events.1</a></li>
-	<li id="profile-side-notes" class="menu-profile-list notes"><a class="menu-profile-list-item" href="$ps.usermenu.notes.0">$ps.usermenu.notes.1</a></li>
-	<li id="profile-side-foren" class="menu-profile-list foren"><a class="menu-profile-list-item" href="http://dir.friendika.com/directory/forum" target="blanc">Public Groups</a></li>
-	<li id="profile-side-foren" class="menu-profile-list com_side"><a class="menu-profile-list-item" href="$ps.usermenu.community.0">$ps.usermenu.community.1</a></li>
-</ul>
-
-</div>
-
-				
\ No newline at end of file
diff --git a/view/theme/diabook/diabook-green/screenshot.png b/view/theme/diabook/diabook-green/screenshot.png
deleted file mode 100644
index 4eee5be5a..000000000
--- a/view/theme/diabook/diabook-green/screenshot.png
+++ /dev/null
diff --git a/view/theme/diabook/diabook-green/search_item.tpl b/view/theme/diabook/diabook-green/search_item.tpl
deleted file mode 100644
index 123834064..000000000
--- a/view/theme/diabook/diabook-green/search_item.tpl
+++ /dev/null
@@ -1,100 +0,0 @@
-{{ if $item.indent }}{{ else }}
-<div class="wall-item-decor">
-	<img id="like-rotator-$item.id" class="like-rotator" src="images/rotator.gif" alt="$item.wait" title="$item.wait" style="display: none;" />
-</div>
-{{ endif }}
-<div class="wall-item-container $item.indent">
-	<div class="wall-item-item">
-		<div class="wall-item-info">
-			<div class="contact-photo-wrapper"
-				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" target="redir" title="$item.linktitle" class="contact-photo-link" id="wall-item-photo-link-$item.id">
-					<img src="$item.thumb" class="contact-photo$item.sparkle" id="wall-item-photo-$item.id" alt="$item.name" />
-				</a>
-				<a href="#" rel="#wall-item-photo-menu-$item.id" class="contact-photo-menu-button icon s16 menu" id="wall-item-photo-menu-button-$item.id">menu</a>
-				<ul class="contact-menu menu-popup" id="wall-item-photo-menu-$item.id">
-				$item.item_photo_menu
-				</ul>
-				
-			</div>
-		</div>
-			<div class="wall-item-actions-author">
-				<a href="$item.profile_url" target="redir" title="$item.linktitle" class="wall-item-name-link"><span class="wall-item-name$item.sparkle">$item.name</span></a> 
-			<span class="wall-item-ago">-
-			{{ if $item.plink }}<a class="link" title="$item.plink.title" href="$item.plink.href" style="color: #999">$item.ago</a>{{ else }} $item.ago {{ endif }}
-			{{ if $item.lock }} - <span class="fakelink" style="color: #999" onclick="lockview(event,$item.id);">$item.lock</span> {{ endif }}
-			</span>
-			</div>
-		<div class="wall-item-content">
-			{{ if $item.title }}<h2><a href="$item.plink.href">$item.title</a></h2>{{ endif }}
-			$item.body
-		</div>
-	</div>
-	<div class="wall-item-bottom">
-		<div class="wall-item-links">
-		</div>
-		<div class="wall-item-tags">
-			{{ for $item.tags as $tag }}
-				<span class='tag'>$tag</span>
-			{{ endfor }}
-		</div>
-	</div>
-	<div class="wall-item-bottom">
-		<div class="">
-
-		</div>
-		<div class="wall-item-actions">
-
-			<div class="wall-item-actions-social">
-			
-			
-			{{ if $item.vote }}
-				<a href="#" id="like-$item.id" class="icon like" title="$item.vote.like.0" onclick="dolike($item.id,'like'); return false">$item.vote.like.1</a>
-				<a href="#" id="dislike-$item.id" class="icon dislike" title="$item.vote.dislike.0" onclick="dolike($item.id,'dislike'); return false"></a>
-			{{ endif }}
-						
-			{{ if $item.vote.share }}
-				<a href="#" id="share-$item.id" class="icon recycle" title="$item.vote.share.0" onclick="jotShare($item.id); return false"></a>
-			{{ endif }}	
-
-
-			{{ if $item.star }}
-				<a href="#" id="starred-$item.id" onclick="dostar($item.id); return false;" class="star-item icon $item.isstarred" title="$item.star.toggle">
-				<img src="images/star_dummy.png" class="icon star" alt="$item.star.do" /> </a>
-				<a href="#" id="tagger-$item.id" onclick="itemTag($item.id); return false;" class="tag-item icon tagged" title="$item.star.tagger"></a>					  
-			{{ endif }}	
-			
-			{{ if $item.filer }}
-			<a href="#" id="filer-$item.id" onclick="itemFiler($item.id); return false;" class="filer-item icon file-as" title="$item.star.filer"></a>
-			{{ endif }}				
-			
-			{{ if $item.plink }}<a class="icon link" title="$item.plink.title" href="$item.plink.href">$item.plink.title</a>{{ endif }}
-			
-					
-					
-			</div>
-			
-			<div class="wall-item-actions-tools">
-
-				{{ if $item.drop.dropping }}
-					<input type="checkbox" title="$item.drop.select" name="itemselected[]" class="item-select" value="$item.id" />
-					<a href="item/drop/$item.id" onclick="return confirmDelete();" class="icon drop" title="$item.drop.delete">$item.drop.delete</a>
-				{{ endif }}
-				{{ if $item.edpost }}
-					<a class="icon pencil" href="$item.edpost.0" title="$item.edpost.1"></a>
-				{{ endif }}
-			</div>
-			<div class="wall-item-location">$item.location&nbsp;</div>
-		</div>
-	</div>
-	<div class="wall-item-bottom">
-		<div class="wall-item-links"></div>
-		<div class="wall-item-like" id="wall-item-like-$item.id">$item.like</div>
-		<div class="wall-item-dislike" id="wall-item-dislike-$item.id">$item.dislike</div>	
-	</div>
-</div>
-
-<div class="wall-item-comment-wrapper" >
-	$item.comment
-</div>
diff --git a/view/theme/diabook/diabook-green/style-network-wide.css b/view/theme/diabook/diabook-green/style-network-wide.css
index 5cdcb9132..cc598b9fe 100644
--- a/view/theme/diabook/diabook-green/style-network-wide.css
+++ b/view/theme/diabook/diabook-green/style-network-wide.css
@@ -121,7 +121,7 @@
 			  display: block; width: 28px; height: 28px; background-repeat: no-repeat;
 			  }	
 .video 	{ background-image: url("../diabook-green/icons/video.png"); 
-			  display: block; width: 100%; height: 28px; background-repeat: no-repeat;
+			  display: block; width: 100%; height: 140px; background-repeat: no-repeat;
 			  }
 .audio2 	{ background-image: url("../diabook-green/icons/audio.png"); 
 			  display: block; width: 28px; height: 28px; background-repeat: no-repeat;
@@ -1371,7 +1371,7 @@ transition: all 0.2s ease-in-out;
   max-width: 690px;
   word-wrap: break-word;
 
-  margin-bottom: 14px;
+
 }
 /*marker*/
 .wall-item-container .wall-item-content img {
diff --git a/view/theme/diabook/diabook-green/style-network.css b/view/theme/diabook/diabook-green/style-network.css
index 41ddc7442..786547711 100644
--- a/view/theme/diabook/diabook-green/style-network.css
+++ b/view/theme/diabook/diabook-green/style-network.css
@@ -121,7 +121,7 @@
 			  display: block; width: 28px; height: 28px; background-repeat: no-repeat;
 			  }	
 .video 	{ background-image: url("../diabook-green/icons/video.png"); 
-			  display: block; width: 100%; height: 28px; background-repeat: no-repeat;
+			  display: block; width: 100%; height: 140px; background-repeat: no-repeat;
 			  }
 .audio2 	{ background-image: url("../diabook-green/icons/audio.png"); 
 			  display: block; width: 28px; height: 28px; background-repeat: no-repeat;
@@ -1365,7 +1365,7 @@ transition: all 0.2s ease-in-out;
   max-width: 420px;
   word-wrap: break-word;
 
-  margin-bottom: 14px;
+
 }
 
 .wall-item-container .wall-item-content img {
diff --git a/view/theme/diabook/diabook-green/style-profile-wide.css b/view/theme/diabook/diabook-green/style-profile-wide.css
index f1bf0d5ff..65b7f2ba3 100644
--- a/view/theme/diabook/diabook-green/style-profile-wide.css
+++ b/view/theme/diabook/diabook-green/style-profile-wide.css
@@ -121,7 +121,7 @@
 			  display: block; width: 28px; height: 28px; background-repeat: no-repeat;
 			  }	
 .video 	{ background-image: url("../diabook-green/icons/video.png"); 
-			  display: block; width: 100%; height: 28px; background-repeat: no-repeat;
+			  display: block; width: 100%; height: 140px; background-repeat: no-repeat;
 			  }
 .audio2 	{ background-image: url("../diabook-green/icons/audio.png"); 
 			  display: block; width: 28px; height: 28px; background-repeat: no-repeat;
@@ -1346,7 +1346,7 @@ transition: all 0.2s ease-in-out;
   max-width: 690px;
   word-wrap: break-word;
 
-  margin-bottom: 14px;
+
 }
 /*marker*/
 .wall-item-container .wall-item-content img {
diff --git a/view/theme/diabook/diabook-green/style-profile.css b/view/theme/diabook/diabook-green/style-profile.css
index ef196bede..dcc7b373a 100644
--- a/view/theme/diabook/diabook-green/style-profile.css
+++ b/view/theme/diabook/diabook-green/style-profile.css
@@ -121,7 +121,7 @@
 			  display: block; width: 28px; height: 28px; background-repeat: no-repeat;
 			  }	
 .video 	{ background-image: url("../diabook-green/icons/video.png"); 
-			  display: block; width: 100%; height: 28px; background-repeat: no-repeat;
+			  display: block; width: 100%; height: 140px; background-repeat: no-repeat;
 			  }
 .audio2 	{ background-image: url("../diabook-green/icons/audio.png"); 
 			  display: block; width: 28px; height: 28px; background-repeat: no-repeat;
@@ -1338,7 +1338,7 @@ transition: all 0.2s ease-in-out;
   max-width: 420px;
   word-wrap: break-word;
 
-  margin-bottom: 14px;
+
 }
 
 .wall-item-container .wall-item-content img {
diff --git a/view/theme/diabook/diabook-green/style-wide.css b/view/theme/diabook/diabook-green/style-wide.css
index e7243f4cb..d85ea23a6 100644
--- a/view/theme/diabook/diabook-green/style-wide.css
+++ b/view/theme/diabook/diabook-green/style-wide.css
@@ -150,7 +150,7 @@
 			  display: block; width: 28px; height: 28px; background-repeat: no-repeat;
 			  }	
 .video 	{ background-image: url("../../../view/theme/diabook/diabook-green/icons/video.png"); 
-			  display: block; width: 100%; height: 28px; background-repeat: no-repeat;
+			  display: block; width: 100%; height: 140px; background-repeat: no-repeat;
 			  }
 .audio2 	{ background-image: url("../../../view/theme/diabook/diabook-green/icons/audio.png"); 
 			  display: block; width: 28px; height: 28px; background-repeat: no-repeat;
@@ -1220,7 +1220,14 @@ aside #likes a:hover{
   margin-right: 20px;		
 	}
 #login-submit-wrapper{
-margin-bottom: 15px;
+  padding-top: 120px;
+  margin-bottom: 12px;
+	}
+aside #login-submit-button{
+  margin-left: 0px!important;	
+	}
+aside #login-extra-links{
+  padding-top: 0px!important;	
 	}
 .group_selected {
   background: url("../diabook/icons/selected.png") no-repeat left center;
@@ -1601,7 +1608,7 @@ body .pageheader{
   max-width: 690px;
   word-wrap: break-word;
 
-  margin-bottom: 14px;
+
 }
 
 .wall-item-container .wall-item-content img {
diff --git a/view/theme/diabook/diabook-green/style.css b/view/theme/diabook/diabook-green/style.css
index 273f4b5a8..c83ddd397 100644
--- a/view/theme/diabook/diabook-green/style.css
+++ b/view/theme/diabook/diabook-green/style.css
@@ -150,7 +150,7 @@
 			  display: block; width: 28px; height: 28px; background-repeat: no-repeat;
 			  }	
 .video 	{ background-image: url("../../../view/theme/diabook/diabook-green/icons/video.png"); 
-			  display: block; width: 100%; height: 28px; background-repeat: no-repeat;
+			  display: block; width: 100%; height: 140px; background-repeat: no-repeat;
 			  }
 .audio2 	{ background-image: url("../../../view/theme/diabook/diabook-green/icons/audio.png"); 
 			  display: block; width: 28px; height: 28px; background-repeat: no-repeat;
@@ -1224,7 +1224,14 @@ aside #likes a:hover{
   margin-right: 20px;		
 	}
 #login-submit-wrapper{
-margin-bottom: 15px;
+  padding-top: 120px;
+  margin-bottom: 12px;
+	}
+aside #login-submit-button{
+  margin-left: 0px!important;	
+	}
+aside #login-extra-links{
+  padding-top: 0px!important;	
 	}
 .group_selected {
   background: url("../diabook/icons/selected.png") no-repeat left center;
@@ -1600,7 +1607,7 @@ body .pageheader{
   max-width: 720px;
   word-wrap: break-word;
 
-  margin-bottom: 14px;
+
 }
 
 .wall-item-container .wall-item-content img {
diff --git a/view/theme/diabook/diabook-green/style.php b/view/theme/diabook/diabook-green/style.php
deleted file mode 100644
index b8c37fc96..000000000
--- a/view/theme/diabook/diabook-green/style.php
+++ /dev/null
@@ -1,277 +0,0 @@
-<?php
-	$line_height=false;
-	$diabook_font_size=false;
-	$resolution=false;
-	$site_line_height = get_config("diabook-aerith","line_height");
-	$site_diabook_font_size = get_config("diabook-aerith", "font_size" );
-	$site_resolution = get_config("diabook-aerith", "resolution" );
-	
-	
-	if (local_user()) {
-		$line_height = get_pconfig(local_user(), "diabook-aerith","line_height");
-		$diabook_font_size = get_pconfig(local_user(), "diabook-aerith", "font_size");
-		$resolution = get_pconfig(local_user(), "diabook-aerith", "resolution");
-	}
-	
-	if ($line_height===false) $line_height=$site_line_height;
-	if ($line_height===false) $line_height="1.3";
-	if ($diabook_font_size===false) $diabook_font_size=$site_diabook_font_size;
-	if ($diabook_font_size===false) $diabook_font_size="13";
-	if ($resolution===false) $resolution=$site_resolution;
-	if ($resolution===false) $resolution="normal";
-	
-	
-	if($resolution == "normal") {	
-	if (file_exists("$THEMEPATH/style.css")){
-		echo file_get_contents("$THEMEPATH/style.css");
-	}
-
-   if($diabook_font_size == "15"){
-		echo "
-			.wall-item-container .wall-item-content {
-  					font-size: 15px;
-  					}
-  					
-			.wall-item-photo-container .wall-item-content {
-  					font-size: 15px;
-  					}
-		";
-	}	
-	if($diabook_font_size == "14"){
-		echo "
-			.wall-item-container .wall-item-content {
-  					font-size: 14px;
-  					}
-  					
-			.wall-item-photo-container .wall-item-content {
-  					font-size: 14px;
-  					}
-		";
-	}
-	if($diabook_font_size == "13.5"){
-		echo "
-			.wall-item-container .wall-item-content {
-  					font-size: 13.5px;
-  					}
-  					
-			.wall-item-photo-container .wall-item-content {
-  					font-size: 13.5px;
-  					}
-		";
-	}
-	if($diabook_font_size == "13"){
-		echo "
-			.wall-item-container .wall-item-content {
-  					font-size: 13px;
-  					}
-  					
-			.wall-item-photo-container .wall-item-content {
-  					font-size: 13px;
-  					}
-		";
-	}
-	if($diabook_font_size == "12.5"){
-		echo "
-			.wall-item-container .wall-item-content {
-  					font-size: 12.5px;
-  					}
-  					
-			.wall-item-photo-container .wall-item-content {
-  					font-size: 12.5px;
-  					}
-		";
-	}
-	if($diabook_font_size == "12"){
-		echo "
-			.wall-item-container .wall-item-content {
-  					font-size: 12px;
-  					}
-  					
-			.wall-item-photo-container .wall-item-content {
-  					font-size: 12px;
-  					}
-		";
-	}
-	if($line_height == "1.5"){
-		echo "
-			.wall-item-container .wall-item-content {
-  					line-height: 1.5;
-  					}
-  					
-			.wall-item-photo-container .wall-item-content {
- 					line-height: 1.5;
-  					}
-		";
-	}	
-	if($line_height == "1.4"){
-		echo "
-			.wall-item-container .wall-item-content {
-  					line-height: 1.4;
-  					}
-  					
-			.wall-item-photo-container .wall-item-content {
- 					line-height: 1.4;
-  					}
-		";
-	}
-	if($line_height == "1.3"){
-		echo "
-			.wall-item-container .wall-item-content {
-  					line-height: 1.3;
-  					}
-  					
-			.wall-item-photo-container .wall-item-content {
- 					line-height: 1.3;
-  					}
-		";
-	}
-	if($line_height == "1.2"){
-		echo "
-			.wall-item-container .wall-item-content {
-  					line-height: 1.2;
-  					}
-  					
-			.wall-item-photo-container .wall-item-content {
- 					line-height: 1.2;
-  					}
-		";
-	}
-	if($line_height == "1.1"){
-		echo "
-			.wall-item-container .wall-item-content {
-  					line-height: 1.1;
-  					}
-  					
-			.wall-item-photo-container .wall-item-content {
- 					line-height: 1.1;
-  					}
-		";
-	}
-	}
-	
-	if($resolution == "wide") {	
-	if (file_exists("$THEMEPATH/style-wide.css")){
-		echo file_get_contents("$THEMEPATH/style-wide.css");
-	}
-	if($diabook_font_size == "15"){
-		echo "
-			.wall-item-container .wall-item-content {
-  					font-size: 15px;
-  					}
-  					
-			.wall-item-photo-container .wall-item-content {
-  					font-size: 15px;
-  					}
-		";
-	}
-	if($diabook_font_size == "14"){
-		echo "
-			.wall-item-container .wall-item-content {
-  					font-size: 14px;
-  					}
-  					
-			.wall-item-photo-container .wall-item-content {
-  					font-size: 14px;
-  					}
-		";
-	}
-	if($diabook_font_size == "13.5"){
-		echo "
-			.wall-item-container .wall-item-content {
-  					font-size: 13.5px;
-  					}
-  					
-			.wall-item-photo-container .wall-item-content {
-  					font-size: 13.5px;
-  					}
-		";
-	}
-	if($diabook_font_size == "13"){
-		echo "
-			.wall-item-container .wall-item-content {
-  					font-size: 13px;
-  					}
-  					
-			.wall-item-photo-container .wall-item-content {
-  					font-size: 13px;
-  					}
-		";
-	}
-	if($diabook_font_size == "12.5"){
-		echo "
-			.wall-item-container .wall-item-content {
-  					font-size: 12.5px;
-  					}
-  					
-			.wall-item-photo-container .wall-item-content {
-  					font-size: 12.5px;
-  					}
-		";
-	}
-	if($diabook_font_size == "12"){
-		echo "
-			.wall-item-container .wall-item-content {
-  					font-size: 12px;
-  					}
-  					
-			.wall-item-photo-container .wall-item-content {
-  					font-size: 12px;
-  					}
-		";
-	}
-	if($line_height == "1.5"){
-		echo "
-			.wall-item-container .wall-item-content {
-  					line-height: 1.5;
-  					}
-  					
-			.wall-item-photo-container .wall-item-content {
- 					line-height: 1.5;
-  					}
-		";
-	}	
-	if($line_height == "1.4"){
-		echo "
-			.wall-item-container .wall-item-content {
-  					line-height: 1.4;
-  					}
-  					
-			.wall-item-photo-container .wall-item-content {
- 					line-height: 1.4;
-  					}
-		";
-	}
-	if($line_height == "1.3"){
-		echo "
-			.wall-item-container .wall-item-content {
-  					line-height: 1.3;
-  					}
-  					
-			.wall-item-photo-container .wall-item-content {
- 					line-height: 1.3;
-  					}
-		";
-	}
-	if($line_height == "1.2"){
-		echo "
-			.wall-item-container .wall-item-content {
-  					line-height: 1.2;
-  					}
-  					
-			.wall-item-photo-container .wall-item-content {
- 					line-height: 1.2;
-  					}
-		";
-	}
-	if($line_height == "1.1"){
-		echo "
-			.wall-item-container .wall-item-content {
-  					line-height: 1.1;
-  					}
-  					
-			.wall-item-photo-container .wall-item-content {
- 					line-height: 1.1;
-  					}
-		";
-	}
-	}
\ No newline at end of file
diff --git a/view/theme/diabook/diabook-green/theme.php b/view/theme/diabook/diabook-green/theme.php
deleted file mode 100644
index 1518d7e8e..000000000
--- a/view/theme/diabook/diabook-green/theme.php
+++ /dev/null
@@ -1,488 +0,0 @@
-<?php
-
-/*
- * Name: Diabook-aerith
- * Description: Diabook-aerith : report bugs and request here: http://pad.toktan.org/p/diabook or contact me : thomas_bierey@friendica.eu
- * Version: (Version: 1.020)
- * Author: 
- */
-
-
-//print diabook-version for debugging
-$diabook_version = "Diabook-aerith (Version: 1.020)";
-$a->page['htmlhead'] .= sprintf('<script "%s" ></script>', $diabook_version);
-
-
-//change css on network and profilepages
-$cssFile = null;
-$resolution=false;
-$resolution = get_pconfig(local_user(), "diabook-aerith", "resolution");
-if ($resolution===false) $resolution="normal";
-
-/**
- * prints last community activity
- */
-function diabook_aerith_community_info(){
-	$a = get_app();
-
-	// last 12 users
-	$aside['$lastusers_title'] = t('Last users');
-	$aside['$lastusers_items'] = array();
-	$sql_extra = "";
-	$publish = (get_config('system','publish_all') ? '' : " AND `publish` = 1 " );
-	$order = " ORDER BY `register_date` DESC ";
-
-	$r = q("SELECT `profile`.*, `profile`.`uid` AS `profile_uid`, `user`.`nickname`
-			FROM `profile` LEFT JOIN `user` ON `user`.`uid` = `profile`.`uid` 
-			WHERE `is-default` = 1 $publish AND `user`.`blocked` = 0 $sql_extra $order LIMIT %d , %d ",
-		0,
-		9
-	);
-	$tpl = file_get_contents( dirname(__file__).'/ch_directory_item.tpl');
-	if(count($r)) {
-		$photo = 'thumb';
-		foreach($r as $rr) {
-			$profile_link = $a->get_baseurl() . '/profile/' . ((strlen($rr['nickname'])) ? $rr['nickname'] : $rr['profile_uid']);
-			$entry = replace_macros($tpl,array(
-				'$id' => $rr['id'],
-				'$profile-link' => $profile_link,
-				'$photo' => $rr[$photo],
-				'$alt-text' => $rr['name'],
-			));
-			$aside['$lastusers_items'][] = $entry;
-		}
-	}
-	
-	
-	// last 10 liked items
-	$aside['$like_title'] = t('Last likes');
-	$aside['$like_items'] = array();
-	$r = q("SELECT `T1`.`created`, `T1`.`liker`, `T1`.`liker-link`, `item`.* FROM 
-			(SELECT `parent-uri`, `created`, `author-name` AS `liker`,`author-link` AS `liker-link` 
-				FROM `item` WHERE `verb`='http://activitystrea.ms/schema/1.0/like' GROUP BY `parent-uri` ORDER BY `created` DESC) AS T1
-			INNER JOIN `item` ON `item`.`uri`=`T1`.`parent-uri` 
-			WHERE `T1`.`liker-link` LIKE '%s%%' OR `item`.`author-link` LIKE '%s%%'
-			GROUP BY `uri`
-			ORDER BY `T1`.`created` DESC
-			LIMIT 0,5",
-			$a->get_baseurl(),$a->get_baseurl()
-			);
-
-	foreach ($r as $rr) {
-		$author	 = '<a href="' . $rr['liker-link'] . '">' . $rr['liker'] . '</a>';
-		$objauthor =  '<a href="' . $rr['author-link'] . '">' . $rr['author-name'] . '</a>';
-		
-		//var_dump($rr['verb'],$rr['object-type']); killme();
-		switch($rr['verb']){
-			case 'http://activitystrea.ms/schema/1.0/post':
-				switch ($rr['object-type']){
-					case 'http://activitystrea.ms/schema/1.0/event':
-						$post_type = t('event');
-						break;
-					default:
-						$post_type = t('status');
-				}
-				break;
-			default:
-				if ($rr['resource-id']){
-					$post_type = t('photo');
-					$m=array();	preg_match("/\[url=([^]]*)\]/", $rr['body'], $m);
-					$rr['plink'] = $m[1];
-				} else {
-					$post_type = t('status');
-				}
-		}
-		$plink = '<a href="' . $rr['plink'] . '">' . $post_type . '</a>';
-
-		$aside['$like_items'][] = sprintf( t('%1$s likes %2$s\'s %3$s'), $author, $objauthor, $plink);
-		
-	}
-	
-	
-	// last 12 photos
-	$aside['$photos_title'] = t('Last photos');
-	$aside['$photos_items'] = array();
-	$r = q("SELECT `photo`.`id`, `photo`.`resource-id`, `photo`.`scale`, `photo`.`desc`, `user`.`nickname`, `user`.`username` FROM 
-				(SELECT `resource-id`, MAX(`scale`) as maxscale FROM `photo` 
-					WHERE `profile`=0 AND `contact-id`=0 AND `album` NOT IN ('Contact Photos', '%s', 'Profile Photos', '%s')
-						AND `allow_cid`='' AND `allow_gid`='' AND `deny_cid`='' AND `deny_gid`='' GROUP BY `resource-id`) AS `t1`
-				INNER JOIN `photo` ON `photo`.`resource-id`=`t1`.`resource-id` AND `photo`.`scale` = `t1`.`maxscale`,
-				`user` 
-				WHERE `user`.`uid` = `photo`.`uid`
-				AND `user`.`blockwall`=0
-				AND `user`.`hidewall`=0
-				ORDER BY `photo`.`edited` DESC
-				LIMIT 0, 9",
-				dbesc(t('Contact Photos')),
-				dbesc(t('Profile Photos'))
-				);
-		if(count($r)) {
-		$tpl = file_get_contents( dirname(__file__).'/ch_directory_item.tpl');
-		foreach($r as $rr) {
-			$photo_page = $a->get_baseurl() . '/photos/' . $rr['nickname'] . '/image/' . $rr['resource-id'];
-			$photo_url = $a->get_baseurl() . '/photo/' .  $rr['resource-id'] . '-' . $rr['scale'] .'.jpg';
-		
-			$entry = replace_macros($tpl,array(
-				'$id' => $rr['id'],
-				'$profile-link' => $photo_page,
-				'$photo' => $photo_url,
-				'$alt-text' => $rr['username']." : ".$rr['desc'],
-			));
-
-			$aside['$photos_items'][] = $entry;
-		}
-	}
-	
-	
-   
-   //nav FIND FRIENDS
-	if(local_user()) {
-	$nv = array();
-   $nv['title'] = Array("", t('Find Friends'), "", "");
-	$nv['directory'] = Array('directory', t('Local Directory'), "", "");
-	$nv['global_directory'] = Array('http://dir.friendica.com/', t('Global Directory'), "", "");
-	$nv['match'] = Array('match', t('Similar Interests'), "", "");
-	$nv['suggest'] = Array('suggest', t('Friend Suggestions'), "", "");
-	$nv['invite'] = Array('invite', t('Invite Friends'), "", "");
-	
-	$nv['search'] = '<form name="simple_bar" method="get" action="http://dir.friendika.com/directory">
-						<span class="sbox_l"></span>
-						<span class="sbox">
-						<input type="text" name="search" size="13" maxlength="50">
-						</span>
-						<span class="sbox_r" id="srch_clear"></span>';
-						
-	$aside['$nv'] = $nv;
-	};
-	//Community Page
-	if(local_user()) {
-   $page = '<div id="page-sidebar-right_aside" class="widget">
-			<div class="title tool">
-			<h3>'.t("Community Pages").'<a id="close_pages_icon"  onClick="close_pages()" class="icon close_box" title="close"></a></h3></div>
-			<div id="sidebar-page-list"><ul>';
-
-	$pagelist = array();
-
-	$contacts = q("SELECT `id`, `url`, `name`, `micro`FROM `contact`
-			WHERE `network`= 'dfrn' AND `forum` = 1 AND `uid` = %d
-			ORDER BY `name` ASC",
-			intval($a->user['uid'])
-	);
-
-	$pageD = array();
-
-	// Look if the profile is a community page
-	foreach($contacts as $contact) {
-		$pageD[] = array("url"=>$contact["url"], "name"=>$contact["name"], "id"=>$contact["id"], "micro"=>$contact['micro']);
-	};
-	
-
-	$contacts = $pageD;
-
-	foreach($contacts as $contact) {
-		$page .= '<li style="list-style-type: none;" class="tool"><img height="20" width="20" style="float: left; margin-right: 3px;" src="' . $contact['micro'] .'" alt="' . $contact['url'] . '" /> <a href="'.$a->get_baseurl().'/redir/'.$contact["id"].'" style="margin-top: 2px;" title="' . $contact['url'] . '" class="label" target="external-link">'.
-				$contact["name"]."</a></li>";
-	}
-	$page .= '</ul></div></div>';
-	//if (sizeof($contacts) > 0)
-		
-		$aside['$page'] = $page;
-	}		
-  //END Community Page	
-  //helpers
-   $helpers = array();
-	$helpers['title'] = Array("", t('Help or @NewHere ?'), "", "");
-	
-	$aside['$helpers'] = $helpers;
-   //end helpers
-   //connectable services
-   $con_services = array();
-	$con_services['title'] = Array("", t('Connect Services'), "", "");
-	
-	$aside['$con_services'] = $con_services;
-   //end connectable services
-   
-  
-   //get_baseurl	      
-   $url = $a->get_baseurl($ssl_state);   
-   $aside['$url'] = $url;
-
-	$tpl = file_get_contents(dirname(__file__).'/communityhome.tpl');
-	$a->page['right_aside'] = replace_macros($tpl, $aside);
-	
-}
-
-
-//profile_side at networkpages
-if ($a->argv[0] === "network" && local_user()){
-
-	// USER MENU
-	if(local_user()) {
-		
-		$r = q("SELECT micro FROM contact WHERE uid=%d AND self=1", intval($a->user['uid']));
-				
-		$userinfo = array(
-					'icon' => (count($r) ? $r[0]['micro']: $a->get_baseurl()."/images/default-profile-mm.jpg"),
-					'name' => $a->user['username'],
-				);	
-		$ps = array('usermenu'=>array());
-		$ps['usermenu']['status'] = Array('profile/' . $a->user['nickname'], t('Home'), "", t('Your posts and conversations'));
-		$ps['usermenu']['profile'] = Array('profile/' . $a->user['nickname']. '?tab=profile', t('Profile'), "", t('Your profile page'));
-		$ps['usermenu']['contacts'] = Array('contacts' , t('Contacts'), "", t('Your contacts'));		
-		$ps['usermenu']['photos'] = Array('photos/' . $a->user['nickname'], t('Photos'), "", t('Your photos'));
-		$ps['usermenu']['events'] = Array('events/', t('Events'), "", t('Your events'));
-		$ps['usermenu']['notes'] = Array('notes/', t('Personal notes'), "", t('Your personal photos'));
-		$ps['usermenu']['community'] = Array('community/', t('Community'), "", "");
-		$ps['usermenu']['pgroups'] = Array('http://dir.friendika.com/directory/forum', t('Community Pages'), "", "");
-
-		$tpl = get_markup_template('profile_side.tpl');
-
-		$a->page['aside'] .= replace_macros($tpl, array(
-				'$userinfo' => $userinfo,
-				'$ps' => $ps,
-			));
-
-	}
-	
-	$ccCookie = $_COOKIE['close_pages'] + $_COOKIE['close_helpers'] + $_COOKIE['close_services'] + $_COOKIE['close_friends'] + $_COOKIE['close_lastusers'] + $_COOKIE['close_lastphotos'] + $_COOKIE['close_lastlikes'];
-	
-	if($ccCookie != "7") {
-	// COMMUNITY
-	diabook_aerith_community_info();
-	
-	// CUSTOM CSS
-	if($resolution == "normal") {$cssFile = $a->get_baseurl($ssl_state)."/view/theme/diabook-aerith/style-network.css";}
-	if($resolution == "wide") {$cssFile = $a->get_baseurl($ssl_state)."/view/theme/diabook-aerith/style-network-wide.css";}
-	}
-}
-
-
-
-//right_aside at profile pages
-if ($a->argv[0].$a->argv[1] === "profile".$a->user['nickname']){
-	if($ccCookie != "7") {
-	// COMMUNITY
-	diabook_aerith_community_info();
-	
-	// CUSTOM CSS
-	if($resolution == "normal") {$cssFile = $a->get_baseurl($ssl_state)."/view/theme/diabook-aerith/style-profile.css";}
-	if($resolution == "wide") {$cssFile = $a->get_baseurl($ssl_state)."/view/theme/diabook-aerith/style-profile-wide.css";}
-	}
-}
-
-
-
-// custom css
-if (!is_null($cssFile)) $a->page['htmlhead'] .= sprintf('<link rel="stylesheet" type="text/css" href="%s" />', $cssFile);
-
-//load jquery.cookie.js
-$cookieJS = $a->get_baseurl($ssl_state)."/view/theme/diabook-aerith/js/jquery.cookie.js";
-$a->page['htmlhead'] .= sprintf('<script language="JavaScript" src="%s" ></script>', $cookieJS);
-
-//load jquery.ae.image.resize.js
-$imageresizeJS = $a->get_baseurl($ssl_state)."/view/theme/diabook-aerith/js/jquery.ae.image.resize.js";
-$a->page['htmlhead'] .= sprintf('<script language="JavaScript" src="%s" ></script>', $imageresizeJS);
-
-//load jquery.autogrow-textarea.js
-$autogrowJS = $a->get_baseurl($ssl_state)."/view/theme/diabook-aerith/js/jquery.autogrow.textarea.js";
-$a->page['htmlhead'] .= sprintf('<script language="JavaScript" src="%s" ></script>', $autogrowJS);
-
-//js scripts
-//comment-edit-wrapper on photo_view
-if ($a->argv[0].$a->argv[2] === "photos"."image"){
-
-$a->page['htmlhead'] .= '
-<script>
-	$(function(){
-	
-		$(".comment-edit-form").css("display","table");
-			
-			});
-    </script>';
-	
-}
-
-$a->page['htmlhead'] .= '
-
-<script>
- $(function() {
-	$("a.lightbox").fancybox(); // Select all links with lightbox class
- });
-  
- </script>';
- 
-$a->page['htmlhead'] .= '
-
-<script type="text/javascript">
-
-function tautogrow(id){
-		$("textarea#comment-edit-text-" +id).autogrow(); 	
- 	};
- </script>';
-
-$a->page['htmlhead'] .= '
- <script>
- 
-$(document).ready(function() {
-    $("iframe").each(function(){
-        var ifr_source = $(this).attr("src");
-        var wmode = "wmode=transparent";
-        if(ifr_source.indexOf("?") != -1) {
-            var getQString = ifr_source.split("?");
-            var oldString = getQString[1];
-            var newString = getQString[0];
-            $(this).attr("src",newString+"?"+wmode+"&"+oldString);
-        }
-        else $(this).attr("src",ifr_source+"?"+wmode);
-    });
-      
-
-});
-
-function yt_iframe() {
-	
-	$("iframe").load(function() { 
-	var ifr_src = $(this).contents().find("body iframe").attr("src");
-	$("iframe").contents().find("body iframe").attr("src", ifr_src+"&wmode=transparent");
-    });
-
-	};
-  
- </script>';
-
-if ($a->argv[0].$a->argv[1] === "profile".$a->user['nickname'] or $a->argv[0] === "network" && local_user()){
-$a->page['htmlhead'] .= '
-<script>
-
- $(function() {
-	$(".oembed.photo img").aeImageResize({height: 400, width: 400});
-  });
-</script>';
-
-
-	if($ccCookie != "7") {
-$a->page['htmlhead'] .= '
-<script>
-$("right_aside").ready(function(){
-	
-	if($.cookie("close_pages") == "1") 
-		{
-		document.getElementById( "close_pages" ).style.display = "none";
-			};
-	
-	if($.cookie("close_helpers") == "1") 
-		{
-		document.getElementById( "close_helpers" ).style.display = "none";
-			};
-			
-	if($.cookie("close_services") == "1") 
-		{
-		document.getElementById( "close_services" ).style.display = "none";
-			};
-			
-	if($.cookie("close_friends") == "1") 
-		{
-		document.getElementById( "close_friends" ).style.display = "none";
-			};
-	
-			
-	if($.cookie("close_lastusers") == "1") 
-		{
-		document.getElementById( "close_lastusers" ).style.display = "none";
-			};
-			
-	if($.cookie("close_lastphotos") == "1") 
-		{
-		document.getElementById( "close_lastphotos" ).style.display = "none";
-			};
-			
-	if($.cookie("close_lastlikes") == "1") 
-		{
-		document.getElementById( "close_lastlikes" ).style.display = "none";
-			};}
-
-);
-
-function close_pages(){
- document.getElementById( "close_pages" ).style.display = "none";
- $.cookie("close_pages","1", { expires: 365, path: "/" });
- };
- 
-function close_helpers(){
- document.getElementById( "close_helpers" ).style.display = "none";
-  $.cookie("close_helpers","1", { expires: 365, path: "/" });
- };
-
-function close_services(){
- document.getElementById( "close_services" ).style.display = "none";
- $.cookie("close_services","1", { expires: 365, path: "/" });
- };
- 
-function close_friends(){
- document.getElementById( "close_friends" ).style.display = "none";
- $.cookie("close_friends","1", { expires: 365, path: "/" });
- };
-
- 
-function close_lastusers(){
- document.getElementById( "close_lastusers" ).style.display = "none";
- $.cookie("close_lastusers","1", { expires: 365, path: "/" });
- };
-
-function close_lastphotos(){
- document.getElementById( "close_lastphotos" ).style.display = "none";
- $.cookie("close_lastphotos","1", { expires: 365, path: "/" });
- };
- 
-function close_lastlikes(){
- document.getElementById( "close_lastlikes" ).style.display = "none";
- $.cookie("close_lastlikes","1", { expires: 365, path: "/" });
- };
-</script>';}
-
-$a->page['htmlhead'] .= ' 
-<script>
-function restore_boxes(){
-	$.cookie("close_pages","2", { expires: 365, path: "/" });
-	$.cookie("close_helpers","2", { expires: 365, path: "/" });
-	$.cookie("close_services","2", { expires: 365, path: "/" });
-	$.cookie("close_friends","2", { expires: 365, path: "/" });
-	$.cookie("close_lastusers","2", { expires: 365, path: "/" });
-	$.cookie("close_lastphotos","2", { expires: 365, path: "/" });
-	$.cookie("close_lastlikes","2", { expires: 365, path: "/" });
-	alert("Right-hand column was restored. Please refresh your browser");
-  }
-</script>';}
-
-$a->page['htmlhead'] .= ' 
-
-<script type="text/javascript">
-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);
-											}
-
-	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;
-}
-</script> ';
\ No newline at end of file
diff --git a/view/theme/diabook/diabook-green/theme_settings.tpl b/view/theme/diabook/diabook-green/theme_settings.tpl
deleted file mode 100644
index 472232cf0..000000000
--- a/view/theme/diabook/diabook-green/theme_settings.tpl
+++ /dev/null
@@ -1,10 +0,0 @@
-{{inc field_select.tpl with $field=$font_size}}{{endinc}}
-
-{{inc field_select.tpl with $field=$line_height}}{{endinc}}
-
-{{inc field_select.tpl with $field=$resolution}}{{endinc}}
-
-<div class="settings-submit-wrapper">
-	<input type="submit" value="$submit" class="settings-submit" name="diabook-aerith-settings-submit" />
-</div>
-
diff --git a/view/theme/diabook/diabook-green/wall_item.tpl b/view/theme/diabook/diabook-green/wall_item.tpl
deleted file mode 100644
index 123834064..000000000
--- a/view/theme/diabook/diabook-green/wall_item.tpl
+++ /dev/null
@@ -1,100 +0,0 @@
-{{ if $item.indent }}{{ else }}
-<div class="wall-item-decor">
-	<img id="like-rotator-$item.id" class="like-rotator" src="images/rotator.gif" alt="$item.wait" title="$item.wait" style="display: none;" />
-</div>
-{{ endif }}
-<div class="wall-item-container $item.indent">
-	<div class="wall-item-item">
-		<div class="wall-item-info">
-			<div class="contact-photo-wrapper"
-				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" target="redir" title="$item.linktitle" class="contact-photo-link" id="wall-item-photo-link-$item.id">
-					<img src="$item.thumb" class="contact-photo$item.sparkle" id="wall-item-photo-$item.id" alt="$item.name" />
-				</a>
-				<a href="#" rel="#wall-item-photo-menu-$item.id" class="contact-photo-menu-button icon s16 menu" id="wall-item-photo-menu-button-$item.id">menu</a>
-				<ul class="contact-menu menu-popup" id="wall-item-photo-menu-$item.id">
-				$item.item_photo_menu
-				</ul>
-				
-			</div>
-		</div>
-			<div class="wall-item-actions-author">
-				<a href="$item.profile_url" target="redir" title="$item.linktitle" class="wall-item-name-link"><span class="wall-item-name$item.sparkle">$item.name</span></a> 
-			<span class="wall-item-ago">-
-			{{ if $item.plink }}<a class="link" title="$item.plink.title" href="$item.plink.href" style="color: #999">$item.ago</a>{{ else }} $item.ago {{ endif }}
-			{{ if $item.lock }} - <span class="fakelink" style="color: #999" onclick="lockview(event,$item.id);">$item.lock</span> {{ endif }}
-			</span>
-			</div>
-		<div class="wall-item-content">
-			{{ if $item.title }}<h2><a href="$item.plink.href">$item.title</a></h2>{{ endif }}
-			$item.body
-		</div>
-	</div>
-	<div class="wall-item-bottom">
-		<div class="wall-item-links">
-		</div>
-		<div class="wall-item-tags">
-			{{ for $item.tags as $tag }}
-				<span class='tag'>$tag</span>
-			{{ endfor }}
-		</div>
-	</div>
-	<div class="wall-item-bottom">
-		<div class="">
-
-		</div>
-		<div class="wall-item-actions">
-
-			<div class="wall-item-actions-social">
-			
-			
-			{{ if $item.vote }}
-				<a href="#" id="like-$item.id" class="icon like" title="$item.vote.like.0" onclick="dolike($item.id,'like'); return false">$item.vote.like.1</a>
-				<a href="#" id="dislike-$item.id" class="icon dislike" title="$item.vote.dislike.0" onclick="dolike($item.id,'dislike'); return false"></a>
-			{{ endif }}
-						
-			{{ if $item.vote.share }}
-				<a href="#" id="share-$item.id" class="icon recycle" title="$item.vote.share.0" onclick="jotShare($item.id); return false"></a>
-			{{ endif }}	
-
-
-			{{ if $item.star }}
-				<a href="#" id="starred-$item.id" onclick="dostar($item.id); return false;" class="star-item icon $item.isstarred" title="$item.star.toggle">
-				<img src="images/star_dummy.png" class="icon star" alt="$item.star.do" /> </a>
-				<a href="#" id="tagger-$item.id" onclick="itemTag($item.id); return false;" class="tag-item icon tagged" title="$item.star.tagger"></a>					  
-			{{ endif }}	
-			
-			{{ if $item.filer }}
-			<a href="#" id="filer-$item.id" onclick="itemFiler($item.id); return false;" class="filer-item icon file-as" title="$item.star.filer"></a>
-			{{ endif }}				
-			
-			{{ if $item.plink }}<a class="icon link" title="$item.plink.title" href="$item.plink.href">$item.plink.title</a>{{ endif }}
-			
-					
-					
-			</div>
-			
-			<div class="wall-item-actions-tools">
-
-				{{ if $item.drop.dropping }}
-					<input type="checkbox" title="$item.drop.select" name="itemselected[]" class="item-select" value="$item.id" />
-					<a href="item/drop/$item.id" onclick="return confirmDelete();" class="icon drop" title="$item.drop.delete">$item.drop.delete</a>
-				{{ endif }}
-				{{ if $item.edpost }}
-					<a class="icon pencil" href="$item.edpost.0" title="$item.edpost.1"></a>
-				{{ endif }}
-			</div>
-			<div class="wall-item-location">$item.location&nbsp;</div>
-		</div>
-	</div>
-	<div class="wall-item-bottom">
-		<div class="wall-item-links"></div>
-		<div class="wall-item-like" id="wall-item-like-$item.id">$item.like</div>
-		<div class="wall-item-dislike" id="wall-item-dislike-$item.id">$item.dislike</div>	
-	</div>
-</div>
-
-<div class="wall-item-comment-wrapper" >
-	$item.comment
-</div>
diff --git a/view/theme/diabook/diabook-green/wallwall_item.tpl b/view/theme/diabook/diabook-green/wallwall_item.tpl
deleted file mode 100644
index 6a0c93f88..000000000
--- a/view/theme/diabook/diabook-green/wallwall_item.tpl
+++ /dev/null
@@ -1,106 +0,0 @@
-{{ if $item.indent }}{{ else }}
-<div class="wall-item-decor">
-	<img id="like-rotator-$item.id" class="like-rotator" src="images/rotator.gif" alt="$item.wait" title="$item.wait" style="display: none;" />
-</div>
-{{ endif }}
-<div class="wall-item-container $item.indent">
-	<div class="wall-item-item">
-		<div class="wall-item-info">
-			<div class="contact-photo-wrapper mframe wwto" id="wall-item-ownerphoto-wrapper-$item.id" >
-				<a href="$item.owner_url" target="redir" title="$item.olinktitle" class="contact-photo-link" id="wall-item-ownerphoto-link-$item.id">
-					<img src="$item.owner_photo" class="contact-photo $item.osparkle" id="wall-item-ownerphoto-$item.id" alt="$item.owner_name" />
-				</a>
-			</div>
-			<div class="contact-photo-wrapper mframe wwfrom"
-				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" target="redir" title="$item.linktitle" class="contact-photo-link" id="wall-item-photo-link-$item.id">
-					<img src="$item.thumb" class="contact-photo$item.sparkle" id="wall-item-photo-$item.id" alt="$item.name" />
-				</a>
-				<a href="#" rel="#wall-item-photo-menu-$item.id" class="contact-photo-menu-button icon s16 menu" id="wall-item-photo-menu-button-$item.id">menu</a>
-				<ul class="contact-menu menu-popup" id="wall-item-photo-menu-$item.id">
-				$item.item_photo_menu
-				</ul>
-				
-			</div>
-		</div>
-			<div class="wall-item-actions-author">
-				<a href="$item.profile_url" target="redir" title="$item.linktitle" class="wall-item-name-link"><span class="wall-item-name$item.sparkle">$item.name</span></a>
-				$item.to <a href="$item.owner_url" target="redir" 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 <span class="wall-item-ago">- &nbsp;
-			{{ if $item.plink }}<a class="link" title="$item.plink.title" href="$item.plink.href" style="color: #999">$item.ago</a>{{ else }} $item.ago {{ endif }}
-			{{ if $item.lock }} - <span class="fakelink" style="color: #999" onclick="lockview(event,$item.id);">$item.lock</span> {{ endif }}
-			</span>
-			</div>
-		<div class="wall-item-content">
-			{{ if $item.title }}<h2><a href="$item.plink.href">$item.title</a></h2>{{ endif }}
-			$item.body
-		</div>
-	</div>
-	<div class="wall-item-bottom">
-		<div class="wall-item-links">
-		</div>
-		<div class="wall-item-tags">
-			{{ for $item.tags as $tag }}
-				<span class='tag'>$tag</span>
-			{{ endfor }}
-		</div>
-	</div>
-	<div class="wall-item-bottom">
-		<div class="">
-
-		</div>
-		<div class="wall-item-actions">
-
-			<div class="wall-item-actions-social">
-			
-			
-			{{ if $item.vote }}
-				<a href="#" id="like-$item.id" class="icon like" title="$item.vote.like.0" onclick="dolike($item.id,'like'); return false">$item.vote.like.1</a>
-				<a href="#" id="dislike-$item.id" class="icon dislike" title="$item.vote.dislike.0" onclick="dolike($item.id,'dislike'); return false"></a>
-			{{ endif }}
-						
-			{{ if $item.vote.share }}
-				<a href="#" id="share-$item.id" class="icon recycle" title="$item.vote.share.0" onclick="jotShare($item.id); return false"></a>
-			{{ endif }}	
-
-
-			{{ if $item.star }}
-				<a href="#" id="starred-$item.id" onclick="dostar($item.id); return false;" class="star-item icon $item.isstarred" title="$item.star.toggle">
-				<img src="images/star_dummy.png" class="icon star" alt="$item.star.do" /> </a>
-				<a href="#" id="tagger-$item.id" onclick="itemTag($item.id); return false;" class="tag-item icon tagged" title="$item.star.tagger"></a>
-			{{ endif }}	
-			
-			{{ if $item.filer }}
-			<a href="#" id="filer-$item.id" onclick="itemFiler($item.id); return false;" class="filer-item icon file-as" title="$item.star.filer"></a>
-			{{ endif }}				
-			
-			{{ if $item.plink }}<a class="icon link" title="$item.plink.title" href="$item.plink.href">$item.plink.title</a>{{ endif }}
-			
-					
-					
-			</div>
-			
-			<div class="wall-item-actions-tools">
-
-				{{ if $item.drop.dropping }}
-					<input type="checkbox" title="$item.drop.select" name="itemselected[]" class="item-select" value="$item.id" />
-					<a href="item/drop/$item.id" onclick="return confirmDelete();" class="icon drop" title="$item.drop.delete">$item.drop.delete</a>
-				{{ endif }}
-				{{ if $item.edpost }}
-					<a class="icon pencil" href="$item.edpost.0" title="$item.edpost.1"></a>
-				{{ endif }}
-			</div>
-			<div class="wall-item-location">$item.location&nbsp;</div>
-		</div>
-	</div>
-	<div class="wall-item-bottom">
-		<div class="wall-item-links"></div>
-		<div class="wall-item-like" id="wall-item-like-$item.id">$item.like</div>
-		<div class="wall-item-dislike" id="wall-item-dislike-$item.id">$item.dislike</div>	
-	</div>
-</div>
-
-<div class="wall-item-comment-wrapper" >
-	$item.comment
-</div>
\ No newline at end of file
diff --git a/view/theme/diabook/diabook-pink/admin_users.tpl b/view/theme/diabook/diabook-pink/admin_users.tpl
deleted file mode 100644
index 40f94f5fe..000000000
--- a/view/theme/diabook/diabook-pink/admin_users.tpl
+++ /dev/null
@@ -1,88 +0,0 @@
-<script>
-	function confirm_delete(uname){
-		return confirm( "$confirm_delete".format(uname));
-	}
-	function confirm_delete_multi(){
-		return confirm("$confirm_delete_multi");
-	}
-	function selectall(cls){
-		$("."+cls).attr('checked','checked');
-		return false;
-	}
-</script>
-<div id='adminpage'>
-	<h1>$title - $page</h1>
-	
-	<form action="$baseurl/admin/users" method="post">
-		
-		<h3>$h_pending</h3>
-		{{ if $pending }}
-			<table id='pending'>
-				<thead>
-				<tr>
-					{{ for $th_pending as $th }}<th>$th</th>{{ endfor }}
-					<th></th>
-					<th></th>
-				</tr>
-				</thead>
-				<tbody>
-			{{ for $pending as $u }}
-				<tr>
-					<td class="created">$u.created</td>
-					<td class="name">$u.name</td>
-					<td class="email">$u.email</td>
-					<td class="checkbox"><input type="checkbox" class="pending_ckbx" id="id_pending_$u.hash" name="pending[]" value="$u.hash" /></td>
-					<td class="tools">
-						<a href="$baseurl/regmod/allow/$u.hash" title='$approve'><span class='icon like'></span></a>
-						<a href="$baseurl/regmod/deny/$u.hash" title='$deny'><span class='icon dislike'></span></a>
-					</td>
-				</tr>
-			{{ endfor }}
-				</tbody>
-			</table>
-			<div class='selectall'><a href='#' onclick="return selectall('pending_ckbx');">$select_all</a></div>
-			<div class="submit"><input type="submit" name="page_users_deny" value="$deny"/> <input type="submit" name="page_users_approve" value="$approve" /></div>			
-		{{ else }}
-			<p>$no_pending</p>
-		{{ endif }}
-	
-	
-		
-	
-		<h3>$h_users</h3>
-		{{ if $users }}
-			<table id='users'>
-				<thead>
-				<tr>
-					<th></th>
-					{{ for $th_users as $th }}<th>$th</th>{{ endfor }}
-					<th></th>
-					<th></th>
-				</tr>
-				</thead>
-				<tbody>
-				{{ for $users as $u }}
-					<tr>
-						<td><img src="$u.micro" alt="$u.nickname" title="$u.nickname"></td>
-						<td class='name'><a href="$u.url" title="$u.nickname" >$u.name</a></td>
-						<td class='email'>$u.email</td>
-						<td class='register_date'>$u.register_date</td>
-						<td class='login_date'>$u.login_date</td>
-						<td class='lastitem_date'>$u.lastitem_date</td>
-						<td class='login_date'>$u.page-flags</td>
-						<td class="checkbox"><input type="checkbox" class="users_ckbx" id="id_user_$u.uid" name="user[]" value="$u.uid"/></td>
-						<td class="tools" style="width:60px;">
-							<a href="$baseurl/admin/users/block/$u.uid" title='{{ if $u.blocked }}$unblock{{ else }}$block{{ endif }}'><span class='icon block {{ if $u.blocked==0 }}dim{{ endif }}'></span></a>
-							<a href="$baseurl/admin/users/delete/$u.uid" title='$delete' onclick="return confirm_delete('$u.name')"><span class='icon ad_drop'></span></a>
-						</td>
-					</tr>
-				{{ endfor }}
-				</tbody>
-			</table>
-			<div class='selectall'><a href='#' onclick="return selectall('users_ckbx');">$select_all</a></div>
-			<div class="submit"><input type="submit" name="page_users_block" value="$block/$unblock" /> <input type="submit" name="page_users_delete" value="$delete" onclick="return confirm_delete_multi()" /></div>						
-		{{ else }}
-			NO USERS?!?
-		{{ endif }}
-	</form>
-</div>
diff --git a/view/theme/diabook/diabook-pink/ch_directory_item.tpl b/view/theme/diabook/diabook-pink/ch_directory_item.tpl
deleted file mode 100644
index db1936e4b..000000000
--- a/view/theme/diabook/diabook-pink/ch_directory_item.tpl
+++ /dev/null
@@ -1,10 +0,0 @@
-
-<div class="directory-item" id="directory-item-$id" >
-	<div class="directory-photo-wrapper" id="directory-photo-wrapper-$id" > 
-		<div class="directory-photo" id="directory-photo-$id" >
-			<a href="$profile-link" class="directory-profile-link" id="directory-profile-link-$id" >
-				<img class="directory-photo-img" src="$photo" alt="$alt-text" title="$alt-text" />
-			</a>
-		</div>
-	</div>
-</div>
diff --git a/view/theme/diabook/diabook-pink/comment_item.tpl b/view/theme/diabook/diabook-pink/comment_item.tpl
deleted file mode 100644
index ee4dfba45..000000000
--- a/view/theme/diabook/diabook-pink/comment_item.tpl
+++ /dev/null
@@ -1,41 +0,0 @@
-		<div class="comment-wwedit-wrapper" id="comment-edit-wrapper-$id" style="display: block;">
-			<form class="comment-edit-form" id="comment-edit-form-$id" action="item" method="post" onsubmit="post_comment($id); return false;">
-				<input type="hidden" name="type" value="$type" />
-				<input type="hidden" name="profile_uid" value="$profile_uid" />
-				<input type="hidden" name="parent" value="$parent" />
-				<input type="hidden" name="return" value="$return_path" />
-				<input type="hidden" name="jsreload" value="$jsreload" />
-				<input type="hidden" name="preview" id="comment-preview-inp-$id" value="0" />
-
-				<div class="comment-edit-photo" id="comment-edit-photo-$id" >
-					<a class="comment-edit-photo-link" href="$mylink" title="$mytitle"><img class="my-comment-photo" src="$myphoto" alt="$mytitle" title="$mytitle" /></a>
-				</div>
-				<div class="comment-edit-photo-end"></div>
-				<textarea id="comment-edit-text-$id" class="comment-edit-text-empty" name="body" onFocus="commentOpen(this,$id);tautogrow($id)" onBlur="commentClose(this,$id);" >$comment</textarea>
-				<a class="icon bb-image" style="cursor: pointer;" onclick="insertFormatting('$comment','img',$id);">img</a>	
-				<a class="icon bb-url" style="cursor: pointer;" onclick="insertFormatting('$comment','url',$id);">url</a>
-				<a class="icon bb-video" style="cursor: pointer;" onclick="insertFormatting('$comment','video',$id);">video</a>														
-				<a class="icon underline" style="cursor: pointer;" onclick="insertFormatting('$comment','u',$id);">u</a>
-				<a class="icon italic" style="cursor: pointer;" onclick="insertFormatting('$comment','i',$id);">i</a>
-				<a class="icon bold" style="cursor: pointer;" onclick="insertFormatting('$comment','b',$id);">b</a>
-				<a class="icon quote" style="cursor: pointer;" onclick="insertFormatting('$comment','quote',$id);">quote</a>																			
-				{{ if $qcomment }}
-					<select id="qcomment-select-$id" name="qcomment-$id" class="qcomment" onchange="qCommentInsert(this,$id);" >
-					<option value=""></option>
-				{{ for $qcomment as $qc }}
-					<option value="$qc">$qc</option>				
-				{{ endfor }}
-					</select>
-				{{ endif }}
-
-				<div class="comment-edit-text-end"></div>
-				<div class="comment-edit-submit-wrapper" id="comment-edit-submit-wrapper-$id" style="display: none;" >
-					<input type="submit" onclick="post_comment($id); return false;" id="comment-edit-submit-$id" class="comment-edit-submit" name="submit" value="$submit" />
-					<span onclick="preview_comment($id);" id="comment-edit-preview-link-$id" class="fakelink">$preview</span>
-					<div id="comment-edit-preview-$id" class="comment-edit-preview" style="display:none;"></div>
-				</div>
-
-				<div class="comment-edit-end"></div>
-			</form>
-
-		</div>
diff --git a/view/theme/diabook/diabook-pink/communityhome.tpl b/view/theme/diabook/diabook-pink/communityhome.tpl
deleted file mode 100644
index 875d83f1b..000000000
--- a/view/theme/diabook/diabook-pink/communityhome.tpl
+++ /dev/null
@@ -1,86 +0,0 @@
-<div id="close_pages">
-{{ if $page }}
-<div>$page</div>
-{{ endif }}
-</div>
-
-<div id="close_helpers">
-{{ if $lastusers_title }}
-<h3 style="margin-top:0px;">$helpers.title.1<a id="close_helpers_icon"  onClick="close_helpers()" class="icon close_box" title="close"></a></h3>
-<a href="http://kakste.com/profile/newhere" title="#NewHere" style="margin-left: 10px; " target="blank">NewHere</a><br>
-<a href="https://helpers.pyxis.uberspace.de/profile/helpers" style="margin-left: 10px; " title="Friendica Support" target="blank">Friendica Support</a><br>
-<a href="https://letstalk.pyxis.uberspace.de/profile/letstalk" style="margin-left: 10px; " title="Let's talk" target="blank">Let's talk</a><br>
-<a href="http://newzot.hydra.uberspace.de/profile/newzot" title="Local Friendica" style="margin-left: 10px; " target="blank">Local Friendica</a>
-{{ endif }}
-</div>
-
-<div id="close_services">
-{{ if $lastusers_title }}
-<h3>$con_services.title.1<a id="close_services_icon" onClick="close_services()" class="icon close_box" title="close"></a></h3>
-<div id="right_service_icons" style="margin-left: 16px; margin-top: 5px;">
-<a href="$url/facebook"><img alt="Facebook" src="view/theme/diabook-aerith/icons/facebook.png" title="Facebook"></a>
-<a href="$url/settings/connectors"><img alt="StatusNet" src="view/theme/diabook-aerith/icons/StatusNet.png?" title="StatusNet"></a>
-<a href="$url/settings/connectors"><img alt="LiveJournal" src="view/theme/diabook-aerith/icons/livejournal.png?" title="LiveJournal"></a>
-<a href="$url/settings/connectors"><img alt="Posterous" src="view/theme/diabook-aerith/icons/posterous.png?" title="Posterous"></a>
-<a href="$url/settings/connectors"><img alt="Tumblr" src="view/theme/diabook-aerith/icons/tumblr.png?" title="Tumblr"></a>
-<a href="$url/settings/connectors"><img alt="Twitter" src="view/theme/diabook-aerith/icons/twitter.png?" title="Twitter"></a>
-<a href="$url/settings/connectors"><img alt="WordPress" src="view/theme/diabook-aerith/icons/wordpress.png?" title="WordPress"></a>
-<a href="$url/settings/connectors"><img alt="E-Mail" src="view/theme/diabook-aerith/icons/email.png?" title="E-Mail"></a>
-</div>
-{{ endif }}
-</div>
-
-<div id="close_friends" style="margin-bottom:53px;">
-{{ if $nv }}
-<h3>$nv.title.1<a id="close_friends_icon" onClick="close_friends()"  class="icon close_box" title="close"></a></h3>
-<a class="$nv.directory.2" href="$nv.directory.0" style="margin-left: 10px; " title="$nv.directory.3" >$nv.directory.1</a><br>
-<a class="$nv.global_directory.2" href="$nv.global_directory.0" target="blank" style="margin-left: 10px; " title="$nv.global_directory.3" >$nv.global_directory.1</a><br>
-<a class="$nv.match.2" href="$nv.match.0" style="margin-left: 10px; " title="$nv.match.3" >$nv.match.1</a><br>
-<a class="$nv.suggest.2" href="$nv.suggest.0" style="margin-left: 10px; " title="$nv.suggest.3" >$nv.suggest.1</a><br>
-<a class="$nv.invite.2" href="$nv.invite.0" style="margin-left: 10px; " title="$nv.invite.3" >$nv.invite.1</a>			
-$nv.search
-{{ endif }}
-</div>
-
-<div id="close_lastusers">
-{{ if $lastusers_title }}
-<h3>$lastusers_title<a id="close_lastusers_icon" onClick="close_lastusers()" class="icon close_box" title="close"></a></h3>
-<div id='lastusers-wrapper' class='items-wrapper'>
-{{ for $lastusers_items as $i }}
-	$i
-{{ endfor }}
-</div>
-{{ endif }}
-</div>
-
-
-{{ if $activeusers_title }}
-<h3>$activeusers_title</h3>
-<div class='items-wrapper'>
-{{ for $activeusers_items as $i }}
-	$i
-{{ endfor }}
-</div>
-{{ endif }}
-
-<div id="close_lastphotos">
-{{ if $photos_title }}
-<h3>$photos_title<a id="close_photos_icon" onClick="close_lastphotos()"  class="icon close_box" title="close"></a></h3>
-<div id='ra-photos-wrapper' class='items-wrapper'>
-{{ for $photos_items as $i }}
-	$i
-{{ endfor }}
-</div>
-{{ endif }}
-</div>
-
-<div id="close_lastlikes">
-{{ if $like_title }}
-<h3>$like_title<a id="close_lastlikes_icon" onClick="close_lastlikes()" class="icon close_box" title="close"></a></h3>
-<ul id='likes'>
-{{ for $like_items as $i }}
-	<li id='ra-photos-wrapper'>$i</li>
-{{ endfor }}
-</ul>
-{{ endif }}
-</div>
diff --git a/view/theme/diabook/diabook-pink/config.php b/view/theme/diabook/diabook-pink/config.php
deleted file mode 100644
index 0083a4df7..000000000
--- a/view/theme/diabook/diabook-pink/config.php
+++ /dev/null
@@ -1,84 +0,0 @@
-<?php
-/**
- * Theme settings
- */
-
-
-
-function theme_content(&$a){
-	if(!local_user())
-		return;		
-	
-	$font_size = get_pconfig(local_user(), 'diabook-aerith', 'font_size' );
-	$line_height = get_pconfig(local_user(), 'diabook-aerith', 'line_height' );
-	$resolution = get_pconfig(local_user(), 'diabook-aerith', 'resolution' );
-	
-	return diabook_form($a,$font_size, $line_height,$resolution);
-}
-
-function theme_post(&$a){
-	if(! local_user())
-		return;
-	
-	if (isset($_POST['diabook-aerith-settings-submit'])){
-		set_pconfig(local_user(), 'diabook-aerith', 'font_size', $_POST['diabook-aerith_font_size']);
-		set_pconfig(local_user(), 'diabook-aerith', 'line_height', $_POST['diabook-aerith_line_height']);
-		set_pconfig(local_user(), 'diabook-aerith', 'resolution', $_POST['diabook-aerith_resolution']);	
-	}
-}
-
-
-function theme_admin(&$a){
-	$font_size = get_config('diabook-aerith', 'font_size' );
-	$line_height = get_config('diabook-aerith', 'line_height' );
-	$resolution = get_config('diabook-aerith', 'resolution' );
-	
-	return diabook_form($a,$font_size, $line_height,$resolution);
-}
-
-function theme_admin_post(&$a){
-	if (isset($_POST['diabook-aerith-settings-submit'])){
-		set_config('diabook-aerith', 'font_size', $_POST['diabook-aerith_font_size']);
-		set_config('diabook-aerith', 'line_height', $_POST['diabook-aerith_line_height']);
-		set_config('diabook-aerith', 'resolution', $_POST['diabook-aerith_resolution']);
-	}
-}
-
-
-function diabook_form(&$a, $font_size, $line_height, $resolution){
-	$line_heights = array(
-		"1.3"=>"1.3",
-		"---"=>"---",
-		"1.5"=>"1.5",		
-		"1.4"=>"1.4",
-		"1.2"=>"1.2",
-		"1.1"=>"1.1",
-	);
-	
-	$font_sizes = array(
-		'13'=>'13',
-		"---"=>"---",
-		"15"=>"15",
-		'14'=>'14',
-		'13.5'=>'13.5',		
-		'12.5'=>'12.5',
-		'12'=>'12',
-		);
-	$resolutions = array(
-		'normal'=>'normal',
-		'wide'=>'wide',		
-		);
-	
-	
-	
-	$t = file_get_contents( dirname(__file__). "/theme_settings.tpl" );
-	$o .= replace_macros($t, array(
-		'$submit' => t('Submit'),
-		'$baseurl' => $a->get_baseurl(),
-		'$title' => t("Theme settings"),
-		'$font_size' => array('diabook-aerith_font_size', t('Set font-size for posts and comments'), $font_size, '', $font_sizes),
-		'$line_height' => array('diabook-aerith_line_height', t('Set line-height for posts and comments'), $line_height, '', $line_heights),
-		'$resolution' => array('diabook-aerith_resolution', t('Set resolution for middle column'), $resolution, '', $resolutions),	
-	));
-	return $o;
-}
diff --git a/view/theme/diabook/diabook-pink/contact_template.tpl b/view/theme/diabook/diabook-pink/contact_template.tpl
deleted file mode 100644
index 48930b48a..000000000
--- a/view/theme/diabook/diabook-pink/contact_template.tpl
+++ /dev/null
@@ -1,25 +0,0 @@
-
-<div class="contact-entry-wrapper" id="contact-entry-wrapper-$contact.id" >
-	<div class="contact-entry-photo-wrapper" >
-		<div class="contact-entry-photo mframe" id="contact-entry-photo-$contact.id"
-		onmouseover="if (typeof t$contact.id != 'undefined') clearTimeout(t$contact.id); openMenu('contact-photo-menu-button-$contact.id')" 
-		onmouseout="t$contact.id=setTimeout('closeMenu(\'contact-photo-menu-button-$contact.id\'); closeMenu(\'contact-photo-menu-$contact.id\');',200)" >
-
-			<a href="$contact.url" title="$contact.img_hover" /><img src="$contact.thumb" $contact.sparkle alt="$contact.name" /></a>
-
-			{{ if $contact.photo_menu }}
-			<span onclick="openClose('contact-photo-menu-$contact.id');" class="fakelink contact-photo-menu-button" id="contact-photo-menu-button-$contact.id">menu</span>
-                <div class="contact-photo-menu" id="contact-photo-menu-$contact.id">
-                    <ul>
-                        $contact.photo_menu
-                    </ul>
-                </div>
-			{{ endif }}
-		</div>
-			
-	</div>
-	<div class="contact-entry-photo-end" ></div>
-		<div class="contact-entry-name" id="contact-entry-name-$contact.id" >$contact.name</div>
-
-	<div class="contact-entry-end" ></div>
-</div>
diff --git a/view/theme/diabook/diabook-pink/directory_item.tpl b/view/theme/diabook/diabook-pink/directory_item.tpl
deleted file mode 100644
index bc2af16c2..000000000
--- a/view/theme/diabook/diabook-pink/directory_item.tpl
+++ /dev/null
@@ -1,11 +0,0 @@
-
-<div class="directory-item" id="directory-item-$id" >
-	<div class="directory-photo-wrapper" id="directory-photo-wrapper-$id" > 
-		<div class="directory-photo" id="directory-photo-$id" >
-			<a href="$profile-link" class="directory-profile-link" id="directory-profile-link-$id" >
-				<img class="directory-photo-img" src="$photo" alt="$alt-text" title="$alt-text" />
-			</a>
-		</div>
-	</div>
-	<div class="contact-name" id="directory-name-$id">$name</div>
-</div>
diff --git a/view/theme/diabook/diabook-pink/generic_links_widget.tpl b/view/theme/diabook/diabook-pink/generic_links_widget.tpl
deleted file mode 100644
index 001c1395e..000000000
--- a/view/theme/diabook/diabook-pink/generic_links_widget.tpl
+++ /dev/null
@@ -1,11 +0,0 @@
-<div id="widget_$title">
-	{{if $title}}<h3 style="border-bottom: 1px solid #D2D2D2;">$title</h3>{{endif}}
-	{{if $desc}}<div class="desc">$desc</div>{{endif}}
-	
-	<ul  class="rs_tabs">
-		{{ for $items as $item }}
-			<li><a href="$item.url" class="rs_tab button {{ if $item.selected }}selected{{ endif }}">$item.label</a></li>
-		{{ endfor }}
-	</ul>
-	
-</div>
diff --git a/view/theme/diabook/diabook-pink/group_side.tpl b/view/theme/diabook/diabook-pink/group_side.tpl
deleted file mode 100644
index 8600402f2..000000000
--- a/view/theme/diabook/diabook-pink/group_side.tpl
+++ /dev/null
@@ -1,34 +0,0 @@
-<div id="profile_side" >
-	<div class="">
-		<h3 style="margin-left: 2px;">$title<a href="group/new" title="$createtext" class="icon text_add"></a></h3>
-	</div>
-
-	<div id="sidebar-group-list">
-		<ul class="menu-profile-side">
-			{{ for $groups as $group }}
-			<li class="menu-profile-list">
-				<span class="menu-profile-icon {{ if $group.selected }}group_selected{{else}}group_unselected{{ endif }}"></span>
-				<a href="$group.href" class="menu-profile-list-item">
-					$group.text
-				</a>
-				{{ if $group.edit }}
-					<a href="$group.edit.href" class="action"><span class="icon text_edit" ></span></a>
-				{{ endif }}
-				{{ if $group.cid }}
-					<input type="checkbox" 
-						class="{{ if $group.selected }}ticked{{ else }}unticked {{ endif }} action" 
-						onclick="contactgroupChangeMember('$group.id','$group.cid');return true;"
-						{{ if $group.ismember }}checked="checked"{{ endif }}
-					/>
-				{{ endif }}
-			</li>
-			{{ endfor }}
-		</ul>
-	</div>
-	 {{ if $ungrouped }}
-  <div id="sidebar-ungrouped">
-  <a href="nogroup">$ungrouped</a>
-  </div>
-  {{ endif }}
-</div>	
-
diff --git a/view/theme/diabook/diabook-pink/jot.tpl b/view/theme/diabook/diabook-pink/jot.tpl
deleted file mode 100644
index 0928c9f36..000000000
--- a/view/theme/diabook/diabook-pink/jot.tpl
+++ /dev/null
@@ -1,85 +0,0 @@
-
-<div id="profile-jot-wrapper" >
-	<div id="profile-jot-banner-wrapper">
-		<div id="profile-jot-desc" >&nbsp;</div>
-	</div>
-	<div id="profile-jot-banner-end"></div>
-
-	<form id="profile-jot-form" action="$action" method="post" >
-		<input type="hidden" name="type" value="$ptyp" />
-		<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="coord" id="jot-coord" value="" />
-		<input type="hidden" name="post_id" value="$post_id" />
-		<input type="hidden" name="preview" id="jot-preview" value="0" />
-		<input name="title" id="jot-title" type="text" placeholder="$placeholdertitle" value="$title" class="jothidden" style="display:none">
-		<div id="jot-category-wrap"><input name="category" id="jot-category" type="text" placeholder="$placeholdercategory" value="$category" class="jothidden" style="display:none" /></div>				
-		<div id="character-counter" class="grey"></div>		
-		<img id="profile-jot-text-loading" src="images/rotator.gif" alt="$wait" title="$wait" style="display: none;" />
-		<textarea rows="5" cols="64" class="profile-jot-text" id="profile-jot-text" name="body" >{{ if $content }}$content{{ else }}$share{{ endif }}</textarea>
-
-
-<div id="profile-jot-submit-wrapper" class="jothidden">
-	
-	<div id="profile-upload-wrapper" style="display: $visitor;" >
-		<div id="wall-image-upload-div" ><a href="#" onclick="return false;" id="wall-image-upload" class="camera" title="$upload"></a></div>
-	</div> 
-	<div id="profile-attach-wrapper" style="display: $visitor;" >
-		<div id="wall-file-upload-div" ><a href="#" onclick="return false;" id="wall-file-upload" class="attach" title="$attach"></a></div>
-	</div> 
-
-	<div id="profile-link-wrapper" style="display: $visitor;" ondragenter="linkdropper(event);" ondragover="linkdropper(event);" ondrop="linkdrop(event);" >
-		<a id="profile-link" class="weblink" title="$weblink" ondragenter="return linkdropper(event);" ondragover="return linkdropper(event);" ondrop="linkdrop(event);" onclick="jotGetLink(); return false;"></a>
-	</div> 
-	<div id="profile-video-wrapper" style="display: $visitor;" >
-		<a id="profile-video" class="video2" title="$video" onclick="jotVideoURL();return false;"></a>
-	</div> 
-	<div id="profile-audio-wrapper" style="display: $visitor;" >
-		<a id="profile-audio" class="audio2" title="$audio" onclick="jotAudioURL();return false;"></a>
-	</div> 
-	<div id="profile-location-wrapper" style="display: $visitor;" >
-		<a id="profile-location" class="globe" title="$setloc" onclick="jotGetLocation();return false;"></a>
-	</div> 
-	<div id="profile-nolocation-wrapper" style="display: none;" >
-		<a id="profile-nolocation" class="noglobe" title="$noloc" onclick="jotClearLocation();return false;"></a>
-	</div> 
-
-	<input type="submit" id="profile-jot-submit" class="button creation2" name="submit" value="$share" />
-  
-   <span onclick="preview_post();" id="jot-preview-link" class="tab button">$preview</span>
-   
-	<div id="profile-jot-perms" class="profile-jot-perms" style="display: $pvisit;" >
-		<a href="#profile-jot-acl-wrapper" id="jot-perms-icon" class="icon $lockstate"  title="$permset" ></a>$bang
-	</div>
-
-
-	<div id="profile-jot-plugin-wrapper">
-  	$jotplugins
-	</div>
-	
-	<div id="profile-rotator-wrapper" style="display: $visitor;" >
-		<img id="profile-rotator" src="images/rotator.gif" alt="$wait" title="$wait" style="display: none;" />
-	</div> 
-	
-	</div>
-   <div id="profile-jot-perms-end"></div>
-	
-	<div id="jot-preview-content" style="display:none;"></div>
-
-	<div style="display: none;">
-		<div id="profile-jot-acl-wrapper" style="width:auto;height:auto;overflow:auto;">
-			$acl
-			<hr style="clear:both"/>
-			<div id="profile-jot-email-label">$emailcc</div><input type="text" name="emailcc" id="profile-jot-email" title="$emtitle" />
-			<div id="profile-jot-email-end"></div>
-			$jotnets
-		</div>
-	</div>
-
-
-
-
-</form>
-</div>
-		{{ if $content }}<script>initEditor();</script>{{ endif }}
diff --git a/view/theme/diabook/diabook-pink/js/README b/view/theme/diabook/diabook-pink/js/README
deleted file mode 100644
index c93b2118e..000000000
--- a/view/theme/diabook/diabook-pink/js/README
+++ /dev/null
@@ -1,22 +0,0 @@
-jQuery Resize Plugin Demo
-
-Version: v2.1.1
-Author: Adeel Ejaz (http://adeelejaz.com/)
-License: Dual licensed under MIT and GPL licenses.
-
-Introduction
-aeImageResize is a jQuery plugin to dynamically resize the images without distorting the proportions.
-
-Usage:
-.aeImageResize( height, width )
-
-height
-An integer representing the maximum height for the image.
-
-width
-An integer representing the maximum width for the image.
-
-Example
-$(function() {
-  $( ".resizeme" ).aeImageResize({ height: 250, width: 250 });
-});
\ No newline at end of file
diff --git a/view/theme/diabook/diabook-pink/js/jquery.ae.image.resize.js b/view/theme/diabook/diabook-pink/js/jquery.ae.image.resize.js
deleted file mode 100644
index bac09cd45..000000000
--- a/view/theme/diabook/diabook-pink/js/jquery.ae.image.resize.js
+++ /dev/null
@@ -1,69 +0,0 @@
-(function( $ ) {
-
-  $.fn.aeImageResize = function( params ) {
-
-    var aspectRatio = 0
-      // Nasty I know but it's done only once, so not too bad I guess
-      // Alternate suggestions welcome :)
-      ,	isIE6 = $.browser.msie && (6 == ~~ $.browser.version)
-      ;
-
-    // We cannot do much unless we have one of these
-    if ( !params.height && !params.width ) {
-      return this;
-    }
-
-    // Calculate aspect ratio now, if possible
-    if ( params.height && params.width ) {
-      aspectRatio = params.width / params.height;
-    }
-
-    // Attach handler to load
-    // Handler is executed just once per element
-    // Load event required for Webkit browsers
-    return this.one( "load", function() {
-
-      // Remove all attributes and CSS rules
-      this.removeAttribute( "height" );
-      this.removeAttribute( "width" );
-      this.style.height = this.style.width = "";
-
-      var imgHeight = this.height
-        , imgWidth = this.width
-        , imgAspectRatio = imgWidth / imgHeight
-        , bxHeight = params.height
-        , bxWidth = params.width
-        , bxAspectRatio = aspectRatio;
-				
-      // Work the magic!
-      // If one parameter is missing, we just force calculate it
-      if ( !bxAspectRatio ) {
-        if ( bxHeight ) {
-          bxAspectRatio = imgAspectRatio + 1;
-        } else {
-          bxAspectRatio = imgAspectRatio - 1;
-        }
-      }
-
-      // Only resize the images that need resizing
-      if ( (bxHeight && imgHeight > bxHeight) || (bxWidth && imgWidth > bxWidth) ) {
-
-        if ( imgAspectRatio > bxAspectRatio ) {
-          bxHeight = ~~ ( imgHeight / imgWidth * bxWidth );
-        } else {
-          bxWidth = ~~ ( imgWidth / imgHeight * bxHeight );
-        }
-
-        this.height = bxHeight;
-        this.width = bxWidth;
-      }
-    })
-    .each(function() {
-
-      // Trigger load event (for Gecko and MSIE)
-      if ( this.complete || isIE6 ) {
-        $( this ).trigger( "load" );
-      }
-    });
-  };
-})( jQuery );
\ No newline at end of file
diff --git a/view/theme/diabook/diabook-pink/js/jquery.ae.image.resize.min.js b/view/theme/diabook/diabook-pink/js/jquery.ae.image.resize.min.js
deleted file mode 100644
index 16c30b123..000000000
--- a/view/theme/diabook/diabook-pink/js/jquery.ae.image.resize.min.js
+++ /dev/null
@@ -1 +0,0 @@
-(function(d){d.fn.aeImageResize=function(a){var i=0,j=d.browser.msie&&6==~~d.browser.version;if(!a.height&&!a.width)return this;if(a.height&&a.width)i=a.width/a.height;return this.one("load",function(){this.removeAttribute("height");this.removeAttribute("width");this.style.height=this.style.width="";var e=this.height,f=this.width,g=f/e,b=a.height,c=a.width,h=i;h||(h=b?g+1:g-1);if(b&&e>b||c&&f>c){if(g>h)b=~~(e/f*c);else c=~~(f/e*b);this.height=b;this.width=c}}).each(function(){if(this.complete||j)d(this).trigger("load")})}})(jQuery);
\ No newline at end of file
diff --git a/view/theme/diabook/diabook-pink/js/jquery.autogrow.textarea.js b/view/theme/diabook/diabook-pink/js/jquery.autogrow.textarea.js
deleted file mode 100644
index 806e34f51..000000000
--- a/view/theme/diabook/diabook-pink/js/jquery.autogrow.textarea.js
+++ /dev/null
@@ -1,46 +0,0 @@
-(function($) {
-
-    /*
-     * Auto-growing textareas; technique ripped from Facebook
-     */
-    $.fn.autogrow = function(options) {
-        
-        this.filter('textarea').each(function() {
-            
-            var $this       = $(this),
-                minHeight   = $this.height(),
-                lineHeight  = $this.css('lineHeight');
-            
-            var shadow = $('<div></div>').css({
-                position:   'absolute',
-                top:        -10000,
-                left:       -10000,
-                width:      $(this).width(),
-                fontSize:   $this.css('fontSize'),
-                fontFamily: $this.css('fontFamily'),
-                lineHeight: $this.css('lineHeight'),
-                resize:     'none'
-            }).appendTo(document.body);
-            
-            var update = function() {
-                
-                var val = this.value.replace(/</g, '&lt;')
-                                    .replace(/>/g, '&gt;')
-                                    .replace(/&/g, '&amp;')
-                                    .replace(/\n/g, '<br/>');
-                
-                shadow.html(val);
-                $(this).css('height', Math.max(shadow.height() + 20, minHeight));
-            }
-            
-            $(this).change(update).keyup(update).keydown(update);
-            
-            update.apply(this);
-            
-        });
-        
-        return this;
-        
-    }
-    
-})(jQuery);
\ No newline at end of file
diff --git a/view/theme/diabook/diabook-pink/js/jquery.cookie.js b/view/theme/diabook/diabook-pink/js/jquery.cookie.js
deleted file mode 100644
index 6d5974a2c..000000000
--- a/view/theme/diabook/diabook-pink/js/jquery.cookie.js
+++ /dev/null
@@ -1,47 +0,0 @@
-/*!
- * jQuery Cookie Plugin
- * https://github.com/carhartl/jquery-cookie
- *
- * Copyright 2011, Klaus Hartl
- * Dual licensed under the MIT or GPL Version 2 licenses.
- * http://www.opensource.org/licenses/mit-license.php
- * http://www.opensource.org/licenses/GPL-2.0
- */
-(function($) {
-    $.cookie = function(key, value, options) {
-
-        // key and at least value given, set cookie...
-        if (arguments.length > 1 && (!/Object/.test(Object.prototype.toString.call(value)) || value === null || value === undefined)) {
-            options = $.extend({}, options);
-
-            if (value === null || value === undefined) {
-                options.expires = -1;
-            }
-
-            if (typeof options.expires === 'number') {
-                var days = options.expires, t = options.expires = new Date();
-                t.setDate(t.getDate() + days);
-            }
-
-            value = String(value);
-
-            return (document.cookie = [
-                encodeURIComponent(key), '=', options.raw ? value : encodeURIComponent(value),
-                options.expires ? '; expires=' + options.expires.toUTCString() : '', // use expires attribute, max-age is not supported by IE
-                options.path    ? '; path=' + options.path : '',
-                options.domain  ? '; domain=' + options.domain : '',
-                options.secure  ? '; secure' : ''
-            ].join(''));
-        }
-
-        // key and possibly options given, get cookie...
-        options = value || {};
-        var decode = options.raw ? function(s) { return s; } : decodeURIComponent;
-
-        var pairs = document.cookie.split('; ');
-        for (var i = 0, pair; pair = pairs[i] && pairs[i].split('='); i++) {
-            if (decode(pair[0]) === key) return decode(pair[1] || ''); // IE saves cookies with empty string as "c; ", e.g. without "=" as opposed to EOMB, thus pair[1] may be undefined
-        }
-        return null;
-    };
-})(jQuery);
diff --git a/view/theme/diabook/diabook-pink/login.tpl b/view/theme/diabook/diabook-pink/login.tpl
deleted file mode 100644
index efa7c2d6d..000000000
--- a/view/theme/diabook/diabook-pink/login.tpl
+++ /dev/null
@@ -1,33 +0,0 @@
-
-<form action="$dest_url" method="post" >
-	<input type="hidden" name="auth-params" value="login" />
-
-	<div id="login_standard">
-	{{ inc field_input.tpl with $field=$lname }}{{ endinc }}
-	{{ inc field_password.tpl with $field=$lpassword }}{{ endinc }}
-	</div>
-	
-	{{ if $openid }}
-			<div id="login_openid">
-			{{ inc field_openid.tpl with $field=$lopenid }}{{ endinc }}
-			</div>
-	{{ endif }}
-	
-	<div id="login-submit-wrapper" >
-		<input type="submit" name="submit" id="login-submit-button" value="$login" />
-	</div>
-	
-   <div id="login-extra-links">
-		{{ if $register }}<a href="register" title="$register.title" id="register-link">$register.desc</a>{{ endif }}
-        <a href="lostpass" title="$lostpass" id="lost-password-link" >$lostlink</a>
-	</div>	
-	
-	{{ for $hiddens as $k=>$v }}
-		<input type="hidden" name="$k" value="$v" />
-	{{ endfor }}
-	
-	
-</form>
-
-
-<script type="text/javascript"> $(document).ready(function() { $("#id_$lname.0").focus();} );</script>
diff --git a/view/theme/diabook/diabook-pink/mail_conv.tpl b/view/theme/diabook/diabook-pink/mail_conv.tpl
deleted file mode 100644
index 989f17878..000000000
--- a/view/theme/diabook/diabook-pink/mail_conv.tpl
+++ /dev/null
@@ -1,60 +0,0 @@
-<div class="wall-item-container $item.indent">
-	<div class="wall-item-item">
-		<div class="wall-item-info">
-			<div class="contact-photo-wrapper"
-				<a href="$mail.profile_url" target="redir" title="$mail.from_name" class="contact-photo-link" id="wall-item-photo-link-$mail.id">
-					<img src="$mail.from_photo" class="contact-photo$mail.sparkle" id="wall-item-photo-$mail.id" alt="$mail.from_name" />
-				</a>
-			</div>
-		</div>
-		<div class="wall-item-content">
-			$mail.body
-		</div>
-	</div>
-	<div class="wall-item-bottom">
-		<div class="wall-item-links">
-		</div>
-		<div class="wall-item-tags">
-		</div>
-	</div>
-	<div class="wall-item-bottom">
-		<div class="">
-		</div>
-		<div class="wall-item-actions">
-			<div class="wall-item-actions-author">
-				<a href="$mail.from_url" target="redir" class="wall-item-name-link"><span class="wall-item-name$mail.sparkle">$mail.from_name</span></a> <span class="wall-item-ago">$mail.date</span>
-			</div>
-			
-			<div class="wall-item-actions-social">
-			</div>
-			
-			<div class="wall-item-actions-tools">
-				<a href="message/drop/$mail.id" onclick="return confirmDelete();" class="icon delete s16" title="$mail.delete">$mail.delete</a>
-			</div>
-			
-		</div>
-	</div>
-	<div class="wall-item-bottom">
-	</div>
-</div>
-
-
-{#
-
-
-<div class="mail-conv-outside-wrapper">
-	<div class="mail-conv-sender" >
-		<a href="$mail.from_url" class="mail-conv-sender-url" ><img class="mframe mail-conv-sender-photo$mail.sparkle" src="$mail.from_photo" heigth="80" width="80" alt="$mail.from_name" /></a>
-	</div>
-	<div class="mail-conv-detail" >
-		<div class="mail-conv-sender-name" >$mail.from_name</div>
-		<div class="mail-conv-date">$mail.date</div>
-		<div class="mail-conv-subject">$mail.subject</div>
-		<div class="mail-conv-body">$mail.body</div>
-	<div class="mail-conv-delete-wrapper" id="mail-conv-delete-wrapper-$mail.id" ><a href="message/drop/$mail.id" class="icon drophide delete-icon mail-list-delete-icon" onclick="return confirmDelete();" title="$mail.delete" id="mail-conv-delete-icon-$mail.id" class="mail-conv-delete-icon" onmouseover="imgbright(this);" onmouseout="imgdull(this);" ></a></div><div class="mail-conv-delete-end"></div>
-	<div class="mail-conv-outside-wrapper-end"></div>
-</div>
-</div>
-<hr class="mail-conv-break" />
-
-#}
diff --git a/view/theme/diabook/diabook-pink/mail_display.tpl b/view/theme/diabook/diabook-pink/mail_display.tpl
deleted file mode 100644
index 8b82e95c6..000000000
--- a/view/theme/diabook/diabook-pink/mail_display.tpl
+++ /dev/null
@@ -1,12 +0,0 @@
-<div id="mail-display-subject">
-	<span class="{{if $thread_seen}}seen{{else}}unseen{{endif}}">$thread_subject</span>
-	<a href="message/dropconv/$thread_id" onclick="return confirmDelete();"  title="$delete" class="mail-delete icon s22 delete"></a>
-</div>
-
-{{ for $mails as $mail }}
-	<div id="tread-wrapper-$mail.id" class="tread-wrapper">
-		{{ inc mail_conv.tpl }}{{endinc}}
-	</div>
-{{ endfor }}
-
-{{ inc prv_message.tpl }}{{ endinc }}
diff --git a/view/theme/diabook/diabook-pink/mail_list.tpl b/view/theme/diabook/diabook-pink/mail_list.tpl
deleted file mode 100644
index 6bc6c84f6..000000000
--- a/view/theme/diabook/diabook-pink/mail_list.tpl
+++ /dev/null
@@ -1,8 +0,0 @@
-<div class="mail-list-wrapper">
-	<span class="mail-subject {{if $seen}}seen{{else}}unseen{{endif}}"><a href="message/$id" class="mail-link">$subject</a></span>
-	<span class="mail-from">$from_name</span>
-	<span class="mail-date">$date</span>
-	<span class="mail-count">$count</span>
-	
-	<a href="message/dropconv/$id" onclick="return confirmDelete();"  title="$delete" class="mail-delete icon s22 delete"></a>
-</div>
diff --git a/view/theme/diabook/diabook-pink/message_side.tpl b/view/theme/diabook/diabook-pink/message_side.tpl
deleted file mode 100644
index 9f1587096..000000000
--- a/view/theme/diabook/diabook-pink/message_side.tpl
+++ /dev/null
@@ -1,10 +0,0 @@
-<div id="message-sidebar" class="widget">
-	<div id="message-new" class="{{ if $new.sel }}selected{{ endif }}"><a href="$new.url">$new.label</a> </div>
-	
-	<ul class="message-ul">
-		{{ for $tabs as $t }}
-			<li class="tool {{ if $t.sel }}selected{{ endif }}"><a href="$t.url" class="message-link">$t.label</a></li>
-		{{ endfor }}
-	</ul>
-	
-</div>
diff --git a/view/theme/diabook/diabook-pink/nav.tpl b/view/theme/diabook/diabook-pink/nav.tpl
deleted file mode 100644
index 5f316bcdd..000000000
--- a/view/theme/diabook/diabook-pink/nav.tpl
+++ /dev/null
@@ -1,190 +0,0 @@
-<header>
-	<div id="site-location">$sitelocation</div>
-	<div id="banner">$banner</div>
-</header>
-<nav>
-			
-			
-	<ul>
-			
-			
-			{{ if $nav.network }}
-			<li id="nav-network-link" class="nav-menu-icon">
-				<a class="$nav.network.2" href="$nav.network.0" title="$nav.network.3" >
-				<span class="icon notifications">Benachrichtigungen</span>
-				<span id="net-update" class="nav-notify"></span></a>
-			</li>
-		    {{ endif }}
-	
-			{{ if $nav.contacts }}
-			<li class="nav-menu-icon" id="nav-contacts-linkmenu">
-				<a href="$nav.contacts.0" rel="#nav-contacts-menu" title="$nav.contacts.1">
-				<span class="icon contacts">$nav.contacts.1</span>
-				<span id="intro-update" class="nav-notify"></span></a>
-				<ul id="nav-contacts-menu" class="menu-popup">
-					<li id="nav-contacts-see-intro"><a href="$nav.notifications.0">$nav.introductions.1</a><span id="intro-update-li" class="nav-notify"></span></li>
-					<li id="nav-contacts-all"><a href="contacts">$nav.contacts.1</a></li> 
-				</ul>
-			</li>	
-
-			{{ endif }}
-			
-			{{ if $nav.messages }}
-			<li  id="nav-messages-linkmenu" class="nav-menu-icon">
-			  <a href="$nav.messages.0" rel="#nav-messages-menu" title="$nav.messages.1">
-			  <span class="icon messages">$nav.messages.1</span>
-				<span id="mail-update" class="nav-notify"></span></a>
-				<ul id="nav-messages-menu" class="menu-popup">
-					<li id="nav-messages-see-all"><a href="$nav.messages.0">$nav.messages.1</a></li>
-					<li id="nav-messages-see-all"><a href="$nav.messages.new.0">$nav.messages.new.1</a></li>
-				</ul>
-			</li>		
-			{{ endif }}
-		
-      {{ if $nav.notifications }}
-			<li  id="nav-notifications-linkmenu" class="nav-menu-icon">
-			<a href="$nav.notifications.0" rel="#nav-notifications-menu" title="$nav.notifications.1">
-			<span class="icon notify">$nav.notifications.1</span>
-				<span id="notify-update" class="nav-notify"></span></a>
-				<ul id="nav-notifications-menu" class="menu-popup">
-					<li id="nav-notifications-mark-all"><a href="#" onclick="notifyMarkAll(); return false;">$nav.notifications.mark.1</a></li>
-					<li id="nav-notifications-see-all"><a href="$nav.notifications.all.0">$nav.notifications.all.1</a></li>
-					<li class="empty">$emptynotifications</li>
-				</ul>
-			</li>		
-		{{ endif }}	
-			
-		{{ if $nav.search}}
-		<li id="search-box">
-			<form method="get" action="$nav.search.0">
-				<input id="search-text" class="nav-menu-search" type="text" value="" name="search">
-			</form>
-		</li>		
-		{{ endif }}	
-		
-		<li  style="width: 1%; height: 1px;float: right;"></li>	
-		
-		<li id="nav-site-linkmenu" class="nav-menu-icon"><a href="#" rel="#nav-site-menu"><span class="icon s22 gear">Site</span></a>
-			<ul id="nav-site-menu" class="menu-popup">
-				{{ if $nav.manage }}<li><a class="$nav.manage.2" href="$nav.manage.0" title="$nav.manage.3">$nav.manage.1</a></li>{{ endif }}				
-
-				{{ if $nav.settings }} <li><a class="$nav.search.2" onClick="restore_boxes()" title="Restore right-hand column" style="cursor: pointer;">Restore right-hand column</a></li>{{ endif }}
-										
-				{{ if $nav.help }} <li><a class="$nav.help.2" target="friendika-help" href="$nav.help.0" title="$nav.help.3" >$nav.help.1</a></li>{{ endif }}									
-										
-										 <li><a class="$nav.search.2" href="friendica" title="Site Info / Impressum" >Info/Impressum</a></li>
-										
-				{{ if $nav.settings }}<li><a class="menu-sep $nav.settings.2" href="$nav.settings.0" title="$nav.settings.3">$nav.settings.1</a></li>{{ endif }}
-				{{ if $nav.admin }}<li><a class="$nav.admin.2" href="$nav.admin.0" title="$nav.admin.3" >$nav.admin.1</a></li>{{ endif }}
-
-				{{ if $nav.logout }}<li><a class="menu-sep $nav.logout.2" href="$nav.logout.0" title="$nav.logout.3" >$nav.logout.1</a></li>{{ endif }}
-
-				
-			</ul>		
-		</li>
-		
-		
-		{{ if $nav.directory }}
-		<li id="nav-directory-link" class="nav-menu $sel.directory">
-			<a class="$nav.directory.2" href="$nav.directory.0" title="$nav.directory.3" >$nav.directory.1</a>
-		</li>
-		{{ endif }}
-		
-		{{ if $nav.apps }}
-			<li id="nav-apps-link" class="nav-menu $sel.apps">
-				<a class=" $nav.apps.2" href="#" rel="#nav-apps-menu" title="$nav.apps.3" >$nav.apps.1</a>
-				<ul id="nav-apps-menu" class="menu-popup">
-					{{ for $apps as $ap }}
-					<li>$ap</li>
-					{{ endfor }}
-				</ul>
-			</li>	
-		{{ endif }}		
-		
-      {{ if $nav.home }}
-			<li id="nav-home-link" class="nav-menu $sel.home">
-				<a class="$nav.home.2" href="$nav.home.0" title="$nav.home.3" >$nav.home.1
-				<span id="home-update" class="nav-notify"></span></a>
-			</li>
-		{{ endif }}		
-		
-		{{ if $userinfo }}
-			<li id="nav-user-linkmenu" class="nav-menu-icon"><a href="#" rel="#nav-user-menu" title="$sitelocation"><img src="$userinfo.icon" alt="$userinfo.name"></a>
-				<ul id="nav-user-menu" class="menu-popup">
-					{{ for $nav.usermenu as $usermenu }}
-						<li><a class="$usermenu.2" href="$usermenu.0" title="$usermenu.3">$usermenu.1</a></li>
-					{{ endfor }}
-					
-					{{ if $nav.profiles }}<li><a class="menu-sep $nav.profiles.2" href="$nav.profiles.0" title="$nav.profiles.3" >$nav.profiles.3</a></li>{{ endif }}
-					{{ if $nav.notifications }}<li><a class="$nav.notifications.2" href="$nav.notifications.0" title="$nav.notifications.3" >$nav.notifications.1</a></li>{{ endif }}
-					{{ if $nav.messages }}<li><a class="$nav.messages.2" href="$nav.messages.0" title="$nav.messages.3" >$nav.messages.1</a></li>{{ endif }}
-					{{ if $nav.contacts }}<li><a class="$nav.contacts.2" href="$nav.contacts.0" title="$nav.contacts.3" >$nav.contacts.1</a></li>{{ endif }}	
-				</ul>
-			</li>
-		{{ endif }}
-		
-					{{ if $nav.login }}
-					<li id="nav-home-link" class="nav-menu $sel.home">
-						<a class="$nav.login.2" href="$nav.login.0" title="$nav.login.3" >$nav.login.1</a>
-					<li>
-					{{ endif }}
-		
-		
-		
-	</ul>	
-
-
-	
-</nav>
-
-
-<div style="position: fixed; bottom: 5px; right: 10px;"><a href="javascript:scroll(0,0); "><img src="view/theme/diabook/icons/scroll_top.png" title="scroll to top"></a></div>
-<div style="position: fixed; bottom: 3px; left: 25px;">$langselector</div>
-<div style="position: fixed; bottom: 23px; left: 5px;"><a href="http://pad.toktan.org/p/diabook" target="blank" ><img src="view/theme/diabook/icons/bluebug.png" title="report bugs for the theme diabook"/></a></div>
-
-
-
-
-<ul id="nav-notifications-template" style="display:none;" rel="template">
-	<li class="{4}"><a href="{0}"><img src="{1}">{2} <span class="notif-when">{3}</span></a></li>
-</ul>
-
-
-
-{#
-
-{{ if $nav.logout }}<a id="nav-logout-link" class="nav-link $nav.logout.2" href="$nav.logout.0" title="$nav.logout.3" >$nav.logout.1</a> {{ endif }}
-{{ if $nav.login }}<a id="nav-login-link" class="nav-login-link $nav.login.2" href="$nav.login.0" title="$nav.login.3" >$nav.login.1</a> {{ endif }}
-
-<span id="nav-link-wrapper" >
-
-{{ if $nav.register }}<a id="nav-register-link" class="nav-commlink $nav.register.2" href="$nav.register.0" title="$nav.register.3" >$nav.register.1</a>{{ endif }}
-	
-<a id="nav-help-link" class="nav-link $nav.help.2" target="friendika-help" href="$nav.help.0" title="$nav.help.3" >$nav.help.1</a>
-	
-{{ if $nav.apps }}<a id="nav-apps-link" class="nav-link $nav.apps.2" href="$nav.apps.0" title="$nav.apps.3" >$nav.apps.1</a>{{ endif }}
-
-<a id="nav-search-link" class="nav-link $nav.search.2" href="$nav.search.0" title="$nav.search.3" >$nav.search.1</a>
-<a id="nav-directory-link" class="nav-link $nav.directory.2" href="$nav.directory.0" title="$nav.directory.3" >$nav.directory.1</a>
-
-{{ if $nav.admin }}<a id="nav-admin-link" class="nav-link $nav.admin.2" href="$nav.admin.0" title="$nav.admin.3" >$nav.admin.1</a>{{ endif }}
-
-{{ if $nav.notifications }}
-<a id="nav-notify-link" class="nav-commlink $nav.notifications.2" href="$nav.notifications.0" title="$nav.notifications.3" >$nav.notifications.1</a>
-<span id="notify-update" class="nav-ajax-left"></span>
-{{ endif }}
-{{ if $nav.messages }}
-<a id="nav-messages-link" class="nav-commlink $nav.messages.2" href="$nav.messages.0" title="$nav.messages.3" >$nav.messages.1</a>
-<span id="mail-update" class="nav-ajax-left"></span>
-{{ endif }}
-
-{{ if $nav.manage }}<a id="nav-manage-link" class="nav-commlink $nav.manage.2" href="$nav.manage.0" title="$nav.manage.3">$nav.manage.1</a>{{ endif }}
-
-{{ if $nav.settings }}<a id="nav-settings-link" class="nav-link $nav.settings.2" href="$nav.settings.0" title="$nav.settings.3">$nav.settings.1</a>{{ endif }}
-{{ if $nav.profiles }}<a id="nav-profiles-link" class="nav-link $nav.profiles.2" href="$nav.profiles.0" title="$nav.profiles.3" >$nav.profiles.1</a>{{ endif }}
-
-
-</span>
-<span id="nav-end"></span>
-<span id="banner">$banner</span>
-#}
diff --git a/view/theme/diabook/diabook-pink/nets.tpl b/view/theme/diabook/diabook-pink/nets.tpl
deleted file mode 100644
index be25ddee1..000000000
--- a/view/theme/diabook/diabook-pink/nets.tpl
+++ /dev/null
@@ -1,15 +0,0 @@
-<div id="profile_side">
-	<h3 style="margin-left: 2px;">$title</h3>
-	<div id="nets-desc">$desc</div>
-   
-	<ul class="menu-profile-side">
-	<li class="menu-profile-list">
-	<span class="menu-profile-icon {{ if $sel_all }}group_selected{{else}}group_unselected{{ endif }}"></span>	
-	<a style="text-decoration: none;" href="$base" class="menu-profile-list-item">$all</a></li>
-	{{ for $nets as $net }}
-	<li class="menu-profile-list">
-	<span class="menu-profile-icon {{ if $net.selected }}group_selected{{else}}group_unselected{{ endif }}"></span>	
-	<a href="$base?nets=$net.ref" class="menu-profile-list-item">$net.name</a></li>
-	{{ endfor }}
-	</ul>
-</div>
diff --git a/view/theme/diabook/diabook-pink/oembed_video.tpl b/view/theme/diabook/diabook-pink/oembed_video.tpl
deleted file mode 100644
index d6d29f724..000000000
--- a/view/theme/diabook/diabook-pink/oembed_video.tpl
+++ /dev/null
@@ -1,4 +0,0 @@
-<a class="embed_yt" href='$embedurl' onclick='this.innerHTML=Base64.decode("$escapedhtml"); yt_iframe(); return false;' style='float:left; margin: 1em; position: relative;'>
-	<img width='$tw' height='$th' src='$turl' >
-	<div style='position: absolute; top: 0px; left: 0px; width: $twpx; height: $thpx; background: url(images/icons/48/play.png) no-repeat center center;'></div>
-</a>
diff --git a/view/theme/diabook/diabook-pink/photo_item.tpl b/view/theme/diabook/diabook-pink/photo_item.tpl
deleted file mode 100644
index 5d65a89b7..000000000
--- a/view/theme/diabook/diabook-pink/photo_item.tpl
+++ /dev/null
@@ -1,65 +0,0 @@
-{{ if $indent }}{{ else }}
-<div class="wall-item-decor">
-	<img id="like-rotator-$id" class="like-rotator" src="images/rotator.gif" alt="$wait" title="$wait" style="display: none;" />
-</div>
-{{ endif }}
-
-<div class="wall-item-photo-container $indent">
-	<div class="wall-item-item">
-		<div class="wall-item-info">
-			<div class="contact-photo-wrapper" >
-				<a href="$profile_url" target="redir" title="" class="contact-photo-link" id="wall-item-photo-link-$id">
-					<img src="$thumb" class="contact-photo$sparkle" id="wall-item-photo-$id" alt="$name" />
-				</a>
-				<a href="#" rel="#wall-item-photo-menu-$id" class="contact-photo-menu-button icon s16 menu" id="wall-item-photo-menu-button-$id">menu</a>
-				<ul class="contact-menu menu-popup" id="wall-item-photo-menu-$id">
-				$photo_menu
-				</ul>
-				
-			</div>
-		</div>
-			<div class="wall-item-actions-author">
-				<a href="$profile_url" target="redir" title="$name" class="wall-item-name-link"><span class="wall-item-name$sparkle">$name</span></a> 
-			<span class="wall-item-ago">-
-			{{ if $plink }}<a class="link" title="$plink.title" href="$plink.href" style="color: #999">$ago</a>{{ else }} $ago {{ endif }}
-			{{ if $lock }} - <span class="fakelink" style="color: #999" onclick="lockview(event,$id);">$lock</span> {{ endif }}
-			</span>
-			</div>
-		<div class="wall-item-content">
-			{{ if $title }}<h2><a href="$plink.href">$title</a></h2>{{ endif }}
-			$body
-		</div>
-	</div>
-	<div class="wall-item-bottom">
-		<div class="wall-item-links">
-		</div>
-		<div class="wall-item-tags">
-			{{ for $tags as $tag }}
-				<span class='tag'>$tag</span>
-			{{ endfor }}
-		</div>
-	</div>
-	
-	<div class="wall-item-bottom" style="display: table-row;">
-		<div class="wall-item-actions">
-	   </div>
-		<div class="wall-item-actions">
-			
-			<div class="wall-item-actions-tools">
-
-				{{ if $drop.dropping }}
-					<input type="checkbox" title="$drop.select" name="itemselected[]" class="item-select" value="$id" />
-					<a href="item/drop/$id" onclick="return confirmDelete();" class="icon drop" title="$drop.delete">$drop.delete</a>
-				{{ endif }}
-				{{ if $edpost }}
-					<a class="icon pencil" href="$edpost.0" title="$edpost.1"></a>
-				{{ endif }}
-			</div>
-
-		</div>
-	</div>
-	<div class="wall-item-bottom">
-			
-	</div>
-</div>
-
diff --git a/view/theme/diabook/diabook-pink/photo_view.tpl b/view/theme/diabook/diabook-pink/photo_view.tpl
deleted file mode 100644
index 071972e0c..000000000
--- a/view/theme/diabook/diabook-pink/photo_view.tpl
+++ /dev/null
@@ -1,35 +0,0 @@
-<div id="live-display"></div>
-<h3><a href="$album.0">$album.1</a></h3>
-
-<div id="photo-edit-link-wrap">
-{{ if $tools }}
-<a id="photo-edit-link" href="$tools.edit.0">$tools.edit.1</a>
--
-<a id="photo-toprofile-link" href="$tools.profile.0">$tools.profile.1</a>
-{{ endif }}
-{{ if $lock }} - <img src="images/lock_icon.gif" class="lockview" alt="$lock" onclick="lockview(event,'photo$id');" /> {{ endif }}
-</div>
-
-<div id="photo-photo">
-	{{ if $prevlink }}<div id="photo-prev-link"><a href="$prevlink.0">$prevlink.1</a></div>{{ endif }}
-	<a href="$photo.href" class="lightbox" title="$photo.title"><img src="$photo.src" /></a>
-	{{ if $nextlink }}<div id="photo-next-link"><a href="$nextlink.0">$nextlink.1</a></div>{{ endif }}
-</div>
-
-<div id="photo-photo-end"></div>
-<div id="photo-caption" >$desc</div>
-{{ if $tags }}
-<div id="in-this-photo-text">$tags.0</div>
-<div id="in-this-photo">$tags.1</div>
-{{ endif }}
-{{ if $tags.2 }}<div id="tag-remove"><a href="$tags.2">$tags.3</a></div>{{ endif }}
-
-{{ if $edit }}$edit{{ endif }}
-
-<div style="margin-top:20px">
-</div>
-<div id="wall-photo-container">
-$comments
-</div>
-
-$paginate
diff --git a/view/theme/diabook/diabook-pink/profile_side.tpl b/view/theme/diabook/diabook-pink/profile_side.tpl
deleted file mode 100644
index 01e80f238..000000000
--- a/view/theme/diabook/diabook-pink/profile_side.tpl
+++ /dev/null
@@ -1,21 +0,0 @@
-<div id="profile_side">
-	<div id="ps-usernameicon">
-		<a href="$ps.usermenu.status.0" title="$userinfo.name">
-			<img src="$userinfo.icon" id="ps-usericon" alt="$userinfo.name">
-		</a>
-		<a href="$ps.usermenu.status.0" id="ps-username" title="$userinfo.name">$userinfo.name</a>
-	</div>
-	
-<ul id="profile-side-menu" class="menu-profile-side">
-	<li id="profile-side-status" class="menu-profile-list"><a class="menu-profile-list-item" href="$ps.usermenu.status.0">$ps.usermenu.status.1<span class="menu-profile-icon home"></span></a></li>
-	<li id="profile-side-photos" class="menu-profile-list photos"><a class="menu-profile-list-item" href="$ps.usermenu.photos.0">$ps.usermenu.photos.1<span class="menu-profile-icon photos"></span></a></li>
-	<li id="profile-side-photos" class="menu-profile-list pscontacts"><a class="menu-profile-list-item" href="$ps.usermenu.contacts.0">$ps.usermenu.contacts.1<span class="menu-profile-icon pscontacts"></span></a></li>		
-	<li id="profile-side-events" class="menu-profile-list events"><a class="menu-profile-list-item" href="$ps.usermenu.events.0">$ps.usermenu.events.1<span class="menu-profile-icon events"></span></a></li>
-	<li id="profile-side-notes" class="menu-profile-list notes"><a class="menu-profile-list-item" href="$ps.usermenu.notes.0">$ps.usermenu.notes.1<span class="menu-profile-icon notes"></span></a></li>
-	<li id="profile-side-foren" class="menu-profile-list foren"><a class="menu-profile-list-item" href="$ps.usermenu.pgroups.0" target="blanc">$ps.usermenu.pgroups.1<span class="menu-profile-icon foren"></span></a></li>
-	<li id="profile-side-foren" class="menu-profile-list com_side"><a class="menu-profile-list-item" href="$ps.usermenu.community.0">$ps.usermenu.community.1<span class="menu-profile-icon com_side"></span></a></li>
-</ul>
-
-</div>
-
-				
diff --git a/view/theme/diabook/diabook-pink/profile_vcard.tpl b/view/theme/diabook/diabook-pink/profile_vcard.tpl
deleted file mode 100644
index 6fcffcc9b..000000000
--- a/view/theme/diabook/diabook-pink/profile_vcard.tpl
+++ /dev/null
@@ -1,64 +0,0 @@
-<div class="vcard">
-
-	<div class="tool">
-		<div class="fn label">$profile.name</div>
-		{{ if $profile.edit }}
-			<div class="action">
-			<a class="icon s16 edit ttright" href="#" rel="#profiles-menu" title="$profile.edit.3"><span>$profile.edit.1</span></a>
-			<ul id="profiles-menu" class="menu-popup">
-				{{ for $profile.menu.entries as $e }}
-				<li>
-					<a href="profiles/$e.id"><img src='$e.photo'>$e.profile_name</a>
-				</li>
-				{{ endfor }}
-				<li><a href="profile_photo" >$profile.menu.chg_photo</a></li>
-				<li><a href="profiles/new" id="profile-listing-new-link">$profile.menu.cr_new</a></li>
-				<li><a href="profiles" >$profile.edit.3</a></li>
-								
-			</ul>
-			</div>
-		{{ endif }}
-	</div>
-				
-	
-
-	<div id="profile-photo-wrapper"><img class="photo"  src="$profile.photo?rev=$profile.picdate" alt="$profile.name" /></div>
-	{{ if $pdesc }}<div class="title">$profile.pdesc</div>{{ endif }}
-
-
-	{{ if $location }}
-		<dl class="location"><dt class="location-label">$location</dt><br> 
-		<dd class="adr">
-			{{ if $profile.address }}<div class="street-address">$profile.address</div>{{ endif }}
-			<span class="city-state-zip">
-				<span class="locality">$profile.locality</span>{{ if $profile.locality }}, {{ endif }}
-				<span class="region">$profile.region</span>
-				<span class="postal-code">$profile.postal-code</span>
-			</span>
-			{{ if $profile.country-name }}<span class="country-name">$profile.country-name</span>{{ endif }}
-		</dd>
-		</dl>
-	{{ endif }}
-
-	{{ if $gender }}<dl class="mf"><dt class="gender-label">$gender</dt> <dd class="x-gender">$profile.gender</dd></dl>{{ endif }}
-	
-	{{ if $profile.pubkey }}<div class="key" style="display:none;">$profile.pubkey</div>{{ endif }}
-
-	{{ if $marital }}<dl class="marital"><dt class="marital-label"><span class="heart">&hearts;</span>$marital</dt><dd class="marital-text">$profile.marital</dd></dl>{{ endif }}
-
-	{{ if $homepage }}<dl class="homepage"><dt class="homepage-label">$homepage</dt><dd class="homepage-url"><a href="$profile.homepage" target="external-link">$profile.homepage</a></dd></dl>{{ endif }}
-
-	{{ inc diaspora_vcard.tpl }}{{ endinc }}
-	
-	<div id="profile-extra-links">
-		<ul>
-			{{ if $connect }}
-				<li><a id="dfrn-request-link" href="dfrn_request/$profile.nickname">$connect</a></li>
-			{{ endif }}
-		</ul>
-	</div>
-</div>
-
-$contact_block
-
-
diff --git a/view/theme/diabook/diabook-pink/right_aside.tpl b/view/theme/diabook/diabook-pink/right_aside.tpl
deleted file mode 100644
index a65677696..000000000
--- a/view/theme/diabook/diabook-pink/right_aside.tpl
+++ /dev/null
@@ -1,20 +0,0 @@
-<div id="profile_side">
-	<div id="ps-usernameicon">
-		<a href="$ps.usermenu.status.0" title="$userinfo.name">
-			<img src="$userinfo.icon" id="ps-usericon" alt="$userinfo.name">
-		</a>
-		<a href="$ps.usermenu.status.0" id="ps-username" title="$userinfo.name">$userinfo.name</a>
-	</div>
-	
-<ul id="profile-side-menu" class="menu-profile-side">
-	<li id="profile-side-status" class="menu-profile-list home"><a class="menu-profile-list-item" href="$ps.usermenu.status.0">$ps.usermenu.status.1</a></li>
-	<li id="profile-side-photos" class="menu-profile-list photos"><a class="menu-profile-list-item" href="$ps.usermenu.photos.0">$ps.usermenu.photos.1</a></li>
-	<li id="profile-side-events" class="menu-profile-list events"><a class="menu-profile-list-item" href="$ps.usermenu.events.0">$ps.usermenu.events.1</a></li>
-	<li id="profile-side-notes" class="menu-profile-list notes"><a class="menu-profile-list-item" href="$ps.usermenu.notes.0">$ps.usermenu.notes.1</a></li>
-	<li id="profile-side-foren" class="menu-profile-list foren"><a class="menu-profile-list-item" href="http://dir.friendika.com/directory/forum" target="blanc">Public Groups</a></li>
-	<li id="profile-side-foren" class="menu-profile-list com_side"><a class="menu-profile-list-item" href="$ps.usermenu.community.0">$ps.usermenu.community.1</a></li>
-</ul>
-
-</div>
-
-				
\ No newline at end of file
diff --git a/view/theme/diabook/diabook-pink/screenshot.png b/view/theme/diabook/diabook-pink/screenshot.png
deleted file mode 100644
index 4eee5be5a..000000000
--- a/view/theme/diabook/diabook-pink/screenshot.png
+++ /dev/null
diff --git a/view/theme/diabook/diabook-pink/search_item.tpl b/view/theme/diabook/diabook-pink/search_item.tpl
deleted file mode 100644
index 123834064..000000000
--- a/view/theme/diabook/diabook-pink/search_item.tpl
+++ /dev/null
@@ -1,100 +0,0 @@
-{{ if $item.indent }}{{ else }}
-<div class="wall-item-decor">
-	<img id="like-rotator-$item.id" class="like-rotator" src="images/rotator.gif" alt="$item.wait" title="$item.wait" style="display: none;" />
-</div>
-{{ endif }}
-<div class="wall-item-container $item.indent">
-	<div class="wall-item-item">
-		<div class="wall-item-info">
-			<div class="contact-photo-wrapper"
-				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" target="redir" title="$item.linktitle" class="contact-photo-link" id="wall-item-photo-link-$item.id">
-					<img src="$item.thumb" class="contact-photo$item.sparkle" id="wall-item-photo-$item.id" alt="$item.name" />
-				</a>
-				<a href="#" rel="#wall-item-photo-menu-$item.id" class="contact-photo-menu-button icon s16 menu" id="wall-item-photo-menu-button-$item.id">menu</a>
-				<ul class="contact-menu menu-popup" id="wall-item-photo-menu-$item.id">
-				$item.item_photo_menu
-				</ul>
-				
-			</div>
-		</div>
-			<div class="wall-item-actions-author">
-				<a href="$item.profile_url" target="redir" title="$item.linktitle" class="wall-item-name-link"><span class="wall-item-name$item.sparkle">$item.name</span></a> 
-			<span class="wall-item-ago">-
-			{{ if $item.plink }}<a class="link" title="$item.plink.title" href="$item.plink.href" style="color: #999">$item.ago</a>{{ else }} $item.ago {{ endif }}
-			{{ if $item.lock }} - <span class="fakelink" style="color: #999" onclick="lockview(event,$item.id);">$item.lock</span> {{ endif }}
-			</span>
-			</div>
-		<div class="wall-item-content">
-			{{ if $item.title }}<h2><a href="$item.plink.href">$item.title</a></h2>{{ endif }}
-			$item.body
-		</div>
-	</div>
-	<div class="wall-item-bottom">
-		<div class="wall-item-links">
-		</div>
-		<div class="wall-item-tags">
-			{{ for $item.tags as $tag }}
-				<span class='tag'>$tag</span>
-			{{ endfor }}
-		</div>
-	</div>
-	<div class="wall-item-bottom">
-		<div class="">
-
-		</div>
-		<div class="wall-item-actions">
-
-			<div class="wall-item-actions-social">
-			
-			
-			{{ if $item.vote }}
-				<a href="#" id="like-$item.id" class="icon like" title="$item.vote.like.0" onclick="dolike($item.id,'like'); return false">$item.vote.like.1</a>
-				<a href="#" id="dislike-$item.id" class="icon dislike" title="$item.vote.dislike.0" onclick="dolike($item.id,'dislike'); return false"></a>
-			{{ endif }}
-						
-			{{ if $item.vote.share }}
-				<a href="#" id="share-$item.id" class="icon recycle" title="$item.vote.share.0" onclick="jotShare($item.id); return false"></a>
-			{{ endif }}	
-
-
-			{{ if $item.star }}
-				<a href="#" id="starred-$item.id" onclick="dostar($item.id); return false;" class="star-item icon $item.isstarred" title="$item.star.toggle">
-				<img src="images/star_dummy.png" class="icon star" alt="$item.star.do" /> </a>
-				<a href="#" id="tagger-$item.id" onclick="itemTag($item.id); return false;" class="tag-item icon tagged" title="$item.star.tagger"></a>					  
-			{{ endif }}	
-			
-			{{ if $item.filer }}
-			<a href="#" id="filer-$item.id" onclick="itemFiler($item.id); return false;" class="filer-item icon file-as" title="$item.star.filer"></a>
-			{{ endif }}				
-			
-			{{ if $item.plink }}<a class="icon link" title="$item.plink.title" href="$item.plink.href">$item.plink.title</a>{{ endif }}
-			
-					
-					
-			</div>
-			
-			<div class="wall-item-actions-tools">
-
-				{{ if $item.drop.dropping }}
-					<input type="checkbox" title="$item.drop.select" name="itemselected[]" class="item-select" value="$item.id" />
-					<a href="item/drop/$item.id" onclick="return confirmDelete();" class="icon drop" title="$item.drop.delete">$item.drop.delete</a>
-				{{ endif }}
-				{{ if $item.edpost }}
-					<a class="icon pencil" href="$item.edpost.0" title="$item.edpost.1"></a>
-				{{ endif }}
-			</div>
-			<div class="wall-item-location">$item.location&nbsp;</div>
-		</div>
-	</div>
-	<div class="wall-item-bottom">
-		<div class="wall-item-links"></div>
-		<div class="wall-item-like" id="wall-item-like-$item.id">$item.like</div>
-		<div class="wall-item-dislike" id="wall-item-dislike-$item.id">$item.dislike</div>	
-	</div>
-</div>
-
-<div class="wall-item-comment-wrapper" >
-	$item.comment
-</div>
diff --git a/view/theme/diabook/diabook-pink/style-network-wide.css b/view/theme/diabook/diabook-pink/style-network-wide.css
index c66432e84..0a83955df 100644
--- a/view/theme/diabook/diabook-pink/style-network-wide.css
+++ b/view/theme/diabook/diabook-pink/style-network-wide.css
@@ -121,7 +121,7 @@
 			  display: block; width: 28px; height: 28px; background-repeat: no-repeat;
 			  }	
 .video 	{ background-image: url("../diabook-pink/icons/video.png"); 
-			  display: block; width: 100%; height: 28px; background-repeat: no-repeat;
+			  display: block; width: 100%; height: 140px; background-repeat: no-repeat;
 			  }
 .audio2 	{ background-image: url("../diabook-pink/icons/audio.png"); 
 			  display: block; width: 28px; height: 28px; background-repeat: no-repeat;
@@ -1371,7 +1371,7 @@ transition: all 0.2s ease-in-out;
   max-width: 690px;
   word-wrap: break-word;
 
-  margin-bottom: 14px;
+
 }
 /*marker*/
 .wall-item-container .wall-item-content img {
diff --git a/view/theme/diabook/diabook-pink/style-network.css b/view/theme/diabook/diabook-pink/style-network.css
index 7e8263e1a..3a4f49877 100644
--- a/view/theme/diabook/diabook-pink/style-network.css
+++ b/view/theme/diabook/diabook-pink/style-network.css
@@ -121,7 +121,7 @@
 			  display: block; width: 28px; height: 28px; background-repeat: no-repeat;
 			  }	
 .video 	{ background-image: url("../diabook-pink/icons/video.png"); 
-			  display: block; width: 100%; height: 28px; background-repeat: no-repeat;
+			  display: block; width: 100%; height: 140px; background-repeat: no-repeat;
 			  }
 .audio2 	{ background-image: url("../diabook-pink/icons/audio.png"); 
 			  display: block; width: 28px; height: 28px; background-repeat: no-repeat;
@@ -1365,7 +1365,7 @@ transition: all 0.2s ease-in-out;
   max-width: 420px;
   word-wrap: break-word;
 
-  margin-bottom: 14px;
+
 }
 
 .wall-item-container .wall-item-content img {
diff --git a/view/theme/diabook/diabook-pink/style-profile-wide.css b/view/theme/diabook/diabook-pink/style-profile-wide.css
index c7cfd111e..080551896 100644
--- a/view/theme/diabook/diabook-pink/style-profile-wide.css
+++ b/view/theme/diabook/diabook-pink/style-profile-wide.css
@@ -121,7 +121,7 @@
 			  display: block; width: 28px; height: 28px; background-repeat: no-repeat;
 			  }	
 .video 	{ background-image: url("../diabook-pink/icons/video.png"); 
-			  display: block; width: 100%; height: 28px; background-repeat: no-repeat;
+			  display: block; width: 100%; height: 140px; background-repeat: no-repeat;
 			  }
 .audio2 	{ background-image: url("../diabook-pink/icons/audio.png"); 
 			  display: block; width: 28px; height: 28px; background-repeat: no-repeat;
@@ -1346,7 +1346,7 @@ transition: all 0.2s ease-in-out;
   max-width: 690px;
   word-wrap: break-word;
 
-  margin-bottom: 14px;
+
 }
 /*marker*/
 .wall-item-container .wall-item-content img {
diff --git a/view/theme/diabook/diabook-pink/style-profile.css b/view/theme/diabook/diabook-pink/style-profile.css
index 8d32cf028..8f3753061 100644
--- a/view/theme/diabook/diabook-pink/style-profile.css
+++ b/view/theme/diabook/diabook-pink/style-profile.css
@@ -121,7 +121,7 @@
 			  display: block; width: 28px; height: 28px; background-repeat: no-repeat;
 			  }	
 .video 	{ background-image: url("../diabook-pink/icons/video.png"); 
-			  display: block; width: 100%; height: 28px; background-repeat: no-repeat;
+			  display: block; width: 100%; height: 140px; background-repeat: no-repeat;
 			  }
 .audio2 	{ background-image: url("../diabook-pink/icons/audio.png"); 
 			  display: block; width: 28px; height: 28px; background-repeat: no-repeat;
@@ -1338,7 +1338,7 @@ transition: all 0.2s ease-in-out;
   max-width: 420px;
   word-wrap: break-word;
 
-  margin-bottom: 14px;
+
 }
 
 .wall-item-container .wall-item-content img {
diff --git a/view/theme/diabook/diabook-pink/style-wide.css b/view/theme/diabook/diabook-pink/style-wide.css
index 8442a8880..a51ca49cc 100644
--- a/view/theme/diabook/diabook-pink/style-wide.css
+++ b/view/theme/diabook/diabook-pink/style-wide.css
@@ -150,7 +150,7 @@
 			  display: block; width: 28px; height: 28px; background-repeat: no-repeat;
 			  }	
 .video 	{ background-image: url("../../../view/theme/diabook/diabook-pink/icons/video.png"); 
-			  display: block; width: 100%; height: 28px; background-repeat: no-repeat;
+			  display: block; width: 100%; height: 140px; background-repeat: no-repeat;
 			  }
 .audio2 	{ background-image: url("../../../view/theme/diabook/diabook-pink/icons/audio.png"); 
 			  display: block; width: 28px; height: 28px; background-repeat: no-repeat;
@@ -1220,7 +1220,14 @@ aside #likes a:hover{
   margin-right: 20px;		
 	}
 #login-submit-wrapper{
-margin-bottom: 15px;
+  padding-top: 120px;
+  margin-bottom: 12px;
+	}
+aside #login-submit-button{
+  margin-left: 0px!important;	
+	}
+aside #login-extra-links{
+  padding-top: 0px!important;	
 	}
 .group_selected {
   background: url("../diabook/icons/selected.png") no-repeat left center;
@@ -1601,7 +1608,7 @@ body .pageheader{
   max-width: 690px;
   word-wrap: break-word;
 
-  margin-bottom: 14px;
+
 }
 
 .wall-item-container .wall-item-content img {
diff --git a/view/theme/diabook/diabook-pink/style.css b/view/theme/diabook/diabook-pink/style.css
index 15b25d5cb..833e81a5f 100644
--- a/view/theme/diabook/diabook-pink/style.css
+++ b/view/theme/diabook/diabook-pink/style.css
@@ -150,7 +150,7 @@
 			  display: block; width: 28px; height: 28px; background-repeat: no-repeat;
 			  }	
 .video 	{ background-image: url("../../../view/theme/diabook/diabook-pink/icons/video.png"); 
-			  display: block; width: 100%; height: 28px; background-repeat: no-repeat;
+			  display: block; width: 100%; height: 140px; background-repeat: no-repeat;
 			  }
 .audio2 	{ background-image: url("../../../view/theme/diabook/diabook-pink/icons/audio.png"); 
 			  display: block; width: 28px; height: 28px; background-repeat: no-repeat;
@@ -1224,7 +1224,14 @@ aside #likes a:hover{
   margin-right: 20px;		
 	}
 #login-submit-wrapper{
-margin-bottom: 15px;
+  padding-top: 120px;
+  margin-bottom: 12px;
+	}
+aside #login-submit-button{
+  margin-left: 0px!important;	
+	}
+aside #login-extra-links{
+  padding-top: 0px!important;	
 	}
 .group_selected {
   background: url("../diabook/icons/selected.png") no-repeat left center;
@@ -1600,7 +1607,7 @@ body .pageheader{
   max-width: 720px;
   word-wrap: break-word;
 
-  margin-bottom: 14px;
+
 }
 
 .wall-item-container .wall-item-content img {
diff --git a/view/theme/diabook/diabook-pink/style.php b/view/theme/diabook/diabook-pink/style.php
deleted file mode 100644
index b8c37fc96..000000000
--- a/view/theme/diabook/diabook-pink/style.php
+++ /dev/null
@@ -1,277 +0,0 @@
-<?php
-	$line_height=false;
-	$diabook_font_size=false;
-	$resolution=false;
-	$site_line_height = get_config("diabook-aerith","line_height");
-	$site_diabook_font_size = get_config("diabook-aerith", "font_size" );
-	$site_resolution = get_config("diabook-aerith", "resolution" );
-	
-	
-	if (local_user()) {
-		$line_height = get_pconfig(local_user(), "diabook-aerith","line_height");
-		$diabook_font_size = get_pconfig(local_user(), "diabook-aerith", "font_size");
-		$resolution = get_pconfig(local_user(), "diabook-aerith", "resolution");
-	}
-	
-	if ($line_height===false) $line_height=$site_line_height;
-	if ($line_height===false) $line_height="1.3";
-	if ($diabook_font_size===false) $diabook_font_size=$site_diabook_font_size;
-	if ($diabook_font_size===false) $diabook_font_size="13";
-	if ($resolution===false) $resolution=$site_resolution;
-	if ($resolution===false) $resolution="normal";
-	
-	
-	if($resolution == "normal") {	
-	if (file_exists("$THEMEPATH/style.css")){
-		echo file_get_contents("$THEMEPATH/style.css");
-	}
-
-   if($diabook_font_size == "15"){
-		echo "
-			.wall-item-container .wall-item-content {
-  					font-size: 15px;
-  					}
-  					
-			.wall-item-photo-container .wall-item-content {
-  					font-size: 15px;
-  					}
-		";
-	}	
-	if($diabook_font_size == "14"){
-		echo "
-			.wall-item-container .wall-item-content {
-  					font-size: 14px;
-  					}
-  					
-			.wall-item-photo-container .wall-item-content {
-  					font-size: 14px;
-  					}
-		";
-	}
-	if($diabook_font_size == "13.5"){
-		echo "
-			.wall-item-container .wall-item-content {
-  					font-size: 13.5px;
-  					}
-  					
-			.wall-item-photo-container .wall-item-content {
-  					font-size: 13.5px;
-  					}
-		";
-	}
-	if($diabook_font_size == "13"){
-		echo "
-			.wall-item-container .wall-item-content {
-  					font-size: 13px;
-  					}
-  					
-			.wall-item-photo-container .wall-item-content {
-  					font-size: 13px;
-  					}
-		";
-	}
-	if($diabook_font_size == "12.5"){
-		echo "
-			.wall-item-container .wall-item-content {
-  					font-size: 12.5px;
-  					}
-  					
-			.wall-item-photo-container .wall-item-content {
-  					font-size: 12.5px;
-  					}
-		";
-	}
-	if($diabook_font_size == "12"){
-		echo "
-			.wall-item-container .wall-item-content {
-  					font-size: 12px;
-  					}
-  					
-			.wall-item-photo-container .wall-item-content {
-  					font-size: 12px;
-  					}
-		";
-	}
-	if($line_height == "1.5"){
-		echo "
-			.wall-item-container .wall-item-content {
-  					line-height: 1.5;
-  					}
-  					
-			.wall-item-photo-container .wall-item-content {
- 					line-height: 1.5;
-  					}
-		";
-	}	
-	if($line_height == "1.4"){
-		echo "
-			.wall-item-container .wall-item-content {
-  					line-height: 1.4;
-  					}
-  					
-			.wall-item-photo-container .wall-item-content {
- 					line-height: 1.4;
-  					}
-		";
-	}
-	if($line_height == "1.3"){
-		echo "
-			.wall-item-container .wall-item-content {
-  					line-height: 1.3;
-  					}
-  					
-			.wall-item-photo-container .wall-item-content {
- 					line-height: 1.3;
-  					}
-		";
-	}
-	if($line_height == "1.2"){
-		echo "
-			.wall-item-container .wall-item-content {
-  					line-height: 1.2;
-  					}
-  					
-			.wall-item-photo-container .wall-item-content {
- 					line-height: 1.2;
-  					}
-		";
-	}
-	if($line_height == "1.1"){
-		echo "
-			.wall-item-container .wall-item-content {
-  					line-height: 1.1;
-  					}
-  					
-			.wall-item-photo-container .wall-item-content {
- 					line-height: 1.1;
-  					}
-		";
-	}
-	}
-	
-	if($resolution == "wide") {	
-	if (file_exists("$THEMEPATH/style-wide.css")){
-		echo file_get_contents("$THEMEPATH/style-wide.css");
-	}
-	if($diabook_font_size == "15"){
-		echo "
-			.wall-item-container .wall-item-content {
-  					font-size: 15px;
-  					}
-  					
-			.wall-item-photo-container .wall-item-content {
-  					font-size: 15px;
-  					}
-		";
-	}
-	if($diabook_font_size == "14"){
-		echo "
-			.wall-item-container .wall-item-content {
-  					font-size: 14px;
-  					}
-  					
-			.wall-item-photo-container .wall-item-content {
-  					font-size: 14px;
-  					}
-		";
-	}
-	if($diabook_font_size == "13.5"){
-		echo "
-			.wall-item-container .wall-item-content {
-  					font-size: 13.5px;
-  					}
-  					
-			.wall-item-photo-container .wall-item-content {
-  					font-size: 13.5px;
-  					}
-		";
-	}
-	if($diabook_font_size == "13"){
-		echo "
-			.wall-item-container .wall-item-content {
-  					font-size: 13px;
-  					}
-  					
-			.wall-item-photo-container .wall-item-content {
-  					font-size: 13px;
-  					}
-		";
-	}
-	if($diabook_font_size == "12.5"){
-		echo "
-			.wall-item-container .wall-item-content {
-  					font-size: 12.5px;
-  					}
-  					
-			.wall-item-photo-container .wall-item-content {
-  					font-size: 12.5px;
-  					}
-		";
-	}
-	if($diabook_font_size == "12"){
-		echo "
-			.wall-item-container .wall-item-content {
-  					font-size: 12px;
-  					}
-  					
-			.wall-item-photo-container .wall-item-content {
-  					font-size: 12px;
-  					}
-		";
-	}
-	if($line_height == "1.5"){
-		echo "
-			.wall-item-container .wall-item-content {
-  					line-height: 1.5;
-  					}
-  					
-			.wall-item-photo-container .wall-item-content {
- 					line-height: 1.5;
-  					}
-		";
-	}	
-	if($line_height == "1.4"){
-		echo "
-			.wall-item-container .wall-item-content {
-  					line-height: 1.4;
-  					}
-  					
-			.wall-item-photo-container .wall-item-content {
- 					line-height: 1.4;
-  					}
-		";
-	}
-	if($line_height == "1.3"){
-		echo "
-			.wall-item-container .wall-item-content {
-  					line-height: 1.3;
-  					}
-  					
-			.wall-item-photo-container .wall-item-content {
- 					line-height: 1.3;
-  					}
-		";
-	}
-	if($line_height == "1.2"){
-		echo "
-			.wall-item-container .wall-item-content {
-  					line-height: 1.2;
-  					}
-  					
-			.wall-item-photo-container .wall-item-content {
- 					line-height: 1.2;
-  					}
-		";
-	}
-	if($line_height == "1.1"){
-		echo "
-			.wall-item-container .wall-item-content {
-  					line-height: 1.1;
-  					}
-  					
-			.wall-item-photo-container .wall-item-content {
- 					line-height: 1.1;
-  					}
-		";
-	}
-	}
\ No newline at end of file
diff --git a/view/theme/diabook/diabook-pink/theme.php b/view/theme/diabook/diabook-pink/theme.php
deleted file mode 100644
index 1518d7e8e..000000000
--- a/view/theme/diabook/diabook-pink/theme.php
+++ /dev/null
@@ -1,488 +0,0 @@
-<?php
-
-/*
- * Name: Diabook-aerith
- * Description: Diabook-aerith : report bugs and request here: http://pad.toktan.org/p/diabook or contact me : thomas_bierey@friendica.eu
- * Version: (Version: 1.020)
- * Author: 
- */
-
-
-//print diabook-version for debugging
-$diabook_version = "Diabook-aerith (Version: 1.020)";
-$a->page['htmlhead'] .= sprintf('<script "%s" ></script>', $diabook_version);
-
-
-//change css on network and profilepages
-$cssFile = null;
-$resolution=false;
-$resolution = get_pconfig(local_user(), "diabook-aerith", "resolution");
-if ($resolution===false) $resolution="normal";
-
-/**
- * prints last community activity
- */
-function diabook_aerith_community_info(){
-	$a = get_app();
-
-	// last 12 users
-	$aside['$lastusers_title'] = t('Last users');
-	$aside['$lastusers_items'] = array();
-	$sql_extra = "";
-	$publish = (get_config('system','publish_all') ? '' : " AND `publish` = 1 " );
-	$order = " ORDER BY `register_date` DESC ";
-
-	$r = q("SELECT `profile`.*, `profile`.`uid` AS `profile_uid`, `user`.`nickname`
-			FROM `profile` LEFT JOIN `user` ON `user`.`uid` = `profile`.`uid` 
-			WHERE `is-default` = 1 $publish AND `user`.`blocked` = 0 $sql_extra $order LIMIT %d , %d ",
-		0,
-		9
-	);
-	$tpl = file_get_contents( dirname(__file__).'/ch_directory_item.tpl');
-	if(count($r)) {
-		$photo = 'thumb';
-		foreach($r as $rr) {
-			$profile_link = $a->get_baseurl() . '/profile/' . ((strlen($rr['nickname'])) ? $rr['nickname'] : $rr['profile_uid']);
-			$entry = replace_macros($tpl,array(
-				'$id' => $rr['id'],
-				'$profile-link' => $profile_link,
-				'$photo' => $rr[$photo],
-				'$alt-text' => $rr['name'],
-			));
-			$aside['$lastusers_items'][] = $entry;
-		}
-	}
-	
-	
-	// last 10 liked items
-	$aside['$like_title'] = t('Last likes');
-	$aside['$like_items'] = array();
-	$r = q("SELECT `T1`.`created`, `T1`.`liker`, `T1`.`liker-link`, `item`.* FROM 
-			(SELECT `parent-uri`, `created`, `author-name` AS `liker`,`author-link` AS `liker-link` 
-				FROM `item` WHERE `verb`='http://activitystrea.ms/schema/1.0/like' GROUP BY `parent-uri` ORDER BY `created` DESC) AS T1
-			INNER JOIN `item` ON `item`.`uri`=`T1`.`parent-uri` 
-			WHERE `T1`.`liker-link` LIKE '%s%%' OR `item`.`author-link` LIKE '%s%%'
-			GROUP BY `uri`
-			ORDER BY `T1`.`created` DESC
-			LIMIT 0,5",
-			$a->get_baseurl(),$a->get_baseurl()
-			);
-
-	foreach ($r as $rr) {
-		$author	 = '<a href="' . $rr['liker-link'] . '">' . $rr['liker'] . '</a>';
-		$objauthor =  '<a href="' . $rr['author-link'] . '">' . $rr['author-name'] . '</a>';
-		
-		//var_dump($rr['verb'],$rr['object-type']); killme();
-		switch($rr['verb']){
-			case 'http://activitystrea.ms/schema/1.0/post':
-				switch ($rr['object-type']){
-					case 'http://activitystrea.ms/schema/1.0/event':
-						$post_type = t('event');
-						break;
-					default:
-						$post_type = t('status');
-				}
-				break;
-			default:
-				if ($rr['resource-id']){
-					$post_type = t('photo');
-					$m=array();	preg_match("/\[url=([^]]*)\]/", $rr['body'], $m);
-					$rr['plink'] = $m[1];
-				} else {
-					$post_type = t('status');
-				}
-		}
-		$plink = '<a href="' . $rr['plink'] . '">' . $post_type . '</a>';
-
-		$aside['$like_items'][] = sprintf( t('%1$s likes %2$s\'s %3$s'), $author, $objauthor, $plink);
-		
-	}
-	
-	
-	// last 12 photos
-	$aside['$photos_title'] = t('Last photos');
-	$aside['$photos_items'] = array();
-	$r = q("SELECT `photo`.`id`, `photo`.`resource-id`, `photo`.`scale`, `photo`.`desc`, `user`.`nickname`, `user`.`username` FROM 
-				(SELECT `resource-id`, MAX(`scale`) as maxscale FROM `photo` 
-					WHERE `profile`=0 AND `contact-id`=0 AND `album` NOT IN ('Contact Photos', '%s', 'Profile Photos', '%s')
-						AND `allow_cid`='' AND `allow_gid`='' AND `deny_cid`='' AND `deny_gid`='' GROUP BY `resource-id`) AS `t1`
-				INNER JOIN `photo` ON `photo`.`resource-id`=`t1`.`resource-id` AND `photo`.`scale` = `t1`.`maxscale`,
-				`user` 
-				WHERE `user`.`uid` = `photo`.`uid`
-				AND `user`.`blockwall`=0
-				AND `user`.`hidewall`=0
-				ORDER BY `photo`.`edited` DESC
-				LIMIT 0, 9",
-				dbesc(t('Contact Photos')),
-				dbesc(t('Profile Photos'))
-				);
-		if(count($r)) {
-		$tpl = file_get_contents( dirname(__file__).'/ch_directory_item.tpl');
-		foreach($r as $rr) {
-			$photo_page = $a->get_baseurl() . '/photos/' . $rr['nickname'] . '/image/' . $rr['resource-id'];
-			$photo_url = $a->get_baseurl() . '/photo/' .  $rr['resource-id'] . '-' . $rr['scale'] .'.jpg';
-		
-			$entry = replace_macros($tpl,array(
-				'$id' => $rr['id'],
-				'$profile-link' => $photo_page,
-				'$photo' => $photo_url,
-				'$alt-text' => $rr['username']." : ".$rr['desc'],
-			));
-
-			$aside['$photos_items'][] = $entry;
-		}
-	}
-	
-	
-   
-   //nav FIND FRIENDS
-	if(local_user()) {
-	$nv = array();
-   $nv['title'] = Array("", t('Find Friends'), "", "");
-	$nv['directory'] = Array('directory', t('Local Directory'), "", "");
-	$nv['global_directory'] = Array('http://dir.friendica.com/', t('Global Directory'), "", "");
-	$nv['match'] = Array('match', t('Similar Interests'), "", "");
-	$nv['suggest'] = Array('suggest', t('Friend Suggestions'), "", "");
-	$nv['invite'] = Array('invite', t('Invite Friends'), "", "");
-	
-	$nv['search'] = '<form name="simple_bar" method="get" action="http://dir.friendika.com/directory">
-						<span class="sbox_l"></span>
-						<span class="sbox">
-						<input type="text" name="search" size="13" maxlength="50">
-						</span>
-						<span class="sbox_r" id="srch_clear"></span>';
-						
-	$aside['$nv'] = $nv;
-	};
-	//Community Page
-	if(local_user()) {
-   $page = '<div id="page-sidebar-right_aside" class="widget">
-			<div class="title tool">
-			<h3>'.t("Community Pages").'<a id="close_pages_icon"  onClick="close_pages()" class="icon close_box" title="close"></a></h3></div>
-			<div id="sidebar-page-list"><ul>';
-
-	$pagelist = array();
-
-	$contacts = q("SELECT `id`, `url`, `name`, `micro`FROM `contact`
-			WHERE `network`= 'dfrn' AND `forum` = 1 AND `uid` = %d
-			ORDER BY `name` ASC",
-			intval($a->user['uid'])
-	);
-
-	$pageD = array();
-
-	// Look if the profile is a community page
-	foreach($contacts as $contact) {
-		$pageD[] = array("url"=>$contact["url"], "name"=>$contact["name"], "id"=>$contact["id"], "micro"=>$contact['micro']);
-	};
-	
-
-	$contacts = $pageD;
-
-	foreach($contacts as $contact) {
-		$page .= '<li style="list-style-type: none;" class="tool"><img height="20" width="20" style="float: left; margin-right: 3px;" src="' . $contact['micro'] .'" alt="' . $contact['url'] . '" /> <a href="'.$a->get_baseurl().'/redir/'.$contact["id"].'" style="margin-top: 2px;" title="' . $contact['url'] . '" class="label" target="external-link">'.
-				$contact["name"]."</a></li>";
-	}
-	$page .= '</ul></div></div>';
-	//if (sizeof($contacts) > 0)
-		
-		$aside['$page'] = $page;
-	}		
-  //END Community Page	
-  //helpers
-   $helpers = array();
-	$helpers['title'] = Array("", t('Help or @NewHere ?'), "", "");
-	
-	$aside['$helpers'] = $helpers;
-   //end helpers
-   //connectable services
-   $con_services = array();
-	$con_services['title'] = Array("", t('Connect Services'), "", "");
-	
-	$aside['$con_services'] = $con_services;
-   //end connectable services
-   
-  
-   //get_baseurl	      
-   $url = $a->get_baseurl($ssl_state);   
-   $aside['$url'] = $url;
-
-	$tpl = file_get_contents(dirname(__file__).'/communityhome.tpl');
-	$a->page['right_aside'] = replace_macros($tpl, $aside);
-	
-}
-
-
-//profile_side at networkpages
-if ($a->argv[0] === "network" && local_user()){
-
-	// USER MENU
-	if(local_user()) {
-		
-		$r = q("SELECT micro FROM contact WHERE uid=%d AND self=1", intval($a->user['uid']));
-				
-		$userinfo = array(
-					'icon' => (count($r) ? $r[0]['micro']: $a->get_baseurl()."/images/default-profile-mm.jpg"),
-					'name' => $a->user['username'],
-				);	
-		$ps = array('usermenu'=>array());
-		$ps['usermenu']['status'] = Array('profile/' . $a->user['nickname'], t('Home'), "", t('Your posts and conversations'));
-		$ps['usermenu']['profile'] = Array('profile/' . $a->user['nickname']. '?tab=profile', t('Profile'), "", t('Your profile page'));
-		$ps['usermenu']['contacts'] = Array('contacts' , t('Contacts'), "", t('Your contacts'));		
-		$ps['usermenu']['photos'] = Array('photos/' . $a->user['nickname'], t('Photos'), "", t('Your photos'));
-		$ps['usermenu']['events'] = Array('events/', t('Events'), "", t('Your events'));
-		$ps['usermenu']['notes'] = Array('notes/', t('Personal notes'), "", t('Your personal photos'));
-		$ps['usermenu']['community'] = Array('community/', t('Community'), "", "");
-		$ps['usermenu']['pgroups'] = Array('http://dir.friendika.com/directory/forum', t('Community Pages'), "", "");
-
-		$tpl = get_markup_template('profile_side.tpl');
-
-		$a->page['aside'] .= replace_macros($tpl, array(
-				'$userinfo' => $userinfo,
-				'$ps' => $ps,
-			));
-
-	}
-	
-	$ccCookie = $_COOKIE['close_pages'] + $_COOKIE['close_helpers'] + $_COOKIE['close_services'] + $_COOKIE['close_friends'] + $_COOKIE['close_lastusers'] + $_COOKIE['close_lastphotos'] + $_COOKIE['close_lastlikes'];
-	
-	if($ccCookie != "7") {
-	// COMMUNITY
-	diabook_aerith_community_info();
-	
-	// CUSTOM CSS
-	if($resolution == "normal") {$cssFile = $a->get_baseurl($ssl_state)."/view/theme/diabook-aerith/style-network.css";}
-	if($resolution == "wide") {$cssFile = $a->get_baseurl($ssl_state)."/view/theme/diabook-aerith/style-network-wide.css";}
-	}
-}
-
-
-
-//right_aside at profile pages
-if ($a->argv[0].$a->argv[1] === "profile".$a->user['nickname']){
-	if($ccCookie != "7") {
-	// COMMUNITY
-	diabook_aerith_community_info();
-	
-	// CUSTOM CSS
-	if($resolution == "normal") {$cssFile = $a->get_baseurl($ssl_state)."/view/theme/diabook-aerith/style-profile.css";}
-	if($resolution == "wide") {$cssFile = $a->get_baseurl($ssl_state)."/view/theme/diabook-aerith/style-profile-wide.css";}
-	}
-}
-
-
-
-// custom css
-if (!is_null($cssFile)) $a->page['htmlhead'] .= sprintf('<link rel="stylesheet" type="text/css" href="%s" />', $cssFile);
-
-//load jquery.cookie.js
-$cookieJS = $a->get_baseurl($ssl_state)."/view/theme/diabook-aerith/js/jquery.cookie.js";
-$a->page['htmlhead'] .= sprintf('<script language="JavaScript" src="%s" ></script>', $cookieJS);
-
-//load jquery.ae.image.resize.js
-$imageresizeJS = $a->get_baseurl($ssl_state)."/view/theme/diabook-aerith/js/jquery.ae.image.resize.js";
-$a->page['htmlhead'] .= sprintf('<script language="JavaScript" src="%s" ></script>', $imageresizeJS);
-
-//load jquery.autogrow-textarea.js
-$autogrowJS = $a->get_baseurl($ssl_state)."/view/theme/diabook-aerith/js/jquery.autogrow.textarea.js";
-$a->page['htmlhead'] .= sprintf('<script language="JavaScript" src="%s" ></script>', $autogrowJS);
-
-//js scripts
-//comment-edit-wrapper on photo_view
-if ($a->argv[0].$a->argv[2] === "photos"."image"){
-
-$a->page['htmlhead'] .= '
-<script>
-	$(function(){
-	
-		$(".comment-edit-form").css("display","table");
-			
-			});
-    </script>';
-	
-}
-
-$a->page['htmlhead'] .= '
-
-<script>
- $(function() {
-	$("a.lightbox").fancybox(); // Select all links with lightbox class
- });
-  
- </script>';
- 
-$a->page['htmlhead'] .= '
-
-<script type="text/javascript">
-
-function tautogrow(id){
-		$("textarea#comment-edit-text-" +id).autogrow(); 	
- 	};
- </script>';
-
-$a->page['htmlhead'] .= '
- <script>
- 
-$(document).ready(function() {
-    $("iframe").each(function(){
-        var ifr_source = $(this).attr("src");
-        var wmode = "wmode=transparent";
-        if(ifr_source.indexOf("?") != -1) {
-            var getQString = ifr_source.split("?");
-            var oldString = getQString[1];
-            var newString = getQString[0];
-            $(this).attr("src",newString+"?"+wmode+"&"+oldString);
-        }
-        else $(this).attr("src",ifr_source+"?"+wmode);
-    });
-      
-
-});
-
-function yt_iframe() {
-	
-	$("iframe").load(function() { 
-	var ifr_src = $(this).contents().find("body iframe").attr("src");
-	$("iframe").contents().find("body iframe").attr("src", ifr_src+"&wmode=transparent");
-    });
-
-	};
-  
- </script>';
-
-if ($a->argv[0].$a->argv[1] === "profile".$a->user['nickname'] or $a->argv[0] === "network" && local_user()){
-$a->page['htmlhead'] .= '
-<script>
-
- $(function() {
-	$(".oembed.photo img").aeImageResize({height: 400, width: 400});
-  });
-</script>';
-
-
-	if($ccCookie != "7") {
-$a->page['htmlhead'] .= '
-<script>
-$("right_aside").ready(function(){
-	
-	if($.cookie("close_pages") == "1") 
-		{
-		document.getElementById( "close_pages" ).style.display = "none";
-			};
-	
-	if($.cookie("close_helpers") == "1") 
-		{
-		document.getElementById( "close_helpers" ).style.display = "none";
-			};
-			
-	if($.cookie("close_services") == "1") 
-		{
-		document.getElementById( "close_services" ).style.display = "none";
-			};
-			
-	if($.cookie("close_friends") == "1") 
-		{
-		document.getElementById( "close_friends" ).style.display = "none";
-			};
-	
-			
-	if($.cookie("close_lastusers") == "1") 
-		{
-		document.getElementById( "close_lastusers" ).style.display = "none";
-			};
-			
-	if($.cookie("close_lastphotos") == "1") 
-		{
-		document.getElementById( "close_lastphotos" ).style.display = "none";
-			};
-			
-	if($.cookie("close_lastlikes") == "1") 
-		{
-		document.getElementById( "close_lastlikes" ).style.display = "none";
-			};}
-
-);
-
-function close_pages(){
- document.getElementById( "close_pages" ).style.display = "none";
- $.cookie("close_pages","1", { expires: 365, path: "/" });
- };
- 
-function close_helpers(){
- document.getElementById( "close_helpers" ).style.display = "none";
-  $.cookie("close_helpers","1", { expires: 365, path: "/" });
- };
-
-function close_services(){
- document.getElementById( "close_services" ).style.display = "none";
- $.cookie("close_services","1", { expires: 365, path: "/" });
- };
- 
-function close_friends(){
- document.getElementById( "close_friends" ).style.display = "none";
- $.cookie("close_friends","1", { expires: 365, path: "/" });
- };
-
- 
-function close_lastusers(){
- document.getElementById( "close_lastusers" ).style.display = "none";
- $.cookie("close_lastusers","1", { expires: 365, path: "/" });
- };
-
-function close_lastphotos(){
- document.getElementById( "close_lastphotos" ).style.display = "none";
- $.cookie("close_lastphotos","1", { expires: 365, path: "/" });
- };
- 
-function close_lastlikes(){
- document.getElementById( "close_lastlikes" ).style.display = "none";
- $.cookie("close_lastlikes","1", { expires: 365, path: "/" });
- };
-</script>';}
-
-$a->page['htmlhead'] .= ' 
-<script>
-function restore_boxes(){
-	$.cookie("close_pages","2", { expires: 365, path: "/" });
-	$.cookie("close_helpers","2", { expires: 365, path: "/" });
-	$.cookie("close_services","2", { expires: 365, path: "/" });
-	$.cookie("close_friends","2", { expires: 365, path: "/" });
-	$.cookie("close_lastusers","2", { expires: 365, path: "/" });
-	$.cookie("close_lastphotos","2", { expires: 365, path: "/" });
-	$.cookie("close_lastlikes","2", { expires: 365, path: "/" });
-	alert("Right-hand column was restored. Please refresh your browser");
-  }
-</script>';}
-
-$a->page['htmlhead'] .= ' 
-
-<script type="text/javascript">
-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);
-											}
-
-	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;
-}
-</script> ';
\ No newline at end of file
diff --git a/view/theme/diabook/diabook-pink/theme_settings.tpl b/view/theme/diabook/diabook-pink/theme_settings.tpl
deleted file mode 100644
index 472232cf0..000000000
--- a/view/theme/diabook/diabook-pink/theme_settings.tpl
+++ /dev/null
@@ -1,10 +0,0 @@
-{{inc field_select.tpl with $field=$font_size}}{{endinc}}
-
-{{inc field_select.tpl with $field=$line_height}}{{endinc}}
-
-{{inc field_select.tpl with $field=$resolution}}{{endinc}}
-
-<div class="settings-submit-wrapper">
-	<input type="submit" value="$submit" class="settings-submit" name="diabook-aerith-settings-submit" />
-</div>
-
diff --git a/view/theme/diabook/diabook-pink/wall_item.tpl b/view/theme/diabook/diabook-pink/wall_item.tpl
deleted file mode 100644
index 123834064..000000000
--- a/view/theme/diabook/diabook-pink/wall_item.tpl
+++ /dev/null
@@ -1,100 +0,0 @@
-{{ if $item.indent }}{{ else }}
-<div class="wall-item-decor">
-	<img id="like-rotator-$item.id" class="like-rotator" src="images/rotator.gif" alt="$item.wait" title="$item.wait" style="display: none;" />
-</div>
-{{ endif }}
-<div class="wall-item-container $item.indent">
-	<div class="wall-item-item">
-		<div class="wall-item-info">
-			<div class="contact-photo-wrapper"
-				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" target="redir" title="$item.linktitle" class="contact-photo-link" id="wall-item-photo-link-$item.id">
-					<img src="$item.thumb" class="contact-photo$item.sparkle" id="wall-item-photo-$item.id" alt="$item.name" />
-				</a>
-				<a href="#" rel="#wall-item-photo-menu-$item.id" class="contact-photo-menu-button icon s16 menu" id="wall-item-photo-menu-button-$item.id">menu</a>
-				<ul class="contact-menu menu-popup" id="wall-item-photo-menu-$item.id">
-				$item.item_photo_menu
-				</ul>
-				
-			</div>
-		</div>
-			<div class="wall-item-actions-author">
-				<a href="$item.profile_url" target="redir" title="$item.linktitle" class="wall-item-name-link"><span class="wall-item-name$item.sparkle">$item.name</span></a> 
-			<span class="wall-item-ago">-
-			{{ if $item.plink }}<a class="link" title="$item.plink.title" href="$item.plink.href" style="color: #999">$item.ago</a>{{ else }} $item.ago {{ endif }}
-			{{ if $item.lock }} - <span class="fakelink" style="color: #999" onclick="lockview(event,$item.id);">$item.lock</span> {{ endif }}
-			</span>
-			</div>
-		<div class="wall-item-content">
-			{{ if $item.title }}<h2><a href="$item.plink.href">$item.title</a></h2>{{ endif }}
-			$item.body
-		</div>
-	</div>
-	<div class="wall-item-bottom">
-		<div class="wall-item-links">
-		</div>
-		<div class="wall-item-tags">
-			{{ for $item.tags as $tag }}
-				<span class='tag'>$tag</span>
-			{{ endfor }}
-		</div>
-	</div>
-	<div class="wall-item-bottom">
-		<div class="">
-
-		</div>
-		<div class="wall-item-actions">
-
-			<div class="wall-item-actions-social">
-			
-			
-			{{ if $item.vote }}
-				<a href="#" id="like-$item.id" class="icon like" title="$item.vote.like.0" onclick="dolike($item.id,'like'); return false">$item.vote.like.1</a>
-				<a href="#" id="dislike-$item.id" class="icon dislike" title="$item.vote.dislike.0" onclick="dolike($item.id,'dislike'); return false"></a>
-			{{ endif }}
-						
-			{{ if $item.vote.share }}
-				<a href="#" id="share-$item.id" class="icon recycle" title="$item.vote.share.0" onclick="jotShare($item.id); return false"></a>
-			{{ endif }}	
-
-
-			{{ if $item.star }}
-				<a href="#" id="starred-$item.id" onclick="dostar($item.id); return false;" class="star-item icon $item.isstarred" title="$item.star.toggle">
-				<img src="images/star_dummy.png" class="icon star" alt="$item.star.do" /> </a>
-				<a href="#" id="tagger-$item.id" onclick="itemTag($item.id); return false;" class="tag-item icon tagged" title="$item.star.tagger"></a>					  
-			{{ endif }}	
-			
-			{{ if $item.filer }}
-			<a href="#" id="filer-$item.id" onclick="itemFiler($item.id); return false;" class="filer-item icon file-as" title="$item.star.filer"></a>
-			{{ endif }}				
-			
-			{{ if $item.plink }}<a class="icon link" title="$item.plink.title" href="$item.plink.href">$item.plink.title</a>{{ endif }}
-			
-					
-					
-			</div>
-			
-			<div class="wall-item-actions-tools">
-
-				{{ if $item.drop.dropping }}
-					<input type="checkbox" title="$item.drop.select" name="itemselected[]" class="item-select" value="$item.id" />
-					<a href="item/drop/$item.id" onclick="return confirmDelete();" class="icon drop" title="$item.drop.delete">$item.drop.delete</a>
-				{{ endif }}
-				{{ if $item.edpost }}
-					<a class="icon pencil" href="$item.edpost.0" title="$item.edpost.1"></a>
-				{{ endif }}
-			</div>
-			<div class="wall-item-location">$item.location&nbsp;</div>
-		</div>
-	</div>
-	<div class="wall-item-bottom">
-		<div class="wall-item-links"></div>
-		<div class="wall-item-like" id="wall-item-like-$item.id">$item.like</div>
-		<div class="wall-item-dislike" id="wall-item-dislike-$item.id">$item.dislike</div>	
-	</div>
-</div>
-
-<div class="wall-item-comment-wrapper" >
-	$item.comment
-</div>
diff --git a/view/theme/diabook/diabook-pink/wallwall_item.tpl b/view/theme/diabook/diabook-pink/wallwall_item.tpl
deleted file mode 100644
index 6a0c93f88..000000000
--- a/view/theme/diabook/diabook-pink/wallwall_item.tpl
+++ /dev/null
@@ -1,106 +0,0 @@
-{{ if $item.indent }}{{ else }}
-<div class="wall-item-decor">
-	<img id="like-rotator-$item.id" class="like-rotator" src="images/rotator.gif" alt="$item.wait" title="$item.wait" style="display: none;" />
-</div>
-{{ endif }}
-<div class="wall-item-container $item.indent">
-	<div class="wall-item-item">
-		<div class="wall-item-info">
-			<div class="contact-photo-wrapper mframe wwto" id="wall-item-ownerphoto-wrapper-$item.id" >
-				<a href="$item.owner_url" target="redir" title="$item.olinktitle" class="contact-photo-link" id="wall-item-ownerphoto-link-$item.id">
-					<img src="$item.owner_photo" class="contact-photo $item.osparkle" id="wall-item-ownerphoto-$item.id" alt="$item.owner_name" />
-				</a>
-			</div>
-			<div class="contact-photo-wrapper mframe wwfrom"
-				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" target="redir" title="$item.linktitle" class="contact-photo-link" id="wall-item-photo-link-$item.id">
-					<img src="$item.thumb" class="contact-photo$item.sparkle" id="wall-item-photo-$item.id" alt="$item.name" />
-				</a>
-				<a href="#" rel="#wall-item-photo-menu-$item.id" class="contact-photo-menu-button icon s16 menu" id="wall-item-photo-menu-button-$item.id">menu</a>
-				<ul class="contact-menu menu-popup" id="wall-item-photo-menu-$item.id">
-				$item.item_photo_menu
-				</ul>
-				
-			</div>
-		</div>
-			<div class="wall-item-actions-author">
-				<a href="$item.profile_url" target="redir" title="$item.linktitle" class="wall-item-name-link"><span class="wall-item-name$item.sparkle">$item.name</span></a>
-				$item.to <a href="$item.owner_url" target="redir" 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 <span class="wall-item-ago">- &nbsp;
-			{{ if $item.plink }}<a class="link" title="$item.plink.title" href="$item.plink.href" style="color: #999">$item.ago</a>{{ else }} $item.ago {{ endif }}
-			{{ if $item.lock }} - <span class="fakelink" style="color: #999" onclick="lockview(event,$item.id);">$item.lock</span> {{ endif }}
-			</span>
-			</div>
-		<div class="wall-item-content">
-			{{ if $item.title }}<h2><a href="$item.plink.href">$item.title</a></h2>{{ endif }}
-			$item.body
-		</div>
-	</div>
-	<div class="wall-item-bottom">
-		<div class="wall-item-links">
-		</div>
-		<div class="wall-item-tags">
-			{{ for $item.tags as $tag }}
-				<span class='tag'>$tag</span>
-			{{ endfor }}
-		</div>
-	</div>
-	<div class="wall-item-bottom">
-		<div class="">
-
-		</div>
-		<div class="wall-item-actions">
-
-			<div class="wall-item-actions-social">
-			
-			
-			{{ if $item.vote }}
-				<a href="#" id="like-$item.id" class="icon like" title="$item.vote.like.0" onclick="dolike($item.id,'like'); return false">$item.vote.like.1</a>
-				<a href="#" id="dislike-$item.id" class="icon dislike" title="$item.vote.dislike.0" onclick="dolike($item.id,'dislike'); return false"></a>
-			{{ endif }}
-						
-			{{ if $item.vote.share }}
-				<a href="#" id="share-$item.id" class="icon recycle" title="$item.vote.share.0" onclick="jotShare($item.id); return false"></a>
-			{{ endif }}	
-
-
-			{{ if $item.star }}
-				<a href="#" id="starred-$item.id" onclick="dostar($item.id); return false;" class="star-item icon $item.isstarred" title="$item.star.toggle">
-				<img src="images/star_dummy.png" class="icon star" alt="$item.star.do" /> </a>
-				<a href="#" id="tagger-$item.id" onclick="itemTag($item.id); return false;" class="tag-item icon tagged" title="$item.star.tagger"></a>
-			{{ endif }}	
-			
-			{{ if $item.filer }}
-			<a href="#" id="filer-$item.id" onclick="itemFiler($item.id); return false;" class="filer-item icon file-as" title="$item.star.filer"></a>
-			{{ endif }}				
-			
-			{{ if $item.plink }}<a class="icon link" title="$item.plink.title" href="$item.plink.href">$item.plink.title</a>{{ endif }}
-			
-					
-					
-			</div>
-			
-			<div class="wall-item-actions-tools">
-
-				{{ if $item.drop.dropping }}
-					<input type="checkbox" title="$item.drop.select" name="itemselected[]" class="item-select" value="$item.id" />
-					<a href="item/drop/$item.id" onclick="return confirmDelete();" class="icon drop" title="$item.drop.delete">$item.drop.delete</a>
-				{{ endif }}
-				{{ if $item.edpost }}
-					<a class="icon pencil" href="$item.edpost.0" title="$item.edpost.1"></a>
-				{{ endif }}
-			</div>
-			<div class="wall-item-location">$item.location&nbsp;</div>
-		</div>
-	</div>
-	<div class="wall-item-bottom">
-		<div class="wall-item-links"></div>
-		<div class="wall-item-like" id="wall-item-like-$item.id">$item.like</div>
-		<div class="wall-item-dislike" id="wall-item-dislike-$item.id">$item.dislike</div>	
-	</div>
-</div>
-
-<div class="wall-item-comment-wrapper" >
-	$item.comment
-</div>
\ No newline at end of file
diff --git a/view/theme/diabook/diabook-red/admin_users.tpl b/view/theme/diabook/diabook-red/admin_users.tpl
deleted file mode 100644
index 40f94f5fe..000000000
--- a/view/theme/diabook/diabook-red/admin_users.tpl
+++ /dev/null
@@ -1,88 +0,0 @@
-<script>
-	function confirm_delete(uname){
-		return confirm( "$confirm_delete".format(uname));
-	}
-	function confirm_delete_multi(){
-		return confirm("$confirm_delete_multi");
-	}
-	function selectall(cls){
-		$("."+cls).attr('checked','checked');
-		return false;
-	}
-</script>
-<div id='adminpage'>
-	<h1>$title - $page</h1>
-	
-	<form action="$baseurl/admin/users" method="post">
-		
-		<h3>$h_pending</h3>
-		{{ if $pending }}
-			<table id='pending'>
-				<thead>
-				<tr>
-					{{ for $th_pending as $th }}<th>$th</th>{{ endfor }}
-					<th></th>
-					<th></th>
-				</tr>
-				</thead>
-				<tbody>
-			{{ for $pending as $u }}
-				<tr>
-					<td class="created">$u.created</td>
-					<td class="name">$u.name</td>
-					<td class="email">$u.email</td>
-					<td class="checkbox"><input type="checkbox" class="pending_ckbx" id="id_pending_$u.hash" name="pending[]" value="$u.hash" /></td>
-					<td class="tools">
-						<a href="$baseurl/regmod/allow/$u.hash" title='$approve'><span class='icon like'></span></a>
-						<a href="$baseurl/regmod/deny/$u.hash" title='$deny'><span class='icon dislike'></span></a>
-					</td>
-				</tr>
-			{{ endfor }}
-				</tbody>
-			</table>
-			<div class='selectall'><a href='#' onclick="return selectall('pending_ckbx');">$select_all</a></div>
-			<div class="submit"><input type="submit" name="page_users_deny" value="$deny"/> <input type="submit" name="page_users_approve" value="$approve" /></div>			
-		{{ else }}
-			<p>$no_pending</p>
-		{{ endif }}
-	
-	
-		
-	
-		<h3>$h_users</h3>
-		{{ if $users }}
-			<table id='users'>
-				<thead>
-				<tr>
-					<th></th>
-					{{ for $th_users as $th }}<th>$th</th>{{ endfor }}
-					<th></th>
-					<th></th>
-				</tr>
-				</thead>
-				<tbody>
-				{{ for $users as $u }}
-					<tr>
-						<td><img src="$u.micro" alt="$u.nickname" title="$u.nickname"></td>
-						<td class='name'><a href="$u.url" title="$u.nickname" >$u.name</a></td>
-						<td class='email'>$u.email</td>
-						<td class='register_date'>$u.register_date</td>
-						<td class='login_date'>$u.login_date</td>
-						<td class='lastitem_date'>$u.lastitem_date</td>
-						<td class='login_date'>$u.page-flags</td>
-						<td class="checkbox"><input type="checkbox" class="users_ckbx" id="id_user_$u.uid" name="user[]" value="$u.uid"/></td>
-						<td class="tools" style="width:60px;">
-							<a href="$baseurl/admin/users/block/$u.uid" title='{{ if $u.blocked }}$unblock{{ else }}$block{{ endif }}'><span class='icon block {{ if $u.blocked==0 }}dim{{ endif }}'></span></a>
-							<a href="$baseurl/admin/users/delete/$u.uid" title='$delete' onclick="return confirm_delete('$u.name')"><span class='icon ad_drop'></span></a>
-						</td>
-					</tr>
-				{{ endfor }}
-				</tbody>
-			</table>
-			<div class='selectall'><a href='#' onclick="return selectall('users_ckbx');">$select_all</a></div>
-			<div class="submit"><input type="submit" name="page_users_block" value="$block/$unblock" /> <input type="submit" name="page_users_delete" value="$delete" onclick="return confirm_delete_multi()" /></div>						
-		{{ else }}
-			NO USERS?!?
-		{{ endif }}
-	</form>
-</div>
diff --git a/view/theme/diabook/diabook-red/ch_directory_item.tpl b/view/theme/diabook/diabook-red/ch_directory_item.tpl
deleted file mode 100644
index db1936e4b..000000000
--- a/view/theme/diabook/diabook-red/ch_directory_item.tpl
+++ /dev/null
@@ -1,10 +0,0 @@
-
-<div class="directory-item" id="directory-item-$id" >
-	<div class="directory-photo-wrapper" id="directory-photo-wrapper-$id" > 
-		<div class="directory-photo" id="directory-photo-$id" >
-			<a href="$profile-link" class="directory-profile-link" id="directory-profile-link-$id" >
-				<img class="directory-photo-img" src="$photo" alt="$alt-text" title="$alt-text" />
-			</a>
-		</div>
-	</div>
-</div>
diff --git a/view/theme/diabook/diabook-red/comment_item.tpl b/view/theme/diabook/diabook-red/comment_item.tpl
deleted file mode 100644
index ee4dfba45..000000000
--- a/view/theme/diabook/diabook-red/comment_item.tpl
+++ /dev/null
@@ -1,41 +0,0 @@
-		<div class="comment-wwedit-wrapper" id="comment-edit-wrapper-$id" style="display: block;">
-			<form class="comment-edit-form" id="comment-edit-form-$id" action="item" method="post" onsubmit="post_comment($id); return false;">
-				<input type="hidden" name="type" value="$type" />
-				<input type="hidden" name="profile_uid" value="$profile_uid" />
-				<input type="hidden" name="parent" value="$parent" />
-				<input type="hidden" name="return" value="$return_path" />
-				<input type="hidden" name="jsreload" value="$jsreload" />
-				<input type="hidden" name="preview" id="comment-preview-inp-$id" value="0" />
-
-				<div class="comment-edit-photo" id="comment-edit-photo-$id" >
-					<a class="comment-edit-photo-link" href="$mylink" title="$mytitle"><img class="my-comment-photo" src="$myphoto" alt="$mytitle" title="$mytitle" /></a>
-				</div>
-				<div class="comment-edit-photo-end"></div>
-				<textarea id="comment-edit-text-$id" class="comment-edit-text-empty" name="body" onFocus="commentOpen(this,$id);tautogrow($id)" onBlur="commentClose(this,$id);" >$comment</textarea>
-				<a class="icon bb-image" style="cursor: pointer;" onclick="insertFormatting('$comment','img',$id);">img</a>	
-				<a class="icon bb-url" style="cursor: pointer;" onclick="insertFormatting('$comment','url',$id);">url</a>
-				<a class="icon bb-video" style="cursor: pointer;" onclick="insertFormatting('$comment','video',$id);">video</a>														
-				<a class="icon underline" style="cursor: pointer;" onclick="insertFormatting('$comment','u',$id);">u</a>
-				<a class="icon italic" style="cursor: pointer;" onclick="insertFormatting('$comment','i',$id);">i</a>
-				<a class="icon bold" style="cursor: pointer;" onclick="insertFormatting('$comment','b',$id);">b</a>
-				<a class="icon quote" style="cursor: pointer;" onclick="insertFormatting('$comment','quote',$id);">quote</a>																			
-				{{ if $qcomment }}
-					<select id="qcomment-select-$id" name="qcomment-$id" class="qcomment" onchange="qCommentInsert(this,$id);" >
-					<option value=""></option>
-				{{ for $qcomment as $qc }}
-					<option value="$qc">$qc</option>				
-				{{ endfor }}
-					</select>
-				{{ endif }}
-
-				<div class="comment-edit-text-end"></div>
-				<div class="comment-edit-submit-wrapper" id="comment-edit-submit-wrapper-$id" style="display: none;" >
-					<input type="submit" onclick="post_comment($id); return false;" id="comment-edit-submit-$id" class="comment-edit-submit" name="submit" value="$submit" />
-					<span onclick="preview_comment($id);" id="comment-edit-preview-link-$id" class="fakelink">$preview</span>
-					<div id="comment-edit-preview-$id" class="comment-edit-preview" style="display:none;"></div>
-				</div>
-
-				<div class="comment-edit-end"></div>
-			</form>
-
-		</div>
diff --git a/view/theme/diabook/diabook-red/communityhome.tpl b/view/theme/diabook/diabook-red/communityhome.tpl
deleted file mode 100644
index 179757f4a..000000000
--- a/view/theme/diabook/diabook-red/communityhome.tpl
+++ /dev/null
@@ -1,87 +0,0 @@
-<div id="close_pages">
-{{ if $page }}
-<div>$page</div>
-{{ endif }}
-</div>
-
-<div id="close_helpers">
-{{ if $lastusers_title }}
-<h3 style="margin-top:0px;">$helpers.title.1<a id="close_helpers_icon"  onClick="close_helpers()" class="icon close_box" title="close"></a></h3>
-<a href="http://kakste.com/profile/newhere" title="#NewHere" style="margin-left: 10px; " target="blank">NewHere</a><br>
-<a href="https://helpers.pyxis.uberspace.de/profile/helpers" style="margin-left: 10px; " title="Friendica Support" target="blank">Friendica Support</a><br>
-<a href="https://letstalk.pyxis.uberspace.de/profile/letstalk" style="margin-left: 10px; " title="Let's talk" target="blank">Let's talk</a><br>
-<a href="http://newzot.hydra.uberspace.de/profile/newzot" title="Local Friendica" style="margin-left: 10px; " target="blank">Local Friendica</a>
-{{ endif }}
-</div>
-
-<div id="close_services">
-{{ if $lastusers_title }}
-<h3>$con_services.title.1<a id="close_services_icon" onClick="close_services()" class="icon close_box" title="close"></a></h3>
-<div id="right_service_icons" style="margin-left: 16px; margin-top: 5px;">
-<a href="$url/facebook"><img alt="Facebook" src="view/theme/diabook-red/icons/facebook.png" title="Facebook"></a>
-<a href="$url/settings/connectors"><img alt="StatusNet" src="view/theme/diabook-red/icons/StatusNet.png?" title="StatusNet"></a>
-<a href="$url/settings/connectors"><img alt="LiveJournal" src="view/theme/diabook-red/icons/livejournal.png?" title="LiveJournal"></a>
-<a href="$url/settings/connectors"><img alt="Posterous" src="view/theme/diabook-red/icons/posterous.png?" title="Posterous"></a>
-<a href="$url/settings/connectors"><img alt="Tumblr" src="view/theme/diabook-red/icons/tumblr.png?" title="Tumblr"></a>
-<a href="$url/settings/connectors"><img alt="Twitter" src="view/theme/diabook-red/icons/twitter.png?" title="Twitter"></a>
-<a href="$url/settings/connectors"><img alt="WordPress" src="view/theme/diabook-red/icons/wordpress.png?" title="WordPress"></a>
-<a href="$url/settings/connectors"><img alt="E-Mail" src="view/theme/diabook-red/icons/email.png?" title="E-Mail"></a>
-</div>
-{{ endif }}
-</div>
-
-<div id="close_friends" style="margin-bottom:53px;">
-{{ if $nv }}
-<h3>$nv.title.1<a id="close_friends_icon" onClick="close_friends()"  class="icon close_box" title="close"></a></h3>
-<a class="$nv.directory.2" href="$nv.directory.0" style="margin-left: 10px; " title="$nv.directory.3" >$nv.directory.1</a><br>
-<a class="$nv.global_directory.2" href="$nv.global_directory.0" target="blank" style="margin-left: 10px; " title="$nv.global_directory.3" >$nv.global_directory.1</a><br>
-<a class="$nv.match.2" href="$nv.match.0" style="margin-left: 10px; " title="$nv.match.3" >$nv.match.1</a><br>
-<a class="$nv.suggest.2" href="$nv.suggest.0" style="margin-left: 10px; " title="$nv.suggest.3" >$nv.suggest.1</a><br>
-<a class="$nv.invite.2" href="$nv.invite.0" style="margin-left: 10px; " title="$nv.invite.3" >$nv.invite.1</a>			
-$nv.search
-{{ endif }}
-</div>
-
-
-<div id="close_lastusers">
-{{ if $lastusers_title }}
-<h3>$lastusers_title<a id="close_lastusers_icon" onClick="close_lastusers()" class="icon close_box" title="close"></a></h3>
-<div id='lastusers-wrapper' class='items-wrapper'>
-{{ for $lastusers_items as $i }}
-	$i
-{{ endfor }}
-</div>
-{{ endif }}
-</div>
-
-
-{{ if $activeusers_title }}
-<h3>$activeusers_title</h3>
-<div class='items-wrapper'>
-{{ for $activeusers_items as $i }}
-	$i
-{{ endfor }}
-</div>
-{{ endif }}
-
-<div id="close_lastphotos">
-{{ if $photos_title }}
-<h3>$photos_title<a id="close_photos_icon" onClick="close_lastphotos()"  class="icon close_box" title="close"></a></h3>
-<div id='ra-photos-wrapper' class='items-wrapper'>
-{{ for $photos_items as $i }}
-	$i
-{{ endfor }}
-</div>
-{{ endif }}
-</div>
-
-<div id="close_lastlikes">
-{{ if $like_title }}
-<h3>$like_title<a id="close_lastlikes_icon" onClick="close_lastlikes()" class="icon close_box" title="close"></a></h3>
-<ul id='likes'>
-{{ for $like_items as $i }}
-	<li id='ra-photos-wrapper'>$i</li>
-{{ endfor }}
-</ul>
-{{ endif }}
-</div>
diff --git a/view/theme/diabook/diabook-red/config.php b/view/theme/diabook/diabook-red/config.php
deleted file mode 100644
index 59a461178..000000000
--- a/view/theme/diabook/diabook-red/config.php
+++ /dev/null
@@ -1,84 +0,0 @@
-<?php
-/**
- * Theme settings
- */
-
-
-
-function theme_content(&$a){
-	if(!local_user())
-		return;		
-	
-	$font_size = get_pconfig(local_user(), 'diabook-red', 'font_size' );
-	$line_height = get_pconfig(local_user(), 'diabook-red', 'line_height' );
-	$resolution = get_pconfig(local_user(), 'diabook-red', 'resolution' );
-	
-	return diabook_form($a,$font_size, $line_height,$resolution);
-}
-
-function theme_post(&$a){
-	if(! local_user())
-		return;
-	
-	if (isset($_POST['diabook-blue-settings-submit'])){
-		set_pconfig(local_user(), 'diabook-red', 'font_size', $_POST['diabook-red_font_size']);
-		set_pconfig(local_user(), 'diabook-red', 'line_height', $_POST['diabook-red_line_height']);
-		set_pconfig(local_user(), 'diabook-red', 'resolution', $_POST['diabook-red_resolution']);	
-	}
-}
-
-
-function theme_admin(&$a){
-	$font_size = get_config('diabook-red', 'font_size' );
-	$line_height = get_config('diabook-red', 'line_height' );
-	$resolution = get_config('diabook-red', 'resolution' );
-	
-	return diabook_form($a,$font_size, $line_height,$resolution);
-}
-
-function theme_admin_post(&$a){
-	if (isset($_POST['diabook-red-settings-submit'])){
-		set_config('diabook-red', 'font_size', $_POST['diabook-red_font_size']);
-		set_config('diabook-red', 'line_height', $_POST['diabook-red_line_height']);
-		set_config('diabook-red', 'resolution', $_POST['diabook-red_resolution']);
-	}
-}
-
-
-function diabook_form(&$a, $font_size, $line_height, $resolution){
-	$line_heights = array(
-		"1.3"=>"1.3",
-		"---"=>"---",
-		"1.5"=>"1.5",		
-		"1.4"=>"1.4",
-		"1.2"=>"1.2",
-		"1.1"=>"1.1",
-	);
-	
-	$font_sizes = array(
-		'13'=>'13',
-		"---"=>"---",
-		"15"=>"15",
-		'14'=>'14',
-		'13.5'=>'13.5',		
-		'12.5'=>'12.5',
-		'12'=>'12',
-		);
-	$resolutions = array(
-		'normal'=>'normal',
-		'wide'=>'wide',		
-		);
-	
-	
-	
-	$t = file_get_contents( dirname(__file__). "/theme_settings.tpl" );
-	$o .= replace_macros($t, array(
-		'$submit' => t('Submit'),
-		'$baseurl' => $a->get_baseurl(),
-		'$title' => t("Theme settings"),
-		'$font_size' => array('diabook-red_font_size', t('Set font-size for posts and comments'), $font_size, '', $font_sizes),
-		'$line_height' => array('diabook-red_line_height', t('Set line-height for posts and comments'), $line_height, '', $line_heights),
-		'$resolution' => array('diabook-red_resolution', t('Set resolution for middle column'), $resolution, '', $resolutions),	
-	));
-	return $o;
-}
diff --git a/view/theme/diabook/diabook-red/contact_template.tpl b/view/theme/diabook/diabook-red/contact_template.tpl
deleted file mode 100644
index 48930b48a..000000000
--- a/view/theme/diabook/diabook-red/contact_template.tpl
+++ /dev/null
@@ -1,25 +0,0 @@
-
-<div class="contact-entry-wrapper" id="contact-entry-wrapper-$contact.id" >
-	<div class="contact-entry-photo-wrapper" >
-		<div class="contact-entry-photo mframe" id="contact-entry-photo-$contact.id"
-		onmouseover="if (typeof t$contact.id != 'undefined') clearTimeout(t$contact.id); openMenu('contact-photo-menu-button-$contact.id')" 
-		onmouseout="t$contact.id=setTimeout('closeMenu(\'contact-photo-menu-button-$contact.id\'); closeMenu(\'contact-photo-menu-$contact.id\');',200)" >
-
-			<a href="$contact.url" title="$contact.img_hover" /><img src="$contact.thumb" $contact.sparkle alt="$contact.name" /></a>
-
-			{{ if $contact.photo_menu }}
-			<span onclick="openClose('contact-photo-menu-$contact.id');" class="fakelink contact-photo-menu-button" id="contact-photo-menu-button-$contact.id">menu</span>
-                <div class="contact-photo-menu" id="contact-photo-menu-$contact.id">
-                    <ul>
-                        $contact.photo_menu
-                    </ul>
-                </div>
-			{{ endif }}
-		</div>
-			
-	</div>
-	<div class="contact-entry-photo-end" ></div>
-		<div class="contact-entry-name" id="contact-entry-name-$contact.id" >$contact.name</div>
-
-	<div class="contact-entry-end" ></div>
-</div>
diff --git a/view/theme/diabook/diabook-red/directory_item.tpl b/view/theme/diabook/diabook-red/directory_item.tpl
deleted file mode 100644
index bc2af16c2..000000000
--- a/view/theme/diabook/diabook-red/directory_item.tpl
+++ /dev/null
@@ -1,11 +0,0 @@
-
-<div class="directory-item" id="directory-item-$id" >
-	<div class="directory-photo-wrapper" id="directory-photo-wrapper-$id" > 
-		<div class="directory-photo" id="directory-photo-$id" >
-			<a href="$profile-link" class="directory-profile-link" id="directory-profile-link-$id" >
-				<img class="directory-photo-img" src="$photo" alt="$alt-text" title="$alt-text" />
-			</a>
-		</div>
-	</div>
-	<div class="contact-name" id="directory-name-$id">$name</div>
-</div>
diff --git a/view/theme/diabook/diabook-red/generic_links_widget.tpl b/view/theme/diabook/diabook-red/generic_links_widget.tpl
deleted file mode 100644
index 001c1395e..000000000
--- a/view/theme/diabook/diabook-red/generic_links_widget.tpl
+++ /dev/null
@@ -1,11 +0,0 @@
-<div id="widget_$title">
-	{{if $title}}<h3 style="border-bottom: 1px solid #D2D2D2;">$title</h3>{{endif}}
-	{{if $desc}}<div class="desc">$desc</div>{{endif}}
-	
-	<ul  class="rs_tabs">
-		{{ for $items as $item }}
-			<li><a href="$item.url" class="rs_tab button {{ if $item.selected }}selected{{ endif }}">$item.label</a></li>
-		{{ endfor }}
-	</ul>
-	
-</div>
diff --git a/view/theme/diabook/diabook-red/group_side.tpl b/view/theme/diabook/diabook-red/group_side.tpl
deleted file mode 100644
index 8600402f2..000000000
--- a/view/theme/diabook/diabook-red/group_side.tpl
+++ /dev/null
@@ -1,34 +0,0 @@
-<div id="profile_side" >
-	<div class="">
-		<h3 style="margin-left: 2px;">$title<a href="group/new" title="$createtext" class="icon text_add"></a></h3>
-	</div>
-
-	<div id="sidebar-group-list">
-		<ul class="menu-profile-side">
-			{{ for $groups as $group }}
-			<li class="menu-profile-list">
-				<span class="menu-profile-icon {{ if $group.selected }}group_selected{{else}}group_unselected{{ endif }}"></span>
-				<a href="$group.href" class="menu-profile-list-item">
-					$group.text
-				</a>
-				{{ if $group.edit }}
-					<a href="$group.edit.href" class="action"><span class="icon text_edit" ></span></a>
-				{{ endif }}
-				{{ if $group.cid }}
-					<input type="checkbox" 
-						class="{{ if $group.selected }}ticked{{ else }}unticked {{ endif }} action" 
-						onclick="contactgroupChangeMember('$group.id','$group.cid');return true;"
-						{{ if $group.ismember }}checked="checked"{{ endif }}
-					/>
-				{{ endif }}
-			</li>
-			{{ endfor }}
-		</ul>
-	</div>
-	 {{ if $ungrouped }}
-  <div id="sidebar-ungrouped">
-  <a href="nogroup">$ungrouped</a>
-  </div>
-  {{ endif }}
-</div>	
-
diff --git a/view/theme/diabook/diabook-red/jot.tpl b/view/theme/diabook/diabook-red/jot.tpl
deleted file mode 100644
index 982201f56..000000000
--- a/view/theme/diabook/diabook-red/jot.tpl
+++ /dev/null
@@ -1,85 +0,0 @@
-
-<div id="profile-jot-wrapper" >
-	<div id="profile-jot-banner-wrapper">
-		<div id="profile-jot-desc" >&nbsp;</div>
-	</div>
-	<div id="profile-jot-banner-end"></div>
-
-	<form id="profile-jot-form" action="$action" method="post" >
-		<input type="hidden" name="type" value="$ptyp" />
-		<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="coord" id="jot-coord" value="" />
-		<input type="hidden" name="post_id" value="$post_id" />
-		<input type="hidden" name="preview" id="jot-preview" value="0" />
-		<input name="title" id="jot-title" type="text" placeholder="$placeholdertitle" value="$title" class="jothidden" style="display:none">
-		<div id="jot-category-wrap"><input name="category" id="jot-category" type="text" placeholder="$placeholdercategory" value="$category" class="jothidden" style="display:none" /></div>				
-		<div id="character-counter" class="grey"></div>		
-		<img id="profile-jot-text-loading" src="images/rotator.gif" alt="$wait" title="$wait" style="display: none;" />
-		<textarea rows="5" cols="64" class="profile-jot-text" id="profile-jot-text" name="body" >{{ if $content }}$content{{ else }}$share{{ endif }}</textarea>
-
-
-<div id="profile-jot-submit-wrapper" class="jothidden">
-	
-	<div id="profile-upload-wrapper" style="display: $visitor;" >
-		<div id="wall-image-upload-div" ><a href="#" onclick="return false;" id="wall-image-upload" class="camera" title="$upload"></a></div>
-	</div> 
-	<div id="profile-attach-wrapper" style="display: $visitor;" >
-		<div id="wall-file-upload-div" ><a href="#" onclick="return false;" id="wall-file-upload" class="attach" title="$attach"></a></div>
-	</div> 
-
-	<div id="profile-link-wrapper" style="display: $visitor;" ondragenter="linkdropper(event);" ondragover="linkdropper(event);" ondrop="linkdrop(event);" >
-		<a id="profile-link" class="weblink" title="$weblink" ondragenter="return linkdropper(event);" ondragover="return linkdropper(event);" ondrop="linkdrop(event);" onclick="jotGetLink(); return false;"></a>
-	</div> 
-	<div id="profile-video-wrapper" style="display: $visitor;" >
-		<a id="profile-video" class="video2" title="$video" onclick="jotVideoURL();return false;"></a>
-	</div> 
-	<div id="profile-audio-wrapper" style="display: $visitor;" >
-		<a id="profile-audio" class="audio2" title="$audio" onclick="jotAudioURL();return false;"></a>
-	</div> 
-	<div id="profile-location-wrapper" style="display: $visitor;" >
-		<a id="profile-location" class="globe" title="$setloc" onclick="jotGetLocation();return false;"></a>
-	</div> 
-	<div id="profile-nolocation-wrapper" style="/*display: none;*/" >
-		<a id="profile-nolocation" class="noglobe" title="$noloc" onclick="jotClearLocation();return false;"></a>
-	</div> 
-
-	<input type="submit" id="profile-jot-submit" class="button creation2" name="submit" value="$share" />
-  
-   <span onclick="preview_post();" id="jot-preview-link" class="tab button">$preview</span>
-   
-	<div id="profile-jot-perms" class="profile-jot-perms" style="display: $pvisit;" >
-		<a href="#profile-jot-acl-wrapper" id="jot-perms-icon" class="icon $lockstate"  title="$permset" ></a>$bang
-	</div>
-
-
-	<div id="profile-jot-plugin-wrapper">
-  	$jotplugins
-	</div>
-	
-	<div id="profile-rotator-wrapper" style="display: $visitor;" >
-		<img id="profile-rotator" src="images/rotator.gif" alt="$wait" title="$wait" style="display: none;" />
-	</div> 
-	
-	</div>
-   <div id="profile-jot-perms-end"></div>
-	
-	<div id="jot-preview-content" style="display:none;"></div>
-
-	<div style="display: none;">
-		<div id="profile-jot-acl-wrapper" style="width:auto;height:auto;overflow:auto;">
-			$acl
-			<hr style="clear:both"/>
-			<div id="profile-jot-email-label">$emailcc</div><input type="text" name="emailcc" id="profile-jot-email" title="$emtitle" />
-			<div id="profile-jot-email-end"></div>
-			$jotnets
-		</div>
-	</div>
-
-
-
-
-</form>
-</div>
-		{{ if $content }}<script>initEditor();</script>{{ endif }}
diff --git a/view/theme/diabook/diabook-red/js/README b/view/theme/diabook/diabook-red/js/README
deleted file mode 100644
index c93b2118e..000000000
--- a/view/theme/diabook/diabook-red/js/README
+++ /dev/null
@@ -1,22 +0,0 @@
-jQuery Resize Plugin Demo
-
-Version: v2.1.1
-Author: Adeel Ejaz (http://adeelejaz.com/)
-License: Dual licensed under MIT and GPL licenses.
-
-Introduction
-aeImageResize is a jQuery plugin to dynamically resize the images without distorting the proportions.
-
-Usage:
-.aeImageResize( height, width )
-
-height
-An integer representing the maximum height for the image.
-
-width
-An integer representing the maximum width for the image.
-
-Example
-$(function() {
-  $( ".resizeme" ).aeImageResize({ height: 250, width: 250 });
-});
\ No newline at end of file
diff --git a/view/theme/diabook/diabook-red/js/jquery.ae.image.resize.js b/view/theme/diabook/diabook-red/js/jquery.ae.image.resize.js
deleted file mode 100644
index bac09cd45..000000000
--- a/view/theme/diabook/diabook-red/js/jquery.ae.image.resize.js
+++ /dev/null
@@ -1,69 +0,0 @@
-(function( $ ) {
-
-  $.fn.aeImageResize = function( params ) {
-
-    var aspectRatio = 0
-      // Nasty I know but it's done only once, so not too bad I guess
-      // Alternate suggestions welcome :)
-      ,	isIE6 = $.browser.msie && (6 == ~~ $.browser.version)
-      ;
-
-    // We cannot do much unless we have one of these
-    if ( !params.height && !params.width ) {
-      return this;
-    }
-
-    // Calculate aspect ratio now, if possible
-    if ( params.height && params.width ) {
-      aspectRatio = params.width / params.height;
-    }
-
-    // Attach handler to load
-    // Handler is executed just once per element
-    // Load event required for Webkit browsers
-    return this.one( "load", function() {
-
-      // Remove all attributes and CSS rules
-      this.removeAttribute( "height" );
-      this.removeAttribute( "width" );
-      this.style.height = this.style.width = "";
-
-      var imgHeight = this.height
-        , imgWidth = this.width
-        , imgAspectRatio = imgWidth / imgHeight
-        , bxHeight = params.height
-        , bxWidth = params.width
-        , bxAspectRatio = aspectRatio;
-				
-      // Work the magic!
-      // If one parameter is missing, we just force calculate it
-      if ( !bxAspectRatio ) {
-        if ( bxHeight ) {
-          bxAspectRatio = imgAspectRatio + 1;
-        } else {
-          bxAspectRatio = imgAspectRatio - 1;
-        }
-      }
-
-      // Only resize the images that need resizing
-      if ( (bxHeight && imgHeight > bxHeight) || (bxWidth && imgWidth > bxWidth) ) {
-
-        if ( imgAspectRatio > bxAspectRatio ) {
-          bxHeight = ~~ ( imgHeight / imgWidth * bxWidth );
-        } else {
-          bxWidth = ~~ ( imgWidth / imgHeight * bxHeight );
-        }
-
-        this.height = bxHeight;
-        this.width = bxWidth;
-      }
-    })
-    .each(function() {
-
-      // Trigger load event (for Gecko and MSIE)
-      if ( this.complete || isIE6 ) {
-        $( this ).trigger( "load" );
-      }
-    });
-  };
-})( jQuery );
\ No newline at end of file
diff --git a/view/theme/diabook/diabook-red/js/jquery.ae.image.resize.min.js b/view/theme/diabook/diabook-red/js/jquery.ae.image.resize.min.js
deleted file mode 100644
index 16c30b123..000000000
--- a/view/theme/diabook/diabook-red/js/jquery.ae.image.resize.min.js
+++ /dev/null
@@ -1 +0,0 @@
-(function(d){d.fn.aeImageResize=function(a){var i=0,j=d.browser.msie&&6==~~d.browser.version;if(!a.height&&!a.width)return this;if(a.height&&a.width)i=a.width/a.height;return this.one("load",function(){this.removeAttribute("height");this.removeAttribute("width");this.style.height=this.style.width="";var e=this.height,f=this.width,g=f/e,b=a.height,c=a.width,h=i;h||(h=b?g+1:g-1);if(b&&e>b||c&&f>c){if(g>h)b=~~(e/f*c);else c=~~(f/e*b);this.height=b;this.width=c}}).each(function(){if(this.complete||j)d(this).trigger("load")})}})(jQuery);
\ No newline at end of file
diff --git a/view/theme/diabook/diabook-red/js/jquery.autogrow.textarea.js b/view/theme/diabook/diabook-red/js/jquery.autogrow.textarea.js
deleted file mode 100644
index 806e34f51..000000000
--- a/view/theme/diabook/diabook-red/js/jquery.autogrow.textarea.js
+++ /dev/null
@@ -1,46 +0,0 @@
-(function($) {
-
-    /*
-     * Auto-growing textareas; technique ripped from Facebook
-     */
-    $.fn.autogrow = function(options) {
-        
-        this.filter('textarea').each(function() {
-            
-            var $this       = $(this),
-                minHeight   = $this.height(),
-                lineHeight  = $this.css('lineHeight');
-            
-            var shadow = $('<div></div>').css({
-                position:   'absolute',
-                top:        -10000,
-                left:       -10000,
-                width:      $(this).width(),
-                fontSize:   $this.css('fontSize'),
-                fontFamily: $this.css('fontFamily'),
-                lineHeight: $this.css('lineHeight'),
-                resize:     'none'
-            }).appendTo(document.body);
-            
-            var update = function() {
-                
-                var val = this.value.replace(/</g, '&lt;')
-                                    .replace(/>/g, '&gt;')
-                                    .replace(/&/g, '&amp;')
-                                    .replace(/\n/g, '<br/>');
-                
-                shadow.html(val);
-                $(this).css('height', Math.max(shadow.height() + 20, minHeight));
-            }
-            
-            $(this).change(update).keyup(update).keydown(update);
-            
-            update.apply(this);
-            
-        });
-        
-        return this;
-        
-    }
-    
-})(jQuery);
\ No newline at end of file
diff --git a/view/theme/diabook/diabook-red/js/jquery.cookie.js b/view/theme/diabook/diabook-red/js/jquery.cookie.js
deleted file mode 100644
index 6d5974a2c..000000000
--- a/view/theme/diabook/diabook-red/js/jquery.cookie.js
+++ /dev/null
@@ -1,47 +0,0 @@
-/*!
- * jQuery Cookie Plugin
- * https://github.com/carhartl/jquery-cookie
- *
- * Copyright 2011, Klaus Hartl
- * Dual licensed under the MIT or GPL Version 2 licenses.
- * http://www.opensource.org/licenses/mit-license.php
- * http://www.opensource.org/licenses/GPL-2.0
- */
-(function($) {
-    $.cookie = function(key, value, options) {
-
-        // key and at least value given, set cookie...
-        if (arguments.length > 1 && (!/Object/.test(Object.prototype.toString.call(value)) || value === null || value === undefined)) {
-            options = $.extend({}, options);
-
-            if (value === null || value === undefined) {
-                options.expires = -1;
-            }
-
-            if (typeof options.expires === 'number') {
-                var days = options.expires, t = options.expires = new Date();
-                t.setDate(t.getDate() + days);
-            }
-
-            value = String(value);
-
-            return (document.cookie = [
-                encodeURIComponent(key), '=', options.raw ? value : encodeURIComponent(value),
-                options.expires ? '; expires=' + options.expires.toUTCString() : '', // use expires attribute, max-age is not supported by IE
-                options.path    ? '; path=' + options.path : '',
-                options.domain  ? '; domain=' + options.domain : '',
-                options.secure  ? '; secure' : ''
-            ].join(''));
-        }
-
-        // key and possibly options given, get cookie...
-        options = value || {};
-        var decode = options.raw ? function(s) { return s; } : decodeURIComponent;
-
-        var pairs = document.cookie.split('; ');
-        for (var i = 0, pair; pair = pairs[i] && pairs[i].split('='); i++) {
-            if (decode(pair[0]) === key) return decode(pair[1] || ''); // IE saves cookies with empty string as "c; ", e.g. without "=" as opposed to EOMB, thus pair[1] may be undefined
-        }
-        return null;
-    };
-})(jQuery);
diff --git a/view/theme/diabook/diabook-red/login.tpl b/view/theme/diabook/diabook-red/login.tpl
deleted file mode 100644
index efa7c2d6d..000000000
--- a/view/theme/diabook/diabook-red/login.tpl
+++ /dev/null
@@ -1,33 +0,0 @@
-
-<form action="$dest_url" method="post" >
-	<input type="hidden" name="auth-params" value="login" />
-
-	<div id="login_standard">
-	{{ inc field_input.tpl with $field=$lname }}{{ endinc }}
-	{{ inc field_password.tpl with $field=$lpassword }}{{ endinc }}
-	</div>
-	
-	{{ if $openid }}
-			<div id="login_openid">
-			{{ inc field_openid.tpl with $field=$lopenid }}{{ endinc }}
-			</div>
-	{{ endif }}
-	
-	<div id="login-submit-wrapper" >
-		<input type="submit" name="submit" id="login-submit-button" value="$login" />
-	</div>
-	
-   <div id="login-extra-links">
-		{{ if $register }}<a href="register" title="$register.title" id="register-link">$register.desc</a>{{ endif }}
-        <a href="lostpass" title="$lostpass" id="lost-password-link" >$lostlink</a>
-	</div>	
-	
-	{{ for $hiddens as $k=>$v }}
-		<input type="hidden" name="$k" value="$v" />
-	{{ endfor }}
-	
-	
-</form>
-
-
-<script type="text/javascript"> $(document).ready(function() { $("#id_$lname.0").focus();} );</script>
diff --git a/view/theme/diabook/diabook-red/mail_conv.tpl b/view/theme/diabook/diabook-red/mail_conv.tpl
deleted file mode 100644
index 989f17878..000000000
--- a/view/theme/diabook/diabook-red/mail_conv.tpl
+++ /dev/null
@@ -1,60 +0,0 @@
-<div class="wall-item-container $item.indent">
-	<div class="wall-item-item">
-		<div class="wall-item-info">
-			<div class="contact-photo-wrapper"
-				<a href="$mail.profile_url" target="redir" title="$mail.from_name" class="contact-photo-link" id="wall-item-photo-link-$mail.id">
-					<img src="$mail.from_photo" class="contact-photo$mail.sparkle" id="wall-item-photo-$mail.id" alt="$mail.from_name" />
-				</a>
-			</div>
-		</div>
-		<div class="wall-item-content">
-			$mail.body
-		</div>
-	</div>
-	<div class="wall-item-bottom">
-		<div class="wall-item-links">
-		</div>
-		<div class="wall-item-tags">
-		</div>
-	</div>
-	<div class="wall-item-bottom">
-		<div class="">
-		</div>
-		<div class="wall-item-actions">
-			<div class="wall-item-actions-author">
-				<a href="$mail.from_url" target="redir" class="wall-item-name-link"><span class="wall-item-name$mail.sparkle">$mail.from_name</span></a> <span class="wall-item-ago">$mail.date</span>
-			</div>
-			
-			<div class="wall-item-actions-social">
-			</div>
-			
-			<div class="wall-item-actions-tools">
-				<a href="message/drop/$mail.id" onclick="return confirmDelete();" class="icon delete s16" title="$mail.delete">$mail.delete</a>
-			</div>
-			
-		</div>
-	</div>
-	<div class="wall-item-bottom">
-	</div>
-</div>
-
-
-{#
-
-
-<div class="mail-conv-outside-wrapper">
-	<div class="mail-conv-sender" >
-		<a href="$mail.from_url" class="mail-conv-sender-url" ><img class="mframe mail-conv-sender-photo$mail.sparkle" src="$mail.from_photo" heigth="80" width="80" alt="$mail.from_name" /></a>
-	</div>
-	<div class="mail-conv-detail" >
-		<div class="mail-conv-sender-name" >$mail.from_name</div>
-		<div class="mail-conv-date">$mail.date</div>
-		<div class="mail-conv-subject">$mail.subject</div>
-		<div class="mail-conv-body">$mail.body</div>
-	<div class="mail-conv-delete-wrapper" id="mail-conv-delete-wrapper-$mail.id" ><a href="message/drop/$mail.id" class="icon drophide delete-icon mail-list-delete-icon" onclick="return confirmDelete();" title="$mail.delete" id="mail-conv-delete-icon-$mail.id" class="mail-conv-delete-icon" onmouseover="imgbright(this);" onmouseout="imgdull(this);" ></a></div><div class="mail-conv-delete-end"></div>
-	<div class="mail-conv-outside-wrapper-end"></div>
-</div>
-</div>
-<hr class="mail-conv-break" />
-
-#}
diff --git a/view/theme/diabook/diabook-red/mail_display.tpl b/view/theme/diabook/diabook-red/mail_display.tpl
deleted file mode 100644
index 8b82e95c6..000000000
--- a/view/theme/diabook/diabook-red/mail_display.tpl
+++ /dev/null
@@ -1,12 +0,0 @@
-<div id="mail-display-subject">
-	<span class="{{if $thread_seen}}seen{{else}}unseen{{endif}}">$thread_subject</span>
-	<a href="message/dropconv/$thread_id" onclick="return confirmDelete();"  title="$delete" class="mail-delete icon s22 delete"></a>
-</div>
-
-{{ for $mails as $mail }}
-	<div id="tread-wrapper-$mail.id" class="tread-wrapper">
-		{{ inc mail_conv.tpl }}{{endinc}}
-	</div>
-{{ endfor }}
-
-{{ inc prv_message.tpl }}{{ endinc }}
diff --git a/view/theme/diabook/diabook-red/mail_list.tpl b/view/theme/diabook/diabook-red/mail_list.tpl
deleted file mode 100644
index 6bc6c84f6..000000000
--- a/view/theme/diabook/diabook-red/mail_list.tpl
+++ /dev/null
@@ -1,8 +0,0 @@
-<div class="mail-list-wrapper">
-	<span class="mail-subject {{if $seen}}seen{{else}}unseen{{endif}}"><a href="message/$id" class="mail-link">$subject</a></span>
-	<span class="mail-from">$from_name</span>
-	<span class="mail-date">$date</span>
-	<span class="mail-count">$count</span>
-	
-	<a href="message/dropconv/$id" onclick="return confirmDelete();"  title="$delete" class="mail-delete icon s22 delete"></a>
-</div>
diff --git a/view/theme/diabook/diabook-red/message_side.tpl b/view/theme/diabook/diabook-red/message_side.tpl
deleted file mode 100644
index 9f1587096..000000000
--- a/view/theme/diabook/diabook-red/message_side.tpl
+++ /dev/null
@@ -1,10 +0,0 @@
-<div id="message-sidebar" class="widget">
-	<div id="message-new" class="{{ if $new.sel }}selected{{ endif }}"><a href="$new.url">$new.label</a> </div>
-	
-	<ul class="message-ul">
-		{{ for $tabs as $t }}
-			<li class="tool {{ if $t.sel }}selected{{ endif }}"><a href="$t.url" class="message-link">$t.label</a></li>
-		{{ endfor }}
-	</ul>
-	
-</div>
diff --git a/view/theme/diabook/diabook-red/nav.tpl b/view/theme/diabook/diabook-red/nav.tpl
deleted file mode 100644
index 5f316bcdd..000000000
--- a/view/theme/diabook/diabook-red/nav.tpl
+++ /dev/null
@@ -1,190 +0,0 @@
-<header>
-	<div id="site-location">$sitelocation</div>
-	<div id="banner">$banner</div>
-</header>
-<nav>
-			
-			
-	<ul>
-			
-			
-			{{ if $nav.network }}
-			<li id="nav-network-link" class="nav-menu-icon">
-				<a class="$nav.network.2" href="$nav.network.0" title="$nav.network.3" >
-				<span class="icon notifications">Benachrichtigungen</span>
-				<span id="net-update" class="nav-notify"></span></a>
-			</li>
-		    {{ endif }}
-	
-			{{ if $nav.contacts }}
-			<li class="nav-menu-icon" id="nav-contacts-linkmenu">
-				<a href="$nav.contacts.0" rel="#nav-contacts-menu" title="$nav.contacts.1">
-				<span class="icon contacts">$nav.contacts.1</span>
-				<span id="intro-update" class="nav-notify"></span></a>
-				<ul id="nav-contacts-menu" class="menu-popup">
-					<li id="nav-contacts-see-intro"><a href="$nav.notifications.0">$nav.introductions.1</a><span id="intro-update-li" class="nav-notify"></span></li>
-					<li id="nav-contacts-all"><a href="contacts">$nav.contacts.1</a></li> 
-				</ul>
-			</li>	
-
-			{{ endif }}
-			
-			{{ if $nav.messages }}
-			<li  id="nav-messages-linkmenu" class="nav-menu-icon">
-			  <a href="$nav.messages.0" rel="#nav-messages-menu" title="$nav.messages.1">
-			  <span class="icon messages">$nav.messages.1</span>
-				<span id="mail-update" class="nav-notify"></span></a>
-				<ul id="nav-messages-menu" class="menu-popup">
-					<li id="nav-messages-see-all"><a href="$nav.messages.0">$nav.messages.1</a></li>
-					<li id="nav-messages-see-all"><a href="$nav.messages.new.0">$nav.messages.new.1</a></li>
-				</ul>
-			</li>		
-			{{ endif }}
-		
-      {{ if $nav.notifications }}
-			<li  id="nav-notifications-linkmenu" class="nav-menu-icon">
-			<a href="$nav.notifications.0" rel="#nav-notifications-menu" title="$nav.notifications.1">
-			<span class="icon notify">$nav.notifications.1</span>
-				<span id="notify-update" class="nav-notify"></span></a>
-				<ul id="nav-notifications-menu" class="menu-popup">
-					<li id="nav-notifications-mark-all"><a href="#" onclick="notifyMarkAll(); return false;">$nav.notifications.mark.1</a></li>
-					<li id="nav-notifications-see-all"><a href="$nav.notifications.all.0">$nav.notifications.all.1</a></li>
-					<li class="empty">$emptynotifications</li>
-				</ul>
-			</li>		
-		{{ endif }}	
-			
-		{{ if $nav.search}}
-		<li id="search-box">
-			<form method="get" action="$nav.search.0">
-				<input id="search-text" class="nav-menu-search" type="text" value="" name="search">
-			</form>
-		</li>		
-		{{ endif }}	
-		
-		<li  style="width: 1%; height: 1px;float: right;"></li>	
-		
-		<li id="nav-site-linkmenu" class="nav-menu-icon"><a href="#" rel="#nav-site-menu"><span class="icon s22 gear">Site</span></a>
-			<ul id="nav-site-menu" class="menu-popup">
-				{{ if $nav.manage }}<li><a class="$nav.manage.2" href="$nav.manage.0" title="$nav.manage.3">$nav.manage.1</a></li>{{ endif }}				
-
-				{{ if $nav.settings }} <li><a class="$nav.search.2" onClick="restore_boxes()" title="Restore right-hand column" style="cursor: pointer;">Restore right-hand column</a></li>{{ endif }}
-										
-				{{ if $nav.help }} <li><a class="$nav.help.2" target="friendika-help" href="$nav.help.0" title="$nav.help.3" >$nav.help.1</a></li>{{ endif }}									
-										
-										 <li><a class="$nav.search.2" href="friendica" title="Site Info / Impressum" >Info/Impressum</a></li>
-										
-				{{ if $nav.settings }}<li><a class="menu-sep $nav.settings.2" href="$nav.settings.0" title="$nav.settings.3">$nav.settings.1</a></li>{{ endif }}
-				{{ if $nav.admin }}<li><a class="$nav.admin.2" href="$nav.admin.0" title="$nav.admin.3" >$nav.admin.1</a></li>{{ endif }}
-
-				{{ if $nav.logout }}<li><a class="menu-sep $nav.logout.2" href="$nav.logout.0" title="$nav.logout.3" >$nav.logout.1</a></li>{{ endif }}
-
-				
-			</ul>		
-		</li>
-		
-		
-		{{ if $nav.directory }}
-		<li id="nav-directory-link" class="nav-menu $sel.directory">
-			<a class="$nav.directory.2" href="$nav.directory.0" title="$nav.directory.3" >$nav.directory.1</a>
-		</li>
-		{{ endif }}
-		
-		{{ if $nav.apps }}
-			<li id="nav-apps-link" class="nav-menu $sel.apps">
-				<a class=" $nav.apps.2" href="#" rel="#nav-apps-menu" title="$nav.apps.3" >$nav.apps.1</a>
-				<ul id="nav-apps-menu" class="menu-popup">
-					{{ for $apps as $ap }}
-					<li>$ap</li>
-					{{ endfor }}
-				</ul>
-			</li>	
-		{{ endif }}		
-		
-      {{ if $nav.home }}
-			<li id="nav-home-link" class="nav-menu $sel.home">
-				<a class="$nav.home.2" href="$nav.home.0" title="$nav.home.3" >$nav.home.1
-				<span id="home-update" class="nav-notify"></span></a>
-			</li>
-		{{ endif }}		
-		
-		{{ if $userinfo }}
-			<li id="nav-user-linkmenu" class="nav-menu-icon"><a href="#" rel="#nav-user-menu" title="$sitelocation"><img src="$userinfo.icon" alt="$userinfo.name"></a>
-				<ul id="nav-user-menu" class="menu-popup">
-					{{ for $nav.usermenu as $usermenu }}
-						<li><a class="$usermenu.2" href="$usermenu.0" title="$usermenu.3">$usermenu.1</a></li>
-					{{ endfor }}
-					
-					{{ if $nav.profiles }}<li><a class="menu-sep $nav.profiles.2" href="$nav.profiles.0" title="$nav.profiles.3" >$nav.profiles.3</a></li>{{ endif }}
-					{{ if $nav.notifications }}<li><a class="$nav.notifications.2" href="$nav.notifications.0" title="$nav.notifications.3" >$nav.notifications.1</a></li>{{ endif }}
-					{{ if $nav.messages }}<li><a class="$nav.messages.2" href="$nav.messages.0" title="$nav.messages.3" >$nav.messages.1</a></li>{{ endif }}
-					{{ if $nav.contacts }}<li><a class="$nav.contacts.2" href="$nav.contacts.0" title="$nav.contacts.3" >$nav.contacts.1</a></li>{{ endif }}	
-				</ul>
-			</li>
-		{{ endif }}
-		
-					{{ if $nav.login }}
-					<li id="nav-home-link" class="nav-menu $sel.home">
-						<a class="$nav.login.2" href="$nav.login.0" title="$nav.login.3" >$nav.login.1</a>
-					<li>
-					{{ endif }}
-		
-		
-		
-	</ul>	
-
-
-	
-</nav>
-
-
-<div style="position: fixed; bottom: 5px; right: 10px;"><a href="javascript:scroll(0,0); "><img src="view/theme/diabook/icons/scroll_top.png" title="scroll to top"></a></div>
-<div style="position: fixed; bottom: 3px; left: 25px;">$langselector</div>
-<div style="position: fixed; bottom: 23px; left: 5px;"><a href="http://pad.toktan.org/p/diabook" target="blank" ><img src="view/theme/diabook/icons/bluebug.png" title="report bugs for the theme diabook"/></a></div>
-
-
-
-
-<ul id="nav-notifications-template" style="display:none;" rel="template">
-	<li class="{4}"><a href="{0}"><img src="{1}">{2} <span class="notif-when">{3}</span></a></li>
-</ul>
-
-
-
-{#
-
-{{ if $nav.logout }}<a id="nav-logout-link" class="nav-link $nav.logout.2" href="$nav.logout.0" title="$nav.logout.3" >$nav.logout.1</a> {{ endif }}
-{{ if $nav.login }}<a id="nav-login-link" class="nav-login-link $nav.login.2" href="$nav.login.0" title="$nav.login.3" >$nav.login.1</a> {{ endif }}
-
-<span id="nav-link-wrapper" >
-
-{{ if $nav.register }}<a id="nav-register-link" class="nav-commlink $nav.register.2" href="$nav.register.0" title="$nav.register.3" >$nav.register.1</a>{{ endif }}
-	
-<a id="nav-help-link" class="nav-link $nav.help.2" target="friendika-help" href="$nav.help.0" title="$nav.help.3" >$nav.help.1</a>
-	
-{{ if $nav.apps }}<a id="nav-apps-link" class="nav-link $nav.apps.2" href="$nav.apps.0" title="$nav.apps.3" >$nav.apps.1</a>{{ endif }}
-
-<a id="nav-search-link" class="nav-link $nav.search.2" href="$nav.search.0" title="$nav.search.3" >$nav.search.1</a>
-<a id="nav-directory-link" class="nav-link $nav.directory.2" href="$nav.directory.0" title="$nav.directory.3" >$nav.directory.1</a>
-
-{{ if $nav.admin }}<a id="nav-admin-link" class="nav-link $nav.admin.2" href="$nav.admin.0" title="$nav.admin.3" >$nav.admin.1</a>{{ endif }}
-
-{{ if $nav.notifications }}
-<a id="nav-notify-link" class="nav-commlink $nav.notifications.2" href="$nav.notifications.0" title="$nav.notifications.3" >$nav.notifications.1</a>
-<span id="notify-update" class="nav-ajax-left"></span>
-{{ endif }}
-{{ if $nav.messages }}
-<a id="nav-messages-link" class="nav-commlink $nav.messages.2" href="$nav.messages.0" title="$nav.messages.3" >$nav.messages.1</a>
-<span id="mail-update" class="nav-ajax-left"></span>
-{{ endif }}
-
-{{ if $nav.manage }}<a id="nav-manage-link" class="nav-commlink $nav.manage.2" href="$nav.manage.0" title="$nav.manage.3">$nav.manage.1</a>{{ endif }}
-
-{{ if $nav.settings }}<a id="nav-settings-link" class="nav-link $nav.settings.2" href="$nav.settings.0" title="$nav.settings.3">$nav.settings.1</a>{{ endif }}
-{{ if $nav.profiles }}<a id="nav-profiles-link" class="nav-link $nav.profiles.2" href="$nav.profiles.0" title="$nav.profiles.3" >$nav.profiles.1</a>{{ endif }}
-
-
-</span>
-<span id="nav-end"></span>
-<span id="banner">$banner</span>
-#}
diff --git a/view/theme/diabook/diabook-red/nets.tpl b/view/theme/diabook/diabook-red/nets.tpl
deleted file mode 100644
index be25ddee1..000000000
--- a/view/theme/diabook/diabook-red/nets.tpl
+++ /dev/null
@@ -1,15 +0,0 @@
-<div id="profile_side">
-	<h3 style="margin-left: 2px;">$title</h3>
-	<div id="nets-desc">$desc</div>
-   
-	<ul class="menu-profile-side">
-	<li class="menu-profile-list">
-	<span class="menu-profile-icon {{ if $sel_all }}group_selected{{else}}group_unselected{{ endif }}"></span>	
-	<a style="text-decoration: none;" href="$base" class="menu-profile-list-item">$all</a></li>
-	{{ for $nets as $net }}
-	<li class="menu-profile-list">
-	<span class="menu-profile-icon {{ if $net.selected }}group_selected{{else}}group_unselected{{ endif }}"></span>	
-	<a href="$base?nets=$net.ref" class="menu-profile-list-item">$net.name</a></li>
-	{{ endfor }}
-	</ul>
-</div>
diff --git a/view/theme/diabook/diabook-red/oembed_video.tpl b/view/theme/diabook/diabook-red/oembed_video.tpl
deleted file mode 100644
index d6d29f724..000000000
--- a/view/theme/diabook/diabook-red/oembed_video.tpl
+++ /dev/null
@@ -1,4 +0,0 @@
-<a class="embed_yt" href='$embedurl' onclick='this.innerHTML=Base64.decode("$escapedhtml"); yt_iframe(); return false;' style='float:left; margin: 1em; position: relative;'>
-	<img width='$tw' height='$th' src='$turl' >
-	<div style='position: absolute; top: 0px; left: 0px; width: $twpx; height: $thpx; background: url(images/icons/48/play.png) no-repeat center center;'></div>
-</a>
diff --git a/view/theme/diabook/diabook-red/photo_item.tpl b/view/theme/diabook/diabook-red/photo_item.tpl
deleted file mode 100644
index 5d65a89b7..000000000
--- a/view/theme/diabook/diabook-red/photo_item.tpl
+++ /dev/null
@@ -1,65 +0,0 @@
-{{ if $indent }}{{ else }}
-<div class="wall-item-decor">
-	<img id="like-rotator-$id" class="like-rotator" src="images/rotator.gif" alt="$wait" title="$wait" style="display: none;" />
-</div>
-{{ endif }}
-
-<div class="wall-item-photo-container $indent">
-	<div class="wall-item-item">
-		<div class="wall-item-info">
-			<div class="contact-photo-wrapper" >
-				<a href="$profile_url" target="redir" title="" class="contact-photo-link" id="wall-item-photo-link-$id">
-					<img src="$thumb" class="contact-photo$sparkle" id="wall-item-photo-$id" alt="$name" />
-				</a>
-				<a href="#" rel="#wall-item-photo-menu-$id" class="contact-photo-menu-button icon s16 menu" id="wall-item-photo-menu-button-$id">menu</a>
-				<ul class="contact-menu menu-popup" id="wall-item-photo-menu-$id">
-				$photo_menu
-				</ul>
-				
-			</div>
-		</div>
-			<div class="wall-item-actions-author">
-				<a href="$profile_url" target="redir" title="$name" class="wall-item-name-link"><span class="wall-item-name$sparkle">$name</span></a> 
-			<span class="wall-item-ago">-
-			{{ if $plink }}<a class="link" title="$plink.title" href="$plink.href" style="color: #999">$ago</a>{{ else }} $ago {{ endif }}
-			{{ if $lock }} - <span class="fakelink" style="color: #999" onclick="lockview(event,$id);">$lock</span> {{ endif }}
-			</span>
-			</div>
-		<div class="wall-item-content">
-			{{ if $title }}<h2><a href="$plink.href">$title</a></h2>{{ endif }}
-			$body
-		</div>
-	</div>
-	<div class="wall-item-bottom">
-		<div class="wall-item-links">
-		</div>
-		<div class="wall-item-tags">
-			{{ for $tags as $tag }}
-				<span class='tag'>$tag</span>
-			{{ endfor }}
-		</div>
-	</div>
-	
-	<div class="wall-item-bottom" style="display: table-row;">
-		<div class="wall-item-actions">
-	   </div>
-		<div class="wall-item-actions">
-			
-			<div class="wall-item-actions-tools">
-
-				{{ if $drop.dropping }}
-					<input type="checkbox" title="$drop.select" name="itemselected[]" class="item-select" value="$id" />
-					<a href="item/drop/$id" onclick="return confirmDelete();" class="icon drop" title="$drop.delete">$drop.delete</a>
-				{{ endif }}
-				{{ if $edpost }}
-					<a class="icon pencil" href="$edpost.0" title="$edpost.1"></a>
-				{{ endif }}
-			</div>
-
-		</div>
-	</div>
-	<div class="wall-item-bottom">
-			
-	</div>
-</div>
-
diff --git a/view/theme/diabook/diabook-red/photo_view.tpl b/view/theme/diabook/diabook-red/photo_view.tpl
deleted file mode 100644
index 09dfb2aae..000000000
--- a/view/theme/diabook/diabook-red/photo_view.tpl
+++ /dev/null
@@ -1,36 +0,0 @@
-<div id="live-display"></div>
-<h3><a href="$album.0">$album.1</a></h3>
-
-<div id="photo-edit-link-wrap">
-{{ if $tools }}
-<a id="photo-edit-link" href="$tools.edit.0">$tools.edit.1</a>
--
-<a id="photo-toprofile-link" href="$tools.profile.0">$tools.profile.1</a>
-{{ endif }}
-{{ if $lock }} - <img src="images/lock_icon.gif" class="lockview" alt="$lock" onclick="lockview(event,'photo$id');" /> {{ endif }}
-</div>
-
-<div id="photo-photo">
-	{{ if $prevlink }}<div id="photo-prev-link"><a href="$prevlink.0">$prevlink.1</a></div>{{ endif }}
-	<a href="$photo.href" class="lightbox" title="$photo.title"><img src="$photo.src" /></a>
-	{{ if $nextlink }}<div id="photo-next-link"><a href="$nextlink.0">$nextlink.1</a></div>{{ endif }}
-</div>
-
-<div id="photo-photo-end"></div>
-<div id="photo-caption" >$desc</div>
-{{ if $tags }}
-<div id="in-this-photo-text">$tags.0</div>
-<div id="in-this-photo">$tags.1</div>
-{{ endif }}
-{{ if $tags.2 }}<div id="tag-remove"><a href="$tags.2">$tags.3</a></div>{{ endif }}
-
-{{ if $edit }}$edit{{ endif }}
-
-<div style="margin-top:20px">
-</div>
-<div id="wall-photo-container">
-$comments
-</div>
-
-$paginate
-
diff --git a/view/theme/diabook/diabook-red/profile_side.tpl b/view/theme/diabook/diabook-red/profile_side.tpl
deleted file mode 100644
index 01e80f238..000000000
--- a/view/theme/diabook/diabook-red/profile_side.tpl
+++ /dev/null
@@ -1,21 +0,0 @@
-<div id="profile_side">
-	<div id="ps-usernameicon">
-		<a href="$ps.usermenu.status.0" title="$userinfo.name">
-			<img src="$userinfo.icon" id="ps-usericon" alt="$userinfo.name">
-		</a>
-		<a href="$ps.usermenu.status.0" id="ps-username" title="$userinfo.name">$userinfo.name</a>
-	</div>
-	
-<ul id="profile-side-menu" class="menu-profile-side">
-	<li id="profile-side-status" class="menu-profile-list"><a class="menu-profile-list-item" href="$ps.usermenu.status.0">$ps.usermenu.status.1<span class="menu-profile-icon home"></span></a></li>
-	<li id="profile-side-photos" class="menu-profile-list photos"><a class="menu-profile-list-item" href="$ps.usermenu.photos.0">$ps.usermenu.photos.1<span class="menu-profile-icon photos"></span></a></li>
-	<li id="profile-side-photos" class="menu-profile-list pscontacts"><a class="menu-profile-list-item" href="$ps.usermenu.contacts.0">$ps.usermenu.contacts.1<span class="menu-profile-icon pscontacts"></span></a></li>		
-	<li id="profile-side-events" class="menu-profile-list events"><a class="menu-profile-list-item" href="$ps.usermenu.events.0">$ps.usermenu.events.1<span class="menu-profile-icon events"></span></a></li>
-	<li id="profile-side-notes" class="menu-profile-list notes"><a class="menu-profile-list-item" href="$ps.usermenu.notes.0">$ps.usermenu.notes.1<span class="menu-profile-icon notes"></span></a></li>
-	<li id="profile-side-foren" class="menu-profile-list foren"><a class="menu-profile-list-item" href="$ps.usermenu.pgroups.0" target="blanc">$ps.usermenu.pgroups.1<span class="menu-profile-icon foren"></span></a></li>
-	<li id="profile-side-foren" class="menu-profile-list com_side"><a class="menu-profile-list-item" href="$ps.usermenu.community.0">$ps.usermenu.community.1<span class="menu-profile-icon com_side"></span></a></li>
-</ul>
-
-</div>
-
-				
diff --git a/view/theme/diabook/diabook-red/profile_vcard.tpl b/view/theme/diabook/diabook-red/profile_vcard.tpl
deleted file mode 100644
index e28ec2909..000000000
--- a/view/theme/diabook/diabook-red/profile_vcard.tpl
+++ /dev/null
@@ -1,64 +0,0 @@
-<div class="vcard">
-
-	<div class="tool">
-		<div class="fn label">$profile.name</div>
-		{{ if $profile.edit }}
-			<div class="action">
-			<a class="icon s16 edit ttright" href="#" rel="#profiles-menu" title="$profile.edit.3"><span>$profile.edit.1</span></a>
-			<ul id="profiles-menu" class="menu-popup">
-				{{ for $profile.menu.entries as $e }}
-				<li>
-					<a href="profiles/$e.id"><img src='$e.photo'>$e.profile_name</a>
-				</li>
-				{{ endfor }}
-				<li><a href="profile_photo" >$profile.menu.chg_photo</a></li>
-				<li><a href="profiles/new" id="profile-listing-new-link">$profile.menu.cr_new</a></li>
-				<li><a href="profiles" >$profile.edit.3</a></li>
-								
-			</ul>
-			</div>
-		{{ endif }}
-	</div>
-				
-	
-
-	<div id="profile-photo-wrapper"><img class="photo" width="155" height="155" src="$profile.photo?rev=$profile.picdate" alt="$profile.name" /></div>
-	{{ if $pdesc }}<div class="title">$profile.pdesc</div>{{ endif }}
-
-
-	{{ if $location }}
-		<dl class="location"><dt class="location-label">$location</dt><br> 
-		<dd class="adr">
-			{{ if $profile.address }}<div class="street-address">$profile.address</div>{{ endif }}
-			<span class="city-state-zip">
-				<span class="locality">$profile.locality</span>{{ if $profile.locality }}, {{ endif }}
-				<span class="region">$profile.region</span>
-				<span class="postal-code">$profile.postal-code</span>
-			</span>
-			{{ if $profile.country-name }}<span class="country-name">$profile.country-name</span>{{ endif }}
-		</dd>
-		</dl>
-	{{ endif }}
-
-	{{ if $gender }}<dl class="mf"><dt class="gender-label">$gender</dt> <dd class="x-gender">$profile.gender</dd></dl>{{ endif }}
-	
-	{{ if $profile.pubkey }}<div class="key" style="display:none;">$profile.pubkey</div>{{ endif }}
-
-	{{ if $marital }}<dl class="marital"><dt class="marital-label"><span class="heart">&hearts;</span>$marital</dt><dd class="marital-text">$profile.marital</dd></dl>{{ endif }}
-
-	{{ if $homepage }}<dl class="homepage"><dt class="homepage-label">$homepage</dt><dd class="homepage-url"><a href="$profile.homepage" target="external-link">$profile.homepage</a></dd></dl>{{ endif }}
-
-	{{ inc diaspora_vcard.tpl }}{{ endinc }}
-	
-	<div id="profile-extra-links">
-		<ul>
-			{{ if $connect }}
-				<li><a id="dfrn-request-link" href="dfrn_request/$profile.nickname">$connect</a></li>
-			{{ endif }}
-		</ul>
-	</div>
-</div>
-
-$contact_block
-
-
diff --git a/view/theme/diabook/diabook-red/right_aside.tpl b/view/theme/diabook/diabook-red/right_aside.tpl
deleted file mode 100644
index a65677696..000000000
--- a/view/theme/diabook/diabook-red/right_aside.tpl
+++ /dev/null
@@ -1,20 +0,0 @@
-<div id="profile_side">
-	<div id="ps-usernameicon">
-		<a href="$ps.usermenu.status.0" title="$userinfo.name">
-			<img src="$userinfo.icon" id="ps-usericon" alt="$userinfo.name">
-		</a>
-		<a href="$ps.usermenu.status.0" id="ps-username" title="$userinfo.name">$userinfo.name</a>
-	</div>
-	
-<ul id="profile-side-menu" class="menu-profile-side">
-	<li id="profile-side-status" class="menu-profile-list home"><a class="menu-profile-list-item" href="$ps.usermenu.status.0">$ps.usermenu.status.1</a></li>
-	<li id="profile-side-photos" class="menu-profile-list photos"><a class="menu-profile-list-item" href="$ps.usermenu.photos.0">$ps.usermenu.photos.1</a></li>
-	<li id="profile-side-events" class="menu-profile-list events"><a class="menu-profile-list-item" href="$ps.usermenu.events.0">$ps.usermenu.events.1</a></li>
-	<li id="profile-side-notes" class="menu-profile-list notes"><a class="menu-profile-list-item" href="$ps.usermenu.notes.0">$ps.usermenu.notes.1</a></li>
-	<li id="profile-side-foren" class="menu-profile-list foren"><a class="menu-profile-list-item" href="http://dir.friendika.com/directory/forum" target="blanc">Public Groups</a></li>
-	<li id="profile-side-foren" class="menu-profile-list com_side"><a class="menu-profile-list-item" href="$ps.usermenu.community.0">$ps.usermenu.community.1</a></li>
-</ul>
-
-</div>
-
-				
\ No newline at end of file
diff --git a/view/theme/diabook/diabook-red/screenshot.png b/view/theme/diabook/diabook-red/screenshot.png
deleted file mode 100644
index f7e9b41b7..000000000
--- a/view/theme/diabook/diabook-red/screenshot.png
+++ /dev/null
diff --git a/view/theme/diabook/diabook-red/search_item.tpl b/view/theme/diabook/diabook-red/search_item.tpl
deleted file mode 100644
index 123834064..000000000
--- a/view/theme/diabook/diabook-red/search_item.tpl
+++ /dev/null
@@ -1,100 +0,0 @@
-{{ if $item.indent }}{{ else }}
-<div class="wall-item-decor">
-	<img id="like-rotator-$item.id" class="like-rotator" src="images/rotator.gif" alt="$item.wait" title="$item.wait" style="display: none;" />
-</div>
-{{ endif }}
-<div class="wall-item-container $item.indent">
-	<div class="wall-item-item">
-		<div class="wall-item-info">
-			<div class="contact-photo-wrapper"
-				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" target="redir" title="$item.linktitle" class="contact-photo-link" id="wall-item-photo-link-$item.id">
-					<img src="$item.thumb" class="contact-photo$item.sparkle" id="wall-item-photo-$item.id" alt="$item.name" />
-				</a>
-				<a href="#" rel="#wall-item-photo-menu-$item.id" class="contact-photo-menu-button icon s16 menu" id="wall-item-photo-menu-button-$item.id">menu</a>
-				<ul class="contact-menu menu-popup" id="wall-item-photo-menu-$item.id">
-				$item.item_photo_menu
-				</ul>
-				
-			</div>
-		</div>
-			<div class="wall-item-actions-author">
-				<a href="$item.profile_url" target="redir" title="$item.linktitle" class="wall-item-name-link"><span class="wall-item-name$item.sparkle">$item.name</span></a> 
-			<span class="wall-item-ago">-
-			{{ if $item.plink }}<a class="link" title="$item.plink.title" href="$item.plink.href" style="color: #999">$item.ago</a>{{ else }} $item.ago {{ endif }}
-			{{ if $item.lock }} - <span class="fakelink" style="color: #999" onclick="lockview(event,$item.id);">$item.lock</span> {{ endif }}
-			</span>
-			</div>
-		<div class="wall-item-content">
-			{{ if $item.title }}<h2><a href="$item.plink.href">$item.title</a></h2>{{ endif }}
-			$item.body
-		</div>
-	</div>
-	<div class="wall-item-bottom">
-		<div class="wall-item-links">
-		</div>
-		<div class="wall-item-tags">
-			{{ for $item.tags as $tag }}
-				<span class='tag'>$tag</span>
-			{{ endfor }}
-		</div>
-	</div>
-	<div class="wall-item-bottom">
-		<div class="">
-
-		</div>
-		<div class="wall-item-actions">
-
-			<div class="wall-item-actions-social">
-			
-			
-			{{ if $item.vote }}
-				<a href="#" id="like-$item.id" class="icon like" title="$item.vote.like.0" onclick="dolike($item.id,'like'); return false">$item.vote.like.1</a>
-				<a href="#" id="dislike-$item.id" class="icon dislike" title="$item.vote.dislike.0" onclick="dolike($item.id,'dislike'); return false"></a>
-			{{ endif }}
-						
-			{{ if $item.vote.share }}
-				<a href="#" id="share-$item.id" class="icon recycle" title="$item.vote.share.0" onclick="jotShare($item.id); return false"></a>
-			{{ endif }}	
-
-
-			{{ if $item.star }}
-				<a href="#" id="starred-$item.id" onclick="dostar($item.id); return false;" class="star-item icon $item.isstarred" title="$item.star.toggle">
-				<img src="images/star_dummy.png" class="icon star" alt="$item.star.do" /> </a>
-				<a href="#" id="tagger-$item.id" onclick="itemTag($item.id); return false;" class="tag-item icon tagged" title="$item.star.tagger"></a>					  
-			{{ endif }}	
-			
-			{{ if $item.filer }}
-			<a href="#" id="filer-$item.id" onclick="itemFiler($item.id); return false;" class="filer-item icon file-as" title="$item.star.filer"></a>
-			{{ endif }}				
-			
-			{{ if $item.plink }}<a class="icon link" title="$item.plink.title" href="$item.plink.href">$item.plink.title</a>{{ endif }}
-			
-					
-					
-			</div>
-			
-			<div class="wall-item-actions-tools">
-
-				{{ if $item.drop.dropping }}
-					<input type="checkbox" title="$item.drop.select" name="itemselected[]" class="item-select" value="$item.id" />
-					<a href="item/drop/$item.id" onclick="return confirmDelete();" class="icon drop" title="$item.drop.delete">$item.drop.delete</a>
-				{{ endif }}
-				{{ if $item.edpost }}
-					<a class="icon pencil" href="$item.edpost.0" title="$item.edpost.1"></a>
-				{{ endif }}
-			</div>
-			<div class="wall-item-location">$item.location&nbsp;</div>
-		</div>
-	</div>
-	<div class="wall-item-bottom">
-		<div class="wall-item-links"></div>
-		<div class="wall-item-like" id="wall-item-like-$item.id">$item.like</div>
-		<div class="wall-item-dislike" id="wall-item-dislike-$item.id">$item.dislike</div>	
-	</div>
-</div>
-
-<div class="wall-item-comment-wrapper" >
-	$item.comment
-</div>
diff --git a/view/theme/diabook/diabook-red/style-network-wide.css b/view/theme/diabook/diabook-red/style-network-wide.css
index b761465bc..8c3b67cb6 100644
--- a/view/theme/diabook/diabook-red/style-network-wide.css
+++ b/view/theme/diabook/diabook-red/style-network-wide.css
@@ -121,7 +121,7 @@
 			  display: block; width: 28px; height: 28px; background-repeat: no-repeat;
 			  }	
 .video 	{ background-image: url("../diabook-red/icons/video.png"); 
-			  display: block; width: 100%; height: 28px; background-repeat: no-repeat;
+			  display: block; width: 100%; height: 140px; background-repeat: no-repeat;
 			  }
 .audio2 	{ background-image: url("../diabook-red/icons/audio.png"); 
 			  display: block; width: 28px; height: 28px; background-repeat: no-repeat;
@@ -1391,7 +1391,7 @@ transition: all 0.2s ease-in-out;
   max-width: 690px;
   word-wrap: break-word;
 
-  margin-bottom: 14px;
+
 }
 /*marker*/
 .wall-item-container .wall-item-content img {
diff --git a/view/theme/diabook/diabook-red/style-network.css b/view/theme/diabook/diabook-red/style-network.css
index 61fa69473..84fd5da48 100644
--- a/view/theme/diabook/diabook-red/style-network.css
+++ b/view/theme/diabook/diabook-red/style-network.css
@@ -121,7 +121,7 @@
 			  display: block; width: 28px; height: 28px; background-repeat: no-repeat;
 			  }	
 .video 	{ background-image: url("../diabook-red/icons/video.png"); 
-			  display: block; width: 100%; height: 28px; background-repeat: no-repeat;
+			  display: block; width: 100%; height: 140px; background-repeat: no-repeat;
 			  }
 .audio2 	{ background-image: url("../diabook-red/icons/audio.png"); 
 			  display: block; width: 28px; height: 28px; background-repeat: no-repeat;
@@ -1384,7 +1384,7 @@ transition: all 0.2s ease-in-out;
   max-width: 420px;
   word-wrap: break-word;
 
-  margin-bottom: 14px;
+
 }
 
 .wall-item-container .wall-item-content img {
diff --git a/view/theme/diabook/diabook-red/style-profile-wide.css b/view/theme/diabook/diabook-red/style-profile-wide.css
index 1e4688b23..acb6075f7 100644
--- a/view/theme/diabook/diabook-red/style-profile-wide.css
+++ b/view/theme/diabook/diabook-red/style-profile-wide.css
@@ -121,7 +121,7 @@
 			  display: block; width: 28px; height: 28px; background-repeat: no-repeat;
 			  }	
 .video 	{ background-image: url("../diabook-red/icons/video.png"); 
-			  display: block; width: 100%; height: 28px; background-repeat: no-repeat;
+			  display: block; width: 100%; height: 140px; background-repeat: no-repeat;
 			  }
 .audio2 	{ background-image: url("../diabook-red/icons/audio.png"); 
 			  display: block; width: 28px; height: 28px; background-repeat: no-repeat;
@@ -1350,7 +1350,7 @@ transition: all 0.2s ease-in-out;
   max-width: 690px;
   word-wrap: break-word;
 
-  margin-bottom: 14px;
+
 }
 /*marker*/
 .wall-item-container .wall-item-content img {
diff --git a/view/theme/diabook/diabook-red/style-profile.css b/view/theme/diabook/diabook-red/style-profile.css
index 45f27a311..a29eb3eb0 100644
--- a/view/theme/diabook/diabook-red/style-profile.css
+++ b/view/theme/diabook/diabook-red/style-profile.css
@@ -121,7 +121,7 @@
 			  display: block; width: 28px; height: 28px; background-repeat: no-repeat;
 			  }	
 .video 	{ background-image: url("../diabook-red/icons/video.png"); 
-			  display: block; width: 100%; height: 28px; background-repeat: no-repeat;
+			  display: block; width: 100%; height: 140px; background-repeat: no-repeat;
 			  }
 .audio2 	{ background-image: url("../diabook-red/icons/audio.png"); 
 			  display: block; width: 28px; height: 28px; background-repeat: no-repeat;
@@ -1342,7 +1342,7 @@ transition: all 0.2s ease-in-out;
   max-width: 420px;
   word-wrap: break-word;
 
-  margin-bottom: 14px;
+
 }
 
 .wall-item-container .wall-item-content img {
diff --git a/view/theme/diabook/diabook-red/style-wide.css b/view/theme/diabook/diabook-red/style-wide.css
index 7a037694b..79c5fb1cb 100644
--- a/view/theme/diabook/diabook-red/style-wide.css
+++ b/view/theme/diabook/diabook-red/style-wide.css
@@ -149,7 +149,7 @@
 			  display: block; width: 28px; height: 28px; background-repeat: no-repeat;
 			  }	
 .video 	{ background-image: url("../../../view/theme/diabook/diabook-red/icons/video.png"); 
-			  display: block; width: 100%; height: 28px; background-repeat: no-repeat;
+			  display: block; width: 100%; height: 140px; background-repeat: no-repeat;
 			  }
 .audio2 	{ background-image: url("../../../view/theme/diabook/diabook-red/icons/audio.png"); 
 			  display: block; width: 28px; height: 28px; background-repeat: no-repeat;
@@ -1232,7 +1232,14 @@ aside #side-peoplefind-url {
   margin-right: 20px;		
 	}
 #login-submit-wrapper{
-margin-bottom: 15px;
+  padding-top: 120px;
+  margin-bottom: 12px;
+	}
+aside #login-submit-button{
+  margin-left: 0px!important;	
+	}
+aside #login-extra-links{
+  padding-top: 0px!important;	
 	}
 .group_selected {
   background: url("../../../view/theme/diabook/icons/selected.png") no-repeat left center;
@@ -1609,7 +1616,7 @@ body .pageheader{
   max-width: 690px;
   word-wrap: break-word;
 
-  margin-bottom: 14px;
+
 }
 
 .wall-item-container .wall-item-content img {
diff --git a/view/theme/diabook/diabook-red/style.css b/view/theme/diabook/diabook-red/style.css
index b45f5f593..c7cb1586d 100644
--- a/view/theme/diabook/diabook-red/style.css
+++ b/view/theme/diabook/diabook-red/style.css
@@ -149,7 +149,7 @@
 			  display: block; width: 28px; height: 28px; background-repeat: no-repeat;
 			  }	
 .video 	{ background-image: url("../../../view/theme/diabook/diabook-red/icons/video.png"); 
-			  display: block; width: 100%; height: 28px; background-repeat: no-repeat;
+			  display: block; width: 100%; height: 140px; background-repeat: no-repeat;
 			  }
 .audio2 	{ background-image: url("../../../view/theme/diabook/diabook-red/icons/audio.png"); 
 			  display: block; width: 28px; height: 28px; background-repeat: no-repeat;
@@ -1230,7 +1230,14 @@ aside #side-peoplefind-url {
   margin-right: 20px;		
 	}
 #login-submit-wrapper{
-margin-bottom: 15px;
+  padding-top: 120px;
+  margin-bottom: 12px;
+	}
+aside #login-submit-button{
+  margin-left: 0px!important;	
+	}
+aside #login-extra-links{
+  padding-top: 0px!important;	
 	}
 .group_selected {
   background: url("../../../view/theme/diabook/icons/selected.png") no-repeat left center;
@@ -1602,7 +1609,7 @@ body .pageheader{
   max-width: 720px;
   word-wrap: break-word;
 
-  margin-bottom: 14px;
+
 }
 
 .wall-item-container .wall-item-content img {
diff --git a/view/theme/diabook/diabook-red/style.php b/view/theme/diabook/diabook-red/style.php
deleted file mode 100644
index bbdc32e6d..000000000
--- a/view/theme/diabook/diabook-red/style.php
+++ /dev/null
@@ -1,277 +0,0 @@
-<?php
-	$line_height=false;
-	$diabook_font_size=false;
-	$resolution=false;
-	$site_line_height = get_config("diabook-red","line_height");
-	$site_diabook_font_size = get_config("diabook-red", "font_size" );
-	$site_resolution = get_config("diabook-red", "resolution" );
-	
-	
-	if (local_user()) {
-		$line_height = get_pconfig(local_user(), "diabook-red","line_height");
-		$diabook_font_size = get_pconfig(local_user(), "diabook-red", "font_size");
-		$resolution = get_pconfig(local_user(), "diabook-red", "resolution");
-	}
-	
-	if ($line_height===false) $line_height=$site_line_height;
-	if ($line_height===false) $line_height="1.3";
-	if ($diabook_font_size===false) $diabook_font_size=$site_diabook_font_size;
-	if ($diabook_font_size===false) $diabook_font_size="13";
-	if ($resolution===false) $resolution=$site_resolution;
-	if ($resolution===false) $resolution="normal";
-	
-	
-	if($resolution == "normal") {	
-	if (file_exists("$THEMEPATH/style.css")){
-		echo file_get_contents("$THEMEPATH/style.css");
-	}
-
-   if($diabook_font_size == "15"){
-		echo "
-			.wall-item-container .wall-item-content {
-  					font-size: 15px;
-  					}
-  					
-			.wall-item-photo-container .wall-item-content {
-  					font-size: 15px;
-  					}
-		";
-	}	
-	if($diabook_font_size == "14"){
-		echo "
-			.wall-item-container .wall-item-content {
-  					font-size: 14px;
-  					}
-  					
-			.wall-item-photo-container .wall-item-content {
-  					font-size: 14px;
-  					}
-		";
-	}
-	if($diabook_font_size == "13.5"){
-		echo "
-			.wall-item-container .wall-item-content {
-  					font-size: 13.5px;
-  					}
-  					
-			.wall-item-photo-container .wall-item-content {
-  					font-size: 13.5px;
-  					}
-		";
-	}
-	if($diabook_font_size == "13"){
-		echo "
-			.wall-item-container .wall-item-content {
-  					font-size: 13px;
-  					}
-  					
-			.wall-item-photo-container .wall-item-content {
-  					font-size: 13px;
-  					}
-		";
-	}
-	if($diabook_font_size == "12.5"){
-		echo "
-			.wall-item-container .wall-item-content {
-  					font-size: 12.5px;
-  					}
-  					
-			.wall-item-photo-container .wall-item-content {
-  					font-size: 12.5px;
-  					}
-		";
-	}
-	if($diabook_font_size == "12"){
-		echo "
-			.wall-item-container .wall-item-content {
-  					font-size: 12px;
-  					}
-  					
-			.wall-item-photo-container .wall-item-content {
-  					font-size: 12px;
-  					}
-		";
-	}
-	if($line_height == "1.5"){
-		echo "
-			.wall-item-container .wall-item-content {
-  					line-height: 1.5;
-  					}
-  					
-			.wall-item-photo-container .wall-item-content {
- 					line-height: 1.5;
-  					}
-		";
-	}	
-	if($line_height == "1.4"){
-		echo "
-			.wall-item-container .wall-item-content {
-  					line-height: 1.4;
-  					}
-  					
-			.wall-item-photo-container .wall-item-content {
- 					line-height: 1.4;
-  					}
-		";
-	}
-	if($line_height == "1.3"){
-		echo "
-			.wall-item-container .wall-item-content {
-  					line-height: 1.3;
-  					}
-  					
-			.wall-item-photo-container .wall-item-content {
- 					line-height: 1.3;
-  					}
-		";
-	}
-	if($line_height == "1.2"){
-		echo "
-			.wall-item-container .wall-item-content {
-  					line-height: 1.2;
-  					}
-  					
-			.wall-item-photo-container .wall-item-content {
- 					line-height: 1.2;
-  					}
-		";
-	}
-	if($line_height == "1.1"){
-		echo "
-			.wall-item-container .wall-item-content {
-  					line-height: 1.1;
-  					}
-  					
-			.wall-item-photo-container .wall-item-content {
- 					line-height: 1.1;
-  					}
-		";
-	}
-	}
-	
-	if($resolution == "wide") {	
-	if (file_exists("$THEMEPATH/style-wide.css")){
-		echo file_get_contents("$THEMEPATH/style-wide.css");
-	}
-	if($diabook_font_size == "15"){
-		echo "
-			.wall-item-container .wall-item-content {
-  					font-size: 15px;
-  					}
-  					
-			.wall-item-photo-container .wall-item-content {
-  					font-size: 15px;
-  					}
-		";
-	}
-	if($diabook_font_size == "14"){
-		echo "
-			.wall-item-container .wall-item-content {
-  					font-size: 14px;
-  					}
-  					
-			.wall-item-photo-container .wall-item-content {
-  					font-size: 14px;
-  					}
-		";
-	}
-	if($diabook_font_size == "13.5"){
-		echo "
-			.wall-item-container .wall-item-content {
-  					font-size: 13.5px;
-  					}
-  					
-			.wall-item-photo-container .wall-item-content {
-  					font-size: 13.5px;
-  					}
-		";
-	}
-	if($diabook_font_size == "13"){
-		echo "
-			.wall-item-container .wall-item-content {
-  					font-size: 13px;
-  					}
-  					
-			.wall-item-photo-container .wall-item-content {
-  					font-size: 13px;
-  					}
-		";
-	}
-	if($diabook_font_size == "12.5"){
-		echo "
-			.wall-item-container .wall-item-content {
-  					font-size: 12.5px;
-  					}
-  					
-			.wall-item-photo-container .wall-item-content {
-  					font-size: 12.5px;
-  					}
-		";
-	}
-	if($diabook_font_size == "12"){
-		echo "
-			.wall-item-container .wall-item-content {
-  					font-size: 12px;
-  					}
-  					
-			.wall-item-photo-container .wall-item-content {
-  					font-size: 12px;
-  					}
-		";
-	}
-	if($line_height == "1.5"){
-		echo "
-			.wall-item-container .wall-item-content {
-  					line-height: 1.5;
-  					}
-  					
-			.wall-item-photo-container .wall-item-content {
- 					line-height: 1.5;
-  					}
-		";
-	}	
-	if($line_height == "1.4"){
-		echo "
-			.wall-item-container .wall-item-content {
-  					line-height: 1.4;
-  					}
-  					
-			.wall-item-photo-container .wall-item-content {
- 					line-height: 1.4;
-  					}
-		";
-	}
-	if($line_height == "1.3"){
-		echo "
-			.wall-item-container .wall-item-content {
-  					line-height: 1.3;
-  					}
-  					
-			.wall-item-photo-container .wall-item-content {
- 					line-height: 1.3;
-  					}
-		";
-	}
-	if($line_height == "1.2"){
-		echo "
-			.wall-item-container .wall-item-content {
-  					line-height: 1.2;
-  					}
-  					
-			.wall-item-photo-container .wall-item-content {
- 					line-height: 1.2;
-  					}
-		";
-	}
-	if($line_height == "1.1"){
-		echo "
-			.wall-item-container .wall-item-content {
-  					line-height: 1.1;
-  					}
-  					
-			.wall-item-photo-container .wall-item-content {
- 					line-height: 1.1;
-  					}
-		";
-	}
-	}
\ No newline at end of file
diff --git a/view/theme/diabook/diabook-red/theme.php b/view/theme/diabook/diabook-red/theme.php
deleted file mode 100644
index bb3e20ad7..000000000
--- a/view/theme/diabook/diabook-red/theme.php
+++ /dev/null
@@ -1,483 +0,0 @@
-<?php
-
-/*
- * Name: Diabook-red
- * Description: Diabook-red: report bugs and request here: http://pad.toktan.org/p/diabook or contact me : thomas_bierey@friendica.eu
- * Version: (Version: 1.020)
- * Author: 
- */
-
-
-//print diabook-version for debugging
-$diabook_version = "Diabook-red (Version: 1.020)";
-$a->page['htmlhead'] .= sprintf('<script "%s" ></script>', $diabook_version);
-
-//change css on network and profilepages
-$cssFile = null;
-$resolution=false;
-$resolution = get_pconfig(local_user(), "diabook-red", "resolution");
-if ($resolution===false) $resolution="normal";
-
-/**
- * prints last community activity
- */
-function diabook_red_community_info(){
-	$a = get_app();
-
-	// last 12 users
-	$aside['$lastusers_title'] = t('Last users');
-	$aside['$lastusers_items'] = array();
-	$sql_extra = "";
-	$publish = (get_config('system','publish_all') ? '' : " AND `publish` = 1 " );
-	$order = " ORDER BY `register_date` DESC ";
-
-	$r = q("SELECT `profile`.*, `profile`.`uid` AS `profile_uid`, `user`.`nickname`
-			FROM `profile` LEFT JOIN `user` ON `user`.`uid` = `profile`.`uid` 
-			WHERE `is-default` = 1 $publish AND `user`.`blocked` = 0 $sql_extra $order LIMIT %d , %d ",
-		0,
-		9
-	);
-	$tpl = file_get_contents( dirname(__file__).'/ch_directory_item.tpl');
-	if(count($r)) {
-		$photo = 'thumb';
-		foreach($r as $rr) {
-			$profile_link = $a->get_baseurl() . '/profile/' . ((strlen($rr['nickname'])) ? $rr['nickname'] : $rr['profile_uid']);
-			$entry = replace_macros($tpl,array(
-				'$id' => $rr['id'],
-				'$profile-link' => $profile_link,
-				'$photo' => $rr[$photo],
-				'$alt-text' => $rr['name'],
-			));
-			$aside['$lastusers_items'][] = $entry;
-		}
-	}
-	
-	
-	// last 10 liked items
-	$aside['$like_title'] = t('Last likes');
-	$aside['$like_items'] = array();
-	$r = q("SELECT `T1`.`created`, `T1`.`liker`, `T1`.`liker-link`, `item`.* FROM 
-			(SELECT `parent-uri`, `created`, `author-name` AS `liker`,`author-link` AS `liker-link` 
-				FROM `item` WHERE `verb`='http://activitystrea.ms/schema/1.0/like' GROUP BY `parent-uri` ORDER BY `created` DESC) AS T1
-			INNER JOIN `item` ON `item`.`uri`=`T1`.`parent-uri` 
-			WHERE `T1`.`liker-link` LIKE '%s%%' OR `item`.`author-link` LIKE '%s%%'
-			GROUP BY `uri`
-			ORDER BY `T1`.`created` DESC
-			LIMIT 0,5",
-			$a->get_baseurl(),$a->get_baseurl()
-			);
-
-	foreach ($r as $rr) {
-		$author	 = '<a href="' . $rr['liker-link'] . '">' . $rr['liker'] . '</a>';
-		$objauthor =  '<a href="' . $rr['author-link'] . '">' . $rr['author-name'] . '</a>';
-		
-		//var_dump($rr['verb'],$rr['object-type']); killme();
-		switch($rr['verb']){
-			case 'http://activitystrea.ms/schema/1.0/post':
-				switch ($rr['object-type']){
-					case 'http://activitystrea.ms/schema/1.0/event':
-						$post_type = t('event');
-						break;
-					default:
-						$post_type = t('status');
-				}
-				break;
-			default:
-				if ($rr['resource-id']){
-					$post_type = t('photo');
-					$m=array();	preg_match("/\[url=([^]]*)\]/", $rr['body'], $m);
-					$rr['plink'] = $m[1];
-				} else {
-					$post_type = t('status');
-				}
-		}
-		$plink = '<a href="' . $rr['plink'] . '">' . $post_type . '</a>';
-
-		$aside['$like_items'][] = sprintf( t('%1$s likes %2$s\'s %3$s'), $author, $objauthor, $plink);
-		
-	}
-	
-	
-	// last 12 photos
-	$aside['$photos_title'] = t('Last photos');
-	$aside['$photos_items'] = array();
-	$r = q("SELECT `photo`.`id`, `photo`.`resource-id`, `photo`.`scale`, `photo`.`desc`, `user`.`nickname`, `user`.`username` FROM 
-				(SELECT `resource-id`, MAX(`scale`) as maxscale FROM `photo` 
-					WHERE `profile`=0 AND `contact-id`=0 AND `album` NOT IN ('Contact Photos', '%s', 'Profile Photos', '%s')
-						AND `allow_cid`='' AND `allow_gid`='' AND `deny_cid`='' AND `deny_gid`='' GROUP BY `resource-id`) AS `t1`
-				INNER JOIN `photo` ON `photo`.`resource-id`=`t1`.`resource-id` AND `photo`.`scale` = `t1`.`maxscale`,
-				`user` 
-				WHERE `user`.`uid` = `photo`.`uid`
-				AND `user`.`blockwall`=0
-				AND `user`.`hidewall`=0
-				ORDER BY `photo`.`edited` DESC
-				LIMIT 0, 9",
-				dbesc(t('Contact Photos')),
-				dbesc(t('Profile Photos'))
-				);
-		if(count($r)) {
-		$tpl = file_get_contents( dirname(__file__).'/ch_directory_item.tpl');
-		foreach($r as $rr) {
-			$photo_page = $a->get_baseurl() . '/photos/' . $rr['nickname'] . '/image/' . $rr['resource-id'];
-			$photo_url = $a->get_baseurl() . '/photo/' .  $rr['resource-id'] . '-' . $rr['scale'] .'.jpg';
-		
-			$entry = replace_macros($tpl,array(
-				'$id' => $rr['id'],
-				'$profile-link' => $photo_page,
-				'$photo' => $photo_url,
-				'$alt-text' => $rr['username']." : ".$rr['desc'],
-			));
-
-			$aside['$photos_items'][] = $entry;
-		}
-	}
-	
-   
-   //nav FIND FRIENDS
-	if(local_user()) {
-	$nv = array();
-	$nv['title'] = Array("", t('Find Friends'), "", "");
-	$nv['directory'] = Array('directory', t('Local Directory'), "", "");
-	$nv['global_directory'] = Array('http://dir.friendica.com/', t('Global Directory'), "", "");
-	$nv['match'] = Array('match', t('Similar Interests'), "", "");
-	$nv['suggest'] = Array('suggest', t('Friend Suggestions'), "", "");
-	$nv['invite'] = Array('invite', t('Invite Friends'), "", "");
-	
-	$nv['search'] = '<form name="simple_bar" method="get" action="http://dir.friendika.com/directory">
-						<span class="sbox_l"></span>
-						<span class="sbox">
-						<input type="text" name="search" size="13" maxlength="50">
-						</span>
-						<span class="sbox_r" id="srch_clear"></span>';
-						
-	$aside['$nv'] = $nv;
-	};
-	//Community Page
-	if(local_user()) {
-   $page = '<div id="page-sidebar-right_aside" class="widget">
-			<div class="title tool">
-			<h3>'.t("Community Pages").'<a id="close_pages_icon"  onClick="close_pages()" class="icon close_box" title="close"></a></h3></div>
-			<div id="sidebar-page-list"><ul>';
-
-	$pagelist = array();
-
-	$contacts = q("SELECT `id`, `url`, `name`, `micro`FROM `contact`
-			WHERE `network`= 'dfrn' AND `forum` = 1 AND `uid` = %d
-			ORDER BY `name` ASC",
-			intval($a->user['uid'])
-	);
-
-	$pageD = array();
-
-	// Look if the profile is a community page
-	foreach($contacts as $contact) {
-		$pageD[] = array("url"=>$contact["url"], "name"=>$contact["name"], "id"=>$contact["id"], "micro"=>$contact['micro']);
-	};
-	
-
-	$contacts = $pageD;
-
-	foreach($contacts as $contact) {
-		$page .= '<li style="list-style-type: none;" class="tool"><img height="20" width="20" style="float: left; margin-right: 3px;" src="' . $contact['micro'] .'" alt="' . $contact['url'] . '" /> <a href="'.$a->get_baseurl().'/redir/'.$contact["id"].'" style="margin-top: 2px;" title="' . $contact['url'] . '" class="label" target="external-link">'.
-				$contact["name"]."</a></li>";
-	}
-	$page .= '</ul></div></div>';
-	//if (sizeof($contacts) > 0)
-		
-		$aside['$page'] = $page;
-	}		
-  //END Community Page	
-  //helpers
-   $helpers = array();
-	$helpers['title'] = Array("", t('Help or @NewHere ?'), "", "");
-	
-	$aside['$helpers'] = $helpers;
-   //end helpers
-   //connectable services
-   $con_services = array();
-	$con_services['title'] = Array("", t('Connect Services'), "", "");
-	
-	$aside['$con_services'] = $con_services;
-   //end connectable services
-   
-  
-   //get_baseurl   
-   $url = $a->get_baseurl($ssl_state);   
-   $aside['$url'] = $url;
-
-	$tpl = file_get_contents(dirname(__file__).'/communityhome.tpl');
-	$a->page['right_aside'] = replace_macros($tpl, $aside);
-	
-}
-
-
-//profile_side at networkpages
-if ($a->argv[0] === "network" && local_user()){
-
-	// USER MENU
-	if(local_user()) {
-		
-		$r = q("SELECT micro FROM contact WHERE uid=%d AND self=1", intval($a->user['uid']));
-				
-		$userinfo = array(
-					'icon' => (count($r) ? $r[0]['micro']: $a->get_baseurl()."/images/default-profile-mm.jpg"),
-					'name' => $a->user['username'],
-				);	
-		$ps = array('usermenu'=>array());
-		$ps['usermenu']['status'] = Array('profile/' . $a->user['nickname'], t('Home'), "", t('Your posts and conversations'));
-		$ps['usermenu']['profile'] = Array('profile/' . $a->user['nickname']. '?tab=profile', t('Profile'), "", t('Your profile page'));
-		$ps['usermenu']['contacts'] = Array('contacts' , t('Contacts'), "", t('Your contacts'));		
-		$ps['usermenu']['photos'] = Array('photos/' . $a->user['nickname'], t('Photos'), "", t('Your photos'));
-		$ps['usermenu']['events'] = Array('events/', t('Events'), "", t('Your events'));
-		$ps['usermenu']['notes'] = Array('notes/', t('Personal notes'), "", t('Your personal photos'));
-		$ps['usermenu']['community'] = Array('community/', t('Community'), "", "");
-		$ps['usermenu']['pgroups'] = Array('http://dir.friendika.com/directory/forum', t('Community Pages'), "", "");
-
-		$tpl = get_markup_template('profile_side.tpl');
-
-		$a->page['aside'] .= replace_macros($tpl, array(
-				'$userinfo' => $userinfo,
-				'$ps' => $ps,
-			));
-
-	}
-	
-	$ccCookie = $_COOKIE['close_pages'] + $_COOKIE['close_helpers'] + $_COOKIE['close_services'] + $_COOKIE['close_friends'] + $_COOKIE['close_lastusers'] + $_COOKIE['close_lastphotos'] + $_COOKIE['close_lastlikes'];
-	
-	if($ccCookie != "7") {
-	// COMMUNITY
-	diabook_red_community_info();
-	
-	// CUSTOM CSS
-	if($resolution == "normal") {$cssFile = $a->get_baseurl($ssl_state)."/view/theme/diabook-red/style-network.css";}
-	if($resolution == "wide") {$cssFile = $a->get_baseurl($ssl_state)."/view/theme/diabook-red/style-network-wide.css";}
-	}
-}
-
-
-
-//right_aside at profile pages
-if ($a->argv[0].$a->argv[1] === "profile".$a->user['nickname']){
-	if($ccCookie != "7") {
-	// COMMUNITY
-	diabook_red_community_info();
-	
-	// CUSTOM CSS
-	if($resolution == "normal") {$cssFile = $a->get_baseurl($ssl_state)."/view/theme/diabook-red/style-profile.css";}
-	if($resolution == "wide") {$cssFile = $a->get_baseurl($ssl_state)."/view/theme/diabook-red/style-profile-wide.css";}
-	}
-}
-
-// custom css
-if (!is_null($cssFile)) $a->page['htmlhead'] .= sprintf('<link rel="stylesheet" type="text/css" href="%s" />', $cssFile);
-
-//load jquery.cookie.js
-$cookieJS = $a->get_baseurl($ssl_state)."/view/theme/diabook-red/js/jquery.cookie.js";
-$a->page['htmlhead'] .= sprintf('<script language="JavaScript" src="%s" ></script>', $cookieJS);
-
-//load jquery.ae.image.resize.js
-$imageresizeJS = $a->get_baseurl($ssl_state)."/view/theme/diabook-red/js/jquery.ae.image.resize.js";
-$a->page['htmlhead'] .= sprintf('<script language="JavaScript" src="%s" ></script>', $imageresizeJS);
-
-//load jquery.autogrow-textarea.js
-$autogrowJS = $a->get_baseurl($ssl_state)."/view/theme/diabook-red/js/jquery.autogrow.textarea.js";
-$a->page['htmlhead'] .= sprintf('<script language="JavaScript" src="%s" ></script>', $autogrowJS);
-
-//js scripts
-//comment-edit-wrapper on photo_view
-if ($a->argv[0].$a->argv[2] === "photos"."image"){
-
-$a->page['htmlhead'] .= '
-<script>
-	$(function(){
-	
-		$(".comment-edit-form").css("display","table");
-			
-			});
-    </script>';
-	
-}
-
-$a->page['htmlhead'] .= '
-
-<script>
- $(function() {
-	$("a.lightbox").fancybox(); // Select all links with lightbox class
- });
-  
- </script>';
- 
-$a->page['htmlhead'] .= '
-
-<script type="text/javascript">
-
-function tautogrow(id){
-		$("textarea#comment-edit-text-" +id).autogrow(); 	
- 	};
- </script>';
-
-$a->page['htmlhead'] .= '
- <script>
- 
-$(document).ready(function() {
-    $("iframe").each(function(){
-        var ifr_source = $(this).attr("src");
-        var wmode = "wmode=transparent";
-        if(ifr_source.indexOf("?") != -1) {
-            var getQString = ifr_source.split("?");
-            var oldString = getQString[1];
-            var newString = getQString[0];
-            $(this).attr("src",newString+"?"+wmode+"&"+oldString);
-        }
-        else $(this).attr("src",ifr_source+"?"+wmode);
-    });
-      
-
-});
-
-function yt_iframe() {
-	
-	$("iframe").load(function() { 
-	var ifr_src = $(this).contents().find("body iframe").attr("src");
-	$("iframe").contents().find("body iframe").attr("src", ifr_src+"&wmode=transparent");
-    });
-
-	};
-  
- </script>';
-
-
-if ($a->argv[0].$a->argv[1] === "profile".$a->user['nickname'] or $a->argv[0] === "network" && local_user()){
-$a->page['htmlhead'] .= '
-<script>
-
- $(function() {
-	$(".oembed.photo img").aeImageResize({height: 400, width: 400});
-  });
-</script>';
-
-
-	if($ccCookie != "7") {
-$a->page['htmlhead'] .= '
-<script>
-$("right_aside").ready(function(){
-	
-	if($.cookie("close_pages") == "1") 
-		{
-		document.getElementById( "close_pages" ).style.display = "none";
-			};
-	
-	if($.cookie("close_helpers") == "1") 
-		{
-		document.getElementById( "close_helpers" ).style.display = "none";
-			};
-			
-	if($.cookie("close_services") == "1") 
-		{
-		document.getElementById( "close_services" ).style.display = "none";
-			};
-			
-	if($.cookie("close_friends") == "1") 
-		{
-		document.getElementById( "close_friends" ).style.display = "none";
-			};
-			
-	if($.cookie("close_lastusers") == "1") 
-		{
-		document.getElementById( "close_lastusers" ).style.display = "none";
-			};
-			
-	if($.cookie("close_lastphotos") == "1") 
-		{
-		document.getElementById( "close_lastphotos" ).style.display = "none";
-			};
-			
-	if($.cookie("close_lastlikes") == "1") 
-		{
-		document.getElementById( "close_lastlikes" ).style.display = "none";
-			};}
-
-);
-
-function close_pages(){
- document.getElementById( "close_pages" ).style.display = "none";
- $.cookie("close_pages","1", { expires: 365, path: "/" });
- };
- 
-function close_helpers(){
- document.getElementById( "close_helpers" ).style.display = "none";
-  $.cookie("close_helpers","1", { expires: 365, path: "/" });
- };
-
-function close_services(){
- document.getElementById( "close_services" ).style.display = "none";
- $.cookie("close_services","1", { expires: 365, path: "/" });
- };
- 
-function close_friends(){
- document.getElementById( "close_friends" ).style.display = "none";
- $.cookie("close_friends","1", { expires: 365, path: "/" });
- };
- 
-function close_lastusers(){
- document.getElementById( "close_lastusers" ).style.display = "none";
- $.cookie("close_lastusers","1", { expires: 365, path: "/" });
- };
-
-function close_lastphotos(){
- document.getElementById( "close_lastphotos" ).style.display = "none";
- $.cookie("close_lastphotos","1", { expires: 365, path: "/" });
- };
- 
-function close_lastlikes(){
- document.getElementById( "close_lastlikes" ).style.display = "none";
- $.cookie("close_lastlikes","1", { expires: 365, path: "/" });
- };
-</script>';}
-
-$a->page['htmlhead'] .= ' 
-<script>
-function restore_boxes(){
-	$.cookie("close_pages","2", { expires: 365, path: "/" });
-	$.cookie("close_helpers","2", { expires: 365, path: "/" });
-	$.cookie("close_services","2", { expires: 365, path: "/" });
-	$.cookie("close_friends","2", { expires: 365, path: "/" });
-	$.cookie("close_lastusers","2", { expires: 365, path: "/" });
-	$.cookie("close_lastphotos","2", { expires: 365, path: "/" });
-	$.cookie("close_lastlikes","2", { expires: 365, path: "/" });
-	alert("Right-hand column was restored. Please refresh your browser");
-  }
-</script>';}
-
-$a->page['htmlhead'] .= ' 
-
-<script type="text/javascript">
-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);
-											}
-
-	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;
-}
-</script> ';
\ No newline at end of file
diff --git a/view/theme/diabook/diabook-red/wall_item.tpl b/view/theme/diabook/diabook-red/wall_item.tpl
deleted file mode 100644
index 123834064..000000000
--- a/view/theme/diabook/diabook-red/wall_item.tpl
+++ /dev/null
@@ -1,100 +0,0 @@
-{{ if $item.indent }}{{ else }}
-<div class="wall-item-decor">
-	<img id="like-rotator-$item.id" class="like-rotator" src="images/rotator.gif" alt="$item.wait" title="$item.wait" style="display: none;" />
-</div>
-{{ endif }}
-<div class="wall-item-container $item.indent">
-	<div class="wall-item-item">
-		<div class="wall-item-info">
-			<div class="contact-photo-wrapper"
-				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" target="redir" title="$item.linktitle" class="contact-photo-link" id="wall-item-photo-link-$item.id">
-					<img src="$item.thumb" class="contact-photo$item.sparkle" id="wall-item-photo-$item.id" alt="$item.name" />
-				</a>
-				<a href="#" rel="#wall-item-photo-menu-$item.id" class="contact-photo-menu-button icon s16 menu" id="wall-item-photo-menu-button-$item.id">menu</a>
-				<ul class="contact-menu menu-popup" id="wall-item-photo-menu-$item.id">
-				$item.item_photo_menu
-				</ul>
-				
-			</div>
-		</div>
-			<div class="wall-item-actions-author">
-				<a href="$item.profile_url" target="redir" title="$item.linktitle" class="wall-item-name-link"><span class="wall-item-name$item.sparkle">$item.name</span></a> 
-			<span class="wall-item-ago">-
-			{{ if $item.plink }}<a class="link" title="$item.plink.title" href="$item.plink.href" style="color: #999">$item.ago</a>{{ else }} $item.ago {{ endif }}
-			{{ if $item.lock }} - <span class="fakelink" style="color: #999" onclick="lockview(event,$item.id);">$item.lock</span> {{ endif }}
-			</span>
-			</div>
-		<div class="wall-item-content">
-			{{ if $item.title }}<h2><a href="$item.plink.href">$item.title</a></h2>{{ endif }}
-			$item.body
-		</div>
-	</div>
-	<div class="wall-item-bottom">
-		<div class="wall-item-links">
-		</div>
-		<div class="wall-item-tags">
-			{{ for $item.tags as $tag }}
-				<span class='tag'>$tag</span>
-			{{ endfor }}
-		</div>
-	</div>
-	<div class="wall-item-bottom">
-		<div class="">
-
-		</div>
-		<div class="wall-item-actions">
-
-			<div class="wall-item-actions-social">
-			
-			
-			{{ if $item.vote }}
-				<a href="#" id="like-$item.id" class="icon like" title="$item.vote.like.0" onclick="dolike($item.id,'like'); return false">$item.vote.like.1</a>
-				<a href="#" id="dislike-$item.id" class="icon dislike" title="$item.vote.dislike.0" onclick="dolike($item.id,'dislike'); return false"></a>
-			{{ endif }}
-						
-			{{ if $item.vote.share }}
-				<a href="#" id="share-$item.id" class="icon recycle" title="$item.vote.share.0" onclick="jotShare($item.id); return false"></a>
-			{{ endif }}	
-
-
-			{{ if $item.star }}
-				<a href="#" id="starred-$item.id" onclick="dostar($item.id); return false;" class="star-item icon $item.isstarred" title="$item.star.toggle">
-				<img src="images/star_dummy.png" class="icon star" alt="$item.star.do" /> </a>
-				<a href="#" id="tagger-$item.id" onclick="itemTag($item.id); return false;" class="tag-item icon tagged" title="$item.star.tagger"></a>					  
-			{{ endif }}	
-			
-			{{ if $item.filer }}
-			<a href="#" id="filer-$item.id" onclick="itemFiler($item.id); return false;" class="filer-item icon file-as" title="$item.star.filer"></a>
-			{{ endif }}				
-			
-			{{ if $item.plink }}<a class="icon link" title="$item.plink.title" href="$item.plink.href">$item.plink.title</a>{{ endif }}
-			
-					
-					
-			</div>
-			
-			<div class="wall-item-actions-tools">
-
-				{{ if $item.drop.dropping }}
-					<input type="checkbox" title="$item.drop.select" name="itemselected[]" class="item-select" value="$item.id" />
-					<a href="item/drop/$item.id" onclick="return confirmDelete();" class="icon drop" title="$item.drop.delete">$item.drop.delete</a>
-				{{ endif }}
-				{{ if $item.edpost }}
-					<a class="icon pencil" href="$item.edpost.0" title="$item.edpost.1"></a>
-				{{ endif }}
-			</div>
-			<div class="wall-item-location">$item.location&nbsp;</div>
-		</div>
-	</div>
-	<div class="wall-item-bottom">
-		<div class="wall-item-links"></div>
-		<div class="wall-item-like" id="wall-item-like-$item.id">$item.like</div>
-		<div class="wall-item-dislike" id="wall-item-dislike-$item.id">$item.dislike</div>	
-	</div>
-</div>
-
-<div class="wall-item-comment-wrapper" >
-	$item.comment
-</div>
diff --git a/view/theme/diabook/diabook-red/wallwall_item.tpl b/view/theme/diabook/diabook-red/wallwall_item.tpl
deleted file mode 100644
index bee75ad99..000000000
--- a/view/theme/diabook/diabook-red/wallwall_item.tpl
+++ /dev/null
@@ -1,106 +0,0 @@
-{{ if $item.indent }}{{ else }}
-<div class="wall-item-decor">
-	<img id="like-rotator-$item.id" class="like-rotator" src="images/rotator.gif" alt="$item.wait" title="$item.wait" style="display: none;" />
-</div>
-{{ endif }}
-<div class="wall-item-container $item.indent">
-	<div class="wall-item-item">
-		<div class="wall-item-info">
-			<div class="contact-photo-wrapper mframe wwto" id="wall-item-ownerphoto-wrapper-$item.id" >
-				<a href="$item.owner_url" target="redir" title="$item.olinktitle" class="contact-photo-link" id="wall-item-ownerphoto-link-$item.id">
-					<img src="$item.owner_photo" class="contact-photo $item.osparkle" id="wall-item-ownerphoto-$item.id" alt="$item.owner_name" />
-				</a>
-			</div>
-			<div class="contact-photo-wrapper mframe wwfrom"
-				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" target="redir" title="$item.linktitle" class="contact-photo-link" id="wall-item-photo-link-$item.id">
-					<img src="$item.thumb" class="contact-photo$item.sparkle" id="wall-item-photo-$item.id" alt="$item.name" />
-				</a>
-				<a href="#" rel="#wall-item-photo-menu-$item.id" class="contact-photo-menu-button icon s16 menu" id="wall-item-photo-menu-button-$item.id">menu</a>
-				<ul class="contact-menu menu-popup" id="wall-item-photo-menu-$item.id">
-				$item.item_photo_menu
-				</ul>
-				
-			</div>
-		</div>
-			<div class="wall-item-actions-author">
-				<a href="$item.profile_url" target="redir" title="$item.linktitle" class="wall-item-name-link"><span class="wall-item-name$item.sparkle">$item.name</span></a>
-				$item.to <a href="$item.owner_url" target="redir" 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 <span class="wall-item-ago">- &nbsp;
-			{{ if $item.plink }}<a class="link" title="$item.plink.title" href="$item.plink.href" style="color: #999">$item.ago</a>{{ else }} $item.ago {{ endif }}
-			{{ if $item.lock }} - <span class="fakelink" style="color: #999" onclick="lockview(event,$item.id);">$item.lock</span> {{ endif }}
-			</span>
-			</div>
-		<div class="wall-item-content">
-			{{ if $item.title }}<h2><a href="$item.plink.href">$item.title</a></h2>{{ endif }}
-			$item.body
-		</div>
-	</div>
-	<div class="wall-item-bottom">
-		<div class="wall-item-links">
-		</div>
-		<div class="wall-item-tags">
-			{{ for $item.tags as $tag }}
-				<span class='tag'>$tag</span>
-			{{ endfor }}
-		</div>
-	</div>
-	<div class="wall-item-bottom">
-		<div class="">
-
-		</div>
-		<div class="wall-item-actions">
-
-			<div class="wall-item-actions-social">
-			
-			
-			{{ if $item.vote }}
-				<a href="#" id="like-$item.id" class="icon like" title="$item.vote.like.0" onclick="dolike($item.id,'like'); return false">$item.vote.like.1</a>
-				<a href="#" id="dislike-$item.id" class="icon dislike" title="$item.vote.dislike.0" onclick="dolike($item.id,'dislike'); return false"></a>
-			{{ endif }}
-						
-			{{ if $item.vote.share }}
-				<a href="#" id="share-$item.id" class="icon recycle" title="$item.vote.share.0" onclick="jotShare($item.id); return false"></a>
-			{{ endif }}	
-
-
-			{{ if $item.star }}
-				<a href="#" id="starred-$item.id" onclick="dostar($item.id); return false;" class="star-item icon $item.isstarred" title="$item.star.toggle">
-				<img src="images/star_dummy.png" class="icon star" alt="$item.star.do" /> </a>
-				<a href="#" id="tagger-$item.id" onclick="itemTag($item.id); return false;" class="tag-item icon tagged" title="$item.star.tagger"></a>
-			{{ endif }}	
-			
-			{{ if $item.filer }}
-			<a href="#" id="filer-$item.id" onclick="itemFiler($item.id); return false;" class="filer-item icon file-as" title="$item.star.filer"></a>
-			{{ endif }}	
-			
-			{{ if $item.plink }}<a class="icon link" title="$item.plink.title" href="$item.plink.href">$item.plink.title</a>{{ endif }}
-			
-					
-					
-			</div>
-			
-			<div class="wall-item-actions-tools">
-
-				{{ if $item.drop.dropping }}
-					<input type="checkbox" title="$item.drop.select" name="itemselected[]" class="item-select" value="$item.id" />
-					<a href="item/drop/$item.id" onclick="return confirmDelete();" class="icon drop" title="$item.drop.delete">$item.drop.delete</a>
-				{{ endif }}
-				{{ if $item.edpost }}
-					<a class="icon pencil" href="$item.edpost.0" title="$item.edpost.1"></a>
-				{{ endif }}
-			</div>
-			<div class="wall-item-location">$item.location&nbsp;</div>
-		</div>
-	</div>
-	<div class="wall-item-bottom">
-		<div class="wall-item-links"></div>
-		<div class="wall-item-like" id="wall-item-like-$item.id">$item.like</div>
-		<div class="wall-item-dislike" id="wall-item-dislike-$item.id">$item.dislike</div>	
-	</div>
-</div>
-
-<div class="wall-item-comment-wrapper" >
-	$item.comment
-</div>
\ No newline at end of file
diff --git a/view/theme/diabook/footer.tpl b/view/theme/diabook/footer.tpl
new file mode 100644
index 000000000..8d3c65162
--- /dev/null
+++ b/view/theme/diabook/footer.tpl
@@ -0,0 +1,4 @@
+<div style="display: table-cell"></div>
+<div style="border-top: 1px solid #D2D2D2; width: 100%;margin-top: 30px;">
+<a style="float:right; color:#333;margin-right:10px;display: table;margin-top: 5px;" href="friendica" title="Site Info / Impressum" >Info / Impressum</a>
+</div>
\ No newline at end of file
diff --git a/view/theme/diabook/group_side.tpl b/view/theme/diabook/group_side.tpl
index 1c8ebcd9f..ce4b25fbf 100644
--- a/view/theme/diabook/group_side.tpl
+++ b/view/theme/diabook/group_side.tpl
@@ -7,8 +7,8 @@
 		<ul class="menu-profile-side">
 			{{ for $groups as $group }}
 			<li class="menu-profile-list">
-				<span class="menu-profile-icon {{ if $group.selected }}group_selected{{else}}group_unselected{{ endif }}"></span>
 				<a href="$group.href" class="menu-profile-list-item">
+					<span class="menu-profile-icon {{ if $group.selected }}group_selected{{else}}group_unselected{{ endif }}"></span>
 					$group.text
 				</a>
 				{{ if $group.edit }}
diff --git a/view/theme/diabook/icons/scroll_bottom.png b/view/theme/diabook/icons/scroll_bottom.png
new file mode 100644
index 000000000..eba301b34
--- /dev/null
+++ b/view/theme/diabook/icons/scroll_bottom.png
diff --git a/view/theme/diabook/nav.tpl b/view/theme/diabook/nav.tpl
index 29a89527c..ce27400f6 100644
--- a/view/theme/diabook/nav.tpl
+++ b/view/theme/diabook/nav.tpl
@@ -136,7 +136,7 @@
 </nav>
 
 
-<div style="position: fixed; bottom: 5px; right: 10px;"><a href="javascript:$('html, body').animate({scrollTop:0}, 'slow'); "><img src="view/theme/diabook/icons/scroll_top.png" title="scroll to top"></a></div>
+<div id="scrollup" style="position: fixed; bottom: 5px; right: 10px;"><a id="down" onclick="scrolldown()" ><img id="scroll_top_bottom" src="view/theme/diabook/icons/scroll_bottom.png" style="display:cursor !important;" alt="back to top" title="Back to top"></a></div>
 <div style="position: fixed; bottom: 3px; left: 25px;">$langselector</div>
 <div style="position: fixed; bottom: 23px; left: 5px;"><a href="http://pad.toktan.org/p/diabook" target="blank" ><img src="view/theme/diabook/icons/bluebug.png" title="report bugs for the theme diabook"/></a></div>
 
diff --git a/view/theme/diabook/nets.tpl b/view/theme/diabook/nets.tpl
index be25ddee1..351e2c3e2 100644
--- a/view/theme/diabook/nets.tpl
+++ b/view/theme/diabook/nets.tpl
@@ -8,8 +8,10 @@
 	<a style="text-decoration: none;" href="$base" class="menu-profile-list-item">$all</a></li>
 	{{ for $nets as $net }}
 	<li class="menu-profile-list">
-	<span class="menu-profile-icon {{ if $net.selected }}group_selected{{else}}group_unselected{{ endif }}"></span>	
-	<a href="$base?nets=$net.ref" class="menu-profile-list-item">$net.name</a></li>
+	<a href="$base?nets=$net.ref" class="menu-profile-list-item">
+	<span class="menu-profile-icon {{ if $net.selected }}group_selected{{else}}group_unselected{{ endif }}"></span>		
+	$net.name	
+	</a></li>
 	{{ endfor }}
 	</ul>
 </div>
diff --git a/view/theme/diabook/oembed_video.tpl b/view/theme/diabook/oembed_video.tpl
index d6d29f724..5e046d8c5 100644
--- a/view/theme/diabook/oembed_video.tpl
+++ b/view/theme/diabook/oembed_video.tpl
@@ -1,4 +1,4 @@
-<a class="embed_yt" href='$embedurl' onclick='this.innerHTML=Base64.decode("$escapedhtml"); yt_iframe(); return false;' style='float:left; margin: 1em; position: relative;'>
+<a class="embed_yt" href='$embedurl' onclick='this.innerHTML=Base64.decode("$escapedhtml"); yt_iframe();javascript:$(this).parent().css("height", "370px"); return false;' style='float:left; margin: 1em; position: relative;'>
 	<img width='$tw' height='$th' src='$turl' >
 	<div style='position: absolute; top: 0px; left: 0px; width: $twpx; height: $thpx; background: url(images/icons/48/play.png) no-repeat center center;'></div>
 </a>
diff --git a/view/theme/diabook/style-network-wide.css b/view/theme/diabook/style-network-wide.css
index a31007f0a..06e9718fc 100644
--- a/view/theme/diabook/style-network-wide.css
+++ b/view/theme/diabook/style-network-wide.css
@@ -122,7 +122,7 @@
 			  display: block; width: 28px; height: 28px; background-repeat: no-repeat;
 			  }	
 .video 	{ background-image: url("../../../view/theme/diabook/icons/video.png"); 
-			  display: block; width: 100%; height: 28px; background-repeat: no-repeat;
+			  display: block; width: 100%; height: 140px; background-repeat: no-repeat;
 			  }
 .audio2 	{ background-image: url("../../../view/theme/diabook/icons/audio.png"); 
 			  display: block; width: 28px; height: 28px; background-repeat: no-repeat;
@@ -1242,12 +1242,12 @@ right_aside #ra-photos-wrapper { padding-left: 5px; padding-top: 3px; overflow:
 #page-sidebar-right_aside .label {max-width: 128px;}
 right_aside .icon {width: 10px; height: 10px;}
 .close_box		{ 
-		background-image: url("../../../view/theme/diabook-blue/icons/close_box.png");
+		background-image: url("../../../view/theme/diabook/icons/close_box.png");
 		float: right;
 		opacity: 0.1;
 		}
 .close_box:hover	{ 
-		background-image: url("../../../view/theme/diabook-blue/icons/close_box.png");
+		background-image: url("../../../view/theme/diabook/icons/close_box.png");
 		float: right;
 		cursor: pointer;
 		opacity: 1;
@@ -1334,7 +1334,7 @@ transition: all 0.2s ease-in-out;
   max-width: 690px;
   word-wrap: break-word;
 
-  margin-bottom: 14px;
+
 }
 /*marker*/
 .wall-item-container .wall-item-content img {
@@ -1480,14 +1480,14 @@ transition: all 0.2s ease-in-out;
 }
 .tag {
   /*background: url("../../../images/tag_b.png") repeat-x center left;*/
-  color: #3465A4;
+  color: #999;
   padding-left: 3px;
   font-size: 12px;
 }
 .tag a {
   padding-right: 5px;
   /*background: url("../../../images/tag.png") no-repeat center right;*/
-  color: #3465A4;
+  color: #999;
 }
 .wwto {
   position: absolute !important;
diff --git a/view/theme/diabook/style-network.css b/view/theme/diabook/style-network.css
index 00c4d303a..a8ed1e9a2 100644
--- a/view/theme/diabook/style-network.css
+++ b/view/theme/diabook/style-network.css
@@ -122,7 +122,7 @@
 			  display: block; width: 28px; height: 28px; background-repeat: no-repeat;
 			  }	
 .video 	{ background-image: url("../../../view/theme/diabook/icons/video.png"); 
-			  display: block; width: 100%; height: 28px; background-repeat: no-repeat;
+			  display: block; width: 100%; height: 140px; background-repeat: no-repeat;
 			  }
 .audio2 	{ background-image: url("../../../view/theme/diabook/icons/audio.png"); 
 			  display: block; width: 28px; height: 28px; background-repeat: no-repeat;
@@ -1236,12 +1236,12 @@ right_aside #ra-photos-wrapper { padding-left: 5px; padding-top: 3px; overflow:
 #page-sidebar-right_aside .label {max-width: 128px;}
 right_aside .icon {width: 10px; height: 10px;}
 .close_box		{ 
-		background-image: url("../../../view/theme/diabook-blue/icons/close_box.png");
+		background-image: url("../../../view/theme/diabook/icons/close_box.png");
 		float: right;
 		opacity: 0.1;
 		}
 .close_box:hover	{ 
-		background-image: url("../../../view/theme/diabook-blue/icons/close_box.png");
+		background-image: url("../../../view/theme/diabook/icons/close_box.png");
 		float: right;
 		cursor: pointer;
 		opacity: 1;
@@ -1326,7 +1326,7 @@ transition: all 0.2s ease-in-out;
   max-width: 420px;
   word-wrap: break-word;
 
-  margin-bottom: 14px;
+
 }
 
 .wall-item-container .wall-item-content img {
@@ -1471,14 +1471,14 @@ transition: all 0.2s ease-in-out;
 }
 .tag {
   /*background: url("../../../images/tag_b.png") repeat-x center left;*/
-  color: #3465A4;
+  color: #999;
   padding-left: 3px;
   font-size: 12px;
 }
 .tag a {
   padding-right: 5px;
   /*background: url("../../../images/tag.png") no-repeat center right;*/
-  color: #3465A4;
+  color: #999;
 }
 .wwto {
   position: absolute !important;
diff --git a/view/theme/diabook/style-profile-wide.css b/view/theme/diabook/style-profile-wide.css
index 30b5e6422..c4c72fb68 100644
--- a/view/theme/diabook/style-profile-wide.css
+++ b/view/theme/diabook/style-profile-wide.css
@@ -121,7 +121,7 @@
 			  display: block; width: 28px; height: 28px; background-repeat: no-repeat;
 			  }	
 .video 	{ background-image: url("../../../view/theme/diabook/icons/video.png"); 
-			  display: block; width: 100%; height: 28px; background-repeat: no-repeat;
+			  display: block; width: 100%; height: 140px; background-repeat: no-repeat;
 			  }
 .audio2 	{ background-image: url("../../../view/theme/diabook/icons/audio.png"); 
 			  display: block; width: 28px; height: 28px; background-repeat: no-repeat;
@@ -1217,13 +1217,13 @@ right_aside #ra-photos-wrapper { padding-left: 5px; padding-top: 3px; overflow:
 #page-sidebar-right_aside .label {max-width: 128px;}
 right_aside .icon {width: 10px; height: 10px;}
 .close_box		{ 
-		background-image: url("../../../view/theme/diabook-blue/icons/close_box.png");
+		background-image: url("../../../view/theme/diabook/icons/close_box.png");
 		float: right;
 		cursor: pointer;
 		opacity: 0.1;
 		}
 .close_box:hover	{ 
-		background-image: url("../../../view/theme/diabook-blue/icons/close_box.png");
+		background-image: url("../../../view/theme/diabook/icons/close_box.png");
 		float: right;
 		cursor: pointer;
 		opacity: 1;
@@ -1309,7 +1309,7 @@ transition: all 0.2s ease-in-out;
   max-width: 690px;
   word-wrap: break-word;
 
-  margin-bottom: 14px;
+
 }
 /*marker*/
 .wall-item-container .wall-item-content img {
@@ -1455,14 +1455,14 @@ transition: all 0.2s ease-in-out;
 }
 .tag {
   /*background: url("../../../images/tag_b.png") repeat-x center left;*/
-  color: #3465A4;
+  color: #999;
   padding-left: 3px;
   font-size: 12px;
 }
 .tag a {
   padding-right: 5px;
   /*background: url("../../../images/tag.png") no-repeat center right;*/
-  color: #3465A4;
+  color: #999;
 }
 .wwto {
   position: absolute !important;
diff --git a/view/theme/diabook/style-profile.css b/view/theme/diabook/style-profile.css
index 9cd8386e3..a0a2adb53 100644
--- a/view/theme/diabook/style-profile.css
+++ b/view/theme/diabook/style-profile.css
@@ -121,7 +121,7 @@
 			  display: block; width: 28px; height: 28px; background-repeat: no-repeat;
 			  }	
 .video 	{ background-image: url("../../../view/theme/diabook/icons/video.png"); 
-			  display: block; width: 100%; height: 28px; background-repeat: no-repeat;
+			  display: block; width: 100%; height: 140px; background-repeat: no-repeat;
 			  }
 .audio2 	{ background-image: url("../../../view/theme/diabook/icons/audio.png"); 
 			  display: block; width: 28px; height: 28px; background-repeat: no-repeat;
@@ -1212,13 +1212,13 @@ right_aside #ra-photos-wrapper { padding-left: 5px; padding-top: 3px; overflow:
 #page-sidebar-right_aside .label {max-width: 128px;}
 right_aside .icon {width: 10px; height: 10px;}
 .close_box		{ 
-		background-image: url("../../../view/theme/diabook-blue/icons/close_box.png");
+		background-image: url("../../../view/theme/diabook/icons/close_box.png");
 		float: right;
 		cursor: pointer;
 		opacity: 0.1;
 		}
 .close_box:hover	{ 
-		background-image: url("../../../view/theme/diabook-blue/icons/close_box.png");
+		background-image: url("../../../view/theme/diabook/icons/close_box.png");
 		float: right;
 		cursor: pointer;
 		opacity: 1;
@@ -1302,7 +1302,7 @@ transition: all 0.2s ease-in-out;
   max-width: 420px;
   word-wrap: break-word;
 
-  margin-bottom: 14px;
+
 }
 
 .wall-item-container .wall-item-content img {
@@ -1447,14 +1447,14 @@ transition: all 0.2s ease-in-out;
 }
 .tag {
   /*background: url("../../../images/tag_b.png") repeat-x center left;*/
-  color: #3465A4;
+  color: #999;
   padding-left: 3px;
   font-size: 12px;
 }
 .tag a {
   padding-right: 5px;
   /*background: url("../../../images/tag.png") no-repeat center right;*/
-  color: #3465A4;
+  color: #999;
 }
 .wwto {
   position: absolute !important;
diff --git a/view/theme/diabook/style-wide.css b/view/theme/diabook/style-wide.css
index 19abf267d..f8dced3e6 100644
--- a/view/theme/diabook/style-wide.css
+++ b/view/theme/diabook/style-wide.css
@@ -150,7 +150,7 @@
 			  display: block; width: 28px; height: 28px; background-repeat: no-repeat;
 			  }	
 .video 	{ background-image: url("../../../view/theme/diabook/icons/video.png"); 
-			  display: block; width: 100%; height: 28px; background-repeat: no-repeat;
+			  display: block; width: 100%; height: 140px; background-repeat: no-repeat;
 			  }
 .audio2 	{ background-image: url("../../../view/theme/diabook/icons/audio.png"); 
 			  display: block; width: 28px; height: 28px; background-repeat: no-repeat;
@@ -1195,7 +1195,14 @@ aside #side-peoplefind-url {
   margin-right: 20px;	
 	}
 #login-submit-wrapper{
-  margin-bottom: 15px;
+  padding-top: 120px;
+  margin-bottom: 12px;
+	}
+aside #login-submit-button{
+  margin-left: 0px!important;	
+	}
+aside #login-extra-links{
+  padding-top: 0px!important;	
 	}
 /* widget */
 .widget {
@@ -1457,7 +1464,7 @@ body .pageheader{
   max-width: 690px;
   word-wrap: break-word;
 
-  margin-bottom: 14px;
+
 }
 /*marker*/
 .wall-item-photo-container .wall-item-content {
@@ -1690,14 +1697,14 @@ body .pageheader{
 }
 .tag {
   /*background: url("../../../images/tag_b.png") repeat-x center left;*/
-  color: #3465A4;
+  color: #999;
   padding-left: 3px;
   font-size: 12px;
 }
 .tag a {
   padding-right: 5px;
   /*background: url("../../../images/tag.png") no-repeat center right;*/
-  color: #3465A4;
+  color: #999;
 }
 .wwto {
   position: absolute !important;
diff --git a/view/theme/diabook/style.css b/view/theme/diabook/style.css
index edc87df98..9150ea8cf 100644
--- a/view/theme/diabook/style.css
+++ b/view/theme/diabook/style.css
@@ -150,7 +150,7 @@
 			  display: block; width: 28px; height: 28px; background-repeat: no-repeat;
 			  }	
 .video 	{ background-image: url("../../../view/theme/diabook/icons/video.png"); 
-			  display: block; width: 100%; height: 28px; background-repeat: no-repeat;
+			  display: block; width: 100%; height: 140px; background-repeat: no-repeat;
 			  }
 .audio2 	{ background-image: url("../../../view/theme/diabook/icons/audio.png"); 
 			  display: block; width: 28px; height: 28px; background-repeat: no-repeat;
@@ -1198,7 +1198,14 @@ aside #side-peoplefind-url {
   margin-right: 20px;	
 	}
 #login-submit-wrapper{
-  margin-bottom: 15px;
+  padding-top: 120px;
+  margin-bottom: 12px;
+	}
+aside #login-submit-button{
+  margin-left: 0px!important;	
+	}
+aside #login-extra-links{
+  padding-top: 0px!important;	
 	}
 /* widget */
 .widget {
@@ -1457,7 +1464,7 @@ body .pageheader{
   max-width: 720px;
   word-wrap: break-word;
 
-  margin-bottom: 14px;
+
 }
 .wall-item-photo-container .wall-item-content {
 
@@ -1688,14 +1695,14 @@ body .pageheader{
 }
 .tag {
   /*background: url("../../../images/tag_b.png") repeat-x center left;*/
-  color: #3465A4;
+  color: #999;
   padding-left: 3px;
   font-size: 12px;
 }
 .tag a {
   padding-right: 5px;
   /*background: url("../../../images/tag.png") no-repeat center right;*/
-  color: #3465A4;
+  color: #999;
 }
 .wwto {
   position: absolute !important;
diff --git a/view/theme/diabook/style.php b/view/theme/diabook/style.php
index 12ffa7159..d926579da 100644
--- a/view/theme/diabook/style.php
+++ b/view/theme/diabook/style.php
@@ -1556,9 +1556,9 @@
 	}
 	}
 	
-	if($resolution == "green") {	
+	if($resolution == "wide") {	
 	if (file_exists("$THEMEPATH/diabook-green/style-wide.css")){
-		echo file_get_contents("$THEMEPATH/diabook-pink/style-green.css");
+		echo file_get_contents("$THEMEPATH/diabook-green/style-wide.css");
 	}
 	if($diabook_font_size == "16"){
 		echo "
@@ -1834,9 +1834,9 @@
 	}
 	}
 	
-	if($resolution == "dark") {	
+	if($resolution == "wide") {	
 	if (file_exists("$THEMEPATH/diabook-dark/style-wide.css")){
-		echo file_get_contents("$THEMEPATH/diabook-dark/style-green.css");
+		echo file_get_contents("$THEMEPATH/diabook-dark/style-wide.css");
 	}
 	if($diabook_font_size == "16"){
 		echo "
diff --git a/view/theme/diabook/theme.php b/view/theme/diabook/theme.php
index e8518a1c6..c45db9884 100644
--- a/view/theme/diabook/theme.php
+++ b/view/theme/diabook/theme.php
@@ -3,23 +3,28 @@
 /*
  * Name: Diabook
  * Description: Diabook: report bugs and request here: http://pad.toktan.org/p/diabook or contact me : thomas_bierey@friendica.eu
- * Version: (Version: 1.021)
+ * Version: (Version: 1.022)
  * Author: 
  */
 
 
 //print diabook-version for debugging
-$diabook_version = "Diabook (Version: 1.021)";
+$diabook_version = "Diabook (Version: 1.022)";
 $a->page['htmlhead'] .= sprintf('<script "%s" ></script>', $diabook_version);
 
 //change css on network and profilepages
 $cssFile = null;
+
 $resolution=false;
 $resolution = get_pconfig(local_user(), "diabook", "resolution");
 if ($resolution===false) $resolution="normal";
+
 $color = false;
-$color = get_pconfig(local_user(), "diabook", "color");
+$site_color = get_config("diabook", "color" );
+if (local_user()) {$color = get_pconfig(local_user(), "diabook", "color");}
+if ($color===false) $color=$site_color;
 if ($color===false) $color="diabook";
+
 if ($color=="diabook") $color_path = "/";
 if ($color=="aerith") $color_path = "/diabook-aerith/";
 if ($color=="blue") $color_path = "/diabook-blue/";
@@ -291,7 +296,9 @@ if ($a->argv[0].$a->argv[1] === "profile".$a->user['nickname']){
 // custom css
 if (!is_null($cssFile)) $a->page['htmlhead'] .= sprintf('<link rel="stylesheet" type="text/css" href="%s" />', $cssFile);
 
-
+//footer
+$tpl = get_markup_template('footer.tpl');
+$a->page['footer'] .= replace_macros($tpl, array());
 
 //load jquery.cookie.js
 $cookieJS = $a->get_baseurl($ssl_state)."/view/theme/diabook/js/jquery.cookie.js";
@@ -354,19 +361,48 @@ $(document).ready(function() {
             $(this).attr("src",newString+"?"+wmode+"&"+oldString);
         }
         else $(this).attr("src",ifr_source+"?"+wmode);
+       
     });
       
-
 });
 
 function yt_iframe() {
-	
+
 	$("iframe").load(function() { 
 	var ifr_src = $(this).contents().find("body iframe").attr("src");
 	$("iframe").contents().find("body iframe").attr("src", ifr_src+"&wmode=transparent");
     });
 
 	};
+
+function scrolldown(){
+			$("html, body").animate({scrollTop:$(document).height()}, "slow");
+			return false;
+		};
+		
+function scrolltop(){
+			$("html, body").animate({scrollTop:0}, "slow");
+			return false;
+		};
+	 	
+$(window).scroll(function () { 
+		
+				
+		var scrollInfo = $(window).scrollTop();      
+		
+		if (scrollInfo <= "900"){
+      $("a#top").attr("id","down");
+      $("a#down").attr("onclick","scrolldown()");
+	 	$("img#scroll_top_bottom").attr("src","view/theme/diabook/icons/scroll_bottom.png");
+	 	} 
+	 	    
+      if (scrollInfo > "900"){
+      $("a#down").attr("id","top");
+      $("a#top").attr("onclick","scrolltop()");
+	 	$("img#scroll_top_bottom").attr("src","view/theme/diabook/icons/scroll_top.png");
+	 	}
+		
+    });
   
  </script>';
  
@@ -480,7 +516,7 @@ function close_lastlikes(){
 $a->page['htmlhead'] .= ' 
 
 <script>
-function insertFormatting(BBcode,id) {
+function insertFormatting(comment,BBcode,id) {
 	
 		var tmpStr = $("#comment-edit-text-" + id).val();
 		if(tmpStr == comment) {
diff --git a/view/theme/dispy-dark/bottom.tpl b/view/theme/dispy-dark/bottom.tpl
deleted file mode 100644
index 130bfb25a..000000000
--- a/view/theme/dispy-dark/bottom.tpl
+++ /dev/null
@@ -1,46 +0,0 @@
-<script type="text/javascript" src="$baseurl/view/theme/dispy/js/jquery.autogrow.textarea.js"></script>
-<script type="text/javascript">
-$(document).ready(function() {
-
-});
-function tautogrow(id) {
-	$("textarea#comment-edit-text-" + id).autogrow();
-};
-
-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);
-	}
-	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(id) {
-	$(".comment-edit-bb-" + id).show();
-}
-</script>
diff --git a/view/theme/dispy-dark/communityhome.tpl b/view/theme/dispy-dark/communityhome.tpl
deleted file mode 100644
index 4d09b9255..000000000
--- a/view/theme/dispy-dark/communityhome.tpl
+++ /dev/null
@@ -1,39 +0,0 @@
-{{ if $page }}
-<div>$page</div>
-{{ endif }}
-
-{{ if $lastusers_title }}
-<h3 id="extra-help-header">Help or '@NewHere'?</h3>
-<div id="extra-help">
-<a href="https://helpers.pyxis.uberspace.de/profile/helpers"
-	title="Friendica Support" target="_blank">Friendica Support</a><br />
-<a href="https://letstalk.pyxis.uberspace.de/profile/letstalk"
-	title="Let's talk" target="_blank">Let's talk</a><br />
-<a href="http://newzot.hydra.uberspace.de/profile/newzot"
-	title="Local Friendica" target="_blank">Local Friendica</a><br />
-<a href="http://kakste.com/profile/newhere" title="@NewHere" target="_blank">NewHere</a>
-</div>
-{{ endif }}
-
-{{ if $lastusers_title }}
-<h3 id="connect-services-header">Connectable Services</h3>
-<div id="connect-services">
-<a href="$url/facebook"><img alt="Facebook"
-	src="view/theme/dispy/icons/facebook.png" title="Facebook" /></a>
-<a href="$url/settings/connectors"><img
-	alt="StatusNet" src="view/theme/dispy/icons/StatusNet.png?" title="StatusNet" /></a>
-<a href="$url/settings/connectors"><img
-	alt="LiveJournal" src="view/theme/dispy/icons/livejournal.png?" title="LiveJournal" /></a>
-<a href="$url/settings/connectors"><img
-	alt="Posterous" src="view/theme/dispy/icons/posterous.png?" title="Posterous" /></a><br />
-<a href="$url/settings/connectors"><img
-	alt="Tumblr" src="view/theme/dispy/icons/tumblr.png?" title="Tumblr" /></a>
-<a href="$url/settings/connectors"><img
-	alt="Twitter" src="view/theme/dispy/icons/twitter.png?" title="Twitter" /></a>
-<a href="$url/settings/connectors"><img
-	alt="WordPress" src="view/theme/dispy/icons/wordpress.png?" title="WordPress" /></a>
-<a href="$url/settings/connectors"><img
-	alt="E-Mail" src="view/theme/dispy/icons/email.png?" title="E-Mail" /></a>
-</div>
-{{ endif }}
-
diff --git a/view/theme/dispy-dark/contact_template.tpl b/view/theme/dispy-dark/contact_template.tpl
deleted file mode 100644
index 04968bd07..000000000
--- a/view/theme/dispy-dark/contact_template.tpl
+++ /dev/null
@@ -1,30 +0,0 @@
-
-<div class="contact-entry-wrapper" id="contact-entry-wrapper-$contact.id" >
-	<div class="contact-entry-photo-wrapper">
-		<div class="contact-entry-photo mframe" id="contact-entry-photo-$contact.id"
-		onmouseover="if (typeof t$contact.id != 'undefined') clearTimeout(t$contact.id); openMenu('contact-photo-menu-button-$contact.id')" 
-		onmouseout="t$contact.id=setTimeout('closeMenu(\'contact-photo-menu-button-$contact.id\'); closeMenu(\'contact-photo-menu-$contact.id\');',200)">
-
-			<a href="$contact.url" title="$contact.img_hover" /><img src="$contact.thumb" $contact.sparkle alt="$contact.name" /></a>
-
-			{{ if $contact.photo_menu }}
-			<span onclick="openClose('contact-photo-menu-$contact.id');" class="fakelink contact-photo-menu-button" id="contact-photo-menu-button-$contact.id">menu</span>
-                <div class="contact-photo-menu" id="contact-photo-menu-$contact.id">
-                    <ul>
-                        $contact.photo_menu
-                    </ul>
-                </div>
-			{{ endif }}
-		</div>
-			
-	</div>
-	<div class="contact-entry-photo-end" ></div>
-		<div class="contact-entry-name" id="contact-entry-name-$contact.id" >$contact.name</div>
-{{ if $contact.alt_text }}<div class="contact-entry-details" id="contact-entry-rel-$contact.id" >$contact.alt_text</div>{{ endif }}
-	<div class="contact-entry-details" id="contact-entry-url-$contact.id" >
-		<a href="$contact.itemurl" title="$contact.itemurl">Profile URL</a></div>
-	<div class="contact-entry-details" id="contact-entry-network-$contact.id" >$contact.network</div>
-
-	<div class="contact-entry-end" ></div>
-</div>
-
diff --git a/view/theme/dispy-dark/conversation.tpl b/view/theme/dispy-dark/conversation.tpl
deleted file mode 100644
index 41b6aeadf..000000000
--- a/view/theme/dispy-dark/conversation.tpl
+++ /dev/null
@@ -1,23 +0,0 @@
-{{ for $threads as $thread }}
-<div id="tread-wrapper-$thread.id" class="tread-wrapper">
-	{{ for $thread.items as $item }}
-		{{if $item.comment_firstcollapsed}}
-			<div class="hide-comments-outer">
-			<span id="hide-comments-total-$thread.id" class="hide-comments-total">$thread.num_comments</span> <span id="hide-comments-$thread.id" class="hide-comments fakelink" onclick="showHideComments($thread.id);">$thread.hide_text</span>
-			</div>
-			<div id="collapsed-comments-$thread.id" class="collapsed-comments" style="display: none;">
-		{{endif}}
-		{{if $item.comment_lastcollapsed}}</div>{{endif}}
-		
-		{{ inc $item.template }}{{ endinc }}
-		
-		
-	{{ endfor }}
-</div>
-{{ endfor }}
-
-{{ if $dropping }}
-<div class="delete-checked">
-<a href="#" onclick="deleteCheckedItems();return false;"><span class="icon delete"></span><span class="s22 text">$dropping</span></a>
-</div>
-{{ endif }}
diff --git a/view/theme/dispy-dark/default.php b/view/theme/dispy-dark/default.php
deleted file mode 100644
index c3e6c9119..000000000
--- a/view/theme/dispy-dark/default.php
+++ /dev/null
@@ -1,44 +0,0 @@
-<!DOCTYPE html>
-<html>
-<head>
-  <title><?php if(x($page,'title')) echo $page['title']; ?></title>
-  <script>var baseurl="<?php echo $a->get_baseurl() ?>";</script>
-  <?php if(x($page,'htmlhead')) echo $page['htmlhead']; ?>
-</head>
-<body>
-	<header>
-		<?php if(x($page, 'header')) echo $page['header']; ?>
-	</header>
-	<article id="articlemain">
-		<header id="articleheader">
-			<?php if(x($page, 'articleheader')) echo $page['articleheader']; ?>
-		</header>
-		<?php if(x($page,'nav')) echo $page['nav']; ?>
-		<aside id="asideleft">
-			<?php if(x($page,'aside_left')) echo $page['aside_left']; ?>
-			<?php if(x($page,'aside_left_bottom')) echo $page['aside_left_bottom']; ?>
-		</aside>
-		<section id="sectionmain">
-			<?php if(x($page,'content')) echo $page['content']; ?>
-			<footer id="sectionfooter">
-			</footer>
-		</section>
-		<aside id="asidemain">
-			<?php if(x($page,'aside')) echo $page['aside']; ?>
-			<?php if(x($page,'aside_bottom')) echo $page['aside_bottom']; ?>
-		</aside>
-		<aside id="asideright">
-			<?php if(x($page,'aside_right')) echo $page['aside_right']; ?>
-			<?php if(x($page,'aside_right_bottom')) echo $page['aside_right_bottom']; ?>
-		</aside>
-		<footer id="articlefooter">
-			<?php if(x($page, 'articlefooter')) echo $page['articlefooter']; ?>
-		</footer>
-	</article>
-	<footer id="footer">
-		<?php if(x($page, 'footer')) echo $page['footer']; ?>
-	</footer>
-	<?php if (x($page, 'bottom')) echo $page['bottom']; ?>
-</body>
-</html>
-
diff --git a/view/theme/dispy-dark/group_side.tpl b/view/theme/dispy-dark/group_side.tpl
deleted file mode 100644
index 10ecec2e8..000000000
--- a/view/theme/dispy-dark/group_side.tpl
+++ /dev/null
@@ -1,30 +0,0 @@
-<div id="group-sidebar" class="widget">
-<h3 class="label">$title</h3>
-
-<div id="sidebar-group-list">
-	<ul id="sidebar-group-ul">
-		{{ for $groups as $group }}
-			<li class="sidebar-group-li">
-				<a href="$group.href" class="sidebar-group-element {{ if $group.selected }}group-selected{{ endif }}">$group.text</a>
-				{{ if $group.edit }}
-					<a 
-                        class="groupsideedit"
-                        href="$group.edit.href" title="$group.edit.title"><span class="icon small-pencil"></span></a>
-				{{ endif }}
-				{{ if $group.cid }}
-					<input type="checkbox" 
-						class="{{ if $group.selected }}ticked{{ else }}unticked {{ endif }} action" 
-						onclick="contactgroupChangeMember('$group.id','$group.cid');return true;"
-						{{ if $group.ismember }}checked="checked"{{ endif }}
-					/>
-				{{ endif }}
-			</li>
-		{{ endfor }}
-	</ul>
-	</div>
-  <div id="sidebar-new-group">
-  <a href="group/new" title="$createtext"><span class="action text add">$createtext</span></a>
-  </div>
-</div>
-
-
diff --git a/view/theme/dispy-dark/head.tpl b/view/theme/dispy-dark/head.tpl
deleted file mode 100644
index d42b19aef..000000000
--- a/view/theme/dispy-dark/head.tpl
+++ /dev/null
@@ -1,89 +0,0 @@
-<meta http-equiv="Content-Type" content="text/html;charset=utf-8" />
-<meta charset="UTF-8" />
-<base href="$baseurl/" />
-<meta name="generator" content="$generator" />
-<link rel="shortcut icon" href="$baseurl/images/friendica-32.png" />
-<link rel="search" href="$baseurl/opensearch"
-	type="application/opensearchdescription+xml" title="Search in Friendica" />
-<link rel="stylesheet" href="$baseurl/library/fancybox/jquery.fancybox-1.3.4.css" type="text/css" media="screen" />
-<link rel="stylesheet" href="$baseurl/library/tiptip/tipTip.css" type="text/css" media="screen" />
-<link rel="stylesheet" href="$baseurl/library/jgrowl/jquery.jgrowl.css" type="text/css" media="screen" />
-<link rel="stylesheet" type="text/css" href="$stylesheet" media="all" />
-<!--[if IE]>
-<script type="text/javascript" src="https://html5shiv.googlecode.com/svn/trunk/html5.js"></script>
-<![endif]-->
-<script type="text/javascript" src="$baseurl/js/jquery.js"></script>
-<script type="text/javascript" src="$baseurl/js/acl.js"></script>
-<script type="text/javascript" src="$baseurl/js/main.js"></script>
-<script type="text/javascript" src="$baseurl/js/jquery.textinputs.js"></script>
-<script type="text/javascript" src="$baseurl/js/fk.autocomplete.js"></script>
-<script type="text/javascript" src="$baseurl/library/fancybox/jquery.fancybox-1.3.4.pack.js"></script>
-<script type="text/javascript" src="$baseurl/library/tiptip/jquery.tipTip.minified.js"></script>
-<script type="text/javascript" src="$baseurl/library/jgrowl/jquery.jgrowl_minimized.js"></script>
-<script type="text/javascript" src="$baseurl/library/tinymce/jscripts/tiny_mce/tiny_mce_src.js"></script>
-<script type="text/javascript" src="$baseurl/js/webtoolkit.base64.js"></script>
-<!-- in dispy-dark -->
-<script>
-	var updateInterval = $update_interval;
-
-	function confirmDelete() { return confirm("$delitem"); }
-	function commentOpen(obj,id) {
-		if(obj.value == '$comment') {
-			obj.value = '';
-			$("#comment-edit-text-" + id).addClass("comment-edit-text-full");
-			$("#comment-edit-text-" + id).removeClass("comment-edit-text-empty");
-			openMenu("comment-edit-submit-wrapper-" + id);
-		}
-	}
-	function commentClose(obj,id) {
-		if(obj.value == '') {
-			obj.value = '$comment';
-			$("#comment-edit-text-" + id).removeClass("comment-edit-text-full");
-			$("#comment-edit-text-" + id).addClass("comment-edit-text-empty");
-			closeMenu("comment-edit-submit-wrapper-" + id);
-		}
-	}
-
-	function commentInsert(obj,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);
-		}
-		var ins = $(obj).html();
-		ins = ins.replace('&lt;','<');
-		ins = ins.replace('&gt;','>');
-		ins = ins.replace('&amp;','&');
-		ins = ins.replace('&quot;','"');
-		$("#comment-edit-text-" + id).val(tmpStr + ins);
-	}
-
-	function qCommentInsert(obj,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);
-		}
-		var ins = $(obj).val();
-		ins = ins.replace('&lt;','<');
-		ins = ins.replace('&gt;','>');
-		ins = ins.replace('&amp;','&');
-		ins = ins.replace('&quot;','"');
-		$("#comment-edit-text-" + id).val(tmpStr + ins);
-	}
-
-	function showHideComments(id) {
-		if( $('#collapsed-comments-' + id).is(':visible')) {
-			$('#collapsed-comments-' + id).hide();
-			$('#hide-comments-' + id).html('$showmore');
-		}
-		else {
-			$('#collapsed-comments-' + id).show();
-			$('#hide-comments-' + id).html('$showfewer');
-		}
-	}
-</script>
diff --git a/view/theme/dispy-dark/header.tpl b/view/theme/dispy-dark/header.tpl
deleted file mode 100644
index e69de29bb..000000000
--- a/view/theme/dispy-dark/header.tpl
+++ /dev/null
diff --git a/view/theme/dispy-dark/jot-header.tpl b/view/theme/dispy-dark/jot-header.tpl
deleted file mode 100644
index ab15f9516..000000000
--- a/view/theme/dispy-dark/jot-header.tpl
+++ /dev/null
@@ -1,349 +0,0 @@
-<script type="text/javascript">
-var editor = false;
-var textlen = 0;
-var plaintext = '$editselect';
-
-function initEditor(cb) {
-	if (editor==false) {
-		$("#profile-jot-text-loading").show();
-		if(plaintext == 'none') {
-			$("#profile-jot-text-loading").hide();
-			$("#profile-jot-text").css({ 'height': 200, 'color': '#000' });
-			$("#profile-jot-text").contact_autocomplete(baseurl+"/acl");
-			editor = true;
-			$("a#jot-perms-icon").fancybox({
-				'transitionIn' : 'elastic',
-				'transitionOut' : 'elastic'
-			});
-			$(".jothidden").show();
-			if (typeof cb!="undefined") cb();
-			return;
-		}
-		tinyMCE.init({
-			theme : "advanced",
-			mode : "specific_textareas",
-			editor_selector: $editselect,
-			auto_focus: "profile-jot-text",
-			plugins : "bbcode,paste,fullscreen,autoresize,inlinepopups",
-			theme_advanced_buttons1 : "bold,italic,underline,undo,redo,link,unlink,image,forecolor,formatselect,code,fullscreen",
-			theme_advanced_buttons2 : "",
-			theme_advanced_buttons3 : "",
-			theme_advanced_toolbar_location : "top",
-			theme_advanced_toolbar_align : "center",
-			theme_advanced_blockformats : "blockquote,code",
-			gecko_spellcheck : true,
-			paste_text_sticky : true,
-			entity_encoding : "raw",
-			add_unload_trigger : false,
-			remove_linebreaks : false,
-			force_p_newlines : false,
-			force_br_newlines : true,
-			forced_root_block : '',
-			convert_urls: false,
-			content_css: "$baseurl/view/custom_tinymce.css",
-			theme_advanced_path : false,
-			file_browser_callback : "fcFileBrowser",
-			setup : function(ed) {
-				cPopup = null;
-				ed.onKeyDown.add(function(ed,e) {
-					if(cPopup !== null)
-						cPopup.onkey(e);
-				});
-
-				ed.onKeyUp.add(function(ed, e) {
-					var txt = tinyMCE.activeEditor.getContent();
-					match = txt.match(/@([^ \n]+)$/);
-					if(match!==null) {
-						if(cPopup === null) {
-							cPopup = new ACPopup(this,baseurl+"/acl");
-						}
-						if(cPopup.ready && match[1]!==cPopup.searchText) cPopup.search(match[1]);
-						if(! cPopup.ready) cPopup = null;
-					}
-					else {
-						if(cPopup !== null) { cPopup.close(); cPopup = null; }
-					}
-
-					textlen = txt.length;
-					if(textlen != 0 && $('#jot-perms-icon').is('.unlock')) {
-						$('#profile-jot-desc').html(ispublic);
-					}
-					else {
-						$('#profile-jot-desc').html('&#160;');
-					}	 
-
-				 //Character count
-
-					if(textlen <= 140) {
-						$('#character-counter').removeClass('red');
-						$('#character-counter').removeClass('orange');
-						$('#character-counter').addClass('grey');
-					}
-					if((textlen > 140) && (textlen <= 420)) {
-						$('#character-counter').removeClass('grey');
-						$('#character-counter').removeClass('red');
-						$('#character-counter').addClass('orange');
-					}
-					if(textlen > 420) {
-						$('#character-counter').removeClass('grey');
-						$('#character-counter').removeClass('orange');
-						$('#character-counter').addClass('red');
-					}
-					$('#character-counter').text(textlen);
-				});
-
-				ed.onInit.add(function(ed) {
-					ed.pasteAsPlainText = true;
-					$("#profile-jot-text-loading").hide();
-					$(".jothidden").show();
-					if (typeof cb!="undefined") cb();
-				});
-
-			}
-		});
-		editor = true;
-		// setup acl popup
-		$("a#jot-perms-icon").fancybox({
-			'transitionIn' : 'elastic',
-			'transitionOut' : 'elastic'
-		}); 
-	} else {
-		if (typeof cb!="undefined") cb();
-	}
-}
-
-function enableOnUser(){
-	if (editor) return;
-	$(this).val("");
-	initEditor();
-}
-
-</script>
-<script type="text/javascript" src="$baseurl/js/ajaxupload.js"></script>
-<script type="text/javascript">
-	var ispublic = '$ispublic';
-	var addtitle = '$addtitle';
-
-	$(document).ready(function() {
-		
-		/* enable tinymce on focus and click */
-		$("#profile-jot-text").focus(enableOnUser);
-		$("#profile-jot-text").click(enableOnUser);
-		/* enable character counter */
-		$("#profile-jot-text").focus(charCounter);
-		$("#profile-jot-text").click(charCounter);
-
-		var uploader = new window.AjaxUpload(
-			'wall-image-upload',
-			{ action: 'wall_upload/$nickname',
-				name: 'userfile',
-				onSubmit: function(file,ext) { $('#profile-rotator').show(); },
-				onComplete: function(file,response) {
-					addeditortext(response);
-					$('#profile-rotator').hide();
-				}				 
-			}
-		);
-		var file_uploader = new window.AjaxUpload(
-			'wall-file-upload',
-			{ action: 'wall_attach/$nickname',
-				name: 'userfile',
-				onSubmit: function(file,ext) { $('#profile-rotator').show(); },
-				onComplete: function(file,response) {
-					addeditortext(response);
-					$('#profile-rotator').hide();
-				}				 
-			}
-		);
-
-
-	});
-
-	function deleteCheckedItems() {
-		var checkedstr = '';
-
-		$('.item-select').each( function() {
-			if($(this).is(':checked')) {
-				if(checkedstr.length != 0) {
-					checkedstr = checkedstr + ',' + $(this).val();
-				}
-				else {
-					checkedstr = $(this).val();
-				}
-			}	
-		});
-		$.post('item', { dropitems: checkedstr }, function(data) {
-			window.location.reload();
-		});
-	}
-
-	function jotGetLink() {
-		reply = prompt("$linkurl");
-		if(reply && reply.length) {
-			reply = bin2hex(reply);
-			$('#profile-rotator').show();
-			$.get('parse_url?binurl=' + reply, function(data) {
-				addeditortext(data);
-				$('#profile-rotator').hide();
-			});
-		}
-	}
-
-	function jotVideoURL() {
-		reply = prompt("$vidurl");
-		if(reply && reply.length) {
-			addeditortext('[video]' + reply + '[/video]');
-		}
-	}
-
-	function jotAudioURL() {
-		reply = prompt("$audurl");
-		if(reply && reply.length) {
-			addeditortext('[audio]' + reply + '[/audio]');
-		}
-	}
-
-
-	function jotGetLocation() {
-		reply = prompt("$whereareu", $('#jot-location').val());
-		if(reply && reply.length) {
-			$('#jot-location').val(reply);
-		}
-	}
-
-	function jotShare(id) {
-		if ($('#jot-popup').length != 0) $('#jot-popup').show();
-
-		$('#like-rotator-' + id).show();
-		$.get('share/' + id, function(data) {
-			if (!editor) $("#profile-jot-text").val("");
-			initEditor(function(){
-				addeditortext(data);
-				$('#like-rotator-' + id).hide();
-				$(window).scrollTop(0);
-			});
-
-		});
-	}
-
-	function linkdropper(event) {
-		var linkFound = event.dataTransfer.types.contains("text/uri-list");
-		if(linkFound)
-			event.preventDefault();
-	}
-
-	function linkdrop(event) {
-		var reply = event.dataTransfer.getData("text/uri-list");
-		event.target.textContent = reply;
-		event.preventDefault();
-		if(reply && reply.length) {
-			reply = bin2hex(reply);
-			$('#profile-rotator').show();
-			$.get('parse_url?binurl=' + reply, function(data) {
-				if (!editor) $("#profile-jot-text").val("");
-				initEditor(function(){
-					addeditortext(data);
-					$('#profile-rotator').hide();
-				});
-			});
-		}
-	}
-
-	function itemTag(id) {
-		reply = prompt("$term");
-		if(reply && reply.length) {
-			reply = reply.replace('#','');
-			if(reply.length) {
-
-				commentBusy = true;
-				$('body').css('cursor', 'wait');
-
-				$.get('tagger/' + id + '?term=' + reply);
-				if(timer) clearTimeout(timer);
-				timer = setTimeout(NavUpdate,3000);
-				liking = 1;
-			}
-		}
-	}
-
-	function itemFiler(id) {
-		
-		var bordercolor = $("input").css("border-color");
-		
-		$.get('filer/', function(data){
-			$.fancybox(data);
-			$("#id_term").keypress(function(){
-				$(this).css("border-color",bordercolor);
-			})
-			$("#select_term").change(function(){
-				$("#id_term").css("border-color",bordercolor);
-			})
-			
-			$("#filer_save").click(function(e){
-				e.preventDefault();
-				reply = $("#id_term").val();
-				if(reply && reply.length) {
-					commentBusy = true;
-					$('body').css('cursor', 'wait');
-					$.get('filer/' + id + '?term=' + reply);
-					if(timer) clearTimeout(timer);
-					timer = setTimeout(NavUpdate,3000);
-					liking = 1;
-					$.fancybox.close();
-				} else {
-					$("#id_term").css("border-color","#FF0000");
-				}
-				return false;
-			});
-		});
-		
-	}
-
-	function jotClearLocation() {
-		$('#jot-coord').val('');
-		$('#profile-nolocation-wrapper').hide();
-	}
-
-	function addeditortext(data) {
-		if(plaintext == 'none') {
-			var currentText = $("#profile-jot-text").val();
-			$("#profile-jot-text").val(currentText + data);
-		}
-		else
-			tinyMCE.execCommand('mceInsertRawHTML',false,data);
-	}	
-
-	$geotag
-
-	function charCounter() {
-		// character count part deux
-		//$(this).val().length is not a function Line 282(3)
-		$('#profile-jot-text').keyup(function() {
-			var textlen = 0;
-			var maxLen1 = 140;
-			var maxLen2 = 420;
-
-			$('#character-counter').removeClass('jothidden');
-
-			textLen = $(this).val().length;
-			if(textLen <= maxLen1) {
-				$('#character-counter').removeClass('red');
-				$('#character-counter').removeClass('orange');
-				$('#character-counter').addClass('grey');
-			}
-			if((textLen > maxLen1) && (textlen <= maxLen2)) {
-				$('#character-counter').removeClass('grey');
-				$('#character-counter').removeClass('red');
-				$('#character-counter').addClass('orange');
-			}
-			if(textLen > maxLen2) {
-				$('#character-counter').removeClass('grey');
-				$('#character-counter').removeClass('orange');
-				$('#character-counter').addClass('red');
-			}
-			$('#character-counter').text( textLen );
-		});
-		$('#profile-jot-text').keyup();
-	}
-
-</script>
diff --git a/view/theme/dispy-dark/jot.tpl b/view/theme/dispy-dark/jot.tpl
deleted file mode 100644
index 688ac1451..000000000
--- a/view/theme/dispy-dark/jot.tpl
+++ /dev/null
@@ -1,72 +0,0 @@
-<form id="profile-jot-form" action="$action" method="post">
-	<div id="jot">
-		<div id="profile-jot-desc" class="jothidden">&#160;</div>
-		<input name="title" id="jot-title" type="text" placeholder="$placeholdertitle" value="$title" class="jothidden" style="display:none" />
-		<div id="character-counter" class="grey jothidden"></div>
-
-		<input type="hidden" name="type" value="$ptyp" />
-		<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="coord" id="jot-coord" value="" />
-		<input type="hidden" name="post_id" value="$post_id" />
-		<input type="hidden" name="preview" id="jot-preview" value="0" />
-		<div id="jot-category-wrap"><input name="category" id="jot-category" type="text" placeholder="$placeholdercategory" value="$category" class="jothidden" style="display:none" /></div>
-		<textarea rows="5" cols="64" class="profile-jot-text" id="profile-jot-text" name="body">{{ if $content }}$content{{ else }}$share{{ endif }}
-		</textarea>
-
-
-<div id="jot-tools" class="jothidden" style="display:none">
-	<div id="profile-jot-submit-wrapper" class="jothidden">
-
-		<div id="profile-upload-wrapper" style="display: $visitor;">
-			<div id="wall-image-upload-div"><a class="icon border camera" href="#" onclick="return false;" id="wall-image-upload" title="$upload"></a></div>
-		</div>
-		<div id="profile-attach-wrapper" style="display: $visitor;">
-			<div id="wall-file-upload-div"><a class="icon border attach" href="#" onclick="return false;" id="wall-file-upload" title="$attach"></a></div>
-		</div>
-		<div id="profile-link-wrapper" style="display: $visitor;" ondragenter="linkdropper(event);" ondragover="linkdropper(event);" ondrop="linkdrop(event);">
-			<a class="icon border link" id="profile-link" ondragenter="return linkdropper(event);" ondragover="return linkdropper(event);" ondrop="linkdrop(event);" onclick="jotGetLink(); return false;" title="$weblink"></a>
-		</div>
-		<div id="profile-video-wrapper" style="display: $visitor;">
-			<a class="icon border video" id="profile-video" onclick="jotVideoURL();return false;" title="$video"></a>
-		</div>
-		<div id="profile-audio-wrapper" style="display: $visitor;">
-			<a class="icon border audio" id="profile-audio" onclick="jotAudioURL();return false;" title="$audio"></a>
-		</div>
-		<div id="profile-location-wrapper" style="display: $visitor;">
-			<a class="icon border globe" id="profile-location" onclick="jotGetLocation();return false;" title="$setloc"></a>
-		</div>
-		<div id="profile-nolocation-wrapper" style="display: none;">
-			<a class="icon border noglobe" id="profile-nolocation" onclick="jotClearLocation();return false;" title="$noloc"></a>
-		</div>
-
-		<div id="profile-jot-plugin-wrapper">
-		$jotplugins
-		</div>
-
-	<a class="icon-text-preview pointer"></a><a id="jot-preview-link" class="pointer" onclick="preview_post(); return false;" title="$preview">$preview</a>
-	<input type="submit" id="profile-jot-submit" name="submit" value="$share" />
-	<div id="profile-jot-perms" class="profile-jot-perms">
-		<a id="jot-perms-icon" href="#profile-jot-acl-wrapper" class="icon $lockstate $bang" title="$permset"></a>
-	</div>
-	<span id="profile-rotator" class="loading" style="display: none"><img src="images/rotator.gif" alt="$wait" title="$wait" /></span>
-	</div>
-
-	</div> <!-- /#profile-jot-submit-wrapper -->
-</div> <!-- /#jot-tools -->
-	
-	<div id="jot-preview-content" style="display:none;"></div>
-	<div style="display: none;">
-		<div id="profile-jot-acl-wrapper" style="width:auto;height:auto;overflow:auto;">
-			$acl
-			<hr style="clear:both" />
-			<div id="profile-jot-email-label">$emailcc</div>
-			<input type="text" name="emailcc" id="profile-jot-email" title="$emtitle" />
-			<div id="profile-jot-email-end"></div>
-			$jotnets
-		</div>
-	</div>
-
-</form>
-{{ if $content }}<script>initEditor();</script>{{ endif }}
diff --git a/view/theme/dispy-dark/lang_selector.tpl b/view/theme/dispy-dark/lang_selector.tpl
deleted file mode 100644
index e777a0a86..000000000
--- a/view/theme/dispy-dark/lang_selector.tpl
+++ /dev/null
@@ -1,10 +0,0 @@
-<div id="lang-select-icon" class="icon s22 language" title="$title" onclick="openClose('language-selector');" ></div>
-<div id="language-selector" style="display: none;" >
-	<form action="#" method="post" >
-		<select name="system_language" onchange="this.form.submit();" >
-			{{ for $langs.0 as $v=>$l }}
-				<option value="$v" {{if $v==$langs.1}}selected="selected"{{endif}}>$l</option>
-			{{ endfor }}
-		</select>
-	</form>
-</div>
diff --git a/view/theme/dispy-dark/mail_head.tpl b/view/theme/dispy-dark/mail_head.tpl
deleted file mode 100644
index d49d7c1af..000000000
--- a/view/theme/dispy-dark/mail_head.tpl
+++ /dev/null
@@ -1,5 +0,0 @@
-<h3>$messages</h3>
-
-<div class="tabs-wrapper">
-$tab_content
-</div>
diff --git a/view/theme/dispy-dark/nav.tpl b/view/theme/dispy-dark/nav.tpl
deleted file mode 100644
index 6ffd2b379..000000000
--- a/view/theme/dispy-dark/nav.tpl
+++ /dev/null
@@ -1,138 +0,0 @@
-<nav id="pagenav">
-
-<span id="banner">$banner</span>
-
-<a name="top" id="top"></a>
-<div id="nav-floater">
-    <ul id="nav-buttons">
-    {{ if $nav.login }}
-    <li><a id="nav-login-link" class="nav-login-link $nav.login.2"
-			href="$nav.login.0" title="$nav.login.3" >$nav.login.1</a></li>
-    {{ endif }}
-    {{ if $nav.home }}
-    <li><a id="nav-home-link" class="nav-link $nav.home.2"
-			href="$nav.home.0" title="$nav.home.1">$nav.home.1</a></li>
-    {{ endif }}
-    {{ if $nav.network }}
-    <li><a id="nav-network-link" class="nav-link $nav.network.2"
-			href="$nav.network.0" title="$nav.network.1">$nav.network.1</a></li>
-    {{ endif }}
-    {{ if $nav.notifications }}
-    <li><a id="nav-notifications-linkmenu" class="nav-link $nav.notifications.2"
-			href="$nav.notifications.0"
-			rel="#nav-notifications-menu" title="$nav.notifications.1">$nav.notifications.1</a></li>
-		<ul id="nav-notifications-menu" class="menu-popup">
-			<li id="nav-notifications-see-all"><a href="$nav.notifications.all.0">$nav.notifications.all.1</a></li>
-			<li id="nav-notifications-mark-all"><a href="#" onclick="notifyMarkAll(); return false;">$nav.notifications.mark.1</a></li>
-			<li class="empty">$emptynotifications</li>
-		</ul>
-    {{ endif }}
-    {{ if $nav.messages }}
-    <li><a id="nav-messages-link" class="nav-link $nav.messages.2"
-			href="$nav.messages.0" title="$nav.messages.1">$nav.messages.1</a></li>
-    {{ endif }}
-    {{ if $nav.community }}
-    <li><a id="nav-community-link" class="nav-link $nav.community.2"
-			href="$nav.community.0" title="$nav.community.1">$nav.community.1</a></li>
-    {{ endif }}
-    <li><a id="nav-directory-link" class="nav-link $nav.directory.2"
-			href="$nav.directory.0" title="$nav.directory.1">$nav.directory.1</a></li>
-    <li><a id="nav-search-link" class="nav-link $nav.search.2"
-			href="$nav.search.0" title="$nav.search.1">$nav.search.1</a></li>
-    {{ if $nav.apps }}
-    <li><a id="nav-apps-link" class="nav-link $nav.apps.2"
-		href="$nav.apps.0" title="$nav.apps.1">$nav.apps.1</a></li>
-    {{ endif }}
-    {{ if $nav.help }}
-    <li><a id="nav-help-link" class="nav-link $nav.help.2"
-			href="$nav.help.0" title="$nav.help.1">$nav.help.1</a></li>
-    {{ endif }}
-	</ul>
-
-	<div id="user-menu">
-        <a id="user-menu-label" onclick="openClose('user-menu-popup'); return false" href="$nav.home.0">$sitelocation</a>
-        <ul id="user-menu-popup"
-            onmouseover="if (typeof tmenu != 'undefined') clearTimeout(tmenu); openMenu('user-menu-popup')"
-            onmouseout="tmenu=setTimeout('closeMenu(\'user-menu-popup\');',200)">
-
-        {{ if $nav.register }}
-        <li>
-        <a id="nav-register-link" class="nav-commlink $nav.register.2" href="$nav.register.0" title="$nav.register.1"></a>
-        </li>
-        {{ endif }}
-        {{ if $nav.contacts }}
-        <li><a id="nav-contacts-link" class="nav-commlink $nav.contacts.2" href="$nav.contacts.0" title="$nav.contacts.1">$nav.contacts.1</a></li>
-        {{ endif }}
-		{{ if $nav.introductions }}
-	    <li><a id="nav-intro-link" class="nav-commlink $nav.introductions.2 $sel.introductions" href="$nav.introductions.0" title="$nav.introductions.3" >$nav.introductions.1</a></li>
-		{{ endif }}
-        {{ if $nav.profiles }}
-        <li><a id="nav-profiles-link" class="nav-commlink $nav.profiles.2" href="$nav.profiles.0" title="$nav.profiles.1">$nav.profiles.1</a></li>
-        {{ endif }}
-        {{ if $nav.settings }}
-        <li><a id="nav-settings-link" class="nav-commlink $nav.settings.2" href="$nav.settings.0" title="$nav.settings.1">$nav.settings.1</a></li>
-        {{ endif }}
-        {{ if $nav.manage }}
-        <li><a id="nav-manage-link" class="nav-commlink $nav.manage.2" href="$nav.manage.0" title="$nav.manage.1">$nav.manage.1</a></li>
-        {{ endif }}
-        {{ if $nav.admin }}
-        <li><a id="nav-admin-link" class="nav-commlink $nav.admin.2" href="$nav.admin.0" title="$nav.admin.1">$nav.admin.1</a></li>
-        {{ endif }}
-        {{ if $nav.login }}
-        <li><a id="nav-login-link" class="nav-commlink $nav.login.2" href="$nav.login.0" title="$nav.login.1">$nav.login.1</a></li>
-        {{ endif }}
-        {{ if $nav.logout }}
-        <li><a id="nav-logout-link" class="nav-commlink $nav.logout.2" href="$nav.logout.0" title="$nav.logout.3" >$nav.logout.1</a></li>
-        {{ endif }}
-        </ul>
-    </div>
-
-{{ if $userinfo }}
-        <ul id="nav-user-menu" class="menu-popup">
-            {{ for $nav.usermenu as $usermenu }}
-                <li><a class="$usermenu.2" href="$usermenu.0" title="$usermenu.3">$usermenu.1</a></li>
-            {{ endfor }}
-        </ul>
-{{ endif }}
-
-    <div id="notifications">
-        {{ if $nav.home }}
-        <a id="home-update" class="nav-ajax-left" href="$nav.home.0" title="$nav.home.1"></a>
-        {{ endif }}
-        {{ if $nav.network }}
-        <a id="net-update" class="nav-ajax-left" href="$nav.network.0" title="$nav.network.1"></a>
-        {{ endif }}
-        {{ if $nav.notifications }}
-        <a id="notify-update" class="nav-ajax-left" href="$nav.notifications.0" title="$nav.notifications.1"></a>
-        {{ endif }}
-        {{ if $nav.messages }}
-        <a id="mail-update" class="nav-ajax-left" href="$nav.messages.0" title="$nav.messages.1"></a>
-        {{ endif }}
-		{{if $nav.introductions }}
-		<a id="intro-update" class="nav-ajax-left" href="$nav.introductions.0"></a>
-		{{ endif }}
-    </div>
-</div>
-    <a href="#" class="floaterflip"></a>
-</nav>
-
-<div id="lang-sel-wrap">
-$langselector
-</div>
-
-<div id="scrollup">
-<a href="#top"><img
-	src="view/theme/dispy/icons/scroll_top.png"
-	alt="back to top" title="Back to top" /></a>
-</div>
-
-<div class="search-box">
-	<form method="get" action="$nav.search.0">
-		<input id="search-text" class="nav-menu-search" type="search" placeholder="Search" value="" id="search" name="search" />
-	</form>
-</div>
-
-<ul id="nav-notifications-template" style="display:none;" rel="template">
-	<li class="{4}"><a href="{0}"><img src="{1}" height="24" width="24" alt="" />{2} <span class="notif-when">{3}</span></a></li>
-</ul>
-
diff --git a/view/theme/dispy-dark/nets.tpl b/view/theme/dispy-dark/nets.tpl
deleted file mode 100644
index b0cb8890c..000000000
--- a/view/theme/dispy-dark/nets.tpl
+++ /dev/null
@@ -1,10 +0,0 @@
-<div id="nets-sidebar" class="widget">
-	<h3>$title</h3>
-	<div id="nets-desc">$desc</div>
-	<a href="$base" class="nets-link{{ if $sel_all }} nets-selected{{ endif }} nets-all">$all</a>
-	<ul class="nets-ul">
-	{{ for $nets as $net }}
-	<li><a href="$base?nets=$net.ref" class="nets-link{{ if $net.selected }} nets-selected{{ endif }}">$net.name</a></li>
-	{{ endfor }}
-	</ul>
-</div>
diff --git a/view/theme/dispy-dark/photo_view.tpl b/view/theme/dispy-dark/photo_view.tpl
deleted file mode 100644
index 732caf690..000000000
--- a/view/theme/dispy-dark/photo_view.tpl
+++ /dev/null
@@ -1,37 +0,0 @@
-<div id="live-display"></div>
-<h3><a href="$album.0">$album.1</a></h3>
-
-<div id="photo-edit-link-wrap">
-{{ if $tools }}
-<a id="photo-edit-link" href="$tools.edit.0">$tools.edit.1</a>
-|
-<a id="photo-toprofile-link" href="$tools.profile.0">$tools.profile.1</a>
-{{ endif }}
-{{ if $lock }} | <img src="images/lock_icon.gif" class="lockview" alt="$lock" onclick="lockview(event,'photo/$id');" /> {{ endif }}
-</div>
-
-{{ if $prevlink }}<div id="photo-prev-link"><a href="$prevlink.0">$prevlink.1</a></div>{{ endif }}
-<div id="photo-photo"><a href="$photo.href" title="$photo.title"><img src="$photo.src" /></a></div>
-{{ if $nextlink }}<div id="photo-next-link"><a href="$nextlink.0">$nextlink.1</a></div>{{ endif }}
-<div id="photo-photo-end"></div>
-<div id="photo-caption">$desc</div>
-{{ if $tags }}
-<div id="in-this-photo-text">$tags.0</div>
-<div id="in-this-photo">$tags.1</div>
-{{ endif }}
-{{ if $tags.2 }}<div id="tag-remove"><a href="$tags.2">$tags.3</a></div>{{ endif }}
-
-{{ if $edit }}$edit{{ endif }}
-
-{{ if $likebuttons }}
-<div id="photo-like-div">
-	$likebuttons
-	$like
-	$dislike	
-</div>
-{{ endif }}
-
-$comments
-
-$paginate
-
diff --git a/view/theme/dispy-dark/profile_vcard.tpl b/view/theme/dispy-dark/profile_vcard.tpl
deleted file mode 100644
index f14ea7915..000000000
--- a/view/theme/dispy-dark/profile_vcard.tpl
+++ /dev/null
@@ -1,82 +0,0 @@
-<div class="vcard">
-
-	{{ if $profile.edit }}
-	<div class="action">
-	<span class="icon-profile-edit"></span>
-	<a href="#" rel="#profiles-menu" class="ttright" id="profiles-menu-trigger" title="$profile.edit.3">$profile.edit.1</a>
-	<ul id="profiles-menu" class="menu-popup">
-		{{ for $profile.menu.entries as $e }}
-		<li>
-			<a href="profiles/$e.id"><img src='$e.photo'>$e.profile_name</a>
-		</li>
-		{{ endfor }}
-		<li><a href="profile_photo">$profile.menu.chg_photo</a></li>
-		<li><a href="profiles/new" id="profile-listing-new-link">$profile.menu.cr_new</a></li>
-	</ul>
-	</div>
-	{{ endif }}
-
-	<div class="fn label">$profile.name</div>
-
-	{{ if $pdesc }}
-    <div class="title">$profile.pdesc</div>
-    {{ endif }}
-	<div id="profile-photo-wrapper">
-		<img class="photo" width="175" height="175" src="$profile.photo?rev=$profile.picdate" alt="$profile.name" />
-    </div>
-
-	{{ if $location }}
-		<div class="location">
-        <span class="location-label">$location</span>
-		<div class="adr">
-			{{ if $profile.address }}
-            <div class="street-address">$profile.address</div>{{ endif }}
-			<span class="city-state-zip">
-				<span class="locality">$profile.locality</span>{{ if $profile.locality }}, {{ endif }}
-				<span class="region">$profile.region</span>
-				<span class="postal-code">$profile.postal-code</span>
-			</span>
-			{{ if $profile.country-name }}<span class="country-name">$profile.country-name</span>{{ endif }}
-		</div>
-		</div>
-	{{ endif }}
-
-	{{ if $gender }}
-    <div class="mf">
-        <span class="gender-label">$gender</span>
-        <span class="x-gender">$profile.gender</span>
-    </div>
-    {{ endif }}
-	
-	{{ if $profile.pubkey }}
-    <div class="key" style="display:none;">$profile.pubkey</div>
-    {{ endif }}
-
-	{{ if $marital }}
-    <div class="marital">
-    <span class="marital-label">
-    <span class="heart">&hearts;</span>$marital</span>
-    <span class="marital-text">$profile.marital</span>
-    </div>
-    {{ endif }}
-
-	{{ if $homepage }}
-    <div class="homepage">
-    <span class="homepage-label">$homepage</span>
-    <span class="homepage-url"><a href="$profile.homepage"
-    target="external-link">$profile.homepage</a></span>
-    </div>{{ endif }}
-
-	{{ inc diaspora_vcard.tpl }}{{ endinc }}
-	
-	<div id="profile-extra-links">
-		<ul>
-			{{ if $connect }}
-				<li><a id="dfrn-request-link" href="dfrn_request/$profile.nickname">$connect</a></li>
-			{{ endif }}
-		</ul>
-	</div>
-</div>
-
-$contact_block
-
diff --git a/view/theme/dispy-dark/saved_searches_aside.tpl b/view/theme/dispy-dark/saved_searches_aside.tpl
deleted file mode 100644
index fb822fe5d..000000000
--- a/view/theme/dispy-dark/saved_searches_aside.tpl
+++ /dev/null
@@ -1,14 +0,0 @@
-<div class="widget" id="saved-search-list">
-	<h3 id="search">$title</h3>
-	$searchbox
-	
-	<ul id="saved-search-ul">
-		{{ for $saved as $search }}
-		<li class="saved-search-li clear">
-			<a title="$search.delete" onclick="return confirmDelete();" onmouseout="imgdull(this);" onmouseover="imgbright(this);" id="drop-saved-search-term-$search.id" class="icon savedsearchdrop drophide" href="network/?f=&amp;remove=1&amp;search=$search.encodedterm"></a>
-			<a id="saved-search-term-$search.id" class="savedsearchterm" href="network/?f=&amp;search=$search.encodedterm">$search.term</a>
-		</li>
-		{{ endfor }}
-	</ul>
-	<div class="clear"></div>
-</div>
diff --git a/view/theme/dispy-dark/search_item.tpl b/view/theme/dispy-dark/search_item.tpl
deleted file mode 100644
index bfad1b7b7..000000000
--- a/view/theme/dispy-dark/search_item.tpl
+++ /dev/null
@@ -1,54 +0,0 @@
-<div class="wall-item-outside-wrapper$item.indent$item.previewing" 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" id="wall-item-info-$item.id">
-			<div class="wall-item-photo-wrapper" 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" target="redir" 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" target="redir" 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>
-				<div class="wall-item-ago"  id="wall-item-ago-$item.id">$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>
-		</div>
-		<div class="wall-item-tools" id="wall-item-tools-$item.id">
-			<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.dropping }}<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-conv" id="wall-item-conv-$item.id" >
-	{{ if $item.conv }}
-			<a href='$item.conv.href' id='context-$item.id' title='$item.conv.title'>$item.conv.title</a>
-	{{ endif }}
-	</div>
-
-<div class="wall-item-outside-wrapper-end$item.indent" ></div>
-
-</div>
-
-
diff --git a/view/theme/dispy-dark/style.css b/view/theme/dispy-dark/style.css
deleted file mode 100644
index 05d544b0a..000000000
--- a/view/theme/dispy-dark/style.css
+++ /dev/null
@@ -1,3176 +0,0 @@
-/*
- * dispy-dark
- *
- * author, maintainer: simon <http://simon.kisikew.org/>
- *
- */
-
-/* from html5boilerplate */
-
-/* these are to tell browsers they should be displayed a certain way */
-article,
-aside,
-details,
-figcaption,
-figure,
-footer,
-header,
-hgroup,
-nav,
-section {
-    display: block;
-}
-audio,
-canvas,
-video,
-time {
-    display: inline-block;
-    *display: inline;
-    *zoom: 1;
-}
-audio:not([controls]) {
-    display: none;
-}
-[hidden] {
-    display: none;
-}
-
-/* 
- *  Base
- */
-
-/*
- * 1. Correct text resizing oddly in IE6/7 when body font-size is set using em units
- * 2. Force vertical scrollbar in non-IE
- * 3. Prevent iOS text size adjust on device orientation change, without disabling user zoom: h5bp.com/g
- */
-
-html {
-    font-size: 100%;
-    overflow-y: scroll;
-    -webkit-text-size-adjust: 100%;
-    -ms-text-size-adjust: 100%;
-}
-body {
-    margin: 0;
-    font-size: 16px;
-    line-height: 1.1em;
-}
-body,
-button,
-input,
-select,
-textarea {
-    font-family: sans-serif;
-    color: #eec;
-    background-color: #2e2f2e;
-}
-select {
-    border: 1px #555 dotted;
-    padding: 3px;
-    margin: 3px;
-    color: #eec;
-    background: #2e2f2e;
-}
-option {
-    padding: 3px;
-    color: #eec;
-    background: #2e2f2e;
-}
-option[selected="selected"] {
-	color: #2e2f2e;
-	background: #eec;
-}
-ul, ol {
-    padding: 0;
-}
-/* remember to define focus styles! */
-:focus {
-    outline: 0;
-}
-[disabled="disabled"] {
-    background: #4e4f4f;
-    color: #ddb;
-}
-
-/* remember to highlight inserts somehow! */
-ins {
-    background-color: #2e302e;
-    color: #ff9;
-    text-decoration: none;
-}
-mark {
-    background-color: #2e302e;
-    color: #ff9;
-    font-style: italic;
-    font-weight: bold;
-}
-/* Redeclare monospace font family: h5bp.com/j */
-pre, code, kbd, samp, .wall-item-body code {
-    font-family: monospace, monospace;
-    _font-family: monospace;
-    font-size: 1em; }
-
-/* Improve readability of pre-formatted text in all browsers */
-pre, .wall-item-body code {
-    white-space: pre;
-    white-space: pre-wrap;
-    word-wrap: break-word;
-}
-
-q {
-    quotes: none;
-}
-q:before, q:after {
-    content: "";
-    content: none;
-}
-small {
-    font-size: 85%;
-}
-
-/* Position subscript and superscript content without affecting line-height: h5bp.com/k */
-sub, sup {
-    font-size: 75%;
-    line-height: 0;
-    position: relative;
-    vertical-align: baseline;
-}
-sup {
-    top: -0.5em;
-}
-sub {
-    bottom: -0.25em;
-}
-img {
-    border: 0 none;
-    /*vertical-align: middle;*/
-}
-a {
-    color: #88a9d2;
-    text-decoration: none;
-    margin-bottom: 1px;
-}
-a:hover img {
-    text-decoration: none;
-}
-blockquote {
-    background: #444;
-    color: #eec;
-    text-indent: 5px;
-    padding: 5px;
-    border: 1px #aaa solid;
-    border-radius: 5px;
-}
-a:hover {
-    color: #729fcf;
-    border-bottom: 1px dotted #729fcf;
-}
-.required {
-    display: inline;
-    color: #ff0;
-    font-size: 16px;
-    font-weight: bold;
-    margin: 3px;
-}
-.fakelink, .lockview {
-    color: #729fcf;
-    cursor: pointer;
-}
-.fakelink:hover {
-    color: #729fcf;
-}
-.smalltext {
-    font-size: 0.7em;
-}
-#panel {
-    position: absolute;
-    font-size: 0.8em;
-    -webkit-border-radius: 5px;
-    -moz-border-radius: 5px;
-    border-radius: 5px;
-    border: 1px solid #fff;
-    background-color: #2e302e;
-    color: #eeeeec;
-    padding: 1em;
-}
-.pager {
-    margin-top: 60px;
-    display: block;
-    clear: both;
-    text-align: center;
-}
-.pager span {
-    padding: 4px;
-    margin: 4px;
-}
-.pager_current {
-    background-color: #729fcf;
-    color: #fff;
-}
-
-
-/**
- * global
- */
-/* .tool .action */
-.action {
-    margin: 5px 0;
-}
-.tool {
-    margin: 5px 0;
-    list-style: none;
-}
-#articlemain {
-    width: 100%;
-    height: 100%;
-    margin: 0 auto;
-}
-
-
-/**
- * login
- */
-#asidemain .field {
-    overflow: hidden;
-    width: 200px;
-}
-#login-extra-links {
-    overflow: auto !important;
-    padding-top: 60px !important;
-    width: 100% !important;
-}
-#login-extra-links a {
-    margin-right: 20px;
-}
-#login_standard {
-    display: block !important;
-    float: none !important;
-    height: 100% !important;
-    position: relative !important;
-    width: 100% !important;
-}
-#login_standard .field label {
-    width: 200px !important;
-}
-#login_standard input, #login_standard input[type="text"] {
-    margin: 0 0 8px !important;
-    width: 210px !important;
-}
-#login-submit-wrapper {
-    margin: 0 !important;
-}
-#login-submit-button {
-    margin-left: 0px !important;
-}
-#asidemain #login_openid {
-    position: relative !important;
-    float: none !important;
-    margin-left: 0px !important;
-    height: auto !important;
-    width: 200px !important;
-}
-#login_openid #id_openid_url {
-    width: 180px !important;
-    overflow: hidden !important;
-}
-#login_openid label {
-    width: 180px !important;
-}
-
-
-/**
- * nav
- */
-nav {
-    height: 60px;
-    background-color: #1d1f1d;
-    color: #eeeeec;
-    position: relative;
-    padding: 20px 20px 10px 95px;
-}
-nav a {
-    text-decoration: none;
-    color: #eeeeec;
-    border: 0px;
-}
-nav a:hover {
-    text-decoration: none;
-    color: #eeeeec;
-    border: 0px;
-}
-nav #banner {
-    display: block;
-    position: absolute;
-    left: 51px;
-    top: 25px;
-}
-nav #banner #logo-text a {
-    font-size: 40px;
-    font-weight: bold;
-    margin-left: 3px;
-}
-ul#user-menu-popup {
-    display: none;
-    position: absolute;
-    background-color: #555753;
-    width: 100%;
-    padding: 10px 0px;
-    margin: 0px;
-    top: 20px;
-    left: 0;
-    -webkit-border-radius: 0 0 5px 5px;
-    -moz-border-radius: 0 0 5px 5px;
-    border-radius: 0 0 5px 5px;
-    box-shadow: 5px 10px 10px 0 #111;
-    z-index: 10000;
-}
-ul#user-menu-popup li {
-    display: block;
-}
-ul#user-menu-popup li a {
-    display: block;
-    padding: 5px;
-}
-ul#user-menu-popup li a:hover {
-    color: #2e302e;
-    background-color: #eeeeec;
-}
-ul#user-menu-popup li a.nav-sep {
-    border-top: 1px solid #eeeeec;
-}
-nav .nav-link {
-    display: inline-block;
-    width: 22px;
-    height: 22px;
-    overflow: hidden;
-    margin: 0px 5px 5px;
-    text-indent: 50px;
-    background: transparent url(icons.png) 0 0 no-repeat;
-}
-#nav-apps-link {
-    background-position: 0 -66px;
-}
-#nav-apps-link:hover {
-    background-position: -22px -66px;
-}
-#nav-community-link {
-    background-position: 0 -22px;
-}
-#nav-community-link:hover {
-    background-position: -22px -22px;
-}
-#nav-contacts-link {
-    background-position: 0 -22px;
-}
-#nav-contacts-link:hover {
-    background-position: -22px -22px;
-}
-#nav-directory-link {
-    background-position: -44px -154px;
-}
-#nav-directory-link:hover {
-    background-position: -66px -154px;
-}
-#nav-help-link {
-    background-position: 0 -110px;
-}
-#nav-help-link:hover {
-    background-position: -22px -110px;
-}
-#nav-home-link {
-    background-position: -44px -132px;
-}
-#nav-home-link:hover {
-    background-position: -66px -132px;
-}
-#nav-intro-link {
-    background-position: 0px -190px;
-}
-#nav-intro-link:hover {
-    background-position: -44px -190px;
-}
-#nav-login-link {
-    background-position: 0 -88px;
-}
-#nav-login-link:hover {
-    background-position: -22px -88px;
-}
-#nav-logout-link {
-    background-position: 0 -88px;
-}
-#nav-logout-link:hover {
-    background-position: -22px -88px;
-}
-#nav-messages-link {
-    background-position: -44px -88px;
-}
-#nav-messages-link:hover {
-    background-position: -66px -88px;
-}
-#nav-notify-link, #nav-notifications-linkmenu {
-    background-position: -44px -110px;
-}
-#nav-notify-link:hover {
-    background-position: -66px -110px;
-}
-#nav-network-link {
-    background-position: 0px -177px;
-}
-#nav-network-link:hover {
-    background-position: -22px -177px;
-}
-#nav-search-link {
-    background-position: 0 -44px;
-}
-#nav-search-link:hover {
-    background-position: -22px -44px;
-}
-#profile-link,
-#profile-title, 
-#wall-image-upload,
-#wall-file-upload,
-#profile-attach-wrapper,
-#profile-audio,
-#profile-link,
-#profile-location,
-#profile-nolocation,
-#profile-title,
-#jot-title,
-#profile-upload-wrapper,
-#profile-video,
-#profile-jot-submit,
-#wall-image-upload-div,
-#wall-file-upload-div,
-.icon, .hover, .focus, .pointer {
-    cursor: pointer;
-}
-
-
-/* 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;
-}
-#nav-notifications-menu {
-    margin: 30px 0 0 -20px;
-    width: 275px;
-    max-height: 300px;
-    overflow-y: auto;
-    font-size: 9pt;
-}
-#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 {
-    word-wrap: normal;
-    border-bottom: 1px solid #000;
-}
-#nav-notifications-menu li:hover {
-    color: black;
-}
-#nav-notifications-menu a:hover {
-    color: black;
-    text-decoration: underline;
-}
-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");
-}
-.show {
-    display: block;
-}
-#notifications {
-    height: 20px;
-    width: 170px;
-    position: absolute;
-    top: -19px;
-    left: 4px;
-}
-#nav-floater {
-    position: fixed;
-    top: 20px;
-    right: 1%;
-    padding: 5px;
-    background: #1d1f1d;
-    color: transparent;
-    border-radius: 5px;
-    z-index: 100;
-    width: 300px;
-    height: 60px;
-}
-#nav-buttons {
-    clear: both;
-    list-style: none;
-    padding: 0px;
-    margin: 0px;
-    height: 25px;
-}
-#nav-buttons > li {
-    padding: 0;
-	display: inline-block;
-	margin: 0px -4px 0px 0px;
-}
-.floaterflip {
-    display: block;
-    position: fixed;
-    z-index: 110;
-    top: 56px;
-    right: 19px;
-    width: 22px;
-    height: 22px;
-    overflow: hidden;
-    margin: 0px;
-    background: transparent url(icons.png) -190px -60px no-repeat;
-}
-.search-box {
-    display: inline-block;
-    margin: 5px;
-    position: fixed;
-    right: 0px;
-    bottom: 0px;
-    z-index: 100;
-    background: #1d1f1d;
-    border-radius: 5px;
-}
-#search-text {
-    border: 1px #eec solid;
-    background: #2e2f2e;
-    color: #eec;
-}
-.search-box #search-text {
-    margin: 8px;
-    width: 10em;
-    height: 14px;
-    color: #eec;
-}
-#scrollup {
-    position: fixed;
-    right: 5px;
-    bottom: 40px;
-    z-index: 100;
-}
-#scrollup a:hover {
-    text-decoration: none;
-    border: 0;
-}
-#user-menu {
-    box-shadow: 5px 0 10px 0 #111;
-    display: block;	
-    width: 75%;
-    margin: 3px 0 0 0;
-    position: relative;
-    background-color: #555753;
-    -webkit-border-radius: 5px;
-    -moz-border-radius: 5px;
-    border-radius: 5px;
-    background: #555753 url("menu-user-pin.jpg") 98% center no-repeat;
-    clear: both;
-    top: 4px;
-    left: 10px;
-    padding: 2px;
-}
-#user-menu > a {
-    vertical-align: top;
-}
-#user-menu-label {
-    font-size: 12px;
-    padding: 3px 20px 9px 5px;
-    height: 10px;
-}
-.nav-ajax-update, .nav-ajax-left {
-    width: 30px;
-    height: 19px;
-    background: transparent url(notifications.png) 0 0 no-repeat;
-    color: #222;
-    font-weight: bold;
-    font-size: 0.8em;
-    padding-top: 0.2em;
-    text-align: center;
-    float: left;
-    margin: 0 -1px 0 3px;
-    display: block;
-    visibility: hidden;
-}
-.nav-ajax-update.show, .nav-ajax-left.show {
-    visibility: visible;
-}
-#net-update {
-    background-position: 0px 0px;
-}
-#mail-update {
-    background-position: -30px 0;
-}
-#notify-update {
-    background-position: -60px 0px;
-}
-#home-update {
-    background-position: -90px 0px;
-}
-#intro-update {
-    background-position: -120px 0px;
-}
-#lang-select-icon {
-    cursor: pointer;
-    position: fixed;
-    left: 28px;
-    bottom: 6px;
-    z-index: 10;
-}
-#language-selector {
-    position: fixed;
-    bottom: 2px;
-    left: 52px;
-    z-index: 10;
-}
-.menu-popup {
-    position: absolute;
-    display: none;
-    width: 11em;
-    background: #ffffff;
-    color: #2d2d2d;
-    margin: 0px;
-    padding: 0px;
-    list-style: none;
-    border: 3px solid #364e59;
-    z-index: 100000;
-    -webkit-box-shadow: 3px 3px 10px 0 rgba(0, 0, 0, 0.7);
-    -moz-box-shadow: 3px 3px 10px 0 rgba(0, 0, 0, 0.7);
-    box-shadow: 3px 3px 10px 0 rgba(0, 0, 0, 0.7);
-}
-.menu-popup a {
-    display: block;
-    color: #2d2d2d;
-    padding: 5px 10px;
-    text-decoration: none;
-}
-.menu-popup a:hover {
-    background-color: #bdcdd4;
-}
-.menu-popup .menu-sep {
-    border-top: 1px solid #9eabb0;
-}
-.menu-popup li {
-    float: none;
-    overflow: auto;
-    height: auto;
-    display: block;
-}
-.menu-popup li img {
-    float: left;
-    width: 16px;
-    height: 16px;
-    padding-right: 5px;
-}
-.menu-popup .empty {
-    padding: 5px;
-    text-align: center;
-    color: #9eabb0;
-}
-.notif-item {
-    font-size: small;
-}
-.notif-item a {
-    vertical-align: middle;
-}
-.notif-image {
-    width: 32px;
-    height: 32px;
-    padding: 7px 7px 0px 0px;
-}
-.notify-seen {
-    background: #ddd;
-}
-
-
-/**
- * sysmsg
- */
-#sysmsg_info {
-    position: fixed;
-    bottom: 0;
-    -moz-box-shadow: 3px 3px 3px 10px 0 #000;
-    -webkit-box-shadow: 3px 3px 10px 0 #000;
-    box-shadow: 3px 3px 10px 0 #000;
-    padding: 10px;
-    background-color: #fcaf3e;
-    border:2px solid #f8911b;
-    border-bottom: 0;
-    padding-bottom: 50px;
-    z-index: 1000;
-}
-#sysmsg {
-    position: fixed;
-    bottom: 0;
-    -moz-box-shadow: 3px 3px 10px 0 #000;
-    -webkit-box-shadow: 3px 3px 10px 0 #000;
-    box-shadow: 3px 3px 10px 0 #000;
-    padding: 10px;
-    background-color: #fcaf3e;
-    border: 2px solid #f8911b;
-    border-bottom: 0;
-    padding-bottom: 50px;
-    z-index: 1000;
-}
-#sysmsg_info br,
-#sysmsg br {
-    display: block;
-    margin: 2px 0px;
-    border-top: 1px solid #ccccce;
-}
-
-
-/**
- * aside
- */
-#asidemain {
-    float: left;
-    font-size: smaller;
-    margin: 20px 0 20px 35px;
-    width: 25%;
-    display: inline;
-}
-/* for now, disappear these */
-#asideright, #asideleft {
-    display: none;
-}
-.vcard .fn {
-    font-size: 1.7em;
-    font-weight: bold;
-    border-bottom: 1px solid #729fcf;
-    padding-bottom: 3px;
-}
-.vcard #profile-photo-wrapper {
-    margin: 20px;
-}
-/* http://css-tricks.com/snippets/css/css-box-shadow/
-* box-shadow:
-* 1. The horizontal offset of the shadow, positive means
-* the shadow will be on the right of the box, a negative
-* offset will put the shadow on the left of the box.
-* 2. The vertical offset of the shadow, a negative one
-* means the box-shadow will be above the box, a
-* positive one means the shadow will be below the box.
-* 3. The blur radius (optional), if set to 0 the shadow
-* will be sharp, the higher the number, the more blurred
-* it will be.
-* 4. The spread radius (optional), positive values increase
-* the size of the shadow, negative values decrease the size.
-* Default is 0 (the shadow is same size as blur).
-* 5. Colo[u]r
-*/
-.vcard #profile-photo-wrapper img {
-    box-shadow: 3px 3px 10px 0 #000;
-}
-#asidemain h4 {
-    font-size: 1.2em;
-}
-#asidemain #viewcontacts {
-    text-align: right;
-}
-.aprofile dt {
-    background: #eec;
-    color: #2e2f2e;
-    font-weight: bold;
-    box-shadow: 1px 1px 5px 0 #000;
-    margin: 15px 0 5px;
-    padding-left: 5px;
-}
-#profile-extra-links ul {
-    margin-left: 0px;
-    padding-left: 0px;
-    list-style: none;
-}
-#dfrn-request-link {
-    background: #3465A4 url(connect.png) no-repeat 95% center;
-    border-radius: 5px 5px 5px 5px;
-    color: #eec;
-    display: block;
-    font-size: 1.2em;
-    padding: 0.2em 0.5em;
-}
-#wallmessage-link {
-    /*background: #3465A4 url(connect.png) no-repeat 95% center;*/
-    /*border-radius: 5px 5px 5px 5px;*/
-    color: #eee;
-    display: block;
-    font-size: 1.2em;
-    padding: 0.2em 0.5em;
-}
-#netsearch-box {
-    margin: 20px 0px 30px;
-    width: 150px;
-}
-#netsearch-box #search-submit {
-    margin: 5px 5px 0px 0px;
-}
-.ttright {
-    margin: 0px 0px 0px 0px;
-}
-
-
-/**
- * contacts block
- */
-.contact-block-div {
-    width: 50px;
-    height: 50px;
-    float: left;
-}
-.contact-block-textdiv {
-    width: 150px;
-    height: 34px;
-    float: left;
-}
-#contact-block-end {
-    clear: both;
-}
-
-
-/**
- * jot
- */
-#jot {
-/*width: 785px;*/
-margin: 10px 0 20px 0px;
-width: 100%;
-}
-#jot #jot-tools {
-margin: 0px;
-padding: 0px;
-height: 35px;
-overflow: none;
-width: 100%;
-/*background-color: #0e232e;*/
-/*border-bottom: 2px solid #9eabb0;*/
-}
-#jot #jot-tools span {
-    float: left;
-    margin: 10px 20px 2px 0px;
-}
-#jot #jot-tools span a {
-    display: block;
-}
-#jot #jot-tools .perms {
-    float: right;
-    width: 40px;
-}
-#jot #jot-tools li.loading {
-    float: right;
-    background-color: #ffffff;
-    width: 20px;
-    vertical-align: center;
-    text-align: center;
-    border-top: 2px solid #9eabb0;
-    height: 38px;
-}
-#jot #jot-tools li.loading img {
-    margin-top: 10px;
-}
-#jot #jot-title {
-    border: 1px solid #ccc;
-    margin: 0 0 5px;
-    height: 20px;
-    width: 90%;
-    font-weight: bold;
-    border-radius: 5px;
-    vertical-align: middle;
-}
-#jot-category {
-    margin: 5px 0;
-    border-radius: 5px;
-    border: 1px #999 solid;
-    color: #aaa;
-    font-size: smaller;
-}
-#jot-category:focus {
-    color: #eee;
-}
-#jot #character-counter {
-    width: 6%;
-    float: right;
-    text-align: right;
-    height: 15px;
-    line-height: 20px;
-    padding: 2px 20px 5px 0;
-}
-#profile-jot-text_parent {
-    box-shadow: 5px 0 10px 0 #111;
-}
-#profile-jot-text_tbl {
-    margin-bottom: 10px;
-    background: #777;
-}
-#profile-jot-text_ifr {
-    width:99.900002% !important;
-}
-#profile-jot-text_toolbargroup {
-    background: #777;
-}
-.mceCenter table tr {
-    background: #777;
-}
-[id$="jot-text_ifr"] {
-    width: 99.900002% !important;
-    color: #2e2f2e;
-    background: #eec;
-}
-[id$="jot-text_ifr"] .mceContentBody {
-    color: #2e2f2e;
-    background: #eec;
-}
-.defaultSkin tr.mceFirst {
-    background: #777;
-}
-.defaultSkin td.mceFirst {
-	background-color: #eec;
-}
-.defaultSkin td.mceLast {
-	background-color: #eec;
-}
-.defaultSkin span.mceIcon, .defaultSkin img.mceIcon {
-	background-color: #eec;
-}
-.defaultSkin .mceButtonDisabled .mceIcon {
-	background-color: #eec;
-}
-#profile-attach-wrapper,
-#profile-audio-wrapper,
-#profile-link-wrapper,
-#profile-location-wrapper,
-#profile-nolocation-wrapper,
-#profile-title-wrapper,
-#profile-upload-wrapper,
-#profile-video-wrapper {
-    float: left;
-    margin: 0 20px 0 0;
-}
-#profile-rotator-wrapper {
-    float: right; 
-}
-#profile-jot-tools-end,
-#profile-jot-banner-end {
-    clear: both;
-}
-#profile-jot-email-wrapper {
-    margin:10px 10% 0;
-    border:1px solid #555753;
-    border-bottom:0;
-}
-#profile-jot-email-label {
-    background-color:#555753;
-    color:#ccccce;
-    padding:5px;
-}
-#profile-jot-email {
-    width:90%;
-    margin:5px;
-}
-#profile-jot-networks {
-    margin: 0 10%;
-    border: 1px solid #555753;
-    border-top: 0;
-    border-bottom: 0;
-    padding: 5px;
-}
-#profile-jot-net {
-    margin: 5px 0;
-}
-#jot-preview-link {
-    margin: 0 0 0 10px;
-    border: 0;
-    text-decoration: none;
-    float: right;
-}
-.icon-text-preview {
-    margin: 0 0 -18px 0;
-    display: block;
-    width: 20px;
-    height: 20px;
-    background: url(icons.png) no-repeat -128px -40px;
-    border: 0;
-    text-decoration: none;
-    float: right;
-    cursor: pointer;
-}
-#profile-jot-perms { 
-    float: right;
-    background-color: #555753;
-    height: 22px;
-    width: 20px;
-    -webkit-border-radius: 5px;
-    -moz-border-radius: 5px;
-    border-radius: 5px;     
-    overflow: hidden;
-    border: 0px;
-    margin: 0 10px 0 10px;
-}
-#profile-jot-plugin-wrapper {
-    width: 1px;
-    margin: 10px 0 0 0;
-    float: right;
-}
-#profile-jot-submit-wrapper {
-    float: right;
-    width: 100%;
-    list-style: none;
-    margin: 10px 0 0 0;
-    padding: 0;
-}
-#profile-jot-submit {
-    height: auto;
-    background-color: #555753;
-    color: #eeeeec;
-    -webkit-border-radius: 5px;
-    -moz-border-radius: 5px;
-    border-radius: 5px;
-    border: 2px outset #222420;
-    margin: 0;
-    float: right;
-    text-shadow: 1px 1px #111;
-    width: auto;
-}
-#profile-jot-submit:active {
-    box-shadow: 0 0 0 0;
-}
-#jot-perms-icon {
-    height: 22px;
-    width: 20px;
-    -webkit-border-radius: 5px;
-    -moz-border-radius: 5px;
-    border-radius: 5px;
-    overflow: hidden;
-    border: 0;
-}
-#profile-jot-acl-wrapper {
-    margin: 0 10px;
-    border: 1px solid #555753;
-    border-top: 0;
-    display: block !important;
-}
-#group_allow_wrapper,
-#group_deny_wrapper,
-#acl-permit-outer-wrapper {
-    width:47%;
-    float:left;
-}
-#contact_allow_wrapper,
-#contact_deny_wrapper,
-#acl-deny-outer-wrapper {
-    width:47%;
-    float:right;
-}
-#acl-permit-text {
-    background-color: #555753;
-    color: #ccccce;
-    padding: 5px;
-    float: left;
-}
-#jot-public {
-    background-color: #555753;
-    color: #ff0000;
-    padding: 5px;
-    float: left;
-}
-#acl-deny-text {
-    background-color: #555753;
-    color: #ccccce;
-    padding: 5px;
-    float: left;
-}
-#acl-permit-text-end,
-#acl-deny-text-end {
-    clear: both;
-}
-#jot-title-desc {
-    color: #ccc;
-}
-#profile-jot-desc {
-    color: #ff2000;
-    margin: 5px 0;
-}
-#jot-title-wrapper {
-    margin-bottom: 5px;
-}
-#jot-title-display {
-    font-weight: bold;
-}
-.jothidden {
-    display: none;
-}
-#jot-preview-content {
-    background-color: #3e3f3e;
-    color: #eec;
-    border: 1px #eec solid;
-    border-radius: 5px;
-    padding: 3px 3px 6px 10px;
-}
-#jot-preview-content .wall-item-outside-wrapper {
-    border: 0;
-    border-radius: 0px;
-}
-
-
-/**
- * section
- */
-#sectionmain {
-    margin: 20px;
-    font-size: 0.8em;
-    min-width: 475px;
-    width: 67%;
-    float: left;
-    display: inline;
-}
-
-
-/**
- * tabs
- */
-.tabs {
-    list-style: none;
-    margin: 10px 0;
-    padding: 0;
-}
-.tabs li {
-    display: inline;
-    font-size: smaller;
-    font-weight: bold;
-}
-.tab {
-    border: 1px solid #729fcf;
-    padding: 4px;
-}
-.tab:hover, .tab.active:hover {
-    background: #88a9d2;
-    color: #2e2f2e;
-}
-.tab:active {
-    background: #88a9d2;
-    color: #2e2f2e;
-}
-.tab.active {
-    background: #88a9d2;
-    color: #2e2f2e;
-}
-.tab.active a {
-    color: #2e2f2e;
-}
-.tab a {
-    border: 0;
-    text-decoration: none;
-}
-
-
-/**
- * items
- */
-.wall-item-outside-wrapper {
-    border: 1px solid #aaa;
-    border-radius: 5px;
-    box-shadow: 5px 0 10px 0 #111;
-}
-.wall-item-outside-wrapper.comment {
-    margin-top: 5px;
-}
-.wall-item-outside-wrapper-end {
-    clear: both;
-}
-.wall-item-content-wrapper {
-    position: relative;
-    padding: 10px;
-    width: auto;
-}
-.wall-item-outside-wrapper .wall-item-comment-wrapper {
-    /*margin-left: 90px;*/
-}
-.shiny {
-    background: #2e3436;
-    border-radius: 5px;
-}
-.wall-outside-wrapper .shiny {
-    border-radius: 5px;
-}
-.heart {
-    color: red;
-}
-.wall-item-content {
-    overflow-x: auto;
-    margin: 0px 15px 0px 5px;
-}
-/* removing it from here, vs. putting it in .wall-item-content
-* might break things for people. we shall see ;) */
-[id^="tread-wrapper"], [class^="tread-wrapper"] {
-    margin: 15px 0 0 0;
-    padding: 0px;
-    /*overflow-x: auto;*/
-}
-.wall-item-photo-menu {
-    display: none;
-}
-.wall-item-photo-menu-button {
-    display:none;
-    text-indent:-99999px;
-    background:#555753 url(menu-user-pin.jpg) no-repeat 75px center;
-    position:absolute;
-    overflow:hidden;
-    height:20px;
-    width:90px;
-    top:85px;
-    left:0;
-    -webkit-border-radius:0 0 5px 5px;
-    -moz-border-radius:0 0 5px 5px;
-    border-radius:0 0 5px 5px;
-}
-.wall-item-info {
-    float: left;
-    width: 110px;
-}
-.wall-item-photo-wrapper {
-    width: 80px;
-    height: 80px;
-    position: relative;
-    padding: 5px;
-    background-color: #555753;
-    -webkit-border-radius: 5px;
-    -moz-border-radius: 5px;
-    border-radius: 5px;
-}
-[class^="wall-item-tools"] > *, [class^="wall-item-tools"] > * > * {
-    /*margin: 0 0 5px 0;*/
-}
-.wall-item-tools {
-    float: right;
-    filter: alpha(opacity=35);
-    opacity: 0.4;
-    -webkit-transition: all 1s ease-in-out;
-    -moz-transition: all 1s ease-in-out;
-    -o-transition: all 1s ease-in-out;
-    -ms-transition: all 1s ease-in-out;
-    transition: all 1s ease-in-out;
-}
-.wall-item-tools:hover {
-    filter: alpha(opacity=100);
-    opacity: 1;
-    -webkit-transition: all 1s ease-in-out;
-    -moz-transition: all 1s ease-in-out;
-    -o-transition: all 1s ease-in-out;
-    -ms-transition: all 1s ease-in-out;
-    transition: all 1s ease-in-out;
-}
-.wall-item-subtools1 {
-    height: 30px;
-    list-style: none outside none;
-    margin: 20px 0 30px -20px;
-    padding: 0;
-    width: 30px;
-}
-.wall-item-subtools2 {
-    height: 25px;
-    list-style: none outside none;
-    margin: -75px 0 0 5px;
-    padding: 0;
-    width: 25px;
-}
-.wall-item-title {
-    font-size: 1.2em;
-    font-weight: bold;
-    margin-bottom: 1em;
-}
-.wall-item-body {
-    margin: 20px 20px 10px 0px;
-    text-align: left;
-    overflow-x: auto;
-}
-.wall-item-lock-wrapper {
-    float: right;
-    height: 22px;
-    margin: 0 -5px 0 0;
-    width: 22px;
-    opacity: 1;
-}
-.wall-item-dislike,
-.wall-item-like {
-    clear: left;
-    font-size: 0.8em;
-    color: #878883;
-    margin: 5px 0 5px 120px;
-}
-.wall-item-author, .wall-item-actions-author {
-    clear: left;
-    font-size: 0.8em;
-    color: #878883;
-    margin: 20px 20px 0 110px;
-}
-.wall-item-ago {
-    display: inline;
-    padding-left: 10px;
-}
-.wall-item-wrapper-end {
-    clear:both;
-}
-.wall-item-location {
-    margin-top: 15px;
-    width: 100px;
-    overflow: hidden;
-    text-overflow: ellipsis;
-    -o-text-overflow: ellipsis;
-}
-.wall-item-location .icon {
-    float: left;
-}
-.wall-item-location > a {
-    margin-left: 25px;
-    font-size: 0.7em;
-    display: block;
-}
-.wall-item-location .smalltext {
-    margin-left: 25px;
-    font-size: 0.7em;
-    display: block;
-}
-.wall-item-location > br {
-    display: none;
-}
-.wallwall .wwto {
-    left: 5px;
-    margin: 0;
-    position: absolute;
-    top: 75px;
-    width: 30px;
-    z-index: 10001;
-    width: 30px;
-    height: 30px;
-}
-.wallwall .wwto img {
-    width: 30px !important;
-    height: 30px !important;
-}
-.wallwall .wall-item-photo-end {
-    clear: both;
-}
-.wall-item-arrowphoto-wrapper {
-    position: absolute;
-    left: 35px;
-    top: 80px;
-    z-index: 10002;
-}
-.wall-item-photo-menu {
-    min-width: 92px;
-    border: 2px solid #FFFFFF;
-    border-top: 0px;
-    background: #555753;
-    position: absolute;
-    left: -2px; top: 101px;
-    display: none;
-    z-index: 10003;
-    -webkit-border-radius: 0px 5px 5px 5px;
-    -moz-border-radius: 0px 5px 5px 5px;
-    border-radius: 0px 5px 5px 5px;
-}
-.wall-item-photo-menu ul {
-    margin:0px;
-    padding: 0px;
-    list-style: none;
-}
-.wall-item-photo-menu li a {
-    white-space: nowrap;
-    display: block;
-    padding: 5px 2px;
-    color: #eeeeec;
-}
-.wall-item-photo-menu li a:hover {
-    color: #555753;
-    background: #eeeeec;
-}
-#item-delete-selected {
-    overflow: auto;
-    width: 100%;
-}
-#connect-services-header {
-    margin: 5px 0 0 0;
-}
-#connect-services {
-    margin: 5px 0 0 0;
-}
-#extra-help-header {
-    margin: 5px 0 0 0;
-}
-#extra-help {
-    margin: 5px 0 0 0;
-}
-#postit-header {
-    margin: 5px 0 0 0;
-}
-#postit {
-    margin: 5px 0 0 0;
-}
-
-
-/**
- * comment
- */
-.ccollapse-wrapper {
-    font-size: 0.9em;
-    margin-left: 80px;
-}
-
-.wall-item-outside-wrapper.comment {
-    margin-left: 80px;
-}
-.wall-item-outside-wrapper.comment .wall-item-photo {
-    width: 40px!important;
-    height: 40px!important;
-}
-.wall-item-outside-wrapper.comment .wall-item-photo-wrapper {
-    width: 40px;
-    height: 40px;
-}
-.wall-item-outside-wrapper.comment .wall-item-photo-menu-button {
-    width: 50px;
-    top: 45px;
-    background-position: 35px center;
-}
-.wall-item-outside-wrapper.comment .wall-item-info {
-    width: 60px;
-}
-.wall-item-outside-wrapper.comment .wall-item-body {
-    margin-left: 10px;
-}
-.wall-item-outside-wrapper.comment .wall-item-author {
-    margin-left: 50px;
-}
-
-.wall-item-outside-wrapper.comment .wall-item-photo-menu {
-    min-width: 50px;
-    top: 60px;
-}
-.comment-wwedit-wrapper {
-    /*margin: 30px 0px 0px 80px;*/
-}
-.comment-edit-wrapper {
-    border-top: 1px #aaa solid;
-}
-[class^="comment-edit-bb"] {
-	list-style: none;
-	display: none;
-	margin: -40px 0 5px 60px;
-	width: 75%;
-}
-[class^="comment-edit-bb"] > li {
-	display: inline-block;
-	margin: 0 10px 0 0;
-	visibility: none;
-}
-.comment-wwedit-wrapper img,
-.comment-edit-wrapper img {
-    width: 20px;
-    height: 20px;
-}
-.comment-edit-photo-link, .comment-edit-photo {
-    margin-left: 10px;
-}
-.my-comment-photo {
-    width: 40px;
-    height: 40px;
-    padding: 5px;
-}
-[class^="comment-edit-text"] {
-    margin: 5px 0 10px 20px;
-    width: 84.5%;
-}
-.comment-edit-text-empty {
-    height: 20px;
-    border: 2px #c8bebe solid;
-    border-radius: 5px;
-    color: #c8bebe;
-    -webkit-transition: all 0.5s ease-in-out;
-    -moz-transition: all 0.5s ease-in-out;
-    -o-transition: all 0.5s ease-in-out;
-    -ms-transition: all 0.5s ease-in-out;
-    transition: all 0.5s ease-in-out;	
-}
-.comment-edit-text-empty:hover {
-    color: #999999;
-}
-.comment-edit-text-full {
-    height: 10em;
-    border-radius: 5px;
-    -webkit-transition: all 0.5s ease-in-out;
-    -moz-transition: all 0.5s ease-in-out;
-    -o-transition: all 0.5s ease-in-out;
-    -ms-transition: all 0.5s ease-in-out;
-    transition: all 0.5s ease-in-out;	
-}
-.comment-edit-submit-wrapper {
-    width: 90%;
-    margin: 5px 5px 10px 50px;
-    text-align: right;
-}
-.comment-edit-submit {
-    height: 22px;
-    background-color: #555753;
-    color: #eeeeec;
-    -webkit-border-radius: 5px;
-    -moz-border-radius: 5px;
-    border-radius: 5px;
-    border: 0;
-}
-
-
-/**
- * item text style
- */
-.wall-item-body code {
-    display: block;
-    padding: 0 0 10px 5px;
-    border-color: #ccc;
-    border-style: solid;
-    border-width: 1px 1px 1px 10px;
-    background: #eee;
-    color: #2e2f2e;
-    width: 95%;
-}
-
-
-/**
- * profile
- */
-div[id$="text"] {
-    font-weight: bold;
-    border-bottom: 1px solid #ccc;
-}
-div[id$="wrapper"] {
-    height: 100%;
-    margin-bottom: 1em;
-}
-div[id$="wrapper"] br {
-    clear: left;
-}
-[id$="-end"], [class$="end"] {
-	clear: both;
-	margin: 0 0 10px 0;
-}
-#advanced-profile-with {
-    margin-left: 200px;
-}
-
-
-/**
- * photos
- */
-.photos {
-    height: auto;
-    overflow: auto;
-}
-#photo-top-links {
-    margin-bottom: 30px;
-}
-.photo-album-image-wrapper,
-.photo-top-image-wrapper {
-    float: left;
-    -moz-box-shadow: 3px 3px 10px 0 #000;
-    -webkit-box-shadow: 3px 3px 10px 0 #000;
-    box-shadow: 3px 3px 10px 0 #000;
-    background-color: #222;
-    color: #2e2f2e;
-    -webkit-border-radius: 5px;
-    -moz-border-radius: 5px;
-    border-radius: 5px;
-    padding-bottom: 30px;
-    position: relative;
-    margin: 0 10px 10px 0;
-}
-
-#photo-photo {
-    max-width: 100%;
-}
-#photo-photo img {
-    max-width: 100%;
-}
-.photo-top-image-wrapper a:hover,
-#photo-photo a:hover,
-.photo-album-image-wrapper a:hover {
-    border-bottom: 0;
-}
-.photo-top-photo,.photo-album-photo {
-    -webkit-border-radius:5px 5px 0 0;
-    -moz-border-radius:5px 5px 0 0;
-    border-radius:5px 5px 0 0;
-}
-.photo-top-album-name {
-    position: absolute;
-    bottom: 0;
-    padding: 0 5px;
-}
-.caption {
-    position: absolute;
-    bottom: 0;
-    margin: 0 5px;
-}
-#photo-photo {
-    position: relative;
-    float:left;
-}
-#photo-prev-link,
-#photo-next-link {
-    position:absolute;
-    width:30%;
-    height:100%;
-    background-color:rgba(255,255,255,0.5);
-    opacity:0;
-    -webkit-transition:all .2s ease-in-out;
-    -moz-transition:all .2s ease-in-out;
-    -o-transition:all .2s ease-in-out;
-    -ms-transition:all .2s ease-in-out;
-    transition:all .2s ease-in-out;
-    background-position:center center;
-    background-repeat:no-repeat;
-}
-#photo-prev-link {
-    left:0;
-    top:0;
-    background-image:url(prev.png);
-}
-#photo-next-link {
-    right:0;
-    top:0;
-    background-image:url(next.png);
-}
-
-#photo-prev-link a,#photo-next-link a {
-    display:block;
-    width:100%;
-    height:100%;
-    overflow:hidden;
-    text-indent:-900000px;
-}
-#photo-prev-link:hover,
-#photo-next-link:hover {
-    opacity:1;
-    -webkit-transition:all .2s ease-in-out;
-    -moz-transition:all .2s ease-in-out;
-    -o-transition:all .2s ease-in-out;
-    -ms-transition:all .2s ease-in-out;
-    transition:all .2s ease-in-out;
-}
-#photo-next-link .icon,
-#photo-prev-link .icon {
-    display: none;
-}
-#photos-upload-spacer,
-#photos-upload-new-wrapper,
-#photos-upload-exist-wrapper {
-    margin-bottom: 1em;
-}
-#photos-upload-existing-album-text,
-#photos-upload-newalbum-div {
-    background-color:#555753;
-    color:#eeeeec;
-    padding:1px;
-}
-#photos-upload-album-select,
-#photos-upload-newalbum {
-    width: 99%;
-}
-#photos-upload-perms-menu {
-    text-align: right;
-}
-#photo-edit-caption, #photo-edit-newtag, #photo-edit-albumname {
-    float: left;
-    margin-bottom: 25px;
-}
-#photo-edit-link-wrap {
-    margin-bottom: 15px;
-}
-#photo-edit-caption {
-    width: 100%;
-}
-#photo-edit-newtag {
-    width: 100%;
-}
-#photo-like-div {
-    margin-bottom: 25px;
-}
-#photo-edit-caption-end, #photo-edit-tags-end, #photo-edit-albumname-end {
-    clear: both;
-}
-#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;
-}
-
-/**
- * message
- */
-.prvmail-text {
-    width: 100%;
-}
-#prvmail-subject {
-    width: 100%;
-    color: #2e2f2e;
-    background: #eec;
-}
-#prvmail-submit-wrapper {
-    margin-top: 10px;
-}
-#prvmail-submit {
-    float:right;
-    margin-top: 0;
-}
-#prvmail-submit-wrapper > div {
-    margin-right:5px;
-    float:left;
-}
-.mail-list-outside-wrapper {
-    margin-top: 20px;
-}
-.mail-list-sender {
-    float: left;
-}
-.mail-list-detail {
-    margin-left: 90px;
-}
-.mail-list-sender-name {
-    display: inline;
-    font-size: 1.1em;
-}
-.mail-list-date {
-    display: inline;
-    font-size: 0.9em;
-    padding-left: 10px;
-}
-.mail-list-sender-name, .mail-list-date {
-    font-style: italic;
-}
-.mail-list-subject {
-    font-size: 1.2em;
-}
-.mail-list-delete-wrapper {
-    float: right;
-}
-.mail-list-outside-wrapper-end {
-    clear: both;
-    border-bottom: 1px #eec dotted;
-}
-.mail-conv-sender {
-    float: left;
-    margin: 0px 5px 5px 0px;
-}
-.mail-conv-sender-photo {
-    width: 32px;
-    height: 32px;
-}
-.mail-conv-sender-name {
-    float: left;
-}
-.mail-conv-date {
-    float: right;
-}
-.mail-conv-subject {
-    clear: right;
-    font-weight: bold;
-    font-size: 1.2em;
-}
-.mail-conv-body {
-    clear: both;
-}
-.mail-conv-delete-wrapper {
-    margin-top: 5px;
-}
-
-
-/**
- * contacts
- */
-.view-contact-wrapper,
-.contact-entry-wrapper {
-    float: left;
-    margin: 0 5px 40px 0;
-    width: 120px;
-    height: 120px;
-    padding: 3px;
-    position: relative;
-}
-.contact-direction-wrapper {
-    position: absolute;
-    top: 20px;
-}
-.contact-edit-links {
-    position: absolute;
-    top: 60px;
-}
-.contact-entry-photo-wrapper {
-
-}
-.contact-entry-photo {
-    margin-left: 20px;
-}
-.contact-entry-name {
-    width: 120px;
-    font-weight: bold;
-    /*overflow: hidden;*/
-}
-.contact-entry-photo {
-    position: relative;
-}
-.contact-entry-edit-links .icon {
-    border: 1px solid #babdb6;
-    -webkit-border-radius: 3px;
-    -moz-border-radius: 3px;
-    border-radius: 3px;
-    background-color: #fff;
-}
-#contact-entry-url, [id^="contact-entry-url"] {
-    font-size: smaller;
-    /*overflow: scroll;*/
-}
-#contact-entry-network, [id^="contact-entry-network"] {
-    font-size: smaller;
-    font-style: italic;
-}
-#contact-edit-banner-name {
-    font-size: 1.5em;
-}
-#contact-edit-photo-wrapper {
-    position: relative;
-    float: left;
-    padding: 20px;
-}
-#contact-edit-direction-icon {
-    position:absolute;
-    top:60px;
-    left:0;
-}
-#contact-edit-nav-wrapper {
-    margin-left: 0px;
-}
-#contact-edit-links {
-    margin-top: 23px;
-}
-#contact-edit-links ul {
-    list-style-type: none;
-}
-#contact-drop-links {
-    margin-left:5px;
-}
-#contact-edit-nav-wrapper .icon {
-    border: 1px solid #babdb6;
-    -webkit-border-radius: 3px;
-    -moz-border-radius: 3px;
-    border-radius: 3px;	
-}
-#contact-edit-poll-wrapper {
-    margin-left: 0px;
-}
-#contact-edit-last-update-text {
-    margin-bottom: 15px;
-}
-#contact-edit-last-updated {
-    font-weight: bold;
-}
-#contact-edit-poll-text {
-    display: inline;
-}
-#contact-edit-info_tbl, #contact-edit-info_parent {
-    width: 100%;
-}
-.mceLayout {
-    width: 100%;
-}
-#contact-edit-end {
-    clear: both;
-    margin-bottom: 65px;
-}
-
-.contact-photo-menu-button {
-    position: absolute;
-    background-image: url("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 #444;
-    background: #2e2f2e;
-    color: #eec;
-    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: #fff;
-    background: #3465A4;
-    text-decoration: none;
-}
-
-
-/**
- * register, settings & profile forms
- */
-.openid {
-
-}
-#id_openid_url {
-    background:url(login-bg.gif) no-repeat;
-    background-position:0 50%;
-    padding-left:18px;
-}
-
-#settings-nickname-desc {
-    background-color: #eec;
-    -webkit-border-radius: 5px;
-    -moz-border-radius: 5px;
-    border-radius: 5px;
-    padding: 5px;
-    color: #111;
-}
-#settings-default-perms {
-    margin-bottom: 20px;
-}
-#register-form div,
-#profile-edit-form div {
-    clear: both;
-}
-.settings-block {
-    
-}
-.settings-block label {
-    clear: left;
-}
-.settings-block input {
-    margin: 10px 5px;
-}
-/*#register-form label,     */
-/*#profile-edit-form label {*/
-/*    width: 300px;         */
-/*    float: left;          */
-/*}                         */
-
-/*#register-form span,     */
-/*#profile-edit-form span {*/
-/*    color: #555753;      */
-/*    display: block;      */
-/*    margin-bottom: 20px; */
-/*}                        */
-#profile-edit-marital-label span {
-    margin: -4px;
-}
-.settings-submit-wrapper,
-.profile-edit-submit-wrapper {
-    margin: 30px 0px;
-}
-.profile-edit-side-div {
-    display: none;
-}
-/*.profile-edit-side-div:hover {
-    display: block;
-}
-.profile-edit-side-link {
-    margin: 3px 0px 0px 70px;
-}*/
-#profiles-menu-trigger {
-    margin: 0px 0px 0px 25px;
-}
-.profile-listing {
-    float: left;
-    margin: 20px 20px 0px 0px;
-}
-.icon-profile-edit {
-    background: url("icons.png") -150px 0px no-repeat;
-    border: 0;
-    cursor: pointer;
-    display: block;
-    float: right;
-    width: 20px;
-    height: 20px;
-    margin: 0 0 -18px;
-    position: absolute;
-    text-decoration: none;
-    top: 113px;
-    right: 260px;
-}
-#profile-edit-links ul {
-    margin: 20px 0;
-    padding: 0;
-    list-style: none;
-}
-.marital {
-    margin-top: 5px;
-}
-#register-sitename {
-    display: inline;
-    font-weight: bold;
-}
-#advanced-expire-popup {
-    background: #2e2f2e;
-    color: #eec;
-}
-#id_ssl_policy {
-    width: 374px;
-}
-#theme-preview {
-
-}
-#theme-preview img {
-    margin: 10px 10px 10px 288px;
-}
-
-
-/**
- * contacts selector
- */
-.group-delete-wrapper {
-    margin: -31px 50px 0 0;
-    float: right;
-}
-/*.group-delete-icon {
-    margin: 0 0 0 10px;
-}*/
-#group-edit-submit-wrapper {
-    margin: 0 0 10px 0;
-    display: inline;
-}
-#group-edit-desc {
-    margin: 10px 0px;
-}
-#group-members,
-#prof-members {
-    height:200px;
-    overflow:auto;
-    border:1px solid #555753;
-    -webkit-border-radius:5px 5px 0 0;
-    -moz-border-radius:5px 5px 0 0;
-    border-radius:5px 5px 0 0;
-}
-#group-all-contacts,
-#prof-all-contacts {
-    height:200px;
-    overflow:auto;
-    border:1px solid #555753;
-    -webkit-border-radius:0 0 5px 5px;
-    -moz-border-radius:0 0 5px 5px;
-    border-radius:0 0 5px 5px;
-}
-#group-members h3,
-#group-all-contacts h3,
-#prof-members h3,
-#prof-all-contacts h3 {
-    color:#eeeeec;
-    background-color:#555753;
-    margin:0;
-    padding:5px;
-}
-#group-separator,
-#prof-separator {
-    display: none;
-}
-
-
-/**
- * profile
- */
-#cropimage-wrapper {
-    float:left;
-}
-#crop-image-form {
-    clear:both;
-}
-
-
-/**
- * intros
- */
-.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;
-}
-.intro-approve-as-friend, .intro-approve-as-fan {
-    float: left;
-}
-.intro-form-end {
-    clear: both;
-    margin-bottom: 10px;
-}
-.intro-approve-as-friend-desc {
-    margin-top: 10px;
-}
-.intro-approve-as-end {
-    clear: both;
-    margin-bottom: 10px;
-}
-
-.intro-end {
-    clear: both;
-}
-
-
-/**
- * events
- */
-.clear { clear: both; }
-.eventcal {
-    float:left;
-    font-size:20px;
-}
-.event {
-    background: #2e2f2e;
-}
-.vevent {
-    border:1px solid #ccc;
-}
-.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;
-    font-size: smaller;
-}
-.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: monospace;
-}
-.today {
-    font-weight: bold;
-    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,
-#event-share-checkbox {
-    float:left;
-}
-#event-datetime-break {
-    margin-bottom: 10px;
-}
-#event-nofinish-break,
-#event-adjust-break,
-#event-share-break {
-    clear: both;
-}
-#event-desc-text, 
-#event-location-text {
-    margin-top: 10px;
-    margin-bottom: 5px;
-}
-#event-submit {
-    margin-top: 10px;
-}
-.body-tag {
-    margin: 10px 0;
-    opacity: 0.5;
-    filter:alpha(opacity=50);
-}
-.body-tag:hover {
-    opacity: 1.0 !important;
-    filter:alpha(opacity=100) !important;
-}
-.filesavetags, .categorytags {
-    margin: 20px 0;
-    opacity: 0.5;
-    filter:alpha(opacity=50);
-}
-.filesavetags:hover, .categorytags:hover {
-    margin: 20px 0;
-    opacity: 1.0 !important;
-    filter:alpha(opacity=100) !important;
-}
-.item-select {
-    opacity: 0.1;
-    filter:alpha(opacity=10);
-    margin: 5px 0 0 6px !important;
-}
-.item-select:hover, .checkeditem {
-    opacity: 1;
-    filter:alpha(opacity=100);
-}
-#item-delete-selected {
-    margin-top: 30px;
-}
-/* was tired of having no way of moving it around, so
-* here's a little 'hook' to do so */
-.delete-checked {
-    position: absolute;
-    left: 35px;
-    margin-top: 20px;
-}
-#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;
-}
-.fc-state-highlight {
-    background: #eec;
-    color: #2e2f2e;
-}
-
-
-/**
- * directory
- */
-.directory-item {
-    float: left;
-    /*margin: 50px 50px 0px 0px;*/
-    margin: 0 5px 4px 0;
-    padding: 3px;
-    width: 180px;
-    height: 250px;
-    position: relative;
-}
-
-
-/**
- * sidebar
- */
-#group-sidebar {
-    margin-bottom: 10px;
-}
-.group-selected, .nets-selected, .fileas-selected {
-    padding: 3px;
-    color: #2e2f2e;
-    background: #88a9d2;
-    font-weight: bold;
-}
-.group-selected:hover, .nets-selected:hover, .fileas-selected:hover {
-    color: #2e2f2e;
-}
-.groupsideedit {
-    margin-right: 10px;
-}
-#sidebar-group-ul {
-    padding-left: 0;
-}
-#sidebar-group-list {
-    margin: 0 0 5px 0;
-}
-#sidebar-group-list ul {
-    list-style-type: none;
-    list-style-position: inside;
-}
-#sidebar-group-list li {
-    margin-top: 10px;
-}
-#sidebar-group-list .icon {
-    display: inline-block;
-    height: 12px;
-    width: 12px;
-}
-#sidebar-new-group {
-    margin: auto;
-    display: inline-block;
-    color: #efefef;
-    text-decoration: none;
-    text-align: center;
-}
-#peoplefind-sidebar form {
-    margin-bottom: 10px;
-}
-#sidebar-new-group:hover {
-    /*background: -webkit-gradient( linear, left top, left bottom, color-stop(0.05, #b20202), color-stop(1, #d60808) );*/
-    /*background: -moz-linear-gradient( center top, #b20202 5%, #d60808 100% );*/
-    /*background-color: #b20202;*/
-}
-
-#sidebar-new-group:active {
-    position: relative;
-    top: 1px;
-}
-#side-peoplefind-url {
-    background-color: #2e2f2e;
-    color: #eec;
-    border: 1px 999 solid;
-    margin-right: 3px;
-    width: 75%;
-}
-#side-peoplefind-url:hover, #side-peoplefind-url:focus {
-    background-color: #efefef;
-    color: #222;
-    border: 1px 333 solid;
-}
-.nets-ul {
-    list-style-type: none;
-    padding-left: 0px;
-}
-.nets-ul li {
-    margin: 10px 0 0;
-}
-
-.nets-link {
-    margin-left: 0px;
-}
-.nets-all {
-    margin-left: 0px;
-}
-#netsearch-box {
-    margin-top: 20px;
-    width: 150px;   
-}
-#netsearch-box #search-submit {
-    margin: 5px 0px 0px 0px;
-}
-
-
-/**
- * admin
- */
-#pending-update {
-    float:right;
-    color: #fff;
-    font-weight: bold;
-    background-color: #ff0000;
-    padding: 0 .3em;
-}
-.admin.linklist {
-    border: 0; padding: 0;
-}
-.admin.link {
-    list-style-position: inside;
-}
-#adminpage {
-    color: #eec;
-    background: #2e2f2e;
-    margin: 5px;
-    padding: 10px;
-}
-#adminpage dl {
-    clear:left;
-    margin-bottom: 2px;
-    padding-bottom: 2px;
-    border-bottom: 1px solid #000;
-}
-#adminpage dt {
-    width: 250px;
-    float: left;
-    font-weight: bold;
-}
-#adminpage dd {
-    margin-left: 250px;
-}
-#adminpage h3 {
-    border-bottom:1px solid #ccc;
-}
-
-#adminpage .submit {
-    clear:left;
-}
-#adminpage #pluginslist {
-    margin: 0;
-    padding: 0;
-}
-#adminpage .plugin {
-    list-style: none;
-    display: block;
-    border: 1px solid #888;
-    padding: 1em;
-    margin-bottom: 5px;
-    clear: left;
-}
-#adminpage .toggleplugin {
-    float:left;
-    margin-right: 1em;
-}
-#adminpage table {
-    width: 100%;
-    border-bottom: 1px solid #000;
-    margin: 5px 0;
-}
-#adminpage table th {
-    text-align: left;
-}
-#adminpage td .icon {
-    float: left;
-}
-#adminpage table#users img {
-    width: 16px; height: 16px;
-}
-#adminpage table tr:hover {
-    color: #2e2f2e;
-    background-color: #eec;
-}
-#adminpage .selectall {
-    text-align: right;
-}
-#adminpage #users a {
-    color: #eec;
-    text-decoration: underline;
-}
-#users .name {
-    color: #eec;
-}
-
-
-/**
- * form fields
- */
-.field {
-    /*margin-bottom: 10px;*/
-    /*padding-bottom: 10px;*/
-    overflow: auto;
-    width: 100%;
-}
-.field label, label {
-    width: 38%;
-    display: inline-block;
-    font-size: 1.077em;
-    margin: 0 10px 1em 0;
-    border: 1px #2e2f2e solid;
-    padding: 5px;
-    background: #eec;
-    color: #111;
-}
-input,
-input[type="text"],
-input[type="password"],
-input[type="search"] {
-    width: 250px;
-    height: 25px;
-    border: 1px #999 solid;
-}
-input[type="checkbox"], input[type="radio"] {
-    border: 1px #999 solid;
-    margin: 0 0 0 0;
-	height: 15px;
-	width: 15px;
-}
-input[type="submit"], input[type="button"] {
-    background-color: #eee;
-    border: 2px outset #aaa;
-    border-radius: 5px;
-    box-shadow: 1px 3px 4px 0 #111;
-    color: #2e302e;
-    cursor: pointer;
-    font-weight: bold;
-    width: auto;
-    text-shadow: 1px 1px #000;
-    -webkit-border-radius: 5px;
-    -moz-border-radius: 5px;
-}
-input[type="submit"]:active, input[type="button"]:active {
-    box-shadow: 0 0 0 0;
-}
-.field textarea {
-    width: 80%;
-    height: 100px;
-}
-.field_help {
-    display: block;
-    margin-left: 297px;
-    color: #aaa;
-}
-.field .onoff {
-    float: left;
-    width: 80px;
-}
-.field .onoff a {
-    display: block;
-    border: 1px solid #666;
-    padding: 3px 6px 4px 10px;
-    height: 16px;
-    text-decoration: none;
-}
-.field .onoff .on {
-    background: url("../../../images/onoff.jpg") no-repeat 42px 1px #999;
-    color: #111;
-    text-align: left;
-}
-.field .onoff .off {
-    background: url("../../../images/onoff.jpg") no-repeat 2px 1px #ccc;
-    color: #333;
-    text-align: right;
-}
-.hidden {
-    display:none !important;
-}
-.field.radio .field_help {
-    margin-left: 297px;
-}
-
-
-/*
- * 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;
-}
-#panel {
-    z-index: 100;
-}
-.grey {
-    color: grey;
-}
-.orange {
-    color: orange;
-}
-.red {
-    color: red;
-}
-.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: 20px;
-    height: 20px;
-    background: url(icons.png) no-repeat;
-    border: 0;
-    text-decoration: none;
-    border-radius: 5px;
-}
-.icon:hover {
-    border: 0;
-    text-decoration: none;
-}
-.editicon {
-    display: inline-block;
-    width: 21px;
-    height: 21px;
-    background: url(editicons.png) no-repeat;
-    border: 0;
-    text-decoration: none;
-}
-.shadow {
-	box-shadow: 2px 2px 5px 2px #111;
-}
-.shadow:active, .shadow:focus, .shadow:hover {
-	box-shadow: 0 0 0 0;
-}
-.editicon:hover {
-	border: 0;
-}
-.boldbb {
-	background-position: 0px 0px;
-}
-.boldbb:hover {
-	background-position: -22px 0px;
-}
-.italicbb {
-	background-position: 0px -22px;
-}
-.italicbb:hover {
-	background-position: -22px -22px;
-}
-.underlinebb {
-	background-position: 0px -44px;
-}
-.underlinebb:hover {
-	background-position: -22px -44px;
-}
-.quotebb {
-	background-position: 0px -66px;
-}
-.quotebb:hover {
-	background-position: -22px -66px;
-}
-.codebb {
-	background-position: 0px -88px;
-}
-.codebb:hover {
-	background-position: -22px -88px;
-}
-.imagebb {
-	background-position: -44px 0px;
-}
-.imagebb:hover {
-	background-position: -66px 0px;
-}
-.urlbb {
-	background-position: -44px -22px;
-}
-.urlbb:hover {
-	background-position: -66px -22px;
-}
-.videobb {
-	background-position: -44px -44px;
-}
-.videobb:hover {
-	background-position: -66px -44px;
-}
-.icon.drop,
-.icon.drophide, .icon.delete {
-    float: left;
-    margin: 0 2px;
-}
-.icon.s22.delete {
-    display: block;
-    background-position: -110px 0;
-}
-.icon.s22.text {
-    padding: 10px 0px 0px 25px;
-    width: 200px;
-}
-.icon.text {
-    text-indent: 0px;
-}
-.icon.s16 {
-    min-width: 16px;
-    height: 16px;
-}
-.s16 .add {
-    background: url("../../../images/icons/16/add.png") no-repeat;
-}
-.add {
-    margin: 0px 5px;    
-}
-.article {
-    background-position: -50px 0;
-}
-.audio {
-    background-position: -70px 0;
-}
-.block {
-    background-position: -90px 0px;
-}
-.drop, .delete {
-    background-position: -110px 0;
-}
-.drophide {
-    background-position: -130px 0;
-}
-.edit {
-    background-position: -150px 0;
-}
-.camera {
-    background-position: -170px 0;
-}
-.dislike {
-    background-position: -190px 0;
-}
-.file-as {
-    background-position: -230px -60px;
-}
-.like {
-    background-position: -211px 0;
-}
-.link {
-    background-position: -230px 0;
-}
-.globe, .location {
-    background-position: -50px -20px;
-}
-.noglobe, .nolocation {
-    background-position: -70px -20px;
-}
-.no {
-    background-position: -90px -20px;
-}
-.pause {
-    background-position: -110px -20px;
-}
-.play {
-    background-position: -130px -20px;
-}
-.pencil {
-    background-position: -151px -18px;
-}
-.small-pencil {
-    background-position: -170px -20px;
-}
-.recycle {
-    background-position: -190px -20px;
-}
-.remote-link {
-    background-position: -210px -20px;
-}
-.share {
-    background-position: -230px -20px;
-}
-.tools {
-    background-position: -50px -40px;
-}
-.lock {
-    background-position: -70px -40px;
-}
-.unlock {
-    background-position: -88px -40px;
-}
-.video {
-    background-position: -110px -40px;
-}
-.attach {
-    background-position: -190px -40px;
-}
-.language {
-    background-position: -210px -40px;
-}
-.starred {
-    background-position: -130px -60px;
-}
-.unstarred {
-    background-position: -150px -60px;
-}
-.tagged {
-    background-position: -170px -60px;
-}
-.on {
-    background-position: -50px  -60px;
-}
-.off {
-    background-position: -70px  -60px;
-}
-.prev {
-    background-position: -90px  -60px;
-}
-.next {
-    background-position: -110px  -60px;
-}
-.icon.dim {
-    opacity: 0.3;
-    filter: alpha(opacity=30);
-}
-#pause {
-    position: fixed;
-    bottom: 40px;
-    right: 30px;
-}
-.border, .border:hover {
-    border: 1px solid #babdb6;
-    -webkit-border-radius: 5px;
-    -moz-border-radius: 5px;
-    border-radius: 5px;	
-}
-.attachtype {
-    display: block;
-    width: 20px;
-    height: 23px;
-    background-image: url(../../../images/content-types.png);
-}
-.type-video {
-    background-position: 0px 0px;
-}
-.type-image {
-    background-position: -20px 0;
-}
-.type-audio {
-    background-position: -40px 0;
-}
-.type-text {
-    background-position: -60px 0px;
-}
-.type-unkn {
-    background-position: -80px 0;
-}
-
-
-/**
- * footer
- */
-.cc-license {
-    margin-top: 100px;
-    font-size: 0.7em;
-}
-footer {
-    display: block;
-    /*margin: 50px 20%;*/
-    clear: both;
-}
-#profile-jot-text {
-    height: 20px;
-    color: #eec;
-    border: 1px solid #eec;
-    border-radius: 5px;
-    width: 99.5%;
-}
-
-
-/**
- * acl
- */
-#photo-edit-perms-select,
-#photos-upload-permissions-wrapper,
-#profile-jot-acl-wrapper {
-    display: block !important;
-    background: #2e2f2e;
-    color: #eec;
-}
-#acl-wrapper {
-    width: 660px;
-    margin: 0 auto;
-}
-#acl-search {
-    float: right;
-    background: #fff url("../../../images/search_18.png") no-repeat right center;
-    padding-right: 20px;
-    margin: 6px;
-    color: #111;
-}
-#acl-showall {
-    float: left;
-    display: block;
-    width: auto;
-    height: 18px;
-    background: #eec url("../../../images/show_all_off.png") 8px 8px no-repeat;
-    padding: 7px 10px 7px 30px;
-    -webkit-border-radius: 5px;
-    -moz-border-radius: 5px;
-    border-radius: 5px;
-    color: #999;
-    margin: 5px 0;
-}
-#acl-showall.selected {
-    color: #000;
-    background: #f90 url(../../../images/show_all_on.png) 8px 8px no-repeat;
-}
-#acl-list {
-    height: 210px;
-    border: 1px solid #ccc;
-    clear: both;
-    margin-top: 30px;
-    overflow: auto;
-}
-/*#acl-list-content {
-}*/
-.acl-list-item {
-    border: 1px solid #eec;
-    display: block;
-    float: left;
-    height: 110px;
-    margin: 3px 0 5px 5px;
-    width: 120px;
-}
-.acl-list-item img {
-    width: 22px;
-    height: 22px;
-    float: left;
-    margin: 5px 5px 20px;
-}
-.acl-list-item p {
-    height: 12px;
-    font-size: 10px;
-    margin: 0 0 22px;
-    padding: 2px 0 1px;
-}
-.acl-list-item a {
-    background: #eec 3px 3px no-repeat;
-    -webkit-border-radius: 2px;
-    -moz-border-radius: 2px;
-    border-radius: 2px;
-    clear: both;
-    font-size: 10px;
-    display: block;
-    width: 55px;
-    height: 20px;
-    color: #2e2f2e;
-    margin: 5px auto 0;
-    padding: 0 3px;
-    text-align: center;
-    vertical-align: middle;
-}
-#acl-wrapper a:hover {
-    text-decoration: none;
-    color: #2e2f2e;
-    border: 0;
-}
-.acl-button-show {
-    background-image: url('../../../images/show_off.png');
-    margin: 0 auto;
-}
-.acl-button-hide {
-    background-image: url('../../../images/hide_off.png');
-    margin: 0 auto;
-}
-.acl-button-show.selected {
-    color: #2e2f2e;
-    background-color: #9ade00;
-    background-image: url(../../../images/show_on.png);
-}
-.acl-button-hide.selected {
-    color: #2e2f2e;
-    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 **/
-
-
-/* autocomplete popup */
-.acpopup {
-    max-height: 175px;
-    max-width: 42%;
-    background-color: #555753;
-    color: #fff;
-    overflow: auto;
-    z-index: 100000;
-    border: 1px solid #cccccc;
-}
-.acpopupitem {
-    background-color: #555753;
-    padding: 4px;
-    clear: left;
-}
-.acpopupitem img {
-    float: left;
-    margin-right: 4px;
-}
-.acpopupitem.selected {
-    color: #2e302e;
-    background-color: #eeeeec;
-}
-.qcomment-wrapper {
-    padding: 0px;
-    margin: 5px 5px 5px 81%;
-}
-.qcomment {
-    opacity: 0.5;
-    filter:alpha(opacity=50);
-}
-.qcomment:hover {
-    opacity: 1.0;
-    filter:alpha(opacity=100);
-}
-#network-star-link {
-    margin-top: 10px;
-}
-.network-star {
-    float: left;
-    margin-right: 5px;
-}
-.network-star.icon.starred {
-    display: inline-block;
-}
-#fileas-sidebar {
-    
-}
-.fileas-ul {
-    padding: 0;
-}
-
-
-
-/*
- * addons theming
- */
-
-#sidebar-page-list {
-    
-}
-#sidebar-page-list ul {
-    padding: 0;
-    margin: 5px 0;
-}
-#sidebar-page-list li {
-    list-style: none;
-}
-#jappix_mini {
-    margin-left: 130px;
-    position: fixed;
-    bottom: 0;
-    right: 175px !important; /* override the jappix css */
-    z-index: 999;
-}
-
-@media handheld {
-    body {
-        font-size: 15pt;
-    }
-}
diff --git a/view/theme/dispy-dark/theme.php b/view/theme/dispy-dark/theme.php
deleted file mode 100644
index 57e0fbe5c..000000000
--- a/view/theme/dispy-dark/theme.php
+++ /dev/null
@@ -1,163 +0,0 @@
-<?php
-
-/*
- * Name: Dispy Dark
- * Description: Dispy Dark, Friendica theme
- * Version: 1.1
- * Author: Simon <http://simon.kisikew.org/>
- * Maintainer: Simon <http://simon.kisikew.org/>
- * Screenshot: <a href="screenshot.jpg">Screenshot</a>
- */
-
-$a = get_app();
-$a->theme_info = array(
-	'name' => 'dispy-dark',
-	'version' => '1.1'
-);
-
-function dispy_dark_init(&$a) {
-
-	// aside on profile page
-	if (($a->argv[0] . $a->argv[1]) === ("profile" . $a->user['nickname'])) {
-		dispy_dark_community_info();
-	}
-
-	$a->page['htmlhead'] .= <<<EOT
-	<script type="text/javascript">
-	$(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'); }
-			);
-
-		// click outside notifications menu closes it
-		$('html').click(function() {
-			$('#nav-notifications-linkmenu').removeClass('selected');
-			$('#nav-notifications-menu').css({display: 'none'});
-		});
-
-		$('#nav-notifications-linkmenu').click(function(event) {
-			event.stopPropagation();
-		});
-		// click outside profiles menu closes it
-		$('html').click(function() {
-			$('#profiles-menu-trigger').removeClass('selected');
-			$('#profiles-menu').css({display: 'none'});
-		});
-
-		$('#profiles-menu').click(function(event) {
-			event.stopPropagation();
-		});
-
-		// main function in toolbar functioning
-		function toggleToolbar() {
-			if ( $('#nav-floater').is(':visible') ) {
-				$('#nav-floater').slideUp('fast');
-				$('.floaterflip').css({
-					backgroundPosition: '-210px -60px' 
-				});
-				$('.search-box').slideUp('fast');
-			} else {
-				$('#nav-floater').slideDown('fast');
-				$('.floaterflip').css({
-					backgroundPosition: '-190px -60px'
-				});
-				$('.search-box').slideDown('fast');
-			}
-		};
-		// our trigger for the toolbar button
-		$('.floaterflip').click(function() {
-			toggleToolbar();
-			return false;
-		});
-
-		// (attempt to) change the text colour in a top post
-		$('#profile-jot-text').focusin(function() {
-			$(this).css({color: '#eec'});
-		});
-
-		$('a[href=#top]').click(function() {
-			$('html, body').animate({scrollTop:0}, 'slow');
-			return false;
-		});
-
-	});
-	// shadowing effect for floating toolbars
-	$(document).scroll(function(e) {
-		var pageTop = $('html').scrollTop();
-		if (pageTop) {
-			$('#nav-floater').css({boxShadow: '3px 3px 10px rgba(0, 0, 0, 0.7)'});
-			$('.search-box').css({boxShadow: '3px 3px 10px rgba(0, 0, 0, 0.7)'});
-		} else {
-			$('#nav-floater').css({boxShadow: '0 0 0 0'});
-			$('.search-box').css({boxShadow: '0 0 0 0'});
-		}
-	});
-	</script>
-EOT;
-
-	js_in_foot();
-}
-
-function dispy_dark_community_info() {
-	$a = get_app();
-	$url = $a->get_baseurl($ssl_state);
-	$aside['$url'] = $url;
-
-	$tpl = file_get_contents(dirname(__file__) . '/communityhome.tpl');
-	return $a->page['aside_bottom'] = replace_macros($tpl, $aside);
-}
-
-function js_in_foot() {
-	/** @purpose insert stuff in bottom of page
-	 */
-	$a = get_app();
-	$baseurl = $a->get_baseurl($ssl_state);
-	$bottom['$baseurl'] = $baseurl;
-	$tpl = file_get_contents(dirname(__file__) . '/bottom.tpl');
-
-	return $a->page['bottom'] = replace_macros($tpl, $bottom);
-}
diff --git a/view/theme/dispy-dark/wall_item.tpl b/view/theme/dispy-dark/wall_item.tpl
deleted file mode 100644
index 52af07532..000000000
--- a/view/theme/dispy-dark/wall_item.tpl
+++ /dev/null
@@ -1,84 +0,0 @@
-<div class="wall-item-outside-wrapper$item.indent$item.previewing" 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" id="wall-item-info-$item.id">
-			<div class="wall-item-photo-wrapper" 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" target="redir" 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-location" id="wall-item-location-$item.id">{{ if $item.location }}<span class="icon globe"></span>$item.location {{ endif }}</div>				
-		</div>
-		<div class="wall-item-tools" id="wall-item-tools-$item.id">
-			<div class="wall-item-lock-wrapper">
-				{{ 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>
-			<ul class="wall-item-subtools1">
-				{{ if $item.star }}
-				<li>
-					<a href="#" id="starred-$item.id" onclick="dostar($item.id); return false;" class="star-item icon $item.isstarred" title="$item.star.toggle"></a>
-					<a href="#" id="tagger-$item.id" onclick="itemTag($item.id); return false;" class="tag-item icon tagged" title="$item.star.tagger"></a>
-				</li>
-				{{ endif }}
-				{{ if $item.vote }}
-				<li class="wall-item-like-buttons" id="wall-item-like-buttons-$item.id">
-					<a href="#" class="icon like" title="$item.vote.like.0" onclick="dolike($item.id,'like'); return false"></a>
-					<a href="#" class="icon dislike" title="$item.vote.dislike.0" onclick="dolike($item.id,'dislike'); return false"></a>
-					{{ if $item.vote.share }}
-						<a href="#" id="share-$item.id"
-							class="icon recycle wall-item-share-buttons" title="$item.vote.share.0" onclick="jotShare($item.id); return false"></a>{{ endif }}
-					<img id="like-rotator-$item.id" class="like-rotator" src="images/rotator.gif" alt="$item.wait" title="$item.wait" style="display: none;" />
-				</li>
-				{{ endif }}
-			</ul><br style="clear:left;" />
-			<ul class="wall-item-subtools2">
-				{{ if $item.filer }}
-				<li><a href="#" id="filer-$item.id" onclick="itemFiler($item.id); return false;" class="filer-item icon file-as" title="$item.star.filer"></a></li>
-				{{ endif }}
-				{{ if $item.plink }}
-				<li class="wall-item-links-wrapper"><a href="$item.plink.href" title="$item.plink.title" target="external-link" class="icon remote-link"></a></li>
-				{{ endif }}
-				{{ if $item.edpost }}
-				<li><a class="editpost icon pencil" href="$item.edpost.0" title="$item.edpost.1"></a></li>
-				{{ endif }}
-				<li class="wall-item-delete-wrapper" id="wall-item-delete-wrapper-$item.id">
-				{{ if $item.drop.dropping }}<div><a href="item/drop/$item.id" onclick="return confirmDelete();" class="icon drophide" title="$item.drop.delete" onmouseover="imgbright(this);" onmouseout="imgdull(this);" ></a></div>{{ endif }}
-				{{ if $item.drop.dropping }}<div><input type="checkbox" onclick="checkboxhighlight(this);" title="$item.drop.select" class="item-select" name="itemselected[]" value="$item.id" /></div>{{ endif }}
-				</li>
-			</ul>
-			<div class="wall-item-delete-end"></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>
-			</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>
-				<div class="wall-item-ago"  id="wall-item-ago-$item.id">$item.ago</div>
-		</div>	
-	</div>
-	<div class="wall-item-wrapper-end"></div>
-	<div class="wall-item-like" id="wall-item-like-$item.id">$item.like</div>
-	<div class="wall-item-dislike" id="wall-item-dislike-$item.id">$item.dislike</div>
-	<div class="wall-item-comment-wrapper">
-	$item.comment
-	</div>
-</div>
-
-<div class="wall-item-outside-wrapper-end$item.indent"></div>
-
diff --git a/view/theme/dispy-dark/wallwall_item.tpl b/view/theme/dispy-dark/wallwall_item.tpl
deleted file mode 100644
index e8cbc2cd4..000000000
--- a/view/theme/dispy-dark/wallwall_item.tpl
+++ /dev/null
@@ -1,90 +0,0 @@
-<div class="wall-item-outside-wrapper$item.indent wallwall" 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 wallwall" id="wall-item-info-$item.id">
-			<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>
-			<div class="wall-item-photo-wrapper wwfrom" 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-location" id="wall-item-location-$item.id">{{ if $item.location }}<span class="icon globe"></span>$item.location {{ endif }}</div>				
-		</div>
-		<div class="wall-item-tools" id="wall-item-tools-$item.id">
-			<div class="wall-item-lock-wrapper">
-				{{ 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>
-			<ul class="wall-item-subtools1">
-				{{ if $item.star }}
-				<li>
-					<a href="#" id="starred-$item.id" onclick="dostar($item.id); return false;" class="star-item icon $item.isstarred" title="$item.star.toggle"></a>
-					<a href="#" id="tagger-$item.id" onclick="itemTag($item.id); return false;" class="tag-item icon tagged" title="$item.star.tagger"></a>
-				</li>
-				{{ endif }}
-				{{ if $item.vote }}
-				<li class="wall-item-like-buttons" id="wall-item-like-buttons-$item.id">
-					<a href="#" class="icon like" title="$item.vote.like.0" onclick="dolike($item.id,'like'); return false"></a>
-					<a href="#" class="icon dislike" title="$item.vote.dislike.0" onclick="dolike($item.id,'dislike'); return false"></a>
-					{{ if $item.vote.share }}
-					<a href="#" id="share-$item.id"
-class="icon recycle wall-item-share-buttons"  title="$item.vote.share.0" onclick="jotShare($item.id); return false"></a>{{ endif }}
-					<img id="like-rotator-$item.id" class="like-rotator" src="images/rotator.gif" alt="$item.wait" title="$item.wait" style="display: none;" />
-				</li>
-				{{ endif }}
-			</ul><br style="clear:left;" />
-			<ul class="wall-item-subtools2">
-			{{ if $item.filer }}
-				<li class="wall-item-filer-wrapper"><a href="#" id="filer-$item.id" onclick="itemFiler($item.id); return false;" class="filer-item icon file-as" title="$item.star.filer"></a></li>
-			{{ endif }}
-			{{ if $item.plink }}
-				<li class="wall-item-links-wrapper"><a href="$item.plink.href" title="$item.plink.title" target="external-link" class="icon remote-link"></a></li>
-			{{ endif }}
-			{{ if $item.edpost }}
-				<li><a class="editpost icon pencil" href="$item.edpost.0" title="$item.edpost.1"></a></li>
-			{{ endif }}
-		
-			<li 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 }}
-				{{ if $item.drop.dropping }}<input type="checkbox" onclick="checkboxhighlight(this);" title="$item.drop.select" class="item-select" name="itemselected[]" value="$item.id" />{{ endif }}
-			</li>
-			</ul>
-			<div class="wall-item-delete-end"></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>			
-			</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>
-			<div class="wall-item-ago"  id="wall-item-ago-$item.id">$item.ago</div>
-		</div>	
-	</div>	
-	<div class="wall-item-wrapper-end"></div>
-	<div class="wall-item-like" id="wall-item-like-$item.id">$item.like</div>
-	<div class="wall-item-dislike" id="wall-item-dislike-$item.id">$item.dislike</div>
-	<div class="wall-item-comment-wrapper">
-	$item.comment
-	</div>
-</div>
-
-<div class="wall-item-outside-wrapper-end$item.indent" ></div>
-
diff --git a/view/theme/dispy/config.php b/view/theme/dispy/config.php
new file mode 100644
index 000000000..a24288bf8
--- /dev/null
+++ b/view/theme/dispy/config.php
@@ -0,0 +1,79 @@
+<?php
+/**
+ * Theme settings
+ */
+
+function theme_content(&$a) {
+	if(!local_user()) { return;	}
+
+	$font_size = get_pconfig(local_user(),'dispy', 'font_size' );
+	$line_height = get_pconfig(local_user(), 'dispy', 'line_height' );
+	$colour = get_pconfig(local_user(), 'dispy', 'colour' );
+	
+	return dispy_form($a, $font_size, $line_height, $colour);
+}
+
+function theme_post(&$a) {
+	if(!local_user()) { return; }
+	
+	if (isset($_POST['dispy-settings-submit'])) {
+		set_pconfig(local_user(), 'dispy', 'font_size', $_POST['dispy_font_size']);
+		set_pconfig(local_user(), 'dispy', 'line_height', $_POST['dispy_line_height']);
+		set_pconfig(local_user(), 'dispy', 'colour', $_POST['dispy_colour']);	
+	}
+}
+
+function theme_admin(&$a) {
+	$font_size = get_config('dispy', 'font_size' );
+	$line_height = get_config('dispy', 'line_height' );
+	$colour = get_config('dispy', 'colour' );	
+	
+	return dispy_form($a, $font_size, $line_height, $colour);
+}
+
+function theme_admin_post(&$a) {
+	if (isset($_POST['dispy-settings-submit'])) {
+		set_config('dispy', 'font_size', $_POST['dispy_font_size']);
+		set_config('dispy', 'line_height', $_POST['dispy_line_height']);
+		set_config('dispy', 'colour', $_POST['dispy_colour']);
+	}
+}
+
+function dispy_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__). "/theme_settings.tpl" );
+	$o .= replace_macros($t, array(
+		'$submit' => t('Submit'),
+		'$baseurl' => $a->get_baseurl(),
+		'$title' => t("Theme settings"),
+		'$font_size' => array('dispy_font_size', t('Set font-size for posts and comments'), $font_size, '', $font_sizes),
+		'$line_height' => array('dispy_line_height', t('Set line-height for posts and comments'), $line_height, '', $line_heights),
+		'$colour' => array('dispy_colour', t('Set colour scheme'), $colour, '', $colours),	
+	));
+
+	return $o;
+}
diff --git a/view/theme/dispy-dark/connect.png b/view/theme/dispy/dark/connect.png
index b76fc13dc..b76fc13dc 100644
--- a/view/theme/dispy-dark/connect.png
+++ b/view/theme/dispy/dark/connect.png
diff --git a/view/theme/dispy-dark/editicons.png b/view/theme/dispy/dark/editicons.png
index 51e0d9830..51e0d9830 100644
--- a/view/theme/dispy-dark/editicons.png
+++ b/view/theme/dispy/dark/editicons.png
diff --git a/view/theme/dispy-dark/editicons.svg b/view/theme/dispy/dark/editicons.svg
index 8804d0907..8804d0907 100644
--- a/view/theme/dispy-dark/editicons.svg
+++ b/view/theme/dispy/dark/editicons.svg
diff --git a/view/theme/dispy-dark/icons.png b/view/theme/dispy/dark/icons.png
index 2ee1a5ecb..2ee1a5ecb 100644
--- a/view/theme/dispy-dark/icons.png
+++ b/view/theme/dispy/dark/icons.png
diff --git a/view/theme/dispy-dark/icons.svg b/view/theme/dispy/dark/icons.svg
index 2c4b3abd3..2c4b3abd3 100644
--- a/view/theme/dispy-dark/icons.svg
+++ b/view/theme/dispy/dark/icons.svg
diff --git a/view/theme/dispy-dark/login-bg.gif b/view/theme/dispy/dark/login-bg.gif
index cde836c89..cde836c89 100644
--- a/view/theme/dispy-dark/login-bg.gif
+++ b/view/theme/dispy/dark/login-bg.gif
diff --git a/view/theme/dispy-dark/menu-user-pin.jpg b/view/theme/dispy/dark/menu-user-pin.jpg
index 26449569f..26449569f 100644
--- a/view/theme/dispy-dark/menu-user-pin.jpg
+++ b/view/theme/dispy/dark/menu-user-pin.jpg
diff --git a/view/theme/dispy-dark/next.png b/view/theme/dispy/dark/next.png
index 5e0067c4b..5e0067c4b 100644
--- a/view/theme/dispy-dark/next.png
+++ b/view/theme/dispy/dark/next.png
diff --git a/view/theme/dispy-dark/notifications.png b/view/theme/dispy/dark/notifications.png
index 66c432eac..66c432eac 100644
--- a/view/theme/dispy-dark/notifications.png
+++ b/view/theme/dispy/dark/notifications.png
diff --git a/view/theme/dispy-dark/notifications.svg b/view/theme/dispy/dark/notifications.svg
index 0ec2c0569..0ec2c0569 100644
--- a/view/theme/dispy-dark/notifications.svg
+++ b/view/theme/dispy/dark/notifications.svg
diff --git a/view/theme/dispy-dark/photo-menu.jpg b/view/theme/dispy/dark/photo-menu.jpg
index fde5eb535..fde5eb535 100644
--- a/view/theme/dispy-dark/photo-menu.jpg
+++ b/view/theme/dispy/dark/photo-menu.jpg
diff --git a/view/theme/dispy-dark/premium.png b/view/theme/dispy/dark/premium.png
index d2855a4f5..d2855a4f5 100644
--- a/view/theme/dispy-dark/premium.png
+++ b/view/theme/dispy/dark/premium.png
diff --git a/view/theme/dispy-dark/prev.png b/view/theme/dispy/dark/prev.png
index 10b10d74f..10b10d74f 100644
--- a/view/theme/dispy-dark/prev.png
+++ b/view/theme/dispy/dark/prev.png
diff --git a/view/theme/dispy-dark/screenshot.jpg b/view/theme/dispy/dark/screenshot.jpg
index ada60ca61..ada60ca61 100644
--- a/view/theme/dispy-dark/screenshot.jpg
+++ b/view/theme/dispy/dark/screenshot.jpg
diff --git a/view/theme/dispy-dark/star.png b/view/theme/dispy/dark/star.png
index a327ba14e..a327ba14e 100644
--- a/view/theme/dispy-dark/star.png
+++ b/view/theme/dispy/dark/star.png
diff --git a/view/theme/dispy/dark/style.css b/view/theme/dispy/dark/style.css
new file mode 100644
index 000000000..3b0548be2
--- /dev/null
+++ b/view/theme/dispy/dark/style.css
@@ -0,0 +1,523 @@
+article,aside,details,figcaption,figure,footer,header,hgroup,nav,section{display:block;}
+audio,canvas,video,time{display:inline-block;*display:inline;*zoom:1;}
+audio:not([controls]),[hidden]{display:none;}
+html{font-size:100%;overflow-y:scroll;-webkit-text-size-adjust:100%;-ms-text-size-adjust:100%;}
+body{margin:0;font-size:16px;line-height:1.1em;font-family:sans-serif;color:#eec;background-color:#2e2f2e;}
+button,input,select,textarea{font-family:sans-serif;color:#eec;background-color:#2e2f2e;}
+select{border:1px #555 dotted;padding:3px;margin:3px;color:#eec;background:#2e2f2e;}
+option{padding:3px;color:#eec;background:#2e2f2e;}option[selected="selected"]{color:#2e2f2e;background:#eec;}
+ul,ol{padding:0;}
+:focus{outline:0;}
+[disabled="disabled"]{background:#4e4f4f;color:#ddb;}
+ins{background-color:#2e302e;color:#ff9;text-decoration:none;}
+mark{background-color:#2e302e;color:#ff9;font-style:italic;font-weight:bold;}
+pre,code,kbd,samp,.wall-item-body code{font-family:monospace, monospace;_font-family:monospace;font-size:1em;}
+pre,.wall-item-body code{white-space:pre;white-space:pre-wrap;word-wrap:break-word;}
+q{quotes:none;}q:before,q:after{content:"";content:none;}
+small{font-size:85%;}
+sub,sup{font-size:75%;line-height:0;position:relative;vertical-align:baseline;}
+sub{bottom:-0.25em;}
+sup{top:-0.5em;}
+img{border:0 none;}
+a{color:#88a9d2;text-decoration:none;margin-bottom:1px;}a:hover img{text-decoration:none;}
+blockquote{background:#444;color:#eec;text-indent:5px;padding:5px;border:1px #aaa solid;border-radius:5px;}
+a:hover{color:#729fcf;border-bottom:1px dotted #729fcf;}
+.required{display:inline;color:#ff0;font-size:16px;font-weight:bold;margin:3px;}
+.fakelink,.lockview{color:#729fcf;cursor:pointer;}
+.fakelink:hover{color:#729fcf;}
+.smalltext{font-size:0.7em;}
+#panel{position:absolute;font-size:0.8em;-webkit-border-radius:5px;-moz-border-radius:5px;border-radius:5px;border:1px solid #fff;background-color:#2e302e;color:#eeeeec;padding:1em;}
+.pager{margin-top:60px;display:block;clear:both;text-align:center;}.pager span{padding:4px;margin:4px;}
+.pager_current{background-color:#729fcf;color:#fff;}
+.action{margin:5px 0;}
+.tool{margin:5px 0;list-style:none;}
+#articlemain{width:100%;height:100%;margin:0 auto;}
+#asidemain .field{overflow:hidden;width:200px;}
+#login-extra-links{overflow:auto !important;padding-top:60px !important;width:100% !important;}#login-extra-links a{margin-right:20px;}
+#login_standard{display:block !important;float:none !important;height:100% !important;position:relative !important;width:100% !important;}#login_standard .field label{width:200px !important;}
+#login_standard input{margin:0 0 8px !important;width:210px !important;}#login_standard input[type="text"]{margin:0 0 8px !important;width:210px !important;}
+#login-submit-wrapper{margin:0 !important;}
+#login-submit-button{margin-left:0px !important;}
+#asidemain #login_openid{position:relative !important;float:none !important;margin-left:0px !important;height:auto !important;width:200px !important;}
+#login_openid #id_openid_url{width:180px !important;overflow:hidden !important;}
+#login_openid label{width:180px !important;}
+nav{height:60px;background-color:#1d1f1d;color:#eeeeec;position:relative;padding:20px 20px 10px 95px;}nav a{text-decoration:none;color:#eeeeec;border:0px;}nav a:hover{text-decoration:none;color:#eeeeec;border:0px;}
+nav #banner{display:block;position:absolute;left:51px;top:25px;}nav #banner #logo-text a{font-size:40px;font-weight:bold;margin-left:3px;}
+ul#user-menu-popup{display:none;position:absolute;background-color:#555753;width:100%;padding:10px 0px;margin:0px;top:20px;left:0;-webkit-border-radius:0 0 5px 5px;-moz-border-radius:0 0 5px 5px;border-radius:0 0 5px 5px;box-shadow:5px 10px 10px 0 #111;z-index:10000;}ul#user-menu-popup li{display:block;}ul#user-menu-popup li a{display:block;padding:5px;}ul#user-menu-popup li a:hover{color:#2e302e;background-color:#eeeeec;}
+ul#user-menu-popup li a.nav-sep{border-top:1px solid #eeeeec;}
+nav .nav-link{display:inline-block;width:22px;height:22px;overflow:hidden;margin:0px 5px 5px;text-indent:50px;background:transparent url(dark/icons.png) 0 0 no-repeat;}
+#nav-apps-link{background-position:0 -66px;}#nav-apps-link:hover{background-position:-22px -66px;}
+#nav-community-link,#nav-contacts-link{background-position:0 -22px;}#nav-community-link:hover,#nav-contacts-link:hover{background-position:-22px -22px;}
+#nav-directory-link{background-position:-44px -154px;}#nav-directory-link:hover{background-position:-66px -154px;}
+#nav-help-link{background-position:0 -110px;}#nav-help-link:hover{background-position:-22px -110px;}
+#nav-home-link{background-position:-44px -132px;}#nav-home-link:hover{background-position:-66px -132px;}
+#nav-intro-link{background-position:0px -190px;}#nav-intro-link:hover{background-position:-44px -190px;}
+#nav-login-link,#nav-logout-link{background-position:0 -88px;}#nav-login-link:hover,#nav-logout-link:hover{background-position:-22px -88px;}
+#nav-messages-link{background-position:-44px -88px;}#nav-messages-link:hover{background-position:-66px -88px;}
+#nav-notify-link,#nav-notifications-linkmenu{background-position:-44px -110px;}
+#nav-notify-link:hover{background-position:-66px -110px;}
+#nav-network-link{background-position:0px -177px;}#nav-network-link:hover{background-position:-22px -177px;}
+#nav-search-link{background-position:0 -44px;}#nav-search-link:hover{background-position:-22px -44px;}
+#profile-link,#profile-title,#wall-image-upload,#wall-file-upload,#profile-attach-wrapper,#profile-audio,#profile-link,#profile-location,#profile-nolocation,#profile-title,#jot-title,#profile-upload-wrapper,#profile-video,#profile-jot-submit,#wall-image-upload-div,#wall-file-upload-div,.icon,.hover,.focus,.pointer{cursor:pointer;}
+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;}
+#nav-notifications-menu{margin:30px 0 0 -20px;width:275px;max-height:300px;overflow-y:auto;font-size:9pt;}#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{word-wrap:normal;border-bottom:1px solid #000;}#nav-notifications-menu li:hover{color:black;}
+#nav-notifications-menu a:hover{color:black;text-decoration:underline;}
+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");}
+.show{display:block;}
+#notifications{height:20px;width:170px;position:absolute;top:-19px;left:4px;}
+#nav-floater{position:fixed;top:20px;right:1%;padding:5px;background:#1d1f1d;color:transparent;border-radius:5px;z-index:100;width:300px;height:60px;}
+#nav-buttons{clear:both;list-style:none;padding:0px;margin:0px;height:25px;}#nav-buttons>li{padding:0;display:inline-block;margin:0px -4px 0px 0px;}
+.floaterflip{display:block;position:fixed;z-index:110;top:56px;right:19px;width:22px;height:22px;overflow:hidden;margin:0px;background:transparent url(dark/icons.png) -190px -60px no-repeat;}
+.search-box{display:inline-block;margin:5px;position:fixed;right:0px;bottom:0px;z-index:100;background:#1d1f1d;border-radius:5px;}
+#search-text{border:1px #eec solid;background:#2e2f2e;color:#eec;}
+.search-box #search-text{margin:8px;width:10em;height:14px;color:#eec;}
+#scrollup{position:fixed;right:5px;bottom:40px;z-index:100;}#scrollup a:hover{text-decoration:none;border:0;}
+#user-menu{box-shadow:5px 0 10px 0 #111;display:block;width:75%;margin:3px 0 0 0;position:relative;background-color:#555753;-webkit-border-radius:5px;-moz-border-radius:5px;border-radius:5px;background:#555753 url("dark/menu-user-pin.jpg") 98% center no-repeat;clear:both;top:4px;left:10px;padding:2px;}#user-menu>a{vertical-align:top;}
+#user-menu-label{font-size:12px;padding:3px 20px 9px 5px;height:10px;}
+.nav-ajax-update,.nav-ajax-left{width:30px;height:19px;background:transparent url(dark/notifications.png) 0 0 no-repeat;color:#222;font-weight:bold;font-size:0.8em;padding-top:0.2em;text-align:center;float:left;margin:0 -1px 0 3px;display:block;visibility:hidden;}
+.nav-ajax-update.show,.nav-ajax-left.show{visibility:visible;}
+#net-update{background-position:0px 0px;}
+#mail-update{background-position:-30px 0;}
+#notify-update{background-position:-60px 0px;}
+#home-update{background-position:-90px 0px;}
+#intro-update{background-position:-120px 0px;}
+#lang-select-icon{cursor:pointer;position:fixed;left:28px;bottom:6px;z-index:10;}
+#language-selector{position:fixed;bottom:2px;left:52px;z-index:10;}
+.menu-popup{position:absolute;display:none;width:11em;background:#ffffff;color:#2d2d2d;margin:0px;padding:0px;list-style:none;border:3px solid #364e59;z-index:100000;-webkit-box-shadow:3px 3px 10px 0 rgba(0, 0, 0, 0.7);-moz-box-shadow:3px 3px 10px 0 rgba(0, 0, 0, 0.7);box-shadow:3px 3px 10px 0 rgba(0, 0, 0, 0.7);}.menu-popup a{display:block;color:#2d2d2d;padding:5px 10px;text-decoration:none;}.menu-popup a:hover{background-color:#bdcdd4;}
+.menu-popup .menu-sep{border-top:1px solid #9eabb0;}
+.menu-popup li{float:none;overflow:auto;height:auto;display:block;}.menu-popup li img{float:left;width:16px;height:16px;padding-right:5px;}
+.menu-popup .empty{padding:5px;text-align:center;color:#9eabb0;}
+.notif-item{font-size:small;}.notif-item a{vertical-align:middle;}
+.notif-image{width:32px;height:32px;padding:7px 7px 0px 0px;}
+.notify-seen{background:#ddd;}
+#sysmsg_info{position:fixed;bottom:0;-moz-box-shadow:3px 3px 3px 10px 0 #000;-webkit-box-shadow:3px 3px 10px 0 #000;box-shadow:3px 3px 10px 0 #000;padding:10px;background-color:#fcaf3e;border:2px solid #f8911b;border-bottom:0;padding-bottom:50px;z-index:1000;}
+#sysmsg{position:fixed;bottom:0;-moz-box-shadow:3px 3px 10px 0 #000;-webkit-box-shadow:3px 3px 10px 0 #000;box-shadow:3px 3px 10px 0 #000;padding:10px;background-color:#fcaf3e;border:2px solid #f8911b;border-bottom:0;padding-bottom:50px;z-index:1000;}
+#sysmsg_info br,#sysmsg br{display:block;margin:2px 0px;border-top:1px solid #ccccce;}
+#asidemain{float:left;font-size:smaller;margin:20px 0 20px 35px;width:25%;display:inline;}
+#asideright,#asideleft{display:none;}
+.vcard .fn{font-size:1.7em;font-weight:bold;border-bottom:1px solid #729fcf;padding-bottom:3px;}
+.vcard #profile-photo-wrapper{margin:20px;}.vcard #profile-photo-wrapper img{box-shadow:3px 3px 10px 0 #000;}
+#asidemain h4{font-size:1.2em;}
+#asidemain #viewcontacts{text-align:right;}
+.aprofile dt{background:#eec;color:#2e2f2e;font-weight:bold;box-shadow:1px 1px 5px 0 #000;margin:15px 0 5px;padding-left:5px;}
+#profile-extra-links ul{margin-left:0px;padding-left:0px;list-style:none;}
+#dfrn-request-link{background:#3465a4 url(dark/connect.png) no-repeat 95% center;border-radius:5px 5px 5px 5px;color:#eec;display:block;font-size:1.2em;padding:0.2em 0.5em;}
+#wallmessage-link{color:#eee;display:block;font-size:1.2em;padding:0.2em 0.5em;}
+#netsearch-box{margin:20px 0px 30px;width:150px;}#netsearch-box #search-submit{margin:5px 5px 0px 0px;}
+.ttright{margin:0px 0px 0px 0px;}
+.contact-block-div{width:50px;height:50px;float:left;}
+.contact-block-textdiv{width:150px;height:34px;float:left;}
+#contact-block-end{clear:both;}
+#jot{margin:10px 0 20px 0px;width:100%;}#jot #jot-tools{margin:0px;padding:0px;height:35px;overflow:none;width:100%;}#jot #jot-tools span{float:left;margin:10px 20px 2px 0px;}#jot #jot-tools span a{display:block;}
+#jot #jot-tools .perms{float:right;width:40px;}
+#jot #jot-tools li.loading{float:right;background-color:#ffffff;width:20px;vertical-align:center;text-align:center;border-top:2px solid #9eabb0;height:38px;}#jot #jot-tools li.loading img{margin-top:10px;}
+#jot #jot-title{border:1px solid #ccc;margin:0 0 5px;height:20px;width:90%;font-weight:bold;border-radius:5px;vertical-align:middle;}
+#jot-category{margin:5px 0;border-radius:5px;border:1px #999 solid;color:#aaa;font-size:smaller;}#jot-category:focus{color:#eee;}
+#jot #character-counter{width:6%;float:right;text-align:right;height:15px;line-height:20px;padding:2px 20px 5px 0;}
+#profile-jot-text_parent{box-shadow:5px 0 10px 0 #111;}
+#profile-jot-text_tbl{margin-bottom:10px;background:#777;}
+#profile-jot-text_ifr{width:99.900002% !important;}
+#profile-jot-text_toolbargroup,.mceCenter tr{background:#777;}
+[id$="jot-text_ifr"]{width:99.900002% !important;color:#2e2f2e;background:#eec;}[id$="jot-text_ifr"] .mceContentBody{color:#2e2f2e;background:#eec;}
+.defaultSkin tr.mceFirst{background:#777;}
+.defaultSkin td.mceFirst,.defaultSkin td.mceLast{background-color:#eec;}
+.defaultSkin span.mceIcon,.defaultSkin img.mceIcon,.defaultSkin .mceButtonDisabled .mceIcon{background-color:#eec;}
+#profile-attach-wrapper,#profile-audio-wrapper,#profile-link-wrapper,#profile-location-wrapper,#profile-nolocation-wrapper,#profile-title-wrapper,#profile-upload-wrapper,#profile-video-wrapper{float:left;margin:0 20px 0 0;}
+#profile-rotator-wrapper{float:right;}
+#profile-jot-tools-end,#profile-jot-banner-end{clear:both;}
+#profile-jot-email-wrapper{margin:10px 10% 0;border:1px solid #555753;border-bottom:0;}
+#profile-jot-email-label{background-color:#555753;color:#ccccce;padding:5px;}
+#profile-jot-email{width:90%;margin:5px;}
+#profile-jot-networks{margin:0 10%;border:1px solid #555753;border-top:0;border-bottom:0;padding:5px;}
+#profile-jot-net{margin:5px 0;}
+#jot-preview-link{margin:0 0 0 10px;border:0;text-decoration:none;float:right;}
+.icon-text-preview{margin:0 0 -18px 0;display:block;width:20px;height:20px;background:url(dark/icons.png) no-repeat -128px -40px;border:0;text-decoration:none;float:right;cursor:pointer;}
+#profile-jot-perms{float:right;background-color:#555753;height:22px;width:20px;-webkit-border-radius:5px;-moz-border-radius:5px;border-radius:5px;overflow:hidden;border:0px;margin:0 10px 0 10px;}
+#profile-jot-plugin-wrapper{width:1px;margin:10px 0 0 0;float:right;}
+#profile-jot-submit-wrapper{float:right;width:100%;list-style:none;margin:10px 0 0 0;padding:0;}
+#profile-jot-submit{height:auto;background-color:#555753;color:#eeeeec;-webkit-border-radius:5px;-moz-border-radius:5px;border-radius:5px;border:2px outset #222420;margin:0;float:right;text-shadow:1px 1px #111;width:auto;}#profile-jot-submit:active{box-shadow:0 0 0 0;}
+#jot-perms-icon{height:22px;width:20px;-webkit-border-radius:5px;-moz-border-radius:5px;border-radius:5px;overflow:hidden;border:0;}
+#profile-jot-acl-wrapper{margin:0 10px;border:1px solid #555753;border-top:0;display:block !important;}
+#group_allow_wrapper,#group_deny_wrapper,#acl-permit-outer-wrapper{width:47%;float:left;}
+#contact_allow_wrapper,#contact_deny_wrapper,#acl-deny-outer-wrapper{width:47%;float:right;}
+#acl-permit-text{background-color:#555753;color:#ccccce;padding:5px;float:left;}
+#jot-public{background-color:#555753;color:#ff0000;padding:5px;float:left;}
+#acl-deny-text{background-color:#555753;color:#ccccce;padding:5px;float:left;}
+#acl-permit-text-end,#acl-deny-text-end{clear:both;}
+#jot-title-desc{color:#ccc;}
+#profile-jot-desc{color:#ff2000;margin:5px 0;}
+#jot-title-wrapper{margin-bottom:5px;}
+#jot-title-display{font-weight:bold;}
+.jothidden{display:none;}
+#jot-preview-content{background-color:#3e3f3e;color:#eec;border:1px #eec solid;border-radius:5px;padding:3px 3px 6px 10px;}#jot-preview-content .wall-item-outside-wrapper{border:0;border-radius:0px;}
+#sectionmain{margin:20px;font-size:0.8em;min-width:475px;width:67%;float:left;display:inline;}
+.tabs{list-style:none;margin:10px 0;padding:0;}.tabs li{display:inline;font-size:smaller;font-weight:bold;}
+.tab{border:1px solid #729fcf;padding:4px;}.tab:hover,.tab.active:hover,.tab:active{background:#88a9d2;color:#2e2f2e;}
+.tab.active{background:#88a9d2;color:#2e2f2e;}.tab.active a{color:#2e2f2e;}
+.tab a{border:0;text-decoration:none;}
+.wall-item-outside-wrapper{border:1px solid #aaa;border-radius:5px;box-shadow:5px 0 10px 0 #111;}.wall-item-outside-wrapper.comment{margin-top:5px;}
+.wall-item-outside-wrapper-end{clear:both;}
+.wall-item-content-wrapper{position:relative;padding:10px;width:auto;}
+.wall-item-outside-wrapper .wall-item-comment-wrapper{}
+.shiny{background:#2e3436;border-radius:5px;}
+.wall-outside-wrapper .shiny{border-radius:5px;}
+.heart{color:red;}
+.wall-item-content{overflow-x:auto;margin:0px 15px 0px 5px;}
+[id^="tread-wrapper"],[class^="tread-wrapper"]{margin:15px 0 0 0;padding:0px;}
+.wall-item-photo-menu{display:none;}
+.wall-item-photo-menu-button{display:none;text-indent:-99999px;background:#555753 url(dark/menu-user-pin.jpg) no-repeat 75px center;position:absolute;overflow:hidden;height:20px;width:90px;top:85px;left:0;-webkit-border-radius:0 0 5px 5px;-moz-border-radius:0 0 5px 5px;border-radius:0 0 5px 5px;}
+.wall-item-info{float:left;width:110px;}
+.wall-item-photo-wrapper{width:80px;height:80px;position:relative;padding:5px;background-color:#555753;-webkit-border-radius:5px;-moz-border-radius:5px;border-radius:5px;}
+[class^="wall-item-tools"] *{}[class^="wall-item-tools"] *>*{}
+.wall-item-tools{float:right;opacity:0.4;-webkit-transition:all 1s ease-in-out;-moz-transition:all 1s ease-in-out;-o-transition:all 1s ease-in-out;-ms-transition:all 1s ease-in-out;transition:all 1s ease-in-out;}.wall-item-tools:hover{opacity:1;-webkit-transition:all 1s ease-in-out;-moz-transition:all 1s ease-in-out;-o-transition:all 1s ease-in-out;-ms-transition:all 1s ease-in-out;transition:all 1s ease-in-out;}
+.wall-item-subtools1{height:30px;list-style:none outside none;margin:20px 0 30px -20px;padding:0;width:30px;}
+.wall-item-subtools2{height:25px;list-style:none outside none;margin:-75px 0 0 5px;padding:0;width:25px;}
+.wall-item-title{font-size:1.2em;font-weight:bold;margin-bottom:1em;}
+.wall-item-body{margin:20px 20px 10px 0px;text-align:left;overflow-x:auto;}
+.wall-item-lock-wrapper{float:right;height:22px;margin:0 -5px 0 0;width:22px;opacity:1;}
+.wall-item-dislike,.wall-item-like{clear:left;font-size:0.8em;color:#878883;margin:5px 0 5px 120px;}
+.wall-item-author,.wall-item-actions-author{clear:left;font-size:0.8em;color:#878883;margin:20px 20px 0 110px;}
+.wall-item-ago{display:inline;padding-left:10px;}
+.wall-item-wrapper-end{clear:both;}
+.wall-item-location{margin-top:15px;width:100px;overflow:hidden;text-overflow:ellipsis;-o-text-overflow:ellipsis;}.wall-item-location .icon{float:left;}
+.wall-item-location>a,.wall-item-location .smalltext{margin-left:25px;font-size:0.7em;display:block;}
+.wall-item-location>br{display:none;}
+.wallwall .wwto{left:5px;margin:0;position:absolute;top:75px;width:30px;z-index:10001;width:30px;height:30px;}.wallwall .wwto img{width:30px !important;height:30px !important;}
+.wallwall .wall-item-photo-end{clear:both;}
+.wall-item-arrowphoto-wrapper{position:absolute;left:35px;top:80px;z-index:10002;}
+.wall-item-photo-menu{min-width:92px;border:2px solid #FFFFFF;border-top:0px;background:#555753;position:absolute;left:-2px;top:101px;display:none;z-index:10003;-webkit-border-radius:0px 5px 5px 5px;-moz-border-radius:0px 5px 5px 5px;border-radius:0px 5px 5px 5px;}.wall-item-photo-menu ul{margin:0px;padding:0px;list-style:none;}
+.wall-item-photo-menu li a{white-space:nowrap;display:block;padding:5px 2px;color:#eeeeec;}.wall-item-photo-menu li a:hover{color:#555753;background:#eeeeec;}
+#item-delete-selected{overflow:auto;width:100%;}
+#connect-services-header,#connect-services,#extra-help-header,#extra-help,#postit-header,#postit{margin:5px 0 0 0;}
+.ccollapse-wrapper{font-size:0.9em;margin-left:80px;}
+.wall-item-outside-wrapper.comment{margin-left:80px;}.wall-item-outside-wrapper.comment .wall-item-photo{width:40px!important;height:40px!important;}
+.wall-item-outside-wrapper.comment .wall-item-photo-wrapper{width:40px;height:40px;}
+.wall-item-outside-wrapper.comment .wall-item-photo-menu-button{width:50px;top:45px;background-position:35px center;}
+.wall-item-outside-wrapper.comment .wall-item-info{width:60px;}
+.wall-item-outside-wrapper.comment .wall-item-body{margin-left:10px;}
+.wall-item-outside-wrapper.comment .wall-item-author{margin-left:50px;}
+.wall-item-outside-wrapper.comment .wall-item-photo-menu{min-width:50px;top:60px;}
+.comment-wwedit-wrapper{}
+.comment-edit-wrapper{border-top:1px #aaa solid;}
+[class^="comment-edit-bb"]{list-style:none;display:none;margin:-40px 0 5px 60px;width:75%;}[class^="comment-edit-bb"]>li{display:inline-block;margin:0 10px 0 0;visibility:none;}
+.comment-wwedit-wrapper img,.comment-edit-wrapper img{width:20px;height:20px;}
+.comment-edit-photo-link,.comment-edit-photo{margin-left:10px;}
+.my-comment-photo{width:40px;height:40px;padding:5px;}
+[class^="comment-edit-text"]{margin:5px 0 10px 20px;width:84.5%;}
+.comment-edit-text-empty{height:20px;border:2px #c8bebe solid;border-radius:5px;color:#c8bebe;-webkit-transition:all 0.5s ease-in-out;-moz-transition:all 0.5s ease-in-out;-o-transition:all 0.5s ease-in-out;-ms-transition:all 0.5s ease-in-out;transition:all 0.5s ease-in-out;}.comment-edit-text-empty:hover{color:#999999;}
+.comment-edit-text-full{height:10em;border-radius:5px;-webkit-transition:all 0.5s ease-in-out;-moz-transition:all 0.5s ease-in-out;-o-transition:all 0.5s ease-in-out;-ms-transition:all 0.5s ease-in-out;transition:all 0.5s ease-in-out;}
+.comment-edit-submit-wrapper{width:90%;margin:5px 5px 10px 50px;text-align:right;}
+.comment-edit-submit{height:22px;background-color:#555753;color:#eeeeec;-webkit-border-radius:5px;-moz-border-radius:5px;border-radius:5px;border:0;}
+.wall-item-body code{display:block;padding:0 0 10px 5px;border-color:#ccc;border-style:solid;border-width:1px 1px 1px 10px;background:#eee;color:#2e2f2e;width:95%;}
+div[id$="text"]{font-weight:bold;border-bottom:1px solid #ccc;}
+div[id$="wrapper"]{height:100%;margin-bottom:1em;}div[id$="wrapper"] br{clear:left;}
+.profile-match-wrapper{float:left;margin:0 5px 40px 0;width:120px;height:120px;padding:3px;position:relative;}
+.icon.drophide.profile-match-ignore{margin:0 6px 0 -3px;}
+[id$="-end"],[class$="end"]{clear:both;margin:0 0 10px 0;}
+.profile-match-end{margin:0 0 5px 0;}
+.profile-match-name{font-weight:bold;margin:auto auto auto 23px;}
+.profile-match-connect{font-style:italic;margin:auto auto auto 23px;}
+#advanced-profile-with{margin-left:200px;}
+.photos{height:auto;overflow:auto;}
+#photo-top-links{margin-bottom:30px;}
+.photo-album-image-wrapper,.photo-top-image-wrapper{float:left;-moz-box-shadow:3px 3px 10px 0 #000;-webkit-box-shadow:3px 3px 10px 0 #000;box-shadow:3px 3px 10px 0 #000;background-color:#222;color:#2e2f2e;-webkit-border-radius:5px;-moz-border-radius:5px;border-radius:5px;padding-bottom:30px;position:relative;margin:0 10px 10px 0;}
+#photo-photo{max-width:100%;}#photo-photo img{max-width:100%;}
+.photo-top-image-wrapper a:hover,#photo-photo a:hover,.photo-album-image-wrapper a:hover{border-bottom:0;}
+.photo-top-photo,.photo-album-photo{-webkit-border-radius:5px 5px 0 0;-moz-border-radius:5px 5px 0 0;border-radius:5px 5px 0 0;}
+.photo-top-album-name{position:absolute;bottom:0;padding:0 5px;}
+.caption{position:absolute;bottom:0;margin:0 5px;}
+#photo-photo{position:relative;float:left;}
+#photo-prev-link,#photo-next-link{position:absolute;width:30%;height:100%;background-color:rgba(255, 255, 255, 0.5);opacity:0;-webkit-transition:all 0.2s ease-in-out;-moz-transition:all 0.2s ease-in-out;-o-transition:all 0.2s ease-in-out;-ms-transition:all 0.2s ease-in-out;transition:all 0.2s ease-in-out;background-position:center center;background-repeat:no-repeat;}
+#photo-prev-link{background-image:url(dark/prev.png);height:350px;left:1%;top:215px;width:50px;z-index:10;}
+#photo-next-link{background-image:url(dark/next.png);height:350px;right:45%;top:215px;width:50px;}
+#photo-prev-link a,#photo-next-link a{display:block;width:100%;height:100%;overflow:hidden;text-indent:-900000px;}
+#photo-prev-link:hover{opacity:1;-webkit-transition:all 0.2s ease-in-out;-moz-transition:all 0.2s ease-in-out;-o-transition:all 0.2s ease-in-out;-ms-transition:all 0.2s ease-in-out;transition:all 0.2s ease-in-out;}
+#photo-next-link:hover{opacity:1;-webkit-transition:all 0.2s ease-in-out;-moz-transition:all 0.2s ease-in-out;-o-transition:all 0.2s ease-in-out;-ms-transition:all 0.2s ease-in-out;transition:all 0.2s ease-in-out;}
+#photo-next-link .icon{display:none;}
+#photo-prev-link .icon{display:none;}
+#photos-upload-spacer,#photos-upload-new-wrapper,#photos-upload-exist-wrapper{margin-bottom:1em;}
+#photos-upload-existing-album-text,#photos-upload-newalbum-div{background-color:#555753;color:#eeeeec;padding:1px;}
+#photos-upload-album-select,#photos-upload-newalbum{width:99%;}
+#photos-upload-perms-menu{text-align:right;}
+#photo-edit-caption,#photo-edit-newtag,#photo-edit-albumname{float:left;margin-bottom:25px;}
+#photo-edit-link-wrap{margin-bottom:15px;}
+#photo-edit-caption,#photo-edit-newtag{width:100%;}
+#photo-like-div{margin-bottom:25px;}
+#photo-edit-caption-end,#photo-edit-tags-end,#photo-edit-albumname-end{clear:both;}
+#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;}
+.prvmail-text{width:100%;}
+#prvmail-subject{width:100%;color:#2e2f2e;background:#eec;}
+#prvmail-submit-wrapper{margin-top:10px;}
+#prvmail-submit{float:right;margin-top:0;}
+#prvmail-submit-wrapper div{margin-right:5px;float:left;}
+.mail-list-outside-wrapper{margin-top:20px;}
+.mail-list-sender{float:left;}
+.mail-list-detail{margin-left:90px;}
+.mail-list-sender-name{display:inline;font-size:1.1em;}
+.mail-list-date{display:inline;font-size:0.9em;padding-left:10px;}
+.mail-list-sender-name,.mail-list-date{font-style:italic;}
+.mail-list-subject{font-size:1.2em;}
+.mail-list-delete-wrapper{float:right;}
+.mail-list-outside-wrapper-end{clear:both;border-bottom:1px #eec dotted;}
+.mail-conv-sender{float:left;margin:0px 5px 5px 0px;}
+.mail-conv-sender-photo{width:32px;height:32px;}
+.mail-conv-sender-name{float:left;}
+.mail-conv-date{float:right;}
+.mail-conv-subject{clear:right;font-weight:bold;font-size:1.2em;}
+.mail-conv-body{clear:both;}
+.mail-conv-delete-wrapper{margin-top:5px;}
+.view-contact-wrapper,.contact-entry-wrapper{float:left;margin:0 5px 40px 0;width:120px;height:120px;padding:3px;position:relative;}
+.contact-direction-wrapper{position:absolute;top:20px;}
+.contact-edit-links{position:absolute;top:60px;}
+.contact-entry-photo{margin-left:20px;}
+.contact-entry-name{width:120px;font-weight:bold;}
+.contact-entry-photo{position:relative;}
+.contact-entry-edit-links .icon{border:1px solid #babdb6;-webkit-border-radius:3px;-moz-border-radius:3px;border-radius:3px;background-color:#fff;}
+#contact-entry-url,[id^="contact-entry-url"]{font-size:smaller;}
+#contact-entry-network,[id^="contact-entry-network"]{font-size:smaller;font-style:italic;}
+#contact-edit-banner-name{font-size:1.5em;}
+#contact-edit-photo-wrapper{position:relative;float:left;padding:20px;}
+#contact-edit-direction-icon{position:absolute;top:60px;left:0;}
+#contact-edit-nav-wrapper{margin-left:0px;}
+#contact-edit-links{margin-top:23px;}#contact-edit-links ul{list-style-type:none;}
+#contact-drop-links{margin-left:5px;}
+#contact-edit-nav-wrapper .icon{border:1px solid #babdb6;-webkit-border-radius:3px;-moz-border-radius:3px;border-radius:3px;}
+#contact-edit-poll-wrapper{margin-left:0px;}
+#contact-edit-last-update-text{margin-bottom:15px;}
+#contact-edit-last-updated{font-weight:bold;}
+#contact-edit-poll-text{display:inline;}
+#contact-edit-info_tbl,#contact-edit-info_parent,.mceLayout{width:100%;}
+#contact-edit-end{clear:both;margin-bottom:65px;}
+.contact-photo-menu-button{position:absolute;background-image:url("dark/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 #444;background:#2e2f2e;color:#eec;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:#fff;background:#3465A4;text-decoration:none;}
+#id_openid_url{background:url(dark/login-bg.gif) no-repeat;background-position:0 50%;padding-left:18px;}
+#settings-nickname-desc{background-color:#eec;-webkit-border-radius:5px;-moz-border-radius:5px;border-radius:5px;padding:5px;color:#111;}
+#settings-default-perms{margin-bottom:20px;}
+#register-form div,#profile-edit-form div{clear:both;}
+.settings-block label{clear:left;}
+.settings-block input{margin:10px 5px;}
+#profile-edit-marital-label span{margin:-4px;}
+.settings-submit-wrapper,.profile-edit-submit-wrapper{margin:0 0 30px -3px;}
+.profile-edit-side-div{display:none;}
+#profiles-menu-trigger{margin:0px 0px 0px 25px;}
+.profile-listing{float:left;margin:20px 20px 0px 0px;}
+.icon-profile-edit{background:url("dark/icons.png") -150px 0px no-repeat;border:0;cursor:pointer;display:block;float:right;width:20px;height:20px;margin:0 0 -18px;position:absolute;text-decoration:none;top:113px;right:260px;}
+#profile-edit-links ul{margin:20px 0;padding:0;list-style:none;}
+.marital{margin-top:5px;}
+#register-sitename{display:inline;font-weight:bold;}
+#advanced-expire-popup{background:#2e2f2e;color:#eec;}
+#id_ssl_policy{width:374px;}
+#theme-preview img{margin:10px 10px 10px 288px;}
+.group-delete-wrapper{margin:-31px 50px 0 0;float:right;}
+#group-edit-submit-wrapper{margin:0 0 10px 0;display:inline;}
+#group-edit-desc{margin:10px 0px;}
+#group-members,#prof-members{height:200px;overflow:auto;border:1px solid #555753;-webkit-border-radius:5px 5px 0 0;-moz-border-radius:5px 5px 0 0;border-radius:5px 5px 0 0;}
+#group-all-contacts,#prof-all-contacts{height:200px;overflow:auto;border:1px solid #555753;-webkit-border-radius:0 0 5px 5px;-moz-border-radius:0 0 5px 5px;border-radius:0 0 5px 5px;}
+#group-members h3,#group-all-contacts h3,#prof-members h3,#prof-all-contacts h3{color:#eeeeec;background-color:#555753;margin:0;padding:5px;}
+#group-separator,#prof-separator{display:none;}
+#cropimage-wrapper{float:left;}
+#crop-image-form{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,.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,.intro-approve-as-friend,.intro-approve-as-fan{float:left;}
+.intro-form-end{clear:both;margin-bottom:10px;}
+.intro-approve-as-friend-desc{margin-top:10px;}
+.intro-approve-as-end{clear:both;margin-bottom:10px;}
+.intro-end,.clear{clear:both;}
+.eventcal{float:left;font-size:20px;}
+.event{background:#2e2f2e;}
+.vevent{border:1px solid #ccc;}.vevent .event-description,.vevent .event-location,.vevent .event-start{margin-left:10px;margin-right:10px;}
+#new-event-link{margin-bottom:10px;}
+.edit-event-link,.plink-event-link{}
+.event-description:before{content:url('../../../images/calendar.png');margin-right:15px;}
+.event-start,.event-end{margin-left:10px;width:330px;font-size:smaller;}
+.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:monospace;}
+.today{font-weight:bold;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,#event-share-checkbox{float:left;}
+#event-datetime-break{margin-bottom:10px;}
+#event-nofinish-break,#event-adjust-break,#event-share-break{clear:both;}
+#event-desc-text,#event-location-text{margin-top:10px;margin-bottom:5px;}
+#event-submit{margin-top:10px;}
+.body-tag{margin:10px 0;opacity:0.5;}.body-tag:hover{opacity:1.0 !important;}
+.filesavetags,.categorytags{margin:20px 0;opacity:0.5;}
+.filesavetags:hover,.categorytags:hover{margin:20px 0;opacity:1.0 !important;}
+.item-select{opacity:0.1;margin:5px 0 0 6px !important;}.item-select:hover{opacity:1;}
+.checkeditem{opacity:1;}
+#item-delete-selected{margin-top:30px;}
+.delete-checked{position:absolute;left:35px;margin-top:20px;}
+#item-delete-selected-end{clear:both;}
+#item-delete-selected-icon{float:left;margin-right:5px;}
+#item-delete-selected-desc{float:left;margin-right:5px;}#item-delete-selected-desc:hover{text-decoration:underline;}
+.fc-state-highlight{background:#eec;color:#2e2f2e;}
+.directory-item{float:left;margin:0 5px 4px 0;padding:3px;width:180px;height:250px;position:relative;}
+#group-sidebar{margin-bottom:10px;}
+.group-selected,.nets-selected,.fileas-selected{padding:3px;color:#2e2f2e;background:#88a9d2;font-weight:bold;}
+.group-selected:hover,.nets-selected:hover,.fileas-selected:hover{color:#2e2f2e;}
+.groupsideedit{margin-right:10px;}
+#sidebar-group-ul{padding-left:0;}
+#sidebar-group-list{margin:0 0 5px 0;}#sidebar-group-list ul{list-style-type:none;list-style-position:inside;}
+#sidebar-group-list li{margin-top:10px;}
+#sidebar-group-list .icon{display:inline-block;height:12px;width:12px;}
+#sidebar-new-group{margin:auto;display:inline-block;color:#efefef;text-decoration:none;text-align:center;}
+#peoplefind-sidebar form{margin-bottom:10px;}
+#sidebar-new-group:hover{}
+#sidebar-new-group:active{position:relative;top:1px;}
+#side-peoplefind-url{background-color:#2e2f2e;color:#eec;border:1px #999 solid;margin-right:3px;width:75%;}#side-peoplefind-url:hover,#side-peoplefind-url:focus{background-color:#efefef;color:#222;border:1px 333 solid;}
+.nets-ul{list-style-type:none;padding-left:0px;}.nets-ul li{margin:10px 0 0;}
+.nets-link,.nets-all{margin-left:0px;}
+#netsearch-box{margin-top:20px;width:150px;}#netsearch-box #search-submit{margin:5px 0px 0px 0px;}
+#pending-update{float:right;color:#fff;font-weight:bold;background-color:#ff0000;padding:0 .3em;}
+.admin.linklist{border:0;padding:0;}
+.admin.link{list-style-position:inside;}
+#adminpage{color:#eec;background:#2e2f2e;margin:5px;padding:10px;}#adminpage dl{clear:left;margin-bottom:2px;padding-bottom:2px;border-bottom:1px solid #000;}
+#adminpage dt{width:250px;float:left;font-weight:bold;}
+#adminpage dd{margin-left:250px;}
+#adminpage h3{border-bottom:1px solid #ccc;}
+#adminpage .submit{clear:left;}
+#adminpage #pluginslist{margin:0;padding:0;}
+#adminpage .plugin{list-style:none;display:block;border:1px solid #888;padding:1em;margin-bottom:5px;clear:left;}
+#adminpage .toggleplugin{float:left;margin-right:1em;}
+#adminpage table{width:100%;border-bottom:1px solid #000;margin:5px 0;}#adminpage table th{text-align:left;}
+#adminpage td .icon{float:left;}
+#adminpage table#users img{width:16px;height:16px;}
+#adminpage table tr:hover{color:#2e2f2e;background-color:#eec;}
+#adminpage .selectall{text-align:right;}
+#adminpage #users a{color:#eec;text-decoration:underline;}
+#users .name{color:#eec;}
+.field{overflow:auto;}.field label{width:38%;display:inline-block;font-size:1.077em;margin:0 10px 1em 0;border:1px #2e2f2e solid;padding:5px;background:#eec;color:#111;}
+.field .onoff{float:right;margin:0 330px 0 auto;width:80px;}.field .onoff a{display:block;border:1px solid #666;padding:3px 6px 4px 10px;height:16px;text-decoration:none;}
+.field .onoff .on{background:url("../../../images/onoff.jpg") no-repeat 42px 1px #999999;color:#111;text-align:left;}
+.field .onoff .off{background:url("../../../images/onoff.jpg") no-repeat 2px 1px #cccccc;color:#333;text-align:right;}
+.hidden{display:none !important;}
+.field textarea{width:80%;height:100px;}
+.field_help{display:block;margin-left:297px;color:#aaa;}
+.field.radio .field_help{margin-left:297px;}
+label{width:38%;display:inline-block;font-size:1.077em;margin:0 10px 1em 0;border:1px #2e2f2e solid;padding:5px;background:#eec;color:#111;}
+input{width:250px;height:25px;border:1px #999 solid;}input[type="text"],input[type="password"],input[type="search"]{width:250px;height:25px;border:1px #999 solid;}
+input[type="checkbox"],input[type="radio"]{border:1px #999 solid;margin:0 0 0 0;height:15px;width:15px;}
+input[type="submit"],input[type="button"]{background-color:#eee;border:2px outset #aaa;border-radius:5px;box-shadow:1px 3px 4px 0 #111;color:#2e302e;cursor:pointer;font-weight:bold;width:auto;text-shadow:1px 1px #000;-webkit-border-radius:5px;-moz-border-radius:5px;}
+input[type="submit"]:active,input[type="button"]:active{box-shadow:0 0 0 0;}
+.popup{width:100%;height:100%;top:0px;left:0px;position:absolute;display:none;}.popup .background{background-color:#000;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;}
+#panel{z-index:100;}
+.grey{color:grey;}
+.orange{color:orange;}
+.red{color:red;}
+.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;}
+.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;}
+.iconspacer{display:block;width:16px;height:16px;}
+.icon{display:block;width:20px;height:20px;background:url(dark/icons.png) no-repeat;border:0;text-decoration:none;border-radius:5px;}.icon:hover{border:0;text-decoration:none;}
+.editicon{display:inline-block;width:21px;height:21px;background:url(dark/editicons.png) no-repeat;border:0;text-decoration:none;}
+.shadow{box-shadow:2px 2px 5px 2px #111;}.shadow:active,.shadow:focus,.shadow:hover{box-shadow:0 0 0 0;}
+.editicon:hover{border:0;}
+.boldbb{background-position:0px 0px;}.boldbb:hover{background-position:-22px 0px;}
+.italicbb{background-position:0px -22px;}.italicbb:hover{background-position:-22px -22px;}
+.underlinebb{background-position:0px -44px;}.underlinebb:hover{background-position:-22px -44px;}
+.quotebb{background-position:0px -66px;}.quotebb:hover{background-position:-22px -66px;}
+.codebb{background-position:0px -88px;}.codebb:hover{background-position:-22px -88px;}
+.imagebb{background-position:-44px 0px;}.imagebb:hover{background-position:-66px 0px;}
+.urlbb{background-position:-44px -22px;}.urlbb:hover{background-position:-66px -22px;}
+.videobb{background-position:-44px -44px;}.videobb:hover{background-position:-66px -44px;}
+.icon.drop,.icon.drophide,.icon.delete{float:left;margin:0 2px;}
+.icon.s22.delete{display:block;background-position:-110px 0;}
+.icon.s22.text{padding:10px 0px 0px 25px;width:200px;}
+.icon.text{text-indent:0px;}
+.icon.s16{min-width:16px;height:16px;}
+.s16 .add{background:url("../../../images/icons/16/add.png") no-repeat;}
+.add{margin:0px 5px;}
+.article{background-position:-50px 0;}
+.audio{background-position:-70px 0;}
+.block{background-position:-90px 0px;}
+.drop,.delete{background-position:-110px 0;}
+.drophide{background-position:-130px 0;}
+.edit{background-position:-150px 0;}
+.camera{background-position:-170px 0;}
+.dislike{background-position:-190px 0;}
+.file-as{background-position:-230px -60px;}
+.like{background-position:-211px 0;}
+.link{background-position:-230px 0;}
+.globe,.location{background-position:-50px -20px;}
+.noglobe,.nolocation{background-position:-70px -20px;}
+.no{background-position:-90px -20px;}
+.pause{background-position:-110px -20px;}
+.play{background-position:-130px -20px;}
+.pencil{background-position:-151px -18px;}
+.small-pencil{background-position:-170px -20px;}
+.recycle{background-position:-190px -20px;}
+.remote-link{background-position:-210px -20px;}
+.share{background-position:-230px -20px;}
+.tools{background-position:-50px -40px;}
+.lock{background-position:-70px -40px;}
+.unlock{background-position:-88px -40px;}
+.video{background-position:-110px -40px;}
+.attach{background-position:-190px -40px;}
+.language{background-position:-210px -40px;}
+.starred{background-position:-130px -60px;}
+.unstarred{background-position:-150px -60px;}
+.tagged{background-position:-170px -60px;}
+.on{background-position:-50px -60px;}
+.off{background-position:-70px -60px;}
+.prev{background-position:-90px -60px;}
+.next{background-position:-110px -60px;}
+.icon.dim{opacity:0.3;}
+#pause{position:fixed;bottom:40px;right:30px;}
+.border{border:1px solid #babdb6;-webkit-border-radius:5px;-moz-border-radius:5px;border-radius:5px;}.border:hover{border:1px solid #babdb6;-webkit-border-radius:5px;-moz-border-radius:5px;border-radius:5px;}
+.attachtype{display:block;width:20px;height:23px;background-image:url(../../../images/content-types.png);}
+.type-video{background-position:0px 0px;}
+.type-image{background-position:-20px 0;}
+.type-audio{background-position:-40px 0;}
+.type-text{background-position:-60px 0px;}
+.type-unkn{background-position:-80px 0;}
+.cc-license{margin-top:100px;font-size:0.7em;}
+footer{display:block;clear:both;}
+#profile-jot-text{height:20px;color:#eec;border:1px solid #eec;border-radius:5px;width:99.5%;}
+#photo-edit-perms-select,#photos-upload-permissions-wrapper,#profile-jot-acl-wrapper{display:block !important;background:#2e2f2e;color:#eec;}
+#acl-wrapper{width:660px;margin:0 auto;}
+#acl-search{float:right;background:#ffffff url("../../../images/search_18.png") no-repeat right center;padding-right:20px;margin:6px;color:#111;}
+#acl-showall{float:left;display:block;width:auto;height:18px;background:#eeeecc url("../../../images/show_all_off.png") 8px 8px no-repeat;padding:7px 10px 7px 30px;-webkit-border-radius:5px;-moz-border-radius:5px;border-radius:5px;color:#999;margin:5px 0;}#acl-showall.selected{color:#000;background:#ff9900 url(../../../images/show_all_on.png) 8px 8px no-repeat;}
+#acl-list{height:210px;border:1px solid #ccc;clear:both;margin-top:30px;overflow:auto;}
+.acl-list-item{border:1px solid #eec;display:block;float:left;height:110px;margin:3px 0 5px 5px;width:120px;}.acl-list-item img{width:22px;height:22px;float:left;margin:5px 5px 20px;}
+.acl-list-item p{height:12px;font-size:10px;margin:0 0 22px;padding:2px 0 1px;}
+.acl-list-item a{background:#eeeecc 3px 3px no-repeat;-webkit-border-radius:2px;-moz-border-radius:2px;border-radius:2px;clear:both;font-size:10px;display:block;width:55px;height:20px;color:#2e2f2e;margin:5px auto 0;padding:0 3px;text-align:center;vertical-align:middle;}
+#acl-wrapper a:hover{text-decoration:none;color:#2e2f2e;border:0;}
+.acl-button-show{background-image:url('../../../images/show_off.png');margin:0 auto;}
+.acl-button-hide{background-image:url('../../../images/hide_off.png');margin:0 auto;}
+.acl-button-show.selected{color:#2e2f2e;background-color:#9ade00;background-image:url(../../../images/show_on.png);}
+.acl-button-hide.selected{color:#2e2f2e;background-color:#ff4141;background-image:url(../../../images/hide_on.png);}
+.acl-list-item.groupshow{border-color:#9ade00;}
+.acl-list-item.grouphide{border-color:#ff4141;}
+.acpopup{max-height:175px;max-width:42%;background-color:#555753;color:#fff;overflow:auto;z-index:100000;border:1px solid #cccccc;}
+.acpopupitem{background-color:#555753;padding:4px;clear:left;}.acpopupitem img{float:left;margin-right:4px;}
+.acpopupitem.selected{color:#2e302e;background-color:#eeeeec;}
+.qcomment-wrapper{padding:0px;margin:5px 5px 5px 81%;}
+.qcomment{opacity:0.5;}.qcomment:hover{opacity:1.0;}
+#network-star-link{margin-top:10px;}
+.network-star{float:left;margin-right:5px;}.network-star.icon.starred{display:inline-block;}
+.fileas-ul{padding:0;}
+#sidebar-page-list ul{padding:0;margin:5px 0;}
+#sidebar-page-list li{list-style:none;}
+#jappix_mini{margin-left:130px;position:fixed;bottom:0;right:175px !important;z-index:999;}
+@media handheld{body{font-size:15pt;}}
diff --git a/view/theme/dispy/dark/style.less b/view/theme/dispy/dark/style.less
new file mode 100644
index 000000000..96cdb82fa
--- /dev/null
+++ b/view/theme/dispy/dark/style.less
@@ -0,0 +1,2911 @@
+/*
+ * dispy-dark
+ *
+ * author, maintainer: simon <http://simon.kisikew.org/>
+ * 
+ * Author's notes:
+ * A few things of note here. The less file is our working copy,
+ * and the CSS is *generated* from it. The CSS is the one that's
+ * included in the HTML, and not the less one. This is to save
+ * bandwidth and processing time.
+ */
+/* from html5boilerplate */
+/* these are to tell browsers they should be displayed a certain way */
+
+article, aside, details, figcaption, figure, footer, header, hgroup, nav, section {
+  display: block; }
+
+audio, canvas, video, time {
+  display: inline-block;
+  *display: inline;
+  *zoom: 1; }
+
+audio:not([controls]), [hidden] {
+  display: none; }
+
+/* 
+ *  Base
+ */
+/*
+ * 1. Correct text resizing oddly in IE6/7 when body font-size is set using em units
+ * 2. Force vertical scrollbar in non-IE
+ * 3. Prevent iOS text size adjust on device orientation change, without disabling user zoom: h5bp.com/g
+ */
+
+html {
+  font-size: 100%;
+  overflow-y: scroll;
+  -webkit-text-size-adjust: 100%;
+  -ms-text-size-adjust: 100%; }
+
+body {
+  margin: 0;
+  font-size: 16px;
+  line-height: 1.1em;
+  font-family: sans-serif;
+  color: #eec;
+  background-color: #2e2f2e; }
+
+button, input, select, textarea {
+  font-family: sans-serif;
+  color: #eec;
+  background-color: #2e2f2e; }
+
+select {
+  border: 1px #555 dotted;
+  padding: 3px;
+  margin: 3px;
+  color: #eec;
+  background: #2e2f2e; }
+
+option {
+  padding: 3px;
+  color: #eec;
+  background: #2e2f2e;
+  &[selected="selected"] {
+    color: #2e2f2e;
+    background: #eec; } }
+
+ul, ol {
+  padding: 0; }
+
+/* remember to define focus styles! */
+
+:focus {
+  outline: 0; }
+
+[disabled="disabled"] {
+  background: #4e4f4f;
+  color: #ddb; }
+
+/* remember to highlight inserts somehow! */
+
+ins {
+  background-color: #2e302e;
+  color: #ff9;
+  text-decoration: none; }
+
+mark {
+  background-color: #2e302e;
+  color: #ff9;
+  font-style: italic;
+  font-weight: bold; }
+
+/* Redeclare monospace font family: h5bp.com/j */
+
+pre, code, kbd, samp, .wall-item-body code {
+  font-family: monospace, monospace;
+  _font-family: monospace;
+  font-size: 1em; }
+
+/* Improve readability of pre-formatted text in all browsers */
+
+pre, .wall-item-body code {
+  white-space: pre;
+  white-space: pre-wrap;
+  word-wrap: break-word; }
+
+q {
+  quotes: none;
+  &:before, &:after {
+    content: "";
+    content: none; } }
+
+small {
+  font-size: 85%; }
+
+/* Position subscript and superscript content without affecting line-height: h5bp.com/k */
+
+sub, sup {
+  font-size: 75%;
+  line-height: 0;
+  position: relative;
+  vertical-align: baseline; }
+
+sub {
+  bottom: -0.25em; }
+
+sup {
+  top: -0.5em; }
+
+img {
+  border: 0 none; }
+
+a {
+  color: #88a9d2;
+  text-decoration: none;
+  margin-bottom: 1px;
+  &:hover img {
+    text-decoration: none; } }
+
+blockquote {
+  background: #444;
+  color: #eec;
+  text-indent: 5px;
+  padding: 5px;
+  border: 1px #aaa solid;
+  border-radius: 5px; }
+
+a:hover {
+  color: #729fcf;
+  border-bottom: 1px dotted #729fcf; }
+
+.required {
+  display: inline;
+  color: #ff0;
+  font-size: 16px;
+  font-weight: bold;
+  margin: 3px; }
+
+.fakelink, .lockview {
+  color: #729fcf;
+  cursor: pointer; }
+
+.fakelink:hover {
+  color: #729fcf; }
+
+.smalltext {
+  font-size: 0.7em; }
+
+#panel {
+  position: absolute;
+  font-size: 0.8em;
+  -webkit-border-radius: 5px;
+  -moz-border-radius: 5px;
+  border-radius: 5px;
+  border: 1px solid #fff;
+  background-color: #2e302e;
+  color: #eeeeec;
+  padding: 1em; }
+
+.pager {
+  margin-top: 60px;
+  display: block;
+  clear: both;
+  text-align: center;
+  span {
+    padding: 4px;
+    margin: 4px; } }
+
+.pager_current {
+  background-color: #729fcf;
+  color: #fff; }
+
+/**
+ * global
+ */
+/* .tool .action */
+
+.action {
+  margin: 5px 0; }
+
+.tool {
+  margin: 5px 0;
+  list-style: none; }
+
+#articlemain {
+  width: 100%;
+  height: 100%;
+  margin: 0 auto; }
+
+/**
+ * login
+ */
+
+#asidemain .field {
+  overflow: hidden;
+  width: 200px; }
+
+#login-extra-links {
+  overflow: auto !important;
+  padding-top: 60px !important;
+  width: 100% !important;
+  a {
+    margin-right: 20px; } }
+
+#login_standard {
+  display: block !important;
+  float: none !important;
+  height: 100% !important;
+  position: relative !important;
+  width: 100% !important;
+  .field label {
+    width: 200px !important; }
+  input {
+    margin: 0 0 8px !important;
+    width: 210px !important;
+    &[type="text"] {
+      margin: 0 0 8px !important;
+      width: 210px !important; } } }
+
+#login-submit-wrapper {
+  margin: 0 !important; }
+
+#login-submit-button {
+  margin-left: 0px !important; }
+
+#asidemain #login_openid {
+  position: relative !important;
+  float: none !important;
+  margin-left: 0px !important;
+  height: auto !important;
+  width: 200px !important; }
+
+#login_openid {
+  #id_openid_url {
+    width: 180px !important;
+    overflow: hidden !important; }
+  label {
+    width: 180px !important; } }
+
+/**
+ * nav
+ */
+
+nav {
+  height: 60px;
+  background-color: #1d1f1d;
+  color: #eeeeec;
+  position: relative;
+  padding: 20px 20px 10px 95px;
+  a {
+    text-decoration: none;
+    color: #eeeeec;
+    border: 0px;
+    &:hover {
+      text-decoration: none;
+      color: #eeeeec;
+      border: 0px; } }
+  #banner {
+    display: block;
+    position: absolute;
+    left: 51px;
+    top: 25px;
+    #logo-text a {
+      font-size: 40px;
+      font-weight: bold;
+      margin-left: 3px; } } }
+
+ul#user-menu-popup {
+  display: none;
+  position: absolute;
+  background-color: #555753;
+  width: 100%;
+  padding: 10px 0px;
+  margin: 0px;
+  top: 20px;
+  left: 0;
+  -webkit-border-radius: 0 0 5px 5px;
+  -moz-border-radius: 0 0 5px 5px;
+  border-radius: 0 0 5px 5px;
+  box-shadow: 5px 10px 10px 0 #111;
+  z-index: 10000;
+  li {
+    display: block;
+    a {
+      display: block;
+      padding: 5px;
+      &:hover {
+        color: #2e302e;
+        background-color: #eeeeec; }
+      &.nav-sep {
+        border-top: 1px solid #eeeeec; } } } }
+
+nav .nav-link {
+  display: inline-block;
+  width: 22px;
+  height: 22px;
+  overflow: hidden;
+  margin: 0px 5px 5px;
+  text-indent: 50px;
+  background: transparent url(dark/icons.png) 0 0 no-repeat; }
+
+#nav-apps-link {
+  background-position: 0 -66px;
+  &:hover {
+    background-position: -22px -66px; } }
+
+#nav-community-link, #nav-contacts-link {
+  background-position: 0 -22px;
+  &:hover {
+    background-position: -22px -22px; } }
+
+#nav-directory-link {
+  background-position: -44px -154px;
+  &:hover {
+    background-position: -66px -154px; } }
+
+#nav-help-link {
+  background-position: 0 -110px;
+  &:hover {
+    background-position: -22px -110px; } }
+
+#nav-home-link {
+  background-position: -44px -132px;
+  &:hover {
+    background-position: -66px -132px; } }
+
+#nav-intro-link {
+  background-position: 0px -190px;
+  &:hover {
+    background-position: -44px -190px; } }
+
+#nav-login-link, #nav-logout-link {
+  background-position: 0 -88px;
+  &:hover {
+    background-position: -22px -88px; } }
+
+#nav-messages-link {
+  background-position: -44px -88px;
+  &:hover {
+    background-position: -66px -88px; } }
+
+#nav-notify-link, #nav-notifications-linkmenu {
+  background-position: -44px -110px; }
+
+#nav-notify-link:hover {
+  background-position: -66px -110px; }
+
+#nav-network-link {
+  background-position: 0px -177px;
+  &:hover {
+    background-position: -22px -177px; } }
+
+#nav-search-link {
+  background-position: 0 -44px;
+  &:hover {
+    background-position: -22px -44px; } }
+
+#profile-link, #profile-title, #wall-image-upload, #wall-file-upload, #profile-attach-wrapper, #profile-audio, #profile-link, #profile-location, #profile-nolocation, #profile-title, #jot-title, #profile-upload-wrapper, #profile-video, #profile-jot-submit, #wall-image-upload-div, #wall-file-upload-div, .icon, .hover, .focus, .pointer {
+  cursor: pointer; }
+
+/* popup notifications */
+
+div.jGrowl div {
+  &.notice {
+    background: #511919 url("../../../images/icons/48/notice.png") no-repeat 5px center;
+    color: #ffffff;
+    padding-left: 58px; }
+  &.info {
+    background: #364e59 url("../../../images/icons/48/info.png") no-repeat 5px center;
+    color: #ffffff;
+    padding-left: 58px; } }
+
+#nav-notifications-menu {
+  margin: 30px 0 0 -20px;
+  width: 275px;
+  max-height: 300px;
+  overflow-y: auto;
+  font-size: 9pt;
+  .contactname {
+    font-weight: bold;
+    font-size: 0.9em; }
+  img {
+    float: left;
+    margin-right: 5px; }
+  .notif-when {
+    font-size: 0.8em;
+    display: block; }
+  li {
+    word-wrap: normal;
+    border-bottom: 1px solid #000;
+    &:hover {
+      color: black; } }
+  a:hover {
+    color: black;
+    text-decoration: underline; } }
+
+nav #nav-notifications-linkmenu {
+  &.on .icon.s22.notify, &.selected .icon.s22.notify {
+    background-image: url("../../../images/icons/22/notify_on.png"); } }
+
+.show {
+  display: block; }
+
+#notifications {
+  height: 20px;
+  width: 170px;
+  position: absolute;
+  top: -19px;
+  left: 4px; }
+
+#nav-floater {
+  position: fixed;
+  top: 20px;
+  right: 1%;
+  padding: 5px;
+  background: #1d1f1d;
+  color: transparent;
+  border-radius: 5px;
+  z-index: 100;
+  width: 300px;
+  height: 60px; }
+
+#nav-buttons {
+  clear: both;
+  list-style: none;
+  padding: 0px;
+  margin: 0px;
+  height: 25px;
+  > li {
+    padding: 0;
+    display: inline-block;
+    margin: 0px -4px 0px 0px; } }
+
+.floaterflip {
+  display: block;
+  position: fixed;
+  z-index: 110;
+  top: 56px;
+  right: 19px;
+  width: 22px;
+  height: 22px;
+  overflow: hidden;
+  margin: 0px;
+  background: transparent url(dark/icons.png) -190px -60px no-repeat; }
+
+.search-box {
+  display: inline-block;
+  margin: 5px;
+  position: fixed;
+  right: 0px;
+  bottom: 0px;
+  z-index: 100;
+  background: #1d1f1d;
+  border-radius: 5px; }
+
+#search-text {
+  border: 1px #eec solid;
+  background: #2e2f2e;
+  color: #eec; }
+
+.search-box #search-text {
+  margin: 8px;
+  width: 10em;
+  height: 14px;
+  color: #eec; }
+
+#scrollup {
+  position: fixed;
+  right: 5px;
+  bottom: 40px;
+  z-index: 100;
+  a:hover {
+    text-decoration: none;
+    border: 0; } }
+
+#user-menu {
+  box-shadow: 5px 0 10px 0 #111;
+  display: block;
+  width: 75%;
+  margin: 3px 0 0 0;
+  position: relative;
+  background-color: #555753;
+  -webkit-border-radius: 5px;
+  -moz-border-radius: 5px;
+  border-radius: 5px;
+  background: #555753 url("dark/menu-user-pin.jpg") 98% center no-repeat;
+  clear: both;
+  top: 4px;
+  left: 10px;
+  padding: 2px;
+  > a {
+    vertical-align: top; } }
+
+#user-menu-label {
+  font-size: 12px;
+  padding: 3px 20px 9px 5px;
+  height: 10px; }
+
+.nav-ajax-update, .nav-ajax-left {
+  width: 30px;
+  height: 19px;
+  background: transparent url(dark/notifications.png) 0 0 no-repeat;
+  color: #222;
+  font-weight: bold;
+  font-size: 0.8em;
+  padding-top: 0.2em;
+  text-align: center;
+  float: left;
+  margin: 0 -1px 0 3px;
+  display: block;
+  visibility: hidden; }
+
+.nav-ajax-update.show, .nav-ajax-left.show {
+  visibility: visible; }
+
+#net-update {
+  background-position: 0px 0px; }
+
+#mail-update {
+  background-position: -30px 0; }
+
+#notify-update {
+  background-position: -60px 0px; }
+
+#home-update {
+  background-position: -90px 0px; }
+
+#intro-update {
+  background-position: -120px 0px; }
+
+#lang-select-icon {
+  cursor: pointer;
+  position: fixed;
+  left: 28px;
+  bottom: 6px;
+  z-index: 10; }
+
+#language-selector {
+  position: fixed;
+  bottom: 2px;
+  left: 52px;
+  z-index: 10; }
+
+.menu-popup {
+  position: absolute;
+  display: none;
+  width: 11em;
+  background: #ffffff;
+  color: #2d2d2d;
+  margin: 0px;
+  padding: 0px;
+  list-style: none;
+  border: 3px solid #364e59;
+  z-index: 100000;
+  -webkit-box-shadow: 3px 3px 10px 0 rgba(0, 0, 0, 0.7);
+  -moz-box-shadow: 3px 3px 10px 0 rgba(0, 0, 0, 0.7);
+  box-shadow: 3px 3px 10px 0 rgba(0, 0, 0, 0.7);
+  a {
+    display: block;
+    color: #2d2d2d;
+    padding: 5px 10px;
+    text-decoration: none;
+    &:hover {
+      background-color: #bdcdd4; } }
+  .menu-sep {
+    border-top: 1px solid #9eabb0; }
+  li {
+    float: none;
+    overflow: auto;
+    height: auto;
+    display: block;
+    img {
+      float: left;
+      width: 16px;
+      height: 16px;
+      padding-right: 5px; } }
+  .empty {
+    padding: 5px;
+    text-align: center;
+    color: #9eabb0; } }
+
+.notif-item {
+  font-size: small;
+  a {
+    vertical-align: middle; } }
+
+.notif-image {
+  width: 32px;
+  height: 32px;
+  padding: 7px 7px 0px 0px; }
+
+.notify-seen {
+  background: #ddd; }
+
+/**
+ * sysmsg
+ */
+
+#sysmsg_info {
+  position: fixed;
+  bottom: 0;
+  -moz-box-shadow: 3px 3px 3px 10px 0 #000;
+  -webkit-box-shadow: 3px 3px 10px 0 #000;
+  box-shadow: 3px 3px 10px 0 #000;
+  padding: 10px;
+  background-color: #fcaf3e;
+  border: 2px solid #f8911b;
+  border-bottom: 0;
+  padding-bottom: 50px;
+  z-index: 1000; }
+
+#sysmsg {
+  position: fixed;
+  bottom: 0;
+  -moz-box-shadow: 3px 3px 10px 0 #000;
+  -webkit-box-shadow: 3px 3px 10px 0 #000;
+  box-shadow: 3px 3px 10px 0 #000;
+  padding: 10px;
+  background-color: #fcaf3e;
+  border: 2px solid #f8911b;
+  border-bottom: 0;
+  padding-bottom: 50px;
+  z-index: 1000; }
+
+#sysmsg_info br, #sysmsg br {
+  display: block;
+  margin: 2px 0px;
+  border-top: 1px solid #ccccce; }
+
+/**
+ * aside
+ */
+
+#asidemain {
+  float: left;
+  font-size: smaller;
+  margin: 20px 0 20px 35px;
+  width: 25%;
+  display: inline; }
+
+/* for now, disappear these */
+
+#asideright, #asideleft {
+  display: none; }
+
+.vcard {
+  .fn {
+    font-size: 1.7em;
+    font-weight: bold;
+    border-bottom: 1px solid #729fcf;
+    padding-bottom: 3px; }
+  #profile-photo-wrapper {
+    margin: 20px;
+    img {
+      box-shadow: 3px 3px 10px 0 #000; } } }
+
+/* http://css-tricks.com/snippets/css/css-box-shadow/
+* box-shadow:
+* 1. The horizontal offset of the shadow, positive means
+* the shadow will be on the right of the box, a negative
+* offset will put the shadow on the left of the box.
+* 2. The vertical offset of the shadow, a negative one
+* means the box-shadow will be above the box, a
+* positive one means the shadow will be below the box.
+* 3. The blur radius (optional), if set to 0 the shadow
+* will be sharp, the higher the number, the more blurred
+* it will be.
+* 4. The spread radius (optional), positive values increase
+* the size of the shadow, negative values decrease the size.
+* Default is 0 (the shadow is same size as blur).
+* 5. Colo[u]r
+*/
+
+#asidemain {
+  h4 {
+    font-size: 1.2em; }
+  #viewcontacts {
+    text-align: right; } }
+
+.aprofile dt {
+  background: #eec;
+  color: #2e2f2e;
+  font-weight: bold;
+  box-shadow: 1px 1px 5px 0 #000;
+  margin: 15px 0 5px;
+  padding-left: 5px; }
+
+#profile-extra-links ul {
+  margin-left: 0px;
+  padding-left: 0px;
+  list-style: none; }
+
+#dfrn-request-link {
+  background: #3465a4 url(dark/connect.png) no-repeat 95% center;
+  border-radius: 5px 5px 5px 5px;
+  color: #eec;
+  display: block;
+  font-size: 1.2em;
+  padding: 0.2em 0.5em; }
+
+#wallmessage-link {
+  /*background: #3465A4 url(dark/connect.png) no-repeat 95% center;*/
+  /*border-radius: 5px 5px 5px 5px;*/
+  color: #eee;
+  display: block;
+  font-size: 1.2em;
+  padding: 0.2em 0.5em; }
+
+#netsearch-box {
+  margin: 20px 0px 30px;
+  width: 150px;
+  #search-submit {
+    margin: 5px 5px 0px 0px; } }
+
+.ttright {
+  margin: 0px 0px 0px 0px; }
+
+/**
+ * contacts block
+ */
+
+.contact-block-div {
+  width: 50px;
+  height: 50px;
+  float: left; }
+
+.contact-block-textdiv {
+  width: 150px;
+  height: 34px;
+  float: left; }
+
+#contact-block-end {
+  clear: both; }
+
+/**
+ * jot
+ */
+
+#jot {
+  /*width: 785px;*/
+  margin: 10px 0 20px 0px;
+  width: 100%;
+  #jot-tools {
+    margin: 0px;
+    padding: 0px;
+    height: 35px;
+    overflow: none;
+    width: 100%;
+    /*background-color: #0e232e;*/
+    /*border-bottom: 2px solid #9eabb0;*/
+    span {
+      float: left;
+      margin: 10px 20px 2px 0px;
+      a {
+        display: block; } }
+    .perms {
+      float: right;
+      width: 40px; }
+    li.loading {
+      float: right;
+      background-color: #ffffff;
+      width: 20px;
+      vertical-align: center;
+      text-align: center;
+      border-top: 2px solid #9eabb0;
+      height: 38px;
+      img {
+        margin-top: 10px; } } }
+  #jot-title {
+    border: 1px solid #ccc;
+    margin: 0 0 5px;
+    height: 20px;
+    width: 90%;
+    font-weight: bold;
+    border-radius: 5px;
+    vertical-align: middle; } }
+
+#jot-category {
+  margin: 5px 0;
+  border-radius: 5px;
+  border: 1px #999 solid;
+  color: #aaa;
+  font-size: smaller;
+  &:focus {
+    color: #eee; } }
+
+#jot #character-counter {
+  width: 6%;
+  float: right;
+  text-align: right;
+  height: 15px;
+  line-height: 20px;
+  padding: 2px 20px 5px 0; }
+
+#profile-jot-text_parent {
+  box-shadow: 5px 0 10px 0 #111; }
+
+#profile-jot-text_tbl {
+  margin-bottom: 10px;
+  background: #777; }
+
+#profile-jot-text_ifr {
+  width: 99.900002% !important; }
+
+#profile-jot-text_toolbargroup, .mceCenter tr {
+  background: #777; }
+
+[id$="jot-text_ifr"] {
+  width: 99.900002% !important;
+  color: #2e2f2e;
+  background: #eec;
+  .mceContentBody {
+    color: #2e2f2e;
+    background: #eec; } }
+
+.defaultSkin {
+  tr.mceFirst {
+    background: #777; }
+  td {
+    &.mceFirst, &.mceLast {
+      background-color: #eec; } }
+  span.mceIcon, img.mceIcon, .mceButtonDisabled .mceIcon {
+    background-color: #eec; } }
+
+#profile-attach-wrapper, #profile-audio-wrapper, #profile-link-wrapper, #profile-location-wrapper, #profile-nolocation-wrapper, #profile-title-wrapper, #profile-upload-wrapper, #profile-video-wrapper {
+  float: left;
+  margin: 0 20px 0 0; }
+
+#profile-rotator-wrapper {
+  float: right; }
+
+#profile-jot-tools-end, #profile-jot-banner-end {
+  clear: both; }
+
+#profile-jot-email-wrapper {
+  margin: 10px 10% 0;
+  border: 1px solid #555753;
+  border-bottom: 0; }
+
+#profile-jot-email-label {
+  background-color: #555753;
+  color: #ccccce;
+  padding: 5px; }
+
+#profile-jot-email {
+  width: 90%;
+  margin: 5px; }
+
+#profile-jot-networks {
+  margin: 0 10%;
+  border: 1px solid #555753;
+  border-top: 0;
+  border-bottom: 0;
+  padding: 5px; }
+
+#profile-jot-net {
+  margin: 5px 0; }
+
+#jot-preview-link {
+  margin: 0 0 0 10px;
+  border: 0;
+  text-decoration: none;
+  float: right; }
+
+.icon-text-preview {
+  margin: 0 0 -18px 0;
+  display: block;
+  width: 20px;
+  height: 20px;
+  background: url(dark/icons.png) no-repeat -128px -40px;
+  border: 0;
+  text-decoration: none;
+  float: right;
+  cursor: pointer; }
+
+#profile-jot-perms {
+  float: right;
+  background-color: #555753;
+  height: 22px;
+  width: 20px;
+  -webkit-border-radius: 5px;
+  -moz-border-radius: 5px;
+  border-radius: 5px;
+  overflow: hidden;
+  border: 0px;
+  margin: 0 10px 0 10px; }
+
+#profile-jot-plugin-wrapper {
+  width: 1px;
+  margin: 10px 0 0 0;
+  float: right; }
+
+#profile-jot-submit-wrapper {
+  float: right;
+  width: 100%;
+  list-style: none;
+  margin: 10px 0 0 0;
+  padding: 0; }
+
+#profile-jot-submit {
+  height: auto;
+  background-color: #555753;
+  color: #eeeeec;
+  -webkit-border-radius: 5px;
+  -moz-border-radius: 5px;
+  border-radius: 5px;
+  border: 2px outset #222420;
+  margin: 0;
+  float: right;
+  text-shadow: 1px 1px #111;
+  width: auto;
+  &:active {
+    box-shadow: 0 0 0 0; } }
+
+#jot-perms-icon {
+  height: 22px;
+  width: 20px;
+  -webkit-border-radius: 5px;
+  -moz-border-radius: 5px;
+  border-radius: 5px;
+  overflow: hidden;
+  border: 0; }
+
+#profile-jot-acl-wrapper {
+  margin: 0 10px;
+  border: 1px solid #555753;
+  border-top: 0;
+  display: block !important; }
+
+#group_allow_wrapper, #group_deny_wrapper, #acl-permit-outer-wrapper {
+  width: 47%;
+  float: left; }
+
+#contact_allow_wrapper, #contact_deny_wrapper, #acl-deny-outer-wrapper {
+  width: 47%;
+  float: right; }
+
+#acl-permit-text {
+  background-color: #555753;
+  color: #ccccce;
+  padding: 5px;
+  float: left; }
+
+#jot-public {
+  background-color: #555753;
+  color: #ff0000;
+  padding: 5px;
+  float: left; }
+
+#acl-deny-text {
+  background-color: #555753;
+  color: #ccccce;
+  padding: 5px;
+  float: left; }
+
+#acl-permit-text-end, #acl-deny-text-end {
+  clear: both; }
+
+#jot-title-desc {
+  color: #ccc; }
+
+#profile-jot-desc {
+  color: #ff2000;
+  margin: 5px 0; }
+
+#jot-title-wrapper {
+  margin-bottom: 5px; }
+
+#jot-title-display {
+  font-weight: bold; }
+
+.jothidden {
+  display: none; }
+
+#jot-preview-content {
+  background-color: #3e3f3e;
+  color: #eec;
+  border: 1px #eec solid;
+  border-radius: 5px;
+  padding: 3px 3px 6px 10px;
+  .wall-item-outside-wrapper {
+    border: 0;
+    border-radius: 0px; } }
+
+/**
+ * section
+ */
+
+#sectionmain {
+  margin: 20px;
+  font-size: 0.8em;
+  min-width: 475px;
+  width: 67%;
+  float: left;
+  display: inline; }
+
+/**
+ * tabs
+ */
+
+.tabs {
+  list-style: none;
+  margin: 10px 0;
+  padding: 0;
+  li {
+    display: inline;
+    font-size: smaller;
+    font-weight: bold; } }
+
+.tab {
+  border: 1px solid #729fcf;
+  padding: 4px;
+  &:hover, &.active:hover, &:active {
+    background: #88a9d2;
+    color: #2e2f2e; }
+  &.active {
+    background: #88a9d2;
+    color: #2e2f2e;
+    a {
+      color: #2e2f2e; } }
+  a {
+    border: 0;
+    text-decoration: none; } }
+
+/**
+ * items
+ */
+
+.wall-item-outside-wrapper {
+  border: 1px solid #aaa;
+  border-radius: 5px;
+  box-shadow: 5px 0 10px 0 #111;
+  &.comment {
+    margin-top: 5px; } }
+
+.wall-item-outside-wrapper-end {
+  clear: both; }
+
+.wall-item-content-wrapper {
+  position: relative;
+  padding: 10px;
+  width: auto; }
+
+.wall-item-outside-wrapper .wall-item-comment-wrapper {
+  /*margin-left: 90px;*/ }
+
+.shiny {
+  background: #2e3436;
+  border-radius: 5px; }
+
+.wall-outside-wrapper .shiny {
+  border-radius: 5px; }
+
+.heart {
+  color: red; }
+
+.wall-item-content {
+  overflow-x: auto;
+  margin: 0px 15px 0px 5px; }
+
+/* removing it from here, vs. putting it in .wall-item-content
+* might break things for people. we shall see ;) */
+
+[id^="tread-wrapper"], [class^="tread-wrapper"] {
+  margin: 15px 0 0 0;
+  padding: 0px;
+  /*overflow-x: auto;*/ }
+
+.wall-item-photo-menu {
+  display: none; }
+
+.wall-item-photo-menu-button {
+  display: none;
+  text-indent: -99999px;
+  background: #555753 url(dark/menu-user-pin.jpg) no-repeat 75px center;
+  position: absolute;
+  overflow: hidden;
+  height: 20px;
+  width: 90px;
+  top: 85px;
+  left: 0;
+  -webkit-border-radius: 0 0 5px 5px;
+  -moz-border-radius: 0 0 5px 5px;
+  border-radius: 0 0 5px 5px; }
+
+.wall-item-info {
+  float: left;
+  width: 110px; }
+
+.wall-item-photo-wrapper {
+  width: 80px;
+  height: 80px;
+  position: relative;
+  padding: 5px;
+  background-color: #555753;
+  -webkit-border-radius: 5px;
+  -moz-border-radius: 5px;
+  border-radius: 5px; }
+
+[class^="wall-item-tools"] * {
+  /*margin: 0 0 5px 0;*/
+  > * {
+    /*margin: 0 0 5px 0;*/ } }
+
+.wall-item-tools {
+  float: right;
+  opacity: 0.4;
+  -webkit-transition: all 1s ease-in-out;
+  -moz-transition: all 1s ease-in-out;
+  -o-transition: all 1s ease-in-out;
+  -ms-transition: all 1s ease-in-out;
+  transition: all 1s ease-in-out;
+  &:hover {
+    opacity: 1;
+    -webkit-transition: all 1s ease-in-out;
+    -moz-transition: all 1s ease-in-out;
+    -o-transition: all 1s ease-in-out;
+    -ms-transition: all 1s ease-in-out;
+    transition: all 1s ease-in-out; } }
+
+.wall-item-subtools1 {
+  height: 30px;
+  list-style: none outside none;
+  margin: 20px 0 30px -20px;
+  padding: 0;
+  width: 30px; }
+
+.wall-item-subtools2 {
+  height: 25px;
+  list-style: none outside none;
+  margin: -75px 0 0 5px;
+  padding: 0;
+  width: 25px; }
+
+.wall-item-title {
+  font-size: 1.2em;
+  font-weight: bold;
+  margin-bottom: 1em; }
+
+.wall-item-body {
+  margin: 20px 20px 10px 0px;
+  text-align: left;
+  overflow-x: auto; }
+
+.wall-item-lock-wrapper {
+  float: right;
+  height: 22px;
+  margin: 0 -5px 0 0;
+  width: 22px;
+  opacity: 1; }
+
+.wall-item-dislike, .wall-item-like {
+  clear: left;
+  font-size: 0.8em;
+  color: #878883;
+  margin: 5px 0 5px 120px; }
+
+.wall-item-author, .wall-item-actions-author {
+  clear: left;
+  font-size: 0.8em;
+  color: #878883;
+  margin: 20px 20px 0 110px; }
+
+.wall-item-ago {
+  display: inline;
+  padding-left: 10px; }
+
+.wall-item-wrapper-end {
+  clear: both; }
+
+.wall-item-location {
+  margin-top: 15px;
+  width: 100px;
+  overflow: hidden;
+  text-overflow: ellipsis;
+  -o-text-overflow: ellipsis;
+  .icon {
+    float: left; }
+  > a, .smalltext {
+    margin-left: 25px;
+    font-size: 0.7em;
+    display: block; }
+  > br {
+    display: none; } }
+
+.wallwall {
+  .wwto {
+    left: 5px;
+    margin: 0;
+    position: absolute;
+    top: 75px;
+    width: 30px;
+    z-index: 10001;
+    width: 30px;
+    height: 30px;
+    img {
+      width: 30px !important;
+      height: 30px !important; } }
+  .wall-item-photo-end {
+    clear: both; } }
+
+.wall-item-arrowphoto-wrapper {
+  position: absolute;
+  left: 35px;
+  top: 80px;
+  z-index: 10002; }
+
+.wall-item-photo-menu {
+  min-width: 92px;
+  border: 2px solid #FFFFFF;
+  border-top: 0px;
+  background: #555753;
+  position: absolute;
+  left: -2px;
+  top: 101px;
+  display: none;
+  z-index: 10003;
+  -webkit-border-radius: 0px 5px 5px 5px;
+  -moz-border-radius: 0px 5px 5px 5px;
+  border-radius: 0px 5px 5px 5px;
+  ul {
+    margin: 0px;
+    padding: 0px;
+    list-style: none; }
+  li a {
+    white-space: nowrap;
+    display: block;
+    padding: 5px 2px;
+    color: #eeeeec;
+    &:hover {
+      color: #555753;
+      background: #eeeeec; } } }
+
+#item-delete-selected {
+  overflow: auto;
+  width: 100%; }
+
+#connect-services-header, #connect-services, #extra-help-header, #extra-help, #postit-header, #postit {
+  margin: 5px 0 0 0; }
+
+/**
+ * comment
+ */
+
+.ccollapse-wrapper {
+  font-size: 0.9em;
+  margin-left: 80px; }
+
+.wall-item-outside-wrapper.comment {
+  margin-left: 80px;
+  .wall-item-photo {
+    width: 40px!important;
+    height: 40px!important; }
+  .wall-item-photo-wrapper {
+    width: 40px;
+    height: 40px; }
+  .wall-item-photo-menu-button {
+    width: 50px;
+    top: 45px;
+    background-position: 35px center; }
+  .wall-item-info {
+    width: 60px; }
+  .wall-item-body {
+    margin-left: 10px; }
+  .wall-item-author {
+    margin-left: 50px; }
+  .wall-item-photo-menu {
+    min-width: 50px;
+    top: 60px; } }
+
+.comment-wwedit-wrapper {
+  /*margin: 30px 0px 0px 80px;*/ }
+
+.comment-edit-wrapper {
+  border-top: 1px #aaa solid; }
+
+[class^="comment-edit-bb"] {
+  list-style: none;
+  display: none;
+  margin: -40px 0 5px 60px;
+  width: 75%;
+  > li {
+    display: inline-block;
+    margin: 0 10px 0 0;
+    visibility: none; } }
+
+.comment-wwedit-wrapper img, .comment-edit-wrapper img {
+  width: 20px;
+  height: 20px; }
+
+.comment-edit-photo-link, .comment-edit-photo {
+  margin-left: 10px; }
+
+.my-comment-photo {
+  width: 40px;
+  height: 40px;
+  padding: 5px; }
+
+[class^="comment-edit-text"] {
+  margin: 5px 0 10px 20px;
+  width: 84.5%; }
+
+.comment-edit-text-empty {
+  height: 20px;
+  border: 2px #c8bebe solid;
+  border-radius: 5px;
+  color: #c8bebe;
+  -webkit-transition: all 0.5s ease-in-out;
+  -moz-transition: all 0.5s ease-in-out;
+  -o-transition: all 0.5s ease-in-out;
+  -ms-transition: all 0.5s ease-in-out;
+  transition: all 0.5s ease-in-out;
+  &:hover {
+    color: #999999; } }
+
+.comment-edit-text-full {
+  height: 10em;
+  border-radius: 5px;
+  -webkit-transition: all 0.5s ease-in-out;
+  -moz-transition: all 0.5s ease-in-out;
+  -o-transition: all 0.5s ease-in-out;
+  -ms-transition: all 0.5s ease-in-out;
+  transition: all 0.5s ease-in-out; }
+
+.comment-edit-submit-wrapper {
+  width: 90%;
+  margin: 5px 5px 10px 50px;
+  text-align: right; }
+
+.comment-edit-submit {
+  height: 22px;
+  background-color: #555753;
+  color: #eeeeec;
+  -webkit-border-radius: 5px;
+  -moz-border-radius: 5px;
+  border-radius: 5px;
+  border: 0; }
+
+/**
+ * item text style
+ */
+
+.wall-item-body code {
+  display: block;
+  padding: 0 0 10px 5px;
+  border-color: #ccc;
+  border-style: solid;
+  border-width: 1px 1px 1px 10px;
+  background: #eee;
+  color: #2e2f2e;
+  width: 95%; }
+
+/**
+ * profile
+ */
+
+div {
+  &[id$="text"] {
+    font-weight: bold;
+    border-bottom: 1px solid #ccc; }
+  &[id$="wrapper"] {
+    height: 100%;
+    margin-bottom: 1em;
+    br {
+      clear: left; } } }
+
+.profile-match-wrapper {
+	float: left;
+	margin: 0 5px 40px 0;
+	width: 120px;
+	height: 120px;
+	padding: 3px;
+	position: relative;
+}
+.icon.drophide.profile-match-ignore {
+	margin: 0 6px 0 -3px;
+}
+.profile-match-photo {
+	
+}
+
+[id$="-end"], [class$="end"] {
+  clear: both;
+  margin: 0 0 10px 0; }
+
+.profile-match-end {
+	margin: 0 0 5px 0;
+}
+.profile-match-name {
+	font-weight: bold;
+	margin: auto auto auto 23px;
+}
+.profile-match-connect {
+	font-style: italic;
+	margin: auto auto auto 23px;
+}
+#advanced-profile-with {
+  margin-left: 200px; }
+
+/**
+ * photos
+ */
+
+.photos {
+  height: auto;
+  overflow: auto; }
+
+#photo-top-links {
+  margin-bottom: 30px; }
+
+.photo-album-image-wrapper, .photo-top-image-wrapper {
+  float: left;
+  -moz-box-shadow: 3px 3px 10px 0 #000;
+  -webkit-box-shadow: 3px 3px 10px 0 #000;
+  box-shadow: 3px 3px 10px 0 #000;
+  background-color: #222;
+  color: #2e2f2e;
+  -webkit-border-radius: 5px;
+  -moz-border-radius: 5px;
+  border-radius: 5px;
+  padding-bottom: 30px;
+  position: relative;
+  margin: 0 10px 10px 0; }
+
+#photo-photo {
+  max-width: 100%;
+  img {
+    max-width: 100%; } }
+
+.photo-top-image-wrapper a:hover, #photo-photo a:hover, .photo-album-image-wrapper a:hover {
+  border-bottom: 0; }
+
+.photo-top-photo, .photo-album-photo {
+  -webkit-border-radius: 5px 5px 0 0;
+  -moz-border-radius: 5px 5px 0 0;
+  border-radius: 5px 5px 0 0; }
+
+.photo-top-album-name {
+  position: absolute;
+  bottom: 0;
+  padding: 0 5px; }
+
+.caption {
+  position: absolute;
+  bottom: 0;
+  margin: 0 5px; }
+
+#photo-photo {
+  position: relative;
+  float: left; }
+
+#photo-prev-link, #photo-next-link {
+  position: absolute;
+  width: 30%;
+  height: 100%;
+  background-color: rgba(255, 255, 255, 0.5);
+  opacity: 0;
+  -webkit-transition: all .2s ease-in-out;
+  -moz-transition: all .2s ease-in-out;
+  -o-transition: all .2s ease-in-out;
+  -ms-transition: all .2s ease-in-out;
+  transition: all .2s ease-in-out;
+  background-position: center center;
+  background-repeat: no-repeat; }
+
+#photo-prev-link {
+	background-image: url(dark/prev.png);
+    height: 350px;
+    left: 1%;
+    top: 215px;
+    width: 50px;
+    z-index: 10;
+}
+
+#photo-next-link {
+	background-image: url(dark/next.png);
+    height: 350px;
+    right: 45%;
+    top: 215px;
+    width: 50px;
+}
+
+#photo-prev-link a, #photo-next-link a {
+  display: block;
+  width: 100%;
+  height: 100%;
+  overflow: hidden;
+  text-indent: -900000px; }
+
+#photo-prev-link:hover {
+  opacity: 1;
+  -webkit-transition: all .2s ease-in-out;
+  -moz-transition: all .2s ease-in-out;
+  -o-transition: all .2s ease-in-out;
+  -ms-transition: all .2s ease-in-out;
+  transition: all .2s ease-in-out; }
+
+#photo-next-link {
+  &:hover {
+    opacity: 1;
+    -webkit-transition: all .2s ease-in-out;
+    -moz-transition: all .2s ease-in-out;
+    -o-transition: all .2s ease-in-out;
+    -ms-transition: all .2s ease-in-out;
+    transition: all .2s ease-in-out; }
+  .icon {
+    display: none; } }
+
+#photo-prev-link .icon {
+  display: none; }
+
+#photos-upload-spacer, #photos-upload-new-wrapper, #photos-upload-exist-wrapper {
+  margin-bottom: 1em; }
+
+#photos-upload-existing-album-text, #photos-upload-newalbum-div {
+  background-color: #555753;
+  color: #eeeeec;
+  padding: 1px; }
+
+#photos-upload-album-select, #photos-upload-newalbum {
+  width: 99%; }
+
+#photos-upload-perms-menu {
+  text-align: right; }
+
+#photo-edit-caption, #photo-edit-newtag, #photo-edit-albumname {
+  float: left;
+  margin-bottom: 25px; }
+
+#photo-edit-link-wrap {
+  margin-bottom: 15px; }
+
+#photo-edit-caption, #photo-edit-newtag {
+  width: 100%; }
+
+#photo-like-div {
+  margin-bottom: 25px; }
+
+#photo-edit-caption-end, #photo-edit-tags-end, #photo-edit-albumname-end {
+  clear: both; }
+
+#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; }
+
+/**
+ * message
+ */
+
+.prvmail-text {
+  width: 100%; }
+
+#prvmail-subject {
+  width: 100%;
+  color: #2e2f2e;
+  background: #eec; }
+
+#prvmail-submit-wrapper {
+  margin-top: 10px; }
+
+#prvmail-submit {
+  float: right;
+  margin-top: 0; }
+
+#prvmail-submit-wrapper div {
+  margin-right: 5px;
+  float: left; }
+
+.mail-list-outside-wrapper {
+  margin-top: 20px; }
+
+.mail-list-sender {
+  float: left; }
+
+.mail-list-detail {
+  margin-left: 90px; }
+
+.mail-list-sender-name {
+  display: inline;
+  font-size: 1.1em; }
+
+.mail-list-date {
+  display: inline;
+  font-size: 0.9em;
+  padding-left: 10px; }
+
+.mail-list-sender-name, .mail-list-date {
+  font-style: italic; }
+
+.mail-list-subject {
+  font-size: 1.2em; }
+
+.mail-list-delete-wrapper {
+  float: right; }
+
+.mail-list-outside-wrapper-end {
+  clear: both;
+  border-bottom: 1px #eec dotted; }
+
+.mail-conv-sender {
+  float: left;
+  margin: 0px 5px 5px 0px; }
+
+.mail-conv-sender-photo {
+  width: 32px;
+  height: 32px; }
+
+.mail-conv-sender-name {
+  float: left; }
+
+.mail-conv-date {
+  float: right; }
+
+.mail-conv-subject {
+  clear: right;
+  font-weight: bold;
+  font-size: 1.2em; }
+
+.mail-conv-body {
+  clear: both; }
+
+.mail-conv-delete-wrapper {
+  margin-top: 5px; }
+
+/**
+ * contacts
+ */
+
+.view-contact-wrapper, .contact-entry-wrapper {
+  float: left;
+  margin: 0 5px 40px 0;
+  width: 120px;
+  height: 120px;
+  padding: 3px;
+  position: relative; }
+
+.contact-direction-wrapper {
+  position: absolute;
+  top: 20px; }
+
+.contact-edit-links {
+  position: absolute;
+  top: 60px; }
+
+.contact-entry-photo-wrapper {}
+
+.contact-entry-photo {
+  margin-left: 20px; }
+
+.contact-entry-name {
+  width: 120px;
+  font-weight: bold;
+  /*overflow: hidden;*/ }
+
+.contact-entry-photo {
+  position: relative; }
+
+.contact-entry-edit-links .icon {
+  border: 1px solid #babdb6;
+  -webkit-border-radius: 3px;
+  -moz-border-radius: 3px;
+  border-radius: 3px;
+  background-color: #fff; }
+
+#contact-entry-url, [id^="contact-entry-url"] {
+  font-size: smaller;
+  /*overflow: scroll;*/ }
+
+#contact-entry-network, [id^="contact-entry-network"] {
+  font-size: smaller;
+  font-style: italic; }
+
+#contact-edit-banner-name {
+  font-size: 1.5em; }
+
+#contact-edit-photo-wrapper {
+  position: relative;
+  float: left;
+  padding: 20px; }
+
+#contact-edit-direction-icon {
+  position: absolute;
+  top: 60px;
+  left: 0; }
+
+#contact-edit-nav-wrapper {
+  margin-left: 0px; }
+
+#contact-edit-links {
+  margin-top: 23px;
+  ul {
+    list-style-type: none; } }
+
+#contact-drop-links {
+  margin-left: 5px; }
+
+#contact-edit-nav-wrapper .icon {
+  border: 1px solid #babdb6;
+  -webkit-border-radius: 3px;
+  -moz-border-radius: 3px;
+  border-radius: 3px; }
+
+#contact-edit-poll-wrapper {
+  margin-left: 0px; }
+
+#contact-edit-last-update-text {
+  margin-bottom: 15px; }
+
+#contact-edit-last-updated {
+  font-weight: bold; }
+
+#contact-edit-poll-text {
+  display: inline; }
+
+#contact-edit-info_tbl, #contact-edit-info_parent, .mceLayout {
+  width: 100%; }
+
+#contact-edit-end {
+  clear: both;
+  margin-bottom: 65px; }
+
+.contact-photo-menu-button {
+  position: absolute;
+  background-image: url("dark/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 #444;
+  background: #2e2f2e;
+  color: #eec;
+  position: absolute;
+  left: 0px;
+  top: 90px;
+  display: none;
+  z-index: 10000;
+  ul {
+    margin: 0px;
+    padding: 0px;
+    list-style: none; }
+  li a {
+    display: block;
+    padding: 2px;
+    &:hover {
+      color: #fff;
+      background: #3465A4;
+      text-decoration: none; } } }
+
+/**
+ * register, settings & profile forms
+ */
+
+.openid {}
+
+#id_openid_url {
+  background: url(dark/login-bg.gif) no-repeat;
+  background-position: 0 50%;
+  padding-left: 18px; }
+
+#settings-nickname-desc {
+  background-color: #eec;
+  -webkit-border-radius: 5px;
+  -moz-border-radius: 5px;
+  border-radius: 5px;
+  padding: 5px;
+  color: #111; }
+
+#settings-default-perms {
+  margin-bottom: 20px; }
+
+#register-form div, #profile-edit-form div {
+  clear: both; }
+
+.settings-block {
+  label {
+    clear: left; }
+  input {
+    margin: 10px 5px; } }
+
+/*#register-form label,     */
+/*#profile-edit-form label {*/
+/*    width: 300px;         */
+/*    float: left;          */
+/*}                         */
+
+/*#register-form span,     */
+/*#profile-edit-form span {*/
+/*    color: #555753;      */
+/*    display: block;      */
+/*    margin-bottom: 20px; */
+/*}                        */
+
+#profile-edit-marital-label span {
+  margin: -4px; }
+
+.settings-submit-wrapper, .profile-edit-submit-wrapper {
+  margin: 0 0 30px -3px; }
+
+.profile-edit-side-div {
+  display: none; }
+
+/*.profile-edit-side-div:hover {
+    display: block;
+}
+.profile-edit-side-link {
+    margin: 3px 0px 0px 70px;
+}*/
+
+#profiles-menu-trigger {
+  margin: 0px 0px 0px 25px; }
+
+.profile-listing {
+  float: left;
+  margin: 20px 20px 0px 0px; }
+
+.icon-profile-edit {
+  background: url("dark/icons.png") -150px 0px no-repeat;
+  border: 0;
+  cursor: pointer;
+  display: block;
+  float: right;
+  width: 20px;
+  height: 20px;
+  margin: 0 0 -18px;
+  position: absolute;
+  text-decoration: none;
+  top: 113px;
+  right: 260px; }
+
+#profile-edit-links ul {
+  margin: 20px 0;
+  padding: 0;
+  list-style: none; }
+
+.marital {
+  margin-top: 5px; }
+
+#register-sitename {
+  display: inline;
+  font-weight: bold; }
+
+#advanced-expire-popup {
+  background: #2e2f2e;
+  color: #eec; }
+
+#id_ssl_policy {
+  width: 374px; }
+
+#theme-preview img {
+  margin: 10px 10px 10px 288px; }
+
+/**
+ * contacts selector
+ */
+
+.group-delete-wrapper {
+  margin: -31px 50px 0 0;
+  float: right; }
+
+/*.group-delete-icon {
+    margin: 0 0 0 10px;
+}*/
+
+#group-edit-submit-wrapper {
+  margin: 0 0 10px 0;
+  display: inline; }
+
+#group-edit-desc {
+  margin: 10px 0px; }
+
+#group-members, #prof-members {
+  height: 200px;
+  overflow: auto;
+  border: 1px solid #555753;
+  -webkit-border-radius: 5px 5px 0 0;
+  -moz-border-radius: 5px 5px 0 0;
+  border-radius: 5px 5px 0 0; }
+
+#group-all-contacts, #prof-all-contacts {
+  height: 200px;
+  overflow: auto;
+  border: 1px solid #555753;
+  -webkit-border-radius: 0 0 5px 5px;
+  -moz-border-radius: 0 0 5px 5px;
+  border-radius: 0 0 5px 5px; }
+
+#group-members h3, #group-all-contacts h3, #prof-members h3, #prof-all-contacts h3 {
+  color: #eeeeec;
+  background-color: #555753;
+  margin: 0;
+  padding: 5px; }
+
+#group-separator, #prof-separator {
+  display: none; }
+
+/**
+ * profile
+ */
+
+#cropimage-wrapper {
+  float: left; }
+
+#crop-image-form {
+  clear: both; }
+
+/**
+ * intros
+ */
+
+.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, .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, .intro-approve-as-friend, .intro-approve-as-fan {
+  float: left; }
+
+.intro-form-end {
+  clear: both;
+  margin-bottom: 10px; }
+
+.intro-approve-as-friend-desc {
+  margin-top: 10px; }
+
+.intro-approve-as-end {
+  clear: both;
+  margin-bottom: 10px; }
+
+.intro-end, .clear {
+  clear: both; }
+
+/**
+ * events
+ */
+
+.eventcal {
+  float: left;
+  font-size: 20px; }
+
+.event {
+  background: #2e2f2e; }
+
+.vevent {
+  border: 1px solid #ccc;
+  .event-description, .event-location, .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;
+  font-size: smaller; }
+
+.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: monospace; }
+
+.today {
+  font-weight: bold;
+  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, #event-share-checkbox {
+  float: left; }
+
+#event-datetime-break {
+  margin-bottom: 10px; }
+
+#event-nofinish-break, #event-adjust-break, #event-share-break {
+  clear: both; }
+
+#event-desc-text, #event-location-text {
+  margin-top: 10px;
+  margin-bottom: 5px; }
+
+#event-submit {
+  margin-top: 10px; }
+
+.body-tag {
+  margin: 10px 0;
+  opacity: 0.5;
+  &:hover {
+    opacity: 1.0 !important; } }
+
+.filesavetags, .categorytags {
+  margin: 20px 0;
+  opacity: 0.5; }
+
+.filesavetags:hover, .categorytags:hover {
+  margin: 20px 0;
+  opacity: 1.0 !important; }
+
+.item-select {
+  opacity: 0.1;
+  margin: 5px 0 0 6px !important;
+  &:hover {
+    opacity: 1; } }
+
+.checkeditem {
+  opacity: 1; }
+
+#item-delete-selected {
+  margin-top: 30px; }
+
+/* was tired of having no way of moving it around, so
+* here's a little 'hook' to do so */
+
+.delete-checked {
+  position: absolute;
+  left: 35px;
+  margin-top: 20px; }
+
+#item-delete-selected-end {
+  clear: both; }
+
+#item-delete-selected-icon {
+  float: left;
+  margin-right: 5px; }
+
+#item-delete-selected-desc {
+  float: left;
+  margin-right: 5px;
+  &:hover {
+    text-decoration: underline; } }
+
+.fc-state-highlight {
+  background: #eec;
+  color: #2e2f2e; }
+
+/**
+ * directory
+ */
+
+.directory-item {
+  float: left;
+  margin: 0 5px 4px 0;
+  padding: 3px;
+  width: 180px;
+  height: 250px;
+  position: relative; }
+
+/**
+ * sidebar
+ */
+
+#group-sidebar {
+  margin-bottom: 10px; }
+
+.group-selected, .nets-selected, .fileas-selected {
+  padding: 3px;
+  color: #2e2f2e;
+  background: #88a9d2;
+  font-weight: bold; }
+
+.group-selected:hover, .nets-selected:hover, .fileas-selected:hover {
+  color: #2e2f2e; }
+
+.groupsideedit {
+  margin-right: 10px; }
+
+#sidebar-group-ul {
+  padding-left: 0; }
+
+#sidebar-group-list {
+  margin: 0 0 5px 0;
+  ul {
+    list-style-type: none;
+    list-style-position: inside; }
+  li {
+    margin-top: 10px; }
+  .icon {
+    display: inline-block;
+    height: 12px;
+    width: 12px; } }
+
+#sidebar-new-group {
+  margin: auto;
+  display: inline-block;
+  color: #efefef;
+  text-decoration: none;
+  text-align: center; }
+
+#peoplefind-sidebar form {
+  margin-bottom: 10px; }
+
+#sidebar-new-group {
+  &:hover {
+    /*background: -webkit-gradient( linear, left top, left bottom, color-stop(0.05, #b20202), color-stop(1, #d60808) );*/
+    /*background: -moz-linear-gradient( center top, #b20202 5%, #d60808 100% );*/
+    /*background-color: #b20202;*/ }
+  &:active {
+    position: relative;
+    top: 1px; } }
+
+#side-peoplefind-url {
+  background-color: #2e2f2e;
+  color: #eec;
+  border: 1px #999 solid;
+  margin-right: 3px;
+  width: 75%;
+  &:hover, &:focus {
+    background-color: #efefef;
+    color: #222;
+    border: 1px 333 solid; } }
+
+.nets-ul {
+  list-style-type: none;
+  padding-left: 0px;
+  li {
+    margin: 10px 0 0; } }
+
+.nets-link, .nets-all {
+  margin-left: 0px; }
+
+#netsearch-box {
+  margin-top: 20px;
+  width: 150px;
+  #search-submit {
+    margin: 5px 0px 0px 0px; } }
+
+/**
+ * admin
+ */
+
+#pending-update {
+  float: right;
+  color: #fff;
+  font-weight: bold;
+  background-color: #ff0000;
+  padding: 0 .3em; }
+
+.admin {
+  &.linklist {
+    border: 0;
+    padding: 0; }
+  &.link {
+    list-style-position: inside; } }
+
+#adminpage {
+  color: #eec;
+  background: #2e2f2e;
+  margin: 5px;
+  padding: 10px;
+  dl {
+    clear: left;
+    margin-bottom: 2px;
+    padding-bottom: 2px;
+    border-bottom: 1px solid #000; }
+  dt {
+    width: 250px;
+    float: left;
+    font-weight: bold; }
+  dd {
+    margin-left: 250px; }
+  h3 {
+    border-bottom: 1px solid #ccc; }
+  .submit {
+    clear: left; }
+  #pluginslist {
+    margin: 0;
+    padding: 0; }
+  .plugin {
+    list-style: none;
+    display: block;
+    border: 1px solid #888;
+    padding: 1em;
+    margin-bottom: 5px;
+    clear: left; }
+  .toggleplugin {
+    float: left;
+    margin-right: 1em; }
+  table {
+    width: 100%;
+    border-bottom: 1px solid #000;
+    margin: 5px 0;
+    th {
+      text-align: left; } }
+  td .icon {
+    float: left; }
+  table {
+    &#users img {
+      width: 16px;
+      height: 16px; }
+    tr:hover {
+      color: #2e2f2e;
+      background-color: #eec; } }
+  .selectall {
+    text-align: right; }
+  #users a {
+    color: #eec;
+    text-decoration: underline; } }
+
+#users .name {
+  color: #eec; }
+
+/**
+ * form fields
+ */
+
+.field {
+  /*margin-bottom: 10px;*/
+  /*padding-bottom: 10px;*/
+  overflow: auto;
+  /* width: 100%;*/
+  label {
+    width: 38%;
+    display: inline-block;
+    font-size: 1.077em;
+    margin: 0 10px 1em 0;
+    border: 1px #2e2f2e solid;
+    padding: 5px;
+    background: #eec;
+    color: #111; } }
+
+.field .onoff {
+  float: right;
+  margin: 0 330px 0 auto;
+  width: 80px;
+  a {
+    display: block;
+    border: 1px solid #666;
+    padding: 3px 6px 4px 10px;
+    height: 16px;
+    text-decoration: none; }
+  .on {
+    background: url("../../../images/onoff.jpg") no-repeat 42px 1px #999999;
+    color: #111;
+    text-align: left; }
+  .off {
+    background: url("../../../images/onoff.jpg") no-repeat 2px 1px #cccccc;
+    color: #333;
+    text-align: right; } }
+
+.hidden {
+  display: none !important; }
+
+.field textarea {
+  width: 80%;
+  height: 100px; }
+
+.field_help {
+  display: block;
+  margin-left: 297px;
+  color: #aaa; }
+
+.field.radio .field_help {
+  margin-left: 297px; }
+
+label {
+  width: 38%;
+  display: inline-block;
+  font-size: 1.077em;
+  margin: 0 10px 1em 0;
+  border: 1px #2e2f2e solid;
+  padding: 5px;
+  background: #eec;
+  color: #111; }
+
+input {
+  width: 250px;
+  height: 25px;
+  border: 1px #999 solid;
+  &[type="text"], &[type="password"], &[type="search"] {
+    width: 250px;
+    height: 25px;
+    border: 1px #999 solid; }
+  &[type="checkbox"], &[type="radio"] {
+    border: 1px #999 solid;
+    margin: 0 0 0 0;
+    height: 15px;
+    width: 15px; }
+  &[type="submit"], &[type="button"] {
+    background-color: #eee;
+    border: 2px outset #aaa;
+    border-radius: 5px;
+    box-shadow: 1px 3px 4px 0 #111;
+    color: #2e302e;
+    cursor: pointer;
+    font-weight: bold;
+    width: auto;
+    text-shadow: 1px 1px #000;
+    -webkit-border-radius: 5px;
+    -moz-border-radius: 5px; }
+  &[type="submit"]:active, &[type="button"]:active {
+    box-shadow: 0 0 0 0; } }
+
+
+/*
+ * update
+ */
+
+.popup {
+  width: 100%;
+  height: 100%;
+  top: 0px;
+  left: 0px;
+  position: absolute;
+  display: none;
+  .background {
+    background-color: #000;
+    opacity: 0.5;
+    width: 100%;
+    height: 100%;
+    position: absolute;
+    top: 0px;
+    left: 0px; }
+  .panel {
+    top: 25%;
+    left: 25%;
+    width: 50%;
+    height: 50%;
+    padding: 1em;
+    position: absolute;
+    border: 4px solid #000000;
+    background-color: #FFFFFF; } }
+
+#panel {
+  z-index: 100; }
+
+.grey {
+  color: grey; }
+
+.orange {
+  color: orange; }
+
+.red {
+  color: red; }
+
+.popup .panel {
+  .panel_text {
+    display: block;
+    overflow: auto;
+    height: 80%; }
+  .panel_in {
+    width: 100%;
+    height: 100%;
+    position: relative; }
+  .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;
+  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;
+  img {
+    float: left;
+    width: 48px;
+    height: 48px;
+    margin: 10px;
+    &.noicon {
+      background-image: url("../../../images/icons/48/plugin.png");
+      background-position: center center;
+      background-repeat: no-repeat; } }
+  a {
+    float: left; } }
+
+/**
+ * icons
+ */
+
+.iconspacer {
+  display: block;
+  width: 16px;
+  height: 16px; }
+
+.icon {
+  display: block;
+  width: 20px;
+  height: 20px;
+  background: url(dark/icons.png) no-repeat;
+  border: 0;
+  text-decoration: none;
+  border-radius: 5px;
+  &:hover {
+    border: 0;
+    text-decoration: none; } }
+
+.editicon {
+  display: inline-block;
+  width: 21px;
+  height: 21px;
+  background: url(dark/editicons.png) no-repeat;
+  border: 0;
+  text-decoration: none; }
+
+.shadow {
+  box-shadow: 2px 2px 5px 2px #111;
+  &:active, &:focus, &:hover {
+    box-shadow: 0 0 0 0; } }
+
+.editicon:hover {
+  border: 0; }
+
+.boldbb {
+  background-position: 0px 0px;
+  &:hover {
+    background-position: -22px 0px; } }
+
+.italicbb {
+  background-position: 0px -22px;
+  &:hover {
+    background-position: -22px -22px; } }
+
+.underlinebb {
+  background-position: 0px -44px;
+  &:hover {
+    background-position: -22px -44px; } }
+
+.quotebb {
+  background-position: 0px -66px;
+  &:hover {
+    background-position: -22px -66px; } }
+
+.codebb {
+  background-position: 0px -88px;
+  &:hover {
+    background-position: -22px -88px; } }
+
+.imagebb {
+  background-position: -44px 0px;
+  &:hover {
+    background-position: -66px 0px; } }
+
+.urlbb {
+  background-position: -44px -22px;
+  &:hover {
+    background-position: -66px -22px; } }
+
+.videobb {
+  background-position: -44px -44px;
+  &:hover {
+    background-position: -66px -44px; } }
+
+.icon {
+  &.drop, &.drophide, &.delete {
+    float: left;
+    margin: 0 2px; }
+  &.s22 {
+    &.delete {
+      display: block;
+      background-position: -110px 0; }
+    &.text {
+      padding: 10px 0px 0px 25px;
+      width: 200px; } }
+  &.text {
+    text-indent: 0px; }
+  &.s16 {
+    min-width: 16px;
+    height: 16px; } }
+
+.s16 .add {
+  background: url("../../../images/icons/16/add.png") no-repeat; }
+
+.add {
+  margin: 0px 5px; }
+
+.article {
+  background-position: -50px 0; }
+
+.audio {
+  background-position: -70px 0; }
+
+.block {
+  background-position: -90px 0px; }
+
+.drop, .delete {
+  background-position: -110px 0; }
+
+.drophide {
+  background-position: -130px 0; }
+
+.edit {
+  background-position: -150px 0; }
+
+.camera {
+  background-position: -170px 0; }
+
+.dislike {
+  background-position: -190px 0; }
+
+.file-as {
+  background-position: -230px -60px; }
+
+.like {
+  background-position: -211px 0; }
+
+.link {
+  background-position: -230px 0; }
+
+.globe, .location {
+  background-position: -50px -20px; }
+
+.noglobe, .nolocation {
+  background-position: -70px -20px; }
+
+.no {
+  background-position: -90px -20px; }
+
+.pause {
+  background-position: -110px -20px; }
+
+.play {
+  background-position: -130px -20px; }
+
+.pencil {
+  background-position: -151px -18px; }
+
+.small-pencil {
+  background-position: -170px -20px; }
+
+.recycle {
+  background-position: -190px -20px; }
+
+.remote-link {
+  background-position: -210px -20px; }
+
+.share {
+  background-position: -230px -20px; }
+
+.tools {
+  background-position: -50px -40px; }
+
+.lock {
+  background-position: -70px -40px; }
+
+.unlock {
+  background-position: -88px -40px; }
+
+.video {
+  background-position: -110px -40px; }
+
+.attach {
+  background-position: -190px -40px; }
+
+.language {
+  background-position: -210px -40px; }
+
+.starred {
+  background-position: -130px -60px; }
+
+.unstarred {
+  background-position: -150px -60px; }
+
+.tagged {
+  background-position: -170px -60px; }
+
+.on {
+  background-position: -50px -60px; }
+
+.off {
+  background-position: -70px -60px; }
+
+.prev {
+  background-position: -90px -60px; }
+
+.next {
+  background-position: -110px -60px; }
+
+.icon.dim {
+  opacity: 0.3; }
+
+#pause {
+  position: fixed;
+  bottom: 40px;
+  right: 30px; }
+
+.border {
+  border: 1px solid #babdb6;
+  -webkit-border-radius: 5px;
+  -moz-border-radius: 5px;
+  border-radius: 5px;
+  &:hover {
+    border: 1px solid #babdb6;
+    -webkit-border-radius: 5px;
+    -moz-border-radius: 5px;
+    border-radius: 5px; } }
+
+.attachtype {
+  display: block;
+  width: 20px;
+  height: 23px;
+  background-image: url(../../../images/content-types.png); }
+
+.type-video {
+  background-position: 0px 0px; }
+
+.type-image {
+  background-position: -20px 0; }
+
+.type-audio {
+  background-position: -40px 0; }
+
+.type-text {
+  background-position: -60px 0px; }
+
+.type-unkn {
+  background-position: -80px 0; }
+
+/**
+ * footer
+ */
+
+.cc-license {
+  margin-top: 100px;
+  font-size: 0.7em; }
+
+footer {
+  display: block;
+  /*margin: 50px 20%;*/
+  clear: both; }
+
+#profile-jot-text {
+  height: 20px;
+  color: #eec;
+  border: 1px solid #eec;
+  border-radius: 5px;
+  width: 99.5%; }
+
+/**
+ * acl
+ */
+
+#photo-edit-perms-select, #photos-upload-permissions-wrapper, #profile-jot-acl-wrapper {
+  display: block !important;
+  background: #2e2f2e;
+  color: #eec; }
+
+#acl-wrapper {
+  width: 660px;
+  margin: 0 auto; }
+
+#acl-search {
+  float: right;
+  background: white url("../../../images/search_18.png") no-repeat right center;
+  padding-right: 20px;
+  margin: 6px;
+  color: #111; }
+
+#acl-showall {
+  float: left;
+  display: block;
+  width: auto;
+  height: 18px;
+  background: #eeeecc url("../../../images/show_all_off.png") 8px 8px no-repeat;
+  padding: 7px 10px 7px 30px;
+  -webkit-border-radius: 5px;
+  -moz-border-radius: 5px;
+  border-radius: 5px;
+  color: #999;
+  margin: 5px 0;
+  &.selected {
+    color: #000;
+    background: #ff9900 url(../../../images/show_all_on.png) 8px 8px no-repeat; } }
+
+#acl-list {
+  height: 210px;
+  border: 1px solid #ccc;
+  clear: both;
+  margin-top: 30px;
+  overflow: auto; }
+
+/*#acl-list-content {
+}*/
+
+.acl-list-item {
+  border: 1px solid #eec;
+  display: block;
+  float: left;
+  height: 110px;
+  margin: 3px 0 5px 5px;
+  width: 120px;
+  img {
+    width: 22px;
+    height: 22px;
+    float: left;
+    margin: 5px 5px 20px; }
+  p {
+    height: 12px;
+    font-size: 10px;
+    margin: 0 0 22px;
+    padding: 2px 0 1px; }
+  a {
+    background: #eeeecc 3px 3px no-repeat;
+    -webkit-border-radius: 2px;
+    -moz-border-radius: 2px;
+    border-radius: 2px;
+    clear: both;
+    font-size: 10px;
+    display: block;
+    width: 55px;
+    height: 20px;
+    color: #2e2f2e;
+    margin: 5px auto 0;
+    padding: 0 3px;
+    text-align: center;
+    vertical-align: middle; } }
+
+#acl-wrapper a:hover {
+  text-decoration: none;
+  color: #2e2f2e;
+  border: 0; }
+
+.acl-button-show {
+  background-image: url('../../../images/show_off.png');
+  margin: 0 auto; }
+
+.acl-button-hide {
+  background-image: url('../../../images/hide_off.png');
+  margin: 0 auto; }
+
+.acl-button-show.selected {
+  color: #2e2f2e;
+  background-color: #9ade00;
+  background-image: url(../../../images/show_on.png); }
+
+.acl-button-hide.selected {
+  color: #2e2f2e;
+  background-color: #ff4141;
+  background-image: url(../../../images/hide_on.png); }
+
+.acl-list-item {
+  &.groupshow {
+    border-color: #9ade00; }
+  &.grouphide {
+    border-color: #ff4141; } }
+
+/** /acl **/
+
+/* autocomplete popup */
+
+.acpopup {
+  max-height: 175px;
+  max-width: 42%;
+  background-color: #555753;
+  color: #fff;
+  overflow: auto;
+  z-index: 100000;
+  border: 1px solid #cccccc; }
+
+.acpopupitem {
+  background-color: #555753;
+  padding: 4px;
+  clear: left;
+  img {
+    float: left;
+    margin-right: 4px; }
+  &.selected {
+    color: #2e302e;
+    background-color: #eeeeec; } }
+
+.qcomment-wrapper {
+  padding: 0px;
+  margin: 5px 5px 5px 81%; }
+
+.qcomment {
+  opacity: 0.5;
+  &:hover {
+    opacity: 1.0; } }
+
+#network-star-link {
+  margin-top: 10px; }
+
+.network-star {
+  float: left;
+  margin-right: 5px;
+  &.icon.starred {
+    display: inline-block; } }
+
+#fileas-sidebar {}
+
+.fileas-ul {
+  padding: 0; }
+
+/*
+ * addons theming
+ */
+
+#sidebar-page-list {
+  ul {
+    padding: 0;
+    margin: 5px 0; }
+  li {
+    list-style: none; } }
+
+#jappix_mini {
+  margin-left: 130px;
+  position: fixed;
+  bottom: 0;
+  right: 175px !important;
+  /* override the jappix css */
+  z-index: 999; }
+
+/* media stuff */
+@media handheld {
+  body {
+    font-size: 15pt; } }
diff --git a/view/theme/dispy-dark/tag.png b/view/theme/dispy/dark/tag.png
index 9b5a7223e..9b5a7223e 100644
--- a/view/theme/dispy-dark/tag.png
+++ b/view/theme/dispy/dark/tag.png
diff --git a/view/theme/dispy/dark/theme.php b/view/theme/dispy/dark/theme.php
new file mode 100644
index 000000000..339c477a0
--- /dev/null
+++ b/view/theme/dispy/dark/theme.php
@@ -0,0 +1,31 @@
+<?php
+
+/*
+* Name: Dispy Dark
+* Description: Dispy Dark: Dark, Spartan, Sleek, and Functional
+* Version: 1.2
+* Author: Simon <http://simon.kisikew.org/>
+* Maintainer: Simon <http://simon.kisikew.org/>
+* Screenshot: <a href="screenshot.jpg">Screenshot</a>
+*/
+
+$a = get_app();
+$a->theme_info = array(
+    'family' => 'dispy',
+    'name' => 'dark',
+    'version' => '1.2'
+);
+
+function dispy_dark_init(&$a) {
+    /** @purpose set some theme defaults
+    */
+    $cssFile = null;
+    $colour = 'dark';
+	$colour_path = "/dark/";
+
+    // set css
+    if (!is_null($cssFile)) {
+        $a->page['htmlhead'] .= sprintf('<link rel="stylesheet" type="text/css" href="%s" />', $cssFile);
+    }
+}
+
diff --git a/view/theme/dispy/connect.png b/view/theme/dispy/light/connect.png
index b76fc13dc..b76fc13dc 100644
--- a/view/theme/dispy/connect.png
+++ b/view/theme/dispy/light/connect.png
diff --git a/view/theme/dispy/editicons.png b/view/theme/dispy/light/editicons.png
index 41eafbb15..41eafbb15 100644
--- a/view/theme/dispy/editicons.png
+++ b/view/theme/dispy/light/editicons.png
diff --git a/view/theme/dispy/editicons.svg b/view/theme/dispy/light/editicons.svg
index 2691d24b4..2691d24b4 100644
--- a/view/theme/dispy/editicons.svg
+++ b/view/theme/dispy/light/editicons.svg
diff --git a/view/theme/dispy/icons.png b/view/theme/dispy/light/icons.png
index 5c2eab36e..5c2eab36e 100644
--- a/view/theme/dispy/icons.png
+++ b/view/theme/dispy/light/icons.png
diff --git a/view/theme/dispy/icons.svg b/view/theme/dispy/light/icons.svg
index 7b82b94ea..7b82b94ea 100644
--- a/view/theme/dispy/icons.svg
+++ b/view/theme/dispy/light/icons.svg
diff --git a/view/theme/dispy/login-bg.gif b/view/theme/dispy/light/login-bg.gif
index cde836c89..cde836c89 100644
--- a/view/theme/dispy/login-bg.gif
+++ b/view/theme/dispy/light/login-bg.gif
diff --git a/view/theme/dispy/menu-user-pin.jpg b/view/theme/dispy/light/menu-user-pin.jpg
index 26449569f..26449569f 100644
--- a/view/theme/dispy/menu-user-pin.jpg
+++ b/view/theme/dispy/light/menu-user-pin.jpg
diff --git a/view/theme/dispy/next.png b/view/theme/dispy/light/next.png
index 5e0067c4b..5e0067c4b 100644
--- a/view/theme/dispy/next.png
+++ b/view/theme/dispy/light/next.png
diff --git a/view/theme/dispy/notifications.png b/view/theme/dispy/light/notifications.png
index 66c432eac..66c432eac 100644
--- a/view/theme/dispy/notifications.png
+++ b/view/theme/dispy/light/notifications.png
diff --git a/view/theme/dispy/notifications.svg b/view/theme/dispy/light/notifications.svg
index eccc54457..eccc54457 100644
--- a/view/theme/dispy/notifications.svg
+++ b/view/theme/dispy/light/notifications.svg
diff --git a/view/theme/dispy/photo-menu.jpg b/view/theme/dispy/light/photo-menu.jpg
index fde5eb535..fde5eb535 100644
--- a/view/theme/dispy/photo-menu.jpg
+++ b/view/theme/dispy/light/photo-menu.jpg
diff --git a/view/theme/dispy/premium.png b/view/theme/dispy/light/premium.png
index d2855a4f5..d2855a4f5 100644
--- a/view/theme/dispy/premium.png
+++ b/view/theme/dispy/light/premium.png
diff --git a/view/theme/dispy/prev.png b/view/theme/dispy/light/prev.png
index 10b10d74f..10b10d74f 100644
--- a/view/theme/dispy/prev.png
+++ b/view/theme/dispy/light/prev.png
diff --git a/view/theme/dispy/screenshot.jpg b/view/theme/dispy/light/screenshot.jpg
index 81ee35afb..81ee35afb 100644
--- a/view/theme/dispy/screenshot.jpg
+++ b/view/theme/dispy/light/screenshot.jpg
diff --git a/view/theme/dispy/star.png b/view/theme/dispy/light/star.png
index a327ba14e..a327ba14e 100644
--- a/view/theme/dispy/star.png
+++ b/view/theme/dispy/light/star.png
diff --git a/view/theme/dispy/light/style.css b/view/theme/dispy/light/style.css
new file mode 100644
index 000000000..fc293def8
--- /dev/null
+++ b/view/theme/dispy/light/style.css
@@ -0,0 +1,523 @@
+article,aside,details,figcaption,figure,footer,header,hgroup,nav,section{display:block;}
+audio,canvas,video,time{display:inline-block;*display:inline;*zoom:1;}
+audio:not([controls]),[hidden]{display:none;}
+html{font-size:100%;overflow-y:scroll;-webkit-text-size-adjust:100%;-ms-text-size-adjust:100%;}
+body{margin:0;font-size:16px;line-height:1.1em;font-family:sans-serif;color:#222;background-color:#e8e8e8;}
+button,input,select,textarea{font-family:sans-serif;color:#222;background-color:#e8e8e8;}
+select{border:1px #555 dotted;padding:3px;margin:3px;color:#222;background:#e8e8e8;}
+option{padding:3px;color:#222;background:#e8e8e8;}option[selected="selected"]{color:#111;background:#cca;}
+ul,ol{padding:0;}
+:focus{outline:0;}
+[disabled="disabled"]{background:#ddd;color:#333;}
+ins{background-color:#ff9;color:#000;text-decoration:none;}
+mark{background-color:#ff9;color:#000;font-style:italic;font-weight:bold;}
+pre,code,kbd,samp,.wall-item-body code{font-family:monospace, monospace;_font-family:monospace;font-size:1em;}
+pre,.wall-item-body code{white-space:pre;white-space:pre-wrap;word-wrap:break-word;}
+q{quotes:none;}q:before,q:after{content:"";content:none;}
+small{font-size:85%;}
+sub,sup{font-size:75%;line-height:0;position:relative;vertical-align:baseline;}
+sub{bottom:-0.25em;}
+sup{top:-0.5em;}
+img{border:0 none;}
+a{color:#3465a4;text-decoration:none;margin-bottom:1px;}a:hover img{text-decoration:none;}
+blockquote{background:#eee;color:#111;text-indent:5px;padding:5px;border:1px #aaa solid;border-radius:5px;}
+a:hover{color:#729fcf;border-bottom:1px dotted #729fcf;}
+.required{display:inline;color:#f00;font-size:16px;font-weight:bold;margin:3px;}
+.fakelink,.lockview{color:#3465a4;cursor:pointer;}
+.fakelink:hover{color:#729fcf;}
+.smalltext{font-size:0.7em;}
+#panel{position:absolute;font-size:0.8em;-webkit-border-radius:5px;-moz-border-radius:5px;border-radius:5px;border:1px solid #fff;background-color:#2e3436;color:#eeeeec;padding:1em;}
+.pager{margin-top:60px;display:block;clear:both;text-align:center;}.pager span{padding:4px;margin:4px;}
+.pager_current{background-color:#729fcf;color:#fff;}
+.action{margin:5px 0;}
+.tool{margin:5px 0;list-style:none;}
+#articlemain{width:100%;height:100%;margin:0 auto;}
+#asidemain .field{overflow:hidden;width:200px;}
+#login-extra-links{overflow:auto !important;padding-top:60px !important;width:100% !important;}#login-extra-links a{margin-right:20px;}
+#login_standard{display:block !important;float:none !important;height:100% !important;position:relative !important;width:100% !important;}#login_standard .field label{width:200px !important;}
+#login_standard input{margin:0 0 8px !important;width:210px !important;}#login_standard input[type="text"]{margin:0 0 8px !important;width:210px !important;}
+#login-submit-wrapper{margin:0 !important;}
+#login-submit-button{margin-left:0px !important;}
+#asidemain #login_openid{position:relative !important;float:none !important;margin-left:0px !important;height:auto !important;width:200px !important;}
+#login_openid #id_openid_url{width:180px !important;overflow:hidden !important;}
+#login_openid label{width:180px !important;}
+nav{height:60px;background-color:#2e3436;color:#eeeeec;position:relative;padding:20px 20px 10px 95px;}nav a{text-decoration:none;color:#eeeeec;border:0px;}nav a:hover{text-decoration:none;color:#eeeeec;border:0px;}
+nav #banner{display:block;position:absolute;left:51px;top:25px;}nav #banner #logo-text a{font-size:40px;font-weight:bold;margin-left:3px;}
+ul#user-menu-popup{display:none;position:absolute;background-color:#555753;width:100%;padding:10px 0px;margin:0px;top:20px;left:0;-webkit-border-radius:0 0 5px 5px;-moz-border-radius:0 0 5px 5px;border-radius:0 0 5px 5px;box-shadow:5px 10px 10px 0 #111;z-index:10000;}ul#user-menu-popup li{display:block;}ul#user-menu-popup li a{display:block;padding:5px;}ul#user-menu-popup li a:hover{color:#2e3436;background-color:#eeeeec;}
+ul#user-menu-popup li a.nav-sep{border-top:1px solid #eeeeec;}
+nav .nav-link{display:inline-block;width:22px;height:22px;overflow:hidden;margin:0px 5px 5px;text-indent:50px;background:transparent url(light/icons.png) 0 0 no-repeat;}
+#nav-apps-link{background-position:0 -66px;}#nav-apps-link:hover{background-position:-22px -66px;}
+#nav-community-link,#nav-contacts-link{background-position:0 -22px;}#nav-community-link:hover,#nav-contacts-link:hover{background-position:-22px -22px;}
+#nav-directory-link{background-position:-44px -154px;}#nav-directory-link:hover{background-position:-66px -154px;}
+#nav-help-link{background-position:0 -110px;}#nav-help-link:hover{background-position:-22px -110px;}
+#nav-home-link{background-position:-44px -132px;}#nav-home-link:hover{background-position:-66px -132px;}
+#nav-intro-link{background-position:0px -190px;}#nav-intro-link:hover{background-position:-44px -190px;}
+#nav-login-link,#nav-logout-link{background-position:0 -88px;}#nav-login-link:hover,#nav-logout-link:hover{background-position:-22px -88px;}
+#nav-messages-link{background-position:-44px -88px;}#nav-messages-link:hover{background-position:-66px -88px;}
+#nav-notify-link,#nav-notifications-linkmenu{background-position:-44px -110px;}
+#nav-notify-link:hover{background-position:-66px -110px;}
+#nav-network-link{background-position:0px -177px;}#nav-network-link:hover{background-position:-22px -177px;}
+#nav-search-link{background-position:0 -44px;}#nav-search-link:hover{background-position:-22px -44px;}
+#profile-link,#profile-title,#wall-image-upload,#wall-file-upload,#profile-attach-wrapper,#profile-audio,#profile-link,#profile-location,#profile-nolocation,#profile-title,#jot-title,#profile-upload-wrapper,#profile-video,#profile-jot-submit,#wall-image-upload-div,#wall-file-upload-div,.icon,.hover,.focus,.pointer{cursor:pointer;}
+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;}
+#nav-notifications-menu{margin:30px 0 0 -20px;width:275px;max-height:300px;overflow-y:auto;font-size:9pt;}#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{word-wrap:normal;border-bottom:1px solid #000;}#nav-notifications-menu li:hover{color:black;}
+#nav-notifications-menu a:hover{color:black;text-decoration:underline;}
+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");}
+.show{display:block;}
+#notifications{height:20px;width:170px;position:absolute;top:-19px;left:4px;}
+#nav-floater{position:fixed;top:20px;right:1%;padding:5px;background:#2e3436;color:transparent;border-radius:5px;z-index:100;width:300px;height:60px;}
+#nav-buttons{clear:both;list-style:none;padding:0px;margin:0px;height:25px;}#nav-buttons>li{padding:0;display:inline-block;margin:0px -4px 0px 0px;}
+.floaterflip{display:block;position:fixed;z-index:110;top:56px;right:19px;width:22px;height:22px;overflow:hidden;margin:0px;background:transparent url(light/icons.png) -190px -60px no-repeat;}
+.search-box{display:inline-block;margin:5px;position:fixed;right:0px;bottom:0px;z-index:100;background:#1d1f1d;border-radius:5px;}
+#search-text{border:1px #eec solid;background:#2e3436;color:#eec;}
+.search-box #search-text{margin:8px;width:10em;height:14px;color:#eec;}
+#scrollup{position:fixed;right:5px;bottom:40px;z-index:100;}#scrollup a:hover{text-decoration:none;border:0;}
+#user-menu{box-shadow:5px 0 10px 0 #111;display:block;width:75%;margin:3px 0 0 0;position:relative;background-color:#555753;-webkit-border-radius:5px;-moz-border-radius:5px;border-radius:5px;background:#555753 url("light/menu-user-pin.jpg") 98% center no-repeat;clear:both;top:4px;left:10px;padding:2px;}#user-menu>a{vertical-align:top;}
+#user-menu-label{font-size:12px;padding:3px 20px 9px 5px;height:10px;}
+.nav-ajax-update,.nav-ajax-left{width:30px;height:19px;background:transparent url(light/notifications.png) 0 0 no-repeat;color:#222;font-weight:bold;font-size:0.8em;padding-top:0.2em;text-align:center;float:left;margin:0 -1px 0 3px;display:block;visibility:hidden;}
+.nav-ajax-update.show,.nav-ajax-left.show{visibility:visible;}
+#net-update{background-position:0px 0px;}
+#mail-update{background-position:-30px 0;}
+#notify-update{background-position:-60px 0px;}
+#home-update{background-position:-90px 0px;}
+#intro-update{background-position:-120px 0px;}
+#lang-select-icon{cursor:pointer;position:fixed;left:28px;bottom:6px;z-index:10;}
+#language-selector{position:fixed;bottom:2px;left:52px;z-index:10;}
+.menu-popup{position:absolute;display:none;width:11em;background:#ffffff;color:#2d2d2d;margin:0px;padding:0px;list-style:none;border:3px solid #364e59;z-index:100000;-webkit-box-shadow:3px 3px 10px 0 rgba(0, 0, 0, 0.7);-moz-box-shadow:3px 3px 10px 0 rgba(0, 0, 0, 0.7);box-shadow:3px 3px 10px 0 rgba(0, 0, 0, 0.7);}.menu-popup a{display:block;color:#2d2d2d;padding:5px 10px;text-decoration:none;}.menu-popup a:hover{background-color:#bdcdd4;}
+.menu-popup .menu-sep{border-top:1px solid #9eabb0;}
+.menu-popup li{float:none;overflow:auto;height:auto;display:block;}.menu-popup li img{float:left;width:16px;height:16px;padding-right:5px;}
+.menu-popup .empty{padding:5px;text-align:center;color:#9eabb0;}
+.notif-item{font-size:small;}.notif-item a{vertical-align:middle;}
+.notif-image{width:32px;height:32px;padding:7px 7px 0px 0px;}
+.notify-seen{background:#ddd;}
+#sysmsg_info{position:fixed;bottom:0;-moz-box-shadow:3px 3px 3px 10px 0 #000;-webkit-box-shadow:3px 3px 10px 0 #000;box-shadow:3px 3px 10px 0 #000;padding:10px;background-color:#fcaf3e;border:2px solid #f8911b;border-bottom:0;padding-bottom:50px;z-index:1000;}
+#sysmsg{position:fixed;bottom:0;-moz-box-shadow:3px 3px 10px 0 #000;-webkit-box-shadow:3px 3px 10px 0 #000;box-shadow:3px 3px 10px 0 #000;padding:10px;background-color:#fcaf3e;border:2px solid #f8911b;border-bottom:0;padding-bottom:50px;z-index:1000;}
+#sysmsg_info br,#sysmsg br{display:block;margin:2px 0px;border-top:1px solid #ccccce;}
+#asidemain{float:left;font-size:smaller;margin:20px 0 20px 35px;width:25%;display:inline;}
+#asideright,#asideleft{display:none;}
+.vcard .fn{font-size:1.7em;font-weight:bold;border-bottom:1px solid #729fcf;padding-bottom:3px;}
+.vcard #profile-photo-wrapper{margin:20px;}.vcard #profile-photo-wrapper img{box-shadow:3px 3px 10px 0 #000;}
+#asidemain h4{font-size:1.2em;}
+#asidemain #viewcontacts{text-align:right;}
+.aprofile dt{background:transparent;color:#666666;font-weight:bold;box-shadow:1px 1px 5px 0 #000;margin:15px 0 5px;padding-left:5px;}
+#profile-extra-links ul{margin-left:0px;padding-left:0px;list-style:none;}
+#dfrn-request-link{background:#3465a4 url(light/connect.png) no-repeat 95% center;border-radius:5px 5px 5px 5px;color:#fff;display:block;font-size:1.2em;padding:0.2em 0.5em;}
+#wallmessage-link{color:#eee;display:block;font-size:1.2em;padding:0.2em 0.5em;}
+#netsearch-box{margin:20px 0px 30px;width:150px;}#netsearch-box #search-submit{margin:5px 5px 0px 0px;}
+.ttright{margin:0px 0px 0px 0px;}
+.contact-block-div{width:50px;height:50px;float:left;}
+.contact-block-textdiv{width:150px;height:34px;float:left;}
+#contact-block-end{clear:both;}
+#jot{margin:10px 0 20px 0px;width:100%;}#jot #jot-tools{margin:0px;padding:0px;height:35px;overflow:none;width:100%;}#jot #jot-tools span{float:left;margin:10px 20px 2px 0px;}#jot #jot-tools span a{display:block;}
+#jot #jot-tools .perms{float:right;width:40px;}
+#jot #jot-tools li.loading{float:right;background-color:#ffffff;width:20px;vertical-align:center;text-align:center;border-top:2px solid #9eabb0;height:38px;}#jot #jot-tools li.loading img{margin-top:10px;}
+#jot #jot-title{border:1px solid #ccc;margin:0 0 5px;height:20px;width:90%;font-weight:bold;border-radius:5px;vertical-align:middle;}
+#jot-category{margin:5px 0;border-radius:5px;border:1px #ccc solid;color:#666;font-size:smaller;}#jot-category:focus{color:#111;}
+#jot #character-counter{width:6%;float:right;text-align:right;height:15px;line-height:20px;padding:2px 20px 5px 0;}
+#profile-jot-text_parent{box-shadow:5px 0 10px 0 #111;}
+#profile-jot-text_tbl{margin-bottom:10px;background:#777;}
+#profile-jot-text_ifr{width:99.900002% !important;}
+#profile-jot-text_toolbargroup,.mceCenter tr{background:#777;}
+[id$="jot-text_ifr"]{width:99.900002% !important;color:#2e2f2e;background:#eec;}[id$="jot-text_ifr"] .mceContentBody{color:#2e2f2e;background:#eec;}
+.defaultSkin tr.mceFirst{background:#777;}
+.defaultSkin td.mceFirst,.defaultSkin td.mceLast{background-color:#eec;}
+.defaultSkin span.mceIcon,.defaultSkin img.mceIcon,.defaultSkin .mceButtonDisabled .mceIcon{background-color:#eec;}
+#profile-attach-wrapper,#profile-audio-wrapper,#profile-link-wrapper,#profile-location-wrapper,#profile-nolocation-wrapper,#profile-title-wrapper,#profile-upload-wrapper,#profile-video-wrapper{float:left;margin:0 20px 0 0;}
+#profile-rotator-wrapper{float:right;}
+#profile-jot-tools-end,#profile-jot-banner-end{clear:both;}
+#profile-jot-email-wrapper{margin:10px 10% 0;border:1px solid #555753;border-bottom:0;}
+#profile-jot-email-label{background-color:#555753;color:#ccccce;padding:5px;}
+#profile-jot-email{width:90%;margin:5px;}
+#profile-jot-networks{margin:0 10%;border:1px solid #555753;border-top:0;border-bottom:0;padding:5px;}
+#profile-jot-net{margin:5px 0;}
+#jot-preview-link{margin:0 0 0 10px;border:0;text-decoration:none;float:right;}
+.icon-text-preview{margin:0 0 -18px 0;display:block;width:20px;height:20px;background:url(light/icons.png) no-repeat -128px -40px;border:0;text-decoration:none;float:right;cursor:pointer;}
+#profile-jot-perms{float:right;background-color:#555753;height:22px;width:20px;-webkit-border-radius:5px;-moz-border-radius:5px;border-radius:5px;overflow:hidden;border:0px;margin:0 10px 0 10px;}
+#profile-jot-plugin-wrapper{width:1px;margin:10px 0 0 0;float:right;}
+#profile-jot-submit-wrapper{float:right;width:100%;list-style:none;margin:10px 0 0 0;padding:0;}
+#profile-jot-submit{height:auto;background-color:#555753;color:#eeeeec;-webkit-border-radius:5px;-moz-border-radius:5px;border-radius:5px;border:2px outset #222420;margin:0;float:right;text-shadow:1px 1px #111;width:auto;}#profile-jot-submit:active{box-shadow:0 0 0 0;}
+#jot-perms-icon{height:22px;width:20px;-webkit-border-radius:5px;-moz-border-radius:5px;border-radius:5px;overflow:hidden;border:0;}
+#profile-jot-acl-wrapper{margin:0 10px;border:1px solid #555753;border-top:0;display:block !important;}
+#group_allow_wrapper,#group_deny_wrapper,#acl-permit-outer-wrapper{width:47%;float:left;}
+#contact_allow_wrapper,#contact_deny_wrapper,#acl-deny-outer-wrapper{width:47%;float:right;}
+#acl-permit-text{background-color:#555753;color:#ccccce;padding:5px;float:left;}
+#jot-public{background-color:#555753;color:#ff0000;padding:5px;float:left;}
+#acl-deny-text{background-color:#555753;color:#ccccce;padding:5px;float:left;}
+#acl-permit-text-end,#acl-deny-text-end{clear:both;}
+#jot-title-desc{color:#ccc;}
+#profile-jot-desc{color:#a00;margin:5px 0;}
+#jot-title-wrapper{margin-bottom:5px;}
+#jot-title-display{font-weight:bold;}
+.jothidden{display:none;}
+#jot-preview-content{background-color:#ffffe0;color:#111;border:1px #aa0 solid;border-radius:5px;padding:3px 3px 6px 10px;}#jot-preview-content .wall-item-outside-wrapper{border:0;border-radius:0px;}
+#sectionmain{margin:20px;font-size:0.8em;min-width:475px;width:67%;float:left;display:inline;}
+.tabs{list-style:none;margin:10px 0;padding:0;}.tabs li{display:inline;font-size:smaller;font-weight:bold;}
+.tab{border:1px solid #729fcf;padding:4px;}.tab:hover,.tab.active:hover,.tab:active{background:#729fcf;color:#eeeeec;}
+.tab.active{background:#729fcf;color:#eeeeec;}.tab.active a{color:#729fcf;}
+.tab a{border:0;text-decoration:none;}
+.wall-item-outside-wrapper{border:1px solid #aaa;border-radius:5px;box-shadow:5px 0 10px 0 #888;}.wall-item-outside-wrapper.comment{margin-top:5px;}
+.wall-item-outside-wrapper-end{clear:both;}
+.wall-item-content-wrapper{position:relative;padding:10px;width:auto;}
+.wall-item-outside-wrapper .wall-item-comment-wrapper{}
+.shiny{background:#efefdf;border-radius:5px;}
+.wall-outside-wrapper .shiny{border-radius:5px;}
+.heart{color:red;}
+.wall-item-content{overflow-x:auto;margin:0px 15px 0px 5px;}
+[id^="tread-wrapper"],[class^="tread-wrapper"]{margin:15px 0 0 0;padding:0px;}
+.wall-item-photo-menu{display:none;}
+.wall-item-photo-menu-button{display:none;text-indent:-99999px;background:#555753 url(light/menu-user-pin.jpg) no-repeat 75px center;position:absolute;overflow:hidden;height:20px;width:90px;top:85px;left:0;-webkit-border-radius:0 0 5px 5px;-moz-border-radius:0 0 5px 5px;border-radius:0 0 5px 5px;}
+.wall-item-info{float:left;width:110px;}
+.wall-item-photo-wrapper{width:80px;height:80px;position:relative;padding:5px;background-color:#555753;-webkit-border-radius:5px;-moz-border-radius:5px;border-radius:5px;}
+[class^="wall-item-tools"] *{}[class^="wall-item-tools"] *>*{}
+.wall-item-tools{float:right;opacity:0.4;-webkit-transition:all 1s ease-in-out;-moz-transition:all 1s ease-in-out;-o-transition:all 1s ease-in-out;-ms-transition:all 1s ease-in-out;transition:all 1s ease-in-out;}.wall-item-tools:hover{opacity:1;-webkit-transition:all 1s ease-in-out;-moz-transition:all 1s ease-in-out;-o-transition:all 1s ease-in-out;-ms-transition:all 1s ease-in-out;transition:all 1s ease-in-out;}
+.wall-item-subtools1{height:30px;list-style:none outside none;margin:20px 0 30px -20px;padding:0;width:30px;}
+.wall-item-subtools2{height:25px;list-style:none outside none;margin:-75px 0 0 5px;padding:0;width:25px;}
+.wall-item-title{font-size:1.2em;font-weight:bold;margin-bottom:1em;}
+.wall-item-body{margin:20px 20px 10px 0px;text-align:left;overflow-x:auto;}
+.wall-item-lock-wrapper{float:right;height:22px;margin:0 -5px 0 0;width:22px;opacity:1;}
+.wall-item-dislike,.wall-item-like{clear:left;font-size:0.8em;color:#878883;margin:5px 0 5px 120px;}
+.wall-item-author,.wall-item-actions-author{clear:left;font-size:0.8em;color:#878883;margin:20px 20px 0 110px;}
+.wall-item-ago{display:inline;padding-left:10px;}
+.wall-item-wrapper-end{clear:both;}
+.wall-item-location{margin-top:15px;width:100px;overflow:hidden;text-overflow:ellipsis;-o-text-overflow:ellipsis;}.wall-item-location .icon{float:left;}
+.wall-item-location>a,.wall-item-location .smalltext{margin-left:25px;font-size:0.7em;display:block;}
+.wall-item-location>br{display:none;}
+.wallwall .wwto{left:5px;margin:0;position:absolute;top:75px;width:30px;z-index:10001;width:30px;height:30px;}.wallwall .wwto img{width:30px !important;height:30px !important;}
+.wallwall .wall-item-photo-end{clear:both;}
+.wall-item-arrowphoto-wrapper{position:absolute;left:35px;top:80px;z-index:10002;}
+.wall-item-photo-menu{min-width:92px;border:2px solid #FFFFFF;border-top:0px;background:#555753;position:absolute;left:-2px;top:101px;display:none;z-index:10003;-webkit-border-radius:0px 5px 5px 5px;-moz-border-radius:0px 5px 5px 5px;border-radius:0px 5px 5px 5px;}.wall-item-photo-menu ul{margin:0px;padding:0px;list-style:none;}
+.wall-item-photo-menu li a{white-space:nowrap;display:block;padding:5px 2px;color:#eeeeec;}.wall-item-photo-menu li a:hover{color:#555753;background:#eeeeec;}
+#item-delete-selected{overflow:auto;width:100%;}
+#connect-services-header,#connect-services,#extra-help-header,#extra-help,#postit-header,#postit{margin:5px 0 0 0;}
+.ccollapse-wrapper{font-size:0.9em;margin-left:80px;}
+.wall-item-outside-wrapper.comment{margin-left:80px;}.wall-item-outside-wrapper.comment .wall-item-photo{width:40px!important;height:40px!important;}
+.wall-item-outside-wrapper.comment .wall-item-photo-wrapper{width:40px;height:40px;}
+.wall-item-outside-wrapper.comment .wall-item-photo-menu-button{width:50px;top:45px;background-position:35px center;}
+.wall-item-outside-wrapper.comment .wall-item-info{width:60px;}
+.wall-item-outside-wrapper.comment .wall-item-body{margin-left:10px;}
+.wall-item-outside-wrapper.comment .wall-item-author{margin-left:50px;}
+.wall-item-outside-wrapper.comment .wall-item-photo-menu{min-width:50px;top:60px;}
+.comment-wwedit-wrapper{}
+.comment-edit-wrapper{border-top:1px #aaa solid;}
+[class^="comment-edit-bb"]{list-style:none;display:none;margin:-40px 0 5px 60px;width:75%;}[class^="comment-edit-bb"]>li{display:inline-block;margin:0 10px 0 0;visibility:none;}
+.comment-wwedit-wrapper img,.comment-edit-wrapper img{width:20px;height:20px;}
+.comment-edit-photo-link,.comment-edit-photo{margin-left:10px;}
+.my-comment-photo{width:40px;height:40px;padding:5px;}
+[class^="comment-edit-text"]{margin:5px 0 10px 20px;width:84.5%;}
+.comment-edit-text-empty{height:20px;border:2px #babdd6 solid;border-radius:5px;color:#babdb6;-webkit-transition:all 0.5s ease-in-out;-moz-transition:all 0.5s ease-in-out;-o-transition:all 0.5s ease-in-out;-ms-transition:all 0.5s ease-in-out;transition:all 0.5s ease-in-out;}.comment-edit-text-empty:hover{color:#999999;}
+.comment-edit-text-full{height:10em;border-radius:5px;-webkit-transition:all 0.5s ease-in-out;-moz-transition:all 0.5s ease-in-out;-o-transition:all 0.5s ease-in-out;-ms-transition:all 0.5s ease-in-out;transition:all 0.5s ease-in-out;}
+.comment-edit-submit-wrapper{width:90%;margin:5px 5px 10px 50px;text-align:right;}
+.comment-edit-submit{height:22px;background-color:#555753;color:#eeeeec;-webkit-border-radius:5px;-moz-border-radius:5px;border-radius:5px;border:0;}
+.wall-item-body code{display:block;padding:0 0 10px 5px;border-color:#ccc;border-style:solid;border-width:1px 1px 1px 10px;background:#eee;color:#444;width:95%;}
+div[id$="text"]{font-weight:bold;border-bottom:1px solid #ccc;}
+div[id$="wrapper"]{height:100%;margin-bottom:1em;}div[id$="wrapper"] br{clear:left;}
+.profile-match-wrapper{float:left;margin:0 5px 40px 0;width:120px;height:120px;padding:3px;position:relative;}
+.icon.drophide.profile-match-ignore{margin:0 6px 0 -3px;}
+[id$="-end"],[class$="end"]{clear:both;margin:0 0 10px 0;}
+.profile-match-end{margin:0 0 5px 0;}
+.profile-match-name{font-weight:bold;margin:auto auto auto 23px;}
+.profile-match-connect{font-style:italic;margin:auto auto auto 23px;}
+#advanced-profile-with{margin-left:200px;}
+.photos{height:auto;overflow:auto;}
+#photo-top-links{margin-bottom:30px;}
+.photo-album-image-wrapper,.photo-top-image-wrapper{float:left;-moz-box-shadow:3px 3px 10px 0 #000;-webkit-box-shadow:3px 3px 10px 0 #000;box-shadow:3px 3px 10px 0 #000;background-color:#eee;color:#111;-webkit-border-radius:5px;-moz-border-radius:5px;border-radius:5px;padding-bottom:30px;position:relative;margin:0 10px 10px 0;}
+#photo-photo{max-width:100%;}#photo-photo img{max-width:100%;}
+.photo-top-image-wrapper a:hover,#photo-photo a:hover,.photo-album-image-wrapper a:hover{border-bottom:0;}
+.photo-top-photo,.photo-album-photo{-webkit-border-radius:5px 5px 0 0;-moz-border-radius:5px 5px 0 0;border-radius:5px 5px 0 0;}
+.photo-top-album-name{position:absolute;bottom:0;padding:0 5px;}
+.caption{position:absolute;bottom:0;margin:0 5px;}
+#photo-photo{position:relative;float:left;}
+#photo-prev-link,#photo-next-link{position:absolute;width:30%;height:100%;background-color:rgba(255, 255, 255, 0.5);opacity:0;-webkit-transition:all 0.2s ease-in-out;-moz-transition:all 0.2s ease-in-out;-o-transition:all 0.2s ease-in-out;-ms-transition:all 0.2s ease-in-out;transition:all 0.2s ease-in-out;background-position:center center;background-repeat:no-repeat;}
+#photo-prev-link{background-image:url(light/prev.png);height:350px;left:1%;top:215px;width:50px;z-index:10;}
+#photo-next-link{background-image:url(light/next.png);height:350px;right:45%;top:215px;width:50px;}
+#photo-prev-link a,#photo-next-link a{display:block;width:100%;height:100%;overflow:hidden;text-indent:-900000px;}
+#photo-prev-link:hover{opacity:1;-webkit-transition:all 0.2s ease-in-out;-moz-transition:all 0.2s ease-in-out;-o-transition:all 0.2s ease-in-out;-ms-transition:all 0.2s ease-in-out;transition:all 0.2s ease-in-out;}
+#photo-next-link:hover{opacity:1;-webkit-transition:all 0.2s ease-in-out;-moz-transition:all 0.2s ease-in-out;-o-transition:all 0.2s ease-in-out;-ms-transition:all 0.2s ease-in-out;transition:all 0.2s ease-in-out;}
+#photo-next-link .icon{display:none;}
+#photo-prev-link .icon{display:none;}
+#photos-upload-spacer,#photos-upload-new-wrapper,#photos-upload-exist-wrapper{margin-bottom:1em;}
+#photos-upload-existing-album-text,#photos-upload-newalbum-div{background-color:#555753;color:#eeeeec;padding:1px;}
+#photos-upload-album-select,#photos-upload-newalbum{width:99%;}
+#photos-upload-perms-menu{text-align:right;}
+#photo-edit-caption,#photo-edit-newtag,#photo-edit-albumname{float:left;margin-bottom:25px;}
+#photo-edit-link-wrap{margin-bottom:15px;}
+#photo-edit-caption,#photo-edit-newtag{width:100%;}
+#photo-like-div{margin-bottom:25px;}
+#photo-edit-caption-end,#photo-edit-tags-end,#photo-edit-albumname-end{clear:both;}
+#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;}
+.prvmail-text{width:100%;}
+#prvmail-subject{width:100%;color:#eec;background:#444;}
+#prvmail-submit-wrapper{margin-top:10px;}
+#prvmail-submit{float:right;margin-top:0;}
+#prvmail-submit-wrapper div{margin-right:5px;float:left;}
+.mail-list-outside-wrapper{margin-top:20px;}
+.mail-list-sender{float:left;}
+.mail-list-detail{margin-left:90px;}
+.mail-list-sender-name{display:inline;font-size:1.1em;}
+.mail-list-date{display:inline;font-size:0.9em;padding-left:10px;}
+.mail-list-sender-name,.mail-list-date{font-style:italic;}
+.mail-list-subject{font-size:1.2em;}
+.mail-list-delete-wrapper{float:right;}
+.mail-list-outside-wrapper-end{clear:both;border-bottom:1px #eec dotted;}
+.mail-conv-sender{float:left;margin:0px 5px 5px 0px;}
+.mail-conv-sender-photo{width:32px;height:32px;}
+.mail-conv-sender-name{float:left;}
+.mail-conv-date{float:right;}
+.mail-conv-subject{clear:right;font-weight:bold;font-size:1.2em;}
+.mail-conv-body{clear:both;}
+.mail-conv-delete-wrapper{margin-top:5px;}
+.view-contact-wrapper,.contact-entry-wrapper{float:left;margin:0 5px 40px 0;width:120px;height:120px;padding:3px;position:relative;}
+.contact-direction-wrapper{position:absolute;top:20px;}
+.contact-edit-links{position:absolute;top:60px;}
+.contact-entry-photo{margin-left:20px;}
+.contact-entry-name{width:120px;font-weight:bold;}
+.contact-entry-photo{position:relative;}
+.contact-entry-edit-links .icon{border:1px solid #babdb6;-webkit-border-radius:3px;-moz-border-radius:3px;border-radius:3px;background-color:#fff;}
+#contact-entry-url,[id^="contact-entry-url"]{font-size:smaller;}
+#contact-entry-network,[id^="contact-entry-network"]{font-size:smaller;font-style:italic;}
+#contact-edit-banner-name{font-size:1.5em;}
+#contact-edit-photo-wrapper{position:relative;float:left;padding:20px;}
+#contact-edit-direction-icon{position:absolute;top:60px;left:0;}
+#contact-edit-nav-wrapper{margin-left:0px;}
+#contact-edit-links{margin-top:23px;}#contact-edit-links ul{list-style-type:none;}
+#contact-drop-links{margin-left:5px;}
+#contact-edit-nav-wrapper .icon{border:1px solid #babdb6;-webkit-border-radius:3px;-moz-border-radius:3px;border-radius:3px;}
+#contact-edit-poll-wrapper{margin-left:0px;}
+#contact-edit-last-update-text{margin-bottom:15px;}
+#contact-edit-last-updated{font-weight:bold;}
+#contact-edit-poll-text{display:inline;}
+#contact-edit-info_tbl,#contact-edit-info_parent,.mceLayout{width:100%;}
+#contact-edit-end{clear:both;margin-bottom:65px;}
+.contact-photo-menu-button{position:absolute;background-image:url("light/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 #444;background:#eee;color:#111;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:#fff;background:#3465A4;text-decoration:none;}
+#id_openid_url{background:url(light/login-bg.gif) no-repeat;background-position:0 50%;padding-left:18px;}
+#settings-nickname-desc{background-color:#eee;-webkit-border-radius:5px;-moz-border-radius:5px;border-radius:5px;padding:5px;color:#111;}
+#settings-default-perms{margin-bottom:20px;}
+#register-form div,#profile-edit-form div{clear:both;}
+.settings-block label{clear:left;}
+.settings-block input{margin:10px 5px;}
+#profile-edit-marital-label span{margin:-4px;}
+.settings-submit-wrapper,.profile-edit-submit-wrapper{margin:0 0 30px -3px;}
+.profile-edit-side-div{display:none;}
+#profiles-menu-trigger{margin:0px 0px 0px 25px;}
+.profile-listing{float:left;margin:20px 20px 0px 0px;}
+.icon-profile-edit{background:url("light/icons.png") -150px 0px no-repeat;border:0;cursor:pointer;display:block;float:right;width:20px;height:20px;margin:0 0 -18px;position:absolute;text-decoration:none;top:113px;right:260px;}
+#profile-edit-links ul{margin:20px 0;padding:0;list-style:none;}
+.marital{margin-top:5px;}
+#register-sitename{display:inline;font-weight:bold;}
+#advanced-expire-popup{background:#2e2f2e;color:#eec;}
+#id_ssl_policy{width:374px;}
+#theme-preview img{margin:10px 10px 10px 288px;}
+.group-delete-wrapper{margin:-31px 50px 0 0;float:right;}
+#group-edit-submit-wrapper{margin:0 0 10px 0;display:inline;}
+#group-edit-desc{margin:10px 0px;}
+#group-members,#prof-members{height:200px;overflow:auto;border:1px solid #555753;-webkit-border-radius:5px 5px 0 0;-moz-border-radius:5px 5px 0 0;border-radius:5px 5px 0 0;}
+#group-all-contacts,#prof-all-contacts{height:200px;overflow:auto;border:1px solid #555753;-webkit-border-radius:0 0 5px 5px;-moz-border-radius:0 0 5px 5px;border-radius:0 0 5px 5px;}
+#group-members h3,#group-all-contacts h3,#prof-members h3,#prof-all-contacts h3{color:#eeeeec;background-color:#555753;margin:0;padding:5px;}
+#group-separator,#prof-separator{display:none;}
+#cropimage-wrapper{float:left;}
+#crop-image-form{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,.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,.intro-approve-as-friend,.intro-approve-as-fan{float:left;}
+.intro-form-end{clear:both;margin-bottom:10px;}
+.intro-approve-as-friend-desc{margin-top:10px;}
+.intro-approve-as-end{clear:both;margin-bottom:10px;}
+.intro-end,.clear{clear:both;}
+.eventcal{float:left;font-size:20px;}
+.event{background:#2e2f2e;}
+.vevent{border:1px solid #ccc;}.vevent .event-description,.vevent .event-location,.vevent .event-start{margin-left:10px;margin-right:10px;}
+#new-event-link{margin-bottom:10px;}
+.edit-event-link,.plink-event-link{}
+.event-description:before{content:url('../../../images/calendar.png');margin-right:15px;}
+.event-start,.event-end{margin-left:10px;width:330px;font-size:smaller;}
+.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:monospace;}
+.today{font-weight:bold;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,#event-share-checkbox{float:left;}
+#event-datetime-break{margin-bottom:10px;}
+#event-nofinish-break,#event-adjust-break,#event-share-break{clear:both;}
+#event-desc-text,#event-location-text{margin-top:10px;margin-bottom:5px;}
+#event-submit{margin-top:10px;}
+.body-tag{margin:10px 0;opacity:0.5;}.body-tag:hover{opacity:1.0 !important;}
+.filesavetags,.categorytags{margin:20px 0;opacity:0.5;}
+.filesavetags:hover,.categorytags:hover{margin:20px 0;opacity:1.0 !important;}
+.item-select{opacity:0.1;margin:5px 0 0 6px !important;}.item-select:hover{opacity:1;}
+.checkeditem{opacity:1;}
+#item-delete-selected{margin-top:30px;}
+.delete-checked{position:absolute;left:35px;margin-top:20px;}
+#item-delete-selected-end{clear:both;}
+#item-delete-selected-icon{float:left;margin-right:5px;}
+#item-delete-selected-desc{float:left;margin-right:5px;}#item-delete-selected-desc:hover{text-decoration:underline;}
+.fc-state-highlight{background:#eec;color:#2e2f2e;}
+.directory-item{float:left;margin:0 5px 4px 0;padding:3px;width:180px;height:250px;position:relative;}
+#group-sidebar{margin-bottom:10px;}
+.group-selected,.nets-selected,.fileas-selected{padding:3px;color:#111;background:#f8f8f8;font-weight:bold;}
+.group-selected:hover,.nets-selected:hover,.fileas-selected:hover{color:#111;}
+.groupsideedit{margin-right:10px;}
+#sidebar-group-ul{padding-left:0;}
+#sidebar-group-list{margin:0 0 5px 0;}#sidebar-group-list ul{list-style-type:none;list-style-position:inside;}
+#sidebar-group-list li{margin-top:10px;}
+#sidebar-group-list .icon{display:inline-block;height:12px;width:12px;}
+#sidebar-new-group{margin:auto;display:inline-block;color:#efefef;text-decoration:none;text-align:center;}
+#peoplefind-sidebar form{margin-bottom:10px;}
+#sidebar-new-group:hover{}
+#sidebar-new-group:active{position:relative;top:1px;}
+#side-peoplefind-url{background-color:#e5e0cf;color:#666;border:1px #666 solid;margin-right:3px;width:75%;}#side-peoplefind-url:hover,#side-peoplefind-url:focus{background-color:#efefef;color:#222;border:1px 333 solid;}
+.nets-ul{list-style-type:none;padding-left:0px;}.nets-ul li{margin:10px 0 0;}
+.nets-link,.nets-all{margin-left:0px;}
+#netsearch-box{margin-top:20px;width:150px;}#netsearch-box #search-submit{margin:5px 0px 0px 0px;}
+#pending-update{float:right;color:#fff;font-weight:bold;background-color:#ff0000;padding:0 .3em;}
+.admin.linklist{border:0;padding:0;}
+.admin.link{list-style-position:inside;}
+#adminpage{color:#111;background:transparent;margin:5px;padding:10px;}#adminpage dl{clear:left;margin-bottom:2px;padding-bottom:2px;border-bottom:1px solid #000;}
+#adminpage dt{width:250px;float:left;font-weight:bold;}
+#adminpage dd{margin-left:250px;}
+#adminpage h3{border-bottom:1px solid #ccc;}
+#adminpage .submit{clear:left;}
+#adminpage #pluginslist{margin:0;padding:0;}
+#adminpage .plugin{list-style:none;display:block;border:1px solid #888;padding:1em;margin-bottom:5px;clear:left;}
+#adminpage .toggleplugin{float:left;margin-right:1em;}
+#adminpage table{width:100%;border-bottom:1px solid #000;margin:5px 0;}#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;}
+#adminpage #users a{text-decoration:underline;}
+#users .name{color:#eec;}
+.field{overflow:auto;}.field label{width:38%;display:inline-block;font-size:1.077em;margin:0 10px 1em 0;border:1px #999 solid;padding:5px;background:#ccc;color:#111;}
+.field .onoff{float:right;margin:0 330px 0 auto;width:80px;}.field .onoff a{display:block;border:1px solid #666;padding:3px 6px 4px 10px;height:16px;text-decoration:none;}
+.field .onoff .on{background:url("../../../images/onoff.jpg") no-repeat 42px 1px #999999;color:#111;text-align:left;}
+.field .onoff .off{background:url("../../../images/onoff.jpg") no-repeat 2px 1px #cccccc;color:#333;text-align:right;}
+.hidden{display:none !important;}
+.field textarea{width:80%;height:100px;}
+.field_help{display:block;margin-left:297px;color:#666;}
+.field.radio .field_help{margin-left:297px;}
+label{width:38%;display:inline-block;font-size:1.077em;margin:0 10px 1em 0;border:1px #999 solid;padding:5px;background:#ccc;color:#111;}
+input{width:250px;height:25px;border:1px #999 solid;}input[type="text"],input[type="password"],input[type="search"]{width:250px;height:25px;border:1px #999 solid;}
+input[type="checkbox"],input[type="radio"]{border:1px #999 solid;margin:0 0 0 0;height:15px;width:15px;}
+input[type="submit"],input[type="button"]{background-color:#555753;border:2px outset #444;border-radius:5px;box-shadow:1px 3px 4px 0 #111;color:#eeeeec;cursor:pointer;font-weight:bold;width:auto;text-shadow:1px 1px #111;-webkit-border-radius:5px;-moz-border-radius:5px;}
+input[type="submit"]:active,input[type="button"]:active{box-shadow:0 0 0 0;}
+.popup{width:100%;height:100%;top:0px;left:0px;position:absolute;display:none;}.popup .background{background-color:#000;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;}
+#panel{z-index:100;}
+.grey{color:grey;}
+.orange{color:orange;}
+.red{color:red;}
+.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;}
+.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;}
+.iconspacer{display:block;width:16px;height:16px;}
+.icon{display:block;width:20px;height:20px;background:url(light/icons.png) no-repeat;border:0;text-decoration:none;border-radius:5px;}.icon:hover{border:0;text-decoration:none;}
+.editicon{display:inline-block;width:21px;height:21px;background:url(light/editicons.png) no-repeat;border:0;text-decoration:none;}
+.shadow{box-shadow:2px 2px 5px 2px #111;}.shadow:active,.shadow:focus,.shadow:hover{box-shadow:0 0 0 0;}
+.editicon:hover{border:0;}
+.boldbb{background-position:0px 0px;}.boldbb:hover{background-position:-22px 0px;}
+.italicbb{background-position:0px -22px;}.italicbb:hover{background-position:-22px -22px;}
+.underlinebb{background-position:0px -44px;}.underlinebb:hover{background-position:-22px -44px;}
+.quotebb{background-position:0px -66px;}.quotebb:hover{background-position:-22px -66px;}
+.codebb{background-position:0px -88px;}.codebb:hover{background-position:-22px -88px;}
+.imagebb{background-position:-44px 0px;}.imagebb:hover{background-position:-66px 0px;}
+.urlbb{background-position:-44px -22px;}.urlbb:hover{background-position:-66px -22px;}
+.videobb{background-position:-44px -44px;}.videobb:hover{background-position:-66px -44px;}
+.icon.drop,.icon.drophide,.icon.delete{float:left;margin:0 2px;}
+.icon.s22.delete{display:block;background-position:-110px 0;}
+.icon.s22.text{padding:10px 0px 0px 25px;width:200px;}
+.icon.text{text-indent:0px;}
+.icon.s16{min-width:16px;height:16px;}
+.s16 .add{background:url("../../../images/icons/16/add.png") no-repeat;}
+.add{margin:0px 5px;}
+.article{background-position:-50px 0;}
+.audio{background-position:-70px 0;}
+.block{background-position:-90px 0px;}
+.drop,.delete{background-position:-110px 0;}
+.drophide{background-position:-130px 0;}
+.edit{background-position:-150px 0;}
+.camera{background-position:-170px 0;}
+.dislike{background-position:-190px 0;}
+.file-as{background-position:-230px -60px;}
+.like{background-position:-211px 0;}
+.link{background-position:-230px 0;}
+.globe,.location{background-position:-50px -20px;}
+.noglobe,.nolocation{background-position:-70px -20px;}
+.no{background-position:-90px -20px;}
+.pause{background-position:-110px -20px;}
+.play{background-position:-130px -20px;}
+.pencil{background-position:-151px -18px;}
+.small-pencil{background-position:-170px -20px;}
+.recycle{background-position:-190px -20px;}
+.remote-link{background-position:-210px -20px;}
+.share{background-position:-230px -20px;}
+.tools{background-position:-50px -40px;}
+.lock{background-position:-70px -40px;}
+.unlock{background-position:-88px -40px;}
+.video{background-position:-110px -40px;}
+.attach{background-position:-190px -40px;}
+.language{background-position:-210px -40px;}
+.starred{background-position:-130px -60px;}
+.unstarred{background-position:-150px -60px;}
+.tagged{background-position:-170px -60px;}
+.on{background-position:-50px -60px;}
+.off{background-position:-70px -60px;}
+.prev{background-position:-90px -60px;}
+.next{background-position:-110px -60px;}
+.icon.dim{opacity:0.3;}
+#pause{position:fixed;bottom:40px;right:30px;}
+.border{border:1px solid #babdb6;-webkit-border-radius:5px;-moz-border-radius:5px;border-radius:5px;}.border:hover{border:1px solid #babdb6;-webkit-border-radius:5px;-moz-border-radius:5px;border-radius:5px;}
+.attachtype{display:block;width:20px;height:23px;background-image:url(../../../images/content-types.png);}
+.type-video{background-position:0px 0px;}
+.type-image{background-position:-20px 0;}
+.type-audio{background-position:-40px 0;}
+.type-text{background-position:-60px 0px;}
+.type-unkn{background-position:-80px 0;}
+.cc-license{margin-top:100px;font-size:0.7em;}
+footer{display:block;clear:both;}
+#profile-jot-text{height:20px;color:#666;border:1px solid #ccc;border-radius:5px;width:99.5%;}
+#photo-edit-perms-select,#photos-upload-permissions-wrapper,#profile-jot-acl-wrapper{display:block !important;background:#eec;color:#2e2f2e;}
+#acl-wrapper{width:660px;margin:0 auto;}
+#acl-search{float:right;background:#ffffff url("../../../images/search_18.png") no-repeat right center;padding-right:20px;margin:6px;color:#111;}
+#acl-showall{float:left;display:block;width:auto;height:18px;background:#eeeecc url("../../../images/show_all_off.png") 8px 8px no-repeat;padding:7px 10px 7px 30px;-webkit-border-radius:5px;-moz-border-radius:5px;border-radius:5px;color:#999;margin:5px 0;}#acl-showall.selected{color:#000;background:#ff9900 url(../../../images/show_all_on.png) 8px 8px no-repeat;}
+#acl-list{height:210px;border:1px solid #ccc;clear:both;margin-top:30px;overflow:auto;}
+.acl-list-item{border:1px solid #ccc;display:block;float:left;height:110px;margin:3px 0 5px 5px;width:120px;}.acl-list-item img{width:22px;height:22px;float:left;margin:5px 5px 20px;}
+.acl-list-item p{height:12px;font-size:10px;margin:0 0 22px;padding:2px 0 1px;}
+.acl-list-item a{background:#cccccc 3px 3px no-repeat;-webkit-border-radius:2px;-moz-border-radius:2px;border-radius:2px;clear:both;font-size:10px;display:block;width:55px;height:20px;color:#999;margin:5px auto 0;padding:0 3px;text-align:center;vertical-align:middle;}
+#acl-wrapper a:hover{text-decoration:none;color:#000;border:0;}
+.acl-button-show{background-image:url('../../../images/show_off.png');margin:0 auto;}
+.acl-button-hide{background-image:url('../../../images/hide_off.png');margin:0 auto;}
+.acl-button-show.selected{color:#000;background-color:#9ade00;background-image:url(../../../images/show_on.png);}
+.acl-button-hide.selected{color:#000;background-color:#ff4141;background-image:url(../../../images/hide_on.png);}
+.acl-list-item.groupshow{border-color:#9ade00;}
+.acl-list-item.grouphide{border-color:#ff4141;}
+.acpopup{max-height:175px;max-width:42%;background-color:#555753;color:#fff;overflow:auto;z-index:100000;border:1px solid #cccccc;}
+.acpopupitem{background-color:#555753;padding:4px;clear:left;}.acpopupitem img{float:left;margin-right:4px;}
+.acpopupitem.selected{color:#2e3436;background-color:#eeeeec;}
+.qcomment-wrapper{padding:0px;margin:5px 5px 5px 81%;}
+.qcomment{opacity:0.5;}.qcomment:hover{opacity:1.0;}
+#network-star-link{margin-top:10px;}
+.network-star{float:left;margin-right:5px;}.network-star.icon.starred{display:inline-block;}
+.fileas-ul{padding:0;}
+#sidebar-page-list ul{padding:0;margin:5px 0;}
+#sidebar-page-list li{list-style:none;}
+#jappix_mini{margin-left:130px;position:fixed;bottom:0;right:175px !important;z-index:999;}
+@media handheld{body{font-size:15pt;}}
diff --git a/view/theme/dispy/light/style.less b/view/theme/dispy/light/style.less
new file mode 100644
index 000000000..f14284f39
--- /dev/null
+++ b/view/theme/dispy/light/style.less
@@ -0,0 +1,2912 @@
+/*
+ * dispy
+ *
+ * maintainer: simon <http://simon.kisikew.org/>
+ * author: unknown
+ *
+ * Author's notes:
+ * A few things of note here. The less file is our working copy,
+ * and the CSS is *generated* from it. The CSS is the one that's
+ * included in the HTML, and not the less one. This is to save
+ * bandwidth and processing time.
+ */
+/* from html5boilerplate */
+/* these are to tell browsers they should be displayed a certain way */
+
+article, aside, details, figcaption, figure, footer, header, hgroup, nav, section {
+  display: block; }
+
+audio, canvas, video, time {
+  display: inline-block;
+  *display: inline;
+  *zoom: 1; }
+
+audio:not([controls]), [hidden] {
+  display: none; }
+
+/* 
+ *  Base
+ */
+/*
+ * 1. Correct text resizing oddly in IE6/7 when body font-size is set using em units
+ * 2. Force vertical scrollbar in non-IE
+ * 3. Prevent iOS text size adjust on device orientation change, without disabling user zoom: h5bp.com/g
+ */
+
+html {
+  font-size: 100%;
+  overflow-y: scroll;
+  -webkit-text-size-adjust: 100%;
+  -ms-text-size-adjust: 100%; }
+
+body {
+  margin: 0;
+  font-size: 16px;
+  line-height: 1.1em;
+  font-family: sans-serif;
+  color: #222;
+  background-color: #e8e8e8; }
+
+button, input, select, textarea {
+  font-family: sans-serif;
+  color: #222;
+  background-color: #e8e8e8; }
+
+select {
+  border: 1px #555 dotted;
+  padding: 3px;
+  margin: 3px;
+  color: #222;
+  background: #e8e8e8; }
+
+option {
+  padding: 3px;
+  color: #222;
+  background: #e8e8e8;
+  &[selected="selected"] {
+    color: #111;
+    background: #cca; } }
+
+ul, ol {
+  padding: 0; }
+
+/* remember to define focus styles! */
+
+:focus {
+  outline: 0; }
+
+[disabled="disabled"] {
+  background: #ddd;
+  color: #333; }
+
+/* remember to highlight inserts somehow! */
+
+ins {
+  background-color: #ff9;
+  color: #000;
+  text-decoration: none; }
+
+mark {
+  background-color: #ff9;
+  color: #000;
+  font-style: italic;
+  font-weight: bold; }
+
+/* Redeclare monospace font family: h5bp.com/j */
+
+pre, code, kbd, samp, .wall-item-body code {
+  font-family: monospace, monospace;
+  _font-family: monospace;
+  font-size: 1em; }
+
+/* Improve readability of pre-formatted text in all browsers */
+
+pre, .wall-item-body code {
+  white-space: pre;
+  white-space: pre-wrap;
+  word-wrap: break-word; }
+
+q {
+  quotes: none;
+  &:before, &:after {
+    content: "";
+    content: none; } }
+
+small {
+  font-size: 85%; }
+
+/* Position subscript and superscript content without affecting line-height: h5bp.com/k */
+
+sub, sup {
+  font-size: 75%;
+  line-height: 0;
+  position: relative;
+  vertical-align: baseline; }
+
+sub {
+  bottom: -0.25em; }
+
+sup {
+  top: -0.5em; }
+
+img {
+  border: 0 none; }
+
+a {
+  color: #3465a4;
+  text-decoration: none;
+  margin-bottom: 1px;
+  &:hover img {
+    text-decoration: none; } }
+
+blockquote {
+  background: #eee;
+  color: #111;
+  text-indent: 5px;
+  padding: 5px;
+  border: 1px #aaa solid;
+  border-radius: 5px; }
+
+a:hover {
+  color: #729fcf;
+  border-bottom: 1px dotted #729fcf; }
+
+.required {
+  display: inline;
+  color: #f00;
+  font-size: 16px;
+  font-weight: bold;
+  margin: 3px; }
+
+.fakelink, .lockview {
+  color: #3465a4;
+  cursor: pointer; }
+
+.fakelink:hover {
+  color: #729fcf; }
+
+.smalltext {
+  font-size: 0.7em; }
+
+#panel {
+  position: absolute;
+  font-size: 0.8em;
+  -webkit-border-radius: 5px;
+  -moz-border-radius: 5px;
+  border-radius: 5px;
+  border: 1px solid #fff;
+  background-color: #2e3436;
+  color: #eeeeec;
+  padding: 1em; }
+
+.pager {
+  margin-top: 60px;
+  display: block;
+  clear: both;
+  text-align: center;
+  span {
+    padding: 4px;
+    margin: 4px; } }
+
+.pager_current {
+  background-color: #729fcf;
+  color: #fff; }
+
+/**
+ * global
+ */
+/* .tool .action */
+
+.action {
+  margin: 5px 0; }
+
+.tool {
+  margin: 5px 0;
+  list-style: none; }
+
+#articlemain {
+  width: 100%;
+  height: 100%;
+  margin: 0 auto; }
+
+/**
+ * login
+ */
+
+#asidemain .field {
+  overflow: hidden;
+  width: 200px; }
+
+#login-extra-links {
+  overflow: auto !important;
+  padding-top: 60px !important;
+  width: 100% !important;
+  a {
+    margin-right: 20px; } }
+
+#login_standard {
+  display: block !important;
+  float: none !important;
+  height: 100% !important;
+  position: relative !important;
+  width: 100% !important;
+  .field label {
+    width: 200px !important; }
+  input {
+    margin: 0 0 8px !important;
+    width: 210px !important;
+    &[type="text"] {
+      margin: 0 0 8px !important;
+      width: 210px !important; } } }
+
+#login-submit-wrapper {
+  margin: 0 !important; }
+
+#login-submit-button {
+  margin-left: 0px !important; }
+
+#asidemain #login_openid {
+  position: relative !important;
+  float: none !important;
+  margin-left: 0px !important;
+  height: auto !important;
+  width: 200px !important; }
+
+#login_openid {
+  #id_openid_url {
+    width: 180px !important;
+    overflow: hidden !important; }
+  label {
+    width: 180px !important; } }
+
+/**
+ * nav
+ */
+
+nav {
+  height: 60px;
+  background-color: #2e3436;
+  color: #eeeeec;
+  position: relative;
+  padding: 20px 20px 10px 95px;
+  a {
+    text-decoration: none;
+    color: #eeeeec;
+    border: 0px;
+    &:hover {
+      text-decoration: none;
+      color: #eeeeec;
+      border: 0px; } }
+  #banner {
+    display: block;
+    position: absolute;
+    left: 51px;
+    top: 25px;
+    #logo-text a {
+      font-size: 40px;
+      font-weight: bold;
+      margin-left: 3px; } } }
+
+ul#user-menu-popup {
+  display: none;
+  position: absolute;
+  background-color: #555753;
+  width: 100%;
+  padding: 10px 0px;
+  margin: 0px;
+  top: 20px;
+  left: 0;
+  -webkit-border-radius: 0 0 5px 5px;
+  -moz-border-radius: 0 0 5px 5px;
+  border-radius: 0 0 5px 5px;
+  box-shadow: 5px 10px 10px 0 #111;
+  z-index: 10000;
+  li {
+    display: block;
+    a {
+      display: block;
+      padding: 5px;
+      &:hover {
+        color: #2e3436;
+        background-color: #eeeeec; }
+      &.nav-sep {
+        border-top: 1px solid #eeeeec; } } } }
+
+nav .nav-link {
+  display: inline-block;
+  width: 22px;
+  height: 22px;
+  overflow: hidden;
+  margin: 0px 5px 5px;
+  text-indent: 50px;
+  background: transparent url(light/icons.png) 0 0 no-repeat; }
+
+#nav-apps-link {
+  background-position: 0 -66px;
+  &:hover {
+    background-position: -22px -66px; } }
+
+#nav-community-link, #nav-contacts-link {
+  background-position: 0 -22px;
+  &:hover {
+    background-position: -22px -22px; } }
+
+#nav-directory-link {
+  background-position: -44px -154px;
+  &:hover {
+    background-position: -66px -154px; } }
+
+#nav-help-link {
+  background-position: 0 -110px;
+  &:hover {
+    background-position: -22px -110px; } }
+
+#nav-home-link {
+  background-position: -44px -132px;
+  &:hover {
+    background-position: -66px -132px; } }
+
+#nav-intro-link {
+  background-position: 0px -190px;
+  &:hover {
+    background-position: -44px -190px; } }
+
+#nav-login-link, #nav-logout-link {
+  background-position: 0 -88px;
+  &:hover {
+    background-position: -22px -88px; } }
+
+#nav-messages-link {
+  background-position: -44px -88px;
+  &:hover {
+    background-position: -66px -88px; } }
+
+#nav-notify-link, #nav-notifications-linkmenu {
+  background-position: -44px -110px; }
+
+#nav-notify-link:hover {
+  background-position: -66px -110px; }
+
+#nav-network-link {
+  background-position: 0px -177px;
+  &:hover {
+    background-position: -22px -177px; } }
+
+#nav-search-link {
+  background-position: 0 -44px;
+  &:hover {
+    background-position: -22px -44px; } }
+
+#profile-link, #profile-title, #wall-image-upload, #wall-file-upload, #profile-attach-wrapper, #profile-audio, #profile-link, #profile-location, #profile-nolocation, #profile-title, #jot-title, #profile-upload-wrapper, #profile-video, #profile-jot-submit, #wall-image-upload-div, #wall-file-upload-div, .icon, .hover, .focus, .pointer {
+  cursor: pointer; }
+
+/* popup notifications */
+
+div.jGrowl div {
+  &.notice {
+    background: #511919 url("../../../images/icons/48/notice.png") no-repeat 5px center;
+    color: #ffffff;
+    padding-left: 58px; }
+  &.info {
+    background: #364e59 url("../../../images/icons/48/info.png") no-repeat 5px center;
+    color: #ffffff;
+    padding-left: 58px; } }
+
+#nav-notifications-menu {
+  margin: 30px 0 0 -20px;
+  width: 275px;
+  max-height: 300px;
+  overflow-y: auto;
+  font-size: 9pt;
+  .contactname {
+    font-weight: bold;
+    font-size: 0.9em; }
+  img {
+    float: left;
+    margin-right: 5px; }
+  .notif-when {
+    font-size: 0.8em;
+    display: block; }
+  li {
+    word-wrap: normal;
+    border-bottom: 1px solid #000;
+    &:hover {
+      color: black; } }
+  a:hover {
+    color: black;
+    text-decoration: underline; } }
+
+nav #nav-notifications-linkmenu {
+  &.on .icon.s22.notify, &.selected .icon.s22.notify {
+    background-image: url("../../../images/icons/22/notify_on.png"); } }
+
+.show {
+  display: block; }
+
+#notifications {
+  height: 20px;
+  width: 170px;
+  position: absolute;
+  top: -19px;
+  left: 4px; }
+
+#nav-floater {
+  position: fixed;
+  top: 20px;
+  right: 1%;
+  padding: 5px;
+  background: #2e3436;
+  color: transparent;
+  border-radius: 5px;
+  z-index: 100;
+  width: 300px;
+  height: 60px; }
+
+#nav-buttons {
+  clear: both;
+  list-style: none;
+  padding: 0px;
+  margin: 0px;
+  height: 25px;
+  > li {
+    padding: 0;
+    display: inline-block;
+    margin: 0px -4px 0px 0px; } }
+
+.floaterflip {
+  display: block;
+  position: fixed;
+  z-index: 110;
+  top: 56px;
+  right: 19px;
+  width: 22px;
+  height: 22px;
+  overflow: hidden;
+  margin: 0px;
+  background: transparent url(light/icons.png) -190px -60px no-repeat; }
+
+.search-box {
+  display: inline-block;
+  margin: 5px;
+  position: fixed;
+  right: 0px;
+  bottom: 0px;
+  z-index: 100;
+  background: #1d1f1d;
+  border-radius: 5px; }
+
+#search-text {
+  border: 1px #eec solid;
+  background: #2e3436;
+  color: #eec; }
+
+.search-box #search-text {
+  margin: 8px;
+  width: 10em;
+  height: 14px;
+  color: #eec; }
+
+#scrollup {
+  position: fixed;
+  right: 5px;
+  bottom: 40px;
+  z-index: 100;
+  a:hover {
+    text-decoration: none;
+    border: 0; } }
+
+#user-menu {
+  box-shadow: 5px 0 10px 0 #111;
+  display: block;
+  width: 75%;
+  margin: 3px 0 0 0;
+  position: relative;
+  background-color: #555753;
+  -webkit-border-radius: 5px;
+  -moz-border-radius: 5px;
+  border-radius: 5px;
+  background: #555753 url("light/menu-user-pin.jpg") 98% center no-repeat;
+  clear: both;
+  top: 4px;
+  left: 10px;
+  padding: 2px;
+  > a {
+    vertical-align: top; } }
+
+#user-menu-label {
+  font-size: 12px;
+  padding: 3px 20px 9px 5px;
+  height: 10px; }
+
+.nav-ajax-update, .nav-ajax-left {
+  width: 30px;
+  height: 19px;
+  background: transparent url(light/notifications.png) 0 0 no-repeat;
+  color: #222;
+  font-weight: bold;
+  font-size: 0.8em;
+  padding-top: 0.2em;
+  text-align: center;
+  float: left;
+  margin: 0 -1px 0 3px;
+  display: block;
+  visibility: hidden; }
+
+.nav-ajax-update.show, .nav-ajax-left.show {
+  visibility: visible; }
+
+#net-update {
+  background-position: 0px 0px; }
+
+#mail-update {
+  background-position: -30px 0; }
+
+#notify-update {
+  background-position: -60px 0px; }
+
+#home-update {
+  background-position: -90px 0px; }
+
+#intro-update {
+  background-position: -120px 0px; }
+
+#lang-select-icon {
+  cursor: pointer;
+  position: fixed;
+  left: 28px;
+  bottom: 6px;
+  z-index: 10; }
+
+#language-selector {
+  position: fixed;
+  bottom: 2px;
+  left: 52px;
+  z-index: 10; }
+
+.menu-popup {
+  position: absolute;
+  display: none;
+  width: 11em;
+  background: #ffffff;
+  color: #2d2d2d;
+  margin: 0px;
+  padding: 0px;
+  list-style: none;
+  border: 3px solid #364e59;
+  z-index: 100000;
+  -webkit-box-shadow: 3px 3px 10px 0 rgba(0, 0, 0, 0.7);
+  -moz-box-shadow: 3px 3px 10px 0 rgba(0, 0, 0, 0.7);
+  box-shadow: 3px 3px 10px 0 rgba(0, 0, 0, 0.7);
+  a {
+    display: block;
+    color: #2d2d2d;
+    padding: 5px 10px;
+    text-decoration: none;
+    &:hover {
+      background-color: #bdcdd4; } }
+  .menu-sep {
+    border-top: 1px solid #9eabb0; }
+  li {
+    float: none;
+    overflow: auto;
+    height: auto;
+    display: block;
+    img {
+      float: left;
+      width: 16px;
+      height: 16px;
+      padding-right: 5px; } }
+  .empty {
+    padding: 5px;
+    text-align: center;
+    color: #9eabb0; } }
+
+.notif-item {
+  font-size: small;
+  a {
+    vertical-align: middle; } }
+
+.notif-image {
+  width: 32px;
+  height: 32px;
+  padding: 7px 7px 0px 0px; }
+
+.notify-seen {
+  background: #ddd; }
+
+/**
+ * sysmsg
+ */
+
+#sysmsg_info {
+  position: fixed;
+  bottom: 0;
+  -moz-box-shadow: 3px 3px 3px 10px 0 #000;
+  -webkit-box-shadow: 3px 3px 10px 0 #000;
+  box-shadow: 3px 3px 10px 0 #000;
+  padding: 10px;
+  background-color: #fcaf3e;
+  border: 2px solid #f8911b;
+  border-bottom: 0;
+  padding-bottom: 50px;
+  z-index: 1000; }
+
+#sysmsg {
+  position: fixed;
+  bottom: 0;
+  -moz-box-shadow: 3px 3px 10px 0 #000;
+  -webkit-box-shadow: 3px 3px 10px 0 #000;
+  box-shadow: 3px 3px 10px 0 #000;
+  padding: 10px;
+  background-color: #fcaf3e;
+  border: 2px solid #f8911b;
+  border-bottom: 0;
+  padding-bottom: 50px;
+  z-index: 1000; }
+
+#sysmsg_info br, #sysmsg br {
+  display: block;
+  margin: 2px 0px;
+  border-top: 1px solid #ccccce; }
+
+/**
+ * aside
+ */
+
+#asidemain {
+  float: left;
+  font-size: smaller;
+  margin: 20px 0 20px 35px;
+  width: 25%;
+  display: inline; }
+
+/* for now, disappear these */
+
+#asideright, #asideleft {
+  display: none; }
+
+.vcard {
+  .fn {
+    font-size: 1.7em;
+    font-weight: bold;
+    border-bottom: 1px solid #729fcf;
+    padding-bottom: 3px; }
+  #profile-photo-wrapper {
+    margin: 20px;
+    img {
+      box-shadow: 3px 3px 10px 0 #000; } } }
+
+/* http://css-tricks.com/snippets/css/css-box-shadow/
+* box-shadow:
+* 1. The horizontal offset of the shadow, positive means
+* the shadow will be on the right of the box, a negative
+* offset will put the shadow on the left of the box.
+* 2. The vertical offset of the shadow, a negative one
+* means the box-shadow will be above the box, a
+* positive one means the shadow will be below the box.
+* 3. The blur radius (optional), if set to 0 the shadow
+* will be sharp, the higher the number, the more blurred
+* it will be.
+* 4. The spread radius (optional), positive values increase
+* the size of the shadow, negative values decrease the size.
+* Default is 0 (the shadow is same size as blur).
+* 5. Colo[u]r
+*/
+
+#asidemain {
+  h4 {
+    font-size: 1.2em; }
+  #viewcontacts {
+    text-align: right; } }
+
+.aprofile dt {
+  background: transparent;
+  color: #666666;
+  font-weight: bold;
+  box-shadow: 1px 1px 5px 0 #000;
+  margin: 15px 0 5px;
+  padding-left: 5px; }
+
+#profile-extra-links ul {
+  margin-left: 0px;
+  padding-left: 0px;
+  list-style: none; }
+
+#dfrn-request-link {
+  background: #3465a4 url(light/connect.png) no-repeat 95% center;
+  border-radius: 5px 5px 5px 5px;
+  color: #fff;
+  display: block;
+  font-size: 1.2em;
+  padding: 0.2em 0.5em; }
+
+#wallmessage-link {
+  /*background: #3465A4 url(light/connect.png) no-repeat 95% center;*/
+  /*border-radius: 5px 5px 5px 5px;*/
+  color: #eee;
+  display: block;
+  font-size: 1.2em;
+  padding: 0.2em 0.5em; }
+
+#netsearch-box {
+  margin: 20px 0px 30px;
+  width: 150px;
+  #search-submit {
+    margin: 5px 5px 0px 0px; } }
+
+.ttright {
+  margin: 0px 0px 0px 0px; }
+
+/**
+ * contacts block
+ */
+
+.contact-block-div {
+  width: 50px;
+  height: 50px;
+  float: left; }
+
+.contact-block-textdiv {
+  width: 150px;
+  height: 34px;
+  float: left; }
+
+#contact-block-end {
+  clear: both; }
+
+/**
+ * jot
+ */
+
+#jot {
+  /*width: 785px;*/
+  margin: 10px 0 20px 0px;
+  width: 100%;
+  #jot-tools {
+    margin: 0px;
+    padding: 0px;
+    height: 35px;
+    overflow: none;
+    width: 100%;
+    /*background-color: #0e232e;*/
+    /*border-bottom: 2px solid #9eabb0;*/
+    span {
+      float: left;
+      margin: 10px 20px 2px 0px;
+      a {
+        display: block; } }
+    .perms {
+      float: right;
+      width: 40px; }
+    li.loading {
+      float: right;
+      background-color: #ffffff;
+      width: 20px;
+      vertical-align: center;
+      text-align: center;
+      border-top: 2px solid #9eabb0;
+      height: 38px;
+      img {
+        margin-top: 10px; } } }
+  #jot-title {
+    border: 1px solid #ccc;
+    margin: 0 0 5px;
+    height: 20px;
+    width: 90%;
+    font-weight: bold;
+    border-radius: 5px;
+    vertical-align: middle; } }
+
+#jot-category {
+  margin: 5px 0;
+  border-radius: 5px;
+  border: 1px #ccc solid;
+  color: #666;
+  font-size: smaller;
+  &:focus {
+    color: #111; } }
+
+#jot #character-counter {
+  width: 6%;
+  float: right;
+  text-align: right;
+  height: 15px;
+  line-height: 20px;
+  padding: 2px 20px 5px 0; }
+
+#profile-jot-text_parent {
+  box-shadow: 5px 0 10px 0 #111; }
+
+#profile-jot-text_tbl {
+  margin-bottom: 10px;
+  background: #777; }
+
+#profile-jot-text_ifr {
+  width: 99.900002% !important; }
+
+#profile-jot-text_toolbargroup, .mceCenter tr {
+  background: #777; }
+
+[id$="jot-text_ifr"] {
+  width: 99.900002% !important;
+  color: #2e2f2e;
+  background: #eec;
+  .mceContentBody {
+    color: #2e2f2e;
+    background: #eec; } }
+
+.defaultSkin {
+  tr.mceFirst {
+    background: #777; }
+  td {
+    &.mceFirst, &.mceLast {
+      background-color: #eec; } }
+  span.mceIcon, img.mceIcon, .mceButtonDisabled .mceIcon {
+    background-color: #eec; } }
+
+#profile-attach-wrapper, #profile-audio-wrapper, #profile-link-wrapper, #profile-location-wrapper, #profile-nolocation-wrapper, #profile-title-wrapper, #profile-upload-wrapper, #profile-video-wrapper {
+  float: left;
+  margin: 0 20px 0 0; }
+
+#profile-rotator-wrapper {
+  float: right; }
+
+#profile-jot-tools-end, #profile-jot-banner-end {
+  clear: both; }
+
+#profile-jot-email-wrapper {
+  margin: 10px 10% 0;
+  border: 1px solid #555753;
+  border-bottom: 0; }
+
+#profile-jot-email-label {
+  background-color: #555753;
+  color: #ccccce;
+  padding: 5px; }
+
+#profile-jot-email {
+  width: 90%;
+  margin: 5px; }
+
+#profile-jot-networks {
+  margin: 0 10%;
+  border: 1px solid #555753;
+  border-top: 0;
+  border-bottom: 0;
+  padding: 5px; }
+
+#profile-jot-net {
+  margin: 5px 0; }
+
+#jot-preview-link {
+  margin: 0 0 0 10px;
+  border: 0;
+  text-decoration: none;
+  float: right; }
+
+.icon-text-preview {
+  margin: 0 0 -18px 0;
+  display: block;
+  width: 20px;
+  height: 20px;
+  background: url(light/icons.png) no-repeat -128px -40px;
+  border: 0;
+  text-decoration: none;
+  float: right;
+  cursor: pointer; }
+
+#profile-jot-perms {
+  float: right;
+  background-color: #555753;
+  height: 22px;
+  width: 20px;
+  -webkit-border-radius: 5px;
+  -moz-border-radius: 5px;
+  border-radius: 5px;
+  overflow: hidden;
+  border: 0px;
+  margin: 0 10px 0 10px; }
+
+#profile-jot-plugin-wrapper {
+  width: 1px;
+  margin: 10px 0 0 0;
+  float: right; }
+
+#profile-jot-submit-wrapper {
+  float: right;
+  width: 100%;
+  list-style: none;
+  margin: 10px 0 0 0;
+  padding: 0; }
+
+#profile-jot-submit {
+  height: auto;
+  background-color: #555753;
+  color: #eeeeec;
+  -webkit-border-radius: 5px;
+  -moz-border-radius: 5px;
+  border-radius: 5px;
+  border: 2px outset #222420;
+  margin: 0;
+  float: right;
+  text-shadow: 1px 1px #111;
+  width: auto;
+  &:active {
+    box-shadow: 0 0 0 0; } }
+
+#jot-perms-icon {
+  height: 22px;
+  width: 20px;
+  -webkit-border-radius: 5px;
+  -moz-border-radius: 5px;
+  border-radius: 5px;
+  overflow: hidden;
+  border: 0; }
+
+#profile-jot-acl-wrapper {
+  margin: 0 10px;
+  border: 1px solid #555753;
+  border-top: 0;
+  display: block !important; }
+
+#group_allow_wrapper, #group_deny_wrapper, #acl-permit-outer-wrapper {
+  width: 47%;
+  float: left; }
+
+#contact_allow_wrapper, #contact_deny_wrapper, #acl-deny-outer-wrapper {
+  width: 47%;
+  float: right; }
+
+#acl-permit-text {
+  background-color: #555753;
+  color: #ccccce;
+  padding: 5px;
+  float: left; }
+
+#jot-public {
+  background-color: #555753;
+  color: #ff0000;
+  padding: 5px;
+  float: left; }
+
+#acl-deny-text {
+  background-color: #555753;
+  color: #ccccce;
+  padding: 5px;
+  float: left; }
+
+#acl-permit-text-end, #acl-deny-text-end {
+  clear: both; }
+
+#jot-title-desc {
+  color: #ccc; }
+
+#profile-jot-desc {
+  color: #a00;
+  margin: 5px 0; }
+
+#jot-title-wrapper {
+  margin-bottom: 5px; }
+
+#jot-title-display {
+  font-weight: bold; }
+
+.jothidden {
+  display: none; }
+
+#jot-preview-content {
+  background-color: #ffffe0;
+  color: #111;
+  border: 1px #aa0 solid;
+  border-radius: 5px;
+  padding: 3px 3px 6px 10px;
+  .wall-item-outside-wrapper {
+    border: 0;
+    border-radius: 0px; } }
+
+/**
+ * section
+ */
+
+#sectionmain {
+  margin: 20px;
+  font-size: 0.8em;
+  min-width: 475px;
+  width: 67%;
+  float: left;
+  display: inline; }
+
+/**
+ * tabs
+ */
+
+.tabs {
+  list-style: none;
+  margin: 10px 0;
+  padding: 0;
+  li {
+    display: inline;
+    font-size: smaller;
+    font-weight: bold; } }
+
+.tab {
+  border: 1px solid #729fcf;
+  padding: 4px;
+  &:hover, &.active:hover, &:active {
+    background: #729fcf;
+    color: #eeeeec; }
+  &.active {
+    background: #729fcf;
+    color: #eeeeec;
+    a {
+      color: #729fcf; } }
+  a {
+    border: 0;
+    text-decoration: none; } }
+
+/**
+ * items
+ */
+
+.wall-item-outside-wrapper {
+  border: 1px solid #aaa;
+  border-radius: 5px;
+  box-shadow: 5px 0 10px 0 #888;
+  &.comment {
+    margin-top: 5px; } }
+
+.wall-item-outside-wrapper-end {
+  clear: both; }
+
+.wall-item-content-wrapper {
+  position: relative;
+  padding: 10px;
+  width: auto; }
+
+.wall-item-outside-wrapper .wall-item-comment-wrapper {
+  /*margin-left: 90px;*/ }
+
+.shiny {
+  background: #efefdf;
+  border-radius: 5px; }
+
+.wall-outside-wrapper .shiny {
+  border-radius: 5px; }
+
+.heart {
+  color: red; }
+
+.wall-item-content {
+  overflow-x: auto;
+  margin: 0px 15px 0px 5px; }
+
+/* removing it from here, vs. putting it in .wall-item-content
+* might break things for people. we shall see ;) */
+
+[id^="tread-wrapper"], [class^="tread-wrapper"] {
+  margin: 15px 0 0 0;
+  padding: 0px;
+  /*overflow-x: auto;*/ }
+
+.wall-item-photo-menu {
+  display: none; }
+
+.wall-item-photo-menu-button {
+  display: none;
+  text-indent: -99999px;
+  background: #555753 url(light/menu-user-pin.jpg) no-repeat 75px center;
+  position: absolute;
+  overflow: hidden;
+  height: 20px;
+  width: 90px;
+  top: 85px;
+  left: 0;
+  -webkit-border-radius: 0 0 5px 5px;
+  -moz-border-radius: 0 0 5px 5px;
+  border-radius: 0 0 5px 5px; }
+
+.wall-item-info {
+  float: left;
+  width: 110px; }
+
+.wall-item-photo-wrapper {
+  width: 80px;
+  height: 80px;
+  position: relative;
+  padding: 5px;
+  background-color: #555753;
+  -webkit-border-radius: 5px;
+  -moz-border-radius: 5px;
+  border-radius: 5px; }
+
+[class^="wall-item-tools"] * {
+  /*margin: 0 0 5px 0;*/
+  > * {
+    /*margin: 0 0 5px 0;*/ } }
+
+.wall-item-tools {
+  float: right;
+  opacity: 0.4;
+  -webkit-transition: all 1s ease-in-out;
+  -moz-transition: all 1s ease-in-out;
+  -o-transition: all 1s ease-in-out;
+  -ms-transition: all 1s ease-in-out;
+  transition: all 1s ease-in-out;
+  &:hover {
+    opacity: 1;
+    -webkit-transition: all 1s ease-in-out;
+    -moz-transition: all 1s ease-in-out;
+    -o-transition: all 1s ease-in-out;
+    -ms-transition: all 1s ease-in-out;
+    transition: all 1s ease-in-out; } }
+
+.wall-item-subtools1 {
+  height: 30px;
+  list-style: none outside none;
+  margin: 20px 0 30px -20px;
+  padding: 0;
+  width: 30px; }
+
+.wall-item-subtools2 {
+  height: 25px;
+  list-style: none outside none;
+  margin: -75px 0 0 5px;
+  padding: 0;
+  width: 25px; }
+
+.wall-item-title {
+  font-size: 1.2em;
+  font-weight: bold;
+  margin-bottom: 1em; }
+
+.wall-item-body {
+  margin: 20px 20px 10px 0px;
+  text-align: left;
+  overflow-x: auto; }
+
+.wall-item-lock-wrapper {
+  float: right;
+  height: 22px;
+  margin: 0 -5px 0 0;
+  width: 22px;
+  opacity: 1; }
+
+.wall-item-dislike, .wall-item-like {
+  clear: left;
+  font-size: 0.8em;
+  color: #878883;
+  margin: 5px 0 5px 120px; }
+
+.wall-item-author, .wall-item-actions-author {
+  clear: left;
+  font-size: 0.8em;
+  color: #878883;
+  margin: 20px 20px 0 110px; }
+
+.wall-item-ago {
+  display: inline;
+  padding-left: 10px; }
+
+.wall-item-wrapper-end {
+  clear: both; }
+
+.wall-item-location {
+  margin-top: 15px;
+  width: 100px;
+  overflow: hidden;
+  text-overflow: ellipsis;
+  -o-text-overflow: ellipsis;
+  .icon {
+    float: left; }
+  > a, .smalltext {
+    margin-left: 25px;
+    font-size: 0.7em;
+    display: block; }
+  > br {
+    display: none; } }
+
+.wallwall {
+  .wwto {
+    left: 5px;
+    margin: 0;
+    position: absolute;
+    top: 75px;
+    width: 30px;
+    z-index: 10001;
+    width: 30px;
+    height: 30px;
+    img {
+      width: 30px !important;
+      height: 30px !important; } }
+  .wall-item-photo-end {
+    clear: both; } }
+
+.wall-item-arrowphoto-wrapper {
+  position: absolute;
+  left: 35px;
+  top: 80px;
+  z-index: 10002; }
+
+.wall-item-photo-menu {
+  min-width: 92px;
+  border: 2px solid #FFFFFF;
+  border-top: 0px;
+  background: #555753;
+  position: absolute;
+  left: -2px;
+  top: 101px;
+  display: none;
+  z-index: 10003;
+  -webkit-border-radius: 0px 5px 5px 5px;
+  -moz-border-radius: 0px 5px 5px 5px;
+  border-radius: 0px 5px 5px 5px;
+  ul {
+    margin: 0px;
+    padding: 0px;
+    list-style: none; }
+  li a {
+    white-space: nowrap;
+    display: block;
+    padding: 5px 2px;
+    color: #eeeeec;
+    &:hover {
+      color: #555753;
+      background: #eeeeec; } } }
+
+#item-delete-selected {
+  overflow: auto;
+  width: 100%; }
+
+#connect-services-header, #connect-services, #extra-help-header, #extra-help, #postit-header, #postit {
+  margin: 5px 0 0 0; }
+
+/**
+ * comment
+ */
+
+.ccollapse-wrapper {
+  font-size: 0.9em;
+  margin-left: 80px; }
+
+.wall-item-outside-wrapper.comment {
+  margin-left: 80px;
+  .wall-item-photo {
+    width: 40px!important;
+    height: 40px!important; }
+  .wall-item-photo-wrapper {
+    width: 40px;
+    height: 40px; }
+  .wall-item-photo-menu-button {
+    width: 50px;
+    top: 45px;
+    background-position: 35px center; }
+  .wall-item-info {
+    width: 60px; }
+  .wall-item-body {
+    margin-left: 10px; }
+  .wall-item-author {
+    margin-left: 50px; }
+  .wall-item-photo-menu {
+    min-width: 50px;
+    top: 60px; } }
+
+.comment-wwedit-wrapper {
+  /*margin: 30px 0px 0px 80px;*/ }
+
+.comment-edit-wrapper {
+  border-top: 1px #aaa solid; }
+
+[class^="comment-edit-bb"] {
+  list-style: none;
+  display: none;
+  margin: -40px 0 5px 60px;
+  width: 75%;
+  > li {
+    display: inline-block;
+    margin: 0 10px 0 0;
+    visibility: none; } }
+
+.comment-wwedit-wrapper img, .comment-edit-wrapper img {
+  width: 20px;
+  height: 20px; }
+
+.comment-edit-photo-link, .comment-edit-photo {
+  margin-left: 10px; }
+
+.my-comment-photo {
+  width: 40px;
+  height: 40px;
+  padding: 5px; }
+
+[class^="comment-edit-text"] {
+  margin: 5px 0 10px 20px;
+  width: 84.5%; }
+
+.comment-edit-text-empty {
+  height: 20px;
+  border: 2px #babdd6 solid;
+  border-radius: 5px;
+  color: #babdb6;
+  -webkit-transition: all 0.5s ease-in-out;
+  -moz-transition: all 0.5s ease-in-out;
+  -o-transition: all 0.5s ease-in-out;
+  -ms-transition: all 0.5s ease-in-out;
+  transition: all 0.5s ease-in-out;
+  &:hover {
+    color: #999999; } }
+
+.comment-edit-text-full {
+  height: 10em;
+  border-radius: 5px;
+  -webkit-transition: all 0.5s ease-in-out;
+  -moz-transition: all 0.5s ease-in-out;
+  -o-transition: all 0.5s ease-in-out;
+  -ms-transition: all 0.5s ease-in-out;
+  transition: all 0.5s ease-in-out; }
+
+.comment-edit-submit-wrapper {
+  width: 90%;
+  margin: 5px 5px 10px 50px;
+  text-align: right; }
+
+.comment-edit-submit {
+  height: 22px;
+  background-color: #555753;
+  color: #eeeeec;
+  -webkit-border-radius: 5px;
+  -moz-border-radius: 5px;
+  border-radius: 5px;
+  border: 0; }
+
+/**
+ * item text style
+ */
+
+.wall-item-body code {
+  display: block;
+  padding: 0 0 10px 5px;
+  border-color: #ccc;
+  border-style: solid;
+  border-width: 1px 1px 1px 10px;
+  background: #eee;
+  color: #444;
+  width: 95%; }
+
+/**
+ * profile
+ */
+
+div {
+  &[id$="text"] {
+    font-weight: bold;
+    border-bottom: 1px solid #ccc; }
+  &[id$="wrapper"] {
+    height: 100%;
+    margin-bottom: 1em;
+    br {
+      clear: left; } } }
+
+.profile-match-wrapper {
+	float: left;
+	margin: 0 5px 40px 0;
+	width: 120px;
+	height: 120px;
+	padding: 3px;
+	position: relative;
+}
+.icon.drophide.profile-match-ignore {
+	margin: 0 6px 0 -3px;
+}
+.profile-match-photo {
+	
+}
+
+[id$="-end"], [class$="end"] {
+  clear: both;
+  margin: 0 0 10px 0; }
+
+.profile-match-end {
+	margin: 0 0 5px 0;
+}
+.profile-match-name {
+	font-weight: bold;
+	margin: auto auto auto 23px;
+}
+.profile-match-connect {
+	font-style: italic;
+	margin: auto auto auto 23px;
+}
+#advanced-profile-with {
+  margin-left: 200px; }
+
+/**
+ * photos
+ */
+
+.photos {
+  height: auto;
+  overflow: auto; }
+
+#photo-top-links {
+  margin-bottom: 30px; }
+
+.photo-album-image-wrapper, .photo-top-image-wrapper {
+  float: left;
+  -moz-box-shadow: 3px 3px 10px 0 #000;
+  -webkit-box-shadow: 3px 3px 10px 0 #000;
+  box-shadow: 3px 3px 10px 0 #000;
+  background-color: #eee;
+  color: #111;
+  -webkit-border-radius: 5px;
+  -moz-border-radius: 5px;
+  border-radius: 5px;
+  padding-bottom: 30px;
+  position: relative;
+  margin: 0 10px 10px 0; }
+
+#photo-photo {
+  max-width: 100%;
+  img {
+    max-width: 100%; } }
+
+.photo-top-image-wrapper a:hover, #photo-photo a:hover, .photo-album-image-wrapper a:hover {
+  border-bottom: 0; }
+
+.photo-top-photo, .photo-album-photo {
+  -webkit-border-radius: 5px 5px 0 0;
+  -moz-border-radius: 5px 5px 0 0;
+  border-radius: 5px 5px 0 0; }
+
+.photo-top-album-name {
+  position: absolute;
+  bottom: 0;
+  padding: 0 5px; }
+
+.caption {
+  position: absolute;
+  bottom: 0;
+  margin: 0 5px; }
+
+#photo-photo {
+  position: relative;
+  float: left; }
+
+#photo-prev-link, #photo-next-link {
+  position: absolute;
+  width: 30%;
+  height: 100%;
+  background-color: rgba(255, 255, 255, 0.5);
+  opacity: 0;
+  -webkit-transition: all .2s ease-in-out;
+  -moz-transition: all .2s ease-in-out;
+  -o-transition: all .2s ease-in-out;
+  -ms-transition: all .2s ease-in-out;
+  transition: all .2s ease-in-out;
+  background-position: center center;
+  background-repeat: no-repeat; }
+
+#photo-prev-link {
+	background-image: url(light/prev.png);
+    height: 350px;
+    left: 1%;
+    top: 215px;
+    width: 50px;
+    z-index: 10;
+}
+
+#photo-next-link {
+	background-image: url(light/next.png);
+    height: 350px;
+    right: 45%;
+    top: 215px;
+    width: 50px;
+}
+
+#photo-prev-link a, #photo-next-link a {
+  display: block;
+  width: 100%;
+  height: 100%;
+  overflow: hidden;
+  text-indent: -900000px; }
+
+#photo-prev-link:hover {
+  opacity: 1;
+  -webkit-transition: all .2s ease-in-out;
+  -moz-transition: all .2s ease-in-out;
+  -o-transition: all .2s ease-in-out;
+  -ms-transition: all .2s ease-in-out;
+  transition: all .2s ease-in-out; }
+
+#photo-next-link {
+  &:hover {
+    opacity: 1;
+    -webkit-transition: all .2s ease-in-out;
+    -moz-transition: all .2s ease-in-out;
+    -o-transition: all .2s ease-in-out;
+    -ms-transition: all .2s ease-in-out;
+    transition: all .2s ease-in-out; }
+  .icon {
+    display: none; } }
+
+#photo-prev-link .icon {
+  display: none; }
+
+#photos-upload-spacer, #photos-upload-new-wrapper, #photos-upload-exist-wrapper {
+  margin-bottom: 1em; }
+
+#photos-upload-existing-album-text, #photos-upload-newalbum-div {
+  background-color: #555753;
+  color: #eeeeec;
+  padding: 1px; }
+
+#photos-upload-album-select, #photos-upload-newalbum {
+  width: 99%; }
+
+#photos-upload-perms-menu {
+  text-align: right; }
+
+#photo-edit-caption, #photo-edit-newtag, #photo-edit-albumname {
+  float: left;
+  margin-bottom: 25px; }
+
+#photo-edit-link-wrap {
+  margin-bottom: 15px; }
+
+#photo-edit-caption, #photo-edit-newtag {
+  width: 100%; }
+
+#photo-like-div {
+  margin-bottom: 25px; }
+
+#photo-edit-caption-end, #photo-edit-tags-end, #photo-edit-albumname-end {
+  clear: both; }
+
+#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; }
+
+/**
+ * message
+ */
+
+.prvmail-text {
+  width: 100%; }
+
+#prvmail-subject {
+  width: 100%;
+  color: #eec;
+  background: #444; }
+
+#prvmail-submit-wrapper {
+  margin-top: 10px; }
+
+#prvmail-submit {
+  float: right;
+  margin-top: 0; }
+
+#prvmail-submit-wrapper div {
+  margin-right: 5px;
+  float: left; }
+
+.mail-list-outside-wrapper {
+  margin-top: 20px; }
+
+.mail-list-sender {
+  float: left; }
+
+.mail-list-detail {
+  margin-left: 90px; }
+
+.mail-list-sender-name {
+  display: inline;
+  font-size: 1.1em; }
+
+.mail-list-date {
+  display: inline;
+  font-size: 0.9em;
+  padding-left: 10px; }
+
+.mail-list-sender-name, .mail-list-date {
+  font-style: italic; }
+
+.mail-list-subject {
+  font-size: 1.2em; }
+
+.mail-list-delete-wrapper {
+  float: right; }
+
+.mail-list-outside-wrapper-end {
+  clear: both;
+  border-bottom: 1px #eec dotted; }
+
+.mail-conv-sender {
+  float: left;
+  margin: 0px 5px 5px 0px; }
+
+.mail-conv-sender-photo {
+  width: 32px;
+  height: 32px; }
+
+.mail-conv-sender-name {
+  float: left; }
+
+.mail-conv-date {
+  float: right; }
+
+.mail-conv-subject {
+  clear: right;
+  font-weight: bold;
+  font-size: 1.2em; }
+
+.mail-conv-body {
+  clear: both; }
+
+.mail-conv-delete-wrapper {
+  margin-top: 5px; }
+
+/**
+ * contacts
+ */
+
+.view-contact-wrapper, .contact-entry-wrapper {
+  float: left;
+  margin: 0 5px 40px 0;
+  width: 120px;
+  height: 120px;
+  padding: 3px;
+  position: relative; }
+
+.contact-direction-wrapper {
+  position: absolute;
+  top: 20px; }
+
+.contact-edit-links {
+  position: absolute;
+  top: 60px; }
+
+.contact-entry-photo-wrapper {}
+
+.contact-entry-photo {
+  margin-left: 20px; }
+
+.contact-entry-name {
+  width: 120px;
+  font-weight: bold;
+  /*overflow: hidden;*/ }
+
+.contact-entry-photo {
+  position: relative; }
+
+.contact-entry-edit-links .icon {
+  border: 1px solid #babdb6;
+  -webkit-border-radius: 3px;
+  -moz-border-radius: 3px;
+  border-radius: 3px;
+  background-color: #fff; }
+
+#contact-entry-url, [id^="contact-entry-url"] {
+  font-size: smaller;
+  /*overflow: scroll;*/ }
+
+#contact-entry-network, [id^="contact-entry-network"] {
+  font-size: smaller;
+  font-style: italic; }
+
+#contact-edit-banner-name {
+  font-size: 1.5em; }
+
+#contact-edit-photo-wrapper {
+  position: relative;
+  float: left;
+  padding: 20px; }
+
+#contact-edit-direction-icon {
+  position: absolute;
+  top: 60px;
+  left: 0; }
+
+#contact-edit-nav-wrapper {
+  margin-left: 0px; }
+
+#contact-edit-links {
+  margin-top: 23px;
+  ul {
+    list-style-type: none; } }
+
+#contact-drop-links {
+  margin-left: 5px; }
+
+#contact-edit-nav-wrapper .icon {
+  border: 1px solid #babdb6;
+  -webkit-border-radius: 3px;
+  -moz-border-radius: 3px;
+  border-radius: 3px; }
+
+#contact-edit-poll-wrapper {
+  margin-left: 0px; }
+
+#contact-edit-last-update-text {
+  margin-bottom: 15px; }
+
+#contact-edit-last-updated {
+  font-weight: bold; }
+
+#contact-edit-poll-text {
+  display: inline; }
+
+#contact-edit-info_tbl, #contact-edit-info_parent, .mceLayout {
+  width: 100%; }
+
+#contact-edit-end {
+  clear: both;
+  margin-bottom: 65px; }
+
+.contact-photo-menu-button {
+  position: absolute;
+  background-image: url("light/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 #444;
+  background: #eee;
+  color: #111;
+  position: absolute;
+  left: 0px;
+  top: 90px;
+  display: none;
+  z-index: 10000;
+  ul {
+    margin: 0px;
+    padding: 0px;
+    list-style: none; }
+  li a {
+    display: block;
+    padding: 2px;
+    &:hover {
+      color: #fff;
+      background: #3465A4;
+      text-decoration: none; } } }
+
+/**
+ * register, settings & profile forms
+ */
+
+.openid {}
+
+#id_openid_url {
+  background: url(light/login-bg.gif) no-repeat;
+  background-position: 0 50%;
+  padding-left: 18px; }
+
+#settings-nickname-desc {
+  background-color: #eee;
+  -webkit-border-radius: 5px;
+  -moz-border-radius: 5px;
+  border-radius: 5px;
+  padding: 5px;
+  color: #111; }
+
+#settings-default-perms {
+  margin-bottom: 20px; }
+
+#register-form div, #profile-edit-form div {
+  clear: both; }
+
+.settings-block {
+  label {
+    clear: left; }
+  input {
+    margin: 10px 5px; } }
+
+/*#register-form label,     */
+/*#profile-edit-form label {*/
+/*    width: 300px;         */
+/*    float: left;          */
+/*}                         */
+
+/*#register-form span,     */
+/*#profile-edit-form span {*/
+/*    color: #555753;      */
+/*    display: block;      */
+/*    margin-bottom: 20px; */
+/*}                        */
+
+#profile-edit-marital-label span {
+  margin: -4px; }
+
+.settings-submit-wrapper, .profile-edit-submit-wrapper {
+  margin: 0 0 30px -3px; }
+
+.profile-edit-side-div {
+  display: none; }
+
+/*.profile-edit-side-div:hover {
+    display: block;
+}
+.profile-edit-side-link {
+    margin: 3px 0px 0px 70px;
+}*/
+
+#profiles-menu-trigger {
+  margin: 0px 0px 0px 25px; }
+
+.profile-listing {
+  float: left;
+  margin: 20px 20px 0px 0px; }
+
+.icon-profile-edit {
+  background: url("light/icons.png") -150px 0px no-repeat;
+  border: 0;
+  cursor: pointer;
+  display: block;
+  float: right;
+  width: 20px;
+  height: 20px;
+  margin: 0 0 -18px;
+  position: absolute;
+  text-decoration: none;
+  top: 113px;
+  right: 260px; }
+
+#profile-edit-links ul {
+  margin: 20px 0;
+  padding: 0;
+  list-style: none; }
+
+.marital {
+  margin-top: 5px; }
+
+#register-sitename {
+  display: inline;
+  font-weight: bold; }
+
+#advanced-expire-popup {
+  background: #2e2f2e;
+  color: #eec; }
+
+#id_ssl_policy {
+  width: 374px; }
+
+#theme-preview img {
+  margin: 10px 10px 10px 288px; }
+
+/**
+ * contacts selector
+ */
+
+.group-delete-wrapper {
+  margin: -31px 50px 0 0;
+  float: right; }
+
+/*.group-delete-icon {
+    margin: 0 0 0 10px;
+}*/
+
+#group-edit-submit-wrapper {
+  margin: 0 0 10px 0;
+  display: inline; }
+
+#group-edit-desc {
+  margin: 10px 0px; }
+
+#group-members, #prof-members {
+  height: 200px;
+  overflow: auto;
+  border: 1px solid #555753;
+  -webkit-border-radius: 5px 5px 0 0;
+  -moz-border-radius: 5px 5px 0 0;
+  border-radius: 5px 5px 0 0; }
+
+#group-all-contacts, #prof-all-contacts {
+  height: 200px;
+  overflow: auto;
+  border: 1px solid #555753;
+  -webkit-border-radius: 0 0 5px 5px;
+  -moz-border-radius: 0 0 5px 5px;
+  border-radius: 0 0 5px 5px; }
+
+#group-members h3, #group-all-contacts h3, #prof-members h3, #prof-all-contacts h3 {
+  color: #eeeeec;
+  background-color: #555753;
+  margin: 0;
+  padding: 5px; }
+
+#group-separator, #prof-separator {
+  display: none; }
+
+/**
+ * profile
+ */
+
+#cropimage-wrapper {
+  float: left; }
+
+#crop-image-form {
+  clear: both; }
+
+/**
+ * intros
+ */
+
+.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, .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, .intro-approve-as-friend, .intro-approve-as-fan {
+  float: left; }
+
+.intro-form-end {
+  clear: both;
+  margin-bottom: 10px; }
+
+.intro-approve-as-friend-desc {
+  margin-top: 10px; }
+
+.intro-approve-as-end {
+  clear: both;
+  margin-bottom: 10px; }
+
+.intro-end, .clear {
+  clear: both; }
+
+/**
+ * events
+ */
+
+.eventcal {
+  float: left;
+  font-size: 20px; }
+
+.event {
+  background: #2e2f2e; }
+
+.vevent {
+  border: 1px solid #ccc;
+  .event-description, .event-location, .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;
+  font-size: smaller; }
+
+.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: monospace; }
+
+.today {
+  font-weight: bold;
+  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, #event-share-checkbox {
+  float: left; }
+
+#event-datetime-break {
+  margin-bottom: 10px; }
+
+#event-nofinish-break, #event-adjust-break, #event-share-break {
+  clear: both; }
+
+#event-desc-text, #event-location-text {
+  margin-top: 10px;
+  margin-bottom: 5px; }
+
+#event-submit {
+  margin-top: 10px; }
+
+.body-tag {
+  margin: 10px 0;
+  opacity: 0.5;
+  &:hover {
+    opacity: 1.0 !important; } }
+
+.filesavetags, .categorytags {
+  margin: 20px 0;
+  opacity: 0.5; }
+
+.filesavetags:hover, .categorytags:hover {
+  margin: 20px 0;
+  opacity: 1.0 !important; }
+
+.item-select {
+  opacity: 0.1;
+  margin: 5px 0 0 6px !important;
+  &:hover {
+    opacity: 1; } }
+
+.checkeditem {
+  opacity: 1; }
+
+#item-delete-selected {
+  margin-top: 30px; }
+
+/* was tired of having no way of moving it around, so
+* here's a little 'hook' to do so */
+
+.delete-checked {
+  position: absolute;
+  left: 35px;
+  margin-top: 20px; }
+
+#item-delete-selected-end {
+  clear: both; }
+
+#item-delete-selected-icon {
+  float: left;
+  margin-right: 5px; }
+
+#item-delete-selected-desc {
+  float: left;
+  margin-right: 5px;
+  &:hover {
+    text-decoration: underline; } }
+
+.fc-state-highlight {
+  background: #eec;
+  color: #2e2f2e; }
+
+/**
+ * directory
+ */
+
+.directory-item {
+  float: left;
+  margin: 0 5px 4px 0;
+  padding: 3px;
+  width: 180px;
+  height: 250px;
+  position: relative; }
+
+/**
+ * sidebar
+ */
+
+#group-sidebar {
+  margin-bottom: 10px; }
+
+.group-selected, .nets-selected, .fileas-selected {
+  padding: 3px;
+  color: #111;
+  background: #f8f8f8;
+  font-weight: bold; }
+
+.group-selected:hover, .nets-selected:hover, .fileas-selected:hover {
+  color: #111; }
+
+.groupsideedit {
+  margin-right: 10px; }
+
+#sidebar-group-ul {
+  padding-left: 0; }
+
+#sidebar-group-list {
+  margin: 0 0 5px 0;
+  ul {
+    list-style-type: none;
+    list-style-position: inside; }
+  li {
+    margin-top: 10px; }
+  .icon {
+    display: inline-block;
+    height: 12px;
+    width: 12px; } }
+
+#sidebar-new-group {
+  margin: auto;
+  display: inline-block;
+  color: #efefef;
+  text-decoration: none;
+  text-align: center; }
+
+#peoplefind-sidebar form {
+  margin-bottom: 10px; }
+
+#sidebar-new-group {
+  &:hover {
+    /*background: -webkit-gradient( linear, left top, left bottom, color-stop(0.05, #b20202), color-stop(1, #d60808) );*/
+    /*background: -moz-linear-gradient( center top, #b20202 5%, #d60808 100% );*/
+    /*background-color: #b20202;*/ }
+  &:active {
+    position: relative;
+    top: 1px; } }
+
+#side-peoplefind-url {
+  background-color: #e5e0cf;
+  color: #666;
+  border: 1px #666 solid;
+  margin-right: 3px;
+  width: 75%;
+  &:hover, &:focus {
+    background-color: #efefef;
+    color: #222;
+    border: 1px 333 solid; } }
+
+.nets-ul {
+  list-style-type: none;
+  padding-left: 0px;
+  li {
+    margin: 10px 0 0; } }
+
+.nets-link, .nets-all {
+  margin-left: 0px; }
+
+#netsearch-box {
+  margin-top: 20px;
+  width: 150px;
+  #search-submit {
+    margin: 5px 0px 0px 0px; } }
+
+/**
+ * admin
+ */
+
+#pending-update {
+  float: right;
+  color: #fff;
+  font-weight: bold;
+  background-color: #ff0000;
+  padding: 0 .3em; }
+
+.admin {
+  &.linklist {
+    border: 0;
+    padding: 0; }
+  &.link {
+    list-style-position: inside; } }
+
+#adminpage {
+  color: #111;
+  background: transparent;
+  margin: 5px;
+  padding: 10px;
+  dl {
+    clear: left;
+    margin-bottom: 2px;
+    padding-bottom: 2px;
+    border-bottom: 1px solid #000; }
+  dt {
+    width: 250px;
+    float: left;
+    font-weight: bold; }
+  dd {
+    margin-left: 250px; }
+  h3 {
+    border-bottom: 1px solid #ccc; }
+  .submit {
+    clear: left; }
+  #pluginslist {
+    margin: 0;
+    padding: 0; }
+  .plugin {
+    list-style: none;
+    display: block;
+    border: 1px solid #888;
+    padding: 1em;
+    margin-bottom: 5px;
+    clear: left; }
+  .toggleplugin {
+    float: left;
+    margin-right: 1em; }
+  table {
+    width: 100%;
+    border-bottom: 1px solid #000;
+    margin: 5px 0;
+    th {
+      text-align: left; } }
+  td .icon {
+    float: left; }
+  table {
+    &#users img {
+      width: 16px;
+      height: 16px; }
+    tr:hover {
+      /*color: ;*/
+      background-color: #bbc7d7; } }
+  .selectall {
+    text-align: right; }
+  #users a {
+    /*color: #;*/
+    text-decoration: underline; } }
+
+#users .name {
+  color: #eec; }
+
+/**
+ * form fields
+ */
+
+.field {
+  /*margin-bottom: 10px;*/
+  /*padding-bottom: 10px;*/
+  overflow: auto;
+  /* width: 100%;*/
+  label {
+    width: 38%;
+    display: inline-block;
+    font-size: 1.077em;
+    margin: 0 10px 1em 0;
+    border: 1px #999 solid;
+    padding: 5px;
+    background: #ccc;
+    color: #111; } }
+
+.field .onoff {
+  float: right;
+  margin: 0 330px 0 auto;
+  width: 80px;
+  a {
+    display: block;
+    border: 1px solid #666;
+    padding: 3px 6px 4px 10px;
+    height: 16px;
+    text-decoration: none; }
+  .on {
+    background: url("../../../images/onoff.jpg") no-repeat 42px 1px #999999;
+    color: #111;
+    text-align: left; }
+  .off {
+    background: url("../../../images/onoff.jpg") no-repeat 2px 1px #cccccc;
+    color: #333;
+    text-align: right; } }
+
+.hidden {
+  display: none !important; }
+
+.field textarea {
+  width: 80%;
+  height: 100px; }
+
+.field_help {
+  display: block;
+  margin-left: 297px;
+  color: #666; }
+
+.field.radio .field_help {
+  margin-left: 297px; }
+
+label {
+  width: 38%;
+  display: inline-block;
+  font-size: 1.077em;
+  margin: 0 10px 1em 0;
+  border: 1px #999 solid;
+  padding: 5px;
+  background: #ccc;
+  color: #111; }
+
+input {
+  width: 250px;
+  height: 25px;
+  border: 1px #999 solid;
+  &[type="text"], &[type="password"], &[type="search"] {
+    width: 250px;
+    height: 25px;
+    border: 1px #999 solid; }
+  &[type="checkbox"], &[type="radio"] {
+    border: 1px #999 solid;
+    margin: 0 0 0 0;
+    height: 15px;
+    width: 15px; }
+  &[type="submit"], &[type="button"] {
+    background-color: #555753;
+    border: 2px outset #444;
+    border-radius: 5px;
+    box-shadow: 1px 3px 4px 0 #111;
+    color: #eeeeec;
+    cursor: pointer;
+    font-weight: bold;
+    width: auto;
+    text-shadow: 1px 1px #111;
+    -webkit-border-radius: 5px;
+    -moz-border-radius: 5px; }
+  &[type="submit"]:active, &[type="button"]:active {
+    box-shadow: 0 0 0 0; } }
+
+
+/*
+ * update
+ */
+
+.popup {
+  width: 100%;
+  height: 100%;
+  top: 0px;
+  left: 0px;
+  position: absolute;
+  display: none;
+  .background {
+    background-color: #000;
+    opacity: 0.5;
+    width: 100%;
+    height: 100%;
+    position: absolute;
+    top: 0px;
+    left: 0px; }
+  .panel {
+    top: 25%;
+    left: 25%;
+    width: 50%;
+    height: 50%;
+    padding: 1em;
+    position: absolute;
+    border: 4px solid #000000;
+    background-color: #FFFFFF; } }
+
+#panel {
+  z-index: 100; }
+
+.grey {
+  color: grey; }
+
+.orange {
+  color: orange; }
+
+.red {
+  color: red; }
+
+.popup .panel {
+  .panel_text {
+    display: block;
+    overflow: auto;
+    height: 80%; }
+  .panel_in {
+    width: 100%;
+    height: 100%;
+    position: relative; }
+  .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;
+  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;
+  img {
+    float: left;
+    width: 48px;
+    height: 48px;
+    margin: 10px;
+    &.noicon {
+      background-image: url("../../../images/icons/48/plugin.png");
+      background-position: center center;
+      background-repeat: no-repeat; } }
+  a {
+    float: left; } }
+
+/**
+ * icons
+ */
+
+.iconspacer {
+  display: block;
+  width: 16px;
+  height: 16px; }
+
+.icon {
+  display: block;
+  width: 20px;
+  height: 20px;
+  background: url(light/icons.png) no-repeat;
+  border: 0;
+  text-decoration: none;
+  border-radius: 5px;
+  &:hover {
+    border: 0;
+    text-decoration: none; } }
+
+.editicon {
+  display: inline-block;
+  width: 21px;
+  height: 21px;
+  background: url(light/editicons.png) no-repeat;
+  border: 0;
+  text-decoration: none; }
+
+.shadow {
+  box-shadow: 2px 2px 5px 2px #111;
+  &:active, &:focus, &:hover {
+    box-shadow: 0 0 0 0; } }
+
+.editicon:hover {
+  border: 0; }
+
+.boldbb {
+  background-position: 0px 0px;
+  &:hover {
+    background-position: -22px 0px; } }
+
+.italicbb {
+  background-position: 0px -22px;
+  &:hover {
+    background-position: -22px -22px; } }
+
+.underlinebb {
+  background-position: 0px -44px;
+  &:hover {
+    background-position: -22px -44px; } }
+
+.quotebb {
+  background-position: 0px -66px;
+  &:hover {
+    background-position: -22px -66px; } }
+
+.codebb {
+  background-position: 0px -88px;
+  &:hover {
+    background-position: -22px -88px; } }
+
+.imagebb {
+  background-position: -44px 0px;
+  &:hover {
+    background-position: -66px 0px; } }
+
+.urlbb {
+  background-position: -44px -22px;
+  &:hover {
+    background-position: -66px -22px; } }
+
+.videobb {
+  background-position: -44px -44px;
+  &:hover {
+    background-position: -66px -44px; } }
+
+.icon {
+  &.drop, &.drophide, &.delete {
+    float: left;
+    margin: 0 2px; }
+  &.s22 {
+    &.delete {
+      display: block;
+      background-position: -110px 0; }
+    &.text {
+      padding: 10px 0px 0px 25px;
+      width: 200px; } }
+  &.text {
+    text-indent: 0px; }
+  &.s16 {
+    min-width: 16px;
+    height: 16px; } }
+
+.s16 .add {
+  background: url("../../../images/icons/16/add.png") no-repeat; }
+
+.add {
+  margin: 0px 5px; }
+
+.article {
+  background-position: -50px 0; }
+
+.audio {
+  background-position: -70px 0; }
+
+.block {
+  background-position: -90px 0px; }
+
+.drop, .delete {
+  background-position: -110px 0; }
+
+.drophide {
+  background-position: -130px 0; }
+
+.edit {
+  background-position: -150px 0; }
+
+.camera {
+  background-position: -170px 0; }
+
+.dislike {
+  background-position: -190px 0; }
+
+.file-as {
+  background-position: -230px -60px; }
+
+.like {
+  background-position: -211px 0; }
+
+.link {
+  background-position: -230px 0; }
+
+.globe, .location {
+  background-position: -50px -20px; }
+
+.noglobe, .nolocation {
+  background-position: -70px -20px; }
+
+.no {
+  background-position: -90px -20px; }
+
+.pause {
+  background-position: -110px -20px; }
+
+.play {
+  background-position: -130px -20px; }
+
+.pencil {
+  background-position: -151px -18px; }
+
+.small-pencil {
+  background-position: -170px -20px; }
+
+.recycle {
+  background-position: -190px -20px; }
+
+.remote-link {
+  background-position: -210px -20px; }
+
+.share {
+  background-position: -230px -20px; }
+
+.tools {
+  background-position: -50px -40px; }
+
+.lock {
+  background-position: -70px -40px; }
+
+.unlock {
+  background-position: -88px -40px; }
+
+.video {
+  background-position: -110px -40px; }
+
+.attach {
+  background-position: -190px -40px; }
+
+.language {
+  background-position: -210px -40px; }
+
+.starred {
+  background-position: -130px -60px; }
+
+.unstarred {
+  background-position: -150px -60px; }
+
+.tagged {
+  background-position: -170px -60px; }
+
+.on {
+  background-position: -50px -60px; }
+
+.off {
+  background-position: -70px -60px; }
+
+.prev {
+  background-position: -90px -60px; }
+
+.next {
+  background-position: -110px -60px; }
+
+.icon.dim {
+  opacity: 0.3; }
+
+#pause {
+  position: fixed;
+  bottom: 40px;
+  right: 30px; }
+
+.border {
+  border: 1px solid #babdb6;
+  -webkit-border-radius: 5px;
+  -moz-border-radius: 5px;
+  border-radius: 5px;
+  &:hover {
+    border: 1px solid #babdb6;
+    -webkit-border-radius: 5px;
+    -moz-border-radius: 5px;
+    border-radius: 5px; } }
+
+.attachtype {
+  display: block;
+  width: 20px;
+  height: 23px;
+  background-image: url(../../../images/content-types.png); }
+
+.type-video {
+  background-position: 0px 0px; }
+
+.type-image {
+  background-position: -20px 0; }
+
+.type-audio {
+  background-position: -40px 0; }
+
+.type-text {
+  background-position: -60px 0px; }
+
+.type-unkn {
+  background-position: -80px 0; }
+
+/**
+ * footer
+ */
+
+.cc-license {
+  margin-top: 100px;
+  font-size: 0.7em; }
+
+footer {
+  display: block;
+  /*margin: 50px 20%;*/
+  clear: both; }
+
+#profile-jot-text {
+  height: 20px;
+  color: #666;
+  border: 1px solid #ccc;
+  border-radius: 5px;
+  width: 99.5%; }
+
+/**
+ * acl
+ */
+
+#photo-edit-perms-select, #photos-upload-permissions-wrapper, #profile-jot-acl-wrapper {
+  display: block !important;
+  background: #eec;
+  color: #2e2f2e; }
+
+#acl-wrapper {
+  width: 660px;
+  margin: 0 auto; }
+
+#acl-search {
+  float: right;
+  background: white url("../../../images/search_18.png") no-repeat right center;
+  padding-right: 20px;
+  margin: 6px;
+  color: #111; }
+
+#acl-showall {
+  float: left;
+  display: block;
+  width: auto;
+  height: 18px;
+  background: #eeeecc url("../../../images/show_all_off.png") 8px 8px no-repeat;
+  padding: 7px 10px 7px 30px;
+  -webkit-border-radius: 5px;
+  -moz-border-radius: 5px;
+  border-radius: 5px;
+  color: #999;
+  margin: 5px 0;
+  &.selected {
+    color: #000;
+    background: #ff9900 url(../../../images/show_all_on.png) 8px 8px no-repeat; } }
+
+#acl-list {
+  height: 210px;
+  border: 1px solid #ccc;
+  clear: both;
+  margin-top: 30px;
+  overflow: auto; }
+
+/*#acl-list-content {
+}*/
+
+.acl-list-item {
+  border: 1px solid #ccc;
+  display: block;
+  float: left;
+  height: 110px;
+  margin: 3px 0 5px 5px;
+  width: 120px;
+  img {
+    width: 22px;
+    height: 22px;
+    float: left;
+    margin: 5px 5px 20px; }
+  p {
+    height: 12px;
+    font-size: 10px;
+    margin: 0 0 22px;
+    padding: 2px 0 1px; }
+  a {
+    background: #ccc 3px 3px no-repeat;
+    -webkit-border-radius: 2px;
+    -moz-border-radius: 2px;
+    border-radius: 2px;
+    clear: both;
+    font-size: 10px;
+    display: block;
+    width: 55px;
+    height: 20px;
+    color: #999;
+    margin: 5px auto 0;
+    padding: 0 3px;
+    text-align: center;
+    vertical-align: middle; } }
+
+#acl-wrapper a:hover {
+  text-decoration: none;
+  color: #000;
+  border: 0; }
+
+.acl-button-show {
+  background-image: url('../../../images/show_off.png');
+  margin: 0 auto; }
+
+.acl-button-hide {
+  background-image: url('../../../images/hide_off.png');
+  margin: 0 auto; }
+
+.acl-button-show.selected {
+  color: #000;
+  background-color: #9ade00;
+  background-image: url(../../../images/show_on.png); }
+
+.acl-button-hide.selected {
+  color: #000;
+  background-color: #ff4141;
+  background-image: url(../../../images/hide_on.png); }
+
+.acl-list-item {
+  &.groupshow {
+    border-color: #9ade00; }
+  &.grouphide {
+    border-color: #ff4141; } }
+
+/** /acl **/
+
+/* autocomplete popup */
+
+.acpopup {
+  max-height: 175px;
+  max-width: 42%;
+  background-color: #555753;
+  color: #fff;
+  overflow: auto;
+  z-index: 100000;
+  border: 1px solid #cccccc; }
+
+.acpopupitem {
+  background-color: #555753;
+  padding: 4px;
+  clear: left;
+  img {
+    float: left;
+    margin-right: 4px; }
+  &.selected {
+    color: #2e3436;
+    background-color: #eeeeec; } }
+
+.qcomment-wrapper {
+  padding: 0px;
+  margin: 5px 5px 5px 81%; }
+
+.qcomment {
+  opacity: 0.5;
+  &:hover {
+    opacity: 1.0; } }
+
+#network-star-link {
+  margin-top: 10px; }
+
+.network-star {
+  float: left;
+  margin-right: 5px;
+  &.icon.starred {
+    display: inline-block; } }
+
+#fileas-sidebar {}
+
+.fileas-ul {
+  padding: 0; }
+
+/*
+ * addons theming
+ */
+
+#sidebar-page-list {
+  ul {
+    padding: 0;
+    margin: 5px 0; }
+  li {
+    list-style: none; } }
+
+#jappix_mini {
+  margin-left: 130px;
+  position: fixed;
+  bottom: 0;
+  right: 175px !important;
+  /* override the jappix css */
+  z-index: 999; }
+
+/* media stuff */
+@media handheld {
+  body {
+    font-size: 15pt; } }
diff --git a/view/theme/dispy/tag.png b/view/theme/dispy/light/tag.png
index 9b5a7223e..9b5a7223e 100644
--- a/view/theme/dispy/tag.png
+++ b/view/theme/dispy/light/tag.png
diff --git a/view/theme/dispy/light/theme.php b/view/theme/dispy/light/theme.php
new file mode 100644
index 000000000..2b37c0671
--- /dev/null
+++ b/view/theme/dispy/light/theme.php
@@ -0,0 +1,32 @@
+<?php
+
+/*
+ * Name: Dispy
+ * Description: <p style="white-space:pre;">            Dispy: Light, Spartan, Sleek, and Functional<br />            Dispy Dark: Dark, Spartan, Sleek, and Functional</p>
+ * Version: 1.2
+ * Author: Simon <http://simon.kisikew.org/>
+ * Maintainer: Simon <http://simon.kisikew.org/>
+ * Screenshot: <a href="screenshot.jpg">Screenshot</a>
+ */
+
+$a = get_app();
+$a->theme_info = array(
+    'family' => 'dispy',
+	'name' => 'light',
+	'version' => '1.2'
+);
+
+function dispy_light_init(&$a) {
+
+    /** @purpose set some theme defaults
+    */
+    $cssFile = null;
+    $colour = false;
+    $colour = 'light';
+
+    // custom css
+    if (!is_null($cssFile)) {
+        $a->page['htmlhead'] .= sprintf('<link rel="stylesheet" type="text/css" href="%s" />', $cssFile);
+    }
+}
+
diff --git a/view/theme/dispy/style.css b/view/theme/dispy/style.css
index cf3b83cfa..3ae667003 100644
--- a/view/theme/dispy/style.css
+++ b/view/theme/dispy/style.css
@@ -1,3177 +1,518 @@
-/*
- * dispy
- *
- * maintainer: simon <http://simon.kisikew.org/>
- * author: unknown
- *
- */
-
-/* from html5boilerplate */
-
-/* these are to tell browsers they should be displayed a certain way */
-article,
-aside,
-details,
-figcaption,
-figure,
-footer,
-header,
-hgroup,
-nav,
-section {
-    display: block;
-}
-audio,
-canvas,
-video,
-time {
-    display: inline-block;
-    *display: inline;
-    *zoom: 1;
-}
-audio:not([controls]) {
-    display: none;
-}
-[hidden] {
-    display: none;
-}
-
-/* 
- *  Base
- */
-
-/*
- * 1. Correct text resizing oddly in IE6/7 when body font-size is set using em units
- * 2. Force vertical scrollbar in non-IE
- * 3. Prevent iOS text size adjust on device orientation change, without disabling user zoom: h5bp.com/g
- */
-
-html {
-    font-size: 100%;
-    overflow-y: scroll;
-    -webkit-text-size-adjust: 100%;
-    -ms-text-size-adjust: 100%;
-}
-body {
-    margin: 0;
-    font-size: 16px;
-    line-height: 1.1em;
-}
-body,
-button,
-input,
-select,
-textarea {
-    font-family: sans-serif;
-    color: #222;
-    background-color: #e8e8e8;
-}
-select {
-    border: 1px #555 dotted;
-    padding: 3px;
-    margin: 3px;
-    color: #222;
-    background: #e8e8e8;
-}
-option {
-    padding: 3px;
-    color: #222;
-    background: #e8e8e8;
-}
-option[selected="selected"] {
-    color: #111;
-	background: #cca;
-}
-ul, ol {
-    padding: 0;
-}
-/* remember to define focus styles! */
-:focus {
-    outline: 0;
-}
-[disabled="disabled"] {
-    background: #ddd;
-    color: #333;
-}
-
-/* remember to highlight inserts somehow! */
-ins {
-    background-color: #ff9;
-    color: #000;
-    text-decoration: none;
-}
-mark {
-    background-color: #ff9;
-    color: #000;
-    font-style: italic;
-    font-weight: bold;
-}
-/* Redeclare monospace font family: h5bp.com/j */
-pre, code, kbd, samp, .wall-item-body code {
-    font-family: monospace, monospace;
-    _font-family: monospace;
-    font-size: 1em; }
-
-/* Improve readability of pre-formatted text in all browsers */
-pre, .wall-item-body code {
-    white-space: pre;
-    white-space: pre-wrap;
-    word-wrap: break-word;
-}
-
-q {
-    quotes: none;
-}
-q:before, q:after {
-    content: "";
-    content: none;
-}
-small {
-    font-size: 85%;
-}
-
-/* Position subscript and superscript content without affecting line-height: h5bp.com/k */
-sub, sup {
-    font-size: 75%;
-    line-height: 0;
-    position: relative;
-    vertical-align: baseline;
-}
-sup {
-    top: -0.5em;
-}
-sub {
-    bottom: -0.25em;
-}
-img {
-    border: 0 none;
-    /*vertical-align: middle;*/
-}
-a {
-    color: #3465a4;
-    text-decoration: none;
-    margin-bottom: 1px;
-}
-a:hover img {
-    text-decoration: none;
-}
-blockquote {
-    background: #eee;
-    color: #111;
-    text-indent: 5px;
-    padding: 5px;
-    border: 1px #aaa solid;
-    border-radius: 5px;
-}
-a:hover {
-    color: #729fcf;
-    border-bottom: 1px dotted #729fcf;
-}
-.required {
-    display: inline;
-    color: #f00;
-    font-size: 16px;
-    font-weight: bold;
-    margin: 3px;
-}
-.fakelink, .lockview {
-    color: #3465a4;
-    cursor: pointer;
-}
-.fakelink:hover {
-    color: #729fcf;
-}
-.smalltext {
-    font-size: 0.7em;
-}
-#panel {
-    position: absolute;
-    font-size: 0.8em;
-    -webkit-border-radius: 5px;
-    -moz-border-radius: 5px;
-    border-radius: 5px;
-    border: 1px solid #fff;
-    background-color: #2e3436;
-    color: #eeeeec;
-    padding: 1em;
-}
-.pager {
-    margin-top: 60px;
-    display: block;
-    clear: both;
-    text-align: center;
-}
-.pager span {
-    padding: 4px;
-    margin: 4px;
-}
-.pager_current {
-    background-color: #729fcf;
-    color: #fff;
-}
-
-
-/**
- * global
- */
-/* .tool .action */
-.action {
-    margin: 5px 0;
-}
-.tool {
-    margin: 5px 0;
-    list-style: none;
-}
-#articlemain {
-    width: 100%;
-    height: 100%;
-    margin: 0 auto;
-}
-
-
-/**
- * login
- */
-#asidemain .field {
-    overflow: hidden;
-    width: 200px;
-}
-#login-extra-links {
-    overflow: auto !important;
-    padding-top: 60px !important;
-    width: 100% !important;
-}
-#login-extra-links a {
-    margin-right: 20px;
-}
-#login_standard {
-    display: block !important;
-    float: none !important;
-    height: 100% !important;
-    position: relative !important;
-    width: 100% !important;
-}
-#login_standard .field label {
-    width: 200px !important;
-}
-#login_standard input, #login_standard input[type="text"] {
-    margin: 0 0 8px !important;
-    width: 210px !important;
-}
-#login-submit-wrapper {
-    margin: 0 !important;
-}
-#login-submit-button {
-    margin-left: 0px !important;
-}
-#asidemain #login_openid {
-    position: relative !important;
-    float: none !important;
-    margin-left: 0px !important;
-    height: auto !important;
-    width: 200px !important;
-}
-#login_openid #id_openid_url {
-    width: 180px !important;
-    overflow: hidden !important;
-}
-#login_openid label {
-    width: 180px !important;
-}
-
-
-/**
- * nav
- */
-nav {
-    height: 60px;
-    background-color: #2e3436;
-    color: #eeeeec;
-    position: relative;
-    padding: 20px 20px 10px 95px;
-}
-nav a {
-    text-decoration: none;
-    color: #eeeeec;
-    border: 0px;
-}
-nav a:hover {
-    text-decoration: none;
-    color: #eeeeec;
-    border: 0px;
-}
-nav #banner {
-    display: block;
-    position: absolute;
-    left: 51px;
-    top: 25px;
-}
-nav #banner #logo-text a {
-    font-size: 40px;
-    font-weight: bold;
-    margin-left: 3px;
-}
-ul#user-menu-popup {
-    display: none;
-    position: absolute;
-    background-color: #555753;
-    width: 100%;
-    padding: 10px 0px;
-    margin: 0px;
-    top: 20px;
-    left: 0;
-    -webkit-border-radius: 0 0 5px 5px;
-    -moz-border-radius: 0 0 5px 5px;
-    border-radius: 0 0 5px 5px;
-    box-shadow: 5px 10px 10px 0 #111;
-    z-index: 10000;
-}
-ul#user-menu-popup li {
-    display: block;
-}
-ul#user-menu-popup li a {
-    display: block;
-    padding: 5px;
-}
-ul#user-menu-popup li a:hover {
-    color: #2e3436;
-    background-color: #eeeeec;
-}
-ul#user-menu-popup li a.nav-sep {
-    border-top: 1px solid #eeeeec;
-}
-nav .nav-link {
-    display: inline-block;
-    width: 22px;
-    height: 22px;
-    overflow: hidden;
-    margin: 0px 5px 5px;
-    text-indent: 50px;
-    background: transparent url(icons.png) 0 0 no-repeat;
-}
-#nav-apps-link {
-    background-position: 0 -66px;
-}
-#nav-apps-link:hover {
-    background-position: -22px -66px;
-}
-#nav-community-link {
-    background-position: 0 -22px;
-}
-#nav-community-link:hover {
-    background-position: -22px -22px;
-}
-#nav-contacts-link {
-    background-position: 0 -22px;
-}
-#nav-contacts-link:hover {
-    background-position: -22px -22px;
-}
-#nav-directory-link {
-    background-position: -44px -154px;
-}
-#nav-directory-link:hover {
-    background-position: -66px -154px;
-}
-#nav-help-link {
-    background-position: 0 -110px;
-}
-#nav-help-link:hover {
-    background-position: -22px -110px;
-}
-#nav-home-link {
-    background-position: -44px -132px;
-}
-#nav-home-link:hover {
-    background-position: -66px -132px;
-}
-#nav-intro-link {
-    background-position: 0px -190px;
-}
-#nav-intro-link:hover {
-    background-position: -44px -190px;
-}
-#nav-login-link {
-    background-position: 0 -88px;
-}
-#nav-login-link:hover {
-    background-position: -22px -88px;
-}
-#nav-logout-link {
-    background-position: 0 -88px;
-}
-#nav-logout-link:hover {
-    background-position: -22px -88px;
-}
-#nav-messages-link {
-    background-position: -44px -88px;
-}
-#nav-messages-link:hover {
-    background-position: -66px -88px;
-}
-#nav-notify-link, #nav-notifications-linkmenu {
-    background-position: -44px -110px;
-}
-#nav-notify-link:hover {
-    background-position: -66px -110px;
-}
-#nav-network-link {
-    background-position: 0px -177px;
-}
-#nav-network-link:hover {
-    background-position: -22px -177px;
-}
-#nav-search-link {
-    background-position: 0 -44px;
-}
-#nav-search-link:hover {
-    background-position: -22px -44px;
-}
-#profile-link,
-#profile-title, 
-#wall-image-upload,
-#wall-file-upload,
-#profile-attach-wrapper,
-#profile-audio,
-#profile-link,
-#profile-location,
-#profile-nolocation,
-#profile-title,
-#jot-title,
-#profile-upload-wrapper,
-#profile-video,
-#profile-jot-submit,
-#wall-image-upload-div,
-#wall-file-upload-div,
-.icon, .hover, .focus, .pointer {
-    cursor: pointer;
-}
-
-
-/* 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;
-}
-#nav-notifications-menu {
-    margin: 30px 0 0 -20px;
-    width: 275px;
-    max-height: 300px;
-    overflow-y: auto;
-    font-size: 9pt;
-}
-#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 {
-    word-wrap: normal;
-    border-bottom: 1px solid #000;
-}
-#nav-notifications-menu li:hover {
-    color: black;
-}
-#nav-notifications-menu a:hover {
-    color: black;
-    text-decoration: underline;
-}
-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");
-}
-.show {
-    display: block;
-}
-#notifications {
-    height: 20px;
-    width: 170px;
-    position: absolute;
-    top: -19px;
-    left: 4px;
-}
-#nav-floater {
-    position: fixed;
-    top: 20px;
-    right: 1%;
-    padding: 5px;
-    background: #2e3436;
-    color: transparent;
-    border-radius: 5px;
-    z-index: 100;
-    width: 300px;
-    height: 60px;
-}
-#nav-buttons {
-    clear: both;
-    list-style: none;
-    padding: 0px;
-    margin: 0px;
-    height: 25px;
-}
-#nav-buttons > li {
-    padding: 0;
-	display: inline-block;
-	margin: 0px -4px 0px 0px;
-}
-.floaterflip {
-    display: block;
-    position: fixed;
-    z-index: 110;
-    top: 56px;
-    right: 19px;
-    width: 22px;
-    height: 22px;
-    overflow: hidden;
-    margin: 0px;
-    background: transparent url(icons.png) -190px -60px no-repeat;
-}
-.search-box {
-    display: inline-block;
-    margin: 5px;
-    position: fixed;
-    right: 0px;
-    bottom: 0px;
-    z-index: 100;
-    background: #1d1f1d;
-    border-radius: 5px;
-}
-#search-text {
-    border: 1px #eec solid;
-    background: #2e3436;
-    color: #eec;
-}
-.search-box #search-text {
-    margin: 8px;
-    width: 10em;
-    height: 14px;
-    color: #eec;
-}
-#scrollup {
-    position: fixed;
-    right: 5px;
-    bottom: 40px;
-    z-index: 100;
-}
-#scrollup a:hover {
-    text-decoration: none;
-    border: 0;
-}
-#user-menu {
-    box-shadow: 5px 0 10px 0 #111;
-    display: block;	
-    width: 75%;
-    margin: 3px 0 0 0;
-    position: relative;
-    background-color: #555753;
-    -webkit-border-radius: 5px;
-    -moz-border-radius: 5px;
-    border-radius: 5px;
-    background: #555753 url("menu-user-pin.jpg") 98% center no-repeat;
-    clear: both;
-    top: 4px;
-    left: 10px;
-    padding: 2px;
-}
-#user-menu > a {
-    vertical-align: top;
-}
-#user-menu-label {
-    font-size: 12px;
-    padding: 3px 20px 9px 5px;
-    height: 10px;
-}
-.nav-ajax-update, .nav-ajax-left {
-    width: 30px;
-    height: 19px;
-    background: transparent url(notifications.png) 0 0 no-repeat;
-    color: #222;
-    font-weight: bold;
-    font-size: 0.8em;
-    padding-top: 0.2em;
-    text-align: center;
-    float: left;
-    margin: 0 -1px 0 3px;
-    display: block;
-    visibility: hidden;
-}
-.nav-ajax-update.show, .nav-ajax-left.show {
-    visibility: visible;
-}
-#net-update {
-    background-position: 0px 0px;
-}
-#mail-update {
-    background-position: -30px 0;
-}
-#notify-update {
-    background-position: -60px 0px;
-}
-#home-update {
-    background-position: -90px 0px;
-}
-#intro-update {
-    background-position: -120px 0px;
-}
-#lang-select-icon {
-    cursor: pointer;
-    position: fixed;
-    left: 28px;
-    bottom: 6px;
-    z-index: 10;
-}
-#language-selector {
-    position: fixed;
-    bottom: 2px;
-    left: 52px;
-    z-index: 10;
-}
-.menu-popup {
-    position: absolute;
-    display: none;
-    width: 11em;
-    background: #ffffff;
-    color: #2d2d2d;
-    margin: 0px;
-    padding: 0px;
-    list-style: none;
-    border: 3px solid #364e59;
-    z-index: 100000;
-    -webkit-box-shadow: 3px 3px 10px 0 rgba(0, 0, 0, 0.7);
-    -moz-box-shadow: 3px 3px 10px 0 rgba(0, 0, 0, 0.7);
-    box-shadow: 3px 3px 10px 0 rgba(0, 0, 0, 0.7);
-}
-.menu-popup a {
-    display: block;
-    color: #2d2d2d;
-    padding: 5px 10px;
-    text-decoration: none;
-}
-.menu-popup a:hover {
-    background-color: #bdcdd4;
-}
-.menu-popup .menu-sep {
-    border-top: 1px solid #9eabb0;
-}
-.menu-popup li {
-    float: none;
-    overflow: auto;
-    height: auto;
-    display: block;
-}
-.menu-popup li img {
-    float: left;
-    width: 16px;
-    height: 16px;
-    padding-right: 5px;
-}
-.menu-popup .empty {
-    padding: 5px;
-    text-align: center;
-    color: #9eabb0;
-}
-.notif-item {
-    font-size: small;
-}
-.notif-item a {
-    vertical-align: middle;
-}
-.notif-image {
-    width: 32px;
-    height: 32px;
-    padding: 7px 7px 0px 0px;
-}
-.notify-seen {
-    background: #ddd;
-}
-
-
-/**
- * sysmsg
- */
-#sysmsg_info {
-    position: fixed;
-    bottom: 0;
-    -moz-box-shadow: 3px 3px 3px 10px 0 #000;
-    -webkit-box-shadow: 3px 3px 10px 0 #000;
-    box-shadow: 3px 3px 10px 0 #000;
-    padding: 10px;
-    background-color: #fcaf3e;
-    border:2px solid #f8911b;
-    border-bottom: 0;
-    padding-bottom: 50px;
-    z-index: 1000;
-}
-#sysmsg {
-    position: fixed;
-    bottom: 0;
-    -moz-box-shadow: 3px 3px 10px 0 #000;
-    -webkit-box-shadow: 3px 3px 10px 0 #000;
-    box-shadow: 3px 3px 10px 0 #000;
-    padding: 10px;
-    background-color: #fcaf3e;
-    border: 2px solid #f8911b;
-    border-bottom: 0;
-    padding-bottom: 50px;
-    z-index: 1000;
-}
-#sysmsg_info br,
-#sysmsg br {
-    display: block;
-    margin: 2px 0px;
-    border-top: 1px solid #ccccce;
-}
-
-
-/**
- * aside
- */
-#asidemain {
-    float: left;
-    font-size: smaller;
-    margin: 20px 0 20px 35px;
-    width: 25%;
-    display: inline;
-}
-/* for now, disappear these */
-#asideright, #asideleft {
-    display: none;
-}
-.vcard .fn {
-    font-size: 1.7em;
-    font-weight: bold;
-    border-bottom: 1px solid #729fcf;
-    padding-bottom: 3px;
-}
-.vcard #profile-photo-wrapper {
-    margin: 20px;
-}
-/* http://css-tricks.com/snippets/css/css-box-shadow/
-* box-shadow:
-* 1. The horizontal offset of the shadow, positive means
-* the shadow will be on the right of the box, a negative
-* offset will put the shadow on the left of the box.
-* 2. The vertical offset of the shadow, a negative one
-* means the box-shadow will be above the box, a
-* positive one means the shadow will be below the box.
-* 3. The blur radius (optional), if set to 0 the shadow
-* will be sharp, the higher the number, the more blurred
-* it will be.
-* 4. The spread radius (optional), positive values increase
-* the size of the shadow, negative values decrease the size.
-* Default is 0 (the shadow is same size as blur).
-* 5. Colo[u]r
-*/
-.vcard #profile-photo-wrapper img {
-    box-shadow: 3px 3px 10px 0 #000;
-}
-#asidemain h4 {
-    font-size: 1.2em;
-}
-#asidemain #viewcontacts {
-    text-align: right;
-}
-.aprofile dt {
-    background: transparent;
-    color: #666666;
-    font-weight: bold;
-    box-shadow: 1px 1px 5px 0 #000;
-    margin: 15px 0 5px;
-    padding-left: 5px;
-}
-#profile-extra-links ul {
-    margin-left: 0px;
-    padding-left: 0px;
-    list-style: none;
-}
-#dfrn-request-link {
-    background: #3465A4 url(connect.png) no-repeat 95% center;
-    border-radius: 5px 5px 5px 5px;
-    color: #fff;
-    display: block;
-    font-size: 1.2em;
-    padding: 0.2em 0.5em;
-}
-#wallmessage-link {
-    /*background: #3465A4 url(connect.png) no-repeat 95% center;*/
-    /*border-radius: 5px 5px 5px 5px;*/
-    color: #eee;
-    display: block;
-    font-size: 1.2em;
-    padding: 0.2em 0.5em;
-}
-#netsearch-box {
-    margin: 20px 0px 30px;
-    width: 150px;
-}
-#netsearch-box #search-submit {
-    margin: 5px 5px 0px 0px;
-}
-.ttright {
-    margin: 0px 0px 0px 0px;
-}
-
-
-/**
- * contacts block
- */
-.contact-block-div {
-    width: 50px;
-    height: 50px;
-    float: left;
-}
-.contact-block-textdiv {
-    width: 150px;
-    height: 34px;
-    float: left;
-}
-#contact-block-end {
-    clear: both;
-}
-
-
-/**
- * jot
- */
-#jot {
-/*width: 785px;*/
-margin: 10px 0 20px 0px;
-width: 100%;
-}
-#jot #jot-tools {
-margin: 0px;
-padding: 0px;
-height: 35px;
-overflow: none;
-width: 100%;
-/*background-color: #0e232e;*/
-/*border-bottom: 2px solid #9eabb0;*/
-}
-#jot #jot-tools span {
-    float: left;
-    margin: 10px 20px 2px 0px;
-}
-#jot #jot-tools span a {
-    display: block;
-}
-#jot #jot-tools .perms {
-    float: right;
-    width: 40px;
-}
-#jot #jot-tools li.loading {
-    float: right;
-    background-color: #ffffff;
-    width: 20px;
-    vertical-align: center;
-    text-align: center;
-    border-top: 2px solid #9eabb0;
-    height: 38px;
-}
-#jot #jot-tools li.loading img {
-    margin-top: 10px;
-}
-#jot #jot-title {
-    border: 1px solid #ccc;
-    margin: 0 0 5px;
-    height: 20px;
-    width: 90%;
-    font-weight: bold;
-    border-radius: 5px;
-    vertical-align: middle;
-}
-#jot-category {
-    margin: 5px 0;
-    border-radius: 5px;
-    border: 1px #ccc solid;
-    color: #666;
-    font-size: smaller;
-}
-#jot-category:focus {
-    color: #111;
-}
-#jot #character-counter {
-    width: 6%;
-    float: right;
-    text-align: right;
-    height: 15px;
-    line-height: 20px;
-    padding: 2px 20px 5px 0;
-}
-#profile-jot-text_parent {
-    box-shadow: 5px 0 10px 0 #111;
-}
-#profile-jot-text_tbl {
-    margin-bottom: 10px;
-    background: #777;
-}
-#profile-jot-text_ifr {
-    width:99.900002% !important;
-}
-#profile-jot-text_toolbargroup {
-    background: #777;
-}
-.mceCenter table tr {
-    background: #777;
-}
-[id$="jot-text_ifr"] {
-    width: 99.900002% !important;
-    color: #2e2f2e;
-    background: #eec;
-}
-[id$="jot-text_ifr"] .mceContentBody {
-    color: #2e2f2e;
-    background: #eec;
-}
-.defaultSkin tr.mceFirst {
-    background: #777;
-}
-.defaultSkin td.mceFirst {
-	background-color: #eec;
-}
-.defaultSkin td.mceLast {
-	background-color: #eec;
-}
-.defaultSkin span.mceIcon, .defaultSkin img.mceIcon {
-	background-color: #eec;
-}
-.defaultSkin .mceButtonDisabled .mceIcon {
-	background-color: #eec;
-}
-#profile-attach-wrapper,
-#profile-audio-wrapper,
-#profile-link-wrapper,
-#profile-location-wrapper,
-#profile-nolocation-wrapper,
-#profile-title-wrapper,
-#profile-upload-wrapper,
-#profile-video-wrapper {
-    float: left;
-    margin: 0 20px 0 0;
-}
-#profile-rotator-wrapper {
-    float: right; 
-}
-#profile-jot-tools-end,
-#profile-jot-banner-end {
-    clear: both;
-}
-#profile-jot-email-wrapper {
-    margin:10px 10% 0;
-    border:1px solid #555753;
-    border-bottom:0;
-}
-#profile-jot-email-label {
-    background-color:#555753;
-    color:#ccccce;
-    padding:5px;
-}
-#profile-jot-email {
-    width:90%;
-    margin:5px;
-}
-#profile-jot-networks {
-    margin: 0 10%;
-    border: 1px solid #555753;
-    border-top: 0;
-    border-bottom: 0;
-    padding: 5px;
-}
-#profile-jot-net {
-    margin: 5px 0;
-}
-#jot-preview-link {
-    margin: 0 0 0 10px;
-    border: 0;
-    text-decoration: none;
-    float: right;
-}
-.icon-text-preview {
-    margin: 0 0 -18px 0;
-    display: block;
-    width: 20px;
-    height: 20px;
-    background: url(icons.png) no-repeat -128px -40px;
-    border: 0;
-    text-decoration: none;
-    float: right;
-    cursor: pointer;
-}
-#profile-jot-perms { 
-    float: right;
-    background-color: #555753;
-    height: 22px;
-    width: 20px;
-    -webkit-border-radius: 5px;
-    -moz-border-radius: 5px;
-    border-radius: 5px;     
-    overflow: hidden;
-    border: 0px;
-    margin: 0 10px 0 10px;
-}
-#profile-jot-plugin-wrapper {
-    width: 1px;
-    margin: 10px 0 0 0;
-    float: right;
-}
-#profile-jot-submit-wrapper {
-    float: right;
-    width: 100%;
-    list-style: none;
-    margin: 10px 0 0 0;
-    padding: 0;
-}
-#profile-jot-submit {
-    height: auto;
-    background-color: #555753;
-    color: #eeeeec;
-    -webkit-border-radius: 5px;
-    -moz-border-radius: 5px;
-    border-radius: 5px;
-    border: 2px outset #222420;
-    margin: 0;
-    float: right;
-    text-shadow: 1px 1px #111;
-    width: auto;
-}
-#profile-jot-submit:active {
-    box-shadow: 0 0 0 0;
-}
-#jot-perms-icon {
-    height: 22px;
-    width: 20px;
-    -webkit-border-radius: 5px;
-    -moz-border-radius: 5px;
-    border-radius: 5px;
-    overflow: hidden;
-    border: 0;
-}
-#profile-jot-acl-wrapper {
-    margin: 0 10px;
-    border: 1px solid #555753;
-    border-top: 0;
-    display: block !important;
-}
-#group_allow_wrapper,
-#group_deny_wrapper,
-#acl-permit-outer-wrapper {
-    width:47%;
-    float:left;
-}
-#contact_allow_wrapper,
-#contact_deny_wrapper,
-#acl-deny-outer-wrapper {
-    width:47%;
-    float:right;
-}
-#acl-permit-text {
-    background-color: #555753;
-    color: #ccccce;
-    padding: 5px;
-    float: left;
-}
-#jot-public {
-    background-color: #555753;
-    color: #ff0000;
-    padding: 5px;
-    float: left;
-}
-#acl-deny-text {
-    background-color: #555753;
-    color: #ccccce;
-    padding: 5px;
-    float: left;
-}
-#acl-permit-text-end,
-#acl-deny-text-end {
-    clear: both;
-}
-#jot-title-desc {
-    color: #ccc;
-}
-#profile-jot-desc {
-    color: #a00;
-    margin: 5px 0;
-}
-#jot-title-wrapper {
-    margin-bottom: 5px;
-}
-#jot-title-display {
-    font-weight: bold;
-}
-.jothidden {
-    display: none;
-}
-#jot-preview-content {
-    background-color: #ffffe0;
-    color: #111;
-    border: 1px #aa0 solid;
-    border-radius: 5px;
-    padding: 3px 3px 6px 10px;
-}
-#jot-preview-content .wall-item-outside-wrapper {
-    border: 0;
-    border-radius: 0px;
-}
-
-
-/**
- * section
- */
-#sectionmain {
-    margin: 20px;
-    font-size: 0.8em;
-    min-width: 475px;
-    width: 67%;
-    float: left;
-    display: inline;
-}
-
-
-/**
- * tabs
- */
-.tabs {
-    list-style: none;
-    margin: 10px 0;
-    padding: 0;
-}
-.tabs li {
-    display: inline;
-    font-size: smaller;
-    font-weight: bold;
-}
-.tab {
-    border: 1px solid #729fcf;
-    padding: 4px;
-}
-.tab:hover, .tab.active:hover {
-    background: #729fcf;
-    color: #eeeeec;
-}
-.tab:active {
-    background: #729fcf;
-    color: #eeeeec;
-}
-.tab.active {
-    background: #729fcf;
-    color: #eeeeec;
-}
-.tab.active a {
-    color: #729fcf;
-}
-.tab a {
-    border: 0;
-    text-decoration: none;
-}
-
-
-/**
- * items
- */
-.wall-item-outside-wrapper {
-    border: 1px solid #aaa;
-    border-radius: 5px;
-    box-shadow: 5px 0 10px 0 #888;
-}
-.wall-item-outside-wrapper.comment {
-    margin-top: 5px;
-}
-.wall-item-outside-wrapper-end {
-    clear: both;
-}
-.wall-item-content-wrapper {
-    position: relative;
-    padding: 10px;
-    width: auto;
-}
-.wall-item-outside-wrapper .wall-item-comment-wrapper {
-    /*margin-left: 90px;*/
-}
-.shiny {
-    background: #efefdf;
-    border-radius: 5px;
-}
-.wall-outside-wrapper .shiny {
-    border-radius: 5px;
-}
-.heart {
-    color: red;
-}
-.wall-item-content {
-    overflow-x: auto;
-    margin: 0px 15px 0px 5px;
-}
-/* removing it from here, vs. putting it in .wall-item-content
-* might break things for people. we shall see ;) */
-[id^="tread-wrapper"], [class^="tread-wrapper"] {
-    margin: 15px 0 0 0;
-    padding: 0px;
-    /*overflow-x: auto;*/
-}
-.wall-item-photo-menu {
-    display: none;
-}
-.wall-item-photo-menu-button {
-    display:none;
-    text-indent:-99999px;
-    background:#555753 url(menu-user-pin.jpg) no-repeat 75px center;
-    position:absolute;
-    overflow:hidden;
-    height:20px;
-    width:90px;
-    top:85px;
-    left:0;
-    -webkit-border-radius:0 0 5px 5px;
-    -moz-border-radius:0 0 5px 5px;
-    border-radius:0 0 5px 5px;
-}
-.wall-item-info {
-    float: left;
-    width: 110px;
-}
-.wall-item-photo-wrapper {
-    width: 80px;
-    height: 80px;
-    position: relative;
-    padding: 5px;
-    background-color: #555753;
-    -webkit-border-radius: 5px;
-    -moz-border-radius: 5px;
-    border-radius: 5px;
-}
-[class^="wall-item-tools"] > *, [class^="wall-item-tools"] > * > * {
-    /*margin: 0 0 5px 0;*/
-}
-.wall-item-tools {
-    float: right;
-    filter: alpha(opacity=35);
-    opacity: 0.4;
-    -webkit-transition: all 1s ease-in-out;
-    -moz-transition: all 1s ease-in-out;
-    -o-transition: all 1s ease-in-out;
-    -ms-transition: all 1s ease-in-out;
-    transition: all 1s ease-in-out;
-}
-.wall-item-tools:hover {
-    filter: alpha(opacity=100);
-    opacity: 1;
-    -webkit-transition: all 1s ease-in-out;
-    -moz-transition: all 1s ease-in-out;
-    -o-transition: all 1s ease-in-out;
-    -ms-transition: all 1s ease-in-out;
-    transition: all 1s ease-in-out;
-}
-.wall-item-subtools1 {
-    height: 30px;
-    list-style: none outside none;
-    margin: 20px 0 30px -20px;
-    padding: 0;
-    width: 30px;
-}
-.wall-item-subtools2 {
-    height: 25px;
-    list-style: none outside none;
-    margin: -75px 0 0 5px;
-    padding: 0;
-    width: 25px;
-}
-.wall-item-title {
-    font-size: 1.2em;
-    font-weight: bold;
-    margin-bottom: 1em;
-}
-.wall-item-body {
-    margin: 20px 20px 10px 0px;
-    text-align: left;
-    overflow-x: auto;
-}
-.wall-item-lock-wrapper {
-    float: right;
-    height: 22px;
-    margin: 0 -5px 0 0;
-    width: 22px;
-    opacity: 1;
-}
-.wall-item-dislike,
-.wall-item-like {
-    clear: left;
-    font-size: 0.8em;
-    color: #878883;
-    margin: 5px 0 5px 120px;
-}
-.wall-item-author, .wall-item-actions-author {
-    clear: left;
-    font-size: 0.8em;
-    color: #878883;
-    margin: 20px 20px 0 110px;
-}
-.wall-item-ago {
-    display: inline;
-    padding-left: 10px;
-}
-.wall-item-wrapper-end {
-    clear:both;
-}
-.wall-item-location {
-    margin-top: 15px;
-    width: 100px;
-    overflow: hidden;
-    text-overflow: ellipsis;
-    -o-text-overflow: ellipsis;
-}
-.wall-item-location .icon {
-    float: left;
-}
-.wall-item-location > a {
-    margin-left: 25px;
-    font-size: 0.7em;
-    display: block;
-}
-.wall-item-location .smalltext {
-    margin-left: 25px;
-    font-size: 0.7em;
-    display: block;
-}
-.wall-item-location > br {
-    display: none;
-}
-.wallwall .wwto {
-    left: 5px;
-    margin: 0;
-    position: absolute;
-    top: 75px;
-    width: 30px;
-    z-index: 10001;
-    width: 30px;
-    height: 30px;
-}
-.wallwall .wwto img {
-    width: 30px !important;
-    height: 30px !important;
-}
-.wallwall .wall-item-photo-end {
-    clear: both;
-}
-.wall-item-arrowphoto-wrapper {
-    position: absolute;
-    left: 35px;
-    top: 80px;
-    z-index: 10002;
-}
-.wall-item-photo-menu {
-    min-width: 92px;
-    border: 2px solid #FFFFFF;
-    border-top: 0px;
-    background: #555753;
-    position: absolute;
-    left: -2px; top: 101px;
-    display: none;
-    z-index: 10003;
-    -webkit-border-radius: 0px 5px 5px 5px;
-    -moz-border-radius: 0px 5px 5px 5px;
-    border-radius: 0px 5px 5px 5px;
-}
-.wall-item-photo-menu ul {
-    margin:0px;
-    padding: 0px;
-    list-style: none;
-}
-.wall-item-photo-menu li a {
-    white-space: nowrap;
-    display: block;
-    padding: 5px 2px;
-    color: #eeeeec;
-}
-.wall-item-photo-menu li a:hover {
-    color: #555753;
-    background: #eeeeec;
-}
-#item-delete-selected {
-    overflow: auto;
-    width: 100%;
-}
-#connect-services-header {
-    margin: 5px 0 0 0;
-}
-#connect-services {
-    margin: 5px 0 0 0;
-}
-#extra-help-header {
-    margin: 5px 0 0 0;
-}
-#extra-help {
-    margin: 5px 0 0 0;
-}
-#postit-header {
-    margin: 5px 0 0 0;
-}
-#postit {
-    margin: 5px 0 0 0;
-}
-
-
-/**
- * comment
- */
-.ccollapse-wrapper {
-    font-size: 0.9em;
-    margin-left: 80px;
-}
-
-.wall-item-outside-wrapper.comment {
-    margin-left: 80px;
-}
-.wall-item-outside-wrapper.comment .wall-item-photo {
-    width: 40px!important;
-    height: 40px!important;
-}
-.wall-item-outside-wrapper.comment .wall-item-photo-wrapper {
-    width: 40px;
-    height: 40px;
-}
-.wall-item-outside-wrapper.comment .wall-item-photo-menu-button {
-    width: 50px;
-    top: 45px;
-    background-position: 35px center;
-}
-.wall-item-outside-wrapper.comment .wall-item-info {
-    width: 60px;
-}
-.wall-item-outside-wrapper.comment .wall-item-body {
-    margin-left: 10px;
-}
-.wall-item-outside-wrapper.comment .wall-item-author {
-    margin-left: 50px;
-}
-
-.wall-item-outside-wrapper.comment .wall-item-photo-menu {
-    min-width: 50px;
-    top: 60px;
-}
-.comment-wwedit-wrapper {
-    /*margin: 30px 0px 0px 80px;*/
-}
-.comment-edit-wrapper {
-    border-top: 1px #aaa solid;
-}
-[class^="comment-edit-bb"] {
-	list-style: none;
-	display: none;
-	margin: -40px 0 5px 60px;
-	width: 75%;
-}
-[class^="comment-edit-bb"] > li {
-	display: inline-block;
-	margin: 0 10px 0 0;
-	visibility: none;
-}
-.comment-wwedit-wrapper img,
-.comment-edit-wrapper img {
-    width: 20px;
-    height: 20px;
-}
-.comment-edit-photo-link, .comment-edit-photo {
-    margin-left: 10px;
-}
-.my-comment-photo {
-    width: 40px;
-    height: 40px;
-    padding: 5px;
-}
-[class^="comment-edit-text"] {
-    margin: 5px 0 10px 20px;
-    width: 84.5%;
-}
-.comment-edit-text-empty {
-    height: 20px;
-    border: 2px #babdd6 solid;
-    border-radius: 5px;
-    color: #babdb6;
-    -webkit-transition: all 0.5s ease-in-out;
-    -moz-transition: all 0.5s ease-in-out;
-    -o-transition: all 0.5s ease-in-out;
-    -ms-transition: all 0.5s ease-in-out;
-    transition: all 0.5s ease-in-out;	
-}
-.comment-edit-text-empty:hover {
-    color: #999999;
-}
-.comment-edit-text-full {
-    height: 10em;
-    border-radius: 5px;
-    -webkit-transition: all 0.5s ease-in-out;
-    -moz-transition: all 0.5s ease-in-out;
-    -o-transition: all 0.5s ease-in-out;
-    -ms-transition: all 0.5s ease-in-out;
-    transition: all 0.5s ease-in-out;	
-}
-.comment-edit-submit-wrapper {
-    width: 90%;
-    margin: 5px 5px 10px 50px;
-    text-align: right;
-}
-.comment-edit-submit {
-    height: 22px;
-    background-color: #555753;
-    color: #eeeeec;
-    -webkit-border-radius: 5px;
-    -moz-border-radius: 5px;
-    border-radius: 5px;
-    border: 0;
-}
-
-
-/**
- * item text style
- */
-.wall-item-body code {
-    display: block;
-    padding: 0 0 10px 5px;
-    border-color: #ccc;
-    border-style: solid;
-    border-width: 1px 1px 1px 10px;
-    background: #eee;
-    color: #444;
-    width: 95%;
-}
-
-
-/**
- * profile
- */
-div[id$="text"] {
-    font-weight: bold;
-    border-bottom: 1px solid #ccc;
-}
-div[id$="wrapper"] {
-    height: 100%;
-    margin-bottom: 1em;
-}
-div[id$="wrapper"] br {
-    clear: left;
-}
-[id$="-end"], [class$="end"] {
-	clear: both;
-	margin: 0 0 10px 0;
-}
-#advanced-profile-with {
-    margin-left: 200px;
-}
-
-
-/**
- * photos
- */
-.photos {
-    height: auto;
-    overflow: auto;
-}
-#photo-top-links {
-    margin-bottom: 30px;
-}
-.photo-album-image-wrapper,
-.photo-top-image-wrapper {
-    float: left;
-    -moz-box-shadow: 3px 3px 10px 0 #000;
-    -webkit-box-shadow: 3px 3px 10px 0 #000;
-    box-shadow: 3px 3px 10px 0 #000;
-    background-color: #eee;
-    color: #111;
-    -webkit-border-radius: 5px;
-    -moz-border-radius: 5px;
-    border-radius: 5px;
-    padding-bottom: 30px;
-    position: relative;
-    margin: 0 10px 10px 0;
-}
-
-#photo-photo {
-    max-width: 100%;
-}
-#photo-photo img {
-    max-width: 100%;
-}
-.photo-top-image-wrapper a:hover,
-#photo-photo a:hover,
-.photo-album-image-wrapper a:hover {
-    border-bottom: 0;
-}
-.photo-top-photo,.photo-album-photo {
-    -webkit-border-radius:5px 5px 0 0;
-    -moz-border-radius:5px 5px 0 0;
-    border-radius:5px 5px 0 0;
-}
-.photo-top-album-name {
-    position: absolute;
-    bottom: 0;
-    padding: 0 5px;
-}
-.caption {
-    position: absolute;
-    bottom: 0;
-    margin: 0 5px;
-}
-#photo-photo {
-    position: relative;
-    float:left;
-}
-#photo-prev-link,
-#photo-next-link {
-    position:absolute;
-    width:30%;
-    height:100%;
-    background-color:rgba(255,255,255,0.5);
-    opacity:0;
-    -webkit-transition:all .2s ease-in-out;
-    -moz-transition:all .2s ease-in-out;
-    -o-transition:all .2s ease-in-out;
-    -ms-transition:all .2s ease-in-out;
-    transition:all .2s ease-in-out;
-    background-position:center center;
-    background-repeat:no-repeat;
-}
-#photo-prev-link {
-    left:0;
-    top:0;
-    background-image:url(prev.png);
-}
-#photo-next-link {
-    right:0;
-    top:0;
-    background-image:url(next.png);
-}
-
-#photo-prev-link a,#photo-next-link a {
-    display:block;
-    width:100%;
-    height:100%;
-    overflow:hidden;
-    text-indent:-900000px;
-}
-#photo-prev-link:hover,
-#photo-next-link:hover {
-    opacity:1;
-    -webkit-transition:all .2s ease-in-out;
-    -moz-transition:all .2s ease-in-out;
-    -o-transition:all .2s ease-in-out;
-    -ms-transition:all .2s ease-in-out;
-    transition:all .2s ease-in-out;
-}
-#photo-next-link .icon,
-#photo-prev-link .icon {
-    display: none;
-}
-#photos-upload-spacer,
-#photos-upload-new-wrapper,
-#photos-upload-exist-wrapper {
-    margin-bottom: 1em;
-}
-#photos-upload-existing-album-text,
-#photos-upload-newalbum-div {
-    background-color:#555753;
-    color:#eeeeec;
-    padding:1px;
-}
-#photos-upload-album-select,
-#photos-upload-newalbum {
-    width: 99%;
-}
-#photos-upload-perms-menu {
-    text-align: right;
-}
-#photo-edit-caption, #photo-edit-newtag, #photo-edit-albumname {
-    float: left;
-    margin-bottom: 25px;
-}
-#photo-edit-link-wrap {
-    margin-bottom: 15px;
-}
-#photo-edit-caption {
-    width: 100%;
-}
-#photo-edit-newtag {
-    width: 100%;
-}
-#photo-like-div {
-    margin-bottom: 25px;
-}
-#photo-edit-caption-end, #photo-edit-tags-end, #photo-edit-albumname-end {
-    clear: both;
-}
-#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;
-}
-
-/**
- * message
- */
-.prvmail-text {
-    width: 100%;
-}
-#prvmail-subject {
-    width: 100%;
-    color: #eec;
-    background: #444;
-}
-#prvmail-submit-wrapper {
-    margin-top: 10px;
-}
-#prvmail-submit {
-    float:right;
-    margin-top: 0;
-}
-#prvmail-submit-wrapper > div {
-    margin-right:5px;
-    float:left;
-}
-.mail-list-outside-wrapper {
-    margin-top: 20px;
-}
-.mail-list-sender {
-    float: left;
-}
-.mail-list-detail {
-    margin-left: 90px;
-}
-.mail-list-sender-name {
-    display: inline;
-    font-size: 1.1em;
-}
-.mail-list-date {
-    display: inline;
-    font-size: 0.9em;
-    padding-left: 10px;
-}
-.mail-list-sender-name, .mail-list-date {
-    font-style: italic;
-}
-.mail-list-subject {
-    font-size: 1.2em;
-}
-.mail-list-delete-wrapper {
-    float: right;
-}
-.mail-list-outside-wrapper-end {
-    clear: both;
-    border-bottom: 1px #eec dotted;
-}
-.mail-conv-sender {
-    float: left;
-    margin: 0px 5px 5px 0px;
-}
-.mail-conv-sender-photo {
-    width: 32px;
-    height: 32px;
-}
-.mail-conv-sender-name {
-    float: left;
-}
-.mail-conv-date {
-    float: right;
-}
-.mail-conv-subject {
-    clear: right;
-    font-weight: bold;
-    font-size: 1.2em;
-}
-.mail-conv-body {
-    clear: both;
-}
-.mail-conv-delete-wrapper {
-    margin-top: 5px;
-}
-
-
-/**
- * contacts
- */
-.view-contact-wrapper,
-.contact-entry-wrapper {
-    float: left;
-    margin: 0 5px 40px 0;
-    width: 120px;
-    height: 120px;
-    padding: 3px;
-    position: relative;
-}
-.contact-direction-wrapper {
-    position: absolute;
-    top: 20px;
-}
-.contact-edit-links {
-    position: absolute;
-    top: 60px;
-}
-.contact-entry-photo-wrapper {
-
-}
-.contact-entry-photo {
-    margin-left: 20px;
-}
-.contact-entry-name {
-    width: 120px;
-    font-weight: bold;
-    /*overflow: hidden;*/
-}
-.contact-entry-photo {
-    position: relative;
-}
-.contact-entry-edit-links .icon {
-    border: 1px solid #babdb6;
-    -webkit-border-radius: 3px;
-    -moz-border-radius: 3px;
-    border-radius: 3px;
-    background-color: #fff;
-}
-#contact-entry-url, [id^="contact-entry-url"] {
-    font-size: smaller;
-    /*overflow: scroll;*/
-}
-#contact-entry-network, [id^="contact-entry-network"] {
-    font-size: smaller;
-    font-style: italic;
-}
-#contact-edit-banner-name {
-    font-size: 1.5em;
-}
-#contact-edit-photo-wrapper {
-    position: relative;
-    float: left;
-    padding: 20px;
-}
-#contact-edit-direction-icon {
-    position:absolute;
-    top:60px;
-    left:0;
-}
-#contact-edit-nav-wrapper {
-    margin-left: 0px;
-}
-#contact-edit-links {
-    margin-top: 23px;
-}
-#contact-edit-links ul {
-    list-style-type: none;
-}
-#contact-drop-links {
-    margin-left:5px;
-}
-#contact-edit-nav-wrapper .icon {
-    border: 1px solid #babdb6;
-    -webkit-border-radius: 3px;
-    -moz-border-radius: 3px;
-    border-radius: 3px;	
-}
-#contact-edit-poll-wrapper {
-    margin-left: 0px;
-}
-#contact-edit-last-update-text {
-    margin-bottom: 15px;
-}
-#contact-edit-last-updated {
-    font-weight: bold;
-}
-#contact-edit-poll-text {
-    display: inline;
-}
-#contact-edit-info_tbl, #contact-edit-info_parent {
-    width: 100%;
-}
-.mceLayout {
-    width: 100%;
-}
-#contact-edit-end {
-    clear: both;
-    margin-bottom: 65px;
-}
-
-.contact-photo-menu-button {
-    position: absolute;
-    background-image: url("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 #444;
-    background: #eee;
-    color: #111;
-    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: #fff;
-    background: #3465A4;
-    text-decoration: none;
-}
-
-
-/**
- * register, settings & profile forms
- */
-.openid {
-
-}
-#id_openid_url {
-    background:url(login-bg.gif) no-repeat;
-    background-position:0 50%;
-    padding-left:18px;
-}
-
-#settings-nickname-desc {
-    background-color: #eee;
-    -webkit-border-radius: 5px;
-    -moz-border-radius: 5px;
-    border-radius: 5px;
-    padding: 5px;
-    color: #111;
-}
-#settings-default-perms {
-    margin-bottom: 20px;
-}
-#register-form div,
-#profile-edit-form div {
-    clear: both;
-}
-.settings-block {
-    
-}
-.settings-block label {
-    clear: left;
-}
-.settings-block input {
-    margin: 10px 5px;
-}
-/*#register-form label,     */
-/*#profile-edit-form label {*/
-/*    width: 300px;         */
-/*    float: left;          */
-/*}                         */
-
-/*#register-form span,     */
-/*#profile-edit-form span {*/
-/*    color: #555753;      */
-/*    display: block;      */
-/*    margin-bottom: 20px; */
-/*}                        */
-#profile-edit-marital-label span {
-    margin: -4px;
-}
-.settings-submit-wrapper,
-.profile-edit-submit-wrapper {
-    margin: 30px 0px;
-}
-.profile-edit-side-div {
-    display: none;
-}
-/*.profile-edit-side-div:hover {
-    display: block;
-}
-.profile-edit-side-link {
-    margin: 3px 0px 0px 70px;
-}*/
-#profiles-menu-trigger {
-    margin: 0px 0px 0px 25px;
-}
-.profile-listing {
-    float: left;
-    margin: 20px 20px 0px 0px;
-}
-.icon-profile-edit {
-    background: url("icons.png") -150px 0px no-repeat;
-    border: 0;
-    cursor: pointer;
-    display: block;
-    float: right;
-    width: 20px;
-    height: 20px;
-    margin: 0 0 -18px;
-    position: absolute;
-    text-decoration: none;
-    top: 113px;
-    right: 260px;
-}
-#profile-edit-links ul {
-    margin: 20px 0;
-    padding: 0;
-    list-style: none;
-}
-.marital {
-    margin-top: 5px;
-}
-#register-sitename {
-    display: inline;
-    font-weight: bold;
-}
-#advanced-expire-popup {
-    background: #2e2f2e;
-    color: #eec;
-}
-#id_ssl_policy {
-    width: 374px;
-}
-#theme-preview {
-
-}
-#theme-preview img {
-    margin: 10px 10px 10px 288px;
-}
-
-
-/**
- * contacts selector
- */
-.group-delete-wrapper {
-    margin: -31px 50px 0 0;
-    float: right;
-}
-/*.group-delete-icon {
-    margin: 0 0 0 10px;
-}*/
-#group-edit-submit-wrapper {
-    margin: 0 0 10px 0;
-    display: inline;
-}
-#group-edit-desc {
-    margin: 10px 0px;
-}
-#group-members,
-#prof-members {
-    height:200px;
-    overflow:auto;
-    border:1px solid #555753;
-    -webkit-border-radius:5px 5px 0 0;
-    -moz-border-radius:5px 5px 0 0;
-    border-radius:5px 5px 0 0;
-}
-#group-all-contacts,
-#prof-all-contacts {
-    height:200px;
-    overflow:auto;
-    border:1px solid #555753;
-    -webkit-border-radius:0 0 5px 5px;
-    -moz-border-radius:0 0 5px 5px;
-    border-radius:0 0 5px 5px;
-}
-#group-members h3,
-#group-all-contacts h3,
-#prof-members h3,
-#prof-all-contacts h3 {
-    color:#eeeeec;
-    background-color:#555753;
-    margin:0;
-    padding:5px;
-}
-#group-separator,
-#prof-separator {
-    display: none;
-}
-
-
-/**
- * profile
- */
-#cropimage-wrapper {
-    float:left;
-}
-#crop-image-form {
-    clear:both;
-}
-
-
-/**
- * intros
- */
-.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;
-}
-.intro-approve-as-friend, .intro-approve-as-fan {
-    float: left;
-}
-.intro-form-end {
-    clear: both;
-    margin-bottom: 10px;
-}
-.intro-approve-as-friend-desc {
-    margin-top: 10px;
-}
-.intro-approve-as-end {
-    clear: both;
-    margin-bottom: 10px;
-}
-
-.intro-end {
-    clear: both;
-}
-
-
-/**
- * events
- */
-.clear { clear: both; }
-.eventcal {
-    float:left;
-    font-size:20px;
-}
-.event {
-    background: #2e2f2e;
-}
-.vevent {
-    border:1px solid #ccc;
-}
-.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;
-    font-size: smaller;
-}
-.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: monospace;
-}
-.today {
-    font-weight: bold;
-    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,
-#event-share-checkbox {
-    float:left;
-}
-#event-datetime-break {
-    margin-bottom: 10px;
-}
-#event-nofinish-break,
-#event-adjust-break,
-#event-share-break {
-    clear: both;
-}
-#event-desc-text, 
-#event-location-text {
-    margin-top: 10px;
-    margin-bottom: 5px;
-}
-#event-submit {
-    margin-top: 10px;
-}
-.body-tag {
-    margin: 10px 0;
-    opacity: 0.5;
-    filter:alpha(opacity=50);
-}
-.body-tag:hover {
-    opacity: 1.0 !important;
-    filter:alpha(opacity=100) !important;
-}
-.filesavetags, .categorytags {
-    margin: 20px 0;
-    opacity: 0.5;
-    filter:alpha(opacity=50);
-}
-.filesavetags:hover, .categorytags:hover {
-    margin: 20px 0;
-    opacity: 1.0 !important;
-    filter:alpha(opacity=100) !important;
-}
-.item-select {
-    opacity: 0.1;
-    filter:alpha(opacity=10);
-    margin: 5px 0 0 6px !important;
-}
-.item-select:hover, .checkeditem {
-    opacity: 1;
-    filter:alpha(opacity=100);
-}
-#item-delete-selected {
-    margin-top: 30px;
-}
-/* was tired of having no way of moving it around, so
-* here's a little 'hook' to do so */
-.delete-checked {
-    position: absolute;
-    left: 35px;
-    margin-top: 20px;
-}
-#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;
-}
-.fc-state-highlight {
-    background: #eec;
-    color: #2e2f2e;
-}
-
-
-/**
- * directory
- */
-.directory-item {
-    float: left;
-    /*margin: 50px 50px 0px 0px;*/
-    margin: 0 5px 4px 0;
-    padding: 3px;
-    width: 180px;
-    height: 250px;
-    position: relative;
-}
-
-
-/**
- * sidebar
- */
-#group-sidebar {
-    margin-bottom: 10px;
-}
-.group-selected, .nets-selected, .fileas-selected {
-    padding: 3px;
-    color: #111;
-    background: #f8f8f8;
-    font-weight: bold;
-}
-.group-selected:hover, .nets-selected:hover, .fileas-selected:hover {
-    color: #111;
-}
-.groupsideedit {
-    margin-right: 10px;
-}
-#sidebar-group-ul {
-    padding-left: 0;
-}
-#sidebar-group-list {
-    margin: 0 0 5px 0;
-}
-#sidebar-group-list ul {
-    list-style-type: none;
-    list-style-position: inside;
-}
-#sidebar-group-list li {
-    margin-top: 10px;
-}
-#sidebar-group-list .icon {
-    display: inline-block;
-    height: 12px;
-    width: 12px;
-}
-#sidebar-new-group {
-    margin: auto;
-    display: inline-block;
-    color: #efefef;
-    text-decoration: none;
-    text-align: center;
-}
-#peoplefind-sidebar form {
-    margin-bottom: 10px;
-}
-#sidebar-new-group:hover {
-    /*background: -webkit-gradient( linear, left top, left bottom, color-stop(0.05, #b20202), color-stop(1, #d60808) );*/
-    /*background: -moz-linear-gradient( center top, #b20202 5%, #d60808 100% );*/
-    /*background-color: #b20202;*/
-}
-
-#sidebar-new-group:active {
-    position: relative;
-    top: 1px;
-}
-#side-peoplefind-url {
-    background-color: #e5e0cf;
-    color: #666;
-    border: 1px 666 solid;
-    margin-right: 3px;
-    width: 75%;
-}
-#side-peoplefind-url:hover, #side-peoplefind-url:focus {
-    background-color: #efefef;
-    color: #222;
-    border: 1px 333 solid;
-}
-.nets-ul {
-    list-style-type: none;
-    padding-left: 0px;
-}
-.nets-ul li {
-    margin: 10px 0 0;
-}
-
-.nets-link {
-    margin-left: 0px;
-}
-.nets-all {
-    margin-left: 0px;
-}
-#netsearch-box {
-    margin-top: 20px;
-    width: 150px;   
-}
-#netsearch-box #search-submit {
-    margin: 5px 0px 0px 0px;
-}
-
-
-/**
- * admin
- */
-#pending-update {
-    float:right;
-    color: #fff;
-    font-weight: bold;
-    background-color: #ff0000;
-    padding: 0 .3em;
-}
-.admin.linklist {
-    border: 0; padding: 0;
-}
-.admin.link {
-    list-style-position: inside;
-}
-#adminpage {
-    color: #111;
-    background: transparent;
-    margin: 5px;
-    padding: 10px;
-}
-#adminpage dl {
-    clear:left;
-    margin-bottom: 2px;
-    padding-bottom: 2px;
-    border-bottom: 1px solid #000;
-}
-#adminpage dt {
-    width: 250px;
-    float: left;
-    font-weight: bold;
-}
-#adminpage dd {
-    margin-left: 250px;
-}
-#adminpage h3 {
-    border-bottom:1px solid #ccc;
-}
-
-#adminpage .submit {
-    clear:left;
-}
-#adminpage #pluginslist {
-    margin: 0;
-    padding: 0;
-}
-#adminpage .plugin {
-    list-style: none;
-    display: block;
-    border: 1px solid #888;
-    padding: 1em;
-    margin-bottom: 5px;
-    clear: left;
-}
-#adminpage .toggleplugin {
-    float:left;
-    margin-right: 1em;
-}
-#adminpage table {
-    width: 100%;
-    border-bottom: 1px solid #000;
-    margin: 5px 0;
-}
-#adminpage table th {
-    text-align: left;
-}
-#adminpage td .icon {
-    float: left;
-}
-#adminpage table#users img {
-    width: 16px; height: 16px;
-}
-#adminpage table tr:hover {
-/*	color: ;*/
-    background-color: #bbc7d7;
-}
-#adminpage .selectall {
-    text-align: right;
-}
-#adminpage #users a {
-/*	color: #;*/
-    text-decoration: underline;
-}
-#users .name {
-    color: #eec;
-}
-
-
-/**
- * form fields
- */
-.field {
-    /*margin-bottom: 10px;*/
-    /*padding-bottom: 10px;*/
-    overflow: auto;
-    width: 100%;
-}
-.field label, label {
-    width: 38%;
-    display: inline-block;
-    font-size: 1.077em;
-    margin: 0 10px 1em 0;
-    border: 1px #999 solid;
-    padding: 5px;
-    background: #ccc;
-    color: #111;
-}
-input,
-input[type="text"],
-input[type="password"],
-input[type="search"] {
-    width: 250px;
-    height: 25px;
-    border: 1px #999 solid;
-}
-input[type="checkbox"], input[type="radio"] {
-    border: 1px #999 solid;
-    margin: 0 0 0 0;
-	height: 15px;
-	width: 15px;
-}
-input[type="submit"], input[type="button"] {
-    background-color: #555753;
-    border: 2px outset #444;
-    border-radius: 5px;
-    box-shadow: 1px 3px 4px 0 #111;
-    color: #eeeeec;
-    cursor: pointer;
-    font-weight: bold;
-    width: auto;
-    text-shadow: 1px 1px #111;
-    -webkit-border-radius: 5px;
-    -moz-border-radius: 5px;
-}
-input[type="submit"]:active, input[type="button"]:active {
-    box-shadow: 0 0 0 0;
-}
-.field textarea {
-    width: 80%;
-    height: 100px;
-}
-.field_help {
-    display: block;
-    margin-left: 297px;
-    color: #666;
-}
-.field .onoff {
-    float: left;
-    width: 80px;
-}
-.field .onoff a {
-    display: block;
-    border: 1px solid #666;
-    padding: 3px 6px 4px 10px;
-    height: 16px;
-    text-decoration: none;
-}
-.field .onoff .on {
-    background: url("../../../images/onoff.jpg") no-repeat 42px 1px #999;
-    color: #111;
-    text-align: left;
-}
-.field .onoff .off {
-    background: url("../../../images/onoff.jpg") no-repeat 2px 1px #ccc;
-    color: #333;
-    text-align: right;
-}
-.hidden {
-    display:none !important;
-}
-.field.radio .field_help {
-    margin-left: 297px;
-}
-
-
-/*
- * 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;
-}
-#panel {
-    z-index: 100;
-}
-.grey {
-    color: grey;
-}
-.orange {
-    color: orange;
-}
-.red {
-    color: red;
-}
-.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: 20px;
-    height: 20px;
-    background: url(icons.png) no-repeat;
-    border: 0;
-    text-decoration: none;
-    border-radius: 5px;
-}
-.icon:hover {
-    border: 0;
-    text-decoration: none;
-}
-.editicon {
-    display: inline-block;
-    width: 21px;
-    height: 21px;
-    background: url(editicons.png) no-repeat;
-    border: 0;
-    text-decoration: none;
-}
-.shadow {
-	box-shadow: 2px 2px 5px 2px #111;
-}
-.shadow:active, .shadow:focus, .shadow:hover {
-	box-shadow: 0 0 0 0;
-}
-.editicon:hover {
-	border: 0;
-}
-.boldbb {
-	background-position: 0px 0px;
-}
-.boldbb:hover {
-	background-position: -22px 0px;
-}
-.italicbb {
-	background-position: 0px -22px;
-}
-.italicbb:hover {
-	background-position: -22px -22px;
-}
-.underlinebb {
-	background-position: 0px -44px;
-}
-.underlinebb:hover {
-	background-position: -22px -44px;
-}
-.quotebb {
-	background-position: 0px -66px;
-}
-.quotebb:hover {
-	background-position: -22px -66px;
-}
-.codebb {
-	background-position: 0px -88px;
-}
-.codebb:hover {
-	background-position: -22px -88px;
-}
-.imagebb {
-	background-position: -44px 0px;
-}
-.imagebb:hover {
-	background-position: -66px 0px;
-}
-.urlbb {
-	background-position: -44px -22px;
-}
-.urlbb:hover {
-	background-position: -66px -22px;
-}
-.videobb {
-	background-position: -44px -44px;
-}
-.videobb:hover {
-	background-position: -66px -44px;
-}
-.icon.drop,
-.icon.drophide, .icon.delete {
-    float: left;
-    margin: 0 2px;
-}
-.icon.s22.delete {
-    display: block;
-    background-position: -110px 0;
-}
-.icon.s22.text {
-    padding: 10px 0px 0px 25px;
-    width: 200px;
-}
-.icon.text {
-    text-indent: 0px;
-}
-.icon.s16 {
-    min-width: 16px;
-    height: 16px;
-}
-.s16 .add {
-    background: url("../../../images/icons/16/add.png") no-repeat;
-}
-.add {
-    margin: 0px 5px;    
-}
-.article {
-    background-position: -50px 0;
-}
-.audio {
-    background-position: -70px 0;
-}
-.block {
-    background-position: -90px 0px;
-}
-.drop, .delete {
-    background-position: -110px 0;
-}
-.drophide {
-    background-position: -130px 0;
-}
-.edit {
-    background-position: -150px 0;
-}
-.camera {
-    background-position: -170px 0;
-}
-.dislike {
-    background-position: -190px 0;
-}
-.file-as {
-    background-position: -230px -60px;
-}
-.like {
-    background-position: -211px 0;
-}
-.link {
-    background-position: -230px 0;
-}
-.globe, .location {
-    background-position: -50px -20px;
-}
-.noglobe, .nolocation {
-    background-position: -70px -20px;
-}
-.no {
-    background-position: -90px -20px;
-}
-.pause {
-    background-position: -110px -20px;
-}
-.play {
-    background-position: -130px -20px;
-}
-.pencil {
-    background-position: -151px -18px;
-}
-.small-pencil {
-    background-position: -170px -20px;
-}
-.recycle {
-    background-position: -190px -20px;
-}
-.remote-link {
-    background-position: -210px -20px;
-}
-.share {
-    background-position: -230px -20px;
-}
-.tools {
-    background-position: -50px -40px;
-}
-.lock {
-    background-position: -70px -40px;
-}
-.unlock {
-    background-position: -88px -40px;
-}
-.video {
-    background-position: -110px -40px;
-}
-.attach {
-    background-position: -190px -40px;
-}
-.language {
-    background-position: -210px -40px;
-}
-.starred {
-    background-position: -130px -60px;
-}
-.unstarred {
-    background-position: -150px -60px;
-}
-.tagged {
-    background-position: -170px -60px;
-}
-.on {
-    background-position: -50px  -60px;
-}
-.off {
-    background-position: -70px  -60px;
-}
-.prev {
-    background-position: -90px  -60px;
-}
-.next {
-    background-position: -110px  -60px;
-}
-.icon.dim {
-    opacity: 0.3;
-    filter: alpha(opacity=30);
-}
-#pause {
-    position: fixed;
-    bottom: 40px;
-    right: 30px;
-}
-.border, .border:hover {
-    border: 1px solid #babdb6;
-    -webkit-border-radius: 5px;
-    -moz-border-radius: 5px;
-    border-radius: 5px;	
-}
-.attachtype {
-    display: block;
-    width: 20px;
-    height: 23px;
-    background-image: url(../../../images/content-types.png);
-}
-.type-video {
-    background-position: 0px 0px;
-}
-.type-image {
-    background-position: -20px 0;
-}
-.type-audio {
-    background-position: -40px 0;
-}
-.type-text {
-    background-position: -60px 0px;
-}
-.type-unkn {
-    background-position: -80px 0;
-}
-
-
-/**
- * footer
- */
-.cc-license {
-    margin-top: 100px;
-    font-size: 0.7em;
-}
-footer {
-    display: block;
-    /*margin: 50px 20%;*/
-    clear: both;
-}
-#profile-jot-text {
-    height: 20px;
-    color: #666;
-    border: 1px solid #ccc;
-    border-radius: 5px;
-    width: 99.5%;
-}
-
-
-/**
- * acl
- */
-#photo-edit-perms-select,
-#photos-upload-permissions-wrapper,
-#profile-jot-acl-wrapper {
-    display: block !important;
-    background: #eec;
-    color: #2e2f2e;
-}
-#acl-wrapper {
-    width: 660px;
-    margin: 0 auto;
-}
-#acl-search {
-    float: right;
-    background: #fff url("../../../images/search_18.png") no-repeat right center;
-    padding-right: 20px;
-    margin: 6px;
-    color: #111;
-}
-#acl-showall {
-    float: left;
-    display: block;
-    width: auto;
-    height: 18px;
-    background: #eec url("../../../images/show_all_off.png") 8px 8px no-repeat;
-    padding: 7px 10px 7px 30px;
-    -webkit-border-radius: 5px;
-    -moz-border-radius: 5px;
-    border-radius: 5px;
-    color: #999;
-    margin: 5px 0;
-}
-#acl-showall.selected {
-    color: #000;
-    background: #f90 url(../../../images/show_all_on.png) 8px 8px no-repeat;
-}
-#acl-list {
-    height: 210px;
-    border: 1px solid #ccc;
-    clear: both;
-    margin-top: 30px;
-    overflow: auto;
-}
-/*#acl-list-content {
-}*/
-.acl-list-item {
-    border: 1px solid #ccc;
-    display: block;
-    float: left;
-    height: 110px;
-    margin: 3px 0 5px 5px;
-    width: 120px;
-}
-.acl-list-item img {
-    width: 22px;
-    height: 22px;
-    float: left;
-    margin: 5px 5px 20px;
-}
-.acl-list-item p {
-    height: 12px;
-    font-size: 10px;
-    margin: 0 0 22px;
-    padding: 2px 0 1px;
-}
-.acl-list-item a {
-    background: #ccc 3px 3px no-repeat;
-    -webkit-border-radius: 2px;
-    -moz-border-radius: 2px;
-    border-radius: 2px;
-    clear: both;
-    font-size: 10px;
-    display: block;
-    width: 55px;
-    height: 20px;
-    color: #999;
-    margin: 5px auto 0;
-    padding: 0 3px;
-    text-align: center;
-    vertical-align: middle;
-}
-#acl-wrapper a:hover {
-    text-decoration: none;
-    color: #000;
-    border: 0;
-}
-.acl-button-show {
-    background-image: url('../../../images/show_off.png');
-    margin: 0 auto;
-}
-.acl-button-hide {
-    background-image: url('../../../images/hide_off.png');
-    margin: 0 auto;
-}
-.acl-button-show.selected {
-    color: #000;
-    background-color: #9ade00;
-    background-image: url(../../../images/show_on.png);
-}
-.acl-button-hide.selected {
-    color: #000;
-    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 **/
-
-
-/* autocomplete popup */
-.acpopup {
-    max-height: 175px;
-    max-width: 42%;
-    background-color: #555753;
-    color: #fff;
-    overflow: auto;
-    z-index: 100000;
-    border: 1px solid #cccccc;
-}
-.acpopupitem {
-    background-color: #555753;
-    padding: 4px;
-    clear: left;
-}
-.acpopupitem img {
-    float: left;
-    margin-right: 4px;
-}
-.acpopupitem.selected {
-    color: #2e3436;
-    background-color: #eeeeec;
-}
-.qcomment-wrapper {
-    padding: 0px;
-    margin: 5px 5px 5px 81%;
-}
-.qcomment {
-    opacity: 0.5;
-    filter:alpha(opacity=50);
-}
-.qcomment:hover {
-    opacity: 1.0;
-    filter:alpha(opacity=100);
-}
-#network-star-link {
-    margin-top: 10px;
-}
-.network-star {
-    float: left;
-    margin-right: 5px;
-}
-.network-star.icon.starred {
-    display: inline-block;
-}
-#fileas-sidebar {
-    
-}
-.fileas-ul {
-    padding: 0;
-}
-
-
-
-/*
- * addons theming
- */
-
-#sidebar-page-list {
-    
-}
-#sidebar-page-list ul {
-    padding: 0;
-    margin: 5px 0;
-}
-#sidebar-page-list li {
-    list-style: none;
-}
-#jappix_mini {
-    margin-left: 130px;
-    position: fixed;
-    bottom: 0;
-    right: 175px !important; /* override the jappix css */
-    z-index: 999;
-}
-
-@media handheld {
-    body {
-        font-size: 15pt;
-    }
-}
+article,aside,details,figcaption,figure,footer,header,hgroup,nav,section{display:block;}
+audio,canvas,video,time{display:inline-block;*display:inline;*zoom:1;}
+audio:not([controls]),[hidden]{display:none;}
+html{font-size:100%;overflow-y:scroll;-webkit-text-size-adjust:100%;-ms-text-size-adjust:100%;}
+body{margin:0;font-size:16px;line-height:1.1em;font-family:sans-serif;color:#222;background-color:#e8e8e8;}
+button,input,select,textarea{font-family:sans-serif;color:#222;background-color:#e8e8e8;}
+select{border:1px #555 dotted;padding:3px;margin:3px;color:#222;background:#e8e8e8;}
+option{padding:3px;color:#222;background:#e8e8e8;}option[selected="selected"]{color:#111;background:#cca;}
+ul,ol{padding:0;}
+:focus{outline:0;}
+[disabled="disabled"]{background:#ddd;color:#333;}
+ins{background-color:#ff9;color:#000;text-decoration:none;}
+mark{background-color:#ff9;color:#000;font-style:italic;font-weight:bold;}
+pre,code,kbd,samp,.wall-item-body code{font-family:monospace, monospace;_font-family:monospace;font-size:1em;}
+pre,.wall-item-body code{white-space:pre;white-space:pre-wrap;word-wrap:break-word;}
+q{quotes:none;}q:before,q:after{content:"";content:none;}
+small{font-size:85%;}
+sub,sup{font-size:75%;line-height:0;position:relative;vertical-align:baseline;}
+sub{bottom:-0.25em;}
+sup{top:-0.5em;}
+img{border:0 none;}
+a{color:#3465a4;text-decoration:none;margin-bottom:1px;}a:hover img{text-decoration:none;}
+blockquote{background:#eee;color:#111;text-indent:5px;padding:5px;border:1px #aaa solid;border-radius:5px;}
+a:hover{color:#729fcf;border-bottom:1px dotted #729fcf;}
+.required{display:inline;color:#f00;font-size:16px;font-weight:bold;margin:3px;}
+.fakelink,.lockview{color:#3465a4;cursor:pointer;}
+.fakelink:hover{color:#729fcf;}
+.smalltext{font-size:0.7em;}
+#panel{position:absolute;font-size:0.8em;-webkit-border-radius:5px;-moz-border-radius:5px;border-radius:5px;border:1px solid #fff;background-color:#2e3436;color:#eeeeec;padding:1em;}
+.pager{margin-top:60px;display:block;clear:both;text-align:center;}.pager span{padding:4px;margin:4px;}
+.pager_current{background-color:#729fcf;color:#fff;}
+.action{margin:5px 0;}
+.tool{margin:5px 0;list-style:none;}
+#articlemain{width:100%;height:100%;margin:0 auto;}
+#asidemain .field{overflow:hidden;width:200px;}
+#login-extra-links{overflow:auto !important;padding-top:60px !important;width:100% !important;}#login-extra-links a{margin-right:20px;}
+#login_standard{display:block !important;float:none !important;height:100% !important;position:relative !important;width:100% !important;}#login_standard .field label{width:200px !important;}
+#login_standard input{margin:0 0 8px !important;width:210px !important;}#login_standard input[type="text"]{margin:0 0 8px !important;width:210px !important;}
+#login-submit-wrapper{margin:0 !important;}
+#login-submit-button{margin-left:0px !important;}
+#asidemain #login_openid{position:relative !important;float:none !important;margin-left:0px !important;height:auto !important;width:200px !important;}
+#login_openid #id_openid_url{width:180px !important;overflow:hidden !important;}
+#login_openid label{width:180px !important;}
+nav{height:60px;background-color:#2e3436;color:#eeeeec;position:relative;padding:20px 20px 10px 95px;}nav a{text-decoration:none;color:#eeeeec;border:0px;}nav a:hover{text-decoration:none;color:#eeeeec;border:0px;}
+nav #banner{display:block;position:absolute;left:51px;top:25px;}nav #banner #logo-text a{font-size:40px;font-weight:bold;margin-left:3px;}
+ul#user-menu-popup{display:none;position:absolute;background-color:#555753;width:100%;padding:10px 0px;margin:0px;top:20px;left:0;-webkit-border-radius:0 0 5px 5px;-moz-border-radius:0 0 5px 5px;border-radius:0 0 5px 5px;box-shadow:5px 10px 10px 0 #111;z-index:10000;}ul#user-menu-popup li{display:block;}ul#user-menu-popup li a{display:block;padding:5px;}ul#user-menu-popup li a:hover{color:#2e3436;background-color:#eeeeec;}
+ul#user-menu-popup li a.nav-sep{border-top:1px solid #eeeeec;}
+nav .nav-link{display:inline-block;width:22px;height:22px;overflow:hidden;margin:0px 5px 5px;text-indent:50px;background:transparent url(icons.png) 0 0 no-repeat;}
+#nav-apps-link{background-position:0 -66px;}#nav-apps-link:hover{background-position:-22px -66px;}
+#nav-community-link,#nav-contacts-link{background-position:0 -22px;}#nav-community-link:hover,#nav-contacts-link:hover{background-position:-22px -22px;}
+#nav-directory-link{background-position:-44px -154px;}#nav-directory-link:hover{background-position:-66px -154px;}
+#nav-help-link{background-position:0 -110px;}#nav-help-link:hover{background-position:-22px -110px;}
+#nav-home-link{background-position:-44px -132px;}#nav-home-link:hover{background-position:-66px -132px;}
+#nav-intro-link{background-position:0px -190px;}#nav-intro-link:hover{background-position:-44px -190px;}
+#nav-login-link,#nav-logout-link{background-position:0 -88px;}#nav-login-link:hover,#nav-logout-link:hover{background-position:-22px -88px;}
+#nav-messages-link{background-position:-44px -88px;}#nav-messages-link:hover{background-position:-66px -88px;}
+#nav-notify-link,#nav-notifications-linkmenu{background-position:-44px -110px;}
+#nav-notify-link:hover{background-position:-66px -110px;}
+#nav-network-link{background-position:0px -177px;}#nav-network-link:hover{background-position:-22px -177px;}
+#nav-search-link{background-position:0 -44px;}#nav-search-link:hover{background-position:-22px -44px;}
+#profile-link,#profile-title,#wall-image-upload,#wall-file-upload,#profile-attach-wrapper,#profile-audio,#profile-link,#profile-location,#profile-nolocation,#profile-title,#jot-title,#profile-upload-wrapper,#profile-video,#profile-jot-submit,#wall-image-upload-div,#wall-file-upload-div,.icon,.hover,.focus,.pointer{cursor:pointer;}
+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;}
+#nav-notifications-menu{margin:30px 0 0 -20px;width:275px;max-height:300px;overflow-y:auto;font-size:9pt;}#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{word-wrap:normal;border-bottom:1px solid #000;}#nav-notifications-menu li:hover{color:black;}
+#nav-notifications-menu a:hover{color:black;text-decoration:underline;}
+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");}
+.show{display:block;}
+#notifications{height:20px;width:170px;position:absolute;top:-19px;left:4px;}
+#nav-floater{position:fixed;top:20px;right:1%;padding:5px;background:#2e3436;color:transparent;border-radius:5px;z-index:100;width:300px;height:60px;}
+#nav-buttons{clear:both;list-style:none;padding:0px;margin:0px;height:25px;}#nav-buttons>li{padding:0;display:inline-block;margin:0px -4px 0px 0px;}
+.floaterflip{display:block;position:fixed;z-index:110;top:56px;right:19px;width:22px;height:22px;overflow:hidden;margin:0px;background:transparent url(icons.png) -190px -60px no-repeat;}
+.search-box{display:inline-block;margin:5px;position:fixed;right:0px;bottom:0px;z-index:100;background:#1d1f1d;border-radius:5px;}
+#search-text{border:1px #eec solid;background:#2e3436;color:#eec;}
+.search-box #search-text{margin:8px;width:10em;height:14px;color:#eec;}
+#scrollup{position:fixed;right:5px;bottom:40px;z-index:100;}#scrollup a:hover{text-decoration:none;border:0;}
+#user-menu{box-shadow:5px 0 10px 0 #111;display:block;width:75%;margin:3px 0 0 0;position:relative;background-color:#555753;-webkit-border-radius:5px;-moz-border-radius:5px;border-radius:5px;background:#555753 url("menu-user-pin.jpg") 98% center no-repeat;clear:both;top:4px;left:10px;padding:2px;}#user-menu>a{vertical-align:top;}
+#user-menu-label{font-size:12px;padding:3px 20px 9px 5px;height:10px;}
+.nav-ajax-update,.nav-ajax-left{width:30px;height:19px;background:transparent url(notifications.png) 0 0 no-repeat;color:#222;font-weight:bold;font-size:0.8em;padding-top:0.2em;text-align:center;float:left;margin:0 -1px 0 3px;display:block;visibility:hidden;}
+.nav-ajax-update.show,.nav-ajax-left.show{visibility:visible;}
+#net-update{background-position:0px 0px;}
+#mail-update{background-position:-30px 0;}
+#notify-update{background-position:-60px 0px;}
+#home-update{background-position:-90px 0px;}
+#intro-update{background-position:-120px 0px;}
+#lang-select-icon{cursor:pointer;position:fixed;left:28px;bottom:6px;z-index:10;}
+#language-selector{position:fixed;bottom:2px;left:52px;z-index:10;}
+.menu-popup{position:absolute;display:none;width:11em;background:#ffffff;color:#2d2d2d;margin:0px;padding:0px;list-style:none;border:3px solid #364e59;z-index:100000;-webkit-box-shadow:3px 3px 10px 0 rgba(0, 0, 0, 0.7);-moz-box-shadow:3px 3px 10px 0 rgba(0, 0, 0, 0.7);box-shadow:3px 3px 10px 0 rgba(0, 0, 0, 0.7);}.menu-popup a{display:block;color:#2d2d2d;padding:5px 10px;text-decoration:none;}.menu-popup a:hover{background-color:#bdcdd4;}
+.menu-popup .menu-sep{border-top:1px solid #9eabb0;}
+.menu-popup li{float:none;overflow:auto;height:auto;display:block;}.menu-popup li img{float:left;width:16px;height:16px;padding-right:5px;}
+.menu-popup .empty{padding:5px;text-align:center;color:#9eabb0;}
+.notif-item{font-size:small;}.notif-item a{vertical-align:middle;}
+.notif-image{width:32px;height:32px;padding:7px 7px 0px 0px;}
+.notify-seen{background:#ddd;}
+#sysmsg_info{position:fixed;bottom:0;-moz-box-shadow:3px 3px 3px 10px 0 #000;-webkit-box-shadow:3px 3px 10px 0 #000;box-shadow:3px 3px 10px 0 #000;padding:10px;background-color:#fcaf3e;border:2px solid #f8911b;border-bottom:0;padding-bottom:50px;z-index:1000;}
+#sysmsg{position:fixed;bottom:0;-moz-box-shadow:3px 3px 10px 0 #000;-webkit-box-shadow:3px 3px 10px 0 #000;box-shadow:3px 3px 10px 0 #000;padding:10px;background-color:#fcaf3e;border:2px solid #f8911b;border-bottom:0;padding-bottom:50px;z-index:1000;}
+#sysmsg_info br,#sysmsg br{display:block;margin:2px 0px;border-top:1px solid #ccccce;}
+#asidemain{float:left;font-size:smaller;margin:20px 0 20px 35px;width:25%;display:inline;}
+#asideright,#asideleft{display:none;}
+.vcard .fn{font-size:1.7em;font-weight:bold;border-bottom:1px solid #729fcf;padding-bottom:3px;}
+.vcard #profile-photo-wrapper{margin:20px;}.vcard #profile-photo-wrapper img{box-shadow:3px 3px 10px 0 #000;}
+#asidemain h4{font-size:1.2em;}
+#asidemain #viewcontacts{text-align:right;}
+.aprofile dt{background:transparent;color:#666666;font-weight:bold;box-shadow:1px 1px 5px 0 #000;margin:15px 0 5px;padding-left:5px;}
+#profile-extra-links ul{margin-left:0px;padding-left:0px;list-style:none;}
+#dfrn-request-link{background:#3465a4 url(connect.png) no-repeat 95% center;border-radius:5px 5px 5px 5px;color:#fff;display:block;font-size:1.2em;padding:0.2em 0.5em;}
+#wallmessage-link{color:#eee;display:block;font-size:1.2em;padding:0.2em 0.5em;}
+#netsearch-box{margin:20px 0px 30px;width:150px;}#netsearch-box #search-submit{margin:5px 5px 0px 0px;}
+.ttright{margin:0px 0px 0px 0px;}
+.contact-block-div{width:50px;height:50px;float:left;}
+.contact-block-textdiv{width:150px;height:34px;float:left;}
+#contact-block-end{clear:both;}
+#jot{margin:10px 0 20px 0px;width:100%;}#jot #jot-tools{margin:0px;padding:0px;height:35px;overflow:none;width:100%;}#jot #jot-tools span{float:left;margin:10px 20px 2px 0px;}#jot #jot-tools span a{display:block;}
+#jot #jot-tools .perms{float:right;width:40px;}
+#jot #jot-tools li.loading{float:right;background-color:#ffffff;width:20px;vertical-align:center;text-align:center;border-top:2px solid #9eabb0;height:38px;}#jot #jot-tools li.loading img{margin-top:10px;}
+#jot #jot-title{border:1px solid #ccc;margin:0 0 5px;height:20px;width:90%;font-weight:bold;border-radius:5px;vertical-align:middle;}
+#jot-category{margin:5px 0;border-radius:5px;border:1px #ccc solid;color:#666;font-size:smaller;}#jot-category:focus{color:#111;}
+#jot #character-counter{width:6%;float:right;text-align:right;height:15px;line-height:20px;padding:2px 20px 5px 0;}
+#profile-jot-text_parent{box-shadow:5px 0 10px 0 #111;}
+#profile-jot-text_tbl{margin-bottom:10px;background:#777;}
+#profile-jot-text_ifr{width:99.900002% !important;}
+#profile-jot-text_toolbargroup,.mceCenter tr{background:#777;}
+[id$="jot-text_ifr"]{width:99.900002% !important;color:#2e2f2e;background:#eec;}[id$="jot-text_ifr"] .mceContentBody{color:#2e2f2e;background:#eec;}
+.defaultSkin tr.mceFirst{background:#777;}
+.defaultSkin td.mceFirst,.defaultSkin td.mceLast{background-color:#eec;}
+.defaultSkin span.mceIcon,.defaultSkin img.mceIcon,.defaultSkin .mceButtonDisabled .mceIcon{background-color:#eec;}
+#profile-attach-wrapper,#profile-audio-wrapper,#profile-link-wrapper,#profile-location-wrapper,#profile-nolocation-wrapper,#profile-title-wrapper,#profile-upload-wrapper,#profile-video-wrapper{float:left;margin:0 20px 0 0;}
+#profile-rotator-wrapper{float:right;}
+#profile-jot-tools-end,#profile-jot-banner-end{clear:both;}
+#profile-jot-email-wrapper{margin:10px 10% 0;border:1px solid #555753;border-bottom:0;}
+#profile-jot-email-label{background-color:#555753;color:#ccccce;padding:5px;}
+#profile-jot-email{width:90%;margin:5px;}
+#profile-jot-networks{margin:0 10%;border:1px solid #555753;border-top:0;border-bottom:0;padding:5px;}
+#profile-jot-net{margin:5px 0;}
+#jot-preview-link{margin:0 0 0 10px;border:0;text-decoration:none;float:right;}
+.icon-text-preview{margin:0 0 -18px 0;display:block;width:20px;height:20px;background:url(icons.png) no-repeat -128px -40px;border:0;text-decoration:none;float:right;cursor:pointer;}
+#profile-jot-perms{float:right;background-color:#555753;height:22px;width:20px;-webkit-border-radius:5px;-moz-border-radius:5px;border-radius:5px;overflow:hidden;border:0px;margin:0 10px 0 10px;}
+#profile-jot-plugin-wrapper{width:1px;margin:10px 0 0 0;float:right;}
+#profile-jot-submit-wrapper{float:right;width:100%;list-style:none;margin:10px 0 0 0;padding:0;}
+#profile-jot-submit{height:auto;background-color:#555753;color:#eeeeec;-webkit-border-radius:5px;-moz-border-radius:5px;border-radius:5px;border:2px outset #222420;margin:0;float:right;text-shadow:1px 1px #111;width:auto;}#profile-jot-submit:active{box-shadow:0 0 0 0;}
+#jot-perms-icon{height:22px;width:20px;-webkit-border-radius:5px;-moz-border-radius:5px;border-radius:5px;overflow:hidden;border:0;}
+#profile-jot-acl-wrapper{margin:0 10px;border:1px solid #555753;border-top:0;display:block !important;}
+#group_allow_wrapper,#group_deny_wrapper,#acl-permit-outer-wrapper{width:47%;float:left;}
+#contact_allow_wrapper,#contact_deny_wrapper,#acl-deny-outer-wrapper{width:47%;float:right;}
+#acl-permit-text{background-color:#555753;color:#ccccce;padding:5px;float:left;}
+#jot-public{background-color:#555753;color:#ff0000;padding:5px;float:left;}
+#acl-deny-text{background-color:#555753;color:#ccccce;padding:5px;float:left;}
+#acl-permit-text-end,#acl-deny-text-end{clear:both;}
+#jot-title-desc{color:#ccc;}
+#profile-jot-desc{color:#a00;margin:5px 0;}
+#jot-title-wrapper{margin-bottom:5px;}
+#jot-title-display{font-weight:bold;}
+.jothidden{display:none;}
+#jot-preview-content{background-color:#ffffe0;color:#111;border:1px #aa0 solid;border-radius:5px;padding:3px 3px 6px 10px;}#jot-preview-content .wall-item-outside-wrapper{border:0;border-radius:0px;}
+#sectionmain{margin:20px;font-size:0.8em;min-width:475px;width:67%;float:left;display:inline;}
+.tabs{list-style:none;margin:10px 0;padding:0;}.tabs li{display:inline;font-size:smaller;font-weight:bold;}
+.tab{border:1px solid #729fcf;padding:4px;}.tab:hover,.tab.active:hover,.tab:active{background:#729fcf;color:#eeeeec;}
+.tab.active{background:#729fcf;color:#eeeeec;}.tab.active a{color:#729fcf;}
+.tab a{border:0;text-decoration:none;}
+.wall-item-outside-wrapper{border:1px solid #aaa;border-radius:5px;box-shadow:5px 0 10px 0 #888;}.wall-item-outside-wrapper.comment{margin-top:5px;}
+.wall-item-outside-wrapper-end{clear:both;}
+.wall-item-content-wrapper{position:relative;padding:10px;width:auto;}
+.wall-item-outside-wrapper .wall-item-comment-wrapper{}
+.shiny{background:#efefdf;border-radius:5px;}
+.wall-outside-wrapper .shiny{border-radius:5px;}
+.heart{color:red;}
+.wall-item-content{overflow-x:auto;margin:0px 15px 0px 5px;}
+[id^="tread-wrapper"],[class^="tread-wrapper"]{margin:15px 0 0 0;padding:0px;}
+.wall-item-photo-menu{display:none;}
+.wall-item-photo-menu-button{display:none;text-indent:-99999px;background:#555753 url(menu-user-pin.jpg) no-repeat 75px center;position:absolute;overflow:hidden;height:20px;width:90px;top:85px;left:0;-webkit-border-radius:0 0 5px 5px;-moz-border-radius:0 0 5px 5px;border-radius:0 0 5px 5px;}
+.wall-item-info{float:left;width:110px;}
+.wall-item-photo-wrapper{width:80px;height:80px;position:relative;padding:5px;background-color:#555753;-webkit-border-radius:5px;-moz-border-radius:5px;border-radius:5px;}
+[class^="wall-item-tools"] *{}[class^="wall-item-tools"] *>*{}
+.wall-item-tools{float:right;opacity:0.4;-webkit-transition:all 1s ease-in-out;-moz-transition:all 1s ease-in-out;-o-transition:all 1s ease-in-out;-ms-transition:all 1s ease-in-out;transition:all 1s ease-in-out;}.wall-item-tools:hover{opacity:1;-webkit-transition:all 1s ease-in-out;-moz-transition:all 1s ease-in-out;-o-transition:all 1s ease-in-out;-ms-transition:all 1s ease-in-out;transition:all 1s ease-in-out;}
+.wall-item-subtools1{height:30px;list-style:none outside none;margin:20px 0 30px -20px;padding:0;width:30px;}
+.wall-item-subtools2{height:25px;list-style:none outside none;margin:-75px 0 0 5px;padding:0;width:25px;}
+.wall-item-title{font-size:1.2em;font-weight:bold;margin-bottom:1em;}
+.wall-item-body{margin:20px 20px 10px 0px;text-align:left;overflow-x:auto;}
+.wall-item-lock-wrapper{float:right;height:22px;margin:0 -5px 0 0;width:22px;opacity:1;}
+.wall-item-dislike,.wall-item-like{clear:left;font-size:0.8em;color:#878883;margin:5px 0 5px 120px;}
+.wall-item-author,.wall-item-actions-author{clear:left;font-size:0.8em;color:#878883;margin:20px 20px 0 110px;}
+.wall-item-ago{display:inline;padding-left:10px;}
+.wall-item-wrapper-end{clear:both;}
+.wall-item-location{margin-top:15px;width:100px;overflow:hidden;text-overflow:ellipsis;-o-text-overflow:ellipsis;}.wall-item-location .icon{float:left;}
+.wall-item-location>a,.wall-item-location .smalltext{margin-left:25px;font-size:0.7em;display:block;}
+.wall-item-location>br{display:none;}
+.wallwall .wwto{left:5px;margin:0;position:absolute;top:75px;width:30px;z-index:10001;width:30px;height:30px;}.wallwall .wwto img{width:30px !important;height:30px !important;}
+.wallwall .wall-item-photo-end{clear:both;}
+.wall-item-arrowphoto-wrapper{position:absolute;left:35px;top:80px;z-index:10002;}
+.wall-item-photo-menu{min-width:92px;border:2px solid #FFFFFF;border-top:0px;background:#555753;position:absolute;left:-2px;top:101px;display:none;z-index:10003;-webkit-border-radius:0px 5px 5px 5px;-moz-border-radius:0px 5px 5px 5px;border-radius:0px 5px 5px 5px;}.wall-item-photo-menu ul{margin:0px;padding:0px;list-style:none;}
+.wall-item-photo-menu li a{white-space:nowrap;display:block;padding:5px 2px;color:#eeeeec;}.wall-item-photo-menu li a:hover{color:#555753;background:#eeeeec;}
+#item-delete-selected{overflow:auto;width:100%;}
+#connect-services-header,#connect-services,#extra-help-header,#extra-help,#postit-header,#postit{margin:5px 0 0 0;}
+.ccollapse-wrapper{font-size:0.9em;margin-left:80px;}
+.wall-item-outside-wrapper.comment{margin-left:80px;}.wall-item-outside-wrapper.comment .wall-item-photo{width:40px!important;height:40px!important;}
+.wall-item-outside-wrapper.comment .wall-item-photo-wrapper{width:40px;height:40px;}
+.wall-item-outside-wrapper.comment .wall-item-photo-menu-button{width:50px;top:45px;background-position:35px center;}
+.wall-item-outside-wrapper.comment .wall-item-info{width:60px;}
+.wall-item-outside-wrapper.comment .wall-item-body{margin-left:10px;}
+.wall-item-outside-wrapper.comment .wall-item-author{margin-left:50px;}
+.wall-item-outside-wrapper.comment .wall-item-photo-menu{min-width:50px;top:60px;}
+.comment-wwedit-wrapper{}
+.comment-edit-wrapper{border-top:1px #aaa solid;}
+[class^="comment-edit-bb"]{list-style:none;display:none;margin:-40px 0 5px 60px;width:75%;}[class^="comment-edit-bb"]>li{display:inline-block;margin:0 10px 0 0;visibility:none;}
+.comment-wwedit-wrapper img,.comment-edit-wrapper img{width:20px;height:20px;}
+.comment-edit-photo-link,.comment-edit-photo{margin-left:10px;}
+.my-comment-photo{width:40px;height:40px;padding:5px;}
+[class^="comment-edit-text"]{margin:5px 0 10px 20px;width:84.5%;}
+.comment-edit-text-empty{height:20px;border:2px #babdd6 solid;border-radius:5px;color:#babdb6;-webkit-transition:all 0.5s ease-in-out;-moz-transition:all 0.5s ease-in-out;-o-transition:all 0.5s ease-in-out;-ms-transition:all 0.5s ease-in-out;transition:all 0.5s ease-in-out;}.comment-edit-text-empty:hover{color:#999999;}
+.comment-edit-text-full{height:10em;border-radius:5px;-webkit-transition:all 0.5s ease-in-out;-moz-transition:all 0.5s ease-in-out;-o-transition:all 0.5s ease-in-out;-ms-transition:all 0.5s ease-in-out;transition:all 0.5s ease-in-out;}
+.comment-edit-submit-wrapper{width:90%;margin:5px 5px 10px 50px;text-align:right;}
+.comment-edit-submit{height:22px;background-color:#555753;color:#eeeeec;-webkit-border-radius:5px;-moz-border-radius:5px;border-radius:5px;border:0;}
+.wall-item-body code{display:block;padding:0 0 10px 5px;border-color:#ccc;border-style:solid;border-width:1px 1px 1px 10px;background:#eee;color:#444;width:95%;}
+div[id$="text"]{font-weight:bold;border-bottom:1px solid #ccc;}
+div[id$="wrapper"]{height:100%;margin-bottom:1em;}div[id$="wrapper"] br{clear:left;}
+[id$="-end"],[class$="end"]{clear:both;margin:0 0 10px 0;}
+#advanced-profile-with{margin-left:200px;}
+.photos{height:auto;overflow:auto;}
+#photo-top-links{margin-bottom:30px;}
+.photo-album-image-wrapper,.photo-top-image-wrapper{float:left;-moz-box-shadow:3px 3px 10px 0 #000;-webkit-box-shadow:3px 3px 10px 0 #000;box-shadow:3px 3px 10px 0 #000;background-color:#eee;color:#111;-webkit-border-radius:5px;-moz-border-radius:5px;border-radius:5px;padding-bottom:30px;position:relative;margin:0 10px 10px 0;}
+#photo-photo{max-width:100%;}#photo-photo img{max-width:100%;}
+.photo-top-image-wrapper a:hover,#photo-photo a:hover,.photo-album-image-wrapper a:hover{border-bottom:0;}
+.photo-top-photo,.photo-album-photo{-webkit-border-radius:5px 5px 0 0;-moz-border-radius:5px 5px 0 0;border-radius:5px 5px 0 0;}
+.photo-top-album-name{position:absolute;bottom:0;padding:0 5px;}
+.caption{position:absolute;bottom:0;margin:0 5px;}
+#photo-photo{position:relative;float:left;}
+#photo-prev-link,#photo-next-link{position:absolute;width:30%;height:100%;background-color:rgba(255, 255, 255, 0.5);opacity:0;-webkit-transition:all 0.2s ease-in-out;-moz-transition:all 0.2s ease-in-out;-o-transition:all 0.2s ease-in-out;-ms-transition:all 0.2s ease-in-out;transition:all 0.2s ease-in-out;background-position:center center;background-repeat:no-repeat;}
+#photo-prev-link{left:0;top:0;background-image:url(prev.png);}
+#photo-next-link{right:0;top:0;background-image:url(next.png);}
+#photo-prev-link a,#photo-next-link a{display:block;width:100%;height:100%;overflow:hidden;text-indent:-900000px;}
+#photo-prev-link:hover{opacity:1;-webkit-transition:all 0.2s ease-in-out;-moz-transition:all 0.2s ease-in-out;-o-transition:all 0.2s ease-in-out;-ms-transition:all 0.2s ease-in-out;transition:all 0.2s ease-in-out;}
+#photo-next-link:hover{opacity:1;-webkit-transition:all 0.2s ease-in-out;-moz-transition:all 0.2s ease-in-out;-o-transition:all 0.2s ease-in-out;-ms-transition:all 0.2s ease-in-out;transition:all 0.2s ease-in-out;}
+#photo-next-link .icon{display:none;}
+#photo-prev-link .icon{display:none;}
+#photos-upload-spacer,#photos-upload-new-wrapper,#photos-upload-exist-wrapper{margin-bottom:1em;}
+#photos-upload-existing-album-text,#photos-upload-newalbum-div{background-color:#555753;color:#eeeeec;padding:1px;}
+#photos-upload-album-select,#photos-upload-newalbum{width:99%;}
+#photos-upload-perms-menu{text-align:right;}
+#photo-edit-caption,#photo-edit-newtag,#photo-edit-albumname{float:left;margin-bottom:25px;}
+#photo-edit-link-wrap{margin-bottom:15px;}
+#photo-edit-caption,#photo-edit-newtag{width:100%;}
+#photo-like-div{margin-bottom:25px;}
+#photo-edit-caption-end,#photo-edit-tags-end,#photo-edit-albumname-end{clear:both;}
+#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;}
+.prvmail-text{width:100%;}
+#prvmail-subject{width:100%;color:#eec;background:#444;}
+#prvmail-submit-wrapper{margin-top:10px;}
+#prvmail-submit{float:right;margin-top:0;}
+#prvmail-submit-wrapper div{margin-right:5px;float:left;}
+.mail-list-outside-wrapper{margin-top:20px;}
+.mail-list-sender{float:left;}
+.mail-list-detail{margin-left:90px;}
+.mail-list-sender-name{display:inline;font-size:1.1em;}
+.mail-list-date{display:inline;font-size:0.9em;padding-left:10px;}
+.mail-list-sender-name,.mail-list-date{font-style:italic;}
+.mail-list-subject{font-size:1.2em;}
+.mail-list-delete-wrapper{float:right;}
+.mail-list-outside-wrapper-end{clear:both;border-bottom:1px #eec dotted;}
+.mail-conv-sender{float:left;margin:0px 5px 5px 0px;}
+.mail-conv-sender-photo{width:32px;height:32px;}
+.mail-conv-sender-name{float:left;}
+.mail-conv-date{float:right;}
+.mail-conv-subject{clear:right;font-weight:bold;font-size:1.2em;}
+.mail-conv-body{clear:both;}
+.mail-conv-delete-wrapper{margin-top:5px;}
+.view-contact-wrapper,.contact-entry-wrapper{float:left;margin:0 5px 40px 0;width:120px;height:120px;padding:3px;position:relative;}
+.contact-direction-wrapper{position:absolute;top:20px;}
+.contact-edit-links{position:absolute;top:60px;}
+.contact-entry-photo{margin-left:20px;}
+.contact-entry-name{width:120px;font-weight:bold;}
+.contact-entry-photo{position:relative;}
+.contact-entry-edit-links .icon{border:1px solid #babdb6;-webkit-border-radius:3px;-moz-border-radius:3px;border-radius:3px;background-color:#fff;}
+#contact-entry-url,[id^="contact-entry-url"]{font-size:smaller;}
+#contact-entry-network,[id^="contact-entry-network"]{font-size:smaller;font-style:italic;}
+#contact-edit-banner-name{font-size:1.5em;}
+#contact-edit-photo-wrapper{position:relative;float:left;padding:20px;}
+#contact-edit-direction-icon{position:absolute;top:60px;left:0;}
+#contact-edit-nav-wrapper{margin-left:0px;}
+#contact-edit-links{margin-top:23px;}#contact-edit-links ul{list-style-type:none;}
+#contact-drop-links{margin-left:5px;}
+#contact-edit-nav-wrapper .icon{border:1px solid #babdb6;-webkit-border-radius:3px;-moz-border-radius:3px;border-radius:3px;}
+#contact-edit-poll-wrapper{margin-left:0px;}
+#contact-edit-last-update-text{margin-bottom:15px;}
+#contact-edit-last-updated{font-weight:bold;}
+#contact-edit-poll-text{display:inline;}
+#contact-edit-info_tbl,#contact-edit-info_parent,.mceLayout{width:100%;}
+#contact-edit-end{clear:both;margin-bottom:65px;}
+.contact-photo-menu-button{position:absolute;background-image:url("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 #444;background:#eee;color:#111;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:#fff;background:#3465A4;text-decoration:none;}
+#id_openid_url{background:url(login-bg.gif) no-repeat;background-position:0 50%;padding-left:18px;}
+#settings-nickname-desc{background-color:#eee;-webkit-border-radius:5px;-moz-border-radius:5px;border-radius:5px;padding:5px;color:#111;}
+#settings-default-perms{margin-bottom:20px;}
+#register-form div,#profile-edit-form div{clear:both;}
+.settings-block label{clear:left;}
+.settings-block input{margin:10px 5px;}
+#profile-edit-marital-label span{margin:-4px;}
+.settings-submit-wrapper,.profile-edit-submit-wrapper{margin:0 0 30px -3px;}
+.profile-edit-side-div{display:none;}
+#profiles-menu-trigger{margin:0px 0px 0px 25px;}
+.profile-listing{float:left;margin:20px 20px 0px 0px;}
+.icon-profile-edit{background:url("icons.png") -150px 0px no-repeat;border:0;cursor:pointer;display:block;float:right;width:20px;height:20px;margin:0 0 -18px;position:absolute;text-decoration:none;top:113px;right:260px;}
+#profile-edit-links ul{margin:20px 0;padding:0;list-style:none;}
+.marital{margin-top:5px;}
+#register-sitename{display:inline;font-weight:bold;}
+#advanced-expire-popup{background:#2e2f2e;color:#eec;}
+#id_ssl_policy{width:374px;}
+#theme-preview img{margin:10px 10px 10px 288px;}
+.group-delete-wrapper{margin:-31px 50px 0 0;float:right;}
+#group-edit-submit-wrapper{margin:0 0 10px 0;display:inline;}
+#group-edit-desc{margin:10px 0px;}
+#group-members,#prof-members{height:200px;overflow:auto;border:1px solid #555753;-webkit-border-radius:5px 5px 0 0;-moz-border-radius:5px 5px 0 0;border-radius:5px 5px 0 0;}
+#group-all-contacts,#prof-all-contacts{height:200px;overflow:auto;border:1px solid #555753;-webkit-border-radius:0 0 5px 5px;-moz-border-radius:0 0 5px 5px;border-radius:0 0 5px 5px;}
+#group-members h3,#group-all-contacts h3,#prof-members h3,#prof-all-contacts h3{color:#eeeeec;background-color:#555753;margin:0;padding:5px;}
+#group-separator,#prof-separator{display:none;}
+#cropimage-wrapper{float:left;}
+#crop-image-form{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,.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,.intro-approve-as-friend,.intro-approve-as-fan{float:left;}
+.intro-form-end{clear:both;margin-bottom:10px;}
+.intro-approve-as-friend-desc{margin-top:10px;}
+.intro-approve-as-end{clear:both;margin-bottom:10px;}
+.intro-end,.clear{clear:both;}
+.eventcal{float:left;font-size:20px;}
+.event{background:#2e2f2e;}
+.vevent{border:1px solid #ccc;}.vevent .event-description,.vevent .event-location,.vevent .event-start{margin-left:10px;margin-right:10px;}
+#new-event-link{margin-bottom:10px;}
+.edit-event-link,.plink-event-link{}
+.event-description:before{content:url('../../../images/calendar.png');margin-right:15px;}
+.event-start,.event-end{margin-left:10px;width:330px;font-size:smaller;}
+.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:monospace;}
+.today{font-weight:bold;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,#event-share-checkbox{float:left;}
+#event-datetime-break{margin-bottom:10px;}
+#event-nofinish-break,#event-adjust-break,#event-share-break{clear:both;}
+#event-desc-text,#event-location-text{margin-top:10px;margin-bottom:5px;}
+#event-submit{margin-top:10px;}
+.body-tag{margin:10px 0;opacity:0.5;}.body-tag:hover{opacity:1.0 !important;}
+.filesavetags,.categorytags{margin:20px 0;opacity:0.5;}
+.filesavetags:hover,.categorytags:hover{margin:20px 0;opacity:1.0 !important;}
+.item-select{opacity:0.1;margin:5px 0 0 6px !important;}.item-select:hover{opacity:1;}
+.checkeditem{opacity:1;}
+#item-delete-selected{margin-top:30px;}
+.delete-checked{position:absolute;left:35px;margin-top:20px;}
+#item-delete-selected-end{clear:both;}
+#item-delete-selected-icon{float:left;margin-right:5px;}
+#item-delete-selected-desc{float:left;margin-right:5px;}#item-delete-selected-desc:hover{text-decoration:underline;}
+.fc-state-highlight{background:#eec;color:#2e2f2e;}
+.directory-item{float:left;margin:0 5px 4px 0;padding:3px;width:180px;height:250px;position:relative;}
+#group-sidebar{margin-bottom:10px;}
+.group-selected,.nets-selected,.fileas-selected{padding:3px;color:#111;background:#f8f8f8;font-weight:bold;}
+.group-selected:hover,.nets-selected:hover,.fileas-selected:hover{color:#111;}
+.groupsideedit{margin-right:10px;}
+#sidebar-group-ul{padding-left:0;}
+#sidebar-group-list{margin:0 0 5px 0;}#sidebar-group-list ul{list-style-type:none;list-style-position:inside;}
+#sidebar-group-list li{margin-top:10px;}
+#sidebar-group-list .icon{display:inline-block;height:12px;width:12px;}
+#sidebar-new-group{margin:auto;display:inline-block;color:#efefef;text-decoration:none;text-align:center;}
+#peoplefind-sidebar form{margin-bottom:10px;}
+#sidebar-new-group:hover{}
+#sidebar-new-group:active{position:relative;top:1px;}
+#side-peoplefind-url{background-color:#e5e0cf;color:#666;border:1px 666 solid;margin-right:3px;width:75%;}#side-peoplefind-url:hover,#side-peoplefind-url:focus{background-color:#efefef;color:#222;border:1px 333 solid;}
+.nets-ul{list-style-type:none;padding-left:0px;}.nets-ul li{margin:10px 0 0;}
+.nets-link,.nets-all{margin-left:0px;}
+#netsearch-box{margin-top:20px;width:150px;}#netsearch-box #search-submit{margin:5px 0px 0px 0px;}
+#pending-update{float:right;color:#fff;font-weight:bold;background-color:#ff0000;padding:0 .3em;}
+.admin.linklist{border:0;padding:0;}
+.admin.link{list-style-position:inside;}
+#adminpage{color:#111;background:transparent;margin:5px;padding:10px;}#adminpage dl{clear:left;margin-bottom:2px;padding-bottom:2px;border-bottom:1px solid #000;}
+#adminpage dt{width:250px;float:left;font-weight:bold;}
+#adminpage dd{margin-left:250px;}
+#adminpage h3{border-bottom:1px solid #ccc;}
+#adminpage .submit{clear:left;}
+#adminpage #pluginslist{margin:0;padding:0;}
+#adminpage .plugin{list-style:none;display:block;border:1px solid #888;padding:1em;margin-bottom:5px;clear:left;}
+#adminpage .toggleplugin{float:left;margin-right:1em;}
+#adminpage table{width:100%;border-bottom:1px solid #000;margin:5px 0;}#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;}
+#adminpage #users a{text-decoration:underline;}
+#users .name{color:#eec;}
+.field{overflow:auto;}.field label{width:38%;display:inline-block;font-size:1.077em;margin:0 10px 1em 0;border:1px #999 solid;padding:5px;background:#ccc;color:#111;}
+.field .onoff{float:right;margin:0 330px 0 auto;width:80px;}.field .onoff a{display:block;border:1px solid #666;padding:3px 6px 4px 10px;height:16px;text-decoration:none;}
+.field .onoff .on{background:url("../../../images/onoff.jpg") no-repeat 42px 1px #999999;color:#111;text-align:left;}
+.field .onoff .off{background:url("../../../images/onoff.jpg") no-repeat 2px 1px #cccccc;color:#333;text-align:right;}
+.hidden{display:none !important;}
+.field textarea{width:80%;height:100px;}
+.field_help{display:block;margin-left:297px;color:#666;}
+.field.radio .field_help{margin-left:297px;}
+label{width:38%;display:inline-block;font-size:1.077em;margin:0 10px 1em 0;border:1px #999 solid;padding:5px;background:#ccc;color:#111;}
+input{width:250px;height:25px;border:1px #999 solid;}input[type="text"],input[type="password"],input[type="search"]{width:250px;height:25px;border:1px #999 solid;}
+input[type="checkbox"],input[type="radio"]{border:1px #999 solid;margin:0 0 0 0;height:15px;width:15px;}
+input[type="submit"],input[type="button"]{background-color:#555753;border:2px outset #444;border-radius:5px;box-shadow:1px 3px 4px 0 #111;color:#eeeeec;cursor:pointer;font-weight:bold;width:auto;text-shadow:1px 1px #111;-webkit-border-radius:5px;-moz-border-radius:5px;}
+input[type="submit"]:active,input[type="button"]:active{box-shadow:0 0 0 0;}
+.popup{width:100%;height:100%;top:0px;left:0px;position:absolute;display:none;}.popup .background{background-color:#000;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;}
+#panel{z-index:100;}
+.grey{color:grey;}
+.orange{color:orange;}
+.red{color:red;}
+.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;}
+.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;}
+.iconspacer{display:block;width:16px;height:16px;}
+.icon{display:block;width:20px;height:20px;background:url(icons.png) no-repeat;border:0;text-decoration:none;border-radius:5px;}.icon:hover{border:0;text-decoration:none;}
+.editicon{display:inline-block;width:21px;height:21px;background:url(editicons.png) no-repeat;border:0;text-decoration:none;}
+.shadow{box-shadow:2px 2px 5px 2px #111;}.shadow:active,.shadow:focus,.shadow:hover{box-shadow:0 0 0 0;}
+.editicon:hover{border:0;}
+.boldbb{background-position:0px 0px;}.boldbb:hover{background-position:-22px 0px;}
+.italicbb{background-position:0px -22px;}.italicbb:hover{background-position:-22px -22px;}
+.underlinebb{background-position:0px -44px;}.underlinebb:hover{background-position:-22px -44px;}
+.quotebb{background-position:0px -66px;}.quotebb:hover{background-position:-22px -66px;}
+.codebb{background-position:0px -88px;}.codebb:hover{background-position:-22px -88px;}
+.imagebb{background-position:-44px 0px;}.imagebb:hover{background-position:-66px 0px;}
+.urlbb{background-position:-44px -22px;}.urlbb:hover{background-position:-66px -22px;}
+.videobb{background-position:-44px -44px;}.videobb:hover{background-position:-66px -44px;}
+.icon.drop,.icon.drophide,.icon.delete{float:left;margin:0 2px;}
+.icon.s22.delete{display:block;background-position:-110px 0;}
+.icon.s22.text{padding:10px 0px 0px 25px;width:200px;}
+.icon.text{text-indent:0px;}
+.icon.s16{min-width:16px;height:16px;}
+.s16 .add{background:url("../../../images/icons/16/add.png") no-repeat;}
+.add{margin:0px 5px;}
+.article{background-position:-50px 0;}
+.audio{background-position:-70px 0;}
+.block{background-position:-90px 0px;}
+.drop,.delete{background-position:-110px 0;}
+.drophide{background-position:-130px 0;}
+.edit{background-position:-150px 0;}
+.camera{background-position:-170px 0;}
+.dislike{background-position:-190px 0;}
+.file-as{background-position:-230px -60px;}
+.like{background-position:-211px 0;}
+.link{background-position:-230px 0;}
+.globe,.location{background-position:-50px -20px;}
+.noglobe,.nolocation{background-position:-70px -20px;}
+.no{background-position:-90px -20px;}
+.pause{background-position:-110px -20px;}
+.play{background-position:-130px -20px;}
+.pencil{background-position:-151px -18px;}
+.small-pencil{background-position:-170px -20px;}
+.recycle{background-position:-190px -20px;}
+.remote-link{background-position:-210px -20px;}
+.share{background-position:-230px -20px;}
+.tools{background-position:-50px -40px;}
+.lock{background-position:-70px -40px;}
+.unlock{background-position:-88px -40px;}
+.video{background-position:-110px -40px;}
+.attach{background-position:-190px -40px;}
+.language{background-position:-210px -40px;}
+.starred{background-position:-130px -60px;}
+.unstarred{background-position:-150px -60px;}
+.tagged{background-position:-170px -60px;}
+.on{background-position:-50px -60px;}
+.off{background-position:-70px -60px;}
+.prev{background-position:-90px -60px;}
+.next{background-position:-110px -60px;}
+.icon.dim{opacity:0.3;}
+#pause{position:fixed;bottom:40px;right:30px;}
+.border{border:1px solid #babdb6;-webkit-border-radius:5px;-moz-border-radius:5px;border-radius:5px;}.border:hover{border:1px solid #babdb6;-webkit-border-radius:5px;-moz-border-radius:5px;border-radius:5px;}
+.attachtype{display:block;width:20px;height:23px;background-image:url(../../../images/content-types.png);}
+.type-video{background-position:0px 0px;}
+.type-image{background-position:-20px 0;}
+.type-audio{background-position:-40px 0;}
+.type-text{background-position:-60px 0px;}
+.type-unkn{background-position:-80px 0;}
+.cc-license{margin-top:100px;font-size:0.7em;}
+footer{display:block;clear:both;}
+#profile-jot-text{height:20px;color:#666;border:1px solid #ccc;border-radius:5px;width:99.5%;}
+#photo-edit-perms-select,#photos-upload-permissions-wrapper,#profile-jot-acl-wrapper{display:block !important;background:#eec;color:#2e2f2e;}
+#acl-wrapper{width:660px;margin:0 auto;}
+#acl-search{float:right;background:#ffffff url("../../../images/search_18.png") no-repeat right center;padding-right:20px;margin:6px;color:#111;}
+#acl-showall{float:left;display:block;width:auto;height:18px;background:#eeeecc url("../../../images/show_all_off.png") 8px 8px no-repeat;padding:7px 10px 7px 30px;-webkit-border-radius:5px;-moz-border-radius:5px;border-radius:5px;color:#999;margin:5px 0;}#acl-showall.selected{color:#000;background:#ff9900 url(../../../images/show_all_on.png) 8px 8px no-repeat;}
+#acl-list{height:210px;border:1px solid #ccc;clear:both;margin-top:30px;overflow:auto;}
+.acl-list-item{border:1px solid #ccc;display:block;float:left;height:110px;margin:3px 0 5px 5px;width:120px;}.acl-list-item img{width:22px;height:22px;float:left;margin:5px 5px 20px;}
+.acl-list-item p{height:12px;font-size:10px;margin:0 0 22px;padding:2px 0 1px;}
+.acl-list-item a{background:#cccccc 3px 3px no-repeat;-webkit-border-radius:2px;-moz-border-radius:2px;border-radius:2px;clear:both;font-size:10px;display:block;width:55px;height:20px;color:#999;margin:5px auto 0;padding:0 3px;text-align:center;vertical-align:middle;}
+#acl-wrapper a:hover{text-decoration:none;color:#000;border:0;}
+.acl-button-show{background-image:url('../../../images/show_off.png');margin:0 auto;}
+.acl-button-hide{background-image:url('../../../images/hide_off.png');margin:0 auto;}
+.acl-button-show.selected{color:#000;background-color:#9ade00;background-image:url(../../../images/show_on.png);}
+.acl-button-hide.selected{color:#000;background-color:#ff4141;background-image:url(../../../images/hide_on.png);}
+.acl-list-item.groupshow{border-color:#9ade00;}
+.acl-list-item.grouphide{border-color:#ff4141;}
+.acpopup{max-height:175px;max-width:42%;background-color:#555753;color:#fff;overflow:auto;z-index:100000;border:1px solid #cccccc;}
+.acpopupitem{background-color:#555753;padding:4px;clear:left;}.acpopupitem img{float:left;margin-right:4px;}
+.acpopupitem.selected{color:#2e3436;background-color:#eeeeec;}
+.qcomment-wrapper{padding:0px;margin:5px 5px 5px 81%;}
+.qcomment{opacity:0.5;}.qcomment:hover{opacity:1.0;}
+#network-star-link{margin-top:10px;}
+.network-star{float:left;margin-right:5px;}.network-star.icon.starred{display:inline-block;}
+.fileas-ul{padding:0;}
+#sidebar-page-list ul{padding:0;margin:5px 0;}
+#sidebar-page-list li{list-style:none;}
+#jappix_mini{margin-left:130px;position:fixed;bottom:0;right:175px !important;z-index:999;}
+@media handheld{body{font-size:15pt;}}
diff --git a/view/theme/dispy/style.less b/view/theme/dispy/style.less
new file mode 100644
index 000000000..34830cf32
--- /dev/null
+++ b/view/theme/dispy/style.less
@@ -0,0 +1,2879 @@
+/*
+ * dispy
+ *
+ * maintainer: simon <http://simon.kisikew.org/>
+ * author: unknown
+ *
+ * Author's notes:
+ * A few things of note here. The less file is our working copy,
+ * and the CSS is *generated* from it. The CSS is the one that's
+ * included in the HTML, and not the less one. This is to save
+ * bandwidth and processing time.
+ */
+/* from html5boilerplate */
+/* these are to tell browsers they should be displayed a certain way */
+
+article, aside, details, figcaption, figure, footer, header, hgroup, nav, section {
+  display: block; }
+
+audio, canvas, video, time {
+  display: inline-block;
+  *display: inline;
+  *zoom: 1; }
+
+audio:not([controls]), [hidden] {
+  display: none; }
+
+/* 
+ *  Base
+ */
+/*
+ * 1. Correct text resizing oddly in IE6/7 when body font-size is set using em units
+ * 2. Force vertical scrollbar in non-IE
+ * 3. Prevent iOS text size adjust on device orientation change, without disabling user zoom: h5bp.com/g
+ */
+
+html {
+  font-size: 100%;
+  overflow-y: scroll;
+  -webkit-text-size-adjust: 100%;
+  -ms-text-size-adjust: 100%; }
+
+body {
+  margin: 0;
+  font-size: 16px;
+  line-height: 1.1em;
+  font-family: sans-serif;
+  color: #222;
+  background-color: #e8e8e8; }
+
+button, input, select, textarea {
+  font-family: sans-serif;
+  color: #222;
+  background-color: #e8e8e8; }
+
+select {
+  border: 1px #555 dotted;
+  padding: 3px;
+  margin: 3px;
+  color: #222;
+  background: #e8e8e8; }
+
+option {
+  padding: 3px;
+  color: #222;
+  background: #e8e8e8;
+  &[selected="selected"] {
+    color: #111;
+    background: #cca; } }
+
+ul, ol {
+  padding: 0; }
+
+/* remember to define focus styles! */
+
+:focus {
+  outline: 0; }
+
+[disabled="disabled"] {
+  background: #ddd;
+  color: #333; }
+
+/* remember to highlight inserts somehow! */
+
+ins {
+  background-color: #ff9;
+  color: #000;
+  text-decoration: none; }
+
+mark {
+  background-color: #ff9;
+  color: #000;
+  font-style: italic;
+  font-weight: bold; }
+
+/* Redeclare monospace font family: h5bp.com/j */
+
+pre, code, kbd, samp, .wall-item-body code {
+  font-family: monospace, monospace;
+  _font-family: monospace;
+  font-size: 1em; }
+
+/* Improve readability of pre-formatted text in all browsers */
+
+pre, .wall-item-body code {
+  white-space: pre;
+  white-space: pre-wrap;
+  word-wrap: break-word; }
+
+q {
+  quotes: none;
+  &:before, &:after {
+    content: "";
+    content: none; } }
+
+small {
+  font-size: 85%; }
+
+/* Position subscript and superscript content without affecting line-height: h5bp.com/k */
+
+sub, sup {
+  font-size: 75%;
+  line-height: 0;
+  position: relative;
+  vertical-align: baseline; }
+
+sub {
+  bottom: -0.25em; }
+
+sup {
+  top: -0.5em; }
+
+img {
+  border: 0 none; }
+
+a {
+  color: #3465a4;
+  text-decoration: none;
+  margin-bottom: 1px;
+  &:hover img {
+    text-decoration: none; } }
+
+blockquote {
+  background: #eee;
+  color: #111;
+  text-indent: 5px;
+  padding: 5px;
+  border: 1px #aaa solid;
+  border-radius: 5px; }
+
+a:hover {
+  color: #729fcf;
+  border-bottom: 1px dotted #729fcf; }
+
+.required {
+  display: inline;
+  color: #f00;
+  font-size: 16px;
+  font-weight: bold;
+  margin: 3px; }
+
+.fakelink, .lockview {
+  color: #3465a4;
+  cursor: pointer; }
+
+.fakelink:hover {
+  color: #729fcf; }
+
+.smalltext {
+  font-size: 0.7em; }
+
+#panel {
+  position: absolute;
+  font-size: 0.8em;
+  -webkit-border-radius: 5px;
+  -moz-border-radius: 5px;
+  border-radius: 5px;
+  border: 1px solid #fff;
+  background-color: #2e3436;
+  color: #eeeeec;
+  padding: 1em; }
+
+.pager {
+  margin-top: 60px;
+  display: block;
+  clear: both;
+  text-align: center;
+  span {
+    padding: 4px;
+    margin: 4px; } }
+
+.pager_current {
+  background-color: #729fcf;
+  color: #fff; }
+
+/**
+ * global
+ */
+/* .tool .action */
+
+.action {
+  margin: 5px 0; }
+
+.tool {
+  margin: 5px 0;
+  list-style: none; }
+
+#articlemain {
+  width: 100%;
+  height: 100%;
+  margin: 0 auto; }
+
+/**
+ * login
+ */
+
+#asidemain .field {
+  overflow: hidden;
+  width: 200px; }
+
+#login-extra-links {
+  overflow: auto !important;
+  padding-top: 60px !important;
+  width: 100% !important;
+  a {
+    margin-right: 20px; } }
+
+#login_standard {
+  display: block !important;
+  float: none !important;
+  height: 100% !important;
+  position: relative !important;
+  width: 100% !important;
+  .field label {
+    width: 200px !important; }
+  input {
+    margin: 0 0 8px !important;
+    width: 210px !important;
+    &[type="text"] {
+      margin: 0 0 8px !important;
+      width: 210px !important; } } }
+
+#login-submit-wrapper {
+  margin: 0 !important; }
+
+#login-submit-button {
+  margin-left: 0px !important; }
+
+#asidemain #login_openid {
+  position: relative !important;
+  float: none !important;
+  margin-left: 0px !important;
+  height: auto !important;
+  width: 200px !important; }
+
+#login_openid {
+  #id_openid_url {
+    width: 180px !important;
+    overflow: hidden !important; }
+  label {
+    width: 180px !important; } }
+
+/**
+ * nav
+ */
+
+nav {
+  height: 60px;
+  background-color: #2e3436;
+  color: #eeeeec;
+  position: relative;
+  padding: 20px 20px 10px 95px;
+  a {
+    text-decoration: none;
+    color: #eeeeec;
+    border: 0px;
+    &:hover {
+      text-decoration: none;
+      color: #eeeeec;
+      border: 0px; } }
+  #banner {
+    display: block;
+    position: absolute;
+    left: 51px;
+    top: 25px;
+    #logo-text a {
+      font-size: 40px;
+      font-weight: bold;
+      margin-left: 3px; } } }
+
+ul#user-menu-popup {
+  display: none;
+  position: absolute;
+  background-color: #555753;
+  width: 100%;
+  padding: 10px 0px;
+  margin: 0px;
+  top: 20px;
+  left: 0;
+  -webkit-border-radius: 0 0 5px 5px;
+  -moz-border-radius: 0 0 5px 5px;
+  border-radius: 0 0 5px 5px;
+  box-shadow: 5px 10px 10px 0 #111;
+  z-index: 10000;
+  li {
+    display: block;
+    a {
+      display: block;
+      padding: 5px;
+      &:hover {
+        color: #2e3436;
+        background-color: #eeeeec; }
+      &.nav-sep {
+        border-top: 1px solid #eeeeec; } } } }
+
+nav .nav-link {
+  display: inline-block;
+  width: 22px;
+  height: 22px;
+  overflow: hidden;
+  margin: 0px 5px 5px;
+  text-indent: 50px;
+  background: transparent url(icons.png) 0 0 no-repeat; }
+
+#nav-apps-link {
+  background-position: 0 -66px;
+  &:hover {
+    background-position: -22px -66px; } }
+
+#nav-community-link, #nav-contacts-link {
+  background-position: 0 -22px;
+  &:hover {
+    background-position: -22px -22px; } }
+
+#nav-directory-link {
+  background-position: -44px -154px;
+  &:hover {
+    background-position: -66px -154px; } }
+
+#nav-help-link {
+  background-position: 0 -110px;
+  &:hover {
+    background-position: -22px -110px; } }
+
+#nav-home-link {
+  background-position: -44px -132px;
+  &:hover {
+    background-position: -66px -132px; } }
+
+#nav-intro-link {
+  background-position: 0px -190px;
+  &:hover {
+    background-position: -44px -190px; } }
+
+#nav-login-link, #nav-logout-link {
+  background-position: 0 -88px;
+  &:hover {
+    background-position: -22px -88px; } }
+
+#nav-messages-link {
+  background-position: -44px -88px;
+  &:hover {
+    background-position: -66px -88px; } }
+
+#nav-notify-link, #nav-notifications-linkmenu {
+  background-position: -44px -110px; }
+
+#nav-notify-link:hover {
+  background-position: -66px -110px; }
+
+#nav-network-link {
+  background-position: 0px -177px;
+  &:hover {
+    background-position: -22px -177px; } }
+
+#nav-search-link {
+  background-position: 0 -44px;
+  &:hover {
+    background-position: -22px -44px; } }
+
+#profile-link, #profile-title, #wall-image-upload, #wall-file-upload, #profile-attach-wrapper, #profile-audio, #profile-link, #profile-location, #profile-nolocation, #profile-title, #jot-title, #profile-upload-wrapper, #profile-video, #profile-jot-submit, #wall-image-upload-div, #wall-file-upload-div, .icon, .hover, .focus, .pointer {
+  cursor: pointer; }
+
+/* popup notifications */
+
+div.jGrowl div {
+  &.notice {
+    background: #511919 url("../../../images/icons/48/notice.png") no-repeat 5px center;
+    color: #ffffff;
+    padding-left: 58px; }
+  &.info {
+    background: #364e59 url("../../../images/icons/48/info.png") no-repeat 5px center;
+    color: #ffffff;
+    padding-left: 58px; } }
+
+#nav-notifications-menu {
+  margin: 30px 0 0 -20px;
+  width: 275px;
+  max-height: 300px;
+  overflow-y: auto;
+  font-size: 9pt;
+  .contactname {
+    font-weight: bold;
+    font-size: 0.9em; }
+  img {
+    float: left;
+    margin-right: 5px; }
+  .notif-when {
+    font-size: 0.8em;
+    display: block; }
+  li {
+    word-wrap: normal;
+    border-bottom: 1px solid #000;
+    &:hover {
+      color: black; } }
+  a:hover {
+    color: black;
+    text-decoration: underline; } }
+
+nav #nav-notifications-linkmenu {
+  &.on .icon.s22.notify, &.selected .icon.s22.notify {
+    background-image: url("../../../images/icons/22/notify_on.png"); } }
+
+.show {
+  display: block; }
+
+#notifications {
+  height: 20px;
+  width: 170px;
+  position: absolute;
+  top: -19px;
+  left: 4px; }
+
+#nav-floater {
+  position: fixed;
+  top: 20px;
+  right: 1%;
+  padding: 5px;
+  background: #2e3436;
+  color: transparent;
+  border-radius: 5px;
+  z-index: 100;
+  width: 300px;
+  height: 60px; }
+
+#nav-buttons {
+  clear: both;
+  list-style: none;
+  padding: 0px;
+  margin: 0px;
+  height: 25px;
+  > li {
+    padding: 0;
+    display: inline-block;
+    margin: 0px -4px 0px 0px; } }
+
+.floaterflip {
+  display: block;
+  position: fixed;
+  z-index: 110;
+  top: 56px;
+  right: 19px;
+  width: 22px;
+  height: 22px;
+  overflow: hidden;
+  margin: 0px;
+  background: transparent url(icons.png) -190px -60px no-repeat; }
+
+.search-box {
+  display: inline-block;
+  margin: 5px;
+  position: fixed;
+  right: 0px;
+  bottom: 0px;
+  z-index: 100;
+  background: #1d1f1d;
+  border-radius: 5px; }
+
+#search-text {
+  border: 1px #eec solid;
+  background: #2e3436;
+  color: #eec; }
+
+.search-box #search-text {
+  margin: 8px;
+  width: 10em;
+  height: 14px;
+  color: #eec; }
+
+#scrollup {
+  position: fixed;
+  right: 5px;
+  bottom: 40px;
+  z-index: 100;
+  a:hover {
+    text-decoration: none;
+    border: 0; } }
+
+#user-menu {
+  box-shadow: 5px 0 10px 0 #111;
+  display: block;
+  width: 75%;
+  margin: 3px 0 0 0;
+  position: relative;
+  background-color: #555753;
+  -webkit-border-radius: 5px;
+  -moz-border-radius: 5px;
+  border-radius: 5px;
+  background: #555753 url("menu-user-pin.jpg") 98% center no-repeat;
+  clear: both;
+  top: 4px;
+  left: 10px;
+  padding: 2px;
+  > a {
+    vertical-align: top; } }
+
+#user-menu-label {
+  font-size: 12px;
+  padding: 3px 20px 9px 5px;
+  height: 10px; }
+
+.nav-ajax-update, .nav-ajax-left {
+  width: 30px;
+  height: 19px;
+  background: transparent url(notifications.png) 0 0 no-repeat;
+  color: #222;
+  font-weight: bold;
+  font-size: 0.8em;
+  padding-top: 0.2em;
+  text-align: center;
+  float: left;
+  margin: 0 -1px 0 3px;
+  display: block;
+  visibility: hidden; }
+
+.nav-ajax-update.show, .nav-ajax-left.show {
+  visibility: visible; }
+
+#net-update {
+  background-position: 0px 0px; }
+
+#mail-update {
+  background-position: -30px 0; }
+
+#notify-update {
+  background-position: -60px 0px; }
+
+#home-update {
+  background-position: -90px 0px; }
+
+#intro-update {
+  background-position: -120px 0px; }
+
+#lang-select-icon {
+  cursor: pointer;
+  position: fixed;
+  left: 28px;
+  bottom: 6px;
+  z-index: 10; }
+
+#language-selector {
+  position: fixed;
+  bottom: 2px;
+  left: 52px;
+  z-index: 10; }
+
+.menu-popup {
+  position: absolute;
+  display: none;
+  width: 11em;
+  background: #ffffff;
+  color: #2d2d2d;
+  margin: 0px;
+  padding: 0px;
+  list-style: none;
+  border: 3px solid #364e59;
+  z-index: 100000;
+  -webkit-box-shadow: 3px 3px 10px 0 rgba(0, 0, 0, 0.7);
+  -moz-box-shadow: 3px 3px 10px 0 rgba(0, 0, 0, 0.7);
+  box-shadow: 3px 3px 10px 0 rgba(0, 0, 0, 0.7);
+  a {
+    display: block;
+    color: #2d2d2d;
+    padding: 5px 10px;
+    text-decoration: none;
+    &:hover {
+      background-color: #bdcdd4; } }
+  .menu-sep {
+    border-top: 1px solid #9eabb0; }
+  li {
+    float: none;
+    overflow: auto;
+    height: auto;
+    display: block;
+    img {
+      float: left;
+      width: 16px;
+      height: 16px;
+      padding-right: 5px; } }
+  .empty {
+    padding: 5px;
+    text-align: center;
+    color: #9eabb0; } }
+
+.notif-item {
+  font-size: small;
+  a {
+    vertical-align: middle; } }
+
+.notif-image {
+  width: 32px;
+  height: 32px;
+  padding: 7px 7px 0px 0px; }
+
+.notify-seen {
+  background: #ddd; }
+
+/**
+ * sysmsg
+ */
+
+#sysmsg_info {
+  position: fixed;
+  bottom: 0;
+  -moz-box-shadow: 3px 3px 3px 10px 0 #000;
+  -webkit-box-shadow: 3px 3px 10px 0 #000;
+  box-shadow: 3px 3px 10px 0 #000;
+  padding: 10px;
+  background-color: #fcaf3e;
+  border: 2px solid #f8911b;
+  border-bottom: 0;
+  padding-bottom: 50px;
+  z-index: 1000; }
+
+#sysmsg {
+  position: fixed;
+  bottom: 0;
+  -moz-box-shadow: 3px 3px 10px 0 #000;
+  -webkit-box-shadow: 3px 3px 10px 0 #000;
+  box-shadow: 3px 3px 10px 0 #000;
+  padding: 10px;
+  background-color: #fcaf3e;
+  border: 2px solid #f8911b;
+  border-bottom: 0;
+  padding-bottom: 50px;
+  z-index: 1000; }
+
+#sysmsg_info br, #sysmsg br {
+  display: block;
+  margin: 2px 0px;
+  border-top: 1px solid #ccccce; }
+
+/**
+ * aside
+ */
+
+#asidemain {
+  float: left;
+  font-size: smaller;
+  margin: 20px 0 20px 35px;
+  width: 25%;
+  display: inline; }
+
+/* for now, disappear these */
+
+#asideright, #asideleft {
+  display: none; }
+
+.vcard {
+  .fn {
+    font-size: 1.7em;
+    font-weight: bold;
+    border-bottom: 1px solid #729fcf;
+    padding-bottom: 3px; }
+  #profile-photo-wrapper {
+    margin: 20px;
+    img {
+      box-shadow: 3px 3px 10px 0 #000; } } }
+
+/* http://css-tricks.com/snippets/css/css-box-shadow/
+* box-shadow:
+* 1. The horizontal offset of the shadow, positive means
+* the shadow will be on the right of the box, a negative
+* offset will put the shadow on the left of the box.
+* 2. The vertical offset of the shadow, a negative one
+* means the box-shadow will be above the box, a
+* positive one means the shadow will be below the box.
+* 3. The blur radius (optional), if set to 0 the shadow
+* will be sharp, the higher the number, the more blurred
+* it will be.
+* 4. The spread radius (optional), positive values increase
+* the size of the shadow, negative values decrease the size.
+* Default is 0 (the shadow is same size as blur).
+* 5. Colo[u]r
+*/
+
+#asidemain {
+  h4 {
+    font-size: 1.2em; }
+  #viewcontacts {
+    text-align: right; } }
+
+.aprofile dt {
+  background: transparent;
+  color: #666666;
+  font-weight: bold;
+  box-shadow: 1px 1px 5px 0 #000;
+  margin: 15px 0 5px;
+  padding-left: 5px; }
+
+#profile-extra-links ul {
+  margin-left: 0px;
+  padding-left: 0px;
+  list-style: none; }
+
+#dfrn-request-link {
+  background: #3465a4 url(connect.png) no-repeat 95% center;
+  border-radius: 5px 5px 5px 5px;
+  color: #fff;
+  display: block;
+  font-size: 1.2em;
+  padding: 0.2em 0.5em; }
+
+#wallmessage-link {
+  /*background: #3465A4 url(connect.png) no-repeat 95% center;*/
+  /*border-radius: 5px 5px 5px 5px;*/
+  color: #eee;
+  display: block;
+  font-size: 1.2em;
+  padding: 0.2em 0.5em; }
+
+#netsearch-box {
+  margin: 20px 0px 30px;
+  width: 150px;
+  #search-submit {
+    margin: 5px 5px 0px 0px; } }
+
+.ttright {
+  margin: 0px 0px 0px 0px; }
+
+/**
+ * contacts block
+ */
+
+.contact-block-div {
+  width: 50px;
+  height: 50px;
+  float: left; }
+
+.contact-block-textdiv {
+  width: 150px;
+  height: 34px;
+  float: left; }
+
+#contact-block-end {
+  clear: both; }
+
+/**
+ * jot
+ */
+
+#jot {
+  /*width: 785px;*/
+  margin: 10px 0 20px 0px;
+  width: 100%;
+  #jot-tools {
+    margin: 0px;
+    padding: 0px;
+    height: 35px;
+    overflow: none;
+    width: 100%;
+    /*background-color: #0e232e;*/
+    /*border-bottom: 2px solid #9eabb0;*/
+    span {
+      float: left;
+      margin: 10px 20px 2px 0px;
+      a {
+        display: block; } }
+    .perms {
+      float: right;
+      width: 40px; }
+    li.loading {
+      float: right;
+      background-color: #ffffff;
+      width: 20px;
+      vertical-align: center;
+      text-align: center;
+      border-top: 2px solid #9eabb0;
+      height: 38px;
+      img {
+        margin-top: 10px; } } }
+  #jot-title {
+    border: 1px solid #ccc;
+    margin: 0 0 5px;
+    height: 20px;
+    width: 90%;
+    font-weight: bold;
+    border-radius: 5px;
+    vertical-align: middle; } }
+
+#jot-category {
+  margin: 5px 0;
+  border-radius: 5px;
+  border: 1px #ccc solid;
+  color: #666;
+  font-size: smaller;
+  &:focus {
+    color: #111; } }
+
+#jot #character-counter {
+  width: 6%;
+  float: right;
+  text-align: right;
+  height: 15px;
+  line-height: 20px;
+  padding: 2px 20px 5px 0; }
+
+#profile-jot-text_parent {
+  box-shadow: 5px 0 10px 0 #111; }
+
+#profile-jot-text_tbl {
+  margin-bottom: 10px;
+  background: #777; }
+
+#profile-jot-text_ifr {
+  width: 99.900002% !important; }
+
+#profile-jot-text_toolbargroup, .mceCenter tr {
+  background: #777; }
+
+[id$="jot-text_ifr"] {
+  width: 99.900002% !important;
+  color: #2e2f2e;
+  background: #eec;
+  .mceContentBody {
+    color: #2e2f2e;
+    background: #eec; } }
+
+.defaultSkin {
+  tr.mceFirst {
+    background: #777; }
+  td {
+    &.mceFirst, &.mceLast {
+      background-color: #eec; } }
+  span.mceIcon, img.mceIcon, .mceButtonDisabled .mceIcon {
+    background-color: #eec; } }
+
+#profile-attach-wrapper, #profile-audio-wrapper, #profile-link-wrapper, #profile-location-wrapper, #profile-nolocation-wrapper, #profile-title-wrapper, #profile-upload-wrapper, #profile-video-wrapper {
+  float: left;
+  margin: 0 20px 0 0; }
+
+#profile-rotator-wrapper {
+  float: right; }
+
+#profile-jot-tools-end, #profile-jot-banner-end {
+  clear: both; }
+
+#profile-jot-email-wrapper {
+  margin: 10px 10% 0;
+  border: 1px solid #555753;
+  border-bottom: 0; }
+
+#profile-jot-email-label {
+  background-color: #555753;
+  color: #ccccce;
+  padding: 5px; }
+
+#profile-jot-email {
+  width: 90%;
+  margin: 5px; }
+
+#profile-jot-networks {
+  margin: 0 10%;
+  border: 1px solid #555753;
+  border-top: 0;
+  border-bottom: 0;
+  padding: 5px; }
+
+#profile-jot-net {
+  margin: 5px 0; }
+
+#jot-preview-link {
+  margin: 0 0 0 10px;
+  border: 0;
+  text-decoration: none;
+  float: right; }
+
+.icon-text-preview {
+  margin: 0 0 -18px 0;
+  display: block;
+  width: 20px;
+  height: 20px;
+  background: url(icons.png) no-repeat -128px -40px;
+  border: 0;
+  text-decoration: none;
+  float: right;
+  cursor: pointer; }
+
+#profile-jot-perms {
+  float: right;
+  background-color: #555753;
+  height: 22px;
+  width: 20px;
+  -webkit-border-radius: 5px;
+  -moz-border-radius: 5px;
+  border-radius: 5px;
+  overflow: hidden;
+  border: 0px;
+  margin: 0 10px 0 10px; }
+
+#profile-jot-plugin-wrapper {
+  width: 1px;
+  margin: 10px 0 0 0;
+  float: right; }
+
+#profile-jot-submit-wrapper {
+  float: right;
+  width: 100%;
+  list-style: none;
+  margin: 10px 0 0 0;
+  padding: 0; }
+
+#profile-jot-submit {
+  height: auto;
+  background-color: #555753;
+  color: #eeeeec;
+  -webkit-border-radius: 5px;
+  -moz-border-radius: 5px;
+  border-radius: 5px;
+  border: 2px outset #222420;
+  margin: 0;
+  float: right;
+  text-shadow: 1px 1px #111;
+  width: auto;
+  &:active {
+    box-shadow: 0 0 0 0; } }
+
+#jot-perms-icon {
+  height: 22px;
+  width: 20px;
+  -webkit-border-radius: 5px;
+  -moz-border-radius: 5px;
+  border-radius: 5px;
+  overflow: hidden;
+  border: 0; }
+
+#profile-jot-acl-wrapper {
+  margin: 0 10px;
+  border: 1px solid #555753;
+  border-top: 0;
+  display: block !important; }
+
+#group_allow_wrapper, #group_deny_wrapper, #acl-permit-outer-wrapper {
+  width: 47%;
+  float: left; }
+
+#contact_allow_wrapper, #contact_deny_wrapper, #acl-deny-outer-wrapper {
+  width: 47%;
+  float: right; }
+
+#acl-permit-text {
+  background-color: #555753;
+  color: #ccccce;
+  padding: 5px;
+  float: left; }
+
+#jot-public {
+  background-color: #555753;
+  color: #ff0000;
+  padding: 5px;
+  float: left; }
+
+#acl-deny-text {
+  background-color: #555753;
+  color: #ccccce;
+  padding: 5px;
+  float: left; }
+
+#acl-permit-text-end, #acl-deny-text-end {
+  clear: both; }
+
+#jot-title-desc {
+  color: #ccc; }
+
+#profile-jot-desc {
+  color: #a00;
+  margin: 5px 0; }
+
+#jot-title-wrapper {
+  margin-bottom: 5px; }
+
+#jot-title-display {
+  font-weight: bold; }
+
+.jothidden {
+  display: none; }
+
+#jot-preview-content {
+  background-color: #ffffe0;
+  color: #111;
+  border: 1px #aa0 solid;
+  border-radius: 5px;
+  padding: 3px 3px 6px 10px;
+  .wall-item-outside-wrapper {
+    border: 0;
+    border-radius: 0px; } }
+
+/**
+ * section
+ */
+
+#sectionmain {
+  margin: 20px;
+  font-size: 0.8em;
+  min-width: 475px;
+  width: 67%;
+  float: left;
+  display: inline; }
+
+/**
+ * tabs
+ */
+
+.tabs {
+  list-style: none;
+  margin: 10px 0;
+  padding: 0;
+  li {
+    display: inline;
+    font-size: smaller;
+    font-weight: bold; } }
+
+.tab {
+  border: 1px solid #729fcf;
+  padding: 4px;
+  &:hover, &.active:hover, &:active {
+    background: #729fcf;
+    color: #eeeeec; }
+  &.active {
+    background: #729fcf;
+    color: #eeeeec;
+    a {
+      color: #729fcf; } }
+  a {
+    border: 0;
+    text-decoration: none; } }
+
+/**
+ * items
+ */
+
+.wall-item-outside-wrapper {
+  border: 1px solid #aaa;
+  border-radius: 5px;
+  box-shadow: 5px 0 10px 0 #888;
+  &.comment {
+    margin-top: 5px; } }
+
+.wall-item-outside-wrapper-end {
+  clear: both; }
+
+.wall-item-content-wrapper {
+  position: relative;
+  padding: 10px;
+  width: auto; }
+
+.wall-item-outside-wrapper .wall-item-comment-wrapper {
+  /*margin-left: 90px;*/ }
+
+.shiny {
+  background: #efefdf;
+  border-radius: 5px; }
+
+.wall-outside-wrapper .shiny {
+  border-radius: 5px; }
+
+.heart {
+  color: red; }
+
+.wall-item-content {
+  overflow-x: auto;
+  margin: 0px 15px 0px 5px; }
+
+/* removing it from here, vs. putting it in .wall-item-content
+* might break things for people. we shall see ;) */
+
+[id^="tread-wrapper"], [class^="tread-wrapper"] {
+  margin: 15px 0 0 0;
+  padding: 0px;
+  /*overflow-x: auto;*/ }
+
+.wall-item-photo-menu {
+  display: none; }
+
+.wall-item-photo-menu-button {
+  display: none;
+  text-indent: -99999px;
+  background: #555753 url(menu-user-pin.jpg) no-repeat 75px center;
+  position: absolute;
+  overflow: hidden;
+  height: 20px;
+  width: 90px;
+  top: 85px;
+  left: 0;
+  -webkit-border-radius: 0 0 5px 5px;
+  -moz-border-radius: 0 0 5px 5px;
+  border-radius: 0 0 5px 5px; }
+
+.wall-item-info {
+  float: left;
+  width: 110px; }
+
+.wall-item-photo-wrapper {
+  width: 80px;
+  height: 80px;
+  position: relative;
+  padding: 5px;
+  background-color: #555753;
+  -webkit-border-radius: 5px;
+  -moz-border-radius: 5px;
+  border-radius: 5px; }
+
+[class^="wall-item-tools"] * {
+  /*margin: 0 0 5px 0;*/
+  > * {
+    /*margin: 0 0 5px 0;*/ } }
+
+.wall-item-tools {
+  float: right;
+  opacity: 0.4;
+  -webkit-transition: all 1s ease-in-out;
+  -moz-transition: all 1s ease-in-out;
+  -o-transition: all 1s ease-in-out;
+  -ms-transition: all 1s ease-in-out;
+  transition: all 1s ease-in-out;
+  &:hover {
+    opacity: 1;
+    -webkit-transition: all 1s ease-in-out;
+    -moz-transition: all 1s ease-in-out;
+    -o-transition: all 1s ease-in-out;
+    -ms-transition: all 1s ease-in-out;
+    transition: all 1s ease-in-out; } }
+
+.wall-item-subtools1 {
+  height: 30px;
+  list-style: none outside none;
+  margin: 20px 0 30px -20px;
+  padding: 0;
+  width: 30px; }
+
+.wall-item-subtools2 {
+  height: 25px;
+  list-style: none outside none;
+  margin: -75px 0 0 5px;
+  padding: 0;
+  width: 25px; }
+
+.wall-item-title {
+  font-size: 1.2em;
+  font-weight: bold;
+  margin-bottom: 1em; }
+
+.wall-item-body {
+  margin: 20px 20px 10px 0px;
+  text-align: left;
+  overflow-x: auto; }
+
+.wall-item-lock-wrapper {
+  float: right;
+  height: 22px;
+  margin: 0 -5px 0 0;
+  width: 22px;
+  opacity: 1; }
+
+.wall-item-dislike, .wall-item-like {
+  clear: left;
+  font-size: 0.8em;
+  color: #878883;
+  margin: 5px 0 5px 120px; }
+
+.wall-item-author, .wall-item-actions-author {
+  clear: left;
+  font-size: 0.8em;
+  color: #878883;
+  margin: 20px 20px 0 110px; }
+
+.wall-item-ago {
+  display: inline;
+  padding-left: 10px; }
+
+.wall-item-wrapper-end {
+  clear: both; }
+
+.wall-item-location {
+  margin-top: 15px;
+  width: 100px;
+  overflow: hidden;
+  text-overflow: ellipsis;
+  -o-text-overflow: ellipsis;
+  .icon {
+    float: left; }
+  > a, .smalltext {
+    margin-left: 25px;
+    font-size: 0.7em;
+    display: block; }
+  > br {
+    display: none; } }
+
+.wallwall {
+  .wwto {
+    left: 5px;
+    margin: 0;
+    position: absolute;
+    top: 75px;
+    width: 30px;
+    z-index: 10001;
+    width: 30px;
+    height: 30px;
+    img {
+      width: 30px !important;
+      height: 30px !important; } }
+  .wall-item-photo-end {
+    clear: both; } }
+
+.wall-item-arrowphoto-wrapper {
+  position: absolute;
+  left: 35px;
+  top: 80px;
+  z-index: 10002; }
+
+.wall-item-photo-menu {
+  min-width: 92px;
+  border: 2px solid #FFFFFF;
+  border-top: 0px;
+  background: #555753;
+  position: absolute;
+  left: -2px;
+  top: 101px;
+  display: none;
+  z-index: 10003;
+  -webkit-border-radius: 0px 5px 5px 5px;
+  -moz-border-radius: 0px 5px 5px 5px;
+  border-radius: 0px 5px 5px 5px;
+  ul {
+    margin: 0px;
+    padding: 0px;
+    list-style: none; }
+  li a {
+    white-space: nowrap;
+    display: block;
+    padding: 5px 2px;
+    color: #eeeeec;
+    &:hover {
+      color: #555753;
+      background: #eeeeec; } } }
+
+#item-delete-selected {
+  overflow: auto;
+  width: 100%; }
+
+#connect-services-header, #connect-services, #extra-help-header, #extra-help, #postit-header, #postit {
+  margin: 5px 0 0 0; }
+
+/**
+ * comment
+ */
+
+.ccollapse-wrapper {
+  font-size: 0.9em;
+  margin-left: 80px; }
+
+.wall-item-outside-wrapper.comment {
+  margin-left: 80px;
+  .wall-item-photo {
+    width: 40px!important;
+    height: 40px!important; }
+  .wall-item-photo-wrapper {
+    width: 40px;
+    height: 40px; }
+  .wall-item-photo-menu-button {
+    width: 50px;
+    top: 45px;
+    background-position: 35px center; }
+  .wall-item-info {
+    width: 60px; }
+  .wall-item-body {
+    margin-left: 10px; }
+  .wall-item-author {
+    margin-left: 50px; }
+  .wall-item-photo-menu {
+    min-width: 50px;
+    top: 60px; } }
+
+.comment-wwedit-wrapper {
+  /*margin: 30px 0px 0px 80px;*/ }
+
+.comment-edit-wrapper {
+  border-top: 1px #aaa solid; }
+
+[class^="comment-edit-bb"] {
+  list-style: none;
+  display: none;
+  margin: -40px 0 5px 60px;
+  width: 75%;
+  > li {
+    display: inline-block;
+    margin: 0 10px 0 0;
+    visibility: none; } }
+
+.comment-wwedit-wrapper img, .comment-edit-wrapper img {
+  width: 20px;
+  height: 20px; }
+
+.comment-edit-photo-link, .comment-edit-photo {
+  margin-left: 10px; }
+
+.my-comment-photo {
+  width: 40px;
+  height: 40px;
+  padding: 5px; }
+
+[class^="comment-edit-text"] {
+  margin: 5px 0 10px 20px;
+  width: 84.5%; }
+
+.comment-edit-text-empty {
+  height: 20px;
+  border: 2px #babdd6 solid;
+  border-radius: 5px;
+  color: #babdb6;
+  -webkit-transition: all 0.5s ease-in-out;
+  -moz-transition: all 0.5s ease-in-out;
+  -o-transition: all 0.5s ease-in-out;
+  -ms-transition: all 0.5s ease-in-out;
+  transition: all 0.5s ease-in-out;
+  &:hover {
+    color: #999999; } }
+
+.comment-edit-text-full {
+  height: 10em;
+  border-radius: 5px;
+  -webkit-transition: all 0.5s ease-in-out;
+  -moz-transition: all 0.5s ease-in-out;
+  -o-transition: all 0.5s ease-in-out;
+  -ms-transition: all 0.5s ease-in-out;
+  transition: all 0.5s ease-in-out; }
+
+.comment-edit-submit-wrapper {
+  width: 90%;
+  margin: 5px 5px 10px 50px;
+  text-align: right; }
+
+.comment-edit-submit {
+  height: 22px;
+  background-color: #555753;
+  color: #eeeeec;
+  -webkit-border-radius: 5px;
+  -moz-border-radius: 5px;
+  border-radius: 5px;
+  border: 0; }
+
+/**
+ * item text style
+ */
+
+.wall-item-body code {
+  display: block;
+  padding: 0 0 10px 5px;
+  border-color: #ccc;
+  border-style: solid;
+  border-width: 1px 1px 1px 10px;
+  background: #eee;
+  color: #444;
+  width: 95%; }
+
+/**
+ * profile
+ */
+
+div {
+  &[id$="text"] {
+    font-weight: bold;
+    border-bottom: 1px solid #ccc; }
+  &[id$="wrapper"] {
+    height: 100%;
+    margin-bottom: 1em;
+    br {
+      clear: left; } } }
+
+[id$="-end"], [class$="end"] {
+  clear: both;
+  margin: 0 0 10px 0; }
+
+#advanced-profile-with {
+  margin-left: 200px; }
+
+/**
+ * photos
+ */
+
+.photos {
+  height: auto;
+  overflow: auto; }
+
+#photo-top-links {
+  margin-bottom: 30px; }
+
+.photo-album-image-wrapper, .photo-top-image-wrapper {
+  float: left;
+  -moz-box-shadow: 3px 3px 10px 0 #000;
+  -webkit-box-shadow: 3px 3px 10px 0 #000;
+  box-shadow: 3px 3px 10px 0 #000;
+  background-color: #eee;
+  color: #111;
+  -webkit-border-radius: 5px;
+  -moz-border-radius: 5px;
+  border-radius: 5px;
+  padding-bottom: 30px;
+  position: relative;
+  margin: 0 10px 10px 0; }
+
+#photo-photo {
+  max-width: 100%;
+  img {
+    max-width: 100%; } }
+
+.photo-top-image-wrapper a:hover, #photo-photo a:hover, .photo-album-image-wrapper a:hover {
+  border-bottom: 0; }
+
+.photo-top-photo, .photo-album-photo {
+  -webkit-border-radius: 5px 5px 0 0;
+  -moz-border-radius: 5px 5px 0 0;
+  border-radius: 5px 5px 0 0; }
+
+.photo-top-album-name {
+  position: absolute;
+  bottom: 0;
+  padding: 0 5px; }
+
+.caption {
+  position: absolute;
+  bottom: 0;
+  margin: 0 5px; }
+
+#photo-photo {
+  position: relative;
+  float: left; }
+
+#photo-prev-link, #photo-next-link {
+  position: absolute;
+  width: 30%;
+  height: 100%;
+  background-color: rgba(255, 255, 255, 0.5);
+  opacity: 0;
+  -webkit-transition: all .2s ease-in-out;
+  -moz-transition: all .2s ease-in-out;
+  -o-transition: all .2s ease-in-out;
+  -ms-transition: all .2s ease-in-out;
+  transition: all .2s ease-in-out;
+  background-position: center center;
+  background-repeat: no-repeat; }
+
+#photo-prev-link {
+  left: 0;
+  top: 0;
+  background-image: url(prev.png); }
+
+#photo-next-link {
+  right: 0;
+  top: 0;
+  background-image: url(next.png); }
+
+#photo-prev-link a, #photo-next-link a {
+  display: block;
+  width: 100%;
+  height: 100%;
+  overflow: hidden;
+  text-indent: -900000px; }
+
+#photo-prev-link:hover {
+  opacity: 1;
+  -webkit-transition: all .2s ease-in-out;
+  -moz-transition: all .2s ease-in-out;
+  -o-transition: all .2s ease-in-out;
+  -ms-transition: all .2s ease-in-out;
+  transition: all .2s ease-in-out; }
+
+#photo-next-link {
+  &:hover {
+    opacity: 1;
+    -webkit-transition: all .2s ease-in-out;
+    -moz-transition: all .2s ease-in-out;
+    -o-transition: all .2s ease-in-out;
+    -ms-transition: all .2s ease-in-out;
+    transition: all .2s ease-in-out; }
+  .icon {
+    display: none; } }
+
+#photo-prev-link .icon {
+  display: none; }
+
+#photos-upload-spacer, #photos-upload-new-wrapper, #photos-upload-exist-wrapper {
+  margin-bottom: 1em; }
+
+#photos-upload-existing-album-text, #photos-upload-newalbum-div {
+  background-color: #555753;
+  color: #eeeeec;
+  padding: 1px; }
+
+#photos-upload-album-select, #photos-upload-newalbum {
+  width: 99%; }
+
+#photos-upload-perms-menu {
+  text-align: right; }
+
+#photo-edit-caption, #photo-edit-newtag, #photo-edit-albumname {
+  float: left;
+  margin-bottom: 25px; }
+
+#photo-edit-link-wrap {
+  margin-bottom: 15px; }
+
+#photo-edit-caption, #photo-edit-newtag {
+  width: 100%; }
+
+#photo-like-div {
+  margin-bottom: 25px; }
+
+#photo-edit-caption-end, #photo-edit-tags-end, #photo-edit-albumname-end {
+  clear: both; }
+
+#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; }
+
+/**
+ * message
+ */
+
+.prvmail-text {
+  width: 100%; }
+
+#prvmail-subject {
+  width: 100%;
+  color: #eec;
+  background: #444; }
+
+#prvmail-submit-wrapper {
+  margin-top: 10px; }
+
+#prvmail-submit {
+  float: right;
+  margin-top: 0; }
+
+#prvmail-submit-wrapper div {
+  margin-right: 5px;
+  float: left; }
+
+.mail-list-outside-wrapper {
+  margin-top: 20px; }
+
+.mail-list-sender {
+  float: left; }
+
+.mail-list-detail {
+  margin-left: 90px; }
+
+.mail-list-sender-name {
+  display: inline;
+  font-size: 1.1em; }
+
+.mail-list-date {
+  display: inline;
+  font-size: 0.9em;
+  padding-left: 10px; }
+
+.mail-list-sender-name, .mail-list-date {
+  font-style: italic; }
+
+.mail-list-subject {
+  font-size: 1.2em; }
+
+.mail-list-delete-wrapper {
+  float: right; }
+
+.mail-list-outside-wrapper-end {
+  clear: both;
+  border-bottom: 1px #eec dotted; }
+
+.mail-conv-sender {
+  float: left;
+  margin: 0px 5px 5px 0px; }
+
+.mail-conv-sender-photo {
+  width: 32px;
+  height: 32px; }
+
+.mail-conv-sender-name {
+  float: left; }
+
+.mail-conv-date {
+  float: right; }
+
+.mail-conv-subject {
+  clear: right;
+  font-weight: bold;
+  font-size: 1.2em; }
+
+.mail-conv-body {
+  clear: both; }
+
+.mail-conv-delete-wrapper {
+  margin-top: 5px; }
+
+/**
+ * contacts
+ */
+
+.view-contact-wrapper, .contact-entry-wrapper {
+  float: left;
+  margin: 0 5px 40px 0;
+  width: 120px;
+  height: 120px;
+  padding: 3px;
+  position: relative; }
+
+.contact-direction-wrapper {
+  position: absolute;
+  top: 20px; }
+
+.contact-edit-links {
+  position: absolute;
+  top: 60px; }
+
+.contact-entry-photo-wrapper {}
+
+.contact-entry-photo {
+  margin-left: 20px; }
+
+.contact-entry-name {
+  width: 120px;
+  font-weight: bold;
+  /*overflow: hidden;*/ }
+
+.contact-entry-photo {
+  position: relative; }
+
+.contact-entry-edit-links .icon {
+  border: 1px solid #babdb6;
+  -webkit-border-radius: 3px;
+  -moz-border-radius: 3px;
+  border-radius: 3px;
+  background-color: #fff; }
+
+#contact-entry-url, [id^="contact-entry-url"] {
+  font-size: smaller;
+  /*overflow: scroll;*/ }
+
+#contact-entry-network, [id^="contact-entry-network"] {
+  font-size: smaller;
+  font-style: italic; }
+
+#contact-edit-banner-name {
+  font-size: 1.5em; }
+
+#contact-edit-photo-wrapper {
+  position: relative;
+  float: left;
+  padding: 20px; }
+
+#contact-edit-direction-icon {
+  position: absolute;
+  top: 60px;
+  left: 0; }
+
+#contact-edit-nav-wrapper {
+  margin-left: 0px; }
+
+#contact-edit-links {
+  margin-top: 23px;
+  ul {
+    list-style-type: none; } }
+
+#contact-drop-links {
+  margin-left: 5px; }
+
+#contact-edit-nav-wrapper .icon {
+  border: 1px solid #babdb6;
+  -webkit-border-radius: 3px;
+  -moz-border-radius: 3px;
+  border-radius: 3px; }
+
+#contact-edit-poll-wrapper {
+  margin-left: 0px; }
+
+#contact-edit-last-update-text {
+  margin-bottom: 15px; }
+
+#contact-edit-last-updated {
+  font-weight: bold; }
+
+#contact-edit-poll-text {
+  display: inline; }
+
+#contact-edit-info_tbl, #contact-edit-info_parent, .mceLayout {
+  width: 100%; }
+
+#contact-edit-end {
+  clear: both;
+  margin-bottom: 65px; }
+
+.contact-photo-menu-button {
+  position: absolute;
+  background-image: url("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 #444;
+  background: #eee;
+  color: #111;
+  position: absolute;
+  left: 0px;
+  top: 90px;
+  display: none;
+  z-index: 10000;
+  ul {
+    margin: 0px;
+    padding: 0px;
+    list-style: none; }
+  li a {
+    display: block;
+    padding: 2px;
+    &:hover {
+      color: #fff;
+      background: #3465A4;
+      text-decoration: none; } } }
+
+/**
+ * register, settings & profile forms
+ */
+
+.openid {}
+
+#id_openid_url {
+  background: url(login-bg.gif) no-repeat;
+  background-position: 0 50%;
+  padding-left: 18px; }
+
+#settings-nickname-desc {
+  background-color: #eee;
+  -webkit-border-radius: 5px;
+  -moz-border-radius: 5px;
+  border-radius: 5px;
+  padding: 5px;
+  color: #111; }
+
+#settings-default-perms {
+  margin-bottom: 20px; }
+
+#register-form div, #profile-edit-form div {
+  clear: both; }
+
+.settings-block {
+  label {
+    clear: left; }
+  input {
+    margin: 10px 5px; } }
+
+/*#register-form label,     */
+/*#profile-edit-form label {*/
+/*    width: 300px;         */
+/*    float: left;          */
+/*}                         */
+
+/*#register-form span,     */
+/*#profile-edit-form span {*/
+/*    color: #555753;      */
+/*    display: block;      */
+/*    margin-bottom: 20px; */
+/*}                        */
+
+#profile-edit-marital-label span {
+  margin: -4px; }
+
+.settings-submit-wrapper, .profile-edit-submit-wrapper {
+  margin: 0 0 30px -3px; }
+
+.profile-edit-side-div {
+  display: none; }
+
+/*.profile-edit-side-div:hover {
+    display: block;
+}
+.profile-edit-side-link {
+    margin: 3px 0px 0px 70px;
+}*/
+
+#profiles-menu-trigger {
+  margin: 0px 0px 0px 25px; }
+
+.profile-listing {
+  float: left;
+  margin: 20px 20px 0px 0px; }
+
+.icon-profile-edit {
+  background: url("icons.png") -150px 0px no-repeat;
+  border: 0;
+  cursor: pointer;
+  display: block;
+  float: right;
+  width: 20px;
+  height: 20px;
+  margin: 0 0 -18px;
+  position: absolute;
+  text-decoration: none;
+  top: 113px;
+  right: 260px; }
+
+#profile-edit-links ul {
+  margin: 20px 0;
+  padding: 0;
+  list-style: none; }
+
+.marital {
+  margin-top: 5px; }
+
+#register-sitename {
+  display: inline;
+  font-weight: bold; }
+
+#advanced-expire-popup {
+  background: #2e2f2e;
+  color: #eec; }
+
+#id_ssl_policy {
+  width: 374px; }
+
+#theme-preview img {
+  margin: 10px 10px 10px 288px; }
+
+/**
+ * contacts selector
+ */
+
+.group-delete-wrapper {
+  margin: -31px 50px 0 0;
+  float: right; }
+
+/*.group-delete-icon {
+    margin: 0 0 0 10px;
+}*/
+
+#group-edit-submit-wrapper {
+  margin: 0 0 10px 0;
+  display: inline; }
+
+#group-edit-desc {
+  margin: 10px 0px; }
+
+#group-members, #prof-members {
+  height: 200px;
+  overflow: auto;
+  border: 1px solid #555753;
+  -webkit-border-radius: 5px 5px 0 0;
+  -moz-border-radius: 5px 5px 0 0;
+  border-radius: 5px 5px 0 0; }
+
+#group-all-contacts, #prof-all-contacts {
+  height: 200px;
+  overflow: auto;
+  border: 1px solid #555753;
+  -webkit-border-radius: 0 0 5px 5px;
+  -moz-border-radius: 0 0 5px 5px;
+  border-radius: 0 0 5px 5px; }
+
+#group-members h3, #group-all-contacts h3, #prof-members h3, #prof-all-contacts h3 {
+  color: #eeeeec;
+  background-color: #555753;
+  margin: 0;
+  padding: 5px; }
+
+#group-separator, #prof-separator {
+  display: none; }
+
+/**
+ * profile
+ */
+
+#cropimage-wrapper {
+  float: left; }
+
+#crop-image-form {
+  clear: both; }
+
+/**
+ * intros
+ */
+
+.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, .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, .intro-approve-as-friend, .intro-approve-as-fan {
+  float: left; }
+
+.intro-form-end {
+  clear: both;
+  margin-bottom: 10px; }
+
+.intro-approve-as-friend-desc {
+  margin-top: 10px; }
+
+.intro-approve-as-end {
+  clear: both;
+  margin-bottom: 10px; }
+
+.intro-end, .clear {
+  clear: both; }
+
+/**
+ * events
+ */
+
+.eventcal {
+  float: left;
+  font-size: 20px; }
+
+.event {
+  background: #2e2f2e; }
+
+.vevent {
+  border: 1px solid #ccc;
+  .event-description, .event-location, .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;
+  font-size: smaller; }
+
+.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: monospace; }
+
+.today {
+  font-weight: bold;
+  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, #event-share-checkbox {
+  float: left; }
+
+#event-datetime-break {
+  margin-bottom: 10px; }
+
+#event-nofinish-break, #event-adjust-break, #event-share-break {
+  clear: both; }
+
+#event-desc-text, #event-location-text {
+  margin-top: 10px;
+  margin-bottom: 5px; }
+
+#event-submit {
+  margin-top: 10px; }
+
+.body-tag {
+  margin: 10px 0;
+  opacity: 0.5;
+  &:hover {
+    opacity: 1.0 !important; } }
+
+.filesavetags, .categorytags {
+  margin: 20px 0;
+  opacity: 0.5; }
+
+.filesavetags:hover, .categorytags:hover {
+  margin: 20px 0;
+  opacity: 1.0 !important; }
+
+.item-select {
+  opacity: 0.1;
+  margin: 5px 0 0 6px !important;
+  &:hover {
+    opacity: 1; } }
+
+.checkeditem {
+  opacity: 1; }
+
+#item-delete-selected {
+  margin-top: 30px; }
+
+/* was tired of having no way of moving it around, so
+* here's a little 'hook' to do so */
+
+.delete-checked {
+  position: absolute;
+  left: 35px;
+  margin-top: 20px; }
+
+#item-delete-selected-end {
+  clear: both; }
+
+#item-delete-selected-icon {
+  float: left;
+  margin-right: 5px; }
+
+#item-delete-selected-desc {
+  float: left;
+  margin-right: 5px;
+  &:hover {
+    text-decoration: underline; } }
+
+.fc-state-highlight {
+  background: #eec;
+  color: #2e2f2e; }
+
+/**
+ * directory
+ */
+
+.directory-item {
+  float: left;
+  margin: 0 5px 4px 0;
+  padding: 3px;
+  width: 180px;
+  height: 250px;
+  position: relative; }
+
+/**
+ * sidebar
+ */
+
+#group-sidebar {
+  margin-bottom: 10px; }
+
+.group-selected, .nets-selected, .fileas-selected {
+  padding: 3px;
+  color: #111;
+  background: #f8f8f8;
+  font-weight: bold; }
+
+.group-selected:hover, .nets-selected:hover, .fileas-selected:hover {
+  color: #111; }
+
+.groupsideedit {
+  margin-right: 10px; }
+
+#sidebar-group-ul {
+  padding-left: 0; }
+
+#sidebar-group-list {
+  margin: 0 0 5px 0;
+  ul {
+    list-style-type: none;
+    list-style-position: inside; }
+  li {
+    margin-top: 10px; }
+  .icon {
+    display: inline-block;
+    height: 12px;
+    width: 12px; } }
+
+#sidebar-new-group {
+  margin: auto;
+  display: inline-block;
+  color: #efefef;
+  text-decoration: none;
+  text-align: center; }
+
+#peoplefind-sidebar form {
+  margin-bottom: 10px; }
+
+#sidebar-new-group {
+  &:hover {
+    /*background: -webkit-gradient( linear, left top, left bottom, color-stop(0.05, #b20202), color-stop(1, #d60808) );*/
+    /*background: -moz-linear-gradient( center top, #b20202 5%, #d60808 100% );*/
+    /*background-color: #b20202;*/ }
+  &:active {
+    position: relative;
+    top: 1px; } }
+
+#side-peoplefind-url {
+  background-color: #e5e0cf;
+  color: #666;
+  border: 1px 666 solid;
+  margin-right: 3px;
+  width: 75%;
+  &:hover, &:focus {
+    background-color: #efefef;
+    color: #222;
+    border: 1px 333 solid; } }
+
+.nets-ul {
+  list-style-type: none;
+  padding-left: 0px;
+  li {
+    margin: 10px 0 0; } }
+
+.nets-link, .nets-all {
+  margin-left: 0px; }
+
+#netsearch-box {
+  margin-top: 20px;
+  width: 150px;
+  #search-submit {
+    margin: 5px 0px 0px 0px; } }
+
+/**
+ * admin
+ */
+
+#pending-update {
+  float: right;
+  color: #fff;
+  font-weight: bold;
+  background-color: #ff0000;
+  padding: 0 .3em; }
+
+.admin {
+  &.linklist {
+    border: 0;
+    padding: 0; }
+  &.link {
+    list-style-position: inside; } }
+
+#adminpage {
+  color: #111;
+  background: transparent;
+  margin: 5px;
+  padding: 10px;
+  dl {
+    clear: left;
+    margin-bottom: 2px;
+    padding-bottom: 2px;
+    border-bottom: 1px solid #000; }
+  dt {
+    width: 250px;
+    float: left;
+    font-weight: bold; }
+  dd {
+    margin-left: 250px; }
+  h3 {
+    border-bottom: 1px solid #ccc; }
+  .submit {
+    clear: left; }
+  #pluginslist {
+    margin: 0;
+    padding: 0; }
+  .plugin {
+    list-style: none;
+    display: block;
+    border: 1px solid #888;
+    padding: 1em;
+    margin-bottom: 5px;
+    clear: left; }
+  .toggleplugin {
+    float: left;
+    margin-right: 1em; }
+  table {
+    width: 100%;
+    border-bottom: 1px solid #000;
+    margin: 5px 0;
+    th {
+      text-align: left; } }
+  td .icon {
+    float: left; }
+  table {
+    &#users img {
+      width: 16px;
+      height: 16px; }
+    tr:hover {
+      /*color: ;*/
+      background-color: #bbc7d7; } }
+  .selectall {
+    text-align: right; }
+  #users a {
+    /*color: #;*/
+    text-decoration: underline; } }
+
+#users .name {
+  color: #eec; }
+
+/**
+ * form fields
+ */
+
+.field {
+  /*margin-bottom: 10px;*/
+  /*padding-bottom: 10px;*/
+  overflow: auto;
+  /* width: 100%;*/
+  label {
+    width: 38%;
+    display: inline-block;
+    font-size: 1.077em;
+    margin: 0 10px 1em 0;
+    border: 1px #999 solid;
+    padding: 5px;
+    background: #ccc;
+    color: #111; } }
+
+.field .onoff {
+  float: right;
+  margin: 0 330px 0 auto;
+  width: 80px;
+  a {
+    display: block;
+    border: 1px solid #666;
+    padding: 3px 6px 4px 10px;
+    height: 16px;
+    text-decoration: none; }
+  .on {
+    background: url("../../../images/onoff.jpg") no-repeat 42px 1px #999999;
+    color: #111;
+    text-align: left; }
+  .off {
+    background: url("../../../images/onoff.jpg") no-repeat 2px 1px #cccccc;
+    color: #333;
+    text-align: right; } }
+
+.hidden {
+  display: none !important; }
+
+.field textarea {
+  width: 80%;
+  height: 100px; }
+
+.field_help {
+  display: block;
+  margin-left: 297px;
+  color: #666; }
+
+.field.radio .field_help {
+  margin-left: 297px; }
+
+label {
+  width: 38%;
+  display: inline-block;
+  font-size: 1.077em;
+  margin: 0 10px 1em 0;
+  border: 1px #999 solid;
+  padding: 5px;
+  background: #ccc;
+  color: #111; }
+
+input {
+  width: 250px;
+  height: 25px;
+  border: 1px #999 solid;
+  &[type="text"], &[type="password"], &[type="search"] {
+    width: 250px;
+    height: 25px;
+    border: 1px #999 solid; }
+  &[type="checkbox"], &[type="radio"] {
+    border: 1px #999 solid;
+    margin: 0 0 0 0;
+    height: 15px;
+    width: 15px; }
+  &[type="submit"], &[type="button"] {
+    background-color: #555753;
+    border: 2px outset #444;
+    border-radius: 5px;
+    box-shadow: 1px 3px 4px 0 #111;
+    color: #eeeeec;
+    cursor: pointer;
+    font-weight: bold;
+    width: auto;
+    text-shadow: 1px 1px #111;
+    -webkit-border-radius: 5px;
+    -moz-border-radius: 5px; }
+  &[type="submit"]:active, &[type="button"]:active {
+    box-shadow: 0 0 0 0; } }
+
+
+/*
+ * update
+ */
+
+.popup {
+  width: 100%;
+  height: 100%;
+  top: 0px;
+  left: 0px;
+  position: absolute;
+  display: none;
+  .background {
+    background-color: #000;
+    opacity: 0.5;
+    width: 100%;
+    height: 100%;
+    position: absolute;
+    top: 0px;
+    left: 0px; }
+  .panel {
+    top: 25%;
+    left: 25%;
+    width: 50%;
+    height: 50%;
+    padding: 1em;
+    position: absolute;
+    border: 4px solid #000000;
+    background-color: #FFFFFF; } }
+
+#panel {
+  z-index: 100; }
+
+.grey {
+  color: grey; }
+
+.orange {
+  color: orange; }
+
+.red {
+  color: red; }
+
+.popup .panel {
+  .panel_text {
+    display: block;
+    overflow: auto;
+    height: 80%; }
+  .panel_in {
+    width: 100%;
+    height: 100%;
+    position: relative; }
+  .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;
+  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;
+  img {
+    float: left;
+    width: 48px;
+    height: 48px;
+    margin: 10px;
+    &.noicon {
+      background-image: url("../../../images/icons/48/plugin.png");
+      background-position: center center;
+      background-repeat: no-repeat; } }
+  a {
+    float: left; } }
+
+/**
+ * icons
+ */
+
+.iconspacer {
+  display: block;
+  width: 16px;
+  height: 16px; }
+
+.icon {
+  display: block;
+  width: 20px;
+  height: 20px;
+  background: url(icons.png) no-repeat;
+  border: 0;
+  text-decoration: none;
+  border-radius: 5px;
+  &:hover {
+    border: 0;
+    text-decoration: none; } }
+
+.editicon {
+  display: inline-block;
+  width: 21px;
+  height: 21px;
+  background: url(editicons.png) no-repeat;
+  border: 0;
+  text-decoration: none; }
+
+.shadow {
+  box-shadow: 2px 2px 5px 2px #111;
+  &:active, &:focus, &:hover {
+    box-shadow: 0 0 0 0; } }
+
+.editicon:hover {
+  border: 0; }
+
+.boldbb {
+  background-position: 0px 0px;
+  &:hover {
+    background-position: -22px 0px; } }
+
+.italicbb {
+  background-position: 0px -22px;
+  &:hover {
+    background-position: -22px -22px; } }
+
+.underlinebb {
+  background-position: 0px -44px;
+  &:hover {
+    background-position: -22px -44px; } }
+
+.quotebb {
+  background-position: 0px -66px;
+  &:hover {
+    background-position: -22px -66px; } }
+
+.codebb {
+  background-position: 0px -88px;
+  &:hover {
+    background-position: -22px -88px; } }
+
+.imagebb {
+  background-position: -44px 0px;
+  &:hover {
+    background-position: -66px 0px; } }
+
+.urlbb {
+  background-position: -44px -22px;
+  &:hover {
+    background-position: -66px -22px; } }
+
+.videobb {
+  background-position: -44px -44px;
+  &:hover {
+    background-position: -66px -44px; } }
+
+.icon {
+  &.drop, &.drophide, &.delete {
+    float: left;
+    margin: 0 2px; }
+  &.s22 {
+    &.delete {
+      display: block;
+      background-position: -110px 0; }
+    &.text {
+      padding: 10px 0px 0px 25px;
+      width: 200px; } }
+  &.text {
+    text-indent: 0px; }
+  &.s16 {
+    min-width: 16px;
+    height: 16px; } }
+
+.s16 .add {
+  background: url("../../../images/icons/16/add.png") no-repeat; }
+
+.add {
+  margin: 0px 5px; }
+
+.article {
+  background-position: -50px 0; }
+
+.audio {
+  background-position: -70px 0; }
+
+.block {
+  background-position: -90px 0px; }
+
+.drop, .delete {
+  background-position: -110px 0; }
+
+.drophide {
+  background-position: -130px 0; }
+
+.edit {
+  background-position: -150px 0; }
+
+.camera {
+  background-position: -170px 0; }
+
+.dislike {
+  background-position: -190px 0; }
+
+.file-as {
+  background-position: -230px -60px; }
+
+.like {
+  background-position: -211px 0; }
+
+.link {
+  background-position: -230px 0; }
+
+.globe, .location {
+  background-position: -50px -20px; }
+
+.noglobe, .nolocation {
+  background-position: -70px -20px; }
+
+.no {
+  background-position: -90px -20px; }
+
+.pause {
+  background-position: -110px -20px; }
+
+.play {
+  background-position: -130px -20px; }
+
+.pencil {
+  background-position: -151px -18px; }
+
+.small-pencil {
+  background-position: -170px -20px; }
+
+.recycle {
+  background-position: -190px -20px; }
+
+.remote-link {
+  background-position: -210px -20px; }
+
+.share {
+  background-position: -230px -20px; }
+
+.tools {
+  background-position: -50px -40px; }
+
+.lock {
+  background-position: -70px -40px; }
+
+.unlock {
+  background-position: -88px -40px; }
+
+.video {
+  background-position: -110px -40px; }
+
+.attach {
+  background-position: -190px -40px; }
+
+.language {
+  background-position: -210px -40px; }
+
+.starred {
+  background-position: -130px -60px; }
+
+.unstarred {
+  background-position: -150px -60px; }
+
+.tagged {
+  background-position: -170px -60px; }
+
+.on {
+  background-position: -50px -60px; }
+
+.off {
+  background-position: -70px -60px; }
+
+.prev {
+  background-position: -90px -60px; }
+
+.next {
+  background-position: -110px -60px; }
+
+.icon.dim {
+  opacity: 0.3; }
+
+#pause {
+  position: fixed;
+  bottom: 40px;
+  right: 30px; }
+
+.border {
+  border: 1px solid #babdb6;
+  -webkit-border-radius: 5px;
+  -moz-border-radius: 5px;
+  border-radius: 5px;
+  &:hover {
+    border: 1px solid #babdb6;
+    -webkit-border-radius: 5px;
+    -moz-border-radius: 5px;
+    border-radius: 5px; } }
+
+.attachtype {
+  display: block;
+  width: 20px;
+  height: 23px;
+  background-image: url(../../../images/content-types.png); }
+
+.type-video {
+  background-position: 0px 0px; }
+
+.type-image {
+  background-position: -20px 0; }
+
+.type-audio {
+  background-position: -40px 0; }
+
+.type-text {
+  background-position: -60px 0px; }
+
+.type-unkn {
+  background-position: -80px 0; }
+
+/**
+ * footer
+ */
+
+.cc-license {
+  margin-top: 100px;
+  font-size: 0.7em; }
+
+footer {
+  display: block;
+  /*margin: 50px 20%;*/
+  clear: both; }
+
+#profile-jot-text {
+  height: 20px;
+  color: #666;
+  border: 1px solid #ccc;
+  border-radius: 5px;
+  width: 99.5%; }
+
+/**
+ * acl
+ */
+
+#photo-edit-perms-select, #photos-upload-permissions-wrapper, #profile-jot-acl-wrapper {
+  display: block !important;
+  background: #eec;
+  color: #2e2f2e; }
+
+#acl-wrapper {
+  width: 660px;
+  margin: 0 auto; }
+
+#acl-search {
+  float: right;
+  background: white url("../../../images/search_18.png") no-repeat right center;
+  padding-right: 20px;
+  margin: 6px;
+  color: #111; }
+
+#acl-showall {
+  float: left;
+  display: block;
+  width: auto;
+  height: 18px;
+  background: #eeeecc url("../../../images/show_all_off.png") 8px 8px no-repeat;
+  padding: 7px 10px 7px 30px;
+  -webkit-border-radius: 5px;
+  -moz-border-radius: 5px;
+  border-radius: 5px;
+  color: #999;
+  margin: 5px 0;
+  &.selected {
+    color: #000;
+    background: #ff9900 url(../../../images/show_all_on.png) 8px 8px no-repeat; } }
+
+#acl-list {
+  height: 210px;
+  border: 1px solid #ccc;
+  clear: both;
+  margin-top: 30px;
+  overflow: auto; }
+
+/*#acl-list-content {
+}*/
+
+.acl-list-item {
+  border: 1px solid #ccc;
+  display: block;
+  float: left;
+  height: 110px;
+  margin: 3px 0 5px 5px;
+  width: 120px;
+  img {
+    width: 22px;
+    height: 22px;
+    float: left;
+    margin: 5px 5px 20px; }
+  p {
+    height: 12px;
+    font-size: 10px;
+    margin: 0 0 22px;
+    padding: 2px 0 1px; }
+  a {
+    background: #ccc 3px 3px no-repeat;
+    -webkit-border-radius: 2px;
+    -moz-border-radius: 2px;
+    border-radius: 2px;
+    clear: both;
+    font-size: 10px;
+    display: block;
+    width: 55px;
+    height: 20px;
+    color: #999;
+    margin: 5px auto 0;
+    padding: 0 3px;
+    text-align: center;
+    vertical-align: middle; } }
+
+#acl-wrapper a:hover {
+  text-decoration: none;
+  color: #000;
+  border: 0; }
+
+.acl-button-show {
+  background-image: url('../../../images/show_off.png');
+  margin: 0 auto; }
+
+.acl-button-hide {
+  background-image: url('../../../images/hide_off.png');
+  margin: 0 auto; }
+
+.acl-button-show.selected {
+  color: #000;
+  background-color: #9ade00;
+  background-image: url(../../../images/show_on.png); }
+
+.acl-button-hide.selected {
+  color: #000;
+  background-color: #ff4141;
+  background-image: url(../../../images/hide_on.png); }
+
+.acl-list-item {
+  &.groupshow {
+    border-color: #9ade00; }
+  &.grouphide {
+    border-color: #ff4141; } }
+
+/** /acl **/
+
+/* autocomplete popup */
+
+.acpopup {
+  max-height: 175px;
+  max-width: 42%;
+  background-color: #555753;
+  color: #fff;
+  overflow: auto;
+  z-index: 100000;
+  border: 1px solid #cccccc; }
+
+.acpopupitem {
+  background-color: #555753;
+  padding: 4px;
+  clear: left;
+  img {
+    float: left;
+    margin-right: 4px; }
+  &.selected {
+    color: #2e3436;
+    background-color: #eeeeec; } }
+
+.qcomment-wrapper {
+  padding: 0px;
+  margin: 5px 5px 5px 81%; }
+
+.qcomment {
+  opacity: 0.5;
+  &:hover {
+    opacity: 1.0; } }
+
+#network-star-link {
+  margin-top: 10px; }
+
+.network-star {
+  float: left;
+  margin-right: 5px;
+  &.icon.starred {
+    display: inline-block; } }
+
+#fileas-sidebar {}
+
+.fileas-ul {
+  padding: 0; }
+
+/*
+ * addons theming
+ */
+
+#sidebar-page-list {
+  ul {
+    padding: 0;
+    margin: 5px 0; }
+  li {
+    list-style: none; } }
+
+#jappix_mini {
+  margin-left: 130px;
+  position: fixed;
+  bottom: 0;
+  right: 175px !important;
+  /* override the jappix css */
+  z-index: 999; }
+
+/* media stuff */
+@media handheld {
+  body {
+    font-size: 15pt; } }
diff --git a/view/theme/dispy/style.php b/view/theme/dispy/style.php
new file mode 100644
index 000000000..f666e2768
--- /dev/null
+++ b/view/theme/dispy/style.php
@@ -0,0 +1,250 @@
+<?php
+    $line_height = false;
+    $dispy_font_size = false;
+    $resolution = false;
+    $colour = false;
+    $site_line_height = get_config("dispy","line_height");
+    $site_dispy_font_size = get_config("dispy", "font_size" );
+    $site_colour = get_config("dispy", "colour" );
+
+    if (local_user()) {
+        $line_height = get_pconfig(local_user(), "dispy","line_height");
+        $dispy_font_size = get_pconfig(local_user(), "dispy", "font_size");
+        $colour = get_pconfig(local_user(), "dispy", "colour");
+    }
+
+    if ($line_height === false) { $line_height = $site_line_height; }
+    if ($line_height === false) { $line_height = "1.2"; }
+    if ($dispy_font_size === false) { $dispy_font_size = $site_dispy_font_size; }
+    if ($dispy_font_size === false) { $dispy_font_size = "12"; }
+    if ($colour === false) { $colour = $site_colour; }
+    if ($colour === false) { $colour = "light"; }
+    
+    if($colour == "light") {
+        if (file_exists("$THEMEPATH/light/style.css")) {
+            echo file_get_contents("$THEMEPATH/light/style.css");
+        }
+        if($dispy_font_size == "16") {
+            echo "
+                .wall-item-container .wall-item-content {
+                    font-size: 16px;
+                }
+                .wall-item-photo-container .wall-item-content {
+                    font-size: 16px;
+                }";  
+        }
+        if($dispy_font_size == "15") {
+            echo "
+                .wall-item-container .wall-item-content {
+                    font-size: 15px;
+                }
+                .wall-item-photo-container .wall-item-content {
+                    font-size: 15px;
+                }";
+        }	
+        if($dispy_font_size == "14") {
+            echo "
+                .wall-item-container .wall-item-content {
+                    font-size: 14px;
+                }
+                .wall-item-photo-container .wall-item-content {
+                    font-size: 14px;
+                }";
+        }
+        if($dispy_font_size == "13.5") {
+            echo "
+                .wall-item-container .wall-item-content {
+                    font-size: 13.5px;
+                }
+                .wall-item-photo-container .wall-item-content {
+                    font-size: 13.5px;
+                }";
+        }
+        if($dispy_font_size == "13") {
+            echo "
+                .wall-item-container .wall-item-content {
+                    font-size: 13px;
+                }
+                .wall-item-photo-container .wall-item-content {
+                    font-size: 13px;
+                }";
+        }
+        if($dispy_font_size == "12.5") {
+            echo "
+                .wall-item-container .wall-item-content {
+                    font-size: 12.5px;
+                }
+                .wall-item-photo-container .wall-item-content {
+                    font-size: 12.5px;
+                }";
+        }
+        if($dispy_font_size == "12") {
+            echo "
+                .wall-item-container .wall-item-content {
+                    font-size: 12px;
+                }
+                .wall-item-photo-container .wall-item-content {
+                    font-size: 12px;
+                }";
+        }
+        if($line_height == "1.5") {
+            echo "
+                .wall-item-container .wall-item-content {
+                    line-height: 1.5;
+                }
+                .wall-item-photo-container .wall-item-content {
+                    line-height: 1.5;
+                }";
+        }	
+        if($line_height == "1.4") {
+            echo "
+                .wall-item-container .wall-item-content {
+                    line-height: 1.4;
+                }
+                .wall-item-photo-container .wall-item-content {
+                    line-height: 1.4;
+                }";
+        }
+        if($line_height == "1.3") {
+            echo "
+                .wall-item-container .wall-item-content {
+                    line-height: 1.3;
+                }
+                .wall-item-photo-container .wall-item-content {
+                    line-height: 1.3;
+                }";
+        }
+        if($line_height == "1.2") {
+            echo "
+                .wall-item-container .wall-item-content {
+                    line-height: 1.2;
+                }
+                .wall-item-photo-container .wall-item-content {
+                    line-height: 1.2;
+                }";
+        }
+        if($line_height == "1.1") {
+            echo "
+                .wall-item-container .wall-item-content {
+                    line-height: 1.1;
+                }
+                .wall-item-photo-container .wall-item-content {
+                    line-height: 1.1;
+                }";
+        }
+    }
+
+    if($colour == "dark") {
+        if (file_exists("$THEMEPATH/dark/style.css")) { 
+            echo file_get_contents("$THEMEPATH/dark/style.css");
+        }
+        if($dispy_font_size == "16") {
+            echo "
+                .wall-item-container .wall-item-content {
+                    font-size: 16px;
+                }
+                .wall-item-photo-container .wall-item-content {
+                    font-size: 16px;
+                }";  
+        }
+        if($dispy_font_size == "15") {
+            echo "
+                .wall-item-container .wall-item-content {
+                    font-size: 15px;
+                }
+                .wall-item-photo-container .wall-item-content {
+                    font-size: 15px;
+                }";
+        }	
+        if($dispy_font_size == "14") {
+            echo "
+                .wall-item-container .wall-item-content {
+                    font-size: 14px;
+                }
+                .wall-item-photo-container .wall-item-content {
+                    font-size: 14px;
+                }";
+        }
+        if($dispy_font_size == "13.5") {
+            echo "
+                .wall-item-container .wall-item-content {
+                    font-size: 13.5px;
+                }
+                .wall-item-photo-container .wall-item-content {
+                    font-size: 13.5px;
+                }";
+        }
+        if($dispy_font_size == "13") {
+            echo "
+                .wall-item-container .wall-item-content {
+                    font-size: 13px;
+                }
+                .wall-item-photo-container .wall-item-content {
+                    font-size: 13px;
+                }";
+        }
+        if($dispy_font_size == "12.5") {
+            echo "
+                .wall-item-container .wall-item-content {
+                    font-size: 12.5px;
+                }
+                .wall-item-photo-container .wall-item-content {
+                    font-size: 12.5px;
+                }";
+        }
+        if($dispy_font_size == "12") {
+            echo "
+                .wall-item-container .wall-item-content {
+                    font-size: 12px;
+                }
+                .wall-item-photo-container .wall-item-content {
+                    font-size: 12px;
+                }";
+        }
+        if($line_height == "1.5") {
+            echo "
+                .wall-item-container .wall-item-content {
+                    line-height: 1.5;
+                }
+                .wall-item-photo-container .wall-item-content {
+                    line-height: 1.5;
+                }";
+        }	
+        if($line_height == "1.4"){
+            echo "
+                .wall-item-container .wall-item-content {
+                    line-height: 1.4;
+                }
+                .wall-item-photo-container .wall-item-content {
+                    line-height: 1.4;
+                }";
+        }
+        if($line_height == "1.3") {
+            echo "
+                .wall-item-container .wall-item-content {
+                    line-height: 1.3;
+                }
+                .wall-item-photo-container .wall-item-content {
+                    line-height: 1.3;
+                }";
+        }
+        if($line_height == "1.2") {
+            echo "
+                .wall-item-container .wall-item-content {
+                    line-height: 1.2;
+                }
+                .wall-item-photo-container .wall-item-content {
+                    line-height: 1.2;
+                }";
+        }
+        if($line_height == "1.1") {
+            echo "
+                .wall-item-container .wall-item-content {
+                    line-height: 1.1;
+                }
+                .wall-item-photo-container .wall-item-content {
+                    line-height: 1.1;
+                }";
+        }
+    }
+
diff --git a/view/theme/dispy/theme.php b/view/theme/dispy/theme.php
index b72de51e5..1598220b8 100644
--- a/view/theme/dispy/theme.php
+++ b/view/theme/dispy/theme.php
@@ -2,22 +2,38 @@
 
 /*
  * Name: Dispy
- * Description: Dispy, Friendica theme
- * Version: 1.1
- * Author: unknown
+ * Description: <p style="white-space:pre;">            Dispy: Light, Spartan, Sleek, and Functional<br />            Dispy Dark: Dark, Spartan, Sleek, and Functional</p>
+ * Version: 1.2
+ * Author: Simon <http://simon.kisikew.org/>
  * Maintainer: Simon <http://simon.kisikew.org/>
  * Screenshot: <a href="screenshot.jpg">Screenshot</a>
  */
 
 $a = get_app();
 $a->theme_info = array(
-	'name' => 'dispy',
-	'version' => '1.1'
+    'family' => 'dispy',
+	'version' => '1.2'
 );
 
 function dispy_init(&$a) {
 
-	// aside on profile page
+    /** @purpose set some theme defaults
+    */
+    $cssFile = null;
+    $colour = false;
+    $colour = get_pconfig(local_user(), "dispy", "colour");
+    if ($colour === false) { $colour = "light"; }
+    if ($colour == "light") {
+		$colour_path = "/light/";
+		require_once ('light/theme.php');
+	}
+    if ($colour == "dark") {
+		$colour_path = "/dark/";
+		require_once ('dark/theme.php');
+	}
+
+    /** @purpose aside on profile page
+    */
 	if (($a->argv[0] . $a->argv[1]) === ("profile" . $a->user['nickname'])) {
 		dispy_community_info();
 	}
@@ -139,10 +155,17 @@ function dispy_init(&$a) {
 	</script>
 EOT;
 
+    // custom css
+    if (!is_null($cssFile)) {
+        $a->page['htmlhead'] .= sprintf('<link rel="stylesheet" type="text/css" href="%s" />', $cssFile);
+    }
+
 	js_in_foot();
 }
 
 function dispy_community_info() {
+    /** @purpose some sidebar stuff for new users
+    */
 	$a = get_app();
 	$url = $a->get_baseurl($ssl_state);
 	$aside['$url'] = $url;
diff --git a/view/theme/diabook/diabook-red/theme_settings.tpl b/view/theme/dispy/theme_settings.tpl
index 3ae5fdbf8..9d250cb3a 100644
--- a/view/theme/diabook/diabook-red/theme_settings.tpl
+++ b/view/theme/dispy/theme_settings.tpl
@@ -1,10 +1,10 @@
+{{inc field_select.tpl with $field=$colour}}{{endinc}}
+
 {{inc field_select.tpl with $field=$font_size}}{{endinc}}
 
 {{inc field_select.tpl with $field=$line_height}}{{endinc}}
 
-{{inc field_select.tpl with $field=$resolution}}{{endinc}}
-
 <div class="settings-submit-wrapper">
-	<input type="submit" value="$submit" class="settings-submit" name="diabook-red-settings-submit" />
+	<input type="submit" value="$submit" class="settings-submit" name="dispy-settings-submit" />
 </div>
 
diff --git a/view/theme/dispy/wall_item.tpl b/view/theme/dispy/wall_item.tpl
index 52af07532..35e65f397 100644
--- a/view/theme/dispy/wall_item.tpl
+++ b/view/theme/dispy/wall_item.tpl
@@ -40,7 +40,7 @@
 			</ul><br style="clear:left;" />
 			<ul class="wall-item-subtools2">
 				{{ if $item.filer }}
-				<li><a href="#" id="filer-$item.id" onclick="itemFiler($item.id); return false;" class="filer-item icon file-as" title="$item.star.filer"></a></li>
+				<li><a href="#" id="filer-$item.id" onclick="itemFiler($item.id); return false;" class="filer-item icon file-as" title="$item.filer"></a></li>
 				{{ endif }}
 				{{ if $item.plink }}
 				<li class="wall-item-links-wrapper"><a href="$item.plink.href" title="$item.plink.title" target="external-link" class="icon remote-link"></a></li>
diff --git a/view/theme/duepuntozero/bbedit.png b/view/theme/duepuntozero/bbedit.png
new file mode 100644
index 000000000..b89f2f7a8
--- /dev/null
+++ b/view/theme/duepuntozero/bbedit.png
diff --git a/view/theme/dispy-dark/comment_item.tpl b/view/theme/duepuntozero/comment_item.tpl
index b4fbae5df..ea24d95cc 100644..100755
--- a/view/theme/dispy-dark/comment_item.tpl
+++ b/view/theme/duepuntozero/comment_item.tpl
@@ -13,53 +13,43 @@
 				<div class="comment-edit-photo-end"></div>
 				<ul class="comment-edit-bb-$id">
 					<li><a class="editicon boldbb shadow"
-						style="cursor: pointer;"
+						style="cursor: pointer;" title="$edbold"
 						onclick="insertFormatting('$comment','b', $id);"></a></li>
 					<li><a class="editicon italicbb shadow"
-						style="cursor: pointer;"
+						style="cursor: pointer;" title="$editalic"
 						onclick="insertFormatting('$comment','i', $id);"></a></li>
 					<li><a class="editicon underlinebb shadow"
-						style="cursor: pointer;"
+						style="cursor: pointer;" title="$eduline"
 						onclick="insertFormatting('$comment','u', $id);"></a></li>
 					<li><a class="editicon quotebb shadow"
-						style="cursor: pointer;"
+						style="cursor: pointer;" title="$edquote"
 						onclick="insertFormatting('$comment','quote', $id);"></a></li>
 					<li><a class="editicon codebb shadow"
-						style="cursor: pointer;"
+						style="cursor: pointer;" title="$edcode"
 						onclick="insertFormatting('$comment','code', $id);"></a></li>
 					<li><a class="editicon imagebb shadow"
-						style="cursor: pointer;"
+						style="cursor: pointer;" title="$edimg"
 						onclick="insertFormatting('$comment','img', $id);"></a></li>
 					<li><a class="editicon urlbb shadow"
-						style="cursor: pointer;"
+						style="cursor: pointer;" title="$edurl"
 						onclick="insertFormatting('$comment','url', $id);"></a></li>
 					<li><a class="editicon videobb shadow"
-						style="cursor: pointer;"
+						style="cursor: pointer;" title="$edvideo"
 						onclick="insertFormatting('$comment','video', $id);"></a></li>
-				</ul>
+				</ul>	
 				<div class="comment-edit-bb-end"></div>
-				<textarea id="comment-edit-text-$id"
-					class="comment-edit-text-empty"
-					name="body"
-					onfocus="commentOpen(this,$id);tautogrow($id);cmtBbOpen($id);"
-					onblur="commentClose(this,$id);"
-					placeholder="Comment">$comment</textarea>
+				<textarea id="comment-edit-text-$id" class="comment-edit-text-empty" name="body" onFocus="commentOpen(this,$id);cmtBbOpen($id);" onBlur="commentClose(this,$id);" >$comment</textarea>			
 				{{ if $qcomment }}
-                <div class="qcomment-wrapper">
-					<select id="qcomment-select-$id"
-						name="qcomment-$id"
-						class="qcomment"
-						onchange="qCommentInsert(this,$id);">
+					<select id="qcomment-select-$id" name="qcomment-$id" class="qcomment" onchange="qCommentInsert(this,$id);" >
 					<option value=""></option>
-					{{ for $qcomment as $qc }}
-					<option value="$qc">$qc</option>
-					{{ endfor }}
+				{{ for $qcomment as $qc }}
+					<option value="$qc">$qc</option>				
+				{{ endfor }}
 					</select>
-				</div>
 				{{ endif }}
 
 				<div class="comment-edit-text-end"></div>
-				<div class="comment-edit-submit-wrapper" id="comment-edit-submit-wrapper-$id" style="display: none;">
+				<div class="comment-edit-submit-wrapper" id="comment-edit-submit-wrapper-$id" style="display: none;" >
 					<input type="submit" onclick="post_comment($id); return false;" id="comment-edit-submit-$id" class="comment-edit-submit" name="submit" value="$submit" />
 					<span onclick="preview_comment($id);" id="comment-edit-preview-link-$id" class="fakelink">$preview</span>
 					<div id="comment-edit-preview-$id" class="comment-edit-preview" style="display:none;"></div>
diff --git a/view/theme/duepuntozero/editicons.png b/view/theme/duepuntozero/editicons.png
new file mode 100644
index 000000000..171a40876
--- /dev/null
+++ b/view/theme/duepuntozero/editicons.png
diff --git a/view/theme/duepuntozero/nav.tpl b/view/theme/duepuntozero/nav.tpl
new file mode 100644
index 000000000..257822df4
--- /dev/null
+++ b/view/theme/duepuntozero/nav.tpl
@@ -0,0 +1,70 @@
+<nav>
+	$langselector
+
+	<div id="site-location">$sitelocation</div>
+
+	{{ if $nav.logout }}<a id="nav-logout-link" class="nav-link $nav.logout.2" href="$nav.logout.0" title="$nav.logout.3" >$nav.logout.1</a> {{ endif }}
+	{{ if $nav.login }}<a id="nav-login-link" class="nav-login-link $nav.login.2" href="$nav.login.0" title="$nav.login.3" >$nav.login.1</a> {{ endif }}
+
+	<span id="nav-link-wrapper" >
+
+	{{ if $nav.register }}<a id="nav-register-link" class="nav-commlink $nav.register.2 $sel.register" href="$nav.register.0" title="$nav.register.3" >$nav.register.1</a>{{ endif }}
+		
+	{{ if $nav.help }} <a id="nav-help-link" class="nav-link $nav.help.2" target="friendika-help" href="$nav.help.0" title="$nav.help.3" >$nav.help.1</a>{{ endif }}
+		
+	{{ if $nav.apps }}<a id="nav-apps-link" class="nav-link $nav.apps.2" href="$nav.apps.0" title="$nav.apps.3" >$nav.apps.1</a>{{ endif }}
+
+	<a id="nav-search-link" class="nav-link $nav.search.2" href="$nav.search.0" title="$nav.search.3" >$nav.search.1</a>
+	<a id="nav-directory-link" class="nav-link $nav.directory.2" href="$nav.directory.0" title="$nav.directory.3" >$nav.directory.1</a>
+
+	{{ if $nav.admin }}<a id="nav-admin-link" class="nav-link $nav.admin.2" href="$nav.admin.0" title="$nav.admin.3" >$nav.admin.1</a>{{ endif }}
+
+	{{ if $nav.network }}
+	<a id="nav-network-link" class="nav-commlink $nav.network.2 $sel.network" href="$nav.network.0" title="$nav.network.3" >$nav.network.1</a>
+	<span id="net-update" class="nav-ajax-left"></span>
+	{{ endif }}
+	{{ if $nav.home }}
+	<a id="nav-home-link" class="nav-commlink $nav.home.2 $sel.home" href="$nav.home.0" title="$nav.home.3" >$nav.home.1</a>
+	<span id="home-update" class="nav-ajax-left"></span>
+	{{ endif }}
+	{{ if $nav.community }}
+	<a id="nav-community-link" class="nav-commlink $nav.community.2 $sel.community" href="$nav.community.0" title="$nav.community.3" >$nav.community.1</a>
+	{{ endif }}
+	{{ if $nav.introductions }}
+	<a id="nav-notify-link" class="nav-commlink $nav.introductions.2 $sel.introductions" href="$nav.introductions.0" title="$nav.introductions.3" >$nav.introductions.1</a>
+	<span id="intro-update" class="nav-ajax-left"></span>
+	{{ endif }}
+	{{ if $nav.messages }}
+	<a id="nav-messages-link" class="nav-commlink $nav.messages.2 $sel.messages" href="$nav.messages.0" title="$nav.messages.3" >$nav.messages.1</a>
+	<span id="mail-update" class="nav-ajax-left"></span>
+	{{ endif }}
+
+
+
+
+
+		{{ if $nav.notifications }}
+			<a id="nav-notifications-linkmenu" class="nav-commlink" href="$nav.notifications.0" rel="#nav-notifications-menu" title="$nav.notifications.1">$nav.notifications.1</a>
+				<span id="notify-update" class="nav-ajax-left"></span>
+				<ul id="nav-notifications-menu" class="menu-popup">
+					<li id="nav-notifications-see-all"><a href="$nav.notifications.all.0">$nav.notifications.all.1</a></li>
+					<li id="nav-notifications-mark-all"><a href="#" onclick="notifyMarkAll(); return false;">$nav.notifications.mark.1</a></li>
+					<li class="empty">$emptynotifications</li>
+				</ul>
+		{{ endif }}		
+
+	{{ if $nav.settings }}<a id="nav-settings-link" class="nav-link $nav.settings.2" href="$nav.settings.0" title="$nav.settings.3">$nav.settings.1</a>{{ endif }}
+	{{ if $nav.profiles }}<a id="nav-profiles-link" class="nav-link $nav.profiles.2" href="$nav.profiles.0" title="$nav.profiles.3" >$nav.profiles.1</a>{{ endif }}
+
+	{{ if $nav.contacts }}<a id="nav-contacts-link" class="nav-link $nav.contacts.2" href="$nav.contacts.0" title="$nav.contacts.3" >$nav.contacts.1</a>{{ endif }}
+
+
+	{{ if $nav.manage }}<a id="nav-manage-link" class="nav-link $nav.manage.2 $sel.manage" href="$nav.manage.0" title="$nav.manage.3">$nav.manage.1</a>{{ endif }}
+	</span>
+	<span id="nav-end"></span>
+	<span id="banner">$banner</span>
+</nav>
+
+<ul id="nav-notifications-template" style="display:none;" rel="template">
+	<li class="{4}"><a href="{0}"><img src="{1}" height="24" width="24" alt="" />{2} <span class="notif-when">{3}</span></a></li>
+</ul>
diff --git a/view/theme/duepuntozero/style.css b/view/theme/duepuntozero/style.css
index c30e643ce..2667c4334 100644
--- a/view/theme/duepuntozero/style.css
+++ b/view/theme/duepuntozero/style.css
@@ -134,7 +134,8 @@ nav #banner #logo-text a:hover { text-decoration: none; }
     height: 15px;
 	margin-top: 67px;
 	margin-right: 2px;
-	padding: 6px 10px;
+	//padding: 6px 10px;
+       padding: 6px 3px;
 	float: left;
 	bottom: 140px;
 	border: 1px solid #babdb6;
@@ -232,10 +233,12 @@ section {
 	display:block;
 	float:left;
 	padding: 0.4em;
-	margin-right: 1em;
+	//margin-right: 1em;
+	margin-right: 3px ;
 }
 .tab.active {
 	font-weight: bold;
+	
 }
 
 
@@ -2937,6 +2940,79 @@ aside input[type='text'] {
 }
 
 .icon.dim { opacity: 0.3;filter:alpha(opacity=30); }
+[class^="comment-edit-bb"] {
+	list-style: none;
+	display: none;
+	margin: 0px 0 -5px 60px;
+	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(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;
diff --git a/view/theme/duepuntozero/theme.php b/view/theme/duepuntozero/theme.php
index 7b42088e1..2498852f9 100644
--- a/view/theme/duepuntozero/theme.php
+++ b/view/theme/duepuntozero/theme.php
@@ -4,6 +4,42 @@ $a->theme_info = array();
 function duepuntozero_init(&$a) {
 $a->page['htmlhead'] .= <<< EOT
 <script>
+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(id) {
+	$(".comment-edit-bb-" + id).show();
+}
+function cmtBbClose(comment, id) {
+	$(".comment-edit-bb-" + id).hide();
+}
 $(document).ready(function() {
 
 $('html').click(function() { $("#nav-notifications-menu" ).hide(); });
diff --git a/view/theme/greenzero/editicons.png b/view/theme/greenzero/editicons.png
new file mode 100644
index 000000000..171a40876
--- /dev/null
+++ b/view/theme/greenzero/editicons.png
diff --git a/view/theme/greenzero/theme.php b/view/theme/greenzero/theme.php
index c80202475..a63d8a235 100644
--- a/view/theme/greenzero/theme.php
+++ b/view/theme/greenzero/theme.php
@@ -6,6 +6,42 @@ $a->theme_info = array(
 function greenzero_init(&$a) {
 $a->page['htmlhead'] .= <<< EOT
 <script>
+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(id) {
+	$(".comment-edit-bb-" + id).show();
+}
+function cmtBbClose(id) {
+	$(".comment-edit-bb-" + id).hide();
+}
 $(document).ready(function() {
 
 $('html').click(function() { $("#nav-notifications-menu" ).hide(); });
diff --git a/view/theme/purplezero/editicons.png b/view/theme/purplezero/editicons.png
new file mode 100644
index 000000000..171a40876
--- /dev/null
+++ b/view/theme/purplezero/editicons.png
diff --git a/view/theme/purplezero/theme.php b/view/theme/purplezero/theme.php
index b9613027c..4ae9d579f 100644
--- a/view/theme/purplezero/theme.php
+++ b/view/theme/purplezero/theme.php
@@ -6,6 +6,42 @@ $a->theme_info = array(
 function purplezero_init(&$a) {
 $a->page['htmlhead'] .= <<< EOT
 <script>
+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(id) {
+	$(".comment-edit-bb-" + id).show();
+}
+function cmtBbClose(id) {
+	$(".comment-edit-bb-" + id).hide();
+}
 $(document).ready(function() {
 
 $('html').click(function() { $("#nav-notifications-menu" ).hide(); });
diff --git a/view/theme/quattro/birthdays_reminder.tpl b/view/theme/quattro/birthdays_reminder.tpl
new file mode 100644
index 000000000..8b1378917
--- /dev/null
+++ b/view/theme/quattro/birthdays_reminder.tpl
@@ -0,0 +1 @@
+
diff --git a/view/theme/quattro/events_reminder.tpl b/view/theme/quattro/events_reminder.tpl
new file mode 100644
index 000000000..fc13fa68b
--- /dev/null
+++ b/view/theme/quattro/events_reminder.tpl
@@ -0,0 +1,39 @@
+<link rel='stylesheet' type='text/css' href='$baseurl/library/fullcalendar/fullcalendar.css' />
+<script language="javascript" type="text/javascript"
+          src="$baseurl/library/fullcalendar/fullcalendar.min.js"></script>
+<script>
+	// start calendar from yesterday
+	var yesterday= new Date()
+	yesterday.setDate(yesterday.getDate()-1)
+	
+	function showEvent(eventid) {
+		$.get(
+			'$baseurl/events/?id='+eventid,
+			function(data){
+				$.fancybox(data);
+			}
+		);			
+	}
+	$(document).ready(function() {
+		$('#events-reminder').fullCalendar({
+			firstDay: yesterday.getDay(),
+			year: yesterday.getFullYear(),
+			month: yesterday.getMonth(),
+			date: yesterday.getDate(),
+			events: '$baseurl/events/json/',
+			header: {
+				left: '',
+				center: '',
+				right: ''
+			},			
+			timeFormat: 'H(:mm)',
+			defaultView: 'basicWeek',
+			height: 50,
+			eventClick: function(calEvent, jsEvent, view) {
+				showEvent(calEvent.id);
+			}
+		});
+	});
+</script>
+<div id="events-reminder"></div>
+<br>
diff --git a/view/theme/slack-NS/editicons.png b/view/theme/slack-NS/editicons.png
new file mode 100644
index 000000000..171a40876
--- /dev/null
+++ b/view/theme/slack-NS/editicons.png
diff --git a/view/theme/slack-NS/theme.php b/view/theme/slack-NS/theme.php
index a8934d03b..14d058c7d 100644
--- a/view/theme/slack-NS/theme.php
+++ b/view/theme/slack-NS/theme.php
@@ -6,6 +6,42 @@ $a->theme_info = array(
 function slack_NS_init(&$a) {
 $a->page['htmlhead'] .= <<< EOT
 <script>
+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(id) {
+	$(".comment-edit-bb-" + id).show();
+}
+function cmtBbClose(id) {
+	$(".comment-edit-bb-" + id).hide();
+}
 $(document).ready(function() {
 
 $('html').click(function() { $("#nav-notifications-menu" ).hide(); });
diff --git a/view/theme/slackr/editicons.png b/view/theme/slackr/editicons.png
new file mode 100644
index 000000000..171a40876
--- /dev/null
+++ b/view/theme/slackr/editicons.png
diff --git a/view/theme/slackr/theme.php b/view/theme/slackr/theme.php
index 78f5d40f0..99e061a2f 100644
--- a/view/theme/slackr/theme.php
+++ b/view/theme/slackr/theme.php
@@ -6,6 +6,43 @@ $a->theme_info = array(
 function slackr_init(&$a) {
 $a->page['htmlhead'] .= <<< EOT
 <script>
+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(id) {
+	$(".comment-edit-bb-" + id).show();
+}
+function cmtBbClose(id) {
+	$(".comment-edit-bb-" + id).hide();
+}
 $(document).ready(function() {
 
 $('html').click(function() { $("#nav-notifications-menu" ).hide(); });