Merge https://github.com/friendica/friendica into pull

79 files changed, 4862 insertions, 1518 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/cleanzero/js/jquery.ae.image.resize.js b/view/theme/cleanzero/js/jquery.ae.image.resize.js
new file mode 100644
index 000000000..bac09cd45
--- /dev/null
+++ b/view/theme/cleanzero/js/jquery.ae.image.resize.js
@@ -0,0 +1,69 @@
+(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/cleanzero/js/jquery.ae.image.resize.min.js b/view/theme/cleanzero/js/jquery.ae.image.resize.min.js
new file mode 100644
index 000000000..16c30b123
--- /dev/null
+++ b/view/theme/cleanzero/js/jquery.ae.image.resize.min.js
@@ -0,0 +1 @@
+(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/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/cleanzero/theme_settings.tpl b/view/theme/cleanzero/theme_settings.tpl
new file mode 100644
index 000000000..07e7cba05
--- /dev/null
+++ b/view/theme/cleanzero/theme_settings.tpl
@@ -0,0 +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}}
+
+
+
+<div class="settings-submit-wrapper">
+	<input type="submit" value="$submit" class="settings-submit" name="cleanzero-settings-submit" />
+</div>
+
diff --git a/view/theme/diabook/theme.php b/view/theme/diabook/theme.php
index 073e270ef..c45db9884 100755
--- a/view/theme/diabook/theme.php
+++ b/view/theme/diabook/theme.php
@@ -14,12 +14,17 @@ $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/";
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/comment_item.tpl b/view/theme/dispy-dark/comment_item.tpl
deleted file mode 100644
index b4fbae5df..000000000
--- a/view/theme/dispy-dark/comment_item.tpl
+++ /dev/null
@@ -1,71 +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>
-				<ul class="comment-edit-bb-$id">
-					<li><a class="editicon boldbb shadow"
-						style="cursor: pointer;"
-						onclick="insertFormatting('$comment','b', $id);"></a></li>
-					<li><a class="editicon italicbb shadow"
-						style="cursor: pointer;"
-						onclick="insertFormatting('$comment','i', $id);"></a></li>
-					<li><a class="editicon underlinebb shadow"
-						style="cursor: pointer;"
-						onclick="insertFormatting('$comment','u', $id);"></a></li>
-					<li><a class="editicon quotebb shadow"
-						style="cursor: pointer;"
-						onclick="insertFormatting('$comment','quote', $id);"></a></li>
-					<li><a class="editicon codebb shadow"
-						style="cursor: pointer;"
-						onclick="insertFormatting('$comment','code', $id);"></a></li>
-					<li><a class="editicon imagebb shadow"
-						style="cursor: pointer;"
-						onclick="insertFormatting('$comment','img', $id);"></a></li>
-					<li><a class="editicon urlbb shadow"
-						style="cursor: pointer;"
-						onclick="insertFormatting('$comment','url', $id);"></a></li>
-					<li><a class="editicon videobb shadow"
-						style="cursor: pointer;"
-						onclick="insertFormatting('$comment','video', $id);"></a></li>
-				</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>
-				{{ if $qcomment }}
-                <div class="qcomment-wrapper">
-					<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>
-				</div>
-				{{ 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/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/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
index e1c5ff869..d151cfa1c 100644
--- a/view/theme/dispy-dark/style.css
+++ b/view/theme/dispy/dark/style.css
@@ -45,7 +45,7 @@ nav{height:60px;background-color:#1d1f1d;color:#eeeeec;position:relative;padding
 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 .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;}
@@ -71,14 +71,14 @@ nav #nav-notifications-linkmenu.on .icon.s22.notify,nav #nav-notifications-linkm
 #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;}
+.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("menu-user-pin.jpg") 98% center no-repeat;clear:both;top:4px;left:10px;padding:2px;}#user-menu>a{vertical-align:top;}
+#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(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,.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;}
@@ -105,7 +105,7 @@ nav #nav-notifications-linkmenu.on .icon.s22.notify,nav #nav-notifications-linkm
 #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;}
+#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;}
@@ -135,7 +135,7 @@ nav #nav-notifications-linkmenu.on .icon.s22.notify,nav #nav-notifications-linkm
 #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;}
+.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;}
@@ -169,7 +169,7 @@ nav #nav-notifications-linkmenu.on .icon.s22.notify,nav #nav-notifications-linkm
 .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-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"] *>*{}
@@ -227,8 +227,8 @@ div[id$="wrapper"]{height:100%;margin-bottom:1em;}div[id$="wrapper"] br{clear:le
 .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{left:0;top:0;background-image:url(dark/prev.png);}
+#photo-next-link{right:0;top:0;background-image:url(dark/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;}
@@ -289,10 +289,10 @@ div[id$="wrapper"]{height:100%;margin-bottom:1em;}div[id$="wrapper"] br{clear:le
 #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-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(login-bg.gif) no-repeat;background-position:0 50%;padding-left:18px;}
+#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;}
@@ -303,7 +303,7 @@ div[id$="wrapper"]{height:100%;margin-bottom:1em;}div[id$="wrapper"] br{clear:le
 .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;}
+.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;}
@@ -424,8 +424,8 @@ input[type="submit"]:active,input[type="button"]:active{box-shadow:0 0 0 0;}
 .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;}
+.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;}
diff --git a/view/theme/dispy-dark/style.less b/view/theme/dispy/dark/style.less
index 6d810a8d4..6bab0109a 100644
--- a/view/theme/dispy-dark/style.less
+++ b/view/theme/dispy/dark/style.less
@@ -318,7 +318,7 @@ nav .nav-link {
   overflow: hidden;
   margin: 0px 5px 5px;
   text-indent: 50px;
-  background: transparent url(icons.png) 0 0 no-repeat; }
+  background: transparent url(dark/icons.png) 0 0 no-repeat; }
 
 #nav-apps-link {
   background-position: 0 -66px;
@@ -462,7 +462,7 @@ nav #nav-notifications-linkmenu {
   height: 22px;
   overflow: hidden;
   margin: 0px;
-  background: transparent url(icons.png) -190px -60px no-repeat; }
+  background: transparent url(dark/icons.png) -190px -60px no-repeat; }
 
 .search-box {
   display: inline-block;
@@ -504,7 +504,7 @@ nav #nav-notifications-linkmenu {
   -webkit-border-radius: 5px;
   -moz-border-radius: 5px;
   border-radius: 5px;
-  background: #555753 url("menu-user-pin.jpg") 98% center no-repeat;
+  background: #555753 url("dark/menu-user-pin.jpg") 98% center no-repeat;
   clear: both;
   top: 4px;
   left: 10px;
@@ -520,7 +520,7 @@ nav #nav-notifications-linkmenu {
 .nav-ajax-update, .nav-ajax-left {
   width: 30px;
   height: 19px;
-  background: transparent url(notifications.png) 0 0 no-repeat;
+  background: transparent url(dark/notifications.png) 0 0 no-repeat;
   color: #222;
   font-weight: bold;
   font-size: 0.8em;
@@ -712,7 +712,7 @@ nav #nav-notifications-linkmenu {
   list-style: none; }
 
 #dfrn-request-link {
-  background: #3465a4 url(connect.png) no-repeat 95% center;
+  background: #3465a4 url(dark/connect.png) no-repeat 95% center;
   border-radius: 5px 5px 5px 5px;
   color: #eec;
   display: block;
@@ -720,7 +720,7 @@ nav #nav-notifications-linkmenu {
   padding: 0.2em 0.5em; }
 
 #wallmessage-link {
-  /*background: #3465A4 url(connect.png) no-repeat 95% center;*/
+  /*background: #3465A4 url(dark/connect.png) no-repeat 95% center;*/
   /*border-radius: 5px 5px 5px 5px;*/
   color: #eee;
   display: block;
@@ -888,7 +888,7 @@ nav #nav-notifications-linkmenu {
   display: block;
   width: 20px;
   height: 20px;
-  background: url(icons.png) no-repeat -128px -40px;
+  background: url(dark/icons.png) no-repeat -128px -40px;
   border: 0;
   text-decoration: none;
   float: right;
@@ -1093,7 +1093,7 @@ nav #nav-notifications-linkmenu {
 .wall-item-photo-menu-button {
   display: none;
   text-indent: -99999px;
-  background: #555753 url(menu-user-pin.jpg) no-repeat 75px center;
+  background: #555753 url(dark/menu-user-pin.jpg) no-repeat 75px center;
   position: absolute;
   overflow: hidden;
   height: 20px;
@@ -1461,12 +1461,12 @@ div {
 #photo-prev-link {
   left: 0;
   top: 0;
-  background-image: url(prev.png); }
+  background-image: url(dark/prev.png); }
 
 #photo-next-link {
   right: 0;
   top: 0;
-  background-image: url(next.png); }
+  background-image: url(dark/next.png); }
 
 #photo-prev-link a, #photo-next-link a {
   display: block;
@@ -1717,7 +1717,7 @@ div {
 
 .contact-photo-menu-button {
   position: absolute;
-  background-image: url("photo-menu.jpg");
+  background-image: url("dark/photo-menu.jpg");
   background-position: top left;
   background-repeat: no-repeat;
   margin: 0px;
@@ -1759,7 +1759,7 @@ div {
 .openid {}
 
 #id_openid_url {
-  background: url(login-bg.gif) no-repeat;
+  background: url(dark/login-bg.gif) no-repeat;
   background-position: 0 50%;
   padding-left: 18px; }
 
@@ -1820,7 +1820,7 @@ div {
   margin: 20px 20px 0px 0px; }
 
 .icon-profile-edit {
-  background: url("icons.png") -150px 0px no-repeat;
+  background: url("dark/icons.png") -150px 0px no-repeat;
   border: 0;
   cursor: pointer;
   display: block;
@@ -2449,7 +2449,7 @@ input {
   display: block;
   width: 20px;
   height: 20px;
-  background: url(icons.png) no-repeat;
+  background: url(dark/icons.png) no-repeat;
   border: 0;
   text-decoration: none;
   border-radius: 5px;
@@ -2461,7 +2461,7 @@ input {
   display: inline-block;
   width: 21px;
   height: 21px;
-  background: url(editicons.png) no-repeat;
+  background: url(dark/editicons.png) no-repeat;
   border: 0;
   text-decoration: none; }
 
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..7c996f6f9
--- /dev/null
+++ b/view/theme/dispy/light/style.css
@@ -0,0 +1,518 @@
+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;}
+[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(light/prev.png);}
+#photo-next-link{right:0;top:0;background-image:url(light/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("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..141ff731b
--- /dev/null
+++ b/view/theme/dispy/light/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(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; } } }
+
+[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(light/prev.png); }
+
+#photo-next-link {
+  right: 0;
+  top: 0;
+  background-image: url(light/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("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.php b/view/theme/dispy/style.php
new file mode 100644
index 000000000..c0706af63
--- /dev/null
+++ b/view/theme/dispy/style.php
@@ -0,0 +1,250 @@
+<?php
+    $line_height = false;
+    $dispy_font_size = false;
+    $resolution = false;
+    $color = false;
+    $site_line_height = get_config("dispy","line_height");
+    $site_dispy_font_size = get_config("dispy", "font_size" );
+    $site_color = 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");
+        $color = 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($color == "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($color == "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/dispy/theme_settings.tpl b/view/theme/dispy/theme_settings.tpl
new file mode 100644
index 000000000..9d250cb3a
--- /dev/null
+++ b/view/theme/dispy/theme_settings.tpl
@@ -0,0 +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}}
+
+<div class="settings-submit-wrapper">
+	<input type="submit" value="$submit" class="settings-submit" name="dispy-settings-submit" />
+</div>
+
diff --git a/view/theme/duepuntozero/nav.tpl b/view/theme/duepuntozero/nav.tpl
new file mode 100644
index 000000000..4dacf3858
--- /dev/null
+++ b/view/theme/duepuntozero/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/duepuntozero/style.css b/view/theme/duepuntozero/style.css
index 8e131ad20..0429ba5f0 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;
+	
 }