Merge remote-tracking branch 'upstream/master'

Merge upstream

2106 files changed, 98887 insertions, 17706 deletions

diff --git a/.gitignore b/.gitignore
index 2531fe4cd..2531fe4cd 100755..100644
--- a/.gitignore
+++ b/.gitignore
diff --git a/.htaccess b/.htaccess
index 6cb3a0749..6cb3a0749 100755..100644
--- a/.htaccess
+++ b/.htaccess
diff --git a/INSTALL.txt b/INSTALL.txt
index 574e90975..574e90975 100755..100644
--- a/INSTALL.txt
+++ b/INSTALL.txt
diff --git a/LICENSE b/LICENSE
index 15c3e825b..15c3e825b 100755..100644
--- a/LICENSE
+++ b/LICENSE
diff --git a/boot.php b/boot.php
index 2f2e28ceb..1dd52fe7f 100755..100644
--- a/boot.php
+++ b/boot.php
@@ -9,9 +9,9 @@ require_once('include/nav.php');
 require_once('include/cache.php');
 
 define ( 'FRIENDICA_PLATFORM',     'Friendica');
-define ( 'FRIENDICA_VERSION',      '2.3.1299' );
+define ( 'FRIENDICA_VERSION',      '2.3.1320' );
 define ( 'DFRN_PROTOCOL_VERSION',  '2.23'    );
-define ( 'DB_UPDATE_VERSION',      1134      );
+define ( 'DB_UPDATE_VERSION',      1138      );
 
 define ( 'EOL',                    "<br />\r\n"     );
 define ( 'ATOM_TIME',              'Y-m-d\TH:i:s\Z' );
@@ -20,14 +20,14 @@ define ( 'ATOM_TIME',              'Y-m-d\TH:i:s\Z' );
 /**
  *
  * Image storage quality. Lower numbers save space at cost of image detail.
- * For ease of upgrade, please do not change here. Change jpeg quality with 
- * $a->config['system']['jpeg_quality'] = n; 
- * in .htconfig.php, where n is netween 1 and 100, and with very poor results 
- * below about 50 
+ * For ease of upgrade, please do not change here. Change jpeg quality with
+ * $a->config['system']['jpeg_quality'] = n;
+ * in .htconfig.php, where n is netween 1 and 100, and with very poor results
+ * below about 50
  *
  */
 
-define ( 'JPEG_QUALITY',            100  );         
+define ( 'JPEG_QUALITY',            100  );
 
 /**
  * SSL redirection policies
@@ -68,7 +68,7 @@ define ( 'CONTACT_IS_FRIEND',   3);
 /**
  * Hook array order
  */
- 
+
 define ( 'HOOK_HOOK',      0);
 define ( 'HOOK_FILE',      1);
 define ( 'HOOK_FUNCTION',  2);
@@ -79,9 +79,9 @@ define ( 'HOOK_FUNCTION',  2);
  *
  * PAGE_NORMAL is a typical personal profile account
  * PAGE_SOAPBOX automatically approves all friend requests as CONTACT_IS_SHARING, (readonly)
- * PAGE_COMMUNITY automatically approves all friend requests as CONTACT_IS_SHARING, but with 
+ * PAGE_COMMUNITY automatically approves all friend requests as CONTACT_IS_SHARING, but with
  *      write access to wall and comments (no email and not included in page owner's ACL lists)
- * PAGE_FREELOVE automatically approves all friend requests as full friends (CONTACT_IS_FRIEND). 
+ * PAGE_FREELOVE automatically approves all friend requests as full friends (CONTACT_IS_FRIEND).
  *
  */
 
@@ -90,9 +90,10 @@ define ( 'PAGE_SOAPBOX',           1 );
 define ( 'PAGE_COMMUNITY',         2 );
 define ( 'PAGE_FREELOVE',          3 );
 define ( 'PAGE_BLOG',              4 );
+define ( 'PAGE_PRVGROUP',          5 );
 
 /**
- * Network and protocol family types 
+ * Network and protocol family types
  */
 
 define ( 'NETWORK_DFRN',             'dfrn');    // Friendica, Mistpark, other DFRN implementations
@@ -102,13 +103,13 @@ define ( 'NETWORK_FEED',             'feed');    // RSS/Atom feeds with no known
 define ( 'NETWORK_DIASPORA',         'dspr');    // Diaspora
 define ( 'NETWORK_MAIL',             'mail');    // IMAP/POP
 define ( 'NETWORK_MAIL2',            'mai2');    // extended IMAP/POP
-define ( 'NETWORK_FACEBOOK',         'face');    // Facebook API     
+define ( 'NETWORK_FACEBOOK',         'face');    // Facebook API
 define ( 'NETWORK_LINKEDIN',         'lnkd');    // LinkedIn
-define ( 'NETWORK_XMPP',             'xmpp');    // XMPP     
+define ( 'NETWORK_XMPP',             'xmpp');    // XMPP
 define ( 'NETWORK_MYSPACE',          'mysp');    // MySpace
 define ( 'NETWORK_GPLUS',            'goog');    // Google+
 
-/*
+/**
  * These numbers are used in stored permissions
  * and existing allocations MUST NEVER BE CHANGED
  * OR RE-ASSIGNED! You may only add to them.
@@ -165,7 +166,7 @@ define ( 'NOTIFY_SYSTEM',   0x8000 );
  */
 
 define ( 'NAMESPACE_ZOT',             'http://purl.org/macgirvin/zot' );
-define ( 'NAMESPACE_DFRN' ,           'http://purl.org/macgirvin/dfrn/1.0' ); 
+define ( 'NAMESPACE_DFRN' ,           'http://purl.org/macgirvin/dfrn/1.0' );
 define ( 'NAMESPACE_THREAD' ,         'http://purl.org/syndication/thread/1.0' );
 define ( 'NAMESPACE_TOMB' ,           'http://purl.org/atompub/tombstones/1.0' );
 define ( 'NAMESPACE_ACTIVITY',        'http://activitystrea.ms/spec/1.0/' );
@@ -205,6 +206,7 @@ define ( 'ACTIVITY_OBJ_P_PHOTO', NAMESPACE_ACTIVITY_SCHEMA . 'profile-photo' );
 define ( 'ACTIVITY_OBJ_ALBUM',   NAMESPACE_ACTIVITY_SCHEMA . 'photo-album' );
 define ( 'ACTIVITY_OBJ_EVENT',   NAMESPACE_ACTIVITY_SCHEMA . 'event' );
 define ( 'ACTIVITY_OBJ_TAGTERM', NAMESPACE_DFRN            . '/tagterm' );
+define ( 'ACTIVITY_OBJ_PROFILE', NAMESPACE_DFRN            . '/profile' );
 
 /**
  * item weight for query ordering
@@ -231,19 +233,19 @@ function startup() {
 
 
 	if (get_magic_quotes_gpc()) {
-    	$process = array(&$_GET, &$_POST, &$_COOKIE, &$_REQUEST);
-	    while (list($key, $val) = each($process)) {
-    	    foreach ($val as $k => $v) {
-        	    unset($process[$key][$k]);
-            	if (is_array($v)) {
-                	$process[$key][stripslashes($k)] = $v;
-	                $process[] = &$process[$key][stripslashes($k)];
-    	        } else {
-        	        $process[$key][stripslashes($k)] = stripslashes($v);
-            	}
-	        }
-    	}
-	    unset($process);
+		$process = array(&$_GET, &$_POST, &$_COOKIE, &$_REQUEST);
+		while (list($key, $val) = each($process)) {
+			foreach ($val as $k => $v) {
+				unset($process[$key][$k]);
+				if (is_array($v)) {
+					$process[$key][stripslashes($k)] = $v;
+					$process[] = &$process[$key][stripslashes($k)];
+				} else {
+					$process[$key][stripslashes($k)] = stripslashes($v);
+				}
+			}
+		}
+		unset($process);
 	}
 
 }
@@ -254,271 +256,278 @@ function startup() {
  *
  * Our main application structure for the life of this page
  * Primarily deals with the URL that got us here
- * and tries to make some sense of it, and 
+ * and tries to make some sense of it, and
  * stores our page contents and config storage
- * and anything else that might need to be passed around 
- * before we spit the page out. 
+ * and anything else that might need to be passed around
+ * before we spit the page out.
  *
  */
 
 if(! class_exists('App')) {
-class App {
-
-	public  $module_loaded = false;
-	public  $query_string;
-	public  $config;
-	public  $page;
-	public  $profile;
-	public  $user;
-	public  $cid;
-	public  $contact;
-	public  $contacts;
-	public  $page_contact;
-	public  $content;
-	public  $data = array();
-	public  $error = false;
-	public  $cmd;
-	public  $argv;
-	public  $argc;
-	public  $module;
-	public  $pager;
-	public  $strings;   
-	public  $path;
-	public  $hooks;
-	public  $timezone;
-	public  $interactive = true;
-	public  $plugins;
-	public  $apps = array();
-	public  $identities;
+	class App {
+
+		public  $module_loaded = false;
+		public  $query_string;
+		public  $config;
+		public  $page;
+		public  $profile;
+		public  $user;
+		public  $cid;
+		public  $contact;
+		public  $contacts;
+		public  $page_contact;
+		public  $content;
+		public  $data = array();
+		public  $error = false;
+		public  $cmd;
+		public  $argv;
+		public  $argc;
+		public  $module;
+		public  $pager;
+		public  $strings;
+		public  $path;
+		public  $hooks;
+		public  $timezone;
+		public  $interactive = true;
+		public  $plugins;
+		public  $apps = array();
+		public  $identities;
 	
-	public $nav_sel;
+		public $nav_sel;
 
-	private $scheme;
-	private $hostname;
-	private $baseurl;
-	private $db;
+		public $category;
 
-	private $curl_code;
-	private $curl_headers;
+		private $scheme;
+		private $hostname;
+		private $baseurl;
+		private $db;
 
-	function __construct() {
+		private $curl_code;
+		private $curl_headers;
 
-		$this->config = array();
-		$this->page = array();
-		$this->pager= array();
+		function __construct() {
 
-		$this->query_string = '';
+			$this->config = array();
+			$this->page = array();
+			$this->pager= array();
 
-		startup();
+			$this->query_string = '';
 
-		$this->scheme = 'http';
-		if(x($_SERVER,'HTTPS') && $_SERVER['HTTPS'])
-			$this->scheme = 'https';
-		elseif(x($_SERVER,'SERVER_PORT') && (intval($_SERVER['SERVER_PORT']) == 443)) 
-			$this->scheme = 'https';
+			startup();
 
+			$this->scheme = 'http';
+			if(x($_SERVER,'HTTPS') && $_SERVER['HTTPS'])
+				$this->scheme = 'https';
+			elseif(x($_SERVER,'SERVER_PORT') && (intval($_SERVER['SERVER_PORT']) == 443))
+			$this->scheme = 'https';
 
-		if(x($_SERVER,'SERVER_NAME')) {
-			$this->hostname = $_SERVER['SERVER_NAME'];
-			if(x($_SERVER,'SERVER_PORT') && $_SERVER['SERVER_PORT'] != 80 && $_SERVER['SERVER_PORT'] != 443)
-				$this->hostname .= ':' . $_SERVER['SERVER_PORT'];
-			/** 
-			 * Figure out if we are running at the top of a domain
-			 * or in a sub-directory and adjust accordingly
-			 */
 
-			$path = trim(dirname($_SERVER['SCRIPT_NAME']),'/\\');
-			if(isset($path) && strlen($path) && ($path != $this->path))
-				$this->path = $path;
-		}
+			if(x($_SERVER,'SERVER_NAME')) {
+				$this->hostname = $_SERVER['SERVER_NAME'];
+				if(x($_SERVER,'SERVER_PORT') && $_SERVER['SERVER_PORT'] != 80 && $_SERVER['SERVER_PORT'] != 443)
+					$this->hostname .= ':' . $_SERVER['SERVER_PORT'];
+				/**
+				 * Figure out if we are running at the top of a domain
+				 * or in a sub-directory and adjust accordingly
+				 */
 
-		set_include_path(
-			"include/$this->hostname" . PATH_SEPARATOR 
-			. 'include' . PATH_SEPARATOR 
-			. 'library' . PATH_SEPARATOR 
-			. 'library/phpsec' . PATH_SEPARATOR 
-			. '.' );
-
-		if((x($_SERVER,'QUERY_STRING')) && substr($_SERVER['QUERY_STRING'],0,2) === "q=") {
-			$this->query_string = substr($_SERVER['QUERY_STRING'],2);
-			// removing trailing / - maybe a nginx problem
-			if (substr($this->query_string, 0, 1) == "/")
-				$this->query_string = substr($this->query_string, 1);
-		}
-		if(x($_GET,'q'))
-			$this->cmd = trim($_GET['q'],'/\\');
+				$path = trim(dirname($_SERVER['SCRIPT_NAME']),'/\\');
+				if(isset($path) && strlen($path) && ($path != $this->path))
+					$this->path = $path;
+			}
 
-		// unix style "homedir"
+			set_include_path(
+					"include/$this->hostname" . PATH_SEPARATOR
+					. 'include' . PATH_SEPARATOR
+					. 'library' . PATH_SEPARATOR
+					. 'library/phpsec' . PATH_SEPARATOR
+					. '.' );
+
+			if((x($_SERVER,'QUERY_STRING')) && substr($_SERVER['QUERY_STRING'],0,2) === "q=") {
+				$this->query_string = substr($_SERVER['QUERY_STRING'],2);
+				// removing trailing / - maybe a nginx problem
+				if (substr($this->query_string, 0, 1) == "/")
+					$this->query_string = substr($this->query_string, 1);
+			}
+			if(x($_GET,'q'))
+				$this->cmd = trim($_GET['q'],'/\\');
+
+			// unix style "homedir"
+
+			if(substr($this->cmd,0,1) === '~')
+				$this->cmd = 'profile/' . substr($this->cmd,1);
+
+			// Diaspora style profile url
+
+			if(substr($this->cmd,0,2) === 'u/')
+				$this->cmd = 'profile/' . substr($this->cmd,2);
+
+			/**
+			 *
+			 * Break the URL path into C style argc/argv style arguments for our
+			 * modules. Given "http://example.com/module/arg1/arg2", $this->argc
+			 * will be 3 (integer) and $this->argv will contain:
+			 *   [0] => 'module'
+			 *   [1] => 'arg1'
+			 *   [2] => 'arg2'
+			 *
+			 *
+			 * There will always be one argument. If provided a naked domain
+			 * URL, $this->argv[0] is set to "home".
+			 *
+			 */
 
-		if(substr($this->cmd,0,1) === '~')
-			$this->cmd = 'profile/' . substr($this->cmd,1);
+			$this->argv = explode('/',$this->cmd);
+			$this->argc = count($this->argv);
+			if((array_key_exists('0',$this->argv)) && strlen($this->argv[0])) {
+				$this->module = str_replace(".", "_", $this->argv[0]);
+				if(array_key_exists('2',$this->argv)) {
+					$this->category = $this->argv[2];
+				}
+			}
+			else {
+				$this->argc = 1;
+				$this->argv = array('home');
+				$this->module = 'home';
+			}
 
-		// Diaspora style profile url
+			/**
+			 * Special handling for the webfinger/lrdd host XRD file
+			 */
 
-		if(substr($this->cmd,0,2) === 'u/')
-			$this->cmd = 'profile/' . substr($this->cmd,2);
+			if($this->cmd === '.well-known/host-meta') {
+				$this->argc = 1;
+				$this->argv = array('hostxrd');
+				$this->module = 'hostxrd';
+			}
 
-		/**
-		 *
-		 * Break the URL path into C style argc/argv style arguments for our
-		 * modules. Given "http://example.com/module/arg1/arg2", $this->argc
-		 * will be 3 (integer) and $this->argv will contain:
-		 *   [0] => 'module'
-		 *   [1] => 'arg1'
-		 *   [2] => 'arg2'
-		 *
-		 *
-		 * There will always be one argument. If provided a naked domain
-		 * URL, $this->argv[0] is set to "home".
-		 *
-		 */
+			/**
+			 * See if there is any page number information, and initialise
+			 * pagination
+			 */
 
-		$this->argv = explode('/',$this->cmd);
-		$this->argc = count($this->argv);
-		if((array_key_exists('0',$this->argv)) && strlen($this->argv[0])) {
-			$this->module = str_replace(".", "_", $this->argv[0]);
-		}
-		else {
-			$this->argc = 1;
-			$this->argv = array('home');
-			$this->module = 'home';
+			$this->pager['page'] = ((x($_GET,'page')) ? $_GET['page'] : 1);
+			$this->pager['itemspage'] = 50;
+			$this->pager['start'] = ($this->pager['page'] * $this->pager['itemspage']) - $this->pager['itemspage'];
+			$this->pager['total'] = 0;
 		}
 
-		/**
-		 * Special handling for the webfinger/lrdd host XRD file
-		 */
+		function get_baseurl($ssl = false) {
 
-		if($this->cmd === '.well-known/host-meta') {
-			$this->argc = 1;
-			$this->argv = array('hostxrd');
-			$this->module = 'hostxrd';
-		}
+			$scheme = $this->scheme;
 
-		/**
-		 * See if there is any page number information, and initialise 
-		 * pagination
-		 */
+			if((x($this->config,'system')) && (x($this->config['system'],'ssl_policy'))) {
+				if(intval($this->config['system']['ssl_policy']) === intval(SSL_POLICY_FULL))
+					$scheme = 'https';
 
-		$this->pager['page'] = ((x($_GET,'page')) ? $_GET['page'] : 1);
-		$this->pager['itemspage'] = 50;
-		$this->pager['start'] = ($this->pager['page'] * $this->pager['itemspage']) - $this->pager['itemspage'];
-		$this->pager['total'] = 0;
-	}
+				//			We need to populate the $ssl flag across the entire program before turning this on.
+				//			Basically, we'll have $ssl = true on any links which can only be seen by a logged in user
+				//			(and also the login link). Anything seen by an outsider will have it turned off.
+				//			At present, setting SSL_POLICY_SELFSIGN will only force remote contacts to update their
+				//			contact links to this site with "http:" if they are currently using "https:"
 
-	function get_baseurl($ssl = false) {
+				//			if($this->config['system']['ssl_policy'] == SSL_POLICY_SELFSIGN) {
+				//				if($ssl)
+				//					$scheme = 'https';
+				//				else
+				//					$scheme = 'http';
+					//			}
+		}
 
-		$scheme = $this->scheme;
+				$this->baseurl = $scheme . "://" . $this->hostname . ((isset($this->path) && strlen($this->path)) ? '/' . $this->path : '' );
+				return $this->baseurl;
+		}
 
-		if((x($this->config,'system')) && (x($this->config['system'],'ssl_policy'))) {
-			if(intval($this->config['system']['ssl_policy']) === intval(SSL_POLICY_FULL)) 
-				$scheme = 'https';
+		function set_baseurl($url) {
+			$parsed = @parse_url($url);
 
-//			We need to populate the $ssl flag across the entire program before turning this on.
-//			Basically, we'll have $ssl = true on any links which can only be seen by a logged in user
-//			(and also the login link). Anything seen by an outsider will have it turned off.
-//			At present, setting SSL_POLICY_SELFSIGN will only force remote contacts to update their 
-//			contact links to this site with "http:" if they are currently using "https:"
+			$this->baseurl = $url;
 
-//			if($this->config['system']['ssl_policy'] == SSL_POLICY_SELFSIGN) {
-//				if($ssl)
-//					$scheme = 'https';
-//				else
-//					$scheme = 'http';
-//			}
-		}
+			if($parsed) {
+				$this->scheme = $parsed['scheme'];
 
-		$this->baseurl = $scheme . "://" . $this->hostname . ((isset($this->path) && strlen($this->path)) ? '/' . $this->path : '' );
-		return $this->baseurl;
-	}
+				$this->hostname = $parsed['host'];
+				if(x($parsed,'port'))
+					$this->hostname .= ':' . $parsed['port'];
+				if(x($parsed,'path'))
+					$this->path = trim($parsed['path'],'\\/');
+			}
 
-	function set_baseurl($url) {
-		$parsed = @parse_url($url);
+		}
 
-		$this->baseurl = $url;
+		function get_hostname() {
+			return $this->hostname;
+		}
 
-		if($parsed) {		
-			$this->scheme = $parsed['scheme'];
+		function set_hostname($h) {
+			$this->hostname = $h;
+		}
 
-			$this->hostname = $parsed['host'];
-			if(x($parsed,'port'))
-				$this->hostname .= ':' . $parsed['port'];
-			if(x($parsed,'path'))
-				$this->path = trim($parsed['path'],'\\/');
+		function set_path($p) {
+			$this->path = trim(trim($p),'/');
 		}
 
-	}
+		function get_path() {
+			return $this->path;
+		}
 
-	function get_hostname() {
-		return $this->hostname;
-	}
+		function set_pager_total($n) {
+			$this->pager['total'] = intval($n);
+		}
 
-	function set_hostname($h) {
-		$this->hostname = $h;
-	}
+		function set_pager_itemspage($n) {
+			$this->pager['itemspage'] = intval($n);
+			$this->pager['start'] = ($this->pager['page'] * $this->pager['itemspage']) - $this->pager['itemspage'];
 
-	function set_path($p) {
-		$this->path = trim(trim($p),'/');
-	} 
+		}
 
-	function get_path() {
-		return $this->path;
-	}
+		function init_pagehead() {
+			$interval = ((local_user()) ? get_pconfig(local_user(),'system','update_interval') : 40000);
+			if($interval < 10000)
+				$interval = 40000;
+
+			$this->page['title'] = $this->config['sitename'];
+			$tpl = file_get_contents('view/head.tpl');
+			$this->page['htmlhead'] = replace_macros($tpl,array(
+				'$baseurl' => $this->get_baseurl(), // FIXME for z_path!!!!
+				'$generator' => 'Friendica' . ' ' . FRIENDICA_VERSION,
+				'$delitem' => t('Delete this item?'),
+				'$comment' => t('Comment'),
+				'$showmore' => t('show more'),
+				'$showfewer' => t('show fewer'),
+				'$update_interval' => $interval
+			));
+		}
 
-	function set_pager_total($n) {
-		$this->pager['total'] = intval($n);
-	}
+		function set_curl_code($code) {
+			$this->curl_code = $code;
+		}
 
-	function set_pager_itemspage($n) {
-		$this->pager['itemspage'] = intval($n);
-		$this->pager['start'] = ($this->pager['page'] * $this->pager['itemspage']) - $this->pager['itemspage'];
-
-	} 
-
-	function init_pagehead() {
-		$interval = ((local_user()) ? get_pconfig(local_user(),'system','update_interval') : 40000);
-		if($interval < 10000)
-			$interval = 40000;
-
-		$this->page['title'] = $this->config['sitename'];
-		$tpl = file_get_contents('view/head.tpl');
-		$this->page['htmlhead'] = replace_macros($tpl,array(
-			'$baseurl' => $this->get_baseurl(), // FIXME for z_path!!!!
-			'$generator' => 'Friendica' . ' ' . FRIENDICA_VERSION,
-			'$delitem' => t('Delete this item?'),
-			'$comment' => t('Comment'),
-			'$showmore' => t('show more'),
-			'$showfewer' => t('show fewer'),
-			'$update_interval' => $interval
-		));
-	}
+		function get_curl_code() {
+			return $this->curl_code;
+		}
 
-	function set_curl_code($code) {
-		$this->curl_code = $code;
-	}
+		function set_curl_headers($headers) {
+			$this->curl_headers = $headers;
+		}
 
-	function get_curl_code() {
-		return $this->curl_code;
-	}
+		function get_curl_headers() {
+			return $this->curl_headers;
+		}
 
-	function set_curl_headers($headers) {
-		$this->curl_headers = $headers;
-	}
 
-	function get_curl_headers() {
-		return $this->curl_headers;
 	}
-
-
-}}
+}
 
 // retrieve the App structure
 // useful in functions which require it but don't get it passed to them
 
 if(! function_exists('get_app')) {
-function get_app() {
-	global $a;
-	return $a;
-}};
+	function get_app() {
+		global $a;
+		return $a;
+	}
+};
 
 
 // Multi-purpose function to check variable state.
@@ -528,42 +537,44 @@ function get_app() {
 // e.g. x('') or x(0) returns 0;
 
 if(! function_exists('x')) {
-function x($s,$k = NULL) {
-	if($k != NULL) {
-		if((is_array($s)) && (array_key_exists($k,$s))) {
-			if($s[$k])
-				return (int) 1;
-			return (int) 0;
+	function x($s,$k = NULL) {
+		if($k != NULL) {
+			if((is_array($s)) && (array_key_exists($k,$s))) {
+				if($s[$k])
+					return (int) 1;
+				return (int) 0;
 		}
-		return false;
-	}
-	else {		
-		if(isset($s)) {
-			if($s) {
-				return (int) 1;
+			return false;
+		}
+		else {
+			if(isset($s)) {
+				if($s) {
+					return (int) 1;
+				}
+				return (int) 0;
 			}
-			return (int) 0;
+			return false;
 		}
-		return false;
 	}
-}}
+}
 
 // called from db initialisation if db is dead.
 
 if(! function_exists('system_unavailable')) {
-function system_unavailable() {
-	include('system_unavailable.php');
-	system_down();
-	killme();
-}}
+	function system_unavailable() {
+		include('system_unavailable.php');
+		system_down();
+		killme();
+	}
+}
 
 
 
 function clean_urls() {
 	global $a;
-//	if($a->config['system']['clean_urls'])
-		return true;
-//	return false;
+	//	if($a->config['system']['clean_urls'])
+	return true;
+	//	return false;
 }
 
 function z_path() {
@@ -590,125 +601,150 @@ function is_ajax() {
 }
 
 
-// Primarily involved with database upgrade, but also sets the 
+// Primarily involved with database upgrade, but also sets the
 // base url for use in cmdline programs which don't have
 // $_SERVER variables, and synchronising the state of installed plugins.
 
 
 if(! function_exists('check_config')) {
-function check_config(&$a) {
-
-	$build = get_config('system','build');
-	if(! x($build))
-		$build = set_config('system','build',DB_UPDATE_VERSION);
-
-	$url = get_config('system','url');
-
-	// if the url isn't set or the stored url is radically different 
-	// than the currently visited url, store the current value accordingly.
-	// "Radically different" ignores common variations such as http vs https 
-	// and www.example.com vs example.com.
-
-	if((! x($url)) || (! link_compare($url,$a->get_baseurl())))
-		$url = set_config('system','url',$a->get_baseurl());
-
-	if($build != DB_UPDATE_VERSION) {
-		$stored = intval($build);
-		$current = intval(DB_UPDATE_VERSION);
-		if(($stored < $current) && file_exists('update.php')) {
-
-			load_config('database');
-
-			// We're reporting a different version than what is currently installed.
-			// Run any existing update scripts to bring the database up to current.
-
-			require_once('update.php');
-
-			// make sure that boot.php and update.php are the same release, we might be
-			// updating right this very second and the correct version of the update.php
-			// file may not be here yet. This can happen on a very busy site.
+	function check_config(&$a) {
+
+		$build = get_config('system','build');
+		if(! x($build))
+			$build = set_config('system','build',DB_UPDATE_VERSION);
+
+		$url = get_config('system','url');
+
+		// if the url isn't set or the stored url is radically different
+		// than the currently visited url, store the current value accordingly.
+		// "Radically different" ignores common variations such as http vs https
+		// and www.example.com vs example.com.
+
+		if((! x($url)) || (! link_compare($url,$a->get_baseurl())))
+			$url = set_config('system','url',$a->get_baseurl());
+
+		if($build != DB_UPDATE_VERSION) {
+			$stored = intval($build);
+			$current = intval(DB_UPDATE_VERSION);
+			if(($stored < $current) && file_exists('update.php')) {
+
+				load_config('database');
+
+				// We're reporting a different version than what is currently installed.
+				// Run any existing update scripts to bring the database up to current.
+
+				require_once('update.php');
+
+				// make sure that boot.php and update.php are the same release, we might be
+				// updating right this very second and the correct version of the update.php
+				// file may not be here yet. This can happen on a very busy site.
+
+				if(DB_UPDATE_VERSION == UPDATE_VERSION) {
+
+					for($x = $stored; $x < $current; $x ++) {
+						if(function_exists('update_' . $x)) {
+
+							// There could be a lot of processes running or about to run.
+							// We want exactly one process to run the update command.
+							// So store the fact that we're taking responsibility
+							// after first checking to see if somebody else already has.
+
+							// If the update fails or times-out completely you may need to
+							// delete the config entry to try again.
+
+							if(get_config('database','update_' . $x))
+								break;
+							set_config('database','update_' . $x, '1');
+
+							// call the specific update
+
+//							global $db;
+//							$db->excep(TRUE);
+//							try {
+//								$db->beginTransaction();
+								$func = 'update_' . $x;
+								$func($a);
+//								$db->commit();
+//							} catch(Exception $ex) {
+//								$db->rollback();
+//								//send the administrator an e-mail
+//								$email_tpl = get_intltext_template("update_fail_eml.tpl");
+//								$email_tpl = replace_macros($email_tpl, array(
+//									'$sitename' => $a->config['sitename'],
+//									'$siteurl' =>  $a->get_baseurl(),
+//									'$update' => $x,
+//									'$error' => $ex->getMessage()));
+//								$subject=sprintf(t('Update Error at %s'), $a->get_baseurl());
+									
+//								mail($a->config['admin_email'], $subject, $text,
+//										'From: ' . t('Administrator') . '@' . $_SERVER['SERVER_NAME'] . "\n"
+//										. 'Content-type: text/plain; charset=UTF-8' . "\n"
+//										. 'Content-transfer-encoding: 8bit' );
+//								//try the logger
+//								logger('update failed: '.$ex->getMessage().EOL);
+//							}
+//							$db->excep(FALSE);
+						}
+					}
+					set_config('system','build', DB_UPDATE_VERSION);
+				}
+			}
+		}
 
-			if(DB_UPDATE_VERSION == UPDATE_VERSION) {
+		/**
+		 *
+		 * Synchronise plugins:
+		 *
+		 * $a->config['system']['addon'] contains a comma-separated list of names
+		 * of plugins/addons which are used on this system.
+		 * Go through the database list of already installed addons, and if we have
+		 * an entry, but it isn't in the config list, call the uninstall procedure
+		 * and mark it uninstalled in the database (for now we'll remove it).
+		 * Then go through the config list and if we have a plugin that isn't installed,
+		 * call the install procedure and add it to the database.
+		 *
+		 */
 
-				for($x = $stored; $x < $current; $x ++) {
-					if(function_exists('update_' . $x)) {
+		$r = q("SELECT * FROM `addon` WHERE `installed` = 1");
+		if(count($r))
+			$installed = $r;
+		else
+			$installed = array();
 
-						// There could be a lot of processes running or about to run.
-						// We want exactly one process to run the update command.
-						// So store the fact that we're taking responsibility
-						// after first checking to see if somebody else already has.
+		$plugins = get_config('system','addon');
+		$plugins_arr = array();
 
-						// If the update fails or times-out completely you may need to 
-						// delete the config entry to try again.
+		if($plugins)
+			$plugins_arr = explode(',',str_replace(' ', '',$plugins));
 
-						if(get_config('database','update_' . $x))
-							break;
-						set_config('database','update_' . $x, '1');
+		$a->plugins = $plugins_arr;
 
-						// call the specific update
+		$installed_arr = array();
 
-						$func = 'update_' . $x;
-						$func($a);
-					}
-				}
-				set_config('system','build', DB_UPDATE_VERSION);
+		if(count($installed)) {
+			foreach($installed as $i) {
+				if(! in_array($i['name'],$plugins_arr)) {
+					uninstall_plugin($i['name']);
 			}
-		}
-	}
-
-	/**
-	 *
-	 * Synchronise plugins:
-	 *
-	 * $a->config['system']['addon'] contains a comma-separated list of names
-	 * of plugins/addons which are used on this system. 
-	 * Go through the database list of already installed addons, and if we have
-	 * an entry, but it isn't in the config list, call the uninstall procedure
-	 * and mark it uninstalled in the database (for now we'll remove it).
-	 * Then go through the config list and if we have a plugin that isn't installed,
-	 * call the install procedure and add it to the database.
-	 *
-	 */
-
-	$r = q("SELECT * FROM `addon` WHERE `installed` = 1");
-	if(count($r))
-		$installed = $r;
-	else
-		$installed = array();
-
-	$plugins = get_config('system','addon');
-	$plugins_arr = array();
-
-	if($plugins)
-		$plugins_arr = explode(',',str_replace(' ', '',$plugins));
-
-	$a->plugins = $plugins_arr;
-
-	$installed_arr = array();
-
-	if(count($installed)) {
-		foreach($installed as $i) {
-			if(! in_array($i['name'],$plugins_arr)) {
-				uninstall_plugin($i['name']);
+				else
+					$installed_arr[] = $i['name'];
 			}
-			else
-				$installed_arr[] = $i['name'];
 		}
-	}
 
-	if(count($plugins_arr)) {
-		foreach($plugins_arr as $p) {
-			if(! in_array($p,$installed_arr)) {
-				install_plugin($p);
+		if(count($plugins_arr)) {
+			foreach($plugins_arr as $p) {
+				if(! in_array($p,$installed_arr)) {
+					install_plugin($p);
+				}
 			}
 		}
-	}
 
 
-	load_hooks();
+		load_hooks();
 
-	return;
-}}
+		return;
+	}
+}
 
 
 function get_guid($size=16) {
@@ -729,116 +765,124 @@ function get_guid($size=16) {
 // returns the complete html for inserting into the page
 
 if(! function_exists('login')) {
-function login($register = false, $hiddens=false) {
-	$a = get_app();
-	$o = "";
-	$reg = false;
-	if ($register) {
-		$reg = array(
-			'title' => t('Create a New Account'),
-			'desc' => t('Register')
-		);
-	}
+	function login($register = false, $hiddens=false) {
+		$a = get_app();
+		$o = "";
+		$reg = false;
+		if ($register) {
+			$reg = array(
+				'title' => t('Create a New Account'),
+				'desc' => t('Register')
+			);
+		}
 
-	$noid = get_config('system','no_openid');
+		$noid = get_config('system','no_openid');
 	
-	$dest_url = $a->get_baseurl(true) . '/' . $a->query_string;
+		$dest_url = $a->get_baseurl(true) . '/' . $a->query_string;
 
-	if(local_user()) {
-		$tpl = get_markup_template("logout.tpl");
-	}
-	else {
-		$tpl = get_markup_template("login.tpl");
-		$_SESSION['return_url'] = $a->query_string;
-	}
+		if(local_user()) {
+			$tpl = get_markup_template("logout.tpl");
+		}
+		else {
+			$tpl = get_markup_template("login.tpl");
+			$_SESSION['return_url'] = $a->query_string;
+		}
 
 
-	$o .= replace_macros($tpl,array(
+		$o .= replace_macros($tpl,array(
 
-		'$dest_url'     => $dest_url,
-		'$logout'       => t('Logout'),
-		'$login'        => t('Login'),
-		
-		'$lname'	 	=> array('username', t('Nickname or Email address: ') , '', ''),
-		'$lpassword' 	=> array('password', t('Password: '), '', ''),
-		
-		'$openid'		=> !$noid,
-		'$lopenid'      => array('openid_url', t('Or login using OpenID: '),'',''),
-		
-		'$hiddens'      => $hiddens,
-		
-		'$register'     => $reg,
-		
-		'$lostpass'     => t('Forgot your password?'),
-		'$lostlink'     => t('Password Reset'),
-	));
+			'$dest_url'     => $dest_url,
+			'$logout'       => t('Logout'),
+			'$login'        => t('Login'),
+	
+			'$lname'	 	=> array('username', t('Nickname or Email address: ') , '', ''),
+			'$lpassword' 	=> array('password', t('Password: '), '', ''),
+	
+			'$openid'		=> !$noid,
+			'$lopenid'      => array('openid_url', t('Or login using OpenID: '),'',''),
+	
+			'$hiddens'      => $hiddens,
+	
+			'$register'     => $reg,
+	
+			'$lostpass'     => t('Forgot your password?'),
+			'$lostlink'     => t('Password Reset'),
+		));
 
-	call_hooks('login_hook',$o);
+		call_hooks('login_hook',$o);
 
-	return $o;
-}}
+		return $o;
+	}
+}
 
-// Used to end the current process, after saving session state. 
+// Used to end the current process, after saving session state.
 
 if(! function_exists('killme')) {
-function killme() {
-	session_write_close();
-	exit;
-}}
+	function killme() {
+		session_write_close();
+		exit;
+	}
+}
 
 // redirect to another URL and terminate this process.
 
 if(! function_exists('goaway')) {
-function goaway($s) {
-	header("Location: $s");
-	killme();
-}}
+	function goaway($s) {
+		header("Location: $s");
+		killme();
+	}
+}
 
 
 // Returns the uid of locally logged in user or false.
 
 if(! function_exists('local_user')) {
-function local_user() {
-	if((x($_SESSION,'authenticated')) && (x($_SESSION,'uid')))
-		return intval($_SESSION['uid']);
-	return false;
-}}
+	function local_user() {
+		if((x($_SESSION,'authenticated')) && (x($_SESSION,'uid')))
+			return intval($_SESSION['uid']);
+		return false;
+	}
+}
 
 // Returns contact id of authenticated site visitor or false
 
 if(! function_exists('remote_user')) {
-function remote_user() {
-	if((x($_SESSION,'authenticated')) && (x($_SESSION,'visitor_id')))
-		return intval($_SESSION['visitor_id']);
-	return false;
-}}
+	function remote_user() {
+		if((x($_SESSION,'authenticated')) && (x($_SESSION,'visitor_id')))
+			return intval($_SESSION['visitor_id']);
+		return false;
+	}
+}
 
 // contents of $s are displayed prominently on the page the next time
 // a page is loaded. Usually used for errors or alerts.
 
 if(! function_exists('notice')) {
-function notice($s) {
-	$a = get_app();
-	if(! x($_SESSION,'sysmsg'))	$_SESSION['sysmsg'] = array();
-	if($a->interactive)
-		$_SESSION['sysmsg'][] = $s;
-}}
+	function notice($s) {
+		$a = get_app();
+		if(! x($_SESSION,'sysmsg'))	$_SESSION['sysmsg'] = array();
+		if($a->interactive)
+			$_SESSION['sysmsg'][] = $s;
+	}
+}
 if(! function_exists('info')) {
-function info($s) {
-	$a = get_app();
-	if(! x($_SESSION,'sysmsg_info')) $_SESSION['sysmsg_info'] = array();
-	if($a->interactive)
-		$_SESSION['sysmsg_info'][] = $s;
-}}
+	function info($s) {
+		$a = get_app();
+		if(! x($_SESSION,'sysmsg_info')) $_SESSION['sysmsg_info'] = array();
+		if($a->interactive)
+			$_SESSION['sysmsg_info'][] = $s;
+	}
+}
 
 
 // wrapper around config to limit the text length of an incoming message
 
 if(! function_exists('get_max_import_size')) {
-function get_max_import_size() {
-	global $a;
-	return ((x($a->config,'max_import_size')) ? $a->config['max_import_size'] : 0 );
-}}
+	function get_max_import_size() {
+		global $a;
+		return ((x($a->config,'max_import_size')) ? $a->config['max_import_size'] : 0 );
+	}
+}
 
 
 
@@ -849,7 +893,7 @@ function get_max_import_size() {
  * @parameter string $nickname
  * @parameter int    $profile
  *
- * Summary: Loads a profile into the page sidebar. 
+ * Summary: Loads a profile into the page sidebar.
  * The function requires a writeable copy of the main App structure, and the nickname
  * of a registered local account.
  *
@@ -859,87 +903,90 @@ function get_max_import_size() {
  * by the owner.
  *
  * Profile information is placed in the App structure for later retrieval.
- * Honours the owner's chosen theme for display. 
+ * Honours the owner's chosen theme for display.
  *
  */
 
 if(! function_exists('profile_load')) {
-function profile_load(&$a, $nickname, $profile = 0) {
-	if(remote_user()) {
-		$r = q("SELECT `profile-id` FROM `contact` WHERE `id` = %d LIMIT 1",
-			intval($_SESSION['visitor_id']));
-		if(count($r))
-			$profile = $r[0]['profile-id'];
-	} 
+	function profile_load(&$a, $nickname, $profile = 0) {
+		if(remote_user()) {
+			$r = q("SELECT `profile-id` FROM `contact` WHERE `id` = %d LIMIT 1",
+					intval($_SESSION['visitor_id']));
+			if(count($r))
+				$profile = $r[0]['profile-id'];
+		}
 
-	$r = null;
+		$r = null;
                           
-	if($profile) {
-		$profile_int = intval($profile);
-		$r = q("SELECT `profile`.`uid` AS `profile_uid`, `profile`.* , `contact`.`avatar-date` AS picdate, `user`.* FROM `profile` 
-			left join `contact` on `contact`.`uid` = `profile`.`uid` LEFT JOIN `user` ON `profile`.`uid` = `user`.`uid`
-			WHERE `user`.`nickname` = '%s' AND `profile`.`id` = %d and `contact`.`self` = 1 LIMIT 1",
-			dbesc($nickname),
-			intval($profile_int)
-		);
-	}
-	if((! $r) && (!  count($r))) {	
-		$r = q("SELECT `profile`.`uid` AS `profile_uid`, `profile`.* , `contact`.`avatar-date` AS picdate, `user`.* FROM `profile` 
-			left join `contact` on `contact`.`uid` = `profile`.`uid` LEFT JOIN `user` ON `profile`.`uid` = `user`.`uid`
-			WHERE `user`.`nickname` = '%s' AND `profile`.`is-default` = 1 and `contact`.`self` = 1 LIMIT 1",
-			dbesc($nickname)
-		);
-	}
+		if($profile) {
+			$profile_int = intval($profile);
+			$r = q("SELECT `profile`.`uid` AS `profile_uid`, `profile`.* , `contact`.`avatar-date` AS picdate, `user`.* FROM `profile`
+					left join `contact` on `contact`.`uid` = `profile`.`uid` LEFT JOIN `user` ON `profile`.`uid` = `user`.`uid`
+					WHERE `user`.`nickname` = '%s' AND `profile`.`id` = %d and `contact`.`self` = 1 LIMIT 1",
+					dbesc($nickname),
+					intval($profile_int)
+			);
+		}
+		if((! $r) && (!  count($r))) {
+			$r = q("SELECT `profile`.`uid` AS `profile_uid`, `profile`.* , `contact`.`avatar-date` AS picdate, `user`.* FROM `profile`
+					left join `contact` on `contact`.`uid` = `profile`.`uid` LEFT JOIN `user` ON `profile`.`uid` = `user`.`uid`
+					WHERE `user`.`nickname` = '%s' AND `profile`.`is-default` = 1 and `contact`.`self` = 1 LIMIT 1",
+					dbesc($nickname)
+			);
+		}
 
-	if(($r === false) || (! count($r))) {
-		notice( t('Requested profile is not available.') . EOL );
-		$a->error = 404;
-		return;
-	}
+		if(($r === false) || (! count($r))) {
+			logger('profile error: ' . $a->query_string, LOGGER_DEBUG);
+			notice( t('Requested profile is not available.') . EOL );
+			$a->error = 404;
+			return;
+		}
 	
-	// fetch user tags if this isn't the default profile
+		// fetch user tags if this isn't the default profile
+
+		if(! $r[0]['is-default']) {
+			$x = q("select `pub_keywords` from `profile` where uid = %d and `is-default` = 1 limit 1",
+					intval($profile_uid)
+			);
+			if($x && count($x))
+				$r[0]['pub_keywords'] = $x[0]['pub_keywords'];
+		}
 
-	if(! $r[0]['is-default']) {
-		$x = q("select `pub_keywords` from `profile` where uid = %d and `is-default` = 1 limit 1",
-			intval($profile_uid)
-		);
-		if($x && count($x))
-			$r[0]['pub_keywords'] = $x[0]['pub_keywords'];
-	}
+		$a->profile = $r[0];
 
-	$a->profile = $r[0];
 
+		$a->page['title'] = $a->profile['name'] . " @ " . $a->config['sitename'];
+		$_SESSION['theme'] = $a->profile['theme'];
 
-	$a->page['title'] = $a->profile['name'] . " @ " . $a->config['sitename'];
-	$_SESSION['theme'] = $a->profile['theme'];
+		/**
+		 * load/reload current theme info
+		 */
 
-	/**
-	 * load/reload current theme info
-	 */
-	$theme_info_file = "view/theme/".current_theme()."/theme.php";
-	if (file_exists($theme_info_file)){
-		require_once($theme_info_file);
-	}
+		$theme_info_file = "view/theme/".current_theme()."/theme.php";
+		if (file_exists($theme_info_file)){
+			require_once($theme_info_file);
+		}
 
-	if(! (x($a->page,'aside')))
-		$a->page['aside'] = '';
+		if(! (x($a->page,'aside')))
+			$a->page['aside'] = '';
 
-	if(local_user() && local_user() == $a->profile['uid']) {
-		$a->page['aside'] .= replace_macros(get_markup_template('profile_edlink.tpl'),array(
-			'$editprofile' => t('Edit profile'),
-			'$profid' => $a->profile['id']
-		));
-	}
+		if(local_user() && local_user() == $a->profile['uid']) {
+			$a->page['aside'] .= replace_macros(get_markup_template('profile_edlink.tpl'),array(
+				'$editprofile' => t('Edit profile'),
+				'$profid' => $a->profile['id']
+			));
+		}
 
-	$block = (((get_config('system','block_public')) && (! local_user()) && (! remote_user())) ? true : false);
+		$block = (((get_config('system','block_public')) && (! local_user()) && (! remote_user())) ? true : false);
 
-	$a->page['aside'] .= profile_sidebar($a->profile, $block);
+		$a->page['aside'] .= profile_sidebar($a->profile, $block);
 
-	/*if(! $block)
-		$a->page['aside'] .= contact_block();*/
+		/*if(! $block)
+		 $a->page['aside'] .= contact_block();*/
 
-	return;
-}}
+		return;
+	}
+}
 
 
 /**
@@ -959,478 +1006,488 @@ function profile_load(&$a, $nickname, $profile = 0) {
 
 
 if(! function_exists('profile_sidebar')) {
-function profile_sidebar($profile, $block = 0) {
+	function profile_sidebar($profile, $block = 0) {
 
-	$a = get_app();
+		$a = get_app();
 
-	$o = '';
-	$location = false;
-	$address = false;
-	$pdesc = true;
+		$o = '';
+		$location = false;
+		$address = false;
+		$pdesc = true;
 
-	if((! is_array($profile)) && (! count($profile)))
-		return $o;
+		if((! is_array($profile)) && (! count($profile)))
+			return $o;
 
-	$profile['picdate'] = urlencode($profile['picdate']);
+		$profile['picdate'] = urlencode($profile['picdate']);
 
-	call_hooks('profile_sidebar_enter', $profile);
+		call_hooks('profile_sidebar_enter', $profile);
 
 	
-	// don't show connect link to yourself
-	$connect = (($profile['uid'] != local_user()) ? t('Connect')  : False);
+		// don't show connect link to yourself
+		$connect = (($profile['uid'] != local_user()) ? t('Connect')  : False);
 
-	// don't show connect link to authenticated visitors either
+		// don't show connect link to authenticated visitors either
 
-	if((remote_user()) && ($_SESSION['visitor_visiting'] == $profile['uid']))
-		$connect = False; 
+		if((remote_user()) && ($_SESSION['visitor_visiting'] == $profile['uid']))
+			$connect = False;
 
-	if(get_my_url() && $profile['unkmail'])
-		$wallmessage = t('Message');
-	else
-		$wallmessage = false;
+		if(get_my_url() && $profile['unkmail'])
+			$wallmessage = t('Message');
+		else
+			$wallmessage = false;
 
 
 
-	// show edit profile to yourself
-	if ($profile['uid'] == local_user()) {
-		$profile['edit'] = array($a->get_baseurl(). '/profiles', t('Profiles'),"", t('Manage/edit profiles'));
+		// show edit profile to yourself
+		if ($profile['uid'] == local_user()) {
+			$profile['edit'] = array($a->get_baseurl(). '/profiles', t('Profiles'),"", t('Manage/edit profiles'));
 		
-		$r = q("SELECT * FROM `profile` WHERE `uid` = %d",
-				local_user());
+			$r = q("SELECT * FROM `profile` WHERE `uid` = %d",
+					local_user());
 		
-		$profile['menu'] = array(
-			'chg_photo' => t('Change profile photo'),
-			'cr_new' => t('Create New Profile'),
-			'entries' => array(),
-		);
-				
-		if(count($r)) {
+			$profile['menu'] = array(
+				'chg_photo' => t('Change profile photo'),
+				'cr_new' => t('Create New Profile'),
+				'entries' => array(),
+			);
+
+			if(count($r)) {
+
+				foreach($r as $rr) {
+					$profile['menu']['entries'][] = array(
+						'photo' => $rr['thumb'],
+						'id' => $rr['id'],
+						'alt' => t('Profile Image'),
+						'profile_name' => $rr['profile-name'],
+						'isdefault' => $rr['is-default'],
+						'visibile_to_everybody' =>  t('visible to everybody'),
+						'edit_visibility' => t('Edit visibility'),
+
+					);
+				}
+
 
-			foreach($r as $rr) {
-				$profile['menu']['entries'][] = array(
-					'photo' => $rr['thumb'],
-					'id' => $rr['id'],
-					'alt' => t('Profile Image'),
-					'profile_name' => $rr['profile-name'],
-					'isdefault' => $rr['is-default'],
-					'visibile_to_everybody' =>  t('visible to everybody'),
-					'edit_visibility' => t('Edit visibility'),
-					
-				);
 			}
 
 
 		}
-		
-		
-	}
 
 
 
 	
-	if((x($profile,'address') == 1) 
-		|| (x($profile,'locality') == 1) 
-		|| (x($profile,'region') == 1) 
-		|| (x($profile,'postal-code') == 1) 
-		|| (x($profile,'country-name') == 1))
-		$location = t('Location:');
+		if((x($profile,'address') == 1)
+				|| (x($profile,'locality') == 1)
+				|| (x($profile,'region') == 1)
+				|| (x($profile,'postal-code') == 1)
+				|| (x($profile,'country-name') == 1))
+			$location = t('Location:');
 
-	$gender = ((x($profile,'gender') == 1) ? t('Gender:') : False);
+		$gender = ((x($profile,'gender') == 1) ? t('Gender:') : False);
 
 
-	$marital = ((x($profile,'marital') == 1) ?  t('Status:') : False);
+		$marital = ((x($profile,'marital') == 1) ?  t('Status:') : False);
 
-	$homepage = ((x($profile,'homepage') == 1) ?  t('Homepage:') : False);
+		$homepage = ((x($profile,'homepage') == 1) ?  t('Homepage:') : False);
 
-	if(($profile['hidewall'] || $block) && (! local_user()) && (! remote_user())) {
-		$location = $pdesc = $gender = $marital = $homepage = False;
-	}
+		if(($profile['hidewall'] || $block) && (! local_user()) && (! remote_user())) {
+			$location = $pdesc = $gender = $marital = $homepage = False;
+		}
 
-	$firstname = ((strpos($profile['name'],' ')) 
-		? trim(substr($profile['name'],0,strpos($profile['name'],' '))) : $profile['name']);
-	$lastname = (($firstname === $profile['name']) ? '' : trim(substr($profile['name'],strlen($firstname))));
-
-	$diaspora = array(
-		'podloc' => $a->get_baseurl(),
-		'searchable' => (($profile['publish'] && $profile['net-publish']) ? 'true' : 'false' ),
-		'nickname' => $profile['nickname'],
-		'fullname' => $profile['name'],
-		'firstname' => $firstname,
-		'lastname' => $lastname,
-		'photo300' => $a->get_baseurl() . '/photo/custom/300/' . $profile['uid'] . '.jpg',
-		'photo100' => $a->get_baseurl() . '/photo/custom/100/' . $profile['uid'] . '.jpg',
-		'photo50' => $a->get_baseurl() . '/photo/custom/50/'  . $profile['uid'] . '.jpg',
-	);
-
-	if (!$block){
-		$contact_block = contact_block();
-	}
+		$firstname = ((strpos($profile['name'],' '))
+				? trim(substr($profile['name'],0,strpos($profile['name'],' '))) : $profile['name']);
+		$lastname = (($firstname === $profile['name']) ? '' : trim(substr($profile['name'],strlen($firstname))));
+
+		$diaspora = array(
+			'podloc' => $a->get_baseurl(),
+			'searchable' => (($profile['publish'] && $profile['net-publish']) ? 'true' : 'false' ),
+			'nickname' => $profile['nickname'],
+			'fullname' => $profile['name'],
+			'firstname' => $firstname,
+			'lastname' => $lastname,
+			'photo300' => $a->get_baseurl() . '/photo/custom/300/' . $profile['uid'] . '.jpg',
+			'photo100' => $a->get_baseurl() . '/photo/custom/100/' . $profile['uid'] . '.jpg',
+			'photo50' => $a->get_baseurl() . '/photo/custom/50/'  . $profile['uid'] . '.jpg',
+		);
+
+		if (!$block){
+			$contact_block = contact_block();
+		}
 
 
-	$tpl = get_markup_template('profile_vcard.tpl');
+		$tpl = get_markup_template('profile_vcard.tpl');
 
-	$o .= replace_macros($tpl, array(
-		'$profile' => $profile,
-		'$connect'  => $connect,		
-		'$wallmessage' => $wallmessage,
-		'$location' => template_escape($location),
-		'$gender'   => $gender,
-		'$pdesc'	=> $pdesc,
-		'$marital'  => $marital,
-		'$homepage' => $homepage,
-		'$diaspora' => $diaspora,
-		'$contact_block' => $contact_block,
-	));
+		$o .= replace_macros($tpl, array(
+			'$profile' => $profile,
+			'$connect'  => $connect,
+			'$wallmessage' => $wallmessage,
+			'$location' => template_escape($location),
+			'$gender'   => $gender,
+			'$pdesc'	=> $pdesc,
+			'$marital'  => $marital,
+			'$homepage' => $homepage,
+			'$diaspora' => $diaspora,
+			'$contact_block' => $contact_block,
+		));
 
 
-	$arr = array('profile' => &$profile, 'entry' => &$o);
+		$arr = array('profile' => &$profile, 'entry' => &$o);
 
-	call_hooks('profile_sidebar', $arr);
+		call_hooks('profile_sidebar', $arr);
 
-	return $o;
-}}
+		return $o;
+	}
+}
 
 
 if(! function_exists('get_birthdays')) {
-function get_birthdays() {
+	function get_birthdays() {
 
-	$a = get_app();
-	$o = '';
+		$a = get_app();
+		$o = '';
 
-	if(! local_user())
-		return $o;
+		if(! local_user())
+			return $o;
 
-	$bd_format = t('g A l F d') ; // 8 AM Friday January 18
-	$bd_short = t('F d');
-
-	$r = q("SELECT `event`.*, `event`.`id` AS `eid`, `contact`.* FROM `event` 
-		LEFT JOIN `contact` ON `contact`.`id` = `event`.`cid` 
-		WHERE `event`.`uid` = %d AND `type` = 'birthday' AND `start` < '%s' AND `finish` > '%s' 
-		ORDER BY `start` ASC ",
-		intval(local_user()),
-		dbesc(datetime_convert('UTC','UTC','now + 6 days')),
-		dbesc(datetime_convert('UTC','UTC','now'))
-	);
-
-	if($r && count($r)) {
-		$total = 0;
-		$now = strtotime('now');
-		$cids = array();
-
-		$istoday = false;
-		foreach($r as $rr) {
-			if(strlen($rr['name']))
-				$total ++;
-				if((strtotime($rr['start'] . ' +00:00') < $now) && (strtotime($rr['finish'] . ' +00:00') > $now))
-					$istoday = true;
-		}
-		$classtoday = $istoday ? ' birthday-today ' : '';
-		if($total) {
-			$o .= '<div id="birthday-notice" class="birthday-notice fakelink' . $classtoday . '" onclick=openClose(\'birthday-wrapper\'); >' . t('Birthday Reminders') . ' ' . '(' . $total . ')' . '</div>'; 
-			$o .= '<div id="birthday-wrapper" style="display: none;" ><div id="birthday-title">' . t('Birthdays this week:') . '</div>'; 
-			$o .= '<div id="birthday-title-end"></div>';
+		$bd_format = t('g A l F d') ; // 8 AM Friday January 18
+		$bd_short = t('F d');
 
-			foreach($r as $rr) {
-				if(! strlen($rr['name']))
-					continue;
-
-				// avoid duplicates
+		$r = q("SELECT `event`.*, `event`.`id` AS `eid`, `contact`.* FROM `event`
+				LEFT JOIN `contact` ON `contact`.`id` = `event`.`cid`
+				WHERE `event`.`uid` = %d AND `type` = 'birthday' AND `start` < '%s' AND `finish` > '%s'
+				ORDER BY `start` ASC ",
+				intval(local_user()),
+				dbesc(datetime_convert('UTC','UTC','now + 6 days')),
+				dbesc(datetime_convert('UTC','UTC','now'))
+		);
 
-				if(in_array($rr['cid'],$cids))
-					continue;
-				$cids[] = $rr['cid'];
+		if($r && count($r)) {
+			$total = 0;
+			$now = strtotime('now');
+			$cids = array();
 
-				$today = (((strtotime($rr['start'] . ' +00:00') < $now) && (strtotime($rr['finish'] . ' +00:00') > $now)) ? true : false); 
-				$sparkle = '';
-				$url = $rr['url'];
-				if($rr['network'] === NETWORK_DFRN) {
-					$sparkle = " sparkle";
-					$url = $a->get_baseurl() . '/redir/'  . $rr['cid'];
-				}
+			$istoday = false;
+			foreach($r as $rr) {
+				if(strlen($rr['name']))
+					$total ++;
+				if((strtotime($rr['start'] . ' +00:00') < $now) && (strtotime($rr['finish'] . ' +00:00') > $now))
+					$istoday = true;
+			}
+			$classtoday = $istoday ? ' birthday-today ' : '';
+			if($total) {
+				$o .= '<div id="birthday-notice" class="birthday-notice fakelink' . $classtoday . '" onclick=openClose(\'birthday-wrapper\'); >' . t('Birthday Reminders') . ' ' . '(' . $total . ')' . '</div>';
+				$o .= '<div id="birthday-wrapper" style="display: none;" ><div id="birthday-title">' . t('Birthdays this week:') . '</div>';
+				$o .= '<div id="birthday-title-end"></div>';
+
+				foreach($r as $rr) {
+					if(! strlen($rr['name']))
+						continue;
+
+					// avoid duplicates
+
+					if(in_array($rr['cid'],$cids))
+						continue;
+					$cids[] = $rr['cid'];
+
+					$today = (((strtotime($rr['start'] . ' +00:00') < $now) && (strtotime($rr['finish'] . ' +00:00') > $now)) ? true : false);
+					$sparkle = '';
+					$url = $rr['url'];
+					if($rr['network'] === NETWORK_DFRN) {
+						$sparkle = " sparkle";
+						$url = $a->get_baseurl() . '/redir/'  . $rr['cid'];
+					}
 	
-				$o .= '<div class="birthday-list" id="birthday-' . $rr['eid'] . '"><a class="birthday-link$sparkle" target="redir" href="' 
-				. $url . '">' . $rr['name'] . '</a> ' 
-				. day_translate(datetime_convert('UTC', $a->timezone, $rr['start'], $rr['adjust'] ? $bd_format : $bd_short)) . (($today) ?  ' ' . t('[today]') : '')
-				. '</div>' ;
+					$o .= '<div class="birthday-list" id="birthday-' . $rr['eid'] . '"><a class="birthday-link$sparkle" target="redir" href="'
+					. $url . '">' . $rr['name'] . '</a> '
+					. day_translate(datetime_convert('UTC', $a->timezone, $rr['start'], $rr['adjust'] ? $bd_format : $bd_short)) . (($today) ?  ' ' . t('[today]') : '')
+					. '</div>' ;
+				}
+				$o .= '</div></div>';
 			}
-			$o .= '</div></div>';
 		}
+		return $o;
 	}
-	return $o;
-}}
+}
 
 
 if(! function_exists('get_events')) {
-function get_events() {
+	function get_events() {
 
-	require_once('include/bbcode.php');
+		require_once('include/bbcode.php');
 
-	$a = get_app();
-	$o = '';
+		$a = get_app();
+		$o = '';
 
-	if(! local_user())
-		return $o;
+		if(! local_user())
+			return $o;
 
-	$bd_format = t('g A l F d') ; // 8 AM Friday January 18
-	$bd_short = t('F d');
-
-	$r = q("SELECT `event`.* FROM `event` 
-		WHERE `event`.`uid` = %d AND `type` != 'birthday' AND `start` < '%s' AND `start` > '%s'
-		ORDER BY `start` ASC ",
-		intval(local_user()),
-		dbesc(datetime_convert('UTC','UTC','now + 6 days')),
-		dbesc(datetime_convert('UTC','UTC','now - 1 days'))
-	);
-
-	if($r && count($r)) {
-		$now = strtotime('now');
-		$istoday = false;
-		foreach($r as $rr) {
-			if(strlen($rr['name']))
-				$total ++;
-
-			$strt = datetime_convert('UTC',$rr['convert'] ? $a->timezone : 'UTC',$rr['start'],'Y-m-d');
-			if($strt === datetime_convert('UTC',$a->timezone,'now','Y-m-d'))
-				$istoday = true;
-		}
-		$classtoday = (($istoday) ? ' event-today ' : '');
+		$bd_format = t('g A l F d') ; // 8 AM Friday January 18
+		$bd_short = t('F d');
 
-		$o .= '<div id="event-notice" class="birthday-notice fakelink' . $classtoday . '" onclick=openClose(\'event-wrapper\'); >' . t('Event Reminders') . ' ' . '(' . count($r) . ')' . '</div>'; 
-		$o .= '<div id="event-wrapper" style="display: none;" ><div id="event-title">' . t('Events this week:') . '</div>'; 
-		$o .= '<div id="event-title-end"></div>';
+		$r = q("SELECT `event`.* FROM `event`
+				WHERE `event`.`uid` = %d AND `type` != 'birthday' AND `start` < '%s' AND `start` > '%s'
+				ORDER BY `start` ASC ",
+				intval(local_user()),
+				dbesc(datetime_convert('UTC','UTC','now + 6 days')),
+				dbesc(datetime_convert('UTC','UTC','now - 1 days'))
+		);
 
-		foreach($r as $rr) {
+		if($r && count($r)) {
+			$now = strtotime('now');
+			$istoday = false;
+			foreach($r as $rr) {
+				if(strlen($rr['name']))
+					$total ++;
 
-			if($rr['adjust'])
-				$md = datetime_convert('UTC',$a->timezone,$rr['start'],'Y/m\#\l\i\n\k\-j');
-			else
-				$md = datetime_convert('UTC','UTC',$rr['start'],'Y/m\#\l\i\n\k\-j');
+				$strt = datetime_convert('UTC',$rr['convert'] ? $a->timezone : 'UTC',$rr['start'],'Y-m-d');
+				if($strt === datetime_convert('UTC',$a->timezone,'now','Y-m-d'))
+					$istoday = true;
+			}
+			$classtoday = (($istoday) ? ' event-today ' : '');
 
-			$title = substr(strip_tags(bbcode($rr['desc'])),0,32) . '... ';
-			if(! $title)
-				$title = t('[No description]');
+			$o .= '<div id="event-notice" class="birthday-notice fakelink' . $classtoday . '" onclick=openClose(\'event-wrapper\'); >' . t('Event Reminders') . ' ' . '(' . count($r) . ')' . '</div>';
+			$o .= '<div id="event-wrapper" style="display: none;" ><div id="event-title">' . t('Events this week:') . '</div>';
+			$o .= '<div id="event-title-end"></div>';
 
-			$strt = datetime_convert('UTC',$rr['convert'] ? $a->timezone : 'UTC',$rr['start']);
-			$today = ((substr($strt,0,10) === datetime_convert('UTC',$a->timezone,'now','Y-m-d')) ? true : false);	
+			foreach($r as $rr) {
 
-			$o .= '<div class="event-list" id="event-' . $rr['eid'] . '"></a> <a href="events/' . $md . '">' . $title . '</a>' 
-			. day_translate(datetime_convert('UTC', $rr['adjust'] ? $a->timezone : 'UTC', $rr['start'], $bd_format)) . (($today) ?  ' ' . t('[today]') : '')
-			. '</div>' ;
+				if($rr['adjust'])
+					$md = datetime_convert('UTC',$a->timezone,$rr['start'],'Y/m\#\l\i\n\k\-j');
+				else
+					$md = datetime_convert('UTC','UTC',$rr['start'],'Y/m\#\l\i\n\k\-j');
+
+				$title = substr(strip_tags(bbcode($rr['desc'])),0,32) . '... ';
+				if(! $title)
+					$title = t('[No description]');
+
+				$strt = datetime_convert('UTC',$rr['convert'] ? $a->timezone : 'UTC',$rr['start']);
+				$today = ((substr($strt,0,10) === datetime_convert('UTC',$a->timezone,'now','Y-m-d')) ? true : false);
+
+				$o .= '<div class="event-list" id="event-' . $rr['eid'] . '"></a> <a href="events/' . $md . '">' . $title . '</a>'
+				. day_translate(datetime_convert('UTC', $rr['adjust'] ? $a->timezone : 'UTC', $rr['start'], $bd_format)) . (($today) ?  ' ' . t('[today]') : '')
+				. '</div>' ;
+			}
+			$o .= '</div></div>';
 		}
-		$o .= '</div></div>';
-	}
 
-	return $o;
-}}
+		return $o;
+	}
+}
 
 
 /**
- * 
+ *
  * Wrap calls to proc_close(proc_open()) and call hook
  * so plugins can take part in process :)
- * 
+ *
  * args:
  * $cmd program to run
  *  next args are passed as $cmd command line
- * 
+ *
  * e.g.: proc_run("ls","-la","/tmp");
- * 
+ *
  * $cmd and string args are surrounded with ""
  */
 
 if(! function_exists('proc_run')) {
-function proc_run($cmd){
+	function proc_run($cmd){
 
-	$a = get_app();
+		$a = get_app();
 
-	$args = func_get_args();
-	$arr = array('args' => $args, 'run_cmd' => true);
+		$args = func_get_args();
+		$arr = array('args' => $args, 'run_cmd' => true);
 
-	call_hooks("proc_run", $arr);
-	if(! $arr['run_cmd'])
-		return;
+		call_hooks("proc_run", $arr);
+		if(! $arr['run_cmd'])
+			return;
 
-	if(count($args) && $args[0] === 'php')
-        $args[0] = ((x($a->config,'php_path')) && (strlen($a->config['php_path'])) ? $a->config['php_path'] : 'php');
-	foreach ($args as $arg){
-		$arg = escapeshellarg($arg);
+		if(count($args) && $args[0] === 'php')
+			$args[0] = ((x($a->config,'php_path')) && (strlen($a->config['php_path'])) ? $a->config['php_path'] : 'php');
+		foreach ($args as $arg){
+			$arg = escapeshellarg($arg);
+		}
+		$cmdline = implode($args," ");
+		proc_close(proc_open($cmdline." &",array(),$foo));
 	}
-	$cmdline = implode($args," ");
-	proc_close(proc_open($cmdline." &",array(),$foo));
-}}
+}
 
 if(! function_exists('current_theme')) {
-function current_theme(){
-	$app_base_themes = array('duepuntozero', 'loozah');
+	function current_theme(){
+		$app_base_themes = array('duepuntozero', 'loozah');
 	
-	$a = get_app();
+		$a = get_app();
 	
-	$system_theme = ((isset($a->config['system']['theme'])) ? $a->config['system']['theme'] : '');
-	$theme_name = ((isset($_SESSION) && x($_SESSION,'theme')) ? $_SESSION['theme'] : $system_theme);
+		$system_theme = ((isset($a->config['system']['theme'])) ? $a->config['system']['theme'] : '');
+		$theme_name = ((isset($_SESSION) && x($_SESSION,'theme')) ? $_SESSION['theme'] : $system_theme);
 	
-	if($theme_name && 
-		(file_exists('view/theme/' . $theme_name . '/style.css') ||
-		file_exists('view/theme/' . $theme_name . '/style.php')))
-		return($theme_name);
+		if($theme_name &&
+				(file_exists('view/theme/' . $theme_name . '/style.css') ||
+						file_exists('view/theme/' . $theme_name . '/style.php')))
+			return($theme_name);
 	
-	foreach($app_base_themes as $t) {
-		if(file_exists('view/theme/' . $t . '/style.css')||
-		   file_exists('view/theme/' . $t . '/style.php'))
-			return($t);
-	}
+		foreach($app_base_themes as $t) {
+			if(file_exists('view/theme/' . $t . '/style.css')||
+					file_exists('view/theme/' . $t . '/style.php'))
+				return($t);
+		}
 	
-	$fallback = glob('view/theme/*/style.[css|php]');
-	if(count($fallback))
-		return (str_replace('view/theme/','', substr($fallback[0],0,-10)));
-
-}}
+		$fallback = glob('view/theme/*/style.[css|php]');
+		if(count($fallback))
+			return (str_replace('view/theme/','', substr($fallback[0],0,-10)));
+	
+	}
+}
 
 /*
-* Return full URL to theme which is currently in effect.
+ * Return full URL to theme which is currently in effect.
 * Provide a sane default if nothing is chosen or the specified theme does not exist.
 */
 if(! function_exists('current_theme_url')) {
-function current_theme_url() {
-	global $a;
-	$t = current_theme();
-	if (file_exists('view/theme/' . $t . '/style.php'))
-		return($a->get_baseurl() . '/view/theme/' . $t . '/style.pcss');
-	return($a->get_baseurl() . '/view/theme/' . $t . '/style.css');
-}}
+	function current_theme_url() {
+		global $a;
+		$t = current_theme();
+		if (file_exists('view/theme/' . $t . '/style.php'))
+			return($a->get_baseurl() . '/view/theme/' . $t . '/style.pcss');
+		return($a->get_baseurl() . '/view/theme/' . $t . '/style.css');
+	}
+}
 
 if(! function_exists('feed_birthday')) {
-function feed_birthday($uid,$tz) {
-
-	/**
-	 *
-	 * Determine the next birthday, but only if the birthday is published
-	 * in the default profile. We _could_ also look for a private profile that the
-	 * recipient can see, but somebody could get mad at us if they start getting
-	 * public birthday greetings when they haven't made this info public. 
-	 *
-	 * Assuming we are able to publish this info, we are then going to convert
-	 * the start time from the owner's timezone to UTC. 
-	 *
-	 * This will potentially solve the problem found with some social networks
-	 * where birthdays are converted to the viewer's timezone and salutations from
-	 * elsewhere in the world show up on the wrong day. We will convert it to the
-	 * viewer's timezone also, but first we are going to convert it from the birthday
-	 * person's timezone to GMT - so the viewer may find the birthday starting at
-	 * 6:00PM the day before, but that will correspond to midnight to the birthday person.
-	 *
-	 */
+	function feed_birthday($uid,$tz) {
+
+		/**
+		 *
+		 * Determine the next birthday, but only if the birthday is published
+		 * in the default profile. We _could_ also look for a private profile that the
+		 * recipient can see, but somebody could get mad at us if they start getting
+		 * public birthday greetings when they haven't made this info public.
+		 *
+		 * Assuming we are able to publish this info, we are then going to convert
+		 * the start time from the owner's timezone to UTC.
+		 *
+		 * This will potentially solve the problem found with some social networks
+		 * where birthdays are converted to the viewer's timezone and salutations from
+		 * elsewhere in the world show up on the wrong day. We will convert it to the
+		 * viewer's timezone also, but first we are going to convert it from the birthday
+		 * person's timezone to GMT - so the viewer may find the birthday starting at
+		 * 6:00PM the day before, but that will correspond to midnight to the birthday person.
+		 *
+		 */
 
 	
-	$birthday = '';
-
-	if(! strlen($tz))
-		$tz = 'UTC';
-
-	$p = q("SELECT `dob` FROM `profile` WHERE `is-default` = 1 AND `uid` = %d LIMIT 1",
-		intval($uid)
-	);
-
-	if($p && count($p)) {
-		$tmp_dob = substr($p[0]['dob'],5);
-		if(intval($tmp_dob)) {
-			$y = datetime_convert($tz,$tz,'now','Y');
-			$bd = $y . '-' . $tmp_dob . ' 00:00';
-			$t_dob = strtotime($bd);
-			$now = strtotime(datetime_convert($tz,$tz,'now'));
-			if($t_dob < $now)
-				$bd = $y + 1 . '-' . $tmp_dob . ' 00:00';
-			$birthday = datetime_convert($tz,'UTC',$bd,ATOM_TIME); 
+		$birthday = '';
+
+		if(! strlen($tz))
+			$tz = 'UTC';
+
+		$p = q("SELECT `dob` FROM `profile` WHERE `is-default` = 1 AND `uid` = %d LIMIT 1",
+				intval($uid)
+		);
+
+		if($p && count($p)) {
+			$tmp_dob = substr($p[0]['dob'],5);
+			if(intval($tmp_dob)) {
+				$y = datetime_convert($tz,$tz,'now','Y');
+				$bd = $y . '-' . $tmp_dob . ' 00:00';
+				$t_dob = strtotime($bd);
+				$now = strtotime(datetime_convert($tz,$tz,'now'));
+				if($t_dob < $now)
+					$bd = $y + 1 . '-' . $tmp_dob . ' 00:00';
+				$birthday = datetime_convert($tz,'UTC',$bd,ATOM_TIME);
+			}
 		}
-	}
 
-	return $birthday;
-}}
+		return $birthday;
+	}
+}
 
 if(! function_exists('is_site_admin')) {
-function is_site_admin() {
-	$a = get_app();
-	if(local_user() && x($a->user,'email') && x($a->config,'admin_email') && ($a->user['email'] === $a->config['admin_email']))
-		return true;
-	return false;
-}}
+	function is_site_admin() {
+		$a = get_app();
+		if(local_user() && x($a->user,'email') && x($a->config,'admin_email') && ($a->user['email'] === $a->config['admin_email']))
+			return true;
+		return false;
+	}
+}
 
 
 if(! function_exists('load_contact_links')) {
-function load_contact_links($uid) {
+	function load_contact_links($uid) {
 
-	$a = get_app();
+		$a = get_app();
 
-	$ret = array();
+		$ret = array();
 
-	if(! $uid || x($a->contacts,'empty'))
-		return;
+		if(! $uid || x($a->contacts,'empty'))
+			return;
 
-	$r = q("SELECT `id`,`network`,`url`,`thumb` FROM `contact` WHERE `uid` = %d AND `self` = 0 AND `blocked` = 0 ",
-			intval($uid)
-	);
-	if(count($r)) {
-		foreach($r as $rr){
-			$url = normalise_link($rr['url']);
-			$ret[$url] = $rr;
+		$r = q("SELECT `id`,`network`,`url`,`thumb` FROM `contact` WHERE `uid` = %d AND `self` = 0 AND `blocked` = 0 ",
+				intval($uid)
+		);
+		if(count($r)) {
+			foreach($r as $rr){
+				$url = normalise_link($rr['url']);
+				$ret[$url] = $rr;
+			}
 		}
+		else
+			$ret['empty'] = true;
+		$a->contacts = $ret;
+		return;
 	}
-	else 
-		$ret['empty'] = true;	
-	$a->contacts = $ret;
-	return;		
-}}
+}
 
 if(! function_exists('profile_tabs')){
-function profile_tabs($a, $is_owner=False, $nickname=Null){
-	//echo "<pre>"; var_dump($a->user); killme();
+	function profile_tabs($a, $is_owner=False, $nickname=Null){
+		//echo "<pre>"; var_dump($a->user); killme();
 	
-	if (is_null($nickname))
-		$nickname  = $a->user['nickname'];
+		if (is_null($nickname))
+			$nickname  = $a->user['nickname'];
 		
-	if(x($_GET,'tab'))
-		$tab = notags(trim($_GET['tab']));
+		if(x($_GET,'tab'))
+			$tab = notags(trim($_GET['tab']));
 	
-	$url = $a->get_baseurl() . '/profile/' . $nickname;
-
-	$tabs = array(
-		array(
-			'label'=>t('Status'),
-			'url' => $url,
-			'sel' => ((!isset($tab)&&$a->argv[0]=='profile')?'active':''),
-		),
-		array(
-			'label' => t('Profile'),
-			'url' 	=> $url.'/?tab=profile',
-			'sel'	=> ((isset($tab) && $tab=='profile')?'active':''),
-		),
-		array(
-			'label' => t('Photos'),
-			'url'	=> $a->get_baseurl() . '/photos/' . $nickname,
-			'sel'	=> ((!isset($tab)&&$a->argv[0]=='photos')?'active':''),
-		),
-	);
-	
-	if ($is_owner){
-		 $tabs[] = array(
-			'label' => t('Events'),
-			'url'	=> $a->get_baseurl() . '/events',
-			'sel' 	=>((!isset($tab)&&$a->argv[0]=='events')?'active':''),
-		);
-		$tabs[] = array(
-			'label' => t('Personal Notes'),
-			'url'	=> $a->get_baseurl() . '/notes',
-			'sel' 	=>((!isset($tab)&&$a->argv[0]=='notes')?'active':''),
+		$url = $a->get_baseurl() . '/profile/' . $nickname;
+
+		$tabs = array(
+			array(
+				'label'=>t('Status'),
+				'url' => $url,
+				'sel' => ((!isset($tab)&&$a->argv[0]=='profile')?'active':''),
+			),
+			array(
+				'label' => t('Profile'),
+				'url' 	=> $url.'/?tab=profile',
+				'sel'	=> ((isset($tab) && $tab=='profile')?'active':''),
+			),
+			array(
+				'label' => t('Photos'),
+				'url'	=> $a->get_baseurl() . '/photos/' . $nickname,
+				'sel'	=> ((!isset($tab)&&$a->argv[0]=='photos')?'active':''),
+			),
 		);
-	}
+	
+		if ($is_owner){
+			$tabs[] = array(
+				'label' => t('Events'),
+				'url'	=> $a->get_baseurl() . '/events',
+				'sel' 	=>((!isset($tab)&&$a->argv[0]=='events')?'active':''),
+			);
+			$tabs[] = array(
+				'label' => t('Personal Notes'),
+				'url'	=> $a->get_baseurl() . '/notes',
+				'sel' 	=>((!isset($tab)&&$a->argv[0]=='notes')?'active':''),
+			);
+		}
 
 
-	$arr = array('is_owner' => $is_owner, 'nickname' => $nickname, 'tab' => (($tab) ? $tab : false), 'tabs' => $tabs);
-	call_hooks('profile_tabs', $arr);
+		$arr = array('is_owner' => $is_owner, 'nickname' => $nickname, 'tab' => (($tab) ? $tab : false), 'tabs' => $tabs);
+		call_hooks('profile_tabs', $arr);
 	
-	$tpl = get_markup_template('common_tabs.tpl');
+		$tpl = get_markup_template('common_tabs.tpl');
 
-	return replace_macros($tpl,array('$tabs' => $arr['tabs']));
-}}	
+		return replace_macros($tpl,array('$tabs' => $arr['tabs']));
+	}
+}
 
 function get_my_url() {
 	if(x($_SESSION,'my_url'))
@@ -1438,11 +1495,13 @@ function get_my_url() {
 	return false;
 }
 
-function zrl($s) {
+function zrl($s,$force = false) {
 	if(! strlen($s))
 		return $s;
-	if(! strpos($s,'/profile/'))
-		return $s;	
+	if((! strpos($s,'/profile/')) && (! $force))
+		return $s;
+	if($force && substr($s,-1,1) !== '/')
+		$s = $s . '/';
 	$achar = strpos($s,'?') ? '&' : '?';
 	$mine = get_my_url();
 	if($mine and ! link_compare($mine,$s))
diff --git a/database.sql b/database.sql
index a271e5491..eadb53cc6 100755..100644
--- a/database.sql
+++ b/database.sql
@@ -1,19 +1,77 @@
 -- phpMyAdmin SQL Dump
--- version 2.11.9.4
+-- version 3.3.10.4
 -- http://www.phpmyadmin.net
 --
 
 SET SQL_MODE="NO_AUTO_VALUE_ON_ZERO";
 
+-- --------------------------------------------------------
+
+--
+-- Table structure for table `addon`
+--
+
+CREATE TABLE IF NOT EXISTS `addon` (
+  `id` int(11) NOT NULL AUTO_INCREMENT,
+  `name` char(255) NOT NULL,
+  `version` char(255) NOT NULL,
+  `installed` tinyint(1) NOT NULL DEFAULT '0',
+  `timestamp` bigint(20) NOT NULL DEFAULT '0',
+  `plugin_admin` tinyint(1) NOT NULL DEFAULT '0',
+  PRIMARY KEY (`id`)
+) ENGINE=MyISAM  DEFAULT CHARSET=utf8;
+
+-- --------------------------------------------------------
+
+--
+-- Table structure for table `attach`
+--
+
+CREATE TABLE IF NOT EXISTS `attach` (
+  `id` int(11) NOT NULL AUTO_INCREMENT,
+  `uid` int(11) NOT NULL,
+  `hash` char(64) NOT NULL,
+  `filename` char(255) NOT NULL,
+  `filetype` char(64) NOT NULL,
+  `filesize` int(11) NOT NULL,
+  `data` longblob NOT NULL,
+  `created` datetime NOT NULL DEFAULT '0000-00-00 00:00:00',
+  `edited` datetime NOT NULL DEFAULT '0000-00-00 00:00:00',
+  `allow_cid` mediumtext NOT NULL,
+  `allow_gid` mediumtext NOT NULL,
+  `deny_cid` mediumtext NOT NULL,
+  `deny_gid` mediumtext NOT NULL,
+  PRIMARY KEY (`id`)
+) ENGINE=MyISAM  DEFAULT CHARSET=utf8;
 
-/*!40101 SET @OLD_CHARACTER_SET_CLIENT=@@CHARACTER_SET_CLIENT */;
-/*!40101 SET @OLD_CHARACTER_SET_RESULTS=@@CHARACTER_SET_RESULTS */;
-/*!40101 SET @OLD_COLLATION_CONNECTION=@@COLLATION_CONNECTION */;
-/*!40101 SET NAMES utf8 */;
+-- --------------------------------------------------------
 
 --
+-- Table structure for table `auth_codes`
 --
 
+CREATE TABLE IF NOT EXISTS `auth_codes` (
+  `id` varchar(40) NOT NULL,
+  `client_id` varchar(20) NOT NULL,
+  `redirect_uri` varchar(200) NOT NULL,
+  `expires` int(11) NOT NULL,
+  `scope` varchar(250) NOT NULL,
+  PRIMARY KEY (`id`)
+) ENGINE=MyISAM DEFAULT CHARSET=utf8;
+
+-- --------------------------------------------------------
+
+--
+-- Table structure for table `cache`
+--
+
+CREATE TABLE IF NOT EXISTS `cache` (
+  `k` char(255) NOT NULL,
+  `v` text NOT NULL,
+  `updated` datetime NOT NULL,
+  PRIMARY KEY (`k`)
+) ENGINE=MyISAM DEFAULT CHARSET=utf8;
+
 -- --------------------------------------------------------
 
 --
@@ -32,16 +90,36 @@ CREATE TABLE IF NOT EXISTS `challenge` (
 
 -- --------------------------------------------------------
 
-CREATE TABLE IF NOT EXISTS `config` (
-  `id` int(10) unsigned NOT NULL AUTO_INCREMENT,
-  `cat` char(255) NOT NULL,
-  `k` char(255) NOT NULL,
-  `v` text NOT NULL,
-  PRIMARY KEY (`id`)
+--
+-- Table structure for table `clients`
+--
+
+CREATE TABLE IF NOT EXISTS `clients` (
+  `client_id` varchar(20) NOT NULL,
+  `pw` varchar(20) NOT NULL,
+  `redirect_uri` varchar(200) NOT NULL,
+  `name` text,
+  `icon` text,
+  `uid` int(11) NOT NULL DEFAULT '0',
+  PRIMARY KEY (`client_id`)
 ) ENGINE=MyISAM DEFAULT CHARSET=utf8;
 
+-- --------------------------------------------------------
+
+--
+-- Table structure for table `config`
+--
 
+CREATE TABLE IF NOT EXISTS `config` (
+  `id` int(10) unsigned NOT NULL AUTO_INCREMENT,
+  `cat` char(255) CHARACTER SET ascii NOT NULL,
+  `k` char(255) CHARACTER SET ascii NOT NULL,
+  `v` text NOT NULL,
+  PRIMARY KEY (`id`),
+  UNIQUE KEY `access` (`cat`,`k`)
+) ENGINE=MyISAM  DEFAULT CHARSET=utf8;
 
+-- --------------------------------------------------------
 
 --
 -- Table structure for table `contact`
@@ -51,7 +129,7 @@ CREATE TABLE IF NOT EXISTS `contact` (
   `id` int(11) NOT NULL AUTO_INCREMENT,
   `uid` int(11) NOT NULL COMMENT 'owner uid',
   `created` datetime NOT NULL DEFAULT '0000-00-00 00:00:00',
-  `self` tinyint(1) NOT NULL DEFAULT '0',
+  `self` tinyint(1) NOT NULL DEFAULT '0' COMMENT 'boolean 1 == info for local UID, primarily name and photo to use in item displays.',
   `remote_self` tinyint(1) NOT NULL DEFAULT '0',
   `rel` tinyint(1) NOT NULL DEFAULT '0',
   `duplex` tinyint(1) NOT NULL DEFAULT '0',
@@ -59,7 +137,7 @@ CREATE TABLE IF NOT EXISTS `contact` (
   `name` char(255) NOT NULL,
   `nick` char(255) NOT NULL,
   `attag` char(255) NOT NULL,
-  `photo` text NOT NULL, 
+  `photo` text NOT NULL COMMENT 'remote photo URL initially until approved',
   `thumb` text NOT NULL,
   `micro` text NOT NULL,
   `site-pubkey` text NOT NULL,
@@ -95,32 +173,219 @@ CREATE TABLE IF NOT EXISTS `contact` (
   `forum` tinyint(1) NOT NULL DEFAULT '0',
   `hidden` tinyint(1) NOT NULL DEFAULT '0',
   `pending` tinyint(1) NOT NULL DEFAULT '1',
-  `rating` tinyint(1) NOT NULL DEFAULT '0',
-  `reason` text NOT NULL,
+  `rating` tinyint(1) NOT NULL DEFAULT '0' COMMENT '0-5 reputation, 0 unknown, 1 call police, 5 inscrutable',
+  `reason` text NOT NULL COMMENT 'why a rating was given - will help friends decide to make friends or not',
   `closeness` tinyint(2) NOT NULL DEFAULT '99',
   `info` mediumtext NOT NULL,
-  `profile-id` int(11) NOT NULL DEFAULT '0',
-  `bdyear` CHAR( 4 ) NOT NULL COMMENT 'birthday notify flag',
+  `profile-id` int(11) NOT NULL DEFAULT '0' COMMENT 'which profile to display - 0 is public default',
+  `bdyear` char(4) NOT NULL COMMENT 'birthday notify flag',
   `bd` date NOT NULL,
   PRIMARY KEY (`id`),
   KEY `uid` (`uid`),
   KEY `self` (`self`),
+  KEY `issued-id` (`issued-id`),
+  KEY `dfrn-id` (`dfrn-id`),
+  KEY `blocked` (`blocked`),
+  KEY `readonly` (`readonly`),
   KEY `network` (`network`),
   KEY `name` (`name`),
   KEY `nick` (`nick`),
   KEY `attag` (`attag`),
-  KEY `url` (`url`),
-  KEY `nurl` (`nurl`),
   KEY `addr` (`addr`),
+  KEY `url` (`url`),
   KEY `batch` (`batch`),
-  KEY `issued-id` (`issued-id`),
-  KEY `dfrn-id` (`dfrn-id`),
-  KEY `blocked` (`blocked`),
-  KEY `readonly` (`readonly`),
-  KEY `forum` (`forum`),
-  KEY `hidden` (`hidden`),
+  KEY `nurl` (`nurl`),
   KEY `pending` (`pending`),
-  KEY `closeness` (`closeness`)  
+  KEY `hidden` (`hidden`),
+  KEY `forum` (`forum`)
+) ENGINE=MyISAM  DEFAULT CHARSET=utf8;
+
+-- --------------------------------------------------------
+
+--
+-- Table structure for table `conv`
+--
+
+CREATE TABLE IF NOT EXISTS `conv` (
+  `id` int(10) unsigned NOT NULL AUTO_INCREMENT,
+  `guid` char(64) NOT NULL,
+  `recips` mediumtext NOT NULL,
+  `uid` int(11) NOT NULL,
+  `creator` char(255) NOT NULL,
+  `created` datetime NOT NULL DEFAULT '0000-00-00 00:00:00',
+  `updated` datetime NOT NULL DEFAULT '0000-00-00 00:00:00',
+  `subject` mediumtext NOT NULL,
+  PRIMARY KEY (`id`),
+  KEY `created` (`created`),
+  KEY `updated` (`updated`)
+) ENGINE=MyISAM  DEFAULT CHARSET=utf8;
+
+-- --------------------------------------------------------
+
+--
+-- Table structure for table `deliverq`
+--
+
+CREATE TABLE IF NOT EXISTS `deliverq` (
+  `id` int(10) unsigned NOT NULL AUTO_INCREMENT,
+  `cmd` char(32) NOT NULL,
+  `item` int(11) NOT NULL,
+  `contact` int(11) NOT NULL,
+  PRIMARY KEY (`id`)
+) ENGINE=MyISAM  DEFAULT CHARSET=utf8;
+
+-- --------------------------------------------------------
+
+--
+-- Table structure for table `event`
+--
+
+CREATE TABLE IF NOT EXISTS `event` (
+  `id` int(11) NOT NULL AUTO_INCREMENT,
+  `uid` int(11) NOT NULL,
+  `cid` int(11) NOT NULL,
+  `uri` char(255) NOT NULL,
+  `created` datetime NOT NULL,
+  `edited` datetime NOT NULL,
+  `start` datetime NOT NULL,
+  `finish` datetime NOT NULL,
+  `desc` text NOT NULL,
+  `location` text NOT NULL,
+  `type` char(255) NOT NULL,
+  `nofinish` tinyint(1) NOT NULL DEFAULT '0',
+  `adjust` tinyint(1) NOT NULL DEFAULT '1',
+  `allow_cid` mediumtext NOT NULL,
+  `allow_gid` mediumtext NOT NULL,
+  `deny_cid` mediumtext NOT NULL,
+  `deny_gid` mediumtext NOT NULL,
+  PRIMARY KEY (`id`)
+) ENGINE=MyISAM  DEFAULT CHARSET=utf8;
+
+-- --------------------------------------------------------
+
+--
+-- Table structure for table `fcontact`
+--
+
+CREATE TABLE IF NOT EXISTS `fcontact` (
+  `id` int(10) unsigned NOT NULL AUTO_INCREMENT,
+  `url` char(255) NOT NULL,
+  `name` char(255) NOT NULL,
+  `photo` char(255) NOT NULL,
+  `request` char(255) NOT NULL,
+  `nick` char(255) NOT NULL,
+  `addr` char(255) NOT NULL,
+  `batch` char(255) NOT NULL,
+  `notify` char(255) NOT NULL,
+  `poll` char(255) NOT NULL,
+  `confirm` char(255) NOT NULL,
+  `priority` tinyint(1) NOT NULL,
+  `network` char(32) NOT NULL,
+  `alias` char(255) NOT NULL,
+  `pubkey` text NOT NULL,
+  `updated` datetime NOT NULL DEFAULT '0000-00-00 00:00:00',
+  PRIMARY KEY (`id`),
+  KEY `addr` (`addr`),
+  KEY `network` (`network`)
+) ENGINE=MyISAM  DEFAULT CHARSET=utf8;
+
+-- --------------------------------------------------------
+
+--
+-- Table structure for table `ffinder`
+--
+
+CREATE TABLE IF NOT EXISTS `ffinder` (
+  `id` int(10) unsigned NOT NULL AUTO_INCREMENT,
+  `uid` int(10) unsigned NOT NULL,
+  `cid` int(10) unsigned NOT NULL,
+  `fid` int(10) unsigned NOT NULL,
+  PRIMARY KEY (`id`)
+) ENGINE=MyISAM DEFAULT CHARSET=utf8;
+
+-- --------------------------------------------------------
+
+--
+-- Table structure for table `fserver`
+--
+
+CREATE TABLE IF NOT EXISTS `fserver` (
+  `id` int(11) NOT NULL AUTO_INCREMENT,
+  `server` char(255) NOT NULL,
+  `posturl` char(255) NOT NULL,
+  `key` text NOT NULL,
+  PRIMARY KEY (`id`),
+  KEY `server` (`server`)
+) ENGINE=MyISAM DEFAULT CHARSET=utf8;
+
+-- --------------------------------------------------------
+
+--
+-- Table structure for table `fsuggest`
+--
+
+CREATE TABLE IF NOT EXISTS `fsuggest` (
+  `id` int(11) NOT NULL AUTO_INCREMENT,
+  `uid` int(11) NOT NULL,
+  `cid` int(11) NOT NULL,
+  `name` char(255) NOT NULL,
+  `url` char(255) NOT NULL,
+  `request` char(255) NOT NULL,
+  `photo` char(255) NOT NULL,
+  `note` text NOT NULL,
+  `created` datetime NOT NULL,
+  PRIMARY KEY (`id`)
+) ENGINE=MyISAM  DEFAULT CHARSET=utf8;
+
+-- --------------------------------------------------------
+
+--
+-- Table structure for table `gcign`
+--
+
+CREATE TABLE IF NOT EXISTS `gcign` (
+  `id` int(11) NOT NULL AUTO_INCREMENT,
+  `uid` int(11) NOT NULL,
+  `gcid` int(11) NOT NULL,
+  PRIMARY KEY (`id`),
+  KEY `uid` (`uid`),
+  KEY `gcid` (`gcid`)
+) ENGINE=MyISAM DEFAULT CHARSET=utf8;
+
+-- --------------------------------------------------------
+
+--
+-- Table structure for table `gcontact`
+--
+
+CREATE TABLE IF NOT EXISTS `gcontact` (
+  `id` int(10) unsigned NOT NULL AUTO_INCREMENT,
+  `name` char(255) NOT NULL,
+  `url` char(255) NOT NULL,
+  `nurl` char(255) NOT NULL,
+  `photo` char(255) NOT NULL,
+  `connect` char(255) NOT NULL,
+  PRIMARY KEY (`id`),
+  KEY `nurl` (`nurl`)
+) ENGINE=MyISAM  DEFAULT CHARSET=utf8;
+
+-- --------------------------------------------------------
+
+--
+-- Table structure for table `glink`
+--
+
+CREATE TABLE IF NOT EXISTS `glink` (
+  `id` int(10) unsigned NOT NULL AUTO_INCREMENT,
+  `cid` int(11) NOT NULL,
+  `uid` int(11) NOT NULL,
+  `gcid` int(11) NOT NULL,
+  `updated` datetime NOT NULL,
+  PRIMARY KEY (`id`),
+  KEY `cid` (`cid`),
+  KEY `uid` (`uid`),
+  KEY `gcid` (`gcid`),
+  KEY `updated` (`updated`)
 ) ENGINE=MyISAM  DEFAULT CHARSET=utf8;
 
 -- --------------------------------------------------------
@@ -155,6 +420,33 @@ CREATE TABLE IF NOT EXISTS `group_member` (
 -- --------------------------------------------------------
 
 --
+-- Table structure for table `guid`
+--
+
+CREATE TABLE IF NOT EXISTS `guid` (
+  `id` int(10) unsigned NOT NULL AUTO_INCREMENT,
+  `guid` char(64) NOT NULL,
+  PRIMARY KEY (`id`),
+  KEY `guid` (`guid`)
+) ENGINE=MyISAM  DEFAULT CHARSET=utf8;
+
+-- --------------------------------------------------------
+
+--
+-- Table structure for table `hook`
+--
+
+CREATE TABLE IF NOT EXISTS `hook` (
+  `id` int(11) NOT NULL AUTO_INCREMENT,
+  `hook` char(255) NOT NULL,
+  `file` char(255) NOT NULL,
+  `function` char(255) NOT NULL,
+  PRIMARY KEY (`id`)
+) ENGINE=MyISAM  DEFAULT CHARSET=utf8;
+
+-- --------------------------------------------------------
+
+--
 -- Table structure for table `intro`
 --
 
@@ -182,18 +474,18 @@ CREATE TABLE IF NOT EXISTS `intro` (
 CREATE TABLE IF NOT EXISTS `item` (
   `id` int(10) unsigned NOT NULL AUTO_INCREMENT,
   `guid` char(64) NOT NULL,
-  `uri` char(255) NOT NULL,
+  `uri` char(255) CHARACTER SET ascii NOT NULL,
   `uid` int(10) unsigned NOT NULL DEFAULT '0',
   `contact-id` int(10) unsigned NOT NULL DEFAULT '0',
   `type` char(255) NOT NULL,
   `wall` tinyint(1) NOT NULL DEFAULT '0',
   `gravity` tinyint(1) NOT NULL DEFAULT '0',
   `parent` int(10) unsigned NOT NULL DEFAULT '0',
-  `parent-uri` char(255) NOT NULL,
+  `parent-uri` char(255) CHARACTER SET ascii NOT NULL,
   `extid` char(255) NOT NULL,
   `thr-parent` char(255) NOT NULL,
-  `created` datetime NOT NULL DEFAULT '0000-00-00 00:00:00',
-  `edited` datetime NOT NULL DEFAULT '0000-00-00 00:00:00',
+  `created` datetime NOT NULL,
+  `edited` datetime NOT NULL,
   `commented` datetime NOT NULL DEFAULT '0000-00-00 00:00:00',
   `received` datetime NOT NULL DEFAULT '0000-00-00 00:00:00',
   `changed` datetime NOT NULL DEFAULT '0000-00-00 00:00:00',
@@ -212,9 +504,9 @@ CREATE TABLE IF NOT EXISTS `item` (
   `target-type` char(255) NOT NULL,
   `target` text NOT NULL,
   `postopts` text NOT NULL,
-  `plink` char(255) NOT NULL, 
+  `plink` char(255) NOT NULL,
   `resource-id` char(255) NOT NULL,
-  `event-id` int(10) unsigned NOT NULL,
+  `event-id` int(11) NOT NULL,
   `tag` mediumtext NOT NULL,
   `attach` mediumtext NOT NULL,
   `inform` mediumtext NOT NULL,
@@ -238,43 +530,60 @@ CREATE TABLE IF NOT EXISTS `item` (
   `forum_mode` tinyint(1) NOT NULL DEFAULT '0',
   `last-child` tinyint(1) unsigned NOT NULL DEFAULT '1',
   PRIMARY KEY (`id`),
-  KEY `guid` (`guid`),
   KEY `uri` (`uri`),
   KEY `uid` (`uid`),
   KEY `contact-id` (`contact-id`),
   KEY `type` (`type`),
   KEY `parent` (`parent`),
   KEY `parent-uri` (`parent-uri`),
-  KEY `extid` (`extid`),
   KEY `created` (`created`),
   KEY `edited` (`edited`),
-  KEY `received` (`received`),
-  KEY `moderated` (`moderated`),
   KEY `visible` (`visible`),
-  KEY `spam` (`spam`),
-  KEY `starred` (`starred`),
-  KEY `bookmark` (`bookmark`),
   KEY `deleted` (`deleted`),
-  KEY `origin`  (`origin`),
-  KEY `forum_mode` (`forum_mode`),
   KEY `last-child` (`last-child`),
   KEY `unseen` (`unseen`),
+  KEY `extid` (`extid`),
+  KEY `received` (`received`),
+  KEY `starred` (`starred`),
+  KEY `guid` (`guid`),
+  KEY `origin` (`origin`),
   KEY `wall` (`wall`),
-  KEY `author-name` (`author-name`),
+  KEY `forum_mode` (`forum_mode`),
   KEY `author-link` (`author-link`),
+  KEY `bookmark` (`bookmark`),
+  KEY `moderated` (`moderated`),
+  KEY `spam` (`spam`),
+  KEY `author-name` (`author-name`),
   FULLTEXT KEY `title` (`title`),
   FULLTEXT KEY `body` (`body`),
-  FULLTEXT KEY `tag` (`tag`),
-  FULLTEXT KEY `file` (`file`),
   FULLTEXT KEY `allow_cid` (`allow_cid`),
   FULLTEXT KEY `allow_gid` (`allow_gid`),
   FULLTEXT KEY `deny_cid` (`deny_cid`),
-  FULLTEXT KEY `deny_gid` (`deny_gid`)
+  FULLTEXT KEY `deny_gid` (`deny_gid`),
+  FULLTEXT KEY `tag` (`tag`),
+  FULLTEXT KEY `file` (`file`)
 ) ENGINE=MyISAM  DEFAULT CHARSET=utf8;
 
 -- --------------------------------------------------------
 
 --
+-- Table structure for table `item_id`
+--
+
+CREATE TABLE IF NOT EXISTS `item_id` (
+  `iid` int(11) NOT NULL,
+  `uid` int(11) NOT NULL,
+  `sid` char(255) NOT NULL,
+  `service` char(255) NOT NULL,
+  PRIMARY KEY (`iid`),
+  KEY `uid` (`uid`),
+  KEY `sid` (`sid`),
+  KEY `service` (`service`)
+) ENGINE=MyISAM DEFAULT CHARSET=utf8;
+
+-- --------------------------------------------------------
+
+--
 -- Table structure for table `mail`
 --
 
@@ -286,26 +595,130 @@ CREATE TABLE IF NOT EXISTS `mail` (
   `from-photo` char(255) NOT NULL,
   `from-url` char(255) NOT NULL,
   `contact-id` char(255) NOT NULL,
-  `convid` int(10) unsigned NOT NULL,
+  `convid` int(11) NOT NULL,
   `title` char(255) NOT NULL,
   `body` mediumtext NOT NULL,
-  `seen` tinyint(1) NOT NULL DEFAULT '0',
+  `seen` tinyint(1) NOT NULL,
   `reply` tinyint(1) NOT NULL DEFAULT '0',
-  `replied` tinyint(1) NOT NULL DEFAULT '0',
+  `replied` tinyint(1) NOT NULL,
   `unknown` tinyint(1) NOT NULL DEFAULT '0',
   `uri` char(255) NOT NULL,
   `parent-uri` char(255) NOT NULL,
   `created` datetime NOT NULL DEFAULT '0000-00-00 00:00:00',
   PRIMARY KEY (`id`),
+  KEY `reply` (`reply`),
   KEY `uid` (`uid`),
   KEY `guid` (`guid`),
-  KEY `convid` (`convid`),
-  KEY `reply` (`reply`),
-  KEY `unknown` (`unknown`),
+  KEY `seen` (`seen`),
   KEY `uri` (`uri`),
   KEY `parent-uri` (`parent-uri`),
-  KEY `created` (`created`)
-) ENGINE=MyISAM DEFAULT CHARSET=utf8;
+  KEY `created` (`created`),
+  KEY `convid` (`convid`),
+  KEY `unknown` (`unknown`)
+) ENGINE=MyISAM  DEFAULT CHARSET=utf8;
+
+-- --------------------------------------------------------
+
+--
+-- Table structure for table `mailacct`
+--
+
+CREATE TABLE IF NOT EXISTS `mailacct` (
+  `id` int(11) NOT NULL AUTO_INCREMENT,
+  `uid` int(11) NOT NULL,
+  `server` char(255) NOT NULL,
+  `port` int(11) NOT NULL,
+  `ssltype` char(16) NOT NULL,
+  `mailbox` char(255) NOT NULL,
+  `user` char(255) NOT NULL,
+  `pass` text NOT NULL,
+  `action` int(11) NOT NULL,
+  `movetofolder` char(255) NOT NULL,
+  `reply_to` char(255) NOT NULL,
+  `pubmail` tinyint(1) NOT NULL DEFAULT '0',
+  `last_check` datetime NOT NULL DEFAULT '0000-00-00 00:00:00',
+  PRIMARY KEY (`id`)
+) ENGINE=MyISAM  DEFAULT CHARSET=utf8;
+
+-- --------------------------------------------------------
+
+--
+-- Table structure for table `manage`
+--
+
+CREATE TABLE IF NOT EXISTS `manage` (
+  `id` int(11) NOT NULL AUTO_INCREMENT,
+  `uid` int(11) NOT NULL,
+  `mid` int(11) NOT NULL,
+  PRIMARY KEY (`id`),
+  KEY `uid` (`uid`),
+  KEY `mid` (`mid`)
+) ENGINE=MyISAM  DEFAULT CHARSET=utf8;
+
+-- --------------------------------------------------------
+
+--
+-- Table structure for table `notify`
+--
+
+CREATE TABLE IF NOT EXISTS `notify` (
+  `id` int(11) NOT NULL AUTO_INCREMENT,
+  `hash` char(64) NOT NULL,
+  `name` char(255) NOT NULL,
+  `url` char(255) NOT NULL,
+  `photo` char(255) NOT NULL,
+  `date` datetime NOT NULL,
+  `msg` mediumtext NOT NULL,
+  `uid` int(11) NOT NULL,
+  `link` char(255) NOT NULL,
+  `parent` int(11) NOT NULL,
+  `seen` tinyint(1) NOT NULL DEFAULT '0',
+  `type` int(11) NOT NULL,
+  `verb` char(255) NOT NULL,
+  `otype` char(16) NOT NULL,
+  PRIMARY KEY (`id`),
+  KEY `type` (`type`),
+  KEY `seen` (`seen`),
+  KEY `uid` (`uid`),
+  KEY `date` (`date`),
+  KEY `hash` (`hash`),
+  KEY `parent` (`parent`),
+  KEY `link` (`link`),
+  KEY `otype` (`otype`)
+) ENGINE=MyISAM  DEFAULT CHARSET=utf8;
+
+-- --------------------------------------------------------
+
+--
+-- Table structure for table `notify-threads`
+--
+
+CREATE TABLE IF NOT EXISTS `notify-threads` (
+  `id` int(11) NOT NULL AUTO_INCREMENT,
+  `notify-id` int(11) NOT NULL,
+  `master-parent-item` int(10) unsigned NOT NULL DEFAULT '0',
+  `parent-item` int(10) unsigned NOT NULL DEFAULT '0',
+  `receiver-uid` int(11) NOT NULL,
+  PRIMARY KEY (`id`),
+  KEY `master-parent-item` (`master-parent-item`),
+  KEY `receiver-uid` (`receiver-uid`)
+) ENGINE=MyISAM  DEFAULT CHARSET=utf8;
+
+-- --------------------------------------------------------
+
+--
+-- Table structure for table `pconfig`
+--
+
+CREATE TABLE IF NOT EXISTS `pconfig` (
+  `id` int(11) NOT NULL AUTO_INCREMENT,
+  `uid` int(11) NOT NULL DEFAULT '0',
+  `cat` char(255) CHARACTER SET ascii NOT NULL,
+  `k` char(255) CHARACTER SET ascii NOT NULL,
+  `v` mediumtext NOT NULL,
+  PRIMARY KEY (`id`),
+  UNIQUE KEY `access` (`uid`,`cat`,`k`)
+) ENGINE=MyISAM  DEFAULT CHARSET=utf8;
 
 -- --------------------------------------------------------
 
@@ -316,8 +729,8 @@ CREATE TABLE IF NOT EXISTS `mail` (
 CREATE TABLE IF NOT EXISTS `photo` (
   `id` int(10) unsigned NOT NULL AUTO_INCREMENT,
   `uid` int(10) unsigned NOT NULL,
-  `contact-id` int(10) unsigned NOT NULL,
-  `guid` char(64) NOT NULL, 
+  `contact-id` int(10) unsigned NOT NULL DEFAULT '0',
+  `guid` char(64) NOT NULL,
   `resource-id` char(255) NOT NULL,
   `created` datetime NOT NULL,
   `edited` datetime NOT NULL,
@@ -339,13 +752,50 @@ CREATE TABLE IF NOT EXISTS `photo` (
   KEY `resource-id` (`resource-id`),
   KEY `album` (`album`),
   KEY `scale` (`scale`),
-  KEY `profile` (`profile`),
-  KEY `guid` (`guid`)
+  KEY `profile` (`profile`)
 ) ENGINE=MyISAM  DEFAULT CHARSET=utf8;
 
 -- --------------------------------------------------------
 
 --
+-- Table structure for table `poll`
+--
+
+CREATE TABLE IF NOT EXISTS `poll` (
+  `id` int(11) NOT NULL AUTO_INCREMENT,
+  `uid` int(11) NOT NULL,
+  `q0` mediumtext NOT NULL,
+  `q1` mediumtext NOT NULL,
+  `q2` mediumtext NOT NULL,
+  `q3` mediumtext NOT NULL,
+  `q4` mediumtext NOT NULL,
+  `q5` mediumtext NOT NULL,
+  `q6` mediumtext NOT NULL,
+  `q7` mediumtext NOT NULL,
+  `q8` mediumtext NOT NULL,
+  `q9` mediumtext NOT NULL,
+  PRIMARY KEY (`id`),
+  KEY `uid` (`uid`)
+) ENGINE=MyISAM DEFAULT CHARSET=utf8;
+
+-- --------------------------------------------------------
+
+--
+-- Table structure for table `poll_result`
+--
+
+CREATE TABLE IF NOT EXISTS `poll_result` (
+  `id` int(11) NOT NULL AUTO_INCREMENT,
+  `poll_id` int(11) NOT NULL,
+  `choice` int(11) NOT NULL,
+  PRIMARY KEY (`id`),
+  KEY `poll_id` (`poll_id`),
+  KEY `choice` (`choice`)
+) ENGINE=MyISAM DEFAULT CHARSET=utf8;
+
+-- --------------------------------------------------------
+
+--
 -- Table structure for table `profile`
 --
 
@@ -365,7 +815,6 @@ CREATE TABLE IF NOT EXISTS `profile` (
   `country-name` char(255) NOT NULL,
   `gender` char(32) NOT NULL,
   `marital` char(255) NOT NULL,
-  `showwith` tinyint(1) NOT NULL DEFAULT '0',
   `with` text NOT NULL,
   `sexual` char(255) NOT NULL,
   `politic` char(255) NOT NULL,
@@ -402,7 +851,7 @@ CREATE TABLE IF NOT EXISTS `profile` (
 CREATE TABLE IF NOT EXISTS `profile_check` (
   `id` int(10) unsigned NOT NULL AUTO_INCREMENT,
   `uid` int(10) unsigned NOT NULL,
-  `cid` int(10) unsigned NOT NULL,
+  `cid` int(10) unsigned NOT NULL DEFAULT '0',
   `dfrn_id` char(255) NOT NULL,
   `sec` char(255) NOT NULL,
   `expire` int(11) NOT NULL,
@@ -412,6 +861,59 @@ CREATE TABLE IF NOT EXISTS `profile_check` (
 -- --------------------------------------------------------
 
 --
+-- Table structure for table `queue`
+--
+
+CREATE TABLE IF NOT EXISTS `queue` (
+  `id` int(11) NOT NULL AUTO_INCREMENT,
+  `cid` int(11) NOT NULL,
+  `network` char(32) NOT NULL,
+  `created` datetime NOT NULL,
+  `last` datetime NOT NULL,
+  `content` mediumtext NOT NULL,
+  `batch` tinyint(1) NOT NULL DEFAULT '0',
+  PRIMARY KEY (`id`),
+  KEY `cid` (`cid`),
+  KEY `network` (`network`),
+  KEY `created` (`created`),
+  KEY `last` (`last`),
+  KEY `batch` (`batch`)
+) ENGINE=MyISAM  DEFAULT CHARSET=utf8;
+
+-- --------------------------------------------------------
+
+--
+-- Table structure for table `register`
+--
+
+CREATE TABLE IF NOT EXISTS `register` (
+  `id` int(10) unsigned NOT NULL AUTO_INCREMENT,
+  `hash` char(255) NOT NULL,
+  `created` datetime NOT NULL,
+  `uid` int(10) unsigned NOT NULL,
+  `password` char(255) NOT NULL,
+  `language` char(16) NOT NULL,
+  PRIMARY KEY (`id`)
+) ENGINE=MyISAM  DEFAULT CHARSET=utf8;
+
+-- --------------------------------------------------------
+
+--
+-- Table structure for table `search`
+--
+
+CREATE TABLE IF NOT EXISTS `search` (
+  `id` int(11) NOT NULL AUTO_INCREMENT,
+  `uid` int(11) NOT NULL,
+  `term` char(255) NOT NULL,
+  PRIMARY KEY (`id`),
+  KEY `uid` (`uid`),
+  KEY `term` (`term`)
+) ENGINE=MyISAM  DEFAULT CHARSET=utf8;
+
+-- --------------------------------------------------------
+
+--
 -- Table structure for table `session`
 --
 
@@ -428,6 +930,58 @@ CREATE TABLE IF NOT EXISTS `session` (
 -- --------------------------------------------------------
 
 --
+-- Table structure for table `sign`
+--
+
+CREATE TABLE IF NOT EXISTS `sign` (
+  `id` int(10) unsigned NOT NULL AUTO_INCREMENT,
+  `iid` int(10) unsigned NOT NULL,
+  `signed_text` mediumtext NOT NULL,
+  `signature` text NOT NULL,
+  `signer` char(255) NOT NULL,
+  PRIMARY KEY (`id`),
+  KEY `iid` (`iid`)
+) ENGINE=MyISAM  DEFAULT CHARSET=utf8;
+
+-- --------------------------------------------------------
+
+--
+-- Table structure for table `spam`
+--
+
+CREATE TABLE IF NOT EXISTS `spam` (
+  `id` int(11) NOT NULL AUTO_INCREMENT,
+  `uid` int(11) NOT NULL,
+  `spam` int(11) NOT NULL DEFAULT '0',
+  `ham` int(11) NOT NULL DEFAULT '0',
+  `term` char(255) NOT NULL,
+  `date` datetime NOT NULL DEFAULT '0000-00-00 00:00:00',
+  PRIMARY KEY (`id`),
+  KEY `uid` (`uid`),
+  KEY `spam` (`spam`),
+  KEY `ham` (`ham`),
+  KEY `term` (`term`)
+) ENGINE=MyISAM DEFAULT CHARSET=utf8;
+
+-- --------------------------------------------------------
+
+--
+-- Table structure for table `tokens`
+--
+
+CREATE TABLE IF NOT EXISTS `tokens` (
+  `id` varchar(40) NOT NULL,
+  `secret` text NOT NULL,
+  `client_id` varchar(20) NOT NULL,
+  `expires` int(11) NOT NULL,
+  `scope` varchar(200) NOT NULL,
+  `uid` int(11) NOT NULL,
+  PRIMARY KEY (`id`)
+) ENGINE=MyISAM DEFAULT CHARSET=utf8;
+
+-- --------------------------------------------------------
+
+--
 -- Table structure for table `user`
 --
 
@@ -440,7 +994,7 @@ CREATE TABLE IF NOT EXISTS `user` (
   `email` char(255) NOT NULL,
   `openid` char(255) NOT NULL,
   `timezone` char(128) NOT NULL,
-  `language` char(32) NOT NULL DEFAULT 'en',
+  `language` char(16) NOT NULL DEFAULT 'en',
   `register_date` datetime NOT NULL DEFAULT '0000-00-00 00:00:00',
   `login_date` datetime NOT NULL DEFAULT '0000-00-00 00:00:00',
   `default-location` char(255) NOT NULL,
@@ -450,426 +1004,47 @@ CREATE TABLE IF NOT EXISTS `user` (
   `prvkey` text NOT NULL,
   `spubkey` text NOT NULL,
   `sprvkey` text NOT NULL,
-  `verified` tinyint(1) unsigned NOT NULL DEFAULT '0', 
-  `blocked` tinyint(1) unsigned NOT NULL DEFAULT '0', 
-  `blockwall` tinyint(1) unsigned NOT NULL DEFAULT '0',
-  `hidewall` tinyint(1) unsigned NOT NULL DEFAULT '0',
-  `blocktags` tinyint(1) unsigned NOT NULL DEFAULT '0',
-  `unkmail` tinyint(1) unsigned NOT NULL DEFAULT '0',
-  `cntunkmail` int(11) unsigned NOT NULL DEFAULT '10',
-  `notify-flags` int(11) unsigned NOT NULL DEFAULT '65535', 
-  `page-flags` int(11) unsigned NOT NULL DEFAULT '0',
+  `verified` tinyint(1) unsigned NOT NULL DEFAULT '0',
+  `blocked` tinyint(1) unsigned NOT NULL DEFAULT '0',
+  `blockwall` tinyint(1) NOT NULL DEFAULT '0',
+  `hidewall` tinyint(1) NOT NULL DEFAULT '0',
+  `blocktags` tinyint(1) NOT NULL DEFAULT '0',
+  `unkmail` tinyint(1) NOT NULL DEFAULT '0',
+  `cntunkmail` int(11) NOT NULL DEFAULT '10',
+  `notify-flags` int(11) unsigned NOT NULL DEFAULT '65535',
+  `page-flags` int(11) NOT NULL DEFAULT '0',
   `prvnets` tinyint(1) NOT NULL DEFAULT '0',
   `pwdreset` char(255) NOT NULL,
   `maxreq` int(11) NOT NULL DEFAULT '10',
-  `expire` int(11) unsigned NOT NULL DEFAULT '0',
-  `account_expired` tinyint( 1 ) NOT NULL DEFAULT '0',
+  `expire` int(10) unsigned NOT NULL DEFAULT '0',
+  `account_expired` tinyint(1) NOT NULL DEFAULT '0',
   `account_expires_on` datetime NOT NULL DEFAULT '0000-00-00 00:00:00',
   `expire_notification_sent` datetime NOT NULL DEFAULT '0000-00-00 00:00:00',
-  `allow_cid` mediumtext NOT NULL, 
+  `allow_cid` mediumtext NOT NULL,
   `allow_gid` mediumtext NOT NULL,
-  `deny_cid` mediumtext NOT NULL, 
+  `deny_cid` mediumtext NOT NULL,
   `deny_gid` mediumtext NOT NULL,
   `openidserver` text NOT NULL,
-  PRIMARY KEY (`uid`), 
+  PRIMARY KEY (`uid`),
   KEY `nickname` (`nickname`),
+  KEY `login_date` (`login_date`),
   KEY `account_expired` (`account_expired`),
   KEY `hidewall` (`hidewall`),
   KEY `blockwall` (`blockwall`),
-  KEY `unkmail` (`unkmail`),
-  KEY `cntunkmail` (`cntunkmail`),
   KEY `blocked` (`blocked`),
   KEY `verified` (`verified`),
-  KEY `login_date` (`login_date`)
-) ENGINE=MyISAM DEFAULT CHARSET=utf8;
-
-
-CREATE TABLE IF NOT EXISTS `register` (
-  `id` INT(11) UNSIGNED NOT NULL AUTO_INCREMENT,
-  `hash` CHAR( 255 ) NOT NULL ,
-  `created` DATETIME NOT NULL ,
-  `uid` INT(11) UNSIGNED NOT NULL,
-  `password` CHAR(255) NOT NULL,
-  `language` CHAR(16) NOT NULL,
-  PRIMARY KEY (`id`)
-) ENGINE = MyISAM DEFAULT CHARSET=utf8;
-
-
-CREATE TABLE IF NOT EXISTS `clients` (
-`client_id` VARCHAR( 20 ) NOT NULL ,
-`pw` VARCHAR( 20 ) NOT NULL ,
-`redirect_uri` VARCHAR( 200 ) NOT NULL ,
-`name` VARCHAR( 128 ) NULL DEFAULT NULL,
-`icon` VARCHAR( 255 ) NULL DEFAULT NULL,
-`uid` INT NOT NULL DEFAULT 0,
-PRIMARY KEY ( `client_id` )
-) ENGINE = MyISAM DEFAULT CHARSET=utf8;
-
-CREATE TABLE IF NOT EXISTS `tokens` (
-`id` VARCHAR( 40 ) NOT NULL ,
-`secret` VARCHAR( 40 ) NOT NULL ,
-`client_id` VARCHAR( 20 ) NOT NULL ,
-`expires` INT NOT NULL ,
-`scope` VARCHAR( 200 ) NOT NULL ,
-`uid` INT NOT NULL ,
-PRIMARY KEY ( `id` )
-) ENGINE = MyISAM DEFAULT CHARSET=utf8;
-
-CREATE TABLE IF NOT EXISTS `auth_codes` (
-`id` VARCHAR( 40 ) NOT NULL ,
-`client_id` VARCHAR( 20 ) NOT NULL ,
-`redirect_uri` VARCHAR( 200 ) NOT NULL ,
-`expires` INT NOT NULL ,
-`scope` VARCHAR( 250 ) NOT NULL ,
-PRIMARY KEY ( `id` )
-) ENGINE = MyISAM DEFAULT CHARSET=utf8;
-
-CREATE TABLE IF NOT EXISTS `queue` (
-`id` INT NOT NULL AUTO_INCREMENT PRIMARY KEY ,
-`cid` INT NOT NULL ,
-`network` CHAR( 32 ) NOT NULL,
-`created` DATETIME NOT NULL ,
-`last` DATETIME NOT NULL ,
-`content` MEDIUMTEXT NOT NULL,
-`batch` TINYINT( 1 ) NOT NULL DEFAULT '0',
-INDEX ( `cid` ),
-INDEX ( `created` ),
-INDEX ( `last` ),
-INDEX ( `network` ),
-INDEX ( `batch` )
-) ENGINE = MyISAM DEFAULT CHARSET=utf8;
-
-CREATE TABLE IF NOT EXISTS `pconfig` (
-`id` INT NOT NULL AUTO_INCREMENT PRIMARY KEY ,
-`uid` INT NOT NULL DEFAULT '0',
-`cat` CHAR( 255 ) NOT NULL ,
-`k` CHAR( 255 ) NOT NULL ,
-`v` MEDIUMTEXT NOT NULL
-) ENGINE = MyISAM DEFAULT CHARSET=utf8;
-
-
-CREATE TABLE IF NOT EXISTS `hook` (
-`id` INT NOT NULL AUTO_INCREMENT PRIMARY KEY ,
-`hook` CHAR( 255 ) NOT NULL ,
-`file` CHAR( 255 ) NOT NULL ,
-`function` CHAR( 255 ) NOT NULL
-) ENGINE = MyISAM DEFAULT CHARSET=utf8;
-
-
-CREATE TABLE IF NOT EXISTS `addon` (
-`id` INT NOT NULL AUTO_INCREMENT PRIMARY KEY ,
-`name` CHAR( 255 ) NOT NULL ,
-`version` CHAR( 255 ) NOT NULL ,
-`installed` TINYINT( 1 ) NOT NULL DEFAULT '0' ,
-`timestamp` BIGINT NOT NULL DEFAULT '0' ,
-`plugin_admin` TINYINT( 1 ) NOT NULL DEFAULT '0'
-) ENGINE = MyISAM DEFAULT CHARSET=utf8;
-
-
-CREATE TABLE IF NOT EXISTS `event` (
-`id` INT NOT NULL AUTO_INCREMENT PRIMARY KEY ,
-`uid` INT NOT NULL ,
-`cid` INT NOT NULL ,
-`uri` CHAR( 255 ) NOT NULL,
-`created` DATETIME NOT NULL ,
-`edited` DATETIME NOT NULL ,
-`start` DATETIME NOT NULL ,
-`finish` DATETIME NOT NULL ,
-`desc` TEXT NOT NULL ,
-`location` TEXT NOT NULL ,
-`type` CHAR( 255 ) NOT NULL ,
-`nofinish` TINYINT( 1 ) NOT NULL DEFAULT '0',
-`adjust` TINYINT( 1 ) NOT NULL DEFAULT '1',
-`allow_cid` MEDIUMTEXT NOT NULL ,
-`allow_gid` MEDIUMTEXT NOT NULL ,
-`deny_cid` MEDIUMTEXT NOT NULL ,
-`deny_gid` MEDIUMTEXT NOT NULL
-) ENGINE = MyISAM DEFAULT CHARSET=utf8;
-
-CREATE TABLE IF NOT EXISTS `cache` (
- `k` CHAR( 255 ) NOT NULL PRIMARY KEY ,
- `v` TEXT NOT NULL,
- `updated` DATETIME NOT NULL
-) ENGINE = MyISAM DEFAULT CHARSET=utf8;
-
-
-CREATE TABLE IF NOT EXISTS `fcontact` (
-`id` INT UNSIGNED NOT NULL AUTO_INCREMENT PRIMARY KEY ,
-`url` CHAR( 255 ) NOT NULL ,
-`name` CHAR( 255 ) NOT NULL ,
-`photo` CHAR( 255 ) NOT NULL ,
-`request` CHAR( 255 ) NOT NULL,
-`nick` CHAR( 255 ) NOT NULL ,
-`addr` CHAR( 255 ) NOT NULL ,
-`batch` CHAR( 255) NOT NULL,
-`notify` CHAR( 255 ) NOT NULL ,
-`poll` CHAR( 255 ) NOT NULL ,
-`confirm` CHAR( 255 ) NOT NULL ,
-`priority` TINYINT( 1 ) NOT NULL ,
-`network` CHAR( 32 ) NOT NULL ,
-`alias` CHAR( 255 ) NOT NULL ,
-`pubkey` TEXT NOT NULL ,
-`updated` DATETIME NOT NULL DEFAULT '0000-00-00 00:00:00',
-INDEX ( `addr` ),
-INDEX ( `network` )
-) ENGINE = MyISAM DEFAULT CHARSET=utf8;
-
-CREATE TABLE IF NOT EXISTS `ffinder` (
-`id` INT UNSIGNED NOT NULL AUTO_INCREMENT PRIMARY KEY ,
-`uid` INT UNSIGNED NOT NULL ,
-`cid` INT UNSIGNED NOT NULL ,
-`fid` INT UNSIGNED NOT NULL
-) ENGINE = MyISAM DEFAULT CHARSET=utf8;
-
-
-CREATE TABLE IF NOT EXISTS `fsuggest` (
-`id` INT NOT NULL AUTO_INCREMENT PRIMARY KEY ,
-`uid` INT NOT NULL ,
-`cid` INT NOT NULL ,
-`name` CHAR( 255 ) NOT NULL ,
-`url` CHAR( 255 ) NOT NULL ,
-`request` CHAR( 255 ) NOT NULL,
-`photo` CHAR( 255 ) NOT NULL ,
-`note` TEXT NOT NULL ,
-`created` DATETIME NOT NULL
-) ENGINE = MyISAM DEFAULT CHARSET=utf8;
- 
-
-CREATE TABLE IF NOT EXISTS `mailacct` (
-`id` INT NOT NULL AUTO_INCREMENT PRIMARY KEY ,
-`uid` INT NOT NULL,
-`server` CHAR( 255 ) NOT NULL ,
-`port` INT NOT NULL,
-`ssltype` CHAR( 16 ) NOT NULL,
-`mailbox` CHAR( 255 ) NOT NULL,
-`user` CHAR( 255 ) NOT NULL ,
-`pass` TEXT NOT NULL ,
-`reply_to` CHAR( 255 ) NOT NULL ,
-`action` INT NOT NULL ,
-`movetofolder` CHAR(255) NOT NULL ,
-`pubmail` TINYINT(1) NOT NULL DEFAULT '0',
-`last_check` DATETIME NOT NULL DEFAULT '0000-00-00 00:00:00'
-) ENGINE = MyISAM DEFAULT CHARSET=utf8;
-
-CREATE TABLE IF NOT EXISTS `attach` (
-`id` INT NOT NULL AUTO_INCREMENT PRIMARY KEY ,
-`uid` INT NOT NULL ,
-`hash` CHAR(64) NOT NULL,
-`filename` CHAR(255) NOT NULL,
-`filetype` CHAR( 64 ) NOT NULL ,
-`filesize` INT NOT NULL ,
-`data` LONGBLOB NOT NULL ,
-`created` DATETIME NOT NULL DEFAULT '0000-00-00 00:00:00',
-`edited` DATETIME NOT NULL DEFAULT '0000-00-00 00:00:00',
-`allow_cid` MEDIUMTEXT NOT NULL ,
-`allow_gid` MEDIUMTEXT NOT NULL ,
-`deny_cid` MEDIUMTEXT NOT NULL ,
-`deny_gid` MEDIUMTEXT NOT NULL
-) ENGINE = MyISAM DEFAULT CHARSET=utf8;
-
-CREATE TABLE IF NOT EXISTS `guid` (
-`id` INT UNSIGNED NOT NULL AUTO_INCREMENT PRIMARY KEY ,
-`guid` CHAR( 64 ) NOT NULL ,
-INDEX ( `guid` )
-) ENGINE = MyISAM  DEFAULT CHARSET=utf8;
-
-
-CREATE TABLE IF NOT EXISTS `sign` (
-`id` INT UNSIGNED NOT NULL AUTO_INCREMENT PRIMARY KEY ,
-`iid` INT UNSIGNED NOT NULL ,
-`signed_text` MEDIUMTEXT NOT NULL ,
-`signature` TEXT NOT NULL ,
-`signer` CHAR( 255 ) NOT NULL ,
-INDEX ( `iid` )
-) ENGINE = MyISAM DEFAULT CHARSET=utf8;
-
-
-CREATE TABLE IF NOT EXISTS `deliverq` (
-`id` INT UNSIGNED NOT NULL AUTO_INCREMENT PRIMARY KEY ,
-`cmd` CHAR( 32 ) NOT NULL ,
-`item` INT NOT NULL ,
-`contact` INT NOT NULL
-) ENGINE = MyISAM DEFAULT CHARSET=utf8;
-
-CREATE TABLE IF NOT EXISTS `search` (
-`id` INT NOT NULL AUTO_INCREMENT PRIMARY KEY ,
-`uid` INT NOT NULL ,
-`term` CHAR( 255 ) CHARACTER SET utf8 COLLATE utf8_general_ci NOT NULL,
-INDEX ( `uid` ),
-INDEX ( `term` )
-) ENGINE = MyISAM DEFAULT CHARSET=utf8;
-
-CREATE TABLE IF NOT EXISTS `fserver` (
-`id` INT NOT NULL AUTO_INCREMENT PRIMARY KEY ,
-`server` CHAR( 255 ) NOT NULL ,
-`posturl` CHAR( 255 ) NOT NULL ,
-`key` TEXT NOT NULL,
-INDEX ( `server` )
-) ENGINE = MyISAM DEFAULT CHARSET=utf8;
-
-CREATE TABLE IF NOT EXISTS `gcontact` (
-`id` INT UNSIGNED NOT NULL AUTO_INCREMENT PRIMARY KEY ,
-`name` CHAR( 255 ) NOT NULL ,
-`url` CHAR( 255 ) NOT NULL ,
-`nurl` CHAR( 255 ) NOT NULL ,
-`photo` CHAR( 255 ) NOT NULL,
-`connect` CHAR( 255 ) NOT NULL,
-INDEX ( `nurl` )
-) ENGINE = MyISAM DEFAULT CHARSET=utf8;
-
-CREATE TABLE IF NOT EXISTS `glink` (
-`id` INT UNSIGNED NOT NULL AUTO_INCREMENT PRIMARY KEY ,
-`cid` INT NOT NULL ,
-`uid` INT NOT NULL ,
-`gcid` INT NOT NULL,
-`updated` DATETIME NOT NULL,
-INDEX ( `cid` ),
-INDEX ( `uid` ),
-INDEX ( `gcid` ),
-INDEX ( `updated` )
-) ENGINE = MyISAM DEFAULT CHARSET=utf8;
-
-CREATE TABLE IF NOT EXISTS `gcign` (
-`id` INT NOT NULL AUTO_INCREMENT PRIMARY KEY ,
-`uid` INT NOT NULL ,
-`gcid` INT NOT NULL,
-INDEX ( `uid` ),
-INDEX ( `gcid` )
-) ENGINE = MyISAM DEFAULT CHARSET=utf8;
-
-
-CREATE TABLE IF NOT EXISTS `conv` (
-  `id` INT UNSIGNED NOT NULL AUTO_INCREMENT PRIMARY KEY ,
-  `guid` CHAR( 64 ) NOT NULL ,
-  `recips` MEDIUMTEXT NOT NULL ,
-  `uid` INT NOT NULL,
-  `creator` CHAR( 255 ) NOT NULL ,
-  `created` DATETIME NOT NULL DEFAULT '0000-00-00 00:00:00',
-  `updated` DATETIME NOT NULL DEFAULT '0000-00-00 00:00:00',
-  `subject` MEDIUMTEXT NOT NULL,
-  INDEX ( `created` ),
-  INDEX ( `updated` )
-) ENGINE = MyISAM DEFAULT CHARSET=utf8;
-
-
-CREATE TABLE IF NOT EXISTS `notify` (
-`id` INT NOT NULL AUTO_INCREMENT PRIMARY KEY ,
-`hash` CHAR( 64 ) NOT NULL,
-`type` INT( 11 ) NOT NULL ,
-`name` CHAR( 255 ) NOT NULL ,
-`url` CHAR( 255 ) NOT NULL ,
-`photo` CHAR( 255 ) NOT NULL ,
-`date` DATETIME NOT NULL ,
-`msg` MEDIUMTEXT NOT NULL ,
-`uid` INT NOT NULL ,
-`link` CHAR( 255 ) NOT NULL ,
-`parent` INT( 11 ) NOT NULL,
-`seen` TINYINT( 1 ) NOT NULL DEFAULT '0',
-`verb` CHAR( 255 ) NOT NULL,
-`otype` CHAR( 16 ) NOT NULL,
-INDEX ( `hash` ),
-INDEX ( `type` ),
-INDEX ( `uid` ),
-INDEX ( `link` ),
-INDEX ( `parent` ),
-INDEX ( `seen` ),
-INDEX ( `date` ),
-INDEX ( `otype` )
-) ENGINE = MyISAM DEFAULT CHARSET=utf8;
-
-CREATE TABLE IF NOT EXISTS `item_id` (
-`iid` INT NOT NULL ,
-`uid` INT NOT NULL ,
-`face` CHAR( 255 ) NOT NULL ,
-`dspr` CHAR( 255 ) NOT NULL ,
-`twit` CHAR( 255 ) NOT NULL ,
-`stat` CHAR( 255 ) NOT NULL ,
-PRIMARY KEY ( `iid` ),
-INDEX ( `uid` ),
-INDEX ( `face` ),
-INDEX ( `dspr` ),
-INDEX ( `twit` ),
-INDEX ( `stat` )
-) ENGINE = MyISAM DEFAULT CHARSET=utf8;
-
-CREATE TABLE IF NOT EXISTS `manage` (
-`id` INT NOT NULL AUTO_INCREMENT PRIMARY KEY ,
-`uid` INT NOT NULL ,
-`mid` INT NOT NULL,
-INDEX ( `uid` ),
-INDEX ( `mid` )
-) ENGINE = MyISAM DEFAULT CHARSET=utf8;
-
-CREATE TABLE IF NOT EXISTS `poll_result` (
-`id` INT NOT NULL AUTO_INCREMENT PRIMARY KEY ,
-`poll_id` INT NOT NULL ,
-`choice` INT NOT NULL ,
-INDEX ( `poll_id` ),
-INDEX ( `choice` )
-) ENGINE = MyISAM DEFAULT CHARSET=utf8;
-
-
-CREATE TABLE IF NOT EXISTS `poll` (
-`id` INT NOT NULL AUTO_INCREMENT PRIMARY KEY ,
-`uid` INT NOT NULL ,
-`q0` MEDIUMTEXT NOT NULL ,
-`q1` MEDIUMTEXT NOT NULL ,
-`q2` MEDIUMTEXT NOT NULL ,
-`q3` MEDIUMTEXT NOT NULL ,
-`q4` MEDIUMTEXT NOT NULL ,
-`q5` MEDIUMTEXT NOT NULL ,
-`q6` MEDIUMTEXT NOT NULL ,
-`q7` MEDIUMTEXT NOT NULL ,
-`q8` MEDIUMTEXT NOT NULL ,
-`q9` MEDIUMTEXT NOT NULL ,
-INDEX ( `uid` )
-) ENGINE = MyISAM DEFAULT CHARSET=utf8;
+  KEY `unkmail` (`unkmail`),
+  KEY `cntunkmail` (`cntunkmail`)
+) ENGINE=MyISAM  DEFAULT CHARSET=utf8;
 
+-- --------------------------------------------------------
 
 --
--- Table structure for table `notify-threads`
---
--- notify-id:          notify.id of the first notification of this thread
--- master-parent-item: item.id of the parent item
--- parent-item:        item.id of the imediate parent (only for multi-thread)
---                     not used yet.
--- receiver-uid: user.uid of the receiver of this notification.
+-- Table structure for table `userd`
 --
--- If we query for a master-parent-item and receiver-uid...
---   * Returns 1 item: this is not the parent notification, 
---     so just "follow" the thread (references to this notification)
---   * Returns no item: this is the first notification related to
---     this parent item. So, create the record and use the message-id 
---     header.
-
-
-CREATE TABLE IF NOT EXISTS `notify-threads` (
-`id` INT NOT NULL AUTO_INCREMENT PRIMARY KEY ,
-`notify-id` INT NOT NULL,
-`master-parent-item` INT( 10 ) unsigned NOT NULL DEFAULT '0',
-`parent-item` INT( 10 ) unsigned NOT NULL DEFAULT '0',
-`receiver-uid` INT NOT NULL,
-INDEX ( `master-parent-item` ),
-INDEX ( `receiver-uid` )
-) ENGINE = MyISAM DEFAULT CHARSET=utf8;
-
-CREATE TABLE IF NOT EXISTS `spam` (
-`id` INT NOT NULL AUTO_INCREMENT PRIMARY KEY ,
-`uid` INT NOT NULL,
-`spam` INT NOT NULL DEFAULT '0',
-`ham` INT NOT NULL DEFAULT '0',
-`term` CHAR(255) NOT NULL,
-`date` DATETIME NOT NULL DEFAULT '0000-00-00 00:00:00',
-INDEX ( `uid` ),
-INDEX ( `spam` ),
-INDEX ( `ham` ),
-INDEX ( `term` )
-) ENGINE = MyISAM DEFAULT CHARSET=utf8;
-
 
 CREATE TABLE IF NOT EXISTS `userd` (
-`id` INT NOT NULL AUTO_INCREMENT PRIMARY KEY ,
-`username` CHAR( 255 ) NOT NULL,
-INDEX ( `username` )
-) ENGINE = MyISAM DEFAULT CHARSET=utf8;
-
+  `id` int(11) NOT NULL AUTO_INCREMENT,
+  `username` char(255) NOT NULL,
+  PRIMARY KEY (`id`)
+) ENGINE=MyISAM DEFAULT CHARSET=utf8;
diff --git a/doc/Account-Basics.md b/doc/Account-Basics.md
index 164a6be46..41ca95b36 100755..100644
--- a/doc/Account-Basics.md
+++ b/doc/Account-Basics.md
@@ -6,40 +6,41 @@ Account Basics
 
 **Registration**
 
-Not all Friendica sites allow open registration. If registration is allowed, you will see a "Register" link immediately below the login prompts on the site home page. Following this link will take you to the site registration page.  The strength of our network is that lots of different sites are all completely compatible with each other.  If the site you're visting doesn't allow registration, or you think you might prefer another one, you can find a <a href ="http://dir.friendica.com/siteinfo">list of public servers here</a>, and find one that meets your needs.  
+Not all Friendica sites allow open registration. If registration is allowed, you will see a "Register" link immediately below the login prompts on the site home page. Following this link will take you to the site registration page.  The strength of our network is that lots of different sites are all completely compatible with each other.  If the site you're visting doesn't allow registration, or you think you might prefer another one, you can find a <a href="http://dir.friendica.com/siteinfo">list of public servers here</a>, and find one that meets your needs.  
+
+If you'd like to have your own server, you can do that too.  Visit <a href="http://friendica.com/download">the Friendica website</a> to download the code with setup instructions.  It's a very simple install process that anybody experienced in hosting websites, or with basic Linux experience can handle easily.
 
-If you'd like to have your own server, you can do that too.  Visit <a href = "http://friendica.com/download">the Friendica website</a> to download the code with setup instructions.  It's a very simple install process that anybody experienced in hosting websites, or with basic Linux experience can handle easily.
 
 *OpenID*
 
 The first field on the Registration page is for an OpenID address. If you do not have an OpenID address or do not wish to use OpenID, leave this field blank. If you have an OpenID account elsewhere and wish to use it, enter the address into this field and click 'Register'. Friendica will attempt to extract as much information as possible from your OpenID provider and return to this page with those items already filled in.
 
+
 *Your Full Name*
 
 Please provide your full name **as you would like it to be displayed on this system**.  Most people use their real name for this, but you're under no obligation to do so yourself.
 
+
 *Email Address*
 
 Please provide a valid email address. Your email address is **never** published. We need this to send you account information and your login details. You may also occasionally receive notifications of incoming messages or items requiring your attention, but you have the ability to completely disable these from your Settings page once you have logged in.  This doesn't have to be your primary email address, but it does need to be a real email address.  You can't get your initial password, or reset a lost password later without it.  This is the only bit of personal information that has to be accurate.
 
+
 *Nickname*
 
 A nickname is used to generate web addresses for many of your personal pages, and is also treated like an email address when establishing communications with others. Due to the way that the nickname is used, it has some limitations. It must contain only US-ASCII text characters and numbers, and must also start with a text character. It also must be unique on this system. This is used in many places to identify your account, and once set - cannot be changed.
 
 
-
 *Directory Publishing*
 
 The Registration form also allows you to choose whether or not to list your account in the online directory. This is like a "phone book" and you may choose to be unlisted. We recommend that you select 'Yes' so that other people (friends, family, etc.) will be able to find you. If you choose 'No', you will essentially be invisible and have few opportunities for interaction. Whichever you choose, this can be changed any time from your Settings page after you login. 
 
+
 *Register*
 
 Once you have provided the necessary details, click the 'Register' button. An email will be sent to you providing your account login details. Please watch your email (including spam folders) for your registration details and initial password. 
 
 
-
-
-
 **Login Page**
 
 On the 'Login' page, please enter your login information that was provided during registration. You may use either your nickname or email address as a Login Name. 
@@ -55,6 +56,7 @@ Otherwise, enter your password. This will have been initially provided in your r
 
 After your first login, please visit the 'Settings' page from the top menu bar and change your password to something that you will remember.
 
+
 **Getting Started**
 
 A ['Tips for New Members'](newmember) link will show up on your home page for two weeks to provide some important Getting Started information.
diff --git a/doc/Bugs-and-Issues.md b/doc/Bugs-and-Issues.md
index 46abea9a3..251f91e93 100755..100644
--- a/doc/Bugs-and-Issues.md
+++ b/doc/Bugs-and-Issues.md
@@ -6,11 +6,11 @@ Bugs and Issues
 
 If your server has a support page, you should report any bugs/issues you encounter there first.  Reporting to your support page before reporting to the developers makes their job easier, as they don't have to deal with bug reports that might not have anything to do with them, and that helps us get new features faster.
 
-If you're a technical user, or your site doesn't have a support page, you'll need to use the <a href = "http://bugs.friendica.com/">Bug Tracker</a>.  Please perform a search to see if there's already an open bug that matches yours before submitting anything.
+If you're a technical user, or your site doesn't have a support page, you'll need to use the <a href="http://bugs.friendica.com/">Bug Tracker</a>.  Please perform a search to see if there's already an open bug that matches yours before submitting anything.
 
 Try to provide as much information as you can about the bug, including the **full** text of any error messages or notices, and any steps required to replicate the problem in as much detail as possible.  It's generally better to provide too much information than not enough.
 
-<a href = "http://www.chiark.greenend.org.uk/~sgtatham/bugs.html">See this article</a> to learn more about submitting **good** bug reports.
+<a href="http://www.chiark.greenend.org.uk/~sgtatham/bugs.html">See this article</a> to learn more about submitting **good** bug reports.
 
 
 **Bug Sponsorship**
diff --git a/doc/Connectors.md b/doc/Connectors.md
index 08b4c135e..08b4c135e 100755..100644
--- a/doc/Connectors.md
+++ b/doc/Connectors.md
diff --git a/doc/Developers.md b/doc/Developers.md
index 17aff3869..17aff3869 100755..100644
--- a/doc/Developers.md
+++ b/doc/Developers.md
diff --git a/doc/Home.md b/doc/Home.md
index 30efc93f7..30efc93f7 100755..100644
--- a/doc/Home.md
+++ b/doc/Home.md
diff --git a/doc/Install.md b/doc/Install.md
index 9455c62ba..9455c62ba 100755..100644
--- a/doc/Install.md
+++ b/doc/Install.md
diff --git a/doc/Installing-Connectors.md b/doc/Installing-Connectors.md
index 328e3b6c4..328e3b6c4 100755..100644
--- a/doc/Installing-Connectors.md
+++ b/doc/Installing-Connectors.md
diff --git a/doc/Making-Friends.md b/doc/Making-Friends.md
index 3f1a24c8d..70b87abbc 100755..100644
--- a/doc/Making-Friends.md
+++ b/doc/Making-Friends.md
@@ -5,11 +5,11 @@ Making Friends
 
 Friendship in Friendica can take on a great many different meanings. But let's keep it simple, you want to be friends with somebody. How do you do it?
 
-The easiest thing to do is to join the <a href = "http://kakste.com/profile/newhere">New Here</a> group.  This group is especially for people new to the Friendica network.  Simply connect to the group, post to the wall, and make new friends.  You don't even have to like us - comment on a few of our posts, and other people will start to add you too.
+The easiest thing to do is to join the <a href="http://kakste.com/profile/newhere">New Here</a> group.  This group is especially for people new to the Friendica network.  Simply connect to the group, post to the wall, and make new friends.  You don't even have to like us - comment on a few of our posts, and other people will start to add you too.
 
 The next thing you can do is look at the Directory.  The directory is split up into two parts.  If you click the directory button, you will be presented with a list of all members (who chose to be listed) on your server.  You'll also see a link to the Global Directory.  If you click through to the global directory, you will be presented with a list of everybody who chose to be listed across all instances of Friendica.  You will also see a "Show Community Forums" link, which will direct you to Groups, Forums and Fanpages.  You connect to people, groups and forums in the same way, except groups and forums will automatically accept your introduction request, whereas a human will approve you manually.
 
-To connect with other Friendica user
+To connect with other Friendica users:
 
 Visit their profile. Just beneath their profile picture will be the word 'Connect' (we're assuming this is an English language profile).
 
diff --git a/doc/Message-Flow.md b/doc/Message-Flow.md
index bb1c063d3..bb1c063d3 100755..100644
--- a/doc/Message-Flow.md
+++ b/doc/Message-Flow.md
diff --git a/doc/Pages.md b/doc/Pages.md
index d0e6776a4..d0e6776a4 100755..100644
--- a/doc/Pages.md
+++ b/doc/Pages.md
diff --git a/doc/Plugins.md b/doc/Plugins.md
index 29dff3187..df6004450 100755..100644
--- a/doc/Plugins.md
+++ b/doc/Plugins.md
@@ -164,10 +164,15 @@ Your module functions will often contain the function plugin_name_content(&$a),
 **'init_1'** - called just after DB has been opened and before session start
     $b is not used or passed
 
-
 **'page_end'** - called after HTML content functions have completed
     $b is (string) HTML of content div
 
+**'avatar_lookup'** - called when looking up the avatar
+    $b is (array)
+        'size' => the size of the avatar that will be looked up
+        'email' => email to look up the avatar for
+        'url' => the (string) generated URL of the avatar
+
 
 A complete list of all hook callbacks with file locations (generated 14-Feb-2012): Please see the source for details of any hooks not documented above.
 
diff --git a/doc/Profiles.md b/doc/Profiles.md
index 716db908e..716db908e 100755..100644
--- a/doc/Profiles.md
+++ b/doc/Profiles.md
diff --git a/doc/Remove-Account.md b/doc/Remove-Account.md
index ae5de2cb6..ae5de2cb6 100755..100644
--- a/doc/Remove-Account.md
+++ b/doc/Remove-Account.md
diff --git a/doc/Settings.md b/doc/Settings.md
index 9808ecc5d..574ce8dcc 100755..100644
--- a/doc/Settings.md
+++ b/doc/Settings.md
@@ -172,16 +172,6 @@ $a->config['system']['no_regfullname'] = true;
 ```
 
 
-**Gravatars**
-
-During registration, we will try to automatically find a user photo for you on the web using the gravatar service. You may turn this off by setting 'no_gravatar' to true. Default is false.
-
-Config:
-```
-$a->config['system']['no_gravatar'] = true;
-```
-
-
 **OpenID**
 
 By default, OpenID may be used for both registration and logins. If you do not wish to make OpenID facilities available on your system (at all), set 'no_openid' to true. Default is false.
diff --git a/doc/Tags-and-Mentions.md b/doc/Tags-and-Mentions.md
index ce4e45f42..ce4e45f42 100755..100644
--- a/doc/Tags-and-Mentions.md
+++ b/doc/Tags-and-Mentions.md
diff --git a/doc/andfinally.md b/doc/andfinally.md
index cd8a6994b..c4e8cb948 100644
--- a/doc/andfinally.md
+++ b/doc/andfinally.md
@@ -1,3 +1,5 @@
+[[!meta title="And Finally..."]]
+
 And that brings the Quick Start to an end.
 
 Here are some more things to help get you started:
@@ -5,20 +7,20 @@ Here are some more things to help get you started:
 **Groups**
 
 
-- <a href = "https://kakste.com/profile/newhere">New Here</a> - a group for people new to Friendica
+- <a href="https://kakste.com/profile/newhere">New Here</a> - a group for people new to Friendica
 
-- <a href = "http://helpers.pyxis.uberspace.de/profile/helpers">Friendica Support</a> - problems?  This is the place to ask.
+- <a href="http://helpers.pyxis.uberspace.de/profile/helpers">Friendica Support</a> - problems?  This is the place to ask.
 
-- <a href = "https://kakste.com/profile/public_stream">Public Stream</a> - a place to talk about anything to anyone.
+- <a href="https://kakste.com/profile/public_stream">Public Stream</a> - a place to talk about anything to anyone.
 
-- <a href = "https://letstalk.pyxis.uberspace.de/profile/letstalk">Let's Talk</a> a group for finding people and groups who share similar interests.
+- <a href="https://letstalk.pyxis.uberspace.de/profile/letstalk">Let's Talk</a> a group for finding people and groups who share similar interests.
 
-- <a href = "http://newzot.hydra.uberspace.de/profile/newzot">Local Friendica</a> a page for local Friendica groups</a>
+- <a href="http://newzot.hydra.uberspace.de/profile/newzot">Local Friendica</a> a page for local Friendica groups</a>
 
 
 **Documentation**
 
-- <a href = "/help/Connectors">Connecting to more networks</a>
-- <a href = "/help">Help Index</a>
+- <a href="help/Connectors">Connecting to more networks</a>
+- <a href="help">Help Index</a>
 
 
diff --git a/doc/groupsandpages.md b/doc/groupsandpages.md
index 418e682c8..5cfbc653c 100644
--- a/doc/groupsandpages.md
+++ b/doc/groupsandpages.md
@@ -1,11 +1,11 @@
-This is the global directory.  If you get lost, you can <a href = "/help/groupsandpages">click this link</a> to bring yourself back here.
+This is the global directory.  If you get lost, you can <a href = "help/groupsandpages">click this link</a> to bring yourself back here.
 
 On this page, you'll find a collection of groups, forums and celebrity pages.  Groups are not real people.  Connecting to them is similar to "liking" something on Facebook, or signing up for a new forum.  You don't have to feel awkward about introducing yourself to a new person, because they're not people!
 
 When you connect to a group, all messages to that group will start appearing in your network tab.  You can comment on these posts, or post to the group yourself without ever having to add any of the groups members.  This is a great way to make friends dynamically - you'll find people you like and add each other naturally instead of adding random strangers.  Simply find a group you're interested in, and connect to it the same way you did with people in the last section.  There are a lot of groups, and you're likely to get lost.  Remember the link at the top of this page will bring you back here.
 
-Once you've added some groups, <a href = "/help/andfinally">move on to the next section</a>.
+Once you've added some groups, <a href="help/andfinally">move on to the next section</a>.
 
-<iframe src="http://dir.friendica.com/directory/forum" width="950" height = "600"></iframe>
+<iframe src="http://dir.friendica.com/directory/forum" width="950" height="600"></iframe>
 
 
diff --git a/doc/guide.md b/doc/guide.md
index 178170c4e..d76af92e2 100644
--- a/doc/guide.md
+++ b/doc/guide.md
@@ -6,8 +6,8 @@ This is a bit like your Facebook wall.  It's where all your status messgages are
 
 Once you've finished writing your post, click on the padlock icon to select who can see it.  If you do not use the padlock icon, your post will be public.  This means it will appear to anybody who views your profile, and in the community tab if your site has it enabled, as well as in the network tab of any of your contacts.
 
-Play around with this a bit, then when you're ready to move on, we'll take a look at the <a href = "/help/network">Network Tab</a>
+Play around with this a bit, then when you're ready to move on, we'll take a look at the <a href="help/network">Network Tab</a>
 
-<iframe src="/login" width="950" height = "600"></iframe>
+<iframe src="login" width="950" height="600"></iframe>
 
 
diff --git a/doc/makingnewfriends.md b/doc/makingnewfriends.md
index 35befaa36..7eff1eda1 100644
--- a/doc/makingnewfriends.md
+++ b/doc/makingnewfriends.md
@@ -1,11 +1,11 @@
-This is your Suggested Friends page.  If you get lost, you can <a href = "/help/makenewfriends">click this link</a> to bring yourself back here.
+This is your Suggested Friends page.  If you get lost, you can <a href="help/makenewfriends">click this link</a> to bring yourself back here.
 
 This is a bit like the Friend Suggestions page of Facebook.  Everybody on this list has agreed that they may be suggested as a friend.  This means they're unlikely to refuse an introduction you send, and they want to meet new people too!
 
 See somebody you like the look of?  Click the connect button beneath their photograph.  This will bring you to the introductions page.  Fill in the form as instructed, and add a small note (optional).  Now, wait a bit and they'll accept your request - note that these are real people, and it might take a while.  Now you've added one, you're probably lost.  Click the link at the top of this page to go back to the suggested friends list and add some more.
 
-Feel uncomfortable adding people you don't know?  Don't worry - that's where <a href = "/help/groupsandpages">Groups and Pages</a> come in!
+Feel uncomfortable adding people you don't know?  Don't worry - that's where <a href="help/groupsandpages">Groups and Pages</a> come in!
 
-<iframe src="/suggest" width="950" height = "600"></iframe>
+<iframe src="suggest" width="950" height="600"></iframe>
 
 
diff --git a/doc/network.md b/doc/network.md
index f445b0055..afb092395 100644
--- a/doc/network.md
+++ b/doc/network.md
@@ -1,9 +1,9 @@
-This is your Network Tab.  If you get lost, you can <a href = "/help/network">click this link</a> to bring yourself back here.
+This is your Network Tab.  If you get lost, you can <a href="help/network">click this link</a> to bring yourself back here.
 
 This is a bit like the Newsfeed at Facebook or the Stream at Diaspora.  It's where all the posts from your contacts, groups, and feeds will appear.  If you're new, you won't see anything in this page, unless you posted your status in the last step.  If you've already added a few friends, you'll be able to see their posts.  Here, you can comment, like, or dislike posts, or click on somebody's name to visit their profile page where you can write on their wall.
 
-Now we need to fill it up, the first step, is to <a href = "/help/peopleyouknow"> add people you already know from Facebook</a>.
+Now we need to fill it up, the first step, is to <a href="help/peopleyouknow"> add people you already know from Facebook</a>.
 
-<iframe src="/network" width="950" height = "600"></iframe>
+<iframe src="network" width="950" height="600"></iframe>
 
 
diff --git a/doc/peopleyouknow.md b/doc/peopleyouknow.md
index 143c49217..ae0c9ef59 100644
--- a/doc/peopleyouknow.md
+++ b/doc/peopleyouknow.md
@@ -1,13 +1,13 @@
-This is your connector settings page.  If you get lost, you can <a href = "/help/network">click this link</a> to bring yourself back here.
+This is your connector settings page.  If you get lost, you can <a href="help/network">click this link</a> to bring yourself back here.
 
 This is the bit that makes Friendica unique.  You can connect to <i>anybody on the internet</i> from your Friendica account using this page!  The available connectors varies depending on which plugins you have installed, but for now, we'll walk you through Facebook.  Note that not all servers have the Facebook connector installed.  If you can't find it in the list below, don't worry, we'll look at ways of connecting to more people in the following pages.  
 
-The biggest of all social networks is Facebook.  Fortunately, this connector is really easy.  Scroll down the page, and click Facebook Connector Settings.  Enter your Facebook user name and password and let the application (the connector) do everything the options suggest.  You can <a href = "https://github.com/friendica/friendica/wiki/How-to:-Friendica%E2%80%99s-Facebook-connector" target="new">fine tune this</a> or experiment with the other connectors too.  If you need help, you can always ask at <a href = "http://helpers.pyxis.uberspace.de/profile/helpers" target="new">Friendica Support</a> or <a href = "/help/Connectors" target="new">see the instructions here</a>.
+The biggest of all social networks is Facebook.  Fortunately, this connector is really easy.  Scroll down the page, and click Facebook Connector Settings.  Enter your Facebook user name and password and let the application (the connector) do everything the options suggest.  You can <a href="https://github.com/friendica/friendica/wiki/How-to:-Friendica%E2%80%99s-Facebook-connector" target="_blank">fine tune this</a> or experiment with the other connectors too.  If you need help, you can always ask at <a href="http://helpers.pyxis.uberspace.de/profile/helpers" target="_blank">Friendica Support</a> or <a href="help/Connectors" target="_blank">see the instructions here</a>.
 
-When you're ready, we can move on to <a href = "/help/makingnewfriends">making new friends</a>.
+When you're ready, we can move on to <a href="help/makingnewfriends">making new friends</a>.
 
 
 
-<iframe src="/settings/connectors" width="950" height = "600"></iframe>
+<iframe src="settings/connectors" width="950" height="600"></iframe>
 
 
diff --git a/htconfig.php b/htconfig.php
index 9d9c8a2c7..63a40c809 100755..100644
--- a/htconfig.php
+++ b/htconfig.php
@@ -83,5 +83,8 @@ $a->config['system']['no_regfullname'] = true;
 // If set to true the priority settings of ostatus contacts are used
 $a->config['system']['ostatus_use_priority'] = false;
 
-// If enabled all items are cached in the given directory
+// If enabled, all items are cached in the given directory
 $a->config['system']['itemcache'] = "";
+
+// If enabled, the lockpath is used for a lockfile to check if the poller is running
+$a->config['system']['lockpath'] = "";
diff --git a/images/article.gif b/images/article.gif
index 91aeef000..91aeef000 100755..100644
--- a/images/article.gif
+++ b/images/article.gif
diff --git a/images/audio.gif b/images/audio.gif
index 4be977116..4be977116 100755..100644
--- a/images/audio.gif
+++ b/images/audio.gif
diff --git a/images/b_block.gif b/images/b_block.gif
index 3bc7c056b..3bc7c056b 100755..100644
--- a/images/b_block.gif
+++ b/images/b_block.gif
diff --git a/images/b_drop.gif b/images/b_drop.gif
index b08c68b62..b08c68b62 100755..100644
--- a/images/b_drop.gif
+++ b/images/b_drop.gif
diff --git a/images/b_drop.png b/images/b_drop.png
index 6fc4d3b20..6fc4d3b20 100755..100644
--- a/images/b_drop.png
+++ b/images/b_drop.png
diff --git a/images/b_drophide.gif b/images/b_drophide.gif
index 1207a935b..1207a935b 100755..100644
--- a/images/b_drophide.gif
+++ b/images/b_drophide.gif
diff --git a/images/b_dropshow.gif b/images/b_dropshow.gif
index b08c68b62..b08c68b62 100755..100644
--- a/images/b_dropshow.gif
+++ b/images/b_dropshow.gif
diff --git a/images/b_edit.gif b/images/b_edit.gif
index 79cb3c144..79cb3c144 100755..100644
--- a/images/b_edit.gif
+++ b/images/b_edit.gif
diff --git a/images/b_edit.png b/images/b_edit.png
index 05711a094..05711a094 100755..100644
--- a/images/b_edit.png
+++ b/images/b_edit.png
diff --git a/images/calendar.png b/images/calendar.png
index fbf52933d..fbf52933d 100755..100644
--- a/images/calendar.png
+++ b/images/calendar.png
diff --git a/images/camera-icon.gif b/images/camera-icon.gif
index a4adf9adf..a4adf9adf 100755..100644
--- a/images/camera-icon.gif
+++ b/images/camera-icon.gif
diff --git a/images/connect-bg.png b/images/connect-bg.png
index 0611c73e5..0611c73e5 100755..100644
--- a/images/connect-bg.png
+++ b/images/connect-bg.png
diff --git a/images/content-types.png b/images/content-types.png
index e46eba610..e46eba610 100755..100644
--- a/images/content-types.png
+++ b/images/content-types.png
diff --git a/images/default-group-mm.png b/images/default-group-mm.png
index bfc8b335a..bfc8b335a 100755..100644
--- a/images/default-group-mm.png
+++ b/images/default-group-mm.png
diff --git a/images/default-profile-mm.jpg b/images/default-profile-mm.jpg
index 79c1a8530..79c1a8530 100755..100644
--- a/images/default-profile-mm.jpg
+++ b/images/default-profile-mm.jpg
diff --git a/images/default-profile-sm.jpg b/images/default-profile-sm.jpg
index 348957fb4..348957fb4 100755..100644
--- a/images/default-profile-sm.jpg
+++ b/images/default-profile-sm.jpg
diff --git a/images/default-profile.jpg b/images/default-profile.jpg
index 85fbca8cd..85fbca8cd 100755..100644
--- a/images/default-profile.jpg
+++ b/images/default-profile.jpg
diff --git a/images/diaspora.png b/images/diaspora.png
index 725fae718..725fae718 100755..100644
--- a/images/diaspora.png
+++ b/images/diaspora.png
diff --git a/images/dislike.gif b/images/dislike.gif
index 77779423c..77779423c 100755..100644
--- a/images/dislike.gif
+++ b/images/dislike.gif
diff --git a/images/document.gif b/images/document.gif
index 02d940968..02d940968 100755..100644
--- a/images/document.gif
+++ b/images/document.gif
diff --git a/images/ff-128.jpg b/images/ff-128.jpg
index eaa0a7e67..eaa0a7e67 100755..100644
--- a/images/ff-128.jpg
+++ b/images/ff-128.jpg
diff --git a/images/ff-16.jpg b/images/ff-16.jpg
index 3621f5914..3621f5914 100755..100644
--- a/images/ff-16.jpg
+++ b/images/ff-16.jpg
diff --git a/images/ff-256.jpg b/images/ff-256.jpg
index f80ba07f8..f80ba07f8 100755..100644
--- a/images/ff-256.jpg
+++ b/images/ff-256.jpg
diff --git a/images/ff-32.jpg b/images/ff-32.jpg
index 7f3099916..7f3099916 100755..100644
--- a/images/ff-32.jpg
+++ b/images/ff-32.jpg
diff --git a/images/ff-64.jpg b/images/ff-64.jpg
index b9cecf7c5..b9cecf7c5 100755..100644
--- a/images/ff-64.jpg
+++ b/images/ff-64.jpg
diff --git a/images/ff.xcf b/images/ff.xcf
index a15425669..a15425669 100755..100644
--- a/images/ff.xcf
+++ b/images/ff.xcf
diff --git a/images/friendica-128.jpg b/images/friendica-128.jpg
index f7d86ae50..f7d86ae50 100755..100644
--- a/images/friendica-128.jpg
+++ b/images/friendica-128.jpg
diff --git a/images/friendica-128.png b/images/friendica-128.png
index d2792ab54..d2792ab54 100755..100644
--- a/images/friendica-128.png
+++ b/images/friendica-128.png
diff --git a/images/friendica-16.jpg b/images/friendica-16.jpg
index ce59a70a0..ce59a70a0 100755..100644
--- a/images/friendica-16.jpg
+++ b/images/friendica-16.jpg
diff --git a/images/friendica-16.png b/images/friendica-16.png
index 745b7ac6c..745b7ac6c 100755..100644
--- a/images/friendica-16.png
+++ b/images/friendica-16.png
diff --git a/images/friendica-1600.png b/images/friendica-1600.png
index 615a81dd9..615a81dd9 100755..100644
--- a/images/friendica-1600.png
+++ b/images/friendica-1600.png
diff --git a/images/friendica-256.jpg b/images/friendica-256.jpg
index 182810d62..182810d62 100755..100644
--- a/images/friendica-256.jpg
+++ b/images/friendica-256.jpg
diff --git a/images/friendica-256.png b/images/friendica-256.png
index e965fbaba..e965fbaba 100755..100644
--- a/images/friendica-256.png
+++ b/images/friendica-256.png
diff --git a/images/friendica-32.jpg b/images/friendica-32.jpg
index 4e697411d..4e697411d 100755..100644
--- a/images/friendica-32.jpg
+++ b/images/friendica-32.jpg
diff --git a/images/friendica-32.png b/images/friendica-32.png
index 61764bf20..61764bf20 100755..100644
--- a/images/friendica-32.png
+++ b/images/friendica-32.png
diff --git a/images/friendica-48.png b/images/friendica-48.png
index f858d9a81..f858d9a81 100755..100644
--- a/images/friendica-48.png
+++ b/images/friendica-48.png
diff --git a/images/friendica-64.jpg b/images/friendica-64.jpg
index 050830fff..050830fff 100755..100644
--- a/images/friendica-64.jpg
+++ b/images/friendica-64.jpg
diff --git a/images/friendica-64.png b/images/friendica-64.png
index 88cb8b016..88cb8b016 100755..100644
--- a/images/friendica-64.png
+++ b/images/friendica-64.png
diff --git a/images/friendica-96.png b/images/friendica-96.png
index 76a102ef2..76a102ef2 100755..100644
--- a/images/friendica-96.png
+++ b/images/friendica-96.png
diff --git a/images/friendica.svg b/images/friendica.svg
index 2105ef317..2105ef317 100755..100644
--- a/images/friendica.svg
+++ b/images/friendica.svg
diff --git a/images/friendika-128.jpg b/images/friendika-128.jpg
index f7d86ae50..f7d86ae50 100755..100644
--- a/images/friendika-128.jpg
+++ b/images/friendika-128.jpg
diff --git a/images/friendika-128.png b/images/friendika-128.png
index d2792ab54..d2792ab54 100755..100644
--- a/images/friendika-128.png
+++ b/images/friendika-128.png
diff --git a/images/friendika-16.jpg b/images/friendika-16.jpg
index ce59a70a0..ce59a70a0 100755..100644
--- a/images/friendika-16.jpg
+++ b/images/friendika-16.jpg
diff --git a/images/friendika-16.png b/images/friendika-16.png
index 745b7ac6c..745b7ac6c 100755..100644
--- a/images/friendika-16.png
+++ b/images/friendika-16.png
diff --git a/images/friendika-1600.png b/images/friendika-1600.png
index 615a81dd9..615a81dd9 100755..100644
--- a/images/friendika-1600.png
+++ b/images/friendika-1600.png
diff --git a/images/friendika-256.jpg b/images/friendika-256.jpg
index 182810d62..182810d62 100755..100644
--- a/images/friendika-256.jpg
+++ b/images/friendika-256.jpg
diff --git a/images/friendika-256.png b/images/friendika-256.png
index e965fbaba..e965fbaba 100755..100644
--- a/images/friendika-256.png
+++ b/images/friendika-256.png
diff --git a/images/friendika-32.jpg b/images/friendika-32.jpg
index 4e697411d..4e697411d 100755..100644
--- a/images/friendika-32.jpg
+++ b/images/friendika-32.jpg
diff --git a/images/friendika-32.png b/images/friendika-32.png
index 61764bf20..61764bf20 100755..100644
--- a/images/friendika-32.png
+++ b/images/friendika-32.png
diff --git a/images/friendika-48.png b/images/friendika-48.png
index f858d9a81..f858d9a81 100755..100644
--- a/images/friendika-48.png
+++ b/images/friendika-48.png
diff --git a/images/friendika-64.jpg b/images/friendika-64.jpg
index 050830fff..050830fff 100755..100644
--- a/images/friendika-64.jpg
+++ b/images/friendika-64.jpg
diff --git a/images/friendika-64.png b/images/friendika-64.png
index 88cb8b016..88cb8b016 100755..100644
--- a/images/friendika-64.png
+++ b/images/friendika-64.png
diff --git a/images/friendika-96.png b/images/friendika-96.png
index 76a102ef2..76a102ef2 100755..100644
--- a/images/friendika-96.png
+++ b/images/friendika-96.png
diff --git a/images/friendika.svg b/images/friendika.svg
index 2155d0b00..2155d0b00 100755..100644
--- a/images/friendika.svg
+++ b/images/friendika.svg
diff --git a/images/globe.gif b/images/globe.gif
index 3f17c5d32..3f17c5d32 100755..100644
--- a/images/globe.gif
+++ b/images/globe.gif
diff --git a/images/hide_off.png b/images/hide_off.png
index d504ca2e2..d504ca2e2 100755..100644
--- a/images/hide_off.png
+++ b/images/hide_off.png
diff --git a/images/hide_on.png b/images/hide_on.png
index 960744c06..960744c06 100755..100644
--- a/images/hide_on.png
+++ b/images/hide_on.png
diff --git a/images/icons.png b/images/icons.png
index dd3af3aee..dd3af3aee 100755..100644
--- a/images/icons.png
+++ b/images/icons.png
diff --git a/images/icons/10/add.png b/images/icons/10/add.png
index 296e8e500..296e8e500 100755..100644
--- a/images/icons/10/add.png
+++ b/images/icons/10/add.png
diff --git a/images/icons/10/delete.png b/images/icons/10/delete.png
index e4bd85933..e4bd85933 100755..100644
--- a/images/icons/10/delete.png
+++ b/images/icons/10/delete.png
diff --git a/images/icons/10/edit.png b/images/icons/10/edit.png
index d939342a1..d939342a1 100755..100644
--- a/images/icons/10/edit.png
+++ b/images/icons/10/edit.png
diff --git a/images/icons/10/feed.png b/images/icons/10/feed.png
index 22aa5fd4b..22aa5fd4b 100755..100644
--- a/images/icons/10/feed.png
+++ b/images/icons/10/feed.png
diff --git a/images/icons/10/gear.png b/images/icons/10/gear.png
index b1f2a8f52..b1f2a8f52 100755..100644
--- a/images/icons/10/gear.png
+++ b/images/icons/10/gear.png
diff --git a/images/icons/10/group.png b/images/icons/10/group.png
index a58d51910..a58d51910 100755..100644
--- a/images/icons/10/group.png
+++ b/images/icons/10/group.png
diff --git a/images/icons/10/info.png b/images/icons/10/info.png
index 667c127c6..667c127c6 100755..100644
--- a/images/icons/10/info.png
+++ b/images/icons/10/info.png
diff --git a/images/icons/10/link.png b/images/icons/10/link.png
index 0619f4511..0619f4511 100755..100644
--- a/images/icons/10/link.png
+++ b/images/icons/10/link.png
diff --git a/images/icons/10/lock.png b/images/icons/10/lock.png
index 2ddf98d08..2ddf98d08 100755..100644
--- a/images/icons/10/lock.png
+++ b/images/icons/10/lock.png
diff --git a/images/icons/10/menu.png b/images/icons/10/menu.png
index 7dbb779d0..7dbb779d0 100755..100644
--- a/images/icons/10/menu.png
+++ b/images/icons/10/menu.png
diff --git a/images/icons/10/notice.png b/images/icons/10/notice.png
index 88ea4ac76..88ea4ac76 100755..100644
--- a/images/icons/10/notice.png
+++ b/images/icons/10/notice.png
diff --git a/images/icons/10/notify_off.png b/images/icons/10/notify_off.png
index 8ba240e1d..8ba240e1d 100755..100644
--- a/images/icons/10/notify_off.png
+++ b/images/icons/10/notify_off.png
diff --git a/images/icons/10/notify_on.png b/images/icons/10/notify_on.png
index d4ef71558..d4ef71558 100755..100644
--- a/images/icons/10/notify_on.png
+++ b/images/icons/10/notify_on.png
diff --git a/images/icons/10/play.png b/images/icons/10/play.png
index a9f99e4d1..a9f99e4d1 100755..100644
--- a/images/icons/10/play.png
+++ b/images/icons/10/play.png
diff --git a/images/icons/10/plugin.png b/images/icons/10/plugin.png
index 6cfc40786..6cfc40786 100755..100644
--- a/images/icons/10/plugin.png
+++ b/images/icons/10/plugin.png
diff --git a/images/icons/10/star.png b/images/icons/10/star.png
index cd8518a18..cd8518a18 100755..100644
--- a/images/icons/10/star.png
+++ b/images/icons/10/star.png
diff --git a/images/icons/10/unlock.png b/images/icons/10/unlock.png
index d18088416..d18088416 100755..100644
--- a/images/icons/10/unlock.png
+++ b/images/icons/10/unlock.png
diff --git a/images/icons/10/user.png b/images/icons/10/user.png
index 6c2d161e8..6c2d161e8 100755..100644
--- a/images/icons/10/user.png
+++ b/images/icons/10/user.png
diff --git a/images/icons/16/add.png b/images/icons/16/add.png
index 1ff064bb3..1ff064bb3 100755..100644
--- a/images/icons/16/add.png
+++ b/images/icons/16/add.png
diff --git a/images/icons/16/delete.png b/images/icons/16/delete.png
index 532346860..532346860 100755..100644
--- a/images/icons/16/delete.png
+++ b/images/icons/16/delete.png
diff --git a/images/icons/16/edit.png b/images/icons/16/edit.png
index bd845a767..bd845a767 100755..100644
--- a/images/icons/16/edit.png
+++ b/images/icons/16/edit.png
diff --git a/images/icons/16/feed.png b/images/icons/16/feed.png
index 082e1bc73..082e1bc73 100755..100644
--- a/images/icons/16/feed.png
+++ b/images/icons/16/feed.png
diff --git a/images/icons/16/gear.png b/images/icons/16/gear.png
index 86cbe1eb8..86cbe1eb8 100755..100644
--- a/images/icons/16/gear.png
+++ b/images/icons/16/gear.png
diff --git a/images/icons/16/group.png b/images/icons/16/group.png
index 29ef69672..29ef69672 100755..100644
--- a/images/icons/16/group.png
+++ b/images/icons/16/group.png
diff --git a/images/icons/16/info.png b/images/icons/16/info.png
index e8e7b35ba..e8e7b35ba 100755..100644
--- a/images/icons/16/info.png
+++ b/images/icons/16/info.png
diff --git a/images/icons/16/link.png b/images/icons/16/link.png
index afec9cc30..afec9cc30 100755..100644
--- a/images/icons/16/link.png
+++ b/images/icons/16/link.png
diff --git a/images/icons/16/lock.png b/images/icons/16/lock.png
index 189bfd29e..189bfd29e 100755..100644
--- a/images/icons/16/lock.png
+++ b/images/icons/16/lock.png
diff --git a/images/icons/16/menu.png b/images/icons/16/menu.png
index a6b1cac47..a6b1cac47 100755..100644
--- a/images/icons/16/menu.png
+++ b/images/icons/16/menu.png
diff --git a/images/icons/16/notice.png b/images/icons/16/notice.png
index 13c5c6b79..13c5c6b79 100755..100644
--- a/images/icons/16/notice.png
+++ b/images/icons/16/notice.png
diff --git a/images/icons/16/notify_off.png b/images/icons/16/notify_off.png
index 3031fc906..3031fc906 100755..100644
--- a/images/icons/16/notify_off.png
+++ b/images/icons/16/notify_off.png
diff --git a/images/icons/16/notify_on.png b/images/icons/16/notify_on.png
index 1da6245a6..1da6245a6 100755..100644
--- a/images/icons/16/notify_on.png
+++ b/images/icons/16/notify_on.png
diff --git a/images/icons/16/play.png b/images/icons/16/play.png
index 19ad05bf2..19ad05bf2 100755..100644
--- a/images/icons/16/play.png
+++ b/images/icons/16/play.png
diff --git a/images/icons/16/plugin.png b/images/icons/16/plugin.png
index b11d92082..b11d92082 100755..100644
--- a/images/icons/16/plugin.png
+++ b/images/icons/16/plugin.png
diff --git a/images/icons/16/star.png b/images/icons/16/star.png
index ac620c43c..ac620c43c 100755..100644
--- a/images/icons/16/star.png
+++ b/images/icons/16/star.png
diff --git a/images/icons/16/unlock.png b/images/icons/16/unlock.png
index c56495d02..c56495d02 100755..100644
--- a/images/icons/16/unlock.png
+++ b/images/icons/16/unlock.png
diff --git a/images/icons/16/user.png b/images/icons/16/user.png
index 95c42c572..95c42c572 100755..100644
--- a/images/icons/16/user.png
+++ b/images/icons/16/user.png
diff --git a/images/icons/22/add.png b/images/icons/22/add.png
index 2079e725d..2079e725d 100755..100644
--- a/images/icons/22/add.png
+++ b/images/icons/22/add.png
diff --git a/images/icons/22/delete.png b/images/icons/22/delete.png
index d0f2acf13..d0f2acf13 100755..100644
--- a/images/icons/22/delete.png
+++ b/images/icons/22/delete.png
diff --git a/images/icons/22/edit.png b/images/icons/22/edit.png
index ad251b8ed..ad251b8ed 100755..100644
--- a/images/icons/22/edit.png
+++ b/images/icons/22/edit.png
diff --git a/images/icons/22/feed.png b/images/icons/22/feed.png
index a0b75f11d..a0b75f11d 100755..100644
--- a/images/icons/22/feed.png
+++ b/images/icons/22/feed.png
diff --git a/images/icons/22/gear.png b/images/icons/22/gear.png
index 9ccf5280b..9ccf5280b 100755..100644
--- a/images/icons/22/gear.png
+++ b/images/icons/22/gear.png
diff --git a/images/icons/22/group.png b/images/icons/22/group.png
index f1360159b..f1360159b 100755..100644
--- a/images/icons/22/group.png
+++ b/images/icons/22/group.png
diff --git a/images/icons/22/info.png b/images/icons/22/info.png
index 18d32664d..18d32664d 100755..100644
--- a/images/icons/22/info.png
+++ b/images/icons/22/info.png
diff --git a/images/icons/22/link.png b/images/icons/22/link.png
index e819ad3ac..e819ad3ac 100755..100644
--- a/images/icons/22/link.png
+++ b/images/icons/22/link.png
diff --git a/images/icons/22/lock.png b/images/icons/22/lock.png
index 13b755810..13b755810 100755..100644
--- a/images/icons/22/lock.png
+++ b/images/icons/22/lock.png
diff --git a/images/icons/22/menu.png b/images/icons/22/menu.png
index e3461da8b..e3461da8b 100755..100644
--- a/images/icons/22/menu.png
+++ b/images/icons/22/menu.png
diff --git a/images/icons/22/notice.png b/images/icons/22/notice.png
index 2b9773892..2b9773892 100755..100644
--- a/images/icons/22/notice.png
+++ b/images/icons/22/notice.png
diff --git a/images/icons/22/notify_off.png b/images/icons/22/notify_off.png
index 513687bc5..513687bc5 100755..100644
--- a/images/icons/22/notify_off.png
+++ b/images/icons/22/notify_off.png
diff --git a/images/icons/22/notify_on.png b/images/icons/22/notify_on.png
index 18002e15c..18002e15c 100755..100644
--- a/images/icons/22/notify_on.png
+++ b/images/icons/22/notify_on.png
diff --git a/images/icons/22/play.png b/images/icons/22/play.png
index a7a8b6124..a7a8b6124 100755..100644
--- a/images/icons/22/play.png
+++ b/images/icons/22/play.png
diff --git a/images/icons/22/plugin.png b/images/icons/22/plugin.png
index cf4421125..cf4421125 100755..100644
--- a/images/icons/22/plugin.png
+++ b/images/icons/22/plugin.png
diff --git a/images/icons/22/star.png b/images/icons/22/star.png
index 484e24794..484e24794 100755..100644
--- a/images/icons/22/star.png
+++ b/images/icons/22/star.png
diff --git a/images/icons/22/unlock.png b/images/icons/22/unlock.png
index 9be196f55..9be196f55 100755..100644
--- a/images/icons/22/unlock.png
+++ b/images/icons/22/unlock.png
diff --git a/images/icons/22/user.png b/images/icons/22/user.png
index 79bb05e4e..79bb05e4e 100755..100644
--- a/images/icons/22/user.png
+++ b/images/icons/22/user.png
diff --git a/images/icons/48/add.png b/images/icons/48/add.png
index 753ac4b68..753ac4b68 100755..100644
--- a/images/icons/48/add.png
+++ b/images/icons/48/add.png
diff --git a/images/icons/48/delete.png b/images/icons/48/delete.png
index 2835638a9..2835638a9 100755..100644
--- a/images/icons/48/delete.png
+++ b/images/icons/48/delete.png
diff --git a/images/icons/48/edit.png b/images/icons/48/edit.png
index 709fbb357..709fbb357 100755..100644
--- a/images/icons/48/edit.png
+++ b/images/icons/48/edit.png
diff --git a/images/icons/48/feed.png b/images/icons/48/feed.png
index 13d88f707..13d88f707 100755..100644
--- a/images/icons/48/feed.png
+++ b/images/icons/48/feed.png
diff --git a/images/icons/48/gear.png b/images/icons/48/gear.png
index 8bb12e96e..8bb12e96e 100755..100644
--- a/images/icons/48/gear.png
+++ b/images/icons/48/gear.png
diff --git a/images/icons/48/group.png b/images/icons/48/group.png
index 26238ac6a..26238ac6a 100755..100644
--- a/images/icons/48/group.png
+++ b/images/icons/48/group.png
diff --git a/images/icons/48/info.png b/images/icons/48/info.png
index 760eca5c3..760eca5c3 100755..100644
--- a/images/icons/48/info.png
+++ b/images/icons/48/info.png
diff --git a/images/icons/48/link.png b/images/icons/48/link.png
index b32eec529..b32eec529 100755..100644
--- a/images/icons/48/link.png
+++ b/images/icons/48/link.png
diff --git a/images/icons/48/lock.png b/images/icons/48/lock.png
index b9db282ac..b9db282ac 100755..100644
--- a/images/icons/48/lock.png
+++ b/images/icons/48/lock.png
diff --git a/images/icons/48/menu.png b/images/icons/48/menu.png
index 376e60cab..376e60cab 100755..100644
--- a/images/icons/48/menu.png
+++ b/images/icons/48/menu.png
diff --git a/images/icons/48/notice.png b/images/icons/48/notice.png
index f6fbc95c6..f6fbc95c6 100755..100644
--- a/images/icons/48/notice.png
+++ b/images/icons/48/notice.png
diff --git a/images/icons/48/notify_off.png b/images/icons/48/notify_off.png
index 7c8cd9788..7c8cd9788 100755..100644
--- a/images/icons/48/notify_off.png
+++ b/images/icons/48/notify_off.png
diff --git a/images/icons/48/notify_on.png b/images/icons/48/notify_on.png
index 3275898c5..3275898c5 100755..100644
--- a/images/icons/48/notify_on.png
+++ b/images/icons/48/notify_on.png
diff --git a/images/icons/48/play.png b/images/icons/48/play.png
index fce589370..fce589370 100755..100644
--- a/images/icons/48/play.png
+++ b/images/icons/48/play.png
diff --git a/images/icons/48/plugin.png b/images/icons/48/plugin.png
index c74c6bf46..c74c6bf46 100755..100644
--- a/images/icons/48/plugin.png
+++ b/images/icons/48/plugin.png
diff --git a/images/icons/48/star.png b/images/icons/48/star.png
index f53914efa..f53914efa 100755..100644
--- a/images/icons/48/star.png
+++ b/images/icons/48/star.png
diff --git a/images/icons/48/unlock.png b/images/icons/48/unlock.png
index 9bf72a4c6..9bf72a4c6 100755..100644
--- a/images/icons/48/unlock.png
+++ b/images/icons/48/unlock.png
diff --git a/images/icons/48/user.png b/images/icons/48/user.png
index c42410cd1..c42410cd1 100755..100644
--- a/images/icons/48/user.png
+++ b/images/icons/48/user.png
diff --git a/images/icons/Makefile b/images/icons/Makefile
index bfb5927df..bfb5927df 100755..100644
--- a/images/icons/Makefile
+++ b/images/icons/Makefile
diff --git a/images/icons/add.png b/images/icons/add.png
index 78497fbc9..78497fbc9 100755..100644
--- a/images/icons/add.png
+++ b/images/icons/add.png
diff --git a/images/icons/delete.png b/images/icons/delete.png
index f0cae5154..f0cae5154 100755..100644
--- a/images/icons/delete.png
+++ b/images/icons/delete.png
diff --git a/images/icons/edit.png b/images/icons/edit.png
index aeaf835fe..aeaf835fe 100755..100644
--- a/images/icons/edit.png
+++ b/images/icons/edit.png
diff --git a/images/icons/feed.png b/images/icons/feed.png
index 6894257e9..6894257e9 100755..100644
--- a/images/icons/feed.png
+++ b/images/icons/feed.png
diff --git a/images/icons/gear.png b/images/icons/gear.png
index 02847ef9d..02847ef9d 100755..100644
--- a/images/icons/gear.png
+++ b/images/icons/gear.png
diff --git a/images/icons/group.png b/images/icons/group.png
index de0dc7901..de0dc7901 100755..100644
--- a/images/icons/group.png
+++ b/images/icons/group.png
diff --git a/images/icons/info.png b/images/icons/info.png
index ea2b0ffa4..ea2b0ffa4 100755..100644
--- a/images/icons/info.png
+++ b/images/icons/info.png
diff --git a/images/icons/link.png b/images/icons/link.png
index 743bdf0f9..743bdf0f9 100755..100644
--- a/images/icons/link.png
+++ b/images/icons/link.png
diff --git a/images/icons/lock.png b/images/icons/lock.png
index 91a8f3ef2..91a8f3ef2 100755..100644
--- a/images/icons/lock.png
+++ b/images/icons/lock.png
diff --git a/images/icons/menu.png b/images/icons/menu.png
index 56afc8541..56afc8541 100755..100644
--- a/images/icons/menu.png
+++ b/images/icons/menu.png
diff --git a/images/icons/notice.png b/images/icons/notice.png
index b6017c8de..b6017c8de 100755..100644
--- a/images/icons/notice.png
+++ b/images/icons/notice.png
diff --git a/images/icons/notify_off.png b/images/icons/notify_off.png
index e6eac16b8..e6eac16b8 100755..100644
--- a/images/icons/notify_off.png
+++ b/images/icons/notify_off.png
diff --git a/images/icons/notify_on.png b/images/icons/notify_on.png
index b9e07d24e..b9e07d24e 100755..100644
--- a/images/icons/notify_on.png
+++ b/images/icons/notify_on.png
diff --git a/images/icons/play.png b/images/icons/play.png
index 7c942072e..7c942072e 100755..100644
--- a/images/icons/play.png
+++ b/images/icons/play.png
diff --git a/images/icons/plugin.png b/images/icons/plugin.png
index 943be0d93..943be0d93 100755..100644
--- a/images/icons/plugin.png
+++ b/images/icons/plugin.png
diff --git a/images/icons/star.png b/images/icons/star.png
index 4a2236c9b..4a2236c9b 100755..100644
--- a/images/icons/star.png
+++ b/images/icons/star.png
diff --git a/images/icons/unlock.png b/images/icons/unlock.png
index 4bf7e7eae..4bf7e7eae 100755..100644
--- a/images/icons/unlock.png
+++ b/images/icons/unlock.png
diff --git a/images/icons/user.png b/images/icons/user.png
index f1132b1ae..f1132b1ae 100755..100644
--- a/images/icons/user.png
+++ b/images/icons/user.png
diff --git a/images/larrow.gif b/images/larrow.gif
index ab08bb57e..ab08bb57e 100755..100644
--- a/images/larrow.gif
+++ b/images/larrow.gif
diff --git a/images/larrw.gif b/images/larrw.gif
index 08902d772..08902d772 100755..100644
--- a/images/larrw.gif
+++ b/images/larrw.gif
diff --git a/images/like.gif b/images/like.gif
index f71d0324d..f71d0324d 100755..100644
--- a/images/like.gif
+++ b/images/like.gif
diff --git a/images/link-icon.gif b/images/link-icon.gif
index c012d716e..c012d716e 100755..100644
--- a/images/link-icon.gif
+++ b/images/link-icon.gif
diff --git a/images/lock_icon.gif b/images/lock_icon.gif
index b6b1b7fed..b6b1b7fed 100755..100644
--- a/images/lock_icon.gif
+++ b/images/lock_icon.gif
diff --git a/images/logo.png b/images/logo.png
index 1b977b697..1b977b697 100755..100644
--- a/images/logo.png
+++ b/images/logo.png
diff --git a/images/lrarrow.gif b/images/lrarrow.gif
index fa2676944..fa2676944 100755..100644
--- a/images/lrarrow.gif
+++ b/images/lrarrow.gif
diff --git a/images/mapicon.gif b/images/mapicon.gif
index dd20c209b..dd20c209b 100755..100644
--- a/images/mapicon.gif
+++ b/images/mapicon.gif
diff --git a/images/no.gif b/images/no.gif
index eb0f2b0e9..eb0f2b0e9 100755..100644
--- a/images/no.gif
+++ b/images/no.gif
diff --git a/images/noglobe.gif b/images/noglobe.gif
index 81e176567..81e176567 100755..100644
--- a/images/noglobe.gif
+++ b/images/noglobe.gif
diff --git a/images/nosign.jpg b/images/nosign.jpg
index b73629332..b73629332 100755..100644
--- a/images/nosign.jpg
+++ b/images/nosign.jpg
diff --git a/images/onoff.jpg b/images/onoff.jpg
index 7884912a7..7884912a7 100755..100644
--- a/images/onoff.jpg
+++ b/images/onoff.jpg
diff --git a/images/pause.gif b/images/pause.gif
index dc57c4c98..dc57c4c98 100755..100644
--- a/images/pause.gif
+++ b/images/pause.gif
diff --git a/images/pen.png b/images/pen.png
index 46b404941..46b404941 100755..100644
--- a/images/pen.png
+++ b/images/pen.png
diff --git a/images/pencil.gif b/images/pencil.gif
index 26bfb0c9a..26bfb0c9a 100755..100644
--- a/images/pencil.gif
+++ b/images/pencil.gif
diff --git a/images/penhover.png b/images/penhover.png
index be48d77b4..be48d77b4 100755..100644
--- a/images/penhover.png
+++ b/images/penhover.png
diff --git a/images/people.gif b/images/people.gif
index cac31db2a..cac31db2a 100755..100644
--- a/images/people.gif
+++ b/images/people.gif
diff --git a/images/play.gif b/images/play.gif
index 4010f056d..4010f056d 100755..100644
--- a/images/play.gif
+++ b/images/play.gif
diff --git a/images/plugin.png b/images/plugin.png
index 08b09e060..08b09e060 100755..100644
--- a/images/plugin.png
+++ b/images/plugin.png
diff --git a/images/rarrow.gif b/images/rarrow.gif
index a2d5df3e9..a2d5df3e9 100755..100644
--- a/images/rarrow.gif
+++ b/images/rarrow.gif
diff --git a/images/rarrw.gif b/images/rarrw.gif
index 849238c2d..849238c2d 100755..100644
--- a/images/rarrw.gif
+++ b/images/rarrw.gif
diff --git a/images/recycle.gif b/images/recycle.gif
index 01b3e13b4..01b3e13b4 100755..100644
--- a/images/recycle.gif
+++ b/images/recycle.gif
diff --git a/images/remote-link.gif b/images/remote-link.gif
index 64de29aee..64de29aee 100755..100644
--- a/images/remote-link.gif
+++ b/images/remote-link.gif
diff --git a/images/rotator.gif b/images/rotator.gif
index 3797ec3e4..3797ec3e4 100755..100644
--- a/images/rotator.gif
+++ b/images/rotator.gif
diff --git a/images/search_18.png b/images/search_18.png
index 539739670..539739670 100755..100644
--- a/images/search_18.png
+++ b/images/search_18.png
diff --git a/images/selected.png b/images/selected.png
index 79a7c77c6..79a7c77c6 100755..100644
--- a/images/selected.png
+++ b/images/selected.png
diff --git a/images/share.gif b/images/share.gif
index 035fa2e38..035fa2e38 100755..100644
--- a/images/share.gif
+++ b/images/share.gif
diff --git a/images/show_all_off.png b/images/show_all_off.png
index cc96d28f0..cc96d28f0 100755..100644
--- a/images/show_all_off.png
+++ b/images/show_all_off.png
diff --git a/images/show_all_on.png b/images/show_all_on.png
index 87a7710b5..87a7710b5 100755..100644
--- a/images/show_all_on.png
+++ b/images/show_all_on.png
diff --git a/images/show_off.png b/images/show_off.png
index 4bcf47123..4bcf47123 100755..100644
--- a/images/show_off.png
+++ b/images/show_off.png
diff --git a/images/show_on.png b/images/show_on.png
index b8d1f5bac..b8d1f5bac 100755..100644
--- a/images/show_on.png
+++ b/images/show_on.png
diff --git a/images/smiley-Oo.gif b/images/smiley-Oo.gif
index a15d97427..a15d97427 100755..100644
--- a/images/smiley-Oo.gif
+++ b/images/smiley-Oo.gif
diff --git a/images/smiley-brokenheart.gif b/images/smiley-brokenheart.gif
index 971b57fd9..971b57fd9 100755..100644
--- a/images/smiley-brokenheart.gif
+++ b/images/smiley-brokenheart.gif
diff --git a/images/smiley-cool.gif b/images/smiley-cool.gif
index cee1c1aa3..cee1c1aa3 100755..100644
--- a/images/smiley-cool.gif
+++ b/images/smiley-cool.gif
diff --git a/images/smiley-cry.gif b/images/smiley-cry.gif
index 06e6ca2c2..06e6ca2c2 100755..100644
--- a/images/smiley-cry.gif
+++ b/images/smiley-cry.gif
diff --git a/images/smiley-embarassed.gif b/images/smiley-embarassed.gif
index adc12e7c5..adc12e7c5 100755..100644
--- a/images/smiley-embarassed.gif
+++ b/images/smiley-embarassed.gif
diff --git a/images/smiley-foot-in-mouth.gif b/images/smiley-foot-in-mouth.gif
index b444e5781..b444e5781 100755..100644
--- a/images/smiley-foot-in-mouth.gif
+++ b/images/smiley-foot-in-mouth.gif
diff --git a/images/smiley-frown.gif b/images/smiley-frown.gif
index 9ff19850d..9ff19850d 100755..100644
--- a/images/smiley-frown.gif
+++ b/images/smiley-frown.gif
diff --git a/images/smiley-heart.gif b/images/smiley-heart.gif
index 6a11e7065..6a11e7065 100755..100644
--- a/images/smiley-heart.gif
+++ b/images/smiley-heart.gif
diff --git a/images/smiley-innocent.gif b/images/smiley-innocent.gif
index 9d747140e..9d747140e 100755..100644
--- a/images/smiley-innocent.gif
+++ b/images/smiley-innocent.gif
diff --git a/images/smiley-kiss.gif b/images/smiley-kiss.gif
index cc356611e..cc356611e 100755..100644
--- a/images/smiley-kiss.gif
+++ b/images/smiley-kiss.gif
diff --git a/images/smiley-laughing.gif b/images/smiley-laughing.gif
index 1bf29de79..1bf29de79 100755..100644
--- a/images/smiley-laughing.gif
+++ b/images/smiley-laughing.gif
diff --git a/images/smiley-money-mouth.gif b/images/smiley-money-mouth.gif
index 1e8ccd0f3..1e8ccd0f3 100755..100644
--- a/images/smiley-money-mouth.gif
+++ b/images/smiley-money-mouth.gif
diff --git a/images/smiley-sealed.gif b/images/smiley-sealed.gif
index 98186742d..98186742d 100755..100644
--- a/images/smiley-sealed.gif
+++ b/images/smiley-sealed.gif
diff --git a/images/smiley-smile.gif b/images/smiley-smile.gif
index b9bff40a4..b9bff40a4 100755..100644
--- a/images/smiley-smile.gif
+++ b/images/smiley-smile.gif
diff --git a/images/smiley-surprised.gif b/images/smiley-surprised.gif
index b07465326..b07465326 100755..100644
--- a/images/smiley-surprised.gif
+++ b/images/smiley-surprised.gif
diff --git a/images/smiley-thumbsup.gif b/images/smiley-thumbsup.gif
index a9533a64d..a9533a64d 100755..100644
--- a/images/smiley-thumbsup.gif
+++ b/images/smiley-thumbsup.gif
diff --git a/images/smiley-tongue-out.gif b/images/smiley-tongue-out.gif
index 48867dc26..48867dc26 100755..100644
--- a/images/smiley-tongue-out.gif
+++ b/images/smiley-tongue-out.gif
diff --git a/images/smiley-undecided.gif b/images/smiley-undecided.gif
index 28029794f..28029794f 100755..100644
--- a/images/smiley-undecided.gif
+++ b/images/smiley-undecided.gif
diff --git a/images/smiley-wink.gif b/images/smiley-wink.gif
index e1cefb05c..e1cefb05c 100755..100644
--- a/images/smiley-wink.gif
+++ b/images/smiley-wink.gif
diff --git a/images/smiley-yell.gif b/images/smiley-yell.gif
index 5296c8836..5296c8836 100755..100644
--- a/images/smiley-yell.gif
+++ b/images/smiley-yell.gif
diff --git a/images/spencil.gif b/images/spencil.gif
index 0a2551ac0..0a2551ac0 100755..100644
--- a/images/spencil.gif
+++ b/images/spencil.gif
diff --git a/images/star.png b/images/star.png
index 0b00cb189..0b00cb189 100755..100644
--- a/images/star.png
+++ b/images/star.png
diff --git a/images/tag.png b/images/tag.png
index 40c5fd44e..40c5fd44e 100755..100644
--- a/images/tag.png
+++ b/images/tag.png
diff --git a/images/tag_b.png b/images/tag_b.png
index 66c03415d..66c03415d 100755..100644
--- a/images/tag_b.png
+++ b/images/tag_b.png
diff --git a/images/tools.png b/images/tools.png
index c17094a81..c17094a81 100755..100644
--- a/images/tools.png
+++ b/images/tools.png
diff --git a/images/twopeople.png b/images/twopeople.png
index 07a4a0882..07a4a0882 100755..100644
--- a/images/twopeople.png
+++ b/images/twopeople.png
diff --git a/images/unlock_icon.gif b/images/unlock_icon.gif
index 254ac8bfd..254ac8bfd 100755..100644
--- a/images/unlock_icon.gif
+++ b/images/unlock_icon.gif
diff --git a/images/video.gif b/images/video.gif
index e4d5e8cdd..e4d5e8cdd 100755..100644
--- a/images/video.gif
+++ b/images/video.gif
diff --git a/images/youtube_icon.gif b/images/youtube_icon.gif
index 987b82bfd..987b82bfd 100755..100644
--- a/images/youtube_icon.gif
+++ b/images/youtube_icon.gif
diff --git a/include/Contact.php b/include/Contact.php
index d9949b1ef..9ba1e8ae5 100755..100644
--- a/include/Contact.php
+++ b/include/Contact.php
@@ -23,16 +23,24 @@ function user_remove($uid) {
 	);
 
 	q("DELETE FROM `contact` WHERE `uid` = %d", intval($uid));
+	q("DELETE FROM `gcign` WHERE `uid` = %d", intval($uid));
 	q("DELETE FROM `group` WHERE `uid` = %d", intval($uid));
 	q("DELETE FROM `group_member` WHERE `uid` = %d", intval($uid));
 	q("DELETE FROM `intro` WHERE `uid` = %d", intval($uid));
 	q("DELETE FROM `event` WHERE `uid` = %d", intval($uid));
 	q("DELETE FROM `item` WHERE `uid` = %d", intval($uid));
+	q("DELETE FROM `item_id` WHERE `uid` = %d", intval($uid));
 	q("DELETE FROM `mail` WHERE `uid` = %d", intval($uid));
+	q("DELETE FROM `mailacct` WHERE `uid` = %d", intval($uid));
+	q("DELETE FROM `manage` WHERE `uid` = %d", intval($uid));
+	q("DELETE FROM `notify` WHERE `uid` = %d", intval($uid));
 	q("DELETE FROM `photo` WHERE `uid` = %d", intval($uid));
+	q("DELETE FROM `attach` WHERE `uid` = %d", intval($uid));
 	q("DELETE FROM `profile` WHERE `uid` = %d", intval($uid));
 	q("DELETE FROM `profile_check` WHERE `uid` = %d", intval($uid));
 	q("DELETE FROM `pconfig` WHERE `uid` = %d", intval($uid));
+	q("DELETE FROM `search` WHERE `uid` = %d", intval($uid));
+	q("DELETE FROM `spam` WHERE `uid` = %d", intval($uid));
 	q("DELETE FROM `user` WHERE `uid` = %d", intval($uid));
 	if($uid == local_user()) {
 		unset($_SESSION['authenticated']);
@@ -134,11 +142,11 @@ function contact_photo_menu($contact) {
 	$posts_link = $a->get_baseurl() . '/network/?cid=' . $contact['id'];
 
 	$menu = Array(
-		t("View status") => $status_link,
-		t("View profile") => $profile_link,
-		t("View photos") => $photos_link,		
-		t("View recent") => $posts_link, 
-		t("Edit contact") => $contact_url,
+		t("View Status") => $status_link,
+		t("View Profile") => $profile_link,
+		t("View Photos") => $photos_link,		
+		t("Network Posts") => $posts_link, 
+		t("Edit Contact") => $contact_url,
 		t("Send PM") => $pm_url,
 	);
 	
@@ -150,7 +158,7 @@ function contact_photo_menu($contact) {
 	$o = "";
 	foreach($menu as $k=>$v){
 		if ($v!="") {
-			if(($k !== t("View recent")) && ($k !== t("Send PM")))
+			if(($k !== t("Network Posts")) && ($k !== t("Send PM")) && ($k !== t('Edit Contact')))
 				$o .= "<li><a target=\"redir\" href=\"$v\">$k</a></li>\n";
 			else
 				$o .= "<li><a href=\"$v\">$k</a></li>\n";
@@ -158,3 +166,36 @@ function contact_photo_menu($contact) {
 	}
 	return $o;
 }}
+
+
+function random_profile() {
+	$r = q("select url from gcontact where url like '%%://%%/profile/%%' order by rand() limit 1");
+	if(count($r))
+		return dirname($r[0]['url']);
+	return '';
+}
+
+
+function contacts_not_grouped($uid,$start = 0,$count = 0) {
+
+	if(! $count) {
+		$r = q("select count(*) as total from contact where uid = %d and self = 0 and id not in (select distinct(`contact-id`) from group_member where uid = %d) ",
+			intval($uid),
+			intval($uid)
+		);
+
+		return $r;
+
+
+	}
+
+	$r = q("select * from contact where uid = %d and self = 0 and id not in (select distinct(`contact-id`) from group_member where uid = %d) and blocked = 0 and pending = 0 limit %d, %d",
+		intval($uid),
+		intval($uid),
+		intval($start),
+		intval($count)
+	);
+
+	return $r;
+}
+
diff --git a/include/EmailNotification.php b/include/EmailNotification.php
index 8861e8f5d..8861e8f5d 100755..100644
--- a/include/EmailNotification.php
+++ b/include/EmailNotification.php
diff --git a/include/Photo.php b/include/Photo.php
index 4d02b5c65..4d02b5c65 100755..100644
--- a/include/Photo.php
+++ b/include/Photo.php
diff --git a/include/Scrape.php b/include/Scrape.php
index 9c237916b..b20d7d604 100755..100644
--- a/include/Scrape.php
+++ b/include/Scrape.php
@@ -446,7 +446,7 @@ function probe_url($url, $mode = PROBE_NORMAL) {
 						$phost = substr($url,strpos($url,'@')+1);
 						$profile = 'http://' . $phost;
 						// fix nick character range
-						$vcard = array('fn' => $name, 'nick' => $name, 'photo' => gravatar_img($url));
+						$vcard = array('fn' => $name, 'nick' => $name, 'photo' => avatar_img($url));
 						$notify = 'smtp ' . random_string();
 						$poll = 'email ' . random_string();
 						$priority = 0;
@@ -593,7 +593,7 @@ function probe_url($url, $mode = PROBE_NORMAL) {
 			logger('probe_url: fetch feed: ' . $poll . ' returns: ' . $xml, LOGGER_DATA);
 			$a = get_app();
 
-			logger('probe_url: scrape_feed: headers: ' . $a->get_curl_headers(), $LOGGER_DATA);
+			logger('probe_url: scrape_feed: headers: ' . $a->get_curl_headers(), LOGGER_DATA);
 
    			$feed->set_raw_data($xml);
 
@@ -655,7 +655,7 @@ function probe_url($url, $mode = PROBE_NORMAL) {
 			}
 
 			if((! $vcard['photo']) && strlen($email))
-				$vcard['photo'] = gravatar_img($email);
+				$vcard['photo'] = avatar_img($email);
 			if($poll === $profile)
 				$lnk = $feed->get_permalink();
 			if(isset($lnk) && strlen($lnk))
diff --git a/include/acl_selectors.php b/include/acl_selectors.php
index a5f5aff53..a5f5aff53 100755..100644
--- a/include/acl_selectors.php
+++ b/include/acl_selectors.php
diff --git a/include/api.php b/include/api.php
index 065f14cff..f9be68c3d 100755..100644
--- a/include/api.php
+++ b/include/api.php
@@ -121,6 +121,7 @@
 				if (strpos($a->query_string, ".json")>0) $type="json";
 				if (strpos($a->query_string, ".rss")>0) $type="rss";
 				if (strpos($a->query_string, ".atom")>0) $type="atom";
+				if (strpos($a->query_string, ".as")>0) $type="as";
 
 				$r = call_user_func($info['func'], $a, $type);
 				if ($r===false) return;
@@ -144,6 +145,12 @@
 						header ("Content-Type: application/atom+xml");
 						return '<?xml version="1.0" encoding="UTF-8"?>'."\n".$r;
 						break;
+					case "as":
+						//header ("Content-Type: application/json");
+						//foreach($r as $rr)
+						//    return json_encode($rr);
+						return json_encode($r);
+						break;
 
 				}
 				//echo "<pre>"; var_dump($r); die();
@@ -560,8 +567,17 @@
 		$_REQUEST['profile_uid'] = local_user();
 		if(requestdata('parent'))
 			$_REQUEST['type'] = 'net-comment';
-		else
+		else {
 			$_REQUEST['type'] = 'wall';
+                        if(x($_FILES,'media')) {
+		                // upload the image if we have one
+		                $_REQUEST['hush']='yeah'; //tell wall_upload function to return img info instead of echo
+			        require_once('mod/wall_upload.php');
+			        $media = wall_upload_post($a);
+		                if(strlen($media)>0)
+				        $_REQUEST['body'] .= "\n\n".$media;
+			        }
+		}
 
 		// set this so that the item_post() function is quiet and doesn't redirect or emit json
 
@@ -737,6 +753,13 @@
 			case "atom":
 			case "rss":
 				$data = api_rss_extra($a, $data, $user_info);
+				break;
+			case "as":
+				$as = api_format_as($a, $ret, $user_info);
+				$as['title'] = $a->config['sitename']." Home Timeline";
+				$as['link']['url'] = $a->get_baseurl()."/".$user_info["screen_name"]."/all";
+				return($as);
+				break;
 		}
 				
 		return  api_apply_template("timeline", $type, $data);
@@ -744,6 +767,85 @@
 	api_register_func('api/statuses/home_timeline','api_statuses_home_timeline', true);
 	api_register_func('api/statuses/friends_timeline','api_statuses_home_timeline', true);
 
+	function api_statuses_public_timeline(&$a, $type){
+		if (local_user()===false) return false;
+				
+		$user_info = api_get_user($a);
+		// get last newtork messages
+
+
+		// params
+		$count = (x($_REQUEST,'count')?$_REQUEST['count']:20);
+		$page = (x($_REQUEST,'page')?$_REQUEST['page']-1:0);
+		if ($page<0) $page=0;
+		$since_id = (x($_REQUEST,'since_id')?$_REQUEST['since_id']:0);
+		$max_id = (x($_REQUEST,'max_id')?$_REQUEST['max_id']:0);
+		//$since_id = 0;//$since_id = (x($_REQUEST,'since_id')?$_REQUEST['since_id']:0);
+		
+		$start = $page*$count;
+
+		//$include_entities = (x($_REQUEST,'include_entities')?$_REQUEST['include_entities']:false);
+
+		if ($max_id > 0)
+			$sql_extra = 'AND `item`.`id` <= '.intval($max_id);
+
+		/*$r = q("SELECT `item`.*, `item`.`id` AS `item_id`, 
+			`contact`.`name`, `contact`.`photo`, `contact`.`url`, `contact`.`rel`,
+			`contact`.`network`, `contact`.`thumb`, `contact`.`dfrn-id`, `contact`.`self`,
+			`contact`.`id` AS `cid`, `contact`.`uid` AS `contact-uid`
+			FROM `item`, `contact`
+			WHERE `item`.`visible` = 1 and `item`.`moderated` = 0 AND `item`.`deleted` = 0
+			AND `item`.`allow_cid` = ''  AND `item`.`allow_gid` = '' 
+			AND `item`.`deny_cid`  = '' AND `item`.`deny_gid`  = '' 
+			AND `item`.`private` = 0 AND `item`.`wall` = 1 AND `user`.`hidewall` = 0
+			AND `contact`.`id` = `item`.`contact-id`
+			AND `contact`.`blocked` = 0 AND `contact`.`pending` = 0
+			$sql_extra
+			AND `item`.`id`>%d
+			ORDER BY `item`.`received` DESC LIMIT %d ,%d ",
+			intval($since_id),
+			intval($start),	intval($count)
+		);*/
+	        $r = q("SELECT `item`.*, `item`.`id` AS `item_id`, 
+	                `contact`.`name`, `contact`.`photo`, `contact`.`url`, `contact`.`rel`,
+        	        `contact`.`network`, `contact`.`thumb`, `contact`.`self`, `contact`.`writable`, 
+                	`contact`.`id` AS `cid`, `contact`.`uid` AS `contact-uid`,
+                	`user`.`nickname`, `user`.`hidewall`
+                	FROM `item` LEFT JOIN `contact` ON `contact`.`id` = `item`.`contact-id`
+                	LEFT JOIN `user` ON `user`.`uid` = `item`.`uid`
+                	WHERE `item`.`visible` = 1 AND `item`.`deleted` = 0 and `item`.`moderated` = 0
+                	AND `item`.`allow_cid` = ''  AND `item`.`allow_gid` = '' 
+                	AND `item`.`deny_cid`  = '' AND `item`.`deny_gid`  = '' 
+                	AND `item`.`private` = 0 AND `item`.`wall` = 1 AND `user`.`hidewall` = 0 
+                	AND `contact`.`blocked` = 0 AND `contact`.`pending` = 0
+			$sql_extra
+			AND `item`.`id`>%d
+                	ORDER BY `received` DESC LIMIT %d, %d ",
+			intval($since_id),
+                	intval($start),
+                	intval($count));
+
+		$ret = api_format_items($r,$user_info);
+
+		
+		$data = array('$statuses' => $ret);
+		switch($type){
+			case "atom":
+			case "rss":
+				$data = api_rss_extra($a, $data, $user_info);
+				break;
+			case "as":
+				$as = api_format_as($a, $ret, $user_info);
+				$as['title'] = $a->config['sitename']." Public Timeline";
+				$as['link']['url'] = $a->get_baseurl()."/";
+				return($as);
+				break;
+		}
+				
+		return  api_apply_template("timeline", $type, $data);
+	}
+	api_register_func('api/statuses/public_timeline','api_statuses_public_timeline', true);
+
 	/**
 	 * 
 	 */
@@ -784,8 +886,152 @@
 	}
 	api_register_func('api/statuses/show','api_statuses_show', true);
 
-	//api_register_func('api/statuses/mentions','api_statuses_mentions', true);
-	//api_register_func('api/statuses/replies','api_statuses_mentions', true);
+
+	/**
+	 * 
+	 */
+	function api_statuses_repeat(&$a, $type){
+		if (local_user()===false) return false;
+
+		$user_info = api_get_user($a);
+
+		// params
+		$id = intval($a->argv[3]);
+
+		logger('API: api_statuses_repeat: '.$id);		
+
+		//$include_entities = (x($_REQUEST,'include_entities')?$_REQUEST['include_entities']:false);
+
+		$r = q("SELECT `item`.*, `item`.`id` AS `item_id`, `contact`.`nick` as `reply_author`,
+			`contact`.`name`, `contact`.`photo`, `contact`.`url` as `reply_url`, `contact`.`rel`,
+			`contact`.`network`, `contact`.`thumb`, `contact`.`dfrn-id`, `contact`.`self`,
+			`contact`.`id` AS `cid`, `contact`.`uid` AS `contact-uid`
+			FROM `item`, `contact`
+			WHERE `item`.`visible` = 1 and `item`.`moderated` = 0 AND `item`.`deleted` = 0
+			AND `contact`.`id` = `item`.`contact-id`
+			AND `contact`.`blocked` = 0 AND `contact`.`pending` = 0
+			$sql_extra
+			AND `item`.`id`=%d",
+			intval($id)
+		);
+
+		$_REQUEST['body'] = html_entity_decode("&#x2672; ", ENT_QUOTES, 'UTF-8')."[url=".$r[0]['reply_url']."]".$r[0]['reply_author']."[/url] \n".$r[0]['body'];
+		$_REQUEST['profile_uid'] = local_user();
+		$_REQUEST['type'] = 'wall';
+		$_REQUEST['api_source'] = true;
+
+		require_once('mod/item.php');
+		item_post($a);
+
+		if ($type == 'xml')
+			$ok = "true";
+		else
+			$ok = "ok";
+
+		return api_apply_template('test', $type, array('$ok' => $ok));
+	}
+	api_register_func('api/statuses/retweet','api_statuses_repeat', true);
+
+	/**
+	 * 
+	 */
+	function api_statuses_destroy(&$a, $type){
+		if (local_user()===false) return false;
+
+		$user_info = api_get_user($a);
+
+		// params
+		$id = intval($a->argv[3]);
+
+		logger('API: api_statuses_destroy: '.$id);	
+
+		require_once('include/items.php');
+		drop_item($id, false);
+
+		if ($type == 'xml')
+			$ok = "true";
+		else
+			$ok = "ok";
+
+		return api_apply_template('test', $type, array('$ok' => $ok));
+	}
+	api_register_func('api/statuses/destroy','api_statuses_destroy', true);
+
+	/**
+	 * 
+	 * http://developer.twitter.com/doc/get/statuses/mentions
+	 * 
+	 */
+	function api_statuses_mentions(&$a, $type){
+		if (local_user()===false) return false;
+				
+		$user_info = api_get_user($a);
+		// get last newtork messages
+
+
+		// params
+		$count = (x($_REQUEST,'count')?$_REQUEST['count']:20);
+		$page = (x($_REQUEST,'page')?$_REQUEST['page']-1:0);
+		if ($page<0) $page=0;
+		$since_id = (x($_REQUEST,'since_id')?$_REQUEST['since_id']:0);
+		$max_id = (x($_REQUEST,'max_id')?$_REQUEST['max_id']:0);
+		//$since_id = 0;//$since_id = (x($_REQUEST,'since_id')?$_REQUEST['since_id']:0);
+		
+		$start = $page*$count;
+
+		//$include_entities = (x($_REQUEST,'include_entities')?$_REQUEST['include_entities']:false);
+
+		$myurl = $a->get_baseurl() . '/profile/'. $a->user['nickname'];
+		$myurl = substr($myurl,strpos($myurl,'://')+3);
+		$myurl = str_replace(array('www.','.'),array('','\\.'),$myurl);
+		$diasp_url = str_replace('/profile/','/u/',$myurl);
+		$sql_extra .= sprintf(" AND `item`.`parent` IN (SELECT distinct(`parent`) from item where ( `author-link` regexp '%s' or `tag` regexp '%s' or tag regexp '%s' )) ",
+			dbesc($myurl . '$'),
+			dbesc($myurl . '\\]'),
+			dbesc($diasp_url . '\\]')
+		);
+
+		if ($max_id > 0)
+			$sql_extra .= ' AND `item`.`id` <= '.intval($max_id);
+
+		$r = q("SELECT `item`.*, `item`.`id` AS `item_id`, 
+			`contact`.`name`, `contact`.`photo`, `contact`.`url`, `contact`.`rel`,
+			`contact`.`network`, `contact`.`thumb`, `contact`.`dfrn-id`, `contact`.`self`,
+			`contact`.`id` AS `cid`, `contact`.`uid` AS `contact-uid`
+			FROM `item`, `contact`
+			WHERE `item`.`uid` = %d
+			AND `item`.`visible` = 1 and `item`.`moderated` = 0 AND `item`.`deleted` = 0
+			AND `contact`.`id` = `item`.`contact-id`
+			AND `contact`.`blocked` = 0 AND `contact`.`pending` = 0
+			$sql_extra
+			AND `item`.`id`>%d
+			ORDER BY `item`.`received` DESC LIMIT %d ,%d ",
+			intval($user_info['uid']),
+			intval($since_id),
+			intval($start),	intval($count)
+		);
+
+		$ret = api_format_items($r,$user_info);
+
+		
+		$data = array('$statuses' => $ret);
+		switch($type){
+			case "atom":
+			case "rss":
+				$data = api_rss_extra($a, $data, $user_info);
+				break;
+			case "as":
+				$as = api_format_as($a, $ret, $user_info);
+				$as["title"] = $a->config['sitename']." Mentions";
+				$as['link']['url'] = $a->get_baseurl()."/";
+				return($as);
+				break;
+		}
+				
+		return  api_apply_template("timeline", $type, $data);
+	}
+	api_register_func('api/statuses/mentions','api_statuses_mentions', true);
+	api_register_func('api/statuses/replies','api_statuses_mentions', true);
 
 
 	function api_statuses_user_timeline(&$a, $type){
@@ -898,6 +1144,70 @@
 
 	api_register_func('api/favorites','api_favorites', true);
 
+	function api_format_as($a, $ret, $user_info) {
+
+		$as = array();
+		$as['title'] = $a->config['sitename']." Public Timeline";
+		$items = array();
+		foreach ($ret as $item) {
+			$singleitem["actor"]["displayName"] = $item["user"]["name"];
+			$singleitem["actor"]["id"] = $item["user"]["contact_url"];
+			$avatar[0]["url"] = $item["user"]["profile_image_url"];
+			$avatar[0]["rel"] = "avatar";
+			$avatar[0]["type"] = "";
+			$avatar[0]["width"] = 96;
+			$avatar[0]["height"] = 96;
+			$avatar[1]["url"] = $item["user"]["profile_image_url"];
+			$avatar[1]["rel"] = "avatar";
+			$avatar[1]["type"] = "";
+			$avatar[1]["width"] = 48;
+			$avatar[1]["height"] = 48;
+			$avatar[2]["url"] = $item["user"]["profile_image_url"];
+			$avatar[2]["rel"] = "avatar";
+			$avatar[2]["type"] = "";
+			$avatar[2]["width"] = 24;
+			$avatar[2]["height"] = 24;
+			$singleitem["actor"]["avatarLinks"] = $avatar;
+
+			$singleitem["actor"]["image"]["url"] = $item["user"]["profile_image_url"];
+			$singleitem["actor"]["image"]["rel"] = "avatar";
+			$singleitem["actor"]["image"]["type"] = "";
+			$singleitem["actor"]["image"]["width"] = 96;
+			$singleitem["actor"]["image"]["height"] = 96;
+			$singleitem["actor"]["type"] = "person";
+			$singleitem["actor"]["url"] = $item["person"]["contact_url"];
+			$singleitem["actor"]["statusnet:profile_info"]["local_id"] = $item["user"]["id"];
+			$singleitem["actor"]["statusnet:profile_info"]["following"] = $item["user"]["following"] ? "true" : "false";
+			$singleitem["actor"]["statusnet:profile_info"]["blocking"] = "false";
+			$singleitem["actor"]["contact"]["preferredUsername"] = $item["user"]["screen_name"];
+			$singleitem["actor"]["contact"]["displayName"] = $item["user"]["name"];
+			$singleitem["actor"]["contact"]["addresses"] = "";
+
+			$singleitem["body"] = $item["text"];
+			$singleitem["object"]["displayName"] = $item["text"];
+			$singleitem["object"]["id"] = $item["url"];
+			$singleitem["object"]["type"] = "note";
+			$singleitem["object"]["url"] = $item["url"];
+			//$singleitem["context"] =;
+			$singleitem["postedTime"] = date("c", strtotime($item["published"]));
+			$singleitem["provider"]["objectType"] = "service";
+			$singleitem["provider"]["displayName"] = "Test";
+			$singleitem["provider"]["url"] = "http://test.tld";
+			$singleitem["title"] = $item["text"];
+			$singleitem["verb"] = "post";
+			$singleitem["statusnet:notice_info"]["local_id"] = $item["id"];
+				$singleitem["statusnet:notice_info"]["source"] = $item["source"];
+				$singleitem["statusnet:notice_info"]["favorite"] = "false";
+				$singleitem["statusnet:notice_info"]["repeated"] = "false";
+				//$singleitem["original"] = $item;
+				$items[] = $singleitem;
+		}
+		$as['items'] = $items;
+		$as['link']['url'] = $a->get_baseurl()."/".$user_info["screen_name"]."/all";
+		$as['link']['rel'] = "alternate";
+		$as['link']['type'] = "text/html";
+		return($as);
+	}
 	
 	function api_format_items($r,$user_info) {
 
@@ -932,8 +1242,17 @@
 				$in_reply_to_status_id = 0;
 			}
 
+			// Workaround for ostatus messages where the title is identically to the body
+			$statusbody = trim(html2plain(bbcode($item['body']), 0));
+			$statustitle = trim($item['title']);
+
+			if (($statustitle != '') and (strpos($statusbody, $statustitle) !== false))
+				$statustext = trim($statusbody);
+			else
+				$statustext = trim($statustitle."\n\n".$statusbody);
+
 			$status = array(
-				'text'		=> trim($item['title']." \n".html2plain(bbcode($item['body']), 0)),
+				'text'		=> $statustext,
 				'truncated' => False,
 				'created_at'=> api_date($item['created']),
 				'in_reply_to_status_id' => $in_reply_to_status_id,
@@ -944,8 +1263,8 @@
 				'geo' => '',
 				'favorited' => $item['starred'] ? true : false,
 				'user' =>  $status_user ,
-				'statusnet_html'		=> bbcode($item['body']),
-				'statusnet_conversation_id'	=> 0,
+				'statusnet_html'		=> trim(bbcode($item['body'])),
+				'statusnet_conversation_id'	=> $item['parent'],
 			);
 
 			// Seesmic doesn't like the following content
@@ -1309,12 +1628,10 @@
 
 /*
 Not implemented by now:
-statuses/public_timeline
-statuses/mentions
-statuses/replies
+favorites
+favorites/create
+favorites/destroy
 statuses/retweets_of_me
-statuses/destroy
-statuses/retweet
 friendships/create
 friendships/destroy
 friendships/exists
@@ -1322,9 +1639,6 @@ friendships/show
 account/update_location
 account/update_profile_background_image
 account/update_profile_image
-favorites
-favorites/create
-favorites/destroy
 blocks/create
 blocks/destroy
 oauth/authorize
diff --git a/include/attach.php b/include/attach.php
index 6d611cec0..6d611cec0 100755..100644
--- a/include/attach.php
+++ b/include/attach.php
diff --git a/include/auth.php b/include/auth.php
index 1341f3bb8..1341f3bb8 100755..100644
--- a/include/auth.php
+++ b/include/auth.php
diff --git a/include/bb2diaspora.php b/include/bb2diaspora.php
index 8487f845a..8487f845a 100755..100644
--- a/include/bb2diaspora.php
+++ b/include/bb2diaspora.php
diff --git a/include/bbcode.php b/include/bbcode.php
index 9befbd0f7..85d310b75 100644
--- a/include/bbcode.php
+++ b/include/bbcode.php
@@ -230,7 +230,8 @@ function bbcode($Text,$preserve_nl = false) {
                 	             $Text);
 
 	// [img=widthxheight]image source[/img]
-	$Text = preg_replace("/\[img\=([0-9]*)x([0-9]*)\](.*?)\[\/img\]/ism", '<img src="$3" style="height: $2px; width: $1px;" >', $Text);
+	//$Text = preg_replace("/\[img\=([0-9]*)x([0-9]*)\](.*?)\[\/img\]/ism", '<img src="$3" style="height: $2px; width: $1px;" >', $Text);
+	$Text = preg_replace("/\[img\=([0-9]*)x([0-9]*)\](.*?)\[\/img\]/ism", '<img src="$3" style="width: $1px;" >', $Text);
 
 	// Images
 	// [img]pathtoimage[/img]
@@ -297,6 +298,9 @@ function bbcode($Text,$preserve_nl = false) {
 	$Text = preg_replace_callback("/\[nobb\](.*?)\[\/nobb\]/ism", 'bb_unspacefy_and_trim',$Text);
 	$Text = preg_replace_callback("/\[pre\](.*?)\[\/pre\]/ism", 'bb_unspacefy_and_trim',$Text);
 
+
+	$Text = preg_replace('/\[\&amp\;([#a-z0-9]+)\;\]/','&$1;',$Text);
+
 	// fix any escaped ampersands that may have been converted into links
 	$Text = preg_replace("/\<(.*?)(src|href)=(.*?)\&amp\;(.*?)\>/ism",'<$1$2=$3&$4>',$Text);
 	if(strlen($saved_image))
diff --git a/include/cache.php b/include/cache.php
index 3c8a3f713..3c8a3f713 100755..100644
--- a/include/cache.php
+++ b/include/cache.php
diff --git a/include/config.php b/include/config.php
index 2cddda0b8..4cff38090 100755..100644
--- a/include/config.php
+++ b/include/config.php
@@ -80,6 +80,7 @@ function set_config($family,$key,$value) {
 	
 	// manage array value
 	$dbvalue = (is_array($value)?serialize($value):$value);
+	$dbvalue = (is_bool($value) ? intval($value) : $value);
 
 	if(get_config($family,$key,true) === false) {
 		$a->config[$family][$key] = $value;
diff --git a/include/contact_selectors.php b/include/contact_selectors.php
index 4b3ca987a..4b3ca987a 100755..100644
--- a/include/contact_selectors.php
+++ b/include/contact_selectors.php
diff --git a/include/contact_widgets.php b/include/contact_widgets.php
index 7346b95af..96b02f293 100755..100644
--- a/include/contact_widgets.php
+++ b/include/contact_widgets.php
@@ -12,6 +12,7 @@ function follow_widget() {
 }
 
 function findpeople_widget() {
+	require_once('include/Contact.php');
 
 	$a = get_app();
 
@@ -32,6 +33,7 @@ function findpeople_widget() {
 		'$findthem' => t('Find'),
 		'$suggest' => t('Friend Suggestions'),
 		'$similar' => t('Similar Interests'),
+		'$random' => t('Random Profile'),
 		'$inv' => t('Invite Friends')
 	));
 
@@ -103,3 +105,31 @@ function fileas_widget($baseurl,$selected = '') {
 	));
 }
 
+function categories_widget($baseurl,$selected = '') {
+	$a = get_app();
+
+	$saved = get_pconfig($a->profile['profile_uid'],'system','filetags');
+	if(! strlen($saved))
+		return;
+
+	$matches = false;
+	$terms = array();
+        $cnt = preg_match_all('/<(.*?)>/',$saved,$matches,PREG_SET_ORDER);
+        if($cnt) {
+                foreach($matches as $mtch) {
+		        $unescaped = xmlify(file_tag_decode($mtch[1]));
+			$terms[] = array('name' => $unescaped,'selected' => (($selected == $unescaped) ? 'selected' : ''));
+		}
+	}
+
+	return replace_macros(get_markup_template('categories_widget.tpl'),array(
+		'$title' => t('Categories'),
+		'$desc' => '',
+		'$sel_all' => (($selected == '') ? 'selected' : ''),
+		'$all' => t('Everything'),
+		'$terms' => $terms,
+		'$base' => $baseurl,
+
+	));
+}
+
diff --git a/include/conversation.php b/include/conversation.php
index 5a922b2b5..1b869b91e 100755..100644
--- a/include/conversation.php
+++ b/include/conversation.php
@@ -342,7 +342,6 @@ function conversation(&$a, $items, $mode, $update, $preview = false) {
 					'body' => template_escape($body),
 					'text' => strip_tags(template_escape($body)),
 					'ago' => (($item['app']) ? sprintf( t('%s from %s'),relative_date($item['created']),$item['app']) : relative_date($item['created'])),
-					'lock' => $lock,
 					'location' => template_escape($location),
 					'indent' => '',
 					'owner_name' => template_escape($owner_name),
@@ -400,6 +399,7 @@ function conversation(&$a, $items, $mode, $update, $preview = false) {
 			}
 
 			$comments_collapsed = false;
+			$comments_seen = 0;
 			$comment_lastcollapsed = false;
 			$comment_firstcollapsed = false;
 			$blowhard = 0;
@@ -559,10 +559,10 @@ function conversation(&$a, $items, $mode, $update, $preview = false) {
 					}
 				}
 
-				$edpost = (((($profile_owner == local_user()) && ($toplevelpost) && (intval($item['wall']) == 1)) || ($mode === 'notes'))
-						? array($a->get_baseurl($ssl_state)."/editpost/".$item['id'], t("Edit"))
-						: False);
-
+				if(local_user() && link_compare($a->contact['url'],$item['author-link']))
+					$edpost = array($a->get_baseurl($ssl_state)."/editpost/".$item['id'], t("Edit"));
+				else
+					$edpost = false;
 
 				$drop = '';
 				$dropping = false;
@@ -626,10 +626,6 @@ function conversation(&$a, $items, $mode, $update, $preview = false) {
 				else
 					$profile_avatar = (((strlen($item['author-avatar'])) && $diff_author) ? $item['author-avatar'] : $thumb);
 
-
-
-
-
 				$like    = ((x($alike,$item['id'])) ? format_like($alike[$item['id']],$alike[$item['id'] . '-l'],'like',$item['id']) : '');
 				$dislike = ((x($dlike,$item['id'])) ? format_like($dlike[$item['id']],$dlike[$item['id'] . '-l'],'dislike',$item['id']) : '');
 
@@ -713,7 +709,7 @@ function conversation(&$a, $items, $mode, $update, $preview = false) {
 	}
 
 	$page_template = get_markup_template("conversation.tpl");
-	$o .= replace_macros($page_template, array(
+	$o = replace_macros($page_template, array(
 		'$baseurl' => $a->get_baseurl($ssl_state),
 		'$mode' => $mode,
 		'$user' => $a->user,
@@ -810,11 +806,11 @@ function item_photo_menu($item){
 	}
 
 	$menu = Array(
-		t("View status") => $status_link,
-		t("View profile") => $profile_link,
-		t("View photos") => $photos_link,
-		t("View recent") => $posts_link, 
-		t("Edit contact") => $contact_url,
+		t("View Status") => $status_link,
+		t("View Profile") => $profile_link,
+		t("View Photos") => $photos_link,
+		t("Network Posts") => $posts_link, 
+		t("Edit Contact") => $contact_url,
 		t("Send PM") => $pm_url,
 	);
 	
@@ -974,6 +970,8 @@ function status_editor($a,$x, $notes_cid = 0, $popup=false) {
 		'$shortnoloc' => t('clear location'),
 		'$title' => "",
 		'$placeholdertitle' => t('Set title'),
+		'$category' => "",
+		'$placeholdercategory' => t('Categories (comma-separated list)'),
 		'$wait' => t('Please wait'),
 		'$permset' => t('Permission settings'),
 		'$shortpermset' => t('permissions'),
@@ -1076,7 +1074,6 @@ function find_thread_parent_index($arr,$x) {
 }
 
 function render_location_google($item) {
-	$location = '';
 	$location = (($item['location']) ? '<a target="map" title="' . $item['location'] . '" href="http://maps.google.com/?q=' . urlencode($item['location']) . '">' . $item['location'] . '</a>' : '');
 	$coord = (($item['coord']) ? '<a target="map" title="' . $item['coord'] . '" href="http://maps.google.com/?q=' . urlencode($item['coord']) . '">' . $item['coord'] . '</a>' : '');
 	if($coord) {
@@ -1087,4 +1084,3 @@ function render_location_google($item) {
 	}
 	return $location;
 }
-
diff --git a/include/cronhooks.php b/include/cronhooks.php
index 37541f013..37541f013 100755..100644
--- a/include/cronhooks.php
+++ b/include/cronhooks.php
diff --git a/include/crypto.php b/include/crypto.php
index 0feb45c24..0feb45c24 100755..100644
--- a/include/crypto.php
+++ b/include/crypto.php
diff --git a/include/datetime.php b/include/datetime.php
index 6d395fe3f..f4dcfce62 100755..100644
--- a/include/datetime.php
+++ b/include/datetime.php
@@ -80,6 +80,16 @@ function field_timezone($name='timezone', $label='', $current = 'America/Los_Ang
 if(! function_exists('datetime_convert')) {
 function datetime_convert($from = 'UTC', $to = 'UTC', $s = 'now', $fmt = "Y-m-d H:i:s") {
 
+	// Defaults to UTC if nothing is set, but throws an exception if set to empty string.
+	// Provide some sane defaults regardless.
+
+	if($from === '')
+		$from = 'UTC';
+	if($to === '')
+		$to = 'UTC';
+	if($s === '')
+		$s = 'now';
+
 	// Slight hackish adjustment so that 'zero' datetime actually returns what is intended
 	// otherwise we end up with -0001-11-30 ...
 	// add 32 days so that we at least get year 00, and then hack around the fact that 
diff --git a/include/dba.php b/include/dba.php
index 76cc0bc7b..44a663eac 100755..100644
--- a/include/dba.php
+++ b/include/dba.php
@@ -260,6 +260,4 @@ function dbesc_array(&$arr) {
 	if(is_array($arr) && count($arr)) {
 		array_walk($arr,'dbesc_array_cb');
 	}
-}}		
-
-
+}}
diff --git a/include/delivery.php b/include/delivery.php
index 532dcd699..794b8f27a 100755..100644
--- a/include/delivery.php
+++ b/include/delivery.php
@@ -321,6 +321,14 @@ function delivery_run($argv, $argc){
 						$x[0]['writable'] = 1;
 					}
 
+					$ssl_policy = get_config('system','ssl_policy');
+					fix_contact_ssl_policy($x[0],$ssl_policy);
+
+					// If we are setup as a soapbox we aren't accepting input from this person
+
+					if($x[0]['page-flags'] == PAGE_SOAPBOX)
+						break;
+
 					require_once('library/simplepie/simplepie.inc');
 					logger('mod-delivery: local delivery');
 					local_delivery($x[0],$atom);
diff --git a/include/diaspora.php b/include/diaspora.php
index 104ccadf2..afd86957b 100755..100644
--- a/include/diaspora.php
+++ b/include/diaspora.php
@@ -9,6 +9,12 @@ require_once('include/queue_fn.php');
 
 function diaspora_dispatch_public($msg) {
 
+	$enabled = intval(get_config('system','diaspora_enabled'));
+	if(! $enabled) {
+		logger('mod-diaspora: disabled');
+		return;
+	}
+
 	$r = q("SELECT `user`.* FROM `user` WHERE `user`.`uid` IN ( SELECT `contact`.`uid` FROM `contact` WHERE `contact`.`network` = '%s' AND `contact`.`addr` = '%s' ) AND `account_expired` = 0 ",
 		dbesc(NETWORK_DIASPORA),
 		dbesc($msg['author'])
@@ -29,6 +35,12 @@ function diaspora_dispatch($importer,$msg) {
 
 	$ret = 0;
 
+	$enabled = intval(get_config('system','diaspora_enabled'));
+	if(! $enabled) {
+		logger('mod-diaspora: disabled');
+		return;
+	}
+
 	// php doesn't like dashes in variable names
 
 	$msg['message'] = str_replace(
@@ -1160,7 +1172,7 @@ function diaspora_comment($importer,$xml,$msg) {
 		proc_run('php','include/notifier.php','comment',$message_id);
 	}
 
-	$myconv = q("SELECT `author-link`, `author-avatar`, `parent` FROM `item` WHERE `parent-uri` = '%s' AND `uid` = %d AND `parent` != 0 ",
+	$myconv = q("SELECT `author-link`, `author-avatar`, `parent` FROM `item` WHERE `parent-uri` = '%s' AND `uid` = %d AND `parent` != 0 AND `deleted` = 0 ",
 		dbesc($parent_item['uri']),
 		intval($importer['uid'])
 	);
@@ -1920,6 +1932,7 @@ function diaspora_send_status($item,$owner,$contact,$public_batch = false) {
 
 	$images = array();
 
+	$title = $item['title'];
 	$body = $item['body'];
 
 /*
@@ -1944,9 +1957,12 @@ function diaspora_send_status($item,$owner,$contact,$public_batch = false) {
 		}
 	}	
 */
-
 	$body = xmlify(html_entity_decode(bb2diaspora($body)));
 
+	if(strlen($title))
+		$body = xmlify('**' . html_entity_decode($title) . '**' . "\n") . $body;
+
+
 	if($item['attach']) {
 		$cnt = preg_match_all('/href=\"(.*?)\"(.*?)title=\"(.*?)\"/ism',$item['attach'],$matches,PREG_SET_ORDER);
 		if(cnt) {
@@ -2267,6 +2283,11 @@ function diaspora_send_mail($item,$owner,$contact) {
 
 function diaspora_transmit($owner,$contact,$slap,$public_batch) {
 
+	$enabled = intval(get_config('system','diaspora_enabled'));
+	if(! $enabled) {
+		return 200;
+	}
+
 	$a = get_app();
 	$logid = random_string(4);
 	$dest_url = (($public_batch) ? $contact['batch'] : $contact['notify']);
diff --git a/include/directory.php b/include/directory.php
index cae78adb4..cae78adb4 100755..100644
--- a/include/directory.php
+++ b/include/directory.php
diff --git a/include/email.php b/include/email.php
index b43ae0dc1..b43ae0dc1 100755..100644
--- a/include/email.php
+++ b/include/email.php
diff --git a/include/enotify.php b/include/enotify.php
index 8385bdec5..8385bdec5 100755..100644
--- a/include/enotify.php
+++ b/include/enotify.php
diff --git a/include/event.php b/include/event.php
index 29202badd..29202badd 100755..100644
--- a/include/event.php
+++ b/include/event.php
diff --git a/include/expire.php b/include/expire.php
index 5fa0ec758..5fa0ec758 100755..100644
--- a/include/expire.php
+++ b/include/expire.php
diff --git a/include/fcontact.php b/include/fcontact.php
index 8821a985f..8821a985f 100755..100644
--- a/include/fcontact.php
+++ b/include/fcontact.php
diff --git a/include/group.php b/include/group.php
index 4a35912e5..edb547de6 100755..100644
--- a/include/group.php
+++ b/include/group.php
@@ -212,6 +212,7 @@ function group_side($every="contacts",$each="group",$edit = false, $group_id = 0
 		'$title'		=> t('Groups'),
 		'$edittext'     => t('Edit group'),
 		'$createtext' 	=> t('Create a new group'),
+		'$ungrouped'    => (($every === 'contacts') ? t('Contacts not in any group') : ''),
 		'$groups'		=> $groups,
 		'$add'			=> t('add'),
 	));
diff --git a/include/html2bbcode.php b/include/html2bbcode.php
index 69ccf41b7..69ccf41b7 100755..100644
--- a/include/html2bbcode.php
+++ b/include/html2bbcode.php
diff --git a/include/html2plain.php b/include/html2plain.php
index fe0e3326e..21261327d 100644
--- a/include/html2plain.php
+++ b/include/html2plain.php
@@ -83,12 +83,15 @@ function collecturls($message) {
 	$urls = array();
 	foreach ($result as $treffer) {
 		// A list of some links that should be ignored
-		$list = array("/user/", "/tag/", "/profile/", "/search?search=", "mailto:", "/u/", "/node/",
+		$list = array("/user/", "/tag/", "/group/", "/profile/", "/search?search=", "mailto:", "/u/", "/node/",
 				"//facebook.com/profile.php?id=", "//plus.google.com/");
 		foreach ($list as $listitem)
 			if (strpos($treffer[1], $listitem) !== false)
 				$ignore = true;
 
+		if ((strpos($treffer[1], "//plus.google.com/") !== false) and (strpos($treffer[1], "/posts") !== false))
+				$ignore = false;
+
 		if (!$ignore)
 			$urls[$treffer[1]] = $treffer[1];
 	}
@@ -154,7 +157,7 @@ function html2plain($html, $wraplength = 75, $compact = false)
 	//node2bbcode($doc, 'ol', array(), "\n[list=1]", "[/list]\n");
 	node2bbcode($doc, 'li', array(), "\n* ", "\n");
 
-	node2bbcode($doc, 'hr', array(), str_repeat("-", 70), "");
+	node2bbcode($doc, 'hr', array(), "\n".str_repeat("-", 70)."\n", "");
 
 	node2bbcode($doc, 'tr', array(), "\n", "");
 	node2bbcode($doc, 'td', array(), "\t", "");
diff --git a/include/items.php b/include/items.php
index ee6960534..07f62ece5 100755..100644
--- a/include/items.php
+++ b/include/items.php
@@ -19,9 +19,15 @@ function get_feed_for(&$a, $dfrn_id, $owner_nick, $last_update, $direction = 0)
 				$converse = true;
 			if($a->argv[$x] == 'starred')
 				$starred = true;
+			if($a->argv[$x] === 'category' && $a->argc > ($x + 1) && strlen($a->argv[$x+1]))
+				$category = $a->argv[$x+1];
 		}
+
+
 	}
 
+	
+
 	// default permissions - anonymous user
 
 	$sql_extra = " AND `allow_cid` = '' AND `allow_gid` = '' AND `deny_cid`  = '' AND `deny_gid`  = '' ";
@@ -101,6 +107,10 @@ function get_feed_for(&$a, $dfrn_id, $owner_nick, $last_update, $direction = 0)
 	if(! strlen($last_update))
 		$last_update = 'now -30 days';
 
+	if(isset($category)) {
+		$sql_extra .= file_tag_file_query('item',$category,'category');
+	}
+
 	if($public_feed) {
 		if(! $converse)
 			$sql_extra .= " AND `contact`.`self` = 1 ";
@@ -578,20 +588,21 @@ function get_atom_elements($feed,$item) {
 
 	if($rawobj) {
 		$res['object'] = '<object>' . "\n";
-		if($rawobj[0]['child'][NAMESPACE_ACTIVITY]['object-type'][0]['data']) {
-			$res['object-type'] = $rawobj[0]['child'][NAMESPACE_ACTIVITY]['object-type'][0]['data'];
-			$res['object'] .= '<type>' . $rawobj[0]['child'][NAMESPACE_ACTIVITY]['object-type'][0]['data'] . '</type>' . "\n";
+		$child = $rawobj[0]['child'];
+		if($child[NAMESPACE_ACTIVITY]['object-type'][0]['data']) {
+			$res['object-type'] = $child[NAMESPACE_ACTIVITY]['object-type'][0]['data'];
+			$res['object'] .= '<type>' . $child[NAMESPACE_ACTIVITY]['object-type'][0]['data'] . '</type>' . "\n";
 		}	
-		if($rawobj[0]['child'][SIMPLEPIE_NAMESPACE_ATOM_10]['id'][0]['data'])
-			$res['object'] .= '<id>' . $rawobj[0]['child'][SIMPLEPIE_NAMESPACE_ATOM_10]['id'][0]['data'] . '</id>' . "\n";
-		if($rawobj[0]['child'][SIMPLEPIE_NAMESPACE_ATOM_10]['link'])
-			$res['object'] .= '<link>' . encode_rel_links($rawobj[0]['child'][SIMPLEPIE_NAMESPACE_ATOM_10]['link']) . '</link>' . "\n";
-		if($rawobj[0]['child'][SIMPLEPIE_NAMESPACE_ATOM_10]['title'][0]['data'])
-			$res['object'] .= '<title>' . $rawobj[0]['child'][SIMPLEPIE_NAMESPACE_ATOM_10]['title'][0]['data'] . '</title>' . "\n";
-		if($rawobj[0]['child'][SIMPLEPIE_NAMESPACE_ATOM_10]['content'][0]['data']) {
-			$body = $rawobj[0]['child'][SIMPLEPIE_NAMESPACE_ATOM_10]['content'][0]['data'];
+		if(x($child[SIMPLEPIE_NAMESPACE_ATOM_10], 'id') && $child[SIMPLEPIE_NAMESPACE_ATOM_10]['id'][0]['data'])
+			$res['object'] .= '<id>' . $child[SIMPLEPIE_NAMESPACE_ATOM_10]['id'][0]['data'] . '</id>' . "\n";
+		if(x($child[SIMPLEPIE_NAMESPACE_ATOM_10], 'link') && $child[SIMPLEPIE_NAMESPACE_ATOM_10]['link'])
+			$res['object'] .= '<link>' . encode_rel_links($child[SIMPLEPIE_NAMESPACE_ATOM_10]['link']) . '</link>' . "\n";
+		if(x($child[SIMPLEPIE_NAMESPACE_ATOM_10], 'title') && $child[SIMPLEPIE_NAMESPACE_ATOM_10]['title'][0]['data'])
+			$res['object'] .= '<title>' . $child[SIMPLEPIE_NAMESPACE_ATOM_10]['title'][0]['data'] . '</title>' . "\n";
+		if(x($child[SIMPLEPIE_NAMESPACE_ATOM_10], 'content') && $child[SIMPLEPIE_NAMESPACE_ATOM_10]['content'][0]['data']) {
+			$body = $child[SIMPLEPIE_NAMESPACE_ATOM_10]['content'][0]['data'];
 			if(! $body)
-				$body = $rawobj[0]['child'][SIMPLEPIE_NAMESPACE_ATOM_10]['summary'][0]['data'];
+				$body = $child[SIMPLEPIE_NAMESPACE_ATOM_10]['summary'][0]['data'];
 			// preserve a copy of the original body content in case we later need to parse out any microformat information, e.g. events
 			$res['object'] .= '<orig>' . xmlify($body) . '</orig>' . "\n";
 			if((strpos($body,'<') !== false) || (strpos($body,'>') !== false)) {
@@ -616,20 +627,20 @@ function get_atom_elements($feed,$item) {
 
 	if($rawobj) {
 		$res['target'] = '<target>' . "\n";
-		if($rawobj[0]['child'][NAMESPACE_ACTIVITY]['object-type'][0]['data']) {
-			$res['target'] .= '<type>' . $rawobj[0]['child'][NAMESPACE_ACTIVITY]['object-type'][0]['data'] . '</type>' . "\n";
+		$child = $rawobj[0]['child'];
+		if($child[NAMESPACE_ACTIVITY]['object-type'][0]['data']) {
+			$res['target'] .= '<type>' . $child[NAMESPACE_ACTIVITY]['object-type'][0]['data'] . '</type>' . "\n";
 		}	
-		if($rawobj[0]['child'][SIMPLEPIE_NAMESPACE_ATOM_10]['id'][0]['data'])
-			$res['target'] .= '<id>' . $rawobj[0]['child'][SIMPLEPIE_NAMESPACE_ATOM_10]['id'][0]['data'] . '</id>' . "\n";
-
-		if($rawobj[0]['child'][SIMPLEPIE_NAMESPACE_ATOM_10]['link'])
-			$res['target'] .= '<link>' . encode_rel_links($rawobj[0]['child'][SIMPLEPIE_NAMESPACE_ATOM_10]['link']) . '</link>' . "\n";
-		if($rawobj[0]['child'][SIMPLEPIE_NAMESPACE_ATOM_10]['title'][0]['data'])
-			$res['target'] .= '<title>' . $rawobj[0]['child'][SIMPLEPIE_NAMESPACE_ATOM_10]['title'][0]['data'] . '</title>' . "\n";
-		if($rawobj[0]['child'][SIMPLEPIE_NAMESPACE_ATOM_10]['content'][0]['data']) {
-			$body = $rawobj[0]['child'][SIMPLEPIE_NAMESPACE_ATOM_10]['content'][0]['data'];
+		if(x($child[SIMPLEPIE_NAMESPACE_ATOM_10], 'id') && $child[SIMPLEPIE_NAMESPACE_ATOM_10]['id'][0]['data'])
+			$res['target'] .= '<id>' . $child[SIMPLEPIE_NAMESPACE_ATOM_10]['id'][0]['data'] . '</id>' . "\n";
+		if(x($child[SIMPLEPIE_NAMESPACE_ATOM_10], 'link') && $child[SIMPLEPIE_NAMESPACE_ATOM_10]['link'])
+			$res['target'] .= '<link>' . encode_rel_links($child[SIMPLEPIE_NAMESPACE_ATOM_10]['link']) . '</link>' . "\n";
+		if(x($child[SIMPLEPIE_NAMESPACE_ATOM_10], 'data') && $child[SIMPLEPIE_NAMESPACE_ATOM_10]['title'][0]['data'])
+			$res['target'] .= '<title>' . $child[SIMPLEPIE_NAMESPACE_ATOM_10]['title'][0]['data'] . '</title>' . "\n";
+		if(x($child[SIMPLEPIE_NAMESPACE_ATOM_10], 'data') && $child[SIMPLEPIE_NAMESPACE_ATOM_10]['content'][0]['data']) {
+			$body = $child[SIMPLEPIE_NAMESPACE_ATOM_10]['content'][0]['data'];
 			if(! $body)
-				$body = $rawobj[0]['child'][SIMPLEPIE_NAMESPACE_ATOM_10]['summary'][0]['data'];
+				$body = $child[SIMPLEPIE_NAMESPACE_ATOM_10]['summary'][0]['data'];
 			// preserve a copy of the original body content in case we later need to parse out any microformat information, e.g. events
 			$res['target'] .= '<orig>' . xmlify($body) . '</orig>' . "\n";
 			if((strpos($body,'<') !== false) || (strpos($body,'>') !== false)) {
@@ -1465,7 +1476,7 @@ function consume_feed($xml,$importer,&$contact, &$hub, $datedir = 0, $pass = 0)
 					if(! $item['deleted'])
 						logger('consume_feed: deleting item ' . $item['id'] . ' uri=' . $item['uri'], LOGGER_DEBUG);
 
-					if(($item['verb'] === ACTIVITY_TAG) && ($item['object-type'] === ACTVITY_OBJ_TAGTERM)) {
+					if(($item['verb'] === ACTIVITY_TAG) && ($item['object-type'] === ACTIVITY_OBJ_TAGTERM)) {
 						$xo = parse_xml_string($item['object'],false);
 						$xt = parse_xml_string($item['target'],false);
 						if($xt->type === ACTIVITY_OBJ_NOTE) {
@@ -1856,6 +1867,8 @@ function local_delivery($importer,$data) {
 	$feed->enable_order_by_date(false);
 	$feed->init();
 
+/*
+	// Currently unsupported - needs a lot of work
 	$reloc = $feed->get_feed_tags( NAMESPACE_DFRN, 'relocate' );
 	if(isset($reloc[0]['child'][NAMESPACE_DFRN])) {
 		$base = $reloc[0]['child'][NAMESPACE_DFRN];
@@ -1880,6 +1893,7 @@ function local_delivery($importer,$data) {
 		// schedule a scan?
 
 	}
+*/
 
 	// handle friend suggestion notification
 
@@ -2078,7 +2092,7 @@ function local_delivery($importer,$data) {
 
 					logger('local_delivery: deleting item ' . $item['id'] . ' uri=' . $item['uri'], LOGGER_DEBUG);
 
-					if(($item['verb'] === ACTIVITY_TAG) && ($item['object-type'] === ACTVITY_OBJ_TAGTERM)) {
+					if(($item['verb'] === ACTIVITY_TAG) && ($item['object-type'] === ACTIVITY_OBJ_TAGTERM)) {
 						$xo = parse_xml_string($item['object'],false);
 						$xt = parse_xml_string($item['target'],false);
 
@@ -2216,6 +2230,34 @@ function local_delivery($importer,$data) {
 				$datarray = get_atom_elements($feed,$item);
 
 
+				$r = q("SELECT `id`, `uid`, `last-child`, `edited`, `body` FROM `item` WHERE `uri` = '%s' AND `uid` = %d LIMIT 1",
+					dbesc($item_id),
+					intval($importer['importer_uid'])
+				);
+
+				// Update content if 'updated' changes
+
+				if(count($r)) {
+					$iid = $r[0]['id'];
+					if((x($datarray,'edited') !== false) && (datetime_convert('UTC','UTC',$datarray['edited']) !== $r[0]['edited'])) {  
+						logger('received updated comment' , LOGGER_DEBUG);
+						$r = q("UPDATE `item` SET `title` = '%s', `body` = '%s', `tag` = '%s', `edited` = '%s' WHERE `uri` = '%s' AND `uid` = %d LIMIT 1",
+							dbesc($datarray['title']),
+							dbesc($datarray['body']),
+							dbesc($datarray['tag']),
+							dbesc(datetime_convert('UTC','UTC',$datarray['edited'])),
+							dbesc($item_id),
+							intval($importer['importer_uid'])
+						);
+
+						proc_run('php',"include/notifier.php","comment-import",$iid);
+
+					}
+
+					continue;
+				}
+
+
 				// TODO: make this next part work against both delivery threads of a community post
 
 //				if((! link_compare($datarray['author-link'],$importer['url'])) && (! $community)) {
@@ -2435,9 +2477,9 @@ function local_delivery($importer,$data) {
 
 				// find out if our user is involved in this conversation and wants to be notified.
 			
-				if($datarray['type'] != 'activity') {
+				if(!x($datarray['type']) || $datarray['type'] != 'activity') {
 
-					$myconv = q("SELECT `author-link`, `author-avatar`, `parent` FROM `item` WHERE `parent-uri` = '%s' AND `uid` = %d AND `parent` != 0 ",
+					$myconv = q("SELECT `author-link`, `author-avatar`, `parent` FROM `item` WHERE `parent-uri` = '%s' AND `uid` = %d AND `parent` != 0 AND `deleted` = 0",
 						dbesc($parent_uri),
 						intval($importer['importer_uid'])
 					);
@@ -2971,12 +3013,23 @@ function item_expire($uid,$days) {
 		if($expire_items==0 && $item['type']!='note')
 			continue;
 
+
 		$r = q("UPDATE `item` SET `deleted` = 1, `edited` = '%s', `changed` = '%s' WHERE `id` = %d LIMIT 1",
 			dbesc(datetime_convert()),
 			dbesc(datetime_convert()),
 			intval($item['id'])
 		);
 
+		$r = q("DELETE FROM item_id where iid in (select id from item where parent = %d) and uid = %d",
+			intval($item['id']),
+			intval($uid)
+		);
+
+		$r = q("DELETE FROM sign where iid in (select id from item where parent = %d) and uid = %d",
+			intval($item['id']),
+			intval($uid)
+		);
+
 		// kill the kids
 
 		$r = q("UPDATE `item` SET `deleted` = 1, `edited` = '%s', `changed` = '%s' WHERE `parent-uri` = '%s' AND `uid` = %d ",
@@ -2996,7 +3049,7 @@ function item_expire($uid,$days) {
 function drop_items($items) {
 	$uid = 0;
 
-	if((! local_user()) && (! $remote_user()))
+	if(! local_user() && ! remote_user())
 		return;
 
 	if(count($items)) {
diff --git a/include/message.php b/include/message.php
index 377d7c715..377d7c715 100755..100644
--- a/include/message.php
+++ b/include/message.php
diff --git a/include/nav.php b/include/nav.php
index 2c9c643a9..2c9c643a9 100755..100644
--- a/include/nav.php
+++ b/include/nav.php
diff --git a/include/network.php b/include/network.php
index 9e1ed2091..4bec4a172 100755..100644
--- a/include/network.php
+++ b/include/network.php
@@ -172,7 +172,7 @@ function post_url($url,$params, $headers = null, &$redirects = 0, $timeout = 0)
         $url_parsed = @parse_url($newurl);
         if (isset($url_parsed)) {
             $redirects++;
-            return fetch_url($newurl,$binary,$redirects,$timeout);
+            return fetch_url($newurl,false,$redirects,$timeout);
         }
     }
 	$a->set_curl_code($http_code);
@@ -206,6 +206,7 @@ function xml_status($st, $message = '') {
 if(! function_exists('http_status_exit')) {
 function http_status_exit($val) {
 
+    $err = '';
 	if($val >= 400)
 		$err = 'Error';
 	if($val >= 200 && $val < 300)
@@ -452,7 +453,7 @@ function lrdd($uri, $debug = false) {
 			logger('lrdd: parse error: ' . $e);
 		}
 
-		if($dom) {
+		if(isset($dom) && $dom) {
 			$items = $dom->getElementsByTagName('link');
 			foreach($items as $item) {
 				$x = $item->getAttribute('rel');
@@ -587,13 +588,14 @@ function fetch_xrd_links($url) {
 
 if(! function_exists('validate_url')) {
 function validate_url(&$url) {
-	// no naked subdomains
-	if(strpos($url,'.') === false)
+	
+	// no naked subdomains (allow localhost for tests)
+	if(strpos($url,'.') === false && strpos($url,'/localhost/') === false)
 		return false;
 	if(substr($url,0,4) != 'http')
 		$url = 'http://' . $url;
 	$h = @parse_url($url);
-
+	
 	if(($h) && (dns_get_record($h['host'], DNS_A + DNS_CNAME + DNS_PTR))) {
 		return true;
 	}
@@ -692,18 +694,23 @@ function allowed_email($email) {
 }}
 
 
-if(! function_exists('gravatar_img')) {
-function gravatar_img($email) {
-	$size = 175;
-	$opt = 'identicon';   // psuedo-random geometric pattern if not found
-	$rating = 'pg';
-	$hash = md5(trim(strtolower($email)));
-	
-	$url = 'http://www.gravatar.com/avatar/' . $hash . '.jpg' 
-		. '?s=' . $size . '&d=' . $opt . '&r=' . $rating;
+if(! function_exists('avatar_img')) {
+function avatar_img($email) {
+
+	$a = get_app();
+
+	$avatar['size'] = 175;
+	$avatar['email'] = $email;
+	$avatar['url'] = '';
+	$avatar['success'] = false;
 
-	logger('gravatar: ' . $email . ' ' . $url);
-	return $url;
+	call_hooks('avatar_lookup', $avatar);
+
+	if(! $avatar['success'])
+		$avatar['url'] = $a->get_baseurl() . '/images/person-175.jpg';
+
+	logger('Avatar: ' . $avatar['email'] . ' ' . $avatar['url'], LOGGER_DEBUG);
+	return $avatar['url'];
 }}
 
 
@@ -824,3 +831,48 @@ function scale_external_images($s,$include_link = true) {
 	}
 	return $s;
 }
+
+
+function fix_contact_ssl_policy(&$contact,$new_policy) {
+
+	$ssl_changed = false;
+	if((intval($new_policy) == SSL_POLICY_SELFSIGN || $new_policy === 'self') && strstr($contact['url'],'https:')) {
+		$ssl_changed = true;
+		$contact['url']     = 	str_replace('https:','http:',$contact['url']);
+		$contact['request'] = 	str_replace('https:','http:',$contact['request']);
+		$contact['notify']  = 	str_replace('https:','http:',$contact['notify']);
+		$contact['poll']    = 	str_replace('https:','http:',$contact['poll']);
+		$contact['confirm'] = 	str_replace('https:','http:',$contact['confirm']);
+		$contact['poco']    = 	str_replace('https:','http:',$contact['poco']);
+	}
+
+	if((intval($new_policy) == SSL_POLICY_FULL || $new_policy === 'full') && strstr($contact['url'],'http:')) {
+		$ssl_changed = true;
+		$contact['url']     = 	str_replace('http:','https:',$contact['url']);
+		$contact['request'] = 	str_replace('http:','https:',$contact['request']);
+		$contact['notify']  = 	str_replace('http:','https:',$contact['notify']);
+		$contact['poll']    = 	str_replace('http:','https:',$contact['poll']);
+		$contact['confirm'] = 	str_replace('http:','https:',$contact['confirm']);
+		$contact['poco']    = 	str_replace('http:','https:',$contact['poco']);
+	}
+
+	if($ssl_changed) {
+		q("update contact set 
+			url = '%s', 
+			request = '%s',
+			notify = '%s',
+			poll = '%s',
+			confirm = '%s',
+			poco = '%s'
+			where id = %d limit 1",
+			dbesc($contact['url']),
+			dbesc($contact['request']),
+			dbesc($contact['notify']),
+			dbesc($contact['poll']),
+			dbesc($contact['confirm']),
+			dbesc($contact['poco']),
+			intval($contact['id'])
+		);
+	}
+}
+
diff --git a/include/notifier.php b/include/notifier.php
index d63ad7ae7..ca7c7b92e 100755..100644
--- a/include/notifier.php
+++ b/include/notifier.php
@@ -537,6 +537,17 @@ function notifier_run($argv, $argc){
 								$x[0]['writable'] = 1;
 							}
 
+							// if contact's ssl policy changed, which we just determined
+							// is on our own server, update our contact links
+							
+							$ssl_policy = get_config('system','ssl_policy');
+							fix_contact_ssl_policy($x[0],$ssl_policy);
+
+							// If we are setup as a soapbox we aren't accepting input from this person
+
+							if($x[0]['page-flags'] == PAGE_SOAPBOX)
+								break;
+
 							require_once('library/simplepie/simplepie.inc');
 							logger('mod-delivery: local delivery');
 							local_delivery($x[0],$atom);
diff --git a/include/oauth.php b/include/oauth.php
index 2724dcf7c..2724dcf7c 100755..100644
--- a/include/oauth.php
+++ b/include/oauth.php
diff --git a/include/oembed.php b/include/oembed.php
index 1f45d2814..1f45d2814 100755..100644
--- a/include/oembed.php
+++ b/include/oembed.php
diff --git a/include/pgettext.php b/include/pgettext.php
index 83e76ba9d..a079a4687 100755..100644
--- a/include/pgettext.php
+++ b/include/pgettext.php
@@ -49,6 +49,7 @@ function get_language() {
 	if(isset($preferred))
 		return $preferred;
 
+    $a = get_app();
 	return ((isset($a->config['system']['language'])) ? $a->config['system']['language'] : 'en');
 }}
 
diff --git a/include/pidfile.php b/include/pidfile.php
new file mode 100644
index 000000000..47df8d1f4
--- /dev/null
+++ b/include/pidfile.php
@@ -0,0 +1,32 @@
+<?php
+class pidfile {
+	private $_file;
+	private $_running;
+
+	public function __construct($dir, $name) {
+		$this->_file = "$dir/$name.pid";
+
+		if (file_exists($this->_file)) {
+			$pid = trim(file_get_contents($this->_file));
+			if (posix_kill($pid, 0)) {
+				$this->_running = true;
+			}
+		}
+
+		if (! $this->_running) {
+			$pid = getmypid();
+			file_put_contents($this->_file, $pid);
+		}
+	}
+
+	public function __destruct() {
+		if ((! $this->_running) && file_exists($this->_file)) {
+			unlink($this->_file);
+		}
+	}
+
+	public function is_already_running() {
+		return $this->_running;
+	}
+}
+?>
diff --git a/include/plugin.php b/include/plugin.php
index e37ae8435..8196e8756 100755..100644
--- a/include/plugin.php
+++ b/include/plugin.php
@@ -17,7 +17,12 @@ function uninstall_plugin($plugin){
 }}
 
 if (! function_exists('install_plugin')){
-function install_plugin($plugin){
+function install_plugin($plugin) {
+
+	// silently fail if plugin was removed
+
+	if(! file_exists('addon/' . $plugin . '/' . $plugin . '.php'))
+		return false;
 	logger("Addons: installing " . $plugin);
 	$t = @filemtime('addon/' . $plugin . '/' . $plugin . '.php');
 	@include_once('addon/' . $plugin . '/' . $plugin . '.php');
@@ -32,9 +37,11 @@ function install_plugin($plugin){
 			intval($t),
 			$plugin_admin
 		);
+		return true;
 	}
 	else {
 		logger("Addons: FAILED installing " . $plugin);
+		return false;
 	}
 
 }}
diff --git a/include/poller.php b/include/poller.php
index 90a97867c..499483d00 100755..100644
--- a/include/poller.php
+++ b/include/poller.php
@@ -25,10 +25,20 @@ function poller_run($argv, $argc){
 	require_once('include/Contact.php');
 	require_once('include/email.php');
 	require_once('include/socgraph.php');
+	require_once('include/pidfile.php');
 
 	load_config('config');
 	load_config('system');
 
+	$lockpath = get_config('system','lockpath');
+	if ($lockpath != '') {
+		$pidfile = new pidfile($lockpath, 'poller.lck');
+		if($pidfile->is_already_running()) {
+			logger("poller: Already running");
+			exit;
+		}
+	}
+
 	$a->set_baseurl(get_config('system','url'));
 
 	load_hooks();
diff --git a/include/profile_advanced.php b/include/profile_advanced.php
index 004a58524..bb9850cd0 100755..100644
--- a/include/profile_advanced.php
+++ b/include/profile_advanced.php
@@ -2,7 +2,7 @@
 
 function advanced_profile(&$a) {
 
-	$o .= '';
+	$o = '';
 
 	$o .= '<h2>' . t('Profile') . '</h2>';
 
@@ -69,13 +69,12 @@ function advanced_profile(&$a) {
 		if($txt = prepare_text($a->profile['work'])) $profile['work'] = array( t('Work/employment:'), $txt);
 
 		if($txt = prepare_text($a->profile['education'])) $profile['education'] = array( t('School/education:'), $txt );
-	}
-
-		
-	return replace_macros($tpl, array(
-		'$title' => t('Profile'),
-		'$profile' => $profile,
-	));
 
+        return replace_macros($tpl, array(
+            '$title' => t('Profile'),
+            '$profile' => $profile,
+        ));
+    }
 
+	return '';
 }
diff --git a/include/profile_selectors.php b/include/profile_selectors.php
index 92579f64a..a2cef959d 100755..100644
--- a/include/profile_selectors.php
+++ b/include/profile_selectors.php
@@ -30,7 +30,7 @@ function sexpref_selector($current="",$suffix="") {
 
 function marital_selector($current="",$suffix="") {
 	$o = '';
-	$select = array('', t('Single'), t('Lonely'), t('Available'), t('Unavailable'), t('Dating'), t('Unfaithful'), t('Sex Addict'), t('Friends'), t('Friends/Benefits'), t('Casual'), t('Engaged'), t('Married'), t('Partners'), t('Cohabiting'), t('Happy'), t('Not Looking'), t('Swinger'), t('Betrayed'), t('Separated'), t('Unstable'), t('Divorced'), t('Widowed'), t('Uncertain'), t('Complicated'), t('Don\'t care'), t('Ask me') );
+	$select = array('', t('Single'), t('Lonely'), t('Available'), t('Unavailable'), t('Has crush'), t('Infatuated'), t('Dating'), t('Unfaithful'), t('Sex Addict'), t('Friends'), t('Friends/Benefits'), t('Casual'), t('Engaged'), t('Married'), t('Imaginarily married'), t('Partners'), t('Cohabiting'), t('Common law'), t('Happy'), t('Not looking'), t('Swinger'), t('Betrayed'), t('Separated'), t('Unstable'), t('Divorced'), t('Imaginarily divorced'), t('Widowed'), t('Uncertain'), t('It\'s complicated'), t('Don\'t care'), t('Ask me') );
 
 	$o .= "<select name=\"marital\" id=\"marital-select\" size=\"1\" >";
 	foreach($select as $selection) {
diff --git a/include/profile_update.php b/include/profile_update.php
index 61eaee75d..61eaee75d 100755..100644
--- a/include/profile_update.php
+++ b/include/profile_update.php
diff --git a/include/queue.php b/include/queue.php
index 7e92705be..7e92705be 100755..100644
--- a/include/queue.php
+++ b/include/queue.php
diff --git a/include/queue_fn.php b/include/queue_fn.php
index 3c1087f4e..3c1087f4e 100755..100644
--- a/include/queue_fn.php
+++ b/include/queue_fn.php
diff --git a/include/remoteupdate.php b/include/remoteupdate.php
index 9effc9b6e..9effc9b6e 100755..100644
--- a/include/remoteupdate.php
+++ b/include/remoteupdate.php
diff --git a/include/salmon.php b/include/salmon.php
index 3d525f51a..3d525f51a 100755..100644
--- a/include/salmon.php
+++ b/include/salmon.php
diff --git a/include/security.php b/include/security.php
index 66622fd33..a92400b5c 100755
--- a/include/security.php
+++ b/include/security.php
@@ -326,7 +326,7 @@ function check_form_security_token($typename = '', $formname = 'form_security_to
 }
 
 function check_form_security_std_err_msg() {
-	return t('The form security token was not correct. This probably happened because the form has been opened for too long (>3 hours) before subitting it.') . EOL;
+	return t('The form security token was not correct. This probably happened because the form has been opened for too long (>3 hours) before submitting it.') . EOL;
 }
 function check_form_security_token_redirectOnErr($err_redirect, $typename = '', $formname = 'form_security_token') {
 	if (!check_form_security_token($typename, $formname)) {
@@ -339,9 +339,10 @@ function check_form_security_token_redirectOnErr($err_redirect, $typename = '',
 }
 function check_form_security_token_ForbiddenOnErr($typename = '', $formname = 'form_security_token') {
 	if (!check_form_security_token($typename, $formname)) {
+	    $a = get_app();
 		logger('check_form_security_token failed: user ' . $a->user['guid'] . ' - form element ' . $typename);
 		logger('check_form_security_token failed: _REQUEST data: ' . print_r($_REQUEST, true), LOGGER_DATA);
 		header('HTTP/1.1 403 Forbidden');
 		killme();
 	}
-}
\ No newline at end of file
+}
diff --git a/include/session.php b/include/session.php
index 6c32e299f..6c32e299f 100755..100644
--- a/include/session.php
+++ b/include/session.php
diff --git a/include/socgraph.php b/include/socgraph.php
index 3f5194049..3f5194049 100755..100644
--- a/include/socgraph.php
+++ b/include/socgraph.php
diff --git a/include/system_unavailable.php b/include/system_unavailable.php
index bd7196cdf..bd7196cdf 100755..100644
--- a/include/system_unavailable.php
+++ b/include/system_unavailable.php
diff --git a/include/template_processor.php b/include/template_processor.php
index 4c317efe1..46252c355 100755..100644
--- a/include/template_processor.php
+++ b/include/template_processor.php
@@ -13,12 +13,14 @@
 		var $debug=false;
 		
 		private function _preg_error(){
+			
 			switch(preg_last_error()){
 			    case PREG_INTERNAL_ERROR: echo('PREG_INTERNAL_ERROR'); break;
 			    case PREG_BACKTRACK_LIMIT_ERROR: echo('PREG_BACKTRACK_LIMIT_ERROR'); break;
 			    case PREG_RECURSION_LIMIT_ERROR: echo('PREG_RECURSION_LIMIT_ERROR'); break;
 			    case PREG_BAD_UTF8_ERROR: echo('PREG_BAD_UTF8_ERROR'); break;
-			    case PREG_BAD_UTF8_OFFSET_ERROR: echo('PREG_BAD_UTF8_OFFSET_ERROR'); break;
+// This is only valid for php > 5.3, not certain how to code around it for unit tests
+//			    case PREG_BAD_UTF8_OFFSET_ERROR: echo('PREG_BAD_UTF8_OFFSET_ERROR'); break;
 			    default:
 					//die("Unknown preg error.");
 					return;
diff --git a/include/text.php b/include/text.php
index 191f4fca8..8c8db66a9 100644
--- a/include/text.php
+++ b/include/text.php
@@ -80,6 +80,9 @@ function escape_tags($string) {
 if(! function_exists('autoname')) {
 function autoname($len) {
 
+	if($len <= 0)
+		return '';
+
 	$vowels = array('a','a','ai','au','e','e','e','ee','ea','i','ie','o','ou','u'); 
 	if(mt_rand(0,5) == 4)
 		$vowels[] = 'y';
@@ -225,6 +228,9 @@ if(! function_exists('paginate')) {
 function paginate(&$a) {
 	$o = '';
 	$stripped = preg_replace('/(&page=[0-9]*)/','',$a->query_string);
+
+//	$stripped = preg_replace('/&zrl=(.*?)([\?&]|$)/ism','',$stripped);
+
 	$stripped = str_replace('q=','',$stripped);
 	$stripped = trim($stripped,'/');
 	$pagenum = $a->pager['page'];
@@ -725,6 +731,8 @@ function smilies($s, $sample = false) {
 		'\\o/', 
 		'o.O', 
 		'O.o', 
+		'o_O', 
+		'O_o', 
 		":'(", 
 		":-!", 
 		":-/", 
@@ -759,6 +767,8 @@ function smilies($s, $sample = false) {
 		'<img src="' . $a->get_baseurl() . '/images/smiley-thumbsup.gif" alt="\\o/" />',
 		'<img src="' . $a->get_baseurl() . '/images/smiley-Oo.gif" alt="o.O" />',
 		'<img src="' . $a->get_baseurl() . '/images/smiley-Oo.gif" alt="O.o" />',
+		'<img src="' . $a->get_baseurl() . '/images/smiley-Oo.gif" alt="o_O" />',
+		'<img src="' . $a->get_baseurl() . '/images/smiley-Oo.gif" alt="O_o" />',
 		'<img src="' . $a->get_baseurl() . '/images/smiley-cry.gif" alt=":\'(" />',
 		'<img src="' . $a->get_baseurl() . '/images/smiley-foot-in-mouth.gif" alt=":-!" />',
 		'<img src="' . $a->get_baseurl() . '/images/smiley-undecided.gif" alt=":-/" />',
@@ -1058,10 +1068,12 @@ function unamp($s) {
 if(! function_exists('lang_selector')) {
 function lang_selector() {
 	global $lang;
-	$o = '<div id="lang-select-icon" class="icon language" title="' . t('Select an alternate language') . '" onclick="openClose(\'language-selector\');" ></div>';
-	$o .= '<div id="language-selector" style="display: none;" >';
-	$o .= '<form action="#" method="post" ><select name="system_language" onchange="this.form.submit();" >';
+	
 	$langs = glob('view/*/strings.php');
+	
+	$lang_options = array();
+	$selected = "";
+	
 	if(is_array($langs) && count($langs)) {
 		$langs[] = '';
 		if(! in_array('view/en/strings.php',$langs))
@@ -1069,17 +1081,22 @@ function lang_selector() {
 		asort($langs);
 		foreach($langs as $l) {
 			if($l == '') {
-				$default_selected = ((! x($_SESSION,'language')) ? ' selected="selected" ' : '');
-				$o .= '<option value="" ' . $default_selected . '>' . t('default') . '</option>';
+				$lang_options[""] = t('default');
 				continue;
 			}
 			$ll = substr($l,5);
 			$ll = substr($ll,0,strrpos($ll,'/'));
-			$selected = (($ll === $lang && (x($_SESSION, 'language'))) ? ' selected="selected" ' : '');
-			$o .= '<option value="' . $ll . '"' . $selected . '>' . $ll . '</option>';
+			$selected = (($ll === $lang && (x($_SESSION, 'language'))) ? $ll : $selected);
+			$lang_options[$ll]=$ll;
 		}
 	}
-	$o .= '</select></form></div>';
+
+	$tpl = get_markup_template("lang_selector.tpl");	
+	$o = replace_macros($tpl, array(
+		'$title' => t('Select an alternate language'),
+		'$langs' => array($lang_options, $selected),
+		
+	));
 	return $o;
 }}
 
@@ -1314,6 +1331,118 @@ function file_tag_file_query($table,$s,$type = 'file') {
 	return " AND " . (($table) ? dbesc($table) . '.' : '') . "file regexp '" . dbesc($str) . "' ";
 }
 
+// ex. given music,video return <music><video> or [music][video]
+function file_tag_list_to_file($list,$type = 'file') {
+        $tag_list = '';
+        if(strlen($list)) {
+                $list_array = explode(",",$list);
+                if($type == 'file') {
+	                $lbracket = '[';
+	                $rbracket = ']';
+	        }
+                else {
+	                $lbracket = '<';
+        	        $rbracket = '>';
+	        }
+
+                foreach($list_array as $item) {
+		  if(strlen($item)) {
+		                $tag_list .= $lbracket . file_tag_encode(trim($item))  . $rbracket;
+			}
+                }
+	}
+        return $tag_list;
+}
+
+// ex. given <music><video>[friends], return music,video or friends
+function file_tag_file_to_list($file,$type = 'file') {
+        $matches = false;
+        $list = '';
+        if($type == 'file') {
+                $cnt = preg_match_all('/\[(.*?)\]/',$file,$matches,PREG_SET_ORDER);
+	}
+        else {
+                $cnt = preg_match_all('/<(.*?)>/',$file,$matches,PREG_SET_ORDER);
+	}
+	if($cnt) {
+		foreach($matches as $mtch) {
+			if(strlen($list))
+				$list .= ',';
+			$list .= file_tag_decode($mtch[1]);
+		}
+	}
+
+        return $list;
+}
+
+function file_tag_update_pconfig($uid,$file_old,$file_new,$type = 'file') {
+        // $file_old - categories previously associated with an item
+        // $file_new - new list of categories for an item
+
+	if(! intval($uid))
+		return false;
+
+        if($file_old == $file_new)
+	        return true;
+
+	$saved = get_pconfig($uid,'system','filetags');
+        if(strlen($saved)) {
+                if($type == 'file') {
+	                $lbracket = '[';
+	                $rbracket = ']';
+	        }
+                else {
+	                $lbracket = '<';
+        	        $rbracket = '>';
+	        }
+
+                $filetags_updated = $saved;
+
+		// check for new tags to be added as filetags in pconfig
+                $new_tags = array();
+                $check_new_tags = explode(",",file_tag_file_to_list($file_new,$type));
+
+	        foreach($check_new_tags as $tag) {
+		        if(! stristr($saved,$lbracket . file_tag_encode($tag) . $rbracket))
+			        $new_tags[] = $tag;
+	        }
+
+		$filetags_updated .= file_tag_list_to_file(implode(",",$new_tags),$type);
+
+		// check for deleted tags to be removed from filetags in pconfig
+                $deleted_tags = array();
+                $check_deleted_tags = explode(",",file_tag_file_to_list($file_old,$type));
+
+	        foreach($check_deleted_tags as $tag) {
+		        if(! stristr($file_new,$lbracket . file_tag_encode($tag) . $rbracket))
+		                $deleted_tags[] = $tag;
+	        }
+
+                foreach($deleted_tags as $key => $tag) {
+		        $r = q("select file from item where uid = %d " . file_tag_file_query('item',$tag,$type),
+		                intval($uid)
+	                );
+
+	                if(count($r)) {
+			        unset($deleted_tags[$key]);
+	                }
+			else {
+			        $filetags_updated = str_replace($lbracket . file_tag_encode($tag) . $rbracket,'',$filetags_updated);
+			}
+		}
+
+                if($saved != $filetags_updated) {
+		        set_pconfig($uid,'system','filetags', $filetags_updated);
+                }
+		return true;
+	}
+        else
+                if(strlen($file_new)) {
+		        set_pconfig($uid,'system','filetags', $file_new);
+                }
+		return true;
+}
+
 function file_tag_save_file($uid,$item,$file) {
 	$result = false;
 	if(! intval($uid))
@@ -1384,3 +1513,8 @@ function undo_post_tagging($s) {
 	return $s;
 }
 
+function fix_mce_lf($s) {
+	$s = str_replace("\r\n","\n",$s);
+	$s = str_replace("\n\n","\n",$s);
+	return $s;
+}
diff --git a/index.php b/index.php
index 2faac1f28..442173eeb 100755..100644
--- a/index.php
+++ b/index.php
@@ -38,11 +38,10 @@ load_translation_table($lang);
  */
 
 require_once("dba.php");
-$db = new dba($db_host, $db_user, $db_pass, $db_data, $install);
-        unset($db_host, $db_user, $db_pass, $db_data);
-
 
 if(! $install) {
+	$db = new dba($db_host, $db_user, $db_pass, $db_data, $install);
+    	    unset($db_host, $db_user, $db_pass, $db_data);
 
 	/**
 	 * Load configs from db. Overwrite configs from .htconfig.php
@@ -95,6 +94,11 @@ if((x($_SESSION,'language')) && ($_SESSION['language'] !== $lang)) {
 
 if(x($_GET,'zrl')) {
 	$_SESSION['my_url'] = $_GET['zrl'];
+	$a->query_string = preg_replace('/[\?&]zrl=(.*?)([\?&]|$)/is','',$a->query_string);
+	if(! $install) {
+		$arr = array('zrl' => $_SESSION['my_url'], 'url' => $a->cmd);
+		call_hooks('zrl_init',$arr);
+	}
 }
 
 /**
@@ -243,6 +247,8 @@ if (file_exists($theme_info_file)){
 if(! x($a->page,'content'))
 	$a->page['content'] = '';
 
+if(! $install)
+	call_hooks('page_content_top',$a->page['content']);
 
 /**
  * Call module functions
@@ -255,6 +261,18 @@ if($a->module_loaded) {
 		$func($a);
 	}
 
+	if(function_exists(str_replace('-','_',current_theme()) . '_init')) {
+		$func = str_replace('-','_',current_theme()) . '_init';
+		$func($a);
+	}
+//	elseif (x($a->theme_info,"extends") && file_exists("view/theme/".$a->theme_info["extends"]."/theme.php")) {
+//		require_once("view/theme/".$a->theme_info["extends"]."/theme.php");
+//		if(function_exists(str_replace('-','_',$a->theme_info["extends"]) . '_init')) {
+//			$func = str_replace('-','_',$a->theme_info["extends"]) . '_init';
+//			$func($a);
+//		}
+//	}
+
 	if(($_SERVER['REQUEST_METHOD'] === 'POST') && (! $a->error)
 		&& (function_exists($a->module . '_post'))
 		&& (! x($_POST,'auth-params'))) {
@@ -345,13 +363,13 @@ $profile = $a->profile;
 
 header("Content-type: text/html; charset=utf-8");
 
-$template = 'view/' . current_theme() . '/' 
+$template = 'view/theme/' . current_theme() . '/' 
 	. ((x($a->page,'template')) ? $a->page['template'] : 'default' ) . '.php';
 
 if(file_exists($template))
 	require_once($template);
 else
-	require_once(str_replace(current_theme() . '/', '', $template));
+	require_once(str_replace('theme/' . current_theme() . '/', '', $template));
 
 session_write_close();
 exit;
diff --git a/js/acl.js b/js/acl.js
index e383224ca..e383224ca 100755..100644
--- a/js/acl.js
+++ b/js/acl.js
diff --git a/js/ajaxupload.js b/js/ajaxupload.js
index 67c4a56fb..67c4a56fb 100755..100644
--- a/js/ajaxupload.js
+++ b/js/ajaxupload.js
diff --git a/js/country.js b/js/country.js
index 1c7505580..1c7505580 100755..100644
--- a/js/country.js
+++ b/js/country.js
diff --git a/js/fk.autocomplete.js b/js/fk.autocomplete.js
index b1db92c41..b1db92c41 100755..100644
--- a/js/fk.autocomplete.js
+++ b/js/fk.autocomplete.js
diff --git a/js/jquery.htmlstream.js b/js/jquery.htmlstream.js
index c62c538f7..c62c538f7 100755..100644
--- a/js/jquery.htmlstream.js
+++ b/js/jquery.htmlstream.js
diff --git a/js/jquery.js b/js/jquery.js
index 198b3ff07..198b3ff07 100755..100644
--- a/js/jquery.js
+++ b/js/jquery.js
diff --git a/js/jquery.textinputs.js b/js/jquery.textinputs.js
index fd6d14569..fd6d14569 100755..100644
--- a/js/jquery.textinputs.js
+++ b/js/jquery.textinputs.js
diff --git a/js/main.js b/js/main.js
index 744691b6d..ac238bf6a 100755..100644
--- a/js/main.js
+++ b/js/main.js
@@ -17,6 +17,7 @@
   }
 
 
+
 	var src = null;
 	var prev = null;
 	var livetime = null;
@@ -119,9 +120,7 @@
 			var home = $(data).find('home').text();
 			if(home == 0) { home = '';  $('#home-update').removeClass('show') } else { $('#home-update').addClass('show') }
 			$('#home-update').html(home);
-
- 
-
+			
 			var intro = $(data).find('intro').text();
 			if(intro == 0) { intro = '';  $('#intro-update').removeClass('show') } else { $('#intro-update').addClass('show') }
 			$('#intro-update').html(intro);
@@ -129,15 +128,22 @@
 			var mail = $(data).find('mail').text();
 			if(mail == 0) { mail = '';  $('#mail-update').removeClass('show') } else { $('#mail-update').addClass('show') }
 			$('#mail-update').html(mail);
+			
+			var intro = $(data).find('intro').text();
+			if(intro == 0) { intro = '';  $('#intro-update-li').removeClass('show') } else { $('#intro-update-li').addClass('show') }
+			$('#intro-update-li').html(intro);
+
+			var mail = $(data).find('mail').text();
+			if(mail == 0) { mail = '';  $('#mail-update-li').removeClass('show') } else { $('#mail-update-li').addClass('show') }
+			$('#mail-update-li').html(mail);
 
 			var eNotif = $(data).find('notif')
-			notif = eNotif.attr('count');
-			if (notif>=0){
-				$("#nav-notifications-linkmenu").addClass("on");
+			
+			if (eNotif.children("note").length==0){
+				$("#nav-notifications-menu").html(notifications_empty);
+			} else {
 				nnm = $("#nav-notifications-menu");
-				
 				nnm.html(notifications_all + notifications_mark);
-				
 				//nnm.attr('popup','true');
 				eNotif.children("note").each(function(){
 					e = $(this);
@@ -145,10 +151,12 @@
 					html = notifications_tpl.format(e.attr('href'),e.attr('photo'), text, e.attr('date'), e.attr('seen'));
 					nnm.append(html);
 				});
-				
+			}
+			notif = eNotif.attr('count');
+			if (notif>0){
+				$("#nav-notifications-linkmenu").addClass("on");
 			} else {
-				//				$("#nav-notifications-linkmenu").removeClass("on");
-				//              $("#nav-notifications-menu").html(notifications_empty);
+				$("#nav-notifications-linkmenu").removeClass("on");
 			}
 			if(notif == 0) { notif = ''; $('#notify-update').removeClass('show') } else { $('#notify-update').addClass('show') }
 			$('#notify-update').html(notif);
@@ -551,12 +559,36 @@ function notifyMarkAll() {
 }
 
 
+// code from http://www.tinymce.com/wiki.php/How-to_implement_a_custom_file_browser
+function fcFileBrowser (field_name, url, type, win) {
+    /* TODO: If you work with sessions in PHP and your client doesn't accept cookies you might need to carry
+       the session name and session ID in the request string (can look like this: "?PHPSESSID=88p0n70s9dsknra96qhuk6etm5").
+       These lines of code extract the necessary parameters and add them back to the filebrowser URL again. */
+
+
+    var cmsURL = baseurl+"/fbrowser/"+type+"/";
+
+    tinyMCE.activeEditor.windowManager.open({
+        file : cmsURL,
+        title : 'File Browser',
+        width : 420,  // Your dimensions may differ - toy around with them!
+        height : 400,
+        resizable : "yes",
+        inline : "yes",  // This parameter only has an effect if you use the inlinepopups plugin!
+        close_previous : "no"
+    }, {
+        window : win,
+        input : field_name
+    });
+    return false;
+  }
+
 function setupFieldRichtext(){
 	tinyMCE.init({
 		theme : "advanced",
 		mode : "specific_textareas",
 		editor_selector: "fieldRichtext",
-		plugins : "bbcode,paste",
+		plugins : "bbcode,paste, inlinepopups",
 		theme_advanced_buttons1 : "bold,italic,underline,undo,redo,link,unlink,image,forecolor,formatselect,code",
 		theme_advanced_buttons2 : "",
 		theme_advanced_buttons3 : "",
@@ -573,6 +605,7 @@ function setupFieldRichtext(){
 		convert_urls: false,
 		content_css: baseurl+"/view/custom_tinymce.css",
 		theme_advanced_path : false,
+		file_browser_callback : "fcFileBrowser",
 	});
 }
 
@@ -603,4 +636,4 @@ function previewTheme(elm) {
 			$('#theme-preview').html('<div id="theme-desc">' + data.desc + '</div><a href="' + data.img + '"><img src="' + data.img + '" width="320" height="240" alt="' + theme + '" /></a>');
 	});
 
-}
\ No newline at end of file
+}
diff --git a/js/webtoolkit.base64.js b/js/webtoolkit.base64.js
index 5fa3c1ed7..5fa3c1ed7 100755..100644
--- a/js/webtoolkit.base64.js
+++ b/js/webtoolkit.base64.js
diff --git a/library/ASNValue.class.php b/library/ASNValue.class.php
index 7a3c5d20e..7a3c5d20e 100755..100644
--- a/library/ASNValue.class.php
+++ b/library/ASNValue.class.php
diff --git a/library/HTML5/Data.php b/library/HTML5/Data.php
index fa97e3ee8..fa97e3ee8 100755..100644
--- a/library/HTML5/Data.php
+++ b/library/HTML5/Data.php
diff --git a/library/HTML5/InputStream.php b/library/HTML5/InputStream.php
index f98b42723..f98b42723 100755..100644
--- a/library/HTML5/InputStream.php
+++ b/library/HTML5/InputStream.php
diff --git a/library/HTML5/Parser.php b/library/HTML5/Parser.php
index 5f9ca560e..5f9ca560e 100755..100644
--- a/library/HTML5/Parser.php
+++ b/library/HTML5/Parser.php
diff --git a/library/HTML5/Tokenizer.php b/library/HTML5/Tokenizer.php
index 06c73065f..06c73065f 100755..100644
--- a/library/HTML5/Tokenizer.php
+++ b/library/HTML5/Tokenizer.php
diff --git a/library/HTML5/TreeBuilder.php b/library/HTML5/TreeBuilder.php
index 578e73682..578e73682 100755..100644
--- a/library/HTML5/TreeBuilder.php
+++ b/library/HTML5/TreeBuilder.php
diff --git a/library/HTML5/named-character-references.ser b/library/HTML5/named-character-references.ser
index 3004c4b91..3004c4b91 100755..100644
--- a/library/HTML5/named-character-references.ser
+++ b/library/HTML5/named-character-references.ser
diff --git a/library/HTMLPurifier.auto.php b/library/HTMLPurifier.auto.php
index 1960c399f..1960c399f 100755..100644
--- a/library/HTMLPurifier.auto.php
+++ b/library/HTMLPurifier.auto.php
diff --git a/library/HTMLPurifier.autoload.php b/library/HTMLPurifier.autoload.php
index 8d4017640..8d4017640 100755..100644
--- a/library/HTMLPurifier.autoload.php
+++ b/library/HTMLPurifier.autoload.php
diff --git a/library/HTMLPurifier.func.php b/library/HTMLPurifier.func.php
index 56a55b2fe..56a55b2fe 100755..100644
--- a/library/HTMLPurifier.func.php
+++ b/library/HTMLPurifier.func.php
diff --git a/library/HTMLPurifier.includes.php b/library/HTMLPurifier.includes.php
index 2ed0f0c17..2ed0f0c17 100755..100644
--- a/library/HTMLPurifier.includes.php
+++ b/library/HTMLPurifier.includes.php
diff --git a/library/HTMLPurifier.kses.php b/library/HTMLPurifier.kses.php
index 3143feb17..3143feb17 100755..100644
--- a/library/HTMLPurifier.kses.php
+++ b/library/HTMLPurifier.kses.php
diff --git a/library/HTMLPurifier.path.php b/library/HTMLPurifier.path.php
index 39b1b6531..39b1b6531 100755..100644
--- a/library/HTMLPurifier.path.php
+++ b/library/HTMLPurifier.path.php
diff --git a/library/HTMLPurifier.php b/library/HTMLPurifier.php
index ba2c7b306..ba2c7b306 100755..100644
--- a/library/HTMLPurifier.php
+++ b/library/HTMLPurifier.php
diff --git a/library/HTMLPurifier.safe-includes.php b/library/HTMLPurifier.safe-includes.php
index 6402de045..6402de045 100755..100644
--- a/library/HTMLPurifier.safe-includes.php
+++ b/library/HTMLPurifier.safe-includes.php
diff --git a/library/HTMLPurifier/AttrCollections.php b/library/HTMLPurifier/AttrCollections.php
index 555b86d04..555b86d04 100755..100644
--- a/library/HTMLPurifier/AttrCollections.php
+++ b/library/HTMLPurifier/AttrCollections.php
diff --git a/library/HTMLPurifier/AttrDef.php b/library/HTMLPurifier/AttrDef.php
index b2e4f36c5..b2e4f36c5 100755..100644
--- a/library/HTMLPurifier/AttrDef.php
+++ b/library/HTMLPurifier/AttrDef.php
diff --git a/library/HTMLPurifier/AttrDef/CSS.php b/library/HTMLPurifier/AttrDef/CSS.php
index 953e70675..953e70675 100755..100644
--- a/library/HTMLPurifier/AttrDef/CSS.php
+++ b/library/HTMLPurifier/AttrDef/CSS.php
diff --git a/library/HTMLPurifier/AttrDef/CSS/AlphaValue.php b/library/HTMLPurifier/AttrDef/CSS/AlphaValue.php
index 292c040d4..292c040d4 100755..100644
--- a/library/HTMLPurifier/AttrDef/CSS/AlphaValue.php
+++ b/library/HTMLPurifier/AttrDef/CSS/AlphaValue.php
diff --git a/library/HTMLPurifier/AttrDef/CSS/Background.php b/library/HTMLPurifier/AttrDef/CSS/Background.php
index 3a3d20cd6..3a3d20cd6 100755..100644
--- a/library/HTMLPurifier/AttrDef/CSS/Background.php
+++ b/library/HTMLPurifier/AttrDef/CSS/Background.php
diff --git a/library/HTMLPurifier/AttrDef/CSS/BackgroundPosition.php b/library/HTMLPurifier/AttrDef/CSS/BackgroundPosition.php
index fae82eaec..fae82eaec 100755..100644
--- a/library/HTMLPurifier/AttrDef/CSS/BackgroundPosition.php
+++ b/library/HTMLPurifier/AttrDef/CSS/BackgroundPosition.php
diff --git a/library/HTMLPurifier/AttrDef/CSS/Border.php b/library/HTMLPurifier/AttrDef/CSS/Border.php
index 42a1d1b4a..42a1d1b4a 100755..100644
--- a/library/HTMLPurifier/AttrDef/CSS/Border.php
+++ b/library/HTMLPurifier/AttrDef/CSS/Border.php
diff --git a/library/HTMLPurifier/AttrDef/CSS/Color.php b/library/HTMLPurifier/AttrDef/CSS/Color.php
index 07f95a671..07f95a671 100755..100644
--- a/library/HTMLPurifier/AttrDef/CSS/Color.php
+++ b/library/HTMLPurifier/AttrDef/CSS/Color.php
diff --git a/library/HTMLPurifier/AttrDef/CSS/Composite.php b/library/HTMLPurifier/AttrDef/CSS/Composite.php
index de1289cba..de1289cba 100755..100644
--- a/library/HTMLPurifier/AttrDef/CSS/Composite.php
+++ b/library/HTMLPurifier/AttrDef/CSS/Composite.php
diff --git a/library/HTMLPurifier/AttrDef/CSS/DenyElementDecorator.php b/library/HTMLPurifier/AttrDef/CSS/DenyElementDecorator.php
index 6599c5b2d..6599c5b2d 100755..100644
--- a/library/HTMLPurifier/AttrDef/CSS/DenyElementDecorator.php
+++ b/library/HTMLPurifier/AttrDef/CSS/DenyElementDecorator.php
diff --git a/library/HTMLPurifier/AttrDef/CSS/Filter.php b/library/HTMLPurifier/AttrDef/CSS/Filter.php
index 147894b86..147894b86 100755..100644
--- a/library/HTMLPurifier/AttrDef/CSS/Filter.php
+++ b/library/HTMLPurifier/AttrDef/CSS/Filter.php
diff --git a/library/HTMLPurifier/AttrDef/CSS/Font.php b/library/HTMLPurifier/AttrDef/CSS/Font.php
index 699ee0b70..699ee0b70 100755..100644
--- a/library/HTMLPurifier/AttrDef/CSS/Font.php
+++ b/library/HTMLPurifier/AttrDef/CSS/Font.php
diff --git a/library/HTMLPurifier/AttrDef/CSS/FontFamily.php b/library/HTMLPurifier/AttrDef/CSS/FontFamily.php
index 42c2054c2..42c2054c2 100755..100644
--- a/library/HTMLPurifier/AttrDef/CSS/FontFamily.php
+++ b/library/HTMLPurifier/AttrDef/CSS/FontFamily.php
diff --git a/library/HTMLPurifier/AttrDef/CSS/ImportantDecorator.php b/library/HTMLPurifier/AttrDef/CSS/ImportantDecorator.php
index 4e6b35e5a..4e6b35e5a 100755..100644
--- a/library/HTMLPurifier/AttrDef/CSS/ImportantDecorator.php
+++ b/library/HTMLPurifier/AttrDef/CSS/ImportantDecorator.php
diff --git a/library/HTMLPurifier/AttrDef/CSS/Length.php b/library/HTMLPurifier/AttrDef/CSS/Length.php
index a07ec5813..a07ec5813 100755..100644
--- a/library/HTMLPurifier/AttrDef/CSS/Length.php
+++ b/library/HTMLPurifier/AttrDef/CSS/Length.php
diff --git a/library/HTMLPurifier/AttrDef/CSS/ListStyle.php b/library/HTMLPurifier/AttrDef/CSS/ListStyle.php
index 4406868c0..4406868c0 100755..100644
--- a/library/HTMLPurifier/AttrDef/CSS/ListStyle.php
+++ b/library/HTMLPurifier/AttrDef/CSS/ListStyle.php
diff --git a/library/HTMLPurifier/AttrDef/CSS/Multiple.php b/library/HTMLPurifier/AttrDef/CSS/Multiple.php
index 4d62a40d7..4d62a40d7 100755..100644
--- a/library/HTMLPurifier/AttrDef/CSS/Multiple.php
+++ b/library/HTMLPurifier/AttrDef/CSS/Multiple.php
diff --git a/library/HTMLPurifier/AttrDef/CSS/Number.php b/library/HTMLPurifier/AttrDef/CSS/Number.php
index 3f99e12ec..3f99e12ec 100755..100644
--- a/library/HTMLPurifier/AttrDef/CSS/Number.php
+++ b/library/HTMLPurifier/AttrDef/CSS/Number.php
diff --git a/library/HTMLPurifier/AttrDef/CSS/Percentage.php b/library/HTMLPurifier/AttrDef/CSS/Percentage.php
index c34b8fc3c..c34b8fc3c 100755..100644
--- a/library/HTMLPurifier/AttrDef/CSS/Percentage.php
+++ b/library/HTMLPurifier/AttrDef/CSS/Percentage.php
diff --git a/library/HTMLPurifier/AttrDef/CSS/TextDecoration.php b/library/HTMLPurifier/AttrDef/CSS/TextDecoration.php
index 772c922d8..772c922d8 100755..100644
--- a/library/HTMLPurifier/AttrDef/CSS/TextDecoration.php
+++ b/library/HTMLPurifier/AttrDef/CSS/TextDecoration.php
diff --git a/library/HTMLPurifier/AttrDef/CSS/URI.php b/library/HTMLPurifier/AttrDef/CSS/URI.php
index 1df17dc25..1df17dc25 100755..100644
--- a/library/HTMLPurifier/AttrDef/CSS/URI.php
+++ b/library/HTMLPurifier/AttrDef/CSS/URI.php
diff --git a/library/HTMLPurifier/AttrDef/Enum.php b/library/HTMLPurifier/AttrDef/Enum.php
index 5d603ebcc..5d603ebcc 100755..100644
--- a/library/HTMLPurifier/AttrDef/Enum.php
+++ b/library/HTMLPurifier/AttrDef/Enum.php
diff --git a/library/HTMLPurifier/AttrDef/HTML/Bool.php b/library/HTMLPurifier/AttrDef/HTML/Bool.php
index e06987eb8..e06987eb8 100755..100644
--- a/library/HTMLPurifier/AttrDef/HTML/Bool.php
+++ b/library/HTMLPurifier/AttrDef/HTML/Bool.php
diff --git a/library/HTMLPurifier/AttrDef/HTML/Class.php b/library/HTMLPurifier/AttrDef/HTML/Class.php
index 370068d97..370068d97 100755..100644
--- a/library/HTMLPurifier/AttrDef/HTML/Class.php
+++ b/library/HTMLPurifier/AttrDef/HTML/Class.php
diff --git a/library/HTMLPurifier/AttrDef/HTML/Color.php b/library/HTMLPurifier/AttrDef/HTML/Color.php
index d01e20454..d01e20454 100755..100644
--- a/library/HTMLPurifier/AttrDef/HTML/Color.php
+++ b/library/HTMLPurifier/AttrDef/HTML/Color.php
diff --git a/library/HTMLPurifier/AttrDef/HTML/FrameTarget.php b/library/HTMLPurifier/AttrDef/HTML/FrameTarget.php
index ae6ea7c01..ae6ea7c01 100755..100644
--- a/library/HTMLPurifier/AttrDef/HTML/FrameTarget.php
+++ b/library/HTMLPurifier/AttrDef/HTML/FrameTarget.php
diff --git a/library/HTMLPurifier/AttrDef/HTML/ID.php b/library/HTMLPurifier/AttrDef/HTML/ID.php
index 81d03762d..81d03762d 100755..100644
--- a/library/HTMLPurifier/AttrDef/HTML/ID.php
+++ b/library/HTMLPurifier/AttrDef/HTML/ID.php
diff --git a/library/HTMLPurifier/AttrDef/HTML/Length.php b/library/HTMLPurifier/AttrDef/HTML/Length.php
index a242f9c23..a242f9c23 100755..100644
--- a/library/HTMLPurifier/AttrDef/HTML/Length.php
+++ b/library/HTMLPurifier/AttrDef/HTML/Length.php
diff --git a/library/HTMLPurifier/AttrDef/HTML/LinkTypes.php b/library/HTMLPurifier/AttrDef/HTML/LinkTypes.php
index 76d25ed08..76d25ed08 100755..100644
--- a/library/HTMLPurifier/AttrDef/HTML/LinkTypes.php
+++ b/library/HTMLPurifier/AttrDef/HTML/LinkTypes.php
diff --git a/library/HTMLPurifier/AttrDef/HTML/MultiLength.php b/library/HTMLPurifier/AttrDef/HTML/MultiLength.php
index c72fc76e4..c72fc76e4 100755..100644
--- a/library/HTMLPurifier/AttrDef/HTML/MultiLength.php
+++ b/library/HTMLPurifier/AttrDef/HTML/MultiLength.php
diff --git a/library/HTMLPurifier/AttrDef/HTML/Nmtokens.php b/library/HTMLPurifier/AttrDef/HTML/Nmtokens.php
index aa34120bd..aa34120bd 100755..100644
--- a/library/HTMLPurifier/AttrDef/HTML/Nmtokens.php
+++ b/library/HTMLPurifier/AttrDef/HTML/Nmtokens.php
diff --git a/library/HTMLPurifier/AttrDef/HTML/Pixels.php b/library/HTMLPurifier/AttrDef/HTML/Pixels.php
index 4cb2c1b85..4cb2c1b85 100755..100644
--- a/library/HTMLPurifier/AttrDef/HTML/Pixels.php
+++ b/library/HTMLPurifier/AttrDef/HTML/Pixels.php
diff --git a/library/HTMLPurifier/AttrDef/Integer.php b/library/HTMLPurifier/AttrDef/Integer.php
index d59738d2a..d59738d2a 100755..100644
--- a/library/HTMLPurifier/AttrDef/Integer.php
+++ b/library/HTMLPurifier/AttrDef/Integer.php
diff --git a/library/HTMLPurifier/AttrDef/Lang.php b/library/HTMLPurifier/AttrDef/Lang.php
index 10e6da56d..10e6da56d 100755..100644
--- a/library/HTMLPurifier/AttrDef/Lang.php
+++ b/library/HTMLPurifier/AttrDef/Lang.php
diff --git a/library/HTMLPurifier/AttrDef/Switch.php b/library/HTMLPurifier/AttrDef/Switch.php
index c9e3ed193..c9e3ed193 100755..100644
--- a/library/HTMLPurifier/AttrDef/Switch.php
+++ b/library/HTMLPurifier/AttrDef/Switch.php
diff --git a/library/HTMLPurifier/AttrDef/Text.php b/library/HTMLPurifier/AttrDef/Text.php
index c6216cc53..c6216cc53 100755..100644
--- a/library/HTMLPurifier/AttrDef/Text.php
+++ b/library/HTMLPurifier/AttrDef/Text.php
diff --git a/library/HTMLPurifier/AttrDef/URI.php b/library/HTMLPurifier/AttrDef/URI.php
index 01a6d83e9..01a6d83e9 100755..100644
--- a/library/HTMLPurifier/AttrDef/URI.php
+++ b/library/HTMLPurifier/AttrDef/URI.php
diff --git a/library/HTMLPurifier/AttrDef/URI/Email.php b/library/HTMLPurifier/AttrDef/URI/Email.php
index bfee9d166..bfee9d166 100755..100644
--- a/library/HTMLPurifier/AttrDef/URI/Email.php
+++ b/library/HTMLPurifier/AttrDef/URI/Email.php
diff --git a/library/HTMLPurifier/AttrDef/URI/Email/SimpleCheck.php b/library/HTMLPurifier/AttrDef/URI/Email/SimpleCheck.php
index 94c715ab4..94c715ab4 100755..100644
--- a/library/HTMLPurifier/AttrDef/URI/Email/SimpleCheck.php
+++ b/library/HTMLPurifier/AttrDef/URI/Email/SimpleCheck.php
diff --git a/library/HTMLPurifier/AttrDef/URI/Host.php b/library/HTMLPurifier/AttrDef/URI/Host.php
index 2156c10c6..2156c10c6 100755..100644
--- a/library/HTMLPurifier/AttrDef/URI/Host.php
+++ b/library/HTMLPurifier/AttrDef/URI/Host.php
diff --git a/library/HTMLPurifier/AttrDef/URI/IPv4.php b/library/HTMLPurifier/AttrDef/URI/IPv4.php
index ec4cf591b..ec4cf591b 100755..100644
--- a/library/HTMLPurifier/AttrDef/URI/IPv4.php
+++ b/library/HTMLPurifier/AttrDef/URI/IPv4.php
diff --git a/library/HTMLPurifier/AttrDef/URI/IPv6.php b/library/HTMLPurifier/AttrDef/URI/IPv6.php
index 9454e9be5..9454e9be5 100755..100644
--- a/library/HTMLPurifier/AttrDef/URI/IPv6.php
+++ b/library/HTMLPurifier/AttrDef/URI/IPv6.php
diff --git a/library/HTMLPurifier/AttrTransform.php b/library/HTMLPurifier/AttrTransform.php
index e61d3e01b..e61d3e01b 100755..100644
--- a/library/HTMLPurifier/AttrTransform.php
+++ b/library/HTMLPurifier/AttrTransform.php
diff --git a/library/HTMLPurifier/AttrTransform/Background.php b/library/HTMLPurifier/AttrTransform/Background.php
index 0e1ff24a3..0e1ff24a3 100755..100644
--- a/library/HTMLPurifier/AttrTransform/Background.php
+++ b/library/HTMLPurifier/AttrTransform/Background.php
diff --git a/library/HTMLPurifier/AttrTransform/BdoDir.php b/library/HTMLPurifier/AttrTransform/BdoDir.php
index 4d1a05665..4d1a05665 100755..100644
--- a/library/HTMLPurifier/AttrTransform/BdoDir.php
+++ b/library/HTMLPurifier/AttrTransform/BdoDir.php
diff --git a/library/HTMLPurifier/AttrTransform/BgColor.php b/library/HTMLPurifier/AttrTransform/BgColor.php
index ad3916bb9..ad3916bb9 100755..100644
--- a/library/HTMLPurifier/AttrTransform/BgColor.php
+++ b/library/HTMLPurifier/AttrTransform/BgColor.php
diff --git a/library/HTMLPurifier/AttrTransform/BoolToCSS.php b/library/HTMLPurifier/AttrTransform/BoolToCSS.php
index 51159b671..51159b671 100755..100644
--- a/library/HTMLPurifier/AttrTransform/BoolToCSS.php
+++ b/library/HTMLPurifier/AttrTransform/BoolToCSS.php
diff --git a/library/HTMLPurifier/AttrTransform/Border.php b/library/HTMLPurifier/AttrTransform/Border.php
index 476b0b079..476b0b079 100755..100644
--- a/library/HTMLPurifier/AttrTransform/Border.php
+++ b/library/HTMLPurifier/AttrTransform/Border.php
diff --git a/library/HTMLPurifier/AttrTransform/EnumToCSS.php b/library/HTMLPurifier/AttrTransform/EnumToCSS.php
index 2a5b4514a..2a5b4514a 100755..100644
--- a/library/HTMLPurifier/AttrTransform/EnumToCSS.php
+++ b/library/HTMLPurifier/AttrTransform/EnumToCSS.php
diff --git a/library/HTMLPurifier/AttrTransform/ImgRequired.php b/library/HTMLPurifier/AttrTransform/ImgRequired.php
index 7f0e4b7a5..7f0e4b7a5 100755..100644
--- a/library/HTMLPurifier/AttrTransform/ImgRequired.php
+++ b/library/HTMLPurifier/AttrTransform/ImgRequired.php
diff --git a/library/HTMLPurifier/AttrTransform/ImgSpace.php b/library/HTMLPurifier/AttrTransform/ImgSpace.php
index fd84c10c3..fd84c10c3 100755..100644
--- a/library/HTMLPurifier/AttrTransform/ImgSpace.php
+++ b/library/HTMLPurifier/AttrTransform/ImgSpace.php
diff --git a/library/HTMLPurifier/AttrTransform/Input.php b/library/HTMLPurifier/AttrTransform/Input.php
index 16829552d..16829552d 100755..100644
--- a/library/HTMLPurifier/AttrTransform/Input.php
+++ b/library/HTMLPurifier/AttrTransform/Input.php
diff --git a/library/HTMLPurifier/AttrTransform/Lang.php b/library/HTMLPurifier/AttrTransform/Lang.php
index 5869e7f82..5869e7f82 100755..100644
--- a/library/HTMLPurifier/AttrTransform/Lang.php
+++ b/library/HTMLPurifier/AttrTransform/Lang.php
diff --git a/library/HTMLPurifier/AttrTransform/Length.php b/library/HTMLPurifier/AttrTransform/Length.php
index ea2f30473..ea2f30473 100755..100644
--- a/library/HTMLPurifier/AttrTransform/Length.php
+++ b/library/HTMLPurifier/AttrTransform/Length.php
diff --git a/library/HTMLPurifier/AttrTransform/Name.php b/library/HTMLPurifier/AttrTransform/Name.php
index 15315bc73..15315bc73 100755..100644
--- a/library/HTMLPurifier/AttrTransform/Name.php
+++ b/library/HTMLPurifier/AttrTransform/Name.php
diff --git a/library/HTMLPurifier/AttrTransform/NameSync.php b/library/HTMLPurifier/AttrTransform/NameSync.php
index a95638c14..a95638c14 100755..100644
--- a/library/HTMLPurifier/AttrTransform/NameSync.php
+++ b/library/HTMLPurifier/AttrTransform/NameSync.php
diff --git a/library/HTMLPurifier/AttrTransform/SafeEmbed.php b/library/HTMLPurifier/AttrTransform/SafeEmbed.php
index 4da449981..4da449981 100755..100644
--- a/library/HTMLPurifier/AttrTransform/SafeEmbed.php
+++ b/library/HTMLPurifier/AttrTransform/SafeEmbed.php
diff --git a/library/HTMLPurifier/AttrTransform/SafeObject.php b/library/HTMLPurifier/AttrTransform/SafeObject.php
index 1ed74898b..1ed74898b 100755..100644
--- a/library/HTMLPurifier/AttrTransform/SafeObject.php
+++ b/library/HTMLPurifier/AttrTransform/SafeObject.php
diff --git a/library/HTMLPurifier/AttrTransform/SafeParam.php b/library/HTMLPurifier/AttrTransform/SafeParam.php
index 3f992ec31..3f992ec31 100755..100644
--- a/library/HTMLPurifier/AttrTransform/SafeParam.php
+++ b/library/HTMLPurifier/AttrTransform/SafeParam.php
diff --git a/library/HTMLPurifier/AttrTransform/ScriptRequired.php b/library/HTMLPurifier/AttrTransform/ScriptRequired.php
index 4499050a2..4499050a2 100755..100644
--- a/library/HTMLPurifier/AttrTransform/ScriptRequired.php
+++ b/library/HTMLPurifier/AttrTransform/ScriptRequired.php
diff --git a/library/HTMLPurifier/AttrTransform/Textarea.php b/library/HTMLPurifier/AttrTransform/Textarea.php
index 81ac3488b..81ac3488b 100755..100644
--- a/library/HTMLPurifier/AttrTransform/Textarea.php
+++ b/library/HTMLPurifier/AttrTransform/Textarea.php
diff --git a/library/HTMLPurifier/AttrTypes.php b/library/HTMLPurifier/AttrTypes.php
index fc2ea4e58..fc2ea4e58 100755..100644
--- a/library/HTMLPurifier/AttrTypes.php
+++ b/library/HTMLPurifier/AttrTypes.php
diff --git a/library/HTMLPurifier/AttrValidator.php b/library/HTMLPurifier/AttrValidator.php
index 829a0f8f2..829a0f8f2 100755..100644
--- a/library/HTMLPurifier/AttrValidator.php
+++ b/library/HTMLPurifier/AttrValidator.php
diff --git a/library/HTMLPurifier/Bootstrap.php b/library/HTMLPurifier/Bootstrap.php
index 559f61a23..559f61a23 100755..100644
--- a/library/HTMLPurifier/Bootstrap.php
+++ b/library/HTMLPurifier/Bootstrap.php
diff --git a/library/HTMLPurifier/CSSDefinition.php b/library/HTMLPurifier/CSSDefinition.php
index 6a2e6f56d..6a2e6f56d 100755..100644
--- a/library/HTMLPurifier/CSSDefinition.php
+++ b/library/HTMLPurifier/CSSDefinition.php
diff --git a/library/HTMLPurifier/ChildDef.php b/library/HTMLPurifier/ChildDef.php
index c5d5216da..c5d5216da 100755..100644
--- a/library/HTMLPurifier/ChildDef.php
+++ b/library/HTMLPurifier/ChildDef.php
diff --git a/library/HTMLPurifier/ChildDef/Chameleon.php b/library/HTMLPurifier/ChildDef/Chameleon.php
index 15c364ee3..15c364ee3 100755..100644
--- a/library/HTMLPurifier/ChildDef/Chameleon.php
+++ b/library/HTMLPurifier/ChildDef/Chameleon.php
diff --git a/library/HTMLPurifier/ChildDef/Custom.php b/library/HTMLPurifier/ChildDef/Custom.php
index b68047b4b..b68047b4b 100755..100644
--- a/library/HTMLPurifier/ChildDef/Custom.php
+++ b/library/HTMLPurifier/ChildDef/Custom.php
diff --git a/library/HTMLPurifier/ChildDef/Empty.php b/library/HTMLPurifier/ChildDef/Empty.php
index 13171f665..13171f665 100755..100644
--- a/library/HTMLPurifier/ChildDef/Empty.php
+++ b/library/HTMLPurifier/ChildDef/Empty.php
diff --git a/library/HTMLPurifier/ChildDef/Optional.php b/library/HTMLPurifier/ChildDef/Optional.php
index 32bcb9898..32bcb9898 100755..100644
--- a/library/HTMLPurifier/ChildDef/Optional.php
+++ b/library/HTMLPurifier/ChildDef/Optional.php
diff --git a/library/HTMLPurifier/ChildDef/Required.php b/library/HTMLPurifier/ChildDef/Required.php
index 4889f249b..4889f249b 100755..100644
--- a/library/HTMLPurifier/ChildDef/Required.php
+++ b/library/HTMLPurifier/ChildDef/Required.php
diff --git a/library/HTMLPurifier/ChildDef/StrictBlockquote.php b/library/HTMLPurifier/ChildDef/StrictBlockquote.php
index dfae8a6e5..dfae8a6e5 100755..100644
--- a/library/HTMLPurifier/ChildDef/StrictBlockquote.php
+++ b/library/HTMLPurifier/ChildDef/StrictBlockquote.php
diff --git a/library/HTMLPurifier/ChildDef/Table.php b/library/HTMLPurifier/ChildDef/Table.php
index 34f0227dd..34f0227dd 100755..100644
--- a/library/HTMLPurifier/ChildDef/Table.php
+++ b/library/HTMLPurifier/ChildDef/Table.php
diff --git a/library/HTMLPurifier/Config.php b/library/HTMLPurifier/Config.php
index 2a334b0d8..2a334b0d8 100755..100644
--- a/library/HTMLPurifier/Config.php
+++ b/library/HTMLPurifier/Config.php
diff --git a/library/HTMLPurifier/ConfigSchema.php b/library/HTMLPurifier/ConfigSchema.php
index 67be5c71f..67be5c71f 100755..100644
--- a/library/HTMLPurifier/ConfigSchema.php
+++ b/library/HTMLPurifier/ConfigSchema.php
diff --git a/library/HTMLPurifier/ConfigSchema/Builder/ConfigSchema.php b/library/HTMLPurifier/ConfigSchema/Builder/ConfigSchema.php
index c05668a70..c05668a70 100755..100644
--- a/library/HTMLPurifier/ConfigSchema/Builder/ConfigSchema.php
+++ b/library/HTMLPurifier/ConfigSchema/Builder/ConfigSchema.php
diff --git a/library/HTMLPurifier/ConfigSchema/Builder/Xml.php b/library/HTMLPurifier/ConfigSchema/Builder/Xml.php
index 244561a37..244561a37 100755..100644
--- a/library/HTMLPurifier/ConfigSchema/Builder/Xml.php
+++ b/library/HTMLPurifier/ConfigSchema/Builder/Xml.php
diff --git a/library/HTMLPurifier/ConfigSchema/Exception.php b/library/HTMLPurifier/ConfigSchema/Exception.php
index 2671516c5..2671516c5 100755..100644
--- a/library/HTMLPurifier/ConfigSchema/Exception.php
+++ b/library/HTMLPurifier/ConfigSchema/Exception.php
diff --git a/library/HTMLPurifier/ConfigSchema/Interchange.php b/library/HTMLPurifier/ConfigSchema/Interchange.php
index 91a5aa730..91a5aa730 100755..100644
--- a/library/HTMLPurifier/ConfigSchema/Interchange.php
+++ b/library/HTMLPurifier/ConfigSchema/Interchange.php
diff --git a/library/HTMLPurifier/ConfigSchema/Interchange/Directive.php b/library/HTMLPurifier/ConfigSchema/Interchange/Directive.php
index ac8be0d97..ac8be0d97 100755..100644
--- a/library/HTMLPurifier/ConfigSchema/Interchange/Directive.php
+++ b/library/HTMLPurifier/ConfigSchema/Interchange/Directive.php
diff --git a/library/HTMLPurifier/ConfigSchema/Interchange/Id.php b/library/HTMLPurifier/ConfigSchema/Interchange/Id.php
index b9b3c6f5c..b9b3c6f5c 100755..100644
--- a/library/HTMLPurifier/ConfigSchema/Interchange/Id.php
+++ b/library/HTMLPurifier/ConfigSchema/Interchange/Id.php
diff --git a/library/HTMLPurifier/ConfigSchema/InterchangeBuilder.php b/library/HTMLPurifier/ConfigSchema/InterchangeBuilder.php
index 785b72ce8..785b72ce8 100755..100644
--- a/library/HTMLPurifier/ConfigSchema/InterchangeBuilder.php
+++ b/library/HTMLPurifier/ConfigSchema/InterchangeBuilder.php
diff --git a/library/HTMLPurifier/ConfigSchema/Validator.php b/library/HTMLPurifier/ConfigSchema/Validator.php
index f374f6a02..f374f6a02 100755..100644
--- a/library/HTMLPurifier/ConfigSchema/Validator.php
+++ b/library/HTMLPurifier/ConfigSchema/Validator.php
diff --git a/library/HTMLPurifier/ConfigSchema/ValidatorAtom.php b/library/HTMLPurifier/ConfigSchema/ValidatorAtom.php
index b95aea18c..b95aea18c 100755..100644
--- a/library/HTMLPurifier/ConfigSchema/ValidatorAtom.php
+++ b/library/HTMLPurifier/ConfigSchema/ValidatorAtom.php
diff --git a/library/HTMLPurifier/ConfigSchema/schema.ser b/library/HTMLPurifier/ConfigSchema/schema.ser
index 22b8d54a5..22b8d54a5 100755..100644
--- a/library/HTMLPurifier/ConfigSchema/schema.ser
+++ b/library/HTMLPurifier/ConfigSchema/schema.ser
diff --git a/library/HTMLPurifier/ConfigSchema/schema/Attr.AllowedClasses.txt b/library/HTMLPurifier/ConfigSchema/schema/Attr.AllowedClasses.txt
index 0517fed0a..0517fed0a 100755..100644
--- a/library/HTMLPurifier/ConfigSchema/schema/Attr.AllowedClasses.txt
+++ b/library/HTMLPurifier/ConfigSchema/schema/Attr.AllowedClasses.txt
diff --git a/library/HTMLPurifier/ConfigSchema/schema/Attr.AllowedFrameTargets.txt b/library/HTMLPurifier/ConfigSchema/schema/Attr.AllowedFrameTargets.txt
index 249edd647..249edd647 100755..100644
--- a/library/HTMLPurifier/ConfigSchema/schema/Attr.AllowedFrameTargets.txt
+++ b/library/HTMLPurifier/ConfigSchema/schema/Attr.AllowedFrameTargets.txt
diff --git a/library/HTMLPurifier/ConfigSchema/schema/Attr.AllowedRel.txt b/library/HTMLPurifier/ConfigSchema/schema/Attr.AllowedRel.txt
index 9a8fa6a2e..9a8fa6a2e 100755..100644
--- a/library/HTMLPurifier/ConfigSchema/schema/Attr.AllowedRel.txt
+++ b/library/HTMLPurifier/ConfigSchema/schema/Attr.AllowedRel.txt
diff --git a/library/HTMLPurifier/ConfigSchema/schema/Attr.AllowedRev.txt b/library/HTMLPurifier/ConfigSchema/schema/Attr.AllowedRev.txt
index b01788348..b01788348 100755..100644
--- a/library/HTMLPurifier/ConfigSchema/schema/Attr.AllowedRev.txt
+++ b/library/HTMLPurifier/ConfigSchema/schema/Attr.AllowedRev.txt
diff --git a/library/HTMLPurifier/ConfigSchema/schema/Attr.ClassUseCDATA.txt b/library/HTMLPurifier/ConfigSchema/schema/Attr.ClassUseCDATA.txt
index e774b823b..e774b823b 100755..100644
--- a/library/HTMLPurifier/ConfigSchema/schema/Attr.ClassUseCDATA.txt
+++ b/library/HTMLPurifier/ConfigSchema/schema/Attr.ClassUseCDATA.txt
diff --git a/library/HTMLPurifier/ConfigSchema/schema/Attr.DefaultImageAlt.txt b/library/HTMLPurifier/ConfigSchema/schema/Attr.DefaultImageAlt.txt
index 533165e17..533165e17 100755..100644
--- a/library/HTMLPurifier/ConfigSchema/schema/Attr.DefaultImageAlt.txt
+++ b/library/HTMLPurifier/ConfigSchema/schema/Attr.DefaultImageAlt.txt
diff --git a/library/HTMLPurifier/ConfigSchema/schema/Attr.DefaultInvalidImage.txt b/library/HTMLPurifier/ConfigSchema/schema/Attr.DefaultInvalidImage.txt
index 9eb7e3846..9eb7e3846 100755..100644
--- a/library/HTMLPurifier/ConfigSchema/schema/Attr.DefaultInvalidImage.txt
+++ b/library/HTMLPurifier/ConfigSchema/schema/Attr.DefaultInvalidImage.txt
diff --git a/library/HTMLPurifier/ConfigSchema/schema/Attr.DefaultInvalidImageAlt.txt b/library/HTMLPurifier/ConfigSchema/schema/Attr.DefaultInvalidImageAlt.txt
index 2f17bf477..2f17bf477 100755..100644
--- a/library/HTMLPurifier/ConfigSchema/schema/Attr.DefaultInvalidImageAlt.txt
+++ b/library/HTMLPurifier/ConfigSchema/schema/Attr.DefaultInvalidImageAlt.txt
diff --git a/library/HTMLPurifier/ConfigSchema/schema/Attr.DefaultTextDir.txt b/library/HTMLPurifier/ConfigSchema/schema/Attr.DefaultTextDir.txt
index 52654b53a..52654b53a 100755..100644
--- a/library/HTMLPurifier/ConfigSchema/schema/Attr.DefaultTextDir.txt
+++ b/library/HTMLPurifier/ConfigSchema/schema/Attr.DefaultTextDir.txt
diff --git a/library/HTMLPurifier/ConfigSchema/schema/Attr.EnableID.txt b/library/HTMLPurifier/ConfigSchema/schema/Attr.EnableID.txt
index 6440d2103..6440d2103 100755..100644
--- a/library/HTMLPurifier/ConfigSchema/schema/Attr.EnableID.txt
+++ b/library/HTMLPurifier/ConfigSchema/schema/Attr.EnableID.txt
diff --git a/library/HTMLPurifier/ConfigSchema/schema/Attr.ForbiddenClasses.txt b/library/HTMLPurifier/ConfigSchema/schema/Attr.ForbiddenClasses.txt
index f31d226f5..f31d226f5 100755..100644
--- a/library/HTMLPurifier/ConfigSchema/schema/Attr.ForbiddenClasses.txt
+++ b/library/HTMLPurifier/ConfigSchema/schema/Attr.ForbiddenClasses.txt
diff --git a/library/HTMLPurifier/ConfigSchema/schema/Attr.IDBlacklist.txt b/library/HTMLPurifier/ConfigSchema/schema/Attr.IDBlacklist.txt
index 5f2b5e3d2..5f2b5e3d2 100755..100644
--- a/library/HTMLPurifier/ConfigSchema/schema/Attr.IDBlacklist.txt
+++ b/library/HTMLPurifier/ConfigSchema/schema/Attr.IDBlacklist.txt
diff --git a/library/HTMLPurifier/ConfigSchema/schema/Attr.IDBlacklistRegexp.txt b/library/HTMLPurifier/ConfigSchema/schema/Attr.IDBlacklistRegexp.txt
index 6f5824586..6f5824586 100755..100644
--- a/library/HTMLPurifier/ConfigSchema/schema/Attr.IDBlacklistRegexp.txt
+++ b/library/HTMLPurifier/ConfigSchema/schema/Attr.IDBlacklistRegexp.txt
diff --git a/library/HTMLPurifier/ConfigSchema/schema/Attr.IDPrefix.txt b/library/HTMLPurifier/ConfigSchema/schema/Attr.IDPrefix.txt
index cc49d43fd..cc49d43fd 100755..100644
--- a/library/HTMLPurifier/ConfigSchema/schema/Attr.IDPrefix.txt
+++ b/library/HTMLPurifier/ConfigSchema/schema/Attr.IDPrefix.txt
diff --git a/library/HTMLPurifier/ConfigSchema/schema/Attr.IDPrefixLocal.txt b/library/HTMLPurifier/ConfigSchema/schema/Attr.IDPrefixLocal.txt
index 2c5924a7a..2c5924a7a 100755..100644
--- a/library/HTMLPurifier/ConfigSchema/schema/Attr.IDPrefixLocal.txt
+++ b/library/HTMLPurifier/ConfigSchema/schema/Attr.IDPrefixLocal.txt
diff --git a/library/HTMLPurifier/ConfigSchema/schema/AutoFormat.AutoParagraph.txt b/library/HTMLPurifier/ConfigSchema/schema/AutoFormat.AutoParagraph.txt
index d5caa1bb9..d5caa1bb9 100755..100644
--- a/library/HTMLPurifier/ConfigSchema/schema/AutoFormat.AutoParagraph.txt
+++ b/library/HTMLPurifier/ConfigSchema/schema/AutoFormat.AutoParagraph.txt
diff --git a/library/HTMLPurifier/ConfigSchema/schema/AutoFormat.Custom.txt b/library/HTMLPurifier/ConfigSchema/schema/AutoFormat.Custom.txt
index 2a476481a..2a476481a 100755..100644
--- a/library/HTMLPurifier/ConfigSchema/schema/AutoFormat.Custom.txt
+++ b/library/HTMLPurifier/ConfigSchema/schema/AutoFormat.Custom.txt
diff --git a/library/HTMLPurifier/ConfigSchema/schema/AutoFormat.DisplayLinkURI.txt b/library/HTMLPurifier/ConfigSchema/schema/AutoFormat.DisplayLinkURI.txt
index 663064a34..663064a34 100755..100644
--- a/library/HTMLPurifier/ConfigSchema/schema/AutoFormat.DisplayLinkURI.txt
+++ b/library/HTMLPurifier/ConfigSchema/schema/AutoFormat.DisplayLinkURI.txt
diff --git a/library/HTMLPurifier/ConfigSchema/schema/AutoFormat.Linkify.txt b/library/HTMLPurifier/ConfigSchema/schema/AutoFormat.Linkify.txt
index 3a48ba960..3a48ba960 100755..100644
--- a/library/HTMLPurifier/ConfigSchema/schema/AutoFormat.Linkify.txt
+++ b/library/HTMLPurifier/ConfigSchema/schema/AutoFormat.Linkify.txt
diff --git a/library/HTMLPurifier/ConfigSchema/schema/AutoFormat.PurifierLinkify.DocURL.txt b/library/HTMLPurifier/ConfigSchema/schema/AutoFormat.PurifierLinkify.DocURL.txt
index db58b1346..db58b1346 100755..100644
--- a/library/HTMLPurifier/ConfigSchema/schema/AutoFormat.PurifierLinkify.DocURL.txt
+++ b/library/HTMLPurifier/ConfigSchema/schema/AutoFormat.PurifierLinkify.DocURL.txt
diff --git a/library/HTMLPurifier/ConfigSchema/schema/AutoFormat.PurifierLinkify.txt b/library/HTMLPurifier/ConfigSchema/schema/AutoFormat.PurifierLinkify.txt
index 7996488be..7996488be 100755..100644
--- a/library/HTMLPurifier/ConfigSchema/schema/AutoFormat.PurifierLinkify.txt
+++ b/library/HTMLPurifier/ConfigSchema/schema/AutoFormat.PurifierLinkify.txt
diff --git a/library/HTMLPurifier/ConfigSchema/schema/AutoFormat.RemoveEmpty.RemoveNbsp.Exceptions.txt b/library/HTMLPurifier/ConfigSchema/schema/AutoFormat.RemoveEmpty.RemoveNbsp.Exceptions.txt
index 35c393b4e..35c393b4e 100755..100644
--- a/library/HTMLPurifier/ConfigSchema/schema/AutoFormat.RemoveEmpty.RemoveNbsp.Exceptions.txt
+++ b/library/HTMLPurifier/ConfigSchema/schema/AutoFormat.RemoveEmpty.RemoveNbsp.Exceptions.txt
diff --git a/library/HTMLPurifier/ConfigSchema/schema/AutoFormat.RemoveEmpty.RemoveNbsp.txt b/library/HTMLPurifier/ConfigSchema/schema/AutoFormat.RemoveEmpty.RemoveNbsp.txt
index ca17eb1dc..ca17eb1dc 100755..100644
--- a/library/HTMLPurifier/ConfigSchema/schema/AutoFormat.RemoveEmpty.RemoveNbsp.txt
+++ b/library/HTMLPurifier/ConfigSchema/schema/AutoFormat.RemoveEmpty.RemoveNbsp.txt
diff --git a/library/HTMLPurifier/ConfigSchema/schema/AutoFormat.RemoveEmpty.txt b/library/HTMLPurifier/ConfigSchema/schema/AutoFormat.RemoveEmpty.txt
index 34657ba47..34657ba47 100755..100644
--- a/library/HTMLPurifier/ConfigSchema/schema/AutoFormat.RemoveEmpty.txt
+++ b/library/HTMLPurifier/ConfigSchema/schema/AutoFormat.RemoveEmpty.txt
diff --git a/library/HTMLPurifier/ConfigSchema/schema/AutoFormat.RemoveSpansWithoutAttributes.txt b/library/HTMLPurifier/ConfigSchema/schema/AutoFormat.RemoveSpansWithoutAttributes.txt
index dde990ab2..dde990ab2 100755..100644
--- a/library/HTMLPurifier/ConfigSchema/schema/AutoFormat.RemoveSpansWithoutAttributes.txt
+++ b/library/HTMLPurifier/ConfigSchema/schema/AutoFormat.RemoveSpansWithoutAttributes.txt
diff --git a/library/HTMLPurifier/ConfigSchema/schema/CSS.AllowImportant.txt b/library/HTMLPurifier/ConfigSchema/schema/CSS.AllowImportant.txt
index b324608f7..b324608f7 100755..100644
--- a/library/HTMLPurifier/ConfigSchema/schema/CSS.AllowImportant.txt
+++ b/library/HTMLPurifier/ConfigSchema/schema/CSS.AllowImportant.txt
diff --git a/library/HTMLPurifier/ConfigSchema/schema/CSS.AllowTricky.txt b/library/HTMLPurifier/ConfigSchema/schema/CSS.AllowTricky.txt
index 748be0eec..748be0eec 100755..100644
--- a/library/HTMLPurifier/ConfigSchema/schema/CSS.AllowTricky.txt
+++ b/library/HTMLPurifier/ConfigSchema/schema/CSS.AllowTricky.txt
diff --git a/library/HTMLPurifier/ConfigSchema/schema/CSS.AllowedProperties.txt b/library/HTMLPurifier/ConfigSchema/schema/CSS.AllowedProperties.txt
index 460112ebe..460112ebe 100755..100644
--- a/library/HTMLPurifier/ConfigSchema/schema/CSS.AllowedProperties.txt
+++ b/library/HTMLPurifier/ConfigSchema/schema/CSS.AllowedProperties.txt
diff --git a/library/HTMLPurifier/ConfigSchema/schema/CSS.DefinitionRev.txt b/library/HTMLPurifier/ConfigSchema/schema/CSS.DefinitionRev.txt
index 5cb7dda3b..5cb7dda3b 100755..100644
--- a/library/HTMLPurifier/ConfigSchema/schema/CSS.DefinitionRev.txt
+++ b/library/HTMLPurifier/ConfigSchema/schema/CSS.DefinitionRev.txt
diff --git a/library/HTMLPurifier/ConfigSchema/schema/CSS.MaxImgLength.txt b/library/HTMLPurifier/ConfigSchema/schema/CSS.MaxImgLength.txt
index 7a3291470..7a3291470 100755..100644
--- a/library/HTMLPurifier/ConfigSchema/schema/CSS.MaxImgLength.txt
+++ b/library/HTMLPurifier/ConfigSchema/schema/CSS.MaxImgLength.txt
diff --git a/library/HTMLPurifier/ConfigSchema/schema/CSS.Proprietary.txt b/library/HTMLPurifier/ConfigSchema/schema/CSS.Proprietary.txt
index 148eedb8b..148eedb8b 100755..100644
--- a/library/HTMLPurifier/ConfigSchema/schema/CSS.Proprietary.txt
+++ b/library/HTMLPurifier/ConfigSchema/schema/CSS.Proprietary.txt
diff --git a/library/HTMLPurifier/ConfigSchema/schema/Cache.DefinitionImpl.txt b/library/HTMLPurifier/ConfigSchema/schema/Cache.DefinitionImpl.txt
index c486724c8..c486724c8 100755..100644
--- a/library/HTMLPurifier/ConfigSchema/schema/Cache.DefinitionImpl.txt
+++ b/library/HTMLPurifier/ConfigSchema/schema/Cache.DefinitionImpl.txt
diff --git a/library/HTMLPurifier/ConfigSchema/schema/Cache.SerializerPath.txt b/library/HTMLPurifier/ConfigSchema/schema/Cache.SerializerPath.txt
index 54036507d..54036507d 100755..100644
--- a/library/HTMLPurifier/ConfigSchema/schema/Cache.SerializerPath.txt
+++ b/library/HTMLPurifier/ConfigSchema/schema/Cache.SerializerPath.txt
diff --git a/library/HTMLPurifier/ConfigSchema/schema/Core.AggressivelyFixLt.txt b/library/HTMLPurifier/ConfigSchema/schema/Core.AggressivelyFixLt.txt
index 568cbf3b3..568cbf3b3 100755..100644
--- a/library/HTMLPurifier/ConfigSchema/schema/Core.AggressivelyFixLt.txt
+++ b/library/HTMLPurifier/ConfigSchema/schema/Core.AggressivelyFixLt.txt
diff --git a/library/HTMLPurifier/ConfigSchema/schema/Core.CollectErrors.txt b/library/HTMLPurifier/ConfigSchema/schema/Core.CollectErrors.txt
index d7317911f..d7317911f 100755..100644
--- a/library/HTMLPurifier/ConfigSchema/schema/Core.CollectErrors.txt
+++ b/library/HTMLPurifier/ConfigSchema/schema/Core.CollectErrors.txt
diff --git a/library/HTMLPurifier/ConfigSchema/schema/Core.ColorKeywords.txt b/library/HTMLPurifier/ConfigSchema/schema/Core.ColorKeywords.txt
index 08b381d34..08b381d34 100755..100644
--- a/library/HTMLPurifier/ConfigSchema/schema/Core.ColorKeywords.txt
+++ b/library/HTMLPurifier/ConfigSchema/schema/Core.ColorKeywords.txt
diff --git a/library/HTMLPurifier/ConfigSchema/schema/Core.ConvertDocumentToFragment.txt b/library/HTMLPurifier/ConfigSchema/schema/Core.ConvertDocumentToFragment.txt
index 64b114fce..64b114fce 100755..100644
--- a/library/HTMLPurifier/ConfigSchema/schema/Core.ConvertDocumentToFragment.txt
+++ b/library/HTMLPurifier/ConfigSchema/schema/Core.ConvertDocumentToFragment.txt
diff --git a/library/HTMLPurifier/ConfigSchema/schema/Core.DirectLexLineNumberSyncInterval.txt b/library/HTMLPurifier/ConfigSchema/schema/Core.DirectLexLineNumberSyncInterval.txt
index 36f16e07e..36f16e07e 100755..100644
--- a/library/HTMLPurifier/ConfigSchema/schema/Core.DirectLexLineNumberSyncInterval.txt
+++ b/library/HTMLPurifier/ConfigSchema/schema/Core.DirectLexLineNumberSyncInterval.txt
diff --git a/library/HTMLPurifier/ConfigSchema/schema/Core.Encoding.txt b/library/HTMLPurifier/ConfigSchema/schema/Core.Encoding.txt
index 8bfb47c3a..8bfb47c3a 100755..100644
--- a/library/HTMLPurifier/ConfigSchema/schema/Core.Encoding.txt
+++ b/library/HTMLPurifier/ConfigSchema/schema/Core.Encoding.txt
diff --git a/library/HTMLPurifier/ConfigSchema/schema/Core.EscapeInvalidChildren.txt b/library/HTMLPurifier/ConfigSchema/schema/Core.EscapeInvalidChildren.txt
index 4d5b5055c..4d5b5055c 100755..100644
--- a/library/HTMLPurifier/ConfigSchema/schema/Core.EscapeInvalidChildren.txt
+++ b/library/HTMLPurifier/ConfigSchema/schema/Core.EscapeInvalidChildren.txt
diff --git a/library/HTMLPurifier/ConfigSchema/schema/Core.EscapeInvalidTags.txt b/library/HTMLPurifier/ConfigSchema/schema/Core.EscapeInvalidTags.txt
index a7a5b249b..a7a5b249b 100755..100644
--- a/library/HTMLPurifier/ConfigSchema/schema/Core.EscapeInvalidTags.txt
+++ b/library/HTMLPurifier/ConfigSchema/schema/Core.EscapeInvalidTags.txt
diff --git a/library/HTMLPurifier/ConfigSchema/schema/Core.EscapeNonASCIICharacters.txt b/library/HTMLPurifier/ConfigSchema/schema/Core.EscapeNonASCIICharacters.txt
index abb499948..abb499948 100755..100644
--- a/library/HTMLPurifier/ConfigSchema/schema/Core.EscapeNonASCIICharacters.txt
+++ b/library/HTMLPurifier/ConfigSchema/schema/Core.EscapeNonASCIICharacters.txt
diff --git a/library/HTMLPurifier/ConfigSchema/schema/Core.HiddenElements.txt b/library/HTMLPurifier/ConfigSchema/schema/Core.HiddenElements.txt
index 915391edb..915391edb 100755..100644
--- a/library/HTMLPurifier/ConfigSchema/schema/Core.HiddenElements.txt
+++ b/library/HTMLPurifier/ConfigSchema/schema/Core.HiddenElements.txt
diff --git a/library/HTMLPurifier/ConfigSchema/schema/Core.Language.txt b/library/HTMLPurifier/ConfigSchema/schema/Core.Language.txt
index 233fca14f..233fca14f 100755..100644
--- a/library/HTMLPurifier/ConfigSchema/schema/Core.Language.txt
+++ b/library/HTMLPurifier/ConfigSchema/schema/Core.Language.txt
diff --git a/library/HTMLPurifier/ConfigSchema/schema/Core.LexerImpl.txt b/library/HTMLPurifier/ConfigSchema/schema/Core.LexerImpl.txt
index 8983e2cca..8983e2cca 100755..100644
--- a/library/HTMLPurifier/ConfigSchema/schema/Core.LexerImpl.txt
+++ b/library/HTMLPurifier/ConfigSchema/schema/Core.LexerImpl.txt
diff --git a/library/HTMLPurifier/ConfigSchema/schema/Core.MaintainLineNumbers.txt b/library/HTMLPurifier/ConfigSchema/schema/Core.MaintainLineNumbers.txt
index eb841a759..eb841a759 100755..100644
--- a/library/HTMLPurifier/ConfigSchema/schema/Core.MaintainLineNumbers.txt
+++ b/library/HTMLPurifier/ConfigSchema/schema/Core.MaintainLineNumbers.txt
diff --git a/library/HTMLPurifier/ConfigSchema/schema/Core.RemoveInvalidImg.txt b/library/HTMLPurifier/ConfigSchema/schema/Core.RemoveInvalidImg.txt
index 4070c2a0d..4070c2a0d 100755..100644
--- a/library/HTMLPurifier/ConfigSchema/schema/Core.RemoveInvalidImg.txt
+++ b/library/HTMLPurifier/ConfigSchema/schema/Core.RemoveInvalidImg.txt
diff --git a/library/HTMLPurifier/ConfigSchema/schema/Core.RemoveScriptContents.txt b/library/HTMLPurifier/ConfigSchema/schema/Core.RemoveScriptContents.txt
index a4cd966df..a4cd966df 100755..100644
--- a/library/HTMLPurifier/ConfigSchema/schema/Core.RemoveScriptContents.txt
+++ b/library/HTMLPurifier/ConfigSchema/schema/Core.RemoveScriptContents.txt
diff --git a/library/HTMLPurifier/ConfigSchema/schema/Filter.Custom.txt b/library/HTMLPurifier/ConfigSchema/schema/Filter.Custom.txt
index 3db50ef20..3db50ef20 100755..100644
--- a/library/HTMLPurifier/ConfigSchema/schema/Filter.Custom.txt
+++ b/library/HTMLPurifier/ConfigSchema/schema/Filter.Custom.txt
diff --git a/library/HTMLPurifier/ConfigSchema/schema/Filter.ExtractStyleBlocks.Escaping.txt b/library/HTMLPurifier/ConfigSchema/schema/Filter.ExtractStyleBlocks.Escaping.txt
index 16829bcda..16829bcda 100755..100644
--- a/library/HTMLPurifier/ConfigSchema/schema/Filter.ExtractStyleBlocks.Escaping.txt
+++ b/library/HTMLPurifier/ConfigSchema/schema/Filter.ExtractStyleBlocks.Escaping.txt
diff --git a/library/HTMLPurifier/ConfigSchema/schema/Filter.ExtractStyleBlocks.Scope.txt b/library/HTMLPurifier/ConfigSchema/schema/Filter.ExtractStyleBlocks.Scope.txt
index 7f95f54d1..7f95f54d1 100755..100644
--- a/library/HTMLPurifier/ConfigSchema/schema/Filter.ExtractStyleBlocks.Scope.txt
+++ b/library/HTMLPurifier/ConfigSchema/schema/Filter.ExtractStyleBlocks.Scope.txt
diff --git a/library/HTMLPurifier/ConfigSchema/schema/Filter.ExtractStyleBlocks.TidyImpl.txt b/library/HTMLPurifier/ConfigSchema/schema/Filter.ExtractStyleBlocks.TidyImpl.txt
index 6c231b2d7..6c231b2d7 100755..100644
--- a/library/HTMLPurifier/ConfigSchema/schema/Filter.ExtractStyleBlocks.TidyImpl.txt
+++ b/library/HTMLPurifier/ConfigSchema/schema/Filter.ExtractStyleBlocks.TidyImpl.txt
diff --git a/library/HTMLPurifier/ConfigSchema/schema/Filter.ExtractStyleBlocks.txt b/library/HTMLPurifier/ConfigSchema/schema/Filter.ExtractStyleBlocks.txt
index 078d08741..078d08741 100755..100644
--- a/library/HTMLPurifier/ConfigSchema/schema/Filter.ExtractStyleBlocks.txt
+++ b/library/HTMLPurifier/ConfigSchema/schema/Filter.ExtractStyleBlocks.txt
diff --git a/library/HTMLPurifier/ConfigSchema/schema/Filter.YouTube.txt b/library/HTMLPurifier/ConfigSchema/schema/Filter.YouTube.txt
index 7fa6536b2..7fa6536b2 100755..100644
--- a/library/HTMLPurifier/ConfigSchema/schema/Filter.YouTube.txt
+++ b/library/HTMLPurifier/ConfigSchema/schema/Filter.YouTube.txt
diff --git a/library/HTMLPurifier/ConfigSchema/schema/HTML.Allowed.txt b/library/HTMLPurifier/ConfigSchema/schema/HTML.Allowed.txt
index 3e231d2d1..3e231d2d1 100755..100644
--- a/library/HTMLPurifier/ConfigSchema/schema/HTML.Allowed.txt
+++ b/library/HTMLPurifier/ConfigSchema/schema/HTML.Allowed.txt
diff --git a/library/HTMLPurifier/ConfigSchema/schema/HTML.AllowedAttributes.txt b/library/HTMLPurifier/ConfigSchema/schema/HTML.AllowedAttributes.txt
index fcf093f17..fcf093f17 100755..100644
--- a/library/HTMLPurifier/ConfigSchema/schema/HTML.AllowedAttributes.txt
+++ b/library/HTMLPurifier/ConfigSchema/schema/HTML.AllowedAttributes.txt
diff --git a/library/HTMLPurifier/ConfigSchema/schema/HTML.AllowedElements.txt b/library/HTMLPurifier/ConfigSchema/schema/HTML.AllowedElements.txt
index 888d55819..888d55819 100755..100644
--- a/library/HTMLPurifier/ConfigSchema/schema/HTML.AllowedElements.txt
+++ b/library/HTMLPurifier/ConfigSchema/schema/HTML.AllowedElements.txt
diff --git a/library/HTMLPurifier/ConfigSchema/schema/HTML.AllowedModules.txt b/library/HTMLPurifier/ConfigSchema/schema/HTML.AllowedModules.txt
index 5a59a55c0..5a59a55c0 100755..100644
--- a/library/HTMLPurifier/ConfigSchema/schema/HTML.AllowedModules.txt
+++ b/library/HTMLPurifier/ConfigSchema/schema/HTML.AllowedModules.txt
diff --git a/library/HTMLPurifier/ConfigSchema/schema/HTML.Attr.Name.UseCDATA.txt b/library/HTMLPurifier/ConfigSchema/schema/HTML.Attr.Name.UseCDATA.txt
index 151fb7b82..151fb7b82 100755..100644
--- a/library/HTMLPurifier/ConfigSchema/schema/HTML.Attr.Name.UseCDATA.txt
+++ b/library/HTMLPurifier/ConfigSchema/schema/HTML.Attr.Name.UseCDATA.txt
diff --git a/library/HTMLPurifier/ConfigSchema/schema/HTML.BlockWrapper.txt b/library/HTMLPurifier/ConfigSchema/schema/HTML.BlockWrapper.txt
index 45ae469ec..45ae469ec 100755..100644
--- a/library/HTMLPurifier/ConfigSchema/schema/HTML.BlockWrapper.txt
+++ b/library/HTMLPurifier/ConfigSchema/schema/HTML.BlockWrapper.txt
diff --git a/library/HTMLPurifier/ConfigSchema/schema/HTML.CoreModules.txt b/library/HTMLPurifier/ConfigSchema/schema/HTML.CoreModules.txt
index 524618879..524618879 100755..100644
--- a/library/HTMLPurifier/ConfigSchema/schema/HTML.CoreModules.txt
+++ b/library/HTMLPurifier/ConfigSchema/schema/HTML.CoreModules.txt
diff --git a/library/HTMLPurifier/ConfigSchema/schema/HTML.CustomDoctype.txt b/library/HTMLPurifier/ConfigSchema/schema/HTML.CustomDoctype.txt
index a64e3d7c3..a64e3d7c3 100755..100644
--- a/library/HTMLPurifier/ConfigSchema/schema/HTML.CustomDoctype.txt
+++ b/library/HTMLPurifier/ConfigSchema/schema/HTML.CustomDoctype.txt
diff --git a/library/HTMLPurifier/ConfigSchema/schema/HTML.DefinitionID.txt b/library/HTMLPurifier/ConfigSchema/schema/HTML.DefinitionID.txt
index 103db754a..103db754a 100755..100644
--- a/library/HTMLPurifier/ConfigSchema/schema/HTML.DefinitionID.txt
+++ b/library/HTMLPurifier/ConfigSchema/schema/HTML.DefinitionID.txt
diff --git a/library/HTMLPurifier/ConfigSchema/schema/HTML.DefinitionRev.txt b/library/HTMLPurifier/ConfigSchema/schema/HTML.DefinitionRev.txt
index 229ae0267..229ae0267 100755..100644
--- a/library/HTMLPurifier/ConfigSchema/schema/HTML.DefinitionRev.txt
+++ b/library/HTMLPurifier/ConfigSchema/schema/HTML.DefinitionRev.txt
diff --git a/library/HTMLPurifier/ConfigSchema/schema/HTML.Doctype.txt b/library/HTMLPurifier/ConfigSchema/schema/HTML.Doctype.txt
index 9dab497f2..9dab497f2 100755..100644
--- a/library/HTMLPurifier/ConfigSchema/schema/HTML.Doctype.txt
+++ b/library/HTMLPurifier/ConfigSchema/schema/HTML.Doctype.txt
diff --git a/library/HTMLPurifier/ConfigSchema/schema/HTML.ForbiddenAttributes.txt b/library/HTMLPurifier/ConfigSchema/schema/HTML.ForbiddenAttributes.txt
index 57358f9ba..57358f9ba 100755..100644
--- a/library/HTMLPurifier/ConfigSchema/schema/HTML.ForbiddenAttributes.txt
+++ b/library/HTMLPurifier/ConfigSchema/schema/HTML.ForbiddenAttributes.txt
diff --git a/library/HTMLPurifier/ConfigSchema/schema/HTML.ForbiddenElements.txt b/library/HTMLPurifier/ConfigSchema/schema/HTML.ForbiddenElements.txt
index 93a53e14f..93a53e14f 100755..100644
--- a/library/HTMLPurifier/ConfigSchema/schema/HTML.ForbiddenElements.txt
+++ b/library/HTMLPurifier/ConfigSchema/schema/HTML.ForbiddenElements.txt
diff --git a/library/HTMLPurifier/ConfigSchema/schema/HTML.MaxImgLength.txt b/library/HTMLPurifier/ConfigSchema/schema/HTML.MaxImgLength.txt
index e424c386e..e424c386e 100755..100644
--- a/library/HTMLPurifier/ConfigSchema/schema/HTML.MaxImgLength.txt
+++ b/library/HTMLPurifier/ConfigSchema/schema/HTML.MaxImgLength.txt
diff --git a/library/HTMLPurifier/ConfigSchema/schema/HTML.Parent.txt b/library/HTMLPurifier/ConfigSchema/schema/HTML.Parent.txt
index 62e8e160c..62e8e160c 100755..100644
--- a/library/HTMLPurifier/ConfigSchema/schema/HTML.Parent.txt
+++ b/library/HTMLPurifier/ConfigSchema/schema/HTML.Parent.txt
diff --git a/library/HTMLPurifier/ConfigSchema/schema/HTML.Proprietary.txt b/library/HTMLPurifier/ConfigSchema/schema/HTML.Proprietary.txt
index dfb720496..dfb720496 100755..100644
--- a/library/HTMLPurifier/ConfigSchema/schema/HTML.Proprietary.txt
+++ b/library/HTMLPurifier/ConfigSchema/schema/HTML.Proprietary.txt
diff --git a/library/HTMLPurifier/ConfigSchema/schema/HTML.SafeEmbed.txt b/library/HTMLPurifier/ConfigSchema/schema/HTML.SafeEmbed.txt
index cdda09a4c..cdda09a4c 100755..100644
--- a/library/HTMLPurifier/ConfigSchema/schema/HTML.SafeEmbed.txt
+++ b/library/HTMLPurifier/ConfigSchema/schema/HTML.SafeEmbed.txt
diff --git a/library/HTMLPurifier/ConfigSchema/schema/HTML.SafeObject.txt b/library/HTMLPurifier/ConfigSchema/schema/HTML.SafeObject.txt
index ceb342e22..ceb342e22 100755..100644
--- a/library/HTMLPurifier/ConfigSchema/schema/HTML.SafeObject.txt
+++ b/library/HTMLPurifier/ConfigSchema/schema/HTML.SafeObject.txt
diff --git a/library/HTMLPurifier/ConfigSchema/schema/HTML.Strict.txt b/library/HTMLPurifier/ConfigSchema/schema/HTML.Strict.txt
index a8b1de56b..a8b1de56b 100755..100644
--- a/library/HTMLPurifier/ConfigSchema/schema/HTML.Strict.txt
+++ b/library/HTMLPurifier/ConfigSchema/schema/HTML.Strict.txt
diff --git a/library/HTMLPurifier/ConfigSchema/schema/HTML.TidyAdd.txt b/library/HTMLPurifier/ConfigSchema/schema/HTML.TidyAdd.txt
index b4c271b7f..b4c271b7f 100755..100644
--- a/library/HTMLPurifier/ConfigSchema/schema/HTML.TidyAdd.txt
+++ b/library/HTMLPurifier/ConfigSchema/schema/HTML.TidyAdd.txt
diff --git a/library/HTMLPurifier/ConfigSchema/schema/HTML.TidyLevel.txt b/library/HTMLPurifier/ConfigSchema/schema/HTML.TidyLevel.txt
index 4186ccd0d..4186ccd0d 100755..100644
--- a/library/HTMLPurifier/ConfigSchema/schema/HTML.TidyLevel.txt
+++ b/library/HTMLPurifier/ConfigSchema/schema/HTML.TidyLevel.txt
diff --git a/library/HTMLPurifier/ConfigSchema/schema/HTML.TidyRemove.txt b/library/HTMLPurifier/ConfigSchema/schema/HTML.TidyRemove.txt
index 996762bd1..996762bd1 100755..100644
--- a/library/HTMLPurifier/ConfigSchema/schema/HTML.TidyRemove.txt
+++ b/library/HTMLPurifier/ConfigSchema/schema/HTML.TidyRemove.txt
diff --git a/library/HTMLPurifier/ConfigSchema/schema/HTML.Trusted.txt b/library/HTMLPurifier/ConfigSchema/schema/HTML.Trusted.txt
index 89133b1a3..89133b1a3 100755..100644
--- a/library/HTMLPurifier/ConfigSchema/schema/HTML.Trusted.txt
+++ b/library/HTMLPurifier/ConfigSchema/schema/HTML.Trusted.txt
diff --git a/library/HTMLPurifier/ConfigSchema/schema/HTML.XHTML.txt b/library/HTMLPurifier/ConfigSchema/schema/HTML.XHTML.txt
index 2a47e384f..2a47e384f 100755..100644
--- a/library/HTMLPurifier/ConfigSchema/schema/HTML.XHTML.txt
+++ b/library/HTMLPurifier/ConfigSchema/schema/HTML.XHTML.txt
diff --git a/library/HTMLPurifier/ConfigSchema/schema/Output.CommentScriptContents.txt b/library/HTMLPurifier/ConfigSchema/schema/Output.CommentScriptContents.txt
index 08921fde7..08921fde7 100755..100644
--- a/library/HTMLPurifier/ConfigSchema/schema/Output.CommentScriptContents.txt
+++ b/library/HTMLPurifier/ConfigSchema/schema/Output.CommentScriptContents.txt
diff --git a/library/HTMLPurifier/ConfigSchema/schema/Output.FlashCompat.txt b/library/HTMLPurifier/ConfigSchema/schema/Output.FlashCompat.txt
index 93398e859..93398e859 100755..100644
--- a/library/HTMLPurifier/ConfigSchema/schema/Output.FlashCompat.txt
+++ b/library/HTMLPurifier/ConfigSchema/schema/Output.FlashCompat.txt
diff --git a/library/HTMLPurifier/ConfigSchema/schema/Output.Newline.txt b/library/HTMLPurifier/ConfigSchema/schema/Output.Newline.txt
index 79f8ad82c..79f8ad82c 100755..100644
--- a/library/HTMLPurifier/ConfigSchema/schema/Output.Newline.txt
+++ b/library/HTMLPurifier/ConfigSchema/schema/Output.Newline.txt
diff --git a/library/HTMLPurifier/ConfigSchema/schema/Output.SortAttr.txt b/library/HTMLPurifier/ConfigSchema/schema/Output.SortAttr.txt
index 232b02362..232b02362 100755..100644
--- a/library/HTMLPurifier/ConfigSchema/schema/Output.SortAttr.txt
+++ b/library/HTMLPurifier/ConfigSchema/schema/Output.SortAttr.txt
diff --git a/library/HTMLPurifier/ConfigSchema/schema/Output.TidyFormat.txt b/library/HTMLPurifier/ConfigSchema/schema/Output.TidyFormat.txt
index 06bab00a0..06bab00a0 100755..100644
--- a/library/HTMLPurifier/ConfigSchema/schema/Output.TidyFormat.txt
+++ b/library/HTMLPurifier/ConfigSchema/schema/Output.TidyFormat.txt
diff --git a/library/HTMLPurifier/ConfigSchema/schema/Test.ForceNoIconv.txt b/library/HTMLPurifier/ConfigSchema/schema/Test.ForceNoIconv.txt
index 071bc0295..071bc0295 100755..100644
--- a/library/HTMLPurifier/ConfigSchema/schema/Test.ForceNoIconv.txt
+++ b/library/HTMLPurifier/ConfigSchema/schema/Test.ForceNoIconv.txt
diff --git a/library/HTMLPurifier/ConfigSchema/schema/URI.AllowedSchemes.txt b/library/HTMLPurifier/ConfigSchema/schema/URI.AllowedSchemes.txt
index ae3a913f2..ae3a913f2 100755..100644
--- a/library/HTMLPurifier/ConfigSchema/schema/URI.AllowedSchemes.txt
+++ b/library/HTMLPurifier/ConfigSchema/schema/URI.AllowedSchemes.txt
diff --git a/library/HTMLPurifier/ConfigSchema/schema/URI.Base.txt b/library/HTMLPurifier/ConfigSchema/schema/URI.Base.txt
index 876f0680c..876f0680c 100755..100644
--- a/library/HTMLPurifier/ConfigSchema/schema/URI.Base.txt
+++ b/library/HTMLPurifier/ConfigSchema/schema/URI.Base.txt
diff --git a/library/HTMLPurifier/ConfigSchema/schema/URI.DefaultScheme.txt b/library/HTMLPurifier/ConfigSchema/schema/URI.DefaultScheme.txt
index 728e378cb..728e378cb 100755..100644
--- a/library/HTMLPurifier/ConfigSchema/schema/URI.DefaultScheme.txt
+++ b/library/HTMLPurifier/ConfigSchema/schema/URI.DefaultScheme.txt
diff --git a/library/HTMLPurifier/ConfigSchema/schema/URI.DefinitionID.txt b/library/HTMLPurifier/ConfigSchema/schema/URI.DefinitionID.txt
index f05312ba8..f05312ba8 100755..100644
--- a/library/HTMLPurifier/ConfigSchema/schema/URI.DefinitionID.txt
+++ b/library/HTMLPurifier/ConfigSchema/schema/URI.DefinitionID.txt
diff --git a/library/HTMLPurifier/ConfigSchema/schema/URI.DefinitionRev.txt b/library/HTMLPurifier/ConfigSchema/schema/URI.DefinitionRev.txt
index 80cfea93f..80cfea93f 100755..100644
--- a/library/HTMLPurifier/ConfigSchema/schema/URI.DefinitionRev.txt
+++ b/library/HTMLPurifier/ConfigSchema/schema/URI.DefinitionRev.txt
diff --git a/library/HTMLPurifier/ConfigSchema/schema/URI.Disable.txt b/library/HTMLPurifier/ConfigSchema/schema/URI.Disable.txt
index 71ce025a2..71ce025a2 100755..100644
--- a/library/HTMLPurifier/ConfigSchema/schema/URI.Disable.txt
+++ b/library/HTMLPurifier/ConfigSchema/schema/URI.Disable.txt
diff --git a/library/HTMLPurifier/ConfigSchema/schema/URI.DisableExternal.txt b/library/HTMLPurifier/ConfigSchema/schema/URI.DisableExternal.txt
index 13c122c8c..13c122c8c 100755..100644
--- a/library/HTMLPurifier/ConfigSchema/schema/URI.DisableExternal.txt
+++ b/library/HTMLPurifier/ConfigSchema/schema/URI.DisableExternal.txt
diff --git a/library/HTMLPurifier/ConfigSchema/schema/URI.DisableExternalResources.txt b/library/HTMLPurifier/ConfigSchema/schema/URI.DisableExternalResources.txt
index abcc1efd6..abcc1efd6 100755..100644
--- a/library/HTMLPurifier/ConfigSchema/schema/URI.DisableExternalResources.txt
+++ b/library/HTMLPurifier/ConfigSchema/schema/URI.DisableExternalResources.txt
diff --git a/library/HTMLPurifier/ConfigSchema/schema/URI.DisableResources.txt b/library/HTMLPurifier/ConfigSchema/schema/URI.DisableResources.txt
index 51e6ea91f..51e6ea91f 100755..100644
--- a/library/HTMLPurifier/ConfigSchema/schema/URI.DisableResources.txt
+++ b/library/HTMLPurifier/ConfigSchema/schema/URI.DisableResources.txt
diff --git a/library/HTMLPurifier/ConfigSchema/schema/URI.Host.txt b/library/HTMLPurifier/ConfigSchema/schema/URI.Host.txt
index ee83b121d..ee83b121d 100755..100644
--- a/library/HTMLPurifier/ConfigSchema/schema/URI.Host.txt
+++ b/library/HTMLPurifier/ConfigSchema/schema/URI.Host.txt
diff --git a/library/HTMLPurifier/ConfigSchema/schema/URI.HostBlacklist.txt b/library/HTMLPurifier/ConfigSchema/schema/URI.HostBlacklist.txt
index 0b6df7625..0b6df7625 100755..100644
--- a/library/HTMLPurifier/ConfigSchema/schema/URI.HostBlacklist.txt
+++ b/library/HTMLPurifier/ConfigSchema/schema/URI.HostBlacklist.txt
diff --git a/library/HTMLPurifier/ConfigSchema/schema/URI.MakeAbsolute.txt b/library/HTMLPurifier/ConfigSchema/schema/URI.MakeAbsolute.txt
index 4214900a5..4214900a5 100755..100644
--- a/library/HTMLPurifier/ConfigSchema/schema/URI.MakeAbsolute.txt
+++ b/library/HTMLPurifier/ConfigSchema/schema/URI.MakeAbsolute.txt
diff --git a/library/HTMLPurifier/ConfigSchema/schema/URI.Munge.txt b/library/HTMLPurifier/ConfigSchema/schema/URI.Munge.txt
index 58c81dcc4..58c81dcc4 100755..100644
--- a/library/HTMLPurifier/ConfigSchema/schema/URI.Munge.txt
+++ b/library/HTMLPurifier/ConfigSchema/schema/URI.Munge.txt
diff --git a/library/HTMLPurifier/ConfigSchema/schema/URI.MungeResources.txt b/library/HTMLPurifier/ConfigSchema/schema/URI.MungeResources.txt
index 6fce0fdc3..6fce0fdc3 100755..100644
--- a/library/HTMLPurifier/ConfigSchema/schema/URI.MungeResources.txt
+++ b/library/HTMLPurifier/ConfigSchema/schema/URI.MungeResources.txt
diff --git a/library/HTMLPurifier/ConfigSchema/schema/URI.MungeSecretKey.txt b/library/HTMLPurifier/ConfigSchema/schema/URI.MungeSecretKey.txt
index 0d00f62ea..0d00f62ea 100755..100644
--- a/library/HTMLPurifier/ConfigSchema/schema/URI.MungeSecretKey.txt
+++ b/library/HTMLPurifier/ConfigSchema/schema/URI.MungeSecretKey.txt
diff --git a/library/HTMLPurifier/ConfigSchema/schema/URI.OverrideAllowedSchemes.txt b/library/HTMLPurifier/ConfigSchema/schema/URI.OverrideAllowedSchemes.txt
index 23331a4e7..23331a4e7 100755..100644
--- a/library/HTMLPurifier/ConfigSchema/schema/URI.OverrideAllowedSchemes.txt
+++ b/library/HTMLPurifier/ConfigSchema/schema/URI.OverrideAllowedSchemes.txt
diff --git a/library/HTMLPurifier/ConfigSchema/schema/info.ini b/library/HTMLPurifier/ConfigSchema/schema/info.ini
index 5de4505e1..5de4505e1 100755..100644
--- a/library/HTMLPurifier/ConfigSchema/schema/info.ini
+++ b/library/HTMLPurifier/ConfigSchema/schema/info.ini
diff --git a/library/HTMLPurifier/ContentSets.php b/library/HTMLPurifier/ContentSets.php
index 3b6e96f5f..3b6e96f5f 100755..100644
--- a/library/HTMLPurifier/ContentSets.php
+++ b/library/HTMLPurifier/ContentSets.php
diff --git a/library/HTMLPurifier/Context.php b/library/HTMLPurifier/Context.php
index 9ddf0c547..9ddf0c547 100755..100644
--- a/library/HTMLPurifier/Context.php
+++ b/library/HTMLPurifier/Context.php
diff --git a/library/HTMLPurifier/Definition.php b/library/HTMLPurifier/Definition.php
index a7408c974..a7408c974 100755..100644
--- a/library/HTMLPurifier/Definition.php
+++ b/library/HTMLPurifier/Definition.php
diff --git a/library/HTMLPurifier/DefinitionCache.php b/library/HTMLPurifier/DefinitionCache.php
index c6e1e388c..c6e1e388c 100755..100644
--- a/library/HTMLPurifier/DefinitionCache.php
+++ b/library/HTMLPurifier/DefinitionCache.php
diff --git a/library/HTMLPurifier/DefinitionCache/Decorator.php b/library/HTMLPurifier/DefinitionCache/Decorator.php
index b0fb6d0cd..b0fb6d0cd 100755..100644
--- a/library/HTMLPurifier/DefinitionCache/Decorator.php
+++ b/library/HTMLPurifier/DefinitionCache/Decorator.php
diff --git a/library/HTMLPurifier/DefinitionCache/Decorator/Cleanup.php b/library/HTMLPurifier/DefinitionCache/Decorator/Cleanup.php
index d4cc35c4b..d4cc35c4b 100755..100644
--- a/library/HTMLPurifier/DefinitionCache/Decorator/Cleanup.php
+++ b/library/HTMLPurifier/DefinitionCache/Decorator/Cleanup.php
diff --git a/library/HTMLPurifier/DefinitionCache/Decorator/Memory.php b/library/HTMLPurifier/DefinitionCache/Decorator/Memory.php
index 18f16d32b..18f16d32b 100755..100644
--- a/library/HTMLPurifier/DefinitionCache/Decorator/Memory.php
+++ b/library/HTMLPurifier/DefinitionCache/Decorator/Memory.php
diff --git a/library/HTMLPurifier/DefinitionCache/Decorator/Template.php.in b/library/HTMLPurifier/DefinitionCache/Decorator/Template.php.in
index 21a8fcfda..21a8fcfda 100755..100644
--- a/library/HTMLPurifier/DefinitionCache/Decorator/Template.php.in
+++ b/library/HTMLPurifier/DefinitionCache/Decorator/Template.php.in
diff --git a/library/HTMLPurifier/DefinitionCache/Null.php b/library/HTMLPurifier/DefinitionCache/Null.php
index 41d97e734..41d97e734 100755..100644
--- a/library/HTMLPurifier/DefinitionCache/Null.php
+++ b/library/HTMLPurifier/DefinitionCache/Null.php
diff --git a/library/HTMLPurifier/DefinitionCache/Serializer.php b/library/HTMLPurifier/DefinitionCache/Serializer.php
index 7a6aa93f0..7a6aa93f0 100755..100644
--- a/library/HTMLPurifier/DefinitionCache/Serializer.php
+++ b/library/HTMLPurifier/DefinitionCache/Serializer.php
diff --git a/library/HTMLPurifier/DefinitionCache/Serializer/README b/library/HTMLPurifier/DefinitionCache/Serializer/README
index 2e35c1c3d..2e35c1c3d 100755..100644
--- a/library/HTMLPurifier/DefinitionCache/Serializer/README
+++ b/library/HTMLPurifier/DefinitionCache/Serializer/README
diff --git a/library/HTMLPurifier/DefinitionCacheFactory.php b/library/HTMLPurifier/DefinitionCacheFactory.php
index a6ead6281..a6ead6281 100755..100644
--- a/library/HTMLPurifier/DefinitionCacheFactory.php
+++ b/library/HTMLPurifier/DefinitionCacheFactory.php
diff --git a/library/HTMLPurifier/Doctype.php b/library/HTMLPurifier/Doctype.php
index 1e3c574c0..1e3c574c0 100755..100644
--- a/library/HTMLPurifier/Doctype.php
+++ b/library/HTMLPurifier/Doctype.php
diff --git a/library/HTMLPurifier/DoctypeRegistry.php b/library/HTMLPurifier/DoctypeRegistry.php
index 86049e939..86049e939 100755..100644
--- a/library/HTMLPurifier/DoctypeRegistry.php
+++ b/library/HTMLPurifier/DoctypeRegistry.php
diff --git a/library/HTMLPurifier/ElementDef.php b/library/HTMLPurifier/ElementDef.php
index 5498d9567..5498d9567 100755..100644
--- a/library/HTMLPurifier/ElementDef.php
+++ b/library/HTMLPurifier/ElementDef.php
diff --git a/library/HTMLPurifier/Encoder.php b/library/HTMLPurifier/Encoder.php
index 2b3140caa..2b3140caa 100755..100644
--- a/library/HTMLPurifier/Encoder.php
+++ b/library/HTMLPurifier/Encoder.php
diff --git a/library/HTMLPurifier/EntityLookup.php b/library/HTMLPurifier/EntityLookup.php
index b4dfce94c..b4dfce94c 100755..100644
--- a/library/HTMLPurifier/EntityLookup.php
+++ b/library/HTMLPurifier/EntityLookup.php
diff --git a/library/HTMLPurifier/EntityLookup/entities.ser b/library/HTMLPurifier/EntityLookup/entities.ser
index f2b8b8f2d..f2b8b8f2d 100755..100644
--- a/library/HTMLPurifier/EntityLookup/entities.ser
+++ b/library/HTMLPurifier/EntityLookup/entities.ser
diff --git a/library/HTMLPurifier/EntityParser.php b/library/HTMLPurifier/EntityParser.php
index 8c384472d..8c384472d 100755..100644
--- a/library/HTMLPurifier/EntityParser.php
+++ b/library/HTMLPurifier/EntityParser.php
diff --git a/library/HTMLPurifier/ErrorCollector.php b/library/HTMLPurifier/ErrorCollector.php
index 6713eaf77..6713eaf77 100755..100644
--- a/library/HTMLPurifier/ErrorCollector.php
+++ b/library/HTMLPurifier/ErrorCollector.php
diff --git a/library/HTMLPurifier/ErrorStruct.php b/library/HTMLPurifier/ErrorStruct.php
index 9bc8996ec..9bc8996ec 100755..100644
--- a/library/HTMLPurifier/ErrorStruct.php
+++ b/library/HTMLPurifier/ErrorStruct.php
diff --git a/library/HTMLPurifier/Exception.php b/library/HTMLPurifier/Exception.php
index be85b4c56..be85b4c56 100755..100644
--- a/library/HTMLPurifier/Exception.php
+++ b/library/HTMLPurifier/Exception.php
diff --git a/library/HTMLPurifier/Filter.php b/library/HTMLPurifier/Filter.php
index 9a0e7b09f..9a0e7b09f 100755..100644
--- a/library/HTMLPurifier/Filter.php
+++ b/library/HTMLPurifier/Filter.php
diff --git a/library/HTMLPurifier/Filter/ExtractStyleBlocks.php b/library/HTMLPurifier/Filter/ExtractStyleBlocks.php
index bbf78a663..bbf78a663 100755..100644
--- a/library/HTMLPurifier/Filter/ExtractStyleBlocks.php
+++ b/library/HTMLPurifier/Filter/ExtractStyleBlocks.php
diff --git a/library/HTMLPurifier/Filter/YouTube.php b/library/HTMLPurifier/Filter/YouTube.php
index 23df221ea..23df221ea 100755..100644
--- a/library/HTMLPurifier/Filter/YouTube.php
+++ b/library/HTMLPurifier/Filter/YouTube.php
diff --git a/library/HTMLPurifier/Generator.php b/library/HTMLPurifier/Generator.php
index 4a6241727..4a6241727 100755..100644
--- a/library/HTMLPurifier/Generator.php
+++ b/library/HTMLPurifier/Generator.php
diff --git a/library/HTMLPurifier/HTMLDefinition.php b/library/HTMLPurifier/HTMLDefinition.php
index c99ac11eb..c99ac11eb 100755..100644
--- a/library/HTMLPurifier/HTMLDefinition.php
+++ b/library/HTMLPurifier/HTMLDefinition.php
diff --git a/library/HTMLPurifier/HTMLModule.php b/library/HTMLPurifier/HTMLModule.php
index 072cf6808..072cf6808 100755..100644
--- a/library/HTMLPurifier/HTMLModule.php
+++ b/library/HTMLPurifier/HTMLModule.php
diff --git a/library/HTMLPurifier/HTMLModule/Bdo.php b/library/HTMLPurifier/HTMLModule/Bdo.php
index 3d66f1b4e..3d66f1b4e 100755..100644
--- a/library/HTMLPurifier/HTMLModule/Bdo.php
+++ b/library/HTMLPurifier/HTMLModule/Bdo.php
diff --git a/library/HTMLPurifier/HTMLModule/CommonAttributes.php b/library/HTMLPurifier/HTMLModule/CommonAttributes.php
index 7c15da84f..7c15da84f 100755..100644
--- a/library/HTMLPurifier/HTMLModule/CommonAttributes.php
+++ b/library/HTMLPurifier/HTMLModule/CommonAttributes.php
diff --git a/library/HTMLPurifier/HTMLModule/Edit.php b/library/HTMLPurifier/HTMLModule/Edit.php
index ff9369055..ff9369055 100755..100644
--- a/library/HTMLPurifier/HTMLModule/Edit.php
+++ b/library/HTMLPurifier/HTMLModule/Edit.php
diff --git a/library/HTMLPurifier/HTMLModule/Forms.php b/library/HTMLPurifier/HTMLModule/Forms.php
index 44c22f6f8..44c22f6f8 100755..100644
--- a/library/HTMLPurifier/HTMLModule/Forms.php
+++ b/library/HTMLPurifier/HTMLModule/Forms.php
diff --git a/library/HTMLPurifier/HTMLModule/Hypertext.php b/library/HTMLPurifier/HTMLModule/Hypertext.php
index d7e9bdd27..d7e9bdd27 100755..100644
--- a/library/HTMLPurifier/HTMLModule/Hypertext.php
+++ b/library/HTMLPurifier/HTMLModule/Hypertext.php
diff --git a/library/HTMLPurifier/HTMLModule/Image.php b/library/HTMLPurifier/HTMLModule/Image.php
index 948d435bc..948d435bc 100755..100644
--- a/library/HTMLPurifier/HTMLModule/Image.php
+++ b/library/HTMLPurifier/HTMLModule/Image.php
diff --git a/library/HTMLPurifier/HTMLModule/Legacy.php b/library/HTMLPurifier/HTMLModule/Legacy.php
index df33927ba..df33927ba 100755..100644
--- a/library/HTMLPurifier/HTMLModule/Legacy.php
+++ b/library/HTMLPurifier/HTMLModule/Legacy.php
diff --git a/library/HTMLPurifier/HTMLModule/List.php b/library/HTMLPurifier/HTMLModule/List.php
index 74d4522f4..74d4522f4 100755..100644
--- a/library/HTMLPurifier/HTMLModule/List.php
+++ b/library/HTMLPurifier/HTMLModule/List.php
diff --git a/library/HTMLPurifier/HTMLModule/Name.php b/library/HTMLPurifier/HTMLModule/Name.php
index 05694b450..05694b450 100755..100644
--- a/library/HTMLPurifier/HTMLModule/Name.php
+++ b/library/HTMLPurifier/HTMLModule/Name.php
diff --git a/library/HTMLPurifier/HTMLModule/NonXMLCommonAttributes.php b/library/HTMLPurifier/HTMLModule/NonXMLCommonAttributes.php
index 5f1b14abb..5f1b14abb 100755..100644
--- a/library/HTMLPurifier/HTMLModule/NonXMLCommonAttributes.php
+++ b/library/HTMLPurifier/HTMLModule/NonXMLCommonAttributes.php
diff --git a/library/HTMLPurifier/HTMLModule/Object.php b/library/HTMLPurifier/HTMLModule/Object.php
index 193c1011f..193c1011f 100755..100644
--- a/library/HTMLPurifier/HTMLModule/Object.php
+++ b/library/HTMLPurifier/HTMLModule/Object.php
diff --git a/library/HTMLPurifier/HTMLModule/Presentation.php b/library/HTMLPurifier/HTMLModule/Presentation.php
index 8ff0b5ed7..8ff0b5ed7 100755..100644
--- a/library/HTMLPurifier/HTMLModule/Presentation.php
+++ b/library/HTMLPurifier/HTMLModule/Presentation.php
diff --git a/library/HTMLPurifier/HTMLModule/Proprietary.php b/library/HTMLPurifier/HTMLModule/Proprietary.php
index dd36a3de0..dd36a3de0 100755..100644
--- a/library/HTMLPurifier/HTMLModule/Proprietary.php
+++ b/library/HTMLPurifier/HTMLModule/Proprietary.php
diff --git a/library/HTMLPurifier/HTMLModule/Ruby.php b/library/HTMLPurifier/HTMLModule/Ruby.php
index b26a0a30a..b26a0a30a 100755..100644
--- a/library/HTMLPurifier/HTMLModule/Ruby.php
+++ b/library/HTMLPurifier/HTMLModule/Ruby.php
diff --git a/library/HTMLPurifier/HTMLModule/SafeEmbed.php b/library/HTMLPurifier/HTMLModule/SafeEmbed.php
index ea256716b..ea256716b 100755..100644
--- a/library/HTMLPurifier/HTMLModule/SafeEmbed.php
+++ b/library/HTMLPurifier/HTMLModule/SafeEmbed.php
diff --git a/library/HTMLPurifier/HTMLModule/SafeObject.php b/library/HTMLPurifier/HTMLModule/SafeObject.php
index 64ab8c070..64ab8c070 100755..100644
--- a/library/HTMLPurifier/HTMLModule/SafeObject.php
+++ b/library/HTMLPurifier/HTMLModule/SafeObject.php
diff --git a/library/HTMLPurifier/HTMLModule/Scripting.php b/library/HTMLPurifier/HTMLModule/Scripting.php
index cecdea6c3..cecdea6c3 100755..100644
--- a/library/HTMLPurifier/HTMLModule/Scripting.php
+++ b/library/HTMLPurifier/HTMLModule/Scripting.php
diff --git a/library/HTMLPurifier/HTMLModule/StyleAttribute.php b/library/HTMLPurifier/HTMLModule/StyleAttribute.php
index eb78464cc..eb78464cc 100755..100644
--- a/library/HTMLPurifier/HTMLModule/StyleAttribute.php
+++ b/library/HTMLPurifier/HTMLModule/StyleAttribute.php
diff --git a/library/HTMLPurifier/HTMLModule/Tables.php b/library/HTMLPurifier/HTMLModule/Tables.php
index f314ced3f..f314ced3f 100755..100644
--- a/library/HTMLPurifier/HTMLModule/Tables.php
+++ b/library/HTMLPurifier/HTMLModule/Tables.php
diff --git a/library/HTMLPurifier/HTMLModule/Target.php b/library/HTMLPurifier/HTMLModule/Target.php
index 2b844ecc4..2b844ecc4 100755..100644
--- a/library/HTMLPurifier/HTMLModule/Target.php
+++ b/library/HTMLPurifier/HTMLModule/Target.php
diff --git a/library/HTMLPurifier/HTMLModule/Text.php b/library/HTMLPurifier/HTMLModule/Text.php
index ae77c7188..ae77c7188 100755..100644
--- a/library/HTMLPurifier/HTMLModule/Text.php
+++ b/library/HTMLPurifier/HTMLModule/Text.php
diff --git a/library/HTMLPurifier/HTMLModule/Tidy.php b/library/HTMLPurifier/HTMLModule/Tidy.php
index 21783f18e..21783f18e 100755..100644
--- a/library/HTMLPurifier/HTMLModule/Tidy.php
+++ b/library/HTMLPurifier/HTMLModule/Tidy.php
diff --git a/library/HTMLPurifier/HTMLModule/Tidy/Name.php b/library/HTMLPurifier/HTMLModule/Tidy/Name.php
index 61ff85ce2..61ff85ce2 100755..100644
--- a/library/HTMLPurifier/HTMLModule/Tidy/Name.php
+++ b/library/HTMLPurifier/HTMLModule/Tidy/Name.php
diff --git a/library/HTMLPurifier/HTMLModule/Tidy/Proprietary.php b/library/HTMLPurifier/HTMLModule/Tidy/Proprietary.php
index 14c15c4a0..14c15c4a0 100755..100644
--- a/library/HTMLPurifier/HTMLModule/Tidy/Proprietary.php
+++ b/library/HTMLPurifier/HTMLModule/Tidy/Proprietary.php
diff --git a/library/HTMLPurifier/HTMLModule/Tidy/Strict.php b/library/HTMLPurifier/HTMLModule/Tidy/Strict.php
index c73dc3c4d..c73dc3c4d 100755..100644
--- a/library/HTMLPurifier/HTMLModule/Tidy/Strict.php
+++ b/library/HTMLPurifier/HTMLModule/Tidy/Strict.php
diff --git a/library/HTMLPurifier/HTMLModule/Tidy/Transitional.php b/library/HTMLPurifier/HTMLModule/Tidy/Transitional.php
index 9960b1dd1..9960b1dd1 100755..100644
--- a/library/HTMLPurifier/HTMLModule/Tidy/Transitional.php
+++ b/library/HTMLPurifier/HTMLModule/Tidy/Transitional.php
diff --git a/library/HTMLPurifier/HTMLModule/Tidy/XHTML.php b/library/HTMLPurifier/HTMLModule/Tidy/XHTML.php
index db5a378e5..db5a378e5 100755..100644
--- a/library/HTMLPurifier/HTMLModule/Tidy/XHTML.php
+++ b/library/HTMLPurifier/HTMLModule/Tidy/XHTML.php
diff --git a/library/HTMLPurifier/HTMLModule/Tidy/XHTMLAndHTML4.php b/library/HTMLPurifier/HTMLModule/Tidy/XHTMLAndHTML4.php
index 02e943813..02e943813 100755..100644
--- a/library/HTMLPurifier/HTMLModule/Tidy/XHTMLAndHTML4.php
+++ b/library/HTMLPurifier/HTMLModule/Tidy/XHTMLAndHTML4.php
diff --git a/library/HTMLPurifier/HTMLModule/XMLCommonAttributes.php b/library/HTMLPurifier/HTMLModule/XMLCommonAttributes.php
index 9c0e03198..9c0e03198 100755..100644
--- a/library/HTMLPurifier/HTMLModule/XMLCommonAttributes.php
+++ b/library/HTMLPurifier/HTMLModule/XMLCommonAttributes.php
diff --git a/library/HTMLPurifier/HTMLModuleManager.php b/library/HTMLPurifier/HTMLModuleManager.php
index f5c4a1d2c..f5c4a1d2c 100755..100644
--- a/library/HTMLPurifier/HTMLModuleManager.php
+++ b/library/HTMLPurifier/HTMLModuleManager.php
diff --git a/library/HTMLPurifier/IDAccumulator.php b/library/HTMLPurifier/IDAccumulator.php
index 73215295a..73215295a 100755..100644
--- a/library/HTMLPurifier/IDAccumulator.php
+++ b/library/HTMLPurifier/IDAccumulator.php
diff --git a/library/HTMLPurifier/Injector.php b/library/HTMLPurifier/Injector.php
index 5922f8130..5922f8130 100755..100644
--- a/library/HTMLPurifier/Injector.php
+++ b/library/HTMLPurifier/Injector.php
diff --git a/library/HTMLPurifier/Injector/AutoParagraph.php b/library/HTMLPurifier/Injector/AutoParagraph.php
index afa760892..afa760892 100755..100644
--- a/library/HTMLPurifier/Injector/AutoParagraph.php
+++ b/library/HTMLPurifier/Injector/AutoParagraph.php
diff --git a/library/HTMLPurifier/Injector/DisplayLinkURI.php b/library/HTMLPurifier/Injector/DisplayLinkURI.php
index 9dce9bd08..9dce9bd08 100755..100644
--- a/library/HTMLPurifier/Injector/DisplayLinkURI.php
+++ b/library/HTMLPurifier/Injector/DisplayLinkURI.php
diff --git a/library/HTMLPurifier/Injector/Linkify.php b/library/HTMLPurifier/Injector/Linkify.php
index 296dac282..296dac282 100755..100644
--- a/library/HTMLPurifier/Injector/Linkify.php
+++ b/library/HTMLPurifier/Injector/Linkify.php
diff --git a/library/HTMLPurifier/Injector/PurifierLinkify.php b/library/HTMLPurifier/Injector/PurifierLinkify.php
index ad2455a91..ad2455a91 100755..100644
--- a/library/HTMLPurifier/Injector/PurifierLinkify.php
+++ b/library/HTMLPurifier/Injector/PurifierLinkify.php
diff --git a/library/HTMLPurifier/Injector/RemoveEmpty.php b/library/HTMLPurifier/Injector/RemoveEmpty.php
index 638bfca03..638bfca03 100755..100644
--- a/library/HTMLPurifier/Injector/RemoveEmpty.php
+++ b/library/HTMLPurifier/Injector/RemoveEmpty.php
diff --git a/library/HTMLPurifier/Injector/RemoveSpansWithoutAttributes.php b/library/HTMLPurifier/Injector/RemoveSpansWithoutAttributes.php
index b21313470..b21313470 100755..100644
--- a/library/HTMLPurifier/Injector/RemoveSpansWithoutAttributes.php
+++ b/library/HTMLPurifier/Injector/RemoveSpansWithoutAttributes.php
diff --git a/library/HTMLPurifier/Injector/SafeObject.php b/library/HTMLPurifier/Injector/SafeObject.php
index 9e178ce01..9e178ce01 100755..100644
--- a/library/HTMLPurifier/Injector/SafeObject.php
+++ b/library/HTMLPurifier/Injector/SafeObject.php
diff --git a/library/HTMLPurifier/Language.php b/library/HTMLPurifier/Language.php
index 3e2be03b5..3e2be03b5 100755..100644
--- a/library/HTMLPurifier/Language.php
+++ b/library/HTMLPurifier/Language.php
diff --git a/library/HTMLPurifier/Language/classes/en-x-test.php b/library/HTMLPurifier/Language/classes/en-x-test.php
index d52fcb7ac..d52fcb7ac 100755..100644
--- a/library/HTMLPurifier/Language/classes/en-x-test.php
+++ b/library/HTMLPurifier/Language/classes/en-x-test.php
diff --git a/library/HTMLPurifier/Language/messages/en-x-test.php b/library/HTMLPurifier/Language/messages/en-x-test.php
index 1c046f379..1c046f379 100755..100644
--- a/library/HTMLPurifier/Language/messages/en-x-test.php
+++ b/library/HTMLPurifier/Language/messages/en-x-test.php
diff --git a/library/HTMLPurifier/Language/messages/en-x-testmini.php b/library/HTMLPurifier/Language/messages/en-x-testmini.php
index 806c83fbf..806c83fbf 100755..100644
--- a/library/HTMLPurifier/Language/messages/en-x-testmini.php
+++ b/library/HTMLPurifier/Language/messages/en-x-testmini.php
diff --git a/library/HTMLPurifier/Language/messages/en.php b/library/HTMLPurifier/Language/messages/en.php
index 8d7b5736b..8d7b5736b 100755..100644
--- a/library/HTMLPurifier/Language/messages/en.php
+++ b/library/HTMLPurifier/Language/messages/en.php
diff --git a/library/HTMLPurifier/LanguageFactory.php b/library/HTMLPurifier/LanguageFactory.php
index 134ef8c74..134ef8c74 100755..100644
--- a/library/HTMLPurifier/LanguageFactory.php
+++ b/library/HTMLPurifier/LanguageFactory.php
diff --git a/library/HTMLPurifier/Length.php b/library/HTMLPurifier/Length.php
index 8d2a46b7d..8d2a46b7d 100755..100644
--- a/library/HTMLPurifier/Length.php
+++ b/library/HTMLPurifier/Length.php
diff --git a/library/HTMLPurifier/Lexer.php b/library/HTMLPurifier/Lexer.php
index b05e11546..b05e11546 100755..100644
--- a/library/HTMLPurifier/Lexer.php
+++ b/library/HTMLPurifier/Lexer.php
diff --git a/library/HTMLPurifier/Lexer/DOMLex.php b/library/HTMLPurifier/Lexer/DOMLex.php
index 20dc2ed48..20dc2ed48 100755..100644
--- a/library/HTMLPurifier/Lexer/DOMLex.php
+++ b/library/HTMLPurifier/Lexer/DOMLex.php
diff --git a/library/HTMLPurifier/Lexer/DirectLex.php b/library/HTMLPurifier/Lexer/DirectLex.php
index 456e6e190..456e6e190 100755..100644
--- a/library/HTMLPurifier/Lexer/DirectLex.php
+++ b/library/HTMLPurifier/Lexer/DirectLex.php
diff --git a/library/HTMLPurifier/Lexer/PEARSax3.php b/library/HTMLPurifier/Lexer/PEARSax3.php
index 1d358c7b6..1d358c7b6 100755..100644
--- a/library/HTMLPurifier/Lexer/PEARSax3.php
+++ b/library/HTMLPurifier/Lexer/PEARSax3.php
diff --git a/library/HTMLPurifier/Lexer/PH5P.php b/library/HTMLPurifier/Lexer/PH5P.php
index fa1bf973e..fa1bf973e 100755..100644
--- a/library/HTMLPurifier/Lexer/PH5P.php
+++ b/library/HTMLPurifier/Lexer/PH5P.php
diff --git a/library/HTMLPurifier/PercentEncoder.php b/library/HTMLPurifier/PercentEncoder.php
index a43c44f4c..a43c44f4c 100755..100644
--- a/library/HTMLPurifier/PercentEncoder.php
+++ b/library/HTMLPurifier/PercentEncoder.php
diff --git a/library/HTMLPurifier/Printer.php b/library/HTMLPurifier/Printer.php
index e7eb82e83..e7eb82e83 100755..100644
--- a/library/HTMLPurifier/Printer.php
+++ b/library/HTMLPurifier/Printer.php
diff --git a/library/HTMLPurifier/Printer/CSSDefinition.php b/library/HTMLPurifier/Printer/CSSDefinition.php
index 81f986590..81f986590 100755..100644
--- a/library/HTMLPurifier/Printer/CSSDefinition.php
+++ b/library/HTMLPurifier/Printer/CSSDefinition.php
diff --git a/library/HTMLPurifier/Printer/ConfigForm.css b/library/HTMLPurifier/Printer/ConfigForm.css
index 3ff1a88aa..3ff1a88aa 100755..100644
--- a/library/HTMLPurifier/Printer/ConfigForm.css
+++ b/library/HTMLPurifier/Printer/ConfigForm.css
diff --git a/library/HTMLPurifier/Printer/ConfigForm.js b/library/HTMLPurifier/Printer/ConfigForm.js
index cba00c9b8..cba00c9b8 100755..100644
--- a/library/HTMLPurifier/Printer/ConfigForm.js
+++ b/library/HTMLPurifier/Printer/ConfigForm.js
diff --git a/library/HTMLPurifier/Printer/ConfigForm.php b/library/HTMLPurifier/Printer/ConfigForm.php
index 02aa65689..02aa65689 100755..100644
--- a/library/HTMLPurifier/Printer/ConfigForm.php
+++ b/library/HTMLPurifier/Printer/ConfigForm.php
diff --git a/library/HTMLPurifier/Printer/HTMLDefinition.php b/library/HTMLPurifier/Printer/HTMLDefinition.php
index 8a8f126b8..8a8f126b8 100755..100644
--- a/library/HTMLPurifier/Printer/HTMLDefinition.php
+++ b/library/HTMLPurifier/Printer/HTMLDefinition.php
diff --git a/library/HTMLPurifier/PropertyList.php b/library/HTMLPurifier/PropertyList.php
index 2b99fb7bc..2b99fb7bc 100755..100644
--- a/library/HTMLPurifier/PropertyList.php
+++ b/library/HTMLPurifier/PropertyList.php
diff --git a/library/HTMLPurifier/PropertyListIterator.php b/library/HTMLPurifier/PropertyListIterator.php
index 8f250443e..8f250443e 100755..100644
--- a/library/HTMLPurifier/PropertyListIterator.php
+++ b/library/HTMLPurifier/PropertyListIterator.php
diff --git a/library/HTMLPurifier/Strategy.php b/library/HTMLPurifier/Strategy.php
index 246286521..246286521 100755..100644
--- a/library/HTMLPurifier/Strategy.php
+++ b/library/HTMLPurifier/Strategy.php
diff --git a/library/HTMLPurifier/Strategy/Composite.php b/library/HTMLPurifier/Strategy/Composite.php
index 816490b79..816490b79 100755..100644
--- a/library/HTMLPurifier/Strategy/Composite.php
+++ b/library/HTMLPurifier/Strategy/Composite.php
diff --git a/library/HTMLPurifier/Strategy/Core.php b/library/HTMLPurifier/Strategy/Core.php
index d90e15860..d90e15860 100755..100644
--- a/library/HTMLPurifier/Strategy/Core.php
+++ b/library/HTMLPurifier/Strategy/Core.php
diff --git a/library/HTMLPurifier/Strategy/FixNesting.php b/library/HTMLPurifier/Strategy/FixNesting.php
index f81802391..f81802391 100755..100644
--- a/library/HTMLPurifier/Strategy/FixNesting.php
+++ b/library/HTMLPurifier/Strategy/FixNesting.php
diff --git a/library/HTMLPurifier/Strategy/MakeWellFormed.php b/library/HTMLPurifier/Strategy/MakeWellFormed.php
index c73658400..c73658400 100755..100644
--- a/library/HTMLPurifier/Strategy/MakeWellFormed.php
+++ b/library/HTMLPurifier/Strategy/MakeWellFormed.php
diff --git a/library/HTMLPurifier/Strategy/RemoveForeignElements.php b/library/HTMLPurifier/Strategy/RemoveForeignElements.php
index cf3a33e40..cf3a33e40 100755..100644
--- a/library/HTMLPurifier/Strategy/RemoveForeignElements.php
+++ b/library/HTMLPurifier/Strategy/RemoveForeignElements.php
diff --git a/library/HTMLPurifier/Strategy/ValidateAttributes.php b/library/HTMLPurifier/Strategy/ValidateAttributes.php
index c3328a9d4..c3328a9d4 100755..100644
--- a/library/HTMLPurifier/Strategy/ValidateAttributes.php
+++ b/library/HTMLPurifier/Strategy/ValidateAttributes.php
diff --git a/library/HTMLPurifier/StringHash.php b/library/HTMLPurifier/StringHash.php
index 62085c5c2..62085c5c2 100755..100644
--- a/library/HTMLPurifier/StringHash.php
+++ b/library/HTMLPurifier/StringHash.php
diff --git a/library/HTMLPurifier/StringHashParser.php b/library/HTMLPurifier/StringHashParser.php
index f3e70c712..f3e70c712 100755..100644
--- a/library/HTMLPurifier/StringHashParser.php
+++ b/library/HTMLPurifier/StringHashParser.php
diff --git a/library/HTMLPurifier/TagTransform.php b/library/HTMLPurifier/TagTransform.php
index 210a44721..210a44721 100755..100644
--- a/library/HTMLPurifier/TagTransform.php
+++ b/library/HTMLPurifier/TagTransform.php
diff --git a/library/HTMLPurifier/TagTransform/Font.php b/library/HTMLPurifier/TagTransform/Font.php
index ed2463786..ed2463786 100755..100644
--- a/library/HTMLPurifier/TagTransform/Font.php
+++ b/library/HTMLPurifier/TagTransform/Font.php
diff --git a/library/HTMLPurifier/TagTransform/Simple.php b/library/HTMLPurifier/TagTransform/Simple.php
index 0e36130f2..0e36130f2 100755..100644
--- a/library/HTMLPurifier/TagTransform/Simple.php
+++ b/library/HTMLPurifier/TagTransform/Simple.php
diff --git a/library/HTMLPurifier/Token.php b/library/HTMLPurifier/Token.php
index 7900e6cb1..7900e6cb1 100755..100644
--- a/library/HTMLPurifier/Token.php
+++ b/library/HTMLPurifier/Token.php
diff --git a/library/HTMLPurifier/Token/Comment.php b/library/HTMLPurifier/Token/Comment.php
index dc6bdcabb..dc6bdcabb 100755..100644
--- a/library/HTMLPurifier/Token/Comment.php
+++ b/library/HTMLPurifier/Token/Comment.php
diff --git a/library/HTMLPurifier/Token/Empty.php b/library/HTMLPurifier/Token/Empty.php
index 2a82b47ad..2a82b47ad 100755..100644
--- a/library/HTMLPurifier/Token/Empty.php
+++ b/library/HTMLPurifier/Token/Empty.php
diff --git a/library/HTMLPurifier/Token/End.php b/library/HTMLPurifier/Token/End.php
index 353e79daf..353e79daf 100755..100644
--- a/library/HTMLPurifier/Token/End.php
+++ b/library/HTMLPurifier/Token/End.php
diff --git a/library/HTMLPurifier/Token/Start.php b/library/HTMLPurifier/Token/Start.php
index e0e14fc62..e0e14fc62 100755..100644
--- a/library/HTMLPurifier/Token/Start.php
+++ b/library/HTMLPurifier/Token/Start.php
diff --git a/library/HTMLPurifier/Token/Tag.php b/library/HTMLPurifier/Token/Tag.php
index 798be028e..798be028e 100755..100644
--- a/library/HTMLPurifier/Token/Tag.php
+++ b/library/HTMLPurifier/Token/Tag.php
diff --git a/library/HTMLPurifier/Token/Text.php b/library/HTMLPurifier/Token/Text.php
index 82efd823d..82efd823d 100755..100644
--- a/library/HTMLPurifier/Token/Text.php
+++ b/library/HTMLPurifier/Token/Text.php
diff --git a/library/HTMLPurifier/TokenFactory.php b/library/HTMLPurifier/TokenFactory.php
index 7cf48fb41..7cf48fb41 100755..100644
--- a/library/HTMLPurifier/TokenFactory.php
+++ b/library/HTMLPurifier/TokenFactory.php
diff --git a/library/HTMLPurifier/URI.php b/library/HTMLPurifier/URI.php
index 8b50d0d18..8b50d0d18 100755..100644
--- a/library/HTMLPurifier/URI.php
+++ b/library/HTMLPurifier/URI.php
diff --git a/library/HTMLPurifier/URIDefinition.php b/library/HTMLPurifier/URIDefinition.php
index ea2b8fe24..ea2b8fe24 100755..100644
--- a/library/HTMLPurifier/URIDefinition.php
+++ b/library/HTMLPurifier/URIDefinition.php
diff --git a/library/HTMLPurifier/URIFilter.php b/library/HTMLPurifier/URIFilter.php
index c116f93df..c116f93df 100755..100644
--- a/library/HTMLPurifier/URIFilter.php
+++ b/library/HTMLPurifier/URIFilter.php
diff --git a/library/HTMLPurifier/URIFilter/DisableExternal.php b/library/HTMLPurifier/URIFilter/DisableExternal.php
index d8a39a501..d8a39a501 100755..100644
--- a/library/HTMLPurifier/URIFilter/DisableExternal.php
+++ b/library/HTMLPurifier/URIFilter/DisableExternal.php
diff --git a/library/HTMLPurifier/URIFilter/DisableExternalResources.php b/library/HTMLPurifier/URIFilter/DisableExternalResources.php
index 881abc43c..881abc43c 100755..100644
--- a/library/HTMLPurifier/URIFilter/DisableExternalResources.php
+++ b/library/HTMLPurifier/URIFilter/DisableExternalResources.php
diff --git a/library/HTMLPurifier/URIFilter/HostBlacklist.php b/library/HTMLPurifier/URIFilter/HostBlacklist.php
index 045aa0992..045aa0992 100755..100644
--- a/library/HTMLPurifier/URIFilter/HostBlacklist.php
+++ b/library/HTMLPurifier/URIFilter/HostBlacklist.php
diff --git a/library/HTMLPurifier/URIFilter/MakeAbsolute.php b/library/HTMLPurifier/URIFilter/MakeAbsolute.php
index f46ab2630..f46ab2630 100755..100644
--- a/library/HTMLPurifier/URIFilter/MakeAbsolute.php
+++ b/library/HTMLPurifier/URIFilter/MakeAbsolute.php
diff --git a/library/HTMLPurifier/URIFilter/Munge.php b/library/HTMLPurifier/URIFilter/Munge.php
index efa10a645..efa10a645 100755..100644
--- a/library/HTMLPurifier/URIFilter/Munge.php
+++ b/library/HTMLPurifier/URIFilter/Munge.php
diff --git a/library/HTMLPurifier/URIParser.php b/library/HTMLPurifier/URIParser.php
index 7179e4ab8..7179e4ab8 100755..100644
--- a/library/HTMLPurifier/URIParser.php
+++ b/library/HTMLPurifier/URIParser.php
diff --git a/library/HTMLPurifier/URIScheme.php b/library/HTMLPurifier/URIScheme.php
index 039710fd1..039710fd1 100755..100644
--- a/library/HTMLPurifier/URIScheme.php
+++ b/library/HTMLPurifier/URIScheme.php
diff --git a/library/HTMLPurifier/URIScheme/data.php b/library/HTMLPurifier/URIScheme/data.php
index b7f1989cb..b7f1989cb 100755..100644
--- a/library/HTMLPurifier/URIScheme/data.php
+++ b/library/HTMLPurifier/URIScheme/data.php
diff --git a/library/HTMLPurifier/URIScheme/ftp.php b/library/HTMLPurifier/URIScheme/ftp.php
index 5849bf7ff..5849bf7ff 100755..100644
--- a/library/HTMLPurifier/URIScheme/ftp.php
+++ b/library/HTMLPurifier/URIScheme/ftp.php
diff --git a/library/HTMLPurifier/URIScheme/http.php b/library/HTMLPurifier/URIScheme/http.php
index b097a31d6..b097a31d6 100755..100644
--- a/library/HTMLPurifier/URIScheme/http.php
+++ b/library/HTMLPurifier/URIScheme/http.php
diff --git a/library/HTMLPurifier/URIScheme/https.php b/library/HTMLPurifier/URIScheme/https.php
index 29e380919..29e380919 100755..100644
--- a/library/HTMLPurifier/URIScheme/https.php
+++ b/library/HTMLPurifier/URIScheme/https.php
diff --git a/library/HTMLPurifier/URIScheme/mailto.php b/library/HTMLPurifier/URIScheme/mailto.php
index c1e2cd5aa..c1e2cd5aa 100755..100644
--- a/library/HTMLPurifier/URIScheme/mailto.php
+++ b/library/HTMLPurifier/URIScheme/mailto.php
diff --git a/library/HTMLPurifier/URIScheme/news.php b/library/HTMLPurifier/URIScheme/news.php
index f5f54f4f5..f5f54f4f5 100755..100644
--- a/library/HTMLPurifier/URIScheme/news.php
+++ b/library/HTMLPurifier/URIScheme/news.php
diff --git a/library/HTMLPurifier/URIScheme/nntp.php b/library/HTMLPurifier/URIScheme/nntp.php
index 5bf93ea78..5bf93ea78 100755..100644
--- a/library/HTMLPurifier/URIScheme/nntp.php
+++ b/library/HTMLPurifier/URIScheme/nntp.php
diff --git a/library/HTMLPurifier/URISchemeRegistry.php b/library/HTMLPurifier/URISchemeRegistry.php
index 576bf7b6d..576bf7b6d 100755..100644
--- a/library/HTMLPurifier/URISchemeRegistry.php
+++ b/library/HTMLPurifier/URISchemeRegistry.php
diff --git a/library/HTMLPurifier/UnitConverter.php b/library/HTMLPurifier/UnitConverter.php
index 545d42622..545d42622 100755..100644
--- a/library/HTMLPurifier/UnitConverter.php
+++ b/library/HTMLPurifier/UnitConverter.php
diff --git a/library/HTMLPurifier/VarParser.php b/library/HTMLPurifier/VarParser.php
index 68e72ae86..68e72ae86 100755..100644
--- a/library/HTMLPurifier/VarParser.php
+++ b/library/HTMLPurifier/VarParser.php
diff --git a/library/HTMLPurifier/VarParser/Flexible.php b/library/HTMLPurifier/VarParser/Flexible.php
index c954250e9..c954250e9 100755..100644
--- a/library/HTMLPurifier/VarParser/Flexible.php
+++ b/library/HTMLPurifier/VarParser/Flexible.php
diff --git a/library/HTMLPurifier/VarParser/Native.php b/library/HTMLPurifier/VarParser/Native.php
index b02a6de54..b02a6de54 100755..100644
--- a/library/HTMLPurifier/VarParser/Native.php
+++ b/library/HTMLPurifier/VarParser/Native.php
diff --git a/library/HTMLPurifier/VarParserException.php b/library/HTMLPurifier/VarParserException.php
index 5df341495..5df341495 100755..100644
--- a/library/HTMLPurifier/VarParserException.php
+++ b/library/HTMLPurifier/VarParserException.php
diff --git a/library/OAuth1.php b/library/OAuth1.php
index 0db6fabcb..0db6fabcb 100755..100644
--- a/library/OAuth1.php
+++ b/library/OAuth1.php
diff --git a/library/asn1.php b/library/asn1.php
index e84398bf6..e84398bf6 100755..100644
--- a/library/asn1.php
+++ b/library/asn1.php
diff --git a/library/cropper/cropper.css b/library/cropper/cropper.css
index c2e759818..c2e759818 100755..100644
--- a/library/cropper/cropper.css
+++ b/library/cropper/cropper.css
diff --git a/library/cropper/cropper.html b/library/cropper/cropper.html
index 236235247..236235247 100755..100644
--- a/library/cropper/cropper.html
+++ b/library/cropper/cropper.html
diff --git a/library/cropper/cropper.js b/library/cropper/cropper.js
index 486a92ad9..486a92ad9 100755..100644
--- a/library/cropper/cropper.js
+++ b/library/cropper/cropper.js
diff --git a/library/cropper/cropper.uncompressed.js b/library/cropper/cropper.uncompressed.js
index 66185546e..66185546e 100755..100644
--- a/library/cropper/cropper.uncompressed.js
+++ b/library/cropper/cropper.uncompressed.js
diff --git a/library/cropper/lib/builder.js b/library/cropper/lib/builder.js
index 5b15ba939..5b15ba939 100755..100644
--- a/library/cropper/lib/builder.js
+++ b/library/cropper/lib/builder.js
diff --git a/library/cropper/lib/controls.js b/library/cropper/lib/controls.js
index de0261ed5..de0261ed5 100755..100644
--- a/library/cropper/lib/controls.js
+++ b/library/cropper/lib/controls.js
diff --git a/library/cropper/lib/dragdrop.js b/library/cropper/lib/dragdrop.js
index be2a30f53..be2a30f53 100755..100644
--- a/library/cropper/lib/dragdrop.js
+++ b/library/cropper/lib/dragdrop.js
diff --git a/library/cropper/lib/effects.js b/library/cropper/lib/effects.js
index 0864323ec..0864323ec 100755..100644
--- a/library/cropper/lib/effects.js
+++ b/library/cropper/lib/effects.js
diff --git a/library/cropper/lib/prototype.js b/library/cropper/lib/prototype.js
index 0caf9cd7f..0caf9cd7f 100755..100644
--- a/library/cropper/lib/prototype.js
+++ b/library/cropper/lib/prototype.js
diff --git a/library/cropper/lib/scriptaculous.js b/library/cropper/lib/scriptaculous.js
index f61fc57f7..f61fc57f7 100755..100644
--- a/library/cropper/lib/scriptaculous.js
+++ b/library/cropper/lib/scriptaculous.js
diff --git a/library/cropper/lib/slider.js b/library/cropper/lib/slider.js
index c0f1fc01b..c0f1fc01b 100755..100644
--- a/library/cropper/lib/slider.js
+++ b/library/cropper/lib/slider.js
diff --git a/library/cropper/lib/unittest.js b/library/cropper/lib/unittest.js
index d2c2d8171..d2c2d8171 100755..100644
--- a/library/cropper/lib/unittest.js
+++ b/library/cropper/lib/unittest.js
diff --git a/library/cropper/licence.txt b/library/cropper/licence.txt
index b59e02917..b59e02917 100755..100644
--- a/library/cropper/licence.txt
+++ b/library/cropper/licence.txt
diff --git a/library/cropper/marqueeHoriz.gif b/library/cropper/marqueeHoriz.gif
index 25317e573..25317e573 100755..100644
--- a/library/cropper/marqueeHoriz.gif
+++ b/library/cropper/marqueeHoriz.gif
diff --git a/library/cropper/marqueeVert.gif b/library/cropper/marqueeVert.gif
index 354070bb4..354070bb4 100755..100644
--- a/library/cropper/marqueeVert.gif
+++ b/library/cropper/marqueeVert.gif
diff --git a/library/cropper/tests/castle.jpg b/library/cropper/tests/castle.jpg
index e40b7e4cb..e40b7e4cb 100755..100644
--- a/library/cropper/tests/castle.jpg
+++ b/library/cropper/tests/castle.jpg
diff --git a/library/cropper/tests/castleMed.jpg b/library/cropper/tests/castleMed.jpg
index c35a6f554..c35a6f554 100755..100644
--- a/library/cropper/tests/castleMed.jpg
+++ b/library/cropper/tests/castleMed.jpg
diff --git a/library/cropper/tests/example-Basic.htm b/library/cropper/tests/example-Basic.htm
index 391c2ecdb..391c2ecdb 100755..100644
--- a/library/cropper/tests/example-Basic.htm
+++ b/library/cropper/tests/example-Basic.htm
diff --git a/library/cropper/tests/example-CSS-Absolute.htm b/library/cropper/tests/example-CSS-Absolute.htm
index 17e4c489d..17e4c489d 100755..100644
--- a/library/cropper/tests/example-CSS-Absolute.htm
+++ b/library/cropper/tests/example-CSS-Absolute.htm
diff --git a/library/cropper/tests/example-CSS-Float.htm b/library/cropper/tests/example-CSS-Float.htm
index 5066553fe..5066553fe 100755..100644
--- a/library/cropper/tests/example-CSS-Float.htm
+++ b/library/cropper/tests/example-CSS-Float.htm
diff --git a/library/cropper/tests/example-CSS-Relative.htm b/library/cropper/tests/example-CSS-Relative.htm
index 5894fe1f9..5894fe1f9 100755..100644
--- a/library/cropper/tests/example-CSS-Relative.htm
+++ b/library/cropper/tests/example-CSS-Relative.htm
diff --git a/library/cropper/tests/example-CoordsOnLoad.htm b/library/cropper/tests/example-CoordsOnLoad.htm
index 254a23472..254a23472 100755..100644
--- a/library/cropper/tests/example-CoordsOnLoad.htm
+++ b/library/cropper/tests/example-CoordsOnLoad.htm
diff --git a/library/cropper/tests/example-CoordsOnLoadWithRatio.htm b/library/cropper/tests/example-CoordsOnLoadWithRatio.htm
index 3a696360a..3a696360a 100755..100644
--- a/library/cropper/tests/example-CoordsOnLoadWithRatio.htm
+++ b/library/cropper/tests/example-CoordsOnLoadWithRatio.htm
diff --git a/library/cropper/tests/example-Dimensions.htm b/library/cropper/tests/example-Dimensions.htm
index f54f99683..f54f99683 100755..100644
--- a/library/cropper/tests/example-Dimensions.htm
+++ b/library/cropper/tests/example-Dimensions.htm
diff --git a/library/cropper/tests/example-DynamicImage.htm b/library/cropper/tests/example-DynamicImage.htm
index 898363489..898363489 100755..100644
--- a/library/cropper/tests/example-DynamicImage.htm
+++ b/library/cropper/tests/example-DynamicImage.htm
diff --git a/library/cropper/tests/example-FixedRatio.htm b/library/cropper/tests/example-FixedRatio.htm
index 973bedda9..973bedda9 100755..100644
--- a/library/cropper/tests/example-FixedRatio.htm
+++ b/library/cropper/tests/example-FixedRatio.htm
diff --git a/library/cropper/tests/example-MinimumDimensions.htm b/library/cropper/tests/example-MinimumDimensions.htm
index 3ae93c8e1..3ae93c8e1 100755..100644
--- a/library/cropper/tests/example-MinimumDimensions.htm
+++ b/library/cropper/tests/example-MinimumDimensions.htm
diff --git a/library/cropper/tests/example-MinimumWidth.htm b/library/cropper/tests/example-MinimumWidth.htm
index b0576b87f..b0576b87f 100755..100644
--- a/library/cropper/tests/example-MinimumWidth.htm
+++ b/library/cropper/tests/example-MinimumWidth.htm
diff --git a/library/cropper/tests/example-Preview.htm b/library/cropper/tests/example-Preview.htm
index 701670c91..701670c91 100755..100644
--- a/library/cropper/tests/example-Preview.htm
+++ b/library/cropper/tests/example-Preview.htm
diff --git a/library/cropper/tests/poppy.jpg b/library/cropper/tests/poppy.jpg
index 1f6498584..1f6498584 100755..100644
--- a/library/cropper/tests/poppy.jpg
+++ b/library/cropper/tests/poppy.jpg
diff --git a/library/cropper/tests/staticHTMLStructure.htm b/library/cropper/tests/staticHTMLStructure.htm
index ddb99278e..ddb99278e 100755..100644
--- a/library/cropper/tests/staticHTMLStructure.htm
+++ b/library/cropper/tests/staticHTMLStructure.htm
diff --git a/library/facebook.php b/library/facebook.php
index eebe3b464..eebe3b464 100755..100644
--- a/library/facebook.php
+++ b/library/facebook.php
diff --git a/library/fancybox/blank.gif b/library/fancybox/blank.gif
index 35d42e808..35d42e808 100755..100644
--- a/library/fancybox/blank.gif
+++ b/library/fancybox/blank.gif
diff --git a/library/fancybox/fancy_close.png b/library/fancybox/fancy_close.png
index 07035307a..07035307a 100755..100644
--- a/library/fancybox/fancy_close.png
+++ b/library/fancybox/fancy_close.png
diff --git a/library/fancybox/fancy_loading.png b/library/fancybox/fancy_loading.png
index 250301796..250301796 100755..100644
--- a/library/fancybox/fancy_loading.png
+++ b/library/fancybox/fancy_loading.png
diff --git a/library/fancybox/fancy_nav_left.png b/library/fancybox/fancy_nav_left.png
index ebaa6a4fd..ebaa6a4fd 100755..100644
--- a/library/fancybox/fancy_nav_left.png
+++ b/library/fancybox/fancy_nav_left.png
diff --git a/library/fancybox/fancy_nav_right.png b/library/fancybox/fancy_nav_right.png
index 873294e96..873294e96 100755..100644
--- a/library/fancybox/fancy_nav_right.png
+++ b/library/fancybox/fancy_nav_right.png
diff --git a/library/fancybox/fancy_shadow_e.png b/library/fancybox/fancy_shadow_e.png
index 2eda08936..2eda08936 100755..100644
--- a/library/fancybox/fancy_shadow_e.png
+++ b/library/fancybox/fancy_shadow_e.png
diff --git a/library/fancybox/fancy_shadow_n.png b/library/fancybox/fancy_shadow_n.png
index 69aa10e23..69aa10e23 100755..100644
--- a/library/fancybox/fancy_shadow_n.png
+++ b/library/fancybox/fancy_shadow_n.png
diff --git a/library/fancybox/fancy_shadow_ne.png b/library/fancybox/fancy_shadow_ne.png
index 79f6980a3..79f6980a3 100755..100644
--- a/library/fancybox/fancy_shadow_ne.png
+++ b/library/fancybox/fancy_shadow_ne.png
diff --git a/library/fancybox/fancy_shadow_nw.png b/library/fancybox/fancy_shadow_nw.png
index 7182cd938..7182cd938 100755..100644
--- a/library/fancybox/fancy_shadow_nw.png
+++ b/library/fancybox/fancy_shadow_nw.png
diff --git a/library/fancybox/fancy_shadow_s.png b/library/fancybox/fancy_shadow_s.png
index d8858bfb7..d8858bfb7 100755..100644
--- a/library/fancybox/fancy_shadow_s.png
+++ b/library/fancybox/fancy_shadow_s.png
diff --git a/library/fancybox/fancy_shadow_se.png b/library/fancybox/fancy_shadow_se.png
index 541e3ffd3..541e3ffd3 100755..100644
--- a/library/fancybox/fancy_shadow_se.png
+++ b/library/fancybox/fancy_shadow_se.png
diff --git a/library/fancybox/fancy_shadow_sw.png b/library/fancybox/fancy_shadow_sw.png
index b451689fa..b451689fa 100755..100644
--- a/library/fancybox/fancy_shadow_sw.png
+++ b/library/fancybox/fancy_shadow_sw.png
diff --git a/library/fancybox/fancy_shadow_w.png b/library/fancybox/fancy_shadow_w.png
index 8a4e4a887..8a4e4a887 100755..100644
--- a/library/fancybox/fancy_shadow_w.png
+++ b/library/fancybox/fancy_shadow_w.png
diff --git a/library/fancybox/fancy_title_left.png b/library/fancybox/fancy_title_left.png
index 6049223d1..6049223d1 100755..100644
--- a/library/fancybox/fancy_title_left.png
+++ b/library/fancybox/fancy_title_left.png
diff --git a/library/fancybox/fancy_title_main.png b/library/fancybox/fancy_title_main.png
index 8044271f2..8044271f2 100755..100644
--- a/library/fancybox/fancy_title_main.png
+++ b/library/fancybox/fancy_title_main.png
diff --git a/library/fancybox/fancy_title_over.png b/library/fancybox/fancy_title_over.png
index d9f458f4b..d9f458f4b 100755..100644
--- a/library/fancybox/fancy_title_over.png
+++ b/library/fancybox/fancy_title_over.png
diff --git a/library/fancybox/fancy_title_right.png b/library/fancybox/fancy_title_right.png
index e36d9db2a..e36d9db2a 100755..100644
--- a/library/fancybox/fancy_title_right.png
+++ b/library/fancybox/fancy_title_right.png
diff --git a/library/fancybox/fancybox-x.png b/library/fancybox/fancybox-x.png
index c2130f869..c2130f869 100755..100644
--- a/library/fancybox/fancybox-x.png
+++ b/library/fancybox/fancybox-x.png
diff --git a/library/fancybox/fancybox-y.png b/library/fancybox/fancybox-y.png
index 7ef399b99..7ef399b99 100755..100644
--- a/library/fancybox/fancybox-y.png
+++ b/library/fancybox/fancybox-y.png
diff --git a/library/fancybox/fancybox.png b/library/fancybox/fancybox.png
index 65e14f68f..65e14f68f 100755..100644
--- a/library/fancybox/fancybox.png
+++ b/library/fancybox/fancybox.png
diff --git a/library/fancybox/jquery.easing-1.3.pack.js b/library/fancybox/jquery.easing-1.3.pack.js
index 9028179e7..9028179e7 100755..100644
--- a/library/fancybox/jquery.easing-1.3.pack.js
+++ b/library/fancybox/jquery.easing-1.3.pack.js
diff --git a/library/fancybox/jquery.fancybox-1.3.4.css b/library/fancybox/jquery.fancybox-1.3.4.css
index 6f53d8f4a..6f53d8f4a 100755..100644
--- a/library/fancybox/jquery.fancybox-1.3.4.css
+++ b/library/fancybox/jquery.fancybox-1.3.4.css
diff --git a/library/fancybox/jquery.fancybox-1.3.4.js b/library/fancybox/jquery.fancybox-1.3.4.js
index be7727537..be7727537 100755..100644
--- a/library/fancybox/jquery.fancybox-1.3.4.js
+++ b/library/fancybox/jquery.fancybox-1.3.4.js
diff --git a/library/fancybox/jquery.fancybox-1.3.4.pack.js b/library/fancybox/jquery.fancybox-1.3.4.pack.js
index 1373ed083..1373ed083 100755..100644
--- a/library/fancybox/jquery.fancybox-1.3.4.pack.js
+++ b/library/fancybox/jquery.fancybox-1.3.4.pack.js
diff --git a/library/fancybox/jquery.mousewheel-3.0.4.pack.js b/library/fancybox/jquery.mousewheel-3.0.4.pack.js
index cb66588e2..cb66588e2 100755..100644
--- a/library/fancybox/jquery.mousewheel-3.0.4.pack.js
+++ b/library/fancybox/jquery.mousewheel-3.0.4.pack.js
diff --git a/library/jgrowl/README b/library/jgrowl/README
index 3c94f7508..3c94f7508 100755..100644
--- a/library/jgrowl/README
+++ b/library/jgrowl/README
diff --git a/library/jgrowl/jquery.jgrowl.css b/library/jgrowl/jquery.jgrowl.css
index b4deb978c..b4deb978c 100755..100644
--- a/library/jgrowl/jquery.jgrowl.css
+++ b/library/jgrowl/jquery.jgrowl.css
diff --git a/library/jgrowl/jquery.jgrowl_minimized.js b/library/jgrowl/jquery.jgrowl_minimized.js
index 782898098..782898098 100755..100644
--- a/library/jgrowl/jquery.jgrowl_minimized.js
+++ b/library/jgrowl/jquery.jgrowl_minimized.js
diff --git a/library/mcefixes/plugins.bbcode.editor_plugin_src.js b/library/mcefixes/plugins.bbcode.editor_plugin_src.js
index a2829a21c..a2829a21c 100755..100644
--- a/library/mcefixes/plugins.bbcode.editor_plugin_src.js
+++ b/library/mcefixes/plugins.bbcode.editor_plugin_src.js
diff --git a/library/mcefixes/themes.advanced.img.icons.gif b/library/mcefixes/themes.advanced.img.icons.gif
index efb356c41..efb356c41 100755..100644
--- a/library/mcefixes/themes.advanced.img.icons.gif
+++ b/library/mcefixes/themes.advanced.img.icons.gif
diff --git a/library/mcefixes/themes.advanced.skins.default.dialog.css b/library/mcefixes/themes.advanced.skins.default.dialog.css
index f01222650..f01222650 100755..100644
--- a/library/mcefixes/themes.advanced.skins.default.dialog.css
+++ b/library/mcefixes/themes.advanced.skins.default.dialog.css
diff --git a/library/mcefixes/themes.advanced.skins.default.ui.css b/library/mcefixes/themes.advanced.skins.default.ui.css
index 5f1f96448..5f1f96448 100755..100644
--- a/library/mcefixes/themes.advanced.skins.default.ui.css
+++ b/library/mcefixes/themes.advanced.skins.default.ui.css
diff --git a/library/oauth.php b/library/oauth.php
index caf1a0839..caf1a0839 100755..100644
--- a/library/oauth.php
+++ b/library/oauth.php
diff --git a/library/oauth2-php/CHANGELOG.txt b/library/oauth2-php/CHANGELOG.txt
index d854598b6..d854598b6 100755..100644
--- a/library/oauth2-php/CHANGELOG.txt
+++ b/library/oauth2-php/CHANGELOG.txt
diff --git a/library/oauth2-php/LICENSE.txt b/library/oauth2-php/LICENSE.txt
index 7979b1c85..7979b1c85 100755..100644
--- a/library/oauth2-php/LICENSE.txt
+++ b/library/oauth2-php/LICENSE.txt
diff --git a/library/oauth2-php/lib/OAuth2.inc b/library/oauth2-php/lib/OAuth2.inc
index e10e0f26d..e10e0f26d 100755..100644
--- a/library/oauth2-php/lib/OAuth2.inc
+++ b/library/oauth2-php/lib/OAuth2.inc
diff --git a/library/oauth2-php/lib/OAuth2Client.inc b/library/oauth2-php/lib/OAuth2Client.inc
index e87d723de..e87d723de 100755..100644
--- a/library/oauth2-php/lib/OAuth2Client.inc
+++ b/library/oauth2-php/lib/OAuth2Client.inc
diff --git a/library/oauth2-php/lib/OAuth2Exception.inc b/library/oauth2-php/lib/OAuth2Exception.inc
index 8dc046974..8dc046974 100755..100644
--- a/library/oauth2-php/lib/OAuth2Exception.inc
+++ b/library/oauth2-php/lib/OAuth2Exception.inc
diff --git a/library/openid.php b/library/openid.php
index 3c58beb8a..3c58beb8a 100755..100644
--- a/library/openid.php
+++ b/library/openid.php
diff --git a/library/phpsec/Crypt/AES.php b/library/phpsec/Crypt/AES.php
index 681800a81..681800a81 100755..100644
--- a/library/phpsec/Crypt/AES.php
+++ b/library/phpsec/Crypt/AES.php
diff --git a/library/phpsec/Crypt/DES.php b/library/phpsec/Crypt/DES.php
index 431ad539b..431ad539b 100755..100644
--- a/library/phpsec/Crypt/DES.php
+++ b/library/phpsec/Crypt/DES.php
diff --git a/library/phpsec/Crypt/Hash.php b/library/phpsec/Crypt/Hash.php
index ef3a85802..ef3a85802 100755..100644
--- a/library/phpsec/Crypt/Hash.php
+++ b/library/phpsec/Crypt/Hash.php
diff --git a/library/phpsec/Crypt/RC4.php b/library/phpsec/Crypt/RC4.php
index 6f82b2413..6f82b2413 100755..100644
--- a/library/phpsec/Crypt/RC4.php
+++ b/library/phpsec/Crypt/RC4.php
diff --git a/library/phpsec/Crypt/RSA.php b/library/phpsec/Crypt/RSA.php
index 1c562082b..1c562082b 100755..100644
--- a/library/phpsec/Crypt/RSA.php
+++ b/library/phpsec/Crypt/RSA.php
diff --git a/library/phpsec/Crypt/Random.php b/library/phpsec/Crypt/Random.php
index a91c4d3c5..a91c4d3c5 100755..100644
--- a/library/phpsec/Crypt/Random.php
+++ b/library/phpsec/Crypt/Random.php
diff --git a/library/phpsec/Crypt/Rijndael.php b/library/phpsec/Crypt/Rijndael.php
index f141f3762..f141f3762 100755..100644
--- a/library/phpsec/Crypt/Rijndael.php
+++ b/library/phpsec/Crypt/Rijndael.php
diff --git a/library/phpsec/Crypt/TripleDES.php b/library/phpsec/Crypt/TripleDES.php
index 4d0dbbca0..4d0dbbca0 100755..100644
--- a/library/phpsec/Crypt/TripleDES.php
+++ b/library/phpsec/Crypt/TripleDES.php
diff --git a/library/phpsec/Math/BigInteger.php b/library/phpsec/Math/BigInteger.php
index 5b3a4fc8b..5b3a4fc8b 100755..100644
--- a/library/phpsec/Math/BigInteger.php
+++ b/library/phpsec/Math/BigInteger.php
diff --git a/library/phpsec/Net/SFTP.php b/library/phpsec/Net/SFTP.php
index 06812ada3..06812ada3 100755..100644
--- a/library/phpsec/Net/SFTP.php
+++ b/library/phpsec/Net/SFTP.php
diff --git a/library/phpsec/Net/SSH1.php b/library/phpsec/Net/SSH1.php
index 7220ee402..7220ee402 100755..100644
--- a/library/phpsec/Net/SSH1.php
+++ b/library/phpsec/Net/SSH1.php
diff --git a/library/phpsec/Net/SSH2.php b/library/phpsec/Net/SSH2.php
index aa9f6dbe5..aa9f6dbe5 100755..100644
--- a/library/phpsec/Net/SSH2.php
+++ b/library/phpsec/Net/SSH2.php
diff --git a/library/phpsec/PHP/Compat/Function/array_fill.php b/library/phpsec/PHP/Compat/Function/array_fill.php
index e02bfa14d..e02bfa14d 100755..100644
--- a/library/phpsec/PHP/Compat/Function/array_fill.php
+++ b/library/phpsec/PHP/Compat/Function/array_fill.php
diff --git a/library/phpsec/PHP/Compat/Function/bcpowmod.php b/library/phpsec/PHP/Compat/Function/bcpowmod.php
index 6ec1b1840..6ec1b1840 100755..100644
--- a/library/phpsec/PHP/Compat/Function/bcpowmod.php
+++ b/library/phpsec/PHP/Compat/Function/bcpowmod.php
diff --git a/library/phpsec/PHP/Compat/Function/str_split.php b/library/phpsec/PHP/Compat/Function/str_split.php
index 8e38bdb89..8e38bdb89 100755..100644
--- a/library/phpsec/PHP/Compat/Function/str_split.php
+++ b/library/phpsec/PHP/Compat/Function/str_split.php
diff --git a/library/phpsec/crypt.html b/library/phpsec/crypt.html
index 6720cf789..6720cf789 100755..100644
--- a/library/phpsec/crypt.html
+++ b/library/phpsec/crypt.html
diff --git a/library/phpsec/docbook.css b/library/phpsec/docbook.css
index 4f67aa4cd..4f67aa4cd 100755..100644
--- a/library/phpsec/docbook.css
+++ b/library/phpsec/docbook.css
diff --git a/library/phpsec/index.html b/library/phpsec/index.html
index 6dda0f369..6dda0f369 100755..100644
--- a/library/phpsec/index.html
+++ b/library/phpsec/index.html
diff --git a/library/phpsec/intro.html b/library/phpsec/intro.html
index 406b22fc5..406b22fc5 100755..100644
--- a/library/phpsec/intro.html
+++ b/library/phpsec/intro.html
diff --git a/library/phpsec/math.html b/library/phpsec/math.html
index 4e5a14a54..4e5a14a54 100755..100644
--- a/library/phpsec/math.html
+++ b/library/phpsec/math.html
diff --git a/library/phpsec/misc_crypt.html b/library/phpsec/misc_crypt.html
index 9751ddac8..9751ddac8 100755..100644
--- a/library/phpsec/misc_crypt.html
+++ b/library/phpsec/misc_crypt.html
diff --git a/library/phpsec/net.html b/library/phpsec/net.html
index 2752b826d..2752b826d 100755..100644
--- a/library/phpsec/net.html
+++ b/library/phpsec/net.html
diff --git a/library/phpsec/sym_crypt.html b/library/phpsec/sym_crypt.html
index 956506290..956506290 100755..100644
--- a/library/phpsec/sym_crypt.html
+++ b/library/phpsec/sym_crypt.html
diff --git a/library/simplepie/LICENSE.txt b/library/simplepie/LICENSE.txt
index a822a4bd9..a822a4bd9 100755..100644
--- a/library/simplepie/LICENSE.txt
+++ b/library/simplepie/LICENSE.txt
diff --git a/library/simplepie/README.markdown b/library/simplepie/README.markdown
index e5ca021ce..e5ca021ce 100755..100644
--- a/library/simplepie/README.markdown
+++ b/library/simplepie/README.markdown
diff --git a/library/simplepie/compatibility_test/COMPATIBILITY README.txt b/library/simplepie/compatibility_test/COMPATIBILITY README.txt
index 5b2498992..5b2498992 100755..100644
--- a/library/simplepie/compatibility_test/COMPATIBILITY README.txt
+++ b/library/simplepie/compatibility_test/COMPATIBILITY README.txt
diff --git a/library/simplepie/compatibility_test/sp_compatibility_test.php b/library/simplepie/compatibility_test/sp_compatibility_test.php
index a7a7f5fde..a7a7f5fde 100755..100644
--- a/library/simplepie/compatibility_test/sp_compatibility_test.php
+++ b/library/simplepie/compatibility_test/sp_compatibility_test.php
diff --git a/library/simplepie/create.php b/library/simplepie/create.php
index 908ed182b..908ed182b 100755..100644
--- a/library/simplepie/create.php
+++ b/library/simplepie/create.php
diff --git a/library/simplepie/db.sql b/library/simplepie/db.sql
index 13f504c21..13f504c21 100755..100644
--- a/library/simplepie/db.sql
+++ b/library/simplepie/db.sql
diff --git a/library/simplepie/demo/cli_test.php b/library/simplepie/demo/cli_test.php
index ec933c5ad..ec933c5ad 100755..100644
--- a/library/simplepie/demo/cli_test.php
+++ b/library/simplepie/demo/cli_test.php
diff --git a/library/simplepie/demo/for_the_demo/alternate_favicon.png b/library/simplepie/demo/for_the_demo/alternate_favicon.png
index 063fb2805..063fb2805 100755..100644
--- a/library/simplepie/demo/for_the_demo/alternate_favicon.png
+++ b/library/simplepie/demo/for_the_demo/alternate_favicon.png
diff --git a/library/simplepie/demo/for_the_demo/background_blockquote.png b/library/simplepie/demo/for_the_demo/background_blockquote.png
index 8267e23a2..8267e23a2 100755..100644
--- a/library/simplepie/demo/for_the_demo/background_blockquote.png
+++ b/library/simplepie/demo/for_the_demo/background_blockquote.png
diff --git a/library/simplepie/demo/for_the_demo/background_menuitem.gif b/library/simplepie/demo/for_the_demo/background_menuitem.gif
index fa765d670..fa765d670 100755..100644
--- a/library/simplepie/demo/for_the_demo/background_menuitem.gif
+++ b/library/simplepie/demo/for_the_demo/background_menuitem.gif
diff --git a/library/simplepie/demo/for_the_demo/background_menuitem_off.gif b/library/simplepie/demo/for_the_demo/background_menuitem_off.gif
index 236cf406d..236cf406d 100755..100644
--- a/library/simplepie/demo/for_the_demo/background_menuitem_off.gif
+++ b/library/simplepie/demo/for_the_demo/background_menuitem_off.gif
diff --git a/library/simplepie/demo/for_the_demo/background_menuitem_shadow.gif b/library/simplepie/demo/for_the_demo/background_menuitem_shadow.gif
index 95cfb820d..95cfb820d 100755..100644
--- a/library/simplepie/demo/for_the_demo/background_menuitem_shadow.gif
+++ b/library/simplepie/demo/for_the_demo/background_menuitem_shadow.gif
diff --git a/library/simplepie/demo/for_the_demo/favicons/alternate.png b/library/simplepie/demo/for_the_demo/favicons/alternate.png
index 063fb2805..063fb2805 100755..100644
--- a/library/simplepie/demo/for_the_demo/favicons/alternate.png
+++ b/library/simplepie/demo/for_the_demo/favicons/alternate.png
diff --git a/library/simplepie/demo/for_the_demo/favicons/blinklist.png b/library/simplepie/demo/for_the_demo/favicons/blinklist.png
index 53200b3c6..53200b3c6 100755..100644
--- a/library/simplepie/demo/for_the_demo/favicons/blinklist.png
+++ b/library/simplepie/demo/for_the_demo/favicons/blinklist.png
diff --git a/library/simplepie/demo/for_the_demo/favicons/blogmarks.png b/library/simplepie/demo/for_the_demo/favicons/blogmarks.png
index c5372614a..c5372614a 100755..100644
--- a/library/simplepie/demo/for_the_demo/favicons/blogmarks.png
+++ b/library/simplepie/demo/for_the_demo/favicons/blogmarks.png
diff --git a/library/simplepie/demo/for_the_demo/favicons/delicious.png b/library/simplepie/demo/for_the_demo/favicons/delicious.png
index 2e6021d26..2e6021d26 100755..100644
--- a/library/simplepie/demo/for_the_demo/favicons/delicious.png
+++ b/library/simplepie/demo/for_the_demo/favicons/delicious.png
diff --git a/library/simplepie/demo/for_the_demo/favicons/digg.png b/library/simplepie/demo/for_the_demo/favicons/digg.png
index 3aa96770e..3aa96770e 100755..100644
--- a/library/simplepie/demo/for_the_demo/favicons/digg.png
+++ b/library/simplepie/demo/for_the_demo/favicons/digg.png
diff --git a/library/simplepie/demo/for_the_demo/favicons/magnolia.png b/library/simplepie/demo/for_the_demo/favicons/magnolia.png
index da519f5ab..da519f5ab 100755..100644
--- a/library/simplepie/demo/for_the_demo/favicons/magnolia.png
+++ b/library/simplepie/demo/for_the_demo/favicons/magnolia.png
diff --git a/library/simplepie/demo/for_the_demo/favicons/myweb2.png b/library/simplepie/demo/for_the_demo/favicons/myweb2.png
index 2a12968d5..2a12968d5 100755..100644
--- a/library/simplepie/demo/for_the_demo/favicons/myweb2.png
+++ b/library/simplepie/demo/for_the_demo/favicons/myweb2.png
diff --git a/library/simplepie/demo/for_the_demo/favicons/newsvine.png b/library/simplepie/demo/for_the_demo/favicons/newsvine.png
index 5cdbb31c6..5cdbb31c6 100755..100644
--- a/library/simplepie/demo/for_the_demo/favicons/newsvine.png
+++ b/library/simplepie/demo/for_the_demo/favicons/newsvine.png
diff --git a/library/simplepie/demo/for_the_demo/favicons/reddit.png b/library/simplepie/demo/for_the_demo/favicons/reddit.png
index 65c38867c..65c38867c 100755..100644
--- a/library/simplepie/demo/for_the_demo/favicons/reddit.png
+++ b/library/simplepie/demo/for_the_demo/favicons/reddit.png
diff --git a/library/simplepie/demo/for_the_demo/favicons/segnalo.png b/library/simplepie/demo/for_the_demo/favicons/segnalo.png
index 748149b37..748149b37 100755..100644
--- a/library/simplepie/demo/for_the_demo/favicons/segnalo.png
+++ b/library/simplepie/demo/for_the_demo/favicons/segnalo.png
diff --git a/library/simplepie/demo/for_the_demo/favicons/simpy.png b/library/simplepie/demo/for_the_demo/favicons/simpy.png
index 30b23c1a5..30b23c1a5 100755..100644
--- a/library/simplepie/demo/for_the_demo/favicons/simpy.png
+++ b/library/simplepie/demo/for_the_demo/favicons/simpy.png
diff --git a/library/simplepie/demo/for_the_demo/favicons/spurl.png b/library/simplepie/demo/for_the_demo/favicons/spurl.png
index f5be3963d..f5be3963d 100755..100644
--- a/library/simplepie/demo/for_the_demo/favicons/spurl.png
+++ b/library/simplepie/demo/for_the_demo/favicons/spurl.png
diff --git a/library/simplepie/demo/for_the_demo/favicons/technorati.png b/library/simplepie/demo/for_the_demo/favicons/technorati.png
index 0f19e824e..0f19e824e 100755..100644
--- a/library/simplepie/demo/for_the_demo/favicons/technorati.png
+++ b/library/simplepie/demo/for_the_demo/favicons/technorati.png
diff --git a/library/simplepie/demo/for_the_demo/favicons/wists.png b/library/simplepie/demo/for_the_demo/favicons/wists.png
index 2e2d294d1..2e2d294d1 100755..100644
--- a/library/simplepie/demo/for_the_demo/favicons/wists.png
+++ b/library/simplepie/demo/for_the_demo/favicons/wists.png
diff --git a/library/simplepie/demo/for_the_demo/feed.png b/library/simplepie/demo/for_the_demo/feed.png
index e23c50c85..e23c50c85 100755..100644
--- a/library/simplepie/demo/for_the_demo/feed.png
+++ b/library/simplepie/demo/for_the_demo/feed.png
diff --git a/library/simplepie/demo/for_the_demo/logo_simplepie_demo.png b/library/simplepie/demo/for_the_demo/logo_simplepie_demo.png
index eda2d868b..eda2d868b 100755..100644
--- a/library/simplepie/demo/for_the_demo/logo_simplepie_demo.png
+++ b/library/simplepie/demo/for_the_demo/logo_simplepie_demo.png
diff --git a/library/simplepie/demo/for_the_demo/lucida-grande-bold.swf b/library/simplepie/demo/for_the_demo/lucida-grande-bold.swf
index 0a41e15eb..0a41e15eb 100755..100644
--- a/library/simplepie/demo/for_the_demo/lucida-grande-bold.swf
+++ b/library/simplepie/demo/for_the_demo/lucida-grande-bold.swf
diff --git a/library/simplepie/demo/for_the_demo/mediaplayer.swf b/library/simplepie/demo/for_the_demo/mediaplayer.swf
index bf78fd919..bf78fd919 100755..100644
--- a/library/simplepie/demo/for_the_demo/mediaplayer.swf
+++ b/library/simplepie/demo/for_the_demo/mediaplayer.swf
diff --git a/library/simplepie/demo/for_the_demo/mediaplayer_readme.htm b/library/simplepie/demo/for_the_demo/mediaplayer_readme.htm
index 56e12c309..56e12c309 100755..100644
--- a/library/simplepie/demo/for_the_demo/mediaplayer_readme.htm
+++ b/library/simplepie/demo/for_the_demo/mediaplayer_readme.htm
diff --git a/library/simplepie/demo/for_the_demo/mini_podcast.png b/library/simplepie/demo/for_the_demo/mini_podcast.png
index fd6faf2a3..fd6faf2a3 100755..100644
--- a/library/simplepie/demo/for_the_demo/mini_podcast.png
+++ b/library/simplepie/demo/for_the_demo/mini_podcast.png
diff --git a/library/simplepie/demo/for_the_demo/place_audio.png b/library/simplepie/demo/for_the_demo/place_audio.png
index 560ea0039..560ea0039 100755..100644
--- a/library/simplepie/demo/for_the_demo/place_audio.png
+++ b/library/simplepie/demo/for_the_demo/place_audio.png
diff --git a/library/simplepie/demo/for_the_demo/place_video.png b/library/simplepie/demo/for_the_demo/place_video.png
index be5ec8219..be5ec8219 100755..100644
--- a/library/simplepie/demo/for_the_demo/place_video.png
+++ b/library/simplepie/demo/for_the_demo/place_video.png
diff --git a/library/simplepie/demo/for_the_demo/sIFR-print.css b/library/simplepie/demo/for_the_demo/sIFR-print.css
index ec89b1961..ec89b1961 100755..100644
--- a/library/simplepie/demo/for_the_demo/sIFR-print.css
+++ b/library/simplepie/demo/for_the_demo/sIFR-print.css
diff --git a/library/simplepie/demo/for_the_demo/sIFR-screen.css b/library/simplepie/demo/for_the_demo/sIFR-screen.css
index 778e09d2b..778e09d2b 100755..100644
--- a/library/simplepie/demo/for_the_demo/sIFR-screen.css
+++ b/library/simplepie/demo/for_the_demo/sIFR-screen.css
diff --git a/library/simplepie/demo/for_the_demo/sifr-config.js b/library/simplepie/demo/for_the_demo/sifr-config.js
index e7066b361..e7066b361 100755..100644
--- a/library/simplepie/demo/for_the_demo/sifr-config.js
+++ b/library/simplepie/demo/for_the_demo/sifr-config.js
diff --git a/library/simplepie/demo/for_the_demo/sifr.js b/library/simplepie/demo/for_the_demo/sifr.js
index 0a8b1b6dc..0a8b1b6dc 100755..100644
--- a/library/simplepie/demo/for_the_demo/sifr.js
+++ b/library/simplepie/demo/for_the_demo/sifr.js
diff --git a/library/simplepie/demo/for_the_demo/simplepie.css b/library/simplepie/demo/for_the_demo/simplepie.css
index 3753cb96d..3753cb96d 100755..100644
--- a/library/simplepie/demo/for_the_demo/simplepie.css
+++ b/library/simplepie/demo/for_the_demo/simplepie.css
diff --git a/library/simplepie/demo/for_the_demo/sleight.js b/library/simplepie/demo/for_the_demo/sleight.js
index 4b5058e9a..4b5058e9a 100755..100644
--- a/library/simplepie/demo/for_the_demo/sleight.js
+++ b/library/simplepie/demo/for_the_demo/sleight.js
diff --git a/library/simplepie/demo/for_the_demo/source_files/place_audio_fireworksfile.png b/library/simplepie/demo/for_the_demo/source_files/place_audio_fireworksfile.png
index 2bfd87d0c..2bfd87d0c 100755..100644
--- a/library/simplepie/demo/for_the_demo/source_files/place_audio_fireworksfile.png
+++ b/library/simplepie/demo/for_the_demo/source_files/place_audio_fireworksfile.png
diff --git a/library/simplepie/demo/for_the_demo/source_files/place_video_fireworksfile.png b/library/simplepie/demo/for_the_demo/source_files/place_video_fireworksfile.png
index d0629769c..d0629769c 100755..100644
--- a/library/simplepie/demo/for_the_demo/source_files/place_video_fireworksfile.png
+++ b/library/simplepie/demo/for_the_demo/source_files/place_video_fireworksfile.png
diff --git a/library/simplepie/demo/for_the_demo/source_files/sIFR-r245/SifrStyleSheet.as b/library/simplepie/demo/for_the_demo/source_files/sIFR-r245/SifrStyleSheet.as
index 6a98ca552..6a98ca552 100755..100644
--- a/library/simplepie/demo/for_the_demo/source_files/sIFR-r245/SifrStyleSheet.as
+++ b/library/simplepie/demo/for_the_demo/source_files/sIFR-r245/SifrStyleSheet.as
diff --git a/library/simplepie/demo/for_the_demo/source_files/sIFR-r245/_README_.txt b/library/simplepie/demo/for_the_demo/source_files/sIFR-r245/_README_.txt
index 2b9d32d20..2b9d32d20 100755..100644
--- a/library/simplepie/demo/for_the_demo/source_files/sIFR-r245/_README_.txt
+++ b/library/simplepie/demo/for_the_demo/source_files/sIFR-r245/_README_.txt
diff --git a/library/simplepie/demo/for_the_demo/source_files/sIFR-r245/options.as b/library/simplepie/demo/for_the_demo/source_files/sIFR-r245/options.as
index 4d371954b..4d371954b 100755..100644
--- a/library/simplepie/demo/for_the_demo/source_files/sIFR-r245/options.as
+++ b/library/simplepie/demo/for_the_demo/source_files/sIFR-r245/options.as
diff --git a/library/simplepie/demo/for_the_demo/source_files/sIFR-r245/sIFR.as b/library/simplepie/demo/for_the_demo/source_files/sIFR-r245/sIFR.as
index 4902e003f..4902e003f 100755..100644
--- a/library/simplepie/demo/for_the_demo/source_files/sIFR-r245/sIFR.as
+++ b/library/simplepie/demo/for_the_demo/source_files/sIFR-r245/sIFR.as
diff --git a/library/simplepie/demo/for_the_demo/source_files/sIFR-r245/sifr.fla b/library/simplepie/demo/for_the_demo/source_files/sIFR-r245/sifr.fla
index 2aa3f647f..2aa3f647f 100755..100644
--- a/library/simplepie/demo/for_the_demo/source_files/sIFR-r245/sifr.fla
+++ b/library/simplepie/demo/for_the_demo/source_files/sIFR-r245/sifr.fla
diff --git a/library/simplepie/demo/for_the_demo/top_gradient.gif b/library/simplepie/demo/for_the_demo/top_gradient.gif
index f77bd38f9..f77bd38f9 100755..100644
--- a/library/simplepie/demo/for_the_demo/top_gradient.gif
+++ b/library/simplepie/demo/for_the_demo/top_gradient.gif
diff --git a/library/simplepie/demo/for_the_demo/verdana.swf b/library/simplepie/demo/for_the_demo/verdana.swf
index baf035047..baf035047 100755..100644
--- a/library/simplepie/demo/for_the_demo/verdana.swf
+++ b/library/simplepie/demo/for_the_demo/verdana.swf
diff --git a/library/simplepie/demo/for_the_demo/yanone-kaffeesatz-bold.swf b/library/simplepie/demo/for_the_demo/yanone-kaffeesatz-bold.swf
index c812a79dc..c812a79dc 100755..100644
--- a/library/simplepie/demo/for_the_demo/yanone-kaffeesatz-bold.swf
+++ b/library/simplepie/demo/for_the_demo/yanone-kaffeesatz-bold.swf
diff --git a/library/simplepie/demo/handler_image.php b/library/simplepie/demo/handler_image.php
index 49c3ec89b..49c3ec89b 100755..100644
--- a/library/simplepie/demo/handler_image.php
+++ b/library/simplepie/demo/handler_image.php
diff --git a/library/simplepie/demo/index.php b/library/simplepie/demo/index.php
index 1481ba917..1481ba917 100755..100644
--- a/library/simplepie/demo/index.php
+++ b/library/simplepie/demo/index.php
diff --git a/library/simplepie/demo/minimalistic.php b/library/simplepie/demo/minimalistic.php
index 56509c00c..56509c00c 100755..100644
--- a/library/simplepie/demo/minimalistic.php
+++ b/library/simplepie/demo/minimalistic.php
diff --git a/library/simplepie/demo/multifeeds.php b/library/simplepie/demo/multifeeds.php
index b23d792a2..b23d792a2 100755..100644
--- a/library/simplepie/demo/multifeeds.php
+++ b/library/simplepie/demo/multifeeds.php
diff --git a/library/simplepie/demo/test.php b/library/simplepie/demo/test.php
index 5b9943abb..5b9943abb 100755..100644
--- a/library/simplepie/demo/test.php
+++ b/library/simplepie/demo/test.php
diff --git a/library/simplepie/idn/LICENCE b/library/simplepie/idn/LICENCE
index 25a1d22df..25a1d22df 100755..100644
--- a/library/simplepie/idn/LICENCE
+++ b/library/simplepie/idn/LICENCE
diff --git a/library/simplepie/idn/ReadMe.txt b/library/simplepie/idn/ReadMe.txt
index 7ca8c7e6d..7ca8c7e6d 100755..100644
--- a/library/simplepie/idn/ReadMe.txt
+++ b/library/simplepie/idn/ReadMe.txt
diff --git a/library/simplepie/idn/idna_convert.class.php b/library/simplepie/idn/idna_convert.class.php
index ed2bae26d..ed2bae26d 100755..100644
--- a/library/simplepie/idn/idna_convert.class.php
+++ b/library/simplepie/idn/idna_convert.class.php
diff --git a/library/simplepie/idn/npdata.ser b/library/simplepie/idn/npdata.ser
index d7ce6d03f..d7ce6d03f 100755..100644
--- a/library/simplepie/idn/npdata.ser
+++ b/library/simplepie/idn/npdata.ser
diff --git a/library/simplepie/simplepie.inc b/library/simplepie/simplepie.inc
index 8a2739f52..8a2739f52 100755..100644
--- a/library/simplepie/simplepie.inc
+++ b/library/simplepie/simplepie.inc
diff --git a/library/slinky.php b/library/slinky.php
index cae1f755f..cae1f755f 100755..100644
--- a/library/slinky.php
+++ b/library/slinky.php
diff --git a/library/tiptip/README b/library/tiptip/README
index a83cfba3e..a83cfba3e 100755..100644
--- a/library/tiptip/README
+++ b/library/tiptip/README
diff --git a/library/tiptip/README.txt b/library/tiptip/README.txt
index 740d11a50..740d11a50 100755..100644
--- a/library/tiptip/README.txt
+++ b/library/tiptip/README.txt
diff --git a/library/tiptip/jquery.tipTip.js b/library/tiptip/jquery.tipTip.js
index a05315dd7..a05315dd7 100755..100644
--- a/library/tiptip/jquery.tipTip.js
+++ b/library/tiptip/jquery.tipTip.js
diff --git a/library/tiptip/jquery.tipTip.minified.js b/library/tiptip/jquery.tipTip.minified.js
index 79e58f7ad..79e58f7ad 100755..100644
--- a/library/tiptip/jquery.tipTip.minified.js
+++ b/library/tiptip/jquery.tipTip.minified.js
diff --git a/library/tiptip/tipTip.css b/library/tiptip/tipTip.css
index 4fb95d376..4fb95d376 100755..100644
--- a/library/tiptip/tipTip.css
+++ b/library/tiptip/tipTip.css
diff --git a/library/twitteroauth.php b/library/twitteroauth.php
index 7f3dcba4d..7f3dcba4d 100755..100644
--- a/library/twitteroauth.php
+++ b/library/twitteroauth.php
diff --git a/mod/acl.php b/mod/acl.php
index fe353d1eb..fe353d1eb 100755..100644
--- a/mod/acl.php
+++ b/mod/acl.php
diff --git a/mod/admin.php b/mod/admin.php
index 53b5ee354..cdc45c8e3 100755..100644
--- a/mod/admin.php
+++ b/mod/admin.php
@@ -4,7 +4,11 @@
   * Friendica admin
   */
 require_once("include/remoteupdate.php");
- 
+
+
+/**
+ * @param App $a
+ */
 function admin_post(&$a){
 
 
@@ -40,6 +44,20 @@ function admin_post(&$a){
 				goaway($a->get_baseurl(true) . '/admin/plugins/' . $a->argv[2] );
 				return; // NOTREACHED
 				break;
+			case 'themes':
+				$theme = $a->argv[2];
+				if (is_file("view/theme/$theme/config.php")){
+					require_once("view/theme/$theme/config.php");
+					if (function_exists("theme_admin_post")){
+						theme_admin_post($a);
+					}
+				}
+				info(t('Theme settings updated.'));
+				if(is_ajax()) return;
+				
+				goaway($a->get_baseurl(true) . '/admin/themes/' . $theme );
+				return;
+				break;
 			case 'logs':
 				admin_page_logs_post($a);
 				break;
@@ -53,6 +71,10 @@ function admin_post(&$a){
 	return; // NOTREACHED	
 }
 
+/**
+ * @param App $a
+ * @return string
+ */
 function admin_content(&$a) {
 
 	if(!is_site_admin()) {
@@ -60,7 +82,7 @@ function admin_content(&$a) {
 	}
 
 	if(x($_SESSION,'submanage') && intval($_SESSION['submanage']))
-		return;
+		return "";
 
 	/**
 	 * Side bar links
@@ -129,12 +151,21 @@ function admin_content(&$a) {
 	} else {
 		$o = admin_page_summary($a);
 	}
-	return $o;
+	
+	if(is_ajax()) {
+		echo $o; 
+		killme();
+		return '';
+	} else {
+		return $o;
+	}
 } 
 
 
 /**
  * Admin Summary Page
+ * @param App $a
+ * @return string
  */
 function admin_page_summary(&$a) {
 	$r = q("SELECT `page-flags`, COUNT(uid) as `count` FROM `user` GROUP BY `page-flags`");
@@ -168,13 +199,15 @@ function admin_page_summary(&$a) {
 
 /**
  * Admin Site Page
+ *  @param App $a
  */
 function admin_page_site_post(&$a){
 	if (!x($_POST,"page_site")){
 		return;
 	}
 
-	
+    check_form_security_token_redirectOnErr('/admin/site', 'admin_site');
+
 	$sitename 			=	((x($_POST,'sitename'))			? notags(trim($_POST['sitename']))			: '');
 	$banner				=	((x($_POST,'banner'))      		? trim($_POST['banner'])					: false);
 	$language			=	((x($_POST,'language'))			? notags(trim($_POST['language']))			: '');
@@ -194,7 +227,6 @@ function admin_page_site_post(&$a){
 	$global_directory	=	((x($_POST,'directory_submit_url'))	? notags(trim($_POST['directory_submit_url']))	: '');
 	$no_multi_reg		=	((x($_POST,'no_multi_reg'))		? True	:	False);
 	$no_openid			=	!((x($_POST,'no_openid'))		? True	:	False);
-	$no_gravatar		=	!((x($_POST,'no_gravatar'))		? True	:	False);
 	$no_regfullname		=	!((x($_POST,'no_regfullname'))	? True	:	False);
 	$no_utf				=	!((x($_POST,'no_utf'))			? True	:	False);
 	$no_community_page	=	!((x($_POST,'no_community_page'))	? True	:	False);
@@ -204,10 +236,52 @@ function admin_page_site_post(&$a){
 	$proxy				=	((x($_POST,'proxy'))			? notags(trim($_POST['proxy']))	: '');
 	$timeout			=	((x($_POST,'timeout'))			? intval(trim($_POST['timeout']))		: 60);
 	$dfrn_only          =	((x($_POST,'dfrn_only'))	    ? True	:	False);
-    $ostatus_disabled   =   !((x($_POST,'ostatus_disabled')) ? True  :   False);
+	$ostatus_disabled   =   !((x($_POST,'ostatus_disabled')) ? True  :   False);
 	$diaspora_enabled   =   ((x($_POST,'diaspora_enabled')) ? True   :  False);
 	$ssl_policy         =   ((x($_POST,'ssl_policy')) ? intval($_POST['ssl_policy']) : 0);
 
+	if($ssl_policy != intval(get_config('system','ssl_policy'))) {
+		if($ssl_policy == SSL_POLICY_FULL) {
+			q("update `contact` set 
+				`url`     = replace(`url`    , 'http:' , 'https:'),
+				`photo`   = replace(`photo`  , 'http:' , 'https:'),
+				`thumb`   = replace(`thumb`  , 'http:' , 'https:'),
+				`micro`   = replace(`micro`  , 'http:' , 'https:'),
+				`request` = replace(`request`, 'http:' , 'https:'),
+				`notify`  = replace(`notify` , 'http:' , 'https:'),
+				`poll`    = replace(`poll`   , 'http:' , 'https:'),
+				`confirm` = replace(`confirm`, 'http:' , 'https:'),
+				`poco`    = replace(`poco`   , 'http:' , 'https:')
+				where `self` = 1"
+			);
+			q("update `profile` set 
+				`photo`   = replace(`photo`  , 'http:' , 'https:'),
+				`thumb`   = replace(`thumb`  , 'http:' , 'https:')
+				where 1 "
+			);
+		}
+		elseif($ssl_policy == SSL_POLICY_SELFSIGN) {
+			q("update `contact` set 
+				`url`     = replace(`url`    , 'https:' , 'http:'),
+				`photo`   = replace(`photo`  , 'https:' , 'http:'),
+				`thumb`   = replace(`thumb`  , 'https:' , 'http:'),
+				`micro`   = replace(`micro`  , 'https:' , 'http:'),
+				`request` = replace(`request`, 'https:' , 'http:'),
+				`notify`  = replace(`notify` , 'https:' , 'http:'),
+				`poll`    = replace(`poll`   , 'https:' , 'http:'),
+				`confirm` = replace(`confirm`, 'https:' , 'http:'),
+				`poco`    = replace(`poco`   , 'https:' , 'http:')
+				where `self` = 1"
+			);
+			q("update `profile` set 
+				`photo`   = replace(`photo`  , 'https:' , 'http:'),
+				`thumb`   = replace(`thumb`  , 'https:' , 'http:')
+				where 1 "
+			);
+		}
+	}
+	set_config('system','ssl_policy',$ssl_policy);
+
 	set_config('config','sitename',$sitename);
 	if ($banner==""){
 		// don't know why, but del_config doesn't work...
@@ -218,7 +292,6 @@ function admin_page_site_post(&$a){
 	} else {
 		set_config('system','banner', $banner);
 	}
-	set_config('system','ssl_policy',$ssl_policy);
 	set_config('system','language', $language);
 	set_config('system','theme', $theme);
 	set_config('system','maximagesize', $maximagesize);
@@ -239,10 +312,9 @@ function admin_page_site_post(&$a){
 	} else {
 		set_config('system','directory_submit_url', $global_directory);
 	}
-	set_config('system','directory_search_url', $global_search_url);
+
 	set_config('system','block_extended_register', $no_multi_reg);
 	set_config('system','no_openid', $no_openid);
-	set_config('system','no_gravatar', $no_gravatar);
 	set_config('system','no_regfullname', $no_regfullname);
 	set_config('system','no_community_page', $no_community_page);
 	set_config('system','no_utf', $no_utf);
@@ -259,7 +331,11 @@ function admin_page_site_post(&$a){
 	return; // NOTREACHED	
 	
 }
- 
+
+/**
+ * @param  App $a
+ * @return string
+ */
 function admin_page_site(&$a) {
 	
 	/* Installed langs */
@@ -324,7 +400,7 @@ function admin_page_site(&$a) {
 		'$sitename' 		=> array('sitename', t("Site name"), htmlentities($a->config['sitename'], ENT_QUOTES), ""),
 		'$banner'			=> array('banner', t("Banner/Logo"), $banner, ""),
 		'$language' 		=> array('language', t("System language"), get_config('system','language'), "", $lang_choices),
-		'$theme' 			=> array('theme', t("System theme"), get_config('system','theme'), t("Default system theme - may be over-ridden by user profiles"), $theme_choices),
+		'$theme' 			=> array('theme', t("System theme"), get_config('system','theme'), t("Default system theme - may be over-ridden by user profiles - <a href='#' id='cnftheme'>change theme settings</a>"), $theme_choices),
 		'$ssl_policy'       => array('ssl_policy', t("SSL link policy"), (string) intval(get_config('system','ssl_policy')), t("Determines whether generated links should be forced to use SSL"), $ssl_choices),
 		'$maximagesize'		=> array('maximagesize', t("Maximum image size"), get_config('system','maximagesize'), t("Maximum size in bytes of uploaded images. Default is 0, which means no limits.")),
 
@@ -339,7 +415,6 @@ function admin_page_site(&$a) {
 			
 		'$no_multi_reg'		=> array('no_multi_reg', t("Block multiple registrations"),  get_config('system','block_extended_register'), t("Disallow users to register additional accounts for use as pages.")),
 		'$no_openid'		=> array('no_openid', t("OpenID support"), !get_config('system','no_openid'), t("OpenID support for registration and logins.")),
-		'$no_gravatar'		=> array('no_gravatar', t("Gravatar support"), !get_config('system','no_gravatar'), t("Search new user's photo on Gravatar.")),
 		'$no_regfullname'	=> array('no_regfullname', t("Fullname check"), !get_config('system','no_regfullname'), t("Force users to register with a space between firstname and lastname in Full name, as an antispam measure")),
 		'$no_utf'			=> array('no_utf', t("UTF-8 Regular expressions"), !get_config('system','no_utf'), t("Use PHP UTF8 regular expressions")),
 		'$no_community_page' => array('no_community_page', t("Show Community Page"), !get_config('system','no_community_page'), t("Display a Community page showing all recent public postings on this site.")),
@@ -351,6 +426,7 @@ function admin_page_site(&$a) {
 		'$proxy'			=> array('proxy', t("Proxy URL"), get_config('system','proxy'), ""),
 		'$timeout'			=> array('timeout', t("Network timeout"), (x(get_config('system','curl_timeout'))?get_config('system','curl_timeout'):60), t("Value is in seconds. Set to 0 for unlimited (not recommended).")),
 
+        '$form_security_token' => get_form_security_token("admin_site"),
 			
 	));
 
@@ -359,11 +435,15 @@ function admin_page_site(&$a) {
 
 /**
  * Users admin page
+ *
+ * @param App $a
  */
 function admin_page_users_post(&$a){
 	$pending = ( x($_POST, 'pending') ? $_POST['pending'] : Array() );
 	$users = ( x($_POST, 'user') ? $_POST['user'] : Array() );
-	
+
+    check_form_security_token_redirectOnErr('/admin/users', 'admin_users');
+
 	if (x($_POST,'page_users_block')){
 		foreach($users as $uid){
 			q("UPDATE `user` SET `blocked`=1-`blocked` WHERE `uid`=%s",
@@ -395,7 +475,11 @@ function admin_page_users_post(&$a){
 	goaway($a->get_baseurl(true) . '/admin/users' );
 	return; // NOTREACHED	
 }
- 
+
+/**
+ * @param App $a
+ * @return string
+ */
 function admin_page_users(&$a){
 	if ($a->argc>2) {
 		$uid = $a->argv[3];
@@ -403,10 +487,11 @@ function admin_page_users(&$a){
 		if (count($user)==0){
 			notice( 'User not found' . EOL);
 			goaway($a->get_baseurl(true) . '/admin/users' );
-			return; // NOTREACHED						
+			return ''; // NOTREACHED
 		}		
 		switch($a->argv[2]){
 			case "delete":{
+                check_form_security_token_redirectOnErr('/admin/users', 'admin_users', 't');
 				// delete user
 				require_once("include/Contact.php");
 				user_remove($uid);
@@ -414,6 +499,7 @@ function admin_page_users(&$a){
 				notice( sprintf(t("User '%s' deleted"), $user[0]['username']) . EOL);
 			}; break;
 			case "block":{
+                check_form_security_token_redirectOnErr('/admin/users', 'admin_users', 't');
 				q("UPDATE `user` SET `blocked`=%d WHERE `uid`=%s",
 					intval( 1-$user[0]['blocked'] ),
 					intval( $uid )
@@ -422,7 +508,7 @@ function admin_page_users(&$a){
 			}; break;
 		}
 		goaway($a->get_baseurl(true) . '/admin/users' );
-		return; // NOTREACHED	
+		return ''; // NOTREACHED
 		
 	}
 	
@@ -498,6 +584,7 @@ function admin_page_users(&$a){
 		'$confirm_delete_multi' => t('Selected users will be deleted!\n\nEverything these users had posted on this site will be permanently deleted!\n\nAre you sure?'),
 		'$confirm_delete' => t('The user {0} will be deleted!\n\nEverything this user has posted on this site will be permanently deleted!\n\nAre you sure?'),
 
+        '$form_security_token' => get_form_security_token("admin_users"),
 
 		// values //
 		'$baseurl' => $a->get_baseurl(true),
@@ -510,10 +597,12 @@ function admin_page_users(&$a){
 }
 
 
-/*
+/**
  * Plugins admin page
+ *
+ * @param App $a
+ * @return string
  */
-
 function admin_page_plugins(&$a){
 	
 	/**
@@ -523,10 +612,12 @@ function admin_page_plugins(&$a){
 		$plugin = $a->argv[2];
 		if (!is_file("addon/$plugin/$plugin.php")){
 			notice( t("Item not found.") );
-			return;
+			return '';
 		}
 		
 		if (x($_GET,"a") && $_GET['a']=="t"){
+            check_form_security_token_redirectOnErr('/admin/plugins', 'admin_themes', 't');
+
 			// Toggle plugin status
 			$idx = array_search($plugin, $a->plugins);
 			if ($idx !== false){
@@ -540,7 +631,7 @@ function admin_page_plugins(&$a){
 			}
 			set_config("system","addon", implode(", ",$a->plugins));
 			goaway($a->get_baseurl(true) . '/admin/plugins' );
-			return; // NOTREACHED	
+			return ''; // NOTREACHED
 		}
 		// display plugin details
 		require_once('library/markdown.php');
@@ -584,7 +675,9 @@ function admin_page_plugins(&$a){
 			'$admin_form' => $admin_form,
 			'$function' => 'plugins',
 			'$screenshot' => '',
-			'$readme' => $readme
+			'$readme' => $readme,
+
+            '$form_security_token' => get_form_security_token("admin_themes"),
 		));
 	} 
 	 
@@ -613,10 +706,16 @@ function admin_page_plugins(&$a){
 		'$submit' => t('Submit'),
 		'$baseurl' => $a->get_baseurl(true),
 		'$function' => 'plugins',	
-		'$plugins' => $plugins
+		'$plugins' => $plugins,
+        '$form_security_token' => get_form_security_token("admin_themes"),
 	));
 }
 
+/**
+ * @param array $themes
+ * @param string $th
+ * @param int $result
+ */
 function toggle_theme(&$themes,$th,&$result) {
 	for($x = 0; $x < count($themes); $x ++) {
 		if($themes[$x]['name'] === $th) {
@@ -632,6 +731,11 @@ function toggle_theme(&$themes,$th,&$result) {
 	}
 }
 
+/**
+ * @param array $themes
+ * @param string $th
+ * @return int
+ */
 function theme_status($themes,$th) {
 	for($x = 0; $x < count($themes); $x ++) {
 		if($themes[$x]['name'] === $th) {
@@ -645,9 +749,12 @@ function theme_status($themes,$th) {
 	}
 	return 0;
 }
-	
 
 
+/**
+ * @param array $themes
+ * @return string
+ */
 function rebuild_theme_table($themes) {
 	$o = '';
 	if(count($themes)) {
@@ -663,10 +770,12 @@ function rebuild_theme_table($themes) {
 }
 
 	
-/*
+/**
  * Themes admin page
+ *
+ * @param App $a
+ * @return string
  */
-
 function admin_page_themes(&$a){
 	
 	$allowed_themes_str = get_config('system','allowed_themes');
@@ -683,7 +792,7 @@ function admin_page_themes(&$a){
         foreach($files as $file) {
             $f = basename($file);
             $is_experimental = intval(file_exists($file . '/experimental'));
-			$is_unsupported = 1-(intval(file_exists($file . '/unsupported')));
+			$is_supported = 1-(intval(file_exists($file . '/unsupported'))); // Is not used yet
 			$is_allowed = intval(in_array($f,$allowed_themes));
 			$themes[] = array('name' => $f, 'experimental' => $is_experimental, 'supported' => $is_supported, 'allowed' => $is_allowed);
         }
@@ -691,7 +800,7 @@ function admin_page_themes(&$a){
 
 	if(! count($themes)) {
 		notice( t('No themes found.'));
-		return;
+		return '';
 	}
 
 	/**
@@ -702,10 +811,11 @@ function admin_page_themes(&$a){
 		$theme = $a->argv[2];
 		if(! is_dir("view/theme/$theme")){
 			notice( t("Item not found.") );
-			return;
+			return '';
 		}
 		
 		if (x($_GET,"a") && $_GET['a']=="t"){
+            check_form_security_token_redirectOnErr('/admin/themes', 'admin_themes', 't');
 
 			// Toggle theme status
 
@@ -718,7 +828,7 @@ function admin_page_themes(&$a){
 
 			set_config('system','allowed_themes',$s);
 			goaway($a->get_baseurl(true) . '/admin/themes' );
-			return; // NOTREACHED	
+			return ''; // NOTREACHED
 		}
 
 		// display theme details
@@ -731,14 +841,22 @@ function admin_page_themes(&$a){
 		}
 		
 		$readme=Null;
-		if (is_file("view/$theme/README.md")){
-			$readme = file_get_contents("view/$theme/README.md");
+		if (is_file("view/theme/$theme/README.md")){
+			$readme = file_get_contents("view/theme/$theme/README.md");
 			$readme = Markdown($readme);
-		} else if (is_file("view/$theme/README")){
-			$readme = "<pre>". file_get_contents("view/$theme/README") ."</pre>";
+		} else if (is_file("view/theme/$theme/README")){
+			$readme = "<pre>". file_get_contents("view/theme/$theme/README") ."</pre>";
 		} 
 		
 		$admin_form="";
+		if (is_file("view/theme/$theme/config.php")){
+			require_once("view/theme/$theme/config.php");
+			if(function_exists("theme_admin")){
+				$admin_form = theme_admin($a);
+			}
+			
+		}
+		
 
 		$screenshot = array( get_theme_screenshot($theme), t('Screenshot'));
 		if(! stristr($screenshot[0],$theme))
@@ -756,19 +874,21 @@ function admin_page_themes(&$a){
 			'$status' => $status,
 			'$action' => $action,
 			'$info' => get_theme_info($theme),
-			'$function' => 'themes',		
+			'$function' => 'themes',
 			'$admin_form' => $admin_form,
 			'$str_author' => t('Author: '),
-			'$str_maintainer' => t('Maintainer: '),			
+			'$str_maintainer' => t('Maintainer: '),
 			'$screenshot' => $screenshot,
-			'$readme' => $readme
+			'$readme' => $readme,
+
+			'$form_security_token' => get_form_security_token("admin_themes"),
 		));
 	} 
 	 
 	 
 	
 	/**
-	 * List plugins
+	 * List themes
 	 */
 	
 	$xthemes = array();
@@ -787,17 +907,21 @@ function admin_page_themes(&$a){
 		'$function' => 'themes',
 		'$plugins' => $xthemes,
 		'$experimental' => t('[Experimental]'),
-		'$unsupported' => t('[Unsupported]')
+		'$unsupported' => t('[Unsupported]'),
+        '$form_security_token' => get_form_security_token("admin_themes"),
 	));
 }
 
 
 /**
  * Logs admin page
+ *
+ * @param App $a
  */
  
 function admin_page_logs_post(&$a) {
 	if (x($_POST,"page_logs")) {
+        check_form_security_token_redirectOnErr('/admin/logs', 'admin_logs');
 
 		$logfile 		=	((x($_POST,'logfile'))		? notags(trim($_POST['logfile']))	: '');
 		$debugging		=	((x($_POST,'debugging'))	? true								: false);
@@ -814,7 +938,11 @@ function admin_page_logs_post(&$a) {
 	goaway($a->get_baseurl(true) . '/admin/logs' );
 	return; // NOTREACHED	
 }
- 
+
+/**
+ * @param App $a
+ * @return string
+ */
 function admin_page_logs(&$a){
 	
 	$log_choices = Array(
@@ -872,9 +1000,14 @@ readable.");
 		'$debugging' 		=> array('debugging', t("Debugging"),get_config('system','debugging'), ""),
 		'$logfile'			=> array('logfile', t("Log file"), get_config('system','logfile'), t("Must be writable by web server. Relative to your Friendica top-level directory.")),
 		'$loglevel' 		=> array('loglevel', t("Log level"), get_config('system','loglevel'), "", $log_choices),
+
+        '$form_security_token' => get_form_security_token("admin_logs"),
 	));
 }
 
+/**
+ * @param App $a
+ */
 function admin_page_remoteupdate_post(&$a) {
 	// this function should be called via ajax post
 	if(!is_site_admin()) {
@@ -893,6 +1026,10 @@ function admin_page_remoteupdate_post(&$a) {
 	killme();
 }
 
+/**
+ * @param App $a
+ * @return string
+ */
 function admin_page_remoteupdate(&$a) {
 	if(!is_site_admin()) {
 		return login(false);
diff --git a/mod/allfriends.php b/mod/allfriends.php
index f675b8e29..f675b8e29 100755..100644
--- a/mod/allfriends.php
+++ b/mod/allfriends.php
diff --git a/mod/amcd.php b/mod/amcd.php
index a2a1327e6..a2a1327e6 100755..100644
--- a/mod/amcd.php
+++ b/mod/amcd.php
diff --git a/mod/api.php b/mod/api.php
index ad75e6620..ad75e6620 100755..100644
--- a/mod/api.php
+++ b/mod/api.php
diff --git a/mod/apps.php b/mod/apps.php
index 8049b45fb..8049b45fb 100755..100644
--- a/mod/apps.php
+++ b/mod/apps.php
diff --git a/mod/attach.php b/mod/attach.php
index ae6540201..ae6540201 100755..100644
--- a/mod/attach.php
+++ b/mod/attach.php
diff --git a/mod/cb.php b/mod/cb.php
index 6375d2398..6375d2398 100755..100644
--- a/mod/cb.php
+++ b/mod/cb.php
diff --git a/mod/common.php b/mod/common.php
index 852388c14..852388c14 100755..100644
--- a/mod/common.php
+++ b/mod/common.php
diff --git a/mod/community.php b/mod/community.php
index f8cc3305b..bfe5a3089 100755..100644
--- a/mod/community.php
+++ b/mod/community.php
@@ -45,13 +45,13 @@ function community_content(&$a, $update = 0) {
 	// OR your own posts if you are a logged in member
 
 
-	$r = q("SELECT COUNT(*) AS `total`
+	$r = q("SELECT distinct(`item`.`uri`) AS `total`
 		FROM `item` LEFT JOIN `contact` ON `contact`.`id` = `item`.`contact-id` LEFT JOIN `user` ON `user`.`uid` = `item`.`uid`
 		WHERE `item`.`visible` = 1 AND `item`.`deleted` = 0 and `item`.`moderated` = 0
 		AND `item`.`allow_cid` = ''  AND `item`.`allow_gid` = '' 
 		AND `item`.`deny_cid`  = '' AND `item`.`deny_gid`  = '' 
 		AND `item`.`private` = 0 AND `item`.`wall` = 1 AND `user`.`hidewall` = 0 
-		AND `contact`.`blocked` = 0 AND `contact`.`pending` = 0 "
+		AND `contact`.`blocked` = 0 AND `contact`.`pending` = 0 group by `item`.`uri` "
 	);
 
 	if(count($r))
@@ -62,7 +62,7 @@ function community_content(&$a, $update = 0) {
 		return $o;
 	}
 
-	$r = q("SELECT `item`.*, `item`.`id` AS `item_id`, 
+	$r = q("SELECT distinct(`item`.`uri`), `item`.*, `item`.`id` AS `item_id`, 
 		`contact`.`name`, `contact`.`photo`, `contact`.`url`, `contact`.`rel`,
 		`contact`.`network`, `contact`.`thumb`, `contact`.`self`, `contact`.`writable`, 
 		`contact`.`id` AS `cid`, `contact`.`uid` AS `contact-uid`,
@@ -73,7 +73,7 @@ function community_content(&$a, $update = 0) {
 		AND `item`.`allow_cid` = ''  AND `item`.`allow_gid` = '' 
 		AND `item`.`deny_cid`  = '' AND `item`.`deny_gid`  = '' 
 		AND `item`.`private` = 0 AND `item`.`wall` = 1 AND `user`.`hidewall` = 0 
-		AND `contact`.`blocked` = 0 AND `contact`.`pending` = 0
+		AND `contact`.`blocked` = 0 AND `contact`.`pending` = 0 group by `item`.`uri`
 		ORDER BY `received` DESC LIMIT %d, %d ",
 		intval($a->pager['start']),
 		intval($a->pager['itemspage'])
diff --git a/mod/contactgroup.php b/mod/contactgroup.php
index bf81afe07..bf81afe07 100755..100644
--- a/mod/contactgroup.php
+++ b/mod/contactgroup.php
diff --git a/mod/contacts.php b/mod/contacts.php
index 8aa51d00a..9d29d4bd1 100755..100644
--- a/mod/contacts.php
+++ b/mod/contacts.php
@@ -85,7 +85,7 @@ function contacts_post(&$a) {
 	if($priority > 5 || $priority < 0)
 		$priority = 0;
 
-	$info = escape_tags(trim($_POST['info']));
+	$info = fix_mce_lf(escape_tags(trim($_POST['info'])));
 
 	$r = q("UPDATE `contact` SET `profile-id` = %d, `priority` = %d , `info` = '%s',
 		`hidden` = %d WHERE `id` = %d AND `uid` = %d LIMIT 1",
@@ -232,8 +232,14 @@ function contacts_content(&$a) {
 		$contact_id = $a->data['contact']['id'];
 		$contact = $a->data['contact'];
 
-		$tpl = get_markup_template('contact_head.tpl');
-		$a->page['htmlhead'] .= replace_macros($tpl, array('$baseurl' => $a->get_baseurl(true)));
+		$editselect = 'exact';
+		if(intval(get_pconfig(local_user(),'system','plaintext')))
+			$editselect = 'none';
+
+		$a->page['htmlhead'] .= replace_macros(get_markup_template('contact_head.tpl'), array(
+			'$baseurl' => $a->get_baseurl(true),
+			'$editselect' => $editselect,
+		));
 
 		require_once('include/contact_selectors.php');
 
diff --git a/mod/crepair.php b/mod/crepair.php
index ec963b105..ec963b105 100755..100644
--- a/mod/crepair.php
+++ b/mod/crepair.php
diff --git a/mod/dfrn_notify.php b/mod/dfrn_notify.php
index 8e4ce0671..65d39d5fe 100755..100644
--- a/mod/dfrn_notify.php
+++ b/mod/dfrn_notify.php
@@ -99,65 +99,10 @@ function dfrn_notify_post(&$a) {
 		$importer['forum'] = $page;
 	}
 
-	// if contact's ssl policy changed, update our links
-
-	$ssl_changed = false;
-
-	if($ssl_policy == 'self' && strstr($importer['url'],'https:')) {
-		$ssl_changed = true;
-		$importer['url']     = 	str_replace('https:','http:',$importer['url']);
-		$importer['nurl']    = normalise_link($importer['url']);
-		$importer['photo']   = 	str_replace('https:','http:',$importer['photo']);
-		$importer['thumb']   = 	str_replace('https:','http:',$importer['thumb']);
-		$importer['micro']   = 	str_replace('https:','http:',$importer['micro']);
-		$importer['request'] = 	str_replace('https:','http:',$importer['request']);
-		$importer['notify']  = 	str_replace('https:','http:',$importer['notify']);
-		$importer['poll']    = 	str_replace('https:','http:',$importer['poll']);
-		$importer['confirm'] = 	str_replace('https:','http:',$importer['confirm']);
-		$importer['poco']    = 	str_replace('https:','http:',$importer['poco']);
-	}
 
-	if($ssl_policy == 'full' && strstr($importer['url'],'http:')) {
-		$ssl_changed = true;
-		$importer['url']     = 	str_replace('http:','https:',$importer['url']);
-		$importer['nurl']    = normalise_link($importer['url']);
-		$importer['photo']   = 	str_replace('http:','https:',$importer['photo']);
-		$importer['thumb']   = 	str_replace('http:','https:',$importer['thumb']);
-		$importer['micro']   = 	str_replace('http:','https:',$importer['micro']);
-		$importer['request'] = 	str_replace('http:','https:',$importer['request']);
-		$importer['notify']  = 	str_replace('http:','https:',$importer['notify']);
-		$importer['poll']    = 	str_replace('http:','https:',$importer['poll']);
-		$importer['confirm'] = 	str_replace('http:','https:',$importer['confirm']);
-		$importer['poco']    = 	str_replace('http:','https:',$importer['poco']);
-	}
+	// if contact's ssl policy changed, update our links
 
-	if($ssl_changed) {
-		q("update contact set 
-			url = '%s', 
-			nurl = '%s',
-			photo = '%s',
-			thumb = '%s',
-			micro = '%s',
-			request = '%s',
-			notify = '%s',
-			poll = '%s',
-			confirm = '%s',
-			poco = '%s'
-			where id = %d limit 1",
-			dbesc($importer['url']),
-			dbesc($importer['nurl']),
-			dbesc($importer['photo']),
-			dbesc($importer['thumb']),
-			dbesc($importer['micro']),
-			dbesc($importer['request']),
-			dbesc($importer['notify']),
-			dbesc($importer['poll']),
-			dbesc($importer['confirm']),
-			dbesc($importer['poco']),
-			intval($importer['id'])
-		);
-	}
-			
+	fix_contact_ssl_policy($importer,$ssl_policy);
 
 	logger('dfrn_notify: received notify from ' . $importer['name'] . ' for ' . $importer['username']);
 	logger('dfrn_notify: data: ' . $data, LOGGER_DATA);
diff --git a/mod/dfrn_poll.php b/mod/dfrn_poll.php
index 6030587ce..436727a78 100755..100644
--- a/mod/dfrn_poll.php
+++ b/mod/dfrn_poll.php
@@ -33,7 +33,7 @@ function dfrn_poll_init(&$a) {
 
 		$user = '';
 		if($a->argc > 1) {
-			$r = q("SELECT `hidewall` FROM `user` WHERE `user`.`nickname` = '%s' LIMIT 1",
+			$r = q("SELECT `hidewall`,`nickname` FROM `user` WHERE `user`.`nickname` = '%s' LIMIT 1",
 				dbesc($a->argv[1])
 			);
 			if((! count($r)) || (count($r) && $r[0]['hidewall']))
@@ -428,11 +428,13 @@ function dfrn_poll_content(&$a) {
 				break; // NOTREACHED
 		}
 
+		$nickname = $a->argv[1];
+
 		$r = q("SELECT `contact`.*, `user`.`username`, `user`.`nickname` 
 			FROM `contact` LEFT JOIN `user` ON `contact`.`uid` = `user`.`uid`
 			WHERE `contact`.`blocked` = 0 AND `contact`.`pending` = 0 
 			AND `user`.`nickname` = '%s' $sql_extra LIMIT 1",
-			dbesc($a->argv[1])
+			dbesc($nickname)
 		);
 
 		if(count($r)) {
@@ -482,7 +484,7 @@ function dfrn_poll_content(&$a) {
 				));
 			}
 			
-			$profile = $r[0]['nickname'];
+			$profile = ((count($r) && $r[0]['nickname']) ? $r[0]['nickname'] : $nickname);
 
 			switch($destination_url) {
 				case 'profile':
diff --git a/mod/dfrn_request.php b/mod/dfrn_request.php
index 5881b7b51..74d25adbf 100755..100644
--- a/mod/dfrn_request.php
+++ b/mod/dfrn_request.php
@@ -180,7 +180,7 @@ function dfrn_request_post(&$a) {
 				
 				// (ignore reply, nothing we can do it failed)
 
-				goaway($dfrn_url);
+				goaway(zrl($dfrn_url));
 				return; // NOTREACHED
 
 			}
@@ -261,7 +261,7 @@ function dfrn_request_post(&$a) {
 			WHERE `intro`.`blocked` = 1 AND `contact`.`self` = 0 
 			AND `contact`.`network` != '%s'
 			AND `intro`.`datetime` < UTC_TIMESTAMP() - INTERVAL 30 MINUTE ",
-			dbesc(NETWORK_MAIL)
+			dbesc(NETWORK_MAIL2)
 		);
 		if(count($r)) {
 			foreach($r as $rr) {
@@ -286,7 +286,7 @@ function dfrn_request_post(&$a) {
 			WHERE `intro`.`blocked` = 1 AND `contact`.`self` = 0 
 			AND `contact`.`network` = '%s'
 			AND `intro`.`datetime` < UTC_TIMESTAMP() - INTERVAL 3 DAY ",
-			dbesc(NETWORK_MAIL)
+			dbesc(NETWORK_MAIL2)
 		);
 		if(count($r)) {
 			foreach($r as $rr) {
@@ -301,6 +301,8 @@ function dfrn_request_post(&$a) {
 			}
 		}
 
+		$email_follow = (x($_POST,'email_follow') ? intval($_POST['email_follow']) : 0);
+		$real_name = (x($_POST,'realname') ? notags(trim($_POST['realname'])) : '');
 
 		$url = trim($_POST['dfrn_url']);
 		if(! strlen($url)) {
@@ -308,17 +310,108 @@ function dfrn_request_post(&$a) {
 			return;
 		}
 
-		// Canonicalise email-style profile locator
-
 		$hcard = '';
-		$url = webfinger_dfrn($url,$hcard);
 
-		if(substr($url,0,5) === 'stat:') {
-			$network = NETWORK_OSTATUS;
-			$url = substr($url,5);
+		if($email_follow) {
+
+			if(! validate_email($url)) {
+				notice( t('Invalid email address.') . EOL);
+				return;
+			}
+
+			$addr    = $url;
+			$name    = ($realname) ? $realname : $addr;
+			$nick    = substr($addr,0,strpos($addr,'@'));
+			$url     = 'http://' . substr($addr,strpos($addr,'@') + 1);
+			$nurl    = normalise_url($host);
+			$poll    = 'email ' . random_string();
+			$notify  = 'smtp ' . random_string();
+			$blocked = 1;
+			$pending = 1;
+			$network = NETWORK_MAIL2;
+			$rel     = CONTACT_IS_FOLLOWER;
+
+			$mail_disabled = ((function_exists('imap_open') && (! get_config('system','imap_disabled'))) ? 0 : 1);
+			if(get_config('system','dfrn_only'))
+				$mail_disabled = 1;
+
+			if(! $mail_disabled) {
+				$failed = false;
+				$r = q("SELECT * FROM `mailacct` WHERE `uid` = %d LIMIT 1",
+					intval($uid)
+				);
+				if(! count($r)) {
+					notice( t('This account has not been configured for email. Request failed.') . EOL);
+					return;
+				}
+			}
+
+			$r = q("insert into contact ( uid, created, addr, name, nick, url, nurl, poll, notify, blocked, pending, network, rel )
+				values( %d, '%s', '%s', '%s', '%s', '%s', '%s', '%s', %d, %d, '%s', %d ) ",
+				intval($uid),
+				dbesc(datetime_convert()),
+				dbesc($addr),
+				dbesc($name),
+				dbesc($nick),
+				dbesc($url),
+				dbesc($nurl),
+				dbesc($poll),
+				dbesc($notify),
+				intval($blocked),
+				intval($pending),
+				dbesc($network),
+				intval($rel)
+			);
+
+			$r = q("select id from contact where poll = '%s' and uid = %d limit 1",
+				dbesc($poll),
+				intval($uid)
+			);
+			if(count($r)) {
+				$contact_id = $r[0]['id'];
+
+				$photo = avatar_img($addr);
+
+				$r = q("UPDATE `contact` SET 
+					`photo` = '%s', 
+					`thumb` = '%s',
+					`micro` = '%s', 
+					`name-date` = '%s', 
+					`uri-date` = '%s', 
+					`avatar-date` = '%s', 
+					`hidden` = 0,
+					WHERE `id` = %d LIMIT 1
+				",
+					dbesc($photos[0]),
+					dbesc($photos[1]),
+					dbesc($photos[2]),
+					dbesc(datetime_convert()),
+					dbesc(datetime_convert()),
+					dbesc(datetime_convert()),
+					intval($contact_id)
+				);
+			}
+
+			// contact is created. Now send an email verify form to the requestor.
+			//
+
+
+
 		}
+
 		else {
-			$network = NETWORK_DFRN;
+
+			// Canonicalise email-style profile locator
+
+			$url = webfinger_dfrn($url,$hcard);
+
+			if(substr($url,0,5) === 'stat:') {
+				$network = NETWORK_OSTATUS;
+				$url = substr($url,5);
+			}
+			else {
+				$network = NETWORK_DFRN;
+			}
 		}
 
 		logger('dfrn_request: url: ' . $url);
diff --git a/mod/directory.php b/mod/directory.php
index 7f18bd026..367438845 100755..100644
--- a/mod/directory.php
+++ b/mod/directory.php
@@ -44,7 +44,7 @@ function directory_content(&$a) {
 	$gdirpath = dirname(get_config('system','directory_submit_url'));
 	if(strlen($gdirpath)) {
 		$globaldir = '<ul><li><div id="global-directory-link"><a href="'
-		. $gdirpath . '">' . t('Global Directory') . '</a></div></li></ul>';
+		. zrl($gdirpath,true) . '">' . t('Global Directory') . '</a></div></li></ul>';
 	}
 
 	$admin = '';
diff --git a/mod/dirfind.php b/mod/dirfind.php
index 34c54dd91..34c54dd91 100755..100644
--- a/mod/dirfind.php
+++ b/mod/dirfind.php
diff --git a/mod/display.php b/mod/display.php
index 81ed174ac..81ed174ac 100755..100644
--- a/mod/display.php
+++ b/mod/display.php
diff --git a/mod/editpost.php b/mod/editpost.php
index 2ddba36aa..4c00201ca 100755..100644
--- a/mod/editpost.php
+++ b/mod/editpost.php
@@ -115,6 +115,8 @@ function editpost_content(&$a) {
 		'$jotnets' => $jotnets,
 		'$title' => $itm[0]['title'],
 		'$placeholdertitle' => t('Set title'),
+                '$category' => file_tag_file_to_list($itm[0]['file'], 'category'),
+                '$placeholdercategory' => t('Categories (comma-separated list)'),
 		'$emtitle' => t('Example: bob@example.com, mary@example.com'),
 		'$lockstate' => $lockstate,
 		'$acl' => '', // populate_acl((($group) ? $group_acl : $a->user), $celeb),
diff --git a/mod/events.php b/mod/events.php
index 0906d16c2..e66a2dc44 100755..100644
--- a/mod/events.php
+++ b/mod/events.php
@@ -284,11 +284,11 @@ function events_content(&$a) {
 		if (x($_GET,'id')){
 			$tpl =  get_markup_template("event.tpl");
 		} else {
-			if (get_config('experimentals','new_calendar')==1){
+//			if (get_config('experimentals','new_calendar')==1){
 				$tpl = get_markup_template("events-js.tpl");
-			} else {
-				$tpl = get_markup_template("events.tpl");
-			}
+//			} else {
+//				$tpl = get_markup_template("events.tpl");
+//			}
 		}
 		$o = replace_macros($tpl, array(
 			'$baseurl'	=> $a->get_baseurl(),
diff --git a/mod/fbrowser.php b/mod/fbrowser.php
new file mode 100644
index 000000000..66ff9252e
--- /dev/null
+++ b/mod/fbrowser.php
@@ -0,0 +1,99 @@
+<?php
+/**
+ * @package		Friendica\modules
+ * @subpackage	FileBrowser
+ * @author		Fabio Comuni <fabrixxm@kirgroup.com>
+ */
+ 
+/**
+ * @param App $a
+ */
+function fbrowser_content($a){
+	
+	if (!local_user())
+		killme();
+
+	if ($a->argc==1)
+		killme();
+	
+	//echo "<pre>"; var_dump($a->argv); killme();	
+	
+	switch($a->argv[1]){
+		case "image":
+			$path = array( array($a->get_baseurl()."/fbrowser/image/", t("Photos")));
+			$albums = false;
+			$sql_extra = "";
+			$sql_extra2 = " ORDER BY created DESC LIMIT 0, 10";
+			
+			if ($a->argc==2){
+				$albums = q("SELECT distinct(`album`) AS `album` FROM `photo` WHERE `uid` = %d ",
+					intval(local_user())
+				);
+				// anon functions only from 5.3.0... meglio tardi che mai..
+				function folder1($el){return array(bin2hex($el['album']),$el['album']);}	
+				$albums = array_map( "folder1" , $albums);
+				
+			}
+			
+			$album = "";
+			if ($a->argc==3){
+				$album = hex2bin($a->argv[2]);
+				$sql_extra = sprintf("AND `album` = '%s' ",dbesc($album));
+				$sql_extra2 = "";
+				$path[]=array($a->get_baseurl()."/fbrowser/image/".$a->argv[2]."/", $album);
+			}
+				
+			$r = q("SELECT `resource-id`, `id`, `filename`, min(`scale`) AS `hiq`,max(`scale`) AS `loq`, `desc`  
+					FROM `photo` WHERE `uid` = %d $sql_extra
+					GROUP BY `resource-id` $sql_extra2",
+				intval(local_user())					
+			);
+			
+			
+			function files1($rr){ global $a; return array( $a->get_baseurl() . '/photo/' . $rr['resource-id'] . '-' . $rr['hiq'] . '.jpg', template_escape($rr['filename']), $a->get_baseurl() . '/photo/' . $rr['resource-id'] . '-' . $rr['loq'] . '.jpg');  }
+			$files = array_map("files1", $r);
+			
+			$tpl = get_markup_template("filebrowser.tpl");
+			echo replace_macros($tpl, array(
+				'$type' => 'image',
+				'$baseurl' => $a->get_baseurl(),
+				'$path' => $path,
+				'$folders' => $albums,
+				'$files' =>$files,
+			));
+				
+				
+			break;
+		case "file":
+			if ($a->argc==2){
+				$files = q("SELECT id, filename, filetype FROM `attach` WHERE `uid` = %d ",
+					intval(local_user())
+				);
+				
+				function files2($rr){ global $a; 
+					list($m1,$m2) = explode("/",$rr['filetype']);
+					$filetype = ( (file_exists("images/icons/$m1.png"))?$m1:"zip");
+					return array( $a->get_baseurl() . '/attach/' . $rr['id'], template_escape($rr['filename']), $a->get_baseurl() . '/images/icons/16/' . $filetype . '.png'); 
+				}
+				$files = array_map("files2", $files);
+				//echo "<pre>"; var_dump($files); killme();
+			
+							
+				$tpl = get_markup_template("filebrowser.tpl");
+				echo replace_macros($tpl, array(
+					'$type' => 'file',
+					'$baseurl' => $a->get_baseurl(),
+					'$path' => array( array($a->get_baseurl()."/fbrowser/image/", t("Files")) ),
+					'$folders' => false,
+					'$files' =>$files,
+				));
+				
+			}
+		
+			break;
+	}
+	
+
+	killme();
+	
+}
diff --git a/mod/filer.php b/mod/filer.php
index 3cd1bfe22..c0cca9e6d 100755..100644
--- a/mod/filer.php
+++ b/mod/filer.php
@@ -22,7 +22,8 @@ function filer_content(&$a) {
 	} else {
 		// return filer dialog
 		$filetags = get_pconfig(local_user(),'system','filetags');
-		$filetags = explode("][", trim($filetags,"[]"));
+		$filetags = file_tag_file_to_list($filetags,'file');
+                $filetags = explode(",", $filetags);
 		$tpl = get_markup_template("filer_dialog.tpl");
 		$o = replace_macros($tpl, array(
 			'$field' => array('term', t("Save to Folder:"), '', '', $filetags, t('- select -')),
diff --git a/mod/follow.php b/mod/follow.php
index ae8cb200c..ae8cb200c 100755..100644
--- a/mod/follow.php
+++ b/mod/follow.php
diff --git a/mod/friendica.php b/mod/friendica.php
index 52a064224..52a064224 100755..100644
--- a/mod/friendica.php
+++ b/mod/friendica.php
diff --git a/mod/friendika.php b/mod/friendika.php
index 1f3df565d..1f3df565d 100755..100644
--- a/mod/friendika.php
+++ b/mod/friendika.php
diff --git a/mod/fsuggest.php b/mod/fsuggest.php
index 9ef8f4c55..9ef8f4c55 100755..100644
--- a/mod/fsuggest.php
+++ b/mod/fsuggest.php
diff --git a/mod/group.php b/mod/group.php
index a282dbccf..a282dbccf 100755..100644
--- a/mod/group.php
+++ b/mod/group.php
diff --git a/mod/hcard.php b/mod/hcard.php
index 6d2d9e2eb..6d2d9e2eb 100755..100644
--- a/mod/hcard.php
+++ b/mod/hcard.php
diff --git a/mod/help.php b/mod/help.php
index af05bd47c..af05bd47c 100755..100644
--- a/mod/help.php
+++ b/mod/help.php
diff --git a/mod/home.php b/mod/home.php
index 0320c1b39..0320c1b39 100755..100644
--- a/mod/home.php
+++ b/mod/home.php
diff --git a/mod/hostxrd.php b/mod/hostxrd.php
index fe61a874c..fe61a874c 100755..100644
--- a/mod/hostxrd.php
+++ b/mod/hostxrd.php
diff --git a/mod/install.php b/mod/install.php
index 003d81c6a..6f5552076 100755..100644
--- a/mod/install.php
+++ b/mod/install.php
@@ -340,7 +340,7 @@ function check_php(&$phpath, &$checks) {
 			$help .= t('The command line version of PHP on your system does not have "register_argc_argv" enabled.'). EOL;
 			$help .= t('This is required for message delivery to work.');
 		}
-		check_add($checks, t('PHP "register_argc_argv"'), $passed, true, $help);
+		check_add($checks, t('PHP register_argc_argv'), $passed, true, $help);
 	}
 	
 
@@ -380,9 +380,9 @@ function check_funcs(&$checks) {
 	
 	if(function_exists('apache_get_modules')){
 		if (! in_array('mod_rewrite',apache_get_modules())) {
-			check_add($ck_funcs, t('Apace mod_rewrite module'), false, true, t('Error: Apache webserver mod-rewrite module is required but not installed.'));
+			check_add($ck_funcs, t('Apache mod_rewrite module'), false, true, t('Error: Apache webserver mod-rewrite module is required but not installed.'));
 		} else {
-			check_add($ck_funcs, t('Apace mod_rewrite module'), true, true, "");
+			check_add($ck_funcs, t('Apache mod_rewrite module'), true, true, "");
 		}
 	}
 	if(! function_exists('curl_init')){
@@ -451,7 +451,7 @@ function load_database_rem($v, $i){
 function load_database($db) {
 
 	$str = file_get_contents('database.sql');
-	$str = array_reduce(explode("\n", $str),"load_database_rem","");
+//	$str = array_reduce(explode("\n", $str),"load_database_rem","");
 	$arr = explode(';',$str);
 	$errors = false;
 	foreach($arr as $a) {
@@ -464,3 +464,6 @@ function load_database($db) {
 	}
 	return $errors;
 }
+
+
+
diff --git a/mod/invite.php b/mod/invite.php
index 2dbf93c59..2dbf93c59 100755..100644
--- a/mod/invite.php
+++ b/mod/invite.php
diff --git a/mod/item.php b/mod/item.php
index 24730f53e..642a6758a 100755..100644
--- a/mod/item.php
+++ b/mod/item.php
@@ -216,8 +216,6 @@ function item_post(&$a) {
 		$emailcc           = notags(trim($_REQUEST['emailcc']));
 		$body              = escape_tags(trim($_REQUEST['body']));
 
-		// $categories = TODO
-
 		$private = ((strlen($str_group_allow) || strlen($str_contact_allow) || strlen($str_group_deny) || strlen($str_contact_deny)) ? 1 : 0);
 
 		if(($parent_item) && 
@@ -255,14 +253,26 @@ function item_post(&$a) {
 		}
 	}
 
+        if(strlen($categories)) {
+	        // get the "fileas" tags for this post
+                $filedas = file_tag_file_to_list($categories, 'file');
+	}
+        // save old and new categories, so we can determine what needs to be deleted from pconfig
+        $categories_old = $categories;
+        $categories = file_tag_list_to_file(trim($_REQUEST['category']), 'category');
+        $categories_new = $categories;
+        if(strlen($filedas)) {
+	        // append the fileas stuff to the new categories list
+	        $categories .= file_tag_list_to_file($filedas, 'file');
+	}
+
 	// Work around doubled linefeeds in Tinymce 3.5b2
 	// First figure out if it's a status post that would've been
 	// created using tinymce. Otherwise leave it alone. 
 
 	$plaintext = (local_user() ? intval(get_pconfig(local_user(),'system','plaintext')) : 0);
 	if((! $parent) && (! $api_source) && (! $plaintext)) {
-		$body = str_replace("\r\n","\n",$body);
-		$body = str_replace("\n\n","\n",$body);
+		$body = fix_mce_lf($body);
 	}
 
 
@@ -340,7 +350,7 @@ function item_post(&$a) {
 				$image_uri = substr($image_uri,0, strpos($image_uri,'-'));
 				if(! strlen($image_uri))
 					continue;
-				$srch = '<' . intval($profile_uid) . '>';
+				$srch = '<' . intval($contact_record['id']) . '>';
 				$r = q("SELECT `id` FROM `photo` WHERE `allow_cid` = '%s' AND `allow_gid` = '' AND `deny_cid` = '' AND `deny_gid` = ''
 					AND `resource-id` = '%s' AND `uid` = %d LIMIT 1",
 					dbesc($srch),
@@ -436,7 +446,7 @@ function item_post(&$a) {
 
 	if(count($tags)) {
 		foreach($tags as $tag) {
-			handle_tag($a, $body, $inform, $str_tags, $profile_uid, $tag); 
+			handle_tag($a, $body, $inform, $str_tags, (local_user()) ? local_user() : $profile_uid , $tag); 
 		}
 	}
 
@@ -572,6 +582,9 @@ function item_post(&$a) {
 			intval($profile_uid)
 		);
 
+		// update filetags in pconfig
+                file_tag_update_pconfig($uid,$categories_old,$categories_new,'category');
+
 		proc_run('php', "include/notifier.php", 'edit_post', "$post_id");
 		if((x($_REQUEST,'return')) && strlen($return_path)) {
 			logger('return: ' . $return_path);
@@ -585,8 +598,8 @@ function item_post(&$a) {
 
 	$r = q("INSERT INTO `item` (`guid`, `uid`,`type`,`wall`,`gravity`,`contact-id`,`owner-name`,`owner-link`,`owner-avatar`, 
 		`author-name`, `author-link`, `author-avatar`, `created`, `edited`, `commented`, `received`, `changed`, `uri`, `thr-parent`, `title`, `body`, `app`, `location`, `coord`, 
-		`tag`, `inform`, `verb`, `postopts`, `allow_cid`, `allow_gid`, `deny_cid`, `deny_gid`, `private`, `pubmail`, `attach`, `bookmark`,`origin`, `moderated` )
-		VALUES( '%s', %d, '%s', %d, %d, %d, '%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s', %d, %d, '%s', %d, %d, %d )",
+		`tag`, `inform`, `verb`, `postopts`, `allow_cid`, `allow_gid`, `deny_cid`, `deny_gid`, `private`, `pubmail`, `attach`, `bookmark`,`origin`, `moderated`, `file` )
+		VALUES( '%s', %d, '%s', %d, %d, %d, '%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s', %d, %d, '%s', %d, %d, %d, '%s' )",
 		dbesc($datarray['guid']),
 		intval($datarray['uid']),
 		dbesc($datarray['type']),
@@ -624,8 +637,9 @@ function item_post(&$a) {
 		dbesc($datarray['attach']),
 		intval($datarray['bookmark']),
 		intval($datarray['origin']),
-		intval($datarray['moderated'])
-	);
+	        intval($datarray['moderated']),
+	        dbesc($datarray['file'])
+	       );
 
 	$r = q("SELECT `id` FROM `item` WHERE `uri` = '%s' LIMIT 1",
 		dbesc($datarray['uri']));
@@ -633,6 +647,9 @@ function item_post(&$a) {
 		$post_id = $r[0]['id'];
 		logger('mod_item: saved item ' . $post_id);
 
+		// update filetags in pconfig
+                file_tag_update_pconfig($uid,$categories_old,$categories_new,'category');
+
 		if($parent) {
 
 			// This item is the last leaf and gets the comment box, clear any ancestors
@@ -742,7 +759,7 @@ function item_post(&$a) {
 	}
 	else {
 		logger('mod_item: unable to retrieve post that was just stored.');
-		notify( t('System error. Post not saved.'));
+		notice( t('System error. Post not saved.') . EOL);
 		goaway($a->get_baseurl() . "/" . $return_path );
 		// NOTREACHED
 	}
diff --git a/mod/like.php b/mod/like.php
index 6b97fafb5..6b97fafb5 100755..100644
--- a/mod/like.php
+++ b/mod/like.php
diff --git a/mod/localtime.php b/mod/localtime.php
index c03eae1b0..c03eae1b0 100755..100644
--- a/mod/localtime.php
+++ b/mod/localtime.php
diff --git a/mod/lockview.php b/mod/lockview.php
index 9e64e2608..9e64e2608 100755..100644
--- a/mod/lockview.php
+++ b/mod/lockview.php
diff --git a/mod/login.php b/mod/login.php
index 10b4d3001..10b4d3001 100755..100644
--- a/mod/login.php
+++ b/mod/login.php
diff --git a/mod/lostpass.php b/mod/lostpass.php
index 57e6d6965..57e6d6965 100755..100644
--- a/mod/lostpass.php
+++ b/mod/lostpass.php
diff --git a/mod/manage.php b/mod/manage.php
index 84dfa6917..84dfa6917 100755..100644
--- a/mod/manage.php
+++ b/mod/manage.php
diff --git a/mod/match.php b/mod/match.php
index 926df1dff..926df1dff 100755..100644
--- a/mod/match.php
+++ b/mod/match.php
diff --git a/mod/message.php b/mod/message.php
index 1369fde2e..260f4bb14 100755..100644
--- a/mod/message.php
+++ b/mod/message.php
@@ -48,8 +48,7 @@ function message_post(&$a) {
 
 	$plaintext = intval(get_pconfig(local_user(),'system','plaintext'));
 	if(! $plaintext) {
-		$body = str_replace("\r\n","\n",$body);
-		$body = str_replace("\n\n","\n",$body);
+		$body = fix_mce_lf($body);
 	}
 	
 	$ret = send_message($recipient, $body, $subject, $replyto);
diff --git a/mod/modexp.php b/mod/modexp.php
index bba2c2882..bba2c2882 100755..100644
--- a/mod/modexp.php
+++ b/mod/modexp.php
diff --git a/mod/msearch.php b/mod/msearch.php
index 94def7d89..94def7d89 100755..100644
--- a/mod/msearch.php
+++ b/mod/msearch.php
diff --git a/mod/network.php b/mod/network.php
index d27945a86..b12bd16da 100755..100644
--- a/mod/network.php
+++ b/mod/network.php
@@ -206,8 +206,12 @@ function network_content(&$a, $update = 0) {
 
 
 	);
-	$tpl = get_markup_template('common_tabs.tpl');
-	$o .= replace_macros($tpl, array('$tabs'=>$tabs));
+
+	$arr = array('tabs' => $tabs);
+	call_hooks('network_tabs', $arr);
+
+	$o .= replace_macros(get_markup_template('common_tabs.tpl'), array('$tabs'=> $arr['tabs']));
+
 	// --- end item filter tabs
 
 
diff --git a/mod/newmember.php b/mod/newmember.php
index 683463ecb..a423d11b8 100755..100644
--- a/mod/newmember.php
+++ b/mod/newmember.php
@@ -13,7 +13,7 @@ function newmember_content(&$a) {
 
 	$o .= '<ul>';
 
-	$o .= '<li>' . '<a target="newmember" href="/help/guide">' . t('On your <em>Quick Start</em> page - find a brief introduction to your profile and network tabs, connect to Facebook, make some new connections, and find some groups to join.') . '</a></li>' . EOL; 
+	$o .= '<li>' . '<a target="newmember" href="help/guide">' . t('On your <em>Quick Start</em> page - find a brief introduction to your profile and network tabs, connect to Facebook, make some new connections, and find some groups to join.') . '</a></li>' . EOL; 
 
 	$o .= '<li>' . '<a target="newmember" href="settings">' . t('On your <em>Settings</em> page -  change your initial password. Also make a note of your Identity Address. This looks just like an email address - and will be useful in making friends on the free social web.') . '</a></li>' . EOL; 
 
@@ -48,4 +48,4 @@ function newmember_content(&$a) {
 	$o .= '</div>';
 
 	return $o;
-}
\ No newline at end of file
+}
diff --git a/mod/nogroup.php b/mod/nogroup.php
new file mode 100644
index 000000000..bd1ec82ed
--- /dev/null
+++ b/mod/nogroup.php
@@ -0,0 +1,65 @@
+<?php
+
+require_once('include/Contact.php');
+require_once('include/socgraph.php');
+require_once('include/contact_selectors.php');
+
+function nogroup_init(&$a) {
+
+	if(! local_user())
+		return;
+
+	require_once('include/group.php');
+	require_once('include/contact_widgets.php');
+
+	if(! x($a->page,'aside'))
+		$a->page['aside'] = '';
+
+	$a->page['aside'] .= group_side('contacts','group',false,0,$contact_id);
+}
+
+
+function nogroup_content(&$a) {
+
+	if(! local_user()) {
+		notice( t('Permission denied.') . EOL);
+		return '';
+	}
+
+	require_once('include/Contact.php');
+	$r = contacts_not_grouped(local_user());
+	if(count($r)) {
+		$a->set_pager_total($r[0]['total']);
+	}
+	$r = contacts_not_grouped(local_user(),$a->pager['start'],$a->pager['itemspage']);
+	if(count($r)) {
+		foreach($r as $rr) {
+
+
+			$contacts[] = array(
+				'img_hover' => sprintf( t('Visit %s\'s profile [%s]'),$rr['name'],$rr['url']),
+				'edit_hover' => t('Edit contact'),
+				'photo_menu' => contact_photo_menu($rr),
+				'id' => $rr['id'],
+				'alt_text' => $alt_text,
+				'dir_icon' => $dir_icon,
+				'thumb' => $rr['thumb'], 
+				'name' => $rr['name'],
+				'username' => $rr['name'],
+				'sparkle' => $sparkle,
+				'itemurl' => $rr['url'],
+				'url' => $url,
+				'network' => network_to_name($rr['network']),
+			);
+		}
+	}
+	$tpl = get_markup_template("nogroup-template.tpl");
+	$o .= replace_macros($tpl,array(
+		'$header' => t('Contacts who are not members of a group'),
+		'$contacts' => $contacts,
+		'$paginate' => paginate($a),
+	)); 
+	
+	return $o;
+
+}
diff --git a/mod/notes.php b/mod/notes.php
index e6e2b44fb..e6e2b44fb 100755..100644
--- a/mod/notes.php
+++ b/mod/notes.php
diff --git a/mod/notice.php b/mod/notice.php
index 19cf53189..19cf53189 100755..100644
--- a/mod/notice.php
+++ b/mod/notice.php
diff --git a/mod/notifications.php b/mod/notifications.php
index 690a99562..b28b1478d 100755..100644
--- a/mod/notifications.php
+++ b/mod/notifications.php
@@ -151,7 +151,7 @@ function notifications_content(&$a) {
 						'$fullname' => $rr['fname'],
 						'$url' => zrl($rr['furl']),
 						'$hidden' => array('hidden', t('Hide this contact from others'), ($rr['hidden'] == 1), ''),
-						'$activity' => array('activity', t('Post a new friend activity'), 1, t('if applicable')),
+						'$activity' => array('activity', t('Post a new friend activity'), (intval(get_pconfig(local_user(),'system','post_newfriend')) ? '1' : 0), t('if applicable')),
 
 						'$knowyou' => $knowyou,
 						'$approve' => t('Approve'),
@@ -198,7 +198,7 @@ function notifications_content(&$a) {
 					'$photo' => ((x($rr,'photo')) ? $rr['photo'] : "images/person-175.jpg"),
 					'$fullname' => $rr['name'],
 					'$hidden' => array('hidden', t('Hide this contact from others'), ($rr['hidden'] == 1), ''),
-					'$activity' => array('activity', t('Post a new friend activity'), 1, t('if applicable')),
+					'$activity' => array('activity', t('Post a new friend activity'), (intval(get_pconfig(local_user(),'system','post_newfriend')) ? '1' : 0), t('if applicable')),
 					'$url' => zrl($rr['url']),
 					'$knowyou' => $knowyou,
 					'$approve' => t('Approve'),
diff --git a/mod/oembed.php b/mod/oembed.php
index 236625f68..236625f68 100755..100644
--- a/mod/oembed.php
+++ b/mod/oembed.php
diff --git a/mod/oexchange.php b/mod/oexchange.php
index bbb436e70..bbb436e70 100755..100644
--- a/mod/oexchange.php
+++ b/mod/oexchange.php
diff --git a/mod/openid.php b/mod/openid.php
index e2cea7d85..e2cea7d85 100755..100644
--- a/mod/openid.php
+++ b/mod/openid.php
diff --git a/mod/opensearch.php b/mod/opensearch.php
index ff748d1c5..ff748d1c5 100755..100644
--- a/mod/opensearch.php
+++ b/mod/opensearch.php
diff --git a/mod/parse_url.php b/mod/parse_url.php
index 27dac4d5d..27dac4d5d 100755..100644
--- a/mod/parse_url.php
+++ b/mod/parse_url.php
diff --git a/mod/photo.php b/mod/photo.php
index 3a7025120..1d38fe8e4 100755..100644
--- a/mod/photo.php
+++ b/mod/photo.php
@@ -4,6 +4,30 @@ require_once('include/security.php');
 
 function photo_init(&$a) {
 
+	// To-Do:
+	// - checking with realpath
+	// - checking permissions
+	/*
+	$cache = get_config('system','itemcache');
+        if (($cache != '') and is_dir($cache)) {
+		$cachefile = $cache."/".$a->argc."-".$a->argv[1]."-".$a->argv[2]."-".$a->argv[3];
+		if (file_exists($cachefile)) {
+			$data = file_get_contents($cachefile);
+
+			if(function_exists('header_remove')) {
+				header_remove('Pragma');
+				header_remove('pragma');
+			}
+
+			header("Content-type: image/jpeg");
+ 			header("Expires: " . gmdate("D, d M Y H:i:s", time() + (3600*24)) . " GMT");
+			header("Cache-Control: max-age=" . (3600*24));
+			echo $data;
+			killme();
+			// NOTREACHED
+		}
+	}*/
+
 	switch($a->argc) {
 		case 4:
 			$person = $a->argv[3];
@@ -27,6 +51,7 @@ function photo_init(&$a) {
 
 	if(isset($type)) {
 
+
 		/**
 		 * Profile photos
 		 */
@@ -144,6 +169,10 @@ function photo_init(&$a) {
 		}
 	}
 
+	// Writing in cachefile
+	if (isset($cachefile) && $cachefile != '')
+		file_put_contents($cachefile, $data);
+
 	if(function_exists('header_remove')) {
 		header_remove('Pragma');
 		header_remove('pragma');
diff --git a/mod/photos.php b/mod/photos.php
index 2a808cb41..8da94841e 100755..100644
--- a/mod/photos.php
+++ b/mod/photos.php
@@ -330,7 +330,6 @@ function photos_post(&$a) {
 			// Create item container
 
 			$title = '';
-			$basename = basename($filename);
 			$uri = item_new_uri($a->get_hostname(),$page_owner_uid);
 
 			$arr = array();
diff --git a/mod/ping.php b/mod/ping.php
index e911aaf1f..63aaa0f45 100644
--- a/mod/ping.php
+++ b/mod/ping.php
@@ -134,6 +134,8 @@ function ping_init(&$a) {
 
 
 		function xmlize($href, $name, $url, $photo, $date, $seen, $message){
+			$data = array('href' => &$href, 'name' => &$name, 'url'=>&$url, 'photo'=>&$photo, 'date'=>&$date, 'seen'=>&$seen, 'messsage'=>&$message);
+			call_hooks('ping_xmlize', $data);
 			$notsxml = '<note href="%s" name="%s" url="%s" photo="%s" date="%s" seen="%s" >%s</note>';
 			return sprintf ( $notsxml,
 				xmlify($href), xmlify($name), xmlify($url), xmlify($photo), xmlify($date), xmlify($seen), xmlify($message)
diff --git a/mod/poco.php b/mod/poco.php
index 79cf820bc..acfa3ffaa 100755..100644
--- a/mod/poco.php
+++ b/mod/poco.php
@@ -45,6 +45,8 @@ function poco_init(&$a) {
 
 	if($justme)
 		$sql_extra = " and `contact`.`self` = 1 ";
+	else
+		$sql_extra = " and `contact`.`self` = 0 ";
 
 	if($cid)
 		$sql_extra = sprintf(" and `contact`.`id` = %d ",intval($cid));
diff --git a/mod/post.php b/mod/post.php
index 4a7e33b23..4a7e33b23 100755..100644
--- a/mod/post.php
+++ b/mod/post.php
diff --git a/mod/probe.php b/mod/probe.php
index c95db291b..c95db291b 100755..100644
--- a/mod/probe.php
+++ b/mod/probe.php
diff --git a/mod/profile.php b/mod/profile.php
index 782d17d83..de1e27248 100755..100644
--- a/mod/profile.php
+++ b/mod/profile.php
@@ -2,6 +2,11 @@
 
 function profile_init(&$a) {
 
+	require_once('include/contact_widgets.php');
+
+	if(! x($a->page,'aside'))
+		$a->page['aside'] = '';
+
 	$blocked = (((get_config('system','block_public')) && (! local_user()) && (! remote_user())) ? true : false);
 
 	if($a->argc > 1)
@@ -9,9 +14,10 @@ function profile_init(&$a) {
 	else {
 		$r = q("select nickname from user where blocked = 0 and account_expired = 0 and verified = 1 order by rand() limit 1");
 		if(count($r)) {
-			$which = $r[0]['nickname'];
+			goaway($a->get_baseurl() . '/profile/' . $r[0]['nickname']);
 		}
 		else {
+			logger('profile error: mod_profile ' . $a->query_string, LOGGER_DEBUG);
 			notice( t('Requested profile is not available.') . EOL );
 			$a->error = 404;
 			return;
@@ -59,6 +65,13 @@ function profile_init(&$a) {
 
 function profile_content(&$a, $update = 0) {
 
+        if (x($a->category)) {
+	        $category = $a->category;
+	}
+        else {
+	        $category = ((x($_GET,'category')) ? $_GET['category'] : '');
+	}
+
 	if(get_config('system','block_public') && (! local_user()) && (! remote_user())) {
 		return login();
 	}
@@ -112,8 +125,9 @@ function profile_content(&$a, $update = 0) {
 		return;
 	}
 
-	
 	if(! $update) {
+
+
 		if(x($_GET,'tab'))
 			$tab = notags(trim($_GET['tab']));
 
@@ -135,6 +149,8 @@ function profile_content(&$a, $update = 0) {
 
 		$celeb = ((($a->profile['page-flags'] == PAGE_SOAPBOX) || ($a->profile['page-flags'] == PAGE_COMMUNITY)) ? true : false);
 
+		$a->page['aside'] .= categories_widget($a->get_baseurl(true) . '/profile/' . $a->profile['nickname'],(x($category) ? xmlify($category) : ''));
+
 		if(can_write_wall($a,$a->profile['profile_uid'])) {
 
 			$x = array(
@@ -178,6 +194,10 @@ function profile_content(&$a, $update = 0) {
 	}
 	else {
 
+                if(x($category)) {
+		        $sql_extra .= file_tag_file_query('item',$category,'category');
+		}
+
 		$r = q("SELECT COUNT(*) AS `total`
 			FROM `item` LEFT JOIN `contact` ON `contact`.`id` = `item`.`contact-id`
 			WHERE `item`.`uid` = %d AND `item`.`visible` = 1 AND `item`.`deleted` = 0
@@ -204,6 +224,7 @@ function profile_content(&$a, $update = 0) {
 			intval($a->profile['profile_uid'])
 
 		);
+
 	}
 
 	$parents_arr = array();
diff --git a/mod/profile_photo.php b/mod/profile_photo.php
index ace8dadd4..ace8dadd4 100755..100644
--- a/mod/profile_photo.php
+++ b/mod/profile_photo.php
diff --git a/mod/profiles.php b/mod/profiles.php
index 7b3b6ccc1..7a33a03e4 100755..100644
--- a/mod/profiles.php
+++ b/mod/profiles.php
@@ -51,6 +51,7 @@ function profiles_post(&$a) {
 		if($orig[0]['name'] != $name)
 			$namechanged = true;
 
+
 		$pdesc = notags(trim($_POST['pdesc']));
 		$gender = notags(trim($_POST['gender']));
 		$address = notags(trim($_POST['address']));
@@ -61,15 +62,16 @@ function profiles_post(&$a) {
 		$pub_keywords = notags(trim($_POST['pub_keywords']));
 		$prv_keywords = notags(trim($_POST['prv_keywords']));
 		$marital = notags(trim($_POST['marital']));
-		if($marital != $orig[0]['marital'])
-			$maritalchanged = true;
 
 		$with = ((x($_POST,'with')) ? notags(trim($_POST['with'])) : '');
 
 		// linkify the relationship target if applicable
 
+		$withchanged = false;
+
 		if(strlen($with)) {
 			if($with != strip_tags($orig[0]['with'])) {
+				$withchanged = true;
 				$prf = '';
 				$lookup = $with;
 				if(strpos($lookup,'@') === 0)
@@ -121,18 +123,40 @@ function profiles_post(&$a) {
 		$politic = notags(trim($_POST['politic']));
 		$religion = notags(trim($_POST['religion']));
 
-		$about = escape_tags(trim($_POST['about']));
-		$interest = escape_tags(trim($_POST['interest']));
-		$contact = escape_tags(trim($_POST['contact']));
-		$music = escape_tags(trim($_POST['music']));
-		$book = escape_tags(trim($_POST['book']));
-		$tv = escape_tags(trim($_POST['tv']));
-		$film = escape_tags(trim($_POST['film']));
-		$romance = escape_tags(trim($_POST['romance']));
-		$work = escape_tags(trim($_POST['work']));
-		$education = escape_tags(trim($_POST['education']));
+		$about = fix_mce_lf(escape_tags(trim($_POST['about'])));
+		$interest = fix_mce_lf(escape_tags(trim($_POST['interest'])));
+		$contact = fix_mce_lf(escape_tags(trim($_POST['contact'])));
+		$music = fix_mce_lf(escape_tags(trim($_POST['music'])));
+		$book = fix_mce_lf(escape_tags(trim($_POST['book'])));
+		$tv = fix_mce_lf(escape_tags(trim($_POST['tv'])));
+		$film = fix_mce_lf(escape_tags(trim($_POST['film'])));
+		$romance = fix_mce_lf(escape_tags(trim($_POST['romance'])));
+		$work = fix_mce_lf(escape_tags(trim($_POST['work'])));
+		$education = fix_mce_lf(escape_tags(trim($_POST['education'])));
+
 		$hide_friends = (($_POST['hide-friends'] == 1) ? 1: 0);
 
+
+
+		$changes = array();
+		if($is_default) {
+			if($marital != $orig[0]['marital']) $changes[] = '&hearts; ' . t('Marital Status');
+			if($withchanged) $changes[] = '&hearts; ' . t('Romantic Partner');			
+			if($work != $orig[0]['work']) $changes[] = t('Work/Employment');
+			if($religion != $orig[0]['religion']) $changes[] = t('Religion');
+			if($politic != $orig[0]['politic']) $changes[] = t('Political Views');
+			if($gender != $orig[0]['gender']) $changes[] = t('Gender');
+			if($sexual != $orig[0]['sexual']) $changes[] = t('Sexual Preference');
+			if($homepage != $orig[0]['homepage']) $changes[] = t('Homepage');
+			if($interest != $orig[0]['interest']) $changes[] = t('Interests');
+			if($address != $orig[0]['address'] || $locality != $orig[0]['locality'] || $region != $orig[0]['region']
+				|| $country_name != $orig[0]['country_name'])
+				$changes[] = t('Location');
+
+			profile_activity($changes);
+
+		}			
+			
 		$r = q("UPDATE `profile` 
 			SET `profile-name` = '%s',
 			`name` = '%s',
@@ -194,7 +218,7 @@ function profiles_post(&$a) {
 			dbesc($education),
 			intval($hide_friends),
 			intval($a->argv[1]),
-			intval($_SESSION['uid'])
+			intval(local_user())
 		);
 
 		if($r)
@@ -221,6 +245,79 @@ function profiles_post(&$a) {
 }
 
 
+function profile_activity($changed) {
+	$a = get_app();
+
+	if(! local_user() || ! is_array($changed) || ! count($changed))
+		return;
+
+	if($a->user['hidewall'] || get_config('system','block_public'))
+		return;
+
+	if(! get_pconfig(local_user(),'system','post_profilechange'))
+		return;
+
+	require_once('include/items.php');
+
+	$self = q("SELECT * FROM `contact` WHERE `self` = 1 AND `uid` = %d LIMIT 1",
+		intval(local_user())
+	);
+
+	if(! count($self))
+		return;
+
+	$arr = array();
+	$arr['uri'] = $arr['parent-uri'] = item_new_uri($a->get_hostname(), local_user()); 
+	$arr['uid'] = local_user();
+	$arr['contact-id'] = $self[0]['id'];
+	$arr['wall'] = 1;
+	$arr['type'] = 'wall';
+	$arr['gravity'] = 0;
+	$arr['origin'] = 1;
+	$arr['author-name'] = $arr['owner-name'] = $self[0]['name'];
+	$arr['author-link'] = $arr['owner-link'] = $self[0]['url'];
+	$arr['author-avatar'] = $arr['owner-avatar'] = $self[0]['thumb'];
+	$arr['verb'] = ACTIVITY_UPDATE;
+	$arr['object-type'] = ACTIVITY_OBJ_PROFILE;
+				
+	$A = '[url=' . $self[0]['url'] . ']' . $self[0]['name'] . '[/url]';
+
+
+	$changes = '';
+	$t = count($changed);
+	$z = 0;
+	foreach($changed as $ch) {
+		if(strlen($changes)) {
+			if ($z == ($t - 1))
+				$changes .= ' and ';
+			else
+				$changes .= ', ';
+		}
+		$z ++;
+		$changes .= $ch;
+	}
+
+	$prof = '[url=' . $self[0]['url'] . '?tab=profile' . ']' . t('public profile') . '[/url]';	
+
+	$arr['body'] =  sprintf( t('%1$s has an updated %2$s, changing %3$s.'), $A, $prof, $changes);
+
+	$arr['object'] = '<object><type>' . ACTIVITY_OBJ_PROFILE . '</type><title>' . $self[0]['name'] . '</title>'
+	. '<id>' . $self[0]['url'] . '/' . $self[0]['name'] . '</id>';
+	$arr['object'] .= '<link>' . xmlify('<link rel="alternate" type="text/html" href="' . $self[0]['url'] . '?tab=profile' . '" />' . "\n");
+	$arr['object'] .= xmlify('<link rel="photo" type="image/jpeg" href="' . $self[0]['thumb'] . '" />' . "\n");
+	$arr['object'] .= '</link></object>' . "\n";
+	$arr['last-child'] = 1;
+
+	$arr['allow_cid'] = $a->user['allow_cid'];
+	$arr['allow_gid'] = $a->user['allow_gid'];
+	$arr['deny_cid']  = $a->user['deny_cid'];
+	$arr['deny_gid']  = $a->user['deny_gid'];
+
+	$i = item_store($arr);
+	if($i)
+	   	proc_run('php',"include/notifier.php","activity","$i");
+
+}
 
 
 function profiles_content(&$a) {
@@ -361,7 +458,16 @@ function profiles_content(&$a) {
 
 		require_once('include/profile_selectors.php');
 
-		$tpl = get_markup_template('profed_head.tpl');
+
+		$editselect = 'textareas';
+		if(intval(get_pconfig(local_user(),'system','plaintext')))
+			$editselect = 'none';
+
+		$a->page['htmlhead'] .= replace_macros(get_markup_template('profed_head.tpl'), array(
+			'$baseurl' => $a->get_baseurl(true),
+			'$editselect' => $editselect,
+		));
+
 
 		$opt_tpl = get_markup_template("profile-hide-friends.tpl");
 		$hide_friends = replace_macros($opt_tpl,array(
@@ -372,10 +478,12 @@ function profiles_content(&$a) {
 			'$no_selected' => (($r[0]['hide-friends'] == 0) ? " checked=\"checked\" " : "")
 		));
 
-
-		$a->page['htmlhead'] .= replace_macros($tpl, array('$baseurl' => $a->get_baseurl(true)));
 		$a->page['htmlhead'] .= "<script type=\"text/javascript\" src=\"js/country.js\" ></script>";
 
+
+
+
+
 		$f = get_config('system','birthday_input_format');
 		if(! $f)
 			$f = 'ymd';
diff --git a/mod/profperm.php b/mod/profperm.php
index 8d09c429c..8d09c429c 100755..100644
--- a/mod/profperm.php
+++ b/mod/profperm.php
diff --git a/mod/pubsub.php b/mod/pubsub.php
index 93d50ef90..93d50ef90 100755..100644
--- a/mod/pubsub.php
+++ b/mod/pubsub.php
diff --git a/mod/qsearch.php b/mod/qsearch.php
index c35e253b6..c35e253b6 100755..100644
--- a/mod/qsearch.php
+++ b/mod/qsearch.php
diff --git a/mod/randprof.php b/mod/randprof.php
new file mode 100644
index 000000000..6713a81d9
--- /dev/null
+++ b/mod/randprof.php
@@ -0,0 +1,10 @@
+<?php
+
+
+function randprof_init(&$a) {
+	require_once('include/Contact.php');
+	$x = random_profile();
+	if($x)
+		goaway(zrl($x));
+	goaway($a->get_baseurl() . '/profile');
+}
diff --git a/mod/receive.php b/mod/receive.php
index 950bf0bd3..2bd3cc65b 100755..100644
--- a/mod/receive.php
+++ b/mod/receive.php
@@ -12,6 +12,13 @@ require_once('include/diaspora.php');
 	
 function receive_post(&$a) {
 
+
+	$enabled = intval(get_config('system','diaspora_enabled'));
+	if(! $enabled) {
+		logger('mod-diaspora: disabled');
+		http_status_exit(500);
+	}
+
 	$public = false;
 
 	if(($a->argc == 2) && ($a->argv[1] === 'public')) {
diff --git a/mod/redir.php b/mod/redir.php
index 9223e5483..9223e5483 100755..100644
--- a/mod/redir.php
+++ b/mod/redir.php
diff --git a/mod/register.php b/mod/register.php
index 630c0a675..b60707d45 100755..100644
--- a/mod/register.php
+++ b/mod/register.php
@@ -314,17 +314,13 @@ function register_post(&$a) {
 
 	}
 
-	$use_gravatar = ((get_config('system','no_gravatar')) ? false : true);
-
-	// if we have an openid photo use it. 
-	// otherwise unless it is disabled, use gravatar
-
-	if($use_gravatar || strlen($photo)) {
+	// if we have no OpenID photo try to look up an avatar
+	if(! strlen($photo))
+		$photo = avatar_img($email);
 
+	// unless there is no avatar-plugin loaded
+	if(strlen($photo)) {
 		require_once('include/Photo.php');
-
-		if(($use_gravatar) && (! strlen($photo))) 
-			$photo = gravatar_img($email);
 		$photo_failure = false;
 
 		$filename = basename($photo);
@@ -333,7 +329,7 @@ function register_post(&$a) {
 		if($img->is_valid()) {
 
 			$img->scaleImageSquare(175);
-					
+
 			$hash = photo_new_resource();
 
 			$r = $img->store($newuid, 0, $hash, $filename, t('Profile Photos'), 4 );
diff --git a/mod/regmod.php b/mod/regmod.php
index 21f41eb01..21f41eb01 100755..100644
--- a/mod/regmod.php
+++ b/mod/regmod.php
diff --git a/mod/removeme.php b/mod/removeme.php
index ee88bd76a..ee88bd76a 100755..100644
--- a/mod/removeme.php
+++ b/mod/removeme.php
diff --git a/mod/rsd_xml.php b/mod/rsd_xml.php
index 5bf4663fd..5bf4663fd 100755..100644
--- a/mod/rsd_xml.php
+++ b/mod/rsd_xml.php
diff --git a/mod/salmon.php b/mod/salmon.php
index 6172d17a1..6172d17a1 100755..100644
--- a/mod/salmon.php
+++ b/mod/salmon.php
diff --git a/mod/search.php b/mod/search.php
index 6495fc8e5..4ca7db9bb 100755..100644
--- a/mod/search.php
+++ b/mod/search.php
@@ -97,27 +97,26 @@ function search_content(&$a) {
 	// OR your own posts if you are a logged in member
 	// No items will be shown if the member has a blocked profile wall. 
 
-	$r = q("SELECT COUNT(*) AS `total`
+	$r = q("SELECT distinct(`item`.`uri`) as `total`
 		FROM `item` LEFT JOIN `contact` ON `contact`.`id` = `item`.`contact-id` LEFT JOIN `user` ON `user`.`uid` = `item`.`uid`
 		WHERE `item`.`visible` = 1 AND `item`.`deleted` = 0 and `item`.`moderated` = 0
 		AND (( `item`.`allow_cid` = ''  AND `item`.`allow_gid` = '' AND `item`.`deny_cid`  = '' AND `item`.`deny_gid`  = '' AND `item`.`private` = 0 AND `user`.`hidewall` = 0) 
 			OR `item`.`uid` = %d )
 		AND `contact`.`blocked` = 0 AND `contact`.`pending` = 0
-		AND ( `item`.`body` REGEXP '%s' OR `item`.`tag` REGEXP '%s' )", 
+		AND ( `item`.`body` REGEXP '%s' OR `item`.`tag` REGEXP '%s' ) group by `item`.`uri` ", 
 		intval(local_user()),
 		dbesc(preg_quote($search)), 
 		dbesc('\\]' . preg_quote($search) . '\\[')
 	);
 
 	if(count($r))
-		$a->set_pager_total($r[0]['total']);
-
-	if(! $r[0]['total']) {
+		$a->set_pager_total(count($r));
+	if(! count($r)) {
 		info( t('No results.') . EOL);
 		return $o;
 	}
 
-	$r = q("SELECT `item`.*, `item`.`id` AS `item_id`, 
+	$r = q("SELECT distinct(`item`.`uri`), `item`.*, `item`.`id` AS `item_id`, 
 		`contact`.`name`, `contact`.`photo`, `contact`.`url`, `contact`.`rel`,
 		`contact`.`network`, `contact`.`thumb`, `contact`.`self`, `contact`.`writable`, 
 		`contact`.`id` AS `cid`, `contact`.`uid` AS `contact-uid`,
@@ -128,7 +127,8 @@ function search_content(&$a) {
 		AND (( `item`.`allow_cid` = ''  AND `item`.`allow_gid` = '' AND `item`.`deny_cid`  = '' AND `item`.`deny_gid`  = '' AND `item`.`private` = 0 AND `user`.`hidewall` = 0 ) 
 			OR `item`.`uid` = %d )
 		AND `contact`.`blocked` = 0 AND `contact`.`pending` = 0
-		AND ( `item`.`body` REGEXP '%s' OR `item`.`tag` REGEXP '%s' ) 
+		AND ( `item`.`body` REGEXP '%s' OR `item`.`tag` REGEXP '%s' )
+		group by `item`.`uri`	
 		ORDER BY `received` DESC LIMIT %d , %d ",
 		intval(local_user()),
 		dbesc(preg_quote($search)), 
diff --git a/mod/session.php b/mod/session.php
index 22c855edb..22c855edb 100755..100644
--- a/mod/session.php
+++ b/mod/session.php
diff --git a/mod/settings.php b/mod/settings.php
index 926d1faa5..8c8b3062d 100755..100644
--- a/mod/settings.php
+++ b/mod/settings.php
@@ -15,10 +15,6 @@ function get_theme_config_file($theme){
 }
 
 function settings_init(&$a) {
-	if(local_user()) {
-		profile_load($a,$a->user['nickname']);
-	}
-
 	// These lines provide the javascript needed by the acl selector
 
 	$a->page['htmlhead'] .= "<script> var ispublic = '" . t('everybody') . "';" ;
@@ -47,6 +43,47 @@ function settings_init(&$a) {
 EOT;
 
 
+
+	$tabs = array(
+		array(
+			'label'	=> t('Account settings'),
+			'url' 	=> $a->get_baseurl(true).'/settings',
+			'selected'	=> (($a->argc == 1)?'active':''),
+		),	
+		array(
+			'label'	=> t('Display settings'),
+			'url' 	=> $a->get_baseurl(true).'/settings/display',
+			'selected'	=> (($a->argc > 1) && ($a->argv[1] === 'display')?'active':''),
+		),	
+		
+		array(
+			'label'	=> t('Connector settings'),
+			'url' 	=> $a->get_baseurl(true).'/settings/connectors',
+			'selected'	=> (($a->argc > 1) && ($a->argv[1] === 'connectors')?'active':''),
+		),
+		array(
+			'label'	=> t('Plugin settings'),
+			'url' 	=> $a->get_baseurl(true).'/settings/addon',
+			'selected'	=> (($a->argc > 1) && ($a->argv[1] === 'addon')?'active':''),
+		),
+		array(
+			'label' => t('Connected apps'),
+			'url' => $a->get_baseurl(true) . '/settings/oauth',
+			'selected' => (($a->argc > 1) && ($a->argv[1] === 'oauth')?'active':''),
+		),
+		array(
+			'label' => t('Export personal data'),
+			'url' => $a->get_baseurl(true) . '/uexport',
+			'selected' => ''
+		)
+	);
+	
+	$tabtpl = get_markup_template("generic_links_widget.tpl");
+	$a->page['aside'] = replace_macros($tabtpl, array(
+		'$title' => t('Settings'),
+		'$items' => $tabs,
+	));
+
 }
 
 
@@ -229,7 +266,7 @@ function settings_post(&$a) {
 
 
 		if ($theme == $a->user['theme']){
-			// call theme_post only if theme has not benn changed
+			// call theme_post only if theme has not been changed
 			if( ($themeconfigfile = get_theme_config_file($theme)) != null){
 				require_once($themeconfigfile);
 				theme_post($a);
@@ -242,6 +279,7 @@ function settings_post(&$a) {
 				intval(local_user())
 		);
 	
+		call_hooks('display_settings_post', $_POST);
 		goaway($a->get_baseurl(true) . '/settings/display' );
 		return; // NOTREACHED
 	}
@@ -308,6 +346,8 @@ function settings_post(&$a) {
 	$suggestme        = ((x($_POST,'suggestme')) ? intval($_POST['suggestme'])  : 0);  
 	$hide_friends     = (($_POST['hide-friends'] == 1) ? 1: 0);
 	$hidewall         = (($_POST['hidewall'] == 1) ? 1: 0);
+	$post_newfriend   = (($_POST['post_newfriend'] == 1) ? 1: 0);
+	$post_profilechange   = (($_POST['post_profilechange'] == 1) ? 1: 0);
 
 
 	$notify = 0;
@@ -390,6 +430,8 @@ function settings_post(&$a) {
 	set_pconfig(local_user(),'expire','photos', $expire_photos);
 
 	set_pconfig(local_user(),'system','suggestme', $suggestme);
+	set_pconfig(local_user(),'system','post_newfriend', $post_newfriend);
+	set_pconfig(local_user(),'system','post_profilechange', $post_profilechange);
 
 
 	$r = q("UPDATE `user` SET `username` = '%s', `email` = '%s', `openid` = '%s', `timezone` = '%s',  `allow_cid` = '%s', `allow_gid` = '%s', `deny_cid` = '%s', `deny_gid` = '%s', `notify-flags` = %d, `page-flags` = %d, `default-location` = '%s', `allow_location` = %d, `maxreq` = %d, `expire` = %d, `openidserver` = '%s', `blockwall` = %d, `hidewall` = %d, `blocktags` = %d, `unkmail` = %d, `cntunkmail` = %d  WHERE `uid` = %d LIMIT 1",
@@ -478,44 +520,7 @@ function settings_content(&$a) {
 		return;
 	}
 	
-	$tabs = array(
-		array(
-			'label'	=> t('Account settings'),
-			'url' 	=> $a->get_baseurl(true).'/settings',
-			'sel'	=> (($a->argc == 1)?'active':''),
-		),	
-		array(
-			'label'	=> t('Display settings'),
-			'url' 	=> $a->get_baseurl(true).'/settings/display',
-			'sel'	=> (($a->argc > 1) && ($a->argv[1] === 'display')?'active':''),
-		),	
-		
-		array(
-			'label'	=> t('Connector settings'),
-			'url' 	=> $a->get_baseurl(true).'/settings/connectors',
-			'sel'	=> (($a->argc > 1) && ($a->argv[1] === 'connectors')?'active':''),
-		),
-		array(
-			'label'	=> t('Plugin settings'),
-			'url' 	=> $a->get_baseurl(true).'/settings/addon',
-			'sel'	=> (($a->argc > 1) && ($a->argv[1] === 'addon')?'active':''),
-		),
-		array(
-			'label' => t('Connections'),
-			'url' => $a->get_baseurl(true) . '/settings/oauth',
-			'sel' => (($a->argc > 1) && ($a->argv[1] === 'oauth')?'active':''),
-		),
-		array(
-			'label' => t('Export personal data'),
-			'url' => $a->get_baseurl(true) . '/uexport',
-			'sel' => ''
-		)
-	);
-	
-	$tabtpl = get_markup_template("common_tabs.tpl");
-	$tabs = replace_macros($tabtpl, array(
-		'$tabs' => $tabs,
-	));
+
 		
 	if(($a->argc > 1) && ($a->argv[1] === 'oauth')) {
 		
@@ -523,7 +528,6 @@ function settings_content(&$a) {
 			$tpl = get_markup_template("settings_oauth_edit.tpl");
 			$o .= replace_macros($tpl, array(
 				'$form_security_token' => get_form_security_token("settings_oauth"),
-				'$tabs'		=> $tabs,
 				'$title'	=> t('Add application'),
 				'$submit'	=> t('Submit'),
 				'$cancel'	=> t('Cancel'),
@@ -550,7 +554,6 @@ function settings_content(&$a) {
 			$tpl = get_markup_template("settings_oauth_edit.tpl");
 			$o .= replace_macros($tpl, array(
 				'$form_security_token' => get_form_security_token("settings_oauth"),
-				'$tabs'		=> $tabs,
 				'$title'	=> t('Add application'),
 				'$submit'	=> t('Update'),
 				'$cancel'	=> t('Cancel'),
@@ -593,7 +596,6 @@ function settings_content(&$a) {
 			'$consumerkey' => t('Client key starts with'),
 			'$noname'	=> t('No name'),
 			'$remove'	=> t('Remove authorization'),
-			'$tabs'		=> $tabs,
 			'$apps'		=> $r,
 		));
 		return $o;
@@ -613,7 +615,6 @@ function settings_content(&$a) {
 		$o .= replace_macros($tpl, array(
 			'$form_security_token' => get_form_security_token("settings_addon"),
 			'$title'	=> t('Plugin Settings'),
-			'$tabs'		=> $tabs,
 			'$settings_addons' => $settings_addons
 		));
 		return $o;
@@ -657,7 +658,6 @@ function settings_content(&$a) {
 			'$form_security_token' => get_form_security_token("settings_connectors"),
 			
 			'$title'	=> t('Connector Settings'),
-			'$tabs'		=> $tabs,
 
 			'$diasp_enabled' => $diasp_enabled,
 			'$ostat_enabled' => $ostat_enabled,
@@ -679,6 +679,8 @@ function settings_content(&$a) {
 
 			'$settings_connectors' => $settings_connectors
 		));
+
+		call_hooks('display_settings', $o);
 		return $o;
 	}
 
@@ -694,8 +696,8 @@ function settings_content(&$a) {
 		$allowed_themes_raw = explode(',',$allowed_themes_str);
 		$allowed_themes = array();
 		if(count($allowed_themes_raw))
-			foreach($allowed_themes_raw as $x)
-				if(strlen(trim($x)))
+			foreach($allowed_themes_raw as $x) 
+				if(strlen(trim($x)) && is_dir("view/theme/$x"))
 					$allowed_themes[] = trim($x);
 
 		
@@ -732,7 +734,6 @@ function settings_content(&$a) {
 		
 		$tpl = get_markup_template("settings_display.tpl");
 		$o = replace_macros($tpl, array(
-			'$tabs' 	=> $tabs,
 			'$ptitle' 	=> t('Display Settings'),
 			'$form_security_token' => get_form_security_token("settings_display"),
 			'$submit' 	=> t('Submit'),
@@ -793,6 +794,11 @@ function settings_content(&$a) {
 	$suggestme = get_pconfig(local_user(), 'system','suggestme');
 	$suggestme = (($suggestme===false)? '0': $suggestme); // default if not set: 0
 
+	$post_newfriend = get_pconfig(local_user(), 'system','post_newfriend');
+	$post_newfriend = (($post_newfriend===false)? '0': $post_newfriend); // default if not set: 0
+
+	$post_profilechange = get_pconfig(local_user(), 'system','post_profilechange');
+	$post_profilechange = (($post_profilechange===false)? '0': $post_profilechange); // default if not set: 0
 
 	
 	if(! strlen($a->user['timezone']))
@@ -881,6 +887,8 @@ function settings_content(&$a) {
 	));
 
 
+
+
 	$invisible = (((! $profile['publish']) && (! $profile['net-publish']))
 		? true : false);
 
@@ -917,7 +925,6 @@ function settings_content(&$a) {
 	);
 
 	$o .= replace_macros($stpl,array(
-		'$tabs' 	=> $tabs,
 		'$ptitle' 	=> t('Account Settings'),
 
 		'$submit' 	=> t('Submit'),
@@ -962,6 +969,9 @@ function settings_content(&$a) {
 		
 		
 		'$h_not' 	=> t('Notification Settings'),
+		'$activity_options' => t('By default post a status message when:'),
+		'$post_newfriend' => array('post_newfriend',  t('accepting a friend request'), $post_newfriend, ''),
+		'$post_profilechange' => array('post_profilechange',  t('making an <em>interesting</em> profile change'), $post_profilechange, ''),
 		'$lbl_not' 	=> t('Send a notification email when:'),
 		'$notify1'	=> array('notify1', t('You receive an introduction'), ($notify & NOTIFY_INTRO), NOTIFY_INTRO, ''),
 		'$notify2'	=> array('notify2', t('Your introductions are confirmed'), ($notify & NOTIFY_CONFIRM), NOTIFY_CONFIRM, ''),
diff --git a/mod/share.php b/mod/share.php
index 47bb851a4..6c6098c83 100755..100644
--- a/mod/share.php
+++ b/mod/share.php
@@ -16,18 +16,18 @@ function share_init(&$a) {
 
 	$o = '';
 
-	if(local_user() && intval(get_pconfig(local_user(),'system','plaintext'))) {
+//	if(local_user() && intval(get_pconfig(local_user(),'system','plaintext'))) {
 		$o .= "\xE2\x99\xb2" . ' [url=' . $r[0]['author-link'] . ']' . $r[0]['author-name'] . '[/url]' . "\n";
 		if($r[0]['title'])
 			$o .= '[b]' . $r[0]['title'] . '[/b]' . "\n";
 		$o .= $r[0]['body'] . "\n";
-	}
-	else {
-		$o .= '&#x2672; <a href="' . $r[0]['author-link'] . '">' . $r[0]['author-name'] . '</a><br />';
-		if($r[0]['title'])
-			$o .= '<strong>' . $r[0]['title'] . '</strong><br />';
-		$o .= bbcode($r[0]['body'], true) . '<br />';
-	}
+//	}
+//	else {
+//		$o .= '&#x2672; <a href="' . $r[0]['author-link'] . '">' . $r[0]['author-name'] . '</a><br />';
+//		if($r[0]['title'])
+//			$o .= '<strong>' . $r[0]['title'] . '</strong><br />';
+//		$o .= $r[0]['body'] . "\n";
+//	}
 	echo $o;
 	killme();  
 }
diff --git a/mod/smilies.php b/mod/smilies.php
index c47f95da7..c47f95da7 100755..100644
--- a/mod/smilies.php
+++ b/mod/smilies.php
diff --git a/mod/starred.php b/mod/starred.php
index 035b81e76..035b81e76 100755..100644
--- a/mod/starred.php
+++ b/mod/starred.php
diff --git a/mod/suggest.php b/mod/suggest.php
index 7a86d53a1..7a86d53a1 100755..100644
--- a/mod/suggest.php
+++ b/mod/suggest.php
diff --git a/mod/tagger.php b/mod/tagger.php
index 3ff5d57aa..3ff5d57aa 100755..100644
--- a/mod/tagger.php
+++ b/mod/tagger.php
diff --git a/mod/tagrm.php b/mod/tagrm.php
index 5041145cc..5041145cc 100755..100644
--- a/mod/tagrm.php
+++ b/mod/tagrm.php
diff --git a/mod/uexport.php b/mod/uexport.php
index e1fb22855..e1fb22855 100755..100644
--- a/mod/uexport.php
+++ b/mod/uexport.php
diff --git a/mod/update_community.php b/mod/update_community.php
index 3dcbce6b1..3dcbce6b1 100755..100644
--- a/mod/update_community.php
+++ b/mod/update_community.php
diff --git a/mod/update_network.php b/mod/update_network.php
index 36de0722a..36de0722a 100755..100644
--- a/mod/update_network.php
+++ b/mod/update_network.php
diff --git a/mod/update_notes.php b/mod/update_notes.php
index 90cc5bc69..90cc5bc69 100755..100644
--- a/mod/update_notes.php
+++ b/mod/update_notes.php
diff --git a/mod/update_profile.php b/mod/update_profile.php
index c4884b30f..c4884b30f 100755..100644
--- a/mod/update_profile.php
+++ b/mod/update_profile.php
diff --git a/mod/viewcontacts.php b/mod/viewcontacts.php
index e7d26b73e..e7d26b73e 100755..100644
--- a/mod/viewcontacts.php
+++ b/mod/viewcontacts.php
diff --git a/mod/viewsrc.php b/mod/viewsrc.php
index 3fa4eaed5..3fa4eaed5 100755..100644
--- a/mod/viewsrc.php
+++ b/mod/viewsrc.php
diff --git a/mod/wall_attach.php b/mod/wall_attach.php
index ecf475291..03d9f5105 100755..100644
--- a/mod/wall_attach.php
+++ b/mod/wall_attach.php
@@ -7,7 +7,7 @@ function wall_attach_post(&$a) {
 
 	if($a->argc > 1) {
 		$nick = $a->argv[1];
-		$r = q("SELECT * FROM `user` WHERE `nickname` = '%s' AND `blocked` = 0 LIMIT 1",
+		$r = q("SELECT `user`.*, `contact`.`id` FROM `user` LEFT JOIN `contact` on `user`.`uid` = `contact`.`uid`  WHERE `user`.`nickname` = '%s' AND `user`.`blocked` = 0 and `contact`.`self` = 1 LIMIT 1",
 			dbesc($nick)
 		);
 		if(! count($r))
@@ -21,6 +21,7 @@ function wall_attach_post(&$a) {
 	$visitor   = 0;
 
 	$page_owner_uid   = $r[0]['uid'];
+	$page_owner_cid   = $r[0]['id'];
 	$page_owner_nick  = $r[0]['nickname'];
 	$community_page   = (($r[0]['page-flags'] == PAGE_COMMUNITY) ? true : false);
 
@@ -73,7 +74,7 @@ function wall_attach_post(&$a) {
 		dbesc($filedata),
 		dbesc($created),
 		dbesc($created),
-		dbesc('<' . $page_owner_uid . '>'),
+		dbesc('<' . $page_owner_cid . '>'),
 		dbesc(''),
 		dbesc(''),
 		dbesc('')
@@ -97,8 +98,13 @@ function wall_attach_post(&$a) {
 		killme();
 	}
 
-	echo  '<br /><br />[attachment]' . $r[0]['id'] . '[/attachment]' . '<br />';
+	$lf = '<br />';
 
+	if(local_user() && intval(get_pconfig(local_user(),'system','plaintext')))
+		$lf = "\n";
+
+	echo  $lf . $lf . '[attachment]' . $r[0]['id'] . '[/attachment]' . $lf;
+	
 	killme();
 	// NOTREACHED
 }
diff --git a/mod/wall_upload.php b/mod/wall_upload.php
index 64f174a78..fa66561e8 100755..100644
--- a/mod/wall_upload.php
+++ b/mod/wall_upload.php
@@ -5,21 +5,31 @@ require_once('Photo.php');
 function wall_upload_post(&$a) {
 
 	if($a->argc > 1) {
-		$nick = $a->argv[1];
-		$r = q("SELECT * FROM `user` WHERE `nickname` = '%s' AND `blocked` = 0 LIMIT 1",
-			dbesc($nick)
-		);
-		if(! count($r))
-			return;
-
+	        if(! x($_FILES,'media')) {
+		        $nick = $a->argv[1];
+		        $r = q("SELECT `user`.*, `contact`.`id` FROM `user` LEFT JOIN `contact` on `user`.`uid` = `contact`.`uid`  WHERE `user`.`nickname` = '%s' AND `user`.`blocked` = 0 and `contact`.`self` = 1 LIMIT 1",
+			        dbesc($nick)
+		        );
+
+		        if(! count($r))
+                                return;
+		}
+                else {
+			$user_info = api_get_user($a);
+		        $r = q("SELECT `user`.*, `contact`.`id` FROM `user` LEFT JOIN `contact` on `user`.`uid` = `contact`.`uid`  WHERE `user`.`nickname` = '%s' AND `user`.`blocked` = 0 and `contact`.`self` = 1 LIMIT 1",
+			        dbesc($user_info['screen_name'])
+		        );
+                }
 	}
 	else
 		return;
 
+
 	$can_post  = false;
 	$visitor   = 0;
 
 	$page_owner_uid   = $r[0]['uid'];
+	$default_cid      = $r[0]['id'];
 	$page_owner_nick  = $r[0]['nickname'];
 	$community_page   = (($r[0]['page-flags'] == PAGE_COMMUNITY) ? true : false);
 
@@ -34,6 +44,7 @@ function wall_upload_post(&$a) {
 			if(count($r)) {
 				$can_post = true;
 				$visitor = remote_user();
+				$default_cid = $visitor;
 			}
 		}
 	}
@@ -43,12 +54,19 @@ function wall_upload_post(&$a) {
 		killme();
 	}
 
-	if(! x($_FILES,'userfile'))
+	if(! x($_FILES,'userfile') && ! x($_FILES,'media'))
 		killme();
 
-	$src      = $_FILES['userfile']['tmp_name'];
-	$filename = basename($_FILES['userfile']['name']);
-	$filesize = intval($_FILES['userfile']['size']);
+        if(x($_FILES,'userfile')) {
+	        $src      = $_FILES['userfile']['tmp_name'];
+	        $filename = basename($_FILES['userfile']['name']);
+	        $filesize = intval($_FILES['userfile']['size']);
+        }
+        elseif(x($_FILES,'media')) {
+	        $src = $_FILES['media']['tmp_name'];
+                $filename = basename($_FILES['media']['name']);
+	        $filesize = intval($_FILES['media']['size']);
+        }
 
 	$maximagesize = get_config('system','maximagesize');
 
@@ -76,7 +94,7 @@ function wall_upload_post(&$a) {
 	
 	$smallest = 0;
 
-	$defperm = '<' . $page_owner_uid . '>';
+	$defperm = '<' . $default_cid . '>';
 
 	$r = $ph->store($page_owner_uid, $visitor, $hash, $filename, t('Wall Photos'), 0, 0, $defperm);
 
diff --git a/mod/webfinger.php b/mod/webfinger.php
index 74bd2c954..74bd2c954 100755..100644
--- a/mod/webfinger.php
+++ b/mod/webfinger.php
diff --git a/mod/xrd.php b/mod/xrd.php
index 2fa6bcd99..2fa6bcd99 100755..100644
--- a/mod/xrd.php
+++ b/mod/xrd.php
diff --git a/spec/dfrn-snap2.jpg b/spec/dfrn-snap2.jpg
index ee00f5654..ee00f5654 100755..100644
--- a/spec/dfrn-snap2.jpg
+++ b/spec/dfrn-snap2.jpg
diff --git a/spec/dfrn2.odt b/spec/dfrn2.odt
index 390fc4bb8..390fc4bb8 100755..100644
--- a/spec/dfrn2.odt
+++ b/spec/dfrn2.odt
diff --git a/spec/dfrn2.pdf b/spec/dfrn2.pdf
index e46225f7e..e46225f7e 100755..100644
--- a/spec/dfrn2.pdf
+++ b/spec/dfrn2.pdf
diff --git a/spec/zot.txt b/spec/zot.txt
index 2c3bbb180..2c3bbb180 100755..100644
--- a/spec/zot.txt
+++ b/spec/zot.txt
diff --git a/testargs.php b/testargs.php
index 4c9bce4e9..4c9bce4e9 100755..100644
--- a/testargs.php
+++ b/testargs.php
diff --git a/tests/autoname_test.php b/tests/autoname_test.php
index 9dae920ca..c83e4a471 100755..100644
--- a/tests/autoname_test.php
+++ b/tests/autoname_test.php
@@ -40,7 +40,7 @@ class AutonameTest extends PHPUnit_Framework_TestCase {
 	 */

 	public function testAutonameNoLength() {

 		$autoname1=autoname(0);

-		$this->assertEquals(0, count($autoname1));

+		$this->assertEquals(0, strlen($autoname1));

 	}

 	
 	/**
@@ -50,7 +50,7 @@ class AutonameTest extends PHPUnit_Framework_TestCase {
 	 */

 	public function testAutonameNegativeLength() {

 		$autoname1=autoname(-23);

-		$this->assertEquals(0, count($autoname1));

+		$this->assertEquals(0, strlen($autoname1));

 	}

 	

 	// 	public function testAutonameMaxLength() {

diff --git a/tests/contains_attribute_test.php b/tests/contains_attribute_test.php
index b0bb06acf..b0bb06acf 100755..100644
--- a/tests/contains_attribute_test.php
+++ b/tests/contains_attribute_test.php
diff --git a/tests/expand_acl_test.php b/tests/expand_acl_test.php
index b516a3f14..154bc921d 100755..100644
--- a/tests/expand_acl_test.php
+++ b/tests/expand_acl_test.php
@@ -39,7 +39,7 @@ class ExpandAclTest extends PHPUnit_Framework_TestCase {
 	 */

 	public function testExpandAclString() {

 		$text="<1><279012><tt>"; 

-		$this->assertEquals(array(1, 279012, 'tt'), expand_acl($text));

+		$this->assertEquals(array(1, 279012), expand_acl($text));

 	}

 	
 	/**
@@ -49,7 +49,7 @@ class ExpandAclTest extends PHPUnit_Framework_TestCase {
 	 */

 	public function testExpandAclSpace() {

 		$text="<1><279 012><32>"; 

-		$this->assertEquals(array(1, "279 012", "32"), expand_acl($text));

+		$this->assertEquals(array(1, "279", "32"), expand_acl($text));

 	}

 	
 	/**
@@ -127,16 +127,22 @@ class ExpandAclTest extends PHPUnit_Framework_TestCase {
 	 */

 	public function testExpandAclNoMatching2() {

 		$text="<1>2><3>";

-		$this->assertEquals(array(), expand_acl($text));

+// The angles are delimiters which aren't important
+// the important thing is the numeric content, this returns array(1,2,3) currently
+// we may wish to eliminate 2 from the results, though it isn't harmful
+// It would be a better test to figure out if there is any ACL input which can
+// produce this $text and fix that instead.
+//		$this->assertEquals(array(), expand_acl($text));

 	}
 	
 	/**

 	 * test invalid input, empty <>

 	 *

 	 * TODO: should there be an exception? Or array(1, 3)

+	 * (This should be array(1,3) - mike)
 	 */

 	public function testExpandAclEmptyMatch() {

 		$text="<1><><3>";

-		$this->assertEquals(array(), expand_acl($text));

+		$this->assertEquals(array(1,3), expand_acl($text));

 	}
 }
\ No newline at end of file
diff --git a/tests/get_tags_test.php b/tests/get_tags_test.php
index 9051923be..e5c6485de 100644
--- a/tests/get_tags_test.php
+++ b/tests/get_tags_test.php
@@ -139,23 +139,35 @@ class GetTagsTest extends PHPUnit_Framework_TestCase {
 		$str_tags='';

 		handle_tag($this->a, $text, $inform, $str_tags, 11, $tags[0]);

 	

-		$this->assertEquals("cid:15", $inform); 
-		$this->assertEquals("@[url=http://justatest.de]Mike Lastname[/url]", $str_tags);
-		$this->assertEquals("hi @[url=http://justatest.de]Mike Lastname[/url].because", $text);

+		// (mike) - This is a tricky case.
+		// we support mentions as in @mike@example.com - which contains a period.
+		// This shouldn't match anything unless you have a contact named "Mike.because".
+		// We may need another test for "@Mike. because" - which should return the contact
+		// as we ignore trailing periods in tags. 
+ 
+//		$this->assertEquals("cid:15", $inform); 
+//		$this->assertEquals("@[url=http://justatest.de]Mike Lastname[/url]", $str_tags);
+//		$this->assertEquals("hi @[url=http://justatest.de]Mike Lastname[/url].because", $text);

+
+		$this->assertEquals("", $inform); 
+		$this->assertEquals("", $str_tags);
+
 	}
 	
 	/**

 	 * test with two Person tags. 
 	 * There's a minor spelling mistake...

 	 */

+
 	public function testGetTagsPerson2Spelling() {

 		$text="hi @Mike@campino@friendica.eu";

 	

 		$tags=get_tags($text);

-	
-		$this->assertEquals(2, count($tags)); 

-		$this->assertTrue(in_array("@Mike", $tags));
-		$this->assertTrue(in_array("@campino@friendica.eu", $tags));

+
+// This construct is not supported. Results are indeterminate			
+//		$this->assertEquals(2, count($tags)); 

+//		$this->assertTrue(in_array("@Mike", $tags));
+//		$this->assertTrue(in_array("@campino@friendica.eu", $tags));

 	}

 
 	/**
@@ -251,7 +263,8 @@ class GetTagsTest extends PHPUnit_Framework_TestCase {
 		
 		$this->assertEquals("Test with @[url=http://justatest.de]Mike Lastname[/url] id tag", $text);

 		$this->assertEquals("@[url=http://justatest.de]Mike Lastname[/url]", $str_tags);

-		$this->assertEquals("cid:15", $inform);
+		// this test may produce two cid:15 entries - which is OK because duplicates are pruned before delivery
+		$this->assertContains("cid:15",$inform);
 	}
 	
 	/**
@@ -297,10 +310,10 @@ class GetTagsTest extends PHPUnit_Framework_TestCase {
 		$this->assertTrue(in_array("#nice", $tags));

 		$this->assertTrue(in_array("@first_last", $tags));
 		
-		//right now, none of the is matched
-		$this->assertFalse(in_array("@Mike@campino@friendica.eu", $tags));

-		$this->assertTrue(in_array("@campino@friendica.eu", $tags));
-		$this->assertTrue(in_array("@campino@friendica.eu is", $tags));

+		//right now, none of the is matched (unsupported)
+//		$this->assertFalse(in_array("@Mike@campino@friendica.eu", $tags));

+//		$this->assertTrue(in_array("@campino@friendica.eu", $tags));
+//		$this->assertTrue(in_array("@campino@friendica.eu is", $tags));

 	}

 
 	/**
diff --git a/tests/template_test.php b/tests/template_test.php
index 1f9f80531..1f9f80531 100755..100644
--- a/tests/template_test.php
+++ b/tests/template_test.php
diff --git a/update.php b/update.php
index d38e39f8b..5ab321b33 100755..100644
--- a/update.php
+++ b/update.php
@@ -1,6 +1,6 @@
 <?php
 
-define( 'UPDATE_VERSION' , 1134 );
+define( 'UPDATE_VERSION' , 1138 );
 
 /**
  *
@@ -1137,7 +1137,79 @@ INDEX ( `username` )
 }
 
 function update_1133() {
-	q("ALTER TABLE `user` ADD `unkmail` TINYINT( 1 ) NOT NULL DEFAULT '0' AFTER `blocktags` , ADD INDEX ( `unkmail` ) ");
-	q("ALTER TABLE `user` ADD `cntunkmail` INT NOT NULL DEFAULT '10' AFTER `unkmail` , ADD INDEX ( `cntunkmail` ) ");
-	q("ALTER TABLE `mail` ADD `unknown` TINYINT( 1 ) NOT NULL DEFAULT '0' AFTER `replied` , ADD INDEX ( `unknown` ) ");
+q("ALTER TABLE `user` ADD `unkmail` TINYINT( 1 ) NOT NULL DEFAULT '0' AFTER `blocktags` , ADD INDEX ( `unkmail` ) ");

+q("ALTER TABLE `user` ADD `cntunkmail` INT NOT NULL DEFAULT '10' AFTER `unkmail` , ADD INDEX ( `cntunkmail` ) ");

+q("ALTER TABLE `mail` ADD `unknown` TINYINT( 1 ) NOT NULL DEFAULT '0' AFTER `replied` , ADD INDEX ( `unknown` ) ");
 }
+
+function update_1134() {
+	// faulty update merged forward
+	// had a hardwired tablename of 'friendica' which isn't the right name on most systems
+}
+
+function update_1135() {
+	//there can't be indexes with more than 1000 bytes in mysql, 
+	//so change charset to be smaller
+	q("ALTER TABLE `config` CHANGE `cat` `cat` CHAR( 255 ) CHARACTER SET ascii COLLATE ascii_general_ci NOT NULL ,
+CHANGE `k` `k` CHAR( 255 ) CHARACTER SET ascii COLLATE ascii_general_ci NOT NULL"); 
+	
+	//same thing for pconfig
+	q("ALTER TABLE `pconfig` CHANGE `cat` `cat` CHAR( 255 ) CHARACTER SET ascii COLLATE ascii_general_ci NOT NULL ,
+	CHANGE `k` `k` CHAR( 255 ) CHARACTER SET ascii COLLATE ascii_general_ci NOT NULL"); 
+	// faulty update merged forward. Bad update in 1134 caused duplicate k,cat pairs
+	// these have to be cleared before the unique keys can be added.	
+}
+
+function update_1136() {
+
+	$arr = array();
+
+	// order in reverse so that we save the newest entry
+
+	$r = q("select * from config where 1 order by id desc");
+	if(count($r)) {
+		foreach($r as $rr) {
+			$found = false;
+			foreach($arr as $x) {
+				if($x['cat'] == $rr['cat'] && $x['k'] == $rr['k']) {
+					$found = true;
+					q("delete from config where id = %d limit 1",
+						intval($rr['id'])
+					);
+				}
+			}
+			if(! $found) {
+				$arr[] = $rr;
+			}
+		}
+	}
+			
+	$arr = array();
+	$r = q("select * from pconfig where 1 order by id desc");
+	if(count($r)) {
+		foreach($r as $rr) {
+			$found = false;
+			foreach($arr as $x) {
+				if($x['uid'] == $rr['uid'] && $x['cat'] == $rr['cat'] && $x['k'] == $rr['k']) {
+					$found = true;
+					q("delete from pconfig where id = %d limit 1",
+						intval($rr['id'])
+					);
+				}
+			}
+			if(! $found) {
+				$arr[] = $rr;
+			}
+		}
+	}
+	q("ALTER TABLE `config` ADD UNIQUE `access` ( `cat` , `k` ) "); 
+	q("ALTER TABLE `pconfig` ADD UNIQUE `access` ( `uid` , `cat` , `k` )"); 
+
+}
+
+
+function update_1137() {
+	q("alter table item_id DROP `face` , DROP `dspr` , DROP `twit` , DROP `stat` ");
+	q("ALTER TABLE `item_id` ADD `sid` CHAR( 255 ) NOT NULL AFTER `uid` , ADD `service` CHAR( 255 ) NOT NULL AFTER `sid` , add index (`sid`), add index ( `service`) ");
+}
+
diff --git a/util/.htaccess b/util/.htaccess
index b311c14c2..b311c14c2 100755..100644
--- a/util/.htaccess
+++ b/util/.htaccess
diff --git a/util/README b/util/README
index aceade3e2..aceade3e2 100755..100644
--- a/util/README
+++ b/util/README
diff --git a/util/db_update.php b/util/db_update.php
index 35620e80b..35620e80b 100755..100644
--- a/util/db_update.php
+++ b/util/db_update.php
diff --git a/util/extract.php b/util/extract.php
index 90127f3c1..90127f3c1 100755..100644
--- a/util/extract.php
+++ b/util/extract.php
diff --git a/util/messages.po b/util/messages.po
index 132a784dc..76c74d7b1 100755..100644
--- a/util/messages.po
+++ b/util/messages.po
@@ -6,9 +6,9 @@
 #, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: 2.3.1296\n"
+"Project-Id-Version: 2.3.1320\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-03-30 04:52-0700\n"
+"POT-Creation-Date: 2012-04-22 10:00-0700\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -34,26 +34,29 @@ msgstr ""
 msgid "Contact update failed."
 msgstr ""
 
-#: ../../mod/crepair.php:115 ../../mod/wall_attach.php:43
+#: ../../mod/crepair.php:115 ../../mod/wall_attach.php:44
 #: ../../mod/fsuggest.php:78 ../../mod/events.php:110 ../../mod/api.php:26
-#: ../../mod/api.php:31 ../../mod/photos.php:130 ../../mod/photos.php:866
+#: ../../mod/api.php:31 ../../mod/photos.php:130 ../../mod/photos.php:865
 #: ../../mod/editpost.php:10 ../../mod/install.php:171
-#: ../../mod/notifications.php:62 ../../mod/contacts.php:125
-#: ../../mod/settings.php:49 ../../mod/settings.php:428
-#: ../../mod/settings.php:433 ../../mod/manage.php:86 ../../mod/network.php:6
-#: ../../mod/notes.php:20 ../../mod/attach.php:33 ../../mod/group.php:19
-#: ../../mod/viewcontacts.php:22 ../../mod/register.php:36
-#: ../../mod/regmod.php:116 ../../mod/item.php:124 ../../mod/item.php:140
-#: ../../mod/profile_photo.php:19 ../../mod/profile_photo.php:139
-#: ../../mod/profile_photo.php:150 ../../mod/profile_photo.php:163
-#: ../../mod/message.php:38 ../../mod/message.php:91
-#: ../../mod/allfriends.php:9 ../../mod/wall_upload.php:42
+#: ../../mod/notifications.php:66 ../../mod/contacts.php:125
+#: ../../mod/settings.php:99 ../../mod/settings.php:514
+#: ../../mod/settings.php:519 ../../mod/manage.php:86 ../../mod/network.php:6
+#: ../../mod/notes.php:20 ../../mod/wallmessage.php:9
+#: ../../mod/wallmessage.php:33 ../../mod/wallmessage.php:79
+#: ../../mod/wallmessage.php:103 ../../mod/attach.php:33
+#: ../../mod/group.php:19 ../../mod/viewcontacts.php:22
+#: ../../mod/register.php:38 ../../mod/regmod.php:116 ../../mod/item.php:124
+#: ../../mod/item.php:140 ../../mod/profile_photo.php:19
+#: ../../mod/profile_photo.php:139 ../../mod/profile_photo.php:150
+#: ../../mod/profile_photo.php:163 ../../mod/message.php:38
+#: ../../mod/message.php:90 ../../mod/allfriends.php:9
+#: ../../mod/nogroup.php:25 ../../mod/wall_upload.php:46
 #: ../../mod/follow.php:8 ../../mod/common.php:9 ../../mod/display.php:138
-#: ../../mod/profiles.php:7 ../../mod/profiles.php:232
+#: ../../mod/profiles.php:7 ../../mod/profiles.php:329
 #: ../../mod/delegate.php:6 ../../mod/suggest.php:28 ../../mod/invite.php:13
 #: ../../mod/invite.php:81 ../../mod/dfrn_confirm.php:53
-#: ../../addon/facebook/facebook.php:452 ../../include/items.php:3110
-#: ../../index.php:291
+#: ../../addon/facebook/facebook.php:484 ../../include/items.php:3171
+#: ../../index.php:309
 msgid "Permission denied."
 msgstr ""
 
@@ -82,8 +85,8 @@ msgstr ""
 msgid "Return to contact editor"
 msgstr ""
 
-#: ../../mod/crepair.php:148 ../../mod/settings.php:480
-#: ../../mod/settings.php:507 ../../mod/admin.php:487 ../../mod/admin.php:496
+#: ../../mod/crepair.php:148 ../../mod/settings.php:534
+#: ../../mod/settings.php:560 ../../mod/admin.php:573 ../../mod/admin.php:582
 msgid "Name"
 msgstr ""
 
@@ -120,39 +123,49 @@ msgid "New photo from this URL"
 msgstr ""
 
 #: ../../mod/crepair.php:166 ../../mod/fsuggest.php:107
-#: ../../mod/events.php:400 ../../mod/photos.php:901 ../../mod/photos.php:959
-#: ../../mod/photos.php:1194 ../../mod/photos.php:1234
-#: ../../mod/photos.php:1274 ../../mod/photos.php:1305
+#: ../../mod/events.php:400 ../../mod/photos.php:900 ../../mod/photos.php:958
+#: ../../mod/photos.php:1193 ../../mod/photos.php:1233
+#: ../../mod/photos.php:1273 ../../mod/photos.php:1304
 #: ../../mod/install.php:251 ../../mod/install.php:289
-#: ../../mod/localtime.php:45 ../../mod/contacts.php:319
-#: ../../mod/settings.php:478 ../../mod/settings.php:628
-#: ../../mod/settings.php:826 ../../mod/manage.php:109 ../../mod/group.php:85
-#: ../../mod/admin.php:316 ../../mod/admin.php:484 ../../mod/admin.php:613
-#: ../../mod/admin.php:785 ../../mod/admin.php:865 ../../mod/profiles.php:390
-#: ../../mod/invite.php:119 ../../addon/facebook/facebook.php:531
-#: ../../addon/yourls/yourls.php:76 ../../addon/ljpost/ljpost.php:93
-#: ../../addon/nsfw/nsfw.php:57
+#: ../../mod/localtime.php:45 ../../mod/contacts.php:325
+#: ../../mod/settings.php:532 ../../mod/settings.php:678
+#: ../../mod/settings.php:739 ../../mod/settings.php:930
+#: ../../mod/manage.php:109 ../../mod/group.php:85 ../../mod/admin.php:392
+#: ../../mod/admin.php:570 ../../mod/admin.php:706 ../../mod/admin.php:905
+#: ../../mod/admin.php:993 ../../mod/profiles.php:498 ../../mod/invite.php:119
+#: ../../addon/facebook/facebook.php:574 ../../addon/yourls/yourls.php:76
+#: ../../addon/ljpost/ljpost.php:93 ../../addon/nsfw/nsfw.php:57
+#: ../../addon/planets/planets.php:158
 #: ../../addon/uhremotestorage/uhremotestorage.php:89
-#: ../../addon/randplace/randplace.php:179 ../../addon/dwpost/dwpost.php:93
-#: ../../addon/drpost/drpost.php:110 ../../addon/frown/frown.php:84
-#: ../../addon/geonames/geonames.php:187 ../../addon/oembed.old/oembed.php:41
-#: ../../addon/impressum/impressum.php:69 ../../addon/blockem/blockem.php:57
-#: ../../addon/qcomment/qcomment.php:61
+#: ../../addon/randplace/randplace.php:177 ../../addon/dwpost/dwpost.php:93
+#: ../../addon/drpost/drpost.php:110 ../../addon/geonames/geonames.php:187
+#: ../../addon/oembed.old/oembed.php:41 ../../addon/impressum/impressum.php:80
+#: ../../addon/blockem/blockem.php:57 ../../addon/qcomment/qcomment.php:61
 #: ../../addon/openstreetmap/openstreetmap.php:70
-#: ../../addon/editplain/editplain.php:84 ../../addon/blackout/blackout.php:94
-#: ../../addon/pageheader/pageheader.php:52 ../../addon/ijpost/ijpost.php:93
-#: ../../addon/statusnet/statusnet.php:273
-#: ../../addon/statusnet/statusnet.php:287
-#: ../../addon/statusnet/statusnet.php:313
-#: ../../addon/statusnet/statusnet.php:320
-#: ../../addon/statusnet/statusnet.php:345
-#: ../../addon/statusnet/statusnet.php:532 ../../addon/tumblr/tumblr.php:90
+#: ../../addon/mathjax/mathjax.php:42 ../../addon/editplain/editplain.php:84
+#: ../../addon/blackout/blackout.php:94 ../../addon/gravatar/gravatar.php:86
+#: ../../addon/pageheader/pageheader.php:55 ../../addon/ijpost/ijpost.php:93
+#: ../../addon/jappixmini/jappixmini.php:302
+#: ../../addon/statusnet/statusnet.php:278
+#: ../../addon/statusnet/statusnet.php:292
+#: ../../addon/statusnet/statusnet.php:318
+#: ../../addon/statusnet/statusnet.php:325
+#: ../../addon/statusnet/statusnet.php:353
+#: ../../addon/statusnet/statusnet.php:553 ../../addon/tumblr/tumblr.php:90
 #: ../../addon/numfriends/numfriends.php:85 ../../addon/gnot/gnot.php:88
 #: ../../addon/wppost/wppost.php:102 ../../addon/showmore/showmore.php:48
-#: ../../addon/piwik/piwik.php:89 ../../addon/twitter/twitter.php:175
-#: ../../addon/twitter/twitter.php:201 ../../addon/twitter/twitter.php:355
+#: ../../addon/piwik/piwik.php:89 ../../addon/twitter/twitter.php:180
+#: ../../addon/twitter/twitter.php:209 ../../addon/twitter/twitter.php:375
+#: ../../addon/irc/irc.php:55 ../../addon/blogger/blogger.php:102
 #: ../../addon/posterous/posterous.php:90
-#: ../../view/theme/quattro/theme.php:15 ../../include/conversation.php:555
+#: ../../view/theme/diabook/diabook-green/config.php:76
+#: ../../view/theme/diabook/diabook-red/config.php:76
+#: ../../view/theme/diabook/diabook-blue/config.php:76
+#: ../../view/theme/diabook/diabook-dark/config.php:76
+#: ../../view/theme/diabook/diabook-aerith/config.php:76
+#: ../../view/theme/diabook/diabook-pink/config.php:76
+#: ../../view/theme/diabook/config.php:91
+#: ../../view/theme/quattro/config.php:52 ../../include/conversation.php:555
 msgid "Submit"
 msgstr ""
 
@@ -164,20 +177,20 @@ msgstr ""
 msgid "Help"
 msgstr ""
 
-#: ../../mod/help.php:38 ../../index.php:224
+#: ../../mod/help.php:38 ../../index.php:228
 msgid "Not Found"
 msgstr ""
 
-#: ../../mod/help.php:41 ../../index.php:227
+#: ../../mod/help.php:41 ../../index.php:231
 msgid "Page not found."
 msgstr ""
 
-#: ../../mod/wall_attach.php:57
+#: ../../mod/wall_attach.php:58
 #, php-format
 msgid "File exceeds size limit of %d"
 msgstr ""
 
-#: ../../mod/wall_attach.php:85 ../../mod/wall_attach.php:96
+#: ../../mod/wall_attach.php:86 ../../mod/wall_attach.php:97
 msgid "File upload failed."
 msgstr ""
 
@@ -206,13 +219,19 @@ msgstr ""
 msgid "Edit event"
 msgstr ""
 
-#: ../../mod/events.php:272 ../../include/text.php:1044
+#: ../../mod/events.php:272 ../../include/text.php:1053
 msgid "link to source"
 msgstr ""
 
-#: ../../mod/events.php:296 ../../view/theme/diabook-blue/theme.php:219
-#: ../../view/theme/diabook/theme.php:225 ../../include/nav.php:52
-#: ../../boot.php:1399
+#: ../../mod/events.php:296
+#: ../../view/theme/diabook/diabook-green/theme.php:233
+#: ../../view/theme/diabook/diabook-red/theme.php:231
+#: ../../view/theme/diabook/diabook-blue/theme.php:231
+#: ../../view/theme/diabook/theme.php:250
+#: ../../view/theme/diabook/diabook-dark/theme.php:233
+#: ../../view/theme/diabook/diabook-aerith/theme.php:233
+#: ../../view/theme/diabook/diabook-pink/theme.php:233
+#: ../../include/nav.php:52 ../../boot.php:1471
 msgid "Events"
 msgstr ""
 
@@ -262,7 +281,7 @@ msgid "Description:"
 msgstr ""
 
 #: ../../mod/events.php:395 ../../include/event.php:37
-#: ../../include/bb2diaspora.php:260 ../../boot.php:1030
+#: ../../include/bb2diaspora.php:260 ../../boot.php:1083
 msgid "Location:"
 msgstr ""
 
@@ -271,8 +290,8 @@ msgid "Share this event"
 msgstr ""
 
 #: ../../mod/tagrm.php:11 ../../mod/tagrm.php:94
-#: ../../mod/dfrn_request.php:707 ../../mod/settings.php:479
-#: ../../mod/settings.php:506 ../../addon/js_upload/js_upload.php:45
+#: ../../mod/dfrn_request.php:752 ../../mod/settings.php:533
+#: ../../mod/settings.php:559 ../../addon/js_upload/js_upload.php:45
 msgid "Cancel"
 msgstr ""
 
@@ -292,7 +311,7 @@ msgstr ""
 msgid "Remove"
 msgstr ""
 
-#: ../../mod/dfrn_poll.php:94 ../../mod/dfrn_poll.php:520
+#: ../../mod/dfrn_poll.php:94 ../../mod/dfrn_poll.php:522
 #, php-format
 msgid "%s welcomes %s"
 msgstr ""
@@ -315,25 +334,25 @@ msgid ""
 "and/or create new posts for you?"
 msgstr ""
 
-#: ../../mod/api.php:105 ../../mod/dfrn_request.php:695
-#: ../../mod/settings.php:721 ../../mod/settings.php:727
-#: ../../mod/settings.php:735 ../../mod/settings.php:739
-#: ../../mod/settings.php:744 ../../mod/settings.php:750
-#: ../../mod/settings.php:756 ../../mod/settings.php:816
-#: ../../mod/settings.php:817 ../../mod/settings.php:818
-#: ../../mod/settings.php:819 ../../mod/register.php:534
-#: ../../mod/profiles.php:369
+#: ../../mod/api.php:105 ../../mod/dfrn_request.php:740
+#: ../../mod/settings.php:844 ../../mod/settings.php:850
+#: ../../mod/settings.php:858 ../../mod/settings.php:862
+#: ../../mod/settings.php:867 ../../mod/settings.php:873
+#: ../../mod/settings.php:879 ../../mod/settings.php:885
+#: ../../mod/settings.php:921 ../../mod/settings.php:922
+#: ../../mod/settings.php:923 ../../mod/settings.php:924
+#: ../../mod/register.php:532 ../../mod/profiles.php:475
 msgid "Yes"
 msgstr ""
 
-#: ../../mod/api.php:106 ../../mod/dfrn_request.php:696
-#: ../../mod/settings.php:721 ../../mod/settings.php:727
-#: ../../mod/settings.php:735 ../../mod/settings.php:739
-#: ../../mod/settings.php:744 ../../mod/settings.php:750
-#: ../../mod/settings.php:756 ../../mod/settings.php:816
-#: ../../mod/settings.php:817 ../../mod/settings.php:818
-#: ../../mod/settings.php:819 ../../mod/register.php:535
-#: ../../mod/profiles.php:370
+#: ../../mod/api.php:106 ../../mod/dfrn_request.php:741
+#: ../../mod/settings.php:844 ../../mod/settings.php:850
+#: ../../mod/settings.php:858 ../../mod/settings.php:862
+#: ../../mod/settings.php:867 ../../mod/settings.php:873
+#: ../../mod/settings.php:879 ../../mod/settings.php:885
+#: ../../mod/settings.php:921 ../../mod/settings.php:922
+#: ../../mod/settings.php:923 ../../mod/settings.php:924
+#: ../../mod/register.php:533 ../../mod/profiles.php:476
 msgid "No"
 msgstr ""
 
@@ -341,19 +360,24 @@ msgstr ""
 msgid "Photo Albums"
 msgstr ""
 
-#: ../../mod/photos.php:51 ../../mod/photos.php:151 ../../mod/photos.php:880
-#: ../../mod/photos.php:951 ../../mod/photos.php:966 ../../mod/photos.php:1383
-#: ../../mod/photos.php:1395 ../../addon/communityhome/communityhome.php:110
-#: ../../view/theme/diabook-blue/theme.php:110
-#: ../../view/theme/diabook/theme.php:113
+#: ../../mod/photos.php:51 ../../mod/photos.php:151 ../../mod/photos.php:879
+#: ../../mod/photos.php:950 ../../mod/photos.php:965 ../../mod/photos.php:1382
+#: ../../mod/photos.php:1394 ../../addon/communityhome/communityhome.php:110
+#: ../../view/theme/diabook/diabook-green/theme.php:116
+#: ../../view/theme/diabook/diabook-red/theme.php:115
+#: ../../view/theme/diabook/diabook-blue/theme.php:115
+#: ../../view/theme/diabook/theme.php:130
+#: ../../view/theme/diabook/diabook-dark/theme.php:116
+#: ../../view/theme/diabook/diabook-aerith/theme.php:116
+#: ../../view/theme/diabook/diabook-pink/theme.php:116
 msgid "Contact Photos"
 msgstr ""
 
-#: ../../mod/photos.php:58 ../../mod/photos.php:976 ../../mod/photos.php:1425
+#: ../../mod/photos.php:58 ../../mod/photos.php:975 ../../mod/photos.php:1424
 msgid "Upload New Photos"
 msgstr ""
 
-#: ../../mod/photos.php:69 ../../mod/settings.php:11
+#: ../../mod/photos.php:69 ../../mod/settings.php:20
 msgid "everybody"
 msgstr ""
 
@@ -361,15 +385,20 @@ msgstr ""
 msgid "Contact information unavailable"
 msgstr ""
 
-#: ../../mod/photos.php:151 ../../mod/photos.php:598 ../../mod/photos.php:951
-#: ../../mod/photos.php:966 ../../mod/register.php:337
-#: ../../mod/register.php:344 ../../mod/register.php:351
+#: ../../mod/photos.php:151 ../../mod/photos.php:597 ../../mod/photos.php:950
+#: ../../mod/photos.php:965 ../../mod/register.php:335
+#: ../../mod/register.php:342 ../../mod/register.php:349
 #: ../../mod/profile_photo.php:60 ../../mod/profile_photo.php:67
 #: ../../mod/profile_photo.php:74 ../../mod/profile_photo.php:174
 #: ../../mod/profile_photo.php:252 ../../mod/profile_photo.php:261
 #: ../../addon/communityhome/communityhome.php:111
-#: ../../view/theme/diabook-blue/theme.php:111
-#: ../../view/theme/diabook/theme.php:114
+#: ../../view/theme/diabook/diabook-green/theme.php:117
+#: ../../view/theme/diabook/diabook-red/theme.php:116
+#: ../../view/theme/diabook/diabook-blue/theme.php:116
+#: ../../view/theme/diabook/theme.php:131
+#: ../../view/theme/diabook/diabook-dark/theme.php:117
+#: ../../view/theme/diabook/diabook-aerith/theme.php:117
+#: ../../view/theme/diabook/diabook-pink/theme.php:117
 msgid "Profile Photos"
 msgstr ""
 
@@ -377,189 +406,194 @@ msgstr ""
 msgid "Album not found."
 msgstr ""
 
-#: ../../mod/photos.php:179 ../../mod/photos.php:960
+#: ../../mod/photos.php:179 ../../mod/photos.php:959
 msgid "Delete Album"
 msgstr ""
 
-#: ../../mod/photos.php:242 ../../mod/photos.php:1195
+#: ../../mod/photos.php:242 ../../mod/photos.php:1194
 msgid "Delete Photo"
 msgstr ""
 
-#: ../../mod/photos.php:529
+#: ../../mod/photos.php:528
 msgid "was tagged in a"
 msgstr ""
 
-#: ../../mod/photos.php:529 ../../mod/like.php:127 ../../mod/tagger.php:70
+#: ../../mod/photos.php:528 ../../mod/like.php:127 ../../mod/tagger.php:70
 #: ../../addon/communityhome/communityhome.php:163
-#: ../../view/theme/diabook-blue/theme.php:82
-#: ../../view/theme/diabook/theme.php:85 ../../include/text.php:1288
-#: ../../include/diaspora.php:1642 ../../include/conversation.php:53
-#: ../../include/conversation.php:126
+#: ../../view/theme/diabook/diabook-green/theme.php:88
+#: ../../view/theme/diabook/diabook-red/theme.php:87
+#: ../../view/theme/diabook/diabook-blue/theme.php:87
+#: ../../view/theme/diabook/theme.php:102
+#: ../../view/theme/diabook/diabook-dark/theme.php:88
+#: ../../view/theme/diabook/diabook-aerith/theme.php:88
+#: ../../view/theme/diabook/diabook-pink/theme.php:88
+#: ../../include/text.php:1304 ../../include/diaspora.php:1654
+#: ../../include/conversation.php:53 ../../include/conversation.php:126
 msgid "photo"
 msgstr ""
 
-#: ../../mod/photos.php:529
+#: ../../mod/photos.php:528
 msgid "by"
 msgstr ""
 
-#: ../../mod/photos.php:632 ../../addon/js_upload/js_upload.php:315
+#: ../../mod/photos.php:631 ../../addon/js_upload/js_upload.php:315
 msgid "Image exceeds size limit of "
 msgstr ""
 
-#: ../../mod/photos.php:640
+#: ../../mod/photos.php:639
 msgid "Image file is empty."
 msgstr ""
 
-#: ../../mod/photos.php:654 ../../mod/profile_photo.php:124
-#: ../../mod/wall_upload.php:65
+#: ../../mod/photos.php:653 ../../mod/profile_photo.php:124
+#: ../../mod/wall_upload.php:69
 msgid "Unable to process image."
 msgstr ""
 
-#: ../../mod/photos.php:674 ../../mod/profile_photo.php:257
-#: ../../mod/wall_upload.php:84
+#: ../../mod/photos.php:673 ../../mod/profile_photo.php:257
+#: ../../mod/wall_upload.php:88
 msgid "Image upload failed."
 msgstr ""
 
-#: ../../mod/photos.php:760 ../../mod/community.php:16
-#: ../../mod/dfrn_request.php:626 ../../mod/viewcontacts.php:17
+#: ../../mod/photos.php:759 ../../mod/community.php:16
+#: ../../mod/dfrn_request.php:671 ../../mod/viewcontacts.php:17
 #: ../../mod/display.php:7 ../../mod/search.php:71 ../../mod/directory.php:29
 msgid "Public access denied."
 msgstr ""
 
-#: ../../mod/photos.php:770
+#: ../../mod/photos.php:769
 msgid "No photos selected"
 msgstr ""
 
-#: ../../mod/photos.php:847
+#: ../../mod/photos.php:846
 msgid "Access to this item is restricted."
 msgstr ""
 
-#: ../../mod/photos.php:908
+#: ../../mod/photos.php:907
 msgid "Upload Photos"
 msgstr ""
 
-#: ../../mod/photos.php:911 ../../mod/photos.php:955
+#: ../../mod/photos.php:910 ../../mod/photos.php:954
 msgid "New album name: "
 msgstr ""
 
-#: ../../mod/photos.php:912
+#: ../../mod/photos.php:911
 msgid "or existing album name: "
 msgstr ""
 
-#: ../../mod/photos.php:913
+#: ../../mod/photos.php:912
 msgid "Do not show a status post for this upload"
 msgstr ""
 
-#: ../../mod/photos.php:915 ../../mod/photos.php:1190
+#: ../../mod/photos.php:914 ../../mod/photos.php:1189
 msgid "Permissions"
 msgstr ""
 
-#: ../../mod/photos.php:970
+#: ../../mod/photos.php:969
 msgid "Edit Album"
 msgstr ""
 
-#: ../../mod/photos.php:985 ../../mod/photos.php:1408
+#: ../../mod/photos.php:984 ../../mod/photos.php:1407
 msgid "View Photo"
 msgstr ""
 
-#: ../../mod/photos.php:1020
+#: ../../mod/photos.php:1019
 msgid "Permission denied. Access to this item may be restricted."
 msgstr ""
 
-#: ../../mod/photos.php:1022
+#: ../../mod/photos.php:1021
 msgid "Photo not available"
 msgstr ""
 
-#: ../../mod/photos.php:1072
+#: ../../mod/photos.php:1071
 msgid "View photo"
 msgstr ""
 
-#: ../../mod/photos.php:1072
+#: ../../mod/photos.php:1071
 msgid "Edit photo"
 msgstr ""
 
-#: ../../mod/photos.php:1073
+#: ../../mod/photos.php:1072
 msgid "Use as profile photo"
 msgstr ""
 
-#: ../../mod/photos.php:1079 ../../include/conversation.php:480
+#: ../../mod/photos.php:1078 ../../include/conversation.php:480
 msgid "Private Message"
 msgstr ""
 
-#: ../../mod/photos.php:1101
+#: ../../mod/photos.php:1100
 msgid "View Full Size"
 msgstr ""
 
-#: ../../mod/photos.php:1169
+#: ../../mod/photos.php:1168
 msgid "Tags: "
 msgstr ""
 
-#: ../../mod/photos.php:1172
+#: ../../mod/photos.php:1171
 msgid "[Remove any tag]"
 msgstr ""
 
-#: ../../mod/photos.php:1183
+#: ../../mod/photos.php:1182
 msgid "New album name"
 msgstr ""
 
-#: ../../mod/photos.php:1186
+#: ../../mod/photos.php:1185
 msgid "Caption"
 msgstr ""
 
-#: ../../mod/photos.php:1188
+#: ../../mod/photos.php:1187
 msgid "Add a Tag"
 msgstr ""
 
-#: ../../mod/photos.php:1192
+#: ../../mod/photos.php:1191
 msgid "Example: @bob, @Barbara_Jensen, @jim@example.com, #California, #camping"
 msgstr ""
 
-#: ../../mod/photos.php:1212 ../../include/conversation.php:529
+#: ../../mod/photos.php:1211 ../../include/conversation.php:529
 msgid "I like this (toggle)"
 msgstr ""
 
-#: ../../mod/photos.php:1213 ../../include/conversation.php:530
+#: ../../mod/photos.php:1212 ../../include/conversation.php:530
 msgid "I don't like this (toggle)"
 msgstr ""
 
-#: ../../mod/photos.php:1214 ../../include/conversation.php:960
+#: ../../mod/photos.php:1213 ../../include/conversation.php:956
 msgid "Share"
 msgstr ""
 
-#: ../../mod/photos.php:1215 ../../mod/editpost.php:104
-#: ../../mod/message.php:189 ../../mod/message.php:352
-#: ../../include/conversation.php:362 ../../include/conversation.php:702
-#: ../../include/conversation.php:977
+#: ../../mod/photos.php:1214 ../../mod/editpost.php:104
+#: ../../mod/wallmessage.php:145 ../../mod/message.php:188
+#: ../../mod/message.php:357 ../../include/conversation.php:361
+#: ../../include/conversation.php:698 ../../include/conversation.php:975
 msgid "Please wait"
 msgstr ""
 
-#: ../../mod/photos.php:1231 ../../mod/photos.php:1271
-#: ../../mod/photos.php:1302 ../../include/conversation.php:552
+#: ../../mod/photos.php:1230 ../../mod/photos.php:1270
+#: ../../mod/photos.php:1301 ../../include/conversation.php:552
 msgid "This is you"
 msgstr ""
 
-#: ../../mod/photos.php:1233 ../../mod/photos.php:1273
-#: ../../mod/photos.php:1304 ../../include/conversation.php:554
-#: ../../boot.php:488
+#: ../../mod/photos.php:1232 ../../mod/photos.php:1272
+#: ../../mod/photos.php:1303 ../../include/conversation.php:554
+#: ../../boot.php:495
 msgid "Comment"
 msgstr ""
 
-#: ../../mod/photos.php:1235 ../../mod/editpost.php:123
-#: ../../include/conversation.php:556 ../../include/conversation.php:995
+#: ../../mod/photos.php:1234 ../../mod/editpost.php:125
+#: ../../include/conversation.php:556 ../../include/conversation.php:993
 msgid "Preview"
 msgstr ""
 
-#: ../../mod/photos.php:1332 ../../mod/settings.php:542
-#: ../../mod/settings.php:626 ../../mod/group.php:168 ../../mod/admin.php:491
+#: ../../mod/photos.php:1331 ../../mod/settings.php:595
+#: ../../mod/settings.php:676 ../../mod/group.php:168 ../../mod/admin.php:577
 #: ../../include/conversation.php:318 ../../include/conversation.php:576
 msgid "Delete"
 msgstr ""
 
-#: ../../mod/photos.php:1414
+#: ../../mod/photos.php:1413
 msgid "View Album"
 msgstr ""
 
-#: ../../mod/photos.php:1423
+#: ../../mod/photos.php:1422
 msgid "Recent Photos"
 msgstr ""
 
@@ -567,13 +601,19 @@ msgstr ""
 msgid "Not available."
 msgstr ""
 
-#: ../../mod/community.php:30 ../../addon/pages/pages.php:75
-#: ../../view/theme/diabook-blue/theme.php:221
-#: ../../view/theme/diabook/theme.php:227 ../../include/nav.php:101
+#: ../../mod/community.php:30
+#: ../../view/theme/diabook/diabook-green/theme.php:235
+#: ../../view/theme/diabook/diabook-red/theme.php:233
+#: ../../view/theme/diabook/diabook-blue/theme.php:233
+#: ../../view/theme/diabook/theme.php:252
+#: ../../view/theme/diabook/diabook-dark/theme.php:235
+#: ../../view/theme/diabook/diabook-aerith/theme.php:235
+#: ../../view/theme/diabook/diabook-pink/theme.php:235
+#: ../../include/nav.php:101
 msgid "Community"
 msgstr ""
 
-#: ../../mod/community.php:61 ../../mod/search.php:119
+#: ../../mod/community.php:61 ../../mod/search.php:115
 msgid "No results."
 msgstr ""
 
@@ -617,26 +657,28 @@ msgstr ""
 msgid "Edit post"
 msgstr ""
 
-#: ../../mod/editpost.php:80 ../../include/conversation.php:946
+#: ../../mod/editpost.php:80 ../../include/conversation.php:942
 msgid "Post to Email"
 msgstr ""
 
-#: ../../mod/editpost.php:95 ../../mod/settings.php:541
+#: ../../mod/editpost.php:95 ../../mod/settings.php:594
 #: ../../include/conversation.php:563
 msgid "Edit"
 msgstr ""
 
-#: ../../mod/editpost.php:96 ../../mod/message.php:187
-#: ../../mod/message.php:350 ../../include/conversation.php:961
+#: ../../mod/editpost.php:96 ../../mod/wallmessage.php:143
+#: ../../mod/message.php:186 ../../mod/message.php:355
+#: ../../include/conversation.php:957
 msgid "Upload photo"
 msgstr ""
 
-#: ../../mod/editpost.php:97 ../../include/conversation.php:963
+#: ../../mod/editpost.php:97 ../../include/conversation.php:959
 msgid "Attach file"
 msgstr ""
 
-#: ../../mod/editpost.php:98 ../../mod/message.php:188
-#: ../../mod/message.php:351 ../../include/conversation.php:965
+#: ../../mod/editpost.php:98 ../../mod/wallmessage.php:144
+#: ../../mod/message.php:187 ../../mod/message.php:356
+#: ../../include/conversation.php:961
 msgid "Insert web link"
 msgstr ""
 
@@ -652,31 +694,35 @@ msgstr ""
 msgid "Insert Vorbis [.ogg] audio"
 msgstr ""
 
-#: ../../mod/editpost.php:102 ../../include/conversation.php:971
+#: ../../mod/editpost.php:102 ../../include/conversation.php:967
 msgid "Set your location"
 msgstr ""
 
-#: ../../mod/editpost.php:103 ../../include/conversation.php:973
+#: ../../mod/editpost.php:103 ../../include/conversation.php:969
 msgid "Clear browser location"
 msgstr ""
 
-#: ../../mod/editpost.php:105 ../../include/conversation.php:978
+#: ../../mod/editpost.php:105 ../../include/conversation.php:976
 msgid "Permission settings"
 msgstr ""
 
-#: ../../mod/editpost.php:113 ../../include/conversation.php:987
+#: ../../mod/editpost.php:113 ../../include/conversation.php:985
 msgid "CC: email addresses"
 msgstr ""
 
-#: ../../mod/editpost.php:114 ../../include/conversation.php:988
+#: ../../mod/editpost.php:114 ../../include/conversation.php:986
 msgid "Public post"
 msgstr ""
 
-#: ../../mod/editpost.php:117 ../../include/conversation.php:976
+#: ../../mod/editpost.php:117 ../../include/conversation.php:972
 msgid "Set title"
 msgstr ""
 
-#: ../../mod/editpost.php:118 ../../include/conversation.php:990
+#: ../../mod/editpost.php:119 ../../include/conversation.php:974
+msgid "Categories (comma-separated list)"
+msgstr ""
+
+#: ../../mod/editpost.php:120 ../../include/conversation.php:988
 msgid "Example: bob@example.com, mary@example.com"
 msgstr ""
 
@@ -684,19 +730,19 @@ msgstr ""
 msgid "This introduction has already been accepted."
 msgstr ""
 
-#: ../../mod/dfrn_request.php:117 ../../mod/dfrn_request.php:382
+#: ../../mod/dfrn_request.php:117 ../../mod/dfrn_request.php:427
 msgid "Profile location is not valid or does not contain profile information."
 msgstr ""
 
-#: ../../mod/dfrn_request.php:122 ../../mod/dfrn_request.php:387
+#: ../../mod/dfrn_request.php:122 ../../mod/dfrn_request.php:432
 msgid "Warning: profile location has no identifiable owner name."
 msgstr ""
 
-#: ../../mod/dfrn_request.php:124 ../../mod/dfrn_request.php:389
+#: ../../mod/dfrn_request.php:124 ../../mod/dfrn_request.php:434
 msgid "Warning: profile location has no profile photo."
 msgstr ""
 
-#: ../../mod/dfrn_request.php:127 ../../mod/dfrn_request.php:392
+#: ../../mod/dfrn_request.php:127 ../../mod/dfrn_request.php:437
 #, php-format
 msgid "%d required parameter was not found at the given location"
 msgid_plural "%d required parameters were not found at the given location"
@@ -728,136 +774,140 @@ msgstr ""
 msgid "Friends are advised to please try again in 24 hours."
 msgstr ""
 
-#: ../../mod/dfrn_request.php:307
+#: ../../mod/dfrn_request.php:309
 msgid "Invalid locator"
 msgstr ""
 
-#: ../../mod/dfrn_request.php:327
+#: ../../mod/dfrn_request.php:318
+msgid "Invalid email address."
+msgstr ""
+
+#: ../../mod/dfrn_request.php:344
+msgid "This account has not been configured for email. Request failed."
+msgstr ""
+
+#: ../../mod/dfrn_request.php:372
 msgid "Unable to resolve your name at the provided location."
 msgstr ""
 
-#: ../../mod/dfrn_request.php:340
+#: ../../mod/dfrn_request.php:385
 msgid "You have already introduced yourself here."
 msgstr ""
 
-#: ../../mod/dfrn_request.php:344
+#: ../../mod/dfrn_request.php:389
 #, php-format
 msgid "Apparently you are already friends with %s."
 msgstr ""
 
-#: ../../mod/dfrn_request.php:365
+#: ../../mod/dfrn_request.php:410
 msgid "Invalid profile URL."
 msgstr ""
 
-#: ../../mod/dfrn_request.php:371 ../../mod/follow.php:20
+#: ../../mod/dfrn_request.php:416 ../../mod/follow.php:20
 msgid "Disallowed profile URL."
 msgstr ""
 
-#: ../../mod/dfrn_request.php:440 ../../mod/contacts.php:102
+#: ../../mod/dfrn_request.php:485 ../../mod/contacts.php:102
 msgid "Failed to update contact record."
 msgstr ""
 
-#: ../../mod/dfrn_request.php:461
+#: ../../mod/dfrn_request.php:506
 msgid "Your introduction has been sent."
 msgstr ""
 
-#: ../../mod/dfrn_request.php:514
+#: ../../mod/dfrn_request.php:559
 msgid "Please login to confirm introduction."
 msgstr ""
 
-#: ../../mod/dfrn_request.php:528
+#: ../../mod/dfrn_request.php:573
 msgid ""
 "Incorrect identity currently logged in. Please login to <strong>this</"
 "strong> profile."
 msgstr ""
 
-#: ../../mod/dfrn_request.php:540
+#: ../../mod/dfrn_request.php:585
 #, php-format
 msgid "Welcome home %s."
 msgstr ""
 
-#: ../../mod/dfrn_request.php:541
+#: ../../mod/dfrn_request.php:586
 #, php-format
 msgid "Please confirm your introduction/connection request to %s."
 msgstr ""
 
-#: ../../mod/dfrn_request.php:542
+#: ../../mod/dfrn_request.php:587
 msgid "Confirm"
 msgstr ""
 
-#: ../../mod/dfrn_request.php:583 ../../include/items.php:2641
+#: ../../mod/dfrn_request.php:628 ../../include/items.php:2691
 msgid "[Name Withheld]"
 msgstr ""
 
-#: ../../mod/dfrn_request.php:667
-#, php-format
-msgid ""
-"Diaspora members: Please do not use this form. Instead, enter \"%s\" into "
-"your Diaspora search bar."
-msgstr ""
-
-#: ../../mod/dfrn_request.php:670
+#: ../../mod/dfrn_request.php:715
 msgid ""
 "Please enter your 'Identity Address' from one of the following supported "
 "communications networks:"
 msgstr ""
 
-#: ../../mod/dfrn_request.php:686
+#: ../../mod/dfrn_request.php:731
 msgid "<strike>Connect as an email follower</strike> (Coming soon)"
 msgstr ""
 
-#: ../../mod/dfrn_request.php:688
+#: ../../mod/dfrn_request.php:733
 msgid ""
 "If you are not yet a member of the free social web, <a href=\"http://dir."
 "friendica.com/siteinfo\">follow this link to find a public Friendica site "
 "and join us today</a>."
 msgstr ""
 
-#: ../../mod/dfrn_request.php:691
+#: ../../mod/dfrn_request.php:736
 msgid "Friend/Connection Request"
 msgstr ""
 
-#: ../../mod/dfrn_request.php:692
+#: ../../mod/dfrn_request.php:737
 msgid ""
 "Examples: jojo@demo.friendica.com, http://demo.friendica.com/profile/jojo, "
 "testuser@identi.ca"
 msgstr ""
 
-#: ../../mod/dfrn_request.php:693
+#: ../../mod/dfrn_request.php:738
 msgid "Please answer the following:"
 msgstr ""
 
-#: ../../mod/dfrn_request.php:694
+#: ../../mod/dfrn_request.php:739
 #, php-format
 msgid "Does %s know you?"
 msgstr ""
 
-#: ../../mod/dfrn_request.php:697
+#: ../../mod/dfrn_request.php:742
 msgid "Add a personal note:"
 msgstr ""
 
-#: ../../mod/dfrn_request.php:699 ../../include/contact_selectors.php:76
+#: ../../mod/dfrn_request.php:744 ../../include/contact_selectors.php:76
 msgid "Friendica"
 msgstr ""
 
-#: ../../mod/dfrn_request.php:700
+#: ../../mod/dfrn_request.php:745
 msgid "StatusNet/Federated Social Web"
 msgstr ""
 
-#: ../../mod/dfrn_request.php:701 ../../mod/settings.php:578
+#: ../../mod/dfrn_request.php:746 ../../mod/settings.php:629
 #: ../../include/contact_selectors.php:80
 msgid "Diaspora"
 msgstr ""
 
-#: ../../mod/dfrn_request.php:702
-msgid "- please share from your own site as noted above"
+#: ../../mod/dfrn_request.php:747
+#, php-format
+msgid ""
+" - please do not use this form.  Instead, enter %s into your Diaspora search "
+"bar."
 msgstr ""
 
-#: ../../mod/dfrn_request.php:703
+#: ../../mod/dfrn_request.php:748
 msgid "Your Identity Address:"
 msgstr ""
 
-#: ../../mod/dfrn_request.php:706
+#: ../../mod/dfrn_request.php:751
 msgid "Submit Request"
 msgstr ""
 
@@ -997,7 +1047,7 @@ msgid "This is required for message delivery to work."
 msgstr ""
 
 #: ../../mod/install.php:343
-msgid "PHP \"register_argc_argv\""
+msgid "PHP register_argc_argv"
 msgstr ""
 
 #: ../../mod/install.php:364
@@ -1037,7 +1087,7 @@ msgid "mb_string PHP module"
 msgstr ""
 
 #: ../../mod/install.php:383 ../../mod/install.php:385
-msgid "Apace mod_rewrite module"
+msgid "Apache mod_rewrite module"
 msgstr ""
 
 #: ../../mod/install.php:383
@@ -1152,7 +1202,7 @@ msgid "is interested in:"
 msgstr ""
 
 #: ../../mod/match.php:58 ../../mod/suggest.php:59
-#: ../../include/contact_widgets.php:9 ../../boot.php:980
+#: ../../include/contact_widgets.php:9 ../../boot.php:1027
 msgid "Connect"
 msgstr ""
 
@@ -1177,185 +1227,191 @@ msgstr ""
 msgid "Invalid request identifier."
 msgstr ""
 
-#: ../../mod/notifications.php:35 ../../mod/notifications.php:157
-#: ../../mod/notifications.php:203
+#: ../../mod/notifications.php:35 ../../mod/notifications.php:161
+#: ../../mod/notifications.php:207
 msgid "Discard"
 msgstr ""
 
-#: ../../mod/notifications.php:47 ../../mod/notifications.php:156
-#: ../../mod/notifications.php:202 ../../mod/contacts.php:302
-#: ../../mod/contacts.php:345
+#: ../../mod/notifications.php:51 ../../mod/notifications.php:160
+#: ../../mod/notifications.php:206 ../../mod/contacts.php:308
+#: ../../mod/contacts.php:351
 msgid "Ignore"
 msgstr ""
 
-#: ../../mod/notifications.php:71
+#: ../../mod/notifications.php:75
 msgid "System"
 msgstr ""
 
-#: ../../mod/notifications.php:76 ../../include/nav.php:113
+#: ../../mod/notifications.php:80 ../../include/nav.php:113
 msgid "Network"
 msgstr ""
 
-#: ../../mod/notifications.php:81 ../../mod/network.php:182
+#: ../../mod/notifications.php:85 ../../mod/network.php:182
 msgid "Personal"
 msgstr ""
 
-#: ../../mod/notifications.php:86 ../../view/theme/diabook-blue/theme.php:215
-#: ../../view/theme/diabook/theme.php:221 ../../include/nav.php:77
-#: ../../include/nav.php:115
+#: ../../mod/notifications.php:90
+#: ../../view/theme/diabook/diabook-green/theme.php:229
+#: ../../view/theme/diabook/diabook-red/theme.php:227
+#: ../../view/theme/diabook/diabook-blue/theme.php:227
+#: ../../view/theme/diabook/theme.php:246
+#: ../../view/theme/diabook/diabook-dark/theme.php:229
+#: ../../view/theme/diabook/diabook-aerith/theme.php:229
+#: ../../view/theme/diabook/diabook-pink/theme.php:229
+#: ../../include/nav.php:77 ../../include/nav.php:115
 msgid "Home"
 msgstr ""
 
-#: ../../mod/notifications.php:91 ../../include/nav.php:121
+#: ../../mod/notifications.php:95 ../../include/nav.php:121
 msgid "Introductions"
 msgstr ""
 
-#: ../../mod/notifications.php:96 ../../mod/message.php:103
+#: ../../mod/notifications.php:100 ../../mod/message.php:102
 #: ../../include/nav.php:128
 msgid "Messages"
 msgstr ""
 
-#: ../../mod/notifications.php:115
+#: ../../mod/notifications.php:119
 msgid "Show Ignored Requests"
 msgstr ""
 
-#: ../../mod/notifications.php:115
+#: ../../mod/notifications.php:119
 msgid "Hide Ignored Requests"
 msgstr ""
 
-#: ../../mod/notifications.php:141 ../../mod/notifications.php:187
+#: ../../mod/notifications.php:145 ../../mod/notifications.php:191
 msgid "Notification type: "
 msgstr ""
 
-#: ../../mod/notifications.php:142
+#: ../../mod/notifications.php:146
 msgid "Friend Suggestion"
 msgstr ""
 
-#: ../../mod/notifications.php:144
+#: ../../mod/notifications.php:148
 #, php-format
 msgid "suggested by %s"
 msgstr ""
 
-#: ../../mod/notifications.php:149 ../../mod/notifications.php:196
-#: ../../mod/contacts.php:350
+#: ../../mod/notifications.php:153 ../../mod/notifications.php:200
+#: ../../mod/contacts.php:356
 msgid "Hide this contact from others"
 msgstr ""
 
-#: ../../mod/notifications.php:150 ../../mod/notifications.php:197
+#: ../../mod/notifications.php:154 ../../mod/notifications.php:201
 msgid "Post a new friend activity"
 msgstr ""
 
-#: ../../mod/notifications.php:150 ../../mod/notifications.php:197
+#: ../../mod/notifications.php:154 ../../mod/notifications.php:201
 msgid "if applicable"
 msgstr ""
 
-#: ../../mod/notifications.php:153 ../../mod/notifications.php:200
-#: ../../mod/admin.php:489
+#: ../../mod/notifications.php:157 ../../mod/notifications.php:204
+#: ../../mod/admin.php:575
 msgid "Approve"
 msgstr ""
 
-#: ../../mod/notifications.php:173
+#: ../../mod/notifications.php:177
 msgid "Claims to be known to you: "
 msgstr ""
 
-#: ../../mod/notifications.php:173
+#: ../../mod/notifications.php:177
 msgid "yes"
 msgstr ""
 
-#: ../../mod/notifications.php:173
+#: ../../mod/notifications.php:177
 msgid "no"
 msgstr ""
 
-#: ../../mod/notifications.php:180
+#: ../../mod/notifications.php:184
 msgid "Approve as: "
 msgstr ""
 
-#: ../../mod/notifications.php:181
+#: ../../mod/notifications.php:185
 msgid "Friend"
 msgstr ""
 
-#: ../../mod/notifications.php:182
+#: ../../mod/notifications.php:186
 msgid "Sharer"
 msgstr ""
 
-#: ../../mod/notifications.php:182
+#: ../../mod/notifications.php:186
 msgid "Fan/Admirer"
 msgstr ""
 
-#: ../../mod/notifications.php:188
+#: ../../mod/notifications.php:192
 msgid "Friend/Connect Request"
 msgstr ""
 
-#: ../../mod/notifications.php:188
+#: ../../mod/notifications.php:192
 msgid "New Follower"
 msgstr ""
 
-#: ../../mod/notifications.php:209
+#: ../../mod/notifications.php:213
 msgid "No introductions."
 msgstr ""
 
-#: ../../mod/notifications.php:212 ../../include/nav.php:122
+#: ../../mod/notifications.php:216 ../../include/nav.php:122
 msgid "Notifications"
 msgstr ""
 
-#: ../../mod/notifications.php:249 ../../mod/notifications.php:374
-#: ../../mod/notifications.php:461
+#: ../../mod/notifications.php:253 ../../mod/notifications.php:378
+#: ../../mod/notifications.php:465
 #, php-format
 msgid "%s liked %s's post"
 msgstr ""
 
-#: ../../mod/notifications.php:258 ../../mod/notifications.php:383
-#: ../../mod/notifications.php:470
+#: ../../mod/notifications.php:262 ../../mod/notifications.php:387
+#: ../../mod/notifications.php:474
 #, php-format
 msgid "%s disliked %s's post"
 msgstr ""
 
-#: ../../mod/notifications.php:272 ../../mod/notifications.php:397
-#: ../../mod/notifications.php:484
+#: ../../mod/notifications.php:276 ../../mod/notifications.php:401
+#: ../../mod/notifications.php:488
 #, php-format
 msgid "%s is now friends with %s"
 msgstr ""
 
-#: ../../mod/notifications.php:279 ../../mod/notifications.php:404
+#: ../../mod/notifications.php:283 ../../mod/notifications.php:408
 #, php-format
 msgid "%s created a new post"
 msgstr ""
 
-#: ../../mod/notifications.php:280 ../../mod/notifications.php:405
-#: ../../mod/notifications.php:493
+#: ../../mod/notifications.php:284 ../../mod/notifications.php:409
+#: ../../mod/notifications.php:497
 #, php-format
 msgid "%s commented on %s's post"
 msgstr ""
 
-#: ../../mod/notifications.php:294
+#: ../../mod/notifications.php:298
 msgid "No more network notifications."
 msgstr ""
 
-#: ../../mod/notifications.php:298
+#: ../../mod/notifications.php:302
 msgid "Network Notifications"
 msgstr ""
 
-#: ../../mod/notifications.php:324 ../../mod/notify.php:61
+#: ../../mod/notifications.php:328 ../../mod/notify.php:61
 msgid "No more system notifications."
 msgstr ""
 
-#: ../../mod/notifications.php:328 ../../mod/notify.php:65
+#: ../../mod/notifications.php:332 ../../mod/notify.php:65
 msgid "System Notifications"
 msgstr ""
 
-#: ../../mod/notifications.php:419
+#: ../../mod/notifications.php:423
 msgid "No more personal notifications."
 msgstr ""
 
-#: ../../mod/notifications.php:423
+#: ../../mod/notifications.php:427
 msgid "Personal Notifications"
 msgstr ""
 
-#: ../../mod/notifications.php:500
+#: ../../mod/notifications.php:504
 msgid "No more home notifications."
 msgstr ""
 
-#: ../../mod/notifications.php:504
+#: ../../mod/notifications.php:508
 msgid "Home Notifications"
 msgstr ""
 
@@ -1395,205 +1451,211 @@ msgstr ""
 msgid "Contact has been removed."
 msgstr ""
 
-#: ../../mod/contacts.php:245
+#: ../../mod/contacts.php:251
 #, php-format
 msgid "You are mutual friends with %s"
 msgstr ""
 
-#: ../../mod/contacts.php:249
+#: ../../mod/contacts.php:255
 #, php-format
 msgid "You are sharing with %s"
 msgstr ""
 
-#: ../../mod/contacts.php:254
+#: ../../mod/contacts.php:260
 #, php-format
 msgid "%s is sharing with you"
 msgstr ""
 
-#: ../../mod/contacts.php:271
+#: ../../mod/contacts.php:277
 msgid "Private communications are not available for this contact."
 msgstr ""
 
-#: ../../mod/contacts.php:274
+#: ../../mod/contacts.php:280
 msgid "Never"
 msgstr ""
 
-#: ../../mod/contacts.php:278
+#: ../../mod/contacts.php:284
 msgid "(Update was successful)"
 msgstr ""
 
-#: ../../mod/contacts.php:278
+#: ../../mod/contacts.php:284
 msgid "(Update was not successful)"
 msgstr ""
 
-#: ../../mod/contacts.php:280
+#: ../../mod/contacts.php:286
 msgid "Suggest friends"
 msgstr ""
 
-#: ../../mod/contacts.php:284
+#: ../../mod/contacts.php:290
 #, php-format
 msgid "Network type: %s"
 msgstr ""
 
-#: ../../mod/contacts.php:287
+#: ../../mod/contacts.php:293
 #, php-format
 msgid "%d contact in common"
 msgid_plural "%d contacts in common"
 msgstr[0] ""
 msgstr[1] ""
 
-#: ../../mod/contacts.php:292
+#: ../../mod/contacts.php:298
 msgid "View all contacts"
 msgstr ""
 
-#: ../../mod/contacts.php:297 ../../mod/contacts.php:344
-#: ../../mod/admin.php:493
+#: ../../mod/contacts.php:303 ../../mod/contacts.php:350
+#: ../../mod/admin.php:579
 msgid "Unblock"
 msgstr ""
 
-#: ../../mod/contacts.php:297 ../../mod/contacts.php:344
-#: ../../mod/admin.php:492
+#: ../../mod/contacts.php:303 ../../mod/contacts.php:350
+#: ../../mod/admin.php:578
 msgid "Block"
 msgstr ""
 
-#: ../../mod/contacts.php:302 ../../mod/contacts.php:345
+#: ../../mod/contacts.php:308 ../../mod/contacts.php:351
 msgid "Unignore"
 msgstr ""
 
-#: ../../mod/contacts.php:307
+#: ../../mod/contacts.php:313
 msgid "Repair"
 msgstr ""
 
-#: ../../mod/contacts.php:317
+#: ../../mod/contacts.php:323
 msgid "Contact Editor"
 msgstr ""
 
-#: ../../mod/contacts.php:320
+#: ../../mod/contacts.php:326
 msgid "Profile Visibility"
 msgstr ""
 
-#: ../../mod/contacts.php:321
+#: ../../mod/contacts.php:327
 #, php-format
 msgid ""
 "Please choose the profile you would like to display to %s when viewing your "
 "profile securely."
 msgstr ""
 
-#: ../../mod/contacts.php:322
+#: ../../mod/contacts.php:328
 msgid "Contact Information / Notes"
 msgstr ""
 
-#: ../../mod/contacts.php:323
+#: ../../mod/contacts.php:329
 msgid "Edit contact notes"
 msgstr ""
 
-#: ../../mod/contacts.php:328 ../../mod/contacts.php:501
-#: ../../mod/viewcontacts.php:62
+#: ../../mod/contacts.php:334 ../../mod/contacts.php:507
+#: ../../mod/viewcontacts.php:62 ../../mod/nogroup.php:40
 #, php-format
 msgid "Visit %s's profile [%s]"
 msgstr ""
 
-#: ../../mod/contacts.php:329
+#: ../../mod/contacts.php:335
 msgid "Block/Unblock contact"
 msgstr ""
 
-#: ../../mod/contacts.php:330
+#: ../../mod/contacts.php:336
 msgid "Ignore contact"
 msgstr ""
 
-#: ../../mod/contacts.php:331
+#: ../../mod/contacts.php:337
 msgid "Repair URL settings"
 msgstr ""
 
-#: ../../mod/contacts.php:332
+#: ../../mod/contacts.php:338
 msgid "View conversations"
 msgstr ""
 
-#: ../../mod/contacts.php:334
+#: ../../mod/contacts.php:340
 msgid "Delete contact"
 msgstr ""
 
-#: ../../mod/contacts.php:338
+#: ../../mod/contacts.php:344
 msgid "Last update:"
 msgstr ""
 
-#: ../../mod/contacts.php:339
+#: ../../mod/contacts.php:345
 msgid "Update public posts"
 msgstr ""
 
-#: ../../mod/contacts.php:341 ../../mod/admin.php:914
+#: ../../mod/contacts.php:347 ../../mod/admin.php:1051
 msgid "Update now"
 msgstr ""
 
-#: ../../mod/contacts.php:348
+#: ../../mod/contacts.php:354
 msgid "Currently blocked"
 msgstr ""
 
-#: ../../mod/contacts.php:349
+#: ../../mod/contacts.php:355
 msgid "Currently ignored"
 msgstr ""
 
-#: ../../mod/contacts.php:350
+#: ../../mod/contacts.php:356
 msgid ""
 "Replies/likes to your public posts <strong>may</strong> still be visible"
 msgstr ""
 
-#: ../../mod/contacts.php:399
+#: ../../mod/contacts.php:405
 msgid "Suggestions"
 msgstr ""
 
-#: ../../mod/contacts.php:404 ../../mod/group.php:191
+#: ../../mod/contacts.php:410 ../../mod/group.php:191
 msgid "All Contacts"
 msgstr ""
 
-#: ../../mod/contacts.php:409
+#: ../../mod/contacts.php:415
 msgid "Unblocked Contacts"
 msgstr ""
 
-#: ../../mod/contacts.php:415
+#: ../../mod/contacts.php:421
 msgid "Blocked Contacts"
 msgstr ""
 
-#: ../../mod/contacts.php:421
+#: ../../mod/contacts.php:427
 msgid "Ignored Contacts"
 msgstr ""
 
-#: ../../mod/contacts.php:427
+#: ../../mod/contacts.php:433
 msgid "Hidden Contacts"
 msgstr ""
 
-#: ../../mod/contacts.php:477
+#: ../../mod/contacts.php:483
 msgid "Mutual Friendship"
 msgstr ""
 
-#: ../../mod/contacts.php:481
+#: ../../mod/contacts.php:487
 msgid "is a fan of yours"
 msgstr ""
 
-#: ../../mod/contacts.php:485
+#: ../../mod/contacts.php:491
 msgid "you are a fan of"
 msgstr ""
 
-#: ../../mod/contacts.php:502 ../../include/Contact.php:141
-#: ../../include/conversation.php:817
+#: ../../mod/contacts.php:508 ../../mod/nogroup.php:41
 msgid "Edit contact"
 msgstr ""
 
-#: ../../mod/contacts.php:523 ../../view/theme/diabook-blue/theme.php:217
-#: ../../view/theme/diabook/theme.php:223 ../../include/nav.php:139
+#: ../../mod/contacts.php:529
+#: ../../view/theme/diabook/diabook-green/theme.php:231
+#: ../../view/theme/diabook/diabook-red/theme.php:229
+#: ../../view/theme/diabook/diabook-blue/theme.php:229
+#: ../../view/theme/diabook/theme.php:248
+#: ../../view/theme/diabook/diabook-dark/theme.php:231
+#: ../../view/theme/diabook/diabook-aerith/theme.php:231
+#: ../../view/theme/diabook/diabook-pink/theme.php:231
+#: ../../include/nav.php:139
 msgid "Contacts"
 msgstr ""
 
-#: ../../mod/contacts.php:527
+#: ../../mod/contacts.php:533
 msgid "Search your contacts"
 msgstr ""
 
-#: ../../mod/contacts.php:528 ../../mod/directory.php:57
+#: ../../mod/contacts.php:534 ../../mod/directory.php:57
 msgid "Finding: "
 msgstr ""
 
-#: ../../mod/contacts.php:529 ../../mod/directory.php:59
-#: ../../include/contact_widgets.php:32
+#: ../../mod/contacts.php:535 ../../mod/directory.php:59
+#: ../../include/contact_widgets.php:33
 msgid "Find"
 msgstr ""
 
@@ -1611,9 +1673,11 @@ msgid "Password reset requested at %s"
 msgstr ""
 
 #: ../../mod/lostpass.php:45 ../../mod/lostpass.php:107
-#: ../../mod/register.php:390 ../../mod/register.php:444
+#: ../../mod/register.php:388 ../../mod/register.php:442
 #: ../../mod/regmod.php:54 ../../mod/dfrn_confirm.php:732
-#: ../../addon/facebook/facebook.php:601 ../../include/items.php:2650
+#: ../../addon/facebook/facebook.php:650
+#: ../../addon/facebook/facebook.php:1136
+#: ../../addon/testdrive/testdrive.php:58 ../../include/items.php:2700
 msgid "Administrator"
 msgstr ""
 
@@ -1623,7 +1687,7 @@ msgid ""
 "Password reset failed."
 msgstr ""
 
-#: ../../mod/lostpass.php:83 ../../boot.php:773
+#: ../../mod/lostpass.php:83 ../../boot.php:809
 msgid "Password Reset"
 msgstr ""
 
@@ -1667,456 +1731,491 @@ msgstr ""
 msgid "Reset"
 msgstr ""
 
-#: ../../mod/settings.php:76
+#: ../../mod/settings.php:49 ../../include/nav.php:137
+msgid "Account settings"
+msgstr ""
+
+#: ../../mod/settings.php:54
+msgid "Display settings"
+msgstr ""
+
+#: ../../mod/settings.php:60
+msgid "Connector settings"
+msgstr ""
+
+#: ../../mod/settings.php:65
+msgid "Plugin settings"
+msgstr ""
+
+#: ../../mod/settings.php:70
+msgid "Connected apps"
+msgstr ""
+
+#: ../../mod/settings.php:75
+msgid "Export personal data"
+msgstr ""
+
+#: ../../mod/settings.php:83 ../../mod/admin.php:665 ../../mod/admin.php:870
+#: ../../addon/mathjax/mathjax.php:36 ../../include/nav.php:137
+msgid "Settings"
+msgstr ""
+
+#: ../../mod/settings.php:126
 msgid "Missing some important data!"
 msgstr ""
 
-#: ../../mod/settings.php:79 ../../mod/settings.php:505 ../../mod/admin.php:75
+#: ../../mod/settings.php:129 ../../mod/settings.php:558
+#: ../../mod/admin.php:97
 msgid "Update"
 msgstr ""
 
-#: ../../mod/settings.php:184
+#: ../../mod/settings.php:234
 msgid "Failed to connect with email account using the settings provided."
 msgstr ""
 
-#: ../../mod/settings.php:189
+#: ../../mod/settings.php:239
 msgid "Email settings updated."
 msgstr ""
 
-#: ../../mod/settings.php:208
+#: ../../mod/settings.php:298
 msgid "Passwords do not match. Password unchanged."
 msgstr ""
 
-#: ../../mod/settings.php:213
+#: ../../mod/settings.php:303
 msgid "Empty passwords are not allowed. Password unchanged."
 msgstr ""
 
-#: ../../mod/settings.php:224
+#: ../../mod/settings.php:314
 msgid "Password changed."
 msgstr ""
 
-#: ../../mod/settings.php:226
+#: ../../mod/settings.php:316
 msgid "Password update failed. Please try again."
 msgstr ""
 
-#: ../../mod/settings.php:294
+#: ../../mod/settings.php:379
 msgid " Please use a shorter name."
 msgstr ""
 
-#: ../../mod/settings.php:296
+#: ../../mod/settings.php:381
 msgid " Name too short."
 msgstr ""
 
-#: ../../mod/settings.php:302
+#: ../../mod/settings.php:387
 msgid " Not valid email."
 msgstr ""
 
-#: ../../mod/settings.php:304
+#: ../../mod/settings.php:389
 msgid " Cannot change to that email."
 msgstr ""
 
-#: ../../mod/settings.php:375 ../../addon/facebook/facebook.php:441
-#: ../../addon/impressum/impressum.php:64
+#: ../../mod/settings.php:461 ../../addon/facebook/facebook.php:469
+#: ../../addon/impressum/impressum.php:75
 #: ../../addon/openstreetmap/openstreetmap.php:80
-#: ../../addon/piwik/piwik.php:105 ../../addon/twitter/twitter.php:350
+#: ../../addon/mathjax/mathjax.php:66 ../../addon/piwik/piwik.php:105
+#: ../../addon/twitter/twitter.php:370
 msgid "Settings updated."
 msgstr ""
 
-#: ../../mod/settings.php:439 ../../include/nav.php:137
-msgid "Account settings"
-msgstr ""
-
-#: ../../mod/settings.php:444
-msgid "Connector settings"
-msgstr ""
-
-#: ../../mod/settings.php:449
-msgid "Plugin settings"
-msgstr ""
-
-#: ../../mod/settings.php:454
-msgid "Connections"
-msgstr ""
-
-#: ../../mod/settings.php:459
-msgid "Export personal data"
-msgstr ""
-
-#: ../../mod/settings.php:477 ../../mod/settings.php:504
-#: ../../mod/settings.php:540
+#: ../../mod/settings.php:531 ../../mod/settings.php:557
+#: ../../mod/settings.php:593
 msgid "Add application"
 msgstr ""
 
-#: ../../mod/settings.php:481 ../../mod/settings.php:508
-#: ../../addon/statusnet/statusnet.php:526
+#: ../../mod/settings.php:535 ../../mod/settings.php:561
+#: ../../addon/statusnet/statusnet.php:547
 msgid "Consumer Key"
 msgstr ""
 
-#: ../../mod/settings.php:482 ../../mod/settings.php:509
-#: ../../addon/statusnet/statusnet.php:525
+#: ../../mod/settings.php:536 ../../mod/settings.php:562
+#: ../../addon/statusnet/statusnet.php:546
 msgid "Consumer Secret"
 msgstr ""
 
-#: ../../mod/settings.php:483 ../../mod/settings.php:510
+#: ../../mod/settings.php:537 ../../mod/settings.php:563
 msgid "Redirect"
 msgstr ""
 
-#: ../../mod/settings.php:484 ../../mod/settings.php:511
+#: ../../mod/settings.php:538 ../../mod/settings.php:564
 msgid "Icon url"
 msgstr ""
 
-#: ../../mod/settings.php:495
+#: ../../mod/settings.php:549
 msgid "You can't edit this application."
 msgstr ""
 
-#: ../../mod/settings.php:539
+#: ../../mod/settings.php:592
 msgid "Connected Apps"
 msgstr ""
 
-#: ../../mod/settings.php:543
+#: ../../mod/settings.php:596
 msgid "Client key starts with"
 msgstr ""
 
-#: ../../mod/settings.php:544
+#: ../../mod/settings.php:597
 msgid "No name"
 msgstr ""
 
-#: ../../mod/settings.php:545
+#: ../../mod/settings.php:598
 msgid "Remove authorization"
 msgstr ""
 
-#: ../../mod/settings.php:557
+#: ../../mod/settings.php:609
 msgid "No Plugin settings configured"
 msgstr ""
 
-#: ../../mod/settings.php:565 ../../addon/widgets/widgets.php:123
+#: ../../mod/settings.php:617 ../../addon/widgets/widgets.php:123
 msgid "Plugin Settings"
 msgstr ""
 
-#: ../../mod/settings.php:578 ../../mod/settings.php:579
+#: ../../mod/settings.php:629 ../../mod/settings.php:630
 #, php-format
 msgid "Built-in support for %s connectivity is %s"
 msgstr ""
 
-#: ../../mod/settings.php:578 ../../mod/settings.php:579
+#: ../../mod/settings.php:629 ../../mod/settings.php:630
 msgid "enabled"
 msgstr ""
 
-#: ../../mod/settings.php:578 ../../mod/settings.php:579
+#: ../../mod/settings.php:629 ../../mod/settings.php:630
 msgid "disabled"
 msgstr ""
 
-#: ../../mod/settings.php:579
+#: ../../mod/settings.php:630
 msgid "StatusNet"
 msgstr ""
 
-#: ../../mod/settings.php:609
+#: ../../mod/settings.php:660
 msgid "Connector Settings"
 msgstr ""
 
-#: ../../mod/settings.php:615
+#: ../../mod/settings.php:665
 msgid "Email/Mailbox Setup"
 msgstr ""
 
-#: ../../mod/settings.php:616
+#: ../../mod/settings.php:666
 msgid ""
 "If you wish to communicate with email contacts using this service "
 "(optional), please specify how to connect to your mailbox."
 msgstr ""
 
-#: ../../mod/settings.php:617
+#: ../../mod/settings.php:667
 msgid "Last successful email check:"
 msgstr ""
 
-#: ../../mod/settings.php:618
+#: ../../mod/settings.php:668
 msgid "Email access is disabled on this site."
 msgstr ""
 
-#: ../../mod/settings.php:619
+#: ../../mod/settings.php:669
 msgid "IMAP server name:"
 msgstr ""
 
-#: ../../mod/settings.php:620
+#: ../../mod/settings.php:670
 msgid "IMAP port:"
 msgstr ""
 
-#: ../../mod/settings.php:621
+#: ../../mod/settings.php:671
 msgid "Security:"
 msgstr ""
 
-#: ../../mod/settings.php:621 ../../mod/settings.php:626
+#: ../../mod/settings.php:671 ../../mod/settings.php:676
 msgid "None"
 msgstr ""
 
-#: ../../mod/settings.php:622
+#: ../../mod/settings.php:672
 msgid "Email login name:"
 msgstr ""
 
-#: ../../mod/settings.php:623
+#: ../../mod/settings.php:673
 msgid "Email password:"
 msgstr ""
 
-#: ../../mod/settings.php:624
+#: ../../mod/settings.php:674
 msgid "Reply-to address:"
 msgstr ""
 
-#: ../../mod/settings.php:625
+#: ../../mod/settings.php:675
 msgid "Send public posts to all email contacts:"
 msgstr ""
 
-#: ../../mod/settings.php:626
+#: ../../mod/settings.php:676
 msgid "Action after import:"
 msgstr ""
 
-#: ../../mod/settings.php:626
+#: ../../mod/settings.php:676
 msgid "Mark as seen"
 msgstr ""
 
-#: ../../mod/settings.php:626
+#: ../../mod/settings.php:676
 msgid "Move to folder"
 msgstr ""
 
-#: ../../mod/settings.php:627
+#: ../../mod/settings.php:677
 msgid "Move to folder:"
 msgstr ""
 
-#: ../../mod/settings.php:688 ../../mod/admin.php:142 ../../mod/admin.php:465
+#: ../../mod/settings.php:737
+msgid "Display Settings"
+msgstr ""
+
+#: ../../mod/settings.php:743
+msgid "Display Theme:"
+msgstr ""
+
+#: ../../mod/settings.php:744
+msgid "Update browser every xx seconds"
+msgstr ""
+
+#: ../../mod/settings.php:744
+msgid "Minimum of 10 seconds, no maximum"
+msgstr ""
+
+#: ../../mod/settings.php:745
+msgid "Number of items to display on the network page:"
+msgstr ""
+
+#: ../../mod/settings.php:745
+msgid "Maximum of 100 items"
+msgstr ""
+
+#: ../../mod/settings.php:746
+msgid "Don't show emoticons"
+msgstr ""
+
+#: ../../mod/settings.php:811 ../../mod/admin.php:173 ../../mod/admin.php:551
 msgid "Normal Account"
 msgstr ""
 
-#: ../../mod/settings.php:689
+#: ../../mod/settings.php:812
 msgid "This account is a normal personal profile"
 msgstr ""
 
-#: ../../mod/settings.php:692 ../../mod/admin.php:143 ../../mod/admin.php:466
+#: ../../mod/settings.php:815 ../../mod/admin.php:174 ../../mod/admin.php:552
 msgid "Soapbox Account"
 msgstr ""
 
-#: ../../mod/settings.php:693
+#: ../../mod/settings.php:816
 msgid "Automatically approve all connection/friend requests as read-only fans"
 msgstr ""
 
-#: ../../mod/settings.php:696 ../../mod/admin.php:144 ../../mod/admin.php:467
+#: ../../mod/settings.php:819 ../../mod/admin.php:175 ../../mod/admin.php:553
 msgid "Community/Celebrity Account"
 msgstr ""
 
-#: ../../mod/settings.php:697
+#: ../../mod/settings.php:820
 msgid "Automatically approve all connection/friend requests as read-write fans"
 msgstr ""
 
-#: ../../mod/settings.php:700 ../../mod/admin.php:145 ../../mod/admin.php:468
+#: ../../mod/settings.php:823 ../../mod/admin.php:176 ../../mod/admin.php:554
 msgid "Automatic Friend Account"
 msgstr ""
 
-#: ../../mod/settings.php:701
+#: ../../mod/settings.php:824
 msgid "Automatically approve all connection/friend requests as friends"
 msgstr ""
 
-#: ../../mod/settings.php:711
+#: ../../mod/settings.php:834
 msgid "OpenID:"
 msgstr ""
 
-#: ../../mod/settings.php:711
+#: ../../mod/settings.php:834
 msgid "(Optional) Allow this OpenID to login to this account."
 msgstr ""
 
-#: ../../mod/settings.php:721
+#: ../../mod/settings.php:844
 msgid "Publish your default profile in your local site directory?"
 msgstr ""
 
-#: ../../mod/settings.php:727
+#: ../../mod/settings.php:850
 msgid "Publish your default profile in the global social directory?"
 msgstr ""
 
-#: ../../mod/settings.php:735
+#: ../../mod/settings.php:858
 msgid "Hide your contact/friend list from viewers of your default profile?"
 msgstr ""
 
-#: ../../mod/settings.php:739
+#: ../../mod/settings.php:862
 msgid "Hide your profile details from unknown viewers?"
 msgstr ""
 
-#: ../../mod/settings.php:744
+#: ../../mod/settings.php:867
 msgid "Allow friends to post to your profile page?"
 msgstr ""
 
-#: ../../mod/settings.php:750
+#: ../../mod/settings.php:873
 msgid "Allow friends to tag your posts?"
 msgstr ""
 
-#: ../../mod/settings.php:756
+#: ../../mod/settings.php:879
 msgid "Allow us to suggest you as a potential friend to new members?"
 msgstr ""
 
-#: ../../mod/settings.php:765
+#: ../../mod/settings.php:885
+msgid "Permit unknown people to send you private mail?"
+msgstr ""
+
+#: ../../mod/settings.php:896
 msgid "Profile is <strong>not published</strong>."
 msgstr ""
 
-#: ../../mod/settings.php:797 ../../mod/profile_photo.php:211
+#: ../../mod/settings.php:902 ../../mod/profile_photo.php:211
 msgid "or"
 msgstr ""
 
-#: ../../mod/settings.php:802
+#: ../../mod/settings.php:907
 msgid "Your Identity Address is"
 msgstr ""
 
-#: ../../mod/settings.php:813
+#: ../../mod/settings.php:918
 msgid "Automatically expire posts after this many days:"
 msgstr ""
 
-#: ../../mod/settings.php:813
+#: ../../mod/settings.php:918
 msgid "If empty, posts will not expire. Expired posts will be deleted"
 msgstr ""
 
-#: ../../mod/settings.php:814
+#: ../../mod/settings.php:919
 msgid "Advanced expiration settings"
 msgstr ""
 
-#: ../../mod/settings.php:815
+#: ../../mod/settings.php:920
 msgid "Advanced Expiration"
 msgstr ""
 
-#: ../../mod/settings.php:816
+#: ../../mod/settings.php:921
 msgid "Expire posts:"
 msgstr ""
 
-#: ../../mod/settings.php:817
+#: ../../mod/settings.php:922
 msgid "Expire personal notes:"
 msgstr ""
 
-#: ../../mod/settings.php:818
+#: ../../mod/settings.php:923
 msgid "Expire starred posts:"
 msgstr ""
 
-#: ../../mod/settings.php:819
+#: ../../mod/settings.php:924
 msgid "Expire photos:"
 msgstr ""
 
-#: ../../mod/settings.php:824
+#: ../../mod/settings.php:928
 msgid "Account Settings"
 msgstr ""
 
-#: ../../mod/settings.php:833
+#: ../../mod/settings.php:937
 msgid "Password Settings"
 msgstr ""
 
-#: ../../mod/settings.php:834
+#: ../../mod/settings.php:938
 msgid "New Password:"
 msgstr ""
 
-#: ../../mod/settings.php:835
+#: ../../mod/settings.php:939
 msgid "Confirm:"
 msgstr ""
 
-#: ../../mod/settings.php:835
+#: ../../mod/settings.php:939
 msgid "Leave password fields blank unless changing"
 msgstr ""
 
-#: ../../mod/settings.php:839
+#: ../../mod/settings.php:943
 msgid "Basic Settings"
 msgstr ""
 
-#: ../../mod/settings.php:840 ../../include/profile_advanced.php:15
+#: ../../mod/settings.php:944 ../../include/profile_advanced.php:15
 msgid "Full Name:"
 msgstr ""
 
-#: ../../mod/settings.php:841
+#: ../../mod/settings.php:945
 msgid "Email Address:"
 msgstr ""
 
-#: ../../mod/settings.php:842
+#: ../../mod/settings.php:946
 msgid "Your Timezone:"
 msgstr ""
 
-#: ../../mod/settings.php:843
+#: ../../mod/settings.php:947
 msgid "Default Post Location:"
 msgstr ""
 
-#: ../../mod/settings.php:844
+#: ../../mod/settings.php:948
 msgid "Use Browser Location:"
 msgstr ""
 
-#: ../../mod/settings.php:845
-msgid "Display Theme:"
-msgstr ""
-
-#: ../../mod/settings.php:846
-msgid "Update browser every xx seconds"
-msgstr ""
-
-#: ../../mod/settings.php:846
-msgid "Minimum of 10 seconds, no maximum"
+#: ../../mod/settings.php:951
+msgid "Security and Privacy Settings"
 msgstr ""
 
-#: ../../mod/settings.php:847
-msgid "Number of items to display on the network page:"
+#: ../../mod/settings.php:953
+msgid "Maximum Friend Requests/Day:"
 msgstr ""
 
-#: ../../mod/settings.php:847
-msgid "Maximum of 100 items"
+#: ../../mod/settings.php:953 ../../mod/settings.php:968
+msgid "(to prevent spam abuse)"
 msgstr ""
 
-#: ../../mod/settings.php:848
-msgid "Don't show emoticons"
+#: ../../mod/settings.php:954
+msgid "Default Post Permissions"
 msgstr ""
 
-#: ../../mod/settings.php:850
-msgid "Security and Privacy Settings"
+#: ../../mod/settings.php:955
+msgid "(click to open/close)"
 msgstr ""
 
-#: ../../mod/settings.php:852
-msgid "Maximum Friend Requests/Day:"
+#: ../../mod/settings.php:968
+msgid "Maximum private messages per day from unknown people:"
 msgstr ""
 
-#: ../../mod/settings.php:852
-msgid "(to prevent spam abuse)"
+#: ../../mod/settings.php:971
+msgid "Notification Settings"
 msgstr ""
 
-#: ../../mod/settings.php:853
-msgid "Default Post Permissions"
+#: ../../mod/settings.php:972
+msgid "By default post a status message when:"
 msgstr ""
 
-#: ../../mod/settings.php:854
-msgid "(click to open/close)"
+#: ../../mod/settings.php:973
+msgid "accepting a friend request"
 msgstr ""
 
-#: ../../mod/settings.php:869
-msgid "Notification Settings"
+#: ../../mod/settings.php:974
+msgid "making an <em>interesting</em> profile change"
 msgstr ""
 
-#: ../../mod/settings.php:870
+#: ../../mod/settings.php:975
 msgid "Send a notification email when:"
 msgstr ""
 
-#: ../../mod/settings.php:871
+#: ../../mod/settings.php:976
 msgid "You receive an introduction"
 msgstr ""
 
-#: ../../mod/settings.php:872
+#: ../../mod/settings.php:977
 msgid "Your introductions are confirmed"
 msgstr ""
 
-#: ../../mod/settings.php:873
+#: ../../mod/settings.php:978
 msgid "Someone writes on your profile wall"
 msgstr ""
 
-#: ../../mod/settings.php:874
+#: ../../mod/settings.php:979
 msgid "Someone writes a followup comment"
 msgstr ""
 
-#: ../../mod/settings.php:875
+#: ../../mod/settings.php:980
 msgid "You receive a private message"
 msgstr ""
 
-#: ../../mod/settings.php:876
+#: ../../mod/settings.php:981
 msgid "You receive a friend suggestion"
 msgstr ""
 
-#: ../../mod/settings.php:877
+#: ../../mod/settings.php:982
 msgid "You are tagged in a post"
 msgstr ""
 
-#: ../../mod/settings.php:880
+#: ../../mod/settings.php:985
 msgid "Advanced Page Settings"
 msgstr ""
 
@@ -2146,7 +2245,7 @@ msgstr ""
 msgid "Saved Searches"
 msgstr ""
 
-#: ../../mod/network.php:92 ../../include/group.php:216
+#: ../../mod/network.php:92 ../../include/group.php:217
 msgid "add"
 msgstr ""
 
@@ -2170,7 +2269,7 @@ msgstr ""
 msgid "Shared Links"
 msgstr ""
 
-#: ../../mod/network.php:270
+#: ../../mod/network.php:274
 #, php-format
 msgid "Warning: This group contains %s member from an insecure network."
 msgid_plural ""
@@ -2178,42 +2277,103 @@ msgid_plural ""
 msgstr[0] ""
 msgstr[1] ""
 
-#: ../../mod/network.php:273
+#: ../../mod/network.php:277
 msgid "Private messages to this group are at risk of public disclosure."
 msgstr ""
 
-#: ../../mod/network.php:318
+#: ../../mod/network.php:322
 msgid "No such group"
 msgstr ""
 
-#: ../../mod/network.php:329
+#: ../../mod/network.php:333
 msgid "Group is empty"
 msgstr ""
 
-#: ../../mod/network.php:333
+#: ../../mod/network.php:337
 msgid "Group: "
 msgstr ""
 
-#: ../../mod/network.php:343
+#: ../../mod/network.php:347
 msgid "Contact: "
 msgstr ""
 
-#: ../../mod/network.php:345
+#: ../../mod/network.php:349
 msgid "Private messages to this person are at risk of public disclosure."
 msgstr ""
 
-#: ../../mod/network.php:350
+#: ../../mod/network.php:354
 msgid "Invalid contact."
 msgstr ""
 
-#: ../../mod/notes.php:44 ../../boot.php:1404
+#: ../../mod/notes.php:44 ../../boot.php:1476
 msgid "Personal Notes"
 msgstr ""
 
-#: ../../mod/notes.php:63 ../../mod/filer.php:29 ../../include/text.php:647
+#: ../../mod/notes.php:63 ../../mod/filer.php:30
+#: ../../addon/facebook/facebook.php:715 ../../include/text.php:652
 msgid "Save"
 msgstr ""
 
+#: ../../mod/wallmessage.php:42 ../../mod/wallmessage.php:112
+#, php-format
+msgid "Number of daily wall messages for %s exceeded. Message failed."
+msgstr ""
+
+#: ../../mod/wallmessage.php:56 ../../mod/message.php:59
+msgid "No recipient selected."
+msgstr ""
+
+#: ../../mod/wallmessage.php:59
+msgid "Unable to check your home location."
+msgstr ""
+
+#: ../../mod/wallmessage.php:62 ../../mod/message.php:66
+msgid "Message could not be sent."
+msgstr ""
+
+#: ../../mod/wallmessage.php:65 ../../mod/message.php:69
+msgid "Message collection failure."
+msgstr ""
+
+#: ../../mod/wallmessage.php:68 ../../mod/message.php:72
+msgid "Message sent."
+msgstr ""
+
+#: ../../mod/wallmessage.php:86 ../../mod/wallmessage.php:95
+msgid "No recipient."
+msgstr ""
+
+#: ../../mod/wallmessage.php:124 ../../mod/message.php:169
+#: ../../include/conversation.php:910
+msgid "Please enter a link URL:"
+msgstr ""
+
+#: ../../mod/wallmessage.php:131 ../../mod/message.php:177
+msgid "Send Private Message"
+msgstr ""
+
+#: ../../mod/wallmessage.php:132
+#, php-format
+msgid ""
+"If you wish for %s to respond, please check that the privacy settings on "
+"your site allow private mail from unknown senders."
+msgstr ""
+
+#: ../../mod/wallmessage.php:133 ../../mod/message.php:178
+#: ../../mod/message.php:347
+msgid "To:"
+msgstr ""
+
+#: ../../mod/wallmessage.php:134 ../../mod/message.php:179
+#: ../../mod/message.php:348
+msgid "Subject:"
+msgstr ""
+
+#: ../../mod/wallmessage.php:140 ../../mod/message.php:183
+#: ../../mod/message.php:351 ../../mod/invite.php:113
+msgid "Your message:"
+msgstr ""
+
 #: ../../mod/newmember.php:6
 msgid "Welcome to Friendica"
 msgstr ""
@@ -2232,12 +2392,19 @@ msgstr ""
 
 #: ../../mod/newmember.php:16
 msgid ""
+"On your <em>Quick Start</em> page - find a brief introduction to your "
+"profile and network tabs, connect to Facebook, make some new connections, "
+"and find some groups to join."
+msgstr ""
+
+#: ../../mod/newmember.php:18
+msgid ""
 "On your <em>Settings</em> page -  change your initial password. Also make a "
 "note of your Identity Address. This looks just like an email address - and "
 "will be useful in making friends on the free social web."
 msgstr ""
 
-#: ../../mod/newmember.php:18
+#: ../../mod/newmember.php:20
 msgid ""
 "Review the other settings, particularly the privacy settings. An unpublished "
 "directory listing is like having an unlisted phone number. In general, you "
@@ -2245,61 +2412,61 @@ msgid ""
 "potential friends know exactly how to find you."
 msgstr ""
 
-#: ../../mod/newmember.php:20
+#: ../../mod/newmember.php:22
 msgid ""
 "Upload a profile photo if you have not done so already. Studies have shown "
 "that people with real photos of themselves are ten times more likely to make "
 "friends than people who do not."
 msgstr ""
 
-#: ../../mod/newmember.php:23
+#: ../../mod/newmember.php:25
 msgid ""
 "Authorise the Facebook Connector if you currently have a Facebook account "
 "and we will (optionally) import all your Facebook friends and conversations."
 msgstr ""
 
-#: ../../mod/newmember.php:25
+#: ../../mod/newmember.php:27
 msgid ""
 "<em>If</em> this is your own personal server, installing the Facebook addon "
 "may ease your transition to the free social web."
 msgstr ""
 
-#: ../../mod/newmember.php:30
+#: ../../mod/newmember.php:32
 msgid ""
 "Enter your email access information on your Connector Settings page if you "
 "wish to import and interact with friends or mailing lists from your email "
 "INBOX"
 msgstr ""
 
-#: ../../mod/newmember.php:32
+#: ../../mod/newmember.php:34
 msgid ""
 "Edit your <strong>default</strong> profile to your liking. Review the "
 "settings for hiding your list of friends and hiding the profile from unknown "
 "visitors."
 msgstr ""
 
-#: ../../mod/newmember.php:34
+#: ../../mod/newmember.php:36
 msgid ""
 "Set some public keywords for your default profile which describe your "
 "interests. We may be able to find other people with similar interests and "
 "suggest friendships."
 msgstr ""
 
-#: ../../mod/newmember.php:36
+#: ../../mod/newmember.php:38
 msgid ""
 "Your Contacts page is your gateway to managing friendships and connecting "
 "with friends on other networks. Typically you enter their address or site "
 "URL in the <em>Add New Contact</em> dialog."
 msgstr ""
 
-#: ../../mod/newmember.php:38
+#: ../../mod/newmember.php:40
 msgid ""
 "The Directory page lets you find other people in this network or other "
 "federated sites. Look for a <em>Connect</em> or <em>Follow</em> link on "
 "their profile page. Provide your own Identity Address if requested."
 msgstr ""
 
-#: ../../mod/newmember.php:40
+#: ../../mod/newmember.php:42
 msgid ""
 "On the side panel of the Contacts page are several tools to find new "
 "friends. We can match people by interest, look up people by name or "
@@ -2308,14 +2475,14 @@ msgid ""
 "hours."
 msgstr ""
 
-#: ../../mod/newmember.php:42
+#: ../../mod/newmember.php:44
 msgid ""
 "Once you have made some friends, organize them into private conversation "
 "groups from the sidebar of your Contacts page and then you can interact with "
 "each group privately on your Network page."
 msgstr ""
 
-#: ../../mod/newmember.php:44
+#: ../../mod/newmember.php:46
 msgid ""
 "Our <strong>help</strong> pages may be consulted for detail on other program "
 "features and resources."
@@ -2345,7 +2512,7 @@ msgstr ""
 msgid "Group name changed."
 msgstr ""
 
-#: ../../mod/group.php:72 ../../mod/profperm.php:19 ../../index.php:290
+#: ../../mod/group.php:72 ../../mod/profperm.php:19 ../../index.php:308
 msgid "Permission denied"
 msgstr ""
 
@@ -2385,10 +2552,16 @@ msgstr ""
 msgid "Profile Visibility Editor"
 msgstr ""
 
-#: ../../mod/profperm.php:103 ../../view/theme/diabook-blue/theme.php:216
-#: ../../view/theme/diabook/theme.php:222 ../../include/profile_advanced.php:7
-#: ../../include/profile_advanced.php:76 ../../include/nav.php:50
-#: ../../boot.php:1386
+#: ../../mod/profperm.php:103
+#: ../../view/theme/diabook/diabook-green/theme.php:230
+#: ../../view/theme/diabook/diabook-red/theme.php:228
+#: ../../view/theme/diabook/diabook-blue/theme.php:228
+#: ../../view/theme/diabook/theme.php:247
+#: ../../view/theme/diabook/diabook-dark/theme.php:230
+#: ../../view/theme/diabook/diabook-aerith/theme.php:230
+#: ../../view/theme/diabook/diabook-pink/theme.php:230
+#: ../../include/profile_advanced.php:7 ../../include/profile_advanced.php:74
+#: ../../include/nav.php:50 ../../boot.php:1458
 msgid "Profile"
 msgstr ""
 
@@ -2404,163 +2577,163 @@ msgstr ""
 msgid "No contacts."
 msgstr ""
 
-#: ../../mod/viewcontacts.php:76 ../../include/text.php:584
+#: ../../mod/viewcontacts.php:76 ../../include/text.php:589
 msgid "View Contacts"
 msgstr ""
 
-#: ../../mod/register.php:62
+#: ../../mod/register.php:64
 msgid "An invitation is required."
 msgstr ""
 
-#: ../../mod/register.php:67
+#: ../../mod/register.php:69
 msgid "Invitation could not be verified."
 msgstr ""
 
-#: ../../mod/register.php:75
+#: ../../mod/register.php:77
 msgid "Invalid OpenID url"
 msgstr ""
 
-#: ../../mod/register.php:90
+#: ../../mod/register.php:92
 msgid "Please enter the required information."
 msgstr ""
 
-#: ../../mod/register.php:104
+#: ../../mod/register.php:106
 msgid "Please use a shorter name."
 msgstr ""
 
-#: ../../mod/register.php:106
+#: ../../mod/register.php:108
 msgid "Name too short."
 msgstr ""
 
-#: ../../mod/register.php:121
+#: ../../mod/register.php:123
 msgid "That doesn't appear to be your full (First Last) name."
 msgstr ""
 
-#: ../../mod/register.php:126
+#: ../../mod/register.php:128
 msgid "Your email domain is not among those allowed on this site."
 msgstr ""
 
-#: ../../mod/register.php:129
+#: ../../mod/register.php:131
 msgid "Not a valid email address."
 msgstr ""
 
-#: ../../mod/register.php:139
+#: ../../mod/register.php:141
 msgid "Cannot use that email."
 msgstr ""
 
-#: ../../mod/register.php:145
+#: ../../mod/register.php:147
 msgid ""
 "Your \"nickname\" can only contain \"a-z\", \"0-9\", \"-\", and \"_\", and "
 "must also begin with a letter."
 msgstr ""
 
-#: ../../mod/register.php:151 ../../mod/register.php:262
+#: ../../mod/register.php:153 ../../mod/register.php:264
 msgid "Nickname is already registered. Please choose another."
 msgstr ""
 
-#: ../../mod/register.php:161
+#: ../../mod/register.php:163
 msgid ""
 "Nickname was once registered here and may not be re-used. Please choose "
 "another."
 msgstr ""
 
-#: ../../mod/register.php:180
+#: ../../mod/register.php:182
 msgid "SERIOUS ERROR: Generation of security keys failed."
 msgstr ""
 
-#: ../../mod/register.php:248
+#: ../../mod/register.php:250
 msgid "An error occurred during registration. Please try again."
 msgstr ""
 
-#: ../../mod/register.php:284
+#: ../../mod/register.php:286
 msgid "An error occurred creating your default profile. Please try again."
 msgstr ""
 
-#: ../../mod/register.php:388 ../../mod/regmod.php:52
+#: ../../mod/register.php:386 ../../mod/regmod.php:52
 #, php-format
 msgid "Registration details for %s"
 msgstr ""
 
-#: ../../mod/register.php:396
+#: ../../mod/register.php:394
 msgid ""
 "Registration successful. Please check your email for further instructions."
 msgstr ""
 
-#: ../../mod/register.php:400
+#: ../../mod/register.php:398
 msgid "Failed to send email message. Here is the message that failed."
 msgstr ""
 
-#: ../../mod/register.php:405
+#: ../../mod/register.php:403
 msgid "Your registration can not be processed."
 msgstr ""
 
-#: ../../mod/register.php:442
+#: ../../mod/register.php:440
 #, php-format
 msgid "Registration request at %s"
 msgstr ""
 
-#: ../../mod/register.php:451
+#: ../../mod/register.php:449
 msgid "Your registration is pending approval by the site owner."
 msgstr ""
 
-#: ../../mod/register.php:489
+#: ../../mod/register.php:487
 msgid ""
 "This site has exceeded the number of allowed daily account registrations. "
 "Please try again tomorrow."
 msgstr ""
 
-#: ../../mod/register.php:515
+#: ../../mod/register.php:513
 msgid ""
 "You may (optionally) fill in this form via OpenID by supplying your OpenID "
 "and clicking 'Register'."
 msgstr ""
 
-#: ../../mod/register.php:516
+#: ../../mod/register.php:514
 msgid ""
 "If you are not familiar with OpenID, please leave that field blank and fill "
 "in the rest of the items."
 msgstr ""
 
-#: ../../mod/register.php:517
+#: ../../mod/register.php:515
 msgid "Your OpenID (optional): "
 msgstr ""
 
-#: ../../mod/register.php:531
+#: ../../mod/register.php:529
 msgid "Include your profile in member directory?"
 msgstr ""
 
-#: ../../mod/register.php:546
+#: ../../mod/register.php:549
 msgid "Membership on this site is by invitation only."
 msgstr ""
 
-#: ../../mod/register.php:547
+#: ../../mod/register.php:550
 msgid "Your invitation ID: "
 msgstr ""
 
-#: ../../mod/register.php:550 ../../mod/admin.php:317
+#: ../../mod/register.php:553 ../../mod/admin.php:393
 msgid "Registration"
 msgstr ""
 
-#: ../../mod/register.php:558
+#: ../../mod/register.php:561
 msgid "Your Full Name (e.g. Joe Smith): "
 msgstr ""
 
-#: ../../mod/register.php:559
+#: ../../mod/register.php:562
 msgid "Your Email Address: "
 msgstr ""
 
-#: ../../mod/register.php:560
+#: ../../mod/register.php:563
 msgid ""
 "Choose a profile nickname. This must begin with a text character. Your "
 "profile address on this site will then be '<strong>nickname@$sitename</"
 "strong>'."
 msgstr ""
 
-#: ../../mod/register.php:561
+#: ../../mod/register.php:564
 msgid "Choose a nickname: "
 msgstr ""
 
-#: ../../mod/register.php:564 ../../include/nav.php:81 ../../boot.php:739
+#: ../../mod/register.php:567 ../../include/nav.php:81 ../../boot.php:775
 msgid "Register"
 msgstr ""
 
@@ -2569,23 +2742,39 @@ msgid "People Search"
 msgstr ""
 
 #: ../../mod/like.php:127 ../../mod/tagger.php:70
-#: ../../addon/facebook/facebook.php:1327
+#: ../../addon/facebook/facebook.php:1655
 #: ../../addon/communityhome/communityhome.php:158
 #: ../../addon/communityhome/communityhome.php:167
-#: ../../view/theme/diabook-blue/theme.php:77
-#: ../../view/theme/diabook-blue/theme.php:86
-#: ../../view/theme/diabook/theme.php:80 ../../view/theme/diabook/theme.php:89
-#: ../../include/diaspora.php:1642 ../../include/conversation.php:48
+#: ../../view/theme/diabook/diabook-green/theme.php:83
+#: ../../view/theme/diabook/diabook-green/theme.php:92
+#: ../../view/theme/diabook/diabook-red/theme.php:82
+#: ../../view/theme/diabook/diabook-red/theme.php:91
+#: ../../view/theme/diabook/diabook-blue/theme.php:82
+#: ../../view/theme/diabook/diabook-blue/theme.php:91
+#: ../../view/theme/diabook/theme.php:97
+#: ../../view/theme/diabook/theme.php:106
+#: ../../view/theme/diabook/diabook-dark/theme.php:83
+#: ../../view/theme/diabook/diabook-dark/theme.php:92
+#: ../../view/theme/diabook/diabook-aerith/theme.php:83
+#: ../../view/theme/diabook/diabook-aerith/theme.php:92
+#: ../../view/theme/diabook/diabook-pink/theme.php:83
+#: ../../view/theme/diabook/diabook-pink/theme.php:92
+#: ../../include/diaspora.php:1654 ../../include/conversation.php:48
 #: ../../include/conversation.php:57 ../../include/conversation.php:121
 #: ../../include/conversation.php:130
 msgid "status"
 msgstr ""
 
-#: ../../mod/like.php:144 ../../addon/facebook/facebook.php:1331
+#: ../../mod/like.php:144 ../../addon/facebook/facebook.php:1659
 #: ../../addon/communityhome/communityhome.php:172
-#: ../../view/theme/diabook-blue/theme.php:91
-#: ../../view/theme/diabook/theme.php:94 ../../include/diaspora.php:1658
-#: ../../include/conversation.php:65
+#: ../../view/theme/diabook/diabook-green/theme.php:97
+#: ../../view/theme/diabook/diabook-red/theme.php:96
+#: ../../view/theme/diabook/diabook-blue/theme.php:96
+#: ../../view/theme/diabook/theme.php:111
+#: ../../view/theme/diabook/diabook-dark/theme.php:97
+#: ../../view/theme/diabook/diabook-aerith/theme.php:97
+#: ../../view/theme/diabook/diabook-pink/theme.php:97
+#: ../../include/diaspora.php:1670 ../../include/conversation.php:65
 #, php-format
 msgid "%1$s likes %2$s's %3$s"
 msgstr ""
@@ -2595,9 +2784,9 @@ msgstr ""
 msgid "%1$s doesn't like %2$s's %3$s"
 msgstr ""
 
-#: ../../mod/notice.php:15 ../../mod/viewsrc.php:15 ../../mod/admin.php:127
-#: ../../mod/admin.php:525 ../../mod/admin.php:704 ../../mod/display.php:37
-#: ../../mod/display.php:142 ../../include/items.php:3022
+#: ../../mod/notice.php:15 ../../mod/viewsrc.php:15 ../../mod/admin.php:149
+#: ../../mod/admin.php:614 ../../mod/admin.php:813 ../../mod/display.php:37
+#: ../../mod/display.php:142 ../../include/items.php:3083
 msgid "Item not found."
 msgstr ""
 
@@ -2605,6 +2794,22 @@ msgstr ""
 msgid "Access denied."
 msgstr ""
 
+#: ../../mod/fbrowser.php:23
+#: ../../view/theme/diabook/diabook-green/theme.php:232
+#: ../../view/theme/diabook/diabook-red/theme.php:230
+#: ../../view/theme/diabook/diabook-blue/theme.php:230
+#: ../../view/theme/diabook/theme.php:249
+#: ../../view/theme/diabook/diabook-dark/theme.php:232
+#: ../../view/theme/diabook/diabook-aerith/theme.php:232
+#: ../../view/theme/diabook/diabook-pink/theme.php:232
+#: ../../include/nav.php:51 ../../boot.php:1463
+msgid "Photos"
+msgstr ""
+
+#: ../../mod/fbrowser.php:86
+msgid "Files"
+msgstr ""
+
 #: ../../mod/regmod.php:61
 msgid "Account approved."
 msgstr ""
@@ -2622,38 +2827,38 @@ msgstr ""
 msgid "Unable to locate original post."
 msgstr ""
 
-#: ../../mod/item.php:251
+#: ../../mod/item.php:249
 msgid "Empty post discarded."
 msgstr ""
 
-#: ../../mod/item.php:362 ../../mod/wall_upload.php:81
-#: ../../mod/wall_upload.php:90 ../../mod/wall_upload.php:97
-#: ../../include/message.php:143
+#: ../../mod/item.php:372 ../../mod/wall_upload.php:85
+#: ../../mod/wall_upload.php:94 ../../mod/wall_upload.php:101
+#: ../../include/message.php:144
 msgid "Wall Photos"
 msgstr ""
 
-#: ../../mod/item.php:745
+#: ../../mod/item.php:762
 msgid "System error. Post not saved."
 msgstr ""
 
-#: ../../mod/item.php:770
+#: ../../mod/item.php:787
 #, php-format
 msgid ""
 "This message was sent to you by %s, a member of the Friendica social network."
 msgstr ""
 
-#: ../../mod/item.php:772
+#: ../../mod/item.php:789
 #, php-format
 msgid "You may visit them online at %s"
 msgstr ""
 
-#: ../../mod/item.php:773
+#: ../../mod/item.php:790
 msgid ""
 "Please contact the sender by replying to this post if you do not wish to "
 "receive these messages."
 msgstr ""
 
-#: ../../mod/item.php:775
+#: ../../mod/item.php:792
 #, php-format
 msgid "%s posted an update."
 msgstr ""
@@ -2678,7 +2883,7 @@ msgstr ""
 msgid "Unable to process image"
 msgstr ""
 
-#: ../../mod/profile_photo.php:115 ../../mod/wall_upload.php:56
+#: ../../mod/profile_photo.php:115 ../../mod/wall_upload.php:60
 #, php-format
 msgid "Image exceeds size limit of %d"
 msgstr ""
@@ -2741,60 +2946,28 @@ msgstr ""
 msgid "New Message"
 msgstr ""
 
-#: ../../mod/message.php:60
-msgid "No recipient selected."
-msgstr ""
-
-#: ../../mod/message.php:64
+#: ../../mod/message.php:63
 msgid "Unable to locate contact information."
 msgstr ""
 
-#: ../../mod/message.php:67
-msgid "Message could not be sent."
-msgstr ""
-
-#: ../../mod/message.php:70
-msgid "Message collection failure."
-msgstr ""
-
-#: ../../mod/message.php:73
-msgid "Message sent."
-msgstr ""
-
-#: ../../mod/message.php:118
+#: ../../mod/message.php:117
 msgid "Message deleted."
 msgstr ""
 
-#: ../../mod/message.php:148
+#: ../../mod/message.php:147
 msgid "Conversation removed."
 msgstr ""
 
-#: ../../mod/message.php:170 ../../include/conversation.php:914
-msgid "Please enter a link URL:"
-msgstr ""
-
-#: ../../mod/message.php:178
-msgid "Send Private Message"
-msgstr ""
-
-#: ../../mod/message.php:179 ../../mod/message.php:342
-msgid "To:"
-msgstr ""
-
-#: ../../mod/message.php:180 ../../mod/message.php:343
-msgid "Subject:"
-msgstr ""
-
-#: ../../mod/message.php:184 ../../mod/message.php:346
-#: ../../mod/invite.php:113
-msgid "Your message:"
+#: ../../mod/message.php:219
+msgid "No messages."
 msgstr ""
 
-#: ../../mod/message.php:223
-msgid "No messages."
+#: ../../mod/message.php:226
+#, php-format
+msgid "Unknown sender - %s"
 msgstr ""
 
-#: ../../mod/message.php:230
+#: ../../mod/message.php:229
 #, php-format
 msgid "You and %s"
 msgstr ""
@@ -2804,7 +2977,7 @@ msgstr ""
 msgid "%s and You"
 msgstr ""
 
-#: ../../mod/message.php:242 ../../mod/message.php:336
+#: ../../mod/message.php:242 ../../mod/message.php:340
 msgid "Delete conversation"
 msgstr ""
 
@@ -2823,11 +2996,17 @@ msgstr[1] ""
 msgid "Message not available."
 msgstr ""
 
-#: ../../mod/message.php:320
+#: ../../mod/message.php:324
 msgid "Delete message"
 msgstr ""
 
-#: ../../mod/message.php:341
+#: ../../mod/message.php:342
+msgid ""
+"No secure communications available. You <strong>may</strong> be able to "
+"respond from the sender's profile page."
+msgstr ""
+
+#: ../../mod/message.php:346
 msgid "Send Reply"
 msgstr ""
 
@@ -2840,499 +3019,493 @@ msgstr ""
 msgid "No friends to display."
 msgstr ""
 
-#: ../../mod/admin.php:71 ../../mod/admin.php:315
+#: ../../mod/admin.php:55
+msgid "Theme settings updated."
+msgstr ""
+
+#: ../../mod/admin.php:93 ../../mod/admin.php:391
 msgid "Site"
 msgstr ""
 
-#: ../../mod/admin.php:72 ../../mod/admin.php:483 ../../mod/admin.php:495
+#: ../../mod/admin.php:94 ../../mod/admin.php:569 ../../mod/admin.php:581
 msgid "Users"
 msgstr ""
 
-#: ../../mod/admin.php:73 ../../mod/admin.php:572 ../../mod/admin.php:612
+#: ../../mod/admin.php:95 ../../mod/admin.php:663 ../../mod/admin.php:705
 msgid "Plugins"
 msgstr ""
 
-#: ../../mod/admin.php:74 ../../mod/admin.php:750 ../../mod/admin.php:784
+#: ../../mod/admin.php:96 ../../mod/admin.php:868 ../../mod/admin.php:904
 msgid "Themes"
 msgstr ""
 
-#: ../../mod/admin.php:89 ../../mod/admin.php:864
+#: ../../mod/admin.php:111 ../../mod/admin.php:992
 msgid "Logs"
 msgstr ""
 
-#: ../../mod/admin.php:94
+#: ../../mod/admin.php:116
 msgid "User registrations waiting for confirmation"
 msgstr ""
 
-#: ../../mod/admin.php:157 ../../mod/admin.php:314 ../../mod/admin.php:482
-#: ../../mod/admin.php:571 ../../mod/admin.php:611 ../../mod/admin.php:749
-#: ../../mod/admin.php:783 ../../mod/admin.php:863
+#: ../../mod/admin.php:188 ../../mod/admin.php:390 ../../mod/admin.php:568
+#: ../../mod/admin.php:662 ../../mod/admin.php:704 ../../mod/admin.php:867
+#: ../../mod/admin.php:903 ../../mod/admin.php:991
 msgid "Administration"
 msgstr ""
 
-#: ../../mod/admin.php:158
+#: ../../mod/admin.php:189
 msgid "Summary"
 msgstr ""
 
-#: ../../mod/admin.php:159
+#: ../../mod/admin.php:190
 msgid "Registered users"
 msgstr ""
 
-#: ../../mod/admin.php:161
+#: ../../mod/admin.php:192
 msgid "Pending registrations"
 msgstr ""
 
-#: ../../mod/admin.php:162
+#: ../../mod/admin.php:193
 msgid "Version"
 msgstr ""
 
-#: ../../mod/admin.php:164
+#: ../../mod/admin.php:195
 msgid "Active plugins"
 msgstr ""
 
-#: ../../mod/admin.php:257
+#: ../../mod/admin.php:329
 msgid "Site settings updated."
 msgstr ""
 
-#: ../../mod/admin.php:301
+#: ../../mod/admin.php:377
 msgid "Closed"
 msgstr ""
 
-#: ../../mod/admin.php:302
+#: ../../mod/admin.php:378
 msgid "Requires approval"
 msgstr ""
 
-#: ../../mod/admin.php:303
+#: ../../mod/admin.php:379
 msgid "Open"
 msgstr ""
 
-#: ../../mod/admin.php:307
+#: ../../mod/admin.php:383
 msgid "No SSL policy, links will track page SSL state"
 msgstr ""
 
-#: ../../mod/admin.php:308
+#: ../../mod/admin.php:384
 msgid "Force all links to use SSL"
 msgstr ""
 
-#: ../../mod/admin.php:309
+#: ../../mod/admin.php:385
 msgid "Self-signed certificate, use SSL for local links only (discouraged)"
 msgstr ""
 
-#: ../../mod/admin.php:318
+#: ../../mod/admin.php:394
 msgid "File upload"
 msgstr ""
 
-#: ../../mod/admin.php:319
+#: ../../mod/admin.php:395
 msgid "Policies"
 msgstr ""
 
-#: ../../mod/admin.php:320
+#: ../../mod/admin.php:396
 msgid "Advanced"
 msgstr ""
 
-#: ../../mod/admin.php:324 ../../addon/statusnet/statusnet.php:523
+#: ../../mod/admin.php:400 ../../addon/statusnet/statusnet.php:544
 msgid "Site name"
 msgstr ""
 
-#: ../../mod/admin.php:325
+#: ../../mod/admin.php:401
 msgid "Banner/Logo"
 msgstr ""
 
-#: ../../mod/admin.php:326
+#: ../../mod/admin.php:402
 msgid "System language"
 msgstr ""
 
-#: ../../mod/admin.php:327
+#: ../../mod/admin.php:403
 msgid "System theme"
 msgstr ""
 
-#: ../../mod/admin.php:327
-msgid "Default system theme - may be over-ridden by user profiles"
+#: ../../mod/admin.php:403
+msgid ""
+"Default system theme - may be over-ridden by user profiles - <a href='#' "
+"id='cnftheme'>change theme settings</a>"
 msgstr ""
 
-#: ../../mod/admin.php:328
+#: ../../mod/admin.php:404
 msgid "SSL link policy"
 msgstr ""
 
-#: ../../mod/admin.php:328
+#: ../../mod/admin.php:404
 msgid "Determines whether generated links should be forced to use SSL"
 msgstr ""
 
-#: ../../mod/admin.php:329
+#: ../../mod/admin.php:405
 msgid "Maximum image size"
 msgstr ""
 
-#: ../../mod/admin.php:329
+#: ../../mod/admin.php:405
 msgid ""
 "Maximum size in bytes of uploaded images. Default is 0, which means no "
 "limits."
 msgstr ""
 
-#: ../../mod/admin.php:331
+#: ../../mod/admin.php:407
 msgid "Register policy"
 msgstr ""
 
-#: ../../mod/admin.php:332
+#: ../../mod/admin.php:408
 msgid "Register text"
 msgstr ""
 
-#: ../../mod/admin.php:332
+#: ../../mod/admin.php:408
 msgid "Will be displayed prominently on the registration page."
 msgstr ""
 
-#: ../../mod/admin.php:333
+#: ../../mod/admin.php:409
 msgid "Accounts abandoned after x days"
 msgstr ""
 
-#: ../../mod/admin.php:333
+#: ../../mod/admin.php:409
 msgid ""
 "Will not waste system resources polling external sites for abandonded "
 "accounts. Enter 0 for no time limit."
 msgstr ""
 
-#: ../../mod/admin.php:334
+#: ../../mod/admin.php:410
 msgid "Allowed friend domains"
 msgstr ""
 
-#: ../../mod/admin.php:334
+#: ../../mod/admin.php:410
 msgid ""
 "Comma separated list of domains which are allowed to establish friendships "
 "with this site. Wildcards are accepted. Empty to allow any domains"
 msgstr ""
 
-#: ../../mod/admin.php:335
+#: ../../mod/admin.php:411
 msgid "Allowed email domains"
 msgstr ""
 
-#: ../../mod/admin.php:335
+#: ../../mod/admin.php:411
 msgid ""
 "Comma separated list of domains which are allowed in email addresses for "
 "registrations to this site. Wildcards are accepted. Empty to allow any "
 "domains"
 msgstr ""
 
-#: ../../mod/admin.php:336
+#: ../../mod/admin.php:412
 msgid "Block public"
 msgstr ""
 
-#: ../../mod/admin.php:336
+#: ../../mod/admin.php:412
 msgid ""
 "Check to block public access to all otherwise public personal pages on this "
 "site unless you are currently logged in."
 msgstr ""
 
-#: ../../mod/admin.php:337
+#: ../../mod/admin.php:413
 msgid "Force publish"
 msgstr ""
 
-#: ../../mod/admin.php:337
+#: ../../mod/admin.php:413
 msgid ""
 "Check to force all profiles on this site to be listed in the site directory."
 msgstr ""
 
-#: ../../mod/admin.php:338
+#: ../../mod/admin.php:414
 msgid "Global directory update URL"
 msgstr ""
 
-#: ../../mod/admin.php:338
+#: ../../mod/admin.php:414
 msgid ""
 "URL to update the global directory. If this is not set, the global directory "
 "is completely unavailable to the application."
 msgstr ""
 
-#: ../../mod/admin.php:340
+#: ../../mod/admin.php:416
 msgid "Block multiple registrations"
 msgstr ""
 
-#: ../../mod/admin.php:340
+#: ../../mod/admin.php:416
 msgid "Disallow users to register additional accounts for use as pages."
 msgstr ""
 
-#: ../../mod/admin.php:341
+#: ../../mod/admin.php:417
 msgid "OpenID support"
 msgstr ""
 
-#: ../../mod/admin.php:341
+#: ../../mod/admin.php:417
 msgid "OpenID support for registration and logins."
 msgstr ""
 
-#: ../../mod/admin.php:342
-msgid "Gravatar support"
-msgstr ""
-
-#: ../../mod/admin.php:342
-msgid "Search new user's photo on Gravatar."
-msgstr ""
-
-#: ../../mod/admin.php:343
+#: ../../mod/admin.php:418
 msgid "Fullname check"
 msgstr ""
 
-#: ../../mod/admin.php:343
+#: ../../mod/admin.php:418
 msgid ""
 "Force users to register with a space between firstname and lastname in Full "
 "name, as an antispam measure"
 msgstr ""
 
-#: ../../mod/admin.php:344
+#: ../../mod/admin.php:419
 msgid "UTF-8 Regular expressions"
 msgstr ""
 
-#: ../../mod/admin.php:344
+#: ../../mod/admin.php:419
 msgid "Use PHP UTF8 regular expressions"
 msgstr ""
 
-#: ../../mod/admin.php:345
+#: ../../mod/admin.php:420
 msgid "Show Community Page"
 msgstr ""
 
-#: ../../mod/admin.php:345
+#: ../../mod/admin.php:420
 msgid ""
 "Display a Community page showing all recent public postings on this site."
 msgstr ""
 
-#: ../../mod/admin.php:346
+#: ../../mod/admin.php:421
 msgid "Enable OStatus support"
 msgstr ""
 
-#: ../../mod/admin.php:346
+#: ../../mod/admin.php:421
 msgid ""
 "Provide built-in OStatus (identi.ca, status.net, etc.) compatibility. All "
 "communications in OStatus are public, so privacy warnings will be "
 "occasionally displayed."
 msgstr ""
 
-#: ../../mod/admin.php:347
+#: ../../mod/admin.php:422
 msgid "Enable Diaspora support"
 msgstr ""
 
-#: ../../mod/admin.php:347
+#: ../../mod/admin.php:422
 msgid "Provide built-in Diaspora network compatibility."
 msgstr ""
 
-#: ../../mod/admin.php:348
+#: ../../mod/admin.php:423
 msgid "Only allow Friendica contacts"
 msgstr ""
 
-#: ../../mod/admin.php:348
+#: ../../mod/admin.php:423
 msgid ""
 "All contacts must use Friendica protocols. All other built-in communication "
 "protocols disabled."
 msgstr ""
 
-#: ../../mod/admin.php:349
+#: ../../mod/admin.php:424
 msgid "Verify SSL"
 msgstr ""
 
-#: ../../mod/admin.php:349
+#: ../../mod/admin.php:424
 msgid ""
 "If you wish, you can turn on strict certificate checking. This will mean you "
 "cannot connect (at all) to self-signed SSL sites."
 msgstr ""
 
-#: ../../mod/admin.php:350
+#: ../../mod/admin.php:425
 msgid "Proxy user"
 msgstr ""
 
-#: ../../mod/admin.php:351
+#: ../../mod/admin.php:426
 msgid "Proxy URL"
 msgstr ""
 
-#: ../../mod/admin.php:352
+#: ../../mod/admin.php:427
 msgid "Network timeout"
 msgstr ""
 
-#: ../../mod/admin.php:352
+#: ../../mod/admin.php:427
 msgid "Value is in seconds. Set to 0 for unlimited (not recommended)."
 msgstr ""
 
-#: ../../mod/admin.php:373
+#: ../../mod/admin.php:453
 #, php-format
 msgid "%s user blocked/unblocked"
 msgid_plural "%s users blocked/unblocked"
 msgstr[0] ""
 msgstr[1] ""
 
-#: ../../mod/admin.php:380
+#: ../../mod/admin.php:460
 #, php-format
 msgid "%s user deleted"
 msgid_plural "%s users deleted"
 msgstr[0] ""
 msgstr[1] ""
 
-#: ../../mod/admin.php:414
+#: ../../mod/admin.php:499
 #, php-format
 msgid "User '%s' deleted"
 msgstr ""
 
-#: ../../mod/admin.php:421
+#: ../../mod/admin.php:507
 #, php-format
 msgid "User '%s' unblocked"
 msgstr ""
 
-#: ../../mod/admin.php:421
+#: ../../mod/admin.php:507
 #, php-format
 msgid "User '%s' blocked"
 msgstr ""
 
-#: ../../mod/admin.php:485
+#: ../../mod/admin.php:571
 msgid "select all"
 msgstr ""
 
-#: ../../mod/admin.php:486
+#: ../../mod/admin.php:572
 msgid "User registrations waiting for confirm"
 msgstr ""
 
-#: ../../mod/admin.php:487
+#: ../../mod/admin.php:573
 msgid "Request date"
 msgstr ""
 
-#: ../../mod/admin.php:487 ../../mod/admin.php:496
+#: ../../mod/admin.php:573 ../../mod/admin.php:582
 #: ../../include/contact_selectors.php:79
 msgid "Email"
 msgstr ""
 
-#: ../../mod/admin.php:488
+#: ../../mod/admin.php:574
 msgid "No registrations."
 msgstr ""
 
-#: ../../mod/admin.php:490
+#: ../../mod/admin.php:576
 msgid "Deny"
 msgstr ""
 
-#: ../../mod/admin.php:496
+#: ../../mod/admin.php:582
 msgid "Register date"
 msgstr ""
 
-#: ../../mod/admin.php:496
+#: ../../mod/admin.php:582
 msgid "Last login"
 msgstr ""
 
-#: ../../mod/admin.php:496
+#: ../../mod/admin.php:582
 msgid "Last item"
 msgstr ""
 
-#: ../../mod/admin.php:496
+#: ../../mod/admin.php:582
 msgid "Account"
 msgstr ""
 
-#: ../../mod/admin.php:498
+#: ../../mod/admin.php:584
 msgid ""
 "Selected users will be deleted!\\n\\nEverything these users had posted on "
 "this site will be permanently deleted!\\n\\nAre you sure?"
 msgstr ""
 
-#: ../../mod/admin.php:499
+#: ../../mod/admin.php:585
 msgid ""
 "The user {0} will be deleted!\\n\\nEverything this user has posted on this "
 "site will be permanently deleted!\\n\\nAre you sure?"
 msgstr ""
 
-#: ../../mod/admin.php:535
+#: ../../mod/admin.php:626
 #, php-format
 msgid "Plugin %s disabled."
 msgstr ""
 
-#: ../../mod/admin.php:539
+#: ../../mod/admin.php:630
 #, php-format
 msgid "Plugin %s enabled."
 msgstr ""
 
-#: ../../mod/admin.php:549 ../../mod/admin.php:728
+#: ../../mod/admin.php:640 ../../mod/admin.php:838
 msgid "Disable"
 msgstr ""
 
-#: ../../mod/admin.php:551 ../../mod/admin.php:730
+#: ../../mod/admin.php:642 ../../mod/admin.php:840
 msgid "Enable"
 msgstr ""
 
-#: ../../mod/admin.php:573 ../../mod/admin.php:751
+#: ../../mod/admin.php:664 ../../mod/admin.php:869
 msgid "Toggle"
 msgstr ""
 
-#: ../../mod/admin.php:574 ../../mod/admin.php:752 ../../include/nav.php:137
-msgid "Settings"
-msgstr ""
-
-#: ../../mod/admin.php:581 ../../mod/admin.php:761
+#: ../../mod/admin.php:672 ../../mod/admin.php:879
 msgid "Author: "
 msgstr ""
 
-#: ../../mod/admin.php:582 ../../mod/admin.php:762
+#: ../../mod/admin.php:673 ../../mod/admin.php:880
 msgid "Maintainer: "
 msgstr ""
 
-#: ../../mod/admin.php:693
+#: ../../mod/admin.php:802
 msgid "No themes found."
 msgstr ""
 
-#: ../../mod/admin.php:743
+#: ../../mod/admin.php:861
 msgid "Screenshot"
 msgstr ""
 
-#: ../../mod/admin.php:789
+#: ../../mod/admin.php:909
 msgid "[Experimental]"
 msgstr ""
 
-#: ../../mod/admin.php:790
+#: ../../mod/admin.php:910
 msgid "[Unsupported]"
 msgstr ""
 
-#: ../../mod/admin.php:813
+#: ../../mod/admin.php:937
 msgid "Log settings updated."
 msgstr ""
 
-#: ../../mod/admin.php:866
+#: ../../mod/admin.php:994
 msgid "Clear"
 msgstr ""
 
-#: ../../mod/admin.php:872
+#: ../../mod/admin.php:1000
 msgid "Debugging"
 msgstr ""
 
-#: ../../mod/admin.php:873
+#: ../../mod/admin.php:1001
 msgid "Log file"
 msgstr ""
 
-#: ../../mod/admin.php:873
+#: ../../mod/admin.php:1001
 msgid ""
 "Must be writable by web server. Relative to your Friendica top-level "
 "directory."
 msgstr ""
 
-#: ../../mod/admin.php:874
+#: ../../mod/admin.php:1002
 msgid "Log level"
 msgstr ""
 
-#: ../../mod/admin.php:915
+#: ../../mod/admin.php:1052
 msgid "Close"
 msgstr ""
 
-#: ../../mod/admin.php:921
+#: ../../mod/admin.php:1058
 msgid "FTP Host"
 msgstr ""
 
-#: ../../mod/admin.php:922
+#: ../../mod/admin.php:1059
 msgid "FTP Path"
 msgstr ""
 
-#: ../../mod/admin.php:923
+#: ../../mod/admin.php:1060
 msgid "FTP User"
 msgstr ""
 
-#: ../../mod/admin.php:924
+#: ../../mod/admin.php:1061
 msgid "FTP Password"
 msgstr ""
 
-#: ../../mod/profile.php:15 ../../boot.php:895
+#: ../../mod/profile.php:21 ../../boot.php:940
 msgid "Requested profile is not available."
 msgstr ""
 
-#: ../../mod/profile.php:111 ../../mod/display.php:75
+#: ../../mod/profile.php:124 ../../mod/display.php:75
 msgid "Access to this profile has been restricted."
 msgstr ""
 
-#: ../../mod/profile.php:131
+#: ../../mod/profile.php:145
 msgid "Tips for New Members"
 msgstr ""
 
@@ -3381,6 +3554,10 @@ msgstr ""
 msgid "{0} mentioned you in a post"
 msgstr ""
 
+#: ../../mod/nogroup.php:58
+msgid "Contacts who are not members of a group"
+msgstr ""
+
 #: ../../mod/openid.php:24
 msgid "OpenID protocol error. No ID returned."
 msgstr ""
@@ -3391,7 +3568,7 @@ msgid ""
 msgstr ""
 
 #: ../../mod/openid.php:93 ../../include/auth.php:90
-#: ../../include/auth.php:149
+#: ../../include/auth.php:153
 msgid "Login failed."
 msgstr ""
 
@@ -3464,8 +3641,8 @@ msgstr ""
 msgid "Search This Site"
 msgstr ""
 
-#: ../../mod/profiles.php:21 ../../mod/profiles.php:242
-#: ../../mod/profiles.php:356 ../../mod/dfrn_confirm.php:62
+#: ../../mod/profiles.php:21 ../../mod/profiles.php:339
+#: ../../mod/profiles.php:453 ../../mod/dfrn_confirm.php:62
 msgid "Profile not found."
 msgstr ""
 
@@ -3473,218 +3650,267 @@ msgstr ""
 msgid "Profile Name is required."
 msgstr ""
 
-#: ../../mod/profiles.php:201
+#: ../../mod/profiles.php:143
+msgid "Marital Status"
+msgstr ""
+
+#: ../../mod/profiles.php:144
+msgid "Romantic Partner"
+msgstr ""
+
+#: ../../mod/profiles.php:145
+msgid "Work/Employment"
+msgstr ""
+
+#: ../../mod/profiles.php:146
+msgid "Religion"
+msgstr ""
+
+#: ../../mod/profiles.php:147
+msgid "Political Views"
+msgstr ""
+
+#: ../../mod/profiles.php:148
+msgid "Gender"
+msgstr ""
+
+#: ../../mod/profiles.php:149
+msgid "Sexual Preference"
+msgstr ""
+
+#: ../../mod/profiles.php:150
+msgid "Homepage"
+msgstr ""
+
+#: ../../mod/profiles.php:151
+msgid "Interests"
+msgstr ""
+
+#: ../../mod/profiles.php:154
+msgid "Location"
+msgstr ""
+
+#: ../../mod/profiles.php:225
 msgid "Profile updated."
 msgstr ""
 
-#: ../../mod/profiles.php:261
+#: ../../mod/profiles.php:300
+msgid "public profile"
+msgstr ""
+
+#: ../../mod/profiles.php:302
+#, php-format
+msgid "%1$s has an updated %2$s, changing %3$s."
+msgstr ""
+
+#: ../../mod/profiles.php:358
 msgid "Profile deleted."
 msgstr ""
 
-#: ../../mod/profiles.php:279 ../../mod/profiles.php:313
+#: ../../mod/profiles.php:376 ../../mod/profiles.php:410
 msgid "Profile-"
 msgstr ""
 
-#: ../../mod/profiles.php:298 ../../mod/profiles.php:340
+#: ../../mod/profiles.php:395 ../../mod/profiles.php:437
 msgid "New profile created."
 msgstr ""
 
-#: ../../mod/profiles.php:319
+#: ../../mod/profiles.php:416
 msgid "Profile unavailable to clone."
 msgstr ""
 
-#: ../../mod/profiles.php:368
+#: ../../mod/profiles.php:474
 msgid "Hide your contact/friend list from viewers of this profile?"
 msgstr ""
 
-#: ../../mod/profiles.php:389
+#: ../../mod/profiles.php:497
 msgid "Edit Profile Details"
 msgstr ""
 
-#: ../../mod/profiles.php:391
+#: ../../mod/profiles.php:499
 msgid "View this profile"
 msgstr ""
 
-#: ../../mod/profiles.php:392
+#: ../../mod/profiles.php:500
 msgid "Create a new profile using these settings"
 msgstr ""
 
-#: ../../mod/profiles.php:393
+#: ../../mod/profiles.php:501
 msgid "Clone this profile"
 msgstr ""
 
-#: ../../mod/profiles.php:394
+#: ../../mod/profiles.php:502
 msgid "Delete this profile"
 msgstr ""
 
-#: ../../mod/profiles.php:395
+#: ../../mod/profiles.php:503
 msgid "Profile Name:"
 msgstr ""
 
-#: ../../mod/profiles.php:396
+#: ../../mod/profiles.php:504
 msgid "Your Full Name:"
 msgstr ""
 
-#: ../../mod/profiles.php:397
+#: ../../mod/profiles.php:505
 msgid "Title/Description:"
 msgstr ""
 
-#: ../../mod/profiles.php:398
+#: ../../mod/profiles.php:506
 msgid "Your Gender:"
 msgstr ""
 
-#: ../../mod/profiles.php:399
+#: ../../mod/profiles.php:507
 #, php-format
 msgid "Birthday (%s):"
 msgstr ""
 
-#: ../../mod/profiles.php:400
+#: ../../mod/profiles.php:508
 msgid "Street Address:"
 msgstr ""
 
-#: ../../mod/profiles.php:401
+#: ../../mod/profiles.php:509
 msgid "Locality/City:"
 msgstr ""
 
-#: ../../mod/profiles.php:402
+#: ../../mod/profiles.php:510
 msgid "Postal/Zip Code:"
 msgstr ""
 
-#: ../../mod/profiles.php:403
+#: ../../mod/profiles.php:511
 msgid "Country:"
 msgstr ""
 
-#: ../../mod/profiles.php:404
+#: ../../mod/profiles.php:512
 msgid "Region/State:"
 msgstr ""
 
-#: ../../mod/profiles.php:405
+#: ../../mod/profiles.php:513
 msgid "<span class=\"heart\">&hearts;</span> Marital Status:"
 msgstr ""
 
-#: ../../mod/profiles.php:406
+#: ../../mod/profiles.php:514
 msgid "Who: (if applicable)"
 msgstr ""
 
-#: ../../mod/profiles.php:407
+#: ../../mod/profiles.php:515
 msgid "Examples: cathy123, Cathy Williams, cathy@example.com"
 msgstr ""
 
-#: ../../mod/profiles.php:408 ../../include/profile_advanced.php:43
+#: ../../mod/profiles.php:516 ../../include/profile_advanced.php:43
 msgid "Sexual Preference:"
 msgstr ""
 
-#: ../../mod/profiles.php:409
+#: ../../mod/profiles.php:517
 msgid "Homepage URL:"
 msgstr ""
 
-#: ../../mod/profiles.php:410 ../../include/profile_advanced.php:49
+#: ../../mod/profiles.php:518 ../../include/profile_advanced.php:49
 msgid "Political Views:"
 msgstr ""
 
-#: ../../mod/profiles.php:411
+#: ../../mod/profiles.php:519
 msgid "Religious Views:"
 msgstr ""
 
-#: ../../mod/profiles.php:412
+#: ../../mod/profiles.php:520
 msgid "Public Keywords:"
 msgstr ""
 
-#: ../../mod/profiles.php:413
+#: ../../mod/profiles.php:521
 msgid "Private Keywords:"
 msgstr ""
 
-#: ../../mod/profiles.php:414
+#: ../../mod/profiles.php:522
 msgid "Example: fishing photography software"
 msgstr ""
 
-#: ../../mod/profiles.php:415
+#: ../../mod/profiles.php:523
 msgid "(Used for suggesting potential friends, can be seen by others)"
 msgstr ""
 
-#: ../../mod/profiles.php:416
+#: ../../mod/profiles.php:524
 msgid "(Used for searching profiles, never shown to others)"
 msgstr ""
 
-#: ../../mod/profiles.php:417
+#: ../../mod/profiles.php:525
 msgid "Tell us about yourself..."
 msgstr ""
 
-#: ../../mod/profiles.php:418
+#: ../../mod/profiles.php:526
 msgid "Hobbies/Interests"
 msgstr ""
 
-#: ../../mod/profiles.php:419
+#: ../../mod/profiles.php:527
 msgid "Contact information and Social Networks"
 msgstr ""
 
-#: ../../mod/profiles.php:420
+#: ../../mod/profiles.php:528
 msgid "Musical interests"
 msgstr ""
 
-#: ../../mod/profiles.php:421
+#: ../../mod/profiles.php:529
 msgid "Books, literature"
 msgstr ""
 
-#: ../../mod/profiles.php:422
+#: ../../mod/profiles.php:530
 msgid "Television"
 msgstr ""
 
-#: ../../mod/profiles.php:423
+#: ../../mod/profiles.php:531
 msgid "Film/dance/culture/entertainment"
 msgstr ""
 
-#: ../../mod/profiles.php:424
+#: ../../mod/profiles.php:532
 msgid "Love/romance"
 msgstr ""
 
-#: ../../mod/profiles.php:425
+#: ../../mod/profiles.php:533
 msgid "Work/employment"
 msgstr ""
 
-#: ../../mod/profiles.php:426
+#: ../../mod/profiles.php:534
 msgid "School/education"
 msgstr ""
 
-#: ../../mod/profiles.php:431
+#: ../../mod/profiles.php:539
 msgid ""
 "This is your <strong>public</strong> profile.<br />It <strong>may</strong> "
 "be visible to anybody using the internet."
 msgstr ""
 
-#: ../../mod/profiles.php:441 ../../mod/directory.php:111
+#: ../../mod/profiles.php:549 ../../mod/directory.php:111
 msgid "Age: "
 msgstr ""
 
-#: ../../mod/profiles.php:476
+#: ../../mod/profiles.php:584
 msgid "Edit/Manage Profiles"
 msgstr ""
 
-#: ../../mod/profiles.php:477 ../../boot.php:996
+#: ../../mod/profiles.php:585 ../../boot.php:1049
 msgid "Change profile photo"
 msgstr ""
 
-#: ../../mod/profiles.php:478 ../../boot.php:997
+#: ../../mod/profiles.php:586 ../../boot.php:1050
 msgid "Create New Profile"
 msgstr ""
 
-#: ../../mod/profiles.php:489 ../../boot.php:1007
+#: ../../mod/profiles.php:597 ../../boot.php:1060
 msgid "Profile Image"
 msgstr ""
 
-#: ../../mod/profiles.php:491 ../../boot.php:1010
+#: ../../mod/profiles.php:599 ../../boot.php:1063
 msgid "visible to everybody"
 msgstr ""
 
-#: ../../mod/profiles.php:492 ../../boot.php:1011
+#: ../../mod/profiles.php:600 ../../boot.php:1064
 msgid "Edit visibility"
 msgstr ""
 
-#: ../../mod/filer.php:28 ../../include/conversation.php:918
+#: ../../mod/filer.php:29 ../../include/conversation.php:914
 msgid "Save to Folder:"
 msgstr ""
 
-#: ../../mod/filer.php:28
+#: ../../mod/filer.php:29
 msgid "- select -"
 msgstr ""
 
@@ -3728,8 +3954,15 @@ msgstr ""
 msgid "No entries."
 msgstr ""
 
-#: ../../mod/suggest.php:38 ../../view/theme/diabook-blue/theme.php:144
-#: ../../view/theme/diabook/theme.php:147 ../../include/contact_widgets.php:33
+#: ../../mod/suggest.php:38
+#: ../../view/theme/diabook/diabook-green/theme.php:145
+#: ../../view/theme/diabook/diabook-red/theme.php:143
+#: ../../view/theme/diabook/diabook-blue/theme.php:143
+#: ../../view/theme/diabook/theme.php:158
+#: ../../view/theme/diabook/diabook-dark/theme.php:145
+#: ../../view/theme/diabook/diabook-aerith/theme.php:145
+#: ../../view/theme/diabook/diabook-pink/theme.php:145
+#: ../../include/contact_widgets.php:34
 msgid "Friend Suggestions"
 msgstr ""
 
@@ -3744,6 +3977,13 @@ msgid "Ignore/Hide"
 msgstr ""
 
 #: ../../mod/directory.php:47
+#: ../../view/theme/diabook/diabook-green/theme.php:143
+#: ../../view/theme/diabook/diabook-red/theme.php:141
+#: ../../view/theme/diabook/diabook-blue/theme.php:141
+#: ../../view/theme/diabook/theme.php:156
+#: ../../view/theme/diabook/diabook-dark/theme.php:143
+#: ../../view/theme/diabook/diabook-aerith/theme.php:143
+#: ../../view/theme/diabook/diabook-pink/theme.php:143
 msgid "Global Directory"
 msgstr ""
 
@@ -3882,7 +4122,7 @@ msgstr ""
 msgid "Unable to set contact photo."
 msgstr ""
 
-#: ../../mod/dfrn_confirm.php:477 ../../include/diaspora.php:495
+#: ../../mod/dfrn_confirm.php:477 ../../include/diaspora.php:507
 #: ../../include/conversation.php:101
 #, php-format
 msgid "%1$s is now friends with %2$s"
@@ -3929,71 +4169,71 @@ msgstr ""
 msgid "Connection accepted at %s"
 msgstr ""
 
-#: ../../addon/facebook/facebook.php:458
+#: ../../addon/facebook/facebook.php:490
 msgid "Facebook disabled"
 msgstr ""
 
-#: ../../addon/facebook/facebook.php:463
+#: ../../addon/facebook/facebook.php:495
 msgid "Updating contacts"
 msgstr ""
 
-#: ../../addon/facebook/facebook.php:472
+#: ../../addon/facebook/facebook.php:515
 msgid "Facebook API key is missing."
 msgstr ""
 
-#: ../../addon/facebook/facebook.php:479
+#: ../../addon/facebook/facebook.php:522
 msgid "Facebook Connect"
 msgstr ""
 
-#: ../../addon/facebook/facebook.php:485
+#: ../../addon/facebook/facebook.php:528
 msgid "Install Facebook connector for this account."
 msgstr ""
 
-#: ../../addon/facebook/facebook.php:492
+#: ../../addon/facebook/facebook.php:535
 msgid "Remove Facebook connector"
 msgstr ""
 
-#: ../../addon/facebook/facebook.php:497
+#: ../../addon/facebook/facebook.php:540
 msgid ""
 "Re-authenticate [This is necessary whenever your Facebook password is "
 "changed.]"
 msgstr ""
 
-#: ../../addon/facebook/facebook.php:504
+#: ../../addon/facebook/facebook.php:547
 msgid "Post to Facebook by default"
 msgstr ""
 
-#: ../../addon/facebook/facebook.php:508
+#: ../../addon/facebook/facebook.php:551
 msgid "Link all your Facebook friends and conversations on this website"
 msgstr ""
 
-#: ../../addon/facebook/facebook.php:510
+#: ../../addon/facebook/facebook.php:553
 msgid ""
 "Facebook conversations consist of your <em>profile wall</em> and your friend "
 "<em>stream</em>."
 msgstr ""
 
-#: ../../addon/facebook/facebook.php:511
+#: ../../addon/facebook/facebook.php:554
 msgid "On this website, your Facebook friend stream is only visible to you."
 msgstr ""
 
-#: ../../addon/facebook/facebook.php:512
+#: ../../addon/facebook/facebook.php:555
 msgid ""
 "The following settings determine the privacy of your Facebook profile wall "
 "on this website."
 msgstr ""
 
-#: ../../addon/facebook/facebook.php:516
+#: ../../addon/facebook/facebook.php:559
 msgid ""
 "On this website your Facebook profile wall conversations will only be "
 "visible to you"
 msgstr ""
 
-#: ../../addon/facebook/facebook.php:521
+#: ../../addon/facebook/facebook.php:564
 msgid "Do not import your Facebook profile wall conversations"
 msgstr ""
 
-#: ../../addon/facebook/facebook.php:523
+#: ../../addon/facebook/facebook.php:566
 msgid ""
 "If you choose to link conversations and leave both of these boxes unchecked, "
 "your Facebook profile wall will be merged with your profile wall on this "
@@ -4001,68 +4241,121 @@ msgid ""
 "who may see the conversations."
 msgstr ""
 
-#: ../../addon/facebook/facebook.php:528
+#: ../../addon/facebook/facebook.php:571
 msgid "Comma separated applications to ignore"
 msgstr ""
 
-#: ../../addon/facebook/facebook.php:599
+#: ../../addon/facebook/facebook.php:648
 msgid "Problems with Facebook Real-Time Updates"
 msgstr ""
 
-#: ../../addon/facebook/facebook.php:623
+#: ../../addon/facebook/facebook.php:675
 #: ../../include/contact_selectors.php:81
 msgid "Facebook"
 msgstr ""
 
-#: ../../addon/facebook/facebook.php:624
+#: ../../addon/facebook/facebook.php:676
 msgid "Facebook Connector Settings"
 msgstr ""
 
-#: ../../addon/facebook/facebook.php:634
+#: ../../addon/facebook/facebook.php:691
+msgid "Facebook API Key"
+msgstr ""
+
+#: ../../addon/facebook/facebook.php:700
+msgid ""
+"Error: it appears that you have specified the App-ID and -Secret in your ."
+"htconfig.php file. As long as they are specified there, they cannot be set "
+"using this form.<br><br>"
+msgstr ""
+
+#: ../../addon/facebook/facebook.php:705
+msgid ""
+"Error: the given API Key seems to be incorrect (the application access token "
+"could not be retrieved)."
+msgstr ""
+
+#: ../../addon/facebook/facebook.php:707
+msgid "The given API Key seems to work correctly."
+msgstr ""
+
+#: ../../addon/facebook/facebook.php:709
+msgid ""
+"The correctness of the API Key could not be detected. Somthing strange's "
+"going on."
+msgstr ""
+
+#: ../../addon/facebook/facebook.php:712
+msgid "App-ID / API-Key"
+msgstr ""
+
+#: ../../addon/facebook/facebook.php:713
+msgid "Application secret"
+msgstr ""
+
+#: ../../addon/facebook/facebook.php:714
+#, php-format
+msgid "Polling Interval (min. %1$s minutes)"
+msgstr ""
+
+#: ../../addon/facebook/facebook.php:718
+msgid "Real-Time Updates"
+msgstr ""
+
+#: ../../addon/facebook/facebook.php:722
 msgid "Real-Time Updates are activated."
 msgstr ""
 
-#: ../../addon/facebook/facebook.php:635
+#: ../../addon/facebook/facebook.php:723
 msgid "Deactivate Real-Time Updates"
 msgstr ""
 
-#: ../../addon/facebook/facebook.php:637
+#: ../../addon/facebook/facebook.php:725
 msgid "Real-Time Updates not activated."
 msgstr ""
 
-#: ../../addon/facebook/facebook.php:637
+#: ../../addon/facebook/facebook.php:725
 msgid "Activate Real-Time Updates"
 msgstr ""
 
-#: ../../addon/facebook/facebook.php:659
+#: ../../addon/facebook/facebook.php:743
+msgid "The new values have been saved."
+msgstr ""
+
+#: ../../addon/facebook/facebook.php:767
 msgid "Post to Facebook"
 msgstr ""
 
-#: ../../addon/facebook/facebook.php:751
+#: ../../addon/facebook/facebook.php:865
 msgid ""
 "Post to Facebook cancelled because of multi-network access permission "
 "conflict."
 msgstr ""
 
-#: ../../addon/facebook/facebook.php:923
+#: ../../addon/facebook/facebook.php:1085
 msgid "View on Friendica"
 msgstr ""
 
-#: ../../addon/facebook/facebook.php:948
+#: ../../addon/facebook/facebook.php:1118
 msgid "Facebook post failed. Queued for retry."
 msgstr ""
 
-#: ../../addon/facebook/facebook.php:981
+#: ../../addon/facebook/facebook.php:1158
 msgid "Your Facebook connection became invalid. Please Re-authenticate."
 msgstr ""
 
-#: ../../addon/facebook/facebook.php:982
+#: ../../addon/facebook/facebook.php:1159
 msgid "Facebook connection became invalid"
 msgstr ""
 
-#: ../../addon/facebook/facebook.php:1107
-#: ../../addon/facebook/facebook.php:1116 ../../include/bb2diaspora.php:102
-msgid "link"
+#: ../../addon/facebook/facebook.php:1160
+#, php-format
+msgid ""
+"Hi %1$s,\n"
+"\n"
+"The connection between your accounts on %2$s and Facebook became invalid. "
+"This usually happens after you change your Facebook-password. To enable the "
+"connection again, you have to %3$sre-authenticate the Facebook-connector%4$s."
 msgstr ""
 
 #: ../../addon/widgets/widget_like.php:58
@@ -4144,15 +4437,25 @@ msgid "Post to LiveJournal by default"
 msgstr ""
 
 #: ../../addon/nsfw/nsfw.php:47
-msgid "\"Not Safe For Work\" Settings"
+msgid "Not Safe For Work (General Purpose Content Filter) settings"
+msgstr ""
+
+#: ../../addon/nsfw/nsfw.php:49
+msgid ""
+"This plugin looks in posts for the words/text you specify below, and "
+"collapses any content containing those keywords so it is not displayed at "
+"inappropriate times, such as sexual innuendo that may be improper in a work "
+"setting. It is polite and recommended to tag any content containing nudity "
+"with #NSFW.  This filter can also match any other word/text you specify, and "
+"can thereby be used as a general purpose content filter."
 msgstr ""
 
 #: ../../addon/nsfw/nsfw.php:50
-msgid "Enable NSFW filter"
+msgid "Enable Content filter"
 msgstr ""
 
 #: ../../addon/nsfw/nsfw.php:53
-msgid "Comma separated words to treat as NSFW"
+msgid "Comma separated list of keywords to hide"
 msgstr ""
 
 #: ../../addon/nsfw/nsfw.php:58
@@ -4172,11 +4475,19 @@ msgstr ""
 msgid "Forums"
 msgstr ""
 
+#: ../../addon/planets/planets.php:150
+msgid "Planets Settings"
+msgstr ""
+
+#: ../../addon/planets/planets.php:152
+msgid "Enable Planets Plugin"
+msgstr ""
+
 #: ../../addon/communityhome/communityhome.php:28
 #: ../../addon/communityhome/communityhome.php:34
 #: ../../addon/communityhome/twillingham/communityhome.php:28
 #: ../../addon/communityhome/twillingham/communityhome.php:34
-#: ../../include/nav.php:64 ../../boot.php:760
+#: ../../include/nav.php:64 ../../boot.php:796
 msgid "Login"
 msgstr ""
 
@@ -4186,9 +4497,8 @@ msgid "OpenID"
 msgstr ""
 
 #: ../../addon/communityhome/communityhome.php:38
-#: ../../view/theme/diabook-blue/theme.php:23
-#: ../../view/theme/diabook/theme.php:26
-msgid "Last users"
+#: ../../addon/communityhome/twillingham/communityhome.php:38
+msgid "Latest users"
 msgstr ""
 
 #: ../../addon/communityhome/communityhome.php:81
@@ -4197,28 +4507,26 @@ msgid "Most active users"
 msgstr ""
 
 #: ../../addon/communityhome/communityhome.php:98
-#: ../../view/theme/diabook-blue/theme.php:97
-#: ../../view/theme/diabook/theme.php:100
-msgid "Last photos"
+msgid "Latest photos"
 msgstr ""
 
 #: ../../addon/communityhome/communityhome.php:133
-#: ../../view/theme/diabook-blue/theme.php:52
-#: ../../view/theme/diabook/theme.php:55
-msgid "Last likes"
+msgid "Latest likes"
 msgstr ""
 
 #: ../../addon/communityhome/communityhome.php:155
-#: ../../view/theme/diabook-blue/theme.php:74
-#: ../../view/theme/diabook/theme.php:77 ../../include/text.php:1286
-#: ../../include/conversation.php:45 ../../include/conversation.php:118
+#: ../../view/theme/diabook/diabook-green/theme.php:80
+#: ../../view/theme/diabook/diabook-red/theme.php:79
+#: ../../view/theme/diabook/diabook-blue/theme.php:79
+#: ../../view/theme/diabook/theme.php:94
+#: ../../view/theme/diabook/diabook-dark/theme.php:80
+#: ../../view/theme/diabook/diabook-aerith/theme.php:80
+#: ../../view/theme/diabook/diabook-pink/theme.php:80
+#: ../../include/text.php:1302 ../../include/conversation.php:45
+#: ../../include/conversation.php:118
 msgid "event"
 msgstr ""
 
-#: ../../addon/communityhome/twillingham/communityhome.php:38
-msgid "Latest users"
-msgstr ""
-
 #: ../../addon/uhremotestorage/uhremotestorage.php:84
 #, php-format
 msgid ""
@@ -4297,11 +4605,11 @@ msgstr ""
 msgid "I won!"
 msgstr ""
 
-#: ../../addon/randplace/randplace.php:171
+#: ../../addon/randplace/randplace.php:169
 msgid "Randplace Settings"
 msgstr ""
 
-#: ../../addon/randplace/randplace.php:173
+#: ../../addon/randplace/randplace.php:171
 msgid "Enable Randplace Plugin"
 msgstr ""
 
@@ -4365,23 +4673,11 @@ msgstr ""
 msgid "Post to Drupal by default"
 msgstr ""
 
-#: ../../addon/drpost/drpost.php:184 ../../addon/wppost/wppost.php:172
-#: ../../addon/posterous/posterous.php:173
+#: ../../addon/drpost/drpost.php:184 ../../addon/wppost/wppost.php:190
+#: ../../addon/blogger/blogger.php:172 ../../addon/posterous/posterous.php:173
 msgid "Post from Friendica"
 msgstr ""
 
-#: ../../addon/frown/frown.php:46
-msgid "Frown settings updated."
-msgstr ""
-
-#: ../../addon/frown/frown.php:76
-msgid "Frown Settings"
-msgstr ""
-
-#: ../../addon/frown/frown.php:78
-msgid "Disable graphical smilies"
-msgstr ""
-
 #: ../../addon/geonames/geonames.php:143
 msgid "Geonames settings updated."
 msgstr ""
@@ -4434,41 +4730,69 @@ msgstr ""
 msgid "URL to embed:"
 msgstr ""
 
-#: ../../addon/impressum/impressum.php:25
+#: ../../addon/impressum/impressum.php:34
 msgid "Impressum"
 msgstr ""
 
-#: ../../addon/impressum/impressum.php:38
-#: ../../addon/impressum/impressum.php:40
-#: ../../addon/impressum/impressum.php:70
+#: ../../addon/impressum/impressum.php:47
+#: ../../addon/impressum/impressum.php:49
+#: ../../addon/impressum/impressum.php:81
 msgid "Site Owner"
 msgstr ""
 
-#: ../../addon/impressum/impressum.php:38
-#: ../../addon/impressum/impressum.php:74
+#: ../../addon/impressum/impressum.php:47
+#: ../../addon/impressum/impressum.php:85
 msgid "Email Address"
 msgstr ""
 
-#: ../../addon/impressum/impressum.php:43
-#: ../../addon/impressum/impressum.php:72
+#: ../../addon/impressum/impressum.php:52
+#: ../../addon/impressum/impressum.php:83
 msgid "Postal Address"
 msgstr ""
 
-#: ../../addon/impressum/impressum.php:49
+#: ../../addon/impressum/impressum.php:58
 msgid ""
 "The impressum addon needs to be configured!<br />Please add at least the "
 "<tt>owner</tt> variable to your config file. For other variables please "
 "refer to the README file of the addon."
 msgstr ""
 
-#: ../../addon/impressum/impressum.php:71
+#: ../../addon/impressum/impressum.php:81
+msgid "The page operators name."
+msgstr ""
+
+#: ../../addon/impressum/impressum.php:82
 msgid "Site Owners Profile"
 msgstr ""
 
-#: ../../addon/impressum/impressum.php:73
+#: ../../addon/impressum/impressum.php:82
+msgid "Profile address of the operator."
+msgstr ""
+
+#: ../../addon/impressum/impressum.php:83
+msgid "How to contact the operator via snail mail."
+msgstr ""
+
+#: ../../addon/impressum/impressum.php:84
 msgid "Notes"
 msgstr ""
 
+#: ../../addon/impressum/impressum.php:84
+msgid "Additional notes that are displayed beneath the contact information."
+msgstr ""
+
+#: ../../addon/impressum/impressum.php:85
+msgid "How to contact the operator via email. (will be displayed obfuscated)"
+msgstr ""
+
+#: ../../addon/impressum/impressum.php:86
+msgid "Footer note"
+msgstr ""
+
+#: ../../addon/impressum/impressum.php:86
+msgid "Text for the footer."
+msgstr ""
+
 #: ../../addon/buglink/buglink.php:15
 msgid "Report Bug"
 msgstr ""
@@ -4550,6 +4874,27 @@ msgstr ""
 msgid "The default zoom level. (1:world, 18:highest)"
 msgstr ""
 
+#: ../../addon/mathjax/mathjax.php:37
+msgid ""
+"The MathJax addon renders mathematical formulae written using the LaTeX "
+"syntax surrounded by the usual $$ or an eqnarray block in the postings of "
+"your wall,network tab and private mail."
+msgstr ""
+
+#: ../../addon/mathjax/mathjax.php:38
+msgid "Use the MathJax renderer"
+msgstr ""
+
+#: ../../addon/mathjax/mathjax.php:74
+msgid "MathJax Base URL"
+msgstr ""
+
+#: ../../addon/mathjax/mathjax.php:74
+msgid ""
+"The URL for the javascript file that should be included to use MathJax. Can "
+"be either the MathJax CDN or another installation of MathJax."
+msgstr ""
+
 #: ../../addon/editplain/editplain.php:46
 msgid "Editplain settings updated."
 msgstr ""
@@ -4562,11 +4907,73 @@ msgstr ""
 msgid "Disable richtext status editor"
 msgstr ""
 
-#: ../../addon/pageheader/pageheader.php:47
+#: ../../addon/gravatar/gravatar.php:71
+msgid "generic profile image"
+msgstr ""
+
+#: ../../addon/gravatar/gravatar.php:72
+msgid "random geometric pattern"
+msgstr ""
+
+#: ../../addon/gravatar/gravatar.php:73
+msgid "monster face"
+msgstr ""
+
+#: ../../addon/gravatar/gravatar.php:74
+msgid "computer generated face"
+msgstr ""
+
+#: ../../addon/gravatar/gravatar.php:75
+msgid "retro arcade style face"
+msgstr ""
+
+#: ../../addon/gravatar/gravatar.php:87
+msgid "Default avatar image"
+msgstr ""
+
+#: ../../addon/gravatar/gravatar.php:87
+msgid "Select default avatar image if none was found at Gravatar. See README"
+msgstr ""
+
+#: ../../addon/gravatar/gravatar.php:88
+msgid "Rating of images"
+msgstr ""
+
+#: ../../addon/gravatar/gravatar.php:88
+msgid "Select the appropriate avatar rating for your site. See README"
+msgstr ""
+
+#: ../../addon/gravatar/gravatar.php:102
+msgid "Gravatar settings updated."
+msgstr ""
+
+#: ../../addon/testdrive/testdrive.php:85
+#, php-format
+msgid "Your account on %s will expire in a few days."
+msgstr ""
+
+#: ../../addon/testdrive/testdrive.php:86
+msgid "Your Friendica test account is about to expire."
+msgstr ""
+
+#: ../../addon/testdrive/testdrive.php:87
+#, php-format
+msgid ""
+"Hi %1$s,\n"
+"\n"
+"Your test account on %2$s will expire in less than five days. We hope you "
+"enjoyed this test drive and use this opportunity to find a permanent "
+"Friendica website for your integrated social communications. A list of "
+"public sites is available at http://dir.friendica.com/siteinfo - and for "
+"more information on setting up your own Friendica server please see the "
+"Friendica project website at http://friendica.com."
+msgstr ""
+
+#: ../../addon/pageheader/pageheader.php:50
 msgid "\"pageheader\" Settings"
 msgstr ""
 
-#: ../../addon/pageheader/pageheader.php:65
+#: ../../addon/pageheader/pageheader.php:68
 msgid "pageheader Settings saved."
 msgstr ""
 
@@ -4602,40 +5009,40 @@ msgstr ""
 msgid "Post to StatusNet"
 msgstr ""
 
-#: ../../addon/statusnet/statusnet.php:175
+#: ../../addon/statusnet/statusnet.php:176
 msgid ""
 "Please contact your site administrator.<br />The provided API URL is not "
 "valid."
 msgstr ""
 
-#: ../../addon/statusnet/statusnet.php:203
+#: ../../addon/statusnet/statusnet.php:204
 msgid "We could not contact the StatusNet API with the Path you entered."
 msgstr ""
 
-#: ../../addon/statusnet/statusnet.php:229
+#: ../../addon/statusnet/statusnet.php:232
 msgid "StatusNet settings updated."
 msgstr ""
 
-#: ../../addon/statusnet/statusnet.php:252
+#: ../../addon/statusnet/statusnet.php:257
 msgid "StatusNet Posting Settings"
 msgstr ""
 
-#: ../../addon/statusnet/statusnet.php:266
+#: ../../addon/statusnet/statusnet.php:271
 msgid "Globally Available StatusNet OAuthKeys"
 msgstr ""
 
-#: ../../addon/statusnet/statusnet.php:267
+#: ../../addon/statusnet/statusnet.php:272
 msgid ""
 "There are preconfigured OAuth key pairs for some StatusNet servers "
 "available. If you are useing one of them, please use these credentials. If "
 "not feel free to connect to any other StatusNet instance (see below)."
 msgstr ""
 
-#: ../../addon/statusnet/statusnet.php:275
+#: ../../addon/statusnet/statusnet.php:280
 msgid "Provide your own OAuth Credentials"
 msgstr ""
 
-#: ../../addon/statusnet/statusnet.php:276
+#: ../../addon/statusnet/statusnet.php:281
 msgid ""
 "No consumer key pair for StatusNet found. Register your Friendica Account as "
 "an desktop client on your StatusNet account, copy the consumer key pair here "
@@ -4644,19 +5051,19 @@ msgid ""
 "installation at your favorited StatusNet installation."
 msgstr ""
 
-#: ../../addon/statusnet/statusnet.php:278
+#: ../../addon/statusnet/statusnet.php:283
 msgid "OAuth Consumer Key"
 msgstr ""
 
-#: ../../addon/statusnet/statusnet.php:281
+#: ../../addon/statusnet/statusnet.php:286
 msgid "OAuth Consumer Secret"
 msgstr ""
 
-#: ../../addon/statusnet/statusnet.php:284
+#: ../../addon/statusnet/statusnet.php:289
 msgid "Base API Path (remember the trailing /)"
 msgstr ""
 
-#: ../../addon/statusnet/statusnet.php:305
+#: ../../addon/statusnet/statusnet.php:310
 msgid ""
 "To connect to your StatusNet account click the button below to get a "
 "security code from StatusNet which you have to copy into the input box below "
@@ -4664,38 +5071,38 @@ msgid ""
 "to StatusNet."
 msgstr ""
 
-#: ../../addon/statusnet/statusnet.php:306
+#: ../../addon/statusnet/statusnet.php:311
 msgid "Log in with StatusNet"
 msgstr ""
 
-#: ../../addon/statusnet/statusnet.php:308
+#: ../../addon/statusnet/statusnet.php:313
 msgid "Copy the security code from StatusNet here"
 msgstr ""
 
-#: ../../addon/statusnet/statusnet.php:314
+#: ../../addon/statusnet/statusnet.php:319
 msgid "Cancel Connection Process"
 msgstr ""
 
-#: ../../addon/statusnet/statusnet.php:316
+#: ../../addon/statusnet/statusnet.php:321
 msgid "Current StatusNet API is"
 msgstr ""
 
-#: ../../addon/statusnet/statusnet.php:317
+#: ../../addon/statusnet/statusnet.php:322
 msgid "Cancel StatusNet Connection"
 msgstr ""
 
-#: ../../addon/statusnet/statusnet.php:328 ../../addon/twitter/twitter.php:184
+#: ../../addon/statusnet/statusnet.php:333 ../../addon/twitter/twitter.php:189
 msgid "Currently connected to: "
 msgstr ""
 
-#: ../../addon/statusnet/statusnet.php:329
+#: ../../addon/statusnet/statusnet.php:334
 msgid ""
 "If enabled all your <strong>public</strong> postings can be posted to the "
 "associated StatusNet account. You can choose to do so by default (here) or "
 "for every posting separately in the posting options when writing the entry."
 msgstr ""
 
-#: ../../addon/statusnet/statusnet.php:331
+#: ../../addon/statusnet/statusnet.php:336
 msgid ""
 "<strong>Note</strong>: Due your privacy settings (<em>Hide your profile "
 "details from unknown viewers?</em>) the link potentially included in public "
@@ -4703,19 +5110,23 @@ msgid ""
 "informing the visitor that the access to your profile has been restricted."
 msgstr ""
 
-#: ../../addon/statusnet/statusnet.php:334
+#: ../../addon/statusnet/statusnet.php:339
 msgid "Allow posting to StatusNet"
 msgstr ""
 
-#: ../../addon/statusnet/statusnet.php:337
+#: ../../addon/statusnet/statusnet.php:342
 msgid "Send public postings to StatusNet by default"
 msgstr ""
 
-#: ../../addon/statusnet/statusnet.php:342 ../../addon/twitter/twitter.php:198
+#: ../../addon/statusnet/statusnet.php:345
+msgid "Send #tag links to StatusNet"
+msgstr ""
+
+#: ../../addon/statusnet/statusnet.php:350 ../../addon/twitter/twitter.php:206
 msgid "Clear OAuth configuration"
 msgstr ""
 
-#: ../../addon/statusnet/statusnet.php:524
+#: ../../addon/statusnet/statusnet.php:545
 msgid "API URL"
 msgstr ""
 
@@ -4818,12 +5229,12 @@ msgstr ""
 msgid "Cutting posts after how much characters"
 msgstr ""
 
-#: ../../addon/showmore/showmore.php:64
+#: ../../addon/showmore/showmore.php:65
 msgid "Show More Settings saved."
 msgstr ""
 
-#: ../../addon/showmore/showmore.php:86 ../../include/conversation.php:466
-#: ../../boot.php:489
+#: ../../addon/showmore/showmore.php:87 ../../include/conversation.php:466
+#: ../../boot.php:496
 msgid "show more"
 msgstr ""
 
@@ -4867,21 +5278,21 @@ msgstr ""
 msgid "Post to Twitter"
 msgstr ""
 
-#: ../../addon/twitter/twitter.php:119
+#: ../../addon/twitter/twitter.php:122
 msgid "Twitter settings updated."
 msgstr ""
 
-#: ../../addon/twitter/twitter.php:141
+#: ../../addon/twitter/twitter.php:146
 msgid "Twitter Posting Settings"
 msgstr ""
 
-#: ../../addon/twitter/twitter.php:148
+#: ../../addon/twitter/twitter.php:153
 msgid ""
 "No consumer key pair for Twitter found. Please contact your site "
 "administrator."
 msgstr ""
 
-#: ../../addon/twitter/twitter.php:167
+#: ../../addon/twitter/twitter.php:172
 msgid ""
 "At this Friendica instance the Twitter plugin was enabled but you have not "
 "yet connected your account to your Twitter account. To do so click the "
@@ -4890,22 +5301,22 @@ msgid ""
 "be posted to Twitter."
 msgstr ""
 
-#: ../../addon/twitter/twitter.php:168
+#: ../../addon/twitter/twitter.php:173
 msgid "Log in with Twitter"
 msgstr ""
 
-#: ../../addon/twitter/twitter.php:170
+#: ../../addon/twitter/twitter.php:175
 msgid "Copy the PIN from Twitter here"
 msgstr ""
 
-#: ../../addon/twitter/twitter.php:185
+#: ../../addon/twitter/twitter.php:190
 msgid ""
 "If enabled all your <strong>public</strong> postings can be posted to the "
 "associated Twitter account. You can choose to do so by default (here) or for "
 "every posting separately in the posting options when writing the entry."
 msgstr ""
 
-#: ../../addon/twitter/twitter.php:187
+#: ../../addon/twitter/twitter.php:192
 msgid ""
 "<strong>Note</strong>: Due your privacy settings (<em>Hide your profile "
 "details from unknown viewers?</em>) the link potentially included in public "
@@ -4913,24 +5324,76 @@ msgid ""
 "the visitor that the access to your profile has been restricted."
 msgstr ""
 
-#: ../../addon/twitter/twitter.php:190
+#: ../../addon/twitter/twitter.php:195
 msgid "Allow posting to Twitter"
 msgstr ""
 
-#: ../../addon/twitter/twitter.php:193
+#: ../../addon/twitter/twitter.php:198
 msgid "Send public postings to Twitter by default"
 msgstr ""
 
-#: ../../addon/twitter/twitter.php:357
+#: ../../addon/twitter/twitter.php:201
+msgid "Send #tag links to Twitter"
+msgstr ""
+
+#: ../../addon/twitter/twitter.php:377
 msgid "Consumer key"
 msgstr ""
 
-#: ../../addon/twitter/twitter.php:358
+#: ../../addon/twitter/twitter.php:378
 msgid "Consumer secret"
 msgstr ""
 
-#: ../../addon/irc/irc.php:25
-msgid "irc Chatroom"
+#: ../../addon/irc/irc.php:44
+msgid "IRC Settings"
+msgstr ""
+
+#: ../../addon/irc/irc.php:46
+msgid "Channel(s) to auto connect (comma separated)"
+msgstr ""
+
+#: ../../addon/irc/irc.php:51
+msgid "Popular Channels (comma separated)"
+msgstr ""
+
+#: ../../addon/irc/irc.php:69
+msgid "IRC settings saved."
+msgstr ""
+
+#: ../../addon/irc/irc.php:74
+msgid "IRC Chatroom"
+msgstr ""
+
+#: ../../addon/irc/irc.php:96
+msgid "Popular Channels"
+msgstr ""
+
+#: ../../addon/blogger/blogger.php:42
+msgid "Post to blogger"
+msgstr ""
+
+#: ../../addon/blogger/blogger.php:74
+msgid "Blogger Post Settings"
+msgstr ""
+
+#: ../../addon/blogger/blogger.php:76
+msgid "Enable Blogger Post Plugin"
+msgstr ""
+
+#: ../../addon/blogger/blogger.php:81
+msgid "Blogger username"
+msgstr ""
+
+#: ../../addon/blogger/blogger.php:86
+msgid "Blogger password"
+msgstr ""
+
+#: ../../addon/blogger/blogger.php:91
+msgid "Blogger API URL"
+msgstr ""
+
+#: ../../addon/blogger/blogger.php:96
+msgid "Post to Blogger by default"
 msgstr ""
 
 #: ../../addon/posterous/posterous.php:36
@@ -4957,87 +5420,253 @@ msgstr ""
 msgid "Post to Posterous by default"
 msgstr ""
 
-#: ../../view/theme/diabook-blue/theme.php:142
-#: ../../view/theme/diabook/theme.php:145 ../../include/nav.php:103
-msgid "Directory"
+#: ../../view/theme/diabook/diabook-green/theme.php:29
+#: ../../view/theme/diabook/diabook-red/theme.php:28
+#: ../../view/theme/diabook/diabook-blue/theme.php:28
+#: ../../view/theme/diabook/theme.php:43
+#: ../../view/theme/diabook/diabook-dark/theme.php:29
+#: ../../view/theme/diabook/diabook-aerith/theme.php:29
+#: ../../view/theme/diabook/diabook-pink/theme.php:29
+msgid "Last users"
 msgstr ""
 
-#: ../../view/theme/diabook-blue/theme.php:143
-#: ../../view/theme/diabook/theme.php:146 ../../include/contact_widgets.php:34
+#: ../../view/theme/diabook/diabook-green/theme.php:58
+#: ../../view/theme/diabook/diabook-red/theme.php:57
+#: ../../view/theme/diabook/diabook-blue/theme.php:57
+#: ../../view/theme/diabook/theme.php:72
+#: ../../view/theme/diabook/diabook-dark/theme.php:58
+#: ../../view/theme/diabook/diabook-aerith/theme.php:58
+#: ../../view/theme/diabook/diabook-pink/theme.php:58
+msgid "Last likes"
+msgstr ""
+
+#: ../../view/theme/diabook/diabook-green/theme.php:103
+#: ../../view/theme/diabook/diabook-red/theme.php:102
+#: ../../view/theme/diabook/diabook-blue/theme.php:102
+#: ../../view/theme/diabook/theme.php:117
+#: ../../view/theme/diabook/diabook-dark/theme.php:103
+#: ../../view/theme/diabook/diabook-aerith/theme.php:103
+#: ../../view/theme/diabook/diabook-pink/theme.php:103
+msgid "Last photos"
+msgstr ""
+
+#: ../../view/theme/diabook/diabook-green/theme.php:141
+#: ../../view/theme/diabook/diabook-red/theme.php:139
+#: ../../view/theme/diabook/diabook-blue/theme.php:139
+#: ../../view/theme/diabook/theme.php:154
+#: ../../view/theme/diabook/diabook-dark/theme.php:141
+#: ../../view/theme/diabook/diabook-aerith/theme.php:141
+#: ../../view/theme/diabook/diabook-pink/theme.php:141
+msgid "Find Friends"
+msgstr ""
+
+#: ../../view/theme/diabook/diabook-green/theme.php:142
+#: ../../view/theme/diabook/diabook-red/theme.php:140
+#: ../../view/theme/diabook/diabook-blue/theme.php:140
+#: ../../view/theme/diabook/theme.php:155
+#: ../../view/theme/diabook/diabook-dark/theme.php:142
+#: ../../view/theme/diabook/diabook-aerith/theme.php:142
+#: ../../view/theme/diabook/diabook-pink/theme.php:142
+msgid "Local Directory"
+msgstr ""
+
+#: ../../view/theme/diabook/diabook-green/theme.php:144
+#: ../../view/theme/diabook/diabook-red/theme.php:142
+#: ../../view/theme/diabook/diabook-blue/theme.php:142
+#: ../../view/theme/diabook/theme.php:157
+#: ../../view/theme/diabook/diabook-dark/theme.php:144
+#: ../../view/theme/diabook/diabook-aerith/theme.php:144
+#: ../../view/theme/diabook/diabook-pink/theme.php:144
+#: ../../include/contact_widgets.php:35
 msgid "Similar Interests"
 msgstr ""
 
-#: ../../view/theme/diabook-blue/theme.php:145
-#: ../../view/theme/diabook/theme.php:148 ../../include/contact_widgets.php:35
+#: ../../view/theme/diabook/diabook-green/theme.php:146
+#: ../../view/theme/diabook/diabook-red/theme.php:144
+#: ../../view/theme/diabook/diabook-blue/theme.php:144
+#: ../../view/theme/diabook/theme.php:159
+#: ../../view/theme/diabook/diabook-dark/theme.php:146
+#: ../../view/theme/diabook/diabook-aerith/theme.php:146
+#: ../../view/theme/diabook/diabook-pink/theme.php:146
+#: ../../include/contact_widgets.php:37
 msgid "Invite Friends"
 msgstr ""
 
-#: ../../view/theme/diabook-blue/theme.php:160
-#: ../../view/theme/diabook-blue/theme.php:222
-#: ../../view/theme/diabook/theme.php:164
-#: ../../view/theme/diabook/theme.php:228
+#: ../../view/theme/diabook/diabook-green/theme.php:161
+#: ../../view/theme/diabook/diabook-green/theme.php:236
+#: ../../view/theme/diabook/diabook-red/theme.php:159
+#: ../../view/theme/diabook/diabook-red/theme.php:234
+#: ../../view/theme/diabook/diabook-blue/theme.php:159
+#: ../../view/theme/diabook/diabook-blue/theme.php:234
+#: ../../view/theme/diabook/theme.php:175
+#: ../../view/theme/diabook/theme.php:253
+#: ../../view/theme/diabook/diabook-dark/theme.php:161
+#: ../../view/theme/diabook/diabook-dark/theme.php:236
+#: ../../view/theme/diabook/diabook-aerith/theme.php:161
+#: ../../view/theme/diabook/diabook-aerith/theme.php:236
+#: ../../view/theme/diabook/diabook-pink/theme.php:161
+#: ../../view/theme/diabook/diabook-pink/theme.php:236
 msgid "Community Pages"
 msgstr ""
 
-#: ../../view/theme/diabook-blue/theme.php:215
-#: ../../view/theme/diabook/theme.php:221 ../../include/nav.php:49
-#: ../../include/nav.php:115
+#: ../../view/theme/diabook/diabook-green/theme.php:194
+#: ../../view/theme/diabook/diabook-red/theme.php:192
+#: ../../view/theme/diabook/diabook-blue/theme.php:192
+#: ../../view/theme/diabook/theme.php:208
+#: ../../view/theme/diabook/diabook-dark/theme.php:194
+#: ../../view/theme/diabook/diabook-aerith/theme.php:194
+#: ../../view/theme/diabook/diabook-pink/theme.php:194
+msgid "Help or @NewHere ?"
+msgstr ""
+
+#: ../../view/theme/diabook/diabook-green/theme.php:200
+#: ../../view/theme/diabook/diabook-red/theme.php:198
+#: ../../view/theme/diabook/diabook-blue/theme.php:198
+#: ../../view/theme/diabook/theme.php:214
+#: ../../view/theme/diabook/diabook-dark/theme.php:200
+#: ../../view/theme/diabook/diabook-aerith/theme.php:200
+#: ../../view/theme/diabook/diabook-pink/theme.php:200
+msgid "Connect Services"
+msgstr ""
+
+#: ../../view/theme/diabook/diabook-green/theme.php:229
+#: ../../view/theme/diabook/diabook-red/theme.php:227
+#: ../../view/theme/diabook/diabook-blue/theme.php:227
+#: ../../view/theme/diabook/theme.php:246
+#: ../../view/theme/diabook/diabook-dark/theme.php:229
+#: ../../view/theme/diabook/diabook-aerith/theme.php:229
+#: ../../view/theme/diabook/diabook-pink/theme.php:229
+#: ../../include/nav.php:49 ../../include/nav.php:115
 msgid "Your posts and conversations"
 msgstr ""
 
-#: ../../view/theme/diabook-blue/theme.php:216
-#: ../../view/theme/diabook/theme.php:222 ../../include/nav.php:50
+#: ../../view/theme/diabook/diabook-green/theme.php:230
+#: ../../view/theme/diabook/diabook-red/theme.php:228
+#: ../../view/theme/diabook/diabook-blue/theme.php:228
+#: ../../view/theme/diabook/theme.php:247
+#: ../../view/theme/diabook/diabook-dark/theme.php:230
+#: ../../view/theme/diabook/diabook-aerith/theme.php:230
+#: ../../view/theme/diabook/diabook-pink/theme.php:230
+#: ../../include/nav.php:50
 msgid "Your profile page"
 msgstr ""
 
-#: ../../view/theme/diabook-blue/theme.php:217
-#: ../../view/theme/diabook/theme.php:223
+#: ../../view/theme/diabook/diabook-green/theme.php:231
+#: ../../view/theme/diabook/diabook-red/theme.php:229
+#: ../../view/theme/diabook/diabook-blue/theme.php:229
+#: ../../view/theme/diabook/theme.php:248
+#: ../../view/theme/diabook/diabook-dark/theme.php:231
+#: ../../view/theme/diabook/diabook-aerith/theme.php:231
+#: ../../view/theme/diabook/diabook-pink/theme.php:231
 msgid "Your contacts"
 msgstr ""
 
-#: ../../view/theme/diabook-blue/theme.php:218
-#: ../../view/theme/diabook/theme.php:224 ../../include/nav.php:51
-#: ../../boot.php:1391
-msgid "Photos"
-msgstr ""
-
-#: ../../view/theme/diabook-blue/theme.php:218
-#: ../../view/theme/diabook/theme.php:224 ../../include/nav.php:51
+#: ../../view/theme/diabook/diabook-green/theme.php:232
+#: ../../view/theme/diabook/diabook-red/theme.php:230
+#: ../../view/theme/diabook/diabook-blue/theme.php:230
+#: ../../view/theme/diabook/theme.php:249
+#: ../../view/theme/diabook/diabook-dark/theme.php:232
+#: ../../view/theme/diabook/diabook-aerith/theme.php:232
+#: ../../view/theme/diabook/diabook-pink/theme.php:232
+#: ../../include/nav.php:51
 msgid "Your photos"
 msgstr ""
 
-#: ../../view/theme/diabook-blue/theme.php:219
-#: ../../view/theme/diabook/theme.php:225 ../../include/nav.php:52
+#: ../../view/theme/diabook/diabook-green/theme.php:233
+#: ../../view/theme/diabook/diabook-red/theme.php:231
+#: ../../view/theme/diabook/diabook-blue/theme.php:231
+#: ../../view/theme/diabook/theme.php:250
+#: ../../view/theme/diabook/diabook-dark/theme.php:233
+#: ../../view/theme/diabook/diabook-aerith/theme.php:233
+#: ../../view/theme/diabook/diabook-pink/theme.php:233
+#: ../../include/nav.php:52
 msgid "Your events"
 msgstr ""
 
-#: ../../view/theme/diabook-blue/theme.php:220
-#: ../../view/theme/diabook/theme.php:226 ../../include/nav.php:53
+#: ../../view/theme/diabook/diabook-green/theme.php:234
+#: ../../view/theme/diabook/diabook-red/theme.php:232
+#: ../../view/theme/diabook/diabook-blue/theme.php:232
+#: ../../view/theme/diabook/theme.php:251
+#: ../../view/theme/diabook/diabook-dark/theme.php:234
+#: ../../view/theme/diabook/diabook-aerith/theme.php:234
+#: ../../view/theme/diabook/diabook-pink/theme.php:234
+#: ../../include/nav.php:53
 msgid "Personal notes"
 msgstr ""
 
-#: ../../view/theme/diabook-blue/theme.php:220
-#: ../../view/theme/diabook/theme.php:226 ../../include/nav.php:53
+#: ../../view/theme/diabook/diabook-green/theme.php:234
+#: ../../view/theme/diabook/diabook-red/theme.php:232
+#: ../../view/theme/diabook/diabook-blue/theme.php:232
+#: ../../view/theme/diabook/theme.php:251
+#: ../../view/theme/diabook/diabook-dark/theme.php:234
+#: ../../view/theme/diabook/diabook-aerith/theme.php:234
+#: ../../view/theme/diabook/diabook-pink/theme.php:234
+#: ../../include/nav.php:53
 msgid "Your personal photos"
 msgstr ""
 
-#: ../../view/theme/quattro/theme.php:17
+#: ../../view/theme/diabook/diabook-green/config.php:78
+#: ../../view/theme/diabook/diabook-red/config.php:78
+#: ../../view/theme/diabook/diabook-blue/config.php:78
+#: ../../view/theme/diabook/diabook-dark/config.php:78
+#: ../../view/theme/diabook/diabook-aerith/config.php:78
+#: ../../view/theme/diabook/diabook-pink/config.php:78
+#: ../../view/theme/diabook/config.php:93
+#: ../../view/theme/quattro/config.php:54
 msgid "Theme settings"
 msgstr ""
 
-#: ../../view/theme/quattro/theme.php:18
+#: ../../view/theme/diabook/diabook-green/config.php:79
+#: ../../view/theme/diabook/diabook-red/config.php:79
+#: ../../view/theme/diabook/diabook-blue/config.php:79
+#: ../../view/theme/diabook/diabook-dark/config.php:79
+#: ../../view/theme/diabook/diabook-aerith/config.php:79
+#: ../../view/theme/diabook/diabook-pink/config.php:79
+#: ../../view/theme/diabook/config.php:94
+msgid "Set font-size for posts and comments"
+msgstr ""
+
+#: ../../view/theme/diabook/diabook-green/config.php:80
+#: ../../view/theme/diabook/diabook-red/config.php:80
+#: ../../view/theme/diabook/diabook-blue/config.php:80
+#: ../../view/theme/diabook/diabook-dark/config.php:80
+#: ../../view/theme/diabook/diabook-aerith/config.php:80
+#: ../../view/theme/diabook/diabook-pink/config.php:80
+#: ../../view/theme/diabook/config.php:95
+msgid "Set line-height for posts and comments"
+msgstr ""
+
+#: ../../view/theme/diabook/diabook-green/config.php:81
+#: ../../view/theme/diabook/diabook-red/config.php:81
+#: ../../view/theme/diabook/diabook-blue/config.php:81
+#: ../../view/theme/diabook/diabook-dark/config.php:81
+#: ../../view/theme/diabook/diabook-aerith/config.php:81
+#: ../../view/theme/diabook/diabook-pink/config.php:81
+#: ../../view/theme/diabook/config.php:96
+msgid "Set resolution for middle column"
+msgstr ""
+
+#: ../../view/theme/diabook/config.php:97
+msgid "Set color scheme"
+msgstr ""
+
+#: ../../view/theme/quattro/config.php:55
 msgid "Alignment"
 msgstr ""
 
-#: ../../view/theme/quattro/theme.php:18
+#: ../../view/theme/quattro/config.php:55
 msgid "Left"
 msgstr ""
 
-#: ../../view/theme/quattro/theme.php:18
+#: ../../view/theme/quattro/config.php:55
 msgid "Center"
 msgstr ""
 
-#: ../../include/profile_advanced.php:17 ../../boot.php:1032
+#: ../../view/theme/quattro/config.php:56
+msgid "Color scheme"
+msgstr ""
+
+#: ../../include/profile_advanced.php:17 ../../boot.php:1085
 msgid "Gender:"
 msgstr ""
 
@@ -5049,8 +5678,8 @@ msgstr ""
 msgid "j F"
 msgstr ""
 
-#: ../../include/profile_advanced.php:30 ../../include/datetime.php:438
-#: ../../include/items.php:1384
+#: ../../include/profile_advanced.php:30 ../../include/datetime.php:448
+#: ../../include/items.php:1403
 msgid "Birthday:"
 msgstr ""
 
@@ -5058,11 +5687,11 @@ msgstr ""
 msgid "Age:"
 msgstr ""
 
-#: ../../include/profile_advanced.php:37 ../../boot.php:1035
+#: ../../include/profile_advanced.php:37 ../../boot.php:1088
 msgid "Status:"
 msgstr ""
 
-#: ../../include/profile_advanced.php:45 ../../boot.php:1037
+#: ../../include/profile_advanced.php:45 ../../boot.php:1090
 msgid "Homepage:"
 msgstr ""
 
@@ -5311,6 +5940,14 @@ msgid "Unavailable"
 msgstr ""
 
 #: ../../include/profile_selectors.php:33
+msgid "Has crush"
+msgstr ""
+
+#: ../../include/profile_selectors.php:33
+msgid "Infatuated"
+msgstr ""
+
+#: ../../include/profile_selectors.php:33
 msgid "Dating"
 msgstr ""
 
@@ -5343,6 +5980,10 @@ msgid "Married"
 msgstr ""
 
 #: ../../include/profile_selectors.php:33
+msgid "Imaginarily married"
+msgstr ""
+
+#: ../../include/profile_selectors.php:33
 msgid "Partners"
 msgstr ""
 
@@ -5351,11 +5992,15 @@ msgid "Cohabiting"
 msgstr ""
 
 #: ../../include/profile_selectors.php:33
+msgid "Common law"
+msgstr ""
+
+#: ../../include/profile_selectors.php:33
 msgid "Happy"
 msgstr ""
 
 #: ../../include/profile_selectors.php:33
-msgid "Not Looking"
+msgid "Not looking"
 msgstr ""
 
 #: ../../include/profile_selectors.php:33
@@ -5379,6 +6024,10 @@ msgid "Divorced"
 msgstr ""
 
 #: ../../include/profile_selectors.php:33
+msgid "Imaginarily divorced"
+msgstr ""
+
+#: ../../include/profile_selectors.php:33
 msgid "Widowed"
 msgstr ""
 
@@ -5387,7 +6036,7 @@ msgid "Uncertain"
 msgstr ""
 
 #: ../../include/profile_selectors.php:33
-msgid "Complicated"
+msgid "It's complicated"
 msgstr ""
 
 #: ../../include/profile_selectors.php:33
@@ -5406,184 +6055,184 @@ msgstr ""
 msgid "Finishes:"
 msgstr ""
 
-#: ../../include/delivery.php:426 ../../include/notifier.php:640
+#: ../../include/delivery.php:434 ../../include/notifier.php:651
 msgid "(no subject)"
 msgstr ""
 
-#: ../../include/delivery.php:433 ../../include/enotify.php:23
-#: ../../include/notifier.php:647
+#: ../../include/delivery.php:441 ../../include/enotify.php:23
+#: ../../include/notifier.php:658
 msgid "noreply"
 msgstr ""
 
-#: ../../include/text.php:238
+#: ../../include/text.php:243
 msgid "prev"
 msgstr ""
 
-#: ../../include/text.php:240
+#: ../../include/text.php:245
 msgid "first"
 msgstr ""
 
-#: ../../include/text.php:269
+#: ../../include/text.php:274
 msgid "last"
 msgstr ""
 
-#: ../../include/text.php:272
+#: ../../include/text.php:277
 msgid "next"
 msgstr ""
 
-#: ../../include/text.php:563
+#: ../../include/text.php:568
 msgid "No contacts"
 msgstr ""
 
-#: ../../include/text.php:572
+#: ../../include/text.php:577
 #, php-format
 msgid "%d Contact"
 msgid_plural "%d Contacts"
 msgstr[0] ""
 msgstr[1] ""
 
-#: ../../include/text.php:645 ../../include/nav.php:91
+#: ../../include/text.php:650 ../../include/nav.php:91
 msgid "Search"
 msgstr ""
 
-#: ../../include/text.php:822
+#: ../../include/text.php:831
 msgid "Monday"
 msgstr ""
 
-#: ../../include/text.php:822
+#: ../../include/text.php:831
 msgid "Tuesday"
 msgstr ""
 
-#: ../../include/text.php:822
+#: ../../include/text.php:831
 msgid "Wednesday"
 msgstr ""
 
-#: ../../include/text.php:822
+#: ../../include/text.php:831
 msgid "Thursday"
 msgstr ""
 
-#: ../../include/text.php:822
+#: ../../include/text.php:831
 msgid "Friday"
 msgstr ""
 
-#: ../../include/text.php:822
+#: ../../include/text.php:831
 msgid "Saturday"
 msgstr ""
 
-#: ../../include/text.php:822
+#: ../../include/text.php:831
 msgid "Sunday"
 msgstr ""
 
-#: ../../include/text.php:826
+#: ../../include/text.php:835
 msgid "January"
 msgstr ""
 
-#: ../../include/text.php:826
+#: ../../include/text.php:835
 msgid "February"
 msgstr ""
 
-#: ../../include/text.php:826
+#: ../../include/text.php:835
 msgid "March"
 msgstr ""
 
-#: ../../include/text.php:826
+#: ../../include/text.php:835
 msgid "April"
 msgstr ""
 
-#: ../../include/text.php:826
+#: ../../include/text.php:835
 msgid "May"
 msgstr ""
 
-#: ../../include/text.php:826
+#: ../../include/text.php:835
 msgid "June"
 msgstr ""
 
-#: ../../include/text.php:826
+#: ../../include/text.php:835
 msgid "July"
 msgstr ""
 
-#: ../../include/text.php:826
+#: ../../include/text.php:835
 msgid "August"
 msgstr ""
 
-#: ../../include/text.php:826
+#: ../../include/text.php:835
 msgid "September"
 msgstr ""
 
-#: ../../include/text.php:826
+#: ../../include/text.php:835
 msgid "October"
 msgstr ""
 
-#: ../../include/text.php:826
+#: ../../include/text.php:835
 msgid "November"
 msgstr ""
 
-#: ../../include/text.php:826
+#: ../../include/text.php:835
 msgid "December"
 msgstr ""
 
-#: ../../include/text.php:910
+#: ../../include/text.php:919
 msgid "bytes"
 msgstr ""
 
-#: ../../include/text.php:927
+#: ../../include/text.php:936
 msgid "Categories:"
 msgstr ""
 
-#: ../../include/text.php:939
+#: ../../include/text.php:948
 msgid "remove"
 msgstr ""
 
-#: ../../include/text.php:939
+#: ../../include/text.php:948
 msgid "[remove]"
 msgstr ""
 
-#: ../../include/text.php:942
+#: ../../include/text.php:951
 msgid "Filed under:"
 msgstr ""
 
-#: ../../include/text.php:958 ../../include/text.php:970
+#: ../../include/text.php:967 ../../include/text.php:979
 msgid "Click to open/close"
 msgstr ""
 
-#: ../../include/text.php:1062
-msgid "Select an alternate language"
+#: ../../include/text.php:1084
+msgid "default"
 msgstr ""
 
-#: ../../include/text.php:1074
-msgid "default"
+#: ../../include/text.php:1096
+msgid "Select an alternate language"
 msgstr ""
 
-#: ../../include/text.php:1290
+#: ../../include/text.php:1306
 msgid "activity"
 msgstr ""
 
-#: ../../include/text.php:1292
+#: ../../include/text.php:1308
 msgid "comment"
 msgstr ""
 
-#: ../../include/text.php:1293
+#: ../../include/text.php:1309
 msgid "post"
 msgstr ""
 
-#: ../../include/text.php:1335
+#: ../../include/text.php:1464
 msgid "Item filed"
 msgstr ""
 
-#: ../../include/diaspora.php:570
+#: ../../include/diaspora.php:582
 msgid "Sharing notification from Diaspora network"
 msgstr ""
 
-#: ../../include/diaspora.php:1953
+#: ../../include/diaspora.php:1969
 msgid "Attachments:"
 msgstr ""
 
-#: ../../include/diaspora.php:2136
+#: ../../include/diaspora.php:2152
 #, php-format
 msgid "[Relayed] Comment authored by %s from network %s"
 msgstr ""
 
-#: ../../include/network.php:814
+#: ../../include/network.php:824
 msgid "view full size"
 msgstr ""
 
@@ -5622,7 +6271,11 @@ msgstr ""
 msgid "Create a new group"
 msgstr ""
 
-#: ../../include/nav.php:46 ../../boot.php:759
+#: ../../include/group.php:215
+msgid "Contacts not in any group"
+msgstr ""
+
+#: ../../include/nav.php:46 ../../boot.php:795
 msgid "Logout"
 msgstr ""
 
@@ -5630,7 +6283,7 @@ msgstr ""
 msgid "End this session"
 msgstr ""
 
-#: ../../include/nav.php:49 ../../boot.php:1381
+#: ../../include/nav.php:49 ../../boot.php:1453
 msgid "Status"
 msgstr ""
 
@@ -5667,6 +6320,10 @@ msgid "Conversations on this site"
 msgstr ""
 
 #: ../../include/nav.php:103
+msgid "Directory"
+msgstr ""
+
+#: ../../include/nav.php:103
 msgid "People directory"
 msgstr ""
 
@@ -5706,11 +6363,11 @@ msgstr ""
 msgid "Manage other pages"
 msgstr ""
 
-#: ../../include/nav.php:138 ../../boot.php:990
+#: ../../include/nav.php:138 ../../boot.php:1043
 msgid "Profiles"
 msgstr ""
 
-#: ../../include/nav.php:138 ../../boot.php:990
+#: ../../include/nav.php:138 ../../boot.php:1043
 msgid "Manage/edit profiles"
 msgstr ""
 
@@ -5742,123 +6399,141 @@ msgstr ""
 msgid "Example: bob@example.com, http://example.com/barbara"
 msgstr ""
 
-#: ../../include/contact_widgets.php:22
+#: ../../include/contact_widgets.php:23
 #, php-format
 msgid "%d invitation available"
 msgid_plural "%d invitations available"
 msgstr[0] ""
 msgstr[1] ""
 
-#: ../../include/contact_widgets.php:28
+#: ../../include/contact_widgets.php:29
 msgid "Find People"
 msgstr ""
 
-#: ../../include/contact_widgets.php:29
+#: ../../include/contact_widgets.php:30
 msgid "Enter name or interest"
 msgstr ""
 
-#: ../../include/contact_widgets.php:30
+#: ../../include/contact_widgets.php:31
 msgid "Connect/Follow"
 msgstr ""
 
-#: ../../include/contact_widgets.php:31
+#: ../../include/contact_widgets.php:32
 msgid "Examples: Robert Morgenstein, Fishing"
 msgstr ""
 
-#: ../../include/contact_widgets.php:66
+#: ../../include/contact_widgets.php:36
+msgid "Random Profile"
+msgstr ""
+
+#: ../../include/contact_widgets.php:68
 msgid "Networks"
 msgstr ""
 
-#: ../../include/contact_widgets.php:69
+#: ../../include/contact_widgets.php:71
 msgid "All Networks"
 msgstr ""
 
-#: ../../include/contact_widgets.php:96
+#: ../../include/contact_widgets.php:98
 msgid "Saved Folders"
 msgstr ""
 
-#: ../../include/contact_widgets.php:99
+#: ../../include/contact_widgets.php:101 ../../include/contact_widgets.php:129
 msgid "Everything"
 msgstr ""
 
+#: ../../include/contact_widgets.php:126
+msgid "Categories"
+msgstr ""
+
 #: ../../include/auth.php:29
 msgid "Logged out."
 msgstr ""
 
+#: ../../include/auth.php:106
+msgid ""
+"We encountered a problem while logging in with the OpenID you provided. "
+"Please check the correct spelling of the ID."
+msgstr ""
+
+#: ../../include/auth.php:106
+msgid "The error message was:"
+msgstr ""
+
 #: ../../include/datetime.php:43 ../../include/datetime.php:45
 msgid "Miscellaneous"
 msgstr ""
 
-#: ../../include/datetime.php:121 ../../include/datetime.php:253
+#: ../../include/datetime.php:131 ../../include/datetime.php:263
 msgid "year"
 msgstr ""
 
-#: ../../include/datetime.php:126 ../../include/datetime.php:254
+#: ../../include/datetime.php:136 ../../include/datetime.php:264
 msgid "month"
 msgstr ""
 
-#: ../../include/datetime.php:131 ../../include/datetime.php:256
+#: ../../include/datetime.php:141 ../../include/datetime.php:266
 msgid "day"
 msgstr ""
 
-#: ../../include/datetime.php:244
+#: ../../include/datetime.php:254
 msgid "never"
 msgstr ""
 
-#: ../../include/datetime.php:250
+#: ../../include/datetime.php:260
 msgid "less than a second ago"
 msgstr ""
 
-#: ../../include/datetime.php:253
+#: ../../include/datetime.php:263
 msgid "years"
 msgstr ""
 
-#: ../../include/datetime.php:254
+#: ../../include/datetime.php:264
 msgid "months"
 msgstr ""
 
-#: ../../include/datetime.php:255
+#: ../../include/datetime.php:265
 msgid "week"
 msgstr ""
 
-#: ../../include/datetime.php:255
+#: ../../include/datetime.php:265
 msgid "weeks"
 msgstr ""
 
-#: ../../include/datetime.php:256
+#: ../../include/datetime.php:266
 msgid "days"
 msgstr ""
 
-#: ../../include/datetime.php:257
+#: ../../include/datetime.php:267
 msgid "hour"
 msgstr ""
 
-#: ../../include/datetime.php:257
+#: ../../include/datetime.php:267
 msgid "hours"
 msgstr ""
 
-#: ../../include/datetime.php:258
+#: ../../include/datetime.php:268
 msgid "minute"
 msgstr ""
 
-#: ../../include/datetime.php:258
+#: ../../include/datetime.php:268
 msgid "minutes"
 msgstr ""
 
-#: ../../include/datetime.php:259
+#: ../../include/datetime.php:269
 msgid "second"
 msgstr ""
 
-#: ../../include/datetime.php:259
+#: ../../include/datetime.php:269
 msgid "seconds"
 msgstr ""
 
-#: ../../include/datetime.php:267
+#: ../../include/datetime.php:277
 #, php-format
 msgid "%1$d %2$s ago"
 msgstr ""
 
-#: ../../include/poller.php:533
+#: ../../include/poller.php:543
 msgid "From: "
 msgstr ""
 
@@ -5866,7 +6541,7 @@ msgstr ""
 msgid "$1 wrote:"
 msgstr ""
 
-#: ../../include/bbcode.php:237 ../../include/bbcode.php:303
+#: ../../include/bbcode.php:238 ../../include/bbcode.php:304
 msgid "Image/photo"
 msgstr ""
 
@@ -5875,7 +6550,7 @@ msgstr ""
 msgid "Cannot locate DNS info for database server '%s'"
 msgstr ""
 
-#: ../../include/message.php:14
+#: ../../include/message.php:15 ../../include/message.php:171
 msgid "[no subject]"
 msgstr ""
 
@@ -6079,11 +6754,11 @@ msgstr ""
 msgid "Please visit %s to approve or reject the suggestion."
 msgstr ""
 
-#: ../../include/items.php:2648
+#: ../../include/items.php:2698
 msgid "A new person is sharing with you at "
 msgstr ""
 
-#: ../../include/items.php:2648
+#: ../../include/items.php:2698
 msgid "You have a new follower at "
 msgstr ""
 
@@ -6092,6 +6767,10 @@ msgstr ""
 msgid "image/photo"
 msgstr ""
 
+#: ../../include/bb2diaspora.php:102
+msgid "link"
+msgstr ""
+
 #: ../../include/security.php:21
 msgid "Welcome "
 msgstr ""
@@ -6107,28 +6786,33 @@ msgstr ""
 #: ../../include/security.php:329
 msgid ""
 "The form security token was not correct. This probably happened because the "
-"form has been opened for too long (>3 hours) before subitting it."
+"form has been opened for too long (>3 hours) before submitting it."
 msgstr ""
 
-#: ../../include/Contact.php:137 ../../include/conversation.php:813
-msgid "View status"
+#: ../../include/Contact.php:145 ../../include/conversation.php:809
+msgid "View Status"
 msgstr ""
 
-#: ../../include/Contact.php:138 ../../include/conversation.php:814
-msgid "View profile"
+#: ../../include/Contact.php:146 ../../include/conversation.php:810
+msgid "View Profile"
 msgstr ""
 
-#: ../../include/Contact.php:139 ../../include/conversation.php:815
-msgid "View photos"
+#: ../../include/Contact.php:147 ../../include/conversation.php:811
+msgid "View Photos"
 msgstr ""
 
-#: ../../include/Contact.php:140 ../../include/Contact.php:153
-#: ../../include/conversation.php:816
-msgid "View recent"
+#: ../../include/Contact.php:148 ../../include/Contact.php:161
+#: ../../include/conversation.php:812
+msgid "Network Posts"
 msgstr ""
 
-#: ../../include/Contact.php:142 ../../include/Contact.php:153
-#: ../../include/conversation.php:818
+#: ../../include/Contact.php:149 ../../include/Contact.php:161
+#: ../../include/conversation.php:813
+msgid "Edit Contact"
+msgstr ""
+
+#: ../../include/Contact.php:150 ../../include/Contact.php:161
+#: ../../include/conversation.php:814
 msgid "Send PM"
 msgstr ""
 
@@ -6145,18 +6829,18 @@ msgstr ""
 msgid "Select"
 msgstr ""
 
-#: ../../include/conversation.php:334 ../../include/conversation.php:672
-#: ../../include/conversation.php:673
+#: ../../include/conversation.php:334 ../../include/conversation.php:668
+#: ../../include/conversation.php:669
 #, php-format
 msgid "View %s's profile @ %s"
 msgstr ""
 
-#: ../../include/conversation.php:344 ../../include/conversation.php:684
+#: ../../include/conversation.php:344 ../../include/conversation.php:680
 #, php-format
 msgid "%s from %s"
 msgstr ""
 
-#: ../../include/conversation.php:360
+#: ../../include/conversation.php:359
 msgid "View in context"
 msgstr ""
 
@@ -6207,181 +6891,185 @@ msgstr ""
 msgid "save to folder"
 msgstr ""
 
-#: ../../include/conversation.php:674
+#: ../../include/conversation.php:670
 msgid "to"
 msgstr ""
 
-#: ../../include/conversation.php:675
+#: ../../include/conversation.php:671
 msgid "Wall-to-Wall"
 msgstr ""
 
-#: ../../include/conversation.php:676
+#: ../../include/conversation.php:672
 msgid "via Wall-To-Wall:"
 msgstr ""
 
-#: ../../include/conversation.php:721
+#: ../../include/conversation.php:717
 msgid "Delete Selected Items"
 msgstr ""
 
-#: ../../include/conversation.php:872
+#: ../../include/conversation.php:868
 #, php-format
 msgid "%s likes this."
 msgstr ""
 
-#: ../../include/conversation.php:872
+#: ../../include/conversation.php:868
 #, php-format
 msgid "%s doesn't like this."
 msgstr ""
 
-#: ../../include/conversation.php:876
+#: ../../include/conversation.php:872
 #, php-format
 msgid "<span  %1$s>%2$d people</span> like this."
 msgstr ""
 
-#: ../../include/conversation.php:878
+#: ../../include/conversation.php:874
 #, php-format
 msgid "<span  %1$s>%2$d people</span> don't like this."
 msgstr ""
 
-#: ../../include/conversation.php:884
+#: ../../include/conversation.php:880
 msgid "and"
 msgstr ""
 
-#: ../../include/conversation.php:887
+#: ../../include/conversation.php:883
 #, php-format
 msgid ", and %d other people"
 msgstr ""
 
-#: ../../include/conversation.php:888
+#: ../../include/conversation.php:884
 #, php-format
 msgid "%s like this."
 msgstr ""
 
-#: ../../include/conversation.php:888
+#: ../../include/conversation.php:884
 #, php-format
 msgid "%s don't like this."
 msgstr ""
 
-#: ../../include/conversation.php:913
+#: ../../include/conversation.php:909
 msgid "Visible to <strong>everybody</strong>"
 msgstr ""
 
-#: ../../include/conversation.php:915
+#: ../../include/conversation.php:911
 msgid "Please enter a video link/URL:"
 msgstr ""
 
-#: ../../include/conversation.php:916
+#: ../../include/conversation.php:912
 msgid "Please enter an audio link/URL:"
 msgstr ""
 
-#: ../../include/conversation.php:917
+#: ../../include/conversation.php:913
 msgid "Tag term:"
 msgstr ""
 
-#: ../../include/conversation.php:919
+#: ../../include/conversation.php:915
 msgid "Where are you right now?"
 msgstr ""
 
-#: ../../include/conversation.php:962
+#: ../../include/conversation.php:958
 msgid "upload photo"
 msgstr ""
 
-#: ../../include/conversation.php:964
+#: ../../include/conversation.php:960
 msgid "attach file"
 msgstr ""
 
-#: ../../include/conversation.php:966
+#: ../../include/conversation.php:962
 msgid "web link"
 msgstr ""
 
-#: ../../include/conversation.php:967
+#: ../../include/conversation.php:963
 msgid "Insert video link"
 msgstr ""
 
-#: ../../include/conversation.php:968
+#: ../../include/conversation.php:964
 msgid "video link"
 msgstr ""
 
-#: ../../include/conversation.php:969
+#: ../../include/conversation.php:965
 msgid "Insert audio link"
 msgstr ""
 
-#: ../../include/conversation.php:970
+#: ../../include/conversation.php:966
 msgid "audio link"
 msgstr ""
 
-#: ../../include/conversation.php:972
+#: ../../include/conversation.php:968
 msgid "set location"
 msgstr ""
 
-#: ../../include/conversation.php:974
+#: ../../include/conversation.php:970
 msgid "clear location"
 msgstr ""
 
-#: ../../include/conversation.php:979
+#: ../../include/conversation.php:977
 msgid "permissions"
 msgstr ""
 
-#: ../../boot.php:487
+#: ../../boot.php:494
 msgid "Delete this item?"
 msgstr ""
 
-#: ../../boot.php:490
+#: ../../boot.php:497
 msgid "show fewer"
 msgstr ""
 
-#: ../../boot.php:738
+#: ../../boot.php:774
 msgid "Create a New Account"
 msgstr ""
 
-#: ../../boot.php:762
+#: ../../boot.php:798
 msgid "Nickname or Email address: "
 msgstr ""
 
-#: ../../boot.php:763
+#: ../../boot.php:799
 msgid "Password: "
 msgstr ""
 
-#: ../../boot.php:766
+#: ../../boot.php:802
 msgid "Or login using OpenID: "
 msgstr ""
 
-#: ../../boot.php:772
+#: ../../boot.php:808
 msgid "Forgot your password?"
 msgstr ""
 
-#: ../../boot.php:929
+#: ../../boot.php:975
 msgid "Edit profile"
 msgstr ""
 
-#: ../../boot.php:1096 ../../boot.php:1167
+#: ../../boot.php:1035
+msgid "Message"
+msgstr ""
+
+#: ../../boot.php:1151 ../../boot.php:1223
 msgid "g A l F d"
 msgstr ""
 
-#: ../../boot.php:1097 ../../boot.php:1168
+#: ../../boot.php:1152 ../../boot.php:1224
 msgid "F d"
 msgstr ""
 
-#: ../../boot.php:1122
+#: ../../boot.php:1177
 msgid "Birthday Reminders"
 msgstr ""
 
-#: ../../boot.php:1123
+#: ../../boot.php:1178
 msgid "Birthdays this week:"
 msgstr ""
 
-#: ../../boot.php:1146 ../../boot.php:1210
+#: ../../boot.php:1201 ../../boot.php:1266
 msgid "[today]"
 msgstr ""
 
-#: ../../boot.php:1191
+#: ../../boot.php:1247
 msgid "Event Reminders"
 msgstr ""
 
-#: ../../boot.php:1192
+#: ../../boot.php:1248
 msgid "Events this week:"
 msgstr ""
 
-#: ../../boot.php:1204
+#: ../../boot.php:1260
 msgid "[No description]"
 msgstr ""
diff --git a/util/php2po.php b/util/php2po.php
index d3ce0a5af..d3ce0a5af 100755..100644
--- a/util/php2po.php
+++ b/util/php2po.php
diff --git a/util/po2php.php b/util/po2php.php
index c703172af..c703172af 100755..100644
--- a/util/po2php.php
+++ b/util/po2php.php
diff --git a/util/run_xgettext.sh b/util/run_xgettext.sh
index 6ea603c83..6ea603c83 100755..100644
--- a/util/run_xgettext.sh
+++ b/util/run_xgettext.sh
diff --git a/util/strings.php b/util/strings.php
index e70766d86..e70766d86 100755..100644
--- a/util/strings.php
+++ b/util/strings.php
diff --git a/util/typo.php b/util/typo.php
index e20cce86a..7c275f3ca 100755..100644
--- a/util/typo.php
+++ b/util/typo.php
@@ -33,6 +33,8 @@
 		$files = glob($dir . '/*.php');
 		foreach($files as $file) {
 			echo $file . "\n";
+			if(stristr($file,'jappixmini/proxy.php'))
+				continue;
 			include_once($file);
 		}
 	}
diff --git a/util/typohelper.php b/util/typohelper.php
index 589702a02..589702a02 100755..100644
--- a/util/typohelper.php
+++ b/util/typohelper.php
diff --git a/view/.htaccess b/view/.htaccess
index 559a5fcc0..559a5fcc0 100755..100644
--- a/view/.htaccess
+++ b/view/.htaccess
diff --git a/view/404.tpl b/view/404.tpl
index bf4d4e949..bf4d4e949 100755..100644
--- a/view/404.tpl
+++ b/view/404.tpl
diff --git a/view/admin_aside.tpl b/view/admin_aside.tpl
index 4bf7ce9d3..4bf7ce9d3 100755..100644
--- a/view/admin_aside.tpl
+++ b/view/admin_aside.tpl
diff --git a/view/admin_logs.tpl b/view/admin_logs.tpl
index 9d133b155..b777cf420 100755..100644
--- a/view/admin_logs.tpl
+++ b/view/admin_logs.tpl
@@ -2,6 +2,7 @@
 	<h1>$title - $page</h1>
 	
 	<form action="$baseurl/admin/logs" method="post">
+    <input type='hidden' name='form_security_token' value='$form_security_token'>
 
 	{{ inc field_checkbox.tpl with $field=$debugging }}{{ endinc }}
 	{{ inc field_input.tpl with $field=$logfile }}{{ endinc }}
diff --git a/view/admin_plugins.tpl b/view/admin_plugins.tpl
index 8367ff6a1..74b56bb4e 100755..100644
--- a/view/admin_plugins.tpl
+++ b/view/admin_plugins.tpl
@@ -4,7 +4,7 @@
 		<ul id='pluginslist'>
 		{{ for $plugins as $p }}
 			<li class='plugin $p.1'>
-				<a class='toggleplugin' href='$baseurl/admin/$function/$p.0?a=t' title="{{if $p.1==on }}Disable{{ else }}Enable{{ endif }}" ><span class='icon $p.1'></span></a>
+				<a class='toggleplugin' href='$baseurl/admin/$function/$p.0?a=t&amp;t=$form_security_token' title="{{if $p.1==on }}Disable{{ else }}Enable{{ endif }}" ><span class='icon $p.1'></span></a>
 				<a href='$baseurl/admin/$function/$p.0'><span class='name'>$p.2.name</span></a> - <span class="version">$p.2.version</span>
 				{{ if $p.2.experimental }} $experimental {{ endif }}{{ if $p.2.unsupported }} $unsupported {{ endif }}
 
diff --git a/view/admin_plugins_details.tpl b/view/admin_plugins_details.tpl
index cbaef2d66..931c7b83c 100755..100644
--- a/view/admin_plugins_details.tpl
+++ b/view/admin_plugins_details.tpl
@@ -1,7 +1,7 @@
 <div id='adminpage'>
 	<h1>$title - $page</h1>
 	
-	<p><span class='toggleplugin icon $status'></span> $info.name - $info.version : <a href="$baseurl/admin/$function/$plugin/?a=t">$action</a></p>
+	<p><span class='toggleplugin icon $status'></span> $info.name - $info.version : <a href="$baseurl/admin/$function/$plugin/?a=t&amp;t=$form_security_token">$action</a></p>
 	<p>$info.description</p>
 	
 	<p class="author">$str_author
@@ -17,7 +17,7 @@
 	</p>
 	
 	{{ if $screenshot }}
-	<a href="$screenshot.0" ><img src="$screenshot.0" width="320" height="240" alt="$screenshot.1" /></a>
+	<a href="$screenshot.0" class='screenshot'><img src="$screenshot.0" alt="$screenshot.1" /></a>
 	{{ endif }}
 
 	{{ if $admin_form }}
diff --git a/view/admin_remoteupdate.tpl b/view/admin_remoteupdate.tpl
index 874c6e626..874c6e626 100755..100644
--- a/view/admin_remoteupdate.tpl
+++ b/view/admin_remoteupdate.tpl
diff --git a/view/admin_site.tpl b/view/admin_site.tpl
index 01fe893c6..2b9db9f35 100755..100644
--- a/view/admin_site.tpl
+++ b/view/admin_site.tpl
@@ -1,8 +1,45 @@
+<script>
+	$(function(){
+		
+		$("#cnftheme").fancybox({
+			width: 800,
+			autoDimensions: false,
+			onStart: function(){
+				var theme = $("#id_theme :selected").val();
+				$("#cnftheme").attr('href',"$baseurl/admin/themes/"+theme);
+			}, 
+			onComplete: function(){
+				$("div#fancybox-content form").submit(function(e){
+					var url = $(this).attr('action');
+					// can't get .serialize() to work...
+					var data={};
+					$(this).find("input").each(function(){
+						data[$(this).attr('name')] = $(this).val();
+					});
+					$(this).find("select").each(function(){
+						data[$(this).attr('name')] = $(this).children(":selected").val();
+					});
+					console.log(":)", url, data);
+					
+					$.post(url, data, function(data) {
+						if(timer) clearTimeout(timer);
+						NavUpdate();
+						$.fancybox.close();
+					})
+					
+					return false;
+				});
+				
+			}
+		});
+	});
+</script>
 <div id='adminpage'>
 	<h1>$title - $page</h1>
 	
 	<form action="$baseurl/admin/site" method="post">
-	
+    <input type='hidden' name='form_security_token' value='$form_security_token'>
+
 	{{ inc field_input.tpl with $field=$sitename }}{{ endinc }}
 	{{ inc field_textarea.tpl with $field=$banner }}{{ endinc }}
 	{{ inc field_select.tpl with $field=$language }}{{ endinc }}
@@ -17,7 +54,6 @@
 	
 	{{ inc field_checkbox.tpl with $field=$no_multi_reg }}{{ endinc }}
 	{{ inc field_checkbox.tpl with $field=$no_openid }}{{ endinc }}
-	{{ inc field_checkbox.tpl with $field=$no_gravatar }}{{ endinc }}
 	{{ inc field_checkbox.tpl with $field=$no_regfullname }}{{ endinc }}
 	
 	<div class="submit"><input type="submit" name="page_site" value="$submit" /></div>
diff --git a/view/admin_summary.tpl b/view/admin_summary.tpl
index eed71fbe0..eed71fbe0 100755..100644
--- a/view/admin_summary.tpl
+++ b/view/admin_summary.tpl
diff --git a/view/admin_users.tpl b/view/admin_users.tpl
index bde7edb59..f67e4a0f7 100755..100644
--- a/view/admin_users.tpl
+++ b/view/admin_users.tpl
@@ -14,6 +14,7 @@
 	<h1>$title - $page</h1>
 	
 	<form action="$baseurl/admin/users" method="post">
+        <input type='hidden' name='form_security_token' value='$form_security_token'>
 		
 		<h3>$h_pending</h3>
 		{{ if $pending }}
@@ -72,8 +73,8 @@
 						<td class='login_date'>$u.page-flags</td>
 						<td class="checkbox"><input type="checkbox" class="users_ckbx" id="id_user_$u.uid" name="user[]" value="$u.uid"/></td>
 						<td class="tools">
-							<a href="$baseurl/admin/users/block/$u.uid" title='{{ if $u.blocked }}$unblock{{ else }}$block{{ endif }}'><span class='icon block {{ if $u.blocked==0 }}dim{{ endif }}'></span></a>
-							<a href="$baseurl/admin/users/delete/$u.uid" title='$delete' onclick="return confirm_delete('$u.name')"><span class='icon drop'></span></a>
+							<a href="$baseurl/admin/users/block/$u.uid?t=$form_security_token" title='{{ if $u.blocked }}$unblock{{ else }}$block{{ endif }}'><span class='icon block {{ if $u.blocked==0 }}dim{{ endif }}'></span></a>
+							<a href="$baseurl/admin/users/delete/$u.uid?t=$form_security_token" title='$delete' onclick="return confirm_delete('$u.name')"><span class='icon drop'></span></a>
 						</td>
 					</tr>
 				{{ endfor }}
diff --git a/view/album_edit.tpl b/view/album_edit.tpl
index 56a7b73fc..56a7b73fc 100755..100644
--- a/view/album_edit.tpl
+++ b/view/album_edit.tpl
diff --git a/view/api_config_xml.tpl b/view/api_config_xml.tpl
index 3281e59dd..3281e59dd 100755..100644
--- a/view/api_config_xml.tpl
+++ b/view/api_config_xml.tpl
diff --git a/view/api_friends_xml.tpl b/view/api_friends_xml.tpl
index 0ea7eb13b..0ea7eb13b 100755..100644
--- a/view/api_friends_xml.tpl
+++ b/view/api_friends_xml.tpl
diff --git a/view/api_ratelimit_xml.tpl b/view/api_ratelimit_xml.tpl
index 36ec1993d..36ec1993d 100755..100644
--- a/view/api_ratelimit_xml.tpl
+++ b/view/api_ratelimit_xml.tpl
diff --git a/view/api_status_xml.tpl b/view/api_status_xml.tpl
index f6cd9c2c0..f6cd9c2c0 100755..100644
--- a/view/api_status_xml.tpl
+++ b/view/api_status_xml.tpl
diff --git a/view/api_test_xml.tpl b/view/api_test_xml.tpl
new file mode 100644
index 000000000..7509a2dc1
--- /dev/null
+++ b/view/api_test_xml.tpl
@@ -0,0 +1 @@
+<ok>$ok</ok>
diff --git a/view/api_timeline_atom.tpl b/view/api_timeline_atom.tpl
index fb4f51f59..fb4f51f59 100755..100644
--- a/view/api_timeline_atom.tpl
+++ b/view/api_timeline_atom.tpl
diff --git a/view/api_timeline_rss.tpl b/view/api_timeline_rss.tpl
index 40239273c..40239273c 100755..100644
--- a/view/api_timeline_rss.tpl
+++ b/view/api_timeline_rss.tpl
diff --git a/view/api_timeline_xml.tpl b/view/api_timeline_xml.tpl
index 17860ca61..4a32b411b 100755..100644
--- a/view/api_timeline_xml.tpl
+++ b/view/api_timeline_xml.tpl
@@ -1,22 +1,20 @@
-<statuses type="array">
-  {{ for $statuses as $status }}
-  <status>
-    <created_at>$status.created_at</created_at>
-    <id>$status.id</id>
-    <text>$status.text</text>
-	<statusnet_html>$status.statusnet_html</statusnet_html>
-    <source>$status.source</source>
-    <truncated>$status.truncated</truncated>
-    <url>$status.url</url>
-    <in_reply_to_status_id>$status.in_reply_to_status_id</in_reply_to_status_id>
-    <in_reply_to_user_id>$status.in_reply_to_user_id</in_reply_to_user_id>
-    <favorited>$status.favorited</favorited>
-    <in_reply_to_screen_name>$status.in_reply_to_screen_name</in_reply_to_screen_name>
-    <geo>$status.geo</geo>
-    <coordinates>$status.coordinates</coordinates>
-    <place>$status.place</place>
-    <contributors>$status.contributors</contributors>
-  	{{ inc api_user_xml.tpl with $user=$status.user }}{{ endinc }}
-  </status>
-  {{ endfor }}
-</statuses>
\ No newline at end of file
+<statuses type="array" xmlns:statusnet="http://status.net/schema/api/1/">
+{{ for $statuses as $status }} <status>
+  <text>$status.text</text>
+  <truncated>$status.truncated</truncated>
+  <created_at>$status.created_at</created_at>
+  <in_reply_to_status_id>$status.in_reply_to_status_id</in_reply_to_status_id>
+  <source>$status.source</source>
+  <id>$status.id</id>
+  <in_reply_to_user_id>$status.in_reply_to_user_id</in_reply_to_user_id>
+  <in_reply_to_screen_name>$status.in_reply_to_screen_name</in_reply_to_screen_name>
+  <geo>$status.geo</geo>
+  <favorited>$status.favorited</favorited>
+{{ inc api_user_xml.tpl with $user=$status.user }}{{ endinc }}  <statusnet:html>$status.statusnet_html</statusnet:html>
+  <statusnet:conversation_id>$status.statusnet_conversation_id</statusnet:conversation_id>
+  <url>$status.url</url>
+  <coordinates>$status.coordinates</coordinates>
+  <place>$status.place</place>
+  <contributors>$status.contributors</contributors>
+ </status>
+{{ endfor }}</statuses>
diff --git a/view/api_user_xml.tpl b/view/api_user_xml.tpl
index f1e122f3e..d286652c0 100755..100644
--- a/view/api_user_xml.tpl
+++ b/view/api_user_xml.tpl
@@ -1,34 +1,34 @@
-<user>
-  <id>$user.id</id>
-  <name>$user.name</name>
-  <screen_name>$user.screen_name</screen_name>
-  <location>$user.location</location>
-  <description>$user.description</description>
-  <profile_image_url>$user.profile_image_url</profile_image_url>
-  <url>$user.url</url>
-  <protected>$user.protected</protected>
-  <followers_count>$user.followers_count</followers_count>
-  <profile_background_color>$user.profile_background_color</profile_background_color>
-  <profile_text_color>$user.profile_text_color</profile_text_color>
-  <profile_link_color>$user.profile_link_color</profile_link_color>
-  <profile_sidebar_fill_color>$user.profile_sidebar_fill_color</profile_sidebar_fill_color>
-  <profile_sidebar_border_color>$user.profile_sidebar_border_color</profile_sidebar_border_color>
-  <friends_count>$user.friends_count</friends_count>
-  <created_at>$user.created_at</created_at>
-  <favourites_count>$user.favourites_count</favourites_count>
-  <utc_offset>$user.utc_offset</utc_offset>
-  <time_zone>$user.time_zone</time_zone>
-  <profile_background_image_url>$user.profile_background_image_url</profile_background_image_url>
-  <profile_background_tile>$user.profile_background_tile</profile_background_tile>
-  <profile_use_background_image>$user.profile_use_background_image</profile_use_background_image>
-  <notifications>$user.notifications</notifications>
-  <geo_enabled>$user.geo_enabled</geo_enabled>
-  <verified>$user.verified</verified>
-  <following>$user.following</following>
-  <statuses_count>$user.statuses_count</statuses_count>
-  <lang>$user.lang</lang>
-  <contributors_enabled>$user.contributors_enabled</contributors_enabled>
-  <status>{{ if $user.status }}
+  <user>
+   <id>$user.id</id>
+   <name>$user.name</name>
+   <screen_name>$user.screen_name</screen_name>
+   <location>$user.location</location>
+   <description>$user.description</description>
+   <profile_image_url>$user.profile_image_url</profile_image_url>
+   <url>$user.url</url>
+   <protected>$user.protected</protected>
+   <followers_count>$user.followers_count</followers_count>
+   <friends_count>$user.friends_count</friends_count>
+   <created_at>$user.created_at</created_at>
+   <favourites_count>$user.favourites_count</favourites_count>
+   <utc_offset>$user.utc_offset</utc_offset>
+   <time_zone>$user.time_zone</time_zone>
+   <statuses_count>$user.statuses_count</statuses_count>
+   <following>$user.following</following>
+   <profile_background_color>$user.profile_background_color</profile_background_color>
+   <profile_text_color>$user.profile_text_color</profile_text_color>
+   <profile_link_color>$user.profile_link_color</profile_link_color>
+   <profile_sidebar_fill_color>$user.profile_sidebar_fill_color</profile_sidebar_fill_color>
+   <profile_sidebar_border_color>$user.profile_sidebar_border_color</profile_sidebar_border_color>
+   <profile_background_image_url>$user.profile_background_image_url</profile_background_image_url>
+   <profile_background_tile>$user.profile_background_tile</profile_background_tile>
+   <profile_use_background_image>$user.profile_use_background_image</profile_use_background_image>
+   <notifications>$user.notifications</notifications>
+   <geo_enabled>$user.geo_enabled</geo_enabled>
+   <verified>$user.verified</verified>
+   <lang>$user.lang</lang>
+   <contributors_enabled>$user.contributors_enabled</contributors_enabled>
+   <status>{{ if $user.status }}
     <created_at>$user.status.created_at</created_at>
     <id>$user.status.id</id>
     <text>$user.status.text</text>
@@ -43,4 +43,4 @@
     <place>$user.status.place</place>
     <contributors>$user.status.contributors</contributors>
   {{ endif }}</status>
-</user>
+  </user>
diff --git a/view/apps.tpl b/view/apps.tpl
index 4c7f8c94c..4c7f8c94c 100755..100644
--- a/view/apps.tpl
+++ b/view/apps.tpl
diff --git a/view/atom_feed.tpl b/view/atom_feed.tpl
index 2feb547ee..2feb547ee 100755..100644
--- a/view/atom_feed.tpl
+++ b/view/atom_feed.tpl
diff --git a/view/atom_feed_dfrn.tpl b/view/atom_feed_dfrn.tpl
index 0bae62b52..0bae62b52 100755..100644
--- a/view/atom_feed_dfrn.tpl
+++ b/view/atom_feed_dfrn.tpl
diff --git a/view/atom_mail.tpl b/view/atom_mail.tpl
index bf7c3efc8..bf7c3efc8 100755..100644
--- a/view/atom_mail.tpl
+++ b/view/atom_mail.tpl
diff --git a/view/atom_suggest.tpl b/view/atom_suggest.tpl
index 66c61f9b6..66c61f9b6 100755..100644
--- a/view/atom_suggest.tpl
+++ b/view/atom_suggest.tpl
diff --git a/view/auto_request.tpl b/view/auto_request.tpl
index 2958397c9..961de9bb3 100755..100644
--- a/view/auto_request.tpl
+++ b/view/auto_request.tpl
@@ -7,7 +7,7 @@ $page_desc<br />
 <li><a href="http://friendica.com" title="$friendica">$friendica</a></li>
 <li><a href="http://joindiaspora.com" title="$diaspora">$diaspora</a> $diasnote</li>
 <li><a href="http://ostatus.org" title="$public_net" >$statusnet</a></li>
-<li>$emailnet</li>
+{{ if $emailnet }}<li>$emailnet</li>{{ endif }}
 </ul>
 </p>
 <p>
diff --git a/view/ca/cmnt_received_eml.tpl b/view/ca/cmnt_received_eml.tpl
index ca61ca492..ca61ca492 100755..100644
--- a/view/ca/cmnt_received_eml.tpl
+++ b/view/ca/cmnt_received_eml.tpl
diff --git a/view/ca/follow_notify_eml.tpl b/view/ca/follow_notify_eml.tpl
index ab5a4b371..ab5a4b371 100755..100644
--- a/view/ca/follow_notify_eml.tpl
+++ b/view/ca/follow_notify_eml.tpl
diff --git a/view/ca/friend_complete_eml.tpl b/view/ca/friend_complete_eml.tpl
index 539d9ff3d..539d9ff3d 100755..100644
--- a/view/ca/friend_complete_eml.tpl
+++ b/view/ca/friend_complete_eml.tpl
diff --git a/view/ca/htconfig.tpl b/view/ca/htconfig.tpl
index 28446f3df..28446f3df 100755..100644
--- a/view/ca/htconfig.tpl
+++ b/view/ca/htconfig.tpl
diff --git a/view/ca/intro_complete_eml.tpl b/view/ca/intro_complete_eml.tpl
index 70507d71d..70507d71d 100755..100644
--- a/view/ca/intro_complete_eml.tpl
+++ b/view/ca/intro_complete_eml.tpl
diff --git a/view/ca/lostpass_eml.tpl b/view/ca/lostpass_eml.tpl
index eccf2050a..eccf2050a 100755..100644
--- a/view/ca/lostpass_eml.tpl
+++ b/view/ca/lostpass_eml.tpl
diff --git a/view/ca/mail_received_html_body_eml.tpl b/view/ca/mail_received_html_body_eml.tpl
index 64eee0bf1..64eee0bf1 100755..100644
--- a/view/ca/mail_received_html_body_eml.tpl
+++ b/view/ca/mail_received_html_body_eml.tpl
diff --git a/view/ca/mail_received_text_body_eml.tpl b/view/ca/mail_received_text_body_eml.tpl
index b343c4e6d..b343c4e6d 100755..100644
--- a/view/ca/mail_received_text_body_eml.tpl
+++ b/view/ca/mail_received_text_body_eml.tpl
diff --git a/view/ca/messages.po b/view/ca/messages.po
index 8463ceb12..25c3ce6dc 100755..100644
--- a/view/ca/messages.po
+++ b/view/ca/messages.po
@@ -2910,7 +2910,7 @@ msgstr "Comptes abandonats després de x dies"
 
 #: ../../mod/admin.php:330
 msgid ""
-"Will not waste system resources polling external sites for abandonded "
+"Will not waste system resources polling external sites for abandoned "
 "accounts. Enter 0 for no time limit."
 msgstr "No gastará recursos del sistema creant enquestes des de llocs externos per a comptes abandonats. Introdueixi 0 per a cap límit temporal."
 
diff --git a/view/ca/passchanged_eml.tpl b/view/ca/passchanged_eml.tpl
index 22e54b8c0..22e54b8c0 100755..100644
--- a/view/ca/passchanged_eml.tpl
+++ b/view/ca/passchanged_eml.tpl
diff --git a/view/ca/register_open_eml.tpl b/view/ca/register_open_eml.tpl
index 0170c98e3..0170c98e3 100755..100644
--- a/view/ca/register_open_eml.tpl
+++ b/view/ca/register_open_eml.tpl
diff --git a/view/ca/register_verify_eml.tpl b/view/ca/register_verify_eml.tpl
index 3dd966e0a..3dd966e0a 100755..100644
--- a/view/ca/register_verify_eml.tpl
+++ b/view/ca/register_verify_eml.tpl
diff --git a/view/ca/request_notify_eml.tpl b/view/ca/request_notify_eml.tpl
index 276624aae..276624aae 100755..100644
--- a/view/ca/request_notify_eml.tpl
+++ b/view/ca/request_notify_eml.tpl
diff --git a/view/ca/strings.php b/view/ca/strings.php
index e5aed8be6..265058391 100755..100644
--- a/view/ca/strings.php
+++ b/view/ca/strings.php
@@ -654,7 +654,7 @@ $a->strings["Register policy"] = "Política per a registrar";
 $a->strings["Register text"] = "Text al registrar";
 $a->strings["Will be displayed prominently on the registration page."] = "Sea mostrat de forma peminent a la pagina durant el procés de registre.";
 $a->strings["Accounts abandoned after x days"] = "Comptes abandonats després de x dies";
-$a->strings["Will not waste system resources polling external sites for abandonded accounts. Enter 0 for no time limit."] = "No gastará recursos del sistema creant enquestes des de llocs externos per a comptes abandonats. Introdueixi 0 per a cap límit temporal.";
+$a->strings["Will not waste system resources polling external sites for abandoned accounts. Enter 0 for no time limit."] = "No gastará recursos del sistema creant enquestes des de llocs externos per a comptes abandonats. Introdueixi 0 per a cap límit temporal.";
 $a->strings["Allowed friend domains"] = "Dominis amics permesos";
 $a->strings["Comma separated list of domains which are allowed to establish friendships with this site. Wildcards are accepted. Empty to allow any domains"] = "Llista de dominis separada per comes, de adreçes de correu que són permeses per establir amistats. S'admeten comodins. Deixa'l buit per a acceptar tots els dominis.";
 $a->strings["Allowed email domains"] = "Dominis de correu permesos";
diff --git a/view/ca/wall_received_eml.tpl b/view/ca/wall_received_eml.tpl
index 0b5c150fd..0b5c150fd 100755..100644
--- a/view/ca/wall_received_eml.tpl
+++ b/view/ca/wall_received_eml.tpl
diff --git a/view/categories_widget.tpl b/view/categories_widget.tpl
new file mode 100644
index 000000000..061821beb
--- /dev/null
+++ b/view/categories_widget.tpl
@@ -0,0 +1,13 @@
+<div class="clear"></div>
+<div id="categories-sidebar" class="widget">
+	<h3>$title</h3>
+	<div id="nets-desc">$desc</div>
+	
+	<ul class="categories-ul">
+		<li class="tool"><a href="$base" class="categories-link categories-all{{ if $sel_all }} categories-selected{{ endif }}">$all</a></li>
+		{{ for $terms as $term }}
+			<li class="tool"><a href="$base?f=&category=$term.name" class="categories-link{{ if $term.selected }} categories-selected{{ endif }}">$term.name</a></li>
+		{{ endfor }}
+	</ul>
+	
+</div>
diff --git a/view/comment_item.tpl b/view/comment_item.tpl
index a1d4e1043..a1d4e1043 100755..100644
--- a/view/comment_item.tpl
+++ b/view/comment_item.tpl
diff --git a/view/common_friends.tpl b/view/common_friends.tpl
index 1f610d8c4..1f610d8c4 100755..100644
--- a/view/common_friends.tpl
+++ b/view/common_friends.tpl
diff --git a/view/common_tabs.tpl b/view/common_tabs.tpl
index 146ad29fa..146ad29fa 100755..100644
--- a/view/common_tabs.tpl
+++ b/view/common_tabs.tpl
diff --git a/view/contact_head.tpl b/view/contact_head.tpl
index a76293a68..9cfd81710 100755..100644
--- a/view/contact_head.tpl
+++ b/view/contact_head.tpl
@@ -2,10 +2,9 @@
           src="$baseurl/library/tinymce/jscripts/tiny_mce/tiny_mce_src.js"></script>
           <script language="javascript" type="text/javascript">
 
-
 tinyMCE.init({
 	theme : "advanced",
-	mode : "exact",
+	mode : "$editselect",
 	elements: "contact-edit-info",
 	plugins : "bbcode",
 	theme_advanced_buttons1 : "bold,italic,underline,undo,redo,link,unlink,image,forecolor",
diff --git a/view/contact_template.tpl b/view/contact_template.tpl
index 48930b48a..48930b48a 100755..100644
--- a/view/contact_template.tpl
+++ b/view/contact_template.tpl
diff --git a/view/contacts-template.tpl b/view/contacts-template.tpl
index ecb342bf4..ecb342bf4 100755..100644
--- a/view/contacts-template.tpl
+++ b/view/contacts-template.tpl
diff --git a/view/conversation.tpl b/view/conversation.tpl
index 43bb1dd47..43bb1dd47 100755..100644
--- a/view/conversation.tpl
+++ b/view/conversation.tpl
diff --git a/view/crepair.tpl b/view/crepair.tpl
index a3e532b61..a3e532b61 100755..100644
--- a/view/crepair.tpl
+++ b/view/crepair.tpl
diff --git a/view/cropbody.tpl b/view/cropbody.tpl
index b484d15bf..b484d15bf 100755..100644
--- a/view/cropbody.tpl
+++ b/view/cropbody.tpl
diff --git a/view/crophead.tpl b/view/crophead.tpl
index 48f375426..48f375426 100755..100644
--- a/view/crophead.tpl
+++ b/view/crophead.tpl
diff --git a/view/cs/cmnt_received_eml.tpl b/view/cs/cmnt_received_eml.tpl
index ff4492322..ff4492322 100755..100644
--- a/view/cs/cmnt_received_eml.tpl
+++ b/view/cs/cmnt_received_eml.tpl
diff --git a/view/cs/cmnt_received_html_body_eml.tpl b/view/cs/cmnt_received_html_body_eml.tpl
index 6b6318743..6b6318743 100755..100644
--- a/view/cs/cmnt_received_html_body_eml.tpl
+++ b/view/cs/cmnt_received_html_body_eml.tpl
diff --git a/view/cs/cmnt_received_text_body_eml.tpl b/view/cs/cmnt_received_text_body_eml.tpl
index ff4492322..ff4492322 100755..100644
--- a/view/cs/cmnt_received_text_body_eml.tpl
+++ b/view/cs/cmnt_received_text_body_eml.tpl
diff --git a/view/cs/follow_notify_eml.tpl b/view/cs/follow_notify_eml.tpl
index 440ba9ca4..440ba9ca4 100755..100644
--- a/view/cs/follow_notify_eml.tpl
+++ b/view/cs/follow_notify_eml.tpl
diff --git a/view/cs/friend_complete_eml.tpl b/view/cs/friend_complete_eml.tpl
index 50bb7e105..50bb7e105 100755..100644
--- a/view/cs/friend_complete_eml.tpl
+++ b/view/cs/friend_complete_eml.tpl
diff --git a/view/cs/htconfig.tpl b/view/cs/htconfig.tpl
index 5d116dd99..5d116dd99 100755..100644
--- a/view/cs/htconfig.tpl
+++ b/view/cs/htconfig.tpl
diff --git a/view/cs/intro_complete_eml.tpl b/view/cs/intro_complete_eml.tpl
index 91753f35d..91753f35d 100755..100644
--- a/view/cs/intro_complete_eml.tpl
+++ b/view/cs/intro_complete_eml.tpl
diff --git a/view/cs/lostpass_eml.tpl b/view/cs/lostpass_eml.tpl
index 05042ddce..05042ddce 100755..100644
--- a/view/cs/lostpass_eml.tpl
+++ b/view/cs/lostpass_eml.tpl
diff --git a/view/cs/mail_received_html_body_eml.tpl b/view/cs/mail_received_html_body_eml.tpl
index 427c6c98d..427c6c98d 100755..100644
--- a/view/cs/mail_received_html_body_eml.tpl
+++ b/view/cs/mail_received_html_body_eml.tpl
diff --git a/view/cs/mail_received_text_body_eml.tpl b/view/cs/mail_received_text_body_eml.tpl
index c69872377..c69872377 100755..100644
--- a/view/cs/mail_received_text_body_eml.tpl
+++ b/view/cs/mail_received_text_body_eml.tpl
diff --git a/view/cs/messages.po b/view/cs/messages.po
index 529504c5c..529504c5c 100755..100644
--- a/view/cs/messages.po
+++ b/view/cs/messages.po
diff --git a/view/cs/passchanged_eml.tpl b/view/cs/passchanged_eml.tpl
index 5447d2e80..5447d2e80 100755..100644
--- a/view/cs/passchanged_eml.tpl
+++ b/view/cs/passchanged_eml.tpl
diff --git a/view/cs/register_open_eml.tpl b/view/cs/register_open_eml.tpl
index f8e42678b..f8e42678b 100755..100644
--- a/view/cs/register_open_eml.tpl
+++ b/view/cs/register_open_eml.tpl
diff --git a/view/cs/register_verify_eml.tpl b/view/cs/register_verify_eml.tpl
index 4b34c6b6d..4b34c6b6d 100755..100644
--- a/view/cs/register_verify_eml.tpl
+++ b/view/cs/register_verify_eml.tpl
diff --git a/view/cs/request_notify_eml.tpl b/view/cs/request_notify_eml.tpl
index 74010c79c..74010c79c 100755..100644
--- a/view/cs/request_notify_eml.tpl
+++ b/view/cs/request_notify_eml.tpl
diff --git a/view/cs/strings.php b/view/cs/strings.php
index 0c7d0d7bd..0c7d0d7bd 100755..100644
--- a/view/cs/strings.php
+++ b/view/cs/strings.php
diff --git a/view/cs/wall_received_eml.tpl b/view/cs/wall_received_eml.tpl
index 9fb27ddd8..9fb27ddd8 100755..100644
--- a/view/cs/wall_received_eml.tpl
+++ b/view/cs/wall_received_eml.tpl
diff --git a/view/cs/wall_received_html_body_eml.tpl b/view/cs/wall_received_html_body_eml.tpl
index 893eec20c..893eec20c 100755..100644
--- a/view/cs/wall_received_html_body_eml.tpl
+++ b/view/cs/wall_received_html_body_eml.tpl
diff --git a/view/cs/wall_received_text_body_eml.tpl b/view/cs/wall_received_text_body_eml.tpl
index 088f7f9db..088f7f9db 100755..100644
--- a/view/cs/wall_received_text_body_eml.tpl
+++ b/view/cs/wall_received_text_body_eml.tpl
diff --git a/view/custom_tinymce.css b/view/custom_tinymce.css
index 7932653b6..7932653b6 100755..100644
--- a/view/custom_tinymce.css
+++ b/view/custom_tinymce.css
diff --git a/view/de/cmnt_received_eml.tpl b/view/de/cmnt_received_eml.tpl
index 500c93eb4..500c93eb4 100755..100644
--- a/view/de/cmnt_received_eml.tpl
+++ b/view/de/cmnt_received_eml.tpl
diff --git a/view/de/cmnt_received_html_body_eml.tpl b/view/de/cmnt_received_html_body_eml.tpl
index db7f829bc..db7f829bc 100755..100644
--- a/view/de/cmnt_received_html_body_eml.tpl
+++ b/view/de/cmnt_received_html_body_eml.tpl
diff --git a/view/de/cmnt_received_text_body_eml.tpl b/view/de/cmnt_received_text_body_eml.tpl
index e00a868af..e00a868af 100755..100644
--- a/view/de/cmnt_received_text_body_eml.tpl
+++ b/view/de/cmnt_received_text_body_eml.tpl
diff --git a/view/de/follow_notify_eml.tpl b/view/de/follow_notify_eml.tpl
index d7259a240..d7259a240 100755..100644
--- a/view/de/follow_notify_eml.tpl
+++ b/view/de/follow_notify_eml.tpl
diff --git a/view/de/friend_complete_eml.tpl b/view/de/friend_complete_eml.tpl
index 908d0df40..4011e0d6e 100755..100644
--- a/view/de/friend_complete_eml.tpl
+++ b/view/de/friend_complete_eml.tpl
@@ -1,22 +1,22 @@
 
-Liebe/r $username,
+Hallo $[username],
 
-großartige Neuigkeiten... '$fn' von '$dfrn_url' hat deine Kontaktaufnahme auf
-'$sitename' bestätigt.
+	Großartige Neuigkeiten... '$[fn]' auf '$[dfrn_url]' hat 
+deine Kontaktanfrage auf '$[sitename]' bestätigt.
 
-Ihr seit nun beidseitige Freunde und könnt Statusmitteilungen, Fotos und
-EMail ohne Einschränkungen austauschen.
+Ihr seit nun beidseitige Freunde und könnt Statusmitteilungen, Bilder und Emails
+ohne einschränkungen austauschen.
 
-Bitte rufe deine 'Kontakte' Seite auf $sitename auf um du Änderungen an
-dieser Freundschaft vorzunehmen.
+Rufe deine 'Kontakte' Seite auf $[sitename] auf wenn du 
+Änderungen an diesem Kontakt vornehmen willst. 
 
-$siteurl
+$[siteurl]
 
-[Du könntest zum Beispiel ein neue Profil anlegen mit Informationen die nicht
-für die Allgemeinheit bestimmt sind, die du aber gerne mit '$fn' teilen
-möchtest].
+[Du könntest z.B. ein spezielles Profil anlegen, das Informationen enthällt
+die nicht für die breite Öffentlichkeit sichtbar sein sollen und es für '$[fn]' zum Betrachten freigeben].
 
-Mit freundlichen Grüßen
-        $sitename Administrator
+Beste Grüße,
 
- 
+	$[sitename] Administrator
+
+ 
\ No newline at end of file
diff --git a/view/de/htconfig.tpl b/view/de/htconfig.tpl
index 76709ea75..76709ea75 100755..100644
--- a/view/de/htconfig.tpl
+++ b/view/de/htconfig.tpl
diff --git a/view/de/intro_complete_eml.tpl b/view/de/intro_complete_eml.tpl
index ff9b8a379..de85c8a79 100755..100644
--- a/view/de/intro_complete_eml.tpl
+++ b/view/de/intro_complete_eml.tpl
@@ -1,18 +1,22 @@
 
-Liebe/r $username,
+Hallo $[username],
 
-'$fn' von '$dfrn_url' hat deine Kontaktanfrage auf '$sitename' bestätigt.
+	'$[fn]' auf '$[dfrn_url]' wurde akzeptiert 
+Deine Verbindungsanfrage auf '$[sitename]'.
 
-'$fn' hat sich dazu entschlossen dich als "Fan" mit eingeschränkten
-Kommunikationsmöglichkeiten zu akzeptieren. Dies umfasst private Nachrichten
-und einige Profilaktivitäten. Sollte dies eine Prominenten oder
-Gemeinschaftsseite sein, wurden diese Einstellungen automatisch vorgenommen.
+	'$[fn]' hat entschieden Dich als "Fan" zu akzeptieren, was ein 
+paar Formen der Kommunikation einschränkt - wie das schreiben von privaten Nachrichten und einige Profil
+Interaktionen. Wenn das ein Promi-Konto oder eine Forum-Seite ist, werden die Einstellungen
+automatisch angewendet.
 
-'$fn' kann sich in Zukunft dazu entschließen eure Beziehung in eine beidseitige
-Freundschaft oder freizügigere Beziehung zu erweitern.
+	'$[fn]' kann wählen, ob die Freundschaft in eine beidseitige oder alles erlaubende 
+Beziehung in der Zukunft erweitert wird. 
 
-Ab sofort wirst du Statusmitteilungen von '$fn' erhalten, die auf deiner
-'Netzwerkseite' erscheinen werden.
+	Du empfängst jetzt die öffentlichen Beiträge von '$[fn]', 
+welche auf der "Netzwerk" Seite erscheinen werden  
 
-Mit freundlichen Grüßen,
-        $sitename Administrator
+$[siteurl]
+
+Beste Grüße,
+
+	$[sitename] Administrator
\ No newline at end of file
diff --git a/view/de/lostpass_eml.tpl b/view/de/lostpass_eml.tpl
index 4c06d0c8d..4c06d0c8d 100755..100644
--- a/view/de/lostpass_eml.tpl
+++ b/view/de/lostpass_eml.tpl
diff --git a/view/de/mail_received_html_body_eml.tpl b/view/de/mail_received_html_body_eml.tpl
index 34eea59da..34eea59da 100755..100644
--- a/view/de/mail_received_html_body_eml.tpl
+++ b/view/de/mail_received_html_body_eml.tpl
diff --git a/view/de/mail_received_text_body_eml.tpl b/view/de/mail_received_text_body_eml.tpl
index f5c90cfed..f5c90cfed 100755..100644
--- a/view/de/mail_received_text_body_eml.tpl
+++ b/view/de/mail_received_text_body_eml.tpl
diff --git a/view/de/messages.po b/view/de/messages.po
index 6aab0bf1b..8dc3ec615 100644
--- a/view/de/messages.po
+++ b/view/de/messages.po
@@ -5,10 +5,13 @@
 # Translators:
 # bavatar <tobias.diekershoff@gmx.net>, 2011.
 # Erkan Yilmaz <erkan77@gmail.com>, 2011.
+# Fabian Dost <friends@dostmusik.de>, 2012.
 #   <friends@dostmusik.de>, 2012.
 #   <greeneyedred@googlemail.com>, 2012.
 #   <hzuehl@phone-talk.de>, 2011.
+#   <leberwurscht@hoegners.de>, 2012.
 #   <marmor69@web.de>, 2012.
+# Martin Schmitt <mas@scsy.de>, 2012.
 #   <tobias.diekershoff@gmx.net>, 2011, 2012.
 #   <transifex@zottel.net>, 2011, 2012.
 #   <ts+transifex@ml.tschlotfeldt.de>, 2011.
@@ -16,9 +19,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: friendica\n"
 "Report-Msgid-Bugs-To: http://bugs.friendica.com/\n"
-"POT-Creation-Date: 2012-03-06 15:09-0800\n"
-"PO-Revision-Date: 2012-03-07 20:47+0000\n"
-"Last-Translator: greeneyedred <greeneyedred@googlemail.com>\n"
+"POT-Creation-Date: 2012-04-22 10:00-0700\n"
+"PO-Revision-Date: 2012-04-23 18:48+0000\n"
+"Last-Translator: bavatar <tobias.diekershoff@gmx.net>\n"
 "Language-Team: German (http://www.transifex.net/projects/p/friendica/language/de/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -43,25 +46,29 @@ msgstr "Einstellungen zum Kontakt angewandt."
 msgid "Contact update failed."
 msgstr "Konnte den Kontakt nicht aktualisieren."
 
-#: ../../mod/crepair.php:115 ../../mod/wall_attach.php:43
+#: ../../mod/crepair.php:115 ../../mod/wall_attach.php:44
 #: ../../mod/fsuggest.php:78 ../../mod/events.php:110 ../../mod/api.php:26
-#: ../../mod/api.php:31 ../../mod/photos.php:129 ../../mod/photos.php:865
+#: ../../mod/api.php:31 ../../mod/photos.php:130 ../../mod/photos.php:865
 #: ../../mod/editpost.php:10 ../../mod/install.php:171
-#: ../../mod/notifications.php:62 ../../mod/contacts.php:125
-#: ../../mod/settings.php:49 ../../mod/settings.php:411
-#: ../../mod/settings.php:416 ../../mod/manage.php:86 ../../mod/network.php:6
-#: ../../mod/notes.php:20 ../../mod/attach.php:33 ../../mod/group.php:19
-#: ../../mod/viewcontacts.php:22 ../../mod/register.php:36
-#: ../../mod/regmod.php:111 ../../mod/item.php:124 ../../mod/item.php:140
-#: ../../mod/profile_photo.php:19 ../../mod/profile_photo.php:137
-#: ../../mod/profile_photo.php:148 ../../mod/profile_photo.php:159
-#: ../../mod/message.php:9 ../../mod/message.php:46 ../../mod/allfriends.php:9
-#: ../../mod/wall_upload.php:42 ../../mod/follow.php:8 ../../mod/common.php:9
-#: ../../mod/display.php:133 ../../mod/profiles.php:7
-#: ../../mod/profiles.php:229 ../../mod/delegate.php:6
-#: ../../mod/suggest.php:28 ../../mod/invite.php:13 ../../mod/invite.php:81
-#: ../../mod/dfrn_confirm.php:53 ../../addon/facebook/facebook.php:332
-#: ../../include/items.php:3030 ../../index.php:288
+#: ../../mod/notifications.php:66 ../../mod/contacts.php:125
+#: ../../mod/settings.php:99 ../../mod/settings.php:514
+#: ../../mod/settings.php:519 ../../mod/manage.php:86 ../../mod/network.php:6
+#: ../../mod/notes.php:20 ../../mod/wallmessage.php:9
+#: ../../mod/wallmessage.php:33 ../../mod/wallmessage.php:79
+#: ../../mod/wallmessage.php:103 ../../mod/attach.php:33
+#: ../../mod/group.php:19 ../../mod/viewcontacts.php:22
+#: ../../mod/register.php:38 ../../mod/regmod.php:116 ../../mod/item.php:124
+#: ../../mod/item.php:140 ../../mod/profile_photo.php:19
+#: ../../mod/profile_photo.php:139 ../../mod/profile_photo.php:150
+#: ../../mod/profile_photo.php:163 ../../mod/message.php:38
+#: ../../mod/message.php:90 ../../mod/allfriends.php:9
+#: ../../mod/nogroup.php:25 ../../mod/wall_upload.php:46
+#: ../../mod/follow.php:8 ../../mod/common.php:9 ../../mod/display.php:138
+#: ../../mod/profiles.php:7 ../../mod/profiles.php:329
+#: ../../mod/delegate.php:6 ../../mod/suggest.php:28 ../../mod/invite.php:13
+#: ../../mod/invite.php:81 ../../mod/dfrn_confirm.php:53
+#: ../../addon/facebook/facebook.php:484 ../../include/items.php:3171
+#: ../../index.php:309
 msgid "Permission denied."
 msgstr "Zugriff verweigert."
 
@@ -90,8 +97,8 @@ msgstr "Bitte nutze den Zurück-Button deines Browsers <strong>jetzt</strong>, w
 msgid "Return to contact editor"
 msgstr "Zurück zum Kontakteditor"
 
-#: ../../mod/crepair.php:148 ../../mod/settings.php:462
-#: ../../mod/settings.php:488 ../../mod/admin.php:484 ../../mod/admin.php:493
+#: ../../mod/crepair.php:148 ../../mod/settings.php:534
+#: ../../mod/settings.php:560 ../../mod/admin.php:573 ../../mod/admin.php:582
 msgid "Name"
 msgstr "Name"
 
@@ -129,37 +136,48 @@ msgstr "Neues Foto von dieser URL"
 
 #: ../../mod/crepair.php:166 ../../mod/fsuggest.php:107
 #: ../../mod/events.php:400 ../../mod/photos.php:900 ../../mod/photos.php:958
-#: ../../mod/photos.php:1182 ../../mod/photos.php:1222
-#: ../../mod/photos.php:1262 ../../mod/photos.php:1293
+#: ../../mod/photos.php:1193 ../../mod/photos.php:1233
+#: ../../mod/photos.php:1273 ../../mod/photos.php:1304
 #: ../../mod/install.php:251 ../../mod/install.php:289
-#: ../../mod/localtime.php:45 ../../mod/contacts.php:319
-#: ../../mod/settings.php:460 ../../mod/settings.php:603
-#: ../../mod/settings.php:797 ../../mod/manage.php:109 ../../mod/group.php:80
-#: ../../mod/admin.php:313 ../../mod/admin.php:481 ../../mod/admin.php:609
-#: ../../mod/admin.php:776 ../../mod/admin.php:856 ../../mod/profiles.php:375
-#: ../../mod/invite.php:106 ../../addon/facebook/facebook.php:411
-#: ../../addon/yourls/yourls.php:76 ../../addon/ljpost/ljpost.php:92
-#: ../../addon/nsfw/nsfw.php:57
+#: ../../mod/localtime.php:45 ../../mod/contacts.php:325
+#: ../../mod/settings.php:532 ../../mod/settings.php:678
+#: ../../mod/settings.php:739 ../../mod/settings.php:930
+#: ../../mod/manage.php:109 ../../mod/group.php:85 ../../mod/admin.php:392
+#: ../../mod/admin.php:570 ../../mod/admin.php:706 ../../mod/admin.php:905
+#: ../../mod/admin.php:993 ../../mod/profiles.php:498 ../../mod/invite.php:119
+#: ../../addon/facebook/facebook.php:574 ../../addon/yourls/yourls.php:76
+#: ../../addon/ljpost/ljpost.php:93 ../../addon/nsfw/nsfw.php:57
+#: ../../addon/planets/planets.php:158
 #: ../../addon/uhremotestorage/uhremotestorage.php:89
-#: ../../addon/randplace/randplace.php:179 ../../addon/dwpost/dwpost.php:92
+#: ../../addon/randplace/randplace.php:177 ../../addon/dwpost/dwpost.php:93
 #: ../../addon/drpost/drpost.php:110 ../../addon/geonames/geonames.php:187
-#: ../../addon/oembed.old/oembed.php:41 ../../addon/impressum/impressum.php:69
+#: ../../addon/oembed.old/oembed.php:41 ../../addon/impressum/impressum.php:80
 #: ../../addon/blockem/blockem.php:57 ../../addon/qcomment/qcomment.php:61
 #: ../../addon/openstreetmap/openstreetmap.php:70
-#: ../../addon/editplain/editplain.php:84 ../../addon/blackout/blackout.php:94
-#: ../../addon/pageheader/pageheader.php:52
-#: ../../addon/statusnet/statusnet.php:273
-#: ../../addon/statusnet/statusnet.php:287
-#: ../../addon/statusnet/statusnet.php:313
-#: ../../addon/statusnet/statusnet.php:320
-#: ../../addon/statusnet/statusnet.php:345
-#: ../../addon/statusnet/statusnet.php:532 ../../addon/tumblr/tumblr.php:90
+#: ../../addon/mathjax/mathjax.php:42 ../../addon/editplain/editplain.php:84
+#: ../../addon/blackout/blackout.php:94 ../../addon/gravatar/gravatar.php:86
+#: ../../addon/pageheader/pageheader.php:55 ../../addon/ijpost/ijpost.php:93
+#: ../../addon/jappixmini/jappixmini.php:302
+#: ../../addon/statusnet/statusnet.php:278
+#: ../../addon/statusnet/statusnet.php:292
+#: ../../addon/statusnet/statusnet.php:318
+#: ../../addon/statusnet/statusnet.php:325
+#: ../../addon/statusnet/statusnet.php:353
+#: ../../addon/statusnet/statusnet.php:553 ../../addon/tumblr/tumblr.php:90
 #: ../../addon/numfriends/numfriends.php:85 ../../addon/gnot/gnot.php:88
 #: ../../addon/wppost/wppost.php:102 ../../addon/showmore/showmore.php:48
-#: ../../addon/piwik/piwik.php:89 ../../addon/twitter/twitter.php:175
-#: ../../addon/twitter/twitter.php:201 ../../addon/twitter/twitter.php:355
+#: ../../addon/piwik/piwik.php:89 ../../addon/twitter/twitter.php:180
+#: ../../addon/twitter/twitter.php:209 ../../addon/twitter/twitter.php:375
+#: ../../addon/irc/irc.php:55 ../../addon/blogger/blogger.php:102
 #: ../../addon/posterous/posterous.php:90
-#: ../../view/theme/quattro/theme.php:15 ../../include/conversation.php:552
+#: ../../view/theme/diabook/diabook-green/config.php:76
+#: ../../view/theme/diabook/diabook-red/config.php:76
+#: ../../view/theme/diabook/diabook-blue/config.php:76
+#: ../../view/theme/diabook/diabook-dark/config.php:76
+#: ../../view/theme/diabook/diabook-aerith/config.php:76
+#: ../../view/theme/diabook/diabook-pink/config.php:76
+#: ../../view/theme/diabook/config.php:91
+#: ../../view/theme/quattro/config.php:52 ../../include/conversation.php:555
 msgid "Submit"
 msgstr "Senden"
 
@@ -167,24 +185,24 @@ msgstr "Senden"
 msgid "Help:"
 msgstr "Hilfe:"
 
-#: ../../mod/help.php:34 ../../include/nav.php:82
+#: ../../mod/help.php:34 ../../include/nav.php:86
 msgid "Help"
 msgstr "Hilfe"
 
-#: ../../mod/help.php:38 ../../index.php:221
+#: ../../mod/help.php:38 ../../index.php:228
 msgid "Not Found"
 msgstr "Nicht gefunden"
 
-#: ../../mod/help.php:41 ../../index.php:224
+#: ../../mod/help.php:41 ../../index.php:231
 msgid "Page not found."
 msgstr "Seite nicht gefunden."
 
-#: ../../mod/wall_attach.php:57
+#: ../../mod/wall_attach.php:58
 #, php-format
 msgid "File exceeds size limit of %d"
 msgstr "Die Datei ist größer als das erlaubte Limit von %d"
 
-#: ../../mod/wall_attach.php:85 ../../mod/wall_attach.php:96
+#: ../../mod/wall_attach.php:86 ../../mod/wall_attach.php:97
 msgid "File upload failed."
 msgstr "Hochladen der Datei fehlgeschlagen."
 
@@ -213,11 +231,19 @@ msgstr "l, F j"
 msgid "Edit event"
 msgstr "Veranstaltung bearbeiten"
 
-#: ../../mod/events.php:272 ../../include/text.php:982
+#: ../../mod/events.php:272 ../../include/text.php:1053
 msgid "link to source"
 msgstr "Link zum Originalbeitrag"
 
-#: ../../mod/events.php:296 ../../include/nav.php:50 ../../boot.php:1349
+#: ../../mod/events.php:296
+#: ../../view/theme/diabook/diabook-green/theme.php:233
+#: ../../view/theme/diabook/diabook-red/theme.php:231
+#: ../../view/theme/diabook/diabook-blue/theme.php:231
+#: ../../view/theme/diabook/theme.php:250
+#: ../../view/theme/diabook/diabook-dark/theme.php:233
+#: ../../view/theme/diabook/diabook-aerith/theme.php:233
+#: ../../view/theme/diabook/diabook-pink/theme.php:233
+#: ../../include/nav.php:52 ../../boot.php:1471
 msgid "Events"
 msgstr "Veranstaltungen"
 
@@ -267,7 +293,7 @@ msgid "Description:"
 msgstr "Beschreibung"
 
 #: ../../mod/events.php:395 ../../include/event.php:37
-#: ../../include/bb2diaspora.php:260 ../../boot.php:980
+#: ../../include/bb2diaspora.php:260 ../../boot.php:1083
 msgid "Location:"
 msgstr "Ort:"
 
@@ -276,8 +302,8 @@ msgid "Share this event"
 msgstr "Veranstaltung teilen"
 
 #: ../../mod/tagrm.php:11 ../../mod/tagrm.php:94
-#: ../../mod/dfrn_request.php:686 ../../mod/settings.php:461
-#: ../../mod/settings.php:487 ../../addon/js_upload/js_upload.php:45
+#: ../../mod/dfrn_request.php:752 ../../mod/settings.php:533
+#: ../../mod/settings.php:559 ../../addon/js_upload/js_upload.php:45
 msgid "Cancel"
 msgstr "Abbrechen"
 
@@ -297,7 +323,7 @@ msgstr "Wähle ein Tag zum Entfernen aus: "
 msgid "Remove"
 msgstr "Entfernen"
 
-#: ../../mod/dfrn_poll.php:91 ../../mod/dfrn_poll.php:517
+#: ../../mod/dfrn_poll.php:94 ../../mod/dfrn_poll.php:522
 #, php-format
 msgid "%s welcomes %s"
 msgstr "%s heißt %s herzlich willkommen"
@@ -320,69 +346,83 @@ msgid ""
 " and/or create new posts for you?"
 msgstr "Möchtest du dieser Anwendung den Zugriff auf deine Beiträge und Kontakte, sowie das Erstellen neuer Beiträge in deinem Namen gestatten?"
 
-#: ../../mod/api.php:105 ../../mod/dfrn_request.php:676
-#: ../../mod/settings.php:692 ../../mod/settings.php:698
-#: ../../mod/settings.php:706 ../../mod/settings.php:710
-#: ../../mod/settings.php:715 ../../mod/settings.php:721
-#: ../../mod/settings.php:727 ../../mod/settings.php:787
-#: ../../mod/settings.php:788 ../../mod/settings.php:789
-#: ../../mod/settings.php:790 ../../mod/register.php:524
-#: ../../mod/profiles.php:357
+#: ../../mod/api.php:105 ../../mod/dfrn_request.php:740
+#: ../../mod/settings.php:844 ../../mod/settings.php:850
+#: ../../mod/settings.php:858 ../../mod/settings.php:862
+#: ../../mod/settings.php:867 ../../mod/settings.php:873
+#: ../../mod/settings.php:879 ../../mod/settings.php:885
+#: ../../mod/settings.php:921 ../../mod/settings.php:922
+#: ../../mod/settings.php:923 ../../mod/settings.php:924
+#: ../../mod/register.php:532 ../../mod/profiles.php:475
 msgid "Yes"
 msgstr "Ja"
 
-#: ../../mod/api.php:106 ../../mod/dfrn_request.php:677
-#: ../../mod/settings.php:692 ../../mod/settings.php:698
-#: ../../mod/settings.php:706 ../../mod/settings.php:710
-#: ../../mod/settings.php:715 ../../mod/settings.php:721
-#: ../../mod/settings.php:727 ../../mod/settings.php:787
-#: ../../mod/settings.php:788 ../../mod/settings.php:789
-#: ../../mod/settings.php:790 ../../mod/register.php:525
-#: ../../mod/profiles.php:358
+#: ../../mod/api.php:106 ../../mod/dfrn_request.php:741
+#: ../../mod/settings.php:844 ../../mod/settings.php:850
+#: ../../mod/settings.php:858 ../../mod/settings.php:862
+#: ../../mod/settings.php:867 ../../mod/settings.php:873
+#: ../../mod/settings.php:879 ../../mod/settings.php:885
+#: ../../mod/settings.php:921 ../../mod/settings.php:922
+#: ../../mod/settings.php:923 ../../mod/settings.php:924
+#: ../../mod/register.php:533 ../../mod/profiles.php:476
 msgid "No"
 msgstr "Nein"
 
-#: ../../mod/photos.php:42
+#: ../../mod/photos.php:43
 msgid "Photo Albums"
 msgstr "Fotoalben"
 
-#: ../../mod/photos.php:50 ../../mod/photos.php:150 ../../mod/photos.php:879
-#: ../../mod/photos.php:950 ../../mod/photos.php:965 ../../mod/photos.php:1371
-#: ../../mod/photos.php:1383 ../../addon/communityhome/communityhome.php:110
+#: ../../mod/photos.php:51 ../../mod/photos.php:151 ../../mod/photos.php:879
+#: ../../mod/photos.php:950 ../../mod/photos.php:965 ../../mod/photos.php:1382
+#: ../../mod/photos.php:1394 ../../addon/communityhome/communityhome.php:110
+#: ../../view/theme/diabook/diabook-green/theme.php:116
+#: ../../view/theme/diabook/diabook-red/theme.php:115
+#: ../../view/theme/diabook/diabook-blue/theme.php:115
+#: ../../view/theme/diabook/theme.php:130
+#: ../../view/theme/diabook/diabook-dark/theme.php:116
+#: ../../view/theme/diabook/diabook-aerith/theme.php:116
+#: ../../view/theme/diabook/diabook-pink/theme.php:116
 msgid "Contact Photos"
 msgstr "Kontaktbilder"
 
-#: ../../mod/photos.php:57 ../../mod/photos.php:975 ../../mod/photos.php:1413
+#: ../../mod/photos.php:58 ../../mod/photos.php:975 ../../mod/photos.php:1424
 msgid "Upload New Photos"
 msgstr "Weitere Fotos hochladen"
 
-#: ../../mod/photos.php:68 ../../mod/settings.php:11
+#: ../../mod/photos.php:69 ../../mod/settings.php:20
 msgid "everybody"
 msgstr "jeder"
 
-#: ../../mod/photos.php:139
+#: ../../mod/photos.php:140
 msgid "Contact information unavailable"
 msgstr "Kontaktinformationen nicht verfügbar"
 
-#: ../../mod/photos.php:150 ../../mod/photos.php:597 ../../mod/photos.php:950
-#: ../../mod/photos.php:965 ../../mod/register.php:327
-#: ../../mod/register.php:334 ../../mod/register.php:341
-#: ../../mod/profile_photo.php:58 ../../mod/profile_photo.php:65
-#: ../../mod/profile_photo.php:72 ../../mod/profile_photo.php:170
-#: ../../mod/profile_photo.php:246 ../../mod/profile_photo.php:255
+#: ../../mod/photos.php:151 ../../mod/photos.php:597 ../../mod/photos.php:950
+#: ../../mod/photos.php:965 ../../mod/register.php:335
+#: ../../mod/register.php:342 ../../mod/register.php:349
+#: ../../mod/profile_photo.php:60 ../../mod/profile_photo.php:67
+#: ../../mod/profile_photo.php:74 ../../mod/profile_photo.php:174
+#: ../../mod/profile_photo.php:252 ../../mod/profile_photo.php:261
 #: ../../addon/communityhome/communityhome.php:111
+#: ../../view/theme/diabook/diabook-green/theme.php:117
+#: ../../view/theme/diabook/diabook-red/theme.php:116
+#: ../../view/theme/diabook/diabook-blue/theme.php:116
+#: ../../view/theme/diabook/theme.php:131
+#: ../../view/theme/diabook/diabook-dark/theme.php:117
+#: ../../view/theme/diabook/diabook-aerith/theme.php:117
+#: ../../view/theme/diabook/diabook-pink/theme.php:117
 msgid "Profile Photos"
 msgstr "Profilbilder"
 
-#: ../../mod/photos.php:160
+#: ../../mod/photos.php:161
 msgid "Album not found."
 msgstr "Album nicht gefunden."
 
-#: ../../mod/photos.php:178 ../../mod/photos.php:959
+#: ../../mod/photos.php:179 ../../mod/photos.php:959
 msgid "Delete Album"
 msgstr "Album löschen"
 
-#: ../../mod/photos.php:241 ../../mod/photos.php:1183
+#: ../../mod/photos.php:242 ../../mod/photos.php:1194
 msgid "Delete Photo"
 msgstr "Foto löschen"
 
@@ -391,9 +431,16 @@ msgid "was tagged in a"
 msgstr "wurde getaggt in einem"
 
 #: ../../mod/photos.php:528 ../../mod/like.php:127 ../../mod/tagger.php:70
-#: ../../addon/communityhome/communityhome.php:163 ../../include/text.php:1226
-#: ../../include/diaspora.php:1600 ../../include/conversation.php:53
-#: ../../include/conversation.php:126
+#: ../../addon/communityhome/communityhome.php:163
+#: ../../view/theme/diabook/diabook-green/theme.php:88
+#: ../../view/theme/diabook/diabook-red/theme.php:87
+#: ../../view/theme/diabook/diabook-blue/theme.php:87
+#: ../../view/theme/diabook/theme.php:102
+#: ../../view/theme/diabook/diabook-dark/theme.php:88
+#: ../../view/theme/diabook/diabook-aerith/theme.php:88
+#: ../../view/theme/diabook/diabook-pink/theme.php:88
+#: ../../include/text.php:1304 ../../include/diaspora.php:1654
+#: ../../include/conversation.php:53 ../../include/conversation.php:126
 msgid "photo"
 msgstr "Foto"
 
@@ -409,19 +456,19 @@ msgstr "Die Bildgröße übersteigt das Limit von "
 msgid "Image file is empty."
 msgstr "Bilddatei ist leer."
 
-#: ../../mod/photos.php:653 ../../mod/profile_photo.php:122
-#: ../../mod/wall_upload.php:65
+#: ../../mod/photos.php:653 ../../mod/profile_photo.php:124
+#: ../../mod/wall_upload.php:69
 msgid "Unable to process image."
 msgstr "Konnte das Bild nicht bearbeiten."
 
-#: ../../mod/photos.php:673 ../../mod/profile_photo.php:251
-#: ../../mod/wall_upload.php:84
+#: ../../mod/photos.php:673 ../../mod/profile_photo.php:257
+#: ../../mod/wall_upload.php:88
 msgid "Image upload failed."
 msgstr "Hochladen des Bildes gescheitert."
 
 #: ../../mod/photos.php:759 ../../mod/community.php:16
-#: ../../mod/dfrn_request.php:625 ../../mod/viewcontacts.php:17
-#: ../../mod/display.php:7 ../../mod/search.php:71 ../../mod/directory.php:33
+#: ../../mod/dfrn_request.php:671 ../../mod/viewcontacts.php:17
+#: ../../mod/display.php:7 ../../mod/search.php:71 ../../mod/directory.php:29
 msgid "Public access denied."
 msgstr "Öffentlicher Zugriff verweigert."
 
@@ -449,7 +496,7 @@ msgstr "oder existierender Albumname: "
 msgid "Do not show a status post for this upload"
 msgstr "Keine Status-Mitteilung für diesen Beitrag anzeigen"
 
-#: ../../mod/photos.php:914 ../../mod/photos.php:1178
+#: ../../mod/photos.php:914 ../../mod/photos.php:1189
 msgid "Permissions"
 msgstr "Berechtigungen"
 
@@ -457,7 +504,7 @@ msgstr "Berechtigungen"
 msgid "Edit Album"
 msgstr "Album bearbeiten"
 
-#: ../../mod/photos.php:984 ../../mod/photos.php:1396
+#: ../../mod/photos.php:984 ../../mod/photos.php:1407
 msgid "View Photo"
 msgstr "Fotos betrachten"
 
@@ -481,85 +528,85 @@ msgstr "Foto bearbeiten"
 msgid "Use as profile photo"
 msgstr "Als Profilbild verwenden"
 
-#: ../../mod/photos.php:1078 ../../include/conversation.php:482
+#: ../../mod/photos.php:1078 ../../include/conversation.php:480
 msgid "Private Message"
 msgstr "Private Nachricht"
 
-#: ../../mod/photos.php:1089
+#: ../../mod/photos.php:1100
 msgid "View Full Size"
 msgstr "Betrachte Originalgröße"
 
-#: ../../mod/photos.php:1157
+#: ../../mod/photos.php:1168
 msgid "Tags: "
 msgstr "Tags: "
 
-#: ../../mod/photos.php:1160
+#: ../../mod/photos.php:1171
 msgid "[Remove any tag]"
 msgstr "[Tag entfernen]"
 
-#: ../../mod/photos.php:1171
+#: ../../mod/photos.php:1182
 msgid "New album name"
 msgstr "Name des neuen Albums"
 
-#: ../../mod/photos.php:1174
+#: ../../mod/photos.php:1185
 msgid "Caption"
 msgstr "Bildunterschrift"
 
-#: ../../mod/photos.php:1176
+#: ../../mod/photos.php:1187
 msgid "Add a Tag"
 msgstr "Tag hinzufügen"
 
-#: ../../mod/photos.php:1180
+#: ../../mod/photos.php:1191
 msgid ""
 "Example: @bob, @Barbara_Jensen, @jim@example.com, #California, #camping"
 msgstr "Beispiel: @bob, @Barbara_Jensen, @jim@example.com, #California, #camping"
 
-#: ../../mod/photos.php:1200 ../../include/conversation.php:529
+#: ../../mod/photos.php:1211 ../../include/conversation.php:529
 msgid "I like this (toggle)"
 msgstr "Ich mag das (toggle)"
 
-#: ../../mod/photos.php:1201 ../../include/conversation.php:530
+#: ../../mod/photos.php:1212 ../../include/conversation.php:530
 msgid "I don't like this (toggle)"
 msgstr "Ich mag das nicht (toggle)"
 
-#: ../../mod/photos.php:1202 ../../include/conversation.php:933
+#: ../../mod/photos.php:1213 ../../include/conversation.php:956
 msgid "Share"
 msgstr "Teilen"
 
-#: ../../mod/photos.php:1203 ../../mod/editpost.php:104
-#: ../../mod/message.php:155 ../../mod/message.php:296
-#: ../../include/conversation.php:348 ../../include/conversation.php:694
-#: ../../include/conversation.php:950
+#: ../../mod/photos.php:1214 ../../mod/editpost.php:104
+#: ../../mod/wallmessage.php:145 ../../mod/message.php:188
+#: ../../mod/message.php:357 ../../include/conversation.php:361
+#: ../../include/conversation.php:698 ../../include/conversation.php:975
 msgid "Please wait"
 msgstr "Bitte warten"
 
-#: ../../mod/photos.php:1219 ../../mod/photos.php:1259
-#: ../../mod/photos.php:1290 ../../include/conversation.php:549
+#: ../../mod/photos.php:1230 ../../mod/photos.php:1270
+#: ../../mod/photos.php:1301 ../../include/conversation.php:552
 msgid "This is you"
 msgstr "Das bist du"
 
-#: ../../mod/photos.php:1221 ../../mod/photos.php:1261
-#: ../../mod/photos.php:1292 ../../include/conversation.php:551
-#: ../../boot.php:447
+#: ../../mod/photos.php:1232 ../../mod/photos.php:1272
+#: ../../mod/photos.php:1303 ../../include/conversation.php:554
+#: ../../boot.php:495
 msgid "Comment"
 msgstr "Kommentar"
 
-#: ../../mod/photos.php:1223 ../../mod/editpost.php:123
-#: ../../include/conversation.php:553 ../../include/conversation.php:968
+#: ../../mod/photos.php:1234 ../../mod/editpost.php:125
+#: ../../include/conversation.php:556 ../../include/conversation.php:993
 msgid "Preview"
 msgstr "Vorschau"
 
-#: ../../mod/photos.php:1320 ../../mod/settings.php:520
-#: ../../mod/settings.php:601 ../../mod/group.php:158 ../../mod/admin.php:488
-#: ../../include/conversation.php:304 ../../include/conversation.php:573
+#: ../../mod/photos.php:1331 ../../mod/settings.php:595
+#: ../../mod/settings.php:676 ../../mod/group.php:168 ../../mod/admin.php:577
+#: ../../include/conversation.php:318 ../../include/conversation.php:576
 msgid "Delete"
 msgstr "Löschen"
 
-#: ../../mod/photos.php:1402
+#: ../../mod/photos.php:1413
 msgid "View Album"
 msgstr "Album betrachten"
 
-#: ../../mod/photos.php:1411
+#: ../../mod/photos.php:1422
 msgid "Recent Photos"
 msgstr "Neueste Fotos"
 
@@ -567,43 +614,51 @@ msgstr "Neueste Fotos"
 msgid "Not available."
 msgstr "Nicht verfügbar."
 
-#: ../../mod/community.php:30 ../../include/nav.php:97
+#: ../../mod/community.php:30
+#: ../../view/theme/diabook/diabook-green/theme.php:235
+#: ../../view/theme/diabook/diabook-red/theme.php:233
+#: ../../view/theme/diabook/diabook-blue/theme.php:233
+#: ../../view/theme/diabook/theme.php:252
+#: ../../view/theme/diabook/diabook-dark/theme.php:235
+#: ../../view/theme/diabook/diabook-aerith/theme.php:235
+#: ../../view/theme/diabook/diabook-pink/theme.php:235
+#: ../../include/nav.php:101
 msgid "Community"
 msgstr "Gemeinschaft"
 
-#: ../../mod/community.php:60 ../../mod/search.php:118
+#: ../../mod/community.php:61 ../../mod/search.php:115
 msgid "No results."
 msgstr "Keine Ergebnisse."
 
-#: ../../mod/friendica.php:43
+#: ../../mod/friendica.php:47
 msgid "This is Friendica, version"
 msgstr "Dies ist Friendica, Version"
 
-#: ../../mod/friendica.php:44
+#: ../../mod/friendica.php:48
 msgid "running at web location"
 msgstr "die unter folgender Webadresse zu finden ist"
 
-#: ../../mod/friendica.php:46
+#: ../../mod/friendica.php:50
 msgid ""
 "Please visit <a href=\"http://friendica.com\">Friendica.com</a> to learn "
 "more about the Friendica project."
 msgstr "Bitte besuche <a href=\"http://friendica.com\">Friendica.com</a> um mehr über das Friendica Projekt zu erfahren."
 
-#: ../../mod/friendica.php:48
+#: ../../mod/friendica.php:52
 msgid "Bug reports and issues: please visit"
 msgstr "Probleme oder Fehler gefunden? Bitte besuche"
 
-#: ../../mod/friendica.php:49
+#: ../../mod/friendica.php:53
 msgid ""
 "Suggestions, praise, donations, etc. - please email \"Info\" at Friendica - "
 "dot com"
 msgstr "Vorschläge, Lob, Spenden usw.: E-Mail an \"Info\" at Friendica - dot com"
 
-#: ../../mod/friendica.php:54
-msgid "Installed plugins/addons/apps"
+#: ../../mod/friendica.php:58
+msgid "Installed plugins/addons/apps:"
 msgstr "Installierte Plugins/Erweiterungen/Apps"
 
-#: ../../mod/friendica.php:62
+#: ../../mod/friendica.php:71
 msgid "No installed plugins/addons/apps"
 msgstr "Keine Plugins/Erweiterungen/Apps installiert"
 
@@ -615,28 +670,30 @@ msgstr "Beitrag nicht gefunden"
 msgid "Edit post"
 msgstr "Beitrag bearbeiten"
 
-#: ../../mod/editpost.php:80 ../../include/conversation.php:919
+#: ../../mod/editpost.php:80 ../../include/conversation.php:942
 msgid "Post to Email"
 msgstr "An E-Mail senden"
 
-#: ../../mod/editpost.php:95 ../../mod/settings.php:519
-#: ../../include/conversation.php:560
+#: ../../mod/editpost.php:95 ../../mod/settings.php:594
+#: ../../include/conversation.php:563
 msgid "Edit"
 msgstr "Bearbeiten"
 
-#: ../../mod/editpost.php:96 ../../mod/message.php:153
-#: ../../mod/message.php:294 ../../include/conversation.php:934
+#: ../../mod/editpost.php:96 ../../mod/wallmessage.php:143
+#: ../../mod/message.php:186 ../../mod/message.php:355
+#: ../../include/conversation.php:957
 msgid "Upload photo"
 msgstr "Foto hochladen"
 
-#: ../../mod/editpost.php:97 ../../include/conversation.php:936
+#: ../../mod/editpost.php:97 ../../include/conversation.php:959
 msgid "Attach file"
 msgstr "Datei anhängen"
 
-#: ../../mod/editpost.php:98 ../../mod/message.php:154
-#: ../../mod/message.php:295 ../../include/conversation.php:938
+#: ../../mod/editpost.php:98 ../../mod/wallmessage.php:144
+#: ../../mod/message.php:187 ../../mod/message.php:356
+#: ../../include/conversation.php:961
 msgid "Insert web link"
-msgstr "Weblink einfügen"
+msgstr "einen Link einfügen"
 
 #: ../../mod/editpost.php:99
 msgid "Insert YouTube video"
@@ -650,201 +707,220 @@ msgstr "Vorbis [.ogg] Video einfügen"
 msgid "Insert Vorbis [.ogg] audio"
 msgstr "Vorbis [.ogg] Audio einfügen"
 
-#: ../../mod/editpost.php:102 ../../include/conversation.php:944
+#: ../../mod/editpost.php:102 ../../include/conversation.php:967
 msgid "Set your location"
 msgstr "Deinen Standort festlegen"
 
-#: ../../mod/editpost.php:103 ../../include/conversation.php:946
+#: ../../mod/editpost.php:103 ../../include/conversation.php:969
 msgid "Clear browser location"
 msgstr "Browser-Standort leeren"
 
-#: ../../mod/editpost.php:105 ../../include/conversation.php:951
+#: ../../mod/editpost.php:105 ../../include/conversation.php:976
 msgid "Permission settings"
 msgstr "Berechtigungseinstellungen"
 
-#: ../../mod/editpost.php:113 ../../include/conversation.php:960
+#: ../../mod/editpost.php:113 ../../include/conversation.php:985
 msgid "CC: email addresses"
 msgstr "Cc:-E-Mail-Addressen"
 
-#: ../../mod/editpost.php:114 ../../include/conversation.php:961
+#: ../../mod/editpost.php:114 ../../include/conversation.php:986
 msgid "Public post"
 msgstr "Öffentlicher Beitrag"
 
-#: ../../mod/editpost.php:117 ../../include/conversation.php:949
+#: ../../mod/editpost.php:117 ../../include/conversation.php:972
 msgid "Set title"
 msgstr "Titel setzen"
 
-#: ../../mod/editpost.php:118 ../../include/conversation.php:963
+#: ../../mod/editpost.php:119 ../../include/conversation.php:974
+msgid "Categories (comma-separated list)"
+msgstr "Kategorien (mit Komma separierte Liste)"
+
+#: ../../mod/editpost.php:120 ../../include/conversation.php:988
 msgid "Example: bob@example.com, mary@example.com"
 msgstr "Z.B.: bob@example.com, mary@example.com"
 
-#: ../../mod/dfrn_request.php:92
+#: ../../mod/dfrn_request.php:93
 msgid "This introduction has already been accepted."
 msgstr "Diese Kontaktanfrage wurde bereits akzeptiert."
 
-#: ../../mod/dfrn_request.php:116 ../../mod/dfrn_request.php:381
+#: ../../mod/dfrn_request.php:117 ../../mod/dfrn_request.php:427
 msgid "Profile location is not valid or does not contain profile information."
 msgstr "Profiladresse ist ungültig oder stellt einige Profildaten nicht zur Verfügung."
 
-#: ../../mod/dfrn_request.php:121 ../../mod/dfrn_request.php:386
+#: ../../mod/dfrn_request.php:122 ../../mod/dfrn_request.php:432
 msgid "Warning: profile location has no identifiable owner name."
 msgstr "Warnung: Es konnte kein Name des Besitzers von der angegebenen Profiladresse gefunden werden."
 
-#: ../../mod/dfrn_request.php:123 ../../mod/dfrn_request.php:388
+#: ../../mod/dfrn_request.php:124 ../../mod/dfrn_request.php:434
 msgid "Warning: profile location has no profile photo."
 msgstr "Warnung: Es konnte kein Profilbild bei der angegebenen Profiladresse gefunden werden."
 
-#: ../../mod/dfrn_request.php:126 ../../mod/dfrn_request.php:391
+#: ../../mod/dfrn_request.php:127 ../../mod/dfrn_request.php:437
 #, php-format
 msgid "%d required parameter was not found at the given location"
 msgid_plural "%d required parameters were not found at the given location"
 msgstr[0] "%d benötigter Parameter wurde an der angegebenen Stelle nicht gefunden"
 msgstr[1] "%d benötigte Parameter wurden an der angegebenen Stelle nicht gefunden"
 
-#: ../../mod/dfrn_request.php:167
+#: ../../mod/dfrn_request.php:168
 msgid "Introduction complete."
 msgstr "Kontaktanfrage abgeschlossen."
 
-#: ../../mod/dfrn_request.php:191
+#: ../../mod/dfrn_request.php:192
 msgid "Unrecoverable protocol error."
 msgstr "Nicht behebbarer Protokollfehler."
 
-#: ../../mod/dfrn_request.php:219
+#: ../../mod/dfrn_request.php:220
 msgid "Profile unavailable."
 msgstr "Profil nicht verfügbar."
 
-#: ../../mod/dfrn_request.php:244
+#: ../../mod/dfrn_request.php:245
 #, php-format
 msgid "%s has received too many connection requests today."
 msgstr "%s hat heute zu viele Freundschaftsanfragen erhalten."
 
-#: ../../mod/dfrn_request.php:245
+#: ../../mod/dfrn_request.php:246
 msgid "Spam protection measures have been invoked."
 msgstr "Maßnahmen zum Spamschutz wurden ergriffen."
 
-#: ../../mod/dfrn_request.php:246
+#: ../../mod/dfrn_request.php:247
 msgid "Friends are advised to please try again in 24 hours."
 msgstr "Freunde sind angehalten, es in 24 Stunden erneut zu versuchen."
 
-#: ../../mod/dfrn_request.php:306
+#: ../../mod/dfrn_request.php:309
 msgid "Invalid locator"
 msgstr "Ungültiger Locator"
 
-#: ../../mod/dfrn_request.php:326
+#: ../../mod/dfrn_request.php:318
+msgid "Invalid email address."
+msgstr "Ungültige E-Mail Adresse."
+
+#: ../../mod/dfrn_request.php:344
+msgid "This account has not been configured for email. Request failed."
+msgstr "Dieses Konto ist nicht für Email konfiguriert. Anfrage fehlgeschlagen."
+
+#: ../../mod/dfrn_request.php:372
 msgid "Unable to resolve your name at the provided location."
 msgstr "Konnte deinen Namen an der angegebenen Stelle nicht finden."
 
-#: ../../mod/dfrn_request.php:339
+#: ../../mod/dfrn_request.php:385
 msgid "You have already introduced yourself here."
 msgstr "Du hast dich hier bereits vorgestellt."
 
-#: ../../mod/dfrn_request.php:343
+#: ../../mod/dfrn_request.php:389
 #, php-format
 msgid "Apparently you are already friends with %s."
 msgstr "Es scheint so, als ob du bereits mit %s befreundet bist."
 
-#: ../../mod/dfrn_request.php:364
+#: ../../mod/dfrn_request.php:410
 msgid "Invalid profile URL."
 msgstr "Ungültige Profil-URL."
 
-#: ../../mod/dfrn_request.php:370 ../../mod/follow.php:20
+#: ../../mod/dfrn_request.php:416 ../../mod/follow.php:20
 msgid "Disallowed profile URL."
 msgstr "Nicht erlaubte Profil-URL."
 
-#: ../../mod/dfrn_request.php:439 ../../mod/contacts.php:102
+#: ../../mod/dfrn_request.php:485 ../../mod/contacts.php:102
 msgid "Failed to update contact record."
 msgstr "Aktualisierung der Kontaktdaten fehlgeschlagen."
 
-#: ../../mod/dfrn_request.php:460
+#: ../../mod/dfrn_request.php:506
 msgid "Your introduction has been sent."
 msgstr "Deine Kontaktanfrage wurde gesendet."
 
-#: ../../mod/dfrn_request.php:513
+#: ../../mod/dfrn_request.php:559
 msgid "Please login to confirm introduction."
 msgstr "Bitte melde dich an, um die Kontaktanfrage zu bestätigen."
 
-#: ../../mod/dfrn_request.php:527
+#: ../../mod/dfrn_request.php:573
 msgid ""
 "Incorrect identity currently logged in. Please login to "
 "<strong>this</strong> profile."
 msgstr "Momentan bist du mit einer anderen Identität angemeldet. Bitte melde Dich mit <strong>diesem</strong> Profil an."
 
-#: ../../mod/dfrn_request.php:539
+#: ../../mod/dfrn_request.php:585
 #, php-format
 msgid "Welcome home %s."
 msgstr "Willkommen zurück %s."
 
-#: ../../mod/dfrn_request.php:540
+#: ../../mod/dfrn_request.php:586
 #, php-format
 msgid "Please confirm your introduction/connection request to %s."
 msgstr "Bitte bestätige deine Kontaktanfrage bei %s."
 
-#: ../../mod/dfrn_request.php:541
+#: ../../mod/dfrn_request.php:587
 msgid "Confirm"
 msgstr "Bestätigen"
 
-#: ../../mod/dfrn_request.php:582 ../../include/items.php:2566
+#: ../../mod/dfrn_request.php:628 ../../include/items.php:2691
 msgid "[Name Withheld]"
 msgstr "[Name unterdrückt]"
 
-#: ../../mod/dfrn_request.php:666
-#, php-format
-msgid ""
-"Diaspora members: Please do not use this form. Instead, enter \"%s\" into "
-"your Diaspora search bar."
-msgstr "Diaspora-User: Bitte nicht dieses Formular benutzen! Gebt statt dessen \"%s\" in der Diaspora-Suchleiste ein."
-
-#: ../../mod/dfrn_request.php:669
+#: ../../mod/dfrn_request.php:715
 msgid ""
 "Please enter your 'Identity Address' from one of the following supported "
-"social networks:"
+"communications networks:"
 msgstr "Bitte gib die Adresse deines Profils in einem der unterstützten sozialen Netzwerke an:"
 
-#: ../../mod/dfrn_request.php:672
+#: ../../mod/dfrn_request.php:731
+msgid "<strike>Connect as an email follower</strike> (Coming soon)"
+msgstr "<strike>Als E-Mail-Kontakt verbinden</strike> (In Kürze verfügbar)"
+
+#: ../../mod/dfrn_request.php:733
+msgid ""
+"If you are not yet a member of the free social web, <a "
+"href=\"http://dir.friendica.com/siteinfo\">follow this link to find a public"
+" Friendica site and join us today</a>."
+msgstr "Wenn du noch kein Mitglied dieses freien sozialen Netzwerks bist, <a href=\"http://dir.friendica.com/siteinfo\">folge diesem Link</a> um einen öffentlichen Friendica-Server zu finden und beizutreten."
+
+#: ../../mod/dfrn_request.php:736
 msgid "Friend/Connection Request"
 msgstr "Freundschafts-/Kontaktanfrage"
 
-#: ../../mod/dfrn_request.php:673
+#: ../../mod/dfrn_request.php:737
 msgid ""
 "Examples: jojo@demo.friendica.com, http://demo.friendica.com/profile/jojo, "
 "testuser@identi.ca"
 msgstr "Beispiele: jojo@demo.friendica.com, http://demo.friendica.com/profile/jojo, testuser@identi.ca"
 
-#: ../../mod/dfrn_request.php:674
+#: ../../mod/dfrn_request.php:738
 msgid "Please answer the following:"
 msgstr "Bitte beantworte Folgendes:"
 
-#: ../../mod/dfrn_request.php:675
+#: ../../mod/dfrn_request.php:739
 #, php-format
 msgid "Does %s know you?"
 msgstr "Kennt %s dich?"
 
-#: ../../mod/dfrn_request.php:678
+#: ../../mod/dfrn_request.php:742
 msgid "Add a personal note:"
 msgstr "Eine persönliche Notiz beifügen:"
 
-#: ../../mod/dfrn_request.php:680 ../../include/contact_selectors.php:76
+#: ../../mod/dfrn_request.php:744 ../../include/contact_selectors.php:76
 msgid "Friendica"
 msgstr "Friendica"
 
-#: ../../mod/dfrn_request.php:681
+#: ../../mod/dfrn_request.php:745
 msgid "StatusNet/Federated Social Web"
 msgstr "StatusNet/Federated Social Web"
 
-#: ../../mod/dfrn_request.php:682 ../../mod/settings.php:555
+#: ../../mod/dfrn_request.php:746 ../../mod/settings.php:629
 #: ../../include/contact_selectors.php:80
 msgid "Diaspora"
 msgstr "Diaspora"
 
-#: ../../mod/dfrn_request.php:683
-msgid "- please share from your own site as noted above"
-msgstr "- bitte fange von Deiner eigenen Seite aus zu teilen an"
+#: ../../mod/dfrn_request.php:747
+#, php-format
+msgid ""
+" - please do not use this form.  Instead, enter %s into your Diaspora search"
+" bar."
+msgstr " - bitte verwende dieses Formular nicht. Stattdessen suche nach %s in deiner Diaspora Suchleiste."
 
-#: ../../mod/dfrn_request.php:684
+#: ../../mod/dfrn_request.php:748
 msgid "Your Identity Address:"
 msgstr "Adresse deines Profils:"
 
-#: ../../mod/dfrn_request.php:685
+#: ../../mod/dfrn_request.php:751
 msgid "Submit Request"
 msgstr "Anfrage abschicken"
 
@@ -985,8 +1061,8 @@ msgid "This is required for message delivery to work."
 msgstr "Dies wird für die Auslieferung von Nachrichten benötigt."
 
 #: ../../mod/install.php:343
-msgid "PHP \"register_argc_argv\""
-msgstr "PHP \"register_argc_argv\""
+msgid "PHP register_argc_argv"
+msgstr "PHP register_argc_argv"
 
 #: ../../mod/install.php:364
 msgid ""
@@ -1025,8 +1101,8 @@ msgid "mb_string PHP module"
 msgstr "PHP: mb_string-Modul"
 
 #: ../../mod/install.php:383 ../../mod/install.php:385
-msgid "Apace mod_rewrite module"
-msgstr "Apache: mod_rewrite-Modul"
+msgid "Apache mod_rewrite module"
+msgstr "Apache mod_rewrite module"
 
 #: ../../mod/install.php:383
 msgid ""
@@ -1140,7 +1216,7 @@ msgid "is interested in:"
 msgstr "ist interessiert an:"
 
 #: ../../mod/match.php:58 ../../mod/suggest.php:59
-#: ../../include/contact_widgets.php:9 ../../boot.php:930
+#: ../../include/contact_widgets.php:9 ../../boot.php:1027
 msgid "Connect"
 msgstr "Verbinden"
 
@@ -1165,184 +1241,191 @@ msgstr "Willkommen zu %s"
 msgid "Invalid request identifier."
 msgstr "Invalid request identifier."
 
-#: ../../mod/notifications.php:35 ../../mod/notifications.php:157
-#: ../../mod/notifications.php:203
+#: ../../mod/notifications.php:35 ../../mod/notifications.php:161
+#: ../../mod/notifications.php:207
 msgid "Discard"
 msgstr "Verwerfen"
 
-#: ../../mod/notifications.php:47 ../../mod/notifications.php:156
-#: ../../mod/notifications.php:202 ../../mod/contacts.php:302
-#: ../../mod/contacts.php:345
+#: ../../mod/notifications.php:51 ../../mod/notifications.php:160
+#: ../../mod/notifications.php:206 ../../mod/contacts.php:308
+#: ../../mod/contacts.php:351
 msgid "Ignore"
 msgstr "Ignorieren"
 
-#: ../../mod/notifications.php:71
+#: ../../mod/notifications.php:75
 msgid "System"
 msgstr "System"
 
-#: ../../mod/notifications.php:76 ../../include/nav.php:109
+#: ../../mod/notifications.php:80 ../../include/nav.php:113
 msgid "Network"
 msgstr "Netzwerk"
 
-#: ../../mod/notifications.php:81 ../../mod/network.php:177
+#: ../../mod/notifications.php:85 ../../mod/network.php:182
 msgid "Personal"
 msgstr "Persönlich"
 
-#: ../../mod/notifications.php:86 ../../include/nav.php:73
-#: ../../include/nav.php:111
+#: ../../mod/notifications.php:90
+#: ../../view/theme/diabook/diabook-green/theme.php:229
+#: ../../view/theme/diabook/diabook-red/theme.php:227
+#: ../../view/theme/diabook/diabook-blue/theme.php:227
+#: ../../view/theme/diabook/theme.php:246
+#: ../../view/theme/diabook/diabook-dark/theme.php:229
+#: ../../view/theme/diabook/diabook-aerith/theme.php:229
+#: ../../view/theme/diabook/diabook-pink/theme.php:229
+#: ../../include/nav.php:77 ../../include/nav.php:115
 msgid "Home"
 msgstr "Pinnwand"
 
-#: ../../mod/notifications.php:91 ../../include/nav.php:117
+#: ../../mod/notifications.php:95 ../../include/nav.php:121
 msgid "Introductions"
 msgstr "Kontaktanfragen"
 
-#: ../../mod/notifications.php:96 ../../mod/message.php:76
-#: ../../include/nav.php:124
+#: ../../mod/notifications.php:100 ../../mod/message.php:102
+#: ../../include/nav.php:128
 msgid "Messages"
 msgstr "Nachrichten"
 
-#: ../../mod/notifications.php:115
+#: ../../mod/notifications.php:119
 msgid "Show Ignored Requests"
 msgstr "Zeige ignorierte Anfragen"
 
-#: ../../mod/notifications.php:115
+#: ../../mod/notifications.php:119
 msgid "Hide Ignored Requests"
 msgstr "Verberge ignorierte Anfragen"
 
-#: ../../mod/notifications.php:141 ../../mod/notifications.php:187
+#: ../../mod/notifications.php:145 ../../mod/notifications.php:191
 msgid "Notification type: "
 msgstr "Benachrichtigungstyp: "
 
-#: ../../mod/notifications.php:142
+#: ../../mod/notifications.php:146
 msgid "Friend Suggestion"
 msgstr "Kontaktvorschlag"
 
-#: ../../mod/notifications.php:144
+#: ../../mod/notifications.php:148
 #, php-format
 msgid "suggested by %s"
 msgstr "vorgeschlagen von %s"
 
-#: ../../mod/notifications.php:149 ../../mod/notifications.php:196
-#: ../../mod/contacts.php:350
+#: ../../mod/notifications.php:153 ../../mod/notifications.php:200
+#: ../../mod/contacts.php:356
 msgid "Hide this contact from others"
 msgstr "Verberge diesen Kontakt vor anderen"
 
-#: ../../mod/notifications.php:150 ../../mod/notifications.php:197
+#: ../../mod/notifications.php:154 ../../mod/notifications.php:201
 msgid "Post a new friend activity"
 msgstr "Neue-Kontakt Nachricht senden"
 
-#: ../../mod/notifications.php:150 ../../mod/notifications.php:197
+#: ../../mod/notifications.php:154 ../../mod/notifications.php:201
 msgid "if applicable"
 msgstr "falls anwendbar"
 
-#: ../../mod/notifications.php:153 ../../mod/notifications.php:200
-#: ../../mod/admin.php:486
+#: ../../mod/notifications.php:157 ../../mod/notifications.php:204
+#: ../../mod/admin.php:575
 msgid "Approve"
 msgstr "Genehmigen"
 
-#: ../../mod/notifications.php:173
+#: ../../mod/notifications.php:177
 msgid "Claims to be known to you: "
 msgstr "Behauptet dich zu kennen: "
 
-#: ../../mod/notifications.php:173
+#: ../../mod/notifications.php:177
 msgid "yes"
 msgstr "ja"
 
-#: ../../mod/notifications.php:173
+#: ../../mod/notifications.php:177
 msgid "no"
 msgstr "nein"
 
-#: ../../mod/notifications.php:180
+#: ../../mod/notifications.php:184
 msgid "Approve as: "
 msgstr "Genehmigen als: "
 
-#: ../../mod/notifications.php:181
+#: ../../mod/notifications.php:185
 msgid "Friend"
 msgstr "Freund"
 
-#: ../../mod/notifications.php:182
+#: ../../mod/notifications.php:186
 msgid "Sharer"
 msgstr "Teilenden"
 
-#: ../../mod/notifications.php:182
+#: ../../mod/notifications.php:186
 msgid "Fan/Admirer"
 msgstr "Fan/Verehrer"
 
-#: ../../mod/notifications.php:188
+#: ../../mod/notifications.php:192
 msgid "Friend/Connect Request"
 msgstr "Kontakt-/Freundschaftsanfrage"
 
-#: ../../mod/notifications.php:188
+#: ../../mod/notifications.php:192
 msgid "New Follower"
 msgstr "Neuer Bewunderer"
 
-#: ../../mod/notifications.php:209
+#: ../../mod/notifications.php:213
 msgid "No introductions."
 msgstr "Keine Kontaktanfragen."
 
-#: ../../mod/notifications.php:212 ../../include/nav.php:118
+#: ../../mod/notifications.php:216 ../../include/nav.php:122
 msgid "Notifications"
 msgstr "Benachrichtigungen"
 
-#: ../../mod/notifications.php:249 ../../mod/notifications.php:374
-#: ../../mod/notifications.php:461
+#: ../../mod/notifications.php:253 ../../mod/notifications.php:378
+#: ../../mod/notifications.php:465
 #, php-format
 msgid "%s liked %s's post"
 msgstr "%s mag %ss Beitrag"
 
-#: ../../mod/notifications.php:258 ../../mod/notifications.php:383
-#: ../../mod/notifications.php:470
+#: ../../mod/notifications.php:262 ../../mod/notifications.php:387
+#: ../../mod/notifications.php:474
 #, php-format
 msgid "%s disliked %s's post"
 msgstr "%s mag %ss Beitrag nicht"
 
-#: ../../mod/notifications.php:272 ../../mod/notifications.php:397
-#: ../../mod/notifications.php:484
+#: ../../mod/notifications.php:276 ../../mod/notifications.php:401
+#: ../../mod/notifications.php:488
 #, php-format
 msgid "%s is now friends with %s"
 msgstr "%s ist jetzt mit %s befreundet"
 
-#: ../../mod/notifications.php:279 ../../mod/notifications.php:404
+#: ../../mod/notifications.php:283 ../../mod/notifications.php:408
 #, php-format
 msgid "%s created a new post"
 msgstr "%s hat einen neuen Beitrag erstellt"
 
-#: ../../mod/notifications.php:280 ../../mod/notifications.php:405
-#: ../../mod/notifications.php:493
+#: ../../mod/notifications.php:284 ../../mod/notifications.php:409
+#: ../../mod/notifications.php:497
 #, php-format
 msgid "%s commented on %s's post"
 msgstr "%s hat %ss Beitrag kommentiert"
 
-#: ../../mod/notifications.php:294
+#: ../../mod/notifications.php:298
 msgid "No more network notifications."
 msgstr "Keine weiteren Netzwerk-Benachrichtigungen."
 
-#: ../../mod/notifications.php:298
+#: ../../mod/notifications.php:302
 msgid "Network Notifications"
 msgstr "Netzwerk Benachrichtigungen"
 
-#: ../../mod/notifications.php:324 ../../mod/notify.php:61
+#: ../../mod/notifications.php:328 ../../mod/notify.php:61
 msgid "No more system notifications."
 msgstr "Keine weiteren System Benachrichtigungen."
 
-#: ../../mod/notifications.php:328 ../../mod/notify.php:65
+#: ../../mod/notifications.php:332 ../../mod/notify.php:65
 msgid "System Notifications"
 msgstr "System Benachrichtigungen"
 
-#: ../../mod/notifications.php:419
+#: ../../mod/notifications.php:423
 msgid "No more personal notifications."
 msgstr "Keine weiteren persönlichen Benachrichtigungen"
 
-#: ../../mod/notifications.php:423
+#: ../../mod/notifications.php:427
 msgid "Personal Notifications"
 msgstr "Persönliche Benachrichtigungen"
 
-#: ../../mod/notifications.php:500
+#: ../../mod/notifications.php:504
 msgid "No more home notifications."
 msgstr "Keine weiteren Pinnwand-Benachrichtigungen"
 
-#: ../../mod/notifications.php:504
+#: ../../mod/notifications.php:508
 msgid "Home Notifications"
 msgstr "Pinnwand Benachrichtigungen"
 
@@ -1382,200 +1465,211 @@ msgstr "wird nicht mehr gefolgt"
 msgid "Contact has been removed."
 msgstr "Kontakt wurde entfernt."
 
-#: ../../mod/contacts.php:245
+#: ../../mod/contacts.php:251
 #, php-format
 msgid "You are mutual friends with %s"
 msgstr "Du hast mit %s eine beidseitige Freundschaft"
 
-#: ../../mod/contacts.php:249
+#: ../../mod/contacts.php:255
 #, php-format
 msgid "You are sharing with %s"
 msgstr "Du teilst mit %s"
 
-#: ../../mod/contacts.php:254
+#: ../../mod/contacts.php:260
 #, php-format
 msgid "%s is sharing with you"
 msgstr "%s teilt mit Dir"
 
-#: ../../mod/contacts.php:271
+#: ../../mod/contacts.php:277
 msgid "Private communications are not available for this contact."
 msgstr "Private Kommunikation ist für diesen Kontakt nicht verfügbar."
 
-#: ../../mod/contacts.php:274
+#: ../../mod/contacts.php:280
 msgid "Never"
 msgstr "Niemals"
 
-#: ../../mod/contacts.php:278
+#: ../../mod/contacts.php:284
 msgid "(Update was successful)"
 msgstr "(Aktualisierung war erfolgreich)"
 
-#: ../../mod/contacts.php:278
+#: ../../mod/contacts.php:284
 msgid "(Update was not successful)"
 msgstr "(Aktualisierung war nicht erfolgreich)"
 
-#: ../../mod/contacts.php:280
+#: ../../mod/contacts.php:286
 msgid "Suggest friends"
 msgstr "Kontakte vorschlagen"
 
-#: ../../mod/contacts.php:284
+#: ../../mod/contacts.php:290
 #, php-format
 msgid "Network type: %s"
 msgstr "Netzwerk Typ: %s"
 
-#: ../../mod/contacts.php:287
+#: ../../mod/contacts.php:293
 #, php-format
 msgid "%d contact in common"
 msgid_plural "%d contacts in common"
 msgstr[0] "%d gemeinsamer Kontakt"
 msgstr[1] "%d gemeinsame Kontakte"
 
-#: ../../mod/contacts.php:292
+#: ../../mod/contacts.php:298
 msgid "View all contacts"
 msgstr "Alle Kontakte anzeigen"
 
-#: ../../mod/contacts.php:297 ../../mod/contacts.php:344
-#: ../../mod/admin.php:490
+#: ../../mod/contacts.php:303 ../../mod/contacts.php:350
+#: ../../mod/admin.php:579
 msgid "Unblock"
 msgstr "Entsperren"
 
-#: ../../mod/contacts.php:297 ../../mod/contacts.php:344
-#: ../../mod/admin.php:489
+#: ../../mod/contacts.php:303 ../../mod/contacts.php:350
+#: ../../mod/admin.php:578
 msgid "Block"
 msgstr "Sperren"
 
-#: ../../mod/contacts.php:302 ../../mod/contacts.php:345
+#: ../../mod/contacts.php:308 ../../mod/contacts.php:351
 msgid "Unignore"
 msgstr "Ignorieren aufheben"
 
-#: ../../mod/contacts.php:307
+#: ../../mod/contacts.php:313
 msgid "Repair"
 msgstr "Reparieren"
 
-#: ../../mod/contacts.php:317
+#: ../../mod/contacts.php:323
 msgid "Contact Editor"
 msgstr "Kontakt Editor"
 
-#: ../../mod/contacts.php:320
+#: ../../mod/contacts.php:326
 msgid "Profile Visibility"
 msgstr "Profil Anzeige"
 
-#: ../../mod/contacts.php:321
+#: ../../mod/contacts.php:327
 #, php-format
 msgid ""
 "Please choose the profile you would like to display to %s when viewing your "
 "profile securely."
 msgstr "Bitte wähle eines deiner Profile das angezeigt werden soll, wenn %s dein Profil aufruft."
 
-#: ../../mod/contacts.php:322
+#: ../../mod/contacts.php:328
 msgid "Contact Information / Notes"
 msgstr "Kontakt Informationen / Notizen"
 
-#: ../../mod/contacts.php:323
+#: ../../mod/contacts.php:329
 msgid "Edit contact notes"
 msgstr "Notizen zum Kontakt bearbiten"
 
-#: ../../mod/contacts.php:328 ../../mod/contacts.php:497
-#: ../../mod/viewcontacts.php:60
+#: ../../mod/contacts.php:334 ../../mod/contacts.php:507
+#: ../../mod/viewcontacts.php:62 ../../mod/nogroup.php:40
 #, php-format
 msgid "Visit %s's profile [%s]"
 msgstr "Besuche %ss Profil [%s]"
 
-#: ../../mod/contacts.php:329
+#: ../../mod/contacts.php:335
 msgid "Block/Unblock contact"
 msgstr "Kontakt blockieren/freischalten"
 
-#: ../../mod/contacts.php:330
+#: ../../mod/contacts.php:336
 msgid "Ignore contact"
 msgstr "Ignoriere den Kontakt"
 
-#: ../../mod/contacts.php:331
+#: ../../mod/contacts.php:337
 msgid "Repair URL settings"
 msgstr "URL Einstellungen reparieren"
 
-#: ../../mod/contacts.php:332
+#: ../../mod/contacts.php:338
 msgid "View conversations"
 msgstr "Unterhaltungen anzeigen"
 
-#: ../../mod/contacts.php:334
+#: ../../mod/contacts.php:340
 msgid "Delete contact"
 msgstr "Lösche den Kontakt"
 
-#: ../../mod/contacts.php:338
+#: ../../mod/contacts.php:344
 msgid "Last update:"
 msgstr "letzte Aktualisierung:"
 
-#: ../../mod/contacts.php:339
+#: ../../mod/contacts.php:345
 msgid "Update public posts"
 msgstr "Öffentliche Beiträge aktualisieren"
 
-#: ../../mod/contacts.php:341 ../../mod/admin.php:905
+#: ../../mod/contacts.php:347 ../../mod/admin.php:1051
 msgid "Update now"
 msgstr "Jetzt aktualisieren"
 
-#: ../../mod/contacts.php:348
+#: ../../mod/contacts.php:354
 msgid "Currently blocked"
 msgstr "Derzeit geblockt"
 
-#: ../../mod/contacts.php:349
+#: ../../mod/contacts.php:355
 msgid "Currently ignored"
 msgstr "Derzeit ignoriert"
 
-#: ../../mod/contacts.php:350
+#: ../../mod/contacts.php:356
 msgid ""
 "Replies/likes to your public posts <strong>may</strong> still be visible"
 msgstr "Antworten/Likes auf deine öffentlichen Beiträge <strong>könnten</strong> weiterhin sichtbar sein"
 
-#: ../../mod/contacts.php:399 ../../mod/group.php:179
+#: ../../mod/contacts.php:405
+msgid "Suggestions"
+msgstr "Kontaktvorschläge"
+
+#: ../../mod/contacts.php:410 ../../mod/group.php:191
 msgid "All Contacts"
 msgstr "Alle Kontakte"
 
-#: ../../mod/contacts.php:404
+#: ../../mod/contacts.php:415
 msgid "Unblocked Contacts"
 msgstr "Nicht blockierte Kontakte"
 
-#: ../../mod/contacts.php:410
+#: ../../mod/contacts.php:421
 msgid "Blocked Contacts"
 msgstr "Blockierte Kontakte"
 
-#: ../../mod/contacts.php:416
+#: ../../mod/contacts.php:427
 msgid "Ignored Contacts"
 msgstr "Ignorierte Kontakte"
 
-#: ../../mod/contacts.php:422
+#: ../../mod/contacts.php:433
 msgid "Hidden Contacts"
 msgstr "Verborgene Kontakte"
 
-#: ../../mod/contacts.php:473
+#: ../../mod/contacts.php:483
 msgid "Mutual Friendship"
 msgstr "Beidseitige Freundschaft"
 
-#: ../../mod/contacts.php:477
+#: ../../mod/contacts.php:487
 msgid "is a fan of yours"
 msgstr "ist ein Fan von dir"
 
-#: ../../mod/contacts.php:481
+#: ../../mod/contacts.php:491
 msgid "you are a fan of"
 msgstr "du bist Fan von"
 
-#: ../../mod/contacts.php:498 ../../include/Contact.php:135
-#: ../../include/conversation.php:792
+#: ../../mod/contacts.php:508 ../../mod/nogroup.php:41
 msgid "Edit contact"
 msgstr "Kontakt bearbeiten"
 
-#: ../../mod/contacts.php:519 ../../include/nav.php:132
+#: ../../mod/contacts.php:529
+#: ../../view/theme/diabook/diabook-green/theme.php:231
+#: ../../view/theme/diabook/diabook-red/theme.php:229
+#: ../../view/theme/diabook/diabook-blue/theme.php:229
+#: ../../view/theme/diabook/theme.php:248
+#: ../../view/theme/diabook/diabook-dark/theme.php:231
+#: ../../view/theme/diabook/diabook-aerith/theme.php:231
+#: ../../view/theme/diabook/diabook-pink/theme.php:231
+#: ../../include/nav.php:139
 msgid "Contacts"
 msgstr "Kontakte"
 
-#: ../../mod/contacts.php:523
+#: ../../mod/contacts.php:533
 msgid "Search your contacts"
 msgstr "Suche in deinen Kontakten"
 
-#: ../../mod/contacts.php:524 ../../mod/directory.php:67
+#: ../../mod/contacts.php:534 ../../mod/directory.php:57
 msgid "Finding: "
 msgstr "Funde: "
 
-#: ../../mod/contacts.php:525 ../../mod/directory.php:69
-#: ../../include/contact_widgets.php:34
+#: ../../mod/contacts.php:535 ../../mod/directory.php:59
+#: ../../include/contact_widgets.php:33
 msgid "Find"
 msgstr "Finde"
 
@@ -1583,511 +1677,560 @@ msgstr "Finde"
 msgid "No valid account found."
 msgstr "Kein gültiger Account gefunden."
 
-#: ../../mod/lostpass.php:31
+#: ../../mod/lostpass.php:32
 msgid "Password reset request issued. Check your email."
 msgstr "Zurücksetzen des Passworts eingeleitet. Bitte überprüfe deine E-Mail."
 
-#: ../../mod/lostpass.php:42
+#: ../../mod/lostpass.php:43
 #, php-format
 msgid "Password reset requested at %s"
 msgstr "Anfrage zum Zurücksetzen des Passworts auf %s erhalten"
 
-#: ../../mod/lostpass.php:44 ../../mod/lostpass.php:106
-#: ../../mod/register.php:380 ../../mod/register.php:434
-#: ../../mod/regmod.php:54 ../../mod/dfrn_confirm.php:726
-#: ../../include/items.php:2575
+#: ../../mod/lostpass.php:45 ../../mod/lostpass.php:107
+#: ../../mod/register.php:388 ../../mod/register.php:442
+#: ../../mod/regmod.php:54 ../../mod/dfrn_confirm.php:732
+#: ../../addon/facebook/facebook.php:650
+#: ../../addon/facebook/facebook.php:1136
+#: ../../addon/testdrive/testdrive.php:58 ../../include/items.php:2700
 msgid "Administrator"
 msgstr "Administrator"
 
-#: ../../mod/lostpass.php:64
+#: ../../mod/lostpass.php:65
 msgid ""
 "Request could not be verified. (You may have previously submitted it.) "
 "Password reset failed."
 msgstr "Anfrage konnte nicht verifiziert werden. (Eventuell hast du bereits eine ähnliche Anfrage gestellt.) Zurücksetzen des Passworts gescheitert."
 
-#: ../../mod/lostpass.php:82 ../../boot.php:723
+#: ../../mod/lostpass.php:83 ../../boot.php:809
 msgid "Password Reset"
 msgstr "Passwort zurücksetzen"
 
-#: ../../mod/lostpass.php:83
+#: ../../mod/lostpass.php:84
 msgid "Your password has been reset as requested."
 msgstr "Dein Passwort wurde wie gewünscht zurückgesetzt."
 
-#: ../../mod/lostpass.php:84
+#: ../../mod/lostpass.php:85
 msgid "Your new password is"
 msgstr "Dein neues Passwort lautet"
 
-#: ../../mod/lostpass.php:85
+#: ../../mod/lostpass.php:86
 msgid "Save or copy your new password - and then"
 msgstr "Speichere oder kopiere dein neues Passwort - und dann"
 
-#: ../../mod/lostpass.php:86
+#: ../../mod/lostpass.php:87
 msgid "click here to login"
 msgstr "hier klicken, um dich anzumelden"
 
-#: ../../mod/lostpass.php:87
+#: ../../mod/lostpass.php:88
 msgid ""
 "Your password may be changed from the <em>Settings</em> page after "
 "successful login."
 msgstr "Du kannst das Passwort in den <em>Einstellungen</em> ändern, sobald du dich erfolgreich angemeldet hast."
 
-#: ../../mod/lostpass.php:118
+#: ../../mod/lostpass.php:119
 msgid "Forgot your Password?"
 msgstr "Hast du dein Passwort vergessen?"
 
-#: ../../mod/lostpass.php:119
+#: ../../mod/lostpass.php:120
 msgid ""
 "Enter your email address and submit to have your password reset. Then check "
 "your email for further instructions."
 msgstr "Gib deine Email-Adresse an und fordere ein neues Passwort an. Es werden dir dann weitere Informationen per Mail zugesendet."
 
-#: ../../mod/lostpass.php:120
+#: ../../mod/lostpass.php:121
 msgid "Nickname or Email: "
 msgstr "Spitzname oder Email:"
 
-#: ../../mod/lostpass.php:121
+#: ../../mod/lostpass.php:122
 msgid "Reset"
 msgstr "Zurücksetzen"
 
-#: ../../mod/settings.php:72
+#: ../../mod/settings.php:49 ../../include/nav.php:137
+msgid "Account settings"
+msgstr "Account Einstellungen"
+
+#: ../../mod/settings.php:54
+msgid "Display settings"
+msgstr "Anzeige Einstellungen"
+
+#: ../../mod/settings.php:60
+msgid "Connector settings"
+msgstr "Connector-Einstellungen"
+
+#: ../../mod/settings.php:65
+msgid "Plugin settings"
+msgstr "Plugin-Einstellungen"
+
+#: ../../mod/settings.php:70
+msgid "Connected apps"
+msgstr "Verbundene Programme"
+
+#: ../../mod/settings.php:75
+msgid "Export personal data"
+msgstr "Persönliche Daten exportieren"
+
+#: ../../mod/settings.php:83 ../../mod/admin.php:665 ../../mod/admin.php:870
+#: ../../addon/mathjax/mathjax.php:36 ../../include/nav.php:137
+msgid "Settings"
+msgstr "Einstellungen"
+
+#: ../../mod/settings.php:126
 msgid "Missing some important data!"
 msgstr "Wichtige Daten fehlen!"
 
-#: ../../mod/settings.php:75 ../../mod/settings.php:486 ../../mod/admin.php:75
+#: ../../mod/settings.php:129 ../../mod/settings.php:558
+#: ../../mod/admin.php:97
 msgid "Update"
 msgstr "Aktualisierungen"
 
-#: ../../mod/settings.php:175
+#: ../../mod/settings.php:234
 msgid "Failed to connect with email account using the settings provided."
 msgstr "Konnte das Email Konto mit den angegebenen Einstellungen nicht erreichen."
 
-#: ../../mod/settings.php:180
+#: ../../mod/settings.php:239
 msgid "Email settings updated."
 msgstr "EMail Einstellungen bearbeitet."
 
-#: ../../mod/settings.php:198
+#: ../../mod/settings.php:298
 msgid "Passwords do not match. Password unchanged."
 msgstr "Die Passwörter stimmen nicht überein. Das Passwort bleibt unverändert."
 
-#: ../../mod/settings.php:203
+#: ../../mod/settings.php:303
 msgid "Empty passwords are not allowed. Password unchanged."
 msgstr "Leere Passwörter sind nicht erlaubt. Passwort bleibt unverändert."
 
-#: ../../mod/settings.php:214
+#: ../../mod/settings.php:314
 msgid "Password changed."
 msgstr "Passwort ändern."
 
-#: ../../mod/settings.php:216
+#: ../../mod/settings.php:316
 msgid "Password update failed. Please try again."
 msgstr "Aktualisierung des Passworts gescheitert, bitte versuche es noch einmal."
 
-#: ../../mod/settings.php:280
+#: ../../mod/settings.php:379
 msgid " Please use a shorter name."
 msgstr " Bitte verwende einen kürzeren Namen."
 
-#: ../../mod/settings.php:282
+#: ../../mod/settings.php:381
 msgid " Name too short."
 msgstr " Name ist zu kurz."
 
-#: ../../mod/settings.php:288
+#: ../../mod/settings.php:387
 msgid " Not valid email."
 msgstr " Keine gültige E-Mail."
 
-#: ../../mod/settings.php:290
+#: ../../mod/settings.php:389
 msgid " Cannot change to that email."
 msgstr "Ändern der E-Mail nicht möglich. "
 
-#: ../../mod/settings.php:358 ../../addon/facebook/facebook.php:321
-#: ../../addon/impressum/impressum.php:64
+#: ../../mod/settings.php:461 ../../addon/facebook/facebook.php:469
+#: ../../addon/impressum/impressum.php:75
 #: ../../addon/openstreetmap/openstreetmap.php:80
-#: ../../addon/piwik/piwik.php:105 ../../addon/twitter/twitter.php:350
+#: ../../addon/mathjax/mathjax.php:66 ../../addon/piwik/piwik.php:105
+#: ../../addon/twitter/twitter.php:370
 msgid "Settings updated."
 msgstr "Einstellungen aktualisiert."
 
-#: ../../mod/settings.php:422 ../../include/nav.php:130
-msgid "Account settings"
-msgstr "Account Einstellungen"
-
-#: ../../mod/settings.php:427
-msgid "Connector settings"
-msgstr "Connector-Einstellungen"
-
-#: ../../mod/settings.php:432
-msgid "Plugin settings"
-msgstr "Plugin-Einstellungen"
-
-#: ../../mod/settings.php:437
-msgid "Connections"
-msgstr "Verbindungen"
-
-#: ../../mod/settings.php:442
-msgid "Export personal data"
-msgstr "Persönliche Daten exportieren"
-
-#: ../../mod/settings.php:459 ../../mod/settings.php:485
-#: ../../mod/settings.php:518
+#: ../../mod/settings.php:531 ../../mod/settings.php:557
+#: ../../mod/settings.php:593
 msgid "Add application"
 msgstr "Programm hinzufügen"
 
-#: ../../mod/settings.php:463 ../../mod/settings.php:489
-#: ../../addon/statusnet/statusnet.php:526
+#: ../../mod/settings.php:535 ../../mod/settings.php:561
+#: ../../addon/statusnet/statusnet.php:547
 msgid "Consumer Key"
 msgstr "Consumer Key"
 
-#: ../../mod/settings.php:464 ../../mod/settings.php:490
-#: ../../addon/statusnet/statusnet.php:525
+#: ../../mod/settings.php:536 ../../mod/settings.php:562
+#: ../../addon/statusnet/statusnet.php:546
 msgid "Consumer Secret"
 msgstr "Consumer Secret"
 
-#: ../../mod/settings.php:465 ../../mod/settings.php:491
+#: ../../mod/settings.php:537 ../../mod/settings.php:563
 msgid "Redirect"
 msgstr "Umleiten"
 
-#: ../../mod/settings.php:466 ../../mod/settings.php:492
+#: ../../mod/settings.php:538 ../../mod/settings.php:564
 msgid "Icon url"
 msgstr "Icon URL"
 
-#: ../../mod/settings.php:477
+#: ../../mod/settings.php:549
 msgid "You can't edit this application."
 msgstr "Du kannst dieses Programm nicht bearbeiten."
 
-#: ../../mod/settings.php:517
+#: ../../mod/settings.php:592
 msgid "Connected Apps"
 msgstr "Verbundene Programme"
 
-#: ../../mod/settings.php:521
+#: ../../mod/settings.php:596
 msgid "Client key starts with"
 msgstr "Anwender Schlüssel beginnt mit"
 
-#: ../../mod/settings.php:522
+#: ../../mod/settings.php:597
 msgid "No name"
 msgstr "Kein Name"
 
-#: ../../mod/settings.php:523
+#: ../../mod/settings.php:598
 msgid "Remove authorization"
 msgstr "Autorisierung entziehen"
 
-#: ../../mod/settings.php:535
+#: ../../mod/settings.php:609
 msgid "No Plugin settings configured"
 msgstr "Keine Plugin-Einstellungen konfiguriert"
 
-#: ../../mod/settings.php:542 ../../addon/widgets/widgets.php:122
+#: ../../mod/settings.php:617 ../../addon/widgets/widgets.php:123
 msgid "Plugin Settings"
 msgstr "Plugin-Einstellungen"
 
-#: ../../mod/settings.php:555 ../../mod/settings.php:556
+#: ../../mod/settings.php:629 ../../mod/settings.php:630
 #, php-format
 msgid "Built-in support for %s connectivity is %s"
 msgstr "Eingebaute Unterstützung für Verbindungen zu %s ist %s"
 
-#: ../../mod/settings.php:555 ../../mod/settings.php:556
+#: ../../mod/settings.php:629 ../../mod/settings.php:630
 msgid "enabled"
 msgstr "eingeschaltet"
 
-#: ../../mod/settings.php:555 ../../mod/settings.php:556
+#: ../../mod/settings.php:629 ../../mod/settings.php:630
 msgid "disabled"
 msgstr "ausgeschaltet"
 
-#: ../../mod/settings.php:556
+#: ../../mod/settings.php:630
 msgid "StatusNet"
 msgstr "StatusNet"
 
-#: ../../mod/settings.php:584
+#: ../../mod/settings.php:660
 msgid "Connector Settings"
 msgstr "Verbindungs-Einstellungen"
 
-#: ../../mod/settings.php:590
+#: ../../mod/settings.php:665
 msgid "Email/Mailbox Setup"
 msgstr "E-Mail/Postfach-Einstellungen"
 
-#: ../../mod/settings.php:591
+#: ../../mod/settings.php:666
 msgid ""
 "If you wish to communicate with email contacts using this service "
 "(optional), please specify how to connect to your mailbox."
 msgstr "Wenn du mit E-Mail-Kontakten über diesen Service kommunizieren möchtest (optional), gib bitte die Einstellungen für dein Postfach an."
 
-#: ../../mod/settings.php:592
+#: ../../mod/settings.php:667
 msgid "Last successful email check:"
 msgstr "Letzter erfolgreicher Email Check"
 
-#: ../../mod/settings.php:593
+#: ../../mod/settings.php:668
 msgid "Email access is disabled on this site."
 msgstr "Zugriff auf E-Mails für diese Seite deaktiviert."
 
-#: ../../mod/settings.php:594
+#: ../../mod/settings.php:669
 msgid "IMAP server name:"
 msgstr "IMAP-Server-Name:"
 
-#: ../../mod/settings.php:595
+#: ../../mod/settings.php:670
 msgid "IMAP port:"
 msgstr "IMAP-Port:"
 
-#: ../../mod/settings.php:596
+#: ../../mod/settings.php:671
 msgid "Security:"
 msgstr "Sicherheit:"
 
-#: ../../mod/settings.php:596 ../../mod/settings.php:601
+#: ../../mod/settings.php:671 ../../mod/settings.php:676
 msgid "None"
 msgstr "Keine"
 
-#: ../../mod/settings.php:597
+#: ../../mod/settings.php:672
 msgid "Email login name:"
 msgstr "E-Mail-Login-Name:"
 
-#: ../../mod/settings.php:598
+#: ../../mod/settings.php:673
 msgid "Email password:"
 msgstr "E-Mail-Passwort:"
 
-#: ../../mod/settings.php:599
+#: ../../mod/settings.php:674
 msgid "Reply-to address:"
 msgstr "Reply-to Adresse:"
 
-#: ../../mod/settings.php:600
+#: ../../mod/settings.php:675
 msgid "Send public posts to all email contacts:"
 msgstr "Sende öffentliche Beiträge an alle E-Mail-Kontakte:"
 
-#: ../../mod/settings.php:601
+#: ../../mod/settings.php:676
 msgid "Action after import:"
 msgstr "Aktion nach Import:"
 
-#: ../../mod/settings.php:601
+#: ../../mod/settings.php:676
 msgid "Mark as seen"
 msgstr "Als gelesen markieren"
 
-#: ../../mod/settings.php:601
+#: ../../mod/settings.php:676
 msgid "Move to folder"
 msgstr "In einen Ordner verschieben"
 
-#: ../../mod/settings.php:602
+#: ../../mod/settings.php:677
 msgid "Move to folder:"
 msgstr "In diesen Ordner verschieben:"
 
-#: ../../mod/settings.php:659 ../../mod/admin.php:142 ../../mod/admin.php:462
+#: ../../mod/settings.php:737
+msgid "Display Settings"
+msgstr "Anzeige Einstellungen"
+
+#: ../../mod/settings.php:743
+msgid "Display Theme:"
+msgstr "Theme:"
+
+#: ../../mod/settings.php:744
+msgid "Update browser every xx seconds"
+msgstr "Browser alle xx Sekunden aktualisieren"
+
+#: ../../mod/settings.php:744
+msgid "Minimum of 10 seconds, no maximum"
+msgstr "Minimal 10 Sekunden, kein Maximum"
+
+#: ../../mod/settings.php:745
+msgid "Number of items to display on the network page:"
+msgstr "Zahl der Beiträge, welche pro Netzwerkseite angezeigt werden sollen: "
+
+#: ../../mod/settings.php:745
+msgid "Maximum of 100 items"
+msgstr "Maximal 100 Beiträge"
+
+#: ../../mod/settings.php:746
+msgid "Don't show emoticons"
+msgstr "Keine Smilies anzeigen"
+
+#: ../../mod/settings.php:811 ../../mod/admin.php:173 ../../mod/admin.php:551
 msgid "Normal Account"
 msgstr "Normaler Account"
 
-#: ../../mod/settings.php:660
+#: ../../mod/settings.php:812
 msgid "This account is a normal personal profile"
 msgstr "Dieser Account ist ein normales persönliches Profil"
 
-#: ../../mod/settings.php:663 ../../mod/admin.php:143 ../../mod/admin.php:463
+#: ../../mod/settings.php:815 ../../mod/admin.php:174 ../../mod/admin.php:552
 msgid "Soapbox Account"
 msgstr "Sandkasten-Account"
 
-#: ../../mod/settings.php:664
+#: ../../mod/settings.php:816
 msgid "Automatically approve all connection/friend requests as read-only fans"
 msgstr "Freundschaftsanfragen werden automatisch als Nurlese-Fans akzeptiert"
 
-#: ../../mod/settings.php:667 ../../mod/admin.php:144 ../../mod/admin.php:464
+#: ../../mod/settings.php:819 ../../mod/admin.php:175 ../../mod/admin.php:553
 msgid "Community/Celebrity Account"
 msgstr "Gemeinschafts/Promi-Account"
 
-#: ../../mod/settings.php:668
+#: ../../mod/settings.php:820
 msgid ""
 "Automatically approve all connection/friend requests as read-write fans"
 msgstr "Freundschaftsanfragen werden automatisch als Lese-und-Schreib-Fans akzeptiert"
 
-#: ../../mod/settings.php:671 ../../mod/admin.php:145 ../../mod/admin.php:465
+#: ../../mod/settings.php:823 ../../mod/admin.php:176 ../../mod/admin.php:554
 msgid "Automatic Friend Account"
 msgstr "Automatischer Freundesaccount"
 
-#: ../../mod/settings.php:672
+#: ../../mod/settings.php:824
 msgid "Automatically approve all connection/friend requests as friends"
 msgstr "Freundschaftsanfragen werden automatisch als Freund akzeptiert"
 
-#: ../../mod/settings.php:682
+#: ../../mod/settings.php:834
 msgid "OpenID:"
 msgstr "OpenID:"
 
-#: ../../mod/settings.php:682
+#: ../../mod/settings.php:834
 msgid "(Optional) Allow this OpenID to login to this account."
 msgstr "(Optional) Erlaube die Anmeldung für diesen Account mit dieser OpenID."
 
-#: ../../mod/settings.php:692
+#: ../../mod/settings.php:844
 msgid "Publish your default profile in your local site directory?"
 msgstr "Veröffentliche dein Standardprofil im Verzeichnis der lokalen Seite?"
 
-#: ../../mod/settings.php:698
+#: ../../mod/settings.php:850
 msgid "Publish your default profile in the global social directory?"
 msgstr "Veröffentliche dein Standardprofil im weltweiten Verzeichnis?"
 
-#: ../../mod/settings.php:706
+#: ../../mod/settings.php:858
 msgid "Hide your contact/friend list from viewers of your default profile?"
 msgstr "Liste der Kontakte vor Betrachtern des Standardprofils verbergen?"
 
-#: ../../mod/settings.php:710
+#: ../../mod/settings.php:862
 msgid "Hide your profile details from unknown viewers?"
 msgstr "Profil-Details vor unbekannten Betrachtern verbergen?"
 
-#: ../../mod/settings.php:715
+#: ../../mod/settings.php:867
 msgid "Allow friends to post to your profile page?"
 msgstr "Deinen Kontakten erlauben, auf deine Pinnwand zu schreiben?"
 
-#: ../../mod/settings.php:721
+#: ../../mod/settings.php:873
 msgid "Allow friends to tag your posts?"
 msgstr "Deinen Kontakten erlauben, deine Beiträge mit Schlagwörtern zu versehen?"
 
-#: ../../mod/settings.php:727
+#: ../../mod/settings.php:879
 msgid "Allow us to suggest you as a potential friend to new members?"
 msgstr "Erlaube uns dich als potentiellen Kontakt für neue Mitglieder vorzuschlagen?"
 
-#: ../../mod/settings.php:736
+#: ../../mod/settings.php:885
+msgid "Permit unknown people to send you private mail?"
+msgstr "Erlaube es Unbekannten dir private Nachrichten zu schicken?"
+
+#: ../../mod/settings.php:896
 msgid "Profile is <strong>not published</strong>."
 msgstr "Profil ist <strong>nicht veröffentlicht</strong>."
 
-#: ../../mod/settings.php:768 ../../mod/profile_photo.php:206
+#: ../../mod/settings.php:902 ../../mod/profile_photo.php:211
 msgid "or"
 msgstr "oder"
 
-#: ../../mod/settings.php:773
+#: ../../mod/settings.php:907
 msgid "Your Identity Address is"
 msgstr "Die Adresse deines Profils lautet:"
 
-#: ../../mod/settings.php:784
+#: ../../mod/settings.php:918
 msgid "Automatically expire posts after this many days:"
 msgstr "Beiträge verfallen automatisch nach dieser Anzahl von Tagen"
 
-#: ../../mod/settings.php:784
+#: ../../mod/settings.php:918
 msgid "If empty, posts will not expire. Expired posts will be deleted"
 msgstr "Wenn leer verfallen Beiträge nie automatisch. Verfallene Beiträge werden gelöscht."
 
-#: ../../mod/settings.php:785
+#: ../../mod/settings.php:919
 msgid "Advanced expiration settings"
 msgstr "Erweiterte Verfallseinstellungen"
 
-#: ../../mod/settings.php:786
+#: ../../mod/settings.php:920
 msgid "Advanced Expiration"
 msgstr "Erweitertes Verfallen"
 
-#: ../../mod/settings.php:787
+#: ../../mod/settings.php:921
 msgid "Expire posts:"
 msgstr "Beiträge verfallen lassen:"
 
-#: ../../mod/settings.php:788
+#: ../../mod/settings.php:922
 msgid "Expire personal notes:"
 msgstr "Persönliche Notizen verfallen lassen:"
 
-#: ../../mod/settings.php:789
+#: ../../mod/settings.php:923
 msgid "Expire starred posts:"
 msgstr "Markierte Beiträge verfallen lassen:"
 
-#: ../../mod/settings.php:790
+#: ../../mod/settings.php:924
 msgid "Expire photos:"
 msgstr "Fotos verfallen lassen:"
 
-#: ../../mod/settings.php:795
+#: ../../mod/settings.php:928
 msgid "Account Settings"
 msgstr "Account-Einstellungen"
 
-#: ../../mod/settings.php:803
+#: ../../mod/settings.php:937
 msgid "Password Settings"
 msgstr "Passwort-Einstellungen"
 
-#: ../../mod/settings.php:804
+#: ../../mod/settings.php:938
 msgid "New Password:"
 msgstr "Neues Passwort:"
 
-#: ../../mod/settings.php:805
+#: ../../mod/settings.php:939
 msgid "Confirm:"
 msgstr "Bestätigen:"
 
-#: ../../mod/settings.php:805
+#: ../../mod/settings.php:939
 msgid "Leave password fields blank unless changing"
 msgstr "Lass die Passwort-Felder leer, außer du willst das Passwort ändern"
 
-#: ../../mod/settings.php:809
+#: ../../mod/settings.php:943
 msgid "Basic Settings"
 msgstr "Grundeinstellungen"
 
-#: ../../mod/settings.php:810 ../../include/profile_advanced.php:15
+#: ../../mod/settings.php:944 ../../include/profile_advanced.php:15
 msgid "Full Name:"
 msgstr "Kompletter Name:"
 
-#: ../../mod/settings.php:811
+#: ../../mod/settings.php:945
 msgid "Email Address:"
 msgstr "Emailadresse:"
 
-#: ../../mod/settings.php:812
+#: ../../mod/settings.php:946
 msgid "Your Timezone:"
 msgstr "Deine Zeitzone:"
 
-#: ../../mod/settings.php:813
+#: ../../mod/settings.php:947
 msgid "Default Post Location:"
 msgstr "Standardstandort:"
 
-#: ../../mod/settings.php:814
+#: ../../mod/settings.php:948
 msgid "Use Browser Location:"
 msgstr "Verwende den Standort des Browsers:"
 
-#: ../../mod/settings.php:815
-msgid "Display Theme:"
-msgstr "Theme:"
-
-#: ../../mod/settings.php:816
-msgid "Update browser every xx seconds"
-msgstr "Browser alle xx Sekunden aktualisieren"
-
-#: ../../mod/settings.php:816
-msgid "Minimum of 10 seconds, no maximum"
-msgstr "Minimal 10 Sekunden, kein Maximum"
-
-#: ../../mod/settings.php:818
+#: ../../mod/settings.php:951
 msgid "Security and Privacy Settings"
 msgstr "Sicherheits- und Privatsphäre-Einstellungen"
 
-#: ../../mod/settings.php:820
+#: ../../mod/settings.php:953
 msgid "Maximum Friend Requests/Day:"
 msgstr "Maximale Anzahl von Freundschaftsanfragen/Tag:"
 
-#: ../../mod/settings.php:820
+#: ../../mod/settings.php:953 ../../mod/settings.php:968
 msgid "(to prevent spam abuse)"
 msgstr "(um SPAM zu vermeiden)"
 
-#: ../../mod/settings.php:821
+#: ../../mod/settings.php:954
 msgid "Default Post Permissions"
 msgstr "Standard-Zugriffsrechte für Beiträge"
 
-#: ../../mod/settings.php:822
+#: ../../mod/settings.php:955
 msgid "(click to open/close)"
 msgstr "(klicke zum öffnen/schließen)"
 
-#: ../../mod/settings.php:837
+#: ../../mod/settings.php:968
+msgid "Maximum private messages per day from unknown people:"
+msgstr "Maximale Anzahl von privaten Nachrichten, die dir unbekannte Personen pro Tag senden dürfen:"
+
+#: ../../mod/settings.php:971
 msgid "Notification Settings"
 msgstr "Benachrichtigungseinstellungen"
 
-#: ../../mod/settings.php:838
+#: ../../mod/settings.php:972
+msgid "By default post a status message when:"
+msgstr "Standardmäßig eine Status-Nachricht posten wenn:"
+
+#: ../../mod/settings.php:973
+msgid "accepting a friend request"
+msgstr "akzeptieren einer Freundschaftsanfrage"
+
+#: ../../mod/settings.php:974
+msgid "making an <em>interesting</em> profile change"
+msgstr "<em>interessante</em> Änderungen am Profil gemacht werden"
+
+#: ../../mod/settings.php:975
 msgid "Send a notification email when:"
 msgstr "Benachrichtigungs-E-Mail senden wenn:"
 
-#: ../../mod/settings.php:839
+#: ../../mod/settings.php:976
 msgid "You receive an introduction"
 msgstr "- du eine Kontaktanfrage erhältst"
 
-#: ../../mod/settings.php:840
+#: ../../mod/settings.php:977
 msgid "Your introductions are confirmed"
 msgstr "- eine deiner Kontaktanfragen akzeptiert wurde"
 
-#: ../../mod/settings.php:841
+#: ../../mod/settings.php:978
 msgid "Someone writes on your profile wall"
 msgstr "- jemand etwas auf deine Pinnwand schreibt"
 
-#: ../../mod/settings.php:842
+#: ../../mod/settings.php:979
 msgid "Someone writes a followup comment"
 msgstr "- jemand auch einen Kommentar verfasst"
 
-#: ../../mod/settings.php:843
+#: ../../mod/settings.php:980
 msgid "You receive a private message"
 msgstr "- du eine private Nachricht erhältst"
 
-#: ../../mod/settings.php:844
+#: ../../mod/settings.php:981
 msgid "You receive a friend suggestion"
 msgstr "- du eine Empfehlung erhältst"
 
-#: ../../mod/settings.php:845
+#: ../../mod/settings.php:982
 msgid "You are tagged in a post"
 msgstr "- du in einem Beitrag erwähnt wurdest"
 
-#: ../../mod/settings.php:848
+#: ../../mod/settings.php:985
 msgid "Advanced Page Settings"
 msgstr "Erweiterte Seiten-Einstellungen"
 
@@ -2109,39 +2252,39 @@ msgstr "Wähle eine Identität zum Verwalten: "
 msgid "Search Results For:"
 msgstr "Suchergebnisse für:"
 
-#: ../../mod/network.php:77 ../../mod/search.php:16
+#: ../../mod/network.php:82 ../../mod/search.php:16
 msgid "Remove term"
 msgstr "Begriff entfernen"
 
-#: ../../mod/network.php:86 ../../mod/search.php:13
+#: ../../mod/network.php:91 ../../mod/search.php:13
 msgid "Saved Searches"
 msgstr "Gespeicherte Suchen"
 
-#: ../../mod/network.php:87 ../../include/group.php:216
+#: ../../mod/network.php:92 ../../include/group.php:217
 msgid "add"
 msgstr "hinzufügen"
 
-#: ../../mod/network.php:166
+#: ../../mod/network.php:171
 msgid "Commented Order"
 msgstr "Neueste Kommentare"
 
-#: ../../mod/network.php:171
+#: ../../mod/network.php:176
 msgid "Posted Order"
 msgstr "Neueste Beiträge"
 
-#: ../../mod/network.php:182
+#: ../../mod/network.php:187
 msgid "New"
 msgstr "Neue"
 
-#: ../../mod/network.php:187
+#: ../../mod/network.php:192
 msgid "Starred"
 msgstr "Markierte"
 
-#: ../../mod/network.php:192
-msgid "Bookmarks"
-msgstr "Lesezeichen"
+#: ../../mod/network.php:197
+msgid "Shared Links"
+msgstr "Geteilte Links"
 
-#: ../../mod/network.php:250
+#: ../../mod/network.php:274
 #, php-format
 msgid "Warning: This group contains %s member from an insecure network."
 msgid_plural ""
@@ -2149,42 +2292,103 @@ msgid_plural ""
 msgstr[0] "Warnung: Diese Gruppe beinhaltet %s Person aus einem unsicheren Netzwerk."
 msgstr[1] "Warnung: Diese Gruppe beinhaltet %s Personen aus unsicheren Netzwerken."
 
-#: ../../mod/network.php:253
+#: ../../mod/network.php:277
 msgid "Private messages to this group are at risk of public disclosure."
 msgstr "Private Nachrichten an diese Gruppe könnten an die Öffentlichkeit geraten."
 
-#: ../../mod/network.php:298
+#: ../../mod/network.php:322
 msgid "No such group"
 msgstr "Es gibt keine solche Gruppe"
 
-#: ../../mod/network.php:309
+#: ../../mod/network.php:333
 msgid "Group is empty"
 msgstr "Gruppe ist leer"
 
-#: ../../mod/network.php:313
+#: ../../mod/network.php:337
 msgid "Group: "
 msgstr "Gruppe: "
 
-#: ../../mod/network.php:323
+#: ../../mod/network.php:347
 msgid "Contact: "
 msgstr "Kontakt: "
 
-#: ../../mod/network.php:325
+#: ../../mod/network.php:349
 msgid "Private messages to this person are at risk of public disclosure."
 msgstr "Private Nachrichten an diese Person könnten an die Öffentlichkeit gelangen."
 
-#: ../../mod/network.php:330
+#: ../../mod/network.php:354
 msgid "Invalid contact."
 msgstr "Ungültiger Kontakt."
 
-#: ../../mod/notes.php:44 ../../boot.php:1354
+#: ../../mod/notes.php:44 ../../boot.php:1476
 msgid "Personal Notes"
 msgstr "Persönliche Notizen"
 
-#: ../../mod/notes.php:63 ../../include/text.php:645
+#: ../../mod/notes.php:63 ../../mod/filer.php:30
+#: ../../addon/facebook/facebook.php:715 ../../include/text.php:652
 msgid "Save"
 msgstr "Speichern"
 
+#: ../../mod/wallmessage.php:42 ../../mod/wallmessage.php:112
+#, php-format
+msgid "Number of daily wall messages for %s exceeded. Message failed."
+msgstr "Maximale Anzahl der täglichen Pinnwand Nachrichten für %s ist überschritten. Zustellung fehlgeschlagen."
+
+#: ../../mod/wallmessage.php:56 ../../mod/message.php:59
+msgid "No recipient selected."
+msgstr "Kein Empfänger gewählt."
+
+#: ../../mod/wallmessage.php:59
+msgid "Unable to check your home location."
+msgstr "Konnte deinen Heimatort nicht bestimmen."
+
+#: ../../mod/wallmessage.php:62 ../../mod/message.php:66
+msgid "Message could not be sent."
+msgstr "Nachricht konnte nicht gesendet werden."
+
+#: ../../mod/wallmessage.php:65 ../../mod/message.php:69
+msgid "Message collection failure."
+msgstr "Konnte Nachrichten nicht abrufen."
+
+#: ../../mod/wallmessage.php:68 ../../mod/message.php:72
+msgid "Message sent."
+msgstr "Nachricht gesendet."
+
+#: ../../mod/wallmessage.php:86 ../../mod/wallmessage.php:95
+msgid "No recipient."
+msgstr "Kein Empfänger."
+
+#: ../../mod/wallmessage.php:124 ../../mod/message.php:169
+#: ../../include/conversation.php:910
+msgid "Please enter a link URL:"
+msgstr "Bitte gib die URL des Links ein:"
+
+#: ../../mod/wallmessage.php:131 ../../mod/message.php:177
+msgid "Send Private Message"
+msgstr "Private Nachricht senden"
+
+#: ../../mod/wallmessage.php:132
+#, php-format
+msgid ""
+"If you wish for %s to respond, please check that the privacy settings on "
+"your site allow private mail from unknown senders."
+msgstr "Wenn du möchtest, dass %s dir antworten kann, überprüfe deine Privatsphären-Einstellungen und erlaube private Nachrichten von unbekannten Absendern."
+
+#: ../../mod/wallmessage.php:133 ../../mod/message.php:178
+#: ../../mod/message.php:347
+msgid "To:"
+msgstr "An:"
+
+#: ../../mod/wallmessage.php:134 ../../mod/message.php:179
+#: ../../mod/message.php:348
+msgid "Subject:"
+msgstr "Betreff:"
+
+#: ../../mod/wallmessage.php:140 ../../mod/message.php:183
+#: ../../mod/message.php:351 ../../mod/invite.php:113
+msgid "Your message:"
+msgstr "Deine Nachricht:"
+
 #: ../../mod/newmember.php:6
 msgid "Welcome to Friendica"
 msgstr "Willkommen bei Friendica"
@@ -2203,12 +2407,19 @@ msgstr "Wir möchten Dir einige Tipps und Links anbieten, die Dir helfen könnte
 
 #: ../../mod/newmember.php:16
 msgid ""
+"On your <em>Quick Start</em> page - find a brief introduction to your "
+"profile and network tabs, connect to Facebook, make some new connections, "
+"and find some groups to join."
+msgstr "Auf der <em>Quick Start</em> Seite findest du eine kurze Einleitung in die einzelnen Funktionen deines Profils und die Netzwerk-Reiter, wo du interessante Foren findest, wie du alte Freunde von Facebook wieder findest und neue Kontakte knüpfst."
+
+#: ../../mod/newmember.php:18
+msgid ""
 "On your <em>Settings</em> page -  change your initial password. Also make a "
 "note of your Identity Address. This looks just like an email address - and "
 "will be useful in making friends on the free social web."
 msgstr "Ändere bitte unter <em>Einstellungen</em> Dein Passwort. Außerdem merke Dir Deine Indentifikations-Adresse. Diese sieht aus wie eine E-Mail-Adresse und wird benötigt, um Freundschaften mit anderen im Friendica Netzwerk zu schliessen."
 
-#: ../../mod/newmember.php:18
+#: ../../mod/newmember.php:20
 msgid ""
 "Review the other settings, particularly the privacy settings. An unpublished"
 " directory listing is like having an unlisted phone number. In general, you "
@@ -2216,61 +2427,61 @@ msgid ""
 "potential friends know exactly how to find you."
 msgstr "Überprüfe die restlichen Einstellungen, insbesondere die Einstellungen zur Privatsphäre. Wenn du dein Profil nicht veröffentlichst, ist das als wenn Du Deine Telefonnummer nicht ins Telefonbuch einträgst. Im Allgemeinen solltest du es veröffentlichen - außer all deine Freunde und potentiellen Freunde wissen genau, wie sie dich finden können."
 
-#: ../../mod/newmember.php:20
+#: ../../mod/newmember.php:22
 msgid ""
 "Upload a profile photo if you have not done so already. Studies have shown "
 "that people with real photos of themselves are ten times more likely to make"
 " friends than people who do not."
 msgstr "Lade ein Profilbild hoch falls du es noch nicht getan hast. Studien haben gezeigt, dass es zehnmal wahrscheinlicher ist neue Freunde zu finden, wenn du ein Bild von dir selbst verwendest, als wenn du dies nicht tust."
 
-#: ../../mod/newmember.php:23
+#: ../../mod/newmember.php:25
 msgid ""
 "Authorise the Facebook Connector if you currently have a Facebook account "
 "and we will (optionally) import all your Facebook friends and conversations."
 msgstr "Richte die Verbindung zu Facebook ein, wenn du im Augenblick ein Facebook Konto hast und (optional) deine Facebook Freunde und Unterhaltungen importieren willst."
 
-#: ../../mod/newmember.php:25
+#: ../../mod/newmember.php:27
 msgid ""
 "<em>If</em> this is your own personal server, installing the Facebook addon "
 "may ease your transition to the free social web."
 msgstr "<em>Wenn</em> dies dein privater Server ist, könnte die Installation des Facebook Connectors deinen Umzug ins freie soziale Netz angenehmer gestalten."
 
-#: ../../mod/newmember.php:30
+#: ../../mod/newmember.php:32
 msgid ""
 "Enter your email access information on your Connector Settings page if you "
 "wish to import and interact with friends or mailing lists from your email "
 "INBOX"
 msgstr "Gib deine E-Mail-Zugangsinformationen auf der Connector-Einstellungsseite ein, falls du E-Mails aus deinem Posteingang importieren und mit Freunden und Mailinglisten interagieren willlst."
 
-#: ../../mod/newmember.php:32
+#: ../../mod/newmember.php:34
 msgid ""
 "Edit your <strong>default</strong> profile to your liking. Review the "
 "settings for hiding your list of friends and hiding the profile from unknown"
 " visitors."
 msgstr "Editiere dein <strong>Standard</strong> Profil nach deinen Vorlieben. Überprüfe die Einstellungen zum Verbergen deiner Freundesliste vor unbekannten Betrachtern des Profils."
 
-#: ../../mod/newmember.php:34
+#: ../../mod/newmember.php:36
 msgid ""
 "Set some public keywords for your default profile which describe your "
 "interests. We may be able to find other people with similar interests and "
 "suggest friendships."
 msgstr "Trage ein paar öffentliche Stichwörter in dein Standardprofil ein, die deine Interessen beschreiben. Eventuell sind wir in der Lage Leute zu finden, die deine Interessen teilen und können dir dann Kontakte vorschlagen."
 
-#: ../../mod/newmember.php:36
+#: ../../mod/newmember.php:38
 msgid ""
 "Your Contacts page is your gateway to managing friendships and connecting "
 "with friends on other networks. Typically you enter their address or site "
 "URL in the <em>Add New Contact</em> dialog."
 msgstr "Die Kontakte-Seite ist die Einstiegsseite, von der aus du Kontakte verwalten und dich mit Freunden in anderen Netzwerken verbinden kannst. Normalerweise gibst du dazu einfach ihre Adresse oder die URL der Seite im Kasten <em>Neuen Kontakt hinzufügen</em> ein."
 
-#: ../../mod/newmember.php:38
+#: ../../mod/newmember.php:40
 msgid ""
 "The Directory page lets you find other people in this network or other "
 "federated sites. Look for a <em>Connect</em> or <em>Follow</em> link on "
 "their profile page. Provide your own Identity Address if requested."
 msgstr "Über die Verzeichnisseite kannst du andere Personen auf diesem Server oder anderen verknüpften Seiten finden. Halte nach einem <em>Verbinden</em> oder <em>Folgen</em> Link auf deren Profilseiten Ausschau und gib deine eigene Profiladresse an, falls du danach gefragt wirst."
 
-#: ../../mod/newmember.php:40
+#: ../../mod/newmember.php:42
 msgid ""
 "On the side panel of the Contacts page are several tools to find new "
 "friends. We can match people by interest, look up people by name or "
@@ -2279,14 +2490,14 @@ msgid ""
 "hours."
 msgstr "Im seitlichen Bedienfeld der Kontakte-Seite gibt es diverse Werkzeuge, um neue Freunde zu finden. Wir können Menschen mit den gleichen Interessen finden, anhand von Namen oder Interessen suchen oder aber aufgrund vorhandener Kontakte neue Freunde vorschlagen.\nAuf einer brandneuen - soeben erstellten - Seite starten die Kontaktvorschläge innerhalb von 24 Stunden."
 
-#: ../../mod/newmember.php:42
+#: ../../mod/newmember.php:44
 msgid ""
 "Once you have made some friends, organize them into private conversation "
 "groups from the sidebar of your Contacts page and then you can interact with"
 " each group privately on your Network page."
 msgstr "Sobald du einige Freunde gefunden hast, organisiere sie in Gruppen zur privaten Kommunikation im Seitenmenü der Kontakte-Seite. Du kannst dann mit jeder dieser Gruppen von der Netzwerkseite aus privat interagieren."
 
-#: ../../mod/newmember.php:44
+#: ../../mod/newmember.php:46
 msgid ""
 "Our <strong>help</strong> pages may be consulted for detail on other program"
 " features and resources."
@@ -2300,51 +2511,51 @@ msgstr "Beitrag nicht verfügbar."
 msgid "Item was not found."
 msgstr "Beitrag konnte nicht gefunden werden."
 
-#: ../../mod/group.php:27
+#: ../../mod/group.php:29
 msgid "Group created."
 msgstr "Gruppe erstellt."
 
-#: ../../mod/group.php:33
+#: ../../mod/group.php:35
 msgid "Could not create group."
 msgstr "Konnte die Gruppe nicht erstellen."
 
-#: ../../mod/group.php:43 ../../mod/group.php:127
+#: ../../mod/group.php:47 ../../mod/group.php:137
 msgid "Group not found."
 msgstr "Gruppe nicht gefunden."
 
-#: ../../mod/group.php:56
+#: ../../mod/group.php:60
 msgid "Group name changed."
 msgstr "Gruppenname geändert."
 
-#: ../../mod/group.php:67 ../../mod/profperm.php:19 ../../index.php:287
+#: ../../mod/group.php:72 ../../mod/profperm.php:19 ../../index.php:308
 msgid "Permission denied"
 msgstr "Zugriff verweigert"
 
-#: ../../mod/group.php:85
+#: ../../mod/group.php:90
 msgid "Create a group of contacts/friends."
 msgstr "Eine Gruppe von Kontakten/Freunden anlegen."
 
-#: ../../mod/group.php:86 ../../mod/group.php:166
+#: ../../mod/group.php:91 ../../mod/group.php:177
 msgid "Group Name: "
 msgstr "Gruppenname:"
 
-#: ../../mod/group.php:102
+#: ../../mod/group.php:110
 msgid "Group removed."
 msgstr "Gruppe entfernt."
 
-#: ../../mod/group.php:104
+#: ../../mod/group.php:112
 msgid "Unable to remove group."
 msgstr "Konnte die Gruppe nicht entfernen."
 
-#: ../../mod/group.php:165
+#: ../../mod/group.php:176
 msgid "Group Editor"
 msgstr "Gruppeneditor"
 
-#: ../../mod/group.php:177
+#: ../../mod/group.php:189
 msgid "Members"
 msgstr "Mitglieder"
 
-#: ../../mod/group.php:209 ../../mod/profperm.php:105
+#: ../../mod/group.php:221 ../../mod/profperm.php:105
 msgid "Click on a contact to add or remove."
 msgstr "Klicke einen Kontakt an, um ihn hinzuzufügen oder zu entfernen"
 
@@ -2356,9 +2567,16 @@ msgstr "Ungültiger Profil-Bezeichner"
 msgid "Profile Visibility Editor"
 msgstr "Editor für die Profil-Sichtbarkeit"
 
-#: ../../mod/profperm.php:103 ../../include/profile_advanced.php:7
-#: ../../include/profile_advanced.php:76 ../../include/nav.php:48
-#: ../../boot.php:1336
+#: ../../mod/profperm.php:103
+#: ../../view/theme/diabook/diabook-green/theme.php:230
+#: ../../view/theme/diabook/diabook-red/theme.php:228
+#: ../../view/theme/diabook/diabook-blue/theme.php:228
+#: ../../view/theme/diabook/theme.php:247
+#: ../../view/theme/diabook/diabook-dark/theme.php:230
+#: ../../view/theme/diabook/diabook-aerith/theme.php:230
+#: ../../view/theme/diabook/diabook-pink/theme.php:230
+#: ../../include/profile_advanced.php:7 ../../include/profile_advanced.php:74
+#: ../../include/nav.php:50 ../../boot.php:1458
 msgid "Profile"
 msgstr "Profil"
 
@@ -2374,157 +2592,163 @@ msgstr "Alle Kontakte (mit gesichertem Profilzugriff)"
 msgid "No contacts."
 msgstr "Keine Kontakte."
 
-#: ../../mod/viewcontacts.php:74 ../../include/text.php:584
+#: ../../mod/viewcontacts.php:76 ../../include/text.php:589
 msgid "View Contacts"
 msgstr "Kontakte anzeigen"
 
-#: ../../mod/register.php:62
+#: ../../mod/register.php:64
 msgid "An invitation is required."
 msgstr "Du benötigst eine Einladung."
 
-#: ../../mod/register.php:67
+#: ../../mod/register.php:69
 msgid "Invitation could not be verified."
 msgstr "Die Einladung konnte nicht überprüft werden."
 
-#: ../../mod/register.php:75
+#: ../../mod/register.php:77
 msgid "Invalid OpenID url"
 msgstr "Ungültige OpenID URL"
 
-#: ../../mod/register.php:90
+#: ../../mod/register.php:92
 msgid "Please enter the required information."
 msgstr "Bitte trage die erforderlichen Informationen ein."
 
-#: ../../mod/register.php:104
+#: ../../mod/register.php:106
 msgid "Please use a shorter name."
 msgstr "Bitte verwende einen kürzeren Namen."
 
-#: ../../mod/register.php:106
+#: ../../mod/register.php:108
 msgid "Name too short."
 msgstr "Der Name ist zu kurz."
 
-#: ../../mod/register.php:121
+#: ../../mod/register.php:123
 msgid "That doesn't appear to be your full (First Last) name."
 msgstr "Das scheint nicht dein kompletter Name (Vor- und Nachname) zu sein."
 
-#: ../../mod/register.php:126
+#: ../../mod/register.php:128
 msgid "Your email domain is not among those allowed on this site."
 msgstr "Die Domain deiner E-Mail Adresse ist auf dieser Seite nicht erlaubt."
 
-#: ../../mod/register.php:129
+#: ../../mod/register.php:131
 msgid "Not a valid email address."
 msgstr "Keine gültige E-Mail-Adresse."
 
-#: ../../mod/register.php:139
+#: ../../mod/register.php:141
 msgid "Cannot use that email."
 msgstr "Konnte diese E-Mail-Adresse nicht verwenden."
 
-#: ../../mod/register.php:145
+#: ../../mod/register.php:147
 msgid ""
 "Your \"nickname\" can only contain \"a-z\", \"0-9\", \"-\", and \"_\", and "
 "must also begin with a letter."
 msgstr "Dein Spitzname darf nur aus Buchstaben und Zahlen (\"a-z\",\"0-9\", \"_\" und \"-\") bestehen, außerdem muss er mit einem Buchstaben beginnen."
 
-#: ../../mod/register.php:151 ../../mod/register.php:252
+#: ../../mod/register.php:153 ../../mod/register.php:264
 msgid "Nickname is already registered. Please choose another."
 msgstr "Dieser Spitzname ist bereits vergeben. Bitte wähle einen anderen."
 
-#: ../../mod/register.php:170
+#: ../../mod/register.php:163
+msgid ""
+"Nickname was once registered here and may not be re-used. Please choose "
+"another."
+msgstr "Dieser Spitzname ist bereits vergeben. Bitte wähle einen anderen."
+
+#: ../../mod/register.php:182
 msgid "SERIOUS ERROR: Generation of security keys failed."
 msgstr "FATALER FEHLER: Sicherheitsschlüssel konnten nicht erzeugt werden."
 
-#: ../../mod/register.php:238
+#: ../../mod/register.php:250
 msgid "An error occurred during registration. Please try again."
 msgstr "Wärend der Anmeldung ist ein Fehler aufgetreten. Bitte versuche es noch einmal."
 
-#: ../../mod/register.php:274
+#: ../../mod/register.php:286
 msgid "An error occurred creating your default profile. Please try again."
 msgstr "Bei der Erstellung des Standard-Profils ist ein Fehler aufgetreten. Bitte versuche es noch einmal."
 
-#: ../../mod/register.php:378 ../../mod/regmod.php:52
+#: ../../mod/register.php:386 ../../mod/regmod.php:52
 #, php-format
 msgid "Registration details for %s"
 msgstr "Details der Registration von %s"
 
-#: ../../mod/register.php:386
+#: ../../mod/register.php:394
 msgid ""
 "Registration successful. Please check your email for further instructions."
 msgstr "Registrierung erfolgreich. Eine E-Mail mit weiteren Anweisungen wurde an dich gesendet."
 
-#: ../../mod/register.php:390
+#: ../../mod/register.php:398
 msgid "Failed to send email message. Here is the message that failed."
 msgstr "Konnte die E-Mail nicht versenden. Hier ist die Nachricht, die nicht gesendet werden konnte."
 
-#: ../../mod/register.php:395
+#: ../../mod/register.php:403
 msgid "Your registration can not be processed."
 msgstr "Deine Registrierung konnte nicht verarbeitet werden."
 
-#: ../../mod/register.php:432
+#: ../../mod/register.php:440
 #, php-format
 msgid "Registration request at %s"
 msgstr "Registrierungsanfrage auf %s"
 
-#: ../../mod/register.php:441
+#: ../../mod/register.php:449
 msgid "Your registration is pending approval by the site owner."
 msgstr "Deine Registrierung muss noch vom Betreiber der Seite freigegeben werden."
 
-#: ../../mod/register.php:479
+#: ../../mod/register.php:487
 msgid ""
 "This site has exceeded the number of allowed daily account registrations. "
 "Please try again tomorrow."
 msgstr "Die maximale Anzahl täglicher Registrierungen auf dieser Seite wurde überschritten. Bitte versuche es morgen noch einmal."
 
-#: ../../mod/register.php:505
+#: ../../mod/register.php:513
 msgid ""
 "You may (optionally) fill in this form via OpenID by supplying your OpenID "
 "and clicking 'Register'."
 msgstr "Du kannst dieses Formular auch (optional) mit deiner OpenID ausfüllen, indem du deine OpenID angibst und 'Registrieren' klickst."
 
-#: ../../mod/register.php:506
+#: ../../mod/register.php:514
 msgid ""
 "If you are not familiar with OpenID, please leave that field blank and fill "
 "in the rest of the items."
 msgstr "Wenn du nicht mit OpenID vertraut bist, lass dieses Feld bitte leer und fülle die restlichen Felder aus."
 
-#: ../../mod/register.php:507
+#: ../../mod/register.php:515
 msgid "Your OpenID (optional): "
 msgstr "Deine OpenID (optional): "
 
-#: ../../mod/register.php:521
+#: ../../mod/register.php:529
 msgid "Include your profile in member directory?"
 msgstr "Soll dein Profil im Nutzerverzeichnis angezeigt werden?"
 
-#: ../../mod/register.php:536
+#: ../../mod/register.php:549
 msgid "Membership on this site is by invitation only."
 msgstr "Mitgliedschaft auf dieser Seite ist nur nach vorheriger Einladung möglich."
 
-#: ../../mod/register.php:537
+#: ../../mod/register.php:550
 msgid "Your invitation ID: "
 msgstr "ID deiner Einladung: "
 
-#: ../../mod/register.php:540 ../../mod/admin.php:314
+#: ../../mod/register.php:553 ../../mod/admin.php:393
 msgid "Registration"
 msgstr "Registrierung"
 
-#: ../../mod/register.php:548
+#: ../../mod/register.php:561
 msgid "Your Full Name (e.g. Joe Smith): "
 msgstr "Vollständiger Name (z.B. Max Mustermann): "
 
-#: ../../mod/register.php:549
+#: ../../mod/register.php:562
 msgid "Your Email Address: "
 msgstr "Deine E-Mail-Adresse: "
 
-#: ../../mod/register.php:550
+#: ../../mod/register.php:563
 msgid ""
 "Choose a profile nickname. This must begin with a text character. Your "
 "profile address on this site will then be "
 "'<strong>nickname@$sitename</strong>'."
 msgstr "Wähle einen Spitznamen für dein Profil. Dieser muss mit einem Buchstaben beginnen. Die Adresse deines Profils auf dieser Seite wird '<strong>spitzname@$sitename</strong>' sein."
 
-#: ../../mod/register.php:551
+#: ../../mod/register.php:564
 msgid "Choose a nickname: "
 msgstr "Spitznamen wählen: "
 
-#: ../../mod/register.php:554 ../../include/nav.php:77 ../../boot.php:693
+#: ../../mod/register.php:567 ../../include/nav.php:81 ../../boot.php:775
 msgid "Register"
 msgstr "Registrieren"
 
@@ -2533,18 +2757,39 @@ msgid "People Search"
 msgstr "Personen Suche"
 
 #: ../../mod/like.php:127 ../../mod/tagger.php:70
-#: ../../addon/facebook/facebook.php:1092
+#: ../../addon/facebook/facebook.php:1655
 #: ../../addon/communityhome/communityhome.php:158
 #: ../../addon/communityhome/communityhome.php:167
-#: ../../include/diaspora.php:1600 ../../include/conversation.php:48
+#: ../../view/theme/diabook/diabook-green/theme.php:83
+#: ../../view/theme/diabook/diabook-green/theme.php:92
+#: ../../view/theme/diabook/diabook-red/theme.php:82
+#: ../../view/theme/diabook/diabook-red/theme.php:91
+#: ../../view/theme/diabook/diabook-blue/theme.php:82
+#: ../../view/theme/diabook/diabook-blue/theme.php:91
+#: ../../view/theme/diabook/theme.php:97
+#: ../../view/theme/diabook/theme.php:106
+#: ../../view/theme/diabook/diabook-dark/theme.php:83
+#: ../../view/theme/diabook/diabook-dark/theme.php:92
+#: ../../view/theme/diabook/diabook-aerith/theme.php:83
+#: ../../view/theme/diabook/diabook-aerith/theme.php:92
+#: ../../view/theme/diabook/diabook-pink/theme.php:83
+#: ../../view/theme/diabook/diabook-pink/theme.php:92
+#: ../../include/diaspora.php:1654 ../../include/conversation.php:48
 #: ../../include/conversation.php:57 ../../include/conversation.php:121
 #: ../../include/conversation.php:130
 msgid "status"
 msgstr "Status"
 
-#: ../../mod/like.php:144 ../../addon/facebook/facebook.php:1096
+#: ../../mod/like.php:144 ../../addon/facebook/facebook.php:1659
 #: ../../addon/communityhome/communityhome.php:172
-#: ../../include/diaspora.php:1616 ../../include/conversation.php:65
+#: ../../view/theme/diabook/diabook-green/theme.php:97
+#: ../../view/theme/diabook/diabook-red/theme.php:96
+#: ../../view/theme/diabook/diabook-blue/theme.php:96
+#: ../../view/theme/diabook/theme.php:111
+#: ../../view/theme/diabook/diabook-dark/theme.php:97
+#: ../../view/theme/diabook/diabook-aerith/theme.php:97
+#: ../../view/theme/diabook/diabook-pink/theme.php:97
+#: ../../include/diaspora.php:1670 ../../include/conversation.php:65
 #, php-format
 msgid "%1$s likes %2$s's %3$s"
 msgstr "%1$s mag %2$ss %3$s"
@@ -2554,27 +2799,42 @@ msgstr "%1$s mag %2$ss %3$s"
 msgid "%1$s doesn't like %2$s's %3$s"
 msgstr "%1$s mag %2$ss %3$s nicht"
 
-#: ../../mod/notice.php:15 ../../mod/viewsrc.php:15 ../../mod/admin.php:127
-#: ../../mod/admin.php:522 ../../mod/admin.php:700 ../../mod/display.php:29
-#: ../../mod/display.php:137 ../../mod/viewd.php:14
-#: ../../include/items.php:2942
+#: ../../mod/notice.php:15 ../../mod/viewsrc.php:15 ../../mod/admin.php:149
+#: ../../mod/admin.php:614 ../../mod/admin.php:813 ../../mod/display.php:37
+#: ../../mod/display.php:142 ../../include/items.php:3083
 msgid "Item not found."
 msgstr "Beitrag nicht gefunden."
 
-#: ../../mod/viewsrc.php:7 ../../mod/viewd.php:6
+#: ../../mod/viewsrc.php:7
 msgid "Access denied."
 msgstr "Zugriff verweigert."
 
+#: ../../mod/fbrowser.php:23
+#: ../../view/theme/diabook/diabook-green/theme.php:232
+#: ../../view/theme/diabook/diabook-red/theme.php:230
+#: ../../view/theme/diabook/diabook-blue/theme.php:230
+#: ../../view/theme/diabook/theme.php:249
+#: ../../view/theme/diabook/diabook-dark/theme.php:232
+#: ../../view/theme/diabook/diabook-aerith/theme.php:232
+#: ../../view/theme/diabook/diabook-pink/theme.php:232
+#: ../../include/nav.php:51 ../../boot.php:1463
+msgid "Photos"
+msgstr "Bilder"
+
+#: ../../mod/fbrowser.php:86
+msgid "Files"
+msgstr "Dateien"
+
 #: ../../mod/regmod.php:61
 msgid "Account approved."
 msgstr "Account freigegeben."
 
-#: ../../mod/regmod.php:93
+#: ../../mod/regmod.php:98
 #, php-format
 msgid "Registration revoked for %s"
 msgstr "Registrierung für %s wurde zurückgezogen"
 
-#: ../../mod/regmod.php:105
+#: ../../mod/regmod.php:110
 msgid "Please login."
 msgstr "Bitte melde dich an."
 
@@ -2586,97 +2846,97 @@ msgstr "Konnte den Originalbeitrag nicht finden."
 msgid "Empty post discarded."
 msgstr "Leerer Beitrag wurde verworfen."
 
-#: ../../mod/item.php:351 ../../mod/wall_upload.php:81
-#: ../../mod/wall_upload.php:90 ../../mod/wall_upload.php:97
-#: ../../include/message.php:143
+#: ../../mod/item.php:372 ../../mod/wall_upload.php:85
+#: ../../mod/wall_upload.php:94 ../../mod/wall_upload.php:101
+#: ../../include/message.php:144
 msgid "Wall Photos"
 msgstr "Pinnwand-Bilder"
 
-#: ../../mod/item.php:833
+#: ../../mod/item.php:762
 msgid "System error. Post not saved."
 msgstr "Systemfehler. Beitrag konnte nicht gespeichert werden."
 
-#: ../../mod/item.php:858
+#: ../../mod/item.php:787
 #, php-format
 msgid ""
 "This message was sent to you by %s, a member of the Friendica social "
 "network."
 msgstr "Diese Nachricht wurde dir von %s geschickt, einem Mitglied des Sozialen Netzwerks Friendica."
 
-#: ../../mod/item.php:860
+#: ../../mod/item.php:789
 #, php-format
 msgid "You may visit them online at %s"
 msgstr "Du kannst sie online unter %s besuchen"
 
-#: ../../mod/item.php:861
+#: ../../mod/item.php:790
 msgid ""
 "Please contact the sender by replying to this post if you do not wish to "
 "receive these messages."
 msgstr "Falls du diese Beiträge nicht erhalten möchtest, kontaktiere bitte den Autor, indem du auf diese Nachricht antwortest."
 
-#: ../../mod/item.php:863
+#: ../../mod/item.php:792
 #, php-format
 msgid "%s posted an update."
 msgstr "%s hat ein Update veröffentlicht."
 
-#: ../../mod/profile_photo.php:28
+#: ../../mod/profile_photo.php:30
 msgid "Image uploaded but image cropping failed."
 msgstr "Bilder hochgeladen, aber das Zuschneiden ist fehlgeschlagen."
 
-#: ../../mod/profile_photo.php:61 ../../mod/profile_photo.php:68
-#: ../../mod/profile_photo.php:75 ../../mod/profile_photo.php:258
+#: ../../mod/profile_photo.php:63 ../../mod/profile_photo.php:70
+#: ../../mod/profile_photo.php:77 ../../mod/profile_photo.php:264
 #, php-format
 msgid "Image size reduction [%s] failed."
 msgstr "Verkleinern der Bildgröße von [%s] ist gescheitert."
 
-#: ../../mod/profile_photo.php:89
+#: ../../mod/profile_photo.php:91
 msgid ""
 "Shift-reload the page or clear browser cache if the new photo does not "
 "display immediately."
 msgstr "Drücke Umschalt+Neu Laden oder leere den Browser-Cache, falls das neue Foto nicht gleich angezeigt wird."
 
-#: ../../mod/profile_photo.php:99
+#: ../../mod/profile_photo.php:101
 msgid "Unable to process image"
 msgstr "Bild konnte nicht verarbeitet werden"
 
-#: ../../mod/profile_photo.php:113 ../../mod/wall_upload.php:56
+#: ../../mod/profile_photo.php:115 ../../mod/wall_upload.php:60
 #, php-format
 msgid "Image exceeds size limit of %d"
 msgstr "Bildgröße überschreitet das Limit von %d"
 
-#: ../../mod/profile_photo.php:203
+#: ../../mod/profile_photo.php:207
 msgid "Upload File:"
 msgstr "Datei hochladen:"
 
-#: ../../mod/profile_photo.php:204
+#: ../../mod/profile_photo.php:208
 msgid "Upload Profile Photo"
 msgstr "Profilbild hochladen"
 
-#: ../../mod/profile_photo.php:205
+#: ../../mod/profile_photo.php:209
 msgid "Upload"
 msgstr "Hochladen"
 
-#: ../../mod/profile_photo.php:206
+#: ../../mod/profile_photo.php:211
 msgid "skip this step"
 msgstr "diesen Schritt überspringen"
 
-#: ../../mod/profile_photo.php:206
+#: ../../mod/profile_photo.php:211
 msgid "select a photo from your photo albums"
 msgstr "wähle ein Foto von deinen Fotoalben"
 
-#: ../../mod/profile_photo.php:219
+#: ../../mod/profile_photo.php:224
 msgid "Crop Image"
 msgstr "Bild zurechtschneiden"
 
-#: ../../mod/profile_photo.php:220
+#: ../../mod/profile_photo.php:225
 msgid "Please adjust the image cropping for optimum viewing."
 msgstr "Passe bitte den Bildausschnitt an, damit das Bild optimal dargestellt werden kann."
 
-#: ../../mod/profile_photo.php:221
+#: ../../mod/profile_photo.php:227
 msgid "Done Editing"
 msgstr "Bearbeitung abgeschlossen"
 
-#: ../../mod/profile_photo.php:249
+#: ../../mod/profile_photo.php:255
 msgid "Image uploaded successfully."
 msgstr "Bild erfolgreich auf den Server geladen."
 
@@ -2698,88 +2958,71 @@ msgstr "Dies wird deinen Account endgültig löschen. Es gibt keine Möglichkeit
 msgid "Please enter your password for verification:"
 msgstr "Bitte gib dein Passwort zur Verifikation ein:"
 
-#: ../../mod/message.php:23
-msgid "No recipient selected."
-msgstr "Kein Empfänger gewählt."
+#: ../../mod/message.php:22 ../../include/nav.php:131
+msgid "New Message"
+msgstr "Neue Nachricht"
 
-#: ../../mod/message.php:26
+#: ../../mod/message.php:63
 msgid "Unable to locate contact information."
 msgstr "Konnte die Kontaktinformationen nicht finden."
 
-#: ../../mod/message.php:29
-msgid "Message could not be sent."
-msgstr "Nachricht konnte nicht gesendet werden."
-
-#: ../../mod/message.php:32
-msgid "Message collection failure."
-msgstr "Konnte Nachrichten nicht abrufen."
-
-#: ../../mod/message.php:35
-msgid "Message sent."
-msgstr "Nachricht gesendet."
-
-#: ../../mod/message.php:55
-msgid "Inbox"
-msgstr "Eingang"
-
-#: ../../mod/message.php:60
-msgid "Outbox"
-msgstr "Ausgang"
-
-#: ../../mod/message.php:65
-msgid "New Message"
-msgstr "Neue Nachricht"
-
-#: ../../mod/message.php:91
+#: ../../mod/message.php:117
 msgid "Message deleted."
 msgstr "Nachricht gelöscht."
 
-#: ../../mod/message.php:121
+#: ../../mod/message.php:147
 msgid "Conversation removed."
 msgstr "Unterhaltung gelöscht."
 
-#: ../../mod/message.php:137 ../../include/conversation.php:887
-msgid "Please enter a link URL:"
-msgstr "Bitte gib die URL des Links ein:"
-
-#: ../../mod/message.php:145
-msgid "Send Private Message"
-msgstr "Private Nachricht senden"
-
-#: ../../mod/message.php:146 ../../mod/message.php:287
-msgid "To:"
-msgstr "An:"
+#: ../../mod/message.php:219
+msgid "No messages."
+msgstr "Keine Nachrichten."
 
-#: ../../mod/message.php:147 ../../mod/message.php:288
-msgid "Subject:"
-msgstr "Betreff:"
+#: ../../mod/message.php:226
+#, php-format
+msgid "Unknown sender - %s"
+msgstr "'Unbekannter Absender - %s"
 
-#: ../../mod/message.php:150 ../../mod/message.php:291
-#: ../../mod/invite.php:101
-msgid "Your message:"
-msgstr "Deine Nachricht:"
+#: ../../mod/message.php:229
+#, php-format
+msgid "You and %s"
+msgstr "Du und %s"
 
-#: ../../mod/message.php:188
-msgid "No messages."
-msgstr "Keine Nachrichten."
+#: ../../mod/message.php:232
+#, php-format
+msgid "%s and You"
+msgstr "%s und Du"
 
-#: ../../mod/message.php:201
+#: ../../mod/message.php:242 ../../mod/message.php:340
 msgid "Delete conversation"
 msgstr "Unterhaltung löschen"
 
-#: ../../mod/message.php:204
+#: ../../mod/message.php:245
 msgid "D, d M Y - g:i A"
 msgstr "D, d. M Y - g:i A"
 
-#: ../../mod/message.php:239
+#: ../../mod/message.php:247
+#, php-format
+msgid "%d message"
+msgid_plural "%d messages"
+msgstr[0] "%d Nachricht"
+msgstr[1] "%d Nachrichten"
+
+#: ../../mod/message.php:282
 msgid "Message not available."
 msgstr "Nachricht nicht verfügbar."
 
-#: ../../mod/message.php:276
+#: ../../mod/message.php:324
 msgid "Delete message"
 msgstr "Nachricht löschen"
 
-#: ../../mod/message.php:286
+#: ../../mod/message.php:342
+msgid ""
+"No secure communications available. You <strong>may</strong> be able to "
+"respond from the sender's profile page."
+msgstr "Sichere Kommunikation ist nicht verfügbar. <strong>Eventuell</strong> kannst du auf der Profilseite des Absenders antworten."
+
+#: ../../mod/message.php:346
 msgid "Send Reply"
 msgstr "Antwort senden"
 
@@ -2792,525 +3035,556 @@ msgstr "Freunde von %s"
 msgid "No friends to display."
 msgstr "Keine Freunde zum Anzeigen."
 
-#: ../../mod/admin.php:71 ../../mod/admin.php:312
+#: ../../mod/admin.php:55
+msgid "Theme settings updated."
+msgstr "Themen Einstellungen aktualisiert."
+
+#: ../../mod/admin.php:93 ../../mod/admin.php:391
 msgid "Site"
 msgstr "Seite"
 
-#: ../../mod/admin.php:72 ../../mod/admin.php:480 ../../mod/admin.php:492
+#: ../../mod/admin.php:94 ../../mod/admin.php:569 ../../mod/admin.php:581
 msgid "Users"
 msgstr "Nutzer"
 
-#: ../../mod/admin.php:73 ../../mod/admin.php:569 ../../mod/admin.php:608
+#: ../../mod/admin.php:95 ../../mod/admin.php:663 ../../mod/admin.php:705
 msgid "Plugins"
 msgstr "Plugins"
 
-#: ../../mod/admin.php:74 ../../mod/admin.php:742 ../../mod/admin.php:775
+#: ../../mod/admin.php:96 ../../mod/admin.php:868 ../../mod/admin.php:904
 msgid "Themes"
 msgstr "Themen"
 
-#: ../../mod/admin.php:89 ../../mod/admin.php:855
+#: ../../mod/admin.php:111 ../../mod/admin.php:992
 msgid "Logs"
 msgstr "Protokolle"
 
-#: ../../mod/admin.php:94
+#: ../../mod/admin.php:116
 msgid "User registrations waiting for confirmation"
 msgstr "Nutzeranmeldungen die auf Bestätigung warten"
 
-#: ../../mod/admin.php:161 ../../mod/admin.php:311 ../../mod/admin.php:479
-#: ../../mod/admin.php:568 ../../mod/admin.php:607 ../../mod/admin.php:741
-#: ../../mod/admin.php:774 ../../mod/admin.php:854
+#: ../../mod/admin.php:188 ../../mod/admin.php:390 ../../mod/admin.php:568
+#: ../../mod/admin.php:662 ../../mod/admin.php:704 ../../mod/admin.php:867
+#: ../../mod/admin.php:903 ../../mod/admin.php:991
 msgid "Administration"
 msgstr "Administration"
 
-#: ../../mod/admin.php:162
+#: ../../mod/admin.php:189
 msgid "Summary"
 msgstr "Zusammenfassung"
 
-#: ../../mod/admin.php:163
+#: ../../mod/admin.php:190
 msgid "Registered users"
 msgstr "Registrierte Nutzer"
 
-#: ../../mod/admin.php:165
+#: ../../mod/admin.php:192
 msgid "Pending registrations"
 msgstr "Anstehende Anmeldungen"
 
-#: ../../mod/admin.php:166
+#: ../../mod/admin.php:193
 msgid "Version"
 msgstr "Version"
 
-#: ../../mod/admin.php:168
+#: ../../mod/admin.php:195
 msgid "Active plugins"
 msgstr "Aktive Plugins"
 
-#: ../../mod/admin.php:260
+#: ../../mod/admin.php:329
 msgid "Site settings updated."
 msgstr "Seiteneinstellungen aktualisiert."
 
-#: ../../mod/admin.php:304
+#: ../../mod/admin.php:377
 msgid "Closed"
 msgstr "Geschlossen"
 
-#: ../../mod/admin.php:305
+#: ../../mod/admin.php:378
 msgid "Requires approval"
 msgstr "Bedarf der Zustimmung"
 
-#: ../../mod/admin.php:306
+#: ../../mod/admin.php:379
 msgid "Open"
 msgstr "Offen"
 
-#: ../../mod/admin.php:315
+#: ../../mod/admin.php:383
+msgid "No SSL policy, links will track page SSL state"
+msgstr "Keine SSL Richtlinie, Links werden das verwendete Protokoll beibehalten"
+
+#: ../../mod/admin.php:384
+msgid "Force all links to use SSL"
+msgstr "SSL für alle Links erzwingen"
+
+#: ../../mod/admin.php:385
+msgid "Self-signed certificate, use SSL for local links only (discouraged)"
+msgstr "Selbst-unterzeichnetes Zertifikat, SSL nur für lokale Links verwenden (nicht empfohlen)"
+
+#: ../../mod/admin.php:394
 msgid "File upload"
 msgstr "Datei hochladen"
 
-#: ../../mod/admin.php:316
+#: ../../mod/admin.php:395
 msgid "Policies"
 msgstr "Regeln"
 
-#: ../../mod/admin.php:317
+#: ../../mod/admin.php:396
 msgid "Advanced"
 msgstr "Erweitert"
 
-#: ../../mod/admin.php:321 ../../addon/statusnet/statusnet.php:523
+#: ../../mod/admin.php:400 ../../addon/statusnet/statusnet.php:544
 msgid "Site name"
 msgstr "Seitenname"
 
-#: ../../mod/admin.php:322
+#: ../../mod/admin.php:401
 msgid "Banner/Logo"
 msgstr "Banner/Logo"
 
-#: ../../mod/admin.php:323
+#: ../../mod/admin.php:402
 msgid "System language"
 msgstr "Systemsprache"
 
-#: ../../mod/admin.php:324
+#: ../../mod/admin.php:403
 msgid "System theme"
 msgstr "Systemweites Thema"
 
-#: ../../mod/admin.php:324
-msgid "Default system theme - may be over-ridden by user profiles"
-msgstr "Standard Server Theme - kann von den Benutzereinstellungen überschrieben werden."
+#: ../../mod/admin.php:403
+msgid ""
+"Default system theme - may be over-ridden by user profiles - <a href='#' "
+"id='cnftheme'>change theme settings</a>"
+msgstr "Vorgabe für das System-Theme - kann von Benutzerprofilen überschrieben werden - <a href='#' id='cnftheme'>Theme-Einstellungen ändern</a>"
+
+#: ../../mod/admin.php:404
+msgid "SSL link policy"
+msgstr "Regeln für SSL Links"
+
+#: ../../mod/admin.php:404
+msgid "Determines whether generated links should be forced to use SSL"
+msgstr "Bestimmt, ob generierte Links SSL verwenden müssen"
 
-#: ../../mod/admin.php:326
+#: ../../mod/admin.php:405
 msgid "Maximum image size"
 msgstr "Maximale Größe von Bildern"
 
-#: ../../mod/admin.php:326
+#: ../../mod/admin.php:405
 msgid ""
 "Maximum size in bytes of uploaded images. Default is 0, which means no "
 "limits."
 msgstr "Maximale Upload-Größe von Bildern in Bytes. Standard ist 0, d.h. ohne Limit."
 
-#: ../../mod/admin.php:328
+#: ../../mod/admin.php:407
 msgid "Register policy"
 msgstr "Registrierungsmethode"
 
-#: ../../mod/admin.php:329
+#: ../../mod/admin.php:408
 msgid "Register text"
 msgstr "Registrierungstext"
 
-#: ../../mod/admin.php:329
+#: ../../mod/admin.php:408
 msgid "Will be displayed prominently on the registration page."
 msgstr "Wird gut sichtbar auf der Registrierungs-Seite angezeigt."
 
-#: ../../mod/admin.php:330
+#: ../../mod/admin.php:409
 msgid "Accounts abandoned after x days"
 msgstr "Accounts gelten nach x Tagen als unbenutzt"
 
-#: ../../mod/admin.php:330
+#: ../../mod/admin.php:409
 msgid ""
 "Will not waste system resources polling external sites for abandonded "
 "accounts. Enter 0 for no time limit."
 msgstr "Verschwende keine System-Ressourcen auf das Pollen externer Seiten, wenn Accounts nicht mehr benutzt werden. 0 eingeben für kein Limit."
 
-#: ../../mod/admin.php:331
+#: ../../mod/admin.php:410
 msgid "Allowed friend domains"
 msgstr "Erlaubte Domains für Kontakte"
 
-#: ../../mod/admin.php:331
+#: ../../mod/admin.php:410
 msgid ""
 "Comma separated list of domains which are allowed to establish friendships "
 "with this site. Wildcards are accepted. Empty to allow any domains"
 msgstr "Liste der Domains, die für Freundschaften erlaubt sind, durch Kommas getrennt. Platzhalter werden akzeptiert. Leer lassen, um alle Domains zu erlauben."
 
-#: ../../mod/admin.php:332
+#: ../../mod/admin.php:411
 msgid "Allowed email domains"
 msgstr "Erlaubte Domains für Emails"
 
-#: ../../mod/admin.php:332
+#: ../../mod/admin.php:411
 msgid ""
 "Comma separated list of domains which are allowed in email addresses for "
 "registrations to this site. Wildcards are accepted. Empty to allow any "
 "domains"
 msgstr "Liste der Domains, die für E-Mail-Adressen bei der Registrierung erlaubt sind, durch Kommas getrennt. Platzhalter werden akzeptiert. Leer lassen, um alle Domains zu erlauben."
 
-#: ../../mod/admin.php:333
+#: ../../mod/admin.php:412
 msgid "Block public"
 msgstr "Öffentlichen Zugriff blockieren"
 
-#: ../../mod/admin.php:333
+#: ../../mod/admin.php:412
 msgid ""
 "Check to block public access to all otherwise public personal pages on this "
 "site unless you are currently logged in."
 msgstr "Klicken, um öffentlichen Zugriff auf sonst öffentliche Profile zu blockieren, wenn man nicht eingeloggt ist."
 
-#: ../../mod/admin.php:334
+#: ../../mod/admin.php:413
 msgid "Force publish"
 msgstr "Erzwinge Veröffentlichung"
 
-#: ../../mod/admin.php:334
+#: ../../mod/admin.php:413
 msgid ""
 "Check to force all profiles on this site to be listed in the site directory."
 msgstr "Klicken, um Anzeige aller Profile dieses Servers im Verzeichnis zu erzwingen."
 
-#: ../../mod/admin.php:335
+#: ../../mod/admin.php:414
 msgid "Global directory update URL"
 msgstr "URL für Updates beim weltweiten Verzeichnis"
 
-#: ../../mod/admin.php:335
+#: ../../mod/admin.php:414
 msgid ""
 "URL to update the global directory. If this is not set, the global directory"
 " is completely unavailable to the application."
 msgstr "URL für Update des globalen Verzeichnisses. Wenn nichts eingetragen ist, bleibt das globale Verzeichnis unerreichbar."
 
-#: ../../mod/admin.php:337
+#: ../../mod/admin.php:416
 msgid "Block multiple registrations"
 msgstr "Unterbinde Mehrfachregistrierung"
 
-#: ../../mod/admin.php:337
+#: ../../mod/admin.php:416
 msgid "Disallow users to register additional accounts for use as pages."
 msgstr "Benutzern nicht erlauben, weitere Accounts als zusätzliche Profile anzulegen."
 
-#: ../../mod/admin.php:338
+#: ../../mod/admin.php:417
 msgid "OpenID support"
 msgstr "OpenID Unterstützung"
 
-#: ../../mod/admin.php:338
+#: ../../mod/admin.php:417
 msgid "OpenID support for registration and logins."
 msgstr "OpenID-Unterstützung für Registrierung und Login."
 
-#: ../../mod/admin.php:339
-msgid "Gravatar support"
-msgstr "Gravatar Unterstützung"
-
-#: ../../mod/admin.php:339
-msgid "Search new user's photo on Gravatar."
-msgstr "Suchfunktion bei Gravatar für Profilbilder neuer Nutzer."
-
-#: ../../mod/admin.php:340
+#: ../../mod/admin.php:418
 msgid "Fullname check"
 msgstr "Namen auf Vollständigkeit überprüfen"
 
-#: ../../mod/admin.php:340
+#: ../../mod/admin.php:418
 msgid ""
 "Force users to register with a space between firstname and lastname in Full "
 "name, as an antispam measure"
 msgstr "Leerzeichen zwischen Vor- und Nachname im vollständigen Namen erzwingen, um SPAM zu vermeiden."
 
-#: ../../mod/admin.php:341
+#: ../../mod/admin.php:419
 msgid "UTF-8 Regular expressions"
 msgstr "UTF-8 Reguläre Ausdrücke"
 
-#: ../../mod/admin.php:341
+#: ../../mod/admin.php:419
 msgid "Use PHP UTF8 regular expressions"
 msgstr "PHP UTF8 Ausdrücke verwenden"
 
-#: ../../mod/admin.php:342
+#: ../../mod/admin.php:420
 msgid "Show Community Page"
 msgstr "Gemeinschaftsseite anzeigen"
 
-#: ../../mod/admin.php:342
+#: ../../mod/admin.php:420
 msgid ""
 "Display a Community page showing all recent public postings on this site."
 msgstr "Zeige die Gemeinschaftsseite mit allen öffentlichen Beiträgen auf diesem Server."
 
-#: ../../mod/admin.php:343
+#: ../../mod/admin.php:421
 msgid "Enable OStatus support"
 msgstr "OStatus Unterstützung aktivieren"
 
-#: ../../mod/admin.php:343
+#: ../../mod/admin.php:421
 msgid ""
 "Provide built-in OStatus (identi.ca, status.net, etc.) compatibility. All "
 "communications in OStatus are public, so privacy warnings will be "
 "occasionally displayed."
 msgstr "Biete die eingebaute OStatus (identi.ca, status.net, etc.) Unterstützung an. Jede Kommunikation in OStatus ist öffentlich, so Privatsphäre Warnungen werden bei Bedarf angezeigt."
 
-#: ../../mod/admin.php:344
+#: ../../mod/admin.php:422
 msgid "Enable Diaspora support"
 msgstr "Diaspora-Support aktivieren"
 
-#: ../../mod/admin.php:344
+#: ../../mod/admin.php:422
 msgid "Provide built-in Diaspora network compatibility."
 msgstr "Verwende die eingebaute Diaspora-Verknüpfung."
 
-#: ../../mod/admin.php:345
+#: ../../mod/admin.php:423
 msgid "Only allow Friendica contacts"
 msgstr "Nur Friendica-Kontakte erlauben"
 
-#: ../../mod/admin.php:345
+#: ../../mod/admin.php:423
 msgid ""
 "All contacts must use Friendica protocols. All other built-in communication "
 "protocols disabled."
 msgstr "Alle Kontakte müssen das Friendica Protokoll nutzen. Alle anderen Kommunikationsprotokolle werden deaktiviert."
 
-#: ../../mod/admin.php:346
+#: ../../mod/admin.php:424
 msgid "Verify SSL"
 msgstr "SSL Überprüfen"
 
-#: ../../mod/admin.php:346
+#: ../../mod/admin.php:424
 msgid ""
 "If you wish, you can turn on strict certificate checking. This will mean you"
 " cannot connect (at all) to self-signed SSL sites."
-msgstr "Wenn gewollt, kann man hier eine strenge Zertifikat Kontrolle anstellen. Das bedeutet, das man zu keinen Seiten mit selbst unterzeichneten SSL eine Verbindung herstellen kann."
+msgstr "Wenn gewollt, kann man hier eine strenge Zertifikat Kontrolle einstellen. Das bedeutet, dass man zu keinen Seiten mit selbst unterzeichnetem SSL eine Verbindung herstellen kann."
 
-#: ../../mod/admin.php:347
+#: ../../mod/admin.php:425
 msgid "Proxy user"
 msgstr "Proxy Nutzer"
 
-#: ../../mod/admin.php:348
+#: ../../mod/admin.php:426
 msgid "Proxy URL"
 msgstr "Proxy URL"
 
-#: ../../mod/admin.php:349
+#: ../../mod/admin.php:427
 msgid "Network timeout"
 msgstr "Netzwerk Wartezeit"
 
-#: ../../mod/admin.php:349
+#: ../../mod/admin.php:427
 msgid "Value is in seconds. Set to 0 for unlimited (not recommended)."
 msgstr "Der Wert ist in Sekunden. Setze 0 für unbegrenzt (nicht empfohlen)."
 
-#: ../../mod/admin.php:370
+#: ../../mod/admin.php:453
 #, php-format
 msgid "%s user blocked/unblocked"
 msgid_plural "%s users blocked/unblocked"
 msgstr[0] "%s Benutzer geblockt/freigegeben"
 msgstr[1] "%s Benutzer geblockt/freigegeben"
 
-#: ../../mod/admin.php:377
+#: ../../mod/admin.php:460
 #, php-format
 msgid "%s user deleted"
 msgid_plural "%s users deleted"
 msgstr[0] "%s Nutzer gelöscht"
 msgstr[1] "%s Nutzer gelöscht"
 
-#: ../../mod/admin.php:411
+#: ../../mod/admin.php:499
 #, php-format
 msgid "User '%s' deleted"
 msgstr "Nutzer '%s' gelöscht"
 
-#: ../../mod/admin.php:418
+#: ../../mod/admin.php:507
 #, php-format
 msgid "User '%s' unblocked"
 msgstr "Nutzer '%s' entsperrt"
 
-#: ../../mod/admin.php:418
+#: ../../mod/admin.php:507
 #, php-format
 msgid "User '%s' blocked"
 msgstr "Nutzer '%s' gesperrt"
 
-#: ../../mod/admin.php:482
+#: ../../mod/admin.php:571
 msgid "select all"
 msgstr "Alle auswählen"
 
-#: ../../mod/admin.php:483
+#: ../../mod/admin.php:572
 msgid "User registrations waiting for confirm"
 msgstr "Neuanmeldungen, die auf deine Bestätigung warten"
 
-#: ../../mod/admin.php:484
+#: ../../mod/admin.php:573
 msgid "Request date"
 msgstr "Anfrage Datum"
 
-#: ../../mod/admin.php:484 ../../mod/admin.php:493
+#: ../../mod/admin.php:573 ../../mod/admin.php:582
 #: ../../include/contact_selectors.php:79
 msgid "Email"
 msgstr "Email"
 
-#: ../../mod/admin.php:485
+#: ../../mod/admin.php:574
 msgid "No registrations."
 msgstr "Keine Neuanmeldungen."
 
-#: ../../mod/admin.php:487
+#: ../../mod/admin.php:576
 msgid "Deny"
 msgstr "Verwehren"
 
-#: ../../mod/admin.php:493
+#: ../../mod/admin.php:582
 msgid "Register date"
 msgstr "Anmeldedatum"
 
-#: ../../mod/admin.php:493
+#: ../../mod/admin.php:582
 msgid "Last login"
 msgstr "Letzte Anmeldung"
 
-#: ../../mod/admin.php:493
+#: ../../mod/admin.php:582
 msgid "Last item"
 msgstr "Letzter Beitrag"
 
-#: ../../mod/admin.php:493
+#: ../../mod/admin.php:582
 msgid "Account"
 msgstr "Nutzerkonto"
 
-#: ../../mod/admin.php:495
+#: ../../mod/admin.php:584
 msgid ""
 "Selected users will be deleted!\\n\\nEverything these users had posted on "
 "this site will be permanently deleted!\\n\\nAre you sure?"
 msgstr "Die markierten Nutzer werden gelöscht!\\n\\nAlle Beiträge, die diese Nutzer auf dieser Seite veröffentlicht haben, werden permanent gelöscht!\\n\\nBist du sicher?"
 
-#: ../../mod/admin.php:496
+#: ../../mod/admin.php:585
 msgid ""
 "The user {0} will be deleted!\\n\\nEverything this user has posted on this "
 "site will be permanently deleted!\\n\\nAre you sure?"
 msgstr "Der Nutzer {0} wird gelöscht!\\n\\nAlles was dieser Nutzer auf dieser Seite veröffentlicht hat, wird permanent gelöscht!\\n\\nBist du sicher?"
 
-#: ../../mod/admin.php:532
+#: ../../mod/admin.php:626
 #, php-format
 msgid "Plugin %s disabled."
 msgstr "Plugin %s deaktiviert."
 
-#: ../../mod/admin.php:536
+#: ../../mod/admin.php:630
 #, php-format
 msgid "Plugin %s enabled."
 msgstr "Plugin %s aktiviert."
 
-#: ../../mod/admin.php:546 ../../mod/admin.php:724
+#: ../../mod/admin.php:640 ../../mod/admin.php:838
 msgid "Disable"
 msgstr "Ausschalten"
 
-#: ../../mod/admin.php:548 ../../mod/admin.php:726
+#: ../../mod/admin.php:642 ../../mod/admin.php:840
 msgid "Enable"
 msgstr "Einschalten"
 
-#: ../../mod/admin.php:570 ../../mod/admin.php:743
+#: ../../mod/admin.php:664 ../../mod/admin.php:869
 msgid "Toggle"
 msgstr "Umschalten"
 
-#: ../../mod/admin.php:571 ../../mod/admin.php:744 ../../include/nav.php:130
-msgid "Settings"
-msgstr "Einstellungen"
-
-#: ../../mod/admin.php:578 ../../mod/admin.php:753
+#: ../../mod/admin.php:672 ../../mod/admin.php:879
 msgid "Author: "
 msgstr "Autor:"
 
-#: ../../mod/admin.php:579 ../../mod/admin.php:754
+#: ../../mod/admin.php:673 ../../mod/admin.php:880
 msgid "Maintainer: "
 msgstr "Betreuer:"
 
-#: ../../mod/admin.php:689
+#: ../../mod/admin.php:802
 msgid "No themes found."
 msgstr "Keine Themen gefunden."
 
-#: ../../mod/admin.php:780
+#: ../../mod/admin.php:861
+msgid "Screenshot"
+msgstr "Bildschirmfoto"
+
+#: ../../mod/admin.php:909
 msgid "[Experimental]"
 msgstr "[Experimentell]"
 
-#: ../../mod/admin.php:781
+#: ../../mod/admin.php:910
 msgid "[Unsupported]"
 msgstr "[Nicht unterstützt]"
 
-#: ../../mod/admin.php:804
+#: ../../mod/admin.php:937
 msgid "Log settings updated."
 msgstr "Protokolleinstellungen aktualisiert."
 
-#: ../../mod/admin.php:857
+#: ../../mod/admin.php:994
 msgid "Clear"
 msgstr "löschen"
 
-#: ../../mod/admin.php:863
+#: ../../mod/admin.php:1000
 msgid "Debugging"
 msgstr "Protokoll führen"
 
-#: ../../mod/admin.php:864
+#: ../../mod/admin.php:1001
 msgid "Log file"
 msgstr "Protokolldatei"
 
-#: ../../mod/admin.php:864
+#: ../../mod/admin.php:1001
 msgid ""
 "Must be writable by web server. Relative to your Friendica top-level "
 "directory."
 msgstr "Webserver muss Schreibrechte besitzen. Abhängig vom Friendica-Installationsverzeichnis."
 
-#: ../../mod/admin.php:865
+#: ../../mod/admin.php:1002
 msgid "Log level"
 msgstr "Protokoll-Level"
 
-#: ../../mod/admin.php:906
+#: ../../mod/admin.php:1052
 msgid "Close"
 msgstr "Schließen"
 
-#: ../../mod/admin.php:912
+#: ../../mod/admin.php:1058
 msgid "FTP Host"
 msgstr "FTP Host"
 
-#: ../../mod/admin.php:913
+#: ../../mod/admin.php:1059
 msgid "FTP Path"
 msgstr "FTP Pfad"
 
-#: ../../mod/admin.php:914
+#: ../../mod/admin.php:1060
 msgid "FTP User"
 msgstr "FTP Nutzername"
 
-#: ../../mod/admin.php:915
+#: ../../mod/admin.php:1061
 msgid "FTP Password"
 msgstr "FTP Passwort"
 
-#: ../../mod/profile.php:15 ../../boot.php:845
+#: ../../mod/profile.php:21 ../../boot.php:940
 msgid "Requested profile is not available."
 msgstr "Das angefragte Profil ist nicht vorhanden."
 
-#: ../../mod/profile.php:111 ../../mod/display.php:67
+#: ../../mod/profile.php:124 ../../mod/display.php:75
 msgid "Access to this profile has been restricted."
 msgstr "Der Zugriff zu diesem Profil wurde eingeschränkt."
 
-#: ../../mod/profile.php:131
+#: ../../mod/profile.php:145
 msgid "Tips for New Members"
 msgstr "Tipps für neue Nutzer"
 
-#: ../../mod/ping.php:174
+#: ../../mod/ping.php:175
 msgid "{0} wants to be your friend"
 msgstr "{0} möchte mit dir in Kontakt treten"
 
-#: ../../mod/ping.php:179
+#: ../../mod/ping.php:180
 msgid "{0} sent you a message"
 msgstr "{0} hat dir eine Nachricht geschickt"
 
-#: ../../mod/ping.php:184
+#: ../../mod/ping.php:185
 msgid "{0} requested registration"
 msgstr "{0} möchte sich registrieren"
 
-#: ../../mod/ping.php:190
+#: ../../mod/ping.php:191
 #, php-format
 msgid "{0} commented %s's post"
 msgstr "{0} kommentierte einen Beitrag von %s"
 
-#: ../../mod/ping.php:195
+#: ../../mod/ping.php:196
 #, php-format
 msgid "{0} liked %s's post"
 msgstr "{0} mag %ss Beitrag"
 
-#: ../../mod/ping.php:200
+#: ../../mod/ping.php:201
 #, php-format
 msgid "{0} disliked %s's post"
 msgstr "{0} mag %ss Beitrag nicht"
 
-#: ../../mod/ping.php:205
+#: ../../mod/ping.php:206
 #, php-format
 msgid "{0} is now friends with %s"
 msgstr "{0} ist jetzt mit %s befreundet"
 
-#: ../../mod/ping.php:210
+#: ../../mod/ping.php:211
 msgid "{0} posted"
 msgstr "{0} hat etwas veröffentlicht"
 
-#: ../../mod/ping.php:215
+#: ../../mod/ping.php:216
 #, php-format
 msgid "{0} tagged %s's post with #%s"
 msgstr "{0} hat %ss Beitrag mit dem Schlagwort #%s versehen"
 
-#: ../../mod/ping.php:221
+#: ../../mod/ping.php:222
 msgid "{0} mentioned you in a post"
 msgstr "{0} hat dich in einem Beitrag erwähnt"
 
-#: ../../mod/openid.php:63 ../../mod/openid.php:77 ../../include/auth.php:90
-#: ../../include/auth.php:115 ../../include/auth.php:169
+#: ../../mod/nogroup.php:58
+msgid "Contacts who are not members of a group"
+msgstr "Kontakte, die keiner Gruppe zugewiesen sind"
+
+#: ../../mod/openid.php:24
+msgid "OpenID protocol error. No ID returned."
+msgstr "OpenID Protokollfehler. Keine ID zurückgegeben."
+
+#: ../../mod/openid.php:53
+msgid ""
+"Account not found and OpenID registration is not permitted on this site."
+msgstr "Account wurde nicht gefunden und OpenID Registrierung auf diesem Server nicht gestattet."
+
+#: ../../mod/openid.php:93 ../../include/auth.php:90
+#: ../../include/auth.php:153
 msgid "Login failed."
 msgstr "Annmeldung fehlgeschlagen."
 
@@ -3367,7 +3641,7 @@ msgstr "Gemeinsame Freunde"
 msgid "No friends in common."
 msgstr "Keine gemeinsamen Freunde."
 
-#: ../../mod/display.php:130
+#: ../../mod/display.php:135
 msgid "Item has been removed."
 msgstr "Eintrag wurde entfernt."
 
@@ -3383,222 +3657,279 @@ msgstr "Keine Applikationen installiert."
 msgid "Search This Site"
 msgstr "Diese Seite durchsuchen"
 
-#: ../../mod/profiles.php:21 ../../mod/profiles.php:239
-#: ../../mod/profiles.php:344 ../../mod/dfrn_confirm.php:62
+#: ../../mod/profiles.php:21 ../../mod/profiles.php:339
+#: ../../mod/profiles.php:453 ../../mod/dfrn_confirm.php:62
 msgid "Profile not found."
 msgstr "Profil nicht gefunden."
 
-#: ../../mod/profiles.php:28
+#: ../../mod/profiles.php:31
 msgid "Profile Name is required."
 msgstr "Profilname ist erforderlich."
 
-#: ../../mod/profiles.php:198
+#: ../../mod/profiles.php:143
+msgid "Marital Status"
+msgstr "Familienstand"
+
+#: ../../mod/profiles.php:144
+msgid "Romantic Partner"
+msgstr "Romanze"
+
+#: ../../mod/profiles.php:145
+msgid "Work/Employment"
+msgstr "Arbeit / Beschäftigung"
+
+#: ../../mod/profiles.php:146
+msgid "Religion"
+msgstr "Religion"
+
+#: ../../mod/profiles.php:147
+msgid "Political Views"
+msgstr "Politische Ansichten"
+
+#: ../../mod/profiles.php:148
+msgid "Gender"
+msgstr "Geschlecht"
+
+#: ../../mod/profiles.php:149
+msgid "Sexual Preference"
+msgstr "Sexuelle Vorlieben"
+
+#: ../../mod/profiles.php:150
+msgid "Homepage"
+msgstr "Webseite"
+
+#: ../../mod/profiles.php:151
+msgid "Interests"
+msgstr "Interessen"
+
+#: ../../mod/profiles.php:154
+msgid "Location"
+msgstr "Wohnort"
+
+#: ../../mod/profiles.php:225
 msgid "Profile updated."
 msgstr "Profil aktualisiert."
 
-#: ../../mod/profiles.php:256
+#: ../../mod/profiles.php:300
+msgid "public profile"
+msgstr "öffentliches Profil"
+
+#: ../../mod/profiles.php:302
+#, php-format
+msgid "%1$s has an updated %2$s, changing %3$s."
+msgstr "%1$s hat folgendes aktualisiert %2$s, verändert wurde %3$s."
+
+#: ../../mod/profiles.php:358
 msgid "Profile deleted."
 msgstr "Profil gelöscht."
 
-#: ../../mod/profiles.php:272 ../../mod/profiles.php:303
+#: ../../mod/profiles.php:376 ../../mod/profiles.php:410
 msgid "Profile-"
 msgstr "Profil-"
 
-#: ../../mod/profiles.php:291 ../../mod/profiles.php:330
+#: ../../mod/profiles.php:395 ../../mod/profiles.php:437
 msgid "New profile created."
 msgstr "Neues Profil angelegt."
 
-#: ../../mod/profiles.php:309
+#: ../../mod/profiles.php:416
 msgid "Profile unavailable to clone."
 msgstr "Profil nicht zum Duplizieren verfügbar."
 
-#: ../../mod/profiles.php:356
+#: ../../mod/profiles.php:474
 msgid "Hide your contact/friend list from viewers of this profile?"
 msgstr "Liste der Kontakte vor Betrachtern dieses Profils verbergen?"
 
-#: ../../mod/profiles.php:374
+#: ../../mod/profiles.php:497
 msgid "Edit Profile Details"
 msgstr "Profil bearbeiten"
 
-#: ../../mod/profiles.php:376
+#: ../../mod/profiles.php:499
 msgid "View this profile"
 msgstr "Dieses Profil anzeigen"
 
-#: ../../mod/profiles.php:377
+#: ../../mod/profiles.php:500
 msgid "Create a new profile using these settings"
 msgstr "Neues Profil anlegen und diese Einstellungen verwenden"
 
-#: ../../mod/profiles.php:378
+#: ../../mod/profiles.php:501
 msgid "Clone this profile"
 msgstr "Dieses Profil duplizieren"
 
-#: ../../mod/profiles.php:379
+#: ../../mod/profiles.php:502
 msgid "Delete this profile"
 msgstr "Dieses Profil löschen"
 
-#: ../../mod/profiles.php:380
+#: ../../mod/profiles.php:503
 msgid "Profile Name:"
 msgstr "Profilname:"
 
-#: ../../mod/profiles.php:381
+#: ../../mod/profiles.php:504
 msgid "Your Full Name:"
 msgstr "Dein kompletter Name:"
 
-#: ../../mod/profiles.php:382
+#: ../../mod/profiles.php:505
 msgid "Title/Description:"
 msgstr "Titel/Beschreibung:"
 
-#: ../../mod/profiles.php:383
+#: ../../mod/profiles.php:506
 msgid "Your Gender:"
 msgstr "Dein Geschlecht:"
 
-#: ../../mod/profiles.php:384
+#: ../../mod/profiles.php:507
 #, php-format
 msgid "Birthday (%s):"
 msgstr "Geburtstag (%s):"
 
-#: ../../mod/profiles.php:385
+#: ../../mod/profiles.php:508
 msgid "Street Address:"
 msgstr "Adresse:"
 
-#: ../../mod/profiles.php:386
+#: ../../mod/profiles.php:509
 msgid "Locality/City:"
 msgstr "Wohnort/Stadt:"
 
-#: ../../mod/profiles.php:387
+#: ../../mod/profiles.php:510
 msgid "Postal/Zip Code:"
 msgstr "Postleitzahl:"
 
-#: ../../mod/profiles.php:388
+#: ../../mod/profiles.php:511
 msgid "Country:"
 msgstr "Land:"
 
-#: ../../mod/profiles.php:389
+#: ../../mod/profiles.php:512
 msgid "Region/State:"
 msgstr "Region/Bundesstaat:"
 
-#: ../../mod/profiles.php:390
+#: ../../mod/profiles.php:513
 msgid "<span class=\"heart\">&hearts;</span> Marital Status:"
 msgstr "<span class=\"heart\">&hearts;</span> Beziehungsstatus:"
 
-#: ../../mod/profiles.php:391
+#: ../../mod/profiles.php:514
 msgid "Who: (if applicable)"
 msgstr "Wer: (falls anwendbar)"
 
-#: ../../mod/profiles.php:392
+#: ../../mod/profiles.php:515
 msgid "Examples: cathy123, Cathy Williams, cathy@example.com"
 msgstr "Beispiele: cathy123, Cathy Williams, cathy@example.com"
 
-#: ../../mod/profiles.php:393 ../../include/profile_advanced.php:43
+#: ../../mod/profiles.php:516 ../../include/profile_advanced.php:43
 msgid "Sexual Preference:"
 msgstr "Sexuelle Vorlieben:"
 
-#: ../../mod/profiles.php:394
+#: ../../mod/profiles.php:517
 msgid "Homepage URL:"
 msgstr "Adresse der Homepage:"
 
-#: ../../mod/profiles.php:395 ../../include/profile_advanced.php:49
+#: ../../mod/profiles.php:518 ../../include/profile_advanced.php:49
 msgid "Political Views:"
 msgstr "Politische Ansichten:"
 
-#: ../../mod/profiles.php:396
+#: ../../mod/profiles.php:519
 msgid "Religious Views:"
 msgstr "Religiöse Ansichten:"
 
-#: ../../mod/profiles.php:397
+#: ../../mod/profiles.php:520
 msgid "Public Keywords:"
 msgstr "Öffentliche Schlüsselwörter:"
 
-#: ../../mod/profiles.php:398
+#: ../../mod/profiles.php:521
 msgid "Private Keywords:"
 msgstr "Private Schlüsselwörter:"
 
-#: ../../mod/profiles.php:399
+#: ../../mod/profiles.php:522
 msgid "Example: fishing photography software"
 msgstr "Beispiel: Fischen Fotografie Software"
 
-#: ../../mod/profiles.php:400
+#: ../../mod/profiles.php:523
 msgid "(Used for suggesting potential friends, can be seen by others)"
 msgstr "(Wird verwendet um potentielle Freunde zu finden, könnte von Fremden eingesehen werden)"
 
-#: ../../mod/profiles.php:401
+#: ../../mod/profiles.php:524
 msgid "(Used for searching profiles, never shown to others)"
 msgstr "(Wird für die Suche nach Profilen verwendet und niemals veröffentlicht)"
 
-#: ../../mod/profiles.php:402
+#: ../../mod/profiles.php:525
 msgid "Tell us about yourself..."
 msgstr "Erzähle uns ein bisschen von dir …"
 
-#: ../../mod/profiles.php:403
+#: ../../mod/profiles.php:526
 msgid "Hobbies/Interests"
 msgstr "Hobbies/Interessen"
 
-#: ../../mod/profiles.php:404
+#: ../../mod/profiles.php:527
 msgid "Contact information and Social Networks"
 msgstr "Kontaktinformationen und Soziale Netzwerke"
 
-#: ../../mod/profiles.php:405
+#: ../../mod/profiles.php:528
 msgid "Musical interests"
 msgstr "Musikalische Interessen"
 
-#: ../../mod/profiles.php:406
+#: ../../mod/profiles.php:529
 msgid "Books, literature"
 msgstr "Literatur/Bücher"
 
-#: ../../mod/profiles.php:407
+#: ../../mod/profiles.php:530
 msgid "Television"
 msgstr "Fernsehen"
 
-#: ../../mod/profiles.php:408
+#: ../../mod/profiles.php:531
 msgid "Film/dance/culture/entertainment"
 msgstr "Filme/Tänze/Kultur/Unterhaltung"
 
-#: ../../mod/profiles.php:409
+#: ../../mod/profiles.php:532
 msgid "Love/romance"
 msgstr "Liebesleben"
 
-#: ../../mod/profiles.php:410
+#: ../../mod/profiles.php:533
 msgid "Work/employment"
 msgstr "Arbeit/Beschäftigung"
 
-#: ../../mod/profiles.php:411
+#: ../../mod/profiles.php:534
 msgid "School/education"
 msgstr "Schule/Ausbildung"
 
-#: ../../mod/profiles.php:416
+#: ../../mod/profiles.php:539
 msgid ""
 "This is your <strong>public</strong> profile.<br />It <strong>may</strong> "
 "be visible to anybody using the internet."
 msgstr "Dies ist dein <strong>öffentliches</strong> Profil.<br />Es <strong>könnte</strong> für jeden Nutzer des Internets sichtbar sein."
 
-#: ../../mod/profiles.php:426 ../../mod/directory.php:124
+#: ../../mod/profiles.php:549 ../../mod/directory.php:111
 msgid "Age: "
 msgstr "Alter: "
 
-#: ../../mod/profiles.php:461
+#: ../../mod/profiles.php:584
 msgid "Edit/Manage Profiles"
 msgstr "Verwalte/Editiere Profile"
 
-#: ../../mod/profiles.php:462 ../../boot.php:946
+#: ../../mod/profiles.php:585 ../../boot.php:1049
 msgid "Change profile photo"
 msgstr "Profilbild ändern"
 
-#: ../../mod/profiles.php:463 ../../boot.php:947
+#: ../../mod/profiles.php:586 ../../boot.php:1050
 msgid "Create New Profile"
 msgstr "Neues Profil anlegen"
 
-#: ../../mod/profiles.php:473 ../../boot.php:957
+#: ../../mod/profiles.php:597 ../../boot.php:1060
 msgid "Profile Image"
 msgstr "Profilbild"
 
-#: ../../mod/profiles.php:475 ../../boot.php:960
+#: ../../mod/profiles.php:599 ../../boot.php:1063
 msgid "visible to everybody"
 msgstr "sichtbar für jeden"
 
-#: ../../mod/profiles.php:476 ../../boot.php:961
+#: ../../mod/profiles.php:600 ../../boot.php:1064
 msgid "Edit visibility"
 msgstr "Sichtbarkeit bearbeiten"
 
+#: ../../mod/filer.php:29 ../../include/conversation.php:914
+msgid "Save to Folder:"
+msgstr "In diesen Ordner verschieben:"
+
+#: ../../mod/filer.php:29
+msgid "- select -"
+msgstr "- auswählen -"
+
 #: ../../mod/tagger.php:103 ../../include/conversation.php:138
 #, php-format
 msgid "%1$s tagged %2$s's %3$s with %4$s"
@@ -3639,7 +3970,15 @@ msgstr "Hinzufügen"
 msgid "No entries."
 msgstr "Keine Einträge"
 
-#: ../../mod/suggest.php:38 ../../include/contact_widgets.php:35
+#: ../../mod/suggest.php:38
+#: ../../view/theme/diabook/diabook-green/theme.php:145
+#: ../../view/theme/diabook/diabook-red/theme.php:143
+#: ../../view/theme/diabook/diabook-blue/theme.php:143
+#: ../../view/theme/diabook/theme.php:158
+#: ../../view/theme/diabook/diabook-dark/theme.php:145
+#: ../../view/theme/diabook/diabook-aerith/theme.php:145
+#: ../../view/theme/diabook/diabook-pink/theme.php:145
+#: ../../include/contact_widgets.php:34
 msgid "Friend Suggestions"
 msgstr "Kontaktvorschläge"
 
@@ -3653,31 +3992,30 @@ msgstr "Keine Vorschläge. Falls der Server frisch aufgesetzt wurde, versuche es
 msgid "Ignore/Hide"
 msgstr "Ignorieren/Verbergen"
 
-#: ../../mod/directory.php:51
+#: ../../mod/directory.php:47
+#: ../../view/theme/diabook/diabook-green/theme.php:143
+#: ../../view/theme/diabook/diabook-red/theme.php:141
+#: ../../view/theme/diabook/diabook-blue/theme.php:141
+#: ../../view/theme/diabook/theme.php:156
+#: ../../view/theme/diabook/diabook-dark/theme.php:143
+#: ../../view/theme/diabook/diabook-aerith/theme.php:143
+#: ../../view/theme/diabook/diabook-pink/theme.php:143
 msgid "Global Directory"
 msgstr "Weltweites Verzeichnis"
 
-#: ../../mod/directory.php:57
-msgid "Normal site view"
-msgstr "Normale Seitenansicht"
-
-#: ../../mod/directory.php:59
-msgid "Admin - View all site entries"
-msgstr "Admin: Alle Einträge dieses Servers anzeigen"
-
-#: ../../mod/directory.php:65
+#: ../../mod/directory.php:55
 msgid "Find on this site"
 msgstr "Auf diesem Server suchen"
 
-#: ../../mod/directory.php:68
+#: ../../mod/directory.php:58
 msgid "Site Directory"
 msgstr "Verzeichnis"
 
-#: ../../mod/directory.php:127
+#: ../../mod/directory.php:114
 msgid "Gender: "
 msgstr "Geschlecht:"
 
-#: ../../mod/directory.php:153
+#: ../../mod/directory.php:140
 msgid "No entries (some entries may be hidden)."
 msgstr "Keine Einträge (einige Einträge könnten versteckt sein)."
 
@@ -3687,9 +4025,8 @@ msgid "%s : Not a valid email address."
 msgstr "%s: Keine gültige Email Adresse."
 
 #: ../../mod/invite.php:59
-#, php-format
-msgid "Please join my network on %s"
-msgstr "Bitte trete meinem Netzwerk auf %s bei"
+msgid "Please join us on Friendica"
+msgstr "Bitte trete uns auf Friendica bei"
 
 #: ../../mod/invite.php:69
 #, php-format
@@ -3707,179 +4044,212 @@ msgstr[1] "%d Nachrichten gesendet."
 msgid "You have no more invitations available"
 msgstr "Du hast keine weiteren Einladungen"
 
-#: ../../mod/invite.php:99
-msgid "Send invitations"
-msgstr "Einladungen senden"
-
 #: ../../mod/invite.php:100
-msgid "Enter email addresses, one per line:"
-msgstr "E-Mail-Adressen eingeben, eine pro Zeile:"
+#, php-format
+msgid ""
+"Visit %s for a list of public sites that you can join. Friendica members on "
+"other sites can all connect with each other, as well as with members of many"
+" other social networks."
+msgstr "Besuche %s für eine Liste der öffentlichen Server, denen du beitreten kannst. Friendica Mitglieder unterschiedlicher Server können sich sowohl alle miteinander verbinden, als auch mit Mitgliedern anderer Sozialer Netzwerke."
 
 #: ../../mod/invite.php:102
 #, php-format
-msgid "Please join my social network on %s"
-msgstr "Bitte trete meinem Sozialen Netzwerk auf %s bei"
+msgid ""
+"To accept this invitation, please visit and register at %s or any other "
+"public Friendica website."
+msgstr "Um diese Freundschaftsanfrage zu akzeptieren, besuche und registriere dich bitte bei %s oder einer anderen öffentlichen Friendica Website."
 
 #: ../../mod/invite.php:103
-msgid "To accept this invitation, please visit:"
-msgstr "Um diese Einladung anzunehmen besuche bitte:"
+#, php-format
+msgid ""
+"Friendica sites all inter-connect to create a huge privacy-enhanced social "
+"web that is owned and controlled by its members. They can also connect with "
+"many traditional social networks. See %s for a list of alternate Friendica "
+"sites you can join."
+msgstr "Friendica Server verbinden sich alle untereinander, um ein großes datenschutzorientiertes Soziales Netzwerk zu bilden, das von seinen Mitgliedern betrieben und kontrolliert wird. Sie können sich auch mit vielen üblichen Sozialen Netzwerken verbinden. Besuche %s für eine Liste alternativer Friendica Server, denen du beitreten kannst."
 
-#: ../../mod/invite.php:104
+#: ../../mod/invite.php:106
+msgid ""
+"Our apologies. This system is not currently configured to connect with other"
+" public sites or invite members."
+msgstr "Es tut uns Leid. Dieses System ist zurzeit nicht dafür konfiguriert, sich mit anderen öffentlichen Seiten zu verbinden oder Mitglieder einzuladen."
+
+#: ../../mod/invite.php:111
+msgid "Send invitations"
+msgstr "Einladungen senden"
+
+#: ../../mod/invite.php:112
+msgid "Enter email addresses, one per line:"
+msgstr "E-Mail-Adressen eingeben, eine pro Zeile:"
+
+#: ../../mod/invite.php:114
+msgid ""
+"You are cordially invited to join me and other close friends on Friendica - "
+"and help us to create a better social web."
+msgstr "Du bist herzlich dazu eingeladen, dich mir und anderen guten Freunden auf Friendica anzuschließen - und ein besseres Soziales Netz aufzubauen."
+
+#: ../../mod/invite.php:116
 msgid "You will need to supply this invitation code: $invite_code"
 msgstr "Du benötigst den folgenden Einladungscode: $invite_code"
 
-#: ../../mod/invite.php:104
+#: ../../mod/invite.php:116
 msgid ""
 "Once you have registered, please connect with me via my profile page at:"
 msgstr "Sobald du registriert bist, kontaktiere mich bitte auf meiner Profilseite:"
 
+#: ../../mod/invite.php:118
+msgid ""
+"For more information about the Friendica project and why we feel it is "
+"important, please visit http://friendica.com"
+msgstr "Für weitere Informationen über das Friendica Projekt und warum wir es für ein wichtiges Projekt halten, besuche bitte http://friendica.com"
+
 #: ../../mod/dfrn_confirm.php:119
 msgid ""
 "This may occasionally happen if contact was requested by both persons and it"
 " has already been approved."
 msgstr "Das kann passieren, wenn sich zwei Kontakte gegenseitig eingeladen haben und bereits einer angenommen wurde."
 
-#: ../../mod/dfrn_confirm.php:239
+#: ../../mod/dfrn_confirm.php:242
 msgid "Response from remote site was not understood."
 msgstr "Antwort der Gegenstelle unverständlich."
 
-#: ../../mod/dfrn_confirm.php:248
+#: ../../mod/dfrn_confirm.php:251
 msgid "Unexpected response from remote site: "
 msgstr "Unerwartete Antwort der Gegenstelle: "
 
-#: ../../mod/dfrn_confirm.php:256
+#: ../../mod/dfrn_confirm.php:259
 msgid "Confirmation completed successfully."
 msgstr "Bestätigung erfolgreich abgeschlossen."
 
-#: ../../mod/dfrn_confirm.php:258 ../../mod/dfrn_confirm.php:272
-#: ../../mod/dfrn_confirm.php:279
+#: ../../mod/dfrn_confirm.php:261 ../../mod/dfrn_confirm.php:275
+#: ../../mod/dfrn_confirm.php:282
 msgid "Remote site reported: "
 msgstr "Gegenstelle meldet: "
 
-#: ../../mod/dfrn_confirm.php:270
+#: ../../mod/dfrn_confirm.php:273
 msgid "Temporary failure. Please wait and try again."
 msgstr "Zeitweiser Fehler. Bitte warte einige Momente und versuche es dann noch einmal."
 
-#: ../../mod/dfrn_confirm.php:277
+#: ../../mod/dfrn_confirm.php:280
 msgid "Introduction failed or was revoked."
 msgstr "Kontaktanfrage schlug fehl oder wurde zurück gezogen."
 
-#: ../../mod/dfrn_confirm.php:422
+#: ../../mod/dfrn_confirm.php:425
 msgid "Unable to set contact photo."
 msgstr "Konnte das Bild des Kontakts nicht speichern."
 
-#: ../../mod/dfrn_confirm.php:474 ../../include/diaspora.php:495
+#: ../../mod/dfrn_confirm.php:477 ../../include/diaspora.php:507
 #: ../../include/conversation.php:101
 #, php-format
 msgid "%1$s is now friends with %2$s"
 msgstr "%1$s ist nun mit %2$s befreundet"
 
-#: ../../mod/dfrn_confirm.php:544
+#: ../../mod/dfrn_confirm.php:548
 #, php-format
 msgid "No user record found for '%s' "
 msgstr "Für '%s' wurde kein Nutzer gefunden"
 
-#: ../../mod/dfrn_confirm.php:554
+#: ../../mod/dfrn_confirm.php:558
 msgid "Our site encryption key is apparently messed up."
 msgstr "Der Verschlüsselungsschlüssel unserer Seite ist anscheinend im Arsch."
 
-#: ../../mod/dfrn_confirm.php:565
+#: ../../mod/dfrn_confirm.php:569
 msgid "Empty site URL was provided or URL could not be decrypted by us."
 msgstr "Leere URL für die Seite erhalten oder die URL konnte nicht entschlüsselt werden."
 
-#: ../../mod/dfrn_confirm.php:586
+#: ../../mod/dfrn_confirm.php:590
 msgid "Contact record was not found for you on our site."
 msgstr "Für diesen Kontakt wurde auf unserer Seite kein Eintrag gefunden."
 
-#: ../../mod/dfrn_confirm.php:600
+#: ../../mod/dfrn_confirm.php:604
 #, php-format
 msgid "Site public key not available in contact record for URL %s."
 msgstr "Die Kontaktdaten für URL %s enthalten keinen Public Key für den Server."
 
-#: ../../mod/dfrn_confirm.php:620
+#: ../../mod/dfrn_confirm.php:624
 msgid ""
 "The ID provided by your system is a duplicate on our system. It should work "
 "if you try again."
 msgstr "Die ID, die uns dein System angeboten hat, ist hier bereits vergeben. Bitte versuche es noch einmal."
 
-#: ../../mod/dfrn_confirm.php:631
+#: ../../mod/dfrn_confirm.php:635
 msgid "Unable to set your contact credentials on our system."
 msgstr "Deine Kontaktreferenzen konnten nicht in unserem System gespeichert werden."
 
-#: ../../mod/dfrn_confirm.php:694
+#: ../../mod/dfrn_confirm.php:700
 msgid "Unable to update your contact profile details on our system"
 msgstr "Die Updates für dein Profil konnten nicht gespeichert werden"
 
-#: ../../mod/dfrn_confirm.php:724
+#: ../../mod/dfrn_confirm.php:730
 #, php-format
 msgid "Connection accepted at %s"
 msgstr "Auf %s wurde die Verbindung akzeptiert"
 
-#: ../../addon/facebook/facebook.php:338
+#: ../../addon/facebook/facebook.php:490
 msgid "Facebook disabled"
 msgstr "Facebook deaktiviert"
 
-#: ../../addon/facebook/facebook.php:343
+#: ../../addon/facebook/facebook.php:495
 msgid "Updating contacts"
 msgstr "Aktualisiere Kontakte"
 
-#: ../../addon/facebook/facebook.php:352
+#: ../../addon/facebook/facebook.php:515
 msgid "Facebook API key is missing."
 msgstr "Facebook-API-Schlüssel nicht gefunden"
 
-#: ../../addon/facebook/facebook.php:359
+#: ../../addon/facebook/facebook.php:522
 msgid "Facebook Connect"
 msgstr "Mit Facebook verbinden"
 
-#: ../../addon/facebook/facebook.php:365
+#: ../../addon/facebook/facebook.php:528
 msgid "Install Facebook connector for this account."
 msgstr "Facebook-Connector für diesen Account installieren."
 
-#: ../../addon/facebook/facebook.php:372
+#: ../../addon/facebook/facebook.php:535
 msgid "Remove Facebook connector"
 msgstr "Facebook-Connector entfernen"
 
-#: ../../addon/facebook/facebook.php:377
+#: ../../addon/facebook/facebook.php:540
 msgid ""
 "Re-authenticate [This is necessary whenever your Facebook password is "
 "changed.]"
 msgstr "Neu authentifizieren [Das ist immer dann nötig, wenn Du Dein Facebook-Passwort geändert hast.]"
 
-#: ../../addon/facebook/facebook.php:384
+#: ../../addon/facebook/facebook.php:547
 msgid "Post to Facebook by default"
 msgstr "Veröffentliche standardmäßig bei Facebook"
 
-#: ../../addon/facebook/facebook.php:388
+#: ../../addon/facebook/facebook.php:551
 msgid "Link all your Facebook friends and conversations on this website"
 msgstr "All meine Facebook-Kontakte und -Konversationen hier auf diese Website importieren"
 
-#: ../../addon/facebook/facebook.php:390
+#: ../../addon/facebook/facebook.php:553
 msgid ""
 "Facebook conversations consist of your <em>profile wall</em> and your friend"
 " <em>stream</em>."
 msgstr "Facebook-Konversationen bestehen aus deinen Beiträgen auf deiner<em>Pinnwand</em>, sowie den Beiträgen deiner Freunde <em>Stream</em>."
 
-#: ../../addon/facebook/facebook.php:391
+#: ../../addon/facebook/facebook.php:554
 msgid "On this website, your Facebook friend stream is only visible to you."
 msgstr "Hier auf dieser Webseite kannst nur du die Beiträge Deiner Facebook-Freunde (Stream) sehen."
 
-#: ../../addon/facebook/facebook.php:392
+#: ../../addon/facebook/facebook.php:555
 msgid ""
 "The following settings determine the privacy of your Facebook profile wall "
 "on this website."
 msgstr "Mit den folgenden Einstellungen kannst Du die Privatsphäre der Kopie Deiner Facebook-Pinnwand hier auf dieser Seite einstellen."
 
-#: ../../addon/facebook/facebook.php:396
+#: ../../addon/facebook/facebook.php:559
 msgid ""
 "On this website your Facebook profile wall conversations will only be "
 "visible to you"
 msgstr "Meine Facebook-Pinnwand hier auf dieser Webseite nur für mich sichtbar machen"
 
-#: ../../addon/facebook/facebook.php:401
+#: ../../addon/facebook/facebook.php:564
 msgid "Do not import your Facebook profile wall conversations"
 msgstr "Facebook-Pinnwand nicht importieren"
 
-#: ../../addon/facebook/facebook.php:403
+#: ../../addon/facebook/facebook.php:566
 msgid ""
 "If you choose to link conversations and leave both of these boxes unchecked,"
 " your Facebook profile wall will be merged with your profile wall on this "
@@ -3887,45 +4257,120 @@ msgid ""
 "who may see the conversations."
 msgstr "Wenn Du Facebook-Konversationen importierst und diese beiden Häkchen nicht setzt, wird Deine Facebook-Pinnwand mit der Pinnwand hier auf dieser Webseite vereinigt. Die Privatsphäre-Einstellungen für Deine Pinnwand auf dieser Webseite geben dann an, wer die Konversationen sehen kann."
 
-#: ../../addon/facebook/facebook.php:408
+#: ../../addon/facebook/facebook.php:571
 msgid "Comma separated applications to ignore"
 msgstr "Komma separiert Anwendungen, die ignoriert werden sollen"
 
-#: ../../addon/facebook/facebook.php:476
+#: ../../addon/facebook/facebook.php:648
+msgid "Problems with Facebook Real-Time Updates"
+msgstr "Probleme mit Facebook Echtzeit-Updates"
+
+#: ../../addon/facebook/facebook.php:675
 #: ../../include/contact_selectors.php:81
 msgid "Facebook"
 msgstr "Facebook"
 
-#: ../../addon/facebook/facebook.php:477
+#: ../../addon/facebook/facebook.php:676
 msgid "Facebook Connector Settings"
 msgstr "Facebook-Verbindungseinstellungen"
 
-#: ../../addon/facebook/facebook.php:491
+#: ../../addon/facebook/facebook.php:691
+msgid "Facebook API Key"
+msgstr "Facebook API Schlüssel"
+
+#: ../../addon/facebook/facebook.php:700
+msgid ""
+"Error: it appears that you have specified the App-ID and -Secret in your "
+".htconfig.php file. As long as they are specified there, they cannot be set "
+"using this form.<br><br>"
+msgstr "Fehler: du scheinst die App-ID und das App-Geheimnis in deiner .htconfig.php Datei angegeben zu haben. Solange sie dort festgelegt werden kannst du dieses Formular hier nicht verwenden.<br><br>"
+
+#: ../../addon/facebook/facebook.php:705
+msgid ""
+"Error: the given API Key seems to be incorrect (the application access token"
+" could not be retrieved)."
+msgstr "Fehler: der angegebene API Schlüssel scheint nicht korrekt zu sein (Zugriffstoken konnte nicht empfangen werden)."
+
+#: ../../addon/facebook/facebook.php:707
+msgid "The given API Key seems to work correctly."
+msgstr "Der angegebene API Schlüssel scheint korrekt zu funktionieren."
+
+#: ../../addon/facebook/facebook.php:709
+msgid ""
+"The correctness of the API Key could not be detected. Somthing strange's "
+"going on."
+msgstr "Die Echtheit des API Schlüssels konnte nicht überprüft werden. Etwas Merkwürdiges ist hier im Gange."
+
+#: ../../addon/facebook/facebook.php:712
+msgid "App-ID / API-Key"
+msgstr "App-ID / API-Key"
+
+#: ../../addon/facebook/facebook.php:713
+msgid "Application secret"
+msgstr "Anwendungs-Geheimnis"
+
+#: ../../addon/facebook/facebook.php:714
+#, php-format
+msgid "Polling Interval (min. %1$s minutes)"
+msgstr "Abrufintervall (min. %1$s Minuten)"
+
+#: ../../addon/facebook/facebook.php:718
+msgid "Real-Time Updates"
+msgstr "Echt-Zeit Aktualisierungen"
+
+#: ../../addon/facebook/facebook.php:722
+msgid "Real-Time Updates are activated."
+msgstr "Echtzeit-Updates sind aktiviert."
+
+#: ../../addon/facebook/facebook.php:723
+msgid "Deactivate Real-Time Updates"
+msgstr "Echtzeit-Updates deaktivieren"
+
+#: ../../addon/facebook/facebook.php:725
+msgid "Real-Time Updates not activated."
+msgstr "Echtzeit-Updates nicht aktiviert."
+
+#: ../../addon/facebook/facebook.php:725
+msgid "Activate Real-Time Updates"
+msgstr "Echtzeit-Updates aktivieren"
+
+#: ../../addon/facebook/facebook.php:743
+msgid "The new values have been saved."
+msgstr "Die neuen Einstellungen wurden gespeichert."
+
+#: ../../addon/facebook/facebook.php:767
 msgid "Post to Facebook"
 msgstr "Bei Facebook veröffentlichen"
 
-#: ../../addon/facebook/facebook.php:582
+#: ../../addon/facebook/facebook.php:865
 msgid ""
 "Post to Facebook cancelled because of multi-network access permission "
 "conflict."
 msgstr "Beitrag wurde nicht bei Facebook veröffentlicht, da Konflikte bei den Multi-Netzwerk-Zugriffsrechten vorliegen."
 
-#: ../../addon/facebook/facebook.php:651
-msgid "Image: "
-msgstr "Bild: "
-
-#: ../../addon/facebook/facebook.php:728
+#: ../../addon/facebook/facebook.php:1085
 msgid "View on Friendica"
 msgstr "In Friendica betrachten"
 
-#: ../../addon/facebook/facebook.php:752
+#: ../../addon/facebook/facebook.php:1118
 msgid "Facebook post failed. Queued for retry."
 msgstr "Veröffentlichung bei Facebook gescheitert. Wir versuchen es später erneut."
 
-#: ../../addon/facebook/facebook.php:877 ../../addon/facebook/facebook.php:886
-#: ../../include/bb2diaspora.php:102
-msgid "link"
-msgstr "Verweis"
+#: ../../addon/facebook/facebook.php:1158
+msgid "Your Facebook connection became invalid. Please Re-authenticate."
+msgstr "Deine Facebook Anmeldedaten sind ungültig geworden. Bitte re-authentifiziere dich."
+
+#: ../../addon/facebook/facebook.php:1159
+msgid "Facebook connection became invalid"
+msgstr "Facebook Anmeldedaten sind ungültig geworden"
+
+#: ../../addon/facebook/facebook.php:1160
+#, php-format
+msgid ""
+"Hi %1$s,\n"
+"\n"
+"The connection between your accounts on %2$s and Facebook became invalid. This usually happens after you change your Facebook-password. To enable the connection again, you have to %3$sre-authenticate the Facebook-connector%4$s."
+msgstr "Hi %1$s,\n\ndie Verbindung von deinem Account auf %2$s und Facebook funktioniert derzeit nicht. Dies ist im Allgemeinen das Ergebnis einer Passwortänderung bei Facebook. Um die Verbindung wieder zu aktivieren musst du  %3$sden Facebook-Connector neu Authentifizieren%4$s."
 
 #: ../../addon/widgets/widget_like.php:58
 #, php-format
@@ -3941,15 +4386,15 @@ msgid_plural "%d people don't like this"
 msgstr[0] " %d Person mag das nicht"
 msgstr[1] "%d Leute mögen das nicht"
 
-#: ../../addon/widgets/widgets.php:55
+#: ../../addon/widgets/widgets.php:56
 msgid "Generate new key"
 msgstr "Neuen Schlüssel erstellen"
 
-#: ../../addon/widgets/widgets.php:58
+#: ../../addon/widgets/widgets.php:59
 msgid "Widgets key"
 msgstr "Widgets Schlüssel"
 
-#: ../../addon/widgets/widgets.php:60
+#: ../../addon/widgets/widgets.php:61
 msgid "Widgets available"
 msgstr "Verfügbare Widgets"
 
@@ -3981,41 +4426,51 @@ msgstr "SSL Verwenden "
 msgid "yourls Settings saved."
 msgstr "yourls Einstellungen gespeichert"
 
-#: ../../addon/ljpost/ljpost.php:38
+#: ../../addon/ljpost/ljpost.php:39
 msgid "Post to LiveJournal"
 msgstr "In LiveJournal veröffentlichen."
 
-#: ../../addon/ljpost/ljpost.php:69
+#: ../../addon/ljpost/ljpost.php:70
 msgid "LiveJournal Post Settings"
 msgstr "LiveJournal Veröffentlichungs-Einstellungen"
 
-#: ../../addon/ljpost/ljpost.php:71
+#: ../../addon/ljpost/ljpost.php:72
 msgid "Enable LiveJournal Post Plugin"
 msgstr "LiveJournal Post Plugin aktivieren"
 
-#: ../../addon/ljpost/ljpost.php:76
+#: ../../addon/ljpost/ljpost.php:77
 msgid "LiveJournal username"
 msgstr "LiveJournal Benutzername"
 
-#: ../../addon/ljpost/ljpost.php:81
+#: ../../addon/ljpost/ljpost.php:82
 msgid "LiveJournal password"
 msgstr "LiveJournal Passwort"
 
-#: ../../addon/ljpost/ljpost.php:86
+#: ../../addon/ljpost/ljpost.php:87
 msgid "Post to LiveJournal by default"
 msgstr "Standardmäßig bei LiveJournal veröffentlichen"
 
 #: ../../addon/nsfw/nsfw.php:47
-msgid "\"Not Safe For Work\" Settings"
-msgstr "\"Not Safe For Work\"-Einstellungen"
+msgid "Not Safe For Work (General Purpose Content Filter) settings"
+msgstr "Not Safe for Work (allg. Filter für ungewollte Inhalte) Einstellungen:"
+
+#: ../../addon/nsfw/nsfw.php:49
+msgid ""
+"This plugin looks in posts for the words/text you specify below, and "
+"collapses any content containing those keywords so it is not displayed at "
+"inappropriate times, such as sexual innuendo that may be improper in a work "
+"setting. It is polite and recommended to tag any content containing nudity "
+"with #NSFW.  This filter can also match any other word/text you specify, and"
+" can thereby be used as a general purpose content filter."
+msgstr "Dieses Plugin sucht in Beiträgen nach Wörtern oder Textbauteilen die du weiter unten eingibst, findet es diese Bausteine, dann wird der entsprechende Beitrag zusammengefaltet dargestellt. Auf diese Weise wird verhindert, dass Inhalte, wie z.B. sexuelle Anspielungen, in unpassenden Momenten angezeigt werden. Du solltest den #NSFW Tag für Beiträge verwenden von denen du ausgehen kannst, dass andere sie anstößig finden könnten. Su kannst beliebige Wörter in der Filterliste angeben und ihn so als allgemeinen Filter verwenden."
 
 #: ../../addon/nsfw/nsfw.php:50
-msgid "Enable NSFW filter"
-msgstr "NSFW Filter aktivieren"
+msgid "Enable Content filter"
+msgstr "Aktiviere den Inhaltsfilter"
 
 #: ../../addon/nsfw/nsfw.php:53
-msgid "Comma separated words to treat as NSFW"
-msgstr "Wörter, die gefiltert werden sollen (durch Kommas getrennt)"
+msgid "Comma separated list of keywords to hide"
+msgstr "Durch Komma getrennte Liste von Schlüsselwörtern die verborgen werden sollen"
 
 #: ../../addon/nsfw/nsfw.php:58
 msgid "Use /expression/ to provide regular expressions"
@@ -4030,11 +4485,23 @@ msgstr "NSFW-Einstellungen gespeichert"
 msgid "%s - Click to open/close"
 msgstr "%s – Zum Öffnen/Schließen klicken"
 
+#: ../../addon/page/page.php:47
+msgid "Forums"
+msgstr "Foren"
+
+#: ../../addon/planets/planets.php:150
+msgid "Planets Settings"
+msgstr "Planeten Einstellungen"
+
+#: ../../addon/planets/planets.php:152
+msgid "Enable Planets Plugin"
+msgstr "Aktiviere Planeten Plugin"
+
 #: ../../addon/communityhome/communityhome.php:28
 #: ../../addon/communityhome/communityhome.php:34
 #: ../../addon/communityhome/twillingham/communityhome.php:28
 #: ../../addon/communityhome/twillingham/communityhome.php:34
-#: ../../include/nav.php:62 ../../boot.php:710
+#: ../../include/nav.php:64 ../../boot.php:796
 msgid "Login"
 msgstr "Anmeldung"
 
@@ -4044,8 +4511,9 @@ msgid "OpenID"
 msgstr "OpenID"
 
 #: ../../addon/communityhome/communityhome.php:38
-msgid "Last users"
-msgstr "Letzte Nutzer"
+#: ../../addon/communityhome/twillingham/communityhome.php:38
+msgid "Latest users"
+msgstr "Letzte Benutzer"
 
 #: ../../addon/communityhome/communityhome.php:81
 #: ../../addon/communityhome/twillingham/communityhome.php:81
@@ -4053,22 +4521,26 @@ msgid "Most active users"
 msgstr "Aktivste Nutzer"
 
 #: ../../addon/communityhome/communityhome.php:98
-msgid "Last photos"
-msgstr "Letzte Fotos"
+msgid "Latest photos"
+msgstr "Neueste Fotos"
 
 #: ../../addon/communityhome/communityhome.php:133
-msgid "Last likes"
-msgstr "Zuletzt gemocht"
-
-#: ../../addon/communityhome/communityhome.php:155 ../../include/text.php:1224
-#: ../../include/conversation.php:45 ../../include/conversation.php:118
+msgid "Latest likes"
+msgstr "Neueste Favoriten"
+
+#: ../../addon/communityhome/communityhome.php:155
+#: ../../view/theme/diabook/diabook-green/theme.php:80
+#: ../../view/theme/diabook/diabook-red/theme.php:79
+#: ../../view/theme/diabook/diabook-blue/theme.php:79
+#: ../../view/theme/diabook/theme.php:94
+#: ../../view/theme/diabook/diabook-dark/theme.php:80
+#: ../../view/theme/diabook/diabook-aerith/theme.php:80
+#: ../../view/theme/diabook/diabook-pink/theme.php:80
+#: ../../include/text.php:1302 ../../include/conversation.php:45
+#: ../../include/conversation.php:118
 msgid "event"
 msgstr "Veranstaltung"
 
-#: ../../addon/communityhome/twillingham/communityhome.php:38
-msgid "Latest users"
-msgstr "Letzte Benutzer"
-
 #: ../../addon/uhremotestorage/uhremotestorage.php:84
 #, php-format
 msgid ""
@@ -4148,35 +4620,35 @@ msgstr "Unentschieden!"
 msgid "I won!"
 msgstr "Ich gewinne!"
 
-#: ../../addon/randplace/randplace.php:171
+#: ../../addon/randplace/randplace.php:169
 msgid "Randplace Settings"
 msgstr "Randplace-Einstellungen"
 
-#: ../../addon/randplace/randplace.php:173
+#: ../../addon/randplace/randplace.php:171
 msgid "Enable Randplace Plugin"
 msgstr "Randplace-Plugin aktivieren"
 
-#: ../../addon/dwpost/dwpost.php:38
+#: ../../addon/dwpost/dwpost.php:39
 msgid "Post to Dreamwidth"
 msgstr "In Dreamwidth veröffentlichen"
 
-#: ../../addon/dwpost/dwpost.php:69
+#: ../../addon/dwpost/dwpost.php:70
 msgid "Dreamwidth Post Settings"
 msgstr "Dreamwidth Veröffentlichungs-Einstellungen"
 
-#: ../../addon/dwpost/dwpost.php:71
+#: ../../addon/dwpost/dwpost.php:72
 msgid "Enable dreamwidth Post Plugin"
 msgstr "Dreamwidth Post Plugin aktivieren"
 
-#: ../../addon/dwpost/dwpost.php:76
+#: ../../addon/dwpost/dwpost.php:77
 msgid "dreamwidth username"
 msgstr "Dreamwidth Benutzername"
 
-#: ../../addon/dwpost/dwpost.php:81
+#: ../../addon/dwpost/dwpost.php:82
 msgid "dreamwidth password"
 msgstr "Dreamwidth Passwort"
 
-#: ../../addon/dwpost/dwpost.php:86
+#: ../../addon/dwpost/dwpost.php:87
 msgid "Post to dreamwidth by default"
 msgstr "Standardmäßig bei Dreamwidth veröffentlichen"
 
@@ -4216,8 +4688,8 @@ msgstr "Drupal Seite verwendet bereinigte URLs"
 msgid "Post to Drupal by default"
 msgstr "Veröffentliche öffentliche Beiträge standardmäßig bei Drupal"
 
-#: ../../addon/drpost/drpost.php:184 ../../addon/wppost/wppost.php:172
-#: ../../addon/posterous/posterous.php:173
+#: ../../addon/drpost/drpost.php:184 ../../addon/wppost/wppost.php:190
+#: ../../addon/blogger/blogger.php:172 ../../addon/posterous/posterous.php:173
 msgid "Post from Friendica"
 msgstr "Beitrag via Friendica"
 
@@ -4273,41 +4745,69 @@ msgstr "OEmbed für Youtube Videos verwenden"
 msgid "URL to embed:"
 msgstr "URL zum Einbetten:"
 
-#: ../../addon/impressum/impressum.php:25
+#: ../../addon/impressum/impressum.php:34
 msgid "Impressum"
 msgstr "Impressum"
 
-#: ../../addon/impressum/impressum.php:38
-#: ../../addon/impressum/impressum.php:40
-#: ../../addon/impressum/impressum.php:70
+#: ../../addon/impressum/impressum.php:47
+#: ../../addon/impressum/impressum.php:49
+#: ../../addon/impressum/impressum.php:81
 msgid "Site Owner"
 msgstr "Betreiber der Seite"
 
-#: ../../addon/impressum/impressum.php:38
-#: ../../addon/impressum/impressum.php:74
+#: ../../addon/impressum/impressum.php:47
+#: ../../addon/impressum/impressum.php:85
 msgid "Email Address"
 msgstr "Email Adresse"
 
-#: ../../addon/impressum/impressum.php:43
-#: ../../addon/impressum/impressum.php:72
+#: ../../addon/impressum/impressum.php:52
+#: ../../addon/impressum/impressum.php:83
 msgid "Postal Address"
 msgstr "Postalische Anschrift"
 
-#: ../../addon/impressum/impressum.php:49
+#: ../../addon/impressum/impressum.php:58
 msgid ""
 "The impressum addon needs to be configured!<br />Please add at least the "
 "<tt>owner</tt> variable to your config file. For other variables please "
 "refer to the README file of the addon."
 msgstr "Das Impressums-Plugin muss noch konfiguriert werden.<br />Bitte gebe mindestens den <tt>Betreiber</tt> in der Konfiguration an. Alle weiteren Parameter werden in der README-Datei des Addons erläutert."
 
-#: ../../addon/impressum/impressum.php:71
+#: ../../addon/impressum/impressum.php:81
+msgid "The page operators name."
+msgstr "Name des Server-Administrators"
+
+#: ../../addon/impressum/impressum.php:82
 msgid "Site Owners Profile"
 msgstr "Profil des Seitenbetreibers"
 
-#: ../../addon/impressum/impressum.php:73
+#: ../../addon/impressum/impressum.php:82
+msgid "Profile address of the operator."
+msgstr "Profil-Adresse des Server-Administrators"
+
+#: ../../addon/impressum/impressum.php:83
+msgid "How to contact the operator via snail mail."
+msgstr "Wie erreicht man den Betreiber der Seite postalisch."
+
+#: ../../addon/impressum/impressum.php:84
 msgid "Notes"
 msgstr "Hinweise"
 
+#: ../../addon/impressum/impressum.php:84
+msgid "Additional notes that are displayed beneath the contact information."
+msgstr "Zusätzliche Angaben, die unterhalb der Kontakt-Informationen angezeigt werden."
+
+#: ../../addon/impressum/impressum.php:85
+msgid "How to contact the operator via email. (will be displayed obfuscated)"
+msgstr "Wie erreichts man den Betreiber per Email. (Adresse wird verschleiert dargestellt)"
+
+#: ../../addon/impressum/impressum.php:86
+msgid "Footer note"
+msgstr "Fußnote"
+
+#: ../../addon/impressum/impressum.php:86
+msgid "Text for the footer."
+msgstr "Text für die Fußnote"
+
 #: ../../addon/buglink/buglink.php:15
 msgid "Report Bug"
 msgstr "Fehlerreport erstellen"
@@ -4389,6 +4889,27 @@ msgstr "Standard Zoom"
 msgid "The default zoom level. (1:world, 18:highest)"
 msgstr "Standard Zoomlevel (1: Welt; 18: höchstes)"
 
+#: ../../addon/mathjax/mathjax.php:37
+msgid ""
+"The MathJax addon renders mathematical formulae written using the LaTeX "
+"syntax surrounded by the usual $$ or an eqnarray block in the postings of "
+"your wall,network tab and private mail."
+msgstr "Mit dem MathJax Addon können mathematische Formeln, die mit LaTeX geschrieben wurden, dargestellt werden. Die Formel wird mit den üblichen $$ oder einem eqnarray Block gekennzeichnet. Formeln werden in allen Beiträgen auf deiner Pinnwand, dem Netzwerk-Stream sowie privaten Nachrichten gerendert."
+
+#: ../../addon/mathjax/mathjax.php:38
+msgid "Use the MathJax renderer"
+msgstr "MathJax verwenden"
+
+#: ../../addon/mathjax/mathjax.php:74
+msgid "MathJax Base URL"
+msgstr "MathJax Basis-URL"
+
+#: ../../addon/mathjax/mathjax.php:74
+msgid ""
+"The URL for the javascript file that should be included to use MathJax. Can "
+"be either the MathJax CDN or another installation of MathJax."
+msgstr "Die URL der MathJax Javascript-Datei, die verwendet werden soll. Diese kann entweder aus der MathJax CDN oder einer anderen Quelle stammen."
+
 #: ../../addon/editplain/editplain.php:46
 msgid "Editplain settings updated."
 msgstr "Editplain Einstellungen aktualisiert"
@@ -4401,15 +4922,96 @@ msgstr "Editplain Einstellungen"
 msgid "Disable richtext status editor"
 msgstr "RichText Editor deaktivieren"
 
-#: ../../addon/pageheader/pageheader.php:47
+#: ../../addon/gravatar/gravatar.php:71
+msgid "generic profile image"
+msgstr "allgemeines Profilbild"
+
+#: ../../addon/gravatar/gravatar.php:72
+msgid "random geometric pattern"
+msgstr "zufällig erzeugtes geometrisches Muster"
+
+#: ../../addon/gravatar/gravatar.php:73
+msgid "monster face"
+msgstr "Monstergesicht"
+
+#: ../../addon/gravatar/gravatar.php:74
+msgid "computer generated face"
+msgstr "Computergesicht"
+
+#: ../../addon/gravatar/gravatar.php:75
+msgid "retro arcade style face"
+msgstr "Retro Arcade Design Gesicht"
+
+#: ../../addon/gravatar/gravatar.php:87
+msgid "Default avatar image"
+msgstr "Standard Profilbild "
+
+#: ../../addon/gravatar/gravatar.php:87
+msgid "Select default avatar image if none was found at Gravatar. See README"
+msgstr "Wähle das Standardgesicht, wenn kein Bild auf Gravatar gefunden wurde. Schaue auch sonst im README nach."
+
+#: ../../addon/gravatar/gravatar.php:88
+msgid "Rating of images"
+msgstr "Bildbewertung"
+
+#: ../../addon/gravatar/gravatar.php:88
+msgid "Select the appropriate avatar rating for your site. See README"
+msgstr "Wähle eine angemessene Bildbewertung für Deinen Server. Schaue auch sonst im README nach."
+
+#: ../../addon/gravatar/gravatar.php:102
+msgid "Gravatar settings updated."
+msgstr "Gravatar Einstellungen aktualisiert."
+
+#: ../../addon/testdrive/testdrive.php:85
+#, php-format
+msgid "Your account on %s will expire in a few days."
+msgstr "Dein Konto auf %s wird in ein paar Tagen verfallen."
+
+#: ../../addon/testdrive/testdrive.php:86
+msgid "Your Friendica test account is about to expire."
+msgstr "Dein Friendica Test Konto wird bald verfallen."
+
+#: ../../addon/testdrive/testdrive.php:87
+#, php-format
+msgid ""
+"Hi %1$s,\n"
+"\n"
+"Your test account on %2$s will expire in less than five days. We hope you enjoyed this test drive and use this opportunity to find a permanent Friendica website for your integrated social communications. A list of public sites is available at http://dir.friendica.com/siteinfo - and for more information on setting up your own Friendica server please see the Friendica project website at http://friendica.com."
+msgstr "Hallo %1$s,\n\ndein Test-Konto auf %2$s wird in weniger als fünf Tagen verfallen. Wir hoffen, dass dir dieser Testlauf gefallen hat, so dass du die Gelegenheit nutzt und dir eine feste Friendica-Site für deine integrierte Social-Network-Kommunikation suchst. Eine Liste öffentlicher Sites findest du auf http://dir.friendica.com/siteinfo. Um mehr Information darüber zu bekommen, wie man einen eigenen Friendica-Server aufsetzt, kannst du auch einen Blick auf die Friendica Projektseite werfen: http://friendica.com"
+
+#: ../../addon/pageheader/pageheader.php:50
 msgid "\"pageheader\" Settings"
 msgstr "\"pageheader\"-Einstellungen"
 
-#: ../../addon/pageheader/pageheader.php:65
+#: ../../addon/pageheader/pageheader.php:68
 msgid "pageheader Settings saved."
 msgstr "pageheader-Einstellungen gespeichert."
 
-#: ../../addon/viewsrc/viewsrc.php:25
+#: ../../addon/ijpost/ijpost.php:39
+msgid "Post to Insanejournal"
+msgstr "Auf InsaneJournal posten."
+
+#: ../../addon/ijpost/ijpost.php:70
+msgid "InsaneJournal Post Settings"
+msgstr "InsaneJournal Beitrags-Einstellungen"
+
+#: ../../addon/ijpost/ijpost.php:72
+msgid "Enable InsaneJournal Post Plugin"
+msgstr "InsaneJournal Plugin aktivieren"
+
+#: ../../addon/ijpost/ijpost.php:77
+msgid "InsaneJournal username"
+msgstr "InsaneJournal Benutzername"
+
+#: ../../addon/ijpost/ijpost.php:82
+msgid "InsaneJournal password"
+msgstr "InsaneJournal Passwort"
+
+#: ../../addon/ijpost/ijpost.php:87
+msgid "Post to InsaneJournal by default"
+msgstr "Standardmäßig auf InsaneJournal posten."
+
+#: ../../addon/viewsrc/viewsrc.php:37
 msgid "View Source"
 msgstr "Quelle ansehen"
 
@@ -4417,40 +5019,40 @@ msgstr "Quelle ansehen"
 msgid "Post to StatusNet"
 msgstr "Bei StatusNet veröffentlichen"
 
-#: ../../addon/statusnet/statusnet.php:175
+#: ../../addon/statusnet/statusnet.php:176
 msgid ""
 "Please contact your site administrator.<br />The provided API URL is not "
 "valid."
 msgstr "Bitte kontaktiere den Administrator des Servers.<br />Die angegebene API-URL ist nicht gültig."
 
-#: ../../addon/statusnet/statusnet.php:203
+#: ../../addon/statusnet/statusnet.php:204
 msgid "We could not contact the StatusNet API with the Path you entered."
 msgstr "Die StatusNet-API konnte mit dem angegebenen Pfad nicht erreicht werden."
 
-#: ../../addon/statusnet/statusnet.php:229
+#: ../../addon/statusnet/statusnet.php:232
 msgid "StatusNet settings updated."
 msgstr "StatusNet Einstellungen aktualisiert."
 
-#: ../../addon/statusnet/statusnet.php:252
+#: ../../addon/statusnet/statusnet.php:257
 msgid "StatusNet Posting Settings"
 msgstr "StatusNet-Beitragseinstellungen"
 
-#: ../../addon/statusnet/statusnet.php:266
+#: ../../addon/statusnet/statusnet.php:271
 msgid "Globally Available StatusNet OAuthKeys"
 msgstr "Verfügbare OAuth Schlüssel für StatusNet"
 
-#: ../../addon/statusnet/statusnet.php:267
+#: ../../addon/statusnet/statusnet.php:272
 msgid ""
 "There are preconfigured OAuth key pairs for some StatusNet servers "
 "available. If you are useing one of them, please use these credentials. If "
 "not feel free to connect to any other StatusNet instance (see below)."
 msgstr "Für einige StatusNet Server sind voreingestellt OAuth Schlüsselpaare verfügbar. Solltest du einen dieser Server benutzen, dann verwende bitte diese Schlüssel. Falls nicht, stellen stattdessen eine Verbindung zu irgend einem anderen StatusNet Server her (siehe unten)."
 
-#: ../../addon/statusnet/statusnet.php:275
+#: ../../addon/statusnet/statusnet.php:280
 msgid "Provide your own OAuth Credentials"
 msgstr "Eigene OAuth Schlüssel eintragen"
 
-#: ../../addon/statusnet/statusnet.php:276
+#: ../../addon/statusnet/statusnet.php:281
 msgid ""
 "No consumer key pair for StatusNet found. Register your Friendica Account as"
 " an desktop client on your StatusNet account, copy the consumer key pair "
@@ -4459,19 +5061,19 @@ msgid ""
 "Friendica installation at your favorited StatusNet installation."
 msgstr "Kein Consumer-Schlüsselpaar für StatusNet gefunden. Registriere deinen Friendica-Account als Desktop-Client, kopiere das Consumer-Schlüsselpaar hierher und gib die API-URL ein.<br />Bevor du dein eigenes Consumer-Schlüsselpaar registrierst, frage den Administrator dieses Friendica-Servers, ob schon ein Schlüsselpaar für diesen Friendica-Server auf diesem StatusNet-Server existiert."
 
-#: ../../addon/statusnet/statusnet.php:278
+#: ../../addon/statusnet/statusnet.php:283
 msgid "OAuth Consumer Key"
 msgstr "OAuth Consumer Key"
 
-#: ../../addon/statusnet/statusnet.php:281
+#: ../../addon/statusnet/statusnet.php:286
 msgid "OAuth Consumer Secret"
 msgstr "OAuth Consumer Secret"
 
-#: ../../addon/statusnet/statusnet.php:284
+#: ../../addon/statusnet/statusnet.php:289
 msgid "Base API Path (remember the trailing /)"
 msgstr "Basis-URL der StatusNet-API (vergiss den abschließenden / nicht)"
 
-#: ../../addon/statusnet/statusnet.php:305
+#: ../../addon/statusnet/statusnet.php:310
 msgid ""
 "To connect to your StatusNet account click the button below to get a "
 "security code from StatusNet which you have to copy into the input box below"
@@ -4479,38 +5081,38 @@ msgid ""
 " to StatusNet."
 msgstr "Um deinen Account mit einem StatusNet-Account zu verknüpfen, klicke den Button an, um einen Sicherheitscode von StatusNet zu erhalten, und kopiere diesen in das Eingabefeld weiter unten. Es werden ausschließlich deine <strong>öffentlichen</strong> Nachrichten an StatusNet gesendet."
 
-#: ../../addon/statusnet/statusnet.php:306
+#: ../../addon/statusnet/statusnet.php:311
 msgid "Log in with StatusNet"
 msgstr "Bei StatusNet anmelden"
 
-#: ../../addon/statusnet/statusnet.php:308
+#: ../../addon/statusnet/statusnet.php:313
 msgid "Copy the security code from StatusNet here"
 msgstr "Kopiere den Sicherheitscode von StatusNet hier hin"
 
-#: ../../addon/statusnet/statusnet.php:314
+#: ../../addon/statusnet/statusnet.php:319
 msgid "Cancel Connection Process"
 msgstr "Verbindungsprozess abbrechen"
 
-#: ../../addon/statusnet/statusnet.php:316
+#: ../../addon/statusnet/statusnet.php:321
 msgid "Current StatusNet API is"
 msgstr "Derzeitige StatusNet-API-URL lautet"
 
-#: ../../addon/statusnet/statusnet.php:317
+#: ../../addon/statusnet/statusnet.php:322
 msgid "Cancel StatusNet Connection"
 msgstr "Verbindung zum StatusNet Server abbrechen"
 
-#: ../../addon/statusnet/statusnet.php:328 ../../addon/twitter/twitter.php:184
+#: ../../addon/statusnet/statusnet.php:333 ../../addon/twitter/twitter.php:189
 msgid "Currently connected to: "
 msgstr "Momentan verbunden mit: "
 
-#: ../../addon/statusnet/statusnet.php:329
+#: ../../addon/statusnet/statusnet.php:334
 msgid ""
 "If enabled all your <strong>public</strong> postings can be posted to the "
 "associated StatusNet account. You can choose to do so by default (here) or "
 "for every posting separately in the posting options when writing the entry."
 msgstr "Wenn aktiviert, so können all deine <strong>öffentlichen</strong> Einträge auf dem verbundenen StatusNet Konto veröffentlicht werden. Du kannst das (hier) als Standardverhalten einstellen oder beim Schreiben eines Beitrags in den Beitragsoptionen festlegen."
 
-#: ../../addon/statusnet/statusnet.php:331
+#: ../../addon/statusnet/statusnet.php:336
 msgid ""
 "<strong>Note</strong>: Due your privacy settings (<em>Hide your profile "
 "details from unknown viewers?</em>) the link potentially included in public "
@@ -4518,19 +5120,23 @@ msgid ""
 "informing the visitor that the access to your profile has been restricted."
 msgstr "<strong>Hinweis</strong>: Aufgrund deiner Privatsphären-Einstellungen (<em>Profil-Details vor unbekannten Betrachtern verbergen?</em>) wird der Link, der eventuell an deinen StatusNet Account angehängt wird, um auf den original Artikel zu verweisen, den Betrachter auf eine leere Seite führen, die ihn darüber informiert, dass der Zugriff eingeschränkt wurde."
 
-#: ../../addon/statusnet/statusnet.php:334
+#: ../../addon/statusnet/statusnet.php:339
 msgid "Allow posting to StatusNet"
 msgstr "Veröffentlichung bei StatusNet erlauben"
 
-#: ../../addon/statusnet/statusnet.php:337
+#: ../../addon/statusnet/statusnet.php:342
 msgid "Send public postings to StatusNet by default"
 msgstr "Veröffentliche öffentliche Beiträge standardmäßig bei StatusNet"
 
-#: ../../addon/statusnet/statusnet.php:342 ../../addon/twitter/twitter.php:198
+#: ../../addon/statusnet/statusnet.php:345
+msgid "Send #tag links to StatusNet"
+msgstr "#Tags nach StatusNet senden"
+
+#: ../../addon/statusnet/statusnet.php:350 ../../addon/twitter/twitter.php:206
 msgid "Clear OAuth configuration"
 msgstr "OAuth-Konfiguration löschen"
 
-#: ../../addon/statusnet/statusnet.php:524
+#: ../../addon/statusnet/statusnet.php:545
 msgid "API URL"
 msgstr "API-URL"
 
@@ -4633,13 +5239,14 @@ msgstr "Aktiviere \"Mehr zeigen\""
 msgid "Cutting posts after how much characters"
 msgstr "Begrenze Beiträge nach einer bestimmten Anzahl an Buchstaben"
 
-#: ../../addon/showmore/showmore.php:64
+#: ../../addon/showmore/showmore.php:65
 msgid "Show More Settings saved."
 msgstr "\"Mehr zeigen\" Einstellungen gesichert."
 
-#: ../../addon/showmore/showmore.php:86
-msgid "Show More"
-msgstr "\"Mehr zeigen\""
+#: ../../addon/showmore/showmore.php:87 ../../include/conversation.php:466
+#: ../../boot.php:496
+msgid "show more"
+msgstr "mehr anzeigen"
 
 #: ../../addon/piwik/piwik.php:79
 msgid ""
@@ -4681,21 +5288,21 @@ msgstr "Asynchrones Tracken"
 msgid "Post to Twitter"
 msgstr "Bei Twitter veröffentlichen"
 
-#: ../../addon/twitter/twitter.php:119
+#: ../../addon/twitter/twitter.php:122
 msgid "Twitter settings updated."
 msgstr "Twitter Einstellungen aktualisiert."
 
-#: ../../addon/twitter/twitter.php:141
+#: ../../addon/twitter/twitter.php:146
 msgid "Twitter Posting Settings"
 msgstr "Twitter-Beitragseinstellungen"
 
-#: ../../addon/twitter/twitter.php:148
+#: ../../addon/twitter/twitter.php:153
 msgid ""
 "No consumer key pair for Twitter found. Please contact your site "
 "administrator."
 msgstr "Kein Consumer-Schlüsselpaar für Twitter gefunden. Bitte wende dich an den Administrator der Seite."
 
-#: ../../addon/twitter/twitter.php:167
+#: ../../addon/twitter/twitter.php:172
 msgid ""
 "At this Friendica instance the Twitter plugin was enabled but you have not "
 "yet connected your account to your Twitter account. To do so click the "
@@ -4704,22 +5311,22 @@ msgid ""
 " be posted to Twitter."
 msgstr "Auf diesem Friendica-Server wurde das Twitter-Plugin aktiviert, aber du hast deinen Account noch nicht mit deinem Twitter-Account verbunden. Klicke dazu auf die Schaltfläche unten. Du erhältst dann eine PIN von Twitter, die du dann in das Eingabefeld unten einfügst. Denk daran, den Senden-Knopf zu drücken! Nur <strong>öffentliche</strong> Beiträge werden bei Twitter veröffentlicht."
 
-#: ../../addon/twitter/twitter.php:168
+#: ../../addon/twitter/twitter.php:173
 msgid "Log in with Twitter"
 msgstr "bei Twitter anmelden"
 
-#: ../../addon/twitter/twitter.php:170
+#: ../../addon/twitter/twitter.php:175
 msgid "Copy the PIN from Twitter here"
 msgstr "Kopiere die Twitter-PIN hier her"
 
-#: ../../addon/twitter/twitter.php:185
+#: ../../addon/twitter/twitter.php:190
 msgid ""
 "If enabled all your <strong>public</strong> postings can be posted to the "
 "associated Twitter account. You can choose to do so by default (here) or for"
 " every posting separately in the posting options when writing the entry."
 msgstr "Wenn aktiviert, so können all deine <strong>öffentlichen</strong> Einträge auf dem verbundenen Twitter Konto veröffentlicht werden. Du kannst dies (hier) als Standardverhalten einstellen oder beim Schreiben eines Beitrags in den Beitragsoptionen festlegen."
 
-#: ../../addon/twitter/twitter.php:187
+#: ../../addon/twitter/twitter.php:192
 msgid ""
 "<strong>Note</strong>: Due your privacy settings (<em>Hide your profile "
 "details from unknown viewers?</em>) the link potentially included in public "
@@ -4727,25 +5334,77 @@ msgid ""
 "the visitor that the access to your profile has been restricted."
 msgstr "<strong>Hinweis</strong>: Aufgrund deiner Privatsphären-Einstellungen (<em>Profil-Details vor unbekannten Betrachtern verbergen?</em>) wird der Link, der eventuell an an deinen Twitter Account angehängt wird, um auf den original Artikel zu verweisen, den Betrachter auf eine leere Seite führen, die ihn darüber informiert, dass der Zugriff eingeschränkt wurde."
 
-#: ../../addon/twitter/twitter.php:190
+#: ../../addon/twitter/twitter.php:195
 msgid "Allow posting to Twitter"
 msgstr "Veröffentlichung bei Twitter erlauben"
 
-#: ../../addon/twitter/twitter.php:193
+#: ../../addon/twitter/twitter.php:198
 msgid "Send public postings to Twitter by default"
 msgstr "Veröffentliche öffentliche Beiträge standardmäßig bei Twitter"
 
-#: ../../addon/twitter/twitter.php:357
+#: ../../addon/twitter/twitter.php:201
+msgid "Send #tag links to Twitter"
+msgstr "#Tags nach Twitter senden"
+
+#: ../../addon/twitter/twitter.php:377
 msgid "Consumer key"
 msgstr "Consumer Key"
 
-#: ../../addon/twitter/twitter.php:358
+#: ../../addon/twitter/twitter.php:378
 msgid "Consumer secret"
 msgstr "Consumer Secret"
 
-#: ../../addon/irc/irc.php:20
-msgid "irc Chatroom"
-msgstr "irc Chatroom"
+#: ../../addon/irc/irc.php:44
+msgid "IRC Settings"
+msgstr "IRC Einstellungen"
+
+#: ../../addon/irc/irc.php:46
+msgid "Channel(s) to auto connect (comma separated)"
+msgstr "mit diesen Kanälen soll man automatisch verbunden werden (Komma getrennt)"
+
+#: ../../addon/irc/irc.php:51
+msgid "Popular Channels (comma separated)"
+msgstr "Beliebte Kanäle (mit Komma getrennt)"
+
+#: ../../addon/irc/irc.php:69
+msgid "IRC settings saved."
+msgstr "IRC Einstellungen gespeichert."
+
+#: ../../addon/irc/irc.php:74
+msgid "IRC Chatroom"
+msgstr "IRC Chatraum"
+
+#: ../../addon/irc/irc.php:96
+msgid "Popular Channels"
+msgstr "Beliebte Räume"
+
+#: ../../addon/blogger/blogger.php:42
+msgid "Post to blogger"
+msgstr "Auf Blogger posten"
+
+#: ../../addon/blogger/blogger.php:74
+msgid "Blogger Post Settings"
+msgstr "Einstellungen zum posten auf Blogger"
+
+#: ../../addon/blogger/blogger.php:76
+msgid "Enable Blogger Post Plugin"
+msgstr "Blogger-Post-Plugin aktivieren"
+
+#: ../../addon/blogger/blogger.php:81
+msgid "Blogger username"
+msgstr "Blogger-Benutzername"
+
+#: ../../addon/blogger/blogger.php:86
+msgid "Blogger password"
+msgstr "Blogger-Passwort"
+
+#: ../../addon/blogger/blogger.php:91
+msgid "Blogger API URL"
+msgstr "Blogger-API-URL"
+
+#: ../../addon/blogger/blogger.php:96
+msgid "Post to Blogger by default"
+msgstr "Standardmäßig auf Blogger posten"
 
 #: ../../addon/posterous/posterous.php:36
 msgid "Post to Posterous"
@@ -4771,23 +5430,253 @@ msgstr "Posterous-Passwort"
 msgid "Post to Posterous by default"
 msgstr "Veröffentliche öffentliche Beiträge standardmäßig bei Posterous"
 
-#: ../../view/theme/quattro/theme.php:17
+#: ../../view/theme/diabook/diabook-green/theme.php:29
+#: ../../view/theme/diabook/diabook-red/theme.php:28
+#: ../../view/theme/diabook/diabook-blue/theme.php:28
+#: ../../view/theme/diabook/theme.php:43
+#: ../../view/theme/diabook/diabook-dark/theme.php:29
+#: ../../view/theme/diabook/diabook-aerith/theme.php:29
+#: ../../view/theme/diabook/diabook-pink/theme.php:29
+msgid "Last users"
+msgstr "Letzte Nutzer"
+
+#: ../../view/theme/diabook/diabook-green/theme.php:58
+#: ../../view/theme/diabook/diabook-red/theme.php:57
+#: ../../view/theme/diabook/diabook-blue/theme.php:57
+#: ../../view/theme/diabook/theme.php:72
+#: ../../view/theme/diabook/diabook-dark/theme.php:58
+#: ../../view/theme/diabook/diabook-aerith/theme.php:58
+#: ../../view/theme/diabook/diabook-pink/theme.php:58
+msgid "Last likes"
+msgstr "Zuletzt gemocht"
+
+#: ../../view/theme/diabook/diabook-green/theme.php:103
+#: ../../view/theme/diabook/diabook-red/theme.php:102
+#: ../../view/theme/diabook/diabook-blue/theme.php:102
+#: ../../view/theme/diabook/theme.php:117
+#: ../../view/theme/diabook/diabook-dark/theme.php:103
+#: ../../view/theme/diabook/diabook-aerith/theme.php:103
+#: ../../view/theme/diabook/diabook-pink/theme.php:103
+msgid "Last photos"
+msgstr "Letzte Fotos"
+
+#: ../../view/theme/diabook/diabook-green/theme.php:141
+#: ../../view/theme/diabook/diabook-red/theme.php:139
+#: ../../view/theme/diabook/diabook-blue/theme.php:139
+#: ../../view/theme/diabook/theme.php:154
+#: ../../view/theme/diabook/diabook-dark/theme.php:141
+#: ../../view/theme/diabook/diabook-aerith/theme.php:141
+#: ../../view/theme/diabook/diabook-pink/theme.php:141
+msgid "Find Friends"
+msgstr "Freunde finden"
+
+#: ../../view/theme/diabook/diabook-green/theme.php:142
+#: ../../view/theme/diabook/diabook-red/theme.php:140
+#: ../../view/theme/diabook/diabook-blue/theme.php:140
+#: ../../view/theme/diabook/theme.php:155
+#: ../../view/theme/diabook/diabook-dark/theme.php:142
+#: ../../view/theme/diabook/diabook-aerith/theme.php:142
+#: ../../view/theme/diabook/diabook-pink/theme.php:142
+msgid "Local Directory"
+msgstr "Lokales Verzeichnis"
+
+#: ../../view/theme/diabook/diabook-green/theme.php:144
+#: ../../view/theme/diabook/diabook-red/theme.php:142
+#: ../../view/theme/diabook/diabook-blue/theme.php:142
+#: ../../view/theme/diabook/theme.php:157
+#: ../../view/theme/diabook/diabook-dark/theme.php:144
+#: ../../view/theme/diabook/diabook-aerith/theme.php:144
+#: ../../view/theme/diabook/diabook-pink/theme.php:144
+#: ../../include/contact_widgets.php:35
+msgid "Similar Interests"
+msgstr "Ähnliche Interessen"
+
+#: ../../view/theme/diabook/diabook-green/theme.php:146
+#: ../../view/theme/diabook/diabook-red/theme.php:144
+#: ../../view/theme/diabook/diabook-blue/theme.php:144
+#: ../../view/theme/diabook/theme.php:159
+#: ../../view/theme/diabook/diabook-dark/theme.php:146
+#: ../../view/theme/diabook/diabook-aerith/theme.php:146
+#: ../../view/theme/diabook/diabook-pink/theme.php:146
+#: ../../include/contact_widgets.php:37
+msgid "Invite Friends"
+msgstr "Freunde einladen"
+
+#: ../../view/theme/diabook/diabook-green/theme.php:161
+#: ../../view/theme/diabook/diabook-green/theme.php:236
+#: ../../view/theme/diabook/diabook-red/theme.php:159
+#: ../../view/theme/diabook/diabook-red/theme.php:234
+#: ../../view/theme/diabook/diabook-blue/theme.php:159
+#: ../../view/theme/diabook/diabook-blue/theme.php:234
+#: ../../view/theme/diabook/theme.php:175
+#: ../../view/theme/diabook/theme.php:253
+#: ../../view/theme/diabook/diabook-dark/theme.php:161
+#: ../../view/theme/diabook/diabook-dark/theme.php:236
+#: ../../view/theme/diabook/diabook-aerith/theme.php:161
+#: ../../view/theme/diabook/diabook-aerith/theme.php:236
+#: ../../view/theme/diabook/diabook-pink/theme.php:161
+#: ../../view/theme/diabook/diabook-pink/theme.php:236
+msgid "Community Pages"
+msgstr "Foren"
+
+#: ../../view/theme/diabook/diabook-green/theme.php:194
+#: ../../view/theme/diabook/diabook-red/theme.php:192
+#: ../../view/theme/diabook/diabook-blue/theme.php:192
+#: ../../view/theme/diabook/theme.php:208
+#: ../../view/theme/diabook/diabook-dark/theme.php:194
+#: ../../view/theme/diabook/diabook-aerith/theme.php:194
+#: ../../view/theme/diabook/diabook-pink/theme.php:194
+msgid "Help or @NewHere ?"
+msgstr "Hilfe oder @NewHere"
+
+#: ../../view/theme/diabook/diabook-green/theme.php:200
+#: ../../view/theme/diabook/diabook-red/theme.php:198
+#: ../../view/theme/diabook/diabook-blue/theme.php:198
+#: ../../view/theme/diabook/theme.php:214
+#: ../../view/theme/diabook/diabook-dark/theme.php:200
+#: ../../view/theme/diabook/diabook-aerith/theme.php:200
+#: ../../view/theme/diabook/diabook-pink/theme.php:200
+msgid "Connect Services"
+msgstr "Verbinde Dienste"
+
+#: ../../view/theme/diabook/diabook-green/theme.php:229
+#: ../../view/theme/diabook/diabook-red/theme.php:227
+#: ../../view/theme/diabook/diabook-blue/theme.php:227
+#: ../../view/theme/diabook/theme.php:246
+#: ../../view/theme/diabook/diabook-dark/theme.php:229
+#: ../../view/theme/diabook/diabook-aerith/theme.php:229
+#: ../../view/theme/diabook/diabook-pink/theme.php:229
+#: ../../include/nav.php:49 ../../include/nav.php:115
+msgid "Your posts and conversations"
+msgstr "Deine Beiträge und Unterhaltungen"
+
+#: ../../view/theme/diabook/diabook-green/theme.php:230
+#: ../../view/theme/diabook/diabook-red/theme.php:228
+#: ../../view/theme/diabook/diabook-blue/theme.php:228
+#: ../../view/theme/diabook/theme.php:247
+#: ../../view/theme/diabook/diabook-dark/theme.php:230
+#: ../../view/theme/diabook/diabook-aerith/theme.php:230
+#: ../../view/theme/diabook/diabook-pink/theme.php:230
+#: ../../include/nav.php:50
+msgid "Your profile page"
+msgstr "Deine Profilseite"
+
+#: ../../view/theme/diabook/diabook-green/theme.php:231
+#: ../../view/theme/diabook/diabook-red/theme.php:229
+#: ../../view/theme/diabook/diabook-blue/theme.php:229
+#: ../../view/theme/diabook/theme.php:248
+#: ../../view/theme/diabook/diabook-dark/theme.php:231
+#: ../../view/theme/diabook/diabook-aerith/theme.php:231
+#: ../../view/theme/diabook/diabook-pink/theme.php:231
+msgid "Your contacts"
+msgstr "Deine Kontakte"
+
+#: ../../view/theme/diabook/diabook-green/theme.php:232
+#: ../../view/theme/diabook/diabook-red/theme.php:230
+#: ../../view/theme/diabook/diabook-blue/theme.php:230
+#: ../../view/theme/diabook/theme.php:249
+#: ../../view/theme/diabook/diabook-dark/theme.php:232
+#: ../../view/theme/diabook/diabook-aerith/theme.php:232
+#: ../../view/theme/diabook/diabook-pink/theme.php:232
+#: ../../include/nav.php:51
+msgid "Your photos"
+msgstr "Deine Fotos"
+
+#: ../../view/theme/diabook/diabook-green/theme.php:233
+#: ../../view/theme/diabook/diabook-red/theme.php:231
+#: ../../view/theme/diabook/diabook-blue/theme.php:231
+#: ../../view/theme/diabook/theme.php:250
+#: ../../view/theme/diabook/diabook-dark/theme.php:233
+#: ../../view/theme/diabook/diabook-aerith/theme.php:233
+#: ../../view/theme/diabook/diabook-pink/theme.php:233
+#: ../../include/nav.php:52
+msgid "Your events"
+msgstr "Deine Ereignisse"
+
+#: ../../view/theme/diabook/diabook-green/theme.php:234
+#: ../../view/theme/diabook/diabook-red/theme.php:232
+#: ../../view/theme/diabook/diabook-blue/theme.php:232
+#: ../../view/theme/diabook/theme.php:251
+#: ../../view/theme/diabook/diabook-dark/theme.php:234
+#: ../../view/theme/diabook/diabook-aerith/theme.php:234
+#: ../../view/theme/diabook/diabook-pink/theme.php:234
+#: ../../include/nav.php:53
+msgid "Personal notes"
+msgstr "Persönliche Notizen"
+
+#: ../../view/theme/diabook/diabook-green/theme.php:234
+#: ../../view/theme/diabook/diabook-red/theme.php:232
+#: ../../view/theme/diabook/diabook-blue/theme.php:232
+#: ../../view/theme/diabook/theme.php:251
+#: ../../view/theme/diabook/diabook-dark/theme.php:234
+#: ../../view/theme/diabook/diabook-aerith/theme.php:234
+#: ../../view/theme/diabook/diabook-pink/theme.php:234
+#: ../../include/nav.php:53
+msgid "Your personal photos"
+msgstr "Deine privaten Fotos"
+
+#: ../../view/theme/diabook/diabook-green/config.php:78
+#: ../../view/theme/diabook/diabook-red/config.php:78
+#: ../../view/theme/diabook/diabook-blue/config.php:78
+#: ../../view/theme/diabook/diabook-dark/config.php:78
+#: ../../view/theme/diabook/diabook-aerith/config.php:78
+#: ../../view/theme/diabook/diabook-pink/config.php:78
+#: ../../view/theme/diabook/config.php:93
+#: ../../view/theme/quattro/config.php:54
 msgid "Theme settings"
 msgstr "Themen Einstellungen"
 
-#: ../../view/theme/quattro/theme.php:18
+#: ../../view/theme/diabook/diabook-green/config.php:79
+#: ../../view/theme/diabook/diabook-red/config.php:79
+#: ../../view/theme/diabook/diabook-blue/config.php:79
+#: ../../view/theme/diabook/diabook-dark/config.php:79
+#: ../../view/theme/diabook/diabook-aerith/config.php:79
+#: ../../view/theme/diabook/diabook-pink/config.php:79
+#: ../../view/theme/diabook/config.php:94
+msgid "Set font-size for posts and comments"
+msgstr "Schriftgröße für Beiträge und Kommentare festlegen"
+
+#: ../../view/theme/diabook/diabook-green/config.php:80
+#: ../../view/theme/diabook/diabook-red/config.php:80
+#: ../../view/theme/diabook/diabook-blue/config.php:80
+#: ../../view/theme/diabook/diabook-dark/config.php:80
+#: ../../view/theme/diabook/diabook-aerith/config.php:80
+#: ../../view/theme/diabook/diabook-pink/config.php:80
+#: ../../view/theme/diabook/config.php:95
+msgid "Set line-height for posts and comments"
+msgstr "Liniengröße für Beiträge und Kommantare festlegen"
+
+#: ../../view/theme/diabook/diabook-green/config.php:81
+#: ../../view/theme/diabook/diabook-red/config.php:81
+#: ../../view/theme/diabook/diabook-blue/config.php:81
+#: ../../view/theme/diabook/diabook-dark/config.php:81
+#: ../../view/theme/diabook/diabook-aerith/config.php:81
+#: ../../view/theme/diabook/diabook-pink/config.php:81
+#: ../../view/theme/diabook/config.php:96
+msgid "Set resolution for middle column"
+msgstr "Auflösung für die Mittelspalte setzen"
+
+#: ../../view/theme/diabook/config.php:97
+msgid "Set color scheme"
+msgstr "Wähle Farbschema"
+
+#: ../../view/theme/quattro/config.php:55
 msgid "Alignment"
 msgstr "Ausrichtung"
 
-#: ../../view/theme/quattro/theme.php:18
+#: ../../view/theme/quattro/config.php:55
 msgid "Left"
 msgstr "Links"
 
-#: ../../view/theme/quattro/theme.php:18
+#: ../../view/theme/quattro/config.php:55
 msgid "Center"
 msgstr "Mitte"
 
-#: ../../include/profile_advanced.php:17 ../../boot.php:982
+#: ../../view/theme/quattro/config.php:56
+msgid "Color scheme"
+msgstr "Farbschema"
+
+#: ../../include/profile_advanced.php:17 ../../boot.php:1085
 msgid "Gender:"
 msgstr "Geschlecht:"
 
@@ -4799,8 +5688,8 @@ msgstr "j F, Y"
 msgid "j F"
 msgstr "j F"
 
-#: ../../include/profile_advanced.php:30 ../../include/datetime.php:438
-#: ../../include/items.php:1349
+#: ../../include/profile_advanced.php:30 ../../include/datetime.php:448
+#: ../../include/items.php:1403
 msgid "Birthday:"
 msgstr "Geburtstag:"
 
@@ -4808,11 +5697,11 @@ msgstr "Geburtstag:"
 msgid "Age:"
 msgstr "Alter:"
 
-#: ../../include/profile_advanced.php:37 ../../boot.php:985
+#: ../../include/profile_advanced.php:37 ../../boot.php:1088
 msgid "Status:"
 msgstr "Status:"
 
-#: ../../include/profile_advanced.php:45 ../../boot.php:987
+#: ../../include/profile_advanced.php:45 ../../boot.php:1090
 msgid "Homepage:"
 msgstr "Homepage:"
 
@@ -5026,7 +5915,7 @@ msgstr "Abstinent"
 
 #: ../../include/profile_selectors.php:19
 msgid "Virgin"
-msgstr "Jungfrau"
+msgstr "Jungfrauen"
 
 #: ../../include/profile_selectors.php:19
 msgid "Deviant"
@@ -5061,6 +5950,14 @@ msgid "Unavailable"
 msgstr "Nicht verfügbar"
 
 #: ../../include/profile_selectors.php:33
+msgid "Has crush"
+msgstr "verknallt"
+
+#: ../../include/profile_selectors.php:33
+msgid "Infatuated"
+msgstr "verliebt"
+
+#: ../../include/profile_selectors.php:33
 msgid "Dating"
 msgstr "Dating"
 
@@ -5093,6 +5990,10 @@ msgid "Married"
 msgstr "Verheiratet"
 
 #: ../../include/profile_selectors.php:33
+msgid "Imaginarily married"
+msgstr "imaginär verheiratet"
+
+#: ../../include/profile_selectors.php:33
 msgid "Partners"
 msgstr "Partner"
 
@@ -5101,11 +6002,15 @@ msgid "Cohabiting"
 msgstr "zusammenlebend"
 
 #: ../../include/profile_selectors.php:33
+msgid "Common law"
+msgstr "wilde Ehe"
+
+#: ../../include/profile_selectors.php:33
 msgid "Happy"
 msgstr "Glücklich"
 
 #: ../../include/profile_selectors.php:33
-msgid "Not Looking"
+msgid "Not looking"
 msgstr "Nicht auf der Suche"
 
 #: ../../include/profile_selectors.php:33
@@ -5129,6 +6034,10 @@ msgid "Divorced"
 msgstr "Geschieden"
 
 #: ../../include/profile_selectors.php:33
+msgid "Imaginarily divorced"
+msgstr "imaginär geschieden"
+
+#: ../../include/profile_selectors.php:33
 msgid "Widowed"
 msgstr "Verwitwet"
 
@@ -5137,8 +6046,8 @@ msgid "Uncertain"
 msgstr "Unsicher"
 
 #: ../../include/profile_selectors.php:33
-msgid "Complicated"
-msgstr "Kompliziert"
+msgid "It's complicated"
+msgstr "Ist kompliziert"
 
 #: ../../include/profile_selectors.php:33
 msgid "Don't care"
@@ -5156,43 +6065,43 @@ msgstr "Beginnt:"
 msgid "Finishes:"
 msgstr "Endet:"
 
-#: ../../include/delivery.php:425 ../../include/notifier.php:638
+#: ../../include/delivery.php:434 ../../include/notifier.php:651
 msgid "(no subject)"
 msgstr "(kein Betreff)"
 
-#: ../../include/delivery.php:432 ../../include/enotify.php:17
-#: ../../include/notifier.php:645
+#: ../../include/delivery.php:441 ../../include/enotify.php:23
+#: ../../include/notifier.php:658
 msgid "noreply"
 msgstr "noreply"
 
-#: ../../include/text.php:238
+#: ../../include/text.php:243
 msgid "prev"
 msgstr "vorige"
 
-#: ../../include/text.php:240
+#: ../../include/text.php:245
 msgid "first"
 msgstr "erste"
 
-#: ../../include/text.php:269
+#: ../../include/text.php:274
 msgid "last"
 msgstr "letzte"
 
-#: ../../include/text.php:272
+#: ../../include/text.php:277
 msgid "next"
 msgstr "nächste"
 
-#: ../../include/text.php:563
+#: ../../include/text.php:568
 msgid "No contacts"
 msgstr "Keine Kontakte"
 
-#: ../../include/text.php:572
+#: ../../include/text.php:577
 #, php-format
 msgid "%d Contact"
 msgid_plural "%d Contacts"
 msgstr[0] "%d Kontakt"
 msgstr[1] "%d Kontakte"
 
-#: ../../include/text.php:643 ../../include/nav.php:87
+#: ../../include/text.php:650 ../../include/nav.php:91
 msgid "Search"
 msgstr "Suche"
 
@@ -5272,52 +6181,76 @@ msgstr "November"
 msgid "December"
 msgstr "Dezember"
 
-#: ../../include/text.php:905
+#: ../../include/text.php:919
 msgid "bytes"
 msgstr "Byte"
 
-#: ../../include/text.php:1000
-msgid "Select an alternate language"
-msgstr "Alternative Sprache auswählen"
+#: ../../include/text.php:936
+msgid "Categories:"
+msgstr "Kategorien:"
+
+#: ../../include/text.php:948
+msgid "remove"
+msgstr "löschen"
+
+#: ../../include/text.php:948
+msgid "[remove]"
+msgstr "[löschen]"
 
-#: ../../include/text.php:1012
+#: ../../include/text.php:951
+msgid "Filed under:"
+msgstr "Abgelegt unter:"
+
+#: ../../include/text.php:967 ../../include/text.php:979
+msgid "Click to open/close"
+msgstr "Zum öffnen/schließen klicken"
+
+#: ../../include/text.php:1084
 msgid "default"
 msgstr "standard"
 
-#: ../../include/text.php:1228
+#: ../../include/text.php:1096
+msgid "Select an alternate language"
+msgstr "Alternative Sprache auswählen"
+
+#: ../../include/text.php:1306
 msgid "activity"
 msgstr "Aktivität"
 
-#: ../../include/text.php:1230
+#: ../../include/text.php:1308
 msgid "comment"
 msgstr "Kommentar"
 
-#: ../../include/text.php:1231
+#: ../../include/text.php:1309
 msgid "post"
 msgstr "Beitrag"
 
-#: ../../include/diaspora.php:570
+#: ../../include/text.php:1464
+msgid "Item filed"
+msgstr "Beitrag abgelegt"
+
+#: ../../include/diaspora.php:582
 msgid "Sharing notification from Diaspora network"
 msgstr "Freigabe-Benachrichtigung von Diaspora"
 
-#: ../../include/diaspora.php:1911
+#: ../../include/diaspora.php:1969
 msgid "Attachments:"
 msgstr "Anhänge:"
 
-#: ../../include/diaspora.php:2094
+#: ../../include/diaspora.php:2152
 #, php-format
 msgid "[Relayed] Comment authored by %s from network %s"
 msgstr "[Weitergeleitet] Kommentar von %s aus dem %s Netzwerk"
 
-#: ../../include/network.php:814
+#: ../../include/network.php:824
 msgid "view full size"
 msgstr "Volle Größe anzeigen"
 
-#: ../../include/oembed.php:128
+#: ../../include/oembed.php:132
 msgid "Embedded content"
 msgstr "Eingebetteter Inhalt"
 
-#: ../../include/oembed.php:137
+#: ../../include/oembed.php:141
 msgid "Embedding disabled"
 msgstr "Einbettungen deaktiviert"
 
@@ -5348,135 +6281,119 @@ msgstr "Gruppe bearbeiten"
 msgid "Create a new group"
 msgstr "Neue Gruppe erstellen"
 
-#: ../../include/nav.php:44 ../../boot.php:709
+#: ../../include/group.php:215
+msgid "Contacts not in any group"
+msgstr "Kontakte in keiner Gruppe"
+
+#: ../../include/nav.php:46 ../../boot.php:795
 msgid "Logout"
 msgstr "Abmelden"
 
-#: ../../include/nav.php:44
+#: ../../include/nav.php:46
 msgid "End this session"
 msgstr "Diese Sitzung beenden"
 
-#: ../../include/nav.php:47 ../../boot.php:1331
+#: ../../include/nav.php:49 ../../boot.php:1453
 msgid "Status"
 msgstr "Status"
 
-#: ../../include/nav.php:47 ../../include/nav.php:111
-msgid "Your posts and conversations"
-msgstr "Deine Beiträge und Unterhaltungen"
-
-#: ../../include/nav.php:48
-msgid "Your profile page"
-msgstr "Deine Profilseite"
-
-#: ../../include/nav.php:49 ../../boot.php:1341
-msgid "Photos"
-msgstr "Bilder"
-
-#: ../../include/nav.php:49
-msgid "Your photos"
-msgstr "Deine Fotos"
-
-#: ../../include/nav.php:50
-msgid "Your events"
-msgstr "Deine Ereignisse"
-
-#: ../../include/nav.php:51
-msgid "Personal notes"
-msgstr "Persönliche Notizen"
-
-#: ../../include/nav.php:51
-msgid "Your personal photos"
-msgstr "Deine privaten Fotos"
-
-#: ../../include/nav.php:62
+#: ../../include/nav.php:64
 msgid "Sign in"
 msgstr "Anmelden"
 
-#: ../../include/nav.php:73
+#: ../../include/nav.php:77
 msgid "Home Page"
 msgstr "Homepage"
 
-#: ../../include/nav.php:77
+#: ../../include/nav.php:81
 msgid "Create an account"
 msgstr "Account erstellen"
 
-#: ../../include/nav.php:82
+#: ../../include/nav.php:86
 msgid "Help and documentation"
 msgstr "Hilfe und Dokumentation"
 
-#: ../../include/nav.php:85
+#: ../../include/nav.php:89
 msgid "Apps"
 msgstr "Apps"
 
-#: ../../include/nav.php:85
+#: ../../include/nav.php:89
 msgid "Addon applications, utilities, games"
 msgstr "Addon Anwendungen, Dienstprogramme, Spiele"
 
-#: ../../include/nav.php:87
+#: ../../include/nav.php:91
 msgid "Search site content"
 msgstr "Inhalt der Seite durchsuchen"
 
-#: ../../include/nav.php:97
+#: ../../include/nav.php:101
 msgid "Conversations on this site"
 msgstr "Unterhaltungen auf dieser Seite"
 
-#: ../../include/nav.php:99
+#: ../../include/nav.php:103
 msgid "Directory"
 msgstr "Verzeichnis"
 
-#: ../../include/nav.php:99
+#: ../../include/nav.php:103
 msgid "People directory"
 msgstr "Nutzerverzeichnis"
 
-#: ../../include/nav.php:109
+#: ../../include/nav.php:113
 msgid "Conversations from your friends"
 msgstr "Unterhaltungen deiner Kontakte"
 
-#: ../../include/nav.php:117
+#: ../../include/nav.php:121
 msgid "Friend Requests"
 msgstr "Kontaktanfragen"
 
-#: ../../include/nav.php:119
+#: ../../include/nav.php:123
 msgid "See all notifications"
 msgstr "Alle Benachrichtigungen anzeigen"
 
-#: ../../include/nav.php:120
+#: ../../include/nav.php:124
 msgid "Mark all system notifications seen"
 msgstr "Markiere alle System-Benachrichtigungen als gelesen"
 
-#: ../../include/nav.php:124
+#: ../../include/nav.php:128
 msgid "Private mail"
 msgstr "Private Email"
 
-#: ../../include/nav.php:127
+#: ../../include/nav.php:129
+msgid "Inbox"
+msgstr "Eingang"
+
+#: ../../include/nav.php:130
+msgid "Outbox"
+msgstr "Ausgang"
+
+#: ../../include/nav.php:134
 msgid "Manage"
 msgstr "Verwalten"
 
-#: ../../include/nav.php:127
+#: ../../include/nav.php:134
 msgid "Manage other pages"
 msgstr "Andere Seiten verwalten"
 
-#: ../../include/nav.php:131 ../../boot.php:940
+#: ../../include/nav.php:138 ../../boot.php:1043
 msgid "Profiles"
 msgstr "Profile"
 
-#: ../../include/nav.php:131 ../../boot.php:940
+#: ../../include/nav.php:138 ../../boot.php:1043
 msgid "Manage/edit profiles"
 msgstr "Profile verwalten/editieren"
 
-#: ../../include/nav.php:132
+#: ../../include/nav.php:139
 msgid "Manage/edit friends and contacts"
 msgstr "Freunde und Kontakte verwalten/editieren"
 
-#: ../../include/nav.php:139
+#: ../../include/nav.php:146
 msgid "Admin"
 msgstr "Administration"
 
-#: ../../include/nav.php:139
+#: ../../include/nav.php:146
 msgid "Site setup and configuration"
 msgstr "Einstellungen der Seite und Konfiguration"
 
-#: ../../include/nav.php:162
+#: ../../include/nav.php:169
 msgid "Nothing new here"
 msgstr "Keine Neuigkeiten."
 
@@ -5492,36 +6409,32 @@ msgstr "Adresse oder Web-Link eingeben"
 msgid "Example: bob@example.com, http://example.com/barbara"
 msgstr "Beispiel: bob@example.com, http://example.com/barbara"
 
-#: ../../include/contact_widgets.php:18
-msgid "Invite Friends"
-msgstr "Freunde einladen"
-
-#: ../../include/contact_widgets.php:24
+#: ../../include/contact_widgets.php:23
 #, php-format
 msgid "%d invitation available"
 msgid_plural "%d invitations available"
 msgstr[0] "%d Einladung verfügbar"
 msgstr[1] "%d Einladungen verfügbar"
 
-#: ../../include/contact_widgets.php:30
+#: ../../include/contact_widgets.php:29
 msgid "Find People"
 msgstr "Leute finden"
 
-#: ../../include/contact_widgets.php:31
+#: ../../include/contact_widgets.php:30
 msgid "Enter name or interest"
 msgstr "Name oder Interessen eingeben"
 
-#: ../../include/contact_widgets.php:32
+#: ../../include/contact_widgets.php:31
 msgid "Connect/Follow"
 msgstr "Verbinden/Folgen"
 
-#: ../../include/contact_widgets.php:33
+#: ../../include/contact_widgets.php:32
 msgid "Examples: Robert Morgenstein, Fishing"
 msgstr "Beispiel: Robert Morgenstein, Angeln"
 
 #: ../../include/contact_widgets.php:36
-msgid "Similar Interests"
-msgstr "Ähnliche Interessen"
+msgid "Random Profile"
+msgstr "Zufälliges Profil"
 
 #: ../../include/contact_widgets.php:68
 msgid "Networks"
@@ -5531,309 +6444,331 @@ msgstr "Netzwerke"
 msgid "All Networks"
 msgstr "Alle Netzwerke"
 
+#: ../../include/contact_widgets.php:98
+msgid "Saved Folders"
+msgstr "Gespeicherte Ordner"
+
+#: ../../include/contact_widgets.php:101 ../../include/contact_widgets.php:129
+msgid "Everything"
+msgstr "Alles"
+
+#: ../../include/contact_widgets.php:126
+msgid "Categories"
+msgstr "Kategorien"
+
 #: ../../include/auth.php:29
 msgid "Logged out."
 msgstr "Abgemeldet."
 
+#: ../../include/auth.php:106
+msgid ""
+"We encountered a problem while logging in with the OpenID you provided. "
+"Please check the correct spelling of the ID."
+msgstr "Beim versuch dich mit der von dir angegebenen OpenID anzumelden trat ein Problem auf. Bitte überprüfe dass du die OpenID richtig geschrieben hast."
+
+#: ../../include/auth.php:106
+msgid "The error message was:"
+msgstr "Die Fehlermeldung lautete:"
+
 #: ../../include/datetime.php:43 ../../include/datetime.php:45
 msgid "Miscellaneous"
 msgstr "Verschiedenes"
 
-#: ../../include/datetime.php:121 ../../include/datetime.php:253
+#: ../../include/datetime.php:131 ../../include/datetime.php:263
 msgid "year"
 msgstr "Jahr"
 
-#: ../../include/datetime.php:126 ../../include/datetime.php:254
+#: ../../include/datetime.php:136 ../../include/datetime.php:264
 msgid "month"
 msgstr "Monat"
 
-#: ../../include/datetime.php:131 ../../include/datetime.php:256
+#: ../../include/datetime.php:141 ../../include/datetime.php:266
 msgid "day"
 msgstr "Tag"
 
-#: ../../include/datetime.php:244
+#: ../../include/datetime.php:254
 msgid "never"
 msgstr "nie"
 
-#: ../../include/datetime.php:250
+#: ../../include/datetime.php:260
 msgid "less than a second ago"
 msgstr "vor weniger als einer Sekunde"
 
-#: ../../include/datetime.php:253
+#: ../../include/datetime.php:263
 msgid "years"
 msgstr "Jahre"
 
-#: ../../include/datetime.php:254
+#: ../../include/datetime.php:264
 msgid "months"
 msgstr "Monate"
 
-#: ../../include/datetime.php:255
+#: ../../include/datetime.php:265
 msgid "week"
 msgstr "Woche"
 
-#: ../../include/datetime.php:255
+#: ../../include/datetime.php:265
 msgid "weeks"
 msgstr "Wochen"
 
-#: ../../include/datetime.php:256
+#: ../../include/datetime.php:266
 msgid "days"
 msgstr "Tage"
 
-#: ../../include/datetime.php:257
+#: ../../include/datetime.php:267
 msgid "hour"
 msgstr "Stunde"
 
-#: ../../include/datetime.php:257
+#: ../../include/datetime.php:267
 msgid "hours"
 msgstr "Stunden"
 
-#: ../../include/datetime.php:258
+#: ../../include/datetime.php:268
 msgid "minute"
 msgstr "Minute"
 
-#: ../../include/datetime.php:258
+#: ../../include/datetime.php:268
 msgid "minutes"
 msgstr "Minuten"
 
-#: ../../include/datetime.php:259
+#: ../../include/datetime.php:269
 msgid "second"
 msgstr "Sekunde"
 
-#: ../../include/datetime.php:259
+#: ../../include/datetime.php:269
 msgid "seconds"
 msgstr "Sekunden"
 
-#: ../../include/datetime.php:267
+#: ../../include/datetime.php:277
 #, php-format
 msgid "%1$d %2$s ago"
 msgstr "%1$d %2$s her"
 
-#: ../../include/poller.php:513
+#: ../../include/poller.php:543
 msgid "From: "
 msgstr "Von: "
 
-#: ../../include/bbcode.php:202
+#: ../../include/bbcode.php:203 ../../include/bbcode.php:223
 msgid "$1 wrote:"
 msgstr "$1 hat geschrieben:"
 
-#: ../../include/bbcode.php:216 ../../include/bbcode.php:282
+#: ../../include/bbcode.php:238 ../../include/bbcode.php:304
 msgid "Image/photo"
 msgstr "Bild/Foto"
 
-#: ../../include/dba.php:39
+#: ../../include/dba.php:41
 #, php-format
 msgid "Cannot locate DNS info for database server '%s'"
 msgstr "Kann die DNS Informationen für den Datenbanken Server '%s' nicht ermitteln."
 
-#: ../../include/message.php:14
+#: ../../include/message.php:15 ../../include/message.php:171
 msgid "[no subject]"
 msgstr "[kein Betreff]"
 
-#: ../../include/acl_selectors.php:284
+#: ../../include/acl_selectors.php:286
 msgid "Visible to everybody"
 msgstr "Für jeden sichtbar"
 
-#: ../../include/acl_selectors.php:285
+#: ../../include/acl_selectors.php:287
 msgid "show"
 msgstr "zeigen"
 
-#: ../../include/acl_selectors.php:286
+#: ../../include/acl_selectors.php:288
 msgid "don't show"
 msgstr "nicht zeigen"
 
-#: ../../include/enotify.php:8
+#: ../../include/enotify.php:14
 msgid "Friendica Notification"
 msgstr "Friendica-Benachrichtigung"
 
-#: ../../include/enotify.php:11
+#: ../../include/enotify.php:17
 msgid "Thank You,"
 msgstr "Danke,"
 
-#: ../../include/enotify.php:13
+#: ../../include/enotify.php:19
 #, php-format
 msgid "%s Administrator"
 msgstr "der Administrator von %s"
 
-#: ../../include/enotify.php:29
+#: ../../include/enotify.php:35
 #, php-format
 msgid "%s <!item_type!>"
 msgstr "%s <!item_type!>"
 
-#: ../../include/enotify.php:33
+#: ../../include/enotify.php:39
 #, php-format
 msgid "[Friendica:Notify] New mail received at %s"
 msgstr "[Friendica Meldung] Neue Nachricht erhalten von %s"
 
-#: ../../include/enotify.php:35
+#: ../../include/enotify.php:41
 #, php-format
 msgid "%s sent you a new private message at %s."
 msgstr "%s hat dir eine neue private Nachricht auf %s geschrieben."
 
-#: ../../include/enotify.php:36
+#: ../../include/enotify.php:42
 #, php-format
 msgid "%s sent you %s."
-msgstr "%s hat Dir geschickt %s"
+msgstr "%s hat Dir %s geschickt"
 
-#: ../../include/enotify.php:36
+#: ../../include/enotify.php:42
 msgid "a private message"
 msgstr "eine private Nachricht"
 
-#: ../../include/enotify.php:37
+#: ../../include/enotify.php:43
 #, php-format
 msgid "Please visit %s to view and/or reply to your private messages."
 msgstr "Bitte besuche %s, um deine privaten Nachrichten anzusehen und/oder zu beantworten."
 
-#: ../../include/enotify.php:67
+#: ../../include/enotify.php:73
 #, php-format
 msgid "%s's"
 msgstr "%s's"
 
-#: ../../include/enotify.php:71
+#: ../../include/enotify.php:77
 msgid "your"
 msgstr "Dein"
 
-#: ../../include/enotify.php:78
+#: ../../include/enotify.php:84
 #, php-format
 msgid "[Friendica:Notify] Comment to conversation #%d by %s"
 msgstr "[Friendica Meldung] Kommentar zum Beitrag #%d von %s"
 
-#: ../../include/enotify.php:79
+#: ../../include/enotify.php:85
 #, php-format
 msgid "%s commented on an item/conversation you have been following."
 msgstr "%s hat einen Beitrag kommentiert, dem du folgst."
 
-#: ../../include/enotify.php:80
+#: ../../include/enotify.php:86
 #, php-format
 msgid "%s commented on %s."
 msgstr "%s kommentierte %s."
 
-#: ../../include/enotify.php:82 ../../include/enotify.php:95
-#: ../../include/enotify.php:106 ../../include/enotify.php:117
+#: ../../include/enotify.php:88 ../../include/enotify.php:101
+#: ../../include/enotify.php:112 ../../include/enotify.php:123
 #, php-format
 msgid "Please visit %s to view and/or reply to the conversation."
 msgstr "Bitte besuche %s, um die Konversation anzusehen und/oder zu kommentieren."
 
-#: ../../include/enotify.php:89
+#: ../../include/enotify.php:95
 #, php-format
 msgid "[Friendica:Notify] %s posted to your profile wall"
 msgstr "[Friendica Meldung] %s hat auf Deine Pinnwand geschrieben"
 
-#: ../../include/enotify.php:91
+#: ../../include/enotify.php:97
 #, php-format
 msgid "%s posted to your profile wall at %s"
 msgstr "%s hat auf deine Pinnwand bei %s gepostet"
 
-#: ../../include/enotify.php:93
+#: ../../include/enotify.php:99
 #, php-format
 msgid "%s posted to %s"
 msgstr "%s schrieb an %s"
 
-#: ../../include/enotify.php:93
+#: ../../include/enotify.php:99
 msgid "your profile wall."
 msgstr "Deine Pinnwand"
 
-#: ../../include/enotify.php:102
+#: ../../include/enotify.php:108
 #, php-format
 msgid "[Friendica:Notify] %s tagged you"
 msgstr "[Friendica Meldung] %s hat Dich erwähnt"
 
-#: ../../include/enotify.php:103
+#: ../../include/enotify.php:109
 #, php-format
 msgid "%s tagged you at %s"
 msgstr "%s hat dich auf %s erwähnt"
 
-#: ../../include/enotify.php:104
+#: ../../include/enotify.php:110
 #, php-format
 msgid "%s %s."
 msgstr "%s %s."
 
-#: ../../include/enotify.php:104
+#: ../../include/enotify.php:110
 msgid "tagged you"
 msgstr "erwähnte Dich"
 
-#: ../../include/enotify.php:113
+#: ../../include/enotify.php:119
 #, php-format
 msgid "[Friendica:Notify] %s tagged your post"
 msgstr "[Friendica Meldung] %s markierte Deinen Beitrag"
 
-#: ../../include/enotify.php:114
+#: ../../include/enotify.php:120
 #, php-format
 msgid "%s tagged your post at %s"
 msgstr "%s hat deinen Beitrag auf %s getaggt"
 
-#: ../../include/enotify.php:115
+#: ../../include/enotify.php:121
 #, php-format
 msgid "%s tagged %s"
 msgstr "%s markierte %s"
 
-#: ../../include/enotify.php:115
+#: ../../include/enotify.php:121
 msgid "your post"
-msgstr "Dein Beitrag"
+msgstr "Deinen Beitrag"
 
-#: ../../include/enotify.php:124
+#: ../../include/enotify.php:130
 msgid "[Friendica:Notify] Introduction received"
 msgstr "[Friendica Meldung] Kontaktanfrage erhalten"
 
-#: ../../include/enotify.php:125
+#: ../../include/enotify.php:131
 #, php-format
 msgid "You've received an introduction from '%s' at %s"
 msgstr "Du hast eine Kontaktanfrage von '%s' auf %s erhalten"
 
-#: ../../include/enotify.php:126
+#: ../../include/enotify.php:132
 #, php-format
 msgid "You've received %s from %s."
 msgstr "Du hast %s von %s erhalten."
 
-#: ../../include/enotify.php:126
+#: ../../include/enotify.php:132
 msgid "an introduction"
-msgstr "eine Einführung"
+msgstr "eine Kontaktanfrage"
 
-#: ../../include/enotify.php:127 ../../include/enotify.php:144
+#: ../../include/enotify.php:133 ../../include/enotify.php:150
 #, php-format
 msgid "You may visit their profile at %s"
 msgstr "Hier kannst du das Profil betrachten: %s"
 
-#: ../../include/enotify.php:129
+#: ../../include/enotify.php:135
 #, php-format
 msgid "Please visit %s to approve or reject the introduction."
 msgstr "Bitte besuche %s, um die Kontaktanfrage anzunehmen oder abzulehnen."
 
-#: ../../include/enotify.php:136
+#: ../../include/enotify.php:142
 msgid "[Friendica:Notify] Friend suggestion received"
 msgstr "[Friendica Meldung] Kontaktvorschlag erhalten"
 
-#: ../../include/enotify.php:137
+#: ../../include/enotify.php:143
 #, php-format
 msgid "You've received a friend suggestion from '%s' at %s"
 msgstr "Du hast von '%s' einen Kontaktvorschlag erhalten auf %s"
 
-#: ../../include/enotify.php:138
+#: ../../include/enotify.php:144
 #, php-format
 msgid "You've received %s for %s from %s."
 msgstr "Du hast %s für %s von %s erhalten."
 
-#: ../../include/enotify.php:139
+#: ../../include/enotify.php:145
 msgid "a friend suggestion"
 msgstr "ein Freunde Vorschlag"
 
-#: ../../include/enotify.php:142
+#: ../../include/enotify.php:148
 msgid "Name:"
 msgstr "Name:"
 
-#: ../../include/enotify.php:143
+#: ../../include/enotify.php:149
 msgid "Photo:"
 msgstr "Foto:"
 
-#: ../../include/enotify.php:146
+#: ../../include/enotify.php:152
 #, php-format
 msgid "Please visit %s to approve or reject the suggestion."
 msgstr "Bitte besuche %s, um den Vorschlag zu akzeptieren oder abzulehnen."
 
-#: ../../include/items.php:2573
+#: ../../include/items.php:2698
 msgid "A new person is sharing with you at "
 msgstr "Eine neue Person teilt mit dir auf "
 
-#: ../../include/items.php:2573
+#: ../../include/items.php:2698
 msgid "You have a new follower at "
 msgstr "Du hast einen neuen Kontakt auf "
 
@@ -5842,37 +6777,52 @@ msgstr "Du hast einen neuen Kontakt auf "
 msgid "image/photo"
 msgstr "Bild/Foto"
 
-#: ../../include/security.php:20
+#: ../../include/bb2diaspora.php:102
+msgid "link"
+msgstr "Verweis"
+
+#: ../../include/security.php:21
 msgid "Welcome "
 msgstr "Willkommen "
 
-#: ../../include/security.php:21
+#: ../../include/security.php:22
 msgid "Please upload a profile photo."
 msgstr "Bitte lade ein Profilbild hoch."
 
-#: ../../include/security.php:24
+#: ../../include/security.php:25
 msgid "Welcome back "
 msgstr "Willkommen zurück "
 
-#: ../../include/Contact.php:131 ../../include/conversation.php:788
-msgid "View status"
-msgstr "Status anzeigen"
-
-#: ../../include/Contact.php:132 ../../include/conversation.php:789
-msgid "View profile"
-msgstr "Profil anzeigen"
-
-#: ../../include/Contact.php:133 ../../include/conversation.php:790
-msgid "View photos"
-msgstr "Fotos ansehen"
-
-#: ../../include/Contact.php:134 ../../include/Contact.php:147
-#: ../../include/conversation.php:791
-msgid "View recent"
-msgstr "Neueste anzeigen"
+#: ../../include/security.php:329
+msgid ""
+"The form security token was not correct. This probably happened because the "
+"form has been opened for too long (>3 hours) before submitting it."
+msgstr "Das Sicherheits-Merkmal war nicht korrekt. Das passiert meistens wenn das Formular vor dem Absenden zu lange geöffnet war (länger als 3 Stunden)."
+
+#: ../../include/Contact.php:145 ../../include/conversation.php:809
+msgid "View Status"
+msgstr "Pinnwand anschauen"
+
+#: ../../include/Contact.php:146 ../../include/conversation.php:810
+msgid "View Profile"
+msgstr "Profil anschauen"
+
+#: ../../include/Contact.php:147 ../../include/conversation.php:811
+msgid "View Photos"
+msgstr "Bilder anschauen"
+
+#: ../../include/Contact.php:148 ../../include/Contact.php:161
+#: ../../include/conversation.php:812
+msgid "Network Posts"
+msgstr "Netzwerk Beiträge"
+
+#: ../../include/Contact.php:149 ../../include/Contact.php:161
+#: ../../include/conversation.php:813
+msgid "Edit Contact"
+msgstr "Kontakt bearbeiten"
 
-#: ../../include/Contact.php:136 ../../include/Contact.php:147
-#: ../../include/conversation.php:793
+#: ../../include/Contact.php:150 ../../include/Contact.php:161
+#: ../../include/conversation.php:814
 msgid "Send PM"
 msgstr "Private Nachricht senden"
 
@@ -5885,36 +6835,32 @@ msgstr "Nachricht/Beitrag"
 msgid "%1$s marked %2$s's %3$s as favorite"
 msgstr "%1$s hat %2$s\\s %3$s als Favorit markiert"
 
-#: ../../include/conversation.php:303 ../../include/conversation.php:572
+#: ../../include/conversation.php:317 ../../include/conversation.php:575
 msgid "Select"
 msgstr "Auswählen"
 
-#: ../../include/conversation.php:320 ../../include/conversation.php:665
-#: ../../include/conversation.php:666
+#: ../../include/conversation.php:334 ../../include/conversation.php:668
+#: ../../include/conversation.php:669
 #, php-format
 msgid "View %s's profile @ %s"
 msgstr "Das Profil von %s auf %s betrachten."
 
-#: ../../include/conversation.php:330 ../../include/conversation.php:677
+#: ../../include/conversation.php:344 ../../include/conversation.php:680
 #, php-format
 msgid "%s from %s"
 msgstr "%s von %s"
 
-#: ../../include/conversation.php:346
+#: ../../include/conversation.php:359
 msgid "View in context"
 msgstr "Im Zusammenhang betrachten"
 
-#: ../../include/conversation.php:467
+#: ../../include/conversation.php:465
 #, php-format
 msgid "%d comment"
 msgid_plural "%d comments"
 msgstr[0] "%d Kommentar"
 msgstr[1] "%d Kommentare"
 
-#: ../../include/conversation.php:468 ../../boot.php:448
-msgid "show more"
-msgstr "mehr anzeigen"
-
 #: ../../include/conversation.php:529
 msgid "like"
 msgstr "mag ich"
@@ -5931,205 +6877,209 @@ msgstr "Teile dieses"
 msgid "share"
 msgstr "Teilen"
 
-#: ../../include/conversation.php:582
+#: ../../include/conversation.php:588
 msgid "add star"
 msgstr "markieren"
 
-#: ../../include/conversation.php:583
+#: ../../include/conversation.php:589
 msgid "remove star"
 msgstr "Markierung entfernen"
 
-#: ../../include/conversation.php:584
+#: ../../include/conversation.php:590
 msgid "toggle star status"
 msgstr "Markierung umschalten"
 
-#: ../../include/conversation.php:587
+#: ../../include/conversation.php:593
 msgid "starred"
 msgstr "markiert"
 
-#: ../../include/conversation.php:588
+#: ../../include/conversation.php:594
 msgid "add tag"
 msgstr "Tag hinzufügen"
 
-#: ../../include/conversation.php:667
+#: ../../include/conversation.php:598
+msgid "save to folder"
+msgstr "In Ordner speichern"
+
+#: ../../include/conversation.php:670
 msgid "to"
 msgstr "zu"
 
-#: ../../include/conversation.php:668
+#: ../../include/conversation.php:671
 msgid "Wall-to-Wall"
 msgstr "Wall-to-Wall"
 
-#: ../../include/conversation.php:669
+#: ../../include/conversation.php:672
 msgid "via Wall-To-Wall:"
 msgstr "via Wall-To-Wall:"
 
-#: ../../include/conversation.php:713
+#: ../../include/conversation.php:717
 msgid "Delete Selected Items"
 msgstr "Lösche die markierten Beiträge"
 
-#: ../../include/conversation.php:845
+#: ../../include/conversation.php:868
 #, php-format
 msgid "%s likes this."
 msgstr "%s mag das."
 
-#: ../../include/conversation.php:845
+#: ../../include/conversation.php:868
 #, php-format
 msgid "%s doesn't like this."
 msgstr "%s mag das nicht."
 
-#: ../../include/conversation.php:849
+#: ../../include/conversation.php:872
 #, php-format
 msgid "<span  %1$s>%2$d people</span> like this."
 msgstr "<span  %1$s>%2$d Leute</span> mögen das."
 
-#: ../../include/conversation.php:851
+#: ../../include/conversation.php:874
 #, php-format
 msgid "<span  %1$s>%2$d people</span> don't like this."
 msgstr "<span  %1$s>%2$d Leute</span> mögen das nicht."
 
-#: ../../include/conversation.php:857
+#: ../../include/conversation.php:880
 msgid "and"
 msgstr "und"
 
-#: ../../include/conversation.php:860
+#: ../../include/conversation.php:883
 #, php-format
 msgid ", and %d other people"
 msgstr " und %d andere"
 
-#: ../../include/conversation.php:861
+#: ../../include/conversation.php:884
 #, php-format
 msgid "%s like this."
 msgstr "%s mögen das."
 
-#: ../../include/conversation.php:861
+#: ../../include/conversation.php:884
 #, php-format
 msgid "%s don't like this."
 msgstr "%s mögen das nicht."
 
-#: ../../include/conversation.php:886
+#: ../../include/conversation.php:909
 msgid "Visible to <strong>everybody</strong>"
 msgstr "Für <strong>jedermann</strong> sichtbar"
 
-#: ../../include/conversation.php:888
+#: ../../include/conversation.php:911
 msgid "Please enter a video link/URL:"
 msgstr "Bitte Link/URL zum Video einfügen:"
 
-#: ../../include/conversation.php:889
+#: ../../include/conversation.php:912
 msgid "Please enter an audio link/URL:"
 msgstr "Bitte Link/URL zum Audio einfügen:"
 
-#: ../../include/conversation.php:890
+#: ../../include/conversation.php:913
 msgid "Tag term:"
 msgstr "Tag:"
 
-#: ../../include/conversation.php:891
+#: ../../include/conversation.php:915
 msgid "Where are you right now?"
 msgstr "Wo hältst du dich jetzt gerade auf?"
 
-#: ../../include/conversation.php:892
-msgid "Enter a title for this item"
-msgstr "Gib den Titel für diesen Beitrag ein"
-
-#: ../../include/conversation.php:935
+#: ../../include/conversation.php:958
 msgid "upload photo"
 msgstr "Bild hochladen"
 
-#: ../../include/conversation.php:937
+#: ../../include/conversation.php:960
 msgid "attach file"
 msgstr "Datei anhängen"
 
-#: ../../include/conversation.php:939
+#: ../../include/conversation.php:962
 msgid "web link"
 msgstr "Weblink"
 
-#: ../../include/conversation.php:940
+#: ../../include/conversation.php:963
 msgid "Insert video link"
 msgstr "Video-Adresse einfügen"
 
-#: ../../include/conversation.php:941
+#: ../../include/conversation.php:964
 msgid "video link"
 msgstr "Video-Link"
 
-#: ../../include/conversation.php:942
+#: ../../include/conversation.php:965
 msgid "Insert audio link"
 msgstr "Audio-Adresse einfügen"
 
-#: ../../include/conversation.php:943
+#: ../../include/conversation.php:966
 msgid "audio link"
 msgstr "Audio-Link"
 
-#: ../../include/conversation.php:945
+#: ../../include/conversation.php:968
 msgid "set location"
 msgstr "Ort setzen"
 
-#: ../../include/conversation.php:947
+#: ../../include/conversation.php:970
 msgid "clear location"
 msgstr "Ort löschen"
 
-#: ../../include/conversation.php:952
+#: ../../include/conversation.php:977
 msgid "permissions"
 msgstr "Zugriffsrechte"
 
-#: ../../boot.php:446
+#: ../../boot.php:494
 msgid "Delete this item?"
 msgstr "Diesen Beitrag löschen?"
 
-#: ../../boot.php:449
+#: ../../boot.php:497
 msgid "show fewer"
 msgstr "weniger anzeigen"
 
-#: ../../boot.php:692
+#: ../../boot.php:774
 msgid "Create a New Account"
 msgstr "Neuen Account erstellen"
 
-#: ../../boot.php:712
+#: ../../boot.php:798
 msgid "Nickname or Email address: "
 msgstr "Spitzname oder Email-Adresse: "
 
-#: ../../boot.php:713
+#: ../../boot.php:799
 msgid "Password: "
 msgstr "Passwort: "
 
-#: ../../boot.php:716
+#: ../../boot.php:802
 msgid "Or login using OpenID: "
 msgstr "Oder melde dich mit deiner OpenID an: "
 
-#: ../../boot.php:722
+#: ../../boot.php:808
 msgid "Forgot your password?"
 msgstr "Passwort vergessen?"
 
-#: ../../boot.php:879
+#: ../../boot.php:975
 msgid "Edit profile"
 msgstr "Profil bearbeiten"
 
-#: ../../boot.php:1046 ../../boot.php:1117
+#: ../../boot.php:1035
+msgid "Message"
+msgstr "Nachricht"
+
+#: ../../boot.php:1151 ../../boot.php:1223
 msgid "g A l F d"
-msgstr "l. d, F G \\U\\h\\\\r"
+msgstr "l, d. F G \\U\\h\\r"
 
-#: ../../boot.php:1047 ../../boot.php:1118
+#: ../../boot.php:1152 ../../boot.php:1224
 msgid "F d"
 msgstr "d. F"
 
-#: ../../boot.php:1072
+#: ../../boot.php:1177
 msgid "Birthday Reminders"
 msgstr "Geburtstagserinnerungen"
 
-#: ../../boot.php:1073
+#: ../../boot.php:1178
 msgid "Birthdays this week:"
 msgstr "Geburtstage diese Woche:"
 
-#: ../../boot.php:1096 ../../boot.php:1160
+#: ../../boot.php:1201 ../../boot.php:1266
 msgid "[today]"
 msgstr "[heute]"
 
-#: ../../boot.php:1141
+#: ../../boot.php:1247
 msgid "Event Reminders"
 msgstr "Veranstaltungserinnerungen"
 
-#: ../../boot.php:1142
+#: ../../boot.php:1248
 msgid "Events this week:"
 msgstr "Veranstaltungen diese Woche"
 
-#: ../../boot.php:1154
+#: ../../boot.php:1260
 msgid "[No description]"
 msgstr "[keine Beschreibung]"
diff --git a/view/de/passchanged_eml.tpl b/view/de/passchanged_eml.tpl
index d5e8d9048..dcabbbe49 100755..100644
--- a/view/de/passchanged_eml.tpl
+++ b/view/de/passchanged_eml.tpl
@@ -1,20 +1,20 @@
 
-Liebe/r $username,
-dein Passwort wurde wie gewünscht geändert. Bitte hebe diese Informationen
-für deine Unterlagen auf (oder ändere das Passwort augenblicklich in etwas
-das du dir merken kannst).
+Hallo $[username],
+	Dein Passwort wurde wie gewünscht geändert. Bitte bewahre diese 
+Informationen in deinen Unterlagen auf (oder ändere dein Passwort sofort 
+in etwas, was du dir merken kannst).
 
 
-Deine Anmeldedaten sind die Folgenden:
+Deine Login Daten wurden wie folgt geändert:
 
-Adresse der Seite:	$siteurl
-Anmelde Name:	$email
-Passwort:	$new_password
+Adresse der Seite:	$[siteurl]
+Login Name:	$[email]
+Passwort:	$[new_password]
 
-Du kannst diesen Passwort auf der "Einstellungen" Seite deines Accounts
-ändern nachdem du angemeldet bits.
+Du kannst dein Passwort unter deinen Account-Einstellungen ändern, wenn du angemeldet bist.
 
 
-Viele Grüße,
-	$sitename Administrator
+Beste Grüße,
+	$[sitename] Administrator
 
+ 
\ No newline at end of file
diff --git a/view/de/register_open_eml.tpl b/view/de/register_open_eml.tpl
index d27c3c743..d1c0e5ff4 100755..100644
--- a/view/de/register_open_eml.tpl
+++ b/view/de/register_open_eml.tpl
@@ -1,19 +1,34 @@
-
-Liebe/r $username,
-danke für die Registrierung bei $sitename. Dein neuer Account wurde angelegt.
-Die Anmeldedetails sind die Folgenden.
-
-Adresse der Seite: $siteurl
-Anmelde Name: $email
-Passwort: $password
-
-Du kannst dein Passwort auf der "Einstellungen" Seite deines Accounts ändern
-nachdem du dich angemeldet hast.
-
-Nimm dir bitte ein paar Augenblicke Zeit um die anderen Einstellungen deines
-Accounts zu bearbeiten. 
-
-Vielen Dank und Willkommen auf $sitename.
-
-Mit freundlichem Gruß,
-	$sitename Administrator
+

+Hallo $[username],

+	Danke für deine Anmeldung auf $[sitename]. Dein Account wurde angelegt. 

+Die Login Details sind die folgenden:

+

+

+Adresse der Seite:	$[siteurl]

+Login Name:	$[email]

+Passwort:	$[password]

+

+Du kannst das Passwort in den "Einstellungen" zu deinem Account ändern 

+nachdem du dich eingeloggt hast.

+

+Bitte nimm dir einige Augenblicke Zeit um die anderen Einstellungen auf der Seite zu überprüfen.

+

+Eventuell möchtest du außerdem einige grundlegenden Informationen in dein Standart-Profil eintragen 

+(auf der "Profile" Seite) damit andere Leute dich einfacher finden können.

+

+Wir empfehlen den kompletten Namen anzugeben, ein eigenes Profil-Foto,

+ein paar "Profil-Schlüsselwörter" anzugeben (damit man leichter Gleichinteressierte finden kann) - und 

+natürlich in welchen Land Du lebst; wenn Du es nicht genauer angeben möchtest

+dann das.

+

+Wir respektieren Ihr Recht auf Privatsphäre, und keines dieser Elemente sind notwendig. 

+Wenn Du hier neu bist und keinen kennst, wird man Dir helfen

+ein paar neue und interessante Freunde zu  finden.  

+

+

+Danke dir und willkommen auf $[sitename].

+

+Beste Grüße,

+	$[sitename] Administrator

+

+ 
\ No newline at end of file
diff --git a/view/de/register_verify_eml.tpl b/view/de/register_verify_eml.tpl
index 7ae432d61..8f25f5c36 100755..100644
--- a/view/de/register_verify_eml.tpl
+++ b/view/de/register_verify_eml.tpl
@@ -1,21 +1,25 @@
 
-Ein neuer Nutzer hat sich auf $sitename registriert. Diese Registration
-benötigt noch deine Zustimmung.
+Eine Neuanmeldung auf $[sitename] benötigt 
+deine Aufmerksamkeit. 
 
-Die Anmeldedetails sind Folgende:
 
-Kompletter Name: $username
-Adresse der Seite: $siteurl
-Anmelde Name: $email
+Die Login-Einzelheiten sind die folgenden:
 
+Kompletter Name:	$[username]
+Adresse der Seite:	$[siteurl]
+Login Name:	$[email]
 
-Um dieser Anmeldung zuzustimmen folge bitte diesem Link:
 
-$siteurl/regmod/allow/$hash 
+Um die Anfrage zu bestätigen besuche bitte:
 
 
-Um die Anfrage abzulehen und den Account zu entfernen folge diesem Link:
+$[siteurl]/regmod/allow/$[hash] 
 
-$siteurl/regmod/deny/$hash
 
-Besten Dank!
+Um die Anfrage abzulehnen und den Account zu löschen besuche bitte:
+
+
+$[siteurl]/regmod/deny/$[hash]
+
+
+Danke!
diff --git a/view/de/request_notify_eml.tpl b/view/de/request_notify_eml.tpl
index 55fa98e96..057044e8c 100755..100644
--- a/view/de/request_notify_eml.tpl
+++ b/view/de/request_notify_eml.tpl
@@ -1,14 +1,17 @@
 
-Liebe/r $myname,
+Hallo $[myname],
 
-du hast gerade eine Kontaktanfrage von '$requestor' auf $sitename erhalten.
+du hast eine Kontaktanfrage von '$[requestor]' auf $[sitename] 
 
-Du kannst dir das Profil unter $url ansehen.
+erhalten.
 
-Bitte melde dich auf deiner Seite an um die komplette Vorstellung anzusehen
-und bestätige oder ignoriere die Anfrage.
+Du kannst sein/ihr Profil unter $[url] finden.
 
-$siteurl
+Bitte melde dich an um die komplette Vorstellung einzusehen 
+und die Anfrage zu bestätigen oder zu ignorieren oder abzulehnen.
 
-Schöne Grüße,
-	$sitename Administrator
+$[siteurl]
+
+Beste Grüße,
+
+	$[sitename] Administrator
\ No newline at end of file
diff --git a/view/de/strings.php b/view/de/strings.php
index 3f9176cd7..74125549d 100755..100644
--- a/view/de/strings.php
+++ b/view/de/strings.php
@@ -120,7 +120,7 @@ $a->strings["running at web location"] = "die unter folgender Webadresse zu find
 $a->strings["Please visit <a href=\"http://friendica.com\">Friendica.com</a> to learn more about the Friendica project."] = "Bitte besuche <a href=\"http://friendica.com\">Friendica.com</a> um mehr über das Friendica Projekt zu erfahren.";
 $a->strings["Bug reports and issues: please visit"] = "Probleme oder Fehler gefunden? Bitte besuche";
 $a->strings["Suggestions, praise, donations, etc. - please email \"Info\" at Friendica - dot com"] = "Vorschläge, Lob, Spenden usw.: E-Mail an \"Info\" at Friendica - dot com";
-$a->strings["Installed plugins/addons/apps"] = "Installierte Plugins/Erweiterungen/Apps";
+$a->strings["Installed plugins/addons/apps:"] = "Installierte Plugins/Erweiterungen/Apps";
 $a->strings["No installed plugins/addons/apps"] = "Keine Plugins/Erweiterungen/Apps installiert";
 $a->strings["Item not found"] = "Beitrag nicht gefunden";
 $a->strings["Edit post"] = "Beitrag bearbeiten";
@@ -128,7 +128,7 @@ $a->strings["Post to Email"] = "An E-Mail senden";
 $a->strings["Edit"] = "Bearbeiten";
 $a->strings["Upload photo"] = "Foto hochladen";
 $a->strings["Attach file"] = "Datei anhängen";
-$a->strings["Insert web link"] = "Weblink einfügen";
+$a->strings["Insert web link"] = "einen Link einfügen";
 $a->strings["Insert YouTube video"] = "YouTube-Video einfügen";
 $a->strings["Insert Vorbis [.ogg] video"] = "Vorbis [.ogg] Video einfügen";
 $a->strings["Insert Vorbis [.ogg] audio"] = "Vorbis [.ogg] Audio einfügen";
@@ -138,6 +138,7 @@ $a->strings["Permission settings"] = "Berechtigungseinstellungen";
 $a->strings["CC: email addresses"] = "Cc:-E-Mail-Addressen";
 $a->strings["Public post"] = "Öffentlicher Beitrag";
 $a->strings["Set title"] = "Titel setzen";
+$a->strings["Categories (comma-separated list)"] = "Kategorien (mit Komma separierte Liste)";
 $a->strings["Example: bob@example.com, mary@example.com"] = "Z.B.: bob@example.com, mary@example.com";
 $a->strings["This introduction has already been accepted."] = "Diese Kontaktanfrage wurde bereits akzeptiert.";
 $a->strings["Profile location is not valid or does not contain profile information."] = "Profiladresse ist ungültig oder stellt einige Profildaten nicht zur Verfügung.";
@@ -154,6 +155,8 @@ $a->strings["%s has received too many connection requests today."] = "%s hat heu
 $a->strings["Spam protection measures have been invoked."] = "Maßnahmen zum Spamschutz wurden ergriffen.";
 $a->strings["Friends are advised to please try again in 24 hours."] = "Freunde sind angehalten, es in 24 Stunden erneut zu versuchen.";
 $a->strings["Invalid locator"] = "Ungültiger Locator";
+$a->strings["Invalid email address."] = "Ungültige E-Mail Adresse.";
+$a->strings["This account has not been configured for email. Request failed."] = "Dieses Konto ist nicht für Email konfiguriert. Anfrage fehlgeschlagen.";
 $a->strings["Unable to resolve your name at the provided location."] = "Konnte deinen Namen an der angegebenen Stelle nicht finden.";
 $a->strings["You have already introduced yourself here."] = "Du hast dich hier bereits vorgestellt.";
 $a->strings["Apparently you are already friends with %s."] = "Es scheint so, als ob du bereits mit %s befreundet bist.";
@@ -167,8 +170,9 @@ $a->strings["Welcome home %s."] = "Willkommen zurück %s.";
 $a->strings["Please confirm your introduction/connection request to %s."] = "Bitte bestätige deine Kontaktanfrage bei %s.";
 $a->strings["Confirm"] = "Bestätigen";
 $a->strings["[Name Withheld]"] = "[Name unterdrückt]";
-$a->strings["Diaspora members: Please do not use this form. Instead, enter \"%s\" into your Diaspora search bar."] = "Diaspora-User: Bitte nicht dieses Formular benutzen! Gebt statt dessen \"%s\" in der Diaspora-Suchleiste ein.";
-$a->strings["Please enter your 'Identity Address' from one of the following supported social networks:"] = "Bitte gib die Adresse deines Profils in einem der unterstützten sozialen Netzwerke an:";
+$a->strings["Please enter your 'Identity Address' from one of the following supported communications networks:"] = "Bitte gib die Adresse deines Profils in einem der unterstützten sozialen Netzwerke an:";
+$a->strings["<strike>Connect as an email follower</strike> (Coming soon)"] = "<strike>Als E-Mail-Kontakt verbinden</strike> (In Kürze verfügbar)";
+$a->strings["If you are not yet a member of the free social web, <a href=\"http://dir.friendica.com/siteinfo\">follow this link to find a public Friendica site and join us today</a>."] = "Wenn du noch kein Mitglied dieses freien sozialen Netzwerks bist, <a href=\"http://dir.friendica.com/siteinfo\">folge diesem Link</a> um einen öffentlichen Friendica-Server zu finden und beizutreten.";
 $a->strings["Friend/Connection Request"] = "Freundschafts-/Kontaktanfrage";
 $a->strings["Examples: jojo@demo.friendica.com, http://demo.friendica.com/profile/jojo, testuser@identi.ca"] = "Beispiele: jojo@demo.friendica.com, http://demo.friendica.com/profile/jojo, testuser@identi.ca";
 $a->strings["Please answer the following:"] = "Bitte beantworte Folgendes:";
@@ -177,7 +181,7 @@ $a->strings["Add a personal note:"] = "Eine persönliche Notiz beifügen:";
 $a->strings["Friendica"] = "Friendica";
 $a->strings["StatusNet/Federated Social Web"] = "StatusNet/Federated Social Web";
 $a->strings["Diaspora"] = "Diaspora";
-$a->strings["- please share from your own site as noted above"] = "- bitte fange von Deiner eigenen Seite aus zu teilen an";
+$a->strings[" - please do not use this form.  Instead, enter %s into your Diaspora search bar."] = " - bitte verwende dieses Formular nicht. Stattdessen suche nach %s in deiner Diaspora Suchleiste.";
 $a->strings["Your Identity Address:"] = "Adresse deines Profils:";
 $a->strings["Submit Request"] = "Anfrage abschicken";
 $a->strings["Friendica Social Communications Server - Setup"] = "Friendica-Server für soziale Netzwerke – Setup";
@@ -210,7 +214,7 @@ $a->strings["Enter full path to php executable"] = "Kompletter Pfad zum PHP-Exec
 $a->strings["Command line PHP"] = "Kommandozeilen-PHP";
 $a->strings["The command line version of PHP on your system does not have \"register_argc_argv\" enabled."] = "Die Kommandozeilenversion von PHP auf deinem System hat \"register_argc_argv\" nicht aktiviert.";
 $a->strings["This is required for message delivery to work."] = "Dies wird für die Auslieferung von Nachrichten benötigt.";
-$a->strings["PHP \"register_argc_argv\""] = "PHP \"register_argc_argv\"";
+$a->strings["PHP register_argc_argv"] = "PHP register_argc_argv";
 $a->strings["Error: the \"openssl_pkey_new\" function on this system is not able to generate encryption keys"] = "Fehler: Die Funktion \"openssl_pkey_new\" auf diesem System ist nicht in der Lage, Verschlüsselungsschlüssel zu erzeugen";
 $a->strings["If running under Windows, please see \"http://www.php.net/manual/en/openssl.installation.php\"."] = "Wenn der Server unter Windows läuft, schau dir bitte \"http://www.php.net/manual/en/openssl.installation.php\" an.";
 $a->strings["Generate encryption keys"] = "Schlüssel erzeugen";
@@ -219,7 +223,7 @@ $a->strings["GD graphics PHP module"] = "PHP: GD-Grafikmodul";
 $a->strings["OpenSSL PHP module"] = "PHP: OpenSSL-Modul";
 $a->strings["mysqli PHP module"] = "PHP: mysqli-Modul";
 $a->strings["mb_string PHP module"] = "PHP: mb_string-Modul";
-$a->strings["Apace mod_rewrite module"] = "Apache: mod_rewrite-Modul";
+$a->strings["Apache mod_rewrite module"] = "Apache mod_rewrite module";
 $a->strings["Error: Apache webserver mod-rewrite module is required but not installed."] = "Fehler: Das Apache-Modul mod-rewrite wird benötigt, es ist allerdings nicht installiert.";
 $a->strings["Error: libCURL PHP module required but not installed."] = "Fehler: Das libCURL PHP Modul wird benötigt ist aber nicht installiert.";
 $a->strings["Error: GD graphics PHP module with JPEG support required but not installed."] = "Fehler: Das GD-Graphikmodul für PHP mit JPEG-Unterstützung ist nicht installiert.";
@@ -334,6 +338,7 @@ $a->strings["Update now"] = "Jetzt aktualisieren";
 $a->strings["Currently blocked"] = "Derzeit geblockt";
 $a->strings["Currently ignored"] = "Derzeit ignoriert";
 $a->strings["Replies/likes to your public posts <strong>may</strong> still be visible"] = "Antworten/Likes auf deine öffentlichen Beiträge <strong>könnten</strong> weiterhin sichtbar sein";
+$a->strings["Suggestions"] = "Kontaktvorschläge";
 $a->strings["All Contacts"] = "Alle Kontakte";
 $a->strings["Unblocked Contacts"] = "Nicht blockierte Kontakte";
 $a->strings["Blocked Contacts"] = "Blockierte Kontakte";
@@ -362,6 +367,13 @@ $a->strings["Forgot your Password?"] = "Hast du dein Passwort vergessen?";
 $a->strings["Enter your email address and submit to have your password reset. Then check your email for further instructions."] = "Gib deine Email-Adresse an und fordere ein neues Passwort an. Es werden dir dann weitere Informationen per Mail zugesendet.";
 $a->strings["Nickname or Email: "] = "Spitzname oder Email:";
 $a->strings["Reset"] = "Zurücksetzen";
+$a->strings["Account settings"] = "Account Einstellungen";
+$a->strings["Display settings"] = "Anzeige Einstellungen";
+$a->strings["Connector settings"] = "Connector-Einstellungen";
+$a->strings["Plugin settings"] = "Plugin-Einstellungen";
+$a->strings["Connected apps"] = "Verbundene Programme";
+$a->strings["Export personal data"] = "Persönliche Daten exportieren";
+$a->strings["Settings"] = "Einstellungen";
 $a->strings["Missing some important data!"] = "Wichtige Daten fehlen!";
 $a->strings["Update"] = "Aktualisierungen";
 $a->strings["Failed to connect with email account using the settings provided."] = "Konnte das Email Konto mit den angegebenen Einstellungen nicht erreichen.";
@@ -375,11 +387,6 @@ $a->strings[" Name too short."] = " Name ist zu kurz.";
 $a->strings[" Not valid email."] = " Keine gültige E-Mail.";
 $a->strings[" Cannot change to that email."] = "Ändern der E-Mail nicht möglich. ";
 $a->strings["Settings updated."] = "Einstellungen aktualisiert.";
-$a->strings["Account settings"] = "Account Einstellungen";
-$a->strings["Connector settings"] = "Connector-Einstellungen";
-$a->strings["Plugin settings"] = "Plugin-Einstellungen";
-$a->strings["Connections"] = "Verbindungen";
-$a->strings["Export personal data"] = "Persönliche Daten exportieren";
 $a->strings["Add application"] = "Programm hinzufügen";
 $a->strings["Consumer Key"] = "Consumer Key";
 $a->strings["Consumer Secret"] = "Consumer Secret";
@@ -413,6 +420,13 @@ $a->strings["Action after import:"] = "Aktion nach Import:";
 $a->strings["Mark as seen"] = "Als gelesen markieren";
 $a->strings["Move to folder"] = "In einen Ordner verschieben";
 $a->strings["Move to folder:"] = "In diesen Ordner verschieben:";
+$a->strings["Display Settings"] = "Anzeige Einstellungen";
+$a->strings["Display Theme:"] = "Theme:";
+$a->strings["Update browser every xx seconds"] = "Browser alle xx Sekunden aktualisieren";
+$a->strings["Minimum of 10 seconds, no maximum"] = "Minimal 10 Sekunden, kein Maximum";
+$a->strings["Number of items to display on the network page:"] = "Zahl der Beiträge, welche pro Netzwerkseite angezeigt werden sollen: ";
+$a->strings["Maximum of 100 items"] = "Maximal 100 Beiträge";
+$a->strings["Don't show emoticons"] = "Keine Smilies anzeigen";
 $a->strings["Normal Account"] = "Normaler Account";
 $a->strings["This account is a normal personal profile"] = "Dieser Account ist ein normales persönliches Profil";
 $a->strings["Soapbox Account"] = "Sandkasten-Account";
@@ -430,6 +444,7 @@ $a->strings["Hide your profile details from unknown viewers?"] = "Profil-Details
 $a->strings["Allow friends to post to your profile page?"] = "Deinen Kontakten erlauben, auf deine Pinnwand zu schreiben?";
 $a->strings["Allow friends to tag your posts?"] = "Deinen Kontakten erlauben, deine Beiträge mit Schlagwörtern zu versehen?";
 $a->strings["Allow us to suggest you as a potential friend to new members?"] = "Erlaube uns dich als potentiellen Kontakt für neue Mitglieder vorzuschlagen?";
+$a->strings["Permit unknown people to send you private mail?"] = "Erlaube es Unbekannten dir private Nachrichten zu schicken?";
 $a->strings["Profile is <strong>not published</strong>."] = "Profil ist <strong>nicht veröffentlicht</strong>.";
 $a->strings["or"] = "oder";
 $a->strings["Your Identity Address is"] = "Die Adresse deines Profils lautet:";
@@ -452,15 +467,16 @@ $a->strings["Email Address:"] = "Emailadresse:";
 $a->strings["Your Timezone:"] = "Deine Zeitzone:";
 $a->strings["Default Post Location:"] = "Standardstandort:";
 $a->strings["Use Browser Location:"] = "Verwende den Standort des Browsers:";
-$a->strings["Display Theme:"] = "Theme:";
-$a->strings["Update browser every xx seconds"] = "Browser alle xx Sekunden aktualisieren";
-$a->strings["Minimum of 10 seconds, no maximum"] = "Minimal 10 Sekunden, kein Maximum";
 $a->strings["Security and Privacy Settings"] = "Sicherheits- und Privatsphäre-Einstellungen";
 $a->strings["Maximum Friend Requests/Day:"] = "Maximale Anzahl von Freundschaftsanfragen/Tag:";
 $a->strings["(to prevent spam abuse)"] = "(um SPAM zu vermeiden)";
 $a->strings["Default Post Permissions"] = "Standard-Zugriffsrechte für Beiträge";
 $a->strings["(click to open/close)"] = "(klicke zum öffnen/schließen)";
+$a->strings["Maximum private messages per day from unknown people:"] = "Maximale Anzahl von privaten Nachrichten, die dir unbekannte Personen pro Tag senden dürfen:";
 $a->strings["Notification Settings"] = "Benachrichtigungseinstellungen";
+$a->strings["By default post a status message when:"] = "Standardmäßig eine Status-Nachricht posten wenn:";
+$a->strings["accepting a friend request"] = "akzeptieren einer Freundschaftsanfrage";
+$a->strings["making an <em>interesting</em> profile change"] = "<em>interessante</em> Änderungen am Profil gemacht werden";
 $a->strings["Send a notification email when:"] = "Benachrichtigungs-E-Mail senden wenn:";
 $a->strings["You receive an introduction"] = "- du eine Kontaktanfrage erhältst";
 $a->strings["Your introductions are confirmed"] = "- eine deiner Kontaktanfragen akzeptiert wurde";
@@ -481,7 +497,7 @@ $a->strings["Commented Order"] = "Neueste Kommentare";
 $a->strings["Posted Order"] = "Neueste Beiträge";
 $a->strings["New"] = "Neue";
 $a->strings["Starred"] = "Markierte";
-$a->strings["Bookmarks"] = "Lesezeichen";
+$a->strings["Shared Links"] = "Geteilte Links";
 $a->strings["Warning: This group contains %s member from an insecure network."] = array(
 	0 => "Warnung: Diese Gruppe beinhaltet %s Person aus einem unsicheren Netzwerk.",
 	1 => "Warnung: Diese Gruppe beinhaltet %s Personen aus unsicheren Netzwerken.",
@@ -495,9 +511,23 @@ $a->strings["Private messages to this person are at risk of public disclosure."]
 $a->strings["Invalid contact."] = "Ungültiger Kontakt.";
 $a->strings["Personal Notes"] = "Persönliche Notizen";
 $a->strings["Save"] = "Speichern";
+$a->strings["Number of daily wall messages for %s exceeded. Message failed."] = "Maximale Anzahl der täglichen Pinnwand Nachrichten für %s ist überschritten. Zustellung fehlgeschlagen.";
+$a->strings["No recipient selected."] = "Kein Empfänger gewählt.";
+$a->strings["Unable to check your home location."] = "Konnte deinen Heimatort nicht bestimmen.";
+$a->strings["Message could not be sent."] = "Nachricht konnte nicht gesendet werden.";
+$a->strings["Message collection failure."] = "Konnte Nachrichten nicht abrufen.";
+$a->strings["Message sent."] = "Nachricht gesendet.";
+$a->strings["No recipient."] = "Kein Empfänger.";
+$a->strings["Please enter a link URL:"] = "Bitte gib die URL des Links ein:";
+$a->strings["Send Private Message"] = "Private Nachricht senden";
+$a->strings["If you wish for %s to respond, please check that the privacy settings on your site allow private mail from unknown senders."] = "Wenn du möchtest, dass %s dir antworten kann, überprüfe deine Privatsphären-Einstellungen und erlaube private Nachrichten von unbekannten Absendern.";
+$a->strings["To:"] = "An:";
+$a->strings["Subject:"] = "Betreff:";
+$a->strings["Your message:"] = "Deine Nachricht:";
 $a->strings["Welcome to Friendica"] = "Willkommen bei Friendica";
 $a->strings["New Member Checklist"] = "Checkliste für neue Mitglieder";
 $a->strings["We would like to offer some tips and links to help make your experience enjoyable. Click any item to visit the relevant page. A link to this page will be visible from your home page for two weeks after your initial registration and then will quietly disappear."] = "Wir möchten Dir einige Tipps und Links anbieten, die Dir helfen könnten, den Einstieg angenehmer zu machen. Klicke auf ein Element, um die entsprechende Seite zu besuchen. Ein Link zu dieser Seite hier bleibt für Dich an Deiner Pinnwand für zwei Wochen nach dem Registrierungsdatum sichtbar und wird dann verschwinden.";
+$a->strings["On your <em>Quick Start</em> page - find a brief introduction to your profile and network tabs, connect to Facebook, make some new connections, and find some groups to join."] = "Auf der <em>Quick Start</em> Seite findest du eine kurze Einleitung in die einzelnen Funktionen deines Profils und die Netzwerk-Reiter, wo du interessante Foren findest, wie du alte Freunde von Facebook wieder findest und neue Kontakte knüpfst.";
 $a->strings["On your <em>Settings</em> page -  change your initial password. Also make a note of your Identity Address. This looks just like an email address - and will be useful in making friends on the free social web."] = "Ändere bitte unter <em>Einstellungen</em> Dein Passwort. Außerdem merke Dir Deine Indentifikations-Adresse. Diese sieht aus wie eine E-Mail-Adresse und wird benötigt, um Freundschaften mit anderen im Friendica Netzwerk zu schliessen.";
 $a->strings["Review the other settings, particularly the privacy settings. An unpublished directory listing is like having an unlisted phone number. In general, you should probably publish your listing - unless all of your friends and potential friends know exactly how to find you."] = "Überprüfe die restlichen Einstellungen, insbesondere die Einstellungen zur Privatsphäre. Wenn du dein Profil nicht veröffentlichst, ist das als wenn Du Deine Telefonnummer nicht ins Telefonbuch einträgst. Im Allgemeinen solltest du es veröffentlichen - außer all deine Freunde und potentiellen Freunde wissen genau, wie sie dich finden können.";
 $a->strings["Upload a profile photo if you have not done so already. Studies have shown that people with real photos of themselves are ten times more likely to make friends than people who do not."] = "Lade ein Profilbild hoch falls du es noch nicht getan hast. Studien haben gezeigt, dass es zehnmal wahrscheinlicher ist neue Freunde zu finden, wenn du ein Bild von dir selbst verwendest, als wenn du dies nicht tust.";
@@ -544,6 +574,7 @@ $a->strings["Not a valid email address."] = "Keine gültige E-Mail-Adresse.";
 $a->strings["Cannot use that email."] = "Konnte diese E-Mail-Adresse nicht verwenden.";
 $a->strings["Your \"nickname\" can only contain \"a-z\", \"0-9\", \"-\", and \"_\", and must also begin with a letter."] = "Dein Spitzname darf nur aus Buchstaben und Zahlen (\"a-z\",\"0-9\", \"_\" und \"-\") bestehen, außerdem muss er mit einem Buchstaben beginnen.";
 $a->strings["Nickname is already registered. Please choose another."] = "Dieser Spitzname ist bereits vergeben. Bitte wähle einen anderen.";
+$a->strings["Nickname was once registered here and may not be re-used. Please choose another."] = "Dieser Spitzname ist bereits vergeben. Bitte wähle einen anderen.";
 $a->strings["SERIOUS ERROR: Generation of security keys failed."] = "FATALER FEHLER: Sicherheitsschlüssel konnten nicht erzeugt werden.";
 $a->strings["An error occurred during registration. Please try again."] = "Wärend der Anmeldung ist ein Fehler aufgetreten. Bitte versuche es noch einmal.";
 $a->strings["An error occurred creating your default profile. Please try again."] = "Bei der Erstellung des Standard-Profils ist ein Fehler aufgetreten. Bitte versuche es noch einmal.";
@@ -572,6 +603,8 @@ $a->strings["%1\$s likes %2\$s's %3\$s"] = "%1\$s mag %2\$ss %3\$s";
 $a->strings["%1\$s doesn't like %2\$s's %3\$s"] = "%1\$s mag %2\$ss %3\$s nicht";
 $a->strings["Item not found."] = "Beitrag nicht gefunden.";
 $a->strings["Access denied."] = "Zugriff verweigert.";
+$a->strings["Photos"] = "Bilder";
+$a->strings["Files"] = "Dateien";
 $a->strings["Account approved."] = "Account freigegeben.";
 $a->strings["Registration revoked for %s"] = "Registrierung für %s wurde zurückgezogen";
 $a->strings["Please login."] = "Bitte melde dich an.";
@@ -601,29 +634,27 @@ $a->strings["No profile"] = "Kein Profil";
 $a->strings["Remove My Account"] = "Account löschen";
 $a->strings["This will completely remove your account. Once this has been done it is not recoverable."] = "Dies wird deinen Account endgültig löschen. Es gibt keine Möglichkeit, ihn wiederherzustellen.";
 $a->strings["Please enter your password for verification:"] = "Bitte gib dein Passwort zur Verifikation ein:";
-$a->strings["No recipient selected."] = "Kein Empfänger gewählt.";
-$a->strings["Unable to locate contact information."] = "Konnte die Kontaktinformationen nicht finden.";
-$a->strings["Message could not be sent."] = "Nachricht konnte nicht gesendet werden.";
-$a->strings["Message collection failure."] = "Konnte Nachrichten nicht abrufen.";
-$a->strings["Message sent."] = "Nachricht gesendet.";
-$a->strings["Inbox"] = "Eingang";
-$a->strings["Outbox"] = "Ausgang";
 $a->strings["New Message"] = "Neue Nachricht";
+$a->strings["Unable to locate contact information."] = "Konnte die Kontaktinformationen nicht finden.";
 $a->strings["Message deleted."] = "Nachricht gelöscht.";
 $a->strings["Conversation removed."] = "Unterhaltung gelöscht.";
-$a->strings["Please enter a link URL:"] = "Bitte gib die URL des Links ein:";
-$a->strings["Send Private Message"] = "Private Nachricht senden";
-$a->strings["To:"] = "An:";
-$a->strings["Subject:"] = "Betreff:";
-$a->strings["Your message:"] = "Deine Nachricht:";
 $a->strings["No messages."] = "Keine Nachrichten.";
+$a->strings["Unknown sender - %s"] = "'Unbekannter Absender - %s";
+$a->strings["You and %s"] = "Du und %s";
+$a->strings["%s and You"] = "%s und Du";
 $a->strings["Delete conversation"] = "Unterhaltung löschen";
 $a->strings["D, d M Y - g:i A"] = "D, d. M Y - g:i A";
+$a->strings["%d message"] = array(
+	0 => "%d Nachricht",
+	1 => "%d Nachrichten",
+);
 $a->strings["Message not available."] = "Nachricht nicht verfügbar.";
 $a->strings["Delete message"] = "Nachricht löschen";
+$a->strings["No secure communications available. You <strong>may</strong> be able to respond from the sender's profile page."] = "Sichere Kommunikation ist nicht verfügbar. <strong>Eventuell</strong> kannst du auf der Profilseite des Absenders antworten.";
 $a->strings["Send Reply"] = "Antwort senden";
 $a->strings["Friends of %s"] = "Freunde von %s";
 $a->strings["No friends to display."] = "Keine Freunde zum Anzeigen.";
+$a->strings["Theme settings updated."] = "Themen Einstellungen aktualisiert.";
 $a->strings["Site"] = "Seite";
 $a->strings["Users"] = "Nutzer";
 $a->strings["Plugins"] = "Plugins";
@@ -640,6 +671,9 @@ $a->strings["Site settings updated."] = "Seiteneinstellungen aktualisiert.";
 $a->strings["Closed"] = "Geschlossen";
 $a->strings["Requires approval"] = "Bedarf der Zustimmung";
 $a->strings["Open"] = "Offen";
+$a->strings["No SSL policy, links will track page SSL state"] = "Keine SSL Richtlinie, Links werden das verwendete Protokoll beibehalten";
+$a->strings["Force all links to use SSL"] = "SSL für alle Links erzwingen";
+$a->strings["Self-signed certificate, use SSL for local links only (discouraged)"] = "Selbst-unterzeichnetes Zertifikat, SSL nur für lokale Links verwenden (nicht empfohlen)";
 $a->strings["File upload"] = "Datei hochladen";
 $a->strings["Policies"] = "Regeln";
 $a->strings["Advanced"] = "Erweitert";
@@ -647,7 +681,9 @@ $a->strings["Site name"] = "Seitenname";
 $a->strings["Banner/Logo"] = "Banner/Logo";
 $a->strings["System language"] = "Systemsprache";
 $a->strings["System theme"] = "Systemweites Thema";
-$a->strings["Default system theme - may be over-ridden by user profiles"] = "Standard Server Theme - kann von den Benutzereinstellungen überschrieben werden.";
+$a->strings["Default system theme - may be over-ridden by user profiles - <a href='#' id='cnftheme'>change theme settings</a>"] = "Vorgabe für das System-Theme - kann von Benutzerprofilen überschrieben werden - <a href='#' id='cnftheme'>Theme-Einstellungen ändern</a>";
+$a->strings["SSL link policy"] = "Regeln für SSL Links";
+$a->strings["Determines whether generated links should be forced to use SSL"] = "Bestimmt, ob generierte Links SSL verwenden müssen";
 $a->strings["Maximum image size"] = "Maximale Größe von Bildern";
 $a->strings["Maximum size in bytes of uploaded images. Default is 0, which means no limits."] = "Maximale Upload-Größe von Bildern in Bytes. Standard ist 0, d.h. ohne Limit.";
 $a->strings["Register policy"] = "Registrierungsmethode";
@@ -669,8 +705,6 @@ $a->strings["Block multiple registrations"] = "Unterbinde Mehrfachregistrierung"
 $a->strings["Disallow users to register additional accounts for use as pages."] = "Benutzern nicht erlauben, weitere Accounts als zusätzliche Profile anzulegen.";
 $a->strings["OpenID support"] = "OpenID Unterstützung";
 $a->strings["OpenID support for registration and logins."] = "OpenID-Unterstützung für Registrierung und Login.";
-$a->strings["Gravatar support"] = "Gravatar Unterstützung";
-$a->strings["Search new user's photo on Gravatar."] = "Suchfunktion bei Gravatar für Profilbilder neuer Nutzer.";
 $a->strings["Fullname check"] = "Namen auf Vollständigkeit überprüfen";
 $a->strings["Force users to register with a space between firstname and lastname in Full name, as an antispam measure"] = "Leerzeichen zwischen Vor- und Nachname im vollständigen Namen erzwingen, um SPAM zu vermeiden.";
 $a->strings["UTF-8 Regular expressions"] = "UTF-8 Reguläre Ausdrücke";
@@ -684,7 +718,7 @@ $a->strings["Provide built-in Diaspora network compatibility."] = "Verwende die
 $a->strings["Only allow Friendica contacts"] = "Nur Friendica-Kontakte erlauben";
 $a->strings["All contacts must use Friendica protocols. All other built-in communication protocols disabled."] = "Alle Kontakte müssen das Friendica Protokoll nutzen. Alle anderen Kommunikationsprotokolle werden deaktiviert.";
 $a->strings["Verify SSL"] = "SSL Überprüfen";
-$a->strings["If you wish, you can turn on strict certificate checking. This will mean you cannot connect (at all) to self-signed SSL sites."] = "Wenn gewollt, kann man hier eine strenge Zertifikat Kontrolle anstellen. Das bedeutet, das man zu keinen Seiten mit selbst unterzeichneten SSL eine Verbindung herstellen kann.";
+$a->strings["If you wish, you can turn on strict certificate checking. This will mean you cannot connect (at all) to self-signed SSL sites."] = "Wenn gewollt, kann man hier eine strenge Zertifikat Kontrolle einstellen. Das bedeutet, dass man zu keinen Seiten mit selbst unterzeichnetem SSL eine Verbindung herstellen kann.";
 $a->strings["Proxy user"] = "Proxy Nutzer";
 $a->strings["Proxy URL"] = "Proxy URL";
 $a->strings["Network timeout"] = "Netzwerk Wartezeit";
@@ -717,10 +751,10 @@ $a->strings["Plugin %s enabled."] = "Plugin %s aktiviert.";
 $a->strings["Disable"] = "Ausschalten";
 $a->strings["Enable"] = "Einschalten";
 $a->strings["Toggle"] = "Umschalten";
-$a->strings["Settings"] = "Einstellungen";
 $a->strings["Author: "] = "Autor:";
 $a->strings["Maintainer: "] = "Betreuer:";
 $a->strings["No themes found."] = "Keine Themen gefunden.";
+$a->strings["Screenshot"] = "Bildschirmfoto";
 $a->strings["[Experimental]"] = "[Experimentell]";
 $a->strings["[Unsupported]"] = "[Nicht unterstützt]";
 $a->strings["Log settings updated."] = "Protokolleinstellungen aktualisiert.";
@@ -747,6 +781,9 @@ $a->strings["{0} is now friends with %s"] = "{0} ist jetzt mit %s befreundet";
 $a->strings["{0} posted"] = "{0} hat etwas veröffentlicht";
 $a->strings["{0} tagged %s's post with #%s"] = "{0} hat %ss Beitrag mit dem Schlagwort #%s versehen";
 $a->strings["{0} mentioned you in a post"] = "{0} hat dich in einem Beitrag erwähnt";
+$a->strings["Contacts who are not members of a group"] = "Kontakte, die keiner Gruppe zugewiesen sind";
+$a->strings["OpenID protocol error. No ID returned."] = "OpenID Protokollfehler. Keine ID zurückgegeben.";
+$a->strings["Account not found and OpenID registration is not permitted on this site."] = "Account wurde nicht gefunden und OpenID Registrierung auf diesem Server nicht gestattet.";
 $a->strings["Login failed."] = "Annmeldung fehlgeschlagen.";
 $a->strings["Connect URL missing."] = "Connect-URL fehlt";
 $a->strings["This site is not configured to allow communications with other networks."] = "Diese Seite ist so konfiguriert, dass keine Kommunikation mit anderen Netzwerken erfolgen kann.";
@@ -766,7 +803,19 @@ $a->strings["No installed applications."] = "Keine Applikationen installiert.";
 $a->strings["Search This Site"] = "Diese Seite durchsuchen";
 $a->strings["Profile not found."] = "Profil nicht gefunden.";
 $a->strings["Profile Name is required."] = "Profilname ist erforderlich.";
+$a->strings["Marital Status"] = "Familienstand";
+$a->strings["Romantic Partner"] = "Romanze";
+$a->strings["Work/Employment"] = "Arbeit / Beschäftigung";
+$a->strings["Religion"] = "Religion";
+$a->strings["Political Views"] = "Politische Ansichten";
+$a->strings["Gender"] = "Geschlecht";
+$a->strings["Sexual Preference"] = "Sexuelle Vorlieben";
+$a->strings["Homepage"] = "Webseite";
+$a->strings["Interests"] = "Interessen";
+$a->strings["Location"] = "Wohnort";
 $a->strings["Profile updated."] = "Profil aktualisiert.";
+$a->strings["public profile"] = "öffentliches Profil";
+$a->strings["%1\$s has an updated %2\$s, changing %3\$s."] = "%1\$s hat folgendes aktualisiert %2\$s, verändert wurde %3\$s.";
 $a->strings["Profile deleted."] = "Profil gelöscht.";
 $a->strings["Profile-"] = "Profil-";
 $a->strings["New profile created."] = "Neues Profil angelegt.";
@@ -817,6 +866,8 @@ $a->strings["Create New Profile"] = "Neues Profil anlegen";
 $a->strings["Profile Image"] = "Profilbild";
 $a->strings["visible to everybody"] = "sichtbar für jeden";
 $a->strings["Edit visibility"] = "Sichtbarkeit bearbeiten";
+$a->strings["Save to Folder:"] = "In diesen Ordner verschieben:";
+$a->strings["- select -"] = "- auswählen -";
 $a->strings["%1\$s tagged %2\$s's %3\$s with %4\$s"] = "%1\$s hat %2\$ss %3\$s mit %4\$s getaggt";
 $a->strings["No potential page delegates located."] = "Keine potentiellen Bevollmächtigten für die Seite gefunden.";
 $a->strings["Delegate Page Management"] = "Delegiere das Management für die Seite";
@@ -830,26 +881,28 @@ $a->strings["Friend Suggestions"] = "Kontaktvorschläge";
 $a->strings["No suggestions available. If this is a new site, please try again in 24 hours."] = "Keine Vorschläge. Falls der Server frisch aufgesetzt wurde, versuche es bitte in 24 Stunden noch einmal.";
 $a->strings["Ignore/Hide"] = "Ignorieren/Verbergen";
 $a->strings["Global Directory"] = "Weltweites Verzeichnis";
-$a->strings["Normal site view"] = "Normale Seitenansicht";
-$a->strings["Admin - View all site entries"] = "Admin: Alle Einträge dieses Servers anzeigen";
 $a->strings["Find on this site"] = "Auf diesem Server suchen";
 $a->strings["Site Directory"] = "Verzeichnis";
 $a->strings["Gender: "] = "Geschlecht:";
 $a->strings["No entries (some entries may be hidden)."] = "Keine Einträge (einige Einträge könnten versteckt sein).";
 $a->strings["%s : Not a valid email address."] = "%s: Keine gültige Email Adresse.";
-$a->strings["Please join my network on %s"] = "Bitte trete meinem Netzwerk auf %s bei";
+$a->strings["Please join us on Friendica"] = "Bitte trete uns auf Friendica bei";
 $a->strings["%s : Message delivery failed."] = "%s: Zustellung der Nachricht fehlgeschlagen.";
 $a->strings["%d message sent."] = array(
 	0 => "%d Nachricht gesendet.",
 	1 => "%d Nachrichten gesendet.",
 );
 $a->strings["You have no more invitations available"] = "Du hast keine weiteren Einladungen";
+$a->strings["Visit %s for a list of public sites that you can join. Friendica members on other sites can all connect with each other, as well as with members of many other social networks."] = "Besuche %s für eine Liste der öffentlichen Server, denen du beitreten kannst. Friendica Mitglieder unterschiedlicher Server können sich sowohl alle miteinander verbinden, als auch mit Mitgliedern anderer Sozialer Netzwerke.";
+$a->strings["To accept this invitation, please visit and register at %s or any other public Friendica website."] = "Um diese Freundschaftsanfrage zu akzeptieren, besuche und registriere dich bitte bei %s oder einer anderen öffentlichen Friendica Website.";
+$a->strings["Friendica sites all inter-connect to create a huge privacy-enhanced social web that is owned and controlled by its members. They can also connect with many traditional social networks. See %s for a list of alternate Friendica sites you can join."] = "Friendica Server verbinden sich alle untereinander, um ein großes datenschutzorientiertes Soziales Netzwerk zu bilden, das von seinen Mitgliedern betrieben und kontrolliert wird. Sie können sich auch mit vielen üblichen Sozialen Netzwerken verbinden. Besuche %s für eine Liste alternativer Friendica Server, denen du beitreten kannst.";
+$a->strings["Our apologies. This system is not currently configured to connect with other public sites or invite members."] = "Es tut uns Leid. Dieses System ist zurzeit nicht dafür konfiguriert, sich mit anderen öffentlichen Seiten zu verbinden oder Mitglieder einzuladen.";
 $a->strings["Send invitations"] = "Einladungen senden";
 $a->strings["Enter email addresses, one per line:"] = "E-Mail-Adressen eingeben, eine pro Zeile:";
-$a->strings["Please join my social network on %s"] = "Bitte trete meinem Sozialen Netzwerk auf %s bei";
-$a->strings["To accept this invitation, please visit:"] = "Um diese Einladung anzunehmen besuche bitte:";
+$a->strings["You are cordially invited to join me and other close friends on Friendica - and help us to create a better social web."] = "Du bist herzlich dazu eingeladen, dich mir und anderen guten Freunden auf Friendica anzuschließen - und ein besseres Soziales Netz aufzubauen.";
 $a->strings["You will need to supply this invitation code: \$invite_code"] = "Du benötigst den folgenden Einladungscode: \$invite_code";
 $a->strings["Once you have registered, please connect with me via my profile page at:"] = "Sobald du registriert bist, kontaktiere mich bitte auf meiner Profilseite:";
+$a->strings["For more information about the Friendica project and why we feel it is important, please visit http://friendica.com"] = "Für weitere Informationen über das Friendica Projekt und warum wir es für ein wichtiges Projekt halten, besuche bitte http://friendica.com";
 $a->strings["This may occasionally happen if contact was requested by both persons and it has already been approved."] = "Das kann passieren, wenn sich zwei Kontakte gegenseitig eingeladen haben und bereits einer angenommen wurde.";
 $a->strings["Response from remote site was not understood."] = "Antwort der Gegenstelle unverständlich.";
 $a->strings["Unexpected response from remote site: "] = "Unerwartete Antwort der Gegenstelle: ";
@@ -884,14 +937,30 @@ $a->strings["On this website your Facebook profile wall conversations will only
 $a->strings["Do not import your Facebook profile wall conversations"] = "Facebook-Pinnwand nicht importieren";
 $a->strings["If you choose to link conversations and leave both of these boxes unchecked, your Facebook profile wall will be merged with your profile wall on this website and your privacy settings on this website will be used to determine who may see the conversations."] = "Wenn Du Facebook-Konversationen importierst und diese beiden Häkchen nicht setzt, wird Deine Facebook-Pinnwand mit der Pinnwand hier auf dieser Webseite vereinigt. Die Privatsphäre-Einstellungen für Deine Pinnwand auf dieser Webseite geben dann an, wer die Konversationen sehen kann.";
 $a->strings["Comma separated applications to ignore"] = "Komma separiert Anwendungen, die ignoriert werden sollen";
+$a->strings["Problems with Facebook Real-Time Updates"] = "Probleme mit Facebook Echtzeit-Updates";
 $a->strings["Facebook"] = "Facebook";
 $a->strings["Facebook Connector Settings"] = "Facebook-Verbindungseinstellungen";
+$a->strings["Facebook API Key"] = "Facebook API Schlüssel";
+$a->strings["Error: it appears that you have specified the App-ID and -Secret in your .htconfig.php file. As long as they are specified there, they cannot be set using this form.<br><br>"] = "Fehler: du scheinst die App-ID und das App-Geheimnis in deiner .htconfig.php Datei angegeben zu haben. Solange sie dort festgelegt werden kannst du dieses Formular hier nicht verwenden.<br><br>";
+$a->strings["Error: the given API Key seems to be incorrect (the application access token could not be retrieved)."] = "Fehler: der angegebene API Schlüssel scheint nicht korrekt zu sein (Zugriffstoken konnte nicht empfangen werden).";
+$a->strings["The given API Key seems to work correctly."] = "Der angegebene API Schlüssel scheint korrekt zu funktionieren.";
+$a->strings["The correctness of the API Key could not be detected. Somthing strange's going on."] = "Die Echtheit des API Schlüssels konnte nicht überprüft werden. Etwas Merkwürdiges ist hier im Gange.";
+$a->strings["App-ID / API-Key"] = "App-ID / API-Key";
+$a->strings["Application secret"] = "Anwendungs-Geheimnis";
+$a->strings["Polling Interval (min. %1\$s minutes)"] = "Abrufintervall (min. %1\$s Minuten)";
+$a->strings["Real-Time Updates"] = "Echt-Zeit Aktualisierungen";
+$a->strings["Real-Time Updates are activated."] = "Echtzeit-Updates sind aktiviert.";
+$a->strings["Deactivate Real-Time Updates"] = "Echtzeit-Updates deaktivieren";
+$a->strings["Real-Time Updates not activated."] = "Echtzeit-Updates nicht aktiviert.";
+$a->strings["Activate Real-Time Updates"] = "Echtzeit-Updates aktivieren";
+$a->strings["The new values have been saved."] = "Die neuen Einstellungen wurden gespeichert.";
 $a->strings["Post to Facebook"] = "Bei Facebook veröffentlichen";
 $a->strings["Post to Facebook cancelled because of multi-network access permission conflict."] = "Beitrag wurde nicht bei Facebook veröffentlicht, da Konflikte bei den Multi-Netzwerk-Zugriffsrechten vorliegen.";
-$a->strings["Image: "] = "Bild: ";
 $a->strings["View on Friendica"] = "In Friendica betrachten";
 $a->strings["Facebook post failed. Queued for retry."] = "Veröffentlichung bei Facebook gescheitert. Wir versuchen es später erneut.";
-$a->strings["link"] = "Verweis";
+$a->strings["Your Facebook connection became invalid. Please Re-authenticate."] = "Deine Facebook Anmeldedaten sind ungültig geworden. Bitte re-authentifiziere dich.";
+$a->strings["Facebook connection became invalid"] = "Facebook Anmeldedaten sind ungültig geworden";
+$a->strings["Hi %1\$s,\n\nThe connection between your accounts on %2\$s and Facebook became invalid. This usually happens after you change your Facebook-password. To enable the connection again, you have to %3\$sre-authenticate the Facebook-connector%4\$s."] = "Hi %1\$s,\n\ndie Verbindung von deinem Account auf %2\$s und Facebook funktioniert derzeit nicht. Dies ist im Allgemeinen das Ergebnis einer Passwortänderung bei Facebook. Um die Verbindung wieder zu aktivieren musst du  %3\$sden Facebook-Connector neu Authentifizieren%4\$s.";
 $a->strings["%d person likes this"] = array(
 	0 => "%d Person mag das",
 	1 => "%d Leuten mögen das",
@@ -916,20 +985,23 @@ $a->strings["Enable LiveJournal Post Plugin"] = "LiveJournal Post Plugin aktivie
 $a->strings["LiveJournal username"] = "LiveJournal Benutzername";
 $a->strings["LiveJournal password"] = "LiveJournal Passwort";
 $a->strings["Post to LiveJournal by default"] = "Standardmäßig bei LiveJournal veröffentlichen";
-$a->strings["\"Not Safe For Work\" Settings"] = "\"Not Safe For Work\"-Einstellungen";
-$a->strings["Enable NSFW filter"] = "NSFW Filter aktivieren";
-$a->strings["Comma separated words to treat as NSFW"] = "Wörter, die gefiltert werden sollen (durch Kommas getrennt)";
+$a->strings["Not Safe For Work (General Purpose Content Filter) settings"] = "Not Safe for Work (allg. Filter für ungewollte Inhalte) Einstellungen:";
+$a->strings["This plugin looks in posts for the words/text you specify below, and collapses any content containing those keywords so it is not displayed at inappropriate times, such as sexual innuendo that may be improper in a work setting. It is polite and recommended to tag any content containing nudity with #NSFW.  This filter can also match any other word/text you specify, and can thereby be used as a general purpose content filter."] = "Dieses Plugin sucht in Beiträgen nach Wörtern oder Textbauteilen die du weiter unten eingibst, findet es diese Bausteine, dann wird der entsprechende Beitrag zusammengefaltet dargestellt. Auf diese Weise wird verhindert, dass Inhalte, wie z.B. sexuelle Anspielungen, in unpassenden Momenten angezeigt werden. Du solltest den #NSFW Tag für Beiträge verwenden von denen du ausgehen kannst, dass andere sie anstößig finden könnten. Su kannst beliebige Wörter in der Filterliste angeben und ihn so als allgemeinen Filter verwenden.";
+$a->strings["Enable Content filter"] = "Aktiviere den Inhaltsfilter";
+$a->strings["Comma separated list of keywords to hide"] = "Durch Komma getrennte Liste von Schlüsselwörtern die verborgen werden sollen";
 $a->strings["Use /expression/ to provide regular expressions"] = "Verwende /expression/ um reguläre Ausdrücke zu verwenden";
 $a->strings["NSFW Settings saved."] = "NSFW-Einstellungen gespeichert";
 $a->strings["%s - Click to open/close"] = "%s – Zum Öffnen/Schließen klicken";
+$a->strings["Forums"] = "Foren";
+$a->strings["Planets Settings"] = "Planeten Einstellungen";
+$a->strings["Enable Planets Plugin"] = "Aktiviere Planeten Plugin";
 $a->strings["Login"] = "Anmeldung";
 $a->strings["OpenID"] = "OpenID";
-$a->strings["Last users"] = "Letzte Nutzer";
+$a->strings["Latest users"] = "Letzte Benutzer";
 $a->strings["Most active users"] = "Aktivste Nutzer";
-$a->strings["Last photos"] = "Letzte Fotos";
-$a->strings["Last likes"] = "Zuletzt gemocht";
+$a->strings["Latest photos"] = "Neueste Fotos";
+$a->strings["Latest likes"] = "Neueste Favoriten";
 $a->strings["event"] = "Veranstaltung";
-$a->strings["Latest users"] = "Letzte Benutzer";
 $a->strings["Allow to use your friendica id (%s) to connecto to external unhosted-enabled storage (like ownCloud). See <a href=\"http://www.w3.org/community/unhosted/wiki/RemoteStorage#WebFinger\">RemoteStorage WebFinger</a>"] = "Ermöglicht dir, deine friendica id (%s) mit externen unhosted-fähigen Speichern (z.B. ownCloud) zu verbinden. Siehe <a href=\"http://www.w3.org/community/unhosted/wiki/RemoteStorage#WebFinger\">RemoteStorage WebFinger</a>";
 $a->strings["Template URL (with {category})"] = "Vorlagen URL (mit {Kategorie})";
 $a->strings["OAuth end-point"] = "OAuth end-point";
@@ -983,8 +1055,15 @@ $a->strings["Site Owner"] = "Betreiber der Seite";
 $a->strings["Email Address"] = "Email Adresse";
 $a->strings["Postal Address"] = "Postalische Anschrift";
 $a->strings["The impressum addon needs to be configured!<br />Please add at least the <tt>owner</tt> variable to your config file. For other variables please refer to the README file of the addon."] = "Das Impressums-Plugin muss noch konfiguriert werden.<br />Bitte gebe mindestens den <tt>Betreiber</tt> in der Konfiguration an. Alle weiteren Parameter werden in der README-Datei des Addons erläutert.";
+$a->strings["The page operators name."] = "Name des Server-Administrators";
 $a->strings["Site Owners Profile"] = "Profil des Seitenbetreibers";
+$a->strings["Profile address of the operator."] = "Profil-Adresse des Server-Administrators";
+$a->strings["How to contact the operator via snail mail."] = "Wie erreicht man den Betreiber der Seite postalisch.";
 $a->strings["Notes"] = "Hinweise";
+$a->strings["Additional notes that are displayed beneath the contact information."] = "Zusätzliche Angaben, die unterhalb der Kontakt-Informationen angezeigt werden.";
+$a->strings["How to contact the operator via email. (will be displayed obfuscated)"] = "Wie erreichts man den Betreiber per Email. (Adresse wird verschleiert dargestellt)";
+$a->strings["Footer note"] = "Fußnote";
+$a->strings["Text for the footer."] = "Text für die Fußnote";
 $a->strings["Report Bug"] = "Fehlerreport erstellen";
 $a->strings["\"Blockem\" Settings"] = "\"Blockem\"-Einstellungen";
 $a->strings["Comma separated profile URLS to block"] = "Profil-URLs, die blockiert werden sollen (durch Kommas getrennt)";
@@ -1004,11 +1083,34 @@ $a->strings["Tile Server URL"] = "Tile Server URL";
 $a->strings["A list of <a href=\"http://wiki.openstreetmap.org/wiki/TMS\" target=\"_blank\">public tile servers</a>"] = "Eine Liste <a href=\"http://wiki.openstreetmap.org/wiki/TMS\" target=\"_blank\">öffentlicher Tile Server</a>";
 $a->strings["Default zoom"] = "Standard Zoom";
 $a->strings["The default zoom level. (1:world, 18:highest)"] = "Standard Zoomlevel (1: Welt; 18: höchstes)";
+$a->strings["The MathJax addon renders mathematical formulae written using the LaTeX syntax surrounded by the usual $$ or an eqnarray block in the postings of your wall,network tab and private mail."] = "Mit dem MathJax Addon können mathematische Formeln, die mit LaTeX geschrieben wurden, dargestellt werden. Die Formel wird mit den üblichen $$ oder einem eqnarray Block gekennzeichnet. Formeln werden in allen Beiträgen auf deiner Pinnwand, dem Netzwerk-Stream sowie privaten Nachrichten gerendert.";
+$a->strings["Use the MathJax renderer"] = "MathJax verwenden";
+$a->strings["MathJax Base URL"] = "MathJax Basis-URL";
+$a->strings["The URL for the javascript file that should be included to use MathJax. Can be either the MathJax CDN or another installation of MathJax."] = "Die URL der MathJax Javascript-Datei, die verwendet werden soll. Diese kann entweder aus der MathJax CDN oder einer anderen Quelle stammen.";
 $a->strings["Editplain settings updated."] = "Editplain Einstellungen aktualisiert";
 $a->strings["Editplain Settings"] = "Editplain Einstellungen";
 $a->strings["Disable richtext status editor"] = "RichText Editor deaktivieren";
+$a->strings["generic profile image"] = "allgemeines Profilbild";
+$a->strings["random geometric pattern"] = "zufällig erzeugtes geometrisches Muster";
+$a->strings["monster face"] = "Monstergesicht";
+$a->strings["computer generated face"] = "Computergesicht";
+$a->strings["retro arcade style face"] = "Retro Arcade Design Gesicht";
+$a->strings["Default avatar image"] = "Standard Profilbild ";
+$a->strings["Select default avatar image if none was found at Gravatar. See README"] = "Wähle das Standardgesicht, wenn kein Bild auf Gravatar gefunden wurde. Schaue auch sonst im README nach.";
+$a->strings["Rating of images"] = "Bildbewertung";
+$a->strings["Select the appropriate avatar rating for your site. See README"] = "Wähle eine angemessene Bildbewertung für Deinen Server. Schaue auch sonst im README nach.";
+$a->strings["Gravatar settings updated."] = "Gravatar Einstellungen aktualisiert.";
+$a->strings["Your account on %s will expire in a few days."] = "Dein Konto auf %s wird in ein paar Tagen verfallen.";
+$a->strings["Your Friendica test account is about to expire."] = "Dein Friendica Test Konto wird bald verfallen.";
+$a->strings["Hi %1\$s,\n\nYour test account on %2\$s will expire in less than five days. We hope you enjoyed this test drive and use this opportunity to find a permanent Friendica website for your integrated social communications. A list of public sites is available at http://dir.friendica.com/siteinfo - and for more information on setting up your own Friendica server please see the Friendica project website at http://friendica.com."] = "Hallo %1\$s,\n\ndein Test-Konto auf %2\$s wird in weniger als fünf Tagen verfallen. Wir hoffen, dass dir dieser Testlauf gefallen hat, so dass du die Gelegenheit nutzt und dir eine feste Friendica-Site für deine integrierte Social-Network-Kommunikation suchst. Eine Liste öffentlicher Sites findest du auf http://dir.friendica.com/siteinfo. Um mehr Information darüber zu bekommen, wie man einen eigenen Friendica-Server aufsetzt, kannst du auch einen Blick auf die Friendica Projektseite werfen: http://friendica.com";
 $a->strings["\"pageheader\" Settings"] = "\"pageheader\"-Einstellungen";
 $a->strings["pageheader Settings saved."] = "pageheader-Einstellungen gespeichert.";
+$a->strings["Post to Insanejournal"] = "Auf InsaneJournal posten.";
+$a->strings["InsaneJournal Post Settings"] = "InsaneJournal Beitrags-Einstellungen";
+$a->strings["Enable InsaneJournal Post Plugin"] = "InsaneJournal Plugin aktivieren";
+$a->strings["InsaneJournal username"] = "InsaneJournal Benutzername";
+$a->strings["InsaneJournal password"] = "InsaneJournal Passwort";
+$a->strings["Post to InsaneJournal by default"] = "Standardmäßig auf InsaneJournal posten.";
 $a->strings["View Source"] = "Quelle ansehen";
 $a->strings["Post to StatusNet"] = "Bei StatusNet veröffentlichen";
 $a->strings["Please contact your site administrator.<br />The provided API URL is not valid."] = "Bitte kontaktiere den Administrator des Servers.<br />Die angegebene API-URL ist nicht gültig.";
@@ -1033,6 +1135,7 @@ $a->strings["If enabled all your <strong>public</strong> postings can be posted
 $a->strings["<strong>Note</strong>: Due your privacy settings (<em>Hide your profile details from unknown viewers?</em>) the link potentially included in public postings relayed to StatusNet will lead the visitor to a blank page informing the visitor that the access to your profile has been restricted."] = "<strong>Hinweis</strong>: Aufgrund deiner Privatsphären-Einstellungen (<em>Profil-Details vor unbekannten Betrachtern verbergen?</em>) wird der Link, der eventuell an deinen StatusNet Account angehängt wird, um auf den original Artikel zu verweisen, den Betrachter auf eine leere Seite führen, die ihn darüber informiert, dass der Zugriff eingeschränkt wurde.";
 $a->strings["Allow posting to StatusNet"] = "Veröffentlichung bei StatusNet erlauben";
 $a->strings["Send public postings to StatusNet by default"] = "Veröffentliche öffentliche Beiträge standardmäßig bei StatusNet";
+$a->strings["Send #tag links to StatusNet"] = "#Tags nach StatusNet senden";
 $a->strings["Clear OAuth configuration"] = "OAuth-Konfiguration löschen";
 $a->strings["API URL"] = "API-URL";
 $a->strings["Post to Tumblr"] = "Bei Tumblr veröffentlichen";
@@ -1060,7 +1163,7 @@ $a->strings["\"Show more\" Settings"] = "\"Mehr zeigen\" Einstellungen";
 $a->strings["Enable Show More"] = "Aktiviere \"Mehr zeigen\"";
 $a->strings["Cutting posts after how much characters"] = "Begrenze Beiträge nach einer bestimmten Anzahl an Buchstaben";
 $a->strings["Show More Settings saved."] = "\"Mehr zeigen\" Einstellungen gesichert.";
-$a->strings["Show More"] = "\"Mehr zeigen\"";
+$a->strings["show more"] = "mehr anzeigen";
 $a->strings["This website is tracked using the <a href='http://www.piwik.org'>Piwik</a> analytics tool."] = "Diese Website benutzt <a href='http://www.piwik.org'>Piwik</a>, eine Open Source-Software zur statistischen Auswertung der Besucherzugriffe.";
 $a->strings["If you do not want that your visits are logged this way you <a href='%s'>can set a cookie to prevent Piwik from tracking further visits of the site</a> (opt-out)."] = "Wenn Du nicht willst, dass Deine Besuche auf diese Weise gespeichert werden, kannst Du <a href='%s'>ein Cookie setzen</a>. Dann wird Piwik Dich auf dieser Website nicht mehr verfolgen (opt-out).";
 $a->strings["Piwik Base URL"] = "Piwik Basis URL";
@@ -1079,19 +1182,54 @@ $a->strings["If enabled all your <strong>public</strong> postings can be posted
 $a->strings["<strong>Note</strong>: Due your privacy settings (<em>Hide your profile details from unknown viewers?</em>) the link potentially included in public postings relayed to Twitter will lead the visitor to a blank page informing the visitor that the access to your profile has been restricted."] = "<strong>Hinweis</strong>: Aufgrund deiner Privatsphären-Einstellungen (<em>Profil-Details vor unbekannten Betrachtern verbergen?</em>) wird der Link, der eventuell an an deinen Twitter Account angehängt wird, um auf den original Artikel zu verweisen, den Betrachter auf eine leere Seite führen, die ihn darüber informiert, dass der Zugriff eingeschränkt wurde.";
 $a->strings["Allow posting to Twitter"] = "Veröffentlichung bei Twitter erlauben";
 $a->strings["Send public postings to Twitter by default"] = "Veröffentliche öffentliche Beiträge standardmäßig bei Twitter";
+$a->strings["Send #tag links to Twitter"] = "#Tags nach Twitter senden";
 $a->strings["Consumer key"] = "Consumer Key";
 $a->strings["Consumer secret"] = "Consumer Secret";
-$a->strings["irc Chatroom"] = "irc Chatroom";
+$a->strings["IRC Settings"] = "IRC Einstellungen";
+$a->strings["Channel(s) to auto connect (comma separated)"] = "mit diesen Kanälen soll man automatisch verbunden werden (Komma getrennt)";
+$a->strings["Popular Channels (comma separated)"] = "Beliebte Kanäle (mit Komma getrennt)";
+$a->strings["IRC settings saved."] = "IRC Einstellungen gespeichert.";
+$a->strings["IRC Chatroom"] = "IRC Chatraum";
+$a->strings["Popular Channels"] = "Beliebte Räume";
+$a->strings["Post to blogger"] = "Auf Blogger posten";
+$a->strings["Blogger Post Settings"] = "Einstellungen zum posten auf Blogger";
+$a->strings["Enable Blogger Post Plugin"] = "Blogger-Post-Plugin aktivieren";
+$a->strings["Blogger username"] = "Blogger-Benutzername";
+$a->strings["Blogger password"] = "Blogger-Passwort";
+$a->strings["Blogger API URL"] = "Blogger-API-URL";
+$a->strings["Post to Blogger by default"] = "Standardmäßig auf Blogger posten";
 $a->strings["Post to Posterous"] = "Nach Posterous senden";
 $a->strings["Posterous Post Settings"] = "Posterous Beitrags-Einstellungen";
 $a->strings["Enable Posterous Post Plugin"] = "Posterous-Plugin aktivieren";
 $a->strings["Posterous login"] = "Posterous-Anmeldename";
 $a->strings["Posterous password"] = "Posterous-Passwort";
 $a->strings["Post to Posterous by default"] = "Veröffentliche öffentliche Beiträge standardmäßig bei Posterous";
+$a->strings["Last users"] = "Letzte Nutzer";
+$a->strings["Last likes"] = "Zuletzt gemocht";
+$a->strings["Last photos"] = "Letzte Fotos";
+$a->strings["Find Friends"] = "Freunde finden";
+$a->strings["Local Directory"] = "Lokales Verzeichnis";
+$a->strings["Similar Interests"] = "Ähnliche Interessen";
+$a->strings["Invite Friends"] = "Freunde einladen";
+$a->strings["Community Pages"] = "Foren";
+$a->strings["Help or @NewHere ?"] = "Hilfe oder @NewHere";
+$a->strings["Connect Services"] = "Verbinde Dienste";
+$a->strings["Your posts and conversations"] = "Deine Beiträge und Unterhaltungen";
+$a->strings["Your profile page"] = "Deine Profilseite";
+$a->strings["Your contacts"] = "Deine Kontakte";
+$a->strings["Your photos"] = "Deine Fotos";
+$a->strings["Your events"] = "Deine Ereignisse";
+$a->strings["Personal notes"] = "Persönliche Notizen";
+$a->strings["Your personal photos"] = "Deine privaten Fotos";
 $a->strings["Theme settings"] = "Themen Einstellungen";
+$a->strings["Set font-size for posts and comments"] = "Schriftgröße für Beiträge und Kommentare festlegen";
+$a->strings["Set line-height for posts and comments"] = "Liniengröße für Beiträge und Kommantare festlegen";
+$a->strings["Set resolution for middle column"] = "Auflösung für die Mittelspalte setzen";
+$a->strings["Set color scheme"] = "Wähle Farbschema";
 $a->strings["Alignment"] = "Ausrichtung";
 $a->strings["Left"] = "Links";
 $a->strings["Center"] = "Mitte";
+$a->strings["Color scheme"] = "Farbschema";
 $a->strings["Gender:"] = "Geschlecht:";
 $a->strings["j F, Y"] = "j F, Y";
 $a->strings["j F"] = "j F";
@@ -1151,7 +1289,7 @@ $a->strings["No Preference"] = "Keine Vorlieben";
 $a->strings["Bisexual"] = "Bisexuell";
 $a->strings["Autosexual"] = "Autosexual";
 $a->strings["Abstinent"] = "Abstinent";
-$a->strings["Virgin"] = "Jungfrau";
+$a->strings["Virgin"] = "Jungfrauen";
 $a->strings["Deviant"] = "Deviant";
 $a->strings["Fetish"] = "Fetish";
 $a->strings["Oodles"] = "Oodles";
@@ -1160,6 +1298,8 @@ $a->strings["Single"] = "Single";
 $a->strings["Lonely"] = "Einsam";
 $a->strings["Available"] = "Verfügbar";
 $a->strings["Unavailable"] = "Nicht verfügbar";
+$a->strings["Has crush"] = "verknallt";
+$a->strings["Infatuated"] = "verliebt";
 $a->strings["Dating"] = "Dating";
 $a->strings["Unfaithful"] = "Untreu";
 $a->strings["Sex Addict"] = "Sexbesessen";
@@ -1168,18 +1308,21 @@ $a->strings["Friends/Benefits"] = "Freunde/Zuwendungen";
 $a->strings["Casual"] = "Casual";
 $a->strings["Engaged"] = "Verlobt";
 $a->strings["Married"] = "Verheiratet";
+$a->strings["Imaginarily married"] = "imaginär verheiratet";
 $a->strings["Partners"] = "Partner";
 $a->strings["Cohabiting"] = "zusammenlebend";
+$a->strings["Common law"] = "wilde Ehe";
 $a->strings["Happy"] = "Glücklich";
-$a->strings["Not Looking"] = "Nicht auf der Suche";
+$a->strings["Not looking"] = "Nicht auf der Suche";
 $a->strings["Swinger"] = "Swinger";
 $a->strings["Betrayed"] = "Betrogen";
 $a->strings["Separated"] = "Getrennt";
 $a->strings["Unstable"] = "Unstabil";
 $a->strings["Divorced"] = "Geschieden";
+$a->strings["Imaginarily divorced"] = "imaginär geschieden";
 $a->strings["Widowed"] = "Verwitwet";
 $a->strings["Uncertain"] = "Unsicher";
-$a->strings["Complicated"] = "Kompliziert";
+$a->strings["It's complicated"] = "Ist kompliziert";
 $a->strings["Don't care"] = "Ist mir nicht wichtig";
 $a->strings["Ask me"] = "Frag mich";
 $a->strings["Starts:"] = "Beginnt:";
@@ -1216,11 +1359,17 @@ $a->strings["October"] = "Oktober";
 $a->strings["November"] = "November";
 $a->strings["December"] = "Dezember";
 $a->strings["bytes"] = "Byte";
-$a->strings["Select an alternate language"] = "Alternative Sprache auswählen";
+$a->strings["Categories:"] = "Kategorien:";
+$a->strings["remove"] = "löschen";
+$a->strings["[remove]"] = "[löschen]";
+$a->strings["Filed under:"] = "Abgelegt unter:";
+$a->strings["Click to open/close"] = "Zum öffnen/schließen klicken";
 $a->strings["default"] = "standard";
+$a->strings["Select an alternate language"] = "Alternative Sprache auswählen";
 $a->strings["activity"] = "Aktivität";
 $a->strings["comment"] = "Kommentar";
 $a->strings["post"] = "Beitrag";
+$a->strings["Item filed"] = "Beitrag abgelegt";
 $a->strings["Sharing notification from Diaspora network"] = "Freigabe-Benachrichtigung von Diaspora";
 $a->strings["Attachments:"] = "Anhänge:";
 $a->strings["[Relayed] Comment authored by %s from network %s"] = "[Weitergeleitet] Kommentar von %s aus dem %s Netzwerk";
@@ -1233,16 +1382,10 @@ $a->strings["edit"] = "bearbeiten";
 $a->strings["Groups"] = "Gruppen";
 $a->strings["Edit group"] = "Gruppe bearbeiten";
 $a->strings["Create a new group"] = "Neue Gruppe erstellen";
+$a->strings["Contacts not in any group"] = "Kontakte in keiner Gruppe";
 $a->strings["Logout"] = "Abmelden";
 $a->strings["End this session"] = "Diese Sitzung beenden";
 $a->strings["Status"] = "Status";
-$a->strings["Your posts and conversations"] = "Deine Beiträge und Unterhaltungen";
-$a->strings["Your profile page"] = "Deine Profilseite";
-$a->strings["Photos"] = "Bilder";
-$a->strings["Your photos"] = "Deine Fotos";
-$a->strings["Your events"] = "Deine Ereignisse";
-$a->strings["Personal notes"] = "Persönliche Notizen";
-$a->strings["Your personal photos"] = "Deine privaten Fotos";
 $a->strings["Sign in"] = "Anmelden";
 $a->strings["Home Page"] = "Homepage";
 $a->strings["Create an account"] = "Account erstellen";
@@ -1258,6 +1401,8 @@ $a->strings["Friend Requests"] = "Kontaktanfragen";
 $a->strings["See all notifications"] = "Alle Benachrichtigungen anzeigen";
 $a->strings["Mark all system notifications seen"] = "Markiere alle System-Benachrichtigungen als gelesen";
 $a->strings["Private mail"] = "Private Email";
+$a->strings["Inbox"] = "Eingang";
+$a->strings["Outbox"] = "Ausgang";
 $a->strings["Manage"] = "Verwalten";
 $a->strings["Manage other pages"] = "Andere Seiten verwalten";
 $a->strings["Profiles"] = "Profile";
@@ -1269,7 +1414,6 @@ $a->strings["Nothing new here"] = "Keine Neuigkeiten.";
 $a->strings["Add New Contact"] = "Neuen Kontakt hinzufügen";
 $a->strings["Enter address or web location"] = "Adresse oder Web-Link eingeben";
 $a->strings["Example: bob@example.com, http://example.com/barbara"] = "Beispiel: bob@example.com, http://example.com/barbara";
-$a->strings["Invite Friends"] = "Freunde einladen";
 $a->strings["%d invitation available"] = array(
 	0 => "%d Einladung verfügbar",
 	1 => "%d Einladungen verfügbar",
@@ -1278,10 +1422,15 @@ $a->strings["Find People"] = "Leute finden";
 $a->strings["Enter name or interest"] = "Name oder Interessen eingeben";
 $a->strings["Connect/Follow"] = "Verbinden/Folgen";
 $a->strings["Examples: Robert Morgenstein, Fishing"] = "Beispiel: Robert Morgenstein, Angeln";
-$a->strings["Similar Interests"] = "Ähnliche Interessen";
+$a->strings["Random Profile"] = "Zufälliges Profil";
 $a->strings["Networks"] = "Netzwerke";
 $a->strings["All Networks"] = "Alle Netzwerke";
+$a->strings["Saved Folders"] = "Gespeicherte Ordner";
+$a->strings["Everything"] = "Alles";
+$a->strings["Categories"] = "Kategorien";
 $a->strings["Logged out."] = "Abgemeldet.";
+$a->strings["We encountered a problem while logging in with the OpenID you provided. Please check the correct spelling of the ID."] = "Beim versuch dich mit der von dir angegebenen OpenID anzumelden trat ein Problem auf. Bitte überprüfe dass du die OpenID richtig geschrieben hast.";
+$a->strings["The error message was:"] = "Die Fehlermeldung lautete:";
 $a->strings["Miscellaneous"] = "Verschiedenes";
 $a->strings["year"] = "Jahr";
 $a->strings["month"] = "Monat";
@@ -1314,7 +1463,7 @@ $a->strings["%s Administrator"] = "der Administrator von %s";
 $a->strings["%s <!item_type!>"] = "%s <!item_type!>";
 $a->strings["[Friendica:Notify] New mail received at %s"] = "[Friendica Meldung] Neue Nachricht erhalten von %s";
 $a->strings["%s sent you a new private message at %s."] = "%s hat dir eine neue private Nachricht auf %s geschrieben.";
-$a->strings["%s sent you %s."] = "%s hat Dir geschickt %s";
+$a->strings["%s sent you %s."] = "%s hat Dir %s geschickt";
 $a->strings["a private message"] = "eine private Nachricht";
 $a->strings["Please visit %s to view and/or reply to your private messages."] = "Bitte besuche %s, um deine privaten Nachrichten anzusehen und/oder zu beantworten.";
 $a->strings["%s's"] = "%s's";
@@ -1334,11 +1483,11 @@ $a->strings["tagged you"] = "erwähnte Dich";
 $a->strings["[Friendica:Notify] %s tagged your post"] = "[Friendica Meldung] %s markierte Deinen Beitrag";
 $a->strings["%s tagged your post at %s"] = "%s hat deinen Beitrag auf %s getaggt";
 $a->strings["%s tagged %s"] = "%s markierte %s";
-$a->strings["your post"] = "Dein Beitrag";
+$a->strings["your post"] = "Deinen Beitrag";
 $a->strings["[Friendica:Notify] Introduction received"] = "[Friendica Meldung] Kontaktanfrage erhalten";
 $a->strings["You've received an introduction from '%s' at %s"] = "Du hast eine Kontaktanfrage von '%s' auf %s erhalten";
 $a->strings["You've received %s from %s."] = "Du hast %s von %s erhalten.";
-$a->strings["an introduction"] = "eine Einführung";
+$a->strings["an introduction"] = "eine Kontaktanfrage";
 $a->strings["You may visit their profile at %s"] = "Hier kannst du das Profil betrachten: %s";
 $a->strings["Please visit %s to approve or reject the introduction."] = "Bitte besuche %s, um die Kontaktanfrage anzunehmen oder abzulehnen.";
 $a->strings["[Friendica:Notify] Friend suggestion received"] = "[Friendica Meldung] Kontaktvorschlag erhalten";
@@ -1351,13 +1500,16 @@ $a->strings["Please visit %s to approve or reject the suggestion."] = "Bitte bes
 $a->strings["A new person is sharing with you at "] = "Eine neue Person teilt mit dir auf ";
 $a->strings["You have a new follower at "] = "Du hast einen neuen Kontakt auf ";
 $a->strings["image/photo"] = "Bild/Foto";
+$a->strings["link"] = "Verweis";
 $a->strings["Welcome "] = "Willkommen ";
 $a->strings["Please upload a profile photo."] = "Bitte lade ein Profilbild hoch.";
 $a->strings["Welcome back "] = "Willkommen zurück ";
-$a->strings["View status"] = "Status anzeigen";
-$a->strings["View profile"] = "Profil anzeigen";
-$a->strings["View photos"] = "Fotos ansehen";
-$a->strings["View recent"] = "Neueste anzeigen";
+$a->strings["The form security token was not correct. This probably happened because the form has been opened for too long (>3 hours) before submitting it."] = "Das Sicherheits-Merkmal war nicht korrekt. Das passiert meistens wenn das Formular vor dem Absenden zu lange geöffnet war (länger als 3 Stunden).";
+$a->strings["View Status"] = "Pinnwand anschauen";
+$a->strings["View Profile"] = "Profil anschauen";
+$a->strings["View Photos"] = "Bilder anschauen";
+$a->strings["Network Posts"] = "Netzwerk Beiträge";
+$a->strings["Edit Contact"] = "Kontakt bearbeiten";
 $a->strings["Send PM"] = "Private Nachricht senden";
 $a->strings["post/item"] = "Nachricht/Beitrag";
 $a->strings["%1\$s marked %2\$s's %3\$s as favorite"] = "%1\$s hat %2\$s\\s %3\$s als Favorit markiert";
@@ -1369,7 +1521,6 @@ $a->strings["%d comment"] = array(
 	0 => "%d Kommentar",
 	1 => "%d Kommentare",
 );
-$a->strings["show more"] = "mehr anzeigen";
 $a->strings["like"] = "mag ich";
 $a->strings["dislike"] = "mag ich nicht";
 $a->strings["Share this"] = "Teile dieses";
@@ -1379,6 +1530,7 @@ $a->strings["remove star"] = "Markierung entfernen";
 $a->strings["toggle star status"] = "Markierung umschalten";
 $a->strings["starred"] = "markiert";
 $a->strings["add tag"] = "Tag hinzufügen";
+$a->strings["save to folder"] = "In Ordner speichern";
 $a->strings["to"] = "zu";
 $a->strings["Wall-to-Wall"] = "Wall-to-Wall";
 $a->strings["via Wall-To-Wall:"] = "via Wall-To-Wall:";
@@ -1396,7 +1548,6 @@ $a->strings["Please enter a video link/URL:"] = "Bitte Link/URL zum Video einfü
 $a->strings["Please enter an audio link/URL:"] = "Bitte Link/URL zum Audio einfügen:";
 $a->strings["Tag term:"] = "Tag:";
 $a->strings["Where are you right now?"] = "Wo hältst du dich jetzt gerade auf?";
-$a->strings["Enter a title for this item"] = "Gib den Titel für diesen Beitrag ein";
 $a->strings["upload photo"] = "Bild hochladen";
 $a->strings["attach file"] = "Datei anhängen";
 $a->strings["web link"] = "Weblink";
@@ -1415,7 +1566,8 @@ $a->strings["Password: "] = "Passwort: ";
 $a->strings["Or login using OpenID: "] = "Oder melde dich mit deiner OpenID an: ";
 $a->strings["Forgot your password?"] = "Passwort vergessen?";
 $a->strings["Edit profile"] = "Profil bearbeiten";
-$a->strings["g A l F d"] = "l. d, F G \\U\\h\\\\r";
+$a->strings["Message"] = "Nachricht";
+$a->strings["g A l F d"] = "l, d. F G \\U\\h\\r";
 $a->strings["F d"] = "d. F";
 $a->strings["Birthday Reminders"] = "Geburtstagserinnerungen";
 $a->strings["Birthdays this week:"] = "Geburtstage diese Woche:";
diff --git a/view/de/update_fail_eml.tpl b/view/de/update_fail_eml.tpl
new file mode 100644
index 000000000..26be1786f
--- /dev/null
+++ b/view/de/update_fail_eml.tpl
@@ -0,0 +1,12 @@
+Hey, 

+Ich bin's,  $sitename.   

+Die Friendica-Entwickler haben gerade Update $update freigegeben, 

+aber als ich es installieren wollte, ist irgendetwas schief gegangen.  

+Das sollte schnell repariert werden und alleine schaffe ich es nicht. 

+Wende dich bitte an einen Friendica-Entwickler, wenn du mir nicht selbst helfen kannst. 

+Meine Datenbank könnte ziemlich durcheinander sein. 

+

+Die Fehlermeldung ist '$error'.   

+

+Tut mir leid, 

+dein Friendica Server unter $siteurl
\ No newline at end of file
diff --git a/view/de/wall_received_eml.tpl b/view/de/wall_received_eml.tpl
index b0ca45b24..b0ca45b24 100755..100644
--- a/view/de/wall_received_eml.tpl
+++ b/view/de/wall_received_eml.tpl
diff --git a/view/de/wall_received_html_body_eml.tpl b/view/de/wall_received_html_body_eml.tpl
index 407e4fdce..407e4fdce 100755..100644
--- a/view/de/wall_received_html_body_eml.tpl
+++ b/view/de/wall_received_html_body_eml.tpl
diff --git a/view/de/wall_received_text_body_eml.tpl b/view/de/wall_received_text_body_eml.tpl
index c627b0c7e..c627b0c7e 100755..100644
--- a/view/de/wall_received_text_body_eml.tpl
+++ b/view/de/wall_received_text_body_eml.tpl
diff --git a/view/default.php b/view/default.php
index 61f5f6863..61f5f6863 100755..100644
--- a/view/default.php
+++ b/view/default.php
diff --git a/view/dfrn_req_confirm.tpl b/view/dfrn_req_confirm.tpl
index 58e9233aa..58e9233aa 100755..100644
--- a/view/dfrn_req_confirm.tpl
+++ b/view/dfrn_req_confirm.tpl
diff --git a/view/dfrn_request.tpl b/view/dfrn_request.tpl
index d8aa8b181..bd3bcbc42 100755..100644
--- a/view/dfrn_request.tpl
+++ b/view/dfrn_request.tpl
@@ -7,7 +7,7 @@ $page_desc<br />
 <li><a href="http://friendica.com" title="$friendica">$friendica</a></li>
 <li><a href="http://joindiaspora.com" title="$diaspora">$diaspora</a> $diasnote</li>
 <li><a href="http://ostatus.org" title="$public_net" >$statusnet</a></li>
-<li>$emailnet</li>
+{{ if $emailnet }}<li>$emailnet</li>{{ endif }}
 </ul>
 $invite_desc
 </p>
diff --git a/view/diasp_dec_hdr.tpl b/view/diasp_dec_hdr.tpl
index e87c61888..e87c61888 100755..100644
--- a/view/diasp_dec_hdr.tpl
+++ b/view/diasp_dec_hdr.tpl
diff --git a/view/diaspora_comment.tpl b/view/diaspora_comment.tpl
index 6ef4ab664..6ef4ab664 100755..100644
--- a/view/diaspora_comment.tpl
+++ b/view/diaspora_comment.tpl
diff --git a/view/diaspora_comment_relay.tpl b/view/diaspora_comment_relay.tpl
index e82de1171..e82de1171 100755..100644
--- a/view/diaspora_comment_relay.tpl
+++ b/view/diaspora_comment_relay.tpl
diff --git a/view/diaspora_conversation.tpl b/view/diaspora_conversation.tpl
index 12807ba59..12807ba59 100755..100644
--- a/view/diaspora_conversation.tpl
+++ b/view/diaspora_conversation.tpl
diff --git a/view/diaspora_like.tpl b/view/diaspora_like.tpl
index a777aeebe..a777aeebe 100755..100644
--- a/view/diaspora_like.tpl
+++ b/view/diaspora_like.tpl
diff --git a/view/diaspora_like_relay.tpl b/view/diaspora_like_relay.tpl
index 65559b05b..65559b05b 100755..100644
--- a/view/diaspora_like_relay.tpl
+++ b/view/diaspora_like_relay.tpl
diff --git a/view/diaspora_message.tpl b/view/diaspora_message.tpl
index 667b8d53f..667b8d53f 100755..100644
--- a/view/diaspora_message.tpl
+++ b/view/diaspora_message.tpl
diff --git a/view/diaspora_photo.tpl b/view/diaspora_photo.tpl
index 75ca7f15c..75ca7f15c 100755..100644
--- a/view/diaspora_photo.tpl
+++ b/view/diaspora_photo.tpl
diff --git a/view/diaspora_post.tpl b/view/diaspora_post.tpl
index 1ba3ebb1f..1ba3ebb1f 100755..100644
--- a/view/diaspora_post.tpl
+++ b/view/diaspora_post.tpl
diff --git a/view/diaspora_profile.tpl b/view/diaspora_profile.tpl
index e5c3d3cad..e5c3d3cad 100755..100644
--- a/view/diaspora_profile.tpl
+++ b/view/diaspora_profile.tpl
diff --git a/view/diaspora_retract.tpl b/view/diaspora_retract.tpl
index 6d5b6e22b..6d5b6e22b 100755..100644
--- a/view/diaspora_retract.tpl
+++ b/view/diaspora_retract.tpl
diff --git a/view/diaspora_share.tpl b/view/diaspora_share.tpl
index c16341b1e..c16341b1e 100755..100644
--- a/view/diaspora_share.tpl
+++ b/view/diaspora_share.tpl
diff --git a/view/diaspora_signed_retract.tpl b/view/diaspora_signed_retract.tpl
index 22120e287..22120e287 100755..100644
--- a/view/diaspora_signed_retract.tpl
+++ b/view/diaspora_signed_retract.tpl
diff --git a/view/diaspora_vcard.tpl b/view/diaspora_vcard.tpl
index de3981a94..de3981a94 100755..100644
--- a/view/diaspora_vcard.tpl
+++ b/view/diaspora_vcard.tpl
diff --git a/view/directory_header.tpl b/view/directory_header.tpl
index 1f03540f2..1f03540f2 100755..100644
--- a/view/directory_header.tpl
+++ b/view/directory_header.tpl
diff --git a/view/directory_item.tpl b/view/directory_item.tpl
index b45da4465..b45da4465 100755..100644
--- a/view/directory_item.tpl
+++ b/view/directory_item.tpl
diff --git a/view/email_notify_html.tpl b/view/email_notify_html.tpl
index 43f72f15c..43f72f15c 100755..100644
--- a/view/email_notify_html.tpl
+++ b/view/email_notify_html.tpl
diff --git a/view/email_notify_text.tpl b/view/email_notify_text.tpl
index 018bb6078..018bb6078 100755..100644
--- a/view/email_notify_text.tpl
+++ b/view/email_notify_text.tpl
diff --git a/view/en/follow_notify_eml.tpl b/view/en/follow_notify_eml.tpl
index ae758c9a8..917024b84 100755..100644
--- a/view/en/follow_notify_eml.tpl
+++ b/view/en/follow_notify_eml.tpl
@@ -1,14 +1,14 @@
 
-Dear $myname,
+Dear $[myname],
 
-You have a new follower at $sitename -  '$requestor'.
+You have a new follower at $[sitename] -  '$[requestor]'.
 
-You may visit their profile at $url.
+You may visit their profile at $[url].
 
 Please login to your site to approve or ignore/cancel the request.
 
-$siteurl
+$[siteurl]
 
 Regards,
 
-	$sitename administrator
\ No newline at end of file
+	$[sitename] administrator
diff --git a/view/en/friend_complete_eml.tpl b/view/en/friend_complete_eml.tpl
index ab12fcb6b..89f578388 100755..100644
--- a/view/en/friend_complete_eml.tpl
+++ b/view/en/friend_complete_eml.tpl
@@ -1,22 +1,22 @@
 
-Dear $username,
+Dear $[username],
 
-	Great news... '$fn' at '$dfrn_url' has accepted 
-your connection request at '$sitename'.
+	Great news... '$[fn]' at '$[dfrn_url]' has accepted 
+your connection request at '$[sitename]'.
 
 You are now mutual friends and may exchange status updates, photos, and email
 without restriction.
 
-Please visit your 'Contacts' page at $sitename if you wish to make 
+Please visit your 'Contacts' page at $[sitename] if you wish to make 
 any changes to this relationship. 
 
-$siteurl
+$[siteurl]
 
 [For instance, you may create a separate profile with information that is not
-available to the general public - and assign viewing rights to '$fn'].
+available to the general public - and assign viewing rights to '$[fn]'].
 
 Sincerely,
 
-	$sitename Administrator
+	$[sitename] Administrator
 
  
diff --git a/view/en/htconfig.tpl b/view/en/htconfig.tpl
index 9e39eeb59..9e39eeb59 100755..100644
--- a/view/en/htconfig.tpl
+++ b/view/en/htconfig.tpl
diff --git a/view/en/intro_complete_eml.tpl b/view/en/intro_complete_eml.tpl
index a60745ec5..cd78b2a15 100755..100644
--- a/view/en/intro_complete_eml.tpl
+++ b/view/en/intro_complete_eml.tpl
@@ -1,22 +1,22 @@
 
-Dear $username,
+Dear $[username],
 
-	'$fn' at '$dfrn_url' has accepted 
-your connection request at '$sitename'.
+	'$[fn]' at '$[dfrn_url]' has accepted 
+your connection request at '$[sitename]'.
 
-	'$fn' has chosen to accept you a "fan", which restricts 
+	'$[fn]' has chosen to accept you a "fan", which restricts 
 some forms of communication - such as private messaging and some profile
 interactions. If this is a celebrity or community page, these settings were
 applied automatically.
 
-	'$fn' may choose to extend this into a two-way or more permissive 
+	'$[fn]' may choose to extend this into a two-way or more permissive 
 relationship in the future. 
 
-	You will start receiving public status updates from '$fn', 
+	You will start receiving public status updates from '$[fn]', 
 which will appear on your 'Network' page at  
 
-$siteurl
+$[siteurl]
 
 Sincerely,
 
-	$sitename Administrator
+	$[sitename] Administrator
diff --git a/view/en/lostpass_eml.tpl b/view/en/lostpass_eml.tpl
index c350236a4..1330caa12 100755..100644
--- a/view/en/lostpass_eml.tpl
+++ b/view/en/lostpass_eml.tpl
@@ -1,6 +1,6 @@
 
-Dear $username,
-	A request was recently received at $sitename to reset your account 
+Dear $[username],
+	A request was recently received at $[sitename] to reset your account 
 password. In order to confirm this request, please select the verification link
 below or paste it into your web browser address bar. 
 
@@ -12,7 +12,7 @@ issued this request.
 
 Follow this link to verify your identity:
 
-$reset_link
+$[reset_link]
 
 You will then receive a follow-up message containing the new password.
 
@@ -20,13 +20,13 @@ You may change that password from your account settings page after logging in.
 
 The login details are as follows:
 
-Site Location:	$siteurl
-Login Name:	$email
+Site Location:	$[siteurl]
+Login Name:	$[email]
 
 
 
 
 Sincerely,
-	$sitename Administrator
+	$[sitename] Administrator
 
  
diff --git a/view/en/passchanged_eml.tpl b/view/en/passchanged_eml.tpl
index 9692159e1..e7cc0e2dc 100755..100644
--- a/view/en/passchanged_eml.tpl
+++ b/view/en/passchanged_eml.tpl
@@ -1,5 +1,5 @@
 
-Dear $username,
+Dear $[username],
 	Your password has been changed as requested. Please retain this 
 information for your records (or change your password immediately to 
 something that you will remember).
@@ -7,14 +7,14 @@ something that you will remember).
 
 Your login details are as follows:
 
-Site Location:	$siteurl
-Login Name:	$email
-Password:	$new_password
+Site Location:	$[siteurl]
+Login Name:	$[email]
+Password:	$[new_password]
 
 You may change that password from your account settings page after logging in.
 
 
 Sincerely,
-	$sitename Administrator
+	$[sitename] Administrator
 
  
diff --git a/view/en/register_open_eml.tpl b/view/en/register_open_eml.tpl
index 221e6ec74..c55ac1e7e 100755..100644
--- a/view/en/register_open_eml.tpl
+++ b/view/en/register_open_eml.tpl
@@ -1,12 +1,12 @@
 
-Dear $username,
-	Thank you for registering at $sitename. Your account has been created. 
+Dear $[username],
+	Thank you for registering at $[sitename]. Your account has been created. 
 The login details are as follows:
 
 
-Site Location:	$siteurl
-Login Name:	$email
-Password:	$password
+Site Location:	$[siteurl]
+Login Name:	$[email]
+Password:	$[password]
 
 You may change your password from your account "Settings" page after logging 
 in.
@@ -26,9 +26,9 @@ If you are new and do not know anybody here, they may help
 you to make some new and interesting friends.  
 
 
-Thank you and welcome to $sitename.
+Thank you and welcome to $[sitename].
 
 Sincerely,
-	$sitename Administrator
+	$[sitename] Administrator
 
  
diff --git a/view/en/register_verify_eml.tpl b/view/en/register_verify_eml.tpl
index 60c38d800..73980bb5c 100755..100644
--- a/view/en/register_verify_eml.tpl
+++ b/view/en/register_verify_eml.tpl
@@ -1,25 +1,25 @@
 
-A new user registration request was received at $sitename which requires 
+A new user registration request was received at $[sitename] which requires 
 your approval. 
 
 
 The login details are as follows:
 
-Full Name:	$username
-Site Location:	$siteurl
-Login Name:	$email
+Full Name:	$[username]
+Site Location:	$[siteurl]
+Login Name:	$[email]
 
 
 To approve this request please visit the following link:
 
 
-$siteurl/regmod/allow/$hash 
+$[siteurl]/regmod/allow/$[hash] 
 
 
 To deny the request and remove the account, please visit:
 
 
-$siteurl/regmod/deny/$hash
+$[siteurl]/regmod/deny/$[hash]
 
 
 Thank you.
diff --git a/view/en/request_notify_eml.tpl b/view/en/request_notify_eml.tpl
index 9eef7a61e..ad118a673 100755..100644
--- a/view/en/request_notify_eml.tpl
+++ b/view/en/request_notify_eml.tpl
@@ -1,17 +1,17 @@
 
-Dear $myname,
+Dear $[myname],
 
-You have just received a connection request at $sitename 
+You have just received a connection request at $[sitename] 
 
-from '$requestor'.
+from '$[requestor]'.
 
-You may visit their profile at $url.
+You may visit their profile at $[url].
 
 Please login to your site to view the complete introduction 
 and approve or ignore/cancel the request.
 
-$siteurl
+$[siteurl]
 
 Regards,
 
-	$sitename administrator
\ No newline at end of file
+	$[sitename] administrator
diff --git a/view/eo/messages.po b/view/eo/messages.po
new file mode 100644
index 000000000..dea7d919d
--- /dev/null
+++ b/view/eo/messages.po
@@ -0,0 +1,6954 @@
+# FRIENDICA Distributed Social Network
+# Copyright (C) 2010, 2011 the Friendica Project
+# This file is distributed under the same license as the Friendica package.
+# 
+# Translators:
+# Diego Souza <diegosouza.br@gmail.com>, 2012.
+# Martin Schmitt <mas@scsy.de>, 2012.
+msgid ""
+msgstr ""
+"Project-Id-Version: friendica\n"
+"Report-Msgid-Bugs-To: http://bugs.friendica.com/\n"
+"POT-Creation-Date: 2012-04-16 10:00-0700\n"
+"PO-Revision-Date: 2012-04-18 17:16+0000\n"
+"Last-Translator: Martin Schmitt <mas@scsy.de>\n"
+"Language-Team: Esperanto (http://www.transifex.net/projects/p/friendica/language/eo/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: eo\n"
+"Plural-Forms: nplurals=2; plural=(n != 1)\n"
+
+#: ../../mod/oexchange.php:25
+msgid "Post successful."
+msgstr "Sukcese afi�ita."
+
+#: ../../mod/update_notes.php:41 ../../mod/update_community.php:18
+#: ../../mod/update_network.php:22 ../../mod/update_profile.php:41
+msgid "[Embedded content - reload page to view]"
+msgstr "[Enigita enhavo - re�argu pa�on por spekti �in]"
+
+#: ../../mod/crepair.php:102
+msgid "Contact settings applied."
+msgstr "Kontaktagordoj estas konservita."
+
+#: ../../mod/crepair.php:104
+msgid "Contact update failed."
+msgstr "Äœisdatigo de kontakto malsukcesis."
+
+#: ../../mod/crepair.php:115 ../../mod/wall_attach.php:44
+#: ../../mod/fsuggest.php:78 ../../mod/events.php:110 ../../mod/api.php:26
+#: ../../mod/api.php:31 ../../mod/photos.php:130 ../../mod/photos.php:866
+#: ../../mod/editpost.php:10 ../../mod/install.php:171
+#: ../../mod/notifications.php:66 ../../mod/contacts.php:125
+#: ../../mod/settings.php:99 ../../mod/settings.php:514
+#: ../../mod/settings.php:519 ../../mod/manage.php:86 ../../mod/network.php:6
+#: ../../mod/notes.php:20 ../../mod/wallmessage.php:9
+#: ../../mod/wallmessage.php:33 ../../mod/wallmessage.php:79
+#: ../../mod/wallmessage.php:103 ../../mod/attach.php:33
+#: ../../mod/group.php:19 ../../mod/viewcontacts.php:22
+#: ../../mod/register.php:38 ../../mod/regmod.php:116 ../../mod/item.php:124
+#: ../../mod/item.php:140 ../../mod/profile_photo.php:19
+#: ../../mod/profile_photo.php:139 ../../mod/profile_photo.php:150
+#: ../../mod/profile_photo.php:163 ../../mod/message.php:38
+#: ../../mod/message.php:90 ../../mod/allfriends.php:9
+#: ../../mod/nogroup.php:25 ../../mod/wall_upload.php:46
+#: ../../mod/follow.php:8 ../../mod/common.php:9 ../../mod/display.php:138
+#: ../../mod/profiles.php:7 ../../mod/profiles.php:329
+#: ../../mod/delegate.php:6 ../../mod/suggest.php:28 ../../mod/invite.php:13
+#: ../../mod/invite.php:81 ../../mod/dfrn_confirm.php:53
+#: ../../addon/facebook/facebook.php:461 ../../include/items.php:3170
+#: ../../index.php:309
+msgid "Permission denied."
+msgstr "Malpermesita."
+
+#: ../../mod/crepair.php:129 ../../mod/fsuggest.php:20
+#: ../../mod/fsuggest.php:92 ../../mod/dfrn_confirm.php:118
+msgid "Contact not found."
+msgstr "Kontakto ne trovita."
+
+#: ../../mod/crepair.php:135
+msgid "Repair Contact Settings"
+msgstr "Ripari kontaktagordoj."
+
+#: ../../mod/crepair.php:137
+msgid ""
+"<strong>WARNING: This is highly advanced</strong> and if you enter incorrect"
+" information your communications with this contact may stop working."
+msgstr "<strong>AVERTO: Tio estas tre altnivela</strong> kaj se vi entajpus mal�ustan informojn, komunikado kun la kontakto eble ne plu funkcios."
+
+#: ../../mod/crepair.php:138
+msgid ""
+"Please use your browser 'Back' button <strong>now</strong> if you are "
+"uncertain what to do on this page."
+msgstr "Bonvolu klaki 'malantaŭen' en via retesplorilo <strong>nun</strong> se vi ne scias kion faru ĉi tie."
+
+#: ../../mod/crepair.php:144
+msgid "Return to contact editor"
+msgstr "Reen al kontakta redaktilo"
+
+#: ../../mod/crepair.php:148 ../../mod/settings.php:534
+#: ../../mod/settings.php:560 ../../mod/admin.php:544 ../../mod/admin.php:553
+msgid "Name"
+msgstr "Nomo"
+
+#: ../../mod/crepair.php:149
+msgid "Account Nickname"
+msgstr "Ka�nomo de la konto"
+
+#: ../../mod/crepair.php:150
+msgid "@Tagname - overrides Name/Nickname"
+msgstr "@Marknomo - Transpasas nomon/ka�nomon"
+
+#: ../../mod/crepair.php:151
+msgid "Account URL"
+msgstr "Adreso de la konto"
+
+#: ../../mod/crepair.php:152
+msgid "Friend Request URL"
+msgstr "Kontaktpeta adreso"
+
+#: ../../mod/crepair.php:153
+msgid "Friend Confirm URL"
+msgstr "Kontaktkonfirma adreso"
+
+#: ../../mod/crepair.php:154
+msgid "Notification Endpoint URL"
+msgstr "Finpunkta adreso por atentigoj"
+
+#: ../../mod/crepair.php:155
+msgid "Poll/Feed URL"
+msgstr "Adreso de fluo"
+
+#: ../../mod/crepair.php:156
+msgid "New photo from this URL"
+msgstr "Nova bildo el tiu adreso"
+
+#: ../../mod/crepair.php:166 ../../mod/fsuggest.php:107
+#: ../../mod/events.php:400 ../../mod/photos.php:901 ../../mod/photos.php:959
+#: ../../mod/photos.php:1194 ../../mod/photos.php:1234
+#: ../../mod/photos.php:1274 ../../mod/photos.php:1305
+#: ../../mod/install.php:251 ../../mod/install.php:289
+#: ../../mod/localtime.php:45 ../../mod/contacts.php:325
+#: ../../mod/settings.php:532 ../../mod/settings.php:678
+#: ../../mod/settings.php:739 ../../mod/settings.php:930
+#: ../../mod/manage.php:109 ../../mod/group.php:85 ../../mod/admin.php:374
+#: ../../mod/admin.php:541 ../../mod/admin.php:670 ../../mod/admin.php:850
+#: ../../mod/admin.php:930 ../../mod/profiles.php:498 ../../mod/invite.php:119
+#: ../../addon/facebook/facebook.php:552 ../../addon/yourls/yourls.php:76
+#: ../../addon/ljpost/ljpost.php:93 ../../addon/nsfw/nsfw.php:57
+#: ../../addon/planets/planets.php:158
+#: ../../addon/uhremotestorage/uhremotestorage.php:89
+#: ../../addon/randplace/randplace.php:177 ../../addon/dwpost/dwpost.php:93
+#: ../../addon/drpost/drpost.php:110 ../../addon/geonames/geonames.php:187
+#: ../../addon/oembed.old/oembed.php:41 ../../addon/impressum/impressum.php:80
+#: ../../addon/blockem/blockem.php:57 ../../addon/qcomment/qcomment.php:61
+#: ../../addon/openstreetmap/openstreetmap.php:70
+#: ../../addon/mathjax/mathjax.php:42 ../../addon/editplain/editplain.php:84
+#: ../../addon/blackout/blackout.php:94 ../../addon/gravatar/gravatar.php:86
+#: ../../addon/pageheader/pageheader.php:55 ../../addon/ijpost/ijpost.php:93
+#: ../../addon/statusnet/statusnet.php:278
+#: ../../addon/statusnet/statusnet.php:292
+#: ../../addon/statusnet/statusnet.php:318
+#: ../../addon/statusnet/statusnet.php:325
+#: ../../addon/statusnet/statusnet.php:353
+#: ../../addon/statusnet/statusnet.php:553 ../../addon/tumblr/tumblr.php:90
+#: ../../addon/numfriends/numfriends.php:85 ../../addon/gnot/gnot.php:88
+#: ../../addon/wppost/wppost.php:102 ../../addon/showmore/showmore.php:48
+#: ../../addon/piwik/piwik.php:89 ../../addon/twitter/twitter.php:180
+#: ../../addon/twitter/twitter.php:209 ../../addon/twitter/twitter.php:375
+#: ../../addon/irc/irc.php:55 ../../addon/blogger/blogger.php:102
+#: ../../addon/posterous/posterous.php:90
+#: ../../view/theme/diabook-red/config.php:64
+#: ../../view/theme/diabook-blue/config.php:64
+#: ../../view/theme/diabook/config.php:76
+#: ../../view/theme/quattro/config.php:52
+#: ../../view/theme/diabook-aerith/config.php:64
+#: ../../include/conversation.php:555
+msgid "Submit"
+msgstr "Sendi"
+
+#: ../../mod/help.php:30
+msgid "Help:"
+msgstr "Helpo:"
+
+#: ../../mod/help.php:34 ../../include/nav.php:86
+msgid "Help"
+msgstr "Helpo"
+
+#: ../../mod/help.php:38 ../../index.php:228
+msgid "Not Found"
+msgstr "Ne trovita"
+
+#: ../../mod/help.php:41 ../../index.php:231
+msgid "Page not found."
+msgstr "Pa�o ne trovita"
+
+#: ../../mod/wall_attach.php:58
+#, php-format
+msgid "File exceeds size limit of %d"
+msgstr "Dosiero estas pli granda ol la limito de %d"
+
+#: ../../mod/wall_attach.php:86 ../../mod/wall_attach.php:97
+msgid "File upload failed."
+msgstr "Al�utado malsukcesis."
+
+#: ../../mod/fsuggest.php:63
+msgid "Friend suggestion sent."
+msgstr "Amikosugesto sendita."
+
+#: ../../mod/fsuggest.php:97
+msgid "Suggest Friends"
+msgstr "Sugesti amikojn"
+
+#: ../../mod/fsuggest.php:99
+#, php-format
+msgid "Suggest a friend for %s"
+msgstr "Sugesti amikon por %s"
+
+#: ../../mod/events.php:62
+msgid "Event description and start time are required."
+msgstr "Okazo bezonas priskribon kaj startotempon."
+
+#: ../../mod/events.php:230
+msgid "l, F j"
+msgstr "l, F j"
+
+#: ../../mod/events.php:252
+msgid "Edit event"
+msgstr "Redakti okazon"
+
+#: ../../mod/events.php:272 ../../include/text.php:1053
+msgid "link to source"
+msgstr "ligi al fonto"
+
+#: ../../mod/events.php:296 ../../view/theme/diabook-red/theme.php:243
+#: ../../view/theme/diabook-blue/theme.php:243
+#: ../../view/theme/diabook/theme.php:253
+#: ../../view/theme/diabook-aerith/theme.php:244 ../../include/nav.php:52
+#: ../../boot.php:1471
+msgid "Events"
+msgstr "Okazoj"
+
+#: ../../mod/events.php:297
+msgid "Create New Event"
+msgstr "Krei novan okazon"
+
+#: ../../mod/events.php:298
+msgid "Previous"
+msgstr "antaÅ­a"
+
+#: ../../mod/events.php:299 ../../mod/install.php:210
+msgid "Next"
+msgstr "sekva"
+
+#: ../../mod/events.php:371
+msgid "hour:minute"
+msgstr "horo:minuto"
+
+#: ../../mod/events.php:380
+msgid "Event details"
+msgstr "Detaloj de okazo"
+
+#: ../../mod/events.php:381
+#, php-format
+msgid "Format is %s %s. Starting date and Description are required."
+msgstr "Formato estas %s %s. Startotempo kaj priskribo estas bezonataj"
+
+#: ../../mod/events.php:383
+msgid "Event Starts:"
+msgstr "Okazo startas:"
+
+#: ../../mod/events.php:386
+msgid "Finish date/time is not known or not relevant"
+msgstr "Fina dato/tempo ne estas konata aÅ­ ne bezonata"
+
+#: ../../mod/events.php:388
+msgid "Event Finishes:"
+msgstr "Okazo finas:"
+
+#: ../../mod/events.php:391
+msgid "Adjust for viewer timezone"
+msgstr "Agordi al horzono de la leganto"
+
+#: ../../mod/events.php:393
+msgid "Description:"
+msgstr "Priskribo"
+
+#: ../../mod/events.php:395 ../../include/event.php:37
+#: ../../include/bb2diaspora.php:260 ../../boot.php:1083
+msgid "Location:"
+msgstr "Loko:"
+
+#: ../../mod/events.php:397
+msgid "Share this event"
+msgstr "Kunhavigi la okazon"
+
+#: ../../mod/tagrm.php:11 ../../mod/tagrm.php:94
+#: ../../mod/dfrn_request.php:752 ../../mod/settings.php:533
+#: ../../mod/settings.php:559 ../../addon/js_upload/js_upload.php:45
+msgid "Cancel"
+msgstr "Nuligi"
+
+#: ../../mod/tagrm.php:41
+msgid "Tag removed"
+msgstr "Marko forvi�ita"
+
+#: ../../mod/tagrm.php:79
+msgid "Remove Item Tag"
+msgstr "Forvi�i markon"
+
+#: ../../mod/tagrm.php:81
+msgid "Select a tag to remove: "
+msgstr "Elektu forvi�ontan markon:"
+
+#: ../../mod/tagrm.php:93 ../../mod/delegate.php:130
+msgid "Remove"
+msgstr "Forvi�i"
+
+#: ../../mod/dfrn_poll.php:94 ../../mod/dfrn_poll.php:522
+#, php-format
+msgid "%s welcomes %s"
+msgstr "%s salutas %s"
+
+#: ../../mod/api.php:76 ../../mod/api.php:102
+msgid "Authorize application connection"
+msgstr "Rajtigi programkonekton"
+
+#: ../../mod/api.php:77
+msgid "Return to your app and insert this Securty Code:"
+msgstr "Reiru al via programo kaj entajpu la securecan kodon:"
+
+#: ../../mod/api.php:89
+msgid "Please login to continue."
+msgstr "Bonvolu ensaluti por pluigi."
+
+#: ../../mod/api.php:104
+msgid ""
+"Do you want to authorize this application to access your posts and contacts,"
+" and/or create new posts for you?"
+msgstr "Ĉu rajtigi ĉi tiun programon por atingi viajn afi�ojn kaj kontaktojn kaj/aŭ krei novajn afi�ojn?"
+
+#: ../../mod/api.php:105 ../../mod/dfrn_request.php:740
+#: ../../mod/settings.php:844 ../../mod/settings.php:850
+#: ../../mod/settings.php:858 ../../mod/settings.php:862
+#: ../../mod/settings.php:867 ../../mod/settings.php:873
+#: ../../mod/settings.php:879 ../../mod/settings.php:885
+#: ../../mod/settings.php:921 ../../mod/settings.php:922
+#: ../../mod/settings.php:923 ../../mod/settings.php:924
+#: ../../mod/register.php:532 ../../mod/profiles.php:475
+msgid "Yes"
+msgstr "Jes"
+
+#: ../../mod/api.php:106 ../../mod/dfrn_request.php:741
+#: ../../mod/settings.php:844 ../../mod/settings.php:850
+#: ../../mod/settings.php:858 ../../mod/settings.php:862
+#: ../../mod/settings.php:867 ../../mod/settings.php:873
+#: ../../mod/settings.php:879 ../../mod/settings.php:885
+#: ../../mod/settings.php:921 ../../mod/settings.php:922
+#: ../../mod/settings.php:923 ../../mod/settings.php:924
+#: ../../mod/register.php:533 ../../mod/profiles.php:476
+msgid "No"
+msgstr "Ne"
+
+#: ../../mod/photos.php:43
+msgid "Photo Albums"
+msgstr "Bildalbumoj"
+
+#: ../../mod/photos.php:51 ../../mod/photos.php:151 ../../mod/photos.php:880
+#: ../../mod/photos.php:951 ../../mod/photos.php:966 ../../mod/photos.php:1383
+#: ../../mod/photos.php:1395 ../../addon/communityhome/communityhome.php:110
+#: ../../view/theme/diabook-red/theme.php:113
+#: ../../view/theme/diabook-blue/theme.php:113
+#: ../../view/theme/diabook/theme.php:119
+#: ../../view/theme/diabook-aerith/theme.php:114
+msgid "Contact Photos"
+msgstr "Kontaktbildoj"
+
+#: ../../mod/photos.php:58 ../../mod/photos.php:976 ../../mod/photos.php:1425
+msgid "Upload New Photos"
+msgstr "Al�uti novajn bildojn"
+
+#: ../../mod/photos.php:69 ../../mod/settings.php:20
+msgid "everybody"
+msgstr "ĉiuj"
+
+#: ../../mod/photos.php:140
+msgid "Contact information unavailable"
+msgstr "Kontaktoj informoj ne disponeblas"
+
+#: ../../mod/photos.php:151 ../../mod/photos.php:598 ../../mod/photos.php:951
+#: ../../mod/photos.php:966 ../../mod/register.php:335
+#: ../../mod/register.php:342 ../../mod/register.php:349
+#: ../../mod/profile_photo.php:60 ../../mod/profile_photo.php:67
+#: ../../mod/profile_photo.php:74 ../../mod/profile_photo.php:174
+#: ../../mod/profile_photo.php:252 ../../mod/profile_photo.php:261
+#: ../../addon/communityhome/communityhome.php:111
+#: ../../view/theme/diabook-red/theme.php:114
+#: ../../view/theme/diabook-blue/theme.php:114
+#: ../../view/theme/diabook/theme.php:120
+#: ../../view/theme/diabook-aerith/theme.php:115
+msgid "Profile Photos"
+msgstr "Profilbildoj"
+
+#: ../../mod/photos.php:161
+msgid "Album not found."
+msgstr "Albumo ne trovita."
+
+#: ../../mod/photos.php:179 ../../mod/photos.php:960
+msgid "Delete Album"
+msgstr "Forvi�i albumon"
+
+#: ../../mod/photos.php:242 ../../mod/photos.php:1195
+msgid "Delete Photo"
+msgstr "Forvi�i bildon"
+
+#: ../../mod/photos.php:529
+msgid "was tagged in a"
+msgstr "estas markita en"
+
+#: ../../mod/photos.php:529 ../../mod/like.php:127 ../../mod/tagger.php:70
+#: ../../addon/communityhome/communityhome.php:163
+#: ../../view/theme/diabook-red/theme.php:85
+#: ../../view/theme/diabook-blue/theme.php:85
+#: ../../view/theme/diabook/theme.php:91
+#: ../../view/theme/diabook-aerith/theme.php:86 ../../include/text.php:1304
+#: ../../include/diaspora.php:1654 ../../include/conversation.php:53
+#: ../../include/conversation.php:126
+msgid "photo"
+msgstr "bildo"
+
+#: ../../mod/photos.php:529
+msgid "by"
+msgstr "de"
+
+#: ../../mod/photos.php:632 ../../addon/js_upload/js_upload.php:315
+msgid "Image exceeds size limit of "
+msgstr "Bildo estas pli granda ol la limito de"
+
+#: ../../mod/photos.php:640
+msgid "Image file is empty."
+msgstr "Bilddosiero estas malplena."
+
+#: ../../mod/photos.php:654 ../../mod/profile_photo.php:124
+#: ../../mod/wall_upload.php:69
+msgid "Unable to process image."
+msgstr "Ne eblas procedi la bildon."
+
+#: ../../mod/photos.php:674 ../../mod/profile_photo.php:257
+#: ../../mod/wall_upload.php:88
+msgid "Image upload failed."
+msgstr "Al�uto de bildo malsukcesis."
+
+#: ../../mod/photos.php:760 ../../mod/community.php:16
+#: ../../mod/dfrn_request.php:671 ../../mod/viewcontacts.php:17
+#: ../../mod/display.php:7 ../../mod/search.php:71 ../../mod/directory.php:29
+msgid "Public access denied."
+msgstr "Publika atingo ne permesita."
+
+#: ../../mod/photos.php:770
+msgid "No photos selected"
+msgstr "Neniu bildoj elektita"
+
+#: ../../mod/photos.php:847
+msgid "Access to this item is restricted."
+msgstr "Atingo al tio elemento estas limigita."
+
+#: ../../mod/photos.php:908
+msgid "Upload Photos"
+msgstr "Al�uti bildojn"
+
+#: ../../mod/photos.php:911 ../../mod/photos.php:955
+msgid "New album name: "
+msgstr "Nomo por nova albumo:"
+
+#: ../../mod/photos.php:912
+msgid "or existing album name: "
+msgstr "aÅ­ nomo de estanta albumo:"
+
+#: ../../mod/photos.php:913
+msgid "Do not show a status post for this upload"
+msgstr "Ne kreu statan afi�on por tio al�uto."
+
+#: ../../mod/photos.php:915 ../../mod/photos.php:1190
+msgid "Permissions"
+msgstr "Permesoj"
+
+#: ../../mod/photos.php:970
+msgid "Edit Album"
+msgstr "Redakti albumon"
+
+#: ../../mod/photos.php:985 ../../mod/photos.php:1408
+msgid "View Photo"
+msgstr "Vidi bildon"
+
+#: ../../mod/photos.php:1020
+msgid "Permission denied. Access to this item may be restricted."
+msgstr "Malpermesita. Atingo al tio elemento eble estas limigita."
+
+#: ../../mod/photos.php:1022
+msgid "Photo not available"
+msgstr "La bildo ne disponeblas"
+
+#: ../../mod/photos.php:1072
+msgid "View photo"
+msgstr "Vidi bildon"
+
+#: ../../mod/photos.php:1072
+msgid "Edit photo"
+msgstr "Redakti bildon"
+
+#: ../../mod/photos.php:1073
+msgid "Use as profile photo"
+msgstr "Uzi kiel profilbildo"
+
+#: ../../mod/photos.php:1079 ../../include/conversation.php:480
+msgid "Private Message"
+msgstr "Privata mesa�o"
+
+#: ../../mod/photos.php:1101
+msgid "View Full Size"
+msgstr "Vidi plengrande "
+
+#: ../../mod/photos.php:1169
+msgid "Tags: "
+msgstr "Markoj:"
+
+#: ../../mod/photos.php:1172
+msgid "[Remove any tag]"
+msgstr "[Forvi�i iun markon]"
+
+#: ../../mod/photos.php:1183
+msgid "New album name"
+msgstr "Nova nomo de albumo"
+
+#: ../../mod/photos.php:1186
+msgid "Caption"
+msgstr "Apudskribo"
+
+#: ../../mod/photos.php:1188
+msgid "Add a Tag"
+msgstr "Aldoni markon"
+
+#: ../../mod/photos.php:1192
+msgid ""
+"Example: @bob, @Barbara_Jensen, @jim@example.com, #California, #camping"
+msgstr "Ekzemple: @bob, @Barbara_Jensen, @jim@example.com, #California, #camping"
+
+#: ../../mod/photos.php:1212 ../../include/conversation.php:529
+msgid "I like this (toggle)"
+msgstr "Mi �atas tion (�alti)"
+
+#: ../../mod/photos.php:1213 ../../include/conversation.php:530
+msgid "I don't like this (toggle)"
+msgstr "Mi mal�atas tion(�alti)"
+
+#: ../../mod/photos.php:1214 ../../include/conversation.php:956
+msgid "Share"
+msgstr "Kunhavigi"
+
+#: ../../mod/photos.php:1215 ../../mod/editpost.php:104
+#: ../../mod/wallmessage.php:145 ../../mod/message.php:188
+#: ../../mod/message.php:357 ../../include/conversation.php:362
+#: ../../include/conversation.php:698 ../../include/conversation.php:975
+msgid "Please wait"
+msgstr "Bonvolu atendi"
+
+#: ../../mod/photos.php:1231 ../../mod/photos.php:1271
+#: ../../mod/photos.php:1302 ../../include/conversation.php:552
+msgid "This is you"
+msgstr "Tiu estas vi"
+
+#: ../../mod/photos.php:1233 ../../mod/photos.php:1273
+#: ../../mod/photos.php:1304 ../../include/conversation.php:554
+#: ../../boot.php:495
+msgid "Comment"
+msgstr "Komenti"
+
+#: ../../mod/photos.php:1235 ../../mod/editpost.php:125
+#: ../../include/conversation.php:556 ../../include/conversation.php:993
+msgid "Preview"
+msgstr "AntaÅ­rigardi"
+
+#: ../../mod/photos.php:1332 ../../mod/settings.php:595
+#: ../../mod/settings.php:676 ../../mod/group.php:168 ../../mod/admin.php:548
+#: ../../include/conversation.php:318 ../../include/conversation.php:576
+msgid "Delete"
+msgstr "Forvi�i"
+
+#: ../../mod/photos.php:1414
+msgid "View Album"
+msgstr "Vidi albumon"
+
+#: ../../mod/photos.php:1423
+msgid "Recent Photos"
+msgstr "Ì‚Ä´usaj bildoj"
+
+#: ../../mod/community.php:21
+msgid "Not available."
+msgstr "Ne disponebla."
+
+#: ../../mod/community.php:30 ../../view/theme/diabook-red/theme.php:245
+#: ../../view/theme/diabook-blue/theme.php:245
+#: ../../view/theme/diabook/theme.php:255
+#: ../../view/theme/diabook-aerith/theme.php:246 ../../include/nav.php:101
+msgid "Community"
+msgstr "Komunumo"
+
+#: ../../mod/community.php:61 ../../mod/search.php:115
+msgid "No results."
+msgstr "Nenion trovita."
+
+#: ../../mod/friendica.php:47
+msgid "This is Friendica, version"
+msgstr "Tio estas Friendica en la versio"
+
+#: ../../mod/friendica.php:48
+msgid "running at web location"
+msgstr "instalita ĉe la adreso"
+
+#: ../../mod/friendica.php:50
+msgid ""
+"Please visit <a href=\"http://friendica.com\">Friendica.com</a> to learn "
+"more about the Friendica project."
+msgstr "Bonvolu iri al <a href=\"http://friendica.com\">Friendica.com</a> por lerni pli pri la projekto Friendica"
+
+#: ../../mod/friendica.php:52
+msgid "Bug reports and issues: please visit"
+msgstr "Cimraportoj kaj atendindaĵo: bonvolu iri al"
+
+#: ../../mod/friendica.php:53
+msgid ""
+"Suggestions, praise, donations, etc. - please email \"Info\" at Friendica - "
+"dot com"
+msgstr "Sugestoj, laŭdoj, donacoj ktp - bonvolu sendi mes�on al \"Info\" ĉe Friendica - punkto com"
+
+#: ../../mod/friendica.php:58
+msgid "Installed plugins/addons/apps:"
+msgstr "Instalitaj kromprogramoj/programoj:"
+
+#: ../../mod/friendica.php:71
+msgid "No installed plugins/addons/apps"
+msgstr "Neniom da instalitaj aldonaĵoj/programoj"
+
+#: ../../mod/editpost.php:17 ../../mod/editpost.php:27
+msgid "Item not found"
+msgstr "Elemento ne trovita"
+
+#: ../../mod/editpost.php:36
+msgid "Edit post"
+msgstr "Redakti afi�on"
+
+#: ../../mod/editpost.php:80 ../../include/conversation.php:942
+msgid "Post to Email"
+msgstr "Sendi tra retpo�to"
+
+#: ../../mod/editpost.php:95 ../../mod/settings.php:594
+#: ../../include/conversation.php:563
+msgid "Edit"
+msgstr "Redakti"
+
+#: ../../mod/editpost.php:96 ../../mod/wallmessage.php:143
+#: ../../mod/message.php:186 ../../mod/message.php:355
+#: ../../include/conversation.php:957
+msgid "Upload photo"
+msgstr "Al�uti bildon"
+
+#: ../../mod/editpost.php:97 ../../include/conversation.php:959
+msgid "Attach file"
+msgstr "Kunligi dosieron"
+
+#: ../../mod/editpost.php:98 ../../mod/wallmessage.php:144
+#: ../../mod/message.php:187 ../../mod/message.php:356
+#: ../../include/conversation.php:961
+msgid "Insert web link"
+msgstr "Enmeti retan adreson"
+
+#: ../../mod/editpost.php:99
+msgid "Insert YouTube video"
+msgstr "Enmeti videton ĉe YouTube"
+
+#: ../../mod/editpost.php:100
+msgid "Insert Vorbis [.ogg] video"
+msgstr "Enmeti videton en formato Vorbis [.ogg]"
+
+#: ../../mod/editpost.php:101
+msgid "Insert Vorbis [.ogg] audio"
+msgstr "Enmeti sonon en formato Vorbis [.ogg]"
+
+#: ../../mod/editpost.php:102 ../../include/conversation.php:967
+msgid "Set your location"
+msgstr "Agordi vian lokon"
+
+#: ../../mod/editpost.php:103 ../../include/conversation.php:969
+msgid "Clear browser location"
+msgstr "Forvi�u retesplorilan lokon"
+
+#: ../../mod/editpost.php:105 ../../include/conversation.php:976
+msgid "Permission settings"
+msgstr "Permesagordoj"
+
+#: ../../mod/editpost.php:113 ../../include/conversation.php:985
+msgid "CC: email addresses"
+msgstr "CC: retpo�tadresojn"
+
+#: ../../mod/editpost.php:114 ../../include/conversation.php:986
+msgid "Public post"
+msgstr "Publika afi�o"
+
+#: ../../mod/editpost.php:117 ../../include/conversation.php:972
+msgid "Set title"
+msgstr "Redakti titolon"
+
+#: ../../mod/editpost.php:119 ../../include/conversation.php:974
+msgid "Categories (comma-separated list)"
+msgstr "Kategorioj (disigita per komo)"
+
+#: ../../mod/editpost.php:120 ../../include/conversation.php:988
+msgid "Example: bob@example.com, mary@example.com"
+msgstr "Ekzemple: bob@example.com, mary@example.com"
+
+#: ../../mod/dfrn_request.php:93
+msgid "This introduction has already been accepted."
+msgstr "Tia prezento jam estas akceptita"
+
+#: ../../mod/dfrn_request.php:117 ../../mod/dfrn_request.php:427
+msgid "Profile location is not valid or does not contain profile information."
+msgstr "La adreso de la profilo ne validas aÅ­ ne enhavas profilinformojn."
+
+#: ../../mod/dfrn_request.php:122 ../../mod/dfrn_request.php:432
+msgid "Warning: profile location has no identifiable owner name."
+msgstr "Averto: La adreso de la profilo ne enhavas identeblan personan nomon."
+
+#: ../../mod/dfrn_request.php:124 ../../mod/dfrn_request.php:434
+msgid "Warning: profile location has no profile photo."
+msgstr "Averto: La adreso de la profilo ne enhavas bildon."
+
+#: ../../mod/dfrn_request.php:127 ../../mod/dfrn_request.php:437
+#, php-format
+msgid "%d required parameter was not found at the given location"
+msgid_plural "%d required parameters were not found at the given location"
+msgstr[0] "%d bezonataj parametroj ne trovita ĉe la donata adreso."
+msgstr[1] "%d bezonataj parametroj ne trovita ĉe la donata adreso."
+
+#: ../../mod/dfrn_request.php:168
+msgid "Introduction complete."
+msgstr "Prezento sukcesis."
+
+#: ../../mod/dfrn_request.php:192
+msgid "Unrecoverable protocol error."
+msgstr "Ne�ustigebla eraro en protokolo."
+
+#: ../../mod/dfrn_request.php:220
+msgid "Profile unavailable."
+msgstr "Profilo ne estas disponebla."
+
+#: ../../mod/dfrn_request.php:245
+#, php-format
+msgid "%s has received too many connection requests today."
+msgstr "%s hodiaÅ­ ricevis tro multe da konektpetoj."
+
+#: ../../mod/dfrn_request.php:246
+msgid "Spam protection measures have been invoked."
+msgstr "KontraÅ­spamilo estas aktivita."
+
+#: ../../mod/dfrn_request.php:247
+msgid "Friends are advised to please try again in 24 hours."
+msgstr "Amikoj, vi bonvolu ripeti post 24 horoj."
+
+#: ../../mod/dfrn_request.php:309
+msgid "Invalid locator"
+msgstr "Nevalida adreso."
+
+#: ../../mod/dfrn_request.php:318
+msgid "Invalid email address."
+msgstr "Nevalida repo�tadreso."
+
+#: ../../mod/dfrn_request.php:344
+msgid "This account has not been configured for email. Request failed."
+msgstr "La konto ne estas agordita por retpo�to. La peto malsukcesis."
+
+#: ../../mod/dfrn_request.php:372
+msgid "Unable to resolve your name at the provided location."
+msgstr "Via nomo ne troveblas al la donita adreso."
+
+#: ../../mod/dfrn_request.php:385
+msgid "You have already introduced yourself here."
+msgstr "Vi vin jam prezentis tie."
+
+#: ../../mod/dfrn_request.php:389
+#, php-format
+msgid "Apparently you are already friends with %s."
+msgstr "Ŝajnas kvazaŭ vi jam amiki�is kun %s."
+
+#: ../../mod/dfrn_request.php:410
+msgid "Invalid profile URL."
+msgstr "Nevalida adreso de profilo."
+
+#: ../../mod/dfrn_request.php:416 ../../mod/follow.php:20
+msgid "Disallowed profile URL."
+msgstr "Malpermesita adreso de profilo."
+
+#: ../../mod/dfrn_request.php:485 ../../mod/contacts.php:102
+msgid "Failed to update contact record."
+msgstr "Äœisdatigo de via kontaktrikordo malsukcesis."
+
+#: ../../mod/dfrn_request.php:506
+msgid "Your introduction has been sent."
+msgstr "Via prezento estas sendita."
+
+#: ../../mod/dfrn_request.php:559
+msgid "Please login to confirm introduction."
+msgstr "Bonvolu ensaluti por jesigi la prezenton."
+
+#: ../../mod/dfrn_request.php:573
+msgid ""
+"Incorrect identity currently logged in. Please login to "
+"<strong>this</strong> profile."
+msgstr "Mal�usta identaĵo ensalutata. Bonvolu ensaluti en <strong>tiun</strong> profilon."
+
+#: ../../mod/dfrn_request.php:585
+#, php-format
+msgid "Welcome home %s."
+msgstr "Bonvenon hejme, %s."
+
+#: ../../mod/dfrn_request.php:586
+#, php-format
+msgid "Please confirm your introduction/connection request to %s."
+msgstr "Bonvolu konfirmi vian prezenton / kontaktpeton al %s."
+
+#: ../../mod/dfrn_request.php:587
+msgid "Confirm"
+msgstr "Konfirmi."
+
+#: ../../mod/dfrn_request.php:628 ../../include/items.php:2690
+msgid "[Name Withheld]"
+msgstr "[Ka�ita nomo]"
+
+#: ../../mod/dfrn_request.php:715
+msgid ""
+"Please enter your 'Identity Address' from one of the following supported "
+"communications networks:"
+msgstr "Bonvolu entajpi vian 'Identecan Adreson' de iu de tiuj subtenataj komunikaj retejoj: "
+
+#: ../../mod/dfrn_request.php:731
+msgid "<strike>Connect as an email follower</strike> (Coming soon)"
+msgstr "<strike>Konektu kiel retpo�ta sekvanto</strike> (Baldaŭ venos)"
+
+#: ../../mod/dfrn_request.php:733
+msgid ""
+"If you are not yet a member of the free social web, <a "
+"href=\"http://dir.friendica.com/siteinfo\">follow this link to find a public"
+" Friendica site and join us today</a>."
+msgstr "Se vi ne estas membro de la libra interkona reto, <a href=\"http://dir.friendica.com/siteinfo\">sekvu ĉi-ligilon por trovi publikan Friendica retejon kaj ali�i kun ni hodiaŭ</a>."
+
+#: ../../mod/dfrn_request.php:736
+msgid "Friend/Connection Request"
+msgstr "Prezento / Konektpeto"
+
+#: ../../mod/dfrn_request.php:737
+msgid ""
+"Examples: jojo@demo.friendica.com, http://demo.friendica.com/profile/jojo, "
+"testuser@identi.ca"
+msgstr "Ekzemploj: jojo@demo.friendica.com, http://demo.friendica.com/profile/jojo, testuser@identi.ca"
+
+#: ../../mod/dfrn_request.php:738
+msgid "Please answer the following:"
+msgstr "Bonvolu respondi:"
+
+#: ../../mod/dfrn_request.php:739
+#, php-format
+msgid "Does %s know you?"
+msgstr "Ĉu %s konas vin?"
+
+#: ../../mod/dfrn_request.php:742
+msgid "Add a personal note:"
+msgstr "Aldoni personan noton:"
+
+#: ../../mod/dfrn_request.php:744 ../../include/contact_selectors.php:76
+msgid "Friendica"
+msgstr "Friendica"
+
+#: ../../mod/dfrn_request.php:745
+msgid "StatusNet/Federated Social Web"
+msgstr "StatusNet/Federaciaj interkonaj retejoj"
+
+#: ../../mod/dfrn_request.php:746 ../../mod/settings.php:629
+#: ../../include/contact_selectors.php:80
+msgid "Diaspora"
+msgstr "Diaspora"
+
+#: ../../mod/dfrn_request.php:747
+#, php-format
+msgid ""
+" - please do not use this form.  Instead, enter %s into your Diaspora search"
+" bar."
+msgstr " - bonvolu ne uzi ĉi formo.  Anstataŭe, entajpu %s en la Diaspora serĉilo."
+
+#: ../../mod/dfrn_request.php:748
+msgid "Your Identity Address:"
+msgstr "Via identeca adreso:"
+
+#: ../../mod/dfrn_request.php:751
+msgid "Submit Request"
+msgstr "Sendi peton"
+
+#: ../../mod/install.php:111
+msgid "Friendica Social Communications Server - Setup"
+msgstr "Friendica Interkona Komunikada Servilo - Instalo"
+
+#: ../../mod/install.php:117 ../../mod/install.php:157
+#: ../../mod/install.php:230
+msgid "Database connection"
+msgstr "Datumbaza konekto"
+
+#: ../../mod/install.php:124
+msgid "Could not connect to database."
+msgstr "Ne eblas konekti la datumbazon."
+
+#: ../../mod/install.php:128
+msgid "Could not create table."
+msgstr "Ne eblas krei tabelon."
+
+#: ../../mod/install.php:133
+msgid "Your Friendica site database has been installed."
+msgstr "La datumbazo de vi Friendica retjo estas instalita."
+
+#: ../../mod/install.php:134
+msgid ""
+"IMPORTANT: You will need to [manually] setup a scheduled task for the "
+"poller."
+msgstr "GRAVA: Vi bezonas [mane] agordi planitan taskon por la Friendica poller."
+
+#: ../../mod/install.php:135 ../../mod/install.php:151
+#: ../../mod/install.php:209
+msgid "Please see the file \"INSTALL.txt\"."
+msgstr "Bonvolu legi la dosieron \"INSTALL.txt\"."
+
+#: ../../mod/install.php:137
+msgid "Proceed to registration"
+msgstr "Pluigi al la registrilo"
+
+#: ../../mod/install.php:143
+msgid "Proceed with Installation"
+msgstr "Pluigi la instalado"
+
+#: ../../mod/install.php:150
+msgid ""
+"You may need to import the file \"database.sql\" manually using phpmyadmin "
+"or mysql."
+msgstr "Vi bezonas mane importi la dosieron \"database.sql\" tra phpmyadmin aÅ­ mysql."
+
+#: ../../mod/install.php:158
+msgid "Database import failed."
+msgstr "Importo de la datumbazo malsukcesis."
+
+#: ../../mod/install.php:206
+msgid "System check"
+msgstr "Sistema kontrolo"
+
+#: ../../mod/install.php:211
+msgid "Check again"
+msgstr "Ree kontroli"
+
+#: ../../mod/install.php:231
+msgid ""
+"In order to install Friendica we need to know how to connect to your "
+"database."
+msgstr "Por instali Friendica, ni bezonas scii kiel konekti al via datumbazo."
+
+#: ../../mod/install.php:232
+msgid ""
+"Please contact your hosting provider or site administrator if you have "
+"questions about these settings."
+msgstr "Bonvolu kontakti vian servilprovizanton aŭ administranton se vi havas demandoj pri ĉi tiaj agordoj."
+
+#: ../../mod/install.php:233
+msgid ""
+"The database you specify below should already exist. If it does not, please "
+"create it before continuing."
+msgstr "La datumbazo nomata malsupren jam ekzistu. Se �i ne ekzistas, bonvolu unue krei �in antaŭ progresi."
+
+#: ../../mod/install.php:237
+msgid "Database Server Name"
+msgstr "Nomo de datumbaza servilo."
+
+#: ../../mod/install.php:238
+msgid "Database Login Name"
+msgstr "Salutnomo ĉe la datumbazo."
+
+#: ../../mod/install.php:239
+msgid "Database Login Password"
+msgstr "Pasvorto ĉe la datumbazo."
+
+#: ../../mod/install.php:240
+msgid "Database Name"
+msgstr "Nomo de la datumbazo."
+
+#: ../../mod/install.php:241 ../../mod/install.php:280
+msgid "Site administrator email address"
+msgstr "Retpo�tadreso de la reteja administranto"
+
+#: ../../mod/install.php:241 ../../mod/install.php:280
+msgid ""
+"Your account email address must match this in order to use the web admin "
+"panel."
+msgstr "La repo�tadreso de via konto bezonas esti la sama por uzi la TTTa administrilo."
+
+#: ../../mod/install.php:245 ../../mod/install.php:283
+msgid "Please select a default timezone for your website"
+msgstr "Bonvolu elekti defaÅ­ltan horzonon por via retejo."
+
+#: ../../mod/install.php:270
+msgid "Site settings"
+msgstr "Retejaj agordoj"
+
+#: ../../mod/install.php:323
+msgid "Could not find a command line version of PHP in the web server PATH."
+msgstr "Komanda linia versio de PHP ne trovita en $PATH de la retservilo."
+
+#: ../../mod/install.php:326
+msgid "PHP executable path"
+msgstr "Vojo de la komanda linia versio de PHP"
+
+#: ../../mod/install.php:326
+msgid "Enter full path to php executable"
+msgstr "Entajpu plenan vojon al la komanda linia versio de PHP"
+
+#: ../../mod/install.php:331
+msgid "Command line PHP"
+msgstr "komanda linia versio de PHP"
+
+#: ../../mod/install.php:340
+msgid ""
+"The command line version of PHP on your system does not have "
+"\"register_argc_argv\" enabled."
+msgstr "En via komanda linia versio de PHP je via sistemo, \"register_argc_argv\" ne estas aktivita."
+
+#: ../../mod/install.php:341
+msgid "This is required for message delivery to work."
+msgstr "Tio estas bezonata por la livero de mesa�oj."
+
+#: ../../mod/install.php:343
+msgid "PHP register_argc_argv"
+msgstr "PHP register_argc_argv"
+
+#: ../../mod/install.php:364
+msgid ""
+"Error: the \"openssl_pkey_new\" function on this system is not able to "
+"generate encryption keys"
+msgstr "Eraro: La funkcio \"openssl_pkey_new\" je tia sistemo ne eblas generi ĉifro�losilojn."
+
+#: ../../mod/install.php:365
+msgid ""
+"If running under Windows, please see "
+"\"http://www.php.net/manual/en/openssl.installation.php\"."
+msgstr "Se la operaciumo sistemo estas Windows, bonvolu legi: http://www.php.net/manual/en/openssl.installation.php"
+
+#: ../../mod/install.php:367
+msgid "Generate encryption keys"
+msgstr "Generi ĉifro�losilojn"
+
+#: ../../mod/install.php:374
+msgid "libCurl PHP module"
+msgstr "PHP modulo libCurl"
+
+#: ../../mod/install.php:375
+msgid "GD graphics PHP module"
+msgstr "PHP modulo GD"
+
+#: ../../mod/install.php:376
+msgid "OpenSSL PHP module"
+msgstr "PHP modulo OpenSSL"
+
+#: ../../mod/install.php:377
+msgid "mysqli PHP module"
+msgstr "PHP modulo mysqli"
+
+#: ../../mod/install.php:378
+msgid "mb_string PHP module"
+msgstr "PHP modulo mb_string"
+
+#: ../../mod/install.php:383 ../../mod/install.php:385
+msgid "Apace mod_rewrite module"
+msgstr "Apache modulo mod_rewrite"
+
+#: ../../mod/install.php:383
+msgid ""
+"Error: Apache webserver mod-rewrite module is required but not installed."
+msgstr "Eraro: La modulo mod_rewrite en la Apache retservilo estas bezonata sed ne instalita."
+
+#: ../../mod/install.php:390
+msgid "Error: libCURL PHP module required but not installed."
+msgstr "Eraro: La modulo libCURL en PHP estas bezonata sed ne instalita."
+
+#: ../../mod/install.php:394
+msgid ""
+"Error: GD graphics PHP module with JPEG support required but not installed."
+msgstr "Eraro: La modulo GD en PHP kun subteno por JPEG estas bezonata sed ne instalita."
+
+#: ../../mod/install.php:398
+msgid "Error: openssl PHP module required but not installed."
+msgstr "Eraro: La modulo OpenSSL en PHP estas bezonata sed ne instalita."
+
+#: ../../mod/install.php:402
+msgid "Error: mysqli PHP module required but not installed."
+msgstr "Eraro: La modulo mysqli en PHP estas bezonata sed ne instalita."
+
+#: ../../mod/install.php:406
+msgid "Error: mb_string PHP module required but not installed."
+msgstr "Eraro: La modulo mb_string en PHP estas bezonata sed ne instalita."
+
+#: ../../mod/install.php:423
+msgid ""
+"The web installer needs to be able to create a file called \".htconfig.php\""
+" in the top folder of your web server and it is unable to do so."
+msgstr "La reta instalilo bezonas skribi dosieron nomata \".htconfig.php\" en la baza dosierujo de la retservilo, sed ne sukcesis."
+
+#: ../../mod/install.php:424
+msgid ""
+"This is most often a permission setting, as the web server may not be able "
+"to write files in your folder - even if you can."
+msgstr "Tio ĉi plej ofte estas agordo rilate al permesoj, ĉar la servilo eble ne povas skribi en via dosierujo, eĉ se vi mem povas skribi."
+
+#: ../../mod/install.php:425
+msgid ""
+"Please check with your site documentation or support people to see if this "
+"situation can be corrected."
+msgstr "Bonvolu kontroli la dokumentojn de via servilo aŭ teĥnikiston por ekscii ĉu la situacio �ustigeblas."
+
+#: ../../mod/install.php:426
+msgid ""
+"If not, you may be required to perform a manual installation. Please see the"
+" file \"INSTALL.txt\" for instructions."
+msgstr "Se ne, vi eble bezonas instali mane. Bonvolu legi la dosieron \"INSTALL.txt\" por pluaj instruaĵoj."
+
+#: ../../mod/install.php:429
+msgid ".htconfig.php is writable"
+msgstr ".htconfig.php estas skribebla."
+
+#: ../../mod/install.php:436
+msgid ""
+"The database configuration file \".htconfig.php\" could not be written. "
+"Please use the enclosed text to create a configuration file in your web "
+"server root."
+msgstr "Ne povis skribi la datumbaza agordoj en la dosiero \".htconfig.php\". Bonvolu uzi la inkluzivan tekston por krei agordan dosieron en la baza dosierujo de la retservilo."
+
+#: ../../mod/install.php:461
+msgid "Errors encountered creating database tables."
+msgstr "Okazis eraroj dum la kreado de tabeloj en la datumbazo."
+
+#: ../../mod/localtime.php:12 ../../include/event.php:11
+#: ../../include/bb2diaspora.php:238
+msgid "l F d, Y \\@ g:i A"
+msgstr "l F d, Y \\@ g:i A"
+
+#: ../../mod/localtime.php:24
+msgid "Time Conversion"
+msgstr "Konverto de tempo"
+
+#: ../../mod/localtime.php:26
+msgid ""
+"Friendika provides this service for sharing events with other networks and "
+"friends in unknown timezones."
+msgstr "Friendica provizas tiun servon por kunhavigi okazojn kun aliaj retoj kaj amikoj en aliaj horzonoj."
+
+#: ../../mod/localtime.php:30
+#, php-format
+msgid "UTC time: %s"
+msgstr "UTC horo: %s"
+
+#: ../../mod/localtime.php:33
+#, php-format
+msgid "Current timezone: %s"
+msgstr "Aktuala horzono: %s"
+
+#: ../../mod/localtime.php:36
+#, php-format
+msgid "Converted localtime: %s"
+msgstr "Konvertita loka horo: %s"
+
+#: ../../mod/localtime.php:41
+msgid "Please select your timezone:"
+msgstr "Bonvolu elekti vian horzonon:"
+
+#: ../../mod/match.php:12
+msgid "Profile Match"
+msgstr "Kongrua profilo"
+
+#: ../../mod/match.php:20
+msgid "No keywords to match. Please add keywords to your default profile."
+msgstr "Neniom da kategoriaj vortoj kongruas. Bonvolu aldoni kategoriajn vortojn al via defaÅ­lta profilo."
+
+#: ../../mod/match.php:57
+msgid "is interested in:"
+msgstr "interesi�as pri:"
+
+#: ../../mod/match.php:58 ../../mod/suggest.php:59
+#: ../../include/contact_widgets.php:9 ../../boot.php:1027
+msgid "Connect"
+msgstr "Konekti"
+
+#: ../../mod/match.php:65 ../../mod/dirfind.php:57
+msgid "No matches"
+msgstr "Nenio estas trovita"
+
+#: ../../mod/lockview.php:39
+msgid "Remote privacy information not available."
+msgstr "Informoj pri fora privateca ne estas disponebla."
+
+#: ../../mod/lockview.php:43
+msgid "Visible to:"
+msgstr "Videbla al:"
+
+#: ../../mod/home.php:26 ../../addon/communityhome/communityhome.php:179
+#, php-format
+msgid "Welcome to %s"
+msgstr "Bonvenon ĉe %s"
+
+#: ../../mod/notifications.php:26
+msgid "Invalid request identifier."
+msgstr "Nevalida peta identigilo."
+
+#: ../../mod/notifications.php:35 ../../mod/notifications.php:161
+#: ../../mod/notifications.php:207
+msgid "Discard"
+msgstr "Forvi�i"
+
+#: ../../mod/notifications.php:51 ../../mod/notifications.php:160
+#: ../../mod/notifications.php:206 ../../mod/contacts.php:308
+#: ../../mod/contacts.php:351
+msgid "Ignore"
+msgstr "Ignori"
+
+#: ../../mod/notifications.php:75
+msgid "System"
+msgstr "Sistemo"
+
+#: ../../mod/notifications.php:80 ../../include/nav.php:113
+msgid "Network"
+msgstr "Reto"
+
+#: ../../mod/notifications.php:85 ../../mod/network.php:182
+msgid "Personal"
+msgstr "Propra"
+
+#: ../../mod/notifications.php:90 ../../view/theme/diabook-red/theme.php:239
+#: ../../view/theme/diabook-blue/theme.php:239
+#: ../../view/theme/diabook/theme.php:249
+#: ../../view/theme/diabook-aerith/theme.php:240 ../../include/nav.php:77
+#: ../../include/nav.php:115
+msgid "Home"
+msgstr "Hejmo"
+
+#: ../../mod/notifications.php:95 ../../include/nav.php:121
+msgid "Introductions"
+msgstr "Prezentoj"
+
+#: ../../mod/notifications.php:100 ../../mod/message.php:102
+#: ../../include/nav.php:128
+msgid "Messages"
+msgstr "Mesa�oj"
+
+#: ../../mod/notifications.php:119
+msgid "Show Ignored Requests"
+msgstr "Montri ignoritajn petojn"
+
+#: ../../mod/notifications.php:119
+msgid "Hide Ignored Requests"
+msgstr "Ka�i ignoritajn petojn"
+
+#: ../../mod/notifications.php:145 ../../mod/notifications.php:191
+msgid "Notification type: "
+msgstr "Tipo de atentigo:"
+
+#: ../../mod/notifications.php:146
+msgid "Friend Suggestion"
+msgstr "Amikosugestoj"
+
+#: ../../mod/notifications.php:148
+#, php-format
+msgid "suggested by %s"
+msgstr "sugestita de %s"
+
+#: ../../mod/notifications.php:153 ../../mod/notifications.php:200
+#: ../../mod/contacts.php:356
+msgid "Hide this contact from others"
+msgstr "Ka�i ĉi tiun kontakton al aliaj"
+
+#: ../../mod/notifications.php:154 ../../mod/notifications.php:201
+msgid "Post a new friend activity"
+msgstr "Afi�i novan amikecan aktivecon"
+
+#: ../../mod/notifications.php:154 ../../mod/notifications.php:201
+msgid "if applicable"
+msgstr "se aplikebla"
+
+#: ../../mod/notifications.php:157 ../../mod/notifications.php:204
+#: ../../mod/admin.php:546
+msgid "Approve"
+msgstr "Aprobi"
+
+#: ../../mod/notifications.php:177
+msgid "Claims to be known to you: "
+msgstr "Pensas ke vi konas ilin:"
+
+#: ../../mod/notifications.php:177
+msgid "yes"
+msgstr "jes"
+
+#: ../../mod/notifications.php:177
+msgid "no"
+msgstr "ne"
+
+#: ../../mod/notifications.php:184
+msgid "Approve as: "
+msgstr "Aprobi kiel:"
+
+#: ../../mod/notifications.php:185
+msgid "Friend"
+msgstr "Amiko"
+
+#: ../../mod/notifications.php:186
+msgid "Sharer"
+msgstr "Kunhaviganto"
+
+#: ../../mod/notifications.php:186
+msgid "Fan/Admirer"
+msgstr "Fanatikulo/Admiranto"
+
+#: ../../mod/notifications.php:192
+msgid "Friend/Connect Request"
+msgstr "Kontaktpeto"
+
+#: ../../mod/notifications.php:192
+msgid "New Follower"
+msgstr "Nova abonanto"
+
+#: ../../mod/notifications.php:213
+msgid "No introductions."
+msgstr "Neniom da prezentoj"
+
+#: ../../mod/notifications.php:216 ../../include/nav.php:122
+msgid "Notifications"
+msgstr "Atentigoj"
+
+#: ../../mod/notifications.php:253 ../../mod/notifications.php:378
+#: ../../mod/notifications.php:465
+#, php-format
+msgid "%s liked %s's post"
+msgstr "%s �atis la afi�on de %s"
+
+#: ../../mod/notifications.php:262 ../../mod/notifications.php:387
+#: ../../mod/notifications.php:474
+#, php-format
+msgid "%s disliked %s's post"
+msgstr "%s mal�atis la afi�on de %s"
+
+#: ../../mod/notifications.php:276 ../../mod/notifications.php:401
+#: ../../mod/notifications.php:488
+#, php-format
+msgid "%s is now friends with %s"
+msgstr "%s amiki�is kun %s"
+
+#: ../../mod/notifications.php:283 ../../mod/notifications.php:408
+#, php-format
+msgid "%s created a new post"
+msgstr "%s kreis novan afi�on"
+
+#: ../../mod/notifications.php:284 ../../mod/notifications.php:409
+#: ../../mod/notifications.php:497
+#, php-format
+msgid "%s commented on %s's post"
+msgstr "%s komentis pri la afi�o de %s"
+
+#: ../../mod/notifications.php:298
+msgid "No more network notifications."
+msgstr "Ne pli da retaj atentigoj."
+
+#: ../../mod/notifications.php:302
+msgid "Network Notifications"
+msgstr "Retaj Atentigoj"
+
+#: ../../mod/notifications.php:328 ../../mod/notify.php:61
+msgid "No more system notifications."
+msgstr "Ne pli da sistemaj atentigoj."
+
+#: ../../mod/notifications.php:332 ../../mod/notify.php:65
+msgid "System Notifications"
+msgstr "Sistemaj Atentigoj"
+
+#: ../../mod/notifications.php:423
+msgid "No more personal notifications."
+msgstr "Ne pli da personaj atentigoj"
+
+#: ../../mod/notifications.php:427
+msgid "Personal Notifications"
+msgstr "Personaj Atentigoj"
+
+#: ../../mod/notifications.php:504
+msgid "No more home notifications."
+msgstr "Ne pli da hejmrilataj atentigoj."
+
+#: ../../mod/notifications.php:508
+msgid "Home Notifications"
+msgstr "Hejmrilataj atentigoj"
+
+#: ../../mod/contacts.php:63 ../../mod/contacts.php:143
+msgid "Could not access contact record."
+msgstr "Ne eblis atingi kontaktrikordo."
+
+#: ../../mod/contacts.php:77
+msgid "Could not locate selected profile."
+msgstr "Ne trovis elektitan profilon."
+
+#: ../../mod/contacts.php:100
+msgid "Contact updated."
+msgstr "Kontakto estas �isdatigita."
+
+#: ../../mod/contacts.php:165
+msgid "Contact has been blocked"
+msgstr "Kontakto estas blokita."
+
+#: ../../mod/contacts.php:165
+msgid "Contact has been unblocked"
+msgstr "Kontakto estas malblokita."
+
+#: ../../mod/contacts.php:179
+msgid "Contact has been ignored"
+msgstr "Kontakto estas ignorita."
+
+#: ../../mod/contacts.php:179
+msgid "Contact has been unignored"
+msgstr "Kontakto estas malignorita."
+
+#: ../../mod/contacts.php:200
+msgid "stopped following"
+msgstr "ne plu sekvas"
+
+#: ../../mod/contacts.php:221
+msgid "Contact has been removed."
+msgstr "Kontakto estas forigita."
+
+#: ../../mod/contacts.php:251
+#, php-format
+msgid "You are mutual friends with %s"
+msgstr "Vi estas reciproka amiko de %s"
+
+#: ../../mod/contacts.php:255
+#, php-format
+msgid "You are sharing with %s"
+msgstr "Vi kunhavigas kun %s"
+
+#: ../../mod/contacts.php:260
+#, php-format
+msgid "%s is sharing with you"
+msgstr "%s kunhavigas kun vi"
+
+#: ../../mod/contacts.php:277
+msgid "Private communications are not available for this contact."
+msgstr "Privataj komunikadoj ne disponeblas por ĉi tiu kontakto."
+
+#: ../../mod/contacts.php:280
+msgid "Never"
+msgstr "Neniam"
+
+#: ../../mod/contacts.php:284
+msgid "(Update was successful)"
+msgstr "(Äœisdatigo sukcesis.)"
+
+#: ../../mod/contacts.php:284
+msgid "(Update was not successful)"
+msgstr "(Äœisdatigo malsukcesis.)"
+
+#: ../../mod/contacts.php:286
+msgid "Suggest friends"
+msgstr "Sugesti amikojn"
+
+#: ../../mod/contacts.php:290
+#, php-format
+msgid "Network type: %s"
+msgstr "Reta tipo: %s"
+
+#: ../../mod/contacts.php:293
+#, php-format
+msgid "%d contact in common"
+msgid_plural "%d contacts in common"
+msgstr[0] "%d komuna kontakto"
+msgstr[1] "%d komunaj kontaktoj"
+
+#: ../../mod/contacts.php:298
+msgid "View all contacts"
+msgstr "Vidi ĉiujn kontaktojn"
+
+#: ../../mod/contacts.php:303 ../../mod/contacts.php:350
+#: ../../mod/admin.php:550
+msgid "Unblock"
+msgstr "Malbloki"
+
+#: ../../mod/contacts.php:303 ../../mod/contacts.php:350
+#: ../../mod/admin.php:549
+msgid "Block"
+msgstr "Bloki"
+
+#: ../../mod/contacts.php:308 ../../mod/contacts.php:351
+msgid "Unignore"
+msgstr "Malignori"
+
+#: ../../mod/contacts.php:313
+msgid "Repair"
+msgstr "Ripari"
+
+#: ../../mod/contacts.php:323
+msgid "Contact Editor"
+msgstr "Kontakta redaktilo."
+
+#: ../../mod/contacts.php:326
+msgid "Profile Visibility"
+msgstr "Videbleco de profilo"
+
+#: ../../mod/contacts.php:327
+#, php-format
+msgid ""
+"Please choose the profile you would like to display to %s when viewing your "
+"profile securely."
+msgstr "Bonvolu elekti la profilon kiu vi volas montri al %s aspektinde kiam sekure aspektante vian profilon."
+
+#: ../../mod/contacts.php:328
+msgid "Contact Information / Notes"
+msgstr "Kontaktaj informoj / Notoj"
+
+#: ../../mod/contacts.php:329
+msgid "Edit contact notes"
+msgstr "Redakti kontaktnotojn"
+
+#: ../../mod/contacts.php:334 ../../mod/contacts.php:507
+#: ../../mod/viewcontacts.php:62 ../../mod/nogroup.php:40
+#, php-format
+msgid "Visit %s's profile [%s]"
+msgstr "Viziti la profilon de %s [%s]"
+
+#: ../../mod/contacts.php:335
+msgid "Block/Unblock contact"
+msgstr "Bloki/Malbloki kontakton"
+
+#: ../../mod/contacts.php:336
+msgid "Ignore contact"
+msgstr "Ignori kontakton"
+
+#: ../../mod/contacts.php:337
+msgid "Repair URL settings"
+msgstr "Ripari URL agordoj"
+
+#: ../../mod/contacts.php:338
+msgid "View conversations"
+msgstr "Vidi konversaciojn"
+
+#: ../../mod/contacts.php:340
+msgid "Delete contact"
+msgstr "Forvi�i kontakton"
+
+#: ../../mod/contacts.php:344
+msgid "Last update:"
+msgstr "Plej ĵusa �isdatigo:"
+
+#: ../../mod/contacts.php:345
+msgid "Update public posts"
+msgstr "Ĝisdatigi publikajn afi�ojn"
+
+#: ../../mod/contacts.php:347 ../../mod/admin.php:979
+msgid "Update now"
+msgstr "Äœisdatigi nun"
+
+#: ../../mod/contacts.php:354
+msgid "Currently blocked"
+msgstr "Nuntempe blokata"
+
+#: ../../mod/contacts.php:355
+msgid "Currently ignored"
+msgstr "Nuntempe ignorata"
+
+#: ../../mod/contacts.php:356
+msgid ""
+"Replies/likes to your public posts <strong>may</strong> still be visible"
+msgstr "Rispondoj/�ataĵo al viaj publikaj afi�oj <strong>eble</strong> plu estos videbla"
+
+#: ../../mod/contacts.php:405
+msgid "Suggestions"
+msgstr "Sugestoj"
+
+#: ../../mod/contacts.php:410 ../../mod/group.php:191
+msgid "All Contacts"
+msgstr "Ĉiuj Kontaktoj"
+
+#: ../../mod/contacts.php:415
+msgid "Unblocked Contacts"
+msgstr "Malblokitaj Kontaktoj"
+
+#: ../../mod/contacts.php:421
+msgid "Blocked Contacts"
+msgstr "Blokitaj Kontaktoj"
+
+#: ../../mod/contacts.php:427
+msgid "Ignored Contacts"
+msgstr "Ignoritaj Kontaktoj"
+
+#: ../../mod/contacts.php:433
+msgid "Hidden Contacts"
+msgstr "Ka�itaj Kontaktoj"
+
+#: ../../mod/contacts.php:483
+msgid "Mutual Friendship"
+msgstr "Reciproka amikeco"
+
+#: ../../mod/contacts.php:487
+msgid "is a fan of yours"
+msgstr "estas admiranto de vi"
+
+#: ../../mod/contacts.php:491
+msgid "you are a fan of"
+msgstr "vi estas admiranto de"
+
+#: ../../mod/contacts.php:508 ../../mod/nogroup.php:41
+msgid "Edit contact"
+msgstr "Redakti kontakton"
+
+#: ../../mod/contacts.php:529 ../../view/theme/diabook-red/theme.php:241
+#: ../../view/theme/diabook-blue/theme.php:241
+#: ../../view/theme/diabook/theme.php:251
+#: ../../view/theme/diabook-aerith/theme.php:242 ../../include/nav.php:139
+msgid "Contacts"
+msgstr "Kontaktoj"
+
+#: ../../mod/contacts.php:533
+msgid "Search your contacts"
+msgstr "Serĉi viajn kontaktojn"
+
+#: ../../mod/contacts.php:534 ../../mod/directory.php:57
+msgid "Finding: "
+msgstr "Trovata:"
+
+#: ../../mod/contacts.php:535 ../../mod/directory.php:59
+#: ../../include/contact_widgets.php:33
+msgid "Find"
+msgstr "Trovi"
+
+#: ../../mod/lostpass.php:16
+msgid "No valid account found."
+msgstr "Ne trovis validan konton."
+
+#: ../../mod/lostpass.php:32
+msgid "Password reset request issued. Check your email."
+msgstr "Eldonis riparadon de pasvorto. Legu vian retpo�ton."
+
+#: ../../mod/lostpass.php:43
+#, php-format
+msgid "Password reset requested at %s"
+msgstr "Pasvorta riparado petita je %s"
+
+#: ../../mod/lostpass.php:45 ../../mod/lostpass.php:107
+#: ../../mod/register.php:388 ../../mod/register.php:442
+#: ../../mod/regmod.php:54 ../../mod/dfrn_confirm.php:732
+#: ../../addon/facebook/facebook.php:625
+#: ../../addon/facebook/facebook.php:1090
+#: ../../addon/testdrive/testdrive.php:58 ../../include/items.php:2699
+msgid "Administrator"
+msgstr "Administranto"
+
+#: ../../mod/lostpass.php:65
+msgid ""
+"Request could not be verified. (You may have previously submitted it.) "
+"Password reset failed."
+msgstr "Ne povis konfirmi la peton. (Eble vi sendis �in antaŭ.) Pasvorta riparado malsukcesis."
+
+#: ../../mod/lostpass.php:83 ../../boot.php:809
+msgid "Password Reset"
+msgstr "Pasvorta riparado"
+
+#: ../../mod/lostpass.php:84
+msgid "Your password has been reset as requested."
+msgstr "Via pasvorto estis riparita laÅ­ via peto."
+
+#: ../../mod/lostpass.php:85
+msgid "Your new password is"
+msgstr "Via nova pasvorto estas"
+
+#: ../../mod/lostpass.php:86
+msgid "Save or copy your new password - and then"
+msgstr "Memorigi vian novan pasvorton - kaj poste"
+
+#: ../../mod/lostpass.php:87
+msgid "click here to login"
+msgstr "klaku ĉi tie por ensaluti"
+
+#: ../../mod/lostpass.php:88
+msgid ""
+"Your password may be changed from the <em>Settings</em> page after "
+"successful login."
+msgstr "Vi povas �angi vian pasvorton sur la pa�o <em>agordoj</em> kiam vi sukcese ensalutis."
+
+#: ../../mod/lostpass.php:119
+msgid "Forgot your Password?"
+msgstr "Ĉu vi forgesis vian pasvorton?"
+
+#: ../../mod/lostpass.php:120
+msgid ""
+"Enter your email address and submit to have your password reset. Then check "
+"your email for further instructions."
+msgstr "Entajpu vian retpo�tadreson kaj sendu por pasvorta riparado. Poste, bonvolu legi vian retpo�ton por trovi pliajn instrukciojn."
+
+#: ../../mod/lostpass.php:121
+msgid "Nickname or Email: "
+msgstr "Salutnomo aŭ retpo�tadreso: "
+
+#: ../../mod/lostpass.php:122
+msgid "Reset"
+msgstr "Repari"
+
+#: ../../mod/settings.php:49 ../../include/nav.php:137
+msgid "Account settings"
+msgstr "Kontoagordoj"
+
+#: ../../mod/settings.php:54
+msgid "Display settings"
+msgstr "Ekranagordoj"
+
+#: ../../mod/settings.php:60
+msgid "Connector settings"
+msgstr "Konektiloagordoj"
+
+#: ../../mod/settings.php:65
+msgid "Plugin settings"
+msgstr "Agordoj pri kromprogramoj"
+
+#: ../../mod/settings.php:70
+msgid "Connected apps"
+msgstr "Konektitaj programoj"
+
+#: ../../mod/settings.php:75
+msgid "Export personal data"
+msgstr "Eksporti personan datumaron"
+
+#: ../../mod/settings.php:83 ../../mod/admin.php:631 ../../mod/admin.php:817
+#: ../../addon/mathjax/mathjax.php:36 ../../include/nav.php:137
+msgid "Settings"
+msgstr "Agordoj"
+
+#: ../../mod/settings.php:126
+msgid "Missing some important data!"
+msgstr "Mankas importantaj datumoj!"
+
+#: ../../mod/settings.php:129 ../../mod/settings.php:558
+#: ../../mod/admin.php:89
+msgid "Update"
+msgstr "Äœisdatigi"
+
+#: ../../mod/settings.php:234
+msgid "Failed to connect with email account using the settings provided."
+msgstr "Ne sukcesis konekti al retpo�tkonto kun la provizitaj agordoj."
+
+#: ../../mod/settings.php:239
+msgid "Email settings updated."
+msgstr "Retpo�tagordoj �isdatigita"
+
+#: ../../mod/settings.php:298
+msgid "Passwords do not match. Password unchanged."
+msgstr "La pasvortoj ne estas egala. Pasvorto ne �an�ita."
+
+#: ../../mod/settings.php:303
+msgid "Empty passwords are not allowed. Password unchanged."
+msgstr "Malplenaj pasvortoj ne estas permesita. Pasvorto ne �an�ita."
+
+#: ../../mod/settings.php:314
+msgid "Password changed."
+msgstr "Pasvorto �an�ita."
+
+#: ../../mod/settings.php:316
+msgid "Password update failed. Please try again."
+msgstr "Äœisdatigo de pasvorto malsukcesis. Bonvolu provi refoje."
+
+#: ../../mod/settings.php:379
+msgid " Please use a shorter name."
+msgstr " Bonvolu uzi pli mallongan nomon."
+
+#: ../../mod/settings.php:381
+msgid " Name too short."
+msgstr " Nomo estas tro mallonga."
+
+#: ../../mod/settings.php:387
+msgid " Not valid email."
+msgstr " Repo�tadreso ne validas."
+
+#: ../../mod/settings.php:389
+msgid " Cannot change to that email."
+msgstr " Ne povas �an�i al tio retpo�tadreso."
+
+#: ../../mod/settings.php:461 ../../addon/facebook/facebook.php:450
+#: ../../addon/impressum/impressum.php:75
+#: ../../addon/openstreetmap/openstreetmap.php:80
+#: ../../addon/mathjax/mathjax.php:64 ../../addon/piwik/piwik.php:105
+#: ../../addon/twitter/twitter.php:370
+msgid "Settings updated."
+msgstr "Agordoj �isdatigita."
+
+#: ../../mod/settings.php:531 ../../mod/settings.php:557
+#: ../../mod/settings.php:593
+msgid "Add application"
+msgstr "Aldoni programon"
+
+#: ../../mod/settings.php:535 ../../mod/settings.php:561
+#: ../../addon/statusnet/statusnet.php:547
+msgid "Consumer Key"
+msgstr "Åœlosilo de kliento"
+
+#: ../../mod/settings.php:536 ../../mod/settings.php:562
+#: ../../addon/statusnet/statusnet.php:546
+msgid "Consumer Secret"
+msgstr "Sekreto de kliento"
+
+#: ../../mod/settings.php:537 ../../mod/settings.php:563
+msgid "Redirect"
+msgstr "Alidirekto"
+
+#: ../../mod/settings.php:538 ../../mod/settings.php:564
+msgid "Icon url"
+msgstr "Piktograma adreso"
+
+#: ../../mod/settings.php:549
+msgid "You can't edit this application."
+msgstr "Ĉi tio programo ne estas redaktebla."
+
+#: ../../mod/settings.php:592
+msgid "Connected Apps"
+msgstr "Konektitaj Programoj"
+
+#: ../../mod/settings.php:596
+msgid "Client key starts with"
+msgstr "Åœlosilo de kliento komencas kun"
+
+#: ../../mod/settings.php:597
+msgid "No name"
+msgstr "Neniu nomo"
+
+#: ../../mod/settings.php:598
+msgid "Remove authorization"
+msgstr "Forvi�i rajtigon"
+
+#: ../../mod/settings.php:609
+msgid "No Plugin settings configured"
+msgstr "Neniom da kromprogramoagordoj farita"
+
+#: ../../mod/settings.php:617 ../../addon/widgets/widgets.php:123
+msgid "Plugin Settings"
+msgstr "Kromprogramoagordoj"
+
+#: ../../mod/settings.php:629 ../../mod/settings.php:630
+#, php-format
+msgid "Built-in support for %s connectivity is %s"
+msgstr "Integrita subteno por %s koneto estas %s"
+
+#: ../../mod/settings.php:629 ../../mod/settings.php:630
+msgid "enabled"
+msgstr "�altita"
+
+#: ../../mod/settings.php:629 ../../mod/settings.php:630
+msgid "disabled"
+msgstr "mal�altita"
+
+#: ../../mod/settings.php:630
+msgid "StatusNet"
+msgstr "StatusNet"
+
+#: ../../mod/settings.php:660
+msgid "Connector Settings"
+msgstr "Konektiloagordoj"
+
+#: ../../mod/settings.php:665
+msgid "Email/Mailbox Setup"
+msgstr "Agordoj pri Retpo�to"
+
+#: ../../mod/settings.php:666
+msgid ""
+"If you wish to communicate with email contacts using this service "
+"(optional), please specify how to connect to your mailbox."
+msgstr "Se vi volas uzi ĉi tiun servon por komuniki tra retpo�to (nedeviga), bonvolu specifi kiel konekti al vian retpo�tkonton."
+
+#: ../../mod/settings.php:667
+msgid "Last successful email check:"
+msgstr "Plej ĵusa sukcesa kontrolo de po�to:"
+
+#: ../../mod/settings.php:668
+msgid "Email access is disabled on this site."
+msgstr "Retpo�ta atingo ne disponeblas ĉi tie."
+
+#: ../../mod/settings.php:669
+msgid "IMAP server name:"
+msgstr "Nomo de IMAP servilo:"
+
+#: ../../mod/settings.php:670
+msgid "IMAP port:"
+msgstr "Numero de IMAP pordo:"
+
+#: ../../mod/settings.php:671
+msgid "Security:"
+msgstr "Sekureco:"
+
+#: ../../mod/settings.php:671 ../../mod/settings.php:676
+msgid "None"
+msgstr "Nenio"
+
+#: ../../mod/settings.php:672
+msgid "Email login name:"
+msgstr "Retpo�ta salutnomo:"
+
+#: ../../mod/settings.php:673
+msgid "Email password:"
+msgstr "Retpo�ta pasvorto:"
+
+#: ../../mod/settings.php:674
+msgid "Reply-to address:"
+msgstr "Responda adreso (Reply-to):"
+
+#: ../../mod/settings.php:675
+msgid "Send public posts to all email contacts:"
+msgstr "Sendu publikajn afi�ojn al ĉiuj retpo�tkontaktoj:"
+
+#: ../../mod/settings.php:676
+msgid "Action after import:"
+msgstr "Ago post la importado:"
+
+#: ../../mod/settings.php:676
+msgid "Mark as seen"
+msgstr "Marki kiel legita"
+
+#: ../../mod/settings.php:676
+msgid "Move to folder"
+msgstr "Movi al dosierujo"
+
+#: ../../mod/settings.php:677
+msgid "Move to folder:"
+msgstr "Movi al dosierujo:"
+
+#: ../../mod/settings.php:737
+msgid "Display Settings"
+msgstr "Ekranagordoj"
+
+#: ../../mod/settings.php:743
+msgid "Display Theme:"
+msgstr "Vidiga etoso:"
+
+#: ../../mod/settings.php:744
+msgid "Update browser every xx seconds"
+msgstr "Ĝisdatigu retesplorilon ĉiu xxx sekundoj"
+
+#: ../../mod/settings.php:744
+msgid "Minimum of 10 seconds, no maximum"
+msgstr "Minimume 10 sekundoj, sen maksimumo"
+
+#: ../../mod/settings.php:745
+msgid "Number of items to display on the network page:"
+msgstr "Kvanto da elementoj kiuj estos montrata ĉe la reto pa�o."
+
+#: ../../mod/settings.php:745
+msgid "Maximum of 100 items"
+msgstr "Maksimume 100 eroj"
+
+#: ../../mod/settings.php:746
+msgid "Don't show emoticons"
+msgstr "Ne montru ridetulojn."
+
+#: ../../mod/settings.php:811 ../../mod/admin.php:162 ../../mod/admin.php:522
+msgid "Normal Account"
+msgstr "Normala konto"
+
+#: ../../mod/settings.php:812
+msgid "This account is a normal personal profile"
+msgstr "Tiu konto estas normala persona profilo"
+
+#: ../../mod/settings.php:815 ../../mod/admin.php:163 ../../mod/admin.php:523
+msgid "Soapbox Account"
+msgstr "Konto ĉe Soapbox"
+
+#: ../../mod/settings.php:816
+msgid "Automatically approve all connection/friend requests as read-only fans"
+msgstr "Aŭtomate konfirmi ĉiujn kontaktpetojn kiel nurlegaj admirantoj"
+
+#: ../../mod/settings.php:819 ../../mod/admin.php:164 ../../mod/admin.php:524
+msgid "Community/Celebrity Account"
+msgstr "Komunuma/eminentula Konto"
+
+#: ../../mod/settings.php:820
+msgid ""
+"Automatically approve all connection/friend requests as read-write fans"
+msgstr "Aŭtomate konfirmi ĉiujn kontaktpetojn kiel admirantoj kapable legi kaj skribi"
+
+#: ../../mod/settings.php:823 ../../mod/admin.php:165 ../../mod/admin.php:525
+msgid "Automatic Friend Account"
+msgstr "AÅ­tomata Amika Konto"
+
+#: ../../mod/settings.php:824
+msgid "Automatically approve all connection/friend requests as friends"
+msgstr "Aŭtomate konfirmi ĉiujn kontaktpetojn kiel amikoj"
+
+#: ../../mod/settings.php:834
+msgid "OpenID:"
+msgstr "OpenID:"
+
+#: ../../mod/settings.php:834
+msgid "(Optional) Allow this OpenID to login to this account."
+msgstr "(Nedeviga) Permesi atingon al la konton al ĉi tio OpenID."
+
+#: ../../mod/settings.php:844
+msgid "Publish your default profile in your local site directory?"
+msgstr "Publikigi vian defaÅ­ltan profilon en la loka reteja katalogo?"
+
+#: ../../mod/settings.php:850
+msgid "Publish your default profile in the global social directory?"
+msgstr "Publikigi vian defaÅ­ltan profilon en la tutmonda interkona katalogo?"
+
+#: ../../mod/settings.php:858
+msgid "Hide your contact/friend list from viewers of your default profile?"
+msgstr "Ka�i vian liston de kontaktoj/amiko al spektantoj de via defaŭlta profilo?"
+
+#: ../../mod/settings.php:862
+msgid "Hide your profile details from unknown viewers?"
+msgstr "Ka�i viajn profilajn detalojn al nekonataj spektantoj?"
+
+#: ../../mod/settings.php:867
+msgid "Allow friends to post to your profile page?"
+msgstr "Ĉu amikoj povu afi�i al via profilo?"
+
+#: ../../mod/settings.php:873
+msgid "Allow friends to tag your posts?"
+msgstr "Ĉu amikoj povu aldoni markojn al viaj afi�oj?"
+
+#: ../../mod/settings.php:879
+msgid "Allow us to suggest you as a potential friend to new members?"
+msgstr "Ĉu ni povu sugesti vin kiel amiko al novaj membroj?"
+
+#: ../../mod/settings.php:885
+msgid "Permit unknown people to send you private mail?"
+msgstr "Permesigi nekonatulojn sendi retpo�ton al vi?"
+
+#: ../../mod/settings.php:896
+msgid "Profile is <strong>not published</strong>."
+msgstr "Profilo <strong>ne estas publika</strong>."
+
+#: ../../mod/settings.php:902 ../../mod/profile_photo.php:211
+msgid "or"
+msgstr "aÅ­"
+
+#: ../../mod/settings.php:907
+msgid "Your Identity Address is"
+msgstr "Via identeco adreso estas"
+
+#: ../../mod/settings.php:918
+msgid "Automatically expire posts after this many days:"
+msgstr "Automatike senvalidigi afi�ojn post tiom da tagoj:"
+
+#: ../../mod/settings.php:918
+msgid "If empty, posts will not expire. Expired posts will be deleted"
+msgstr "Se malplena, afi�oj neniam senvalidi�os. Senvalidigitajn afi�on estos forvi�ata"
+
+#: ../../mod/settings.php:919
+msgid "Advanced expiration settings"
+msgstr "Detalaj agordoj rilate al senvalidi�o"
+
+#: ../../mod/settings.php:920
+msgid "Advanced Expiration"
+msgstr "Detala senvalidi�o"
+
+#: ../../mod/settings.php:921
+msgid "Expire posts:"
+msgstr "Senvalidigi afi�ojn:"
+
+#: ../../mod/settings.php:922
+msgid "Expire personal notes:"
+msgstr "Senvalidigi personajn notojn:"
+
+#: ../../mod/settings.php:923
+msgid "Expire starred posts:"
+msgstr "Senvalidigi steligitajn afi�ojn:"
+
+#: ../../mod/settings.php:924
+msgid "Expire photos:"
+msgstr "Senvalidigi bildojn:"
+
+#: ../../mod/settings.php:928
+msgid "Account Settings"
+msgstr "Kontoagordoj"
+
+#: ../../mod/settings.php:937
+msgid "Password Settings"
+msgstr "Agordoj pri Pasvorto"
+
+#: ../../mod/settings.php:938
+msgid "New Password:"
+msgstr "Nova pasvorto:"
+
+#: ../../mod/settings.php:939
+msgid "Confirm:"
+msgstr "Konfirmi:"
+
+#: ../../mod/settings.php:939
+msgid "Leave password fields blank unless changing"
+msgstr "Lasu pasvortkampojn malplenaj se vi ne �an�as la pasvorton."
+
+#: ../../mod/settings.php:943
+msgid "Basic Settings"
+msgstr "Bazaj Agordoj"
+
+#: ../../mod/settings.php:944 ../../include/profile_advanced.php:15
+msgid "Full Name:"
+msgstr "Plena Nomo:"
+
+#: ../../mod/settings.php:945
+msgid "Email Address:"
+msgstr "Retpo�tadreso:"
+
+#: ../../mod/settings.php:946
+msgid "Your Timezone:"
+msgstr "Via Horzono:"
+
+#: ../../mod/settings.php:947
+msgid "Default Post Location:"
+msgstr "Defaŭlta Loko por Afi�oj:"
+
+#: ../../mod/settings.php:948
+msgid "Use Browser Location:"
+msgstr "Uzu Lokon laÅ­ Retesplorilo:"
+
+#: ../../mod/settings.php:951
+msgid "Security and Privacy Settings"
+msgstr "Agordoj pri Sekureco kaj Privateco"
+
+#: ../../mod/settings.php:953
+msgid "Maximum Friend Requests/Day:"
+msgstr "Taga maksimumo da kontaktpetoj:"
+
+#: ../../mod/settings.php:953 ../../mod/settings.php:968
+msgid "(to prevent spam abuse)"
+msgstr "(por malhelpi spamaĵojn)"
+
+#: ../../mod/settings.php:954
+msgid "Default Post Permissions"
+msgstr "Defaŭltaj permesoj por afi�oj"
+
+#: ../../mod/settings.php:955
+msgid "(click to open/close)"
+msgstr "(klaku por malfermi/fermi)"
+
+#: ../../mod/settings.php:968
+msgid "Maximum private messages per day from unknown people:"
+msgstr "Taga maksimumo da privataj mesa�oj."
+
+#: ../../mod/settings.php:971
+msgid "Notification Settings"
+msgstr "Agordoj pri Atentigoj"
+
+#: ../../mod/settings.php:972
+msgid "By default post a status message when:"
+msgstr "Defaŭlte afi�i statmesa�on okaze de:"
+
+#: ../../mod/settings.php:973
+msgid "accepting a friend request"
+msgstr "akcepti kontaktpeton"
+
+#: ../../mod/settings.php:974
+msgid "making an <em>interesting</em> profile change"
+msgstr "fari <em>interesan</em> profil�an�on"
+
+#: ../../mod/settings.php:975
+msgid "Send a notification email when:"
+msgstr "Sendu atentiga repo�ton se:"
+
+#: ../../mod/settings.php:976
+msgid "You receive an introduction"
+msgstr "Vi ricevas inviton"
+
+#: ../../mod/settings.php:977
+msgid "Your introductions are confirmed"
+msgstr "Viaj prezentoj estas konfirmata."
+
+#: ../../mod/settings.php:978
+msgid "Someone writes on your profile wall"
+msgstr "Iu skribas je via profila muro."
+
+#: ../../mod/settings.php:979
+msgid "Someone writes a followup comment"
+msgstr "Iu skribas sekvan komenton"
+
+#: ../../mod/settings.php:980
+msgid "You receive a private message"
+msgstr "Vi ricevas privatan mesa�on."
+
+#: ../../mod/settings.php:981
+msgid "You receive a friend suggestion"
+msgstr "Vi ricevas amikosugeston"
+
+#: ../../mod/settings.php:982
+msgid "You are tagged in a post"
+msgstr "Vi estas markita en afi�on"
+
+#: ../../mod/settings.php:985
+msgid "Advanced Page Settings"
+msgstr "Specialaj agordoj pri pa�oj"
+
+#: ../../mod/manage.php:90
+msgid "Manage Identities and/or Pages"
+msgstr "Administri identecojn kaj/aŭ pa�ojn."
+
+#: ../../mod/manage.php:93
+msgid ""
+"Toggle between different identities or community/group pages which share "
+"your account details or which you have been granted \"manage\" permissions"
+msgstr "Ŝalti inter aliaj identecojn aj komunumaj/grupaj pa�oj kiuj kunhavas viajn kontajn detalojn au por kiuj vi havas \"administranto\" permesojn."
+
+#: ../../mod/manage.php:95
+msgid "Select an identity to manage: "
+msgstr "Elektu identencon por administrado:"
+
+#: ../../mod/network.php:43
+msgid "Search Results For:"
+msgstr "Rezultoj de la serĉado pri:"
+
+#: ../../mod/network.php:82 ../../mod/search.php:16
+msgid "Remove term"
+msgstr "Forvi�u terminon"
+
+#: ../../mod/network.php:91 ../../mod/search.php:13
+msgid "Saved Searches"
+msgstr "Konservitaj Serĉadoj"
+
+#: ../../mod/network.php:92 ../../include/group.php:217
+msgid "add"
+msgstr "aldoni"
+
+#: ../../mod/network.php:171
+msgid "Commented Order"
+msgstr "Komenta Ordo"
+
+#: ../../mod/network.php:176
+msgid "Posted Order"
+msgstr "Afi�ita Ordo"
+
+#: ../../mod/network.php:187
+msgid "New"
+msgstr "Nova"
+
+#: ../../mod/network.php:192
+msgid "Starred"
+msgstr "Steligita"
+
+#: ../../mod/network.php:197
+msgid "Shared Links"
+msgstr "Kunhavigitaj Ligiloj"
+
+#: ../../mod/network.php:274
+#, php-format
+msgid "Warning: This group contains %s member from an insecure network."
+msgid_plural ""
+"Warning: This group contains %s members from an insecure network."
+msgstr[0] "Averto: La grupo enhavas %s membron el nesekuraj retejoj."
+msgstr[1] "Averto: La grupo enhavas %s membrojn el nesekuraj retejoj."
+
+#: ../../mod/network.php:277
+msgid "Private messages to this group are at risk of public disclosure."
+msgstr "La privateco de privataj mesa�oj al ĉi tiu grupo ne ĉiam estas garantita."
+
+#: ../../mod/network.php:322
+msgid "No such group"
+msgstr "Grupo ne estas trovita"
+
+#: ../../mod/network.php:333
+msgid "Group is empty"
+msgstr "Grupo estas malplena"
+
+#: ../../mod/network.php:337
+msgid "Group: "
+msgstr "Grupo:"
+
+#: ../../mod/network.php:347
+msgid "Contact: "
+msgstr "Kontakto:"
+
+#: ../../mod/network.php:349
+msgid "Private messages to this person are at risk of public disclosure."
+msgstr "La privateco de privataj mesa�oj al ĉi tiu persono ne ĉiam estas garantita."
+
+#: ../../mod/network.php:354
+msgid "Invalid contact."
+msgstr "Nevalida kontakto."
+
+#: ../../mod/notes.php:44 ../../boot.php:1476
+msgid "Personal Notes"
+msgstr "Personaj Notoj"
+
+#: ../../mod/notes.php:63 ../../mod/filer.php:30
+#: ../../addon/facebook/facebook.php:683 ../../include/text.php:652
+msgid "Save"
+msgstr "Konservi"
+
+#: ../../mod/wallmessage.php:42 ../../mod/wallmessage.php:112
+#, php-format
+msgid "Number of daily wall messages for %s exceeded. Message failed."
+msgstr "Number of daily wall messages for %s exceeded. Messa�o malsukcesis."
+
+#: ../../mod/wallmessage.php:56 ../../mod/message.php:59
+msgid "No recipient selected."
+msgstr "Neniom da ricevontoj."
+
+#: ../../mod/wallmessage.php:59
+msgid "Unable to check your home location."
+msgstr "Ne eblas kontroli vian hejmlokon."
+
+#: ../../mod/wallmessage.php:62 ../../mod/message.php:66
+msgid "Message could not be sent."
+msgstr "Ne povas sendi la mesa�on."
+
+#: ../../mod/wallmessage.php:65 ../../mod/message.php:69
+msgid "Message collection failure."
+msgstr "Malsukcese provis kolekti mesa�ojn."
+
+#: ../../mod/wallmessage.php:68 ../../mod/message.php:72
+msgid "Message sent."
+msgstr "Mesa�o estas sendita."
+
+#: ../../mod/wallmessage.php:86 ../../mod/wallmessage.php:95
+msgid "No recipient."
+msgstr "Neniom da ricevontoj."
+
+#: ../../mod/wallmessage.php:124 ../../mod/message.php:169
+#: ../../include/conversation.php:910
+msgid "Please enter a link URL:"
+msgstr "Bonvolu entajpu adreson de ligilo:"
+
+#: ../../mod/wallmessage.php:131 ../../mod/message.php:177
+msgid "Send Private Message"
+msgstr "Sendi Privatan Mesa�on"
+
+#: ../../mod/wallmessage.php:132
+#, php-format
+msgid ""
+"If you wish for %s to respond, please check that the privacy settings on "
+"your site allow private mail from unknown senders."
+msgstr "Se vi deziras ke %s respondu, bonvolu kontroli ke la privatecaj agordoj je via retejo permesas privatajn mesa�ojn de nekonataj sendantoj."
+
+#: ../../mod/wallmessage.php:133 ../../mod/message.php:178
+#: ../../mod/message.php:347
+msgid "To:"
+msgstr "Al:"
+
+#: ../../mod/wallmessage.php:134 ../../mod/message.php:179
+#: ../../mod/message.php:348
+msgid "Subject:"
+msgstr "Temo:"
+
+#: ../../mod/wallmessage.php:140 ../../mod/message.php:183
+#: ../../mod/message.php:351 ../../mod/invite.php:113
+msgid "Your message:"
+msgstr "Via mesa�o:"
+
+#: ../../mod/newmember.php:6
+msgid "Welcome to Friendica"
+msgstr "Bonvenon ĉe Friendica"
+
+#: ../../mod/newmember.php:8
+msgid "New Member Checklist"
+msgstr "Kontrololisto por Novaj Membroj"
+
+#: ../../mod/newmember.php:12
+msgid ""
+"We would like to offer some tips and links to help make your experience "
+"enjoyable. Click any item to visit the relevant page. A link to this page "
+"will be visible from your home page for two weeks after your initial "
+"registration and then will quietly disappear."
+msgstr "Lasu nin oferi al vi kelkajn konsolojn kaj ligilojn por plifaciligi vian komencon. Klaku iun elementon por viziti la rilatan pa�on. Ligilo al ĉi tiu pa�o videblos en via hejmpa�o dum du semajnojn post via komenca membri�o. Post du semajnoj, la ligilo silente malaperos. "
+
+#: ../../mod/newmember.php:16
+msgid ""
+"On your <em>Quick Start</em> page - find a brief introduction to your "
+"profile and network tabs, connect to Facebook, make some new connections, "
+"and find some groups to join."
+msgstr "Je via <em>Rapida Starto</em> pa�o - trovu mallongan enigon pri via profilo kaj la reto folioj, konektu al Facebook, faru novajn konektojn kaj trovu ali�indajn grupojn."
+
+#: ../../mod/newmember.php:18
+msgid ""
+"On your <em>Settings</em> page -  change your initial password. Also make a "
+"note of your Identity Address. This looks just like an email address - and "
+"will be useful in making friends on the free social web."
+msgstr "Bonvolu �an�i vian pasvorton ĉe <em>Agordoj</em>. Krome, memorigu vian identadreson. Ĝi aspektas kiel retpo�tadreso kaj estas bezonata por konekti al novaj amikon en la libera interkona reto."
+
+#: ../../mod/newmember.php:20
+msgid ""
+"Review the other settings, particularly the privacy settings. An unpublished"
+" directory listing is like having an unlisted phone number. In general, you "
+"should probably publish your listing - unless all of your friends and "
+"potential friends know exactly how to find you."
+msgstr "Kontrolu la aliajn agordojn, precipe la privatecajn agordojn. Nepublikigita profilo similas al havi telefonnumberon ne registrata en iu telefonlibro. Äœenerale vi eble volas publikigi vian profilon. Alie, viaj amikoj kaj estontaj amikoj bezonas scii kiel rekte trovi vin."
+
+#: ../../mod/newmember.php:22
+msgid ""
+"Upload a profile photo if you have not done so already. Studies have shown "
+"that people with real photos of themselves are ten times more likely to make"
+" friends than people who do not."
+msgstr "En�uti profilbildon se vi ankoraŭ ne havas �in. Laŭ studoj, homoj kun realaj biloj de si mem trovas novajn amikon duope pli probable ol homoj sen reala bildo."
+
+#: ../../mod/newmember.php:25
+msgid ""
+"Authorise the Facebook Connector if you currently have a Facebook account "
+"and we will (optionally) import all your Facebook friends and conversations."
+msgstr "Rajtigu la Facebook Konektilon se vi nuntempe havas Facebook konton, kaj ni (nedeviga) enportu viajn Facebook amikojn kaj konversaciojn."
+
+#: ../../mod/newmember.php:27
+msgid ""
+"<em>If</em> this is your own personal server, installing the Facebook addon "
+"may ease your transition to the free social web."
+msgstr "<em>Se</tm> ĉi tiu estas via propra TTT servilo, instali la Facebook kromprogramon eble plifaciligos la transpason al la libera interkona reto."
+
+#: ../../mod/newmember.php:32
+msgid ""
+"Enter your email access information on your Connector Settings page if you "
+"wish to import and interact with friends or mailing lists from your email "
+"INBOX"
+msgstr "Entajpu la akreditaĵojn por via retpo�tkonto en la konektilagordoj se vi volas importi aŭ interagi kun amikoj aŭ dissendlistoj tra via retkesto."
+
+#: ../../mod/newmember.php:34
+msgid ""
+"Edit your <strong>default</strong> profile to your liking. Review the "
+"settings for hiding your list of friends and hiding the profile from unknown"
+" visitors."
+msgstr "Redakti viajn <strong>defaŭltan</strong> profilon kiel vi �atas �in. Kontrolu la agordojn por ka�i vian kontaktliston aŭ ka�i vian profilon al nekonataj vizitantoj."
+
+#: ../../mod/newmember.php:36
+msgid ""
+"Set some public keywords for your default profile which describe your "
+"interests. We may be able to find other people with similar interests and "
+"suggest friendships."
+msgstr "Aldonu publikajn �losilvortojn al via defaŭlta profilo, kiuj priskribas viajn interesojn. Ni eble povas trovi aliajn uzantojn kun similaj interesoj kaj sugesti amikojn."
+
+#: ../../mod/newmember.php:38
+msgid ""
+"Your Contacts page is your gateway to managing friendships and connecting "
+"with friends on other networks. Typically you enter their address or site "
+"URL in the <em>Add New Contact</em> dialog."
+msgstr "Via kontaktpa�o estas via portalo por administri amikojn kaj konekti kun amikoj en aliaj retoj. Vi kutime entajpas iliajn adreson aŭ URL adreso en la <em>Aldonu Novan Kontakton</em> dialogon."
+
+#: ../../mod/newmember.php:40
+msgid ""
+"The Directory page lets you find other people in this network or other "
+"federated sites. Look for a <em>Connect</em> or <em>Follow</em> link on "
+"their profile page. Provide your own Identity Address if requested."
+msgstr "Ĉe la Katalogo vi povas trovi aliajn homojn en ĉi tiu retejo, au en aliaj federaciaj retejoj. Elrigardi al <em>Konekti</em> aŭ <em>Sekvi</em> ligiloj ĉe iliaj profilo. Donu vian propran Identecan Adreson se la retejo demandas �in."
+
+#: ../../mod/newmember.php:42
+msgid ""
+"On the side panel of the Contacts page are several tools to find new "
+"friends. We can match people by interest, look up people by name or "
+"interest, and provide suggestions based on network relationships. On a brand"
+" new site, friend suggestions will usually begin to be populated within 24 "
+"hours."
+msgstr "En la flanka strio de la Kontaktoj pa�o trovi�as kelkajn helpilojn por trovi novajn amikojn. Ni povas automate trovi amikojn per interesoj, serĉu ilin per nomo aŭ intereso kaj faras sugestojn baze de estantaj kontaktoj. Ĉe nova instalita retejo, la unuaj sugestoj kutime aperas post 24 horoj."
+
+#: ../../mod/newmember.php:44
+msgid ""
+"Once you have made some friends, organize them into private conversation "
+"groups from the sidebar of your Contacts page and then you can interact with"
+" each group privately on your Network page."
+msgstr "Kiam vi trovis kelkajn novajn amikojn, ordigi ilin en grupoj por privata komunikado en la flanka strio de via Kontaktoj pa�o, kaj vi povas private komuniki kun ili je via Reto pa�o."
+
+#: ../../mod/newmember.php:46
+msgid ""
+"Our <strong>help</strong> pages may be consulted for detail on other program"
+" features and resources."
+msgstr "Niaj <strong>Helpo</strong> pa�oj enhavas pli da detaloj pri aliaj programaj trajtoj."
+
+#: ../../mod/attach.php:8
+msgid "Item not available."
+msgstr "Elemento ne disponeblas."
+
+#: ../../mod/attach.php:20
+msgid "Item was not found."
+msgstr "Elemento ne trovita."
+
+#: ../../mod/group.php:29
+msgid "Group created."
+msgstr "Grupo estas kreita."
+
+#: ../../mod/group.php:35
+msgid "Could not create group."
+msgstr "Ne povas krei grupon."
+
+#: ../../mod/group.php:47 ../../mod/group.php:137
+msgid "Group not found."
+msgstr "Grupo ne estas trovita."
+
+#: ../../mod/group.php:60
+msgid "Group name changed."
+msgstr "La nomo de la grupo estas �an�ita."
+
+#: ../../mod/group.php:72 ../../mod/profperm.php:19 ../../index.php:308
+msgid "Permission denied"
+msgstr "Malpermesita"
+
+#: ../../mod/group.php:90
+msgid "Create a group of contacts/friends."
+msgstr "Krei grupon da kontaktoj/amikoj."
+
+#: ../../mod/group.php:91 ../../mod/group.php:177
+msgid "Group Name: "
+msgstr "Nomo de la grupo:"
+
+#: ../../mod/group.php:110
+msgid "Group removed."
+msgstr "Grupo estas forvi�ita."
+
+#: ../../mod/group.php:112
+msgid "Unable to remove group."
+msgstr "Ne eblas forvi�i grupon."
+
+#: ../../mod/group.php:176
+msgid "Group Editor"
+msgstr "Grupa redaktilo"
+
+#: ../../mod/group.php:189
+msgid "Members"
+msgstr "Anoj"
+
+#: ../../mod/group.php:221 ../../mod/profperm.php:105
+msgid "Click on a contact to add or remove."
+msgstr "Klaku kontakton por aldoni aŭ forvi�i."
+
+#: ../../mod/profperm.php:25 ../../mod/profperm.php:55
+msgid "Invalid profile identifier."
+msgstr "Nevaliada profila identigilo."
+
+#: ../../mod/profperm.php:101
+msgid "Profile Visibility Editor"
+msgstr "Redaktilo por profila videbleco."
+
+#: ../../mod/profperm.php:103 ../../view/theme/diabook-red/theme.php:240
+#: ../../view/theme/diabook-blue/theme.php:240
+#: ../../view/theme/diabook/theme.php:250
+#: ../../view/theme/diabook-aerith/theme.php:241
+#: ../../include/profile_advanced.php:7 ../../include/profile_advanced.php:76
+#: ../../include/nav.php:50 ../../boot.php:1458
+msgid "Profile"
+msgstr "Profilo"
+
+#: ../../mod/profperm.php:114
+msgid "Visible To"
+msgstr "Videbla Al"
+
+#: ../../mod/profperm.php:130
+msgid "All Contacts (with secure profile access)"
+msgstr "Ĉiuj Kontaktoj (kun sekura atingo al la profilo)"
+
+#: ../../mod/viewcontacts.php:39
+msgid "No contacts."
+msgstr "Neniu kontaktojn."
+
+#: ../../mod/viewcontacts.php:76 ../../include/text.php:589
+msgid "View Contacts"
+msgstr "Vidi Kontaktojn"
+
+#: ../../mod/register.php:64
+msgid "An invitation is required."
+msgstr "Invio bezonata."
+
+#: ../../mod/register.php:69
+msgid "Invitation could not be verified."
+msgstr "Ne povis kontroli la inviton."
+
+#: ../../mod/register.php:77
+msgid "Invalid OpenID url"
+msgstr "Nevalida OpenID adreso"
+
+#: ../../mod/register.php:92
+msgid "Please enter the required information."
+msgstr "Bonvolu entajpi la bezonatajn informojn."
+
+#: ../../mod/register.php:106
+msgid "Please use a shorter name."
+msgstr "Bonvolu uzi pli mallongan nomon."
+
+#: ../../mod/register.php:108
+msgid "Name too short."
+msgstr "Nomo estas tro mallonga."
+
+#: ../../mod/register.php:123
+msgid "That doesn't appear to be your full (First Last) name."
+msgstr "Tio �ajne ne estas via plena (persona, familia) nomo."
+
+#: ../../mod/register.php:128
+msgid "Your email domain is not among those allowed on this site."
+msgstr "Via retpo�todomajno ne estas permesita ĉi tie."
+
+#: ../../mod/register.php:131
+msgid "Not a valid email address."
+msgstr "Nevalida retpo�tadreso."
+
+#: ../../mod/register.php:141
+msgid "Cannot use that email."
+msgstr "Neuzebla retpo�tadreso."
+
+#: ../../mod/register.php:147
+msgid ""
+"Your \"nickname\" can only contain \"a-z\", \"0-9\", \"-\", and \"_\", and "
+"must also begin with a letter."
+msgstr "Via ka�nomo nur povas enhavi \"a-z\", \"0-9\", \"-\", kaj \"_\". Ĝi ankaŭ devas komenci kun litero."
+
+#: ../../mod/register.php:153 ../../mod/register.php:264
+msgid "Nickname is already registered. Please choose another."
+msgstr "Tio ka�nomo jam estas registrita. Bonvolu elekti alian."
+
+#: ../../mod/register.php:163
+msgid ""
+"Nickname was once registered here and may not be re-used. Please choose "
+"another."
+msgstr "Tiu ka�nomo iam estis registrita ĉi tie kaj ne ree uzeblas. Bonvolu elekti alian."
+
+#: ../../mod/register.php:182
+msgid "SERIOUS ERROR: Generation of security keys failed."
+msgstr "GRAVA ERARO: La generacio de sekurecaj ĉifro�losiloj malsukcesis."
+
+#: ../../mod/register.php:250
+msgid "An error occurred during registration. Please try again."
+msgstr "Eraro okazis dum registrado. Bonvolu provi denove."
+
+#: ../../mod/register.php:286
+msgid "An error occurred creating your default profile. Please try again."
+msgstr "Eraro okazi dum kreado de via defaÅ­lta profilo. Bonvolu provi denove."
+
+#: ../../mod/register.php:386 ../../mod/regmod.php:52
+#, php-format
+msgid "Registration details for %s"
+msgstr "Detaloj de la registrado por %s"
+
+#: ../../mod/register.php:394
+msgid ""
+"Registration successful. Please check your email for further instructions."
+msgstr "Registrado sukcesis. Bonvolu kontroli vian retpo�ton por pli da instruoj."
+
+#: ../../mod/register.php:398
+msgid "Failed to send email message. Here is the message that failed."
+msgstr "Malsukcesis sendi retpo�ton. Jen la malsukcesa mesa�o."
+
+#: ../../mod/register.php:403
+msgid "Your registration can not be processed."
+msgstr "Mi ne povas prilabori vian registradon."
+
+#: ../../mod/register.php:440
+#, php-format
+msgid "Registration request at %s"
+msgstr "Peto de registrado al %s"
+
+#: ../../mod/register.php:449
+msgid "Your registration is pending approval by the site owner."
+msgstr "Via registrado bezonas apropbon de la administranto."
+
+#: ../../mod/register.php:487
+msgid ""
+"This site has exceeded the number of allowed daily account registrations. "
+"Please try again tomorrow."
+msgstr "La retejo transiras la maksimuman kvanton da ĉiutagaj kontaj registradoj. Bonvolu provi denove morgaŭ."
+
+#: ../../mod/register.php:513
+msgid ""
+"You may (optionally) fill in this form via OpenID by supplying your OpenID "
+"and clicking 'Register'."
+msgstr "Vi ankaÅ­ (nedeviga) povas plenigi la formularon tra OpenID se vi provizas vian OpenID adreson kaj klakas 'Registri'."
+
+#: ../../mod/register.php:514
+msgid ""
+"If you are not familiar with OpenID, please leave that field blank and fill "
+"in the rest of the items."
+msgstr "Se vi ne konas OpenID, bonvolu lasi tiun kampon malplena kaj entajpu la aliajn elementojn."
+
+#: ../../mod/register.php:515
+msgid "Your OpenID (optional): "
+msgstr "Via OpenID (nedeviga):"
+
+#: ../../mod/register.php:529
+msgid "Include your profile in member directory?"
+msgstr "Aldoni vian profilon al la membrokatalogo?"
+
+#: ../../mod/register.php:549
+msgid "Membership on this site is by invitation only."
+msgstr "Membri�i ĉi tie nur eblas laŭ invito."
+
+#: ../../mod/register.php:550
+msgid "Your invitation ID: "
+msgstr "Via invita idento: "
+
+#: ../../mod/register.php:553 ../../mod/admin.php:375
+msgid "Registration"
+msgstr "Registrado"
+
+#: ../../mod/register.php:561
+msgid "Your Full Name (e.g. Joe Smith): "
+msgstr "Via Plena Nomo (e.g. Joe Smith): "
+
+#: ../../mod/register.php:562
+msgid "Your Email Address: "
+msgstr "Via Retpo�tadreso: "
+
+#: ../../mod/register.php:563
+msgid ""
+"Choose a profile nickname. This must begin with a text character. Your "
+"profile address on this site will then be "
+"'<strong>nickname@$sitename</strong>'."
+msgstr "Elektu ka�nomon por la profilo. Tiu bezonas komenci kun teksta litero. Poste, via profila adreso ĉi tie estos: '<strong>ka�nomo@$sitename</strong>'."
+
+#: ../../mod/register.php:564
+msgid "Choose a nickname: "
+msgstr "Elektu ka�nomon: "
+
+#: ../../mod/register.php:567 ../../include/nav.php:81 ../../boot.php:775
+msgid "Register"
+msgstr "Registri"
+
+#: ../../mod/dirfind.php:23
+msgid "People Search"
+msgstr "Serĉi Membrojn"
+
+#: ../../mod/like.php:127 ../../mod/tagger.php:70
+#: ../../addon/facebook/facebook.php:1574
+#: ../../addon/communityhome/communityhome.php:158
+#: ../../addon/communityhome/communityhome.php:167
+#: ../../view/theme/diabook-red/theme.php:80
+#: ../../view/theme/diabook-red/theme.php:89
+#: ../../view/theme/diabook-blue/theme.php:80
+#: ../../view/theme/diabook-blue/theme.php:89
+#: ../../view/theme/diabook/theme.php:86 ../../view/theme/diabook/theme.php:95
+#: ../../view/theme/diabook-aerith/theme.php:81
+#: ../../view/theme/diabook-aerith/theme.php:90
+#: ../../include/diaspora.php:1654 ../../include/conversation.php:48
+#: ../../include/conversation.php:57 ../../include/conversation.php:121
+#: ../../include/conversation.php:130
+msgid "status"
+msgstr "staton"
+
+#: ../../mod/like.php:144 ../../addon/facebook/facebook.php:1578
+#: ../../addon/communityhome/communityhome.php:172
+#: ../../view/theme/diabook-red/theme.php:94
+#: ../../view/theme/diabook-blue/theme.php:94
+#: ../../view/theme/diabook/theme.php:100
+#: ../../view/theme/diabook-aerith/theme.php:95
+#: ../../include/diaspora.php:1670 ../../include/conversation.php:65
+#, php-format
+msgid "%1$s likes %2$s's %3$s"
+msgstr "%1$s �atas la %3$s de %2$s"
+
+#: ../../mod/like.php:146 ../../include/conversation.php:68
+#, php-format
+msgid "%1$s doesn't like %2$s's %3$s"
+msgstr "%1$s mal�atas la %3$s de %2$s"
+
+#: ../../mod/notice.php:15 ../../mod/viewsrc.php:15 ../../mod/admin.php:141
+#: ../../mod/admin.php:582 ../../mod/admin.php:761 ../../mod/display.php:37
+#: ../../mod/display.php:142 ../../include/items.php:3082
+msgid "Item not found."
+msgstr "Elemento ne estas trovita."
+
+#: ../../mod/viewsrc.php:7
+msgid "Access denied."
+msgstr "Atingo nepermesita."
+
+#: ../../mod/regmod.php:61
+msgid "Account approved."
+msgstr "Konto aprobita."
+
+#: ../../mod/regmod.php:98
+#, php-format
+msgid "Registration revoked for %s"
+msgstr "Registraĵo por %s senvalidigita."
+
+#: ../../mod/regmod.php:110
+msgid "Please login."
+msgstr "Bonvolu ensaluti."
+
+#: ../../mod/item.php:89
+msgid "Unable to locate original post."
+msgstr "Ne eblas trovi originalan afi�on."
+
+#: ../../mod/item.php:249
+msgid "Empty post discarded."
+msgstr "Forvi�is malplenan afi�on."
+
+#: ../../mod/item.php:372 ../../mod/wall_upload.php:85
+#: ../../mod/wall_upload.php:94 ../../mod/wall_upload.php:101
+#: ../../include/message.php:144
+msgid "Wall Photos"
+msgstr "Muraj Bildoj"
+
+#: ../../mod/item.php:762
+msgid "System error. Post not saved."
+msgstr "Sistema eraro. Afi�o ne registrita."
+
+#: ../../mod/item.php:787
+#, php-format
+msgid ""
+"This message was sent to you by %s, a member of the Friendica social "
+"network."
+msgstr "Ĉi mesa�o estas sendita al vi de %s, membro de la Friendica interkona reto."
+
+#: ../../mod/item.php:789
+#, php-format
+msgid "You may visit them online at %s"
+msgstr "Vi povas viziti ilin rete ĉe %s"
+
+#: ../../mod/item.php:790
+msgid ""
+"Please contact the sender by replying to this post if you do not wish to "
+"receive these messages."
+msgstr "Bonvolu rispondi al ĉi mesa�o kaj kontaktu la sendinto se vi ne volas ricevi tiujn mesa�ojn."
+
+#: ../../mod/item.php:792
+#, php-format
+msgid "%s posted an update."
+msgstr "%s publikigis afi�on."
+
+#: ../../mod/profile_photo.php:30
+msgid "Image uploaded but image cropping failed."
+msgstr "Bildo estas al�utita, sed malsukcesis tranĉi la bildon."
+
+#: ../../mod/profile_photo.php:63 ../../mod/profile_photo.php:70
+#: ../../mod/profile_photo.php:77 ../../mod/profile_photo.php:264
+#, php-format
+msgid "Image size reduction [%s] failed."
+msgstr "Malsukcesis malpligrandigi [%s] la bildon."
+
+#: ../../mod/profile_photo.php:91
+msgid ""
+"Shift-reload the page or clear browser cache if the new photo does not "
+"display immediately."
+msgstr "Re�ar�u la pa�on au malplenigu la ka�memoro de la retesplorilo se la nova bildo ne tuj aperas."
+
+#: ../../mod/profile_photo.php:101
+msgid "Unable to process image"
+msgstr "Ne eblas procezi bildon."
+
+#: ../../mod/profile_photo.php:115 ../../mod/wall_upload.php:60
+#, php-format
+msgid "Image exceeds size limit of %d"
+msgstr "Bildo estas pli granda ol la limito %d"
+
+#: ../../mod/profile_photo.php:207
+msgid "Upload File:"
+msgstr "Al�uti dosieron:"
+
+#: ../../mod/profile_photo.php:208
+msgid "Upload Profile Photo"
+msgstr "Al�uti profilbildon"
+
+#: ../../mod/profile_photo.php:209
+msgid "Upload"
+msgstr "Al�uti"
+
+#: ../../mod/profile_photo.php:211
+msgid "skip this step"
+msgstr "Preterpasi tian pa�on"
+
+#: ../../mod/profile_photo.php:211
+msgid "select a photo from your photo albums"
+msgstr "elekti bildon el viaj albumoj"
+
+#: ../../mod/profile_photo.php:224
+msgid "Crop Image"
+msgstr "Stuci Bildon"
+
+#: ../../mod/profile_photo.php:225
+msgid "Please adjust the image cropping for optimum viewing."
+msgstr "Bonvolu agordi la stuco de la bildo por optimuma aspekto."
+
+#: ../../mod/profile_photo.php:227
+msgid "Done Editing"
+msgstr "Finigi Redaktado"
+
+#: ../../mod/profile_photo.php:255
+msgid "Image uploaded successfully."
+msgstr "Bildo estas sukcese en�utita."
+
+#: ../../mod/hcard.php:10
+msgid "No profile"
+msgstr "Neniu profilo"
+
+#: ../../mod/removeme.php:45 ../../mod/removeme.php:48
+msgid "Remove My Account"
+msgstr "Forigi Mian Konton"
+
+#: ../../mod/removeme.php:46
+msgid ""
+"This will completely remove your account. Once this has been done it is not "
+"recoverable."
+msgstr "Tio tute forigos vian konton. Kiam farita, la konto ne estas restaÅ­rebla."
+
+#: ../../mod/removeme.php:47
+msgid "Please enter your password for verification:"
+msgstr "Bonvolu entajpi vian pasvorton por kontrolado:"
+
+#: ../../mod/message.php:22 ../../include/nav.php:131
+msgid "New Message"
+msgstr "Nova Mesa�o"
+
+#: ../../mod/message.php:63
+msgid "Unable to locate contact information."
+msgstr "Ne eblas trovi kontaktajn informojn."
+
+#: ../../mod/message.php:117
+msgid "Message deleted."
+msgstr "Mesa�o estas forvi�ita."
+
+#: ../../mod/message.php:147
+msgid "Conversation removed."
+msgstr "Dialogo estas forvi�ita."
+
+#: ../../mod/message.php:219
+msgid "No messages."
+msgstr "Neniom da mesa�oj."
+
+#: ../../mod/message.php:226
+#, php-format
+msgid "Unknown sender - %s"
+msgstr "Nekonata sendanto - %s"
+
+#: ../../mod/message.php:229
+#, php-format
+msgid "You and %s"
+msgstr "Vi kaj %s"
+
+#: ../../mod/message.php:232
+#, php-format
+msgid "%s and You"
+msgstr "%s kaj vi"
+
+#: ../../mod/message.php:242 ../../mod/message.php:340
+msgid "Delete conversation"
+msgstr "Forvi�i dialogon"
+
+#: ../../mod/message.php:245
+msgid "D, d M Y - g:i A"
+msgstr "D, d M Y - g:i A"
+
+#: ../../mod/message.php:247
+#, php-format
+msgid "%d message"
+msgid_plural "%d messages"
+msgstr[0] "%d mesa�o"
+msgstr[1] "%d mesa�oj"
+
+#: ../../mod/message.php:282
+msgid "Message not available."
+msgstr "Mesa�o nedisponebla."
+
+#: ../../mod/message.php:324
+msgid "Delete message"
+msgstr "Forvi�u mesa�on"
+
+#: ../../mod/message.php:342
+msgid ""
+"No secure communications available. You <strong>may</strong> be able to "
+"respond from the sender's profile page."
+msgstr "Sekura komunikado ne disponeblas. Vi <strong>eble</strong> povus respondi sur la profilpa�o de la sendanto."
+
+#: ../../mod/message.php:346
+msgid "Send Reply"
+msgstr "Respondi"
+
+#: ../../mod/allfriends.php:34
+#, php-format
+msgid "Friends of %s"
+msgstr "Amikoj de %s"
+
+#: ../../mod/allfriends.php:40
+msgid "No friends to display."
+msgstr "Neniom da amiko al montri."
+
+#: ../../mod/admin.php:51
+msgid "Theme settings updated."
+msgstr "Gisdatigis agordojn pri etosoj."
+
+#: ../../mod/admin.php:85 ../../mod/admin.php:373
+msgid "Site"
+msgstr "Retejo"
+
+#: ../../mod/admin.php:86 ../../mod/admin.php:540 ../../mod/admin.php:552
+msgid "Users"
+msgstr "Uzantoj"
+
+#: ../../mod/admin.php:87 ../../mod/admin.php:629 ../../mod/admin.php:669
+msgid "Plugins"
+msgstr "Kromprogramoj"
+
+#: ../../mod/admin.php:88 ../../mod/admin.php:815 ../../mod/admin.php:849
+msgid "Themes"
+msgstr "Etosoj"
+
+#: ../../mod/admin.php:103 ../../mod/admin.php:929
+msgid "Logs"
+msgstr "Protokoloj"
+
+#: ../../mod/admin.php:108
+msgid "User registrations waiting for confirmation"
+msgstr "Uzantaj registradoj atendante konfirmon"
+
+#: ../../mod/admin.php:177 ../../mod/admin.php:372 ../../mod/admin.php:539
+#: ../../mod/admin.php:628 ../../mod/admin.php:668 ../../mod/admin.php:814
+#: ../../mod/admin.php:848 ../../mod/admin.php:928
+msgid "Administration"
+msgstr "Administrado"
+
+#: ../../mod/admin.php:178
+msgid "Summary"
+msgstr "Resumo"
+
+#: ../../mod/admin.php:179
+msgid "Registered users"
+msgstr "Registrataj uzantoj"
+
+#: ../../mod/admin.php:181
+msgid "Pending registrations"
+msgstr "Okazontaj registradoj"
+
+#: ../../mod/admin.php:182
+msgid "Version"
+msgstr "Versio"
+
+#: ../../mod/admin.php:184
+msgid "Active plugins"
+msgstr "Åœaltitaj kromprogramoj"
+
+#: ../../mod/admin.php:315
+msgid "Site settings updated."
+msgstr "Äœisdatigis retejaj agordoj."
+
+#: ../../mod/admin.php:359
+msgid "Closed"
+msgstr "Ferma"
+
+#: ../../mod/admin.php:360
+msgid "Requires approval"
+msgstr "Bezonas aprobon"
+
+#: ../../mod/admin.php:361
+msgid "Open"
+msgstr "Malferma"
+
+#: ../../mod/admin.php:365
+msgid "No SSL policy, links will track page SSL state"
+msgstr "Sen SSL strategio. Ligiloj sekvos la SSL staton de la pa�o."
+
+#: ../../mod/admin.php:366
+msgid "Force all links to use SSL"
+msgstr "Devigi ke ĉiuj ligiloj uzu SSL."
+
+#: ../../mod/admin.php:367
+msgid "Self-signed certificate, use SSL for local links only (discouraged)"
+msgstr "Memsubskribita atestilo, nur uzu SSL por lokaj ligiloj (malkura�igata)"
+
+#: ../../mod/admin.php:376
+msgid "File upload"
+msgstr "Al�uto"
+
+#: ../../mod/admin.php:377
+msgid "Policies"
+msgstr "Politiko"
+
+#: ../../mod/admin.php:378
+msgid "Advanced"
+msgstr "Altnivela"
+
+#: ../../mod/admin.php:382 ../../addon/statusnet/statusnet.php:544
+msgid "Site name"
+msgstr "Nomo de retejo"
+
+#: ../../mod/admin.php:383
+msgid "Banner/Logo"
+msgstr "Emblemo"
+
+#: ../../mod/admin.php:384
+msgid "System language"
+msgstr "Sistema lingvo"
+
+#: ../../mod/admin.php:385
+msgid "System theme"
+msgstr "Sistema etoso"
+
+#: ../../mod/admin.php:385
+msgid ""
+"Default system theme - may be over-ridden by user profiles - <a href='#' "
+"id='cnftheme'>change theme settings</a>"
+msgstr "DefaÅ­lta sistema etoso - transpasebla de uzantprofiloj -  <a href='#' id='cnftheme'>redakti agordoj pri etosoj</a>"
+
+#: ../../mod/admin.php:386
+msgid "SSL link policy"
+msgstr "Strategio por SSL ligiloj"
+
+#: ../../mod/admin.php:386
+msgid "Determines whether generated links should be forced to use SSL"
+msgstr "Difinas ĉu generotaj ligiloj devige uzu SSL."
+
+#: ../../mod/admin.php:387
+msgid "Maximum image size"
+msgstr "Maksimuma bildgrando"
+
+#: ../../mod/admin.php:387
+msgid ""
+"Maximum size in bytes of uploaded images. Default is 0, which means no "
+"limits."
+msgstr "Maksimuma grando en bajtoj por al�utotaj bildoj. Defaŭlte 0, kio signifas neniu limito."
+
+#: ../../mod/admin.php:389
+msgid "Register policy"
+msgstr "Interkonsento pri registrado"
+
+#: ../../mod/admin.php:390
+msgid "Register text"
+msgstr "Interkonsento teksto"
+
+#: ../../mod/admin.php:390
+msgid "Will be displayed prominently on the registration page."
+msgstr "Tio estos eminente montrata en la registro pa�o."
+
+#: ../../mod/admin.php:391
+msgid "Accounts abandoned after x days"
+msgstr "Kontoj forlasitaj post x tagoj"
+
+#: ../../mod/admin.php:391
+msgid ""
+"Will not waste system resources polling external sites for abandoned "
+"accounts. Enter 0 for no time limit."
+msgstr "Mi ne mal�paru energion por enketi aliajn retejojn pri forlasitaj kontoj. Entajpu 0 por ne uzi templimo."
+
+#: ../../mod/admin.php:392
+msgid "Allowed friend domains"
+msgstr "Permesitaj amikaj domainoj"
+
+#: ../../mod/admin.php:392
+msgid ""
+"Comma separated list of domains which are allowed to establish friendships "
+"with this site. Wildcards are accepted. Empty to allow any domains"
+msgstr "Perkome disigita listo da domajnoj kiuj rajtas konstrui amikecojn kun ĉi tiu retejo. Ĵokeroj eblas. Malplena por rajtigi ĉiujn ajn domajnojn."
+
+#: ../../mod/admin.php:393
+msgid "Allowed email domains"
+msgstr "Permesitaj retpo�taj domajnoj"
+
+#: ../../mod/admin.php:393
+msgid ""
+"Comma separated list of domains which are allowed in email addresses for "
+"registrations to this site. Wildcards are accepted. Empty to allow any "
+"domains"
+msgstr "Perkome disigita listo da domajnoj kiuj uzeblas kiel retpo�taj adresoj en novaj registradoj. Ĵokeroj eblas. Malplena por rajtigi ĉiujn ajn domajnojn."
+
+#: ../../mod/admin.php:394
+msgid "Block public"
+msgstr "Bloki publike"
+
+#: ../../mod/admin.php:394
+msgid ""
+"Check to block public access to all otherwise public personal pages on this "
+"site unless you are currently logged in."
+msgstr "Elektu por bloki publikan atingon al ĉiuj alie publikajn pa�ojn en ĉi tiu retejo kiam vi ne estas ensalutita."
+
+#: ../../mod/admin.php:395
+msgid "Force publish"
+msgstr "Devigi publikigon"
+
+#: ../../mod/admin.php:395
+msgid ""
+"Check to force all profiles on this site to be listed in the site directory."
+msgstr "Elektu por devigi la registradon en la loka katalogo al ĉiuj profiloj en ĉi tiu retejo."
+
+#: ../../mod/admin.php:396
+msgid "Global directory update URL"
+msgstr "Ĝenerala adreso por �isdatigi la katalogon"
+
+#: ../../mod/admin.php:396
+msgid ""
+"URL to update the global directory. If this is not set, the global directory"
+" is completely unavailable to the application."
+msgstr "URL adreso por �isdatigi la tutmondan katalogon. Se ne agordita, la tutmonda katatolge tute ne disponeblas al la programo."
+
+#: ../../mod/admin.php:398
+msgid "Block multiple registrations"
+msgstr "Bloki pluroblajn registradojn."
+
+#: ../../mod/admin.php:398
+msgid "Disallow users to register additional accounts for use as pages."
+msgstr "Malpermesi al uzantoj la permeson por registri pluajn kontojn kiel pa�oj."
+
+#: ../../mod/admin.php:399
+msgid "OpenID support"
+msgstr "Subteno por OpenID"
+
+#: ../../mod/admin.php:399
+msgid "OpenID support for registration and logins."
+msgstr "Subteni OpenID por registrado kaj ensaluto."
+
+#: ../../mod/admin.php:400
+msgid "Fullname check"
+msgstr "Kontroli plenan nomon"
+
+#: ../../mod/admin.php:400
+msgid ""
+"Force users to register with a space between firstname and lastname in Full "
+"name, as an antispam measure"
+msgstr "Kiel kontraÅ­spamilo, devigi uzantoj al registrado kun spaceto inter la persona nomo kaj la familia nomo."
+
+#: ../../mod/admin.php:401
+msgid "UTF-8 Regular expressions"
+msgstr "UTF-8 regulaj exprimoj"
+
+#: ../../mod/admin.php:401
+msgid "Use PHP UTF8 regular expressions"
+msgstr "Uzi PHP UTF8 regulajn esprimojn."
+
+#: ../../mod/admin.php:402
+msgid "Show Community Page"
+msgstr "Montri Komunuma Pa�o"
+
+#: ../../mod/admin.php:402
+msgid ""
+"Display a Community page showing all recent public postings on this site."
+msgstr "Montri komunuma pa�o kun ĉiuj ĵusaj afi�oj en ĉi tiu retejo."
+
+#: ../../mod/admin.php:403
+msgid "Enable OStatus support"
+msgstr "Åœalti subtenon por OStatus"
+
+#: ../../mod/admin.php:403
+msgid ""
+"Provide built-in OStatus (identi.ca, status.net, etc.) compatibility. All "
+"communications in OStatus are public, so privacy warnings will be "
+"occasionally displayed."
+msgstr "Provizi integritan OStatus (identi.ca, status.net ktp) subtenon. Ĉiuj komunikadoj en OStatus estas publikaj, do privatecaj avertoj aperos de tempo al tempo."
+
+#: ../../mod/admin.php:404
+msgid "Enable Diaspora support"
+msgstr "Åœalti subtenon por Diaspora"
+
+#: ../../mod/admin.php:404
+msgid "Provide built-in Diaspora network compatibility."
+msgstr "Provizi integritan Diaspora subtenon."
+
+#: ../../mod/admin.php:405
+msgid "Only allow Friendica contacts"
+msgstr "Nur permesigi Friendica kontaktojn"
+
+#: ../../mod/admin.php:405
+msgid ""
+"All contacts must use Friendica protocols. All other built-in communication "
+"protocols disabled."
+msgstr "Ĉiuj kontaktoj devas uzi Friendica protokolojn. Ĉiuj aliaj komunikaj protokoloj malaktivita."
+
+#: ../../mod/admin.php:406
+msgid "Verify SSL"
+msgstr "Kontroli SSL"
+
+#: ../../mod/admin.php:406
+msgid ""
+"If you wish, you can turn on strict certificate checking. This will mean you"
+" cannot connect (at all) to self-signed SSL sites."
+msgstr "Se vi deziras, vi povas aktivigi severan kontroladon de SSL atestiloj. Pro tio, vie (tute) ne eblos konekti al SSL retejoj kun memsubskribitaj atestiloj."
+
+#: ../../mod/admin.php:407
+msgid "Proxy user"
+msgstr "Uzantnomo por retperanto"
+
+#: ../../mod/admin.php:408
+msgid "Proxy URL"
+msgstr "URL adreso de retperanto"
+
+#: ../../mod/admin.php:409
+msgid "Network timeout"
+msgstr "Reta tempolimo"
+
+#: ../../mod/admin.php:409
+msgid "Value is in seconds. Set to 0 for unlimited (not recommended)."
+msgstr "Valoro en sekundoj. Uzu 0 por mallimitigi (ne rekomendata)."
+
+#: ../../mod/admin.php:430
+#, php-format
+msgid "%s user blocked/unblocked"
+msgid_plural "%s users blocked/unblocked"
+msgstr[0] "Blokis/malblokis %s uzanton"
+msgstr[1] "Blokis/malblokis %s uzantojn"
+
+#: ../../mod/admin.php:437
+#, php-format
+msgid "%s user deleted"
+msgid_plural "%s users deleted"
+msgstr[0] "%s uzanto forvi�ita"
+msgstr[1] "%s uzanto forvi�itaj"
+
+#: ../../mod/admin.php:471
+#, php-format
+msgid "User '%s' deleted"
+msgstr "Uzanto '%s' forvi�ita"
+
+#: ../../mod/admin.php:478
+#, php-format
+msgid "User '%s' unblocked"
+msgstr "Uzanto '%s' malblokita"
+
+#: ../../mod/admin.php:478
+#, php-format
+msgid "User '%s' blocked"
+msgstr "Uzanto '%s' blokita"
+
+#: ../../mod/admin.php:542
+msgid "select all"
+msgstr "elekti ĉiujn"
+
+#: ../../mod/admin.php:543
+msgid "User registrations waiting for confirm"
+msgstr "Registri�oj atendante aprobon"
+
+#: ../../mod/admin.php:544
+msgid "Request date"
+msgstr "Dato de peto"
+
+#: ../../mod/admin.php:544 ../../mod/admin.php:553
+#: ../../include/contact_selectors.php:79
+msgid "Email"
+msgstr "Retpo�to"
+
+#: ../../mod/admin.php:545
+msgid "No registrations."
+msgstr "Neniom da registri�oj."
+
+#: ../../mod/admin.php:547
+msgid "Deny"
+msgstr "Negi"
+
+#: ../../mod/admin.php:553
+msgid "Register date"
+msgstr "Dato de registrado"
+
+#: ../../mod/admin.php:553
+msgid "Last login"
+msgstr "Plej ĵusa ensaluto"
+
+#: ../../mod/admin.php:553
+msgid "Last item"
+msgstr "Plej ĵusa elemento"
+
+#: ../../mod/admin.php:553
+msgid "Account"
+msgstr "Konto"
+
+#: ../../mod/admin.php:555
+msgid ""
+"Selected users will be deleted!\\n\\nEverything these users had posted on "
+"this site will be permanently deleted!\\n\\nAre you sure?"
+msgstr "La elektitaj uzantkontoj estas forvi�otaj!\\n\\nĈiuj elementoj kiujn ili afi�is je la retpa�o estos permanente forvi�itaj.\\n\\nĈu vi certas?"
+
+#: ../../mod/admin.php:556
+msgid ""
+"The user {0} will be deleted!\\n\\nEverything this user has posted on this "
+"site will be permanently deleted!\\n\\nAre you sure?"
+msgstr "La uzanto {0} estas forvi�ota!\\n\\nĈiuj elementoj kiujn li afi�is je la retpa�o estos permanente forvi�itaj.\\n\\nĈu vi certas?"
+
+#: ../../mod/admin.php:592
+#, php-format
+msgid "Plugin %s disabled."
+msgstr "Kromprogramo %s estas mal�altita."
+
+#: ../../mod/admin.php:596
+#, php-format
+msgid "Plugin %s enabled."
+msgstr "Kromprogramo %s estas �altita."
+
+#: ../../mod/admin.php:606 ../../mod/admin.php:785
+msgid "Disable"
+msgstr "Mal�alti"
+
+#: ../../mod/admin.php:608 ../../mod/admin.php:787
+msgid "Enable"
+msgstr "Åœalti"
+
+#: ../../mod/admin.php:630 ../../mod/admin.php:816
+msgid "Toggle"
+msgstr "Ŝalti/Mal�alti"
+
+#: ../../mod/admin.php:638 ../../mod/admin.php:826
+msgid "Author: "
+msgstr "AÅ­toro: "
+
+#: ../../mod/admin.php:639 ../../mod/admin.php:827
+msgid "Maintainer: "
+msgstr "Prizorganto: "
+
+#: ../../mod/admin.php:750
+msgid "No themes found."
+msgstr "Ne trovis etosojn."
+
+#: ../../mod/admin.php:808
+msgid "Screenshot"
+msgstr "Ekrankopio"
+
+#: ../../mod/admin.php:854
+msgid "[Experimental]"
+msgstr "[Eksperimenta]"
+
+#: ../../mod/admin.php:855
+msgid "[Unsupported]"
+msgstr "[Nesubtenata]"
+
+#: ../../mod/admin.php:878
+msgid "Log settings updated."
+msgstr "Protokolagordoj �isdatigitaj."
+
+#: ../../mod/admin.php:931
+msgid "Clear"
+msgstr "Forvi�i"
+
+#: ../../mod/admin.php:937
+msgid "Debugging"
+msgstr "Sencimigado"
+
+#: ../../mod/admin.php:938
+msgid "Log file"
+msgstr "Protokolo"
+
+#: ../../mod/admin.php:938
+msgid ""
+"Must be writable by web server. Relative to your Friendica top-level "
+"directory."
+msgstr "Devas esti skribebla de la retservilo. Relativa al via plej supra Friendica dosierujo."
+
+#: ../../mod/admin.php:939
+msgid "Log level"
+msgstr "Protokolnivelo"
+
+#: ../../mod/admin.php:980
+msgid "Close"
+msgstr "Fermi"
+
+#: ../../mod/admin.php:986
+msgid "FTP Host"
+msgstr "FTP Servilo"
+
+#: ../../mod/admin.php:987
+msgid "FTP Path"
+msgstr "FTP Vojo"
+
+#: ../../mod/admin.php:988
+msgid "FTP User"
+msgstr "FTP Uzanto"
+
+#: ../../mod/admin.php:989
+msgid "FTP Password"
+msgstr "FTP Pasvorto"
+
+#: ../../mod/profile.php:21 ../../boot.php:940
+msgid "Requested profile is not available."
+msgstr "La petita profilo ne disponeblas."
+
+#: ../../mod/profile.php:124 ../../mod/display.php:75
+msgid "Access to this profile has been restricted."
+msgstr "Atingo al ĉi tio profilo estas limitigita"
+
+#: ../../mod/profile.php:145
+msgid "Tips for New Members"
+msgstr "Konsilo por novaj membroj"
+
+#: ../../mod/ping.php:175
+msgid "{0} wants to be your friend"
+msgstr "{0} volas amiki�i kun vi"
+
+#: ../../mod/ping.php:180
+msgid "{0} sent you a message"
+msgstr "{0} sendis mesa�on al vi"
+
+#: ../../mod/ping.php:185
+msgid "{0} requested registration"
+msgstr "{0} petis registradon"
+
+#: ../../mod/ping.php:191
+#, php-format
+msgid "{0} commented %s's post"
+msgstr "{0} komentis pri la afi�o de %s"
+
+#: ../../mod/ping.php:196
+#, php-format
+msgid "{0} liked %s's post"
+msgstr "{0} satis la afi�on de %s"
+
+#: ../../mod/ping.php:201
+#, php-format
+msgid "{0} disliked %s's post"
+msgstr "{0} mal�atis la afi�on de %s"
+
+#: ../../mod/ping.php:206
+#, php-format
+msgid "{0} is now friends with %s"
+msgstr "{0} amiki�is kun %s"
+
+#: ../../mod/ping.php:211
+msgid "{0} posted"
+msgstr "{0} afi�is"
+
+#: ../../mod/ping.php:216
+#, php-format
+msgid "{0} tagged %s's post with #%s"
+msgstr "{0} markis la afi�on de %s kun #%s"
+
+#: ../../mod/ping.php:222
+msgid "{0} mentioned you in a post"
+msgstr "{0} menciis vin en afi�o"
+
+#: ../../mod/nogroup.php:58
+msgid "Contacts who are not members of a group"
+msgstr "Kontaktoj kiuj ne estas en iu grupo"
+
+#: ../../mod/openid.php:24
+msgid "OpenID protocol error. No ID returned."
+msgstr "Eraro en OpenID protokolo. Ne resendis identecon."
+
+#: ../../mod/openid.php:53
+msgid ""
+"Account not found and OpenID registration is not permitted on this site."
+msgstr "Ne trovis kontoj, kaj registrado tra OpenID estas malpermesita ĉi tie."
+
+#: ../../mod/openid.php:93 ../../include/auth.php:90
+#: ../../include/auth.php:153
+msgid "Login failed."
+msgstr "Ensalutado malsukcesis."
+
+#: ../../mod/follow.php:27
+msgid "Connect URL missing."
+msgstr "Ne ekzistas URL adreso por konekti."
+
+#: ../../mod/follow.php:47
+msgid ""
+"This site is not configured to allow communications with other networks."
+msgstr "Tiu retpa�o ne permesas komunikadon kun aliaj retoj."
+
+#: ../../mod/follow.php:48 ../../mod/follow.php:63
+msgid "No compatible communication protocols or feeds were discovered."
+msgstr "Ne malkovris kongruajn protokolojn por komunikado aÅ­ fluojn."
+
+#: ../../mod/follow.php:61
+msgid "The profile address specified does not provide adequate information."
+msgstr "La specifita profiladreso ne enhavas sufiĉe da informoj."
+
+#: ../../mod/follow.php:65
+msgid "An author or name was not found."
+msgstr "Ne trovis aÅ­toron aÅ­ nomon."
+
+#: ../../mod/follow.php:67
+msgid "No browser URL could be matched to this address."
+msgstr "Neniu retuma URL adreso kongruas al la adreso."
+
+#: ../../mod/follow.php:74
+msgid ""
+"The profile address specified belongs to a network which has been disabled "
+"on this site."
+msgstr "Tiu profila adreso apartenas al retejo kiu estas ma�altita je ĉi tiu retejo."
+
+#: ../../mod/follow.php:79
+msgid ""
+"Limited profile. This person will be unable to receive direct/personal "
+"notifications from you."
+msgstr "Profilo limigata. Ĉi persono ne eblos ricevi rektajn/personajn atentigojn de vi. "
+
+#: ../../mod/follow.php:149
+msgid "Unable to retrieve contact information."
+msgstr "Ne eblas ricevi kontaktinformojn."
+
+#: ../../mod/follow.php:195
+msgid "following"
+msgstr "sekvanta"
+
+#: ../../mod/common.php:34
+msgid "Common Friends"
+msgstr "Komunaj Amikoj"
+
+#: ../../mod/common.php:42
+msgid "No friends in common."
+msgstr "Neniom da komunaj amikoj."
+
+#: ../../mod/display.php:135
+msgid "Item has been removed."
+msgstr "Elemento estas forvi�ita."
+
+#: ../../mod/apps.php:4
+msgid "Applications"
+msgstr "Programoj"
+
+#: ../../mod/apps.php:7
+msgid "No installed applications."
+msgstr "Neniom da instalitaj programoj."
+
+#: ../../mod/search.php:83
+msgid "Search This Site"
+msgstr "Serĉi ĉi-tiun retejon"
+
+#: ../../mod/profiles.php:21 ../../mod/profiles.php:339
+#: ../../mod/profiles.php:453 ../../mod/dfrn_confirm.php:62
+msgid "Profile not found."
+msgstr "Profilo ne trovita."
+
+#: ../../mod/profiles.php:31
+msgid "Profile Name is required."
+msgstr "Nomo de profilo estas bezonata."
+
+#: ../../mod/profiles.php:143
+msgid "Marital Status"
+msgstr "Amrilata Stato"
+
+#: ../../mod/profiles.php:144
+msgid "Romantic Partner"
+msgstr "Kora Partnero"
+
+#: ../../mod/profiles.php:145
+msgid "Work/Employment"
+msgstr "Laboro"
+
+#: ../../mod/profiles.php:146
+msgid "Religion"
+msgstr "Religio"
+
+#: ../../mod/profiles.php:147
+msgid "Political Views"
+msgstr "Politikaj Opinioj"
+
+#: ../../mod/profiles.php:148
+msgid "Gender"
+msgstr "Sekso"
+
+#: ../../mod/profiles.php:149
+msgid "Sexual Preference"
+msgstr "Seksa Prefero"
+
+#: ../../mod/profiles.php:150
+msgid "Homepage"
+msgstr "Hejmpa�o"
+
+#: ../../mod/profiles.php:151
+msgid "Interests"
+msgstr "Interesoj"
+
+#: ../../mod/profiles.php:154
+msgid "Location"
+msgstr "Loko"
+
+#: ../../mod/profiles.php:225
+msgid "Profile updated."
+msgstr "Profilo �isdatigita."
+
+#: ../../mod/profiles.php:300
+msgid "public profile"
+msgstr "publika profilo"
+
+#: ../../mod/profiles.php:302
+#, php-format
+msgid "%1$s has an updated %2$s, changing %3$s."
+msgstr "%1$s havas �isdatigigan %2$s, �an�as %3$s."
+
+#: ../../mod/profiles.php:358
+msgid "Profile deleted."
+msgstr "Profilo forvi�ita."
+
+#: ../../mod/profiles.php:376 ../../mod/profiles.php:410
+msgid "Profile-"
+msgstr "Profilo-"
+
+#: ../../mod/profiles.php:395 ../../mod/profiles.php:437
+msgid "New profile created."
+msgstr "Nova profilo kreita."
+
+#: ../../mod/profiles.php:416
+msgid "Profile unavailable to clone."
+msgstr "Ne eblas kopii profilon."
+
+#: ../../mod/profiles.php:474
+msgid "Hide your contact/friend list from viewers of this profile?"
+msgstr "Ka�i vian liston de kontaktoj/amikoj al vidantoj de ĉi-tio profilo?"
+
+#: ../../mod/profiles.php:497
+msgid "Edit Profile Details"
+msgstr "Redakti Detalojn de Profilo"
+
+#: ../../mod/profiles.php:499
+msgid "View this profile"
+msgstr "Vidi la profilon."
+
+#: ../../mod/profiles.php:500
+msgid "Create a new profile using these settings"
+msgstr "Krei novan profilon kun tiaj agordoj"
+
+#: ../../mod/profiles.php:501
+msgid "Clone this profile"
+msgstr "Kopii ĉi tiun profilon"
+
+#: ../../mod/profiles.php:502
+msgid "Delete this profile"
+msgstr "Forvi�i ĉi tiun profilon"
+
+#: ../../mod/profiles.php:503
+msgid "Profile Name:"
+msgstr "Nomo de Profilo:"
+
+#: ../../mod/profiles.php:504
+msgid "Your Full Name:"
+msgstr "Via Plena Nomo:"
+
+#: ../../mod/profiles.php:505
+msgid "Title/Description:"
+msgstr "Titolo/Priskribo:"
+
+#: ../../mod/profiles.php:506
+msgid "Your Gender:"
+msgstr "Via Sekso:"
+
+#: ../../mod/profiles.php:507
+#, php-format
+msgid "Birthday (%s):"
+msgstr "Naski�tago (%s):"
+
+#: ../../mod/profiles.php:508
+msgid "Street Address:"
+msgstr "Adreso:"
+
+#: ../../mod/profiles.php:509
+msgid "Locality/City:"
+msgstr "Urbo:"
+
+#: ../../mod/profiles.php:510
+msgid "Postal/Zip Code:"
+msgstr "Po�tkodo:"
+
+#: ../../mod/profiles.php:511
+msgid "Country:"
+msgstr "Lando:"
+
+#: ../../mod/profiles.php:512
+msgid "Region/State:"
+msgstr "Åœtato:"
+
+#: ../../mod/profiles.php:513
+msgid "<span class=\"heart\">&hearts;</span> Marital Status:"
+msgstr "<span class=\"heart\">&hearts;</span> Civita Stato:"
+
+#: ../../mod/profiles.php:514
+msgid "Who: (if applicable)"
+msgstr "Kiu (se aplikeble):"
+
+#: ../../mod/profiles.php:515
+msgid "Examples: cathy123, Cathy Williams, cathy@example.com"
+msgstr "Ekzemploj: cathy123, Cathy Williams, cathy@example.com"
+
+#: ../../mod/profiles.php:516 ../../include/profile_advanced.php:43
+msgid "Sexual Preference:"
+msgstr "Seksa Prefero:"
+
+#: ../../mod/profiles.php:517
+msgid "Homepage URL:"
+msgstr "Adreso de Hejmpa�o:"
+
+#: ../../mod/profiles.php:518 ../../include/profile_advanced.php:49
+msgid "Political Views:"
+msgstr "Politikaj Opinioj:"
+
+#: ../../mod/profiles.php:519
+msgid "Religious Views:"
+msgstr "Religiaj Opinioj:"
+
+#: ../../mod/profiles.php:520
+msgid "Public Keywords:"
+msgstr "Publikaj �losilvortoj:"
+
+#: ../../mod/profiles.php:521
+msgid "Private Keywords:"
+msgstr "Privataj �losilvortoj:"
+
+#: ../../mod/profiles.php:522
+msgid "Example: fishing photography software"
+msgstr "Ekzemple: fi�kapti fotografio programaro"
+
+#: ../../mod/profiles.php:523
+msgid "(Used for suggesting potential friends, can be seen by others)"
+msgstr "(Por sugesti amikoj. Videbla al aliaj.)"
+
+#: ../../mod/profiles.php:524
+msgid "(Used for searching profiles, never shown to others)"
+msgstr "(Por serĉi profilojn. Neniam videbla al aliaj.)"
+
+#: ../../mod/profiles.php:525
+msgid "Tell us about yourself..."
+msgstr "Diru al ni pri vi..."
+
+#: ../../mod/profiles.php:526
+msgid "Hobbies/Interests"
+msgstr "Åœatokupoj/Interesoj"
+
+#: ../../mod/profiles.php:527
+msgid "Contact information and Social Networks"
+msgstr "Kontaktaj informoj kaj Interkonaj Retejoj"
+
+#: ../../mod/profiles.php:528
+msgid "Musical interests"
+msgstr "Muzikaj interesoj"
+
+#: ../../mod/profiles.php:529
+msgid "Books, literature"
+msgstr "Libroj, literaturo"
+
+#: ../../mod/profiles.php:530
+msgid "Television"
+msgstr "Televido"
+
+#: ../../mod/profiles.php:531
+msgid "Film/dance/culture/entertainment"
+msgstr "Filmoj/dancoj/arto/amuzaĵoj"
+
+#: ../../mod/profiles.php:532
+msgid "Love/romance"
+msgstr "Amo/romanco"
+
+#: ../../mod/profiles.php:533
+msgid "Work/employment"
+msgstr "Laboro"
+
+#: ../../mod/profiles.php:534
+msgid "School/education"
+msgstr "Lernejo/eduko"
+
+#: ../../mod/profiles.php:539
+msgid ""
+"This is your <strong>public</strong> profile.<br />It <strong>may</strong> "
+"be visible to anybody using the internet."
+msgstr "Ĉi tio estas via <strong>publika</strong> profilo. Ĝi <strong>eble</strong> estas videbla al ĉiuj en interreto. "
+
+#: ../../mod/profiles.php:549 ../../mod/directory.php:111
+msgid "Age: "
+msgstr "A�o:"
+
+#: ../../mod/profiles.php:584
+msgid "Edit/Manage Profiles"
+msgstr "Redakti/administri Profilojn"
+
+#: ../../mod/profiles.php:585 ../../boot.php:1049
+msgid "Change profile photo"
+msgstr "Ŝan�i profilbildon"
+
+#: ../../mod/profiles.php:586 ../../boot.php:1050
+msgid "Create New Profile"
+msgstr "Krei novan profilon"
+
+#: ../../mod/profiles.php:597 ../../boot.php:1060
+msgid "Profile Image"
+msgstr "Profilbildo"
+
+#: ../../mod/profiles.php:599 ../../boot.php:1063
+msgid "visible to everybody"
+msgstr "videbla al ĉiuj"
+
+#: ../../mod/profiles.php:600 ../../boot.php:1064
+msgid "Edit visibility"
+msgstr "Redakti videblecon"
+
+#: ../../mod/filer.php:29 ../../include/conversation.php:914
+msgid "Save to Folder:"
+msgstr "Konservi en Dosierujo:"
+
+#: ../../mod/filer.php:29
+msgid "- select -"
+msgstr "- elekti -"
+
+#: ../../mod/tagger.php:103 ../../include/conversation.php:138
+#, php-format
+msgid "%1$s tagged %2$s's %3$s with %4$s"
+msgstr "%1$s markis la %3$s de %2$s kun %4$s"
+
+#: ../../mod/delegate.php:95
+msgid "No potential page delegates located."
+msgstr "Ne trovis delegiteblajn pa�ojn."
+
+#: ../../mod/delegate.php:121
+msgid "Delegate Page Management"
+msgstr "Administrado de Delegitajn Pa�ojn"
+
+#: ../../mod/delegate.php:123
+msgid ""
+"Delegates are able to manage all aspects of this account/page except for "
+"basic account settings. Please do not delegate your personal account to "
+"anybody that you do not trust completely."
+msgstr "Delegitoj povas administri ĉiujn ecojn de la konto/pa�o, escepte bazaj kontoagordoj. Bonvolu ne delegitigi vian personan konton al iu al kiu vi ne plene fidas."
+
+#: ../../mod/delegate.php:124
+msgid "Existing Page Managers"
+msgstr "Estantaj Administrantoj de la Pa�o"
+
+#: ../../mod/delegate.php:126
+msgid "Existing Page Delegates"
+msgstr "Estantaj Delegitoj de la Pa�o"
+
+#: ../../mod/delegate.php:128
+msgid "Potential Delegates"
+msgstr "Eblaj Delegitoj"
+
+#: ../../mod/delegate.php:131
+msgid "Add"
+msgstr "Aldoni"
+
+#: ../../mod/delegate.php:132
+msgid "No entries."
+msgstr "Neniom da afi�oj."
+
+#: ../../mod/suggest.php:38 ../../view/theme/diabook-red/theme.php:149
+#: ../../view/theme/diabook-blue/theme.php:149
+#: ../../view/theme/diabook/theme.php:155
+#: ../../view/theme/diabook-aerith/theme.php:150
+#: ../../include/contact_widgets.php:34
+msgid "Friend Suggestions"
+msgstr "Amikosugestoj."
+
+#: ../../mod/suggest.php:44
+msgid ""
+"No suggestions available. If this is a new site, please try again in 24 "
+"hours."
+msgstr "Neniu sugestoj disponeblas. Se ĉi tiu estas nova retejo, bonvolu reprovi post 24 horoj."
+
+#: ../../mod/suggest.php:61
+msgid "Ignore/Hide"
+msgstr "Ignori/Ka�i"
+
+#: ../../mod/directory.php:47 ../../view/theme/diabook-red/theme.php:147
+#: ../../view/theme/diabook-blue/theme.php:147
+#: ../../view/theme/diabook/theme.php:153
+#: ../../view/theme/diabook-aerith/theme.php:148
+msgid "Global Directory"
+msgstr "Tutmonda Katalogo"
+
+#: ../../mod/directory.php:55
+msgid "Find on this site"
+msgstr "Trovi en ĉi retejo"
+
+#: ../../mod/directory.php:58
+msgid "Site Directory"
+msgstr "Reteja Katalogo"
+
+#: ../../mod/directory.php:114
+msgid "Gender: "
+msgstr "Sekso:"
+
+#: ../../mod/directory.php:140
+msgid "No entries (some entries may be hidden)."
+msgstr "Neniom da afi�oj (kelkaj afi�oj eble ne estas videbla)."
+
+#: ../../mod/invite.php:35
+#, php-format
+msgid "%s : Not a valid email address."
+msgstr "%s: Ne estas valida retpo�tadreso."
+
+#: ../../mod/invite.php:59
+msgid "Please join us on Friendica"
+msgstr "Bonvolu ali�i kun ni ĉe Friendica"
+
+#: ../../mod/invite.php:69
+#, php-format
+msgid "%s : Message delivery failed."
+msgstr "%s: La livero de la mesa�o malsukcesis."
+
+#: ../../mod/invite.php:73
+#, php-format
+msgid "%d message sent."
+msgid_plural "%d messages sent."
+msgstr[0] "Sendis %d mesa�on."
+msgstr[1] "Sendis %d mesa�ojn."
+
+#: ../../mod/invite.php:92
+msgid "You have no more invitations available"
+msgstr "Vi ne plu disponeblas invitaĵojn"
+
+#: ../../mod/invite.php:100
+#, php-format
+msgid ""
+"Visit %s for a list of public sites that you can join. Friendica members on "
+"other sites can all connect with each other, as well as with members of many"
+" other social networks."
+msgstr "Vizitu %s por listo de publikaj retejoj kie vi povas ali�i. Anoj de Friendica ĉe aliaj retejoj povas konekti unu kun la alian, kaj ankaŭ kun membroj de multaj aliaj retejoj."
+
+#: ../../mod/invite.php:102
+#, php-format
+msgid ""
+"To accept this invitation, please visit and register at %s or any other "
+"public Friendica website."
+msgstr "Por akcepti ĉi tiu invito, bonvolu viziti kaj registri�i ĉe %s au alia publika Friendica retejo."
+
+#: ../../mod/invite.php:103
+#, php-format
+msgid ""
+"Friendica sites all inter-connect to create a huge privacy-enhanced social "
+"web that is owned and controlled by its members. They can also connect with "
+"many traditional social networks. See %s for a list of alternate Friendica "
+"sites you can join."
+msgstr "Ĉiuj Friendica retejoj interkonekti�as kaj kune faras grandan altprivatecan interkonan reton, kiun posedas kaj kontrolas �iaj membroj. Ili ankaŭ povas konekti kun multe de tradiciaj interkonaj retejoj. Vidu %s por listo de publikaj retejoj kie vi povas ali�i."
+
+#: ../../mod/invite.php:106
+msgid ""
+"Our apologies. This system is not currently configured to connect with other"
+" public sites or invite members."
+msgstr "Senkulpigu nin. La sistemo nuntempe ne estas agordita por konekti al aliaj retejoj au inviti membrojn."
+
+#: ../../mod/invite.php:111
+msgid "Send invitations"
+msgstr "Sendi invitojn"
+
+#: ../../mod/invite.php:112
+msgid "Enter email addresses, one per line:"
+msgstr "Entajpu retpo�tadresojn, po unu por ĉiu linio."
+
+#: ../../mod/invite.php:114
+msgid ""
+"You are cordially invited to join me and other close friends on Friendica - "
+"and help us to create a better social web."
+msgstr "Ni bonkore invitas vin ali�i kun ni kaj aliaj bonaj amikoj ĉe Friendica. Helpu nin krei pli bonan interkonan reton."
+
+#: ../../mod/invite.php:116
+msgid "You will need to supply this invitation code: $invite_code"
+msgstr "Vi bezonas ĉi-tiun invitkodon: $invite_code"
+
+#: ../../mod/invite.php:116
+msgid ""
+"Once you have registered, please connect with me via my profile page at:"
+msgstr "Kiam vi registris, bonvolu konekti al mi tra mi profilo ĉe: "
+
+#: ../../mod/invite.php:118
+msgid ""
+"For more information about the Friendica project and why we feel it is "
+"important, please visit http://friendica.com"
+msgstr "Por pli da informoj pri Friendica, kaj kial ni pensas ke �i estas grava, bonvolu viziti http://friendica.com"
+
+#: ../../mod/dfrn_confirm.php:119
+msgid ""
+"This may occasionally happen if contact was requested by both persons and it"
+" has already been approved."
+msgstr "Tio ĉi okazis de tempo al tempo se ambaŭ personoj petas kontakton ka �i jam estas aprobita."
+
+#: ../../mod/dfrn_confirm.php:242
+msgid "Response from remote site was not understood."
+msgstr "Ne komprenis la rispondon de la fora retejo."
+
+#: ../../mod/dfrn_confirm.php:251
+msgid "Unexpected response from remote site: "
+msgstr "Neatendita rispondo de la fora retejo:"
+
+#: ../../mod/dfrn_confirm.php:259
+msgid "Confirmation completed successfully."
+msgstr "Konfirmo sukcese kompletigita."
+
+#: ../../mod/dfrn_confirm.php:261 ../../mod/dfrn_confirm.php:275
+#: ../../mod/dfrn_confirm.php:282
+msgid "Remote site reported: "
+msgstr "La fora retejo raportis:"
+
+#: ../../mod/dfrn_confirm.php:273
+msgid "Temporary failure. Please wait and try again."
+msgstr "Dumtempa eraro. Bonvolu atendi kaj provi refoje."
+
+#: ../../mod/dfrn_confirm.php:280
+msgid "Introduction failed or was revoked."
+msgstr "La prezento malsukcesis au estas revokita."
+
+#: ../../mod/dfrn_confirm.php:425
+msgid "Unable to set contact photo."
+msgstr "Neeblas agordi la kontaktbildo."
+
+#: ../../mod/dfrn_confirm.php:477 ../../include/diaspora.php:507
+#: ../../include/conversation.php:101
+#, php-format
+msgid "%1$s is now friends with %2$s"
+msgstr "%1$s amiki�is kun %2$s"
+
+#: ../../mod/dfrn_confirm.php:548
+#, php-format
+msgid "No user record found for '%s' "
+msgstr "Ne trovis uzanton '%s' "
+
+#: ../../mod/dfrn_confirm.php:558
+msgid "Our site encryption key is apparently messed up."
+msgstr "Ŝajnas kvazaŭ la ĉifro�losilo de nia retejo estas fu�ita."
+
+#: ../../mod/dfrn_confirm.php:569
+msgid "Empty site URL was provided or URL could not be decrypted by us."
+msgstr "Malplena adreso de retejo provizita, aŭ ni ne povis malĉifri la adreson."
+
+#: ../../mod/dfrn_confirm.php:590
+msgid "Contact record was not found for you on our site."
+msgstr "Kontakto ne trovita por vi en via retejo."
+
+#: ../../mod/dfrn_confirm.php:604
+#, php-format
+msgid "Site public key not available in contact record for URL %s."
+msgstr "Publika �losilo de retejo ne disponeblas en la kontaktrikordo por la URL adreso %s."
+
+#: ../../mod/dfrn_confirm.php:624
+msgid ""
+"The ID provided by your system is a duplicate on our system. It should work "
+"if you try again."
+msgstr "La identeco provizita de via sistemo estas duoblo ĉe nia sistemo. Ĝi eble funkcias se vi provas refoje."
+
+#: ../../mod/dfrn_confirm.php:635
+msgid "Unable to set your contact credentials on our system."
+msgstr "Ne sukcesis agordi la legitimaĵojn de via kontakto ĉe nia sistemo."
+
+#: ../../mod/dfrn_confirm.php:700
+msgid "Unable to update your contact profile details on our system"
+msgstr "Neeblas �isdatigi viajn profildetalojn ĉe nia sistemo."
+
+#: ../../mod/dfrn_confirm.php:730
+#, php-format
+msgid "Connection accepted at %s"
+msgstr "Konekto akceptita je %s"
+
+#: ../../addon/facebook/facebook.php:467
+msgid "Facebook disabled"
+msgstr "Facebook mal�altita"
+
+#: ../../addon/facebook/facebook.php:472
+msgid "Updating contacts"
+msgstr "Mi �isdatigas la kontaktojn."
+
+#: ../../addon/facebook/facebook.php:493
+msgid "Facebook API key is missing."
+msgstr "La API �losilo de Facebook ne estas konata ĉi tie."
+
+#: ../../addon/facebook/facebook.php:500
+msgid "Facebook Connect"
+msgstr "Kontekto al Facebook"
+
+#: ../../addon/facebook/facebook.php:506
+msgid "Install Facebook connector for this account."
+msgstr "Instali la Facebook konektilo por ĉi tiu konto."
+
+#: ../../addon/facebook/facebook.php:513
+msgid "Remove Facebook connector"
+msgstr "Forigi la Facebook konektilon."
+
+#: ../../addon/facebook/facebook.php:518
+msgid ""
+"Re-authenticate [This is necessary whenever your Facebook password is "
+"changed.]"
+msgstr "Reaŭtenti�i [Tio estas bezonata ĉiam kiam vi �an�is vian pasvorton ĉe Facebook.]"
+
+#: ../../addon/facebook/facebook.php:525
+msgid "Post to Facebook by default"
+msgstr "Ĉiam afi�i al Facebook."
+
+#: ../../addon/facebook/facebook.php:529
+msgid "Link all your Facebook friends and conversations on this website"
+msgstr "Alligu ĉiujn viajn Facebook amikojn kaj konversaciojn je ĉi-tiu retejo."
+
+#: ../../addon/facebook/facebook.php:531
+msgid ""
+"Facebook conversations consist of your <em>profile wall</em> and your friend"
+" <em>stream</em>."
+msgstr "Facebok konversacioj konsistas el via <em>profilmuro</em> kaj la <em>fluo</em> de viaj amikoj."
+
+#: ../../addon/facebook/facebook.php:532
+msgid "On this website, your Facebook friend stream is only visible to you."
+msgstr "Je ĉi-tiu retejo, la fluo de viaj amikoj ĉe Facebook nur videblas al vi."
+
+#: ../../addon/facebook/facebook.php:533
+msgid ""
+"The following settings determine the privacy of your Facebook profile wall "
+"on this website."
+msgstr "La sekvontaj agordoj difinas la privatecon de via Facebook profilmuro je ĉi-tiu retejo."
+
+#: ../../addon/facebook/facebook.php:537
+msgid ""
+"On this website your Facebook profile wall conversations will only be "
+"visible to you"
+msgstr "Je ĉi-tiu retejo, la conversacioj sur via Facebook profilmuro nur videblas al vi."
+
+#: ../../addon/facebook/facebook.php:542
+msgid "Do not import your Facebook profile wall conversations"
+msgstr "Ne importi konversaciojn de via Facebook profilmuro"
+
+#: ../../addon/facebook/facebook.php:544
+msgid ""
+"If you choose to link conversations and leave both of these boxes unchecked,"
+" your Facebook profile wall will be merged with your profile wall on this "
+"website and your privacy settings on this website will be used to determine "
+"who may see the conversations."
+msgstr "Se vi elektas alligi conversaciojn kaj ne elektas tiujn butonojn, via Facebook profilmuro estas kunigota kun via profilmuro ĉi tie. Viaj privatecaj agordoj ĉi tie difinos kiu povas vidi la coversaciojn."
+
+#: ../../addon/facebook/facebook.php:549
+msgid "Comma separated applications to ignore"
+msgstr "Ignorotaj programoj, disigita per komo"
+
+#: ../../addon/facebook/facebook.php:623
+msgid "Problems with Facebook Real-Time Updates"
+msgstr "Problemoj kun Facebook Realtempaj Äœisdatigoj"
+
+#: ../../addon/facebook/facebook.php:647
+#: ../../include/contact_selectors.php:81
+msgid "Facebook"
+msgstr "Facebook"
+
+#: ../../addon/facebook/facebook.php:648
+msgid "Facebook Connector Settings"
+msgstr "Agordoj por la Facebook konektilo"
+
+#: ../../addon/facebook/facebook.php:659
+msgid "Facebook API Key"
+msgstr "Facebook API �losilo"
+
+#: ../../addon/facebook/facebook.php:668
+msgid ""
+"Error: it appears that you have specified the App-ID and -Secret in your "
+".htconfig.php file. As long as they are specified there, they cannot be set "
+"using this form.<br><br>"
+msgstr "Eraro: Ŝajnas kvazaŭ vi agordis la App-ID kaj la sekreton en via .htconfig.php dosiero. Kiam ili estas agordita tie, vi ne povas agordi �in tra tiu ĉi formo.<br><br>"
+
+#: ../../addon/facebook/facebook.php:673
+msgid ""
+"Error: the given API Key seems to be incorrect (the application access token"
+" could not be retrieved)."
+msgstr "Eraro: La API �losilo aspektas mal�usta (ne eblas ricevi la programa atingoĵetono)."
+
+#: ../../addon/facebook/facebook.php:675
+msgid "The given API Key seems to work correctly."
+msgstr "La API �losilo �ajne �uste funkcias."
+
+#: ../../addon/facebook/facebook.php:677
+msgid ""
+"The correctness of the API Key could not be detected. Somthing strange's "
+"going on."
+msgstr "Ne povis kontroli la �ustecon de la API �losilo. Ia stranga afero okazas. "
+
+#: ../../addon/facebook/facebook.php:680
+msgid "App-ID / API-Key"
+msgstr "Programo ID / API Åœlosilo"
+
+#: ../../addon/facebook/facebook.php:681
+msgid "Application secret"
+msgstr "Programo sekreto"
+
+#: ../../addon/facebook/facebook.php:682
+#, php-format
+msgid "Polling Interval (min. %1$s minutes)"
+msgstr "Intervalo por la enketilo (poller intervalo, minimume %1$s mintuoj) "
+
+#: ../../addon/facebook/facebook.php:686
+msgid "Real-Time Updates"
+msgstr "Realtempaj Äœisdatigoj"
+
+#: ../../addon/facebook/facebook.php:690
+msgid "Real-Time Updates are activated."
+msgstr "Realtempaj Ĝisdatigoj estas �altita"
+
+#: ../../addon/facebook/facebook.php:691
+msgid "Deactivate Real-Time Updates"
+msgstr "Mal�alti Realtempaj Ĝisdatigoj"
+
+#: ../../addon/facebook/facebook.php:693
+msgid "Real-Time Updates not activated."
+msgstr "Realtempaj Ĝisdatigoj estas mal�altita"
+
+#: ../../addon/facebook/facebook.php:693
+msgid "Activate Real-Time Updates"
+msgstr "Åœalti Realtempaj Äœisdatigoj"
+
+#: ../../addon/facebook/facebook.php:707
+msgid "The new values have been saved."
+msgstr "Konservis novajn valorojn."
+
+#: ../../addon/facebook/facebook.php:726
+msgid "Post to Facebook"
+msgstr "Afi�i al Facebook"
+
+#: ../../addon/facebook/facebook.php:818
+msgid ""
+"Post to Facebook cancelled because of multi-network access permission "
+"conflict."
+msgstr "Afi�ado al Facebook nuligita ĉar okazis konflikto en la multretpermesoj."
+
+#: ../../addon/facebook/facebook.php:1039
+msgid "View on Friendica"
+msgstr "Vidi ĉe Friendica"
+
+#: ../../addon/facebook/facebook.php:1072
+msgid "Facebook post failed. Queued for retry."
+msgstr "Malsukcesis afi�i ĉe Facebook. Enigita en vico."
+
+#: ../../addon/facebook/facebook.php:1108
+msgid "Your Facebook connection became invalid. Please Re-authenticate."
+msgstr "Via Facbook konekto i�is nevalida. Bonvolu reaŭtenti�i."
+
+#: ../../addon/facebook/facebook.php:1109
+msgid "Facebook connection became invalid"
+msgstr "Facebook konekto i�is nevalida."
+
+#: ../../addon/facebook/facebook.php:1110
+#, php-format
+msgid ""
+"Hi %1$s,\n"
+"\n"
+"The connection between your accounts on %2$s and Facebook became invalid. This usually happens after you change your Facebook-password. To enable the connection again, you have to %3$sre-authenticate the Facebook-connector%4$s."
+msgstr "Saluton %1$s,\n\nla kontekto inter viaj kontoj ĉe %2$s kaj Facebook malvalidi�is. Tio kutime okazas post kiam via �angas vian pasvorton ĉe Facebook. Por reaktivigi la konekto, vi bezonas %3$sreaŭtenti�i la Facebook konektilon%4$s."
+
+#: ../../addon/widgets/widget_like.php:58
+#, php-format
+msgid "%d person likes this"
+msgid_plural "%d people like this"
+msgstr[0] "%d homo �atas tiun"
+msgstr[1] "%d homoj �atas tiun"
+
+#: ../../addon/widgets/widget_like.php:61
+#, php-format
+msgid "%d person doesn't like this"
+msgid_plural "%d people don't like this"
+msgstr[0] "%d homo mal�atas tiun"
+msgstr[1] "%d homo mal�atas tiun"
+
+#: ../../addon/widgets/widgets.php:56
+msgid "Generate new key"
+msgstr "Generi novan ĉifro�losilon"
+
+#: ../../addon/widgets/widgets.php:59
+msgid "Widgets key"
+msgstr "Ŝlosilo por fenestraĵoj"
+
+#: ../../addon/widgets/widgets.php:61
+msgid "Widgets available"
+msgstr "Disponeblaj fenestraĵoj"
+
+#: ../../addon/widgets/widget_friends.php:40
+msgid "Connect on Friendica!"
+msgstr "Konekti ĉe Friendica!"
+
+#: ../../addon/yourls/yourls.php:55
+msgid "YourLS Settings"
+msgstr "\"YourLS\" Agordoj"
+
+#: ../../addon/yourls/yourls.php:57
+msgid "URL: http://"
+msgstr "URL adreso: http://"
+
+#: ../../addon/yourls/yourls.php:62
+msgid "Username:"
+msgstr "Salutnomo:"
+
+#: ../../addon/yourls/yourls.php:67
+msgid "Password:"
+msgstr "Pasvorto:"
+
+#: ../../addon/yourls/yourls.php:72
+msgid "Use SSL "
+msgstr "Uzi SSL "
+
+#: ../../addon/yourls/yourls.php:92
+msgid "yourls Settings saved."
+msgstr "Konservis la agordojn de YourLS."
+
+#: ../../addon/ljpost/ljpost.php:39
+msgid "Post to LiveJournal"
+msgstr "Afi�i ĉe LiveJournal"
+
+#: ../../addon/ljpost/ljpost.php:70
+msgid "LiveJournal Post Settings"
+msgstr "Agordoj pri afi�oj ĉe LiveJournal"
+
+#: ../../addon/ljpost/ljpost.php:72
+msgid "Enable LiveJournal Post Plugin"
+msgstr "Ŝalti la LiveJournal-afi�o kromprogramon."
+
+#: ../../addon/ljpost/ljpost.php:77
+msgid "LiveJournal username"
+msgstr "LiveJournal Salutnomo"
+
+#: ../../addon/ljpost/ljpost.php:82
+msgid "LiveJournal password"
+msgstr "LiveJournal pasvorto"
+
+#: ../../addon/ljpost/ljpost.php:87
+msgid "Post to LiveJournal by default"
+msgstr "Defaŭlte afi�i al LiveJournal"
+
+#: ../../addon/nsfw/nsfw.php:47
+msgid "Not Safe For Work (General Purpose Content Filter) settings"
+msgstr "Not Safe For Work (�enerala filtrilo por enhavoj) agordoj"
+
+#: ../../addon/nsfw/nsfw.php:49
+msgid ""
+"This plugin looks in posts for the words/text you specify below, and "
+"collapses any content containing those keywords so it is not displayed at "
+"inappropriate times, such as sexual innuendo that may be improper in a work "
+"setting. It is polite and recommended to tag any content containing nudity "
+"with #NSFW.  This filter can also match any other word/text you specify, and"
+" can thereby be used as a general purpose content filter."
+msgstr "Tiu kromprogramo serĉas la malsupre agordatajn vortojn en afi�oj kaj malvidebligis ilin se ili enhavas iun vorton. Tiel, afi�oj ne montri�is kiuj enhavas maladekvatan enhavon, ekzemple seksumaj aferoj, kiuj ne estas adekvata, ekzemple en la laborejo. En la reto, oni kutime markas tiajn afi�ojn #NSFW - Not Safe For Work - ne adekvata por la laborejo.  La filtrilo ankaŭ serĉas ĉiujn vortojn kiujn vi agordas kaj tial funkcias kiel �enerala filtrilo."
+
+#: ../../addon/nsfw/nsfw.php:50
+msgid "Enable Content filter"
+msgstr "Åœalti la filtrilo por la enhavo"
+
+#: ../../addon/nsfw/nsfw.php:53
+msgid "Comma separated list of keywords to hide"
+msgstr "Perkome disigita listo da ka�ontaj �losilvortoj"
+
+#: ../../addon/nsfw/nsfw.php:58
+msgid "Use /expression/ to provide regular expressions"
+msgstr "Uzu /expr/ por provizi regulajn esprimojn."
+
+#: ../../addon/nsfw/nsfw.php:74
+msgid "NSFW Settings saved."
+msgstr "NSFW agordoj konservitaj."
+
+#: ../../addon/nsfw/nsfw.php:120
+#, php-format
+msgid "%s - Click to open/close"
+msgstr "%s - Klaku por malfermi/fermi"
+
+#: ../../addon/page/page.php:47
+msgid "Forums"
+msgstr "Forumoj"
+
+#: ../../addon/planets/planets.php:150
+msgid "Planets Settings"
+msgstr "Agordo pri Planets"
+
+#: ../../addon/planets/planets.php:152
+msgid "Enable Planets Plugin"
+msgstr "Åœalti la Planets kromprogamon"
+
+#: ../../addon/communityhome/communityhome.php:28
+#: ../../addon/communityhome/communityhome.php:34
+#: ../../addon/communityhome/twillingham/communityhome.php:28
+#: ../../addon/communityhome/twillingham/communityhome.php:34
+#: ../../include/nav.php:64 ../../boot.php:796
+msgid "Login"
+msgstr "Ensaluti"
+
+#: ../../addon/communityhome/communityhome.php:29
+#: ../../addon/communityhome/twillingham/communityhome.php:29
+msgid "OpenID"
+msgstr "OpenID"
+
+#: ../../addon/communityhome/communityhome.php:38
+#: ../../addon/communityhome/twillingham/communityhome.php:38
+msgid "Latest users"
+msgstr "Ä´usaj uzantoj"
+
+#: ../../addon/communityhome/communityhome.php:81
+#: ../../addon/communityhome/twillingham/communityhome.php:81
+msgid "Most active users"
+msgstr "Plej aktivaj uzantoj"
+
+#: ../../addon/communityhome/communityhome.php:98
+msgid "Latest photos"
+msgstr "Ä´usaj bildoj"
+
+#: ../../addon/communityhome/communityhome.php:133
+msgid "Latest likes"
+msgstr "Ĵusaj �atitaĵoj"
+
+#: ../../addon/communityhome/communityhome.php:155
+#: ../../view/theme/diabook-red/theme.php:77
+#: ../../view/theme/diabook-blue/theme.php:77
+#: ../../view/theme/diabook/theme.php:83
+#: ../../view/theme/diabook-aerith/theme.php:78 ../../include/text.php:1302
+#: ../../include/conversation.php:45 ../../include/conversation.php:118
+msgid "event"
+msgstr "okazo"
+
+#: ../../addon/uhremotestorage/uhremotestorage.php:84
+#, php-format
+msgid ""
+"Allow to use your friendica id (%s) to connecto to external unhosted-enabled"
+" storage (like ownCloud). See <a "
+"href=\"http://www.w3.org/community/unhosted/wiki/RemoteStorage#WebFinger\">RemoteStorage"
+" WebFinger</a>"
+msgstr "Permesi vian identecon ĉe Friendica (%s) por konekti al eksteraj konservejoj subtenata de unhosted (ekz. OwnCloud). Vidu <a href=\"http://www.w3.org/community/unhosted/wiki/RemoteStorage#WebFinger\">RemoteStorage WebFinger</a>"
+
+#: ../../addon/uhremotestorage/uhremotestorage.php:85
+msgid "Template URL (with {category})"
+msgstr "URL adreso de �ablono (kun {category})"
+
+#: ../../addon/uhremotestorage/uhremotestorage.php:86
+msgid "OAuth end-point"
+msgstr "OAuth finpunkto"
+
+#: ../../addon/uhremotestorage/uhremotestorage.php:87
+msgid "Api"
+msgstr "Api"
+
+#: ../../addon/membersince/membersince.php:18
+msgid "Member since:"
+msgstr "Membro ekde:"
+
+#: ../../addon/tictac/tictac.php:20
+msgid "Three Dimensional Tic-Tac-Toe"
+msgstr "Tri-dimensia Tiktakto"
+
+#: ../../addon/tictac/tictac.php:53
+msgid "3D Tic-Tac-Toe"
+msgstr "3D Tiktakto"
+
+#: ../../addon/tictac/tictac.php:58
+msgid "New game"
+msgstr "Nova ludo"
+
+#: ../../addon/tictac/tictac.php:59
+msgid "New game with handicap"
+msgstr "Nova ludo kun handikapo"
+
+#: ../../addon/tictac/tictac.php:60
+msgid ""
+"Three dimensional tic-tac-toe is just like the traditional game except that "
+"it is played on multiple levels simultaneously. "
+msgstr "Tri-dimensia tiktakto similas la tradician ludon, sed estas ludata sur pluraj ebenoj dum la sama tempo."
+
+#: ../../addon/tictac/tictac.php:61
+msgid ""
+"In this case there are three levels. You win by getting three in a row on "
+"any level, as well as up, down, and diagonally across the different levels."
+msgstr "Ĉi-kaze ekzistas tri ebenoj. Vi venkas vicigante tri signojn en una vico, en la sama ebeno, same kiel supren, malsupren aŭ diagonale, trans la ebenoj."
+
+#: ../../addon/tictac/tictac.php:63
+msgid ""
+"The handicap game disables the center position on the middle level because "
+"the player claiming this square often has an unfair advantage."
+msgstr "La ludo kun handikapo malvalidigas la mezan pozicion sur la meza ebeno, ĉar la ludisto kio okupas ĉi tiun pozicion ĉiam havas avanta�on."
+
+#: ../../addon/tictac/tictac.php:182
+msgid "You go first..."
+msgstr "Estas via vico unue."
+
+#: ../../addon/tictac/tictac.php:187
+msgid "I'm going first this time..."
+msgstr "Ĉi-tempe, unue estas mia vico."
+
+#: ../../addon/tictac/tictac.php:193
+msgid "You won!"
+msgstr "Vi venkis!"
+
+#: ../../addon/tictac/tictac.php:199 ../../addon/tictac/tictac.php:224
+msgid "\"Cat\" game!"
+msgstr "Sendecida ludo!"
+
+#: ../../addon/tictac/tictac.php:222
+msgid "I won!"
+msgstr "Mi venkis!"
+
+#: ../../addon/randplace/randplace.php:169
+msgid "Randplace Settings"
+msgstr "Randplace agordoj."
+
+#: ../../addon/randplace/randplace.php:171
+msgid "Enable Randplace Plugin"
+msgstr "Aktivigi la Randplace kromprogramon."
+
+#: ../../addon/dwpost/dwpost.php:39
+msgid "Post to Dreamwidth"
+msgstr "Afi�i al Dreamwidth"
+
+#: ../../addon/dwpost/dwpost.php:70
+msgid "Dreamwidth Post Settings"
+msgstr "Agordoj por Afi�oj al Dreamwidth"
+
+#: ../../addon/dwpost/dwpost.php:72
+msgid "Enable dreamwidth Post Plugin"
+msgstr "Åœalti la Dreamwidth Kromprogramon"
+
+#: ../../addon/dwpost/dwpost.php:77
+msgid "dreamwidth username"
+msgstr "Dreamwidth salutnomo"
+
+#: ../../addon/dwpost/dwpost.php:82
+msgid "dreamwidth password"
+msgstr "Dreamwidth pasvorto"
+
+#: ../../addon/dwpost/dwpost.php:87
+msgid "Post to dreamwidth by default"
+msgstr "Defaŭlte afi�i al Dreamwidth"
+
+#: ../../addon/drpost/drpost.php:35
+msgid "Post to Drupal"
+msgstr "Afi�i al Drupal"
+
+#: ../../addon/drpost/drpost.php:72
+msgid "Drupal Post Settings"
+msgstr "Agordoj por Drupal Afi�oj"
+
+#: ../../addon/drpost/drpost.php:74
+msgid "Enable Drupal Post Plugin"
+msgstr "Ŝalti la Drupal-afi�o Kromprogramon"
+
+#: ../../addon/drpost/drpost.php:79
+msgid "Drupal username"
+msgstr "Drupal salutnomo"
+
+#: ../../addon/drpost/drpost.php:84
+msgid "Drupal password"
+msgstr "Drupal pasvorto"
+
+#: ../../addon/drpost/drpost.php:89
+msgid "Post Type - article,page,or blog"
+msgstr "Tipo de Afi�oj - article, page, aŭ blog"
+
+#: ../../addon/drpost/drpost.php:94
+msgid "Drupal site URL"
+msgstr "URL adreso de Drupal retejo"
+
+#: ../../addon/drpost/drpost.php:99
+msgid "Drupal site uses clean URLS"
+msgstr "Drupal retejo uzas purajn URL adresojn"
+
+#: ../../addon/drpost/drpost.php:104
+msgid "Post to Drupal by default"
+msgstr "Defaŭlte afi�i ĉe Drupal"
+
+#: ../../addon/drpost/drpost.php:184 ../../addon/wppost/wppost.php:190
+#: ../../addon/blogger/blogger.php:172 ../../addon/posterous/posterous.php:173
+msgid "Post from Friendica"
+msgstr "Afi�o de Friendica"
+
+#: ../../addon/geonames/geonames.php:143
+msgid "Geonames settings updated."
+msgstr "Äœidatigis la Geonames agordojn."
+
+#: ../../addon/geonames/geonames.php:179
+msgid "Geonames Settings"
+msgstr "Geonames Agordoj"
+
+#: ../../addon/geonames/geonames.php:181
+msgid "Enable Geonames Plugin"
+msgstr "Åœalti la Geonames Kromprogramon"
+
+#: ../../addon/js_upload/js_upload.php:43
+msgid "Upload a file"
+msgstr "Al�uti dosieron"
+
+#: ../../addon/js_upload/js_upload.php:44
+msgid "Drop files here to upload"
+msgstr "Ŝovmeti dosierojn ĉi tie por al�uti ilin."
+
+#: ../../addon/js_upload/js_upload.php:46
+msgid "Failed"
+msgstr "Malsukcesi"
+
+#: ../../addon/js_upload/js_upload.php:297
+msgid "No files were uploaded."
+msgstr "Neniom da dosieroj al�utita."
+
+#: ../../addon/js_upload/js_upload.php:303
+msgid "Uploaded file is empty"
+msgstr "Al�utita dosiero estas malplena."
+
+#: ../../addon/js_upload/js_upload.php:326
+msgid "File has an invalid extension, it should be one of "
+msgstr "Dosiero havas nevalidan sufikson. Äœi estu unu de "
+
+#: ../../addon/js_upload/js_upload.php:337
+msgid "Upload was cancelled, or server error encountered"
+msgstr "Al�utado estas nuligita aŭ okazis eraro sur la servilo"
+
+#: ../../addon/oembed.old/oembed.php:30
+msgid "OEmbed settings updated"
+msgstr "Äœisdatigis OEmbed agordojn"
+
+#: ../../addon/oembed.old/oembed.php:43
+msgid "Use OEmbed for YouTube videos"
+msgstr "Uzi OEmbed por YouTube videtoj"
+
+#: ../../addon/oembed.old/oembed.php:71
+msgid "URL to embed:"
+msgstr "Enigi la URL adreson:"
+
+#: ../../addon/impressum/impressum.php:34
+msgid "Impressum"
+msgstr "Kolofono"
+
+#: ../../addon/impressum/impressum.php:47
+#: ../../addon/impressum/impressum.php:49
+#: ../../addon/impressum/impressum.php:81
+msgid "Site Owner"
+msgstr "Proprietulo de la la�o"
+
+#: ../../addon/impressum/impressum.php:47
+#: ../../addon/impressum/impressum.php:85
+msgid "Email Address"
+msgstr "Retpo�ta Adreso"
+
+#: ../../addon/impressum/impressum.php:52
+#: ../../addon/impressum/impressum.php:83
+msgid "Postal Address"
+msgstr "Po�ta Adreso"
+
+#: ../../addon/impressum/impressum.php:58
+msgid ""
+"The impressum addon needs to be configured!<br />Please add at least the "
+"<tt>owner</tt> variable to your config file. For other variables please "
+"refer to the README file of the addon."
+msgstr "La kolofono (impressum) kromprogramo bezonas agordojn!<br />Bonvolu aldoni minimume la <tt>owner</tt> variablon al via agorda dosiero. Por aliaj variabloj, bonvolu legi la README dosieron de la kromprogramo."
+
+#: ../../addon/impressum/impressum.php:81
+msgid "The page operators name."
+msgstr "La nomo de la funkciigisto de la retejo."
+
+#: ../../addon/impressum/impressum.php:82
+msgid "Site Owners Profile"
+msgstr "Profilo de la Proprietulo de la Retejo"
+
+#: ../../addon/impressum/impressum.php:82
+msgid "Profile address of the operator."
+msgstr "La profilo de la funkciigisto de la retejo."
+
+#: ../../addon/impressum/impressum.php:83
+msgid "How to contact the operator via snail mail."
+msgstr "Kiel kontakti la funkciigiston de la retejo tra paperpo�to."
+
+#: ../../addon/impressum/impressum.php:84
+msgid "Notes"
+msgstr "Notoj"
+
+#: ../../addon/impressum/impressum.php:84
+msgid "Additional notes that are displayed beneath the contact information."
+msgstr "Pliaj notoj kiuj estas montrigota malsupre la kontaktinformojn."
+
+#: ../../addon/impressum/impressum.php:85
+msgid "How to contact the operator via email. (will be displayed obfuscated)"
+msgstr "Kiel kontakti la funkciigiston de la retejo tra retpo�to. (montri�os vuale) "
+
+#: ../../addon/impressum/impressum.php:86
+msgid "Footer note"
+msgstr "Pa�piednoto"
+
+#: ../../addon/impressum/impressum.php:86
+msgid "Text for the footer."
+msgstr "Teksto por la pa�piedo."
+
+#: ../../addon/buglink/buglink.php:15
+msgid "Report Bug"
+msgstr "Skribi cimraporton"
+
+#: ../../addon/blockem/blockem.php:51
+msgid "\"Blockem\" Settings"
+msgstr "\"Blockem\" Agordoj"
+
+#: ../../addon/blockem/blockem.php:53
+msgid "Comma separated profile URLS to block"
+msgstr "Blokotaj URL adresoj, disigita per komo"
+
+#: ../../addon/blockem/blockem.php:70
+msgid "BLOCKEM Settings saved."
+msgstr "Konservis Agordojn de BLOCKEM."
+
+#: ../../addon/blockem/blockem.php:105
+#, php-format
+msgid "Blocked %s - Click to open/close"
+msgstr "%s blokita - Klaku por malfermi/fermi"
+
+#: ../../addon/blockem/blockem.php:160
+msgid "Unblock Author"
+msgstr "Malbloki AÅ­toron"
+
+#: ../../addon/blockem/blockem.php:162
+msgid "Block Author"
+msgstr "Bloki AÅ­toron"
+
+#: ../../addon/blockem/blockem.php:194
+msgid "blockem settings updated"
+msgstr "Äœisdatigis la blockem agordojn"
+
+#: ../../addon/qcomment/qcomment.php:51
+msgid ":-)"
+msgstr ":-)"
+
+#: ../../addon/qcomment/qcomment.php:51
+msgid ":-("
+msgstr ":-("
+
+#: ../../addon/qcomment/qcomment.php:51
+msgid "lol"
+msgstr "lol"
+
+#: ../../addon/qcomment/qcomment.php:54
+msgid "Quick Comment Settings"
+msgstr "Agordoj pri Rapidaj Komentoj"
+
+#: ../../addon/qcomment/qcomment.php:56
+msgid ""
+"Quick comments are found near comment boxes, sometimes hidden. Click them to"
+" provide simple replies."
+msgstr "Rapidaj komentoj trovi�as apud komentkampoj, kelkfoje ka�ita. Klaku ilin por provizi simplajn rispondojn."
+
+#: ../../addon/qcomment/qcomment.php:57
+msgid "Enter quick comments, one per line"
+msgstr "Entajpu rapidaj komentoj, po unu je linio."
+
+#: ../../addon/qcomment/qcomment.php:75
+msgid "Quick Comment settings saved."
+msgstr "Konservis agordojn pri rapidaj komentoj."
+
+#: ../../addon/openstreetmap/openstreetmap.php:71
+msgid "Tile Server URL"
+msgstr "Adreso de Kahelservilo"
+
+#: ../../addon/openstreetmap/openstreetmap.php:71
+msgid ""
+"A list of <a href=\"http://wiki.openstreetmap.org/wiki/TMS\" "
+"target=\"_blank\">public tile servers</a>"
+msgstr "Listo de <a href=\"http://wiki.openstreetmap.org/wiki/TMS\" target=\"_blank\">publikaj kahelserviloj</a>"
+
+#: ../../addon/openstreetmap/openstreetmap.php:72
+msgid "Default zoom"
+msgstr "DefaÅ­lta zoma faktoro"
+
+#: ../../addon/openstreetmap/openstreetmap.php:72
+msgid "The default zoom level. (1:world, 18:highest)"
+msgstr "La defaÅ­lta zoma faktoro. (1:tutmonda, 18:plej proksima)"
+
+#: ../../addon/mathjax/mathjax.php:37
+msgid ""
+"The MathJax addon renders mathematical formulae written using the LaTeX "
+"syntax surrounded by the usual $$ or an eqnarray block in the postings of "
+"your wall,network tab and private mail."
+msgstr "La Mathjax kromprogramo bildigas matematikajn formulojn skribitajn en la LaTeX sintakso, cirkaŭigita de la komuna $$ aŭ eqnarray bloko en afi�oj ĉe via muro, Reto folio kaj privataj mesa�oj."
+
+#: ../../addon/mathjax/mathjax.php:38
+msgid "Use the MathJax renderer"
+msgstr "Ĉu uzi la Mathjax bildigilo"
+
+#: ../../addon/mathjax/mathjax.php:72
+msgid "MathJax Base URL"
+msgstr "Mathjax Baza URL Adreso"
+
+#: ../../addon/mathjax/mathjax.php:72
+msgid ""
+"The URL for the javascript file that should be included to use MathJax. Can "
+"be either the MathJax CDN or another installation of MathJax."
+msgstr "La URL adreso por la javascript dosiero kiu estas inkluzivigonta por uzi Mathjaz. Eblas esti aÅ­ la Mathjax CDN aÅ­ alia Mathjax instalo."
+
+#: ../../addon/editplain/editplain.php:46
+msgid "Editplain settings updated."
+msgstr "Äœisdatigis la Editplain agordojn."
+
+#: ../../addon/editplain/editplain.php:76
+msgid "Editplain Settings"
+msgstr "Agordoj por Editplain"
+
+#: ../../addon/editplain/editplain.php:78
+msgid "Disable richtext status editor"
+msgstr "Mal�alti la riĉteksto-redaktilon"
+
+#: ../../addon/gravatar/gravatar.php:71
+msgid "generic profile image"
+msgstr "komuna profilbildo"
+
+#: ../../addon/gravatar/gravatar.php:72
+msgid "random geometric pattern"
+msgstr "loteca geometria skemo"
+
+#: ../../addon/gravatar/gravatar.php:73
+msgid "monster face"
+msgstr "monstrobildo"
+
+#: ../../addon/gravatar/gravatar.php:74
+msgid "computer generated face"
+msgstr "komputita viza�o"
+
+#: ../../addon/gravatar/gravatar.php:75
+msgid "retro arcade style face"
+msgstr "retrostila videoludstila viza�o"
+
+#: ../../addon/gravatar/gravatar.php:87
+msgid "Default avatar image"
+msgstr "DefaÅ­lta avatarbildo"
+
+#: ../../addon/gravatar/gravatar.php:87
+msgid "Select default avatar image if none was found at Gravatar. See README"
+msgstr "Elektu defaŭltan avatarbildon se neniu trovi�is ĉe Gravatar. Vidu README."
+
+#: ../../addon/gravatar/gravatar.php:88
+msgid "Rating of images"
+msgstr "Pritakso de bildoj"
+
+#: ../../addon/gravatar/gravatar.php:88
+msgid "Select the appropriate avatar rating for your site. See README"
+msgstr "Elektu la �ustan pritakson de via avataro por via retejo. Vidu README."
+
+#: ../../addon/gravatar/gravatar.php:102
+msgid "Gravatar settings updated."
+msgstr "Gravatar agordoj �isdatigitaj."
+
+#: ../../addon/testdrive/testdrive.php:85
+#, php-format
+msgid "Your account on %s will expire in a few days."
+msgstr "Via konto ĉe %s senvalidi�os post kelkaj tagoj."
+
+#: ../../addon/testdrive/testdrive.php:86
+msgid "Your Friendica test account is about to expire."
+msgstr "Via Friendica provkonto baldaŭ malaktivi�os."
+
+#: ../../addon/testdrive/testdrive.php:87
+#, php-format
+msgid ""
+"Hi %1$s,\n"
+"\n"
+"Your test account on %2$s will expire in less than five days. We hope you enjoyed this test drive and use this opportunity to find a permanent Friendica website for your integrated social communications. A list of public sites is available at http://dir.friendica.com/siteinfo - and for more information on setting up your own Friendica server please see the Friendica project website at http://friendica.com."
+msgstr "Saluton %1$s,\n\nVia testkonto ĉe %2$s senvalidi�os post malpli ol kvin tagoj. Vi esperas ke vi �uis la teston kaj baldaŭ trovos�ustan Friendica retejon por via integrita sociala komunikado. Listo de publikaj retejoj trovi�as ĉe http://dir.friendica.com/siteinfo - kaj por pli da informoj pri kiel instali vian propran Friendica servilon, bonvolu viziti la retejon de la Friendica projekton ĉe http://friendica.com."
+
+#: ../../addon/pageheader/pageheader.php:50
+msgid "\"pageheader\" Settings"
+msgstr "\"pageheader\" Agordoj"
+
+#: ../../addon/pageheader/pageheader.php:68
+msgid "pageheader Settings saved."
+msgstr "Konservis Agordojn de pageheader."
+
+#: ../../addon/ijpost/ijpost.php:39
+msgid "Post to Insanejournal"
+msgstr "Afi�i al Insanejournal"
+
+#: ../../addon/ijpost/ijpost.php:70
+msgid "InsaneJournal Post Settings"
+msgstr "Agordoj pri Insaenejournal Afi�oj"
+
+#: ../../addon/ijpost/ijpost.php:72
+msgid "Enable InsaneJournal Post Plugin"
+msgstr "Ŝalti la InsaneJournal afi�o kromprogramon."
+
+#: ../../addon/ijpost/ijpost.php:77
+msgid "InsaneJournal username"
+msgstr "Salutnomo ĉe InsaneJournal"
+
+#: ../../addon/ijpost/ijpost.php:82
+msgid "InsaneJournal password"
+msgstr "Pasvorto ĉe InsaneJournal"
+
+#: ../../addon/ijpost/ijpost.php:87
+msgid "Post to InsaneJournal by default"
+msgstr "Defaŭlte afi�i ĉe InsaneJournal"
+
+#: ../../addon/viewsrc/viewsrc.php:37
+msgid "View Source"
+msgstr "Vidi Fonton"
+
+#: ../../addon/statusnet/statusnet.php:134
+msgid "Post to StatusNet"
+msgstr "Afi�i ĉe StatusNet"
+
+#: ../../addon/statusnet/statusnet.php:176
+msgid ""
+"Please contact your site administrator.<br />The provided API URL is not "
+"valid."
+msgstr "Bonvolu kontaki vian retejan administranton.<br />La API URL adreso ne validas."
+
+#: ../../addon/statusnet/statusnet.php:204
+msgid "We could not contact the StatusNet API with the Path you entered."
+msgstr "Ni ne povis trovi la StatusNet API kun la vojo kiun vi entajpis."
+
+#: ../../addon/statusnet/statusnet.php:232
+msgid "StatusNet settings updated."
+msgstr "StatusNet agordoj �isdatigita."
+
+#: ../../addon/statusnet/statusnet.php:257
+msgid "StatusNet Posting Settings"
+msgstr "Agordoj por StausNet afi�oj"
+
+#: ../../addon/statusnet/statusnet.php:271
+msgid "Globally Available StatusNet OAuthKeys"
+msgstr "Ĝeneralaj disponeblaj StatusNet OAuth �losiloj"
+
+#: ../../addon/statusnet/statusnet.php:272
+msgid ""
+"There are preconfigured OAuth key pairs for some StatusNet servers "
+"available. If you are useing one of them, please use these credentials. If "
+"not feel free to connect to any other StatusNet instance (see below)."
+msgstr "Disponeblas antaŭagorditaj �losilparoj por kelkaj StatusNet serviloj. Se via uzas iun de iu, bonvolu uzi unun de tiuj legitimaĵojn. Se ne, bonvolu konekti al iu alia StatusNet servilo (vidu malsupre)."
+
+#: ../../addon/statusnet/statusnet.php:280
+msgid "Provide your own OAuth Credentials"
+msgstr "Provizi viajn proprajn OAuth legitimaĵojn"
+
+#: ../../addon/statusnet/statusnet.php:281
+msgid ""
+"No consumer key pair for StatusNet found. Register your Friendica Account as"
+" an desktop client on your StatusNet account, copy the consumer key pair "
+"here and enter the API base root.<br />Before you register your own OAuth "
+"key pair ask the administrator if there is already a key pair for this "
+"Friendica installation at your favorited StatusNet installation."
+msgstr "Ne trovis klientajn �losilojn por StatusNet. Registru vian Friendica konton kiel klientkomputilo/desktop client en via StausNet konto. Kopiu la klientajn �losilojn ĉi tien kaj entajpu la baza API radiko.<br />Antaŭ vi registros viajn proprajn OAuth �losilojn, demandu al la administranto ĉu jam ekzistas �losiloj por ĉi-tiu Friendia retejo je via StatusNet retejo."
+
+#: ../../addon/statusnet/statusnet.php:283
+msgid "OAuth Consumer Key"
+msgstr "OAuth Åœlosilo de Kliento"
+
+#: ../../addon/statusnet/statusnet.php:286
+msgid "OAuth Consumer Secret"
+msgstr "OAuth Sekreto de Kliento"
+
+#: ../../addon/statusnet/statusnet.php:289
+msgid "Base API Path (remember the trailing /)"
+msgstr "Baza vojo al la API (ne forgesu la finan /)"
+
+#: ../../addon/statusnet/statusnet.php:310
+msgid ""
+"To connect to your StatusNet account click the button below to get a "
+"security code from StatusNet which you have to copy into the input box below"
+" and submit the form. Only your <strong>public</strong> posts will be posted"
+" to StatusNet."
+msgstr "Por konekti al vian konton ĉe StatusNet, klaku la malsupran butonon por atingi sekurecan kodon de StatusNet, kiun vi devas alglui en la malsupra kampo kaj sendi la formon. Nur viaj <strong>publikaj</strong> afi�oj estos afi�ota al StatusNet."
+
+#: ../../addon/statusnet/statusnet.php:311
+msgid "Log in with StatusNet"
+msgstr "Ensaluti kun StatusNet."
+
+#: ../../addon/statusnet/statusnet.php:313
+msgid "Copy the security code from StatusNet here"
+msgstr "Alglui la kodon de StatusNet ĉi tie:"
+
+#: ../../addon/statusnet/statusnet.php:319
+msgid "Cancel Connection Process"
+msgstr "Nuligi Konektadon"
+
+#: ../../addon/statusnet/statusnet.php:321
+msgid "Current StatusNet API is"
+msgstr "La nuna StatusNet API estas"
+
+#: ../../addon/statusnet/statusnet.php:322
+msgid "Cancel StatusNet Connection"
+msgstr "Nuligi Konekton al StatusNet"
+
+#: ../../addon/statusnet/statusnet.php:333 ../../addon/twitter/twitter.php:189
+msgid "Currently connected to: "
+msgstr "Konektita al:"
+
+#: ../../addon/statusnet/statusnet.php:334
+msgid ""
+"If enabled all your <strong>public</strong> postings can be posted to the "
+"associated StatusNet account. You can choose to do so by default (here) or "
+"for every posting separately in the posting options when writing the entry."
+msgstr "Kiam �altita, ĉiuj <strong>publikaj</strong> afi�oj de vi ankaŭ eblas esti afi�ota al la asociigita StatusNet konto. Vi povas elekti �in defaŭlte (ĉi tie) au unuope por ĉiuj afi�oj kiam vi skribos ilin."
+
+#: ../../addon/statusnet/statusnet.php:336
+msgid ""
+"<strong>Note</strong>: Due your privacy settings (<em>Hide your profile "
+"details from unknown viewers?</em>) the link potentially included in public "
+"postings relayed to StatusNet will lead the visitor to a blank page "
+"informing the visitor that the access to your profile has been restricted."
+msgstr "<strong>Averto</strong>: Laŭ viaj privatecaj agordoj (<em>Ka�i viajn profilajn detalojn al nekonataj spektantoj?</em>), la ligilo en publikaj afi�oj plusendata al StatusNet gvidas vizitontojn al malplena pa�o sciigante ilin ke atingo al via profilo estas lmitigita."
+
+#: ../../addon/statusnet/statusnet.php:339
+msgid "Allow posting to StatusNet"
+msgstr "Permesi afi�ojn al StatusNet"
+
+#: ../../addon/statusnet/statusnet.php:342
+msgid "Send public postings to StatusNet by default"
+msgstr "Defaŭlte sendi publikajn afi�ojn al StatusNet"
+
+#: ../../addon/statusnet/statusnet.php:345
+msgid "Send #tag links to StatusNet"
+msgstr "Sendu #marko ligilojn al StatusNet"
+
+#: ../../addon/statusnet/statusnet.php:350 ../../addon/twitter/twitter.php:206
+msgid "Clear OAuth configuration"
+msgstr "Forvi�i OAuth agordojn"
+
+#: ../../addon/statusnet/statusnet.php:545
+msgid "API URL"
+msgstr "API URL adreso"
+
+#: ../../addon/tumblr/tumblr.php:36
+msgid "Post to Tumblr"
+msgstr "Afi�i al Tumblr"
+
+#: ../../addon/tumblr/tumblr.php:67
+msgid "Tumblr Post Settings"
+msgstr "Agordoj pri afi�oj ĉe Tumblr"
+
+#: ../../addon/tumblr/tumblr.php:69
+msgid "Enable Tumblr Post Plugin"
+msgstr "Ŝalti la kromprogramon por Tumblr afi�oj"
+
+#: ../../addon/tumblr/tumblr.php:74
+msgid "Tumblr login"
+msgstr "Salutnomo ĉe Tumblr"
+
+#: ../../addon/tumblr/tumblr.php:79
+msgid "Tumblr password"
+msgstr "Pasvorto ĉe Tumblr"
+
+#: ../../addon/tumblr/tumblr.php:84
+msgid "Post to Tumblr by default"
+msgstr "Defaŭlte afi�i ĉe Tumblr"
+
+#: ../../addon/numfriends/numfriends.php:46
+msgid "Numfriends settings updated."
+msgstr "Äœisdatigis agordojn por Numfriends."
+
+#: ../../addon/numfriends/numfriends.php:77
+msgid "Numfriends Settings"
+msgstr "Agordoj por Numfriends"
+
+#: ../../addon/numfriends/numfriends.php:79
+msgid "How many contacts to display on profile sidebar"
+msgstr "Kiom da kontaktoj mi montru en la flanka strio"
+
+#: ../../addon/gnot/gnot.php:48
+msgid "Gnot settings updated."
+msgstr "Äœisdatigis Gnot agordojn."
+
+#: ../../addon/gnot/gnot.php:79
+msgid "Gnot Settings"
+msgstr "Agordoj por Gnot"
+
+#: ../../addon/gnot/gnot.php:81
+msgid ""
+"Allows threading of email comment notifications on Gmail and anonymising the"
+" subject line."
+msgstr "Permesas la ĉenadon de retpo�taj atentigoj pri komentoj ĉe Gmail kan anonimigado de la temlinio."
+
+#: ../../addon/gnot/gnot.php:82
+msgid "Enable this plugin/addon?"
+msgstr "Åœalti tiun kromprogramon?"
+
+#: ../../addon/gnot/gnot.php:97
+#, php-format
+msgid "[Friendica:Notify] Comment to conversation #%d"
+msgstr "[Friendica:Atentigo] Komento pri konversacio #%d"
+
+#: ../../addon/wppost/wppost.php:42
+msgid "Post to Wordpress"
+msgstr "Afi�i al Wordpress"
+
+#: ../../addon/wppost/wppost.php:74
+msgid "WordPress Post Settings"
+msgstr "Agordoj por WordPress afi�ojn"
+
+#: ../../addon/wppost/wppost.php:76
+msgid "Enable WordPress Post Plugin"
+msgstr "Ŝalti la Wordpress-afi�o kromprogramon"
+
+#: ../../addon/wppost/wppost.php:81
+msgid "WordPress username"
+msgstr "WordPress salutnomo"
+
+#: ../../addon/wppost/wppost.php:86
+msgid "WordPress password"
+msgstr "WordPress pasvorto"
+
+#: ../../addon/wppost/wppost.php:91
+msgid "WordPress API URL"
+msgstr "Wordpress API URL adreso"
+
+#: ../../addon/wppost/wppost.php:96
+msgid "Post to WordPress by default"
+msgstr "Defaŭlte afi�i al WordPress"
+
+#: ../../addon/showmore/showmore.php:38
+msgid "\"Show more\" Settings"
+msgstr "\"Montri pli\" agordoj"
+
+#: ../../addon/showmore/showmore.php:41
+msgid "Enable Show More"
+msgstr "Åœalti \"montri pli\""
+
+#: ../../addon/showmore/showmore.php:44
+msgid "Cutting posts after how much characters"
+msgstr "Limitigi afi�ojn al kiom da literoj"
+
+#: ../../addon/showmore/showmore.php:65
+msgid "Show More Settings saved."
+msgstr "Konservis \"montri pli\" agordojn."
+
+#: ../../addon/showmore/showmore.php:87 ../../include/conversation.php:466
+#: ../../boot.php:496
+msgid "show more"
+msgstr "montri pli"
+
+#: ../../addon/piwik/piwik.php:79
+msgid ""
+"This website is tracked using the <a href='http://www.piwik.org'>Piwik</a> "
+"analytics tool."
+msgstr "Ĉi retejo uzas <a href='http://www.piwik.org'>Piwik</a> kiel retuma analizilo."
+
+#: ../../addon/piwik/piwik.php:82
+#, php-format
+msgid ""
+"If you do not want that your visits are logged this way you <a href='%s'>can"
+" set a cookie to prevent Piwik from tracking further visits of the site</a> "
+"(opt-out)."
+msgstr "Se ni ne protokolu viajn vizitojn tiel, vi <a href='%s'>povas agordi kuketon por malpermesi Piwik al plu protokoli pliajn vizitojn</a> (mem-for-elekti / opt-out)."
+
+#: ../../addon/piwik/piwik.php:90
+msgid "Piwik Base URL"
+msgstr "Piwik baza URL adreso"
+
+#: ../../addon/piwik/piwik.php:90
+msgid ""
+"Absolute path to your Piwik installation. (without protocol (http/s), with "
+"trailing slash)"
+msgstr "Absoluta vojo al via Piwik instalo. (sen protokolo (http/s), inkluzive vosta oblikva streketo)"
+
+#: ../../addon/piwik/piwik.php:91
+msgid "Site ID"
+msgstr "Reteja idento"
+
+#: ../../addon/piwik/piwik.php:92
+msgid "Show opt-out cookie link?"
+msgstr "Montru ligilon al kuketo por mem-for-elekti (opt-out)?"
+
+#: ../../addon/piwik/piwik.php:93
+msgid "Asynchronous tracking"
+msgstr "Nesinkrona spurado."
+
+#: ../../addon/twitter/twitter.php:73
+msgid "Post to Twitter"
+msgstr "Afi�i ĉe Twitter"
+
+#: ../../addon/twitter/twitter.php:122
+msgid "Twitter settings updated."
+msgstr "Äœisdatigis Twitter agordojn."
+
+#: ../../addon/twitter/twitter.php:146
+msgid "Twitter Posting Settings"
+msgstr "Agordoj por afi�i ĉe Twitter"
+
+#: ../../addon/twitter/twitter.php:153
+msgid ""
+"No consumer key pair for Twitter found. Please contact your site "
+"administrator."
+msgstr "Ne trovis klientajn �losilojn por Twitter. Bonvolu kontakti vian retejan administranton."
+
+#: ../../addon/twitter/twitter.php:172
+msgid ""
+"At this Friendica instance the Twitter plugin was enabled but you have not "
+"yet connected your account to your Twitter account. To do so click the "
+"button below to get a PIN from Twitter which you have to copy into the input"
+" box below and submit the form. Only your <strong>public</strong> posts will"
+" be posted to Twitter."
+msgstr "Je ĉi tiu Friendica retejo, la Twitter kromprogramo jam estas �altita, sed via konto anokoraŭ ne estas konektita kun via Twitter konto. Por fari tion, klaku la supran butonon por atingi nombrokodon de Twitter, kion vi kopiu en la supran eniga ĉelo, kaj  sendu la formularon. Nur viaj <strong>publikaj</strong> afi�oj estas plusendota al Twitter. "
+
+#: ../../addon/twitter/twitter.php:173
+msgid "Log in with Twitter"
+msgstr "Ensaluti kun Twitter"
+
+#: ../../addon/twitter/twitter.php:175
+msgid "Copy the PIN from Twitter here"
+msgstr "Alglui la PIN de Twitter ĉi tie"
+
+#: ../../addon/twitter/twitter.php:190
+msgid ""
+"If enabled all your <strong>public</strong> postings can be posted to the "
+"associated Twitter account. You can choose to do so by default (here) or for"
+" every posting separately in the posting options when writing the entry."
+msgstr "Kiam �altita, ĉiuj <strong>publikaj</strong> afi�oj de vi ankaŭ eblas esti afi�ota al la asociigita Twitter konto. Vi povas elekti �in defaŭlte (ĉi tie) au unuope por ĉiuj afi�oj kiam vi skribos ilin."
+
+#: ../../addon/twitter/twitter.php:192
+msgid ""
+"<strong>Note</strong>: Due your privacy settings (<em>Hide your profile "
+"details from unknown viewers?</em>) the link potentially included in public "
+"postings relayed to Twitter will lead the visitor to a blank page informing "
+"the visitor that the access to your profile has been restricted."
+msgstr "<strong>Averto</strong>: Laŭ viaj privatecaj agordoj (<em>Ka�i viajn profilajn detalojn al nekonataj spektantoj?</em>), la ligilo en publikaj afi�oj plusendata al Twitter gvidas vizitontojn al malplena pa�o sciigante ilin ke atingo al via profilo estas lmitigita."
+
+#: ../../addon/twitter/twitter.php:195
+msgid "Allow posting to Twitter"
+msgstr "Permesi afi�ojn al Twitter"
+
+#: ../../addon/twitter/twitter.php:198
+msgid "Send public postings to Twitter by default"
+msgstr "Defaŭlte sendi publikajn afi�ojn al Twitter"
+
+#: ../../addon/twitter/twitter.php:201
+msgid "Send #tag links to Twitter"
+msgstr "Sendu #marko ligilon al Twitter"
+
+#: ../../addon/twitter/twitter.php:377
+msgid "Consumer key"
+msgstr "Åœlosilo de Kliento"
+
+#: ../../addon/twitter/twitter.php:378
+msgid "Consumer secret"
+msgstr "Sekreto de Kliento"
+
+#: ../../addon/irc/irc.php:44
+msgid "IRC Settings"
+msgstr "IRC Agordoj"
+
+#: ../../addon/irc/irc.php:46
+msgid "Channel(s) to auto connect (comma separated)"
+msgstr "Aŭtomate konekti�i al la kanalo(j) (disigita per komo)"
+
+#: ../../addon/irc/irc.php:51
+msgid "Popular Channels (comma separated)"
+msgstr "Popularaj kanaloj (disigita per komo)"
+
+#: ../../addon/irc/irc.php:69
+msgid "IRC settings saved."
+msgstr "IRC agordoj konservitaj."
+
+#: ../../addon/irc/irc.php:74
+msgid "IRC Chatroom"
+msgstr "IRC babilejo"
+
+#: ../../addon/irc/irc.php:96
+msgid "Popular Channels"
+msgstr "Popularaj Kanaloj"
+
+#: ../../addon/blogger/blogger.php:42
+msgid "Post to blogger"
+msgstr "Afi�i al blogger"
+
+#: ../../addon/blogger/blogger.php:74
+msgid "Blogger Post Settings"
+msgstr "Agordo pri Blogger Afi�oj"
+
+#: ../../addon/blogger/blogger.php:76
+msgid "Enable Blogger Post Plugin"
+msgstr "Ŝalti la Blogger afi�o kromprogramon"
+
+#: ../../addon/blogger/blogger.php:81
+msgid "Blogger username"
+msgstr "Blogger uzantonomo"
+
+#: ../../addon/blogger/blogger.php:86
+msgid "Blogger password"
+msgstr "Blogger pasvorto"
+
+#: ../../addon/blogger/blogger.php:91
+msgid "Blogger API URL"
+msgstr "Blogger API URL"
+
+#: ../../addon/blogger/blogger.php:96
+msgid "Post to Blogger by default"
+msgstr "Defaŭlte afi�i al Blogger"
+
+#: ../../addon/posterous/posterous.php:36
+msgid "Post to Posterous"
+msgstr "Afi�i al Posterous"
+
+#: ../../addon/posterous/posterous.php:67
+msgid "Posterous Post Settings"
+msgstr "Agordoj pri afi�oj ĉe Posterous"
+
+#: ../../addon/posterous/posterous.php:69
+msgid "Enable Posterous Post Plugin"
+msgstr "Ŝalti la Poserous-afi�o kromprogramon"
+
+#: ../../addon/posterous/posterous.php:74
+msgid "Posterous login"
+msgstr "Posterous salutnomo"
+
+#: ../../addon/posterous/posterous.php:79
+msgid "Posterous password"
+msgstr "Posterous pasvorto"
+
+#: ../../addon/posterous/posterous.php:84
+msgid "Post to Posterous by default"
+msgstr "Defaŭlte afi�i al Posterous"
+
+#: ../../view/theme/diabook-red/theme.php:26
+#: ../../view/theme/diabook-blue/theme.php:26
+#: ../../view/theme/diabook/theme.php:32
+#: ../../view/theme/diabook-aerith/theme.php:27
+msgid "Last users"
+msgstr "Ä´usaj uzantoj"
+
+#: ../../view/theme/diabook-red/theme.php:55
+#: ../../view/theme/diabook-blue/theme.php:55
+#: ../../view/theme/diabook/theme.php:61
+#: ../../view/theme/diabook-aerith/theme.php:56
+msgid "Last likes"
+msgstr "Ĵusaj �atitaj elementoj"
+
+#: ../../view/theme/diabook-red/theme.php:100
+#: ../../view/theme/diabook-blue/theme.php:100
+#: ../../view/theme/diabook/theme.php:106
+#: ../../view/theme/diabook-aerith/theme.php:101
+msgid "Last photos"
+msgstr "Ä´usaj bildoj"
+
+#: ../../view/theme/diabook-red/theme.php:145
+#: ../../view/theme/diabook-blue/theme.php:145
+#: ../../view/theme/diabook/theme.php:151
+#: ../../view/theme/diabook-aerith/theme.php:146
+msgid "Find Friends"
+msgstr "Trovi Amikojn"
+
+#: ../../view/theme/diabook-red/theme.php:146
+#: ../../view/theme/diabook-blue/theme.php:146
+#: ../../view/theme/diabook/theme.php:152
+#: ../../view/theme/diabook-aerith/theme.php:147
+msgid "Local Directory"
+msgstr "Loka Katalogo"
+
+#: ../../view/theme/diabook-red/theme.php:148
+#: ../../view/theme/diabook-blue/theme.php:148
+#: ../../view/theme/diabook/theme.php:154
+#: ../../view/theme/diabook-aerith/theme.php:149
+#: ../../include/contact_widgets.php:35
+msgid "Similar Interests"
+msgstr "Similaj Interesoj"
+
+#: ../../view/theme/diabook-red/theme.php:150
+#: ../../view/theme/diabook-blue/theme.php:150
+#: ../../view/theme/diabook/theme.php:156
+#: ../../view/theme/diabook-aerith/theme.php:151
+#: ../../include/contact_widgets.php:37
+msgid "Invite Friends"
+msgstr "Inviti amikojn"
+
+#: ../../view/theme/diabook-red/theme.php:165
+#: ../../view/theme/diabook-red/theme.php:246
+#: ../../view/theme/diabook-blue/theme.php:165
+#: ../../view/theme/diabook-blue/theme.php:246
+#: ../../view/theme/diabook/theme.php:172
+#: ../../view/theme/diabook/theme.php:256
+#: ../../view/theme/diabook-aerith/theme.php:166
+#: ../../view/theme/diabook-aerith/theme.php:247
+msgid "Community Pages"
+msgstr "Komunumaj pa�oj"
+
+#: ../../view/theme/diabook-red/theme.php:198
+#: ../../view/theme/diabook-blue/theme.php:198
+#: ../../view/theme/diabook/theme.php:205
+#: ../../view/theme/diabook-aerith/theme.php:199
+msgid "Help or @NewHere ?"
+msgstr "Helpu aÅ­ @NewHere ?"
+
+#: ../../view/theme/diabook-red/theme.php:204
+#: ../../view/theme/diabook-blue/theme.php:204
+#: ../../view/theme/diabook/theme.php:211
+#: ../../view/theme/diabook-aerith/theme.php:205
+msgid "Connect Services"
+msgstr "Konekti Servojn"
+
+#: ../../view/theme/diabook-red/theme.php:210
+#: ../../view/theme/diabook-blue/theme.php:210
+#: ../../view/theme/diabook/theme.php:217
+#: ../../view/theme/diabook-aerith/theme.php:211
+msgid "PostIt to Friendica"
+msgstr "PostIt al Friendica"
+
+#: ../../view/theme/diabook-red/theme.php:210
+#: ../../view/theme/diabook-blue/theme.php:210
+#: ../../view/theme/diabook/theme.php:217
+#: ../../view/theme/diabook-aerith/theme.php:211
+msgid "Post to Friendica"
+msgstr "Afi�i al Friendica"
+
+#: ../../view/theme/diabook-red/theme.php:211
+#: ../../view/theme/diabook-blue/theme.php:211
+#: ../../view/theme/diabook/theme.php:218
+#: ../../view/theme/diabook-aerith/theme.php:212
+msgid " from anywhere by bookmarking this Link."
+msgstr " de iu kun ĉi tio ligilo."
+
+#: ../../view/theme/diabook-red/theme.php:239
+#: ../../view/theme/diabook-blue/theme.php:239
+#: ../../view/theme/diabook/theme.php:249
+#: ../../view/theme/diabook-aerith/theme.php:240 ../../include/nav.php:49
+#: ../../include/nav.php:115
+msgid "Your posts and conversations"
+msgstr "Viaj afi�oj kaj komunikadoj"
+
+#: ../../view/theme/diabook-red/theme.php:240
+#: ../../view/theme/diabook-blue/theme.php:240
+#: ../../view/theme/diabook/theme.php:250
+#: ../../view/theme/diabook-aerith/theme.php:241 ../../include/nav.php:50
+msgid "Your profile page"
+msgstr "Via profilo"
+
+#: ../../view/theme/diabook-red/theme.php:241
+#: ../../view/theme/diabook-blue/theme.php:241
+#: ../../view/theme/diabook/theme.php:251
+#: ../../view/theme/diabook-aerith/theme.php:242
+msgid "Your contacts"
+msgstr "Viaj kontaktoj"
+
+#: ../../view/theme/diabook-red/theme.php:242
+#: ../../view/theme/diabook-blue/theme.php:242
+#: ../../view/theme/diabook/theme.php:252
+#: ../../view/theme/diabook-aerith/theme.php:243 ../../include/nav.php:51
+#: ../../boot.php:1463
+msgid "Photos"
+msgstr "Bildoj"
+
+#: ../../view/theme/diabook-red/theme.php:242
+#: ../../view/theme/diabook-blue/theme.php:242
+#: ../../view/theme/diabook/theme.php:252
+#: ../../view/theme/diabook-aerith/theme.php:243 ../../include/nav.php:51
+msgid "Your photos"
+msgstr "Viaj bildoj"
+
+#: ../../view/theme/diabook-red/theme.php:243
+#: ../../view/theme/diabook-blue/theme.php:243
+#: ../../view/theme/diabook/theme.php:253
+#: ../../view/theme/diabook-aerith/theme.php:244 ../../include/nav.php:52
+msgid "Your events"
+msgstr "Viaj okazoj"
+
+#: ../../view/theme/diabook-red/theme.php:244
+#: ../../view/theme/diabook-blue/theme.php:244
+#: ../../view/theme/diabook/theme.php:254
+#: ../../view/theme/diabook-aerith/theme.php:245 ../../include/nav.php:53
+msgid "Personal notes"
+msgstr "Personaj notoj"
+
+#: ../../view/theme/diabook-red/theme.php:244
+#: ../../view/theme/diabook-blue/theme.php:244
+#: ../../view/theme/diabook/theme.php:254
+#: ../../view/theme/diabook-aerith/theme.php:245 ../../include/nav.php:53
+msgid "Your personal photos"
+msgstr "Viaj personaj bildoj"
+
+#: ../../view/theme/diabook-red/config.php:66
+#: ../../view/theme/diabook-blue/config.php:66
+#: ../../view/theme/diabook/config.php:78
+#: ../../view/theme/quattro/config.php:54
+#: ../../view/theme/diabook-aerith/config.php:66
+msgid "Theme settings"
+msgstr "Agordoj pri la etoso"
+
+#: ../../view/theme/diabook-red/config.php:67
+#: ../../view/theme/diabook-blue/config.php:67
+#: ../../view/theme/diabook/config.php:79
+#: ../../view/theme/diabook-aerith/config.php:67
+msgid "Set font-size for posts and comments"
+msgstr "Agordi la tiparan grandon por afi�oj kaj komentoj"
+
+#: ../../view/theme/diabook-red/config.php:68
+#: ../../view/theme/diabook-blue/config.php:68
+#: ../../view/theme/diabook/config.php:80
+#: ../../view/theme/diabook-aerith/config.php:68
+msgid "Set line-height for posts and comments"
+msgstr "Agordi la linigrandon por afi�oj kaj komentoj"
+
+#: ../../view/theme/diabook/config.php:81
+msgid "Set resolution for middle column"
+msgstr "Agordi la distingivon por la meza kolumno"
+
+#: ../../view/theme/quattro/config.php:55
+msgid "Alignment"
+msgstr "Äœisrandigo"
+
+#: ../../view/theme/quattro/config.php:55
+msgid "Left"
+msgstr "Maldekstren"
+
+#: ../../view/theme/quattro/config.php:55
+msgid "Center"
+msgstr "Centren"
+
+#: ../../view/theme/quattro/config.php:56
+msgid "Color scheme"
+msgstr "Kolorskemo"
+
+#: ../../include/profile_advanced.php:17 ../../boot.php:1085
+msgid "Gender:"
+msgstr "Sekso:"
+
+#: ../../include/profile_advanced.php:22
+msgid "j F, Y"
+msgstr "j F, Y"
+
+#: ../../include/profile_advanced.php:23
+msgid "j F"
+msgstr "j F"
+
+#: ../../include/profile_advanced.php:30 ../../include/datetime.php:448
+#: ../../include/items.php:1402
+msgid "Birthday:"
+msgstr "Naski�tago:"
+
+#: ../../include/profile_advanced.php:34
+msgid "Age:"
+msgstr "A�o:"
+
+#: ../../include/profile_advanced.php:37 ../../boot.php:1088
+msgid "Status:"
+msgstr "Stato:"
+
+#: ../../include/profile_advanced.php:45 ../../boot.php:1090
+msgid "Homepage:"
+msgstr "Hejmpa�o:"
+
+#: ../../include/profile_advanced.php:47
+msgid "Tags:"
+msgstr "Markoj:"
+
+#: ../../include/profile_advanced.php:51
+msgid "Religion:"
+msgstr "Religio:"
+
+#: ../../include/profile_advanced.php:53
+msgid "About:"
+msgstr "Pri:"
+
+#: ../../include/profile_advanced.php:55
+msgid "Hobbies/Interests:"
+msgstr "Åœatokupoj/Interesoj:"
+
+#: ../../include/profile_advanced.php:57
+msgid "Contact information and Social Networks:"
+msgstr "Kontaktinformoj kaj Interkonaj Retejoj:"
+
+#: ../../include/profile_advanced.php:59
+msgid "Musical interests:"
+msgstr "Muzaikaj interesoj:"
+
+#: ../../include/profile_advanced.php:61
+msgid "Books, literature:"
+msgstr "Libroj, literaturo:"
+
+#: ../../include/profile_advanced.php:63
+msgid "Television:"
+msgstr "Televido:"
+
+#: ../../include/profile_advanced.php:65
+msgid "Film/dance/culture/entertainment:"
+msgstr "Filmoj/dancoj/arto/amuzaĵoj:"
+
+#: ../../include/profile_advanced.php:67
+msgid "Love/Romance:"
+msgstr "Amo/romanco:"
+
+#: ../../include/profile_advanced.php:69
+msgid "Work/employment:"
+msgstr "Laboro:"
+
+#: ../../include/profile_advanced.php:71
+msgid "School/education:"
+msgstr "Lernejo/eduko:"
+
+#: ../../include/contact_selectors.php:32
+msgid "Unknown | Not categorised"
+msgstr "Nekonata | Nekatorigita"
+
+#: ../../include/contact_selectors.php:33
+msgid "Block immediately"
+msgstr "Bloki tuj"
+
+#: ../../include/contact_selectors.php:34
+msgid "Shady, spammer, self-marketer"
+msgstr "Suspekta, spamisto, memmerkatisto"
+
+#: ../../include/contact_selectors.php:35
+msgid "Known to me, but no opinion"
+msgstr "Konata al mi, sed mi ne havas opinion"
+
+#: ../../include/contact_selectors.php:36
+msgid "OK, probably harmless"
+msgstr "OK, ver�ajne sendan�era"
+
+#: ../../include/contact_selectors.php:37
+msgid "Reputable, has my trust"
+msgstr "Fidinda laÅ­ mi"
+
+#: ../../include/contact_selectors.php:56
+msgid "Frequently"
+msgstr "Ofte"
+
+#: ../../include/contact_selectors.php:57
+msgid "Hourly"
+msgstr "Ĉiuhore"
+
+#: ../../include/contact_selectors.php:58
+msgid "Twice daily"
+msgstr "Duope ĉiutage"
+
+#: ../../include/contact_selectors.php:59
+msgid "Daily"
+msgstr "Ĉiutage"
+
+#: ../../include/contact_selectors.php:60
+msgid "Weekly"
+msgstr "Ĉiusemajne"
+
+#: ../../include/contact_selectors.php:61
+msgid "Monthly"
+msgstr "Ĉiumonate"
+
+#: ../../include/contact_selectors.php:77
+msgid "OStatus"
+msgstr "OStatus"
+
+#: ../../include/contact_selectors.php:78
+msgid "RSS/Atom"
+msgstr "RSS/Atom"
+
+#: ../../include/contact_selectors.php:82
+msgid "Zot!"
+msgstr "Zot!"
+
+#: ../../include/contact_selectors.php:83
+msgid "LinkedIn"
+msgstr "LinkedIn"
+
+#: ../../include/contact_selectors.php:84
+msgid "XMPP/IM"
+msgstr "XMPP/Tujmesa�ilo"
+
+#: ../../include/contact_selectors.php:85
+msgid "MySpace"
+msgstr "MySpace"
+
+#: ../../include/profile_selectors.php:6
+msgid "Male"
+msgstr "Vira"
+
+#: ../../include/profile_selectors.php:6
+msgid "Female"
+msgstr "Ina"
+
+#: ../../include/profile_selectors.php:6
+msgid "Currently Male"
+msgstr "Nuntempe Vira"
+
+#: ../../include/profile_selectors.php:6
+msgid "Currently Female"
+msgstr "Nuntempe Ina"
+
+#: ../../include/profile_selectors.php:6
+msgid "Mostly Male"
+msgstr "Ĉefe Vira"
+
+#: ../../include/profile_selectors.php:6
+msgid "Mostly Female"
+msgstr "Ĉefe Ina"
+
+#: ../../include/profile_selectors.php:6
+msgid "Transgender"
+msgstr "Transgenra"
+
+#: ../../include/profile_selectors.php:6
+msgid "Intersex"
+msgstr "Interseksa"
+
+#: ../../include/profile_selectors.php:6
+msgid "Transsexual"
+msgstr "Transseksa"
+
+#: ../../include/profile_selectors.php:6
+msgid "Hermaphrodite"
+msgstr "Hermafrodita"
+
+#: ../../include/profile_selectors.php:6
+msgid "Neuter"
+msgstr "NeÅ­tra"
+
+#: ../../include/profile_selectors.php:6
+msgid "Non-specific"
+msgstr "Nespecifa"
+
+#: ../../include/profile_selectors.php:6
+msgid "Other"
+msgstr "Alia"
+
+#: ../../include/profile_selectors.php:6
+msgid "Undecided"
+msgstr "Nedecida"
+
+#: ../../include/profile_selectors.php:19
+msgid "Males"
+msgstr "Viroj"
+
+#: ../../include/profile_selectors.php:19
+msgid "Females"
+msgstr "Inoj"
+
+#: ../../include/profile_selectors.php:19
+msgid "Gay"
+msgstr "Geja"
+
+#: ../../include/profile_selectors.php:19
+msgid "Lesbian"
+msgstr "Lesba"
+
+#: ../../include/profile_selectors.php:19
+msgid "No Preference"
+msgstr "Neniu Prefero"
+
+#: ../../include/profile_selectors.php:19
+msgid "Bisexual"
+msgstr "AmbaÅ­seksema"
+
+#: ../../include/profile_selectors.php:19
+msgid "Autosexual"
+msgstr "Memseksema"
+
+#: ../../include/profile_selectors.php:19
+msgid "Abstinent"
+msgstr "Abstinema"
+
+#: ../../include/profile_selectors.php:19
+msgid "Virgin"
+msgstr "Virgulino"
+
+#: ../../include/profile_selectors.php:19
+msgid "Deviant"
+msgstr "Devia"
+
+#: ../../include/profile_selectors.php:19
+msgid "Fetish"
+msgstr "Fetiĉo"
+
+#: ../../include/profile_selectors.php:19
+msgid "Oodles"
+msgstr "Amasa"
+
+#: ../../include/profile_selectors.php:19
+msgid "Nonsexual"
+msgstr "Neseksa"
+
+#: ../../include/profile_selectors.php:33
+msgid "Single"
+msgstr "Sola"
+
+#: ../../include/profile_selectors.php:33
+msgid "Lonely"
+msgstr "Soleca"
+
+#: ../../include/profile_selectors.php:33
+msgid "Available"
+msgstr "Havebla"
+
+#: ../../include/profile_selectors.php:33
+msgid "Unavailable"
+msgstr "Nehavebla"
+
+#: ../../include/profile_selectors.php:33
+msgid "Has crush"
+msgstr "Sekrete enami�inta"
+
+#: ../../include/profile_selectors.php:33
+msgid "Infatuated"
+msgstr "Blinda amo"
+
+#: ../../include/profile_selectors.php:33
+msgid "Dating"
+msgstr "Rendevuanta"
+
+#: ../../include/profile_selectors.php:33
+msgid "Unfaithful"
+msgstr "Malfidela"
+
+#: ../../include/profile_selectors.php:33
+msgid "Sex Addict"
+msgstr "Seksmaniulo"
+
+#: ../../include/profile_selectors.php:33
+msgid "Friends"
+msgstr "Amikoj"
+
+#: ../../include/profile_selectors.php:33
+msgid "Friends/Benefits"
+msgstr "Amikoj/Avanta�oj"
+
+#: ../../include/profile_selectors.php:33
+msgid "Casual"
+msgstr "Neformala"
+
+#: ../../include/profile_selectors.php:33
+msgid "Engaged"
+msgstr "Fianĉiginta"
+
+#: ../../include/profile_selectors.php:33
+msgid "Married"
+msgstr "Edzi�inta"
+
+#: ../../include/profile_selectors.php:33
+msgid "Imaginarily married"
+msgstr "Image edzi�inta"
+
+#: ../../include/profile_selectors.php:33
+msgid "Partners"
+msgstr "Geparuloj"
+
+#: ../../include/profile_selectors.php:33
+msgid "Cohabiting"
+msgstr "Kunlo�anta"
+
+#: ../../include/profile_selectors.php:33
+msgid "Common law"
+msgstr "Registrita partnereco "
+
+#: ../../include/profile_selectors.php:33
+msgid "Happy"
+msgstr "Feliĉa"
+
+#: ../../include/profile_selectors.php:33
+msgid "Not looking"
+msgstr "Ne interesi�is"
+
+#: ../../include/profile_selectors.php:33
+msgid "Swinger"
+msgstr "Swinger"
+
+#: ../../include/profile_selectors.php:33
+msgid "Betrayed"
+msgstr "Trompita"
+
+#: ../../include/profile_selectors.php:33
+msgid "Separated"
+msgstr "Disi�inta"
+
+#: ../../include/profile_selectors.php:33
+msgid "Unstable"
+msgstr "Malfirma"
+
+#: ../../include/profile_selectors.php:33
+msgid "Divorced"
+msgstr "Eksedzi�inta"
+
+#: ../../include/profile_selectors.php:33
+msgid "Imaginarily divorced"
+msgstr "Image eksedzi�inta"
+
+#: ../../include/profile_selectors.php:33
+msgid "Widowed"
+msgstr "Vidva"
+
+#: ../../include/profile_selectors.php:33
+msgid "Uncertain"
+msgstr "Ne certa"
+
+#: ../../include/profile_selectors.php:33
+msgid "It's complicated"
+msgstr "Estas komplika"
+
+#: ../../include/profile_selectors.php:33
+msgid "Don't care"
+msgstr "Egala"
+
+#: ../../include/profile_selectors.php:33
+msgid "Ask me"
+msgstr "Demandu min"
+
+#: ../../include/event.php:17 ../../include/bb2diaspora.php:244
+msgid "Starts:"
+msgstr "Ekas:"
+
+#: ../../include/event.php:27 ../../include/bb2diaspora.php:252
+msgid "Finishes:"
+msgstr "Finas:"
+
+#: ../../include/delivery.php:434 ../../include/notifier.php:651
+msgid "(no subject)"
+msgstr "(neniu temo)"
+
+#: ../../include/delivery.php:441 ../../include/enotify.php:23
+#: ../../include/notifier.php:658
+msgid "noreply"
+msgstr "nerespondi"
+
+#: ../../include/text.php:243
+msgid "prev"
+msgstr "antaÅ­a"
+
+#: ../../include/text.php:245
+msgid "first"
+msgstr "unua"
+
+#: ../../include/text.php:274
+msgid "last"
+msgstr "lasta"
+
+#: ../../include/text.php:277
+msgid "next"
+msgstr "sekvanta"
+
+#: ../../include/text.php:568
+msgid "No contacts"
+msgstr "Neniu kontaktoj"
+
+#: ../../include/text.php:577
+#, php-format
+msgid "%d Contact"
+msgid_plural "%d Contacts"
+msgstr[0] "%d Kontakto"
+msgstr[1] "%d Kontaktoj"
+
+#: ../../include/text.php:650 ../../include/nav.php:91
+msgid "Search"
+msgstr "Serĉi"
+
+#: ../../include/text.php:831
+msgid "Monday"
+msgstr "Lundo"
+
+#: ../../include/text.php:831
+msgid "Tuesday"
+msgstr "Mardo"
+
+#: ../../include/text.php:831
+msgid "Wednesday"
+msgstr "Merkredo"
+
+#: ../../include/text.php:831
+msgid "Thursday"
+msgstr "Ä´aÅ­do"
+
+#: ../../include/text.php:831
+msgid "Friday"
+msgstr "Vendredo"
+
+#: ../../include/text.php:831
+msgid "Saturday"
+msgstr "Sabato"
+
+#: ../../include/text.php:831
+msgid "Sunday"
+msgstr "Dimanĉo"
+
+#: ../../include/text.php:835
+msgid "January"
+msgstr "Januaro"
+
+#: ../../include/text.php:835
+msgid "February"
+msgstr "Februaro"
+
+#: ../../include/text.php:835
+msgid "March"
+msgstr "Marto"
+
+#: ../../include/text.php:835
+msgid "April"
+msgstr "Aprilo"
+
+#: ../../include/text.php:835
+msgid "May"
+msgstr "Majo"
+
+#: ../../include/text.php:835
+msgid "June"
+msgstr "Junio"
+
+#: ../../include/text.php:835
+msgid "July"
+msgstr "Julio"
+
+#: ../../include/text.php:835
+msgid "August"
+msgstr "AÅ­gusto"
+
+#: ../../include/text.php:835
+msgid "September"
+msgstr "Septembro"
+
+#: ../../include/text.php:835
+msgid "October"
+msgstr "Oktobro"
+
+#: ../../include/text.php:835
+msgid "November"
+msgstr "Novembro"
+
+#: ../../include/text.php:835
+msgid "December"
+msgstr "Decembro"
+
+#: ../../include/text.php:919
+msgid "bytes"
+msgstr "bajtoj"
+
+#: ../../include/text.php:936
+msgid "Categories:"
+msgstr "Kategorioj:"
+
+#: ../../include/text.php:948
+msgid "remove"
+msgstr "forvi�i"
+
+#: ../../include/text.php:948
+msgid "[remove]"
+msgstr "[forvi�i]"
+
+#: ../../include/text.php:951
+msgid "Filed under:"
+msgstr "Enarkivigita kiel:"
+
+#: ../../include/text.php:967 ../../include/text.php:979
+msgid "Click to open/close"
+msgstr "Klaku por malfermi/fermi"
+
+#: ../../include/text.php:1084
+msgid "default"
+msgstr "defaÅ­lta"
+
+#: ../../include/text.php:1096
+msgid "Select an alternate language"
+msgstr "Elekti alian lingvon"
+
+#: ../../include/text.php:1306
+msgid "activity"
+msgstr "aktiveco"
+
+#: ../../include/text.php:1308
+msgid "comment"
+msgstr "komento"
+
+#: ../../include/text.php:1309
+msgid "post"
+msgstr "afi�o"
+
+#: ../../include/text.php:1464
+msgid "Item filed"
+msgstr "Enarkivigis elementon "
+
+#: ../../include/diaspora.php:582
+msgid "Sharing notification from Diaspora network"
+msgstr "Antentigo pri kunhavigado de la Diaspora reto"
+
+#: ../../include/diaspora.php:1969
+msgid "Attachments:"
+msgstr "Kunsendaĵoj:"
+
+#: ../../include/diaspora.php:2152
+#, php-format
+msgid "[Relayed] Comment authored by %s from network %s"
+msgstr "[Plusendita] %s en la reto %s skribis komenton"
+
+#: ../../include/network.php:823
+msgid "view full size"
+msgstr "vidi plengrande"
+
+#: ../../include/oembed.php:132
+msgid "Embedded content"
+msgstr "Enigita enhavo"
+
+#: ../../include/oembed.php:141
+msgid "Embedding disabled"
+msgstr "Mal�altita enigitado"
+
+#: ../../include/group.php:25
+msgid ""
+"A deleted group with this name was revived. Existing item permissions "
+"<strong>may</strong> apply to this group and any future members. If this is "
+"not what you intended, please create another group with a different name."
+msgstr "Revivigis malnovan grupon kun la sama nomo. Permesoj por estantaj elementoj <strong>eble</strong> estas validaj por la grupo kaj estontaj membroj. Se tiu ne estas kiun vi atendis, bonvolu krei alian grupon kun alia nomo."
+
+#: ../../include/group.php:168
+msgid "Everybody"
+msgstr "Ĉiuj"
+
+#: ../../include/group.php:191
+msgid "edit"
+msgstr "redakti"
+
+#: ../../include/group.php:212
+msgid "Groups"
+msgstr "Grupoj"
+
+#: ../../include/group.php:213
+msgid "Edit group"
+msgstr "Redakti grupon"
+
+#: ../../include/group.php:214
+msgid "Create a new group"
+msgstr "Krei novan grupon"
+
+#: ../../include/group.php:215
+msgid "Contacts not in any group"
+msgstr "Kontaktoj en neniu grupo"
+
+#: ../../include/nav.php:46 ../../boot.php:795
+msgid "Logout"
+msgstr "Elsaluti"
+
+#: ../../include/nav.php:46
+msgid "End this session"
+msgstr "Fini ĉi-tiun seancon"
+
+#: ../../include/nav.php:49 ../../boot.php:1453
+msgid "Status"
+msgstr "Stato"
+
+#: ../../include/nav.php:64
+msgid "Sign in"
+msgstr "Ensaluti"
+
+#: ../../include/nav.php:77
+msgid "Home Page"
+msgstr "Hejmpa�o"
+
+#: ../../include/nav.php:81
+msgid "Create an account"
+msgstr "Krei konton"
+
+#: ../../include/nav.php:86
+msgid "Help and documentation"
+msgstr "Helpo kaj dokumentado"
+
+#: ../../include/nav.php:89
+msgid "Apps"
+msgstr "Programoj"
+
+#: ../../include/nav.php:89
+msgid "Addon applications, utilities, games"
+msgstr "Kromprogramoj, utilaĵoj, ludiloj"
+
+#: ../../include/nav.php:91
+msgid "Search site content"
+msgstr "Serĉu la retejon"
+
+#: ../../include/nav.php:101
+msgid "Conversations on this site"
+msgstr "Konversacioj je ĉi-tiu retejo"
+
+#: ../../include/nav.php:103
+msgid "Directory"
+msgstr "Katalogo"
+
+#: ../../include/nav.php:103
+msgid "People directory"
+msgstr "Katalogo de homoj"
+
+#: ../../include/nav.php:113
+msgid "Conversations from your friends"
+msgstr "Konversacioj de viaj amikoj"
+
+#: ../../include/nav.php:121
+msgid "Friend Requests"
+msgstr "Kontaktpetoj"
+
+#: ../../include/nav.php:123
+msgid "See all notifications"
+msgstr "Vidu ĉiujn atentigojn"
+
+#: ../../include/nav.php:124
+msgid "Mark all system notifications seen"
+msgstr "Marki ĉiujn atentigojn legita"
+
+#: ../../include/nav.php:128
+msgid "Private mail"
+msgstr "Privata po�to"
+
+#: ../../include/nav.php:129
+msgid "Inbox"
+msgstr "Enirkesto"
+
+#: ../../include/nav.php:130
+msgid "Outbox"
+msgstr "Elirkesto"
+
+#: ../../include/nav.php:134
+msgid "Manage"
+msgstr "Administri"
+
+#: ../../include/nav.php:134
+msgid "Manage other pages"
+msgstr "Administri aliajn pa�ojn"
+
+#: ../../include/nav.php:138 ../../boot.php:1043
+msgid "Profiles"
+msgstr "Profiloj:"
+
+#: ../../include/nav.php:138 ../../boot.php:1043
+msgid "Manage/edit profiles"
+msgstr "Administri/redakti profilojn"
+
+#: ../../include/nav.php:139
+msgid "Manage/edit friends and contacts"
+msgstr "Administri/redakti amikojn kaj kontaktojn"
+
+#: ../../include/nav.php:146
+msgid "Admin"
+msgstr "Administrado"
+
+#: ../../include/nav.php:146
+msgid "Site setup and configuration"
+msgstr "Agordoj pri la retejo"
+
+#: ../../include/nav.php:169
+msgid "Nothing new here"
+msgstr "Estas neniu nova ĉi tie"
+
+#: ../../include/contact_widgets.php:6
+msgid "Add New Contact"
+msgstr "Aldonu Novan Kontakton"
+
+#: ../../include/contact_widgets.php:7
+msgid "Enter address or web location"
+msgstr "Entajpu adreson aÅ­ retlokon"
+
+#: ../../include/contact_widgets.php:8
+msgid "Example: bob@example.com, http://example.com/barbara"
+msgstr "Ekzemple: bob@example.com, http://example.com/barbara"
+
+#: ../../include/contact_widgets.php:23
+#, php-format
+msgid "%d invitation available"
+msgid_plural "%d invitations available"
+msgstr[0] "Disponeblas %d invito"
+msgstr[1] "Disponeblas %d invitoj"
+
+#: ../../include/contact_widgets.php:29
+msgid "Find People"
+msgstr "Trovi Homojn"
+
+#: ../../include/contact_widgets.php:30
+msgid "Enter name or interest"
+msgstr "Entajpu nomon aÅ­ intereson"
+
+#: ../../include/contact_widgets.php:31
+msgid "Connect/Follow"
+msgstr "Konekti/Aboni"
+
+#: ../../include/contact_widgets.php:32
+msgid "Examples: Robert Morgenstein, Fishing"
+msgstr "Ekzemple: Robert Morgenstein, Fishing"
+
+#: ../../include/contact_widgets.php:36
+msgid "Random Profile"
+msgstr "Hazarda Profilo"
+
+#: ../../include/contact_widgets.php:68
+msgid "Networks"
+msgstr "Retoj"
+
+#: ../../include/contact_widgets.php:71
+msgid "All Networks"
+msgstr "Ĉiuj Retoj"
+
+#: ../../include/contact_widgets.php:98
+msgid "Saved Folders"
+msgstr "Konservitaj Dosierujoj"
+
+#: ../../include/contact_widgets.php:101 ../../include/contact_widgets.php:129
+msgid "Everything"
+msgstr "Ĉio"
+
+#: ../../include/contact_widgets.php:126
+msgid "Categories"
+msgstr "Kategorioj"
+
+#: ../../include/auth.php:29
+msgid "Logged out."
+msgstr "Elsalutita."
+
+#: ../../include/auth.php:106
+msgid ""
+"We encountered a problem while logging in with the OpenID you provided. "
+"Please check the correct spelling of the ID."
+msgstr "Okazis problemo ensalutinta kun via OpenID. Bonvolu kontroli la ID."
+
+#: ../../include/auth.php:106
+msgid "The error message was:"
+msgstr "La erarmesa�o estis:"
+
+#: ../../include/datetime.php:43 ../../include/datetime.php:45
+msgid "Miscellaneous"
+msgstr "Diversaj"
+
+#: ../../include/datetime.php:131 ../../include/datetime.php:263
+msgid "year"
+msgstr "jaro"
+
+#: ../../include/datetime.php:136 ../../include/datetime.php:264
+msgid "month"
+msgstr "monato"
+
+#: ../../include/datetime.php:141 ../../include/datetime.php:266
+msgid "day"
+msgstr "tago"
+
+#: ../../include/datetime.php:254
+msgid "never"
+msgstr "neniam"
+
+#: ../../include/datetime.php:260
+msgid "less than a second ago"
+msgstr "antaÅ­ malpli ol unu sekundo"
+
+#: ../../include/datetime.php:263
+msgid "years"
+msgstr "jaroj"
+
+#: ../../include/datetime.php:264
+msgid "months"
+msgstr "monatoj"
+
+#: ../../include/datetime.php:265
+msgid "week"
+msgstr "semajno"
+
+#: ../../include/datetime.php:265
+msgid "weeks"
+msgstr "semajnoj"
+
+#: ../../include/datetime.php:266
+msgid "days"
+msgstr "tagoj"
+
+#: ../../include/datetime.php:267
+msgid "hour"
+msgstr "horo"
+
+#: ../../include/datetime.php:267
+msgid "hours"
+msgstr "horoj"
+
+#: ../../include/datetime.php:268
+msgid "minute"
+msgstr "minuto"
+
+#: ../../include/datetime.php:268
+msgid "minutes"
+msgstr "minutoj"
+
+#: ../../include/datetime.php:269
+msgid "second"
+msgstr "sekundo"
+
+#: ../../include/datetime.php:269
+msgid "seconds"
+msgstr "sekundoj"
+
+#: ../../include/datetime.php:277
+#, php-format
+msgid "%1$d %2$s ago"
+msgstr "antaÅ­ %1$d %2$s"
+
+#: ../../include/poller.php:543
+msgid "From: "
+msgstr "De: "
+
+#: ../../include/bbcode.php:203 ../../include/bbcode.php:223
+msgid "$1 wrote:"
+msgstr "$1 skribis:"
+
+#: ../../include/bbcode.php:238 ../../include/bbcode.php:304
+msgid "Image/photo"
+msgstr "Bildo"
+
+#: ../../include/dba.php:41
+#, php-format
+msgid "Cannot locate DNS info for database server '%s'"
+msgstr "Ne trovis DNS informojn por datumbaza servilo '%s'."
+
+#: ../../include/message.php:15 ../../include/message.php:171
+msgid "[no subject]"
+msgstr "[neniu temo]"
+
+#: ../../include/acl_selectors.php:286
+msgid "Visible to everybody"
+msgstr "Videbla al ĉiuj"
+
+#: ../../include/acl_selectors.php:287
+msgid "show"
+msgstr "montru"
+
+#: ../../include/acl_selectors.php:288
+msgid "don't show"
+msgstr "ne montru"
+
+#: ../../include/enotify.php:14
+msgid "Friendica Notification"
+msgstr "Friendica Atentigo"
+
+#: ../../include/enotify.php:17
+msgid "Thank You,"
+msgstr "Dankon,"
+
+#: ../../include/enotify.php:19
+#, php-format
+msgid "%s Administrator"
+msgstr "%s Administranto"
+
+#: ../../include/enotify.php:35
+#, php-format
+msgid "%s <!item_type!>"
+msgstr "%s <!item_type!>"
+
+#: ../../include/enotify.php:39
+#, php-format
+msgid "[Friendica:Notify] New mail received at %s"
+msgstr "[Friendica:Atentigo] Ricevis novan retpo�ton ĉe %s"
+
+#: ../../include/enotify.php:41
+#, php-format
+msgid "%s sent you a new private message at %s."
+msgstr "%s sendis novan mesa�on al vi ĉe %s."
+
+#: ../../include/enotify.php:42
+#, php-format
+msgid "%s sent you %s."
+msgstr "%s sendis al vi %s."
+
+#: ../../include/enotify.php:42
+msgid "a private message"
+msgstr "privatan mesa�on"
+
+#: ../../include/enotify.php:43
+#, php-format
+msgid "Please visit %s to view and/or reply to your private messages."
+msgstr "Bonvolu viziti %s por vidi aŭ respondi viajn privatajn mesa�ojn."
+
+#: ../../include/enotify.php:73
+#, php-format
+msgid "%s's"
+msgstr "de %s verkita"
+
+#: ../../include/enotify.php:77
+msgid "your"
+msgstr "via"
+
+#: ../../include/enotify.php:84
+#, php-format
+msgid "[Friendica:Notify] Comment to conversation #%d by %s"
+msgstr "[Friendica:Atentigo] Komento pri konversacio #%d de %s"
+
+#: ../../include/enotify.php:85
+#, php-format
+msgid "%s commented on an item/conversation you have been following."
+msgstr "%s komentis pri elemento/konversacio kiun vi sekvas."
+
+#: ../../include/enotify.php:86
+#, php-format
+msgid "%s commented on %s."
+msgstr "%s komentis pri %s."
+
+#: ../../include/enotify.php:88 ../../include/enotify.php:101
+#: ../../include/enotify.php:112 ../../include/enotify.php:123
+#, php-format
+msgid "Please visit %s to view and/or reply to the conversation."
+msgstr "Bonvolu viziti %s por vidi aÅ­ respondi la konversacion."
+
+#: ../../include/enotify.php:95
+#, php-format
+msgid "[Friendica:Notify] %s posted to your profile wall"
+msgstr "[Friendica:Atentigo] %s afi�is al via profilmuro"
+
+#: ../../include/enotify.php:97
+#, php-format
+msgid "%s posted to your profile wall at %s"
+msgstr "%s skribis al via profila muro ĉe %s"
+
+#: ../../include/enotify.php:99
+#, php-format
+msgid "%s posted to %s"
+msgstr "%s afi�is al %s"
+
+#: ../../include/enotify.php:99
+msgid "your profile wall."
+msgstr "via profilmuro."
+
+#: ../../include/enotify.php:108
+#, php-format
+msgid "[Friendica:Notify] %s tagged you"
+msgstr "[Friendica:Atentigo] %s markis vin"
+
+#: ../../include/enotify.php:109
+#, php-format
+msgid "%s tagged you at %s"
+msgstr "%s markis vin kiel %s"
+
+#: ../../include/enotify.php:110
+#, php-format
+msgid "%s %s."
+msgstr "%s %s."
+
+#: ../../include/enotify.php:110
+msgid "tagged you"
+msgstr "markis vin"
+
+#: ../../include/enotify.php:119
+#, php-format
+msgid "[Friendica:Notify] %s tagged your post"
+msgstr "[Friendica:Atentigo] %s markis vian afi�on"
+
+#: ../../include/enotify.php:120
+#, php-format
+msgid "%s tagged your post at %s"
+msgstr "%s markis vian afi�on kiel %s"
+
+#: ../../include/enotify.php:121
+#, php-format
+msgid "%s tagged %s"
+msgstr "%s markis %s"
+
+#: ../../include/enotify.php:121
+msgid "your post"
+msgstr "vian afi�on"
+
+#: ../../include/enotify.php:130
+msgid "[Friendica:Notify] Introduction received"
+msgstr "[Friendica:Atentigo] Ricevis prezenton"
+
+#: ../../include/enotify.php:131
+#, php-format
+msgid "You've received an introduction from '%s' at %s"
+msgstr "Vi ricevis prezento de '%s' ĉe %s"
+
+#: ../../include/enotify.php:132
+#, php-format
+msgid "You've received %s from %s."
+msgstr "Vi ricevis %s de %s."
+
+#: ../../include/enotify.php:132
+msgid "an introduction"
+msgstr "prezenton"
+
+#: ../../include/enotify.php:133 ../../include/enotify.php:150
+#, php-format
+msgid "You may visit their profile at %s"
+msgstr "Vi povas vidi la profilon de li aŭ �i ĉe %s"
+
+#: ../../include/enotify.php:135
+#, php-format
+msgid "Please visit %s to approve or reject the introduction."
+msgstr "Bonvolu viziti %s por aprobi aÅ­ malaprobi la prezenton."
+
+#: ../../include/enotify.php:142
+msgid "[Friendica:Notify] Friend suggestion received"
+msgstr "[Friendica:Atentigo] Ricevis amikosugeston"
+
+#: ../../include/enotify.php:143
+#, php-format
+msgid "You've received a friend suggestion from '%s' at %s"
+msgstr "'%s' ĉe %s rekomendis amikon al vi"
+
+#: ../../include/enotify.php:144
+#, php-format
+msgid "You've received %s for %s from %s."
+msgstr "Vi ricevis %s kun %s de %s."
+
+#: ../../include/enotify.php:145
+msgid "a friend suggestion"
+msgstr "sugeston por amiki�i"
+
+#: ../../include/enotify.php:148
+msgid "Name:"
+msgstr "Nomo:"
+
+#: ../../include/enotify.php:149
+msgid "Photo:"
+msgstr "Bildo:"
+
+#: ../../include/enotify.php:152
+#, php-format
+msgid "Please visit %s to approve or reject the suggestion."
+msgstr "Bonvolu viziti %s por aprobi aÅ­ malaprobi la sugeston."
+
+#: ../../include/items.php:2697
+msgid "A new person is sharing with you at "
+msgstr "Nova persono kunhavigas kun vi ĉe "
+
+#: ../../include/items.php:2697
+msgid "You have a new follower at "
+msgstr "Vi havas novan sekvanton ĉe "
+
+#: ../../include/bb2diaspora.php:102 ../../include/bb2diaspora.php:112
+#: ../../include/bb2diaspora.php:113
+msgid "image/photo"
+msgstr "bildo"
+
+#: ../../include/bb2diaspora.php:102
+msgid "link"
+msgstr "ligilo"
+
+#: ../../include/security.php:21
+msgid "Welcome "
+msgstr "Bonvenon "
+
+#: ../../include/security.php:22
+msgid "Please upload a profile photo."
+msgstr "Bonvolu al�uti profilbildon."
+
+#: ../../include/security.php:25
+msgid "Welcome back "
+msgstr "Bonvenon "
+
+#: ../../include/security.php:329
+msgid ""
+"The form security token was not correct. This probably happened because the "
+"form has been opened for too long (>3 hours) before submitting it."
+msgstr "La sekuriga ĵetono de la formo estis mal�usta. Tio ver�ajne okazis ĉar la formo estis malfermita dum tro longa tempo (>3 horoj) antaŭ la sendado."
+
+#: ../../include/Contact.php:145 ../../include/conversation.php:809
+msgid "View Status"
+msgstr "Vidi Staton"
+
+#: ../../include/Contact.php:146 ../../include/conversation.php:810
+msgid "View Profile"
+msgstr "Vidi Profilon"
+
+#: ../../include/Contact.php:147 ../../include/conversation.php:811
+msgid "View Photos"
+msgstr "Vidi Bildojn"
+
+#: ../../include/Contact.php:148 ../../include/Contact.php:161
+#: ../../include/conversation.php:812
+msgid "Network Posts"
+msgstr "Enretaj Afi�oj"
+
+#: ../../include/Contact.php:149 ../../include/Contact.php:161
+#: ../../include/conversation.php:813
+msgid "Edit Contact"
+msgstr "Redakti Kontakton"
+
+#: ../../include/Contact.php:150 ../../include/Contact.php:161
+#: ../../include/conversation.php:814
+msgid "Send PM"
+msgstr "Sendi PM"
+
+#: ../../include/conversation.php:163
+msgid "post/item"
+msgstr "afi�o/elemento"
+
+#: ../../include/conversation.php:164
+#, php-format
+msgid "%1$s marked %2$s's %3$s as favorite"
+msgstr "%1$s markis la %3$s de %2$s kiel preferita."
+
+#: ../../include/conversation.php:317 ../../include/conversation.php:575
+msgid "Select"
+msgstr "Elekti"
+
+#: ../../include/conversation.php:334 ../../include/conversation.php:668
+#: ../../include/conversation.php:669
+#, php-format
+msgid "View %s's profile @ %s"
+msgstr "Vidi la profilon de %s ĉe %s"
+
+#: ../../include/conversation.php:344 ../../include/conversation.php:680
+#, php-format
+msgid "%s from %s"
+msgstr "%s de %s"
+
+#: ../../include/conversation.php:360
+msgid "View in context"
+msgstr "Vidi kun kunteksto"
+
+#: ../../include/conversation.php:465
+#, php-format
+msgid "%d comment"
+msgid_plural "%d comments"
+msgstr[0] "%d komento"
+msgstr[1] "%d komentoj"
+
+#: ../../include/conversation.php:529
+msgid "like"
+msgstr "�ati"
+
+#: ../../include/conversation.php:530
+msgid "dislike"
+msgstr "mal�ati"
+
+#: ../../include/conversation.php:532
+msgid "Share this"
+msgstr "Kunhavigi ĉi tiun"
+
+#: ../../include/conversation.php:532
+msgid "share"
+msgstr "kunhavigi"
+
+#: ../../include/conversation.php:588
+msgid "add star"
+msgstr "aldoni stelon"
+
+#: ../../include/conversation.php:589
+msgid "remove star"
+msgstr "forpreni stelon"
+
+#: ../../include/conversation.php:590
+msgid "toggle star status"
+msgstr "�alti/mal�alti stelo�tato"
+
+#: ../../include/conversation.php:593
+msgid "starred"
+msgstr "steligita"
+
+#: ../../include/conversation.php:594
+msgid "add tag"
+msgstr "aldoni markon"
+
+#: ../../include/conversation.php:598
+msgid "save to folder"
+msgstr "konservi en dosierujo"
+
+#: ../../include/conversation.php:670
+msgid "to"
+msgstr "al"
+
+#: ../../include/conversation.php:671
+msgid "Wall-to-Wall"
+msgstr "Muro-al-Muro"
+
+#: ../../include/conversation.php:672
+msgid "via Wall-To-Wall:"
+msgstr "tra Muro-al-Muro:"
+
+#: ../../include/conversation.php:717
+msgid "Delete Selected Items"
+msgstr "Forvi�i Elektitajn Elementojn"
+
+#: ../../include/conversation.php:868
+#, php-format
+msgid "%s likes this."
+msgstr "%s �atas tiun."
+
+#: ../../include/conversation.php:868
+#, php-format
+msgid "%s doesn't like this."
+msgstr "%s mal�atas tiun."
+
+#: ../../include/conversation.php:872
+#, php-format
+msgid "<span  %1$s>%2$d people</span> like this."
+msgstr "<span %1$s>%2$d homoj</span> �atas tiun."
+
+#: ../../include/conversation.php:874
+#, php-format
+msgid "<span  %1$s>%2$d people</span> don't like this."
+msgstr "<span %1$s>%2$d homoj</span>mal�atas tiun."
+
+#: ../../include/conversation.php:880
+msgid "and"
+msgstr "kaj"
+
+#: ../../include/conversation.php:883
+#, php-format
+msgid ", and %d other people"
+msgstr ", kaj %d aliaj homoj."
+
+#: ../../include/conversation.php:884
+#, php-format
+msgid "%s like this."
+msgstr "%s �atas tiun."
+
+#: ../../include/conversation.php:884
+#, php-format
+msgid "%s don't like this."
+msgstr "%s mal�atas tiun."
+
+#: ../../include/conversation.php:909
+msgid "Visible to <strong>everybody</strong>"
+msgstr "Videbla al <strong>ĉiuj</strong>"
+
+#: ../../include/conversation.php:911
+msgid "Please enter a video link/URL:"
+msgstr "Bonvolu entajpi ligilon/adreson de video:"
+
+#: ../../include/conversation.php:912
+msgid "Please enter an audio link/URL:"
+msgstr "Bonvolu entajpi ligilon/adreson de sono:"
+
+#: ../../include/conversation.php:913
+msgid "Tag term:"
+msgstr "Markfrazo:"
+
+#: ../../include/conversation.php:915
+msgid "Where are you right now?"
+msgstr "Kie vi estas nun?"
+
+#: ../../include/conversation.php:958
+msgid "upload photo"
+msgstr "al�uti bildon"
+
+#: ../../include/conversation.php:960
+msgid "attach file"
+msgstr "kunsendi dosieron"
+
+#: ../../include/conversation.php:962
+msgid "web link"
+msgstr "TTT ligilo"
+
+#: ../../include/conversation.php:963
+msgid "Insert video link"
+msgstr "Alglui ligilon de video"
+
+#: ../../include/conversation.php:964
+msgid "video link"
+msgstr "video ligilo"
+
+#: ../../include/conversation.php:965
+msgid "Insert audio link"
+msgstr "Alglui ligilon de sono"
+
+#: ../../include/conversation.php:966
+msgid "audio link"
+msgstr "sono ligilo"
+
+#: ../../include/conversation.php:968
+msgid "set location"
+msgstr "agordi lokon"
+
+#: ../../include/conversation.php:970
+msgid "clear location"
+msgstr "forvi�i lokon"
+
+#: ../../include/conversation.php:977
+msgid "permissions"
+msgstr "permesoj"
+
+#: ../../boot.php:494
+msgid "Delete this item?"
+msgstr "Forvi�i ĉi tiun elementon?"
+
+#: ../../boot.php:497
+msgid "show fewer"
+msgstr "montri malpli"
+
+#: ../../boot.php:774
+msgid "Create a New Account"
+msgstr "Krei Novan Konton"
+
+#: ../../boot.php:798
+msgid "Nickname or Email address: "
+msgstr "Ka�nomo aŭ retpo�tadreso:"
+
+#: ../../boot.php:799
+msgid "Password: "
+msgstr "Pasvorto:"
+
+#: ../../boot.php:802
+msgid "Or login using OpenID: "
+msgstr "AÅ­ ensaluti per OpenID:"
+
+#: ../../boot.php:808
+msgid "Forgot your password?"
+msgstr "Ĉu vi vorgesis vian pasvorton?"
+
+#: ../../boot.php:975
+msgid "Edit profile"
+msgstr "Redakti profilon"
+
+#: ../../boot.php:1035
+msgid "Message"
+msgstr "Mesa�o"
+
+#: ../../boot.php:1151 ../../boot.php:1223
+msgid "g A l F d"
+msgstr "\\j\\e \\l\\a G\\a \\h\\o\\r\\o, l F d"
+
+#: ../../boot.php:1152 ../../boot.php:1224
+msgid "F d"
+msgstr "F d"
+
+#: ../../boot.php:1177
+msgid "Birthday Reminders"
+msgstr "Memorigilo pri naski�tagoj"
+
+#: ../../boot.php:1178
+msgid "Birthdays this week:"
+msgstr "Naski�tagoj ĉi-semajne:"
+
+#: ../../boot.php:1201 ../../boot.php:1266
+msgid "[today]"
+msgstr "[hodiaÅ­]"
+
+#: ../../boot.php:1247
+msgid "Event Reminders"
+msgstr "Memorigiloj pri Okazoj"
+
+#: ../../boot.php:1248
+msgid "Events this week:"
+msgstr "Okazoj ĉi-semajne:"
+
+#: ../../boot.php:1260
+msgid "[No description]"
+msgstr "[Neniu priskribo]"
diff --git a/view/eo/strings.php b/view/eo/strings.php
new file mode 100644
index 000000000..33c856ed0
--- /dev/null
+++ b/view/eo/strings.php
@@ -0,0 +1,1578 @@
+<?php
+
+function string_plural_select_eo($n){
+	return ($n != 1);
+}
+;
+$a->strings["Post successful."] = "Sukcese afi�ita.";
+$a->strings["[Embedded content - reload page to view]"] = "[Enigita enhavo - re�argu pa�on por spekti �in]";
+$a->strings["Contact settings applied."] = "Kontaktagordoj estas konservita.";
+$a->strings["Contact update failed."] = "Äœisdatigo de kontakto malsukcesis.";
+$a->strings["Permission denied."] = "Malpermesita.";
+$a->strings["Contact not found."] = "Kontakto ne trovita.";
+$a->strings["Repair Contact Settings"] = "Ripari kontaktagordoj.";
+$a->strings["<strong>WARNING: This is highly advanced</strong> and if you enter incorrect information your communications with this contact may stop working."] = "<strong>AVERTO: Tio estas tre altnivela</strong> kaj se vi entajpus mal�ustan informojn, komunikado kun la kontakto eble ne plu funkcios.";
+$a->strings["Please use your browser 'Back' button <strong>now</strong> if you are uncertain what to do on this page."] = "Bonvolu klaki 'malantaŭen' en via retesplorilo <strong>nun</strong> se vi ne scias kion faru ĉi tie.";
+$a->strings["Return to contact editor"] = "Reen al kontakta redaktilo";
+$a->strings["Name"] = "Nomo";
+$a->strings["Account Nickname"] = "Ka�nomo de la konto";
+$a->strings["@Tagname - overrides Name/Nickname"] = "@Marknomo - Transpasas nomon/ka�nomon";
+$a->strings["Account URL"] = "Adreso de la konto";
+$a->strings["Friend Request URL"] = "Kontaktpeta adreso";
+$a->strings["Friend Confirm URL"] = "Kontaktkonfirma adreso";
+$a->strings["Notification Endpoint URL"] = "Finpunkta adreso por atentigoj";
+$a->strings["Poll/Feed URL"] = "Adreso de fluo";
+$a->strings["New photo from this URL"] = "Nova bildo el tiu adreso";
+$a->strings["Submit"] = "Sendi";
+$a->strings["Help:"] = "Helpo:";
+$a->strings["Help"] = "Helpo";
+$a->strings["Not Found"] = "Ne trovita";
+$a->strings["Page not found."] = "Pa�o ne trovita";
+$a->strings["File exceeds size limit of %d"] = "Dosiero estas pli granda ol la limito de %d";
+$a->strings["File upload failed."] = "Al�utado malsukcesis.";
+$a->strings["Friend suggestion sent."] = "Amikosugesto sendita.";
+$a->strings["Suggest Friends"] = "Sugesti amikojn";
+$a->strings["Suggest a friend for %s"] = "Sugesti amikon por %s";
+$a->strings["Event description and start time are required."] = "Okazo bezonas priskribon kaj startotempon.";
+$a->strings["l, F j"] = "l, F j";
+$a->strings["Edit event"] = "Redakti okazon";
+$a->strings["link to source"] = "ligi al fonto";
+$a->strings["Events"] = "Okazoj";
+$a->strings["Create New Event"] = "Krei novan okazon";
+$a->strings["Previous"] = "antaÅ­a";
+$a->strings["Next"] = "sekva";
+$a->strings["hour:minute"] = "horo:minuto";
+$a->strings["Event details"] = "Detaloj de okazo";
+$a->strings["Format is %s %s. Starting date and Description are required."] = "Formato estas %s %s. Startotempo kaj priskribo estas bezonataj";
+$a->strings["Event Starts:"] = "Okazo startas:";
+$a->strings["Finish date/time is not known or not relevant"] = "Fina dato/tempo ne estas konata aÅ­ ne bezonata";
+$a->strings["Event Finishes:"] = "Okazo finas:";
+$a->strings["Adjust for viewer timezone"] = "Agordi al horzono de la leganto";
+$a->strings["Description:"] = "Priskribo";
+$a->strings["Location:"] = "Loko:";
+$a->strings["Share this event"] = "Kunhavigi la okazon";
+$a->strings["Cancel"] = "Nuligi";
+$a->strings["Tag removed"] = "Marko forvi�ita";
+$a->strings["Remove Item Tag"] = "Forvi�i markon";
+$a->strings["Select a tag to remove: "] = "Elektu forvi�ontan markon:";
+$a->strings["Remove"] = "Forvi�i";
+$a->strings["%s welcomes %s"] = "%s salutas %s";
+$a->strings["Authorize application connection"] = "Rajtigi programkonekton";
+$a->strings["Return to your app and insert this Securty Code:"] = "Reiru al via programo kaj entajpu la securecan kodon:";
+$a->strings["Please login to continue."] = "Bonvolu ensaluti por pluigi.";
+$a->strings["Do you want to authorize this application to access your posts and contacts, and/or create new posts for you?"] = "Ĉu rajtigi ĉi tiun programon por atingi viajn afi�ojn kaj kontaktojn kaj/aŭ krei novajn afi�ojn?";
+$a->strings["Yes"] = "Jes";
+$a->strings["No"] = "Ne";
+$a->strings["Photo Albums"] = "Bildalbumoj";
+$a->strings["Contact Photos"] = "Kontaktbildoj";
+$a->strings["Upload New Photos"] = "Al�uti novajn bildojn";
+$a->strings["everybody"] = "ĉiuj";
+$a->strings["Contact information unavailable"] = "Kontaktoj informoj ne disponeblas";
+$a->strings["Profile Photos"] = "Profilbildoj";
+$a->strings["Album not found."] = "Albumo ne trovita.";
+$a->strings["Delete Album"] = "Forvi�i albumon";
+$a->strings["Delete Photo"] = "Forvi�i bildon";
+$a->strings["was tagged in a"] = "estas markita en";
+$a->strings["photo"] = "bildo";
+$a->strings["by"] = "de";
+$a->strings["Image exceeds size limit of "] = "Bildo estas pli granda ol la limito de";
+$a->strings["Image file is empty."] = "Bilddosiero estas malplena.";
+$a->strings["Unable to process image."] = "Ne eblas procedi la bildon.";
+$a->strings["Image upload failed."] = "Al�uto de bildo malsukcesis.";
+$a->strings["Public access denied."] = "Publika atingo ne permesita.";
+$a->strings["No photos selected"] = "Neniu bildoj elektita";
+$a->strings["Access to this item is restricted."] = "Atingo al tio elemento estas limigita.";
+$a->strings["Upload Photos"] = "Al�uti bildojn";
+$a->strings["New album name: "] = "Nomo por nova albumo:";
+$a->strings["or existing album name: "] = "aÅ­ nomo de estanta albumo:";
+$a->strings["Do not show a status post for this upload"] = "Ne kreu statan afi�on por tio al�uto.";
+$a->strings["Permissions"] = "Permesoj";
+$a->strings["Edit Album"] = "Redakti albumon";
+$a->strings["View Photo"] = "Vidi bildon";
+$a->strings["Permission denied. Access to this item may be restricted."] = "Malpermesita. Atingo al tio elemento eble estas limigita.";
+$a->strings["Photo not available"] = "La bildo ne disponeblas";
+$a->strings["View photo"] = "Vidi bildon";
+$a->strings["Edit photo"] = "Redakti bildon";
+$a->strings["Use as profile photo"] = "Uzi kiel profilbildo";
+$a->strings["Private Message"] = "Privata mesa�o";
+$a->strings["View Full Size"] = "Vidi plengrande ";
+$a->strings["Tags: "] = "Markoj:";
+$a->strings["[Remove any tag]"] = "[Forvi�i iun markon]";
+$a->strings["New album name"] = "Nova nomo de albumo";
+$a->strings["Caption"] = "Apudskribo";
+$a->strings["Add a Tag"] = "Aldoni markon";
+$a->strings["Example: @bob, @Barbara_Jensen, @jim@example.com, #California, #camping"] = "Ekzemple: @bob, @Barbara_Jensen, @jim@example.com, #California, #camping";
+$a->strings["I like this (toggle)"] = "Mi �atas tion (�alti)";
+$a->strings["I don't like this (toggle)"] = "Mi mal�atas tion(�alti)";
+$a->strings["Share"] = "Kunhavigi";
+$a->strings["Please wait"] = "Bonvolu atendi";
+$a->strings["This is you"] = "Tiu estas vi";
+$a->strings["Comment"] = "Komenti";
+$a->strings["Preview"] = "AntaÅ­rigardi";
+$a->strings["Delete"] = "Forvi�i";
+$a->strings["View Album"] = "Vidi albumon";
+$a->strings["Recent Photos"] = "Ì‚Ä´usaj bildoj";
+$a->strings["Not available."] = "Ne disponebla.";
+$a->strings["Community"] = "Komunumo";
+$a->strings["No results."] = "Nenion trovita.";
+$a->strings["This is Friendica, version"] = "Tio estas Friendica en la versio";
+$a->strings["running at web location"] = "instalita ĉe la adreso";
+$a->strings["Please visit <a href=\"http://friendica.com\">Friendica.com</a> to learn more about the Friendica project."] = "Bonvolu iri al <a href=\"http://friendica.com\">Friendica.com</a> por lerni pli pri la projekto Friendica";
+$a->strings["Bug reports and issues: please visit"] = "Cimraportoj kaj atendindaĵo: bonvolu iri al";
+$a->strings["Suggestions, praise, donations, etc. - please email \"Info\" at Friendica - dot com"] = "Sugestoj, laŭdoj, donacoj ktp - bonvolu sendi mes�on al \"Info\" ĉe Friendica - punkto com";
+$a->strings["Installed plugins/addons/apps:"] = "Instalitaj kromprogramoj/programoj:";
+$a->strings["No installed plugins/addons/apps"] = "Neniom da instalitaj aldonaĵoj/programoj";
+$a->strings["Item not found"] = "Elemento ne trovita";
+$a->strings["Edit post"] = "Redakti afi�on";
+$a->strings["Post to Email"] = "Sendi tra retpo�to";
+$a->strings["Edit"] = "Redakti";
+$a->strings["Upload photo"] = "Al�uti bildon";
+$a->strings["Attach file"] = "Kunligi dosieron";
+$a->strings["Insert web link"] = "Enmeti retan adreson";
+$a->strings["Insert YouTube video"] = "Enmeti videton ĉe YouTube";
+$a->strings["Insert Vorbis [.ogg] video"] = "Enmeti videton en formato Vorbis [.ogg]";
+$a->strings["Insert Vorbis [.ogg] audio"] = "Enmeti sonon en formato Vorbis [.ogg]";
+$a->strings["Set your location"] = "Agordi vian lokon";
+$a->strings["Clear browser location"] = "Forvi�u retesplorilan lokon";
+$a->strings["Permission settings"] = "Permesagordoj";
+$a->strings["CC: email addresses"] = "CC: retpo�tadresojn";
+$a->strings["Public post"] = "Publika afi�o";
+$a->strings["Set title"] = "Redakti titolon";
+$a->strings["Categories (comma-separated list)"] = "Kategorioj (disigita per komo)";
+$a->strings["Example: bob@example.com, mary@example.com"] = "Ekzemple: bob@example.com, mary@example.com";
+$a->strings["This introduction has already been accepted."] = "Tia prezento jam estas akceptita";
+$a->strings["Profile location is not valid or does not contain profile information."] = "La adreso de la profilo ne validas aÅ­ ne enhavas profilinformojn.";
+$a->strings["Warning: profile location has no identifiable owner name."] = "Averto: La adreso de la profilo ne enhavas identeblan personan nomon.";
+$a->strings["Warning: profile location has no profile photo."] = "Averto: La adreso de la profilo ne enhavas bildon.";
+$a->strings["%d required parameter was not found at the given location"] = array(
+	0 => "%d bezonataj parametroj ne trovita ĉe la donata adreso.",
+	1 => "%d bezonataj parametroj ne trovita ĉe la donata adreso.",
+);
+$a->strings["Introduction complete."] = "Prezento sukcesis.";
+$a->strings["Unrecoverable protocol error."] = "Ne�ustigebla eraro en protokolo.";
+$a->strings["Profile unavailable."] = "Profilo ne estas disponebla.";
+$a->strings["%s has received too many connection requests today."] = "%s hodiaÅ­ ricevis tro multe da konektpetoj.";
+$a->strings["Spam protection measures have been invoked."] = "KontraÅ­spamilo estas aktivita.";
+$a->strings["Friends are advised to please try again in 24 hours."] = "Amikoj, vi bonvolu ripeti post 24 horoj.";
+$a->strings["Invalid locator"] = "Nevalida adreso.";
+$a->strings["Invalid email address."] = "Nevalida repo�tadreso.";
+$a->strings["This account has not been configured for email. Request failed."] = "La konto ne estas agordita por retpo�to. La peto malsukcesis.";
+$a->strings["Unable to resolve your name at the provided location."] = "Via nomo ne troveblas al la donita adreso.";
+$a->strings["You have already introduced yourself here."] = "Vi vin jam prezentis tie.";
+$a->strings["Apparently you are already friends with %s."] = "Ŝajnas kvazaŭ vi jam amiki�is kun %s.";
+$a->strings["Invalid profile URL."] = "Nevalida adreso de profilo.";
+$a->strings["Disallowed profile URL."] = "Malpermesita adreso de profilo.";
+$a->strings["Failed to update contact record."] = "Äœisdatigo de via kontaktrikordo malsukcesis.";
+$a->strings["Your introduction has been sent."] = "Via prezento estas sendita.";
+$a->strings["Please login to confirm introduction."] = "Bonvolu ensaluti por jesigi la prezenton.";
+$a->strings["Incorrect identity currently logged in. Please login to <strong>this</strong> profile."] = "Mal�usta identaĵo ensalutata. Bonvolu ensaluti en <strong>tiun</strong> profilon.";
+$a->strings["Welcome home %s."] = "Bonvenon hejme, %s.";
+$a->strings["Please confirm your introduction/connection request to %s."] = "Bonvolu konfirmi vian prezenton / kontaktpeton al %s.";
+$a->strings["Confirm"] = "Konfirmi.";
+$a->strings["[Name Withheld]"] = "[Ka�ita nomo]";
+$a->strings["Please enter your 'Identity Address' from one of the following supported communications networks:"] = "Bonvolu entajpi vian 'Identecan Adreson' de iu de tiuj subtenataj komunikaj retejoj: ";
+$a->strings["<strike>Connect as an email follower</strike> (Coming soon)"] = "<strike>Konektu kiel retpo�ta sekvanto</strike> (Baldaŭ venos)";
+$a->strings["If you are not yet a member of the free social web, <a href=\"http://dir.friendica.com/siteinfo\">follow this link to find a public Friendica site and join us today</a>."] = "Se vi ne estas membro de la libra interkona reto, <a href=\"http://dir.friendica.com/siteinfo\">sekvu ĉi-ligilon por trovi publikan Friendica retejon kaj ali�i kun ni hodiaŭ</a>.";
+$a->strings["Friend/Connection Request"] = "Prezento / Konektpeto";
+$a->strings["Examples: jojo@demo.friendica.com, http://demo.friendica.com/profile/jojo, testuser@identi.ca"] = "Ekzemploj: jojo@demo.friendica.com, http://demo.friendica.com/profile/jojo, testuser@identi.ca";
+$a->strings["Please answer the following:"] = "Bonvolu respondi:";
+$a->strings["Does %s know you?"] = "Ĉu %s konas vin?";
+$a->strings["Add a personal note:"] = "Aldoni personan noton:";
+$a->strings["Friendica"] = "Friendica";
+$a->strings["StatusNet/Federated Social Web"] = "StatusNet/Federaciaj interkonaj retejoj";
+$a->strings["Diaspora"] = "Diaspora";
+$a->strings[" - please do not use this form.  Instead, enter %s into your Diaspora search bar."] = " - bonvolu ne uzi ĉi formo.  Anstataŭe, entajpu %s en la Diaspora serĉilo.";
+$a->strings["Your Identity Address:"] = "Via identeca adreso:";
+$a->strings["Submit Request"] = "Sendi peton";
+$a->strings["Friendica Social Communications Server - Setup"] = "Friendica Interkona Komunikada Servilo - Instalo";
+$a->strings["Database connection"] = "Datumbaza konekto";
+$a->strings["Could not connect to database."] = "Ne eblas konekti la datumbazon.";
+$a->strings["Could not create table."] = "Ne eblas krei tabelon.";
+$a->strings["Your Friendica site database has been installed."] = "La datumbazo de vi Friendica retjo estas instalita.";
+$a->strings["IMPORTANT: You will need to [manually] setup a scheduled task for the poller."] = "GRAVA: Vi bezonas [mane] agordi planitan taskon por la Friendica poller.";
+$a->strings["Please see the file \"INSTALL.txt\"."] = "Bonvolu legi la dosieron \"INSTALL.txt\".";
+$a->strings["Proceed to registration"] = "Pluigi al la registrilo";
+$a->strings["Proceed with Installation"] = "Pluigi la instalado";
+$a->strings["You may need to import the file \"database.sql\" manually using phpmyadmin or mysql."] = "Vi bezonas mane importi la dosieron \"database.sql\" tra phpmyadmin aÅ­ mysql.";
+$a->strings["Database import failed."] = "Importo de la datumbazo malsukcesis.";
+$a->strings["System check"] = "Sistema kontrolo";
+$a->strings["Check again"] = "Ree kontroli";
+$a->strings["In order to install Friendica we need to know how to connect to your database."] = "Por instali Friendica, ni bezonas scii kiel konekti al via datumbazo.";
+$a->strings["Please contact your hosting provider or site administrator if you have questions about these settings."] = "Bonvolu kontakti vian servilprovizanton aŭ administranton se vi havas demandoj pri ĉi tiaj agordoj.";
+$a->strings["The database you specify below should already exist. If it does not, please create it before continuing."] = "La datumbazo nomata malsupren jam ekzistu. Se �i ne ekzistas, bonvolu unue krei �in antaŭ progresi.";
+$a->strings["Database Server Name"] = "Nomo de datumbaza servilo.";
+$a->strings["Database Login Name"] = "Salutnomo ĉe la datumbazo.";
+$a->strings["Database Login Password"] = "Pasvorto ĉe la datumbazo.";
+$a->strings["Database Name"] = "Nomo de la datumbazo.";
+$a->strings["Site administrator email address"] = "Retpo�tadreso de la reteja administranto";
+$a->strings["Your account email address must match this in order to use the web admin panel."] = "La repo�tadreso de via konto bezonas esti la sama por uzi la TTTa administrilo.";
+$a->strings["Please select a default timezone for your website"] = "Bonvolu elekti defaÅ­ltan horzonon por via retejo.";
+$a->strings["Site settings"] = "Retejaj agordoj";
+$a->strings["Could not find a command line version of PHP in the web server PATH."] = "Komanda linia versio de PHP ne trovita en $PATH de la retservilo.";
+$a->strings["PHP executable path"] = "Vojo de la komanda linia versio de PHP";
+$a->strings["Enter full path to php executable"] = "Entajpu plenan vojon al la komanda linia versio de PHP";
+$a->strings["Command line PHP"] = "komanda linia versio de PHP";
+$a->strings["The command line version of PHP on your system does not have \"register_argc_argv\" enabled."] = "En via komanda linia versio de PHP je via sistemo, \"register_argc_argv\" ne estas aktivita.";
+$a->strings["This is required for message delivery to work."] = "Tio estas bezonata por la livero de mesa�oj.";
+$a->strings["PHP register_argc_argv"] = "PHP register_argc_argv";
+$a->strings["Error: the \"openssl_pkey_new\" function on this system is not able to generate encryption keys"] = "Eraro: La funkcio \"openssl_pkey_new\" je tia sistemo ne eblas generi ĉifro�losilojn.";
+$a->strings["If running under Windows, please see \"http://www.php.net/manual/en/openssl.installation.php\"."] = "Se la operaciumo sistemo estas Windows, bonvolu legi: http://www.php.net/manual/en/openssl.installation.php";
+$a->strings["Generate encryption keys"] = "Generi ĉifro�losilojn";
+$a->strings["libCurl PHP module"] = "PHP modulo libCurl";
+$a->strings["GD graphics PHP module"] = "PHP modulo GD";
+$a->strings["OpenSSL PHP module"] = "PHP modulo OpenSSL";
+$a->strings["mysqli PHP module"] = "PHP modulo mysqli";
+$a->strings["mb_string PHP module"] = "PHP modulo mb_string";
+$a->strings["Apace mod_rewrite module"] = "Apache modulo mod_rewrite";
+$a->strings["Error: Apache webserver mod-rewrite module is required but not installed."] = "Eraro: La modulo mod_rewrite en la Apache retservilo estas bezonata sed ne instalita.";
+$a->strings["Error: libCURL PHP module required but not installed."] = "Eraro: La modulo libCURL en PHP estas bezonata sed ne instalita.";
+$a->strings["Error: GD graphics PHP module with JPEG support required but not installed."] = "Eraro: La modulo GD en PHP kun subteno por JPEG estas bezonata sed ne instalita.";
+$a->strings["Error: openssl PHP module required but not installed."] = "Eraro: La modulo OpenSSL en PHP estas bezonata sed ne instalita.";
+$a->strings["Error: mysqli PHP module required but not installed."] = "Eraro: La modulo mysqli en PHP estas bezonata sed ne instalita.";
+$a->strings["Error: mb_string PHP module required but not installed."] = "Eraro: La modulo mb_string en PHP estas bezonata sed ne instalita.";
+$a->strings["The web installer needs to be able to create a file called \".htconfig.php\ in the top folder of your web server and it is unable to do so."] = "La reta instalilo bezonas skribi dosieron nomata \".htconfig.php\" en la baza dosierujo de la retservilo, sed ne sukcesis.";
+$a->strings["This is most often a permission setting, as the web server may not be able to write files in your folder - even if you can."] = "Tio ĉi plej ofte estas agordo rilate al permesoj, ĉar la servilo eble ne povas skribi en via dosierujo, eĉ se vi mem povas skribi.";
+$a->strings["Please check with your site documentation or support people to see if this situation can be corrected."] = "Bonvolu kontroli la dokumentojn de via servilo aŭ teĥnikiston por ekscii ĉu la situacio �ustigeblas.";
+$a->strings["If not, you may be required to perform a manual installation. Please see the file \"INSTALL.txt\" for instructions."] = "Se ne, vi eble bezonas instali mane. Bonvolu legi la dosieron \"INSTALL.txt\" por pluaj instruaĵoj.";
+$a->strings[".htconfig.php is writable"] = ".htconfig.php estas skribebla.";
+$a->strings["The database configuration file \".htconfig.php\" could not be written. Please use the enclosed text to create a configuration file in your web server root."] = "Ne povis skribi la datumbaza agordoj en la dosiero \".htconfig.php\". Bonvolu uzi la inkluzivan tekston por krei agordan dosieron en la baza dosierujo de la retservilo.";
+$a->strings["Errors encountered creating database tables."] = "Okazis eraroj dum la kreado de tabeloj en la datumbazo.";
+$a->strings["l F d, Y \\@ g:i A"] = "l F d, Y \\@ g:i A";
+$a->strings["Time Conversion"] = "Konverto de tempo";
+$a->strings["Friendika provides this service for sharing events with other networks and friends in unknown timezones."] = "Friendica provizas tiun servon por kunhavigi okazojn kun aliaj retoj kaj amikoj en aliaj horzonoj.";
+$a->strings["UTC time: %s"] = "UTC horo: %s";
+$a->strings["Current timezone: %s"] = "Aktuala horzono: %s";
+$a->strings["Converted localtime: %s"] = "Konvertita loka horo: %s";
+$a->strings["Please select your timezone:"] = "Bonvolu elekti vian horzonon:";
+$a->strings["Profile Match"] = "Kongrua profilo";
+$a->strings["No keywords to match. Please add keywords to your default profile."] = "Neniom da kategoriaj vortoj kongruas. Bonvolu aldoni kategoriajn vortojn al via defaÅ­lta profilo.";
+$a->strings["is interested in:"] = "interesi�as pri:";
+$a->strings["Connect"] = "Konekti";
+$a->strings["No matches"] = "Nenio estas trovita";
+$a->strings["Remote privacy information not available."] = "Informoj pri fora privateca ne estas disponebla.";
+$a->strings["Visible to:"] = "Videbla al:";
+$a->strings["Welcome to %s"] = "Bonvenon ĉe %s";
+$a->strings["Invalid request identifier."] = "Nevalida peta identigilo.";
+$a->strings["Discard"] = "Forvi�i";
+$a->strings["Ignore"] = "Ignori";
+$a->strings["System"] = "Sistemo";
+$a->strings["Network"] = "Reto";
+$a->strings["Personal"] = "Propra";
+$a->strings["Home"] = "Hejmo";
+$a->strings["Introductions"] = "Prezentoj";
+$a->strings["Messages"] = "Mesa�oj";
+$a->strings["Show Ignored Requests"] = "Montri ignoritajn petojn";
+$a->strings["Hide Ignored Requests"] = "Ka�i ignoritajn petojn";
+$a->strings["Notification type: "] = "Tipo de atentigo:";
+$a->strings["Friend Suggestion"] = "Amikosugestoj";
+$a->strings["suggested by %s"] = "sugestita de %s";
+$a->strings["Hide this contact from others"] = "Ka�i ĉi tiun kontakton al aliaj";
+$a->strings["Post a new friend activity"] = "Afi�i novan amikecan aktivecon";
+$a->strings["if applicable"] = "se aplikebla";
+$a->strings["Approve"] = "Aprobi";
+$a->strings["Claims to be known to you: "] = "Pensas ke vi konas ilin:";
+$a->strings["yes"] = "jes";
+$a->strings["no"] = "ne";
+$a->strings["Approve as: "] = "Aprobi kiel:";
+$a->strings["Friend"] = "Amiko";
+$a->strings["Sharer"] = "Kunhaviganto";
+$a->strings["Fan/Admirer"] = "Fanatikulo/Admiranto";
+$a->strings["Friend/Connect Request"] = "Kontaktpeto";
+$a->strings["New Follower"] = "Nova abonanto";
+$a->strings["No introductions."] = "Neniom da prezentoj";
+$a->strings["Notifications"] = "Atentigoj";
+$a->strings["%s liked %s's post"] = "%s �atis la afi�on de %s";
+$a->strings["%s disliked %s's post"] = "%s mal�atis la afi�on de %s";
+$a->strings["%s is now friends with %s"] = "%s amiki�is kun %s";
+$a->strings["%s created a new post"] = "%s kreis novan afi�on";
+$a->strings["%s commented on %s's post"] = "%s komentis pri la afi�o de %s";
+$a->strings["No more network notifications."] = "Ne pli da retaj atentigoj.";
+$a->strings["Network Notifications"] = "Retaj Atentigoj";
+$a->strings["No more system notifications."] = "Ne pli da sistemaj atentigoj.";
+$a->strings["System Notifications"] = "Sistemaj Atentigoj";
+$a->strings["No more personal notifications."] = "Ne pli da personaj atentigoj";
+$a->strings["Personal Notifications"] = "Personaj Atentigoj";
+$a->strings["No more home notifications."] = "Ne pli da hejmrilataj atentigoj.";
+$a->strings["Home Notifications"] = "Hejmrilataj atentigoj";
+$a->strings["Could not access contact record."] = "Ne eblis atingi kontaktrikordo.";
+$a->strings["Could not locate selected profile."] = "Ne trovis elektitan profilon.";
+$a->strings["Contact updated."] = "Kontakto estas �isdatigita.";
+$a->strings["Contact has been blocked"] = "Kontakto estas blokita.";
+$a->strings["Contact has been unblocked"] = "Kontakto estas malblokita.";
+$a->strings["Contact has been ignored"] = "Kontakto estas ignorita.";
+$a->strings["Contact has been unignored"] = "Kontakto estas malignorita.";
+$a->strings["stopped following"] = "ne plu sekvas";
+$a->strings["Contact has been removed."] = "Kontakto estas forigita.";
+$a->strings["You are mutual friends with %s"] = "Vi estas reciproka amiko de %s";
+$a->strings["You are sharing with %s"] = "Vi kunhavigas kun %s";
+$a->strings["%s is sharing with you"] = "%s kunhavigas kun vi";
+$a->strings["Private communications are not available for this contact."] = "Privataj komunikadoj ne disponeblas por ĉi tiu kontakto.";
+$a->strings["Never"] = "Neniam";
+$a->strings["(Update was successful)"] = "(Äœisdatigo sukcesis.)";
+$a->strings["(Update was not successful)"] = "(Äœisdatigo malsukcesis.)";
+$a->strings["Suggest friends"] = "Sugesti amikojn";
+$a->strings["Network type: %s"] = "Reta tipo: %s";
+$a->strings["%d contact in common"] = array(
+	0 => "%d komuna kontakto",
+	1 => "%d komunaj kontaktoj",
+);
+$a->strings["View all contacts"] = "Vidi ĉiujn kontaktojn";
+$a->strings["Unblock"] = "Malbloki";
+$a->strings["Block"] = "Bloki";
+$a->strings["Unignore"] = "Malignori";
+$a->strings["Repair"] = "Ripari";
+$a->strings["Contact Editor"] = "Kontakta redaktilo.";
+$a->strings["Profile Visibility"] = "Videbleco de profilo";
+$a->strings["Please choose the profile you would like to display to %s when viewing your profile securely."] = "Bonvolu elekti la profilon kiu vi volas montri al %s aspektinde kiam sekure aspektante vian profilon.";
+$a->strings["Contact Information / Notes"] = "Kontaktaj informoj / Notoj";
+$a->strings["Edit contact notes"] = "Redakti kontaktnotojn";
+$a->strings["Visit %s's profile [%s]"] = "Viziti la profilon de %s [%s]";
+$a->strings["Block/Unblock contact"] = "Bloki/Malbloki kontakton";
+$a->strings["Ignore contact"] = "Ignori kontakton";
+$a->strings["Repair URL settings"] = "Ripari URL agordoj";
+$a->strings["View conversations"] = "Vidi konversaciojn";
+$a->strings["Delete contact"] = "Forvi�i kontakton";
+$a->strings["Last update:"] = "Plej ĵusa �isdatigo:";
+$a->strings["Update public posts"] = "Ĝisdatigi publikajn afi�ojn";
+$a->strings["Update now"] = "Äœisdatigi nun";
+$a->strings["Currently blocked"] = "Nuntempe blokata";
+$a->strings["Currently ignored"] = "Nuntempe ignorata";
+$a->strings["Replies/likes to your public posts <strong>may</strong> still be visible"] = "Rispondoj/�ataĵo al viaj publikaj afi�oj <strong>eble</strong> plu estos videbla";
+$a->strings["Suggestions"] = "Sugestoj";
+$a->strings["All Contacts"] = "Ĉiuj Kontaktoj";
+$a->strings["Unblocked Contacts"] = "Malblokitaj Kontaktoj";
+$a->strings["Blocked Contacts"] = "Blokitaj Kontaktoj";
+$a->strings["Ignored Contacts"] = "Ignoritaj Kontaktoj";
+$a->strings["Hidden Contacts"] = "Ka�itaj Kontaktoj";
+$a->strings["Mutual Friendship"] = "Reciproka amikeco";
+$a->strings["is a fan of yours"] = "estas admiranto de vi";
+$a->strings["you are a fan of"] = "vi estas admiranto de";
+$a->strings["Edit contact"] = "Redakti kontakton";
+$a->strings["Contacts"] = "Kontaktoj";
+$a->strings["Search your contacts"] = "Serĉi viajn kontaktojn";
+$a->strings["Finding: "] = "Trovata:";
+$a->strings["Find"] = "Trovi";
+$a->strings["No valid account found."] = "Ne trovis validan konton.";
+$a->strings["Password reset request issued. Check your email."] = "Eldonis riparadon de pasvorto. Legu vian retpo�ton.";
+$a->strings["Password reset requested at %s"] = "Pasvorta riparado petita je %s";
+$a->strings["Administrator"] = "Administranto";
+$a->strings["Request could not be verified. (You may have previously submitted it.) Password reset failed."] = "Ne povis konfirmi la peton. (Eble vi sendis �in antaŭ.) Pasvorta riparado malsukcesis.";
+$a->strings["Password Reset"] = "Pasvorta riparado";
+$a->strings["Your password has been reset as requested."] = "Via pasvorto estis riparita laÅ­ via peto.";
+$a->strings["Your new password is"] = "Via nova pasvorto estas";
+$a->strings["Save or copy your new password - and then"] = "Memorigi vian novan pasvorton - kaj poste";
+$a->strings["click here to login"] = "klaku ĉi tie por ensaluti";
+$a->strings["Your password may be changed from the <em>Settings</em> page after successful login."] = "Vi povas �angi vian pasvorton sur la pa�o <em>agordoj</em> kiam vi sukcese ensalutis.";
+$a->strings["Forgot your Password?"] = "Ĉu vi forgesis vian pasvorton?";
+$a->strings["Enter your email address and submit to have your password reset. Then check your email for further instructions."] = "Entajpu vian retpo�tadreson kaj sendu por pasvorta riparado. Poste, bonvolu legi vian retpo�ton por trovi pliajn instrukciojn.";
+$a->strings["Nickname or Email: "] = "Salutnomo aŭ retpo�tadreso: ";
+$a->strings["Reset"] = "Repari";
+$a->strings["Account settings"] = "Kontoagordoj";
+$a->strings["Display settings"] = "Ekranagordoj";
+$a->strings["Connector settings"] = "Konektiloagordoj";
+$a->strings["Plugin settings"] = "Agordoj pri kromprogramoj";
+$a->strings["Connected apps"] = "Konektitaj programoj";
+$a->strings["Export personal data"] = "Eksporti personan datumaron";
+$a->strings["Settings"] = "Agordoj";
+$a->strings["Missing some important data!"] = "Mankas importantaj datumoj!";
+$a->strings["Update"] = "Äœisdatigi";
+$a->strings["Failed to connect with email account using the settings provided."] = "Ne sukcesis konekti al retpo�tkonto kun la provizitaj agordoj.";
+$a->strings["Email settings updated."] = "Retpo�tagordoj �isdatigita";
+$a->strings["Passwords do not match. Password unchanged."] = "La pasvortoj ne estas egala. Pasvorto ne �an�ita.";
+$a->strings["Empty passwords are not allowed. Password unchanged."] = "Malplenaj pasvortoj ne estas permesita. Pasvorto ne �an�ita.";
+$a->strings["Password changed."] = "Pasvorto �an�ita.";
+$a->strings["Password update failed. Please try again."] = "Äœisdatigo de pasvorto malsukcesis. Bonvolu provi refoje.";
+$a->strings[" Please use a shorter name."] = " Bonvolu uzi pli mallongan nomon.";
+$a->strings[" Name too short."] = " Nomo estas tro mallonga.";
+$a->strings[" Not valid email."] = " Repo�tadreso ne validas.";
+$a->strings[" Cannot change to that email."] = " Ne povas �an�i al tio retpo�tadreso.";
+$a->strings["Settings updated."] = "Agordoj �isdatigita.";
+$a->strings["Add application"] = "Aldoni programon";
+$a->strings["Consumer Key"] = "Åœlosilo de kliento";
+$a->strings["Consumer Secret"] = "Sekreto de kliento";
+$a->strings["Redirect"] = "Alidirekto";
+$a->strings["Icon url"] = "Piktograma adreso";
+$a->strings["You can't edit this application."] = "Ĉi tio programo ne estas redaktebla.";
+$a->strings["Connected Apps"] = "Konektitaj Programoj";
+$a->strings["Client key starts with"] = "Åœlosilo de kliento komencas kun";
+$a->strings["No name"] = "Neniu nomo";
+$a->strings["Remove authorization"] = "Forvi�i rajtigon";
+$a->strings["No Plugin settings configured"] = "Neniom da kromprogramoagordoj farita";
+$a->strings["Plugin Settings"] = "Kromprogramoagordoj";
+$a->strings["Built-in support for %s connectivity is %s"] = "Integrita subteno por %s koneto estas %s";
+$a->strings["enabled"] = "�altita";
+$a->strings["disabled"] = "mal�altita";
+$a->strings["StatusNet"] = "StatusNet";
+$a->strings["Connector Settings"] = "Konektiloagordoj";
+$a->strings["Email/Mailbox Setup"] = "Agordoj pri Retpo�to";
+$a->strings["If you wish to communicate with email contacts using this service (optional), please specify how to connect to your mailbox."] = "Se vi volas uzi ĉi tiun servon por komuniki tra retpo�to (nedeviga), bonvolu specifi kiel konekti al vian retpo�tkonton.";
+$a->strings["Last successful email check:"] = "Plej ĵusa sukcesa kontrolo de po�to:";
+$a->strings["Email access is disabled on this site."] = "Retpo�ta atingo ne disponeblas ĉi tie.";
+$a->strings["IMAP server name:"] = "Nomo de IMAP servilo:";
+$a->strings["IMAP port:"] = "Numero de IMAP pordo:";
+$a->strings["Security:"] = "Sekureco:";
+$a->strings["None"] = "Nenio";
+$a->strings["Email login name:"] = "Retpo�ta salutnomo:";
+$a->strings["Email password:"] = "Retpo�ta pasvorto:";
+$a->strings["Reply-to address:"] = "Responda adreso (Reply-to):";
+$a->strings["Send public posts to all email contacts:"] = "Sendu publikajn afi�ojn al ĉiuj retpo�tkontaktoj:";
+$a->strings["Action after import:"] = "Ago post la importado:";
+$a->strings["Mark as seen"] = "Marki kiel legita";
+$a->strings["Move to folder"] = "Movi al dosierujo";
+$a->strings["Move to folder:"] = "Movi al dosierujo:";
+$a->strings["Display Settings"] = "Ekranagordoj";
+$a->strings["Display Theme:"] = "Vidiga etoso:";
+$a->strings["Update browser every xx seconds"] = "Ĝisdatigu retesplorilon ĉiu xxx sekundoj";
+$a->strings["Minimum of 10 seconds, no maximum"] = "Minimume 10 sekundoj, sen maksimumo";
+$a->strings["Number of items to display on the network page:"] = "Kvanto da elementoj kiuj estos montrata ĉe la reto pa�o.";
+$a->strings["Maximum of 100 items"] = "Maksimume 100 eroj";
+$a->strings["Don't show emoticons"] = "Ne montru ridetulojn.";
+$a->strings["Normal Account"] = "Normala konto";
+$a->strings["This account is a normal personal profile"] = "Tiu konto estas normala persona profilo";
+$a->strings["Soapbox Account"] = "Konto ĉe Soapbox";
+$a->strings["Automatically approve all connection/friend requests as read-only fans"] = "Aŭtomate konfirmi ĉiujn kontaktpetojn kiel nurlegaj admirantoj";
+$a->strings["Community/Celebrity Account"] = "Komunuma/eminentula Konto";
+$a->strings["Automatically approve all connection/friend requests as read-write fans"] = "Aŭtomate konfirmi ĉiujn kontaktpetojn kiel admirantoj kapable legi kaj skribi";
+$a->strings["Automatic Friend Account"] = "AÅ­tomata Amika Konto";
+$a->strings["Automatically approve all connection/friend requests as friends"] = "Aŭtomate konfirmi ĉiujn kontaktpetojn kiel amikoj";
+$a->strings["OpenID:"] = "OpenID:";
+$a->strings["(Optional) Allow this OpenID to login to this account."] = "(Nedeviga) Permesi atingon al la konton al ĉi tio OpenID.";
+$a->strings["Publish your default profile in your local site directory?"] = "Publikigi vian defaÅ­ltan profilon en la loka reteja katalogo?";
+$a->strings["Publish your default profile in the global social directory?"] = "Publikigi vian defaÅ­ltan profilon en la tutmonda interkona katalogo?";
+$a->strings["Hide your contact/friend list from viewers of your default profile?"] = "Ka�i vian liston de kontaktoj/amiko al spektantoj de via defaŭlta profilo?";
+$a->strings["Hide your profile details from unknown viewers?"] = "Ka�i viajn profilajn detalojn al nekonataj spektantoj?";
+$a->strings["Allow friends to post to your profile page?"] = "Ĉu amikoj povu afi�i al via profilo?";
+$a->strings["Allow friends to tag your posts?"] = "Ĉu amikoj povu aldoni markojn al viaj afi�oj?";
+$a->strings["Allow us to suggest you as a potential friend to new members?"] = "Ĉu ni povu sugesti vin kiel amiko al novaj membroj?";
+$a->strings["Permit unknown people to send you private mail?"] = "Permesigi nekonatulojn sendi retpo�ton al vi?";
+$a->strings["Profile is <strong>not published</strong>."] = "Profilo <strong>ne estas publika</strong>.";
+$a->strings["or"] = "aÅ­";
+$a->strings["Your Identity Address is"] = "Via identeco adreso estas";
+$a->strings["Automatically expire posts after this many days:"] = "Automatike senvalidigi afi�ojn post tiom da tagoj:";
+$a->strings["If empty, posts will not expire. Expired posts will be deleted"] = "Se malplena, afi�oj neniam senvalidi�os. Senvalidigitajn afi�on estos forvi�ata";
+$a->strings["Advanced expiration settings"] = "Detalaj agordoj rilate al senvalidi�o";
+$a->strings["Advanced Expiration"] = "Detala senvalidi�o";
+$a->strings["Expire posts:"] = "Senvalidigi afi�ojn:";
+$a->strings["Expire personal notes:"] = "Senvalidigi personajn notojn:";
+$a->strings["Expire starred posts:"] = "Senvalidigi steligitajn afi�ojn:";
+$a->strings["Expire photos:"] = "Senvalidigi bildojn:";
+$a->strings["Account Settings"] = "Kontoagordoj";
+$a->strings["Password Settings"] = "Agordoj pri Pasvorto";
+$a->strings["New Password:"] = "Nova pasvorto:";
+$a->strings["Confirm:"] = "Konfirmi:";
+$a->strings["Leave password fields blank unless changing"] = "Lasu pasvortkampojn malplenaj se vi ne �an�as la pasvorton.";
+$a->strings["Basic Settings"] = "Bazaj Agordoj";
+$a->strings["Full Name:"] = "Plena Nomo:";
+$a->strings["Email Address:"] = "Retpo�tadreso:";
+$a->strings["Your Timezone:"] = "Via Horzono:";
+$a->strings["Default Post Location:"] = "Defaŭlta Loko por Afi�oj:";
+$a->strings["Use Browser Location:"] = "Uzu Lokon laÅ­ Retesplorilo:";
+$a->strings["Security and Privacy Settings"] = "Agordoj pri Sekureco kaj Privateco";
+$a->strings["Maximum Friend Requests/Day:"] = "Taga maksimumo da kontaktpetoj:";
+$a->strings["(to prevent spam abuse)"] = "(por malhelpi spamaĵojn)";
+$a->strings["Default Post Permissions"] = "Defaŭltaj permesoj por afi�oj";
+$a->strings["(click to open/close)"] = "(klaku por malfermi/fermi)";
+$a->strings["Maximum private messages per day from unknown people:"] = "Taga maksimumo da privataj mesa�oj.";
+$a->strings["Notification Settings"] = "Agordoj pri Atentigoj";
+$a->strings["By default post a status message when:"] = "Defaŭlte afi�i statmesa�on okaze de:";
+$a->strings["accepting a friend request"] = "akcepti kontaktpeton";
+$a->strings["making an <em>interesting</em> profile change"] = "fari <em>interesan</em> profil�an�on";
+$a->strings["Send a notification email when:"] = "Sendu atentiga repo�ton se:";
+$a->strings["You receive an introduction"] = "Vi ricevas inviton";
+$a->strings["Your introductions are confirmed"] = "Viaj prezentoj estas konfirmata.";
+$a->strings["Someone writes on your profile wall"] = "Iu skribas je via profila muro.";
+$a->strings["Someone writes a followup comment"] = "Iu skribas sekvan komenton";
+$a->strings["You receive a private message"] = "Vi ricevas privatan mesa�on.";
+$a->strings["You receive a friend suggestion"] = "Vi ricevas amikosugeston";
+$a->strings["You are tagged in a post"] = "Vi estas markita en afi�on";
+$a->strings["Advanced Page Settings"] = "Specialaj agordoj pri pa�oj";
+$a->strings["Manage Identities and/or Pages"] = "Administri identecojn kaj/aŭ pa�ojn.";
+$a->strings["Toggle between different identities or community/group pages which share your account details or which you have been granted \"manage\" permissions"] = "Ŝalti inter aliaj identecojn aj komunumaj/grupaj pa�oj kiuj kunhavas viajn kontajn detalojn au por kiuj vi havas \"administranto\" permesojn.";
+$a->strings["Select an identity to manage: "] = "Elektu identencon por administrado:";
+$a->strings["Search Results For:"] = "Rezultoj de la serĉado pri:";
+$a->strings["Remove term"] = "Forvi�u terminon";
+$a->strings["Saved Searches"] = "Konservitaj Serĉadoj";
+$a->strings["add"] = "aldoni";
+$a->strings["Commented Order"] = "Komenta Ordo";
+$a->strings["Posted Order"] = "Afi�ita Ordo";
+$a->strings["New"] = "Nova";
+$a->strings["Starred"] = "Steligita";
+$a->strings["Shared Links"] = "Kunhavigitaj Ligiloj";
+$a->strings["Warning: This group contains %s member from an insecure network."] = array(
+	0 => "Averto: La grupo enhavas %s membron el nesekuraj retejoj.",
+	1 => "Averto: La grupo enhavas %s membrojn el nesekuraj retejoj.",
+);
+$a->strings["Private messages to this group are at risk of public disclosure."] = "La privateco de privataj mesa�oj al ĉi tiu grupo ne ĉiam estas garantita.";
+$a->strings["No such group"] = "Grupo ne estas trovita";
+$a->strings["Group is empty"] = "Grupo estas malplena";
+$a->strings["Group: "] = "Grupo:";
+$a->strings["Contact: "] = "Kontakto:";
+$a->strings["Private messages to this person are at risk of public disclosure."] = "La privateco de privataj mesa�oj al ĉi tiu persono ne ĉiam estas garantita.";
+$a->strings["Invalid contact."] = "Nevalida kontakto.";
+$a->strings["Personal Notes"] = "Personaj Notoj";
+$a->strings["Save"] = "Konservi";
+$a->strings["Number of daily wall messages for %s exceeded. Message failed."] = "Number of daily wall messages for %s exceeded. Messa�o malsukcesis.";
+$a->strings["No recipient selected."] = "Neniom da ricevontoj.";
+$a->strings["Unable to check your home location."] = "Ne eblas kontroli vian hejmlokon.";
+$a->strings["Message could not be sent."] = "Ne povas sendi la mesa�on.";
+$a->strings["Message collection failure."] = "Malsukcese provis kolekti mesa�ojn.";
+$a->strings["Message sent."] = "Mesa�o estas sendita.";
+$a->strings["No recipient."] = "Neniom da ricevontoj.";
+$a->strings["Please enter a link URL:"] = "Bonvolu entajpu adreson de ligilo:";
+$a->strings["Send Private Message"] = "Sendi Privatan Mesa�on";
+$a->strings["If you wish for %s to respond, please check that the privacy settings on your site allow private mail from unknown senders."] = "Se vi deziras ke %s respondu, bonvolu kontroli ke la privatecaj agordoj je via retejo permesas privatajn mesa�ojn de nekonataj sendantoj.";
+$a->strings["To:"] = "Al:";
+$a->strings["Subject:"] = "Temo:";
+$a->strings["Your message:"] = "Via mesa�o:";
+$a->strings["Welcome to Friendica"] = "Bonvenon ĉe Friendica";
+$a->strings["New Member Checklist"] = "Kontrololisto por Novaj Membroj";
+$a->strings["We would like to offer some tips and links to help make your experience enjoyable. Click any item to visit the relevant page. A link to this page will be visible from your home page for two weeks after your initial registration and then will quietly disappear."] = "Lasu nin oferi al vi kelkajn konsolojn kaj ligilojn por plifaciligi vian komencon. Klaku iun elementon por viziti la rilatan pa�on. Ligilo al ĉi tiu pa�o videblos en via hejmpa�o dum du semajnojn post via komenca membri�o. Post du semajnoj, la ligilo silente malaperos. ";
+$a->strings["On your <em>Quick Start</em> page - find a brief introduction to your profile and network tabs, connect to Facebook, make some new connections, and find some groups to join."] = "Je via <em>Rapida Starto</em> pa�o - trovu mallongan enigon pri via profilo kaj la reto folioj, konektu al Facebook, faru novajn konektojn kaj trovu ali�indajn grupojn.";
+$a->strings["On your <em>Settings</em> page -  change your initial password. Also make a note of your Identity Address. This looks just like an email address - and will be useful in making friends on the free social web."] = "Bonvolu �an�i vian pasvorton ĉe <em>Agordoj</em>. Krome, memorigu vian identadreson. Ĝi aspektas kiel retpo�tadreso kaj estas bezonata por konekti al novaj amikon en la libera interkona reto.";
+$a->strings["Review the other settings, particularly the privacy settings. An unpublished directory listing is like having an unlisted phone number. In general, you should probably publish your listing - unless all of your friends and potential friends know exactly how to find you."] = "Kontrolu la aliajn agordojn, precipe la privatecajn agordojn. Nepublikigita profilo similas al havi telefonnumberon ne registrata en iu telefonlibro. Äœenerale vi eble volas publikigi vian profilon. Alie, viaj amikoj kaj estontaj amikoj bezonas scii kiel rekte trovi vin.";
+$a->strings["Upload a profile photo if you have not done so already. Studies have shown that people with real photos of themselves are ten times more likely to make friends than people who do not."] = "En�uti profilbildon se vi ankoraŭ ne havas �in. Laŭ studoj, homoj kun realaj biloj de si mem trovas novajn amikon duope pli probable ol homoj sen reala bildo.";
+$a->strings["Authorise the Facebook Connector if you currently have a Facebook account and we will (optionally) import all your Facebook friends and conversations."] = "Rajtigu la Facebook Konektilon se vi nuntempe havas Facebook konton, kaj ni (nedeviga) enportu viajn Facebook amikojn kaj konversaciojn.";
+$a->strings["<em>If</em> this is your own personal server, installing the Facebook addon may ease your transition to the free social web."] = "<em>Se</tm> ĉi tiu estas via propra TTT servilo, instali la Facebook kromprogramon eble plifaciligos la transpason al la libera interkona reto.";
+$a->strings["Enter your email access information on your Connector Settings page if you wish to import and interact with friends or mailing lists from your email INBOX"] = "Entajpu la akreditaĵojn por via retpo�tkonto en la konektilagordoj se vi volas importi aŭ interagi kun amikoj aŭ dissendlistoj tra via retkesto.";
+$a->strings["Edit your <strong>default</strong> profile to your liking. Review the settings for hiding your list of friends and hiding the profile from unknown visitors."] = "Redakti viajn <strong>defaŭltan</strong> profilon kiel vi �atas �in. Kontrolu la agordojn por ka�i vian kontaktliston aŭ ka�i vian profilon al nekonataj vizitantoj.";
+$a->strings["Set some public keywords for your default profile which describe your interests. We may be able to find other people with similar interests and suggest friendships."] = "Aldonu publikajn �losilvortojn al via defaŭlta profilo, kiuj priskribas viajn interesojn. Ni eble povas trovi aliajn uzantojn kun similaj interesoj kaj sugesti amikojn.";
+$a->strings["Your Contacts page is your gateway to managing friendships and connecting with friends on other networks. Typically you enter their address or site URL in the <em>Add New Contact</em> dialog."] = "Via kontaktpa�o estas via portalo por administri amikojn kaj konekti kun amikoj en aliaj retoj. Vi kutime entajpas iliajn adreson aŭ URL adreso en la <em>Aldonu Novan Kontakton</em> dialogon.";
+$a->strings["The Directory page lets you find other people in this network or other federated sites. Look for a <em>Connect</em> or <em>Follow</em> link on their profile page. Provide your own Identity Address if requested."] = "Ĉe la Katalogo vi povas trovi aliajn homojn en ĉi tiu retejo, au en aliaj federaciaj retejoj. Elrigardi al <em>Konekti</em> aŭ <em>Sekvi</em> ligiloj ĉe iliaj profilo. Donu vian propran Identecan Adreson se la retejo demandas �in.";
+$a->strings["On the side panel of the Contacts page are several tools to find new friends. We can match people by interest, look up people by name or interest, and provide suggestions based on network relationships. On a brand new site, friend suggestions will usually begin to be populated within 24 hours."] = "En la flanka strio de la Kontaktoj pa�o trovi�as kelkajn helpilojn por trovi novajn amikojn. Ni povas automate trovi amikojn per interesoj, serĉu ilin per nomo aŭ intereso kaj faras sugestojn baze de estantaj kontaktoj. Ĉe nova instalita retejo, la unuaj sugestoj kutime aperas post 24 horoj.";
+$a->strings["Once you have made some friends, organize them into private conversation groups from the sidebar of your Contacts page and then you can interact with each group privately on your Network page."] = "Kiam vi trovis kelkajn novajn amikojn, ordigi ilin en grupoj por privata komunikado en la flanka strio de via Kontaktoj pa�o, kaj vi povas private komuniki kun ili je via Reto pa�o.";
+$a->strings["Our <strong>help</strong> pages may be consulted for detail on other program features and resources."] = "Niaj <strong>Helpo</strong> pa�oj enhavas pli da detaloj pri aliaj programaj trajtoj.";
+$a->strings["Item not available."] = "Elemento ne disponeblas.";
+$a->strings["Item was not found."] = "Elemento ne trovita.";
+$a->strings["Group created."] = "Grupo estas kreita.";
+$a->strings["Could not create group."] = "Ne povas krei grupon.";
+$a->strings["Group not found."] = "Grupo ne estas trovita.";
+$a->strings["Group name changed."] = "La nomo de la grupo estas �an�ita.";
+$a->strings["Permission denied"] = "Malpermesita";
+$a->strings["Create a group of contacts/friends."] = "Krei grupon da kontaktoj/amikoj.";
+$a->strings["Group Name: "] = "Nomo de la grupo:";
+$a->strings["Group removed."] = "Grupo estas forvi�ita.";
+$a->strings["Unable to remove group."] = "Ne eblas forvi�i grupon.";
+$a->strings["Group Editor"] = "Grupa redaktilo";
+$a->strings["Members"] = "Anoj";
+$a->strings["Click on a contact to add or remove."] = "Klaku kontakton por aldoni aŭ forvi�i.";
+$a->strings["Invalid profile identifier."] = "Nevaliada profila identigilo.";
+$a->strings["Profile Visibility Editor"] = "Redaktilo por profila videbleco.";
+$a->strings["Profile"] = "Profilo";
+$a->strings["Visible To"] = "Videbla Al";
+$a->strings["All Contacts (with secure profile access)"] = "Ĉiuj Kontaktoj (kun sekura atingo al la profilo)";
+$a->strings["No contacts."] = "Neniu kontaktojn.";
+$a->strings["View Contacts"] = "Vidi Kontaktojn";
+$a->strings["An invitation is required."] = "Invio bezonata.";
+$a->strings["Invitation could not be verified."] = "Ne povis kontroli la inviton.";
+$a->strings["Invalid OpenID url"] = "Nevalida OpenID adreso";
+$a->strings["Please enter the required information."] = "Bonvolu entajpi la bezonatajn informojn.";
+$a->strings["Please use a shorter name."] = "Bonvolu uzi pli mallongan nomon.";
+$a->strings["Name too short."] = "Nomo estas tro mallonga.";
+$a->strings["That doesn't appear to be your full (First Last) name."] = "Tio �ajne ne estas via plena (persona, familia) nomo.";
+$a->strings["Your email domain is not among those allowed on this site."] = "Via retpo�todomajno ne estas permesita ĉi tie.";
+$a->strings["Not a valid email address."] = "Nevalida retpo�tadreso.";
+$a->strings["Cannot use that email."] = "Neuzebla retpo�tadreso.";
+$a->strings["Your \"nickname\" can only contain \"a-z\", \"0-9\", \"-\", and \"_\", and must also begin with a letter."] = "Via ka�nomo nur povas enhavi \"a-z\", \"0-9\", \"-\", kaj \"_\". Ĝi ankaŭ devas komenci kun litero.";
+$a->strings["Nickname is already registered. Please choose another."] = "Tio ka�nomo jam estas registrita. Bonvolu elekti alian.";
+$a->strings["Nickname was once registered here and may not be re-used. Please choose another."] = "Tiu ka�nomo iam estis registrita ĉi tie kaj ne ree uzeblas. Bonvolu elekti alian.";
+$a->strings["SERIOUS ERROR: Generation of security keys failed."] = "GRAVA ERARO: La generacio de sekurecaj ĉifro�losiloj malsukcesis.";
+$a->strings["An error occurred during registration. Please try again."] = "Eraro okazis dum registrado. Bonvolu provi denove.";
+$a->strings["An error occurred creating your default profile. Please try again."] = "Eraro okazi dum kreado de via defaÅ­lta profilo. Bonvolu provi denove.";
+$a->strings["Registration details for %s"] = "Detaloj de la registrado por %s";
+$a->strings["Registration successful. Please check your email for further instructions."] = "Registrado sukcesis. Bonvolu kontroli vian retpo�ton por pli da instruoj.";
+$a->strings["Failed to send email message. Here is the message that failed."] = "Malsukcesis sendi retpo�ton. Jen la malsukcesa mesa�o.";
+$a->strings["Your registration can not be processed."] = "Mi ne povas prilabori vian registradon.";
+$a->strings["Registration request at %s"] = "Peto de registrado al %s";
+$a->strings["Your registration is pending approval by the site owner."] = "Via registrado bezonas apropbon de la administranto.";
+$a->strings["This site has exceeded the number of allowed daily account registrations. Please try again tomorrow."] = "La retejo transiras la maksimuman kvanton da ĉiutagaj kontaj registradoj. Bonvolu provi denove morgaŭ.";
+$a->strings["You may (optionally) fill in this form via OpenID by supplying your OpenID and clicking 'Register'."] = "Vi ankaÅ­ (nedeviga) povas plenigi la formularon tra OpenID se vi provizas vian OpenID adreson kaj klakas 'Registri'.";
+$a->strings["If you are not familiar with OpenID, please leave that field blank and fill in the rest of the items."] = "Se vi ne konas OpenID, bonvolu lasi tiun kampon malplena kaj entajpu la aliajn elementojn.";
+$a->strings["Your OpenID (optional): "] = "Via OpenID (nedeviga):";
+$a->strings["Include your profile in member directory?"] = "Aldoni vian profilon al la membrokatalogo?";
+$a->strings["Membership on this site is by invitation only."] = "Membri�i ĉi tie nur eblas laŭ invito.";
+$a->strings["Your invitation ID: "] = "Via invita idento: ";
+$a->strings["Registration"] = "Registrado";
+$a->strings["Your Full Name (e.g. Joe Smith): "] = "Via Plena Nomo (e.g. Joe Smith): ";
+$a->strings["Your Email Address: "] = "Via Retpo�tadreso: ";
+$a->strings["Choose a profile nickname. This must begin with a text character. Your profile address on this site will then be '<strong>nickname@\$sitename</strong>'."] = "Elektu ka�nomon por la profilo. Tiu bezonas komenci kun teksta litero. Poste, via profila adreso ĉi tie estos: '<strong>ka�nomo@\$sitename</strong>'.";
+$a->strings["Choose a nickname: "] = "Elektu ka�nomon: ";
+$a->strings["Register"] = "Registri";
+$a->strings["People Search"] = "Serĉi Membrojn";
+$a->strings["status"] = "staton";
+$a->strings["%1\$s likes %2\$s's %3\$s"] = "%1\$s �atas la %3\$s de %2\$s";
+$a->strings["%1\$s doesn't like %2\$s's %3\$s"] = "%1\$s mal�atas la %3\$s de %2\$s";
+$a->strings["Item not found."] = "Elemento ne estas trovita.";
+$a->strings["Access denied."] = "Atingo nepermesita.";
+$a->strings["Account approved."] = "Konto aprobita.";
+$a->strings["Registration revoked for %s"] = "Registraĵo por %s senvalidigita.";
+$a->strings["Please login."] = "Bonvolu ensaluti.";
+$a->strings["Unable to locate original post."] = "Ne eblas trovi originalan afi�on.";
+$a->strings["Empty post discarded."] = "Forvi�is malplenan afi�on.";
+$a->strings["Wall Photos"] = "Muraj Bildoj";
+$a->strings["System error. Post not saved."] = "Sistema eraro. Afi�o ne registrita.";
+$a->strings["This message was sent to you by %s, a member of the Friendica social network."] = "Ĉi mesa�o estas sendita al vi de %s, membro de la Friendica interkona reto.";
+$a->strings["You may visit them online at %s"] = "Vi povas viziti ilin rete ĉe %s";
+$a->strings["Please contact the sender by replying to this post if you do not wish to receive these messages."] = "Bonvolu rispondi al ĉi mesa�o kaj kontaktu la sendinto se vi ne volas ricevi tiujn mesa�ojn.";
+$a->strings["%s posted an update."] = "%s publikigis afi�on.";
+$a->strings["Image uploaded but image cropping failed."] = "Bildo estas al�utita, sed malsukcesis tranĉi la bildon.";
+$a->strings["Image size reduction [%s] failed."] = "Malsukcesis malpligrandigi [%s] la bildon.";
+$a->strings["Shift-reload the page or clear browser cache if the new photo does not display immediately."] = "Re�ar�u la pa�on au malplenigu la ka�memoro de la retesplorilo se la nova bildo ne tuj aperas.";
+$a->strings["Unable to process image"] = "Ne eblas procezi bildon.";
+$a->strings["Image exceeds size limit of %d"] = "Bildo estas pli granda ol la limito %d";
+$a->strings["Upload File:"] = "Al�uti dosieron:";
+$a->strings["Upload Profile Photo"] = "Al�uti profilbildon";
+$a->strings["Upload"] = "Al�uti";
+$a->strings["skip this step"] = "Preterpasi tian pa�on";
+$a->strings["select a photo from your photo albums"] = "elekti bildon el viaj albumoj";
+$a->strings["Crop Image"] = "Stuci Bildon";
+$a->strings["Please adjust the image cropping for optimum viewing."] = "Bonvolu agordi la stuco de la bildo por optimuma aspekto.";
+$a->strings["Done Editing"] = "Finigi Redaktado";
+$a->strings["Image uploaded successfully."] = "Bildo estas sukcese en�utita.";
+$a->strings["No profile"] = "Neniu profilo";
+$a->strings["Remove My Account"] = "Forigi Mian Konton";
+$a->strings["This will completely remove your account. Once this has been done it is not recoverable."] = "Tio tute forigos vian konton. Kiam farita, la konto ne estas restaÅ­rebla.";
+$a->strings["Please enter your password for verification:"] = "Bonvolu entajpi vian pasvorton por kontrolado:";
+$a->strings["New Message"] = "Nova Mesa�o";
+$a->strings["Unable to locate contact information."] = "Ne eblas trovi kontaktajn informojn.";
+$a->strings["Message deleted."] = "Mesa�o estas forvi�ita.";
+$a->strings["Conversation removed."] = "Dialogo estas forvi�ita.";
+$a->strings["No messages."] = "Neniom da mesa�oj.";
+$a->strings["Unknown sender - %s"] = "Nekonata sendanto - %s";
+$a->strings["You and %s"] = "Vi kaj %s";
+$a->strings["%s and You"] = "%s kaj vi";
+$a->strings["Delete conversation"] = "Forvi�i dialogon";
+$a->strings["D, d M Y - g:i A"] = "D, d M Y - g:i A";
+$a->strings["%d message"] = array(
+	0 => "%d mesa�o",
+	1 => "%d mesa�oj",
+);
+$a->strings["Message not available."] = "Mesa�o nedisponebla.";
+$a->strings["Delete message"] = "Forvi�u mesa�on";
+$a->strings["No secure communications available. You <strong>may</strong> be able to respond from the sender's profile page."] = "Sekura komunikado ne disponeblas. Vi <strong>eble</strong> povus respondi sur la profilpa�o de la sendanto.";
+$a->strings["Send Reply"] = "Respondi";
+$a->strings["Friends of %s"] = "Amikoj de %s";
+$a->strings["No friends to display."] = "Neniom da amiko al montri.";
+$a->strings["Theme settings updated."] = "Gisdatigis agordojn pri etosoj.";
+$a->strings["Site"] = "Retejo";
+$a->strings["Users"] = "Uzantoj";
+$a->strings["Plugins"] = "Kromprogramoj";
+$a->strings["Themes"] = "Etosoj";
+$a->strings["Logs"] = "Protokoloj";
+$a->strings["User registrations waiting for confirmation"] = "Uzantaj registradoj atendante konfirmon";
+$a->strings["Administration"] = "Administrado";
+$a->strings["Summary"] = "Resumo";
+$a->strings["Registered users"] = "Registrataj uzantoj";
+$a->strings["Pending registrations"] = "Okazontaj registradoj";
+$a->strings["Version"] = "Versio";
+$a->strings["Active plugins"] = "Åœaltitaj kromprogramoj";
+$a->strings["Site settings updated."] = "Äœisdatigis retejaj agordoj.";
+$a->strings["Closed"] = "Ferma";
+$a->strings["Requires approval"] = "Bezonas aprobon";
+$a->strings["Open"] = "Malferma";
+$a->strings["No SSL policy, links will track page SSL state"] = "Sen SSL strategio. Ligiloj sekvos la SSL staton de la pa�o.";
+$a->strings["Force all links to use SSL"] = "Devigi ke ĉiuj ligiloj uzu SSL.";
+$a->strings["Self-signed certificate, use SSL for local links only (discouraged)"] = "Memsubskribita atestilo, nur uzu SSL por lokaj ligiloj (malkura�igata)";
+$a->strings["File upload"] = "Al�uto";
+$a->strings["Policies"] = "Politiko";
+$a->strings["Advanced"] = "Altnivela";
+$a->strings["Site name"] = "Nomo de retejo";
+$a->strings["Banner/Logo"] = "Emblemo";
+$a->strings["System language"] = "Sistema lingvo";
+$a->strings["System theme"] = "Sistema etoso";
+$a->strings["Default system theme - may be over-ridden by user profiles - <a href='#' id='cnftheme'>change theme settings</a>"] = "DefaÅ­lta sistema etoso - transpasebla de uzantprofiloj -  <a href='#' id='cnftheme'>redakti agordoj pri etosoj</a>";
+$a->strings["SSL link policy"] = "Strategio por SSL ligiloj";
+$a->strings["Determines whether generated links should be forced to use SSL"] = "Difinas ĉu generotaj ligiloj devige uzu SSL.";
+$a->strings["Maximum image size"] = "Maksimuma bildgrando";
+$a->strings["Maximum size in bytes of uploaded images. Default is 0, which means no limits."] = "Maksimuma grando en bajtoj por al�utotaj bildoj. Defaŭlte 0, kio signifas neniu limito.";
+$a->strings["Register policy"] = "Interkonsento pri registrado";
+$a->strings["Register text"] = "Interkonsento teksto";
+$a->strings["Will be displayed prominently on the registration page."] = "Tio estos eminente montrata en la registro pa�o.";
+$a->strings["Accounts abandoned after x days"] = "Kontoj forlasitaj post x tagoj";
+$a->strings["Will not waste system resources polling external sites for abandoned accounts. Enter 0 for no time limit."] = "Mi ne mal�paru energion por enketi aliajn retejojn pri forlasitaj kontoj. Entajpu 0 por ne uzi templimo.";
+$a->strings["Allowed friend domains"] = "Permesitaj amikaj domainoj";
+$a->strings["Comma separated list of domains which are allowed to establish friendships with this site. Wildcards are accepted. Empty to allow any domains"] = "Perkome disigita listo da domajnoj kiuj rajtas konstrui amikecojn kun ĉi tiu retejo. Ĵokeroj eblas. Malplena por rajtigi ĉiujn ajn domajnojn.";
+$a->strings["Allowed email domains"] = "Permesitaj retpo�taj domajnoj";
+$a->strings["Comma separated list of domains which are allowed in email addresses for registrations to this site. Wildcards are accepted. Empty to allow any domains"] = "Perkome disigita listo da domajnoj kiuj uzeblas kiel retpo�taj adresoj en novaj registradoj. Ĵokeroj eblas. Malplena por rajtigi ĉiujn ajn domajnojn.";
+$a->strings["Block public"] = "Bloki publike";
+$a->strings["Check to block public access to all otherwise public personal pages on this site unless you are currently logged in."] = "Elektu por bloki publikan atingon al ĉiuj alie publikajn pa�ojn en ĉi tiu retejo kiam vi ne estas ensalutita.";
+$a->strings["Force publish"] = "Devigi publikigon";
+$a->strings["Check to force all profiles on this site to be listed in the site directory."] = "Elektu por devigi la registradon en la loka katalogo al ĉiuj profiloj en ĉi tiu retejo.";
+$a->strings["Global directory update URL"] = "Ĝenerala adreso por �isdatigi la katalogon";
+$a->strings["URL to update the global directory. If this is not set, the global directory is completely unavailable to the application."] = "URL adreso por �isdatigi la tutmondan katalogon. Se ne agordita, la tutmonda katatolge tute ne disponeblas al la programo.";
+$a->strings["Block multiple registrations"] = "Bloki pluroblajn registradojn.";
+$a->strings["Disallow users to register additional accounts for use as pages."] = "Malpermesi al uzantoj la permeson por registri pluajn kontojn kiel pa�oj.";
+$a->strings["OpenID support"] = "Subteno por OpenID";
+$a->strings["OpenID support for registration and logins."] = "Subteni OpenID por registrado kaj ensaluto.";
+$a->strings["Fullname check"] = "Kontroli plenan nomon";
+$a->strings["Force users to register with a space between firstname and lastname in Full name, as an antispam measure"] = "Kiel kontraÅ­spamilo, devigi uzantoj al registrado kun spaceto inter la persona nomo kaj la familia nomo.";
+$a->strings["UTF-8 Regular expressions"] = "UTF-8 regulaj exprimoj";
+$a->strings["Use PHP UTF8 regular expressions"] = "Uzi PHP UTF8 regulajn esprimojn.";
+$a->strings["Show Community Page"] = "Montri Komunuma Pa�o";
+$a->strings["Display a Community page showing all recent public postings on this site."] = "Montri komunuma pa�o kun ĉiuj ĵusaj afi�oj en ĉi tiu retejo.";
+$a->strings["Enable OStatus support"] = "Åœalti subtenon por OStatus";
+$a->strings["Provide built-in OStatus (identi.ca, status.net, etc.) compatibility. All communications in OStatus are public, so privacy warnings will be occasionally displayed."] = "Provizi integritan OStatus (identi.ca, status.net ktp) subtenon. Ĉiuj komunikadoj en OStatus estas publikaj, do privatecaj avertoj aperos de tempo al tempo.";
+$a->strings["Enable Diaspora support"] = "Åœalti subtenon por Diaspora";
+$a->strings["Provide built-in Diaspora network compatibility."] = "Provizi integritan Diaspora subtenon.";
+$a->strings["Only allow Friendica contacts"] = "Nur permesigi Friendica kontaktojn";
+$a->strings["All contacts must use Friendica protocols. All other built-in communication protocols disabled."] = "Ĉiuj kontaktoj devas uzi Friendica protokolojn. Ĉiuj aliaj komunikaj protokoloj malaktivita.";
+$a->strings["Verify SSL"] = "Kontroli SSL";
+$a->strings["If you wish, you can turn on strict certificate checking. This will mean you cannot connect (at all) to self-signed SSL sites."] = "Se vi deziras, vi povas aktivigi severan kontroladon de SSL atestiloj. Pro tio, vie (tute) ne eblos konekti al SSL retejoj kun memsubskribitaj atestiloj.";
+$a->strings["Proxy user"] = "Uzantnomo por retperanto";
+$a->strings["Proxy URL"] = "URL adreso de retperanto";
+$a->strings["Network timeout"] = "Reta tempolimo";
+$a->strings["Value is in seconds. Set to 0 for unlimited (not recommended)."] = "Valoro en sekundoj. Uzu 0 por mallimitigi (ne rekomendata).";
+$a->strings["%s user blocked/unblocked"] = array(
+	0 => "Blokis/malblokis %s uzanton",
+	1 => "Blokis/malblokis %s uzantojn",
+);
+$a->strings["%s user deleted"] = array(
+	0 => "%s uzanto forvi�ita",
+	1 => "%s uzanto forvi�itaj",
+);
+$a->strings["User '%s' deleted"] = "Uzanto '%s' forvi�ita";
+$a->strings["User '%s' unblocked"] = "Uzanto '%s' malblokita";
+$a->strings["User '%s' blocked"] = "Uzanto '%s' blokita";
+$a->strings["select all"] = "elekti ĉiujn";
+$a->strings["User registrations waiting for confirm"] = "Registri�oj atendante aprobon";
+$a->strings["Request date"] = "Dato de peto";
+$a->strings["Email"] = "Retpo�to";
+$a->strings["No registrations."] = "Neniom da registri�oj.";
+$a->strings["Deny"] = "Negi";
+$a->strings["Register date"] = "Dato de registrado";
+$a->strings["Last login"] = "Plej ĵusa ensaluto";
+$a->strings["Last item"] = "Plej ĵusa elemento";
+$a->strings["Account"] = "Konto";
+$a->strings["Selected users will be deleted!\\n\\nEverything these users had posted on this site will be permanently deleted!\\n\\nAre you sure?"] = "La elektitaj uzantkontoj estas forvi�otaj!\\n\\nĈiuj elementoj kiujn ili afi�is je la retpa�o estos permanente forvi�itaj.\\n\\nĈu vi certas?";
+$a->strings["The user {0} will be deleted!\\n\\nEverything this user has posted on this site will be permanently deleted!\\n\\nAre you sure?"] = "La uzanto {0} estas forvi�ota!\\n\\nĈiuj elementoj kiujn li afi�is je la retpa�o estos permanente forvi�itaj.\\n\\nĈu vi certas?";
+$a->strings["Plugin %s disabled."] = "Kromprogramo %s estas mal�altita.";
+$a->strings["Plugin %s enabled."] = "Kromprogramo %s estas �altita.";
+$a->strings["Disable"] = "Mal�alti";
+$a->strings["Enable"] = "Åœalti";
+$a->strings["Toggle"] = "Ŝalti/Mal�alti";
+$a->strings["Author: "] = "AÅ­toro: ";
+$a->strings["Maintainer: "] = "Prizorganto: ";
+$a->strings["No themes found."] = "Ne trovis etosojn.";
+$a->strings["Screenshot"] = "Ekrankopio";
+$a->strings["[Experimental]"] = "[Eksperimenta]";
+$a->strings["[Unsupported]"] = "[Nesubtenata]";
+$a->strings["Log settings updated."] = "Protokolagordoj �isdatigitaj.";
+$a->strings["Clear"] = "Forvi�i";
+$a->strings["Debugging"] = "Sencimigado";
+$a->strings["Log file"] = "Protokolo";
+$a->strings["Must be writable by web server. Relative to your Friendica top-level directory."] = "Devas esti skribebla de la retservilo. Relativa al via plej supra Friendica dosierujo.";
+$a->strings["Log level"] = "Protokolnivelo";
+$a->strings["Close"] = "Fermi";
+$a->strings["FTP Host"] = "FTP Servilo";
+$a->strings["FTP Path"] = "FTP Vojo";
+$a->strings["FTP User"] = "FTP Uzanto";
+$a->strings["FTP Password"] = "FTP Pasvorto";
+$a->strings["Requested profile is not available."] = "La petita profilo ne disponeblas.";
+$a->strings["Access to this profile has been restricted."] = "Atingo al ĉi tio profilo estas limitigita";
+$a->strings["Tips for New Members"] = "Konsilo por novaj membroj";
+$a->strings["{0} wants to be your friend"] = "{0} volas amiki�i kun vi";
+$a->strings["{0} sent you a message"] = "{0} sendis mesa�on al vi";
+$a->strings["{0} requested registration"] = "{0} petis registradon";
+$a->strings["{0} commented %s's post"] = "{0} komentis pri la afi�o de %s";
+$a->strings["{0} liked %s's post"] = "{0} satis la afi�on de %s";
+$a->strings["{0} disliked %s's post"] = "{0} mal�atis la afi�on de %s";
+$a->strings["{0} is now friends with %s"] = "{0} amiki�is kun %s";
+$a->strings["{0} posted"] = "{0} afi�is";
+$a->strings["{0} tagged %s's post with #%s"] = "{0} markis la afi�on de %s kun #%s";
+$a->strings["{0} mentioned you in a post"] = "{0} menciis vin en afi�o";
+$a->strings["Contacts who are not members of a group"] = "Kontaktoj kiuj ne estas en iu grupo";
+$a->strings["OpenID protocol error. No ID returned."] = "Eraro en OpenID protokolo. Ne resendis identecon.";
+$a->strings["Account not found and OpenID registration is not permitted on this site."] = "Ne trovis kontoj, kaj registrado tra OpenID estas malpermesita ĉi tie.";
+$a->strings["Login failed."] = "Ensalutado malsukcesis.";
+$a->strings["Connect URL missing."] = "Ne ekzistas URL adreso por konekti.";
+$a->strings["This site is not configured to allow communications with other networks."] = "Tiu retpa�o ne permesas komunikadon kun aliaj retoj.";
+$a->strings["No compatible communication protocols or feeds were discovered."] = "Ne malkovris kongruajn protokolojn por komunikado aÅ­ fluojn.";
+$a->strings["The profile address specified does not provide adequate information."] = "La specifita profiladreso ne enhavas sufiĉe da informoj.";
+$a->strings["An author or name was not found."] = "Ne trovis aÅ­toron aÅ­ nomon.";
+$a->strings["No browser URL could be matched to this address."] = "Neniu retuma URL adreso kongruas al la adreso.";
+$a->strings["The profile address specified belongs to a network which has been disabled on this site."] = "Tiu profila adreso apartenas al retejo kiu estas ma�altita je ĉi tiu retejo.";
+$a->strings["Limited profile. This person will be unable to receive direct/personal notifications from you."] = "Profilo limigata. Ĉi persono ne eblos ricevi rektajn/personajn atentigojn de vi. ";
+$a->strings["Unable to retrieve contact information."] = "Ne eblas ricevi kontaktinformojn.";
+$a->strings["following"] = "sekvanta";
+$a->strings["Common Friends"] = "Komunaj Amikoj";
+$a->strings["No friends in common."] = "Neniom da komunaj amikoj.";
+$a->strings["Item has been removed."] = "Elemento estas forvi�ita.";
+$a->strings["Applications"] = "Programoj";
+$a->strings["No installed applications."] = "Neniom da instalitaj programoj.";
+$a->strings["Search This Site"] = "Serĉi ĉi-tiun retejon";
+$a->strings["Profile not found."] = "Profilo ne trovita.";
+$a->strings["Profile Name is required."] = "Nomo de profilo estas bezonata.";
+$a->strings["Marital Status"] = "Amrilata Stato";
+$a->strings["Romantic Partner"] = "Kora Partnero";
+$a->strings["Work/Employment"] = "Laboro";
+$a->strings["Religion"] = "Religio";
+$a->strings["Political Views"] = "Politikaj Opinioj";
+$a->strings["Gender"] = "Sekso";
+$a->strings["Sexual Preference"] = "Seksa Prefero";
+$a->strings["Homepage"] = "Hejmpa�o";
+$a->strings["Interests"] = "Interesoj";
+$a->strings["Location"] = "Loko";
+$a->strings["Profile updated."] = "Profilo �isdatigita.";
+$a->strings["public profile"] = "publika profilo";
+$a->strings["%1\$s has an updated %2\$s, changing %3\$s."] = "%1\$s havas �isdatigigan %2\$s, �an�as %3\$s.";
+$a->strings["Profile deleted."] = "Profilo forvi�ita.";
+$a->strings["Profile-"] = "Profilo-";
+$a->strings["New profile created."] = "Nova profilo kreita.";
+$a->strings["Profile unavailable to clone."] = "Ne eblas kopii profilon.";
+$a->strings["Hide your contact/friend list from viewers of this profile?"] = "Ka�i vian liston de kontaktoj/amikoj al vidantoj de ĉi-tio profilo?";
+$a->strings["Edit Profile Details"] = "Redakti Detalojn de Profilo";
+$a->strings["View this profile"] = "Vidi la profilon.";
+$a->strings["Create a new profile using these settings"] = "Krei novan profilon kun tiaj agordoj";
+$a->strings["Clone this profile"] = "Kopii ĉi tiun profilon";
+$a->strings["Delete this profile"] = "Forvi�i ĉi tiun profilon";
+$a->strings["Profile Name:"] = "Nomo de Profilo:";
+$a->strings["Your Full Name:"] = "Via Plena Nomo:";
+$a->strings["Title/Description:"] = "Titolo/Priskribo:";
+$a->strings["Your Gender:"] = "Via Sekso:";
+$a->strings["Birthday (%s):"] = "Naski�tago (%s):";
+$a->strings["Street Address:"] = "Adreso:";
+$a->strings["Locality/City:"] = "Urbo:";
+$a->strings["Postal/Zip Code:"] = "Po�tkodo:";
+$a->strings["Country:"] = "Lando:";
+$a->strings["Region/State:"] = "Åœtato:";
+$a->strings["<span class=\"heart\">&hearts;</span> Marital Status:"] = "<span class=\"heart\">&hearts;</span> Civita Stato:";
+$a->strings["Who: (if applicable)"] = "Kiu (se aplikeble):";
+$a->strings["Examples: cathy123, Cathy Williams, cathy@example.com"] = "Ekzemploj: cathy123, Cathy Williams, cathy@example.com";
+$a->strings["Sexual Preference:"] = "Seksa Prefero:";
+$a->strings["Homepage URL:"] = "Adreso de Hejmpa�o:";
+$a->strings["Political Views:"] = "Politikaj Opinioj:";
+$a->strings["Religious Views:"] = "Religiaj Opinioj:";
+$a->strings["Public Keywords:"] = "Publikaj �losilvortoj:";
+$a->strings["Private Keywords:"] = "Privataj �losilvortoj:";
+$a->strings["Example: fishing photography software"] = "Ekzemple: fi�kapti fotografio programaro";
+$a->strings["(Used for suggesting potential friends, can be seen by others)"] = "(Por sugesti amikoj. Videbla al aliaj.)";
+$a->strings["(Used for searching profiles, never shown to others)"] = "(Por serĉi profilojn. Neniam videbla al aliaj.)";
+$a->strings["Tell us about yourself..."] = "Diru al ni pri vi...";
+$a->strings["Hobbies/Interests"] = "Åœatokupoj/Interesoj";
+$a->strings["Contact information and Social Networks"] = "Kontaktaj informoj kaj Interkonaj Retejoj";
+$a->strings["Musical interests"] = "Muzikaj interesoj";
+$a->strings["Books, literature"] = "Libroj, literaturo";
+$a->strings["Television"] = "Televido";
+$a->strings["Film/dance/culture/entertainment"] = "Filmoj/dancoj/arto/amuzaĵoj";
+$a->strings["Love/romance"] = "Amo/romanco";
+$a->strings["Work/employment"] = "Laboro";
+$a->strings["School/education"] = "Lernejo/eduko";
+$a->strings["This is your <strong>public</strong> profile.<br />It <strong>may</strong> be visible to anybody using the internet."] = "Ĉi tio estas via <strong>publika</strong> profilo. Ĝi <strong>eble</strong> estas videbla al ĉiuj en interreto. ";
+$a->strings["Age: "] = "A�o:";
+$a->strings["Edit/Manage Profiles"] = "Redakti/administri Profilojn";
+$a->strings["Change profile photo"] = "Ŝan�i profilbildon";
+$a->strings["Create New Profile"] = "Krei novan profilon";
+$a->strings["Profile Image"] = "Profilbildo";
+$a->strings["visible to everybody"] = "videbla al ĉiuj";
+$a->strings["Edit visibility"] = "Redakti videblecon";
+$a->strings["Save to Folder:"] = "Konservi en Dosierujo:";
+$a->strings["- select -"] = "- elekti -";
+$a->strings["%1\$s tagged %2\$s's %3\$s with %4\$s"] = "%1\$s markis la %3\$s de %2\$s kun %4\$s";
+$a->strings["No potential page delegates located."] = "Ne trovis delegiteblajn pa�ojn.";
+$a->strings["Delegate Page Management"] = "Administrado de Delegitajn Pa�ojn";
+$a->strings["Delegates are able to manage all aspects of this account/page except for basic account settings. Please do not delegate your personal account to anybody that you do not trust completely."] = "Delegitoj povas administri ĉiujn ecojn de la konto/pa�o, escepte bazaj kontoagordoj. Bonvolu ne delegitigi vian personan konton al iu al kiu vi ne plene fidas.";
+$a->strings["Existing Page Managers"] = "Estantaj Administrantoj de la Pa�o";
+$a->strings["Existing Page Delegates"] = "Estantaj Delegitoj de la Pa�o";
+$a->strings["Potential Delegates"] = "Eblaj Delegitoj";
+$a->strings["Add"] = "Aldoni";
+$a->strings["No entries."] = "Neniom da afi�oj.";
+$a->strings["Friend Suggestions"] = "Amikosugestoj.";
+$a->strings["No suggestions available. If this is a new site, please try again in 24 hours."] = "Neniu sugestoj disponeblas. Se ĉi tiu estas nova retejo, bonvolu reprovi post 24 horoj.";
+$a->strings["Ignore/Hide"] = "Ignori/Ka�i";
+$a->strings["Global Directory"] = "Tutmonda Katalogo";
+$a->strings["Find on this site"] = "Trovi en ĉi retejo";
+$a->strings["Site Directory"] = "Reteja Katalogo";
+$a->strings["Gender: "] = "Sekso:";
+$a->strings["No entries (some entries may be hidden)."] = "Neniom da afi�oj (kelkaj afi�oj eble ne estas videbla).";
+$a->strings["%s : Not a valid email address."] = "%s: Ne estas valida retpo�tadreso.";
+$a->strings["Please join us on Friendica"] = "Bonvolu ali�i kun ni ĉe Friendica";
+$a->strings["%s : Message delivery failed."] = "%s: La livero de la mesa�o malsukcesis.";
+$a->strings["%d message sent."] = array(
+	0 => "Sendis %d mesa�on.",
+	1 => "Sendis %d mesa�ojn.",
+);
+$a->strings["You have no more invitations available"] = "Vi ne plu disponeblas invitaĵojn";
+$a->strings["Visit %s for a list of public sites that you can join. Friendica members on other sites can all connect with each other, as well as with members of many other social networks."] = "Vizitu %s por listo de publikaj retejoj kie vi povas ali�i. Anoj de Friendica ĉe aliaj retejoj povas konekti unu kun la alian, kaj ankaŭ kun membroj de multaj aliaj retejoj.";
+$a->strings["To accept this invitation, please visit and register at %s or any other public Friendica website."] = "Por akcepti ĉi tiu invito, bonvolu viziti kaj registri�i ĉe %s au alia publika Friendica retejo.";
+$a->strings["Friendica sites all inter-connect to create a huge privacy-enhanced social web that is owned and controlled by its members. They can also connect with many traditional social networks. See %s for a list of alternate Friendica sites you can join."] = "Ĉiuj Friendica retejoj interkonekti�as kaj kune faras grandan altprivatecan interkonan reton, kiun posedas kaj kontrolas �iaj membroj. Ili ankaŭ povas konekti kun multe de tradiciaj interkonaj retejoj. Vidu %s por listo de publikaj retejoj kie vi povas ali�i.";
+$a->strings["Our apologies. This system is not currently configured to connect with other public sites or invite members."] = "Senkulpigu nin. La sistemo nuntempe ne estas agordita por konekti al aliaj retejoj au inviti membrojn.";
+$a->strings["Send invitations"] = "Sendi invitojn";
+$a->strings["Enter email addresses, one per line:"] = "Entajpu retpo�tadresojn, po unu por ĉiu linio.";
+$a->strings["You are cordially invited to join me and other close friends on Friendica - and help us to create a better social web."] = "Ni bonkore invitas vin ali�i kun ni kaj aliaj bonaj amikoj ĉe Friendica. Helpu nin krei pli bonan interkonan reton.";
+$a->strings["You will need to supply this invitation code: \$invite_code"] = "Vi bezonas ĉi-tiun invitkodon: \$invite_code";
+$a->strings["Once you have registered, please connect with me via my profile page at:"] = "Kiam vi registris, bonvolu konekti al mi tra mi profilo ĉe: ";
+$a->strings["For more information about the Friendica project and why we feel it is important, please visit http://friendica.com"] = "Por pli da informoj pri Friendica, kaj kial ni pensas ke �i estas grava, bonvolu viziti http://friendica.com";
+$a->strings["This may occasionally happen if contact was requested by both persons and it has already been approved."] = "Tio ĉi okazis de tempo al tempo se ambaŭ personoj petas kontakton ka �i jam estas aprobita.";
+$a->strings["Response from remote site was not understood."] = "Ne komprenis la rispondon de la fora retejo.";
+$a->strings["Unexpected response from remote site: "] = "Neatendita rispondo de la fora retejo:";
+$a->strings["Confirmation completed successfully."] = "Konfirmo sukcese kompletigita.";
+$a->strings["Remote site reported: "] = "La fora retejo raportis:";
+$a->strings["Temporary failure. Please wait and try again."] = "Dumtempa eraro. Bonvolu atendi kaj provi refoje.";
+$a->strings["Introduction failed or was revoked."] = "La prezento malsukcesis au estas revokita.";
+$a->strings["Unable to set contact photo."] = "Neeblas agordi la kontaktbildo.";
+$a->strings["%1\$s is now friends with %2\$s"] = "%1\$s amiki�is kun %2\$s";
+$a->strings["No user record found for '%s' "] = "Ne trovis uzanton '%s' ";
+$a->strings["Our site encryption key is apparently messed up."] = "Ŝajnas kvazaŭ la ĉifro�losilo de nia retejo estas fu�ita.";
+$a->strings["Empty site URL was provided or URL could not be decrypted by us."] = "Malplena adreso de retejo provizita, aŭ ni ne povis malĉifri la adreson.";
+$a->strings["Contact record was not found for you on our site."] = "Kontakto ne trovita por vi en via retejo.";
+$a->strings["Site public key not available in contact record for URL %s."] = "Publika �losilo de retejo ne disponeblas en la kontaktrikordo por la URL adreso %s.";
+$a->strings["The ID provided by your system is a duplicate on our system. It should work if you try again."] = "La identeco provizita de via sistemo estas duoblo ĉe nia sistemo. Ĝi eble funkcias se vi provas refoje.";
+$a->strings["Unable to set your contact credentials on our system."] = "Ne sukcesis agordi la legitimaĵojn de via kontakto ĉe nia sistemo.";
+$a->strings["Unable to update your contact profile details on our system"] = "Neeblas �isdatigi viajn profildetalojn ĉe nia sistemo.";
+$a->strings["Connection accepted at %s"] = "Konekto akceptita je %s";
+$a->strings["Facebook disabled"] = "Facebook mal�altita";
+$a->strings["Updating contacts"] = "Mi �isdatigas la kontaktojn.";
+$a->strings["Facebook API key is missing."] = "La API �losilo de Facebook ne estas konata ĉi tie.";
+$a->strings["Facebook Connect"] = "Kontekto al Facebook";
+$a->strings["Install Facebook connector for this account."] = "Instali la Facebook konektilo por ĉi tiu konto.";
+$a->strings["Remove Facebook connector"] = "Forigi la Facebook konektilon.";
+$a->strings["Re-authenticate [This is necessary whenever your Facebook password is changed.]"] = "Reaŭtenti�i [Tio estas bezonata ĉiam kiam vi �an�is vian pasvorton ĉe Facebook.]";
+$a->strings["Post to Facebook by default"] = "Ĉiam afi�i al Facebook.";
+$a->strings["Link all your Facebook friends and conversations on this website"] = "Alligu ĉiujn viajn Facebook amikojn kaj konversaciojn je ĉi-tiu retejo.";
+$a->strings["Facebook conversations consist of your <em>profile wall</em> and your friend <em>stream</em>."] = "Facebok konversacioj konsistas el via <em>profilmuro</em> kaj la <em>fluo</em> de viaj amikoj.";
+$a->strings["On this website, your Facebook friend stream is only visible to you."] = "Je ĉi-tiu retejo, la fluo de viaj amikoj ĉe Facebook nur videblas al vi.";
+$a->strings["The following settings determine the privacy of your Facebook profile wall on this website."] = "La sekvontaj agordoj difinas la privatecon de via Facebook profilmuro je ĉi-tiu retejo.";
+$a->strings["On this website your Facebook profile wall conversations will only be visible to you"] = "Je ĉi-tiu retejo, la conversacioj sur via Facebook profilmuro nur videblas al vi.";
+$a->strings["Do not import your Facebook profile wall conversations"] = "Ne importi konversaciojn de via Facebook profilmuro";
+$a->strings["If you choose to link conversations and leave both of these boxes unchecked, your Facebook profile wall will be merged with your profile wall on this website and your privacy settings on this website will be used to determine who may see the conversations."] = "Se vi elektas alligi conversaciojn kaj ne elektas tiujn butonojn, via Facebook profilmuro estas kunigota kun via profilmuro ĉi tie. Viaj privatecaj agordoj ĉi tie difinos kiu povas vidi la coversaciojn.";
+$a->strings["Comma separated applications to ignore"] = "Ignorotaj programoj, disigita per komo";
+$a->strings["Problems with Facebook Real-Time Updates"] = "Problemoj kun Facebook Realtempaj Äœisdatigoj";
+$a->strings["Facebook"] = "Facebook";
+$a->strings["Facebook Connector Settings"] = "Agordoj por la Facebook konektilo";
+$a->strings["Facebook API Key"] = "Facebook API �losilo";
+$a->strings["Error: it appears that you have specified the App-ID and -Secret in your .htconfig.php file. As long as they are specified there, they cannot be set using this form.<br><br>"] = "Eraro: Ŝajnas kvazaŭ vi agordis la App-ID kaj la sekreton en via .htconfig.php dosiero. Kiam ili estas agordita tie, vi ne povas agordi �in tra tiu ĉi formo.<br><br>";
+$a->strings["Error: the given API Key seems to be incorrect (the application access token could not be retrieved)."] = "Eraro: La API �losilo aspektas mal�usta (ne eblas ricevi la programa atingoĵetono).";
+$a->strings["The given API Key seems to work correctly."] = "La API �losilo �ajne �uste funkcias.";
+$a->strings["The correctness of the API Key could not be detected. Somthing strange's going on."] = "Ne povis kontroli la �ustecon de la API �losilo. Ia stranga afero okazas. ";
+$a->strings["App-ID / API-Key"] = "Programo ID / API Åœlosilo";
+$a->strings["Application secret"] = "Programo sekreto";
+$a->strings["Polling Interval (min. %1\$s minutes)"] = "Intervalo por la enketilo (poller intervalo, minimume %1\$s mintuoj) ";
+$a->strings["Real-Time Updates"] = "Realtempaj Äœisdatigoj";
+$a->strings["Real-Time Updates are activated."] = "Realtempaj Ĝisdatigoj estas �altita";
+$a->strings["Deactivate Real-Time Updates"] = "Mal�alti Realtempaj Ĝisdatigoj";
+$a->strings["Real-Time Updates not activated."] = "Realtempaj Ĝisdatigoj estas mal�altita";
+$a->strings["Activate Real-Time Updates"] = "Åœalti Realtempaj Äœisdatigoj";
+$a->strings["The new values have been saved."] = "Konservis novajn valorojn.";
+$a->strings["Post to Facebook"] = "Afi�i al Facebook";
+$a->strings["Post to Facebook cancelled because of multi-network access permission conflict."] = "Afi�ado al Facebook nuligita ĉar okazis konflikto en la multretpermesoj.";
+$a->strings["View on Friendica"] = "Vidi ĉe Friendica";
+$a->strings["Facebook post failed. Queued for retry."] = "Malsukcesis afi�i ĉe Facebook. Enigita en vico.";
+$a->strings["Your Facebook connection became invalid. Please Re-authenticate."] = "Via Facbook konekto i�is nevalida. Bonvolu reaŭtenti�i.";
+$a->strings["Facebook connection became invalid"] = "Facebook konekto i�is nevalida.";
+$a->strings["Hi %1\$s,\n\nThe connection between your accounts on %2\$s and Facebook became invalid. This usually happens after you change your Facebook-password. To enable the connection again, you have to %3\$sre-authenticate the Facebook-connector%4\$s."] = "Saluton %1\$s,\n\nla kontekto inter viaj kontoj ĉe %2\$s kaj Facebook malvalidi�is. Tio kutime okazas post kiam via �angas vian pasvorton ĉe Facebook. Por reaktivigi la konekto, vi bezonas %3\$sreaŭtenti�i la Facebook konektilon%4\$s.";
+$a->strings["%d person likes this"] = array(
+	0 => "%d homo �atas tiun",
+	1 => "%d homoj �atas tiun",
+);
+$a->strings["%d person doesn't like this"] = array(
+	0 => "%d homo mal�atas tiun",
+	1 => "%d homo mal�atas tiun",
+);
+$a->strings["Generate new key"] = "Generi novan ĉifro�losilon";
+$a->strings["Widgets key"] = "Ŝlosilo por fenestraĵoj";
+$a->strings["Widgets available"] = "Disponeblaj fenestraĵoj";
+$a->strings["Connect on Friendica!"] = "Konekti ĉe Friendica!";
+$a->strings["YourLS Settings"] = "\"YourLS\" Agordoj";
+$a->strings["URL: http://"] = "URL adreso: http://";
+$a->strings["Username:"] = "Salutnomo:";
+$a->strings["Password:"] = "Pasvorto:";
+$a->strings["Use SSL "] = "Uzi SSL ";
+$a->strings["yourls Settings saved."] = "Konservis la agordojn de YourLS.";
+$a->strings["Post to LiveJournal"] = "Afi�i ĉe LiveJournal";
+$a->strings["LiveJournal Post Settings"] = "Agordoj pri afi�oj ĉe LiveJournal";
+$a->strings["Enable LiveJournal Post Plugin"] = "Ŝalti la LiveJournal-afi�o kromprogramon.";
+$a->strings["LiveJournal username"] = "LiveJournal Salutnomo";
+$a->strings["LiveJournal password"] = "LiveJournal pasvorto";
+$a->strings["Post to LiveJournal by default"] = "Defaŭlte afi�i al LiveJournal";
+$a->strings["Not Safe For Work (General Purpose Content Filter) settings"] = "Not Safe For Work (�enerala filtrilo por enhavoj) agordoj";
+$a->strings["This plugin looks in posts for the words/text you specify below, and collapses any content containing those keywords so it is not displayed at inappropriate times, such as sexual innuendo that may be improper in a work setting. It is polite and recommended to tag any content containing nudity with #NSFW.  This filter can also match any other word/text you specify, and can thereby be used as a general purpose content filter."] = "Tiu kromprogramo serĉas la malsupre agordatajn vortojn en afi�oj kaj malvidebligis ilin se ili enhavas iun vorton. Tiel, afi�oj ne montri�is kiuj enhavas maladekvatan enhavon, ekzemple seksumaj aferoj, kiuj ne estas adekvata, ekzemple en la laborejo. En la reto, oni kutime markas tiajn afi�ojn #NSFW - Not Safe For Work - ne adekvata por la laborejo.  La filtrilo ankaŭ serĉas ĉiujn vortojn kiujn vi agordas kaj tial funkcias kiel �enerala filtrilo.";
+$a->strings["Enable Content filter"] = "Åœalti la filtrilo por la enhavo";
+$a->strings["Comma separated list of keywords to hide"] = "Perkome disigita listo da ka�ontaj �losilvortoj";
+$a->strings["Use /expression/ to provide regular expressions"] = "Uzu /expr/ por provizi regulajn esprimojn.";
+$a->strings["NSFW Settings saved."] = "NSFW agordoj konservitaj.";
+$a->strings["%s - Click to open/close"] = "%s - Klaku por malfermi/fermi";
+$a->strings["Forums"] = "Forumoj";
+$a->strings["Planets Settings"] = "Agordo pri Planets";
+$a->strings["Enable Planets Plugin"] = "Åœalti la Planets kromprogamon";
+$a->strings["Login"] = "Ensaluti";
+$a->strings["OpenID"] = "OpenID";
+$a->strings["Latest users"] = "Ä´usaj uzantoj";
+$a->strings["Most active users"] = "Plej aktivaj uzantoj";
+$a->strings["Latest photos"] = "Ä´usaj bildoj";
+$a->strings["Latest likes"] = "Ĵusaj �atitaĵoj";
+$a->strings["event"] = "okazo";
+$a->strings["Allow to use your friendica id (%s) to connecto to external unhosted-enabled storage (like ownCloud). See <a href=\"http://www.w3.org/community/unhosted/wiki/RemoteStorage#WebFinger\">RemoteStorage WebFinger</a>"] = "Permesi vian identecon ĉe Friendica (%s) por konekti al eksteraj konservejoj subtenata de unhosted (ekz. OwnCloud). Vidu <a href=\"http://www.w3.org/community/unhosted/wiki/RemoteStorage#WebFinger\">RemoteStorage WebFinger</a>";
+$a->strings["Template URL (with {category})"] = "URL adreso de �ablono (kun {category})";
+$a->strings["OAuth end-point"] = "OAuth finpunkto";
+$a->strings["Api"] = "Api";
+$a->strings["Member since:"] = "Membro ekde:";
+$a->strings["Three Dimensional Tic-Tac-Toe"] = "Tri-dimensia Tiktakto";
+$a->strings["3D Tic-Tac-Toe"] = "3D Tiktakto";
+$a->strings["New game"] = "Nova ludo";
+$a->strings["New game with handicap"] = "Nova ludo kun handikapo";
+$a->strings["Three dimensional tic-tac-toe is just like the traditional game except that it is played on multiple levels simultaneously. "] = "Tri-dimensia tiktakto similas la tradician ludon, sed estas ludata sur pluraj ebenoj dum la sama tempo.";
+$a->strings["In this case there are three levels. You win by getting three in a row on any level, as well as up, down, and diagonally across the different levels."] = "Ĉi-kaze ekzistas tri ebenoj. Vi venkas vicigante tri signojn en una vico, en la sama ebeno, same kiel supren, malsupren aŭ diagonale, trans la ebenoj.";
+$a->strings["The handicap game disables the center position on the middle level because the player claiming this square often has an unfair advantage."] = "La ludo kun handikapo malvalidigas la mezan pozicion sur la meza ebeno, ĉar la ludisto kio okupas ĉi tiun pozicion ĉiam havas avanta�on.";
+$a->strings["You go first..."] = "Estas via vico unue.";
+$a->strings["I'm going first this time..."] = "Ĉi-tempe, unue estas mia vico.";
+$a->strings["You won!"] = "Vi venkis!";
+$a->strings["\"Cat\" game!"] = "Sendecida ludo!";
+$a->strings["I won!"] = "Mi venkis!";
+$a->strings["Randplace Settings"] = "Randplace agordoj.";
+$a->strings["Enable Randplace Plugin"] = "Aktivigi la Randplace kromprogramon.";
+$a->strings["Post to Dreamwidth"] = "Afi�i al Dreamwidth";
+$a->strings["Dreamwidth Post Settings"] = "Agordoj por Afi�oj al Dreamwidth";
+$a->strings["Enable dreamwidth Post Plugin"] = "Åœalti la Dreamwidth Kromprogramon";
+$a->strings["dreamwidth username"] = "Dreamwidth salutnomo";
+$a->strings["dreamwidth password"] = "Dreamwidth pasvorto";
+$a->strings["Post to dreamwidth by default"] = "Defaŭlte afi�i al Dreamwidth";
+$a->strings["Post to Drupal"] = "Afi�i al Drupal";
+$a->strings["Drupal Post Settings"] = "Agordoj por Drupal Afi�oj";
+$a->strings["Enable Drupal Post Plugin"] = "Ŝalti la Drupal-afi�o Kromprogramon";
+$a->strings["Drupal username"] = "Drupal salutnomo";
+$a->strings["Drupal password"] = "Drupal pasvorto";
+$a->strings["Post Type - article,page,or blog"] = "Tipo de Afi�oj - article, page, aŭ blog";
+$a->strings["Drupal site URL"] = "URL adreso de Drupal retejo";
+$a->strings["Drupal site uses clean URLS"] = "Drupal retejo uzas purajn URL adresojn";
+$a->strings["Post to Drupal by default"] = "Defaŭlte afi�i ĉe Drupal";
+$a->strings["Post from Friendica"] = "Afi�o de Friendica";
+$a->strings["Geonames settings updated."] = "Äœidatigis la Geonames agordojn.";
+$a->strings["Geonames Settings"] = "Geonames Agordoj";
+$a->strings["Enable Geonames Plugin"] = "Åœalti la Geonames Kromprogramon";
+$a->strings["Upload a file"] = "Al�uti dosieron";
+$a->strings["Drop files here to upload"] = "Ŝovmeti dosierojn ĉi tie por al�uti ilin.";
+$a->strings["Failed"] = "Malsukcesi";
+$a->strings["No files were uploaded."] = "Neniom da dosieroj al�utita.";
+$a->strings["Uploaded file is empty"] = "Al�utita dosiero estas malplena.";
+$a->strings["File has an invalid extension, it should be one of "] = "Dosiero havas nevalidan sufikson. Äœi estu unu de ";
+$a->strings["Upload was cancelled, or server error encountered"] = "Al�utado estas nuligita aŭ okazis eraro sur la servilo";
+$a->strings["OEmbed settings updated"] = "Äœisdatigis OEmbed agordojn";
+$a->strings["Use OEmbed for YouTube videos"] = "Uzi OEmbed por YouTube videtoj";
+$a->strings["URL to embed:"] = "Enigi la URL adreson:";
+$a->strings["Impressum"] = "Kolofono";
+$a->strings["Site Owner"] = "Proprietulo de la la�o";
+$a->strings["Email Address"] = "Retpo�ta Adreso";
+$a->strings["Postal Address"] = "Po�ta Adreso";
+$a->strings["The impressum addon needs to be configured!<br />Please add at least the <tt>owner</tt> variable to your config file. For other variables please refer to the README file of the addon."] = "La kolofono (impressum) kromprogramo bezonas agordojn!<br />Bonvolu aldoni minimume la <tt>owner</tt> variablon al via agorda dosiero. Por aliaj variabloj, bonvolu legi la README dosieron de la kromprogramo.";
+$a->strings["The page operators name."] = "La nomo de la funkciigisto de la retejo.";
+$a->strings["Site Owners Profile"] = "Profilo de la Proprietulo de la Retejo";
+$a->strings["Profile address of the operator."] = "La profilo de la funkciigisto de la retejo.";
+$a->strings["How to contact the operator via snail mail."] = "Kiel kontakti la funkciigiston de la retejo tra paperpo�to.";
+$a->strings["Notes"] = "Notoj";
+$a->strings["Additional notes that are displayed beneath the contact information."] = "Pliaj notoj kiuj estas montrigota malsupre la kontaktinformojn.";
+$a->strings["How to contact the operator via email. (will be displayed obfuscated)"] = "Kiel kontakti la funkciigiston de la retejo tra retpo�to. (montri�os vuale) ";
+$a->strings["Footer note"] = "Pa�piednoto";
+$a->strings["Text for the footer."] = "Teksto por la pa�piedo.";
+$a->strings["Report Bug"] = "Skribi cimraporton";
+$a->strings["\"Blockem\" Settings"] = "\"Blockem\" Agordoj";
+$a->strings["Comma separated profile URLS to block"] = "Blokotaj URL adresoj, disigita per komo";
+$a->strings["BLOCKEM Settings saved."] = "Konservis Agordojn de BLOCKEM.";
+$a->strings["Blocked %s - Click to open/close"] = "%s blokita - Klaku por malfermi/fermi";
+$a->strings["Unblock Author"] = "Malbloki AÅ­toron";
+$a->strings["Block Author"] = "Bloki AÅ­toron";
+$a->strings["blockem settings updated"] = "Äœisdatigis la blockem agordojn";
+$a->strings[":-)"] = ":-)";
+$a->strings[":-("] = ":-(";
+$a->strings["lol"] = "lol";
+$a->strings["Quick Comment Settings"] = "Agordoj pri Rapidaj Komentoj";
+$a->strings["Quick comments are found near comment boxes, sometimes hidden. Click them to provide simple replies."] = "Rapidaj komentoj trovi�as apud komentkampoj, kelkfoje ka�ita. Klaku ilin por provizi simplajn rispondojn.";
+$a->strings["Enter quick comments, one per line"] = "Entajpu rapidaj komentoj, po unu je linio.";
+$a->strings["Quick Comment settings saved."] = "Konservis agordojn pri rapidaj komentoj.";
+$a->strings["Tile Server URL"] = "Adreso de Kahelservilo";
+$a->strings["A list of <a href=\"http://wiki.openstreetmap.org/wiki/TMS\" target=\"_blank\">public tile servers</a>"] = "Listo de <a href=\"http://wiki.openstreetmap.org/wiki/TMS\" target=\"_blank\">publikaj kahelserviloj</a>";
+$a->strings["Default zoom"] = "DefaÅ­lta zoma faktoro";
+$a->strings["The default zoom level. (1:world, 18:highest)"] = "La defaÅ­lta zoma faktoro. (1:tutmonda, 18:plej proksima)";
+$a->strings["The MathJax addon renders mathematical formulae written using the LaTeX syntax surrounded by the usual $$ or an eqnarray block in the postings of your wall,network tab and private mail."] = "La Mathjax kromprogramo bildigas matematikajn formulojn skribitajn en la LaTeX sintakso, cirkaŭigita de la komuna $$ aŭ eqnarray bloko en afi�oj ĉe via muro, Reto folio kaj privataj mesa�oj.";
+$a->strings["Use the MathJax renderer"] = "Ĉu uzi la Mathjax bildigilo";
+$a->strings["MathJax Base URL"] = "Mathjax Baza URL Adreso";
+$a->strings["The URL for the javascript file that should be included to use MathJax. Can be either the MathJax CDN or another installation of MathJax."] = "La URL adreso por la javascript dosiero kiu estas inkluzivigonta por uzi Mathjaz. Eblas esti aÅ­ la Mathjax CDN aÅ­ alia Mathjax instalo.";
+$a->strings["Editplain settings updated."] = "Äœisdatigis la Editplain agordojn.";
+$a->strings["Editplain Settings"] = "Agordoj por Editplain";
+$a->strings["Disable richtext status editor"] = "Mal�alti la riĉteksto-redaktilon";
+$a->strings["generic profile image"] = "komuna profilbildo";
+$a->strings["random geometric pattern"] = "loteca geometria skemo";
+$a->strings["monster face"] = "monstrobildo";
+$a->strings["computer generated face"] = "komputita viza�o";
+$a->strings["retro arcade style face"] = "retrostila videoludstila viza�o";
+$a->strings["Default avatar image"] = "DefaÅ­lta avatarbildo";
+$a->strings["Select default avatar image if none was found at Gravatar. See README"] = "Elektu defaŭltan avatarbildon se neniu trovi�is ĉe Gravatar. Vidu README.";
+$a->strings["Rating of images"] = "Pritakso de bildoj";
+$a->strings["Select the appropriate avatar rating for your site. See README"] = "Elektu la �ustan pritakson de via avataro por via retejo. Vidu README.";
+$a->strings["Gravatar settings updated."] = "Gravatar agordoj �isdatigitaj.";
+$a->strings["Your account on %s will expire in a few days."] = "Via konto ĉe %s senvalidi�os post kelkaj tagoj.";
+$a->strings["Your Friendica test account is about to expire."] = "Via Friendica provkonto baldaŭ malaktivi�os.";
+$a->strings["Hi %1\$s,\n\nYour test account on %2\$s will expire in less than five days. We hope you enjoyed this test drive and use this opportunity to find a permanent Friendica website for your integrated social communications. A list of public sites is available at http://dir.friendica.com/siteinfo - and for more information on setting up your own Friendica server please see the Friendica project website at http://friendica.com."] = "Saluton %1\$s,\n\nVia testkonto ĉe %2\$s senvalidi�os post malpli ol kvin tagoj. Vi esperas ke vi �uis la teston kaj baldaŭ trovos�ustan Friendica retejon por via integrita sociala komunikado. Listo de publikaj retejoj trovi�as ĉe http://dir.friendica.com/siteinfo - kaj por pli da informoj pri kiel instali vian propran Friendica servilon, bonvolu viziti la retejon de la Friendica projekton ĉe http://friendica.com.";
+$a->strings["\"pageheader\" Settings"] = "\"pageheader\" Agordoj";
+$a->strings["pageheader Settings saved."] = "Konservis Agordojn de pageheader.";
+$a->strings["Post to Insanejournal"] = "Afi�i al Insanejournal";
+$a->strings["InsaneJournal Post Settings"] = "Agordoj pri Insaenejournal Afi�oj";
+$a->strings["Enable InsaneJournal Post Plugin"] = "Ŝalti la InsaneJournal afi�o kromprogramon.";
+$a->strings["InsaneJournal username"] = "Salutnomo ĉe InsaneJournal";
+$a->strings["InsaneJournal password"] = "Pasvorto ĉe InsaneJournal";
+$a->strings["Post to InsaneJournal by default"] = "Defaŭlte afi�i ĉe InsaneJournal";
+$a->strings["View Source"] = "Vidi Fonton";
+$a->strings["Post to StatusNet"] = "Afi�i ĉe StatusNet";
+$a->strings["Please contact your site administrator.<br />The provided API URL is not valid."] = "Bonvolu kontaki vian retejan administranton.<br />La API URL adreso ne validas.";
+$a->strings["We could not contact the StatusNet API with the Path you entered."] = "Ni ne povis trovi la StatusNet API kun la vojo kiun vi entajpis.";
+$a->strings["StatusNet settings updated."] = "StatusNet agordoj �isdatigita.";
+$a->strings["StatusNet Posting Settings"] = "Agordoj por StausNet afi�oj";
+$a->strings["Globally Available StatusNet OAuthKeys"] = "Ĝeneralaj disponeblaj StatusNet OAuth �losiloj";
+$a->strings["There are preconfigured OAuth key pairs for some StatusNet servers available. If you are useing one of them, please use these credentials. If not feel free to connect to any other StatusNet instance (see below)."] = "Disponeblas antaŭagorditaj �losilparoj por kelkaj StatusNet serviloj. Se via uzas iun de iu, bonvolu uzi unun de tiuj legitimaĵojn. Se ne, bonvolu konekti al iu alia StatusNet servilo (vidu malsupre).";
+$a->strings["Provide your own OAuth Credentials"] = "Provizi viajn proprajn OAuth legitimaĵojn";
+$a->strings["No consumer key pair for StatusNet found. Register your Friendica Account as an desktop client on your StatusNet account, copy the consumer key pair here and enter the API base root.<br />Before you register your own OAuth key pair ask the administrator if there is already a key pair for this Friendica installation at your favorited StatusNet installation."] = "Ne trovis klientajn �losilojn por StatusNet. Registru vian Friendica konton kiel klientkomputilo/desktop client en via StausNet konto. Kopiu la klientajn �losilojn ĉi tien kaj entajpu la baza API radiko.<br />Antaŭ vi registros viajn proprajn OAuth �losilojn, demandu al la administranto ĉu jam ekzistas �losiloj por ĉi-tiu Friendia retejo je via StatusNet retejo.";
+$a->strings["OAuth Consumer Key"] = "OAuth Åœlosilo de Kliento";
+$a->strings["OAuth Consumer Secret"] = "OAuth Sekreto de Kliento";
+$a->strings["Base API Path (remember the trailing /)"] = "Baza vojo al la API (ne forgesu la finan /)";
+$a->strings["To connect to your StatusNet account click the button below to get a security code from StatusNet which you have to copy into the input box below and submit the form. Only your <strong>public</strong> posts will be posted to StatusNet."] = "Por konekti al vian konton ĉe StatusNet, klaku la malsupran butonon por atingi sekurecan kodon de StatusNet, kiun vi devas alglui en la malsupra kampo kaj sendi la formon. Nur viaj <strong>publikaj</strong> afi�oj estos afi�ota al StatusNet.";
+$a->strings["Log in with StatusNet"] = "Ensaluti kun StatusNet.";
+$a->strings["Copy the security code from StatusNet here"] = "Alglui la kodon de StatusNet ĉi tie:";
+$a->strings["Cancel Connection Process"] = "Nuligi Konektadon";
+$a->strings["Current StatusNet API is"] = "La nuna StatusNet API estas";
+$a->strings["Cancel StatusNet Connection"] = "Nuligi Konekton al StatusNet";
+$a->strings["Currently connected to: "] = "Konektita al:";
+$a->strings["If enabled all your <strong>public</strong> postings can be posted to the associated StatusNet account. You can choose to do so by default (here) or for every posting separately in the posting options when writing the entry."] = "Kiam �altita, ĉiuj <strong>publikaj</strong> afi�oj de vi ankaŭ eblas esti afi�ota al la asociigita StatusNet konto. Vi povas elekti �in defaŭlte (ĉi tie) au unuope por ĉiuj afi�oj kiam vi skribos ilin.";
+$a->strings["<strong>Note</strong>: Due your privacy settings (<em>Hide your profile details from unknown viewers?</em>) the link potentially included in public postings relayed to StatusNet will lead the visitor to a blank page informing the visitor that the access to your profile has been restricted."] = "<strong>Averto</strong>: Laŭ viaj privatecaj agordoj (<em>Ka�i viajn profilajn detalojn al nekonataj spektantoj?</em>), la ligilo en publikaj afi�oj plusendata al StatusNet gvidas vizitontojn al malplena pa�o sciigante ilin ke atingo al via profilo estas lmitigita.";
+$a->strings["Allow posting to StatusNet"] = "Permesi afi�ojn al StatusNet";
+$a->strings["Send public postings to StatusNet by default"] = "Defaŭlte sendi publikajn afi�ojn al StatusNet";
+$a->strings["Send #tag links to StatusNet"] = "Sendu #marko ligilojn al StatusNet";
+$a->strings["Clear OAuth configuration"] = "Forvi�i OAuth agordojn";
+$a->strings["API URL"] = "API URL adreso";
+$a->strings["Post to Tumblr"] = "Afi�i al Tumblr";
+$a->strings["Tumblr Post Settings"] = "Agordoj pri afi�oj ĉe Tumblr";
+$a->strings["Enable Tumblr Post Plugin"] = "Ŝalti la kromprogramon por Tumblr afi�oj";
+$a->strings["Tumblr login"] = "Salutnomo ĉe Tumblr";
+$a->strings["Tumblr password"] = "Pasvorto ĉe Tumblr";
+$a->strings["Post to Tumblr by default"] = "Defaŭlte afi�i ĉe Tumblr";
+$a->strings["Numfriends settings updated."] = "Äœisdatigis agordojn por Numfriends.";
+$a->strings["Numfriends Settings"] = "Agordoj por Numfriends";
+$a->strings["How many contacts to display on profile sidebar"] = "Kiom da kontaktoj mi montru en la flanka strio";
+$a->strings["Gnot settings updated."] = "Äœisdatigis Gnot agordojn.";
+$a->strings["Gnot Settings"] = "Agordoj por Gnot";
+$a->strings["Allows threading of email comment notifications on Gmail and anonymising the subject line."] = "Permesas la ĉenadon de retpo�taj atentigoj pri komentoj ĉe Gmail kan anonimigado de la temlinio.";
+$a->strings["Enable this plugin/addon?"] = "Åœalti tiun kromprogramon?";
+$a->strings["[Friendica:Notify] Comment to conversation #%d"] = "[Friendica:Atentigo] Komento pri konversacio #%d";
+$a->strings["Post to Wordpress"] = "Afi�i al Wordpress";
+$a->strings["WordPress Post Settings"] = "Agordoj por WordPress afi�ojn";
+$a->strings["Enable WordPress Post Plugin"] = "Ŝalti la Wordpress-afi�o kromprogramon";
+$a->strings["WordPress username"] = "WordPress salutnomo";
+$a->strings["WordPress password"] = "WordPress pasvorto";
+$a->strings["WordPress API URL"] = "Wordpress API URL adreso";
+$a->strings["Post to WordPress by default"] = "Defaŭlte afi�i al WordPress";
+$a->strings["\"Show more\" Settings"] = "\"Montri pli\" agordoj";
+$a->strings["Enable Show More"] = "Åœalti \"montri pli\"";
+$a->strings["Cutting posts after how much characters"] = "Limitigi afi�ojn al kiom da literoj";
+$a->strings["Show More Settings saved."] = "Konservis \"montri pli\" agordojn.";
+$a->strings["show more"] = "montri pli";
+$a->strings["This website is tracked using the <a href='http://www.piwik.org'>Piwik</a> analytics tool."] = "Ĉi retejo uzas <a href='http://www.piwik.org'>Piwik</a> kiel retuma analizilo.";
+$a->strings["If you do not want that your visits are logged this way you <a href='%s'>can set a cookie to prevent Piwik from tracking further visits of the site</a> (opt-out)."] = "Se ni ne protokolu viajn vizitojn tiel, vi <a href='%s'>povas agordi kuketon por malpermesi Piwik al plu protokoli pliajn vizitojn</a> (mem-for-elekti / opt-out).";
+$a->strings["Piwik Base URL"] = "Piwik baza URL adreso";
+$a->strings["Absolute path to your Piwik installation. (without protocol (http/s), with trailing slash)"] = "Absoluta vojo al via Piwik instalo. (sen protokolo (http/s), inkluzive vosta oblikva streketo)";
+$a->strings["Site ID"] = "Reteja idento";
+$a->strings["Show opt-out cookie link?"] = "Montru ligilon al kuketo por mem-for-elekti (opt-out)?";
+$a->strings["Asynchronous tracking"] = "Nesinkrona spurado.";
+$a->strings["Post to Twitter"] = "Afi�i ĉe Twitter";
+$a->strings["Twitter settings updated."] = "Äœisdatigis Twitter agordojn.";
+$a->strings["Twitter Posting Settings"] = "Agordoj por afi�i ĉe Twitter";
+$a->strings["No consumer key pair for Twitter found. Please contact your site administrator."] = "Ne trovis klientajn �losilojn por Twitter. Bonvolu kontakti vian retejan administranton.";
+$a->strings["At this Friendica instance the Twitter plugin was enabled but you have not yet connected your account to your Twitter account. To do so click the button below to get a PIN from Twitter which you have to copy into the input box below and submit the form. Only your <strong>public</strong> posts will be posted to Twitter."] = "Je ĉi tiu Friendica retejo, la Twitter kromprogramo jam estas �altita, sed via konto anokoraŭ ne estas konektita kun via Twitter konto. Por fari tion, klaku la supran butonon por atingi nombrokodon de Twitter, kion vi kopiu en la supran eniga ĉelo, kaj  sendu la formularon. Nur viaj <strong>publikaj</strong> afi�oj estas plusendota al Twitter. ";
+$a->strings["Log in with Twitter"] = "Ensaluti kun Twitter";
+$a->strings["Copy the PIN from Twitter here"] = "Alglui la PIN de Twitter ĉi tie";
+$a->strings["If enabled all your <strong>public</strong> postings can be posted to the associated Twitter account. You can choose to do so by default (here) or for every posting separately in the posting options when writing the entry."] = "Kiam �altita, ĉiuj <strong>publikaj</strong> afi�oj de vi ankaŭ eblas esti afi�ota al la asociigita Twitter konto. Vi povas elekti �in defaŭlte (ĉi tie) au unuope por ĉiuj afi�oj kiam vi skribos ilin.";
+$a->strings["<strong>Note</strong>: Due your privacy settings (<em>Hide your profile details from unknown viewers?</em>) the link potentially included in public postings relayed to Twitter will lead the visitor to a blank page informing the visitor that the access to your profile has been restricted."] = "<strong>Averto</strong>: Laŭ viaj privatecaj agordoj (<em>Ka�i viajn profilajn detalojn al nekonataj spektantoj?</em>), la ligilo en publikaj afi�oj plusendata al Twitter gvidas vizitontojn al malplena pa�o sciigante ilin ke atingo al via profilo estas lmitigita.";
+$a->strings["Allow posting to Twitter"] = "Permesi afi�ojn al Twitter";
+$a->strings["Send public postings to Twitter by default"] = "Defaŭlte sendi publikajn afi�ojn al Twitter";
+$a->strings["Send #tag links to Twitter"] = "Sendu #marko ligilon al Twitter";
+$a->strings["Consumer key"] = "Åœlosilo de Kliento";
+$a->strings["Consumer secret"] = "Sekreto de Kliento";
+$a->strings["IRC Settings"] = "IRC Agordoj";
+$a->strings["Channel(s) to auto connect (comma separated)"] = "Aŭtomate konekti�i al la kanalo(j) (disigita per komo)";
+$a->strings["Popular Channels (comma separated)"] = "Popularaj kanaloj (disigita per komo)";
+$a->strings["IRC settings saved."] = "IRC agordoj konservitaj.";
+$a->strings["IRC Chatroom"] = "IRC babilejo";
+$a->strings["Popular Channels"] = "Popularaj Kanaloj";
+$a->strings["Post to blogger"] = "Afi�i al blogger";
+$a->strings["Blogger Post Settings"] = "Agordo pri Blogger Afi�oj";
+$a->strings["Enable Blogger Post Plugin"] = "Ŝalti la Blogger afi�o kromprogramon";
+$a->strings["Blogger username"] = "Blogger uzantonomo";
+$a->strings["Blogger password"] = "Blogger pasvorto";
+$a->strings["Blogger API URL"] = "Blogger API URL";
+$a->strings["Post to Blogger by default"] = "Defaŭlte afi�i al Blogger";
+$a->strings["Post to Posterous"] = "Afi�i al Posterous";
+$a->strings["Posterous Post Settings"] = "Agordoj pri afi�oj ĉe Posterous";
+$a->strings["Enable Posterous Post Plugin"] = "Ŝalti la Poserous-afi�o kromprogramon";
+$a->strings["Posterous login"] = "Posterous salutnomo";
+$a->strings["Posterous password"] = "Posterous pasvorto";
+$a->strings["Post to Posterous by default"] = "Defaŭlte afi�i al Posterous";
+$a->strings["Last users"] = "Ä´usaj uzantoj";
+$a->strings["Last likes"] = "Ĵusaj �atitaj elementoj";
+$a->strings["Last photos"] = "Ä´usaj bildoj";
+$a->strings["Find Friends"] = "Trovi Amikojn";
+$a->strings["Local Directory"] = "Loka Katalogo";
+$a->strings["Similar Interests"] = "Similaj Interesoj";
+$a->strings["Invite Friends"] = "Inviti amikojn";
+$a->strings["Community Pages"] = "Komunumaj pa�oj";
+$a->strings["Help or @NewHere ?"] = "Helpu aÅ­ @NewHere ?";
+$a->strings["Connect Services"] = "Konekti Servojn";
+$a->strings["PostIt to Friendica"] = "PostIt al Friendica";
+$a->strings["Post to Friendica"] = "Afi�i al Friendica";
+$a->strings[" from anywhere by bookmarking this Link."] = " de iu kun ĉi tio ligilo.";
+$a->strings["Your posts and conversations"] = "Viaj afi�oj kaj komunikadoj";
+$a->strings["Your profile page"] = "Via profilo";
+$a->strings["Your contacts"] = "Viaj kontaktoj";
+$a->strings["Photos"] = "Bildoj";
+$a->strings["Your photos"] = "Viaj bildoj";
+$a->strings["Your events"] = "Viaj okazoj";
+$a->strings["Personal notes"] = "Personaj notoj";
+$a->strings["Your personal photos"] = "Viaj personaj bildoj";
+$a->strings["Theme settings"] = "Agordoj pri la etoso";
+$a->strings["Set font-size for posts and comments"] = "Agordi la tiparan grandon por afi�oj kaj komentoj";
+$a->strings["Set line-height for posts and comments"] = "Agordi la linigrandon por afi�oj kaj komentoj";
+$a->strings["Set resolution for middle column"] = "Agordi la distingivon por la meza kolumno";
+$a->strings["Alignment"] = "Äœisrandigo";
+$a->strings["Left"] = "Maldekstren";
+$a->strings["Center"] = "Centren";
+$a->strings["Color scheme"] = "Kolorskemo";
+$a->strings["Gender:"] = "Sekso:";
+$a->strings["j F, Y"] = "j F, Y";
+$a->strings["j F"] = "j F";
+$a->strings["Birthday:"] = "Naski�tago:";
+$a->strings["Age:"] = "A�o:";
+$a->strings["Status:"] = "Stato:";
+$a->strings["Homepage:"] = "Hejmpa�o:";
+$a->strings["Tags:"] = "Markoj:";
+$a->strings["Religion:"] = "Religio:";
+$a->strings["About:"] = "Pri:";
+$a->strings["Hobbies/Interests:"] = "Åœatokupoj/Interesoj:";
+$a->strings["Contact information and Social Networks:"] = "Kontaktinformoj kaj Interkonaj Retejoj:";
+$a->strings["Musical interests:"] = "Muzaikaj interesoj:";
+$a->strings["Books, literature:"] = "Libroj, literaturo:";
+$a->strings["Television:"] = "Televido:";
+$a->strings["Film/dance/culture/entertainment:"] = "Filmoj/dancoj/arto/amuzaĵoj:";
+$a->strings["Love/Romance:"] = "Amo/romanco:";
+$a->strings["Work/employment:"] = "Laboro:";
+$a->strings["School/education:"] = "Lernejo/eduko:";
+$a->strings["Unknown | Not categorised"] = "Nekonata | Nekatorigita";
+$a->strings["Block immediately"] = "Bloki tuj";
+$a->strings["Shady, spammer, self-marketer"] = "Suspekta, spamisto, memmerkatisto";
+$a->strings["Known to me, but no opinion"] = "Konata al mi, sed mi ne havas opinion";
+$a->strings["OK, probably harmless"] = "OK, ver�ajne sendan�era";
+$a->strings["Reputable, has my trust"] = "Fidinda laÅ­ mi";
+$a->strings["Frequently"] = "Ofte";
+$a->strings["Hourly"] = "Ĉiuhore";
+$a->strings["Twice daily"] = "Duope ĉiutage";
+$a->strings["Daily"] = "Ĉiutage";
+$a->strings["Weekly"] = "Ĉiusemajne";
+$a->strings["Monthly"] = "Ĉiumonate";
+$a->strings["OStatus"] = "OStatus";
+$a->strings["RSS/Atom"] = "RSS/Atom";
+$a->strings["Zot!"] = "Zot!";
+$a->strings["LinkedIn"] = "LinkedIn";
+$a->strings["XMPP/IM"] = "XMPP/Tujmesa�ilo";
+$a->strings["MySpace"] = "MySpace";
+$a->strings["Male"] = "Vira";
+$a->strings["Female"] = "Ina";
+$a->strings["Currently Male"] = "Nuntempe Vira";
+$a->strings["Currently Female"] = "Nuntempe Ina";
+$a->strings["Mostly Male"] = "Ĉefe Vira";
+$a->strings["Mostly Female"] = "Ĉefe Ina";
+$a->strings["Transgender"] = "Transgenra";
+$a->strings["Intersex"] = "Interseksa";
+$a->strings["Transsexual"] = "Transseksa";
+$a->strings["Hermaphrodite"] = "Hermafrodita";
+$a->strings["Neuter"] = "NeÅ­tra";
+$a->strings["Non-specific"] = "Nespecifa";
+$a->strings["Other"] = "Alia";
+$a->strings["Undecided"] = "Nedecida";
+$a->strings["Males"] = "Viroj";
+$a->strings["Females"] = "Inoj";
+$a->strings["Gay"] = "Geja";
+$a->strings["Lesbian"] = "Lesba";
+$a->strings["No Preference"] = "Neniu Prefero";
+$a->strings["Bisexual"] = "AmbaÅ­seksema";
+$a->strings["Autosexual"] = "Memseksema";
+$a->strings["Abstinent"] = "Abstinema";
+$a->strings["Virgin"] = "Virgulino";
+$a->strings["Deviant"] = "Devia";
+$a->strings["Fetish"] = "Fetiĉo";
+$a->strings["Oodles"] = "Amasa";
+$a->strings["Nonsexual"] = "Neseksa";
+$a->strings["Single"] = "Sola";
+$a->strings["Lonely"] = "Soleca";
+$a->strings["Available"] = "Havebla";
+$a->strings["Unavailable"] = "Nehavebla";
+$a->strings["Has crush"] = "Sekrete enami�inta";
+$a->strings["Infatuated"] = "Blinda amo";
+$a->strings["Dating"] = "Rendevuanta";
+$a->strings["Unfaithful"] = "Malfidela";
+$a->strings["Sex Addict"] = "Seksmaniulo";
+$a->strings["Friends"] = "Amikoj";
+$a->strings["Friends/Benefits"] = "Amikoj/Avanta�oj";
+$a->strings["Casual"] = "Neformala";
+$a->strings["Engaged"] = "Fianĉiginta";
+$a->strings["Married"] = "Edzi�inta";
+$a->strings["Imaginarily married"] = "Image edzi�inta";
+$a->strings["Partners"] = "Geparuloj";
+$a->strings["Cohabiting"] = "Kunlo�anta";
+$a->strings["Common law"] = "Registrita partnereco ";
+$a->strings["Happy"] = "Feliĉa";
+$a->strings["Not looking"] = "Ne interesi�is";
+$a->strings["Swinger"] = "Swinger";
+$a->strings["Betrayed"] = "Trompita";
+$a->strings["Separated"] = "Disi�inta";
+$a->strings["Unstable"] = "Malfirma";
+$a->strings["Divorced"] = "Eksedzi�inta";
+$a->strings["Imaginarily divorced"] = "Image eksedzi�inta";
+$a->strings["Widowed"] = "Vidva";
+$a->strings["Uncertain"] = "Ne certa";
+$a->strings["It's complicated"] = "Estas komplika";
+$a->strings["Don't care"] = "Egala";
+$a->strings["Ask me"] = "Demandu min";
+$a->strings["Starts:"] = "Ekas:";
+$a->strings["Finishes:"] = "Finas:";
+$a->strings["(no subject)"] = "(neniu temo)";
+$a->strings["noreply"] = "nerespondi";
+$a->strings["prev"] = "antaÅ­a";
+$a->strings["first"] = "unua";
+$a->strings["last"] = "lasta";
+$a->strings["next"] = "sekvanta";
+$a->strings["No contacts"] = "Neniu kontaktoj";
+$a->strings["%d Contact"] = array(
+	0 => "%d Kontakto",
+	1 => "%d Kontaktoj",
+);
+$a->strings["Search"] = "Serĉi";
+$a->strings["Monday"] = "Lundo";
+$a->strings["Tuesday"] = "Mardo";
+$a->strings["Wednesday"] = "Merkredo";
+$a->strings["Thursday"] = "Ä´aÅ­do";
+$a->strings["Friday"] = "Vendredo";
+$a->strings["Saturday"] = "Sabato";
+$a->strings["Sunday"] = "Dimanĉo";
+$a->strings["January"] = "Januaro";
+$a->strings["February"] = "Februaro";
+$a->strings["March"] = "Marto";
+$a->strings["April"] = "Aprilo";
+$a->strings["May"] = "Majo";
+$a->strings["June"] = "Junio";
+$a->strings["July"] = "Julio";
+$a->strings["August"] = "AÅ­gusto";
+$a->strings["September"] = "Septembro";
+$a->strings["October"] = "Oktobro";
+$a->strings["November"] = "Novembro";
+$a->strings["December"] = "Decembro";
+$a->strings["bytes"] = "bajtoj";
+$a->strings["Categories:"] = "Kategorioj:";
+$a->strings["remove"] = "forvi�i";
+$a->strings["[remove]"] = "[forvi�i]";
+$a->strings["Filed under:"] = "Enarkivigita kiel:";
+$a->strings["Click to open/close"] = "Klaku por malfermi/fermi";
+$a->strings["default"] = "defaÅ­lta";
+$a->strings["Select an alternate language"] = "Elekti alian lingvon";
+$a->strings["activity"] = "aktiveco";
+$a->strings["comment"] = "komento";
+$a->strings["post"] = "afi�o";
+$a->strings["Item filed"] = "Enarkivigis elementon ";
+$a->strings["Sharing notification from Diaspora network"] = "Antentigo pri kunhavigado de la Diaspora reto";
+$a->strings["Attachments:"] = "Kunsendaĵoj:";
+$a->strings["[Relayed] Comment authored by %s from network %s"] = "[Plusendita] %s en la reto %s skribis komenton";
+$a->strings["view full size"] = "vidi plengrande";
+$a->strings["Embedded content"] = "Enigita enhavo";
+$a->strings["Embedding disabled"] = "Mal�altita enigitado";
+$a->strings["A deleted group with this name was revived. Existing item permissions <strong>may</strong> apply to this group and any future members. If this is not what you intended, please create another group with a different name."] = "Revivigis malnovan grupon kun la sama nomo. Permesoj por estantaj elementoj <strong>eble</strong> estas validaj por la grupo kaj estontaj membroj. Se tiu ne estas kiun vi atendis, bonvolu krei alian grupon kun alia nomo.";
+$a->strings["Everybody"] = "Ĉiuj";
+$a->strings["edit"] = "redakti";
+$a->strings["Groups"] = "Grupoj";
+$a->strings["Edit group"] = "Redakti grupon";
+$a->strings["Create a new group"] = "Krei novan grupon";
+$a->strings["Contacts not in any group"] = "Kontaktoj en neniu grupo";
+$a->strings["Logout"] = "Elsaluti";
+$a->strings["End this session"] = "Fini ĉi-tiun seancon";
+$a->strings["Status"] = "Stato";
+$a->strings["Sign in"] = "Ensaluti";
+$a->strings["Home Page"] = "Hejmpa�o";
+$a->strings["Create an account"] = "Krei konton";
+$a->strings["Help and documentation"] = "Helpo kaj dokumentado";
+$a->strings["Apps"] = "Programoj";
+$a->strings["Addon applications, utilities, games"] = "Kromprogramoj, utilaĵoj, ludiloj";
+$a->strings["Search site content"] = "Serĉu la retejon";
+$a->strings["Conversations on this site"] = "Konversacioj je ĉi-tiu retejo";
+$a->strings["Directory"] = "Katalogo";
+$a->strings["People directory"] = "Katalogo de homoj";
+$a->strings["Conversations from your friends"] = "Konversacioj de viaj amikoj";
+$a->strings["Friend Requests"] = "Kontaktpetoj";
+$a->strings["See all notifications"] = "Vidu ĉiujn atentigojn";
+$a->strings["Mark all system notifications seen"] = "Marki ĉiujn atentigojn legita";
+$a->strings["Private mail"] = "Privata po�to";
+$a->strings["Inbox"] = "Enirkesto";
+$a->strings["Outbox"] = "Elirkesto";
+$a->strings["Manage"] = "Administri";
+$a->strings["Manage other pages"] = "Administri aliajn pa�ojn";
+$a->strings["Profiles"] = "Profiloj:";
+$a->strings["Manage/edit profiles"] = "Administri/redakti profilojn";
+$a->strings["Manage/edit friends and contacts"] = "Administri/redakti amikojn kaj kontaktojn";
+$a->strings["Admin"] = "Administrado";
+$a->strings["Site setup and configuration"] = "Agordoj pri la retejo";
+$a->strings["Nothing new here"] = "Estas neniu nova ĉi tie";
+$a->strings["Add New Contact"] = "Aldonu Novan Kontakton";
+$a->strings["Enter address or web location"] = "Entajpu adreson aÅ­ retlokon";
+$a->strings["Example: bob@example.com, http://example.com/barbara"] = "Ekzemple: bob@example.com, http://example.com/barbara";
+$a->strings["%d invitation available"] = array(
+	0 => "Disponeblas %d invito",
+	1 => "Disponeblas %d invitoj",
+);
+$a->strings["Find People"] = "Trovi Homojn";
+$a->strings["Enter name or interest"] = "Entajpu nomon aÅ­ intereson";
+$a->strings["Connect/Follow"] = "Konekti/Aboni";
+$a->strings["Examples: Robert Morgenstein, Fishing"] = "Ekzemple: Robert Morgenstein, Fishing";
+$a->strings["Random Profile"] = "Hazarda Profilo";
+$a->strings["Networks"] = "Retoj";
+$a->strings["All Networks"] = "Ĉiuj Retoj";
+$a->strings["Saved Folders"] = "Konservitaj Dosierujoj";
+$a->strings["Everything"] = "Ĉio";
+$a->strings["Categories"] = "Kategorioj";
+$a->strings["Logged out."] = "Elsalutita.";
+$a->strings["We encountered a problem while logging in with the OpenID you provided. Please check the correct spelling of the ID."] = "Okazis problemo ensalutinta kun via OpenID. Bonvolu kontroli la ID.";
+$a->strings["The error message was:"] = "La erarmesa�o estis:";
+$a->strings["Miscellaneous"] = "Diversaj";
+$a->strings["year"] = "jaro";
+$a->strings["month"] = "monato";
+$a->strings["day"] = "tago";
+$a->strings["never"] = "neniam";
+$a->strings["less than a second ago"] = "antaÅ­ malpli ol unu sekundo";
+$a->strings["years"] = "jaroj";
+$a->strings["months"] = "monatoj";
+$a->strings["week"] = "semajno";
+$a->strings["weeks"] = "semajnoj";
+$a->strings["days"] = "tagoj";
+$a->strings["hour"] = "horo";
+$a->strings["hours"] = "horoj";
+$a->strings["minute"] = "minuto";
+$a->strings["minutes"] = "minutoj";
+$a->strings["second"] = "sekundo";
+$a->strings["seconds"] = "sekundoj";
+$a->strings["%1\$d %2\$s ago"] = "antaÅ­ %1\$d %2\$s";
+$a->strings["From: "] = "De: ";
+$a->strings["$1 wrote:"] = "$1 skribis:";
+$a->strings["Image/photo"] = "Bildo";
+$a->strings["Cannot locate DNS info for database server '%s'"] = "Ne trovis DNS informojn por datumbaza servilo '%s'.";
+$a->strings["[no subject]"] = "[neniu temo]";
+$a->strings["Visible to everybody"] = "Videbla al ĉiuj";
+$a->strings["show"] = "montru";
+$a->strings["don't show"] = "ne montru";
+$a->strings["Friendica Notification"] = "Friendica Atentigo";
+$a->strings["Thank You,"] = "Dankon,";
+$a->strings["%s Administrator"] = "%s Administranto";
+$a->strings["%s <!item_type!>"] = "%s <!item_type!>";
+$a->strings["[Friendica:Notify] New mail received at %s"] = "[Friendica:Atentigo] Ricevis novan retpo�ton ĉe %s";
+$a->strings["%s sent you a new private message at %s."] = "%s sendis novan mesa�on al vi ĉe %s.";
+$a->strings["%s sent you %s."] = "%s sendis al vi %s.";
+$a->strings["a private message"] = "privatan mesa�on";
+$a->strings["Please visit %s to view and/or reply to your private messages."] = "Bonvolu viziti %s por vidi aŭ respondi viajn privatajn mesa�ojn.";
+$a->strings["%s's"] = "de %s verkita";
+$a->strings["your"] = "via";
+$a->strings["[Friendica:Notify] Comment to conversation #%d by %s"] = "[Friendica:Atentigo] Komento pri konversacio #%d de %s";
+$a->strings["%s commented on an item/conversation you have been following."] = "%s komentis pri elemento/konversacio kiun vi sekvas.";
+$a->strings["%s commented on %s."] = "%s komentis pri %s.";
+$a->strings["Please visit %s to view and/or reply to the conversation."] = "Bonvolu viziti %s por vidi aÅ­ respondi la konversacion.";
+$a->strings["[Friendica:Notify] %s posted to your profile wall"] = "[Friendica:Atentigo] %s afi�is al via profilmuro";
+$a->strings["%s posted to your profile wall at %s"] = "%s skribis al via profila muro ĉe %s";
+$a->strings["%s posted to %s"] = "%s afi�is al %s";
+$a->strings["your profile wall."] = "via profilmuro.";
+$a->strings["[Friendica:Notify] %s tagged you"] = "[Friendica:Atentigo] %s markis vin";
+$a->strings["%s tagged you at %s"] = "%s markis vin kiel %s";
+$a->strings["%s %s."] = "%s %s.";
+$a->strings["tagged you"] = "markis vin";
+$a->strings["[Friendica:Notify] %s tagged your post"] = "[Friendica:Atentigo] %s markis vian afi�on";
+$a->strings["%s tagged your post at %s"] = "%s markis vian afi�on kiel %s";
+$a->strings["%s tagged %s"] = "%s markis %s";
+$a->strings["your post"] = "vian afi�on";
+$a->strings["[Friendica:Notify] Introduction received"] = "[Friendica:Atentigo] Ricevis prezenton";
+$a->strings["You've received an introduction from '%s' at %s"] = "Vi ricevis prezento de '%s' ĉe %s";
+$a->strings["You've received %s from %s."] = "Vi ricevis %s de %s.";
+$a->strings["an introduction"] = "prezenton";
+$a->strings["You may visit their profile at %s"] = "Vi povas vidi la profilon de li aŭ �i ĉe %s";
+$a->strings["Please visit %s to approve or reject the introduction."] = "Bonvolu viziti %s por aprobi aÅ­ malaprobi la prezenton.";
+$a->strings["[Friendica:Notify] Friend suggestion received"] = "[Friendica:Atentigo] Ricevis amikosugeston";
+$a->strings["You've received a friend suggestion from '%s' at %s"] = "'%s' ĉe %s rekomendis amikon al vi";
+$a->strings["You've received %s for %s from %s."] = "Vi ricevis %s kun %s de %s.";
+$a->strings["a friend suggestion"] = "sugeston por amiki�i";
+$a->strings["Name:"] = "Nomo:";
+$a->strings["Photo:"] = "Bildo:";
+$a->strings["Please visit %s to approve or reject the suggestion."] = "Bonvolu viziti %s por aprobi aÅ­ malaprobi la sugeston.";
+$a->strings["A new person is sharing with you at "] = "Nova persono kunhavigas kun vi ĉe ";
+$a->strings["You have a new follower at "] = "Vi havas novan sekvanton ĉe ";
+$a->strings["image/photo"] = "bildo";
+$a->strings["link"] = "ligilo";
+$a->strings["Welcome "] = "Bonvenon ";
+$a->strings["Please upload a profile photo."] = "Bonvolu al�uti profilbildon.";
+$a->strings["Welcome back "] = "Bonvenon ";
+$a->strings["The form security token was not correct. This probably happened because the form has been opened for too long (>3 hours) before submitting it."] = "La sekuriga ĵetono de la formo estis mal�usta. Tio ver�ajne okazis ĉar la formo estis malfermita dum tro longa tempo (>3 horoj) antaŭ la sendado.";
+$a->strings["View Status"] = "Vidi Staton";
+$a->strings["View Profile"] = "Vidi Profilon";
+$a->strings["View Photos"] = "Vidi Bildojn";
+$a->strings["Network Posts"] = "Enretaj Afi�oj";
+$a->strings["Edit Contact"] = "Redakti Kontakton";
+$a->strings["Send PM"] = "Sendi PM";
+$a->strings["post/item"] = "afi�o/elemento";
+$a->strings["%1\$s marked %2\$s's %3\$s as favorite"] = "%1\$s markis la %3\$s de %2\$s kiel preferita.";
+$a->strings["Select"] = "Elekti";
+$a->strings["View %s's profile @ %s"] = "Vidi la profilon de %s ĉe %s";
+$a->strings["%s from %s"] = "%s de %s";
+$a->strings["View in context"] = "Vidi kun kunteksto";
+$a->strings["%d comment"] = array(
+	0 => "%d komento",
+	1 => "%d komentoj",
+);
+$a->strings["like"] = "�ati";
+$a->strings["dislike"] = "mal�ati";
+$a->strings["Share this"] = "Kunhavigi ĉi tiun";
+$a->strings["share"] = "kunhavigi";
+$a->strings["add star"] = "aldoni stelon";
+$a->strings["remove star"] = "forpreni stelon";
+$a->strings["toggle star status"] = "�alti/mal�alti stelo�tato";
+$a->strings["starred"] = "steligita";
+$a->strings["add tag"] = "aldoni markon";
+$a->strings["save to folder"] = "konservi en dosierujo";
+$a->strings["to"] = "al";
+$a->strings["Wall-to-Wall"] = "Muro-al-Muro";
+$a->strings["via Wall-To-Wall:"] = "tra Muro-al-Muro:";
+$a->strings["Delete Selected Items"] = "Forvi�i Elektitajn Elementojn";
+$a->strings["%s likes this."] = "%s �atas tiun.";
+$a->strings["%s doesn't like this."] = "%s mal�atas tiun.";
+$a->strings["<span  %1\$s>%2\$d people</span> like this."] = "<span %1\$s>%2\$d homoj</span> �atas tiun.";
+$a->strings["<span  %1\$s>%2\$d people</span> don't like this."] = "<span %1\$s>%2\$d homoj</span>mal�atas tiun.";
+$a->strings["and"] = "kaj";
+$a->strings[", and %d other people"] = ", kaj %d aliaj homoj.";
+$a->strings["%s like this."] = "%s �atas tiun.";
+$a->strings["%s don't like this."] = "%s mal�atas tiun.";
+$a->strings["Visible to <strong>everybody</strong>"] = "Videbla al <strong>ĉiuj</strong>";
+$a->strings["Please enter a video link/URL:"] = "Bonvolu entajpi ligilon/adreson de video:";
+$a->strings["Please enter an audio link/URL:"] = "Bonvolu entajpi ligilon/adreson de sono:";
+$a->strings["Tag term:"] = "Markfrazo:";
+$a->strings["Where are you right now?"] = "Kie vi estas nun?";
+$a->strings["upload photo"] = "al�uti bildon";
+$a->strings["attach file"] = "kunsendi dosieron";
+$a->strings["web link"] = "TTT ligilo";
+$a->strings["Insert video link"] = "Alglui ligilon de video";
+$a->strings["video link"] = "video ligilo";
+$a->strings["Insert audio link"] = "Alglui ligilon de sono";
+$a->strings["audio link"] = "sono ligilo";
+$a->strings["set location"] = "agordi lokon";
+$a->strings["clear location"] = "forvi�i lokon";
+$a->strings["permissions"] = "permesoj";
+$a->strings["Delete this item?"] = "Forvi�i ĉi tiun elementon?";
+$a->strings["show fewer"] = "montri malpli";
+$a->strings["Create a New Account"] = "Krei Novan Konton";
+$a->strings["Nickname or Email address: "] = "Ka�nomo aŭ retpo�tadreso:";
+$a->strings["Password: "] = "Pasvorto:";
+$a->strings["Or login using OpenID: "] = "AÅ­ ensaluti per OpenID:";
+$a->strings["Forgot your password?"] = "Ĉu vi vorgesis vian pasvorton?";
+$a->strings["Edit profile"] = "Redakti profilon";
+$a->strings["Message"] = "Mesa�o";
+$a->strings["g A l F d"] = "\\j\\e \\l\\a G\\a \\h\\o\\r\\o, l F d";
+$a->strings["F d"] = "F d";
+$a->strings["Birthday Reminders"] = "Memorigilo pri naski�tagoj";
+$a->strings["Birthdays this week:"] = "Naski�tagoj ĉi-semajne:";
+$a->strings["[today]"] = "[hodiaÅ­]";
+$a->strings["Event Reminders"] = "Memorigiloj pri Okazoj";
+$a->strings["Events this week:"] = "Okazoj ĉi-semajne:";
+$a->strings["[No description]"] = "[Neniu priskribo]";
diff --git a/view/es/cmnt_received_eml.tpl b/view/es/cmnt_received_eml.tpl
index abf2d95df..abf2d95df 100755..100644
--- a/view/es/cmnt_received_eml.tpl
+++ b/view/es/cmnt_received_eml.tpl
diff --git a/view/es/follow_notify_eml.tpl b/view/es/follow_notify_eml.tpl
index 17bd2c01c..17bd2c01c 100755..100644
--- a/view/es/follow_notify_eml.tpl
+++ b/view/es/follow_notify_eml.tpl
diff --git a/view/es/friend_complete_eml.tpl b/view/es/friend_complete_eml.tpl
index 0dc867efd..0dc867efd 100755..100644
--- a/view/es/friend_complete_eml.tpl
+++ b/view/es/friend_complete_eml.tpl
diff --git a/view/es/htconfig.tpl b/view/es/htconfig.tpl
index 6158f6a33..6158f6a33 100755..100644
--- a/view/es/htconfig.tpl
+++ b/view/es/htconfig.tpl
diff --git a/view/es/intro_complete_eml.tpl b/view/es/intro_complete_eml.tpl
index a2964808c..a2964808c 100755..100644
--- a/view/es/intro_complete_eml.tpl
+++ b/view/es/intro_complete_eml.tpl
diff --git a/view/es/lostpass_eml.tpl b/view/es/lostpass_eml.tpl
index 607744bfe..607744bfe 100755..100644
--- a/view/es/lostpass_eml.tpl
+++ b/view/es/lostpass_eml.tpl
diff --git a/view/es/mail_received_html_body_eml.tpl b/view/es/mail_received_html_body_eml.tpl
index 5086ec246..5086ec246 100755..100644
--- a/view/es/mail_received_html_body_eml.tpl
+++ b/view/es/mail_received_html_body_eml.tpl
diff --git a/view/es/mail_received_text_body_eml.tpl b/view/es/mail_received_text_body_eml.tpl
index 8400b9d01..8400b9d01 100755..100644
--- a/view/es/mail_received_text_body_eml.tpl
+++ b/view/es/mail_received_text_body_eml.tpl
diff --git a/view/es/messages.po b/view/es/messages.po
index d3f8557e9..54de3ee64 100755..100644
--- a/view/es/messages.po
+++ b/view/es/messages.po
@@ -3136,7 +3136,7 @@ msgstr "Cuentas abandonadas después de x días"
 
 #: ../../mod/admin.php:313
 msgid ""
-"Will not waste system resources polling external sites for abandonded "
+"Will not waste system resources polling external sites for abandoned "
 "accounts. Enter 0 for no time limit."
 msgstr ""
 "No gastará recursos del sistema creando encuestas desde sitios externos para"
diff --git a/view/es/passchanged_eml.tpl b/view/es/passchanged_eml.tpl
index 7959846b7..7959846b7 100755..100644
--- a/view/es/passchanged_eml.tpl
+++ b/view/es/passchanged_eml.tpl
diff --git a/view/es/register_open_eml.tpl b/view/es/register_open_eml.tpl
index 7c7a90b40..7c7a90b40 100755..100644
--- a/view/es/register_open_eml.tpl
+++ b/view/es/register_open_eml.tpl
diff --git a/view/es/register_verify_eml.tpl b/view/es/register_verify_eml.tpl
index 9f2cc4d9b..9f2cc4d9b 100755..100644
--- a/view/es/register_verify_eml.tpl
+++ b/view/es/register_verify_eml.tpl
diff --git a/view/es/request_notify_eml.tpl b/view/es/request_notify_eml.tpl
index 6161c45c1..6161c45c1 100755..100644
--- a/view/es/request_notify_eml.tpl
+++ b/view/es/request_notify_eml.tpl
diff --git a/view/es/strings.php b/view/es/strings.php
index ac53a45a9..d2b8e240e 100755..100644
--- a/view/es/strings.php
+++ b/view/es/strings.php
@@ -674,7 +674,7 @@ $a->strings["Maximum image size"] = "Tamaño máximo de la imagen";
 $a->strings["Register policy"] = "Política de registros";
 $a->strings["Register text"] = "Términos";
 $a->strings["Accounts abandoned after x days"] = "Cuentas abandonadas después de x días";
-$a->strings["Will not waste system resources polling external sites for abandonded accounts. Enter 0 for no time limit."] = "No gastará recursos del sistema creando encuestas desde sitios externos para cuentas abandonadas. Introduzca 0 para ningún límite temporal.";
+$a->strings["Will not waste system resources polling external sites for abandoned accounts. Enter 0 for no time limit."] = "No gastará recursos del sistema creando encuestas desde sitios externos para cuentas abandonadas. Introduzca 0 para ningún límite temporal.";
 $a->strings["Allowed friend domains"] = "Dominios amigos permitidos";
 $a->strings["Allowed email domains"] = "Dominios de correo permitidos";
 $a->strings["Block public"] = "Bloqueo público";
diff --git a/view/es/wall_received_eml.tpl b/view/es/wall_received_eml.tpl
index 4cd253c72..4cd253c72 100755..100644
--- a/view/es/wall_received_eml.tpl
+++ b/view/es/wall_received_eml.tpl
diff --git a/view/event_form.tpl b/view/event_form.tpl
index 7d5f8cf4a..7d5f8cf4a 100755..100644
--- a/view/event_form.tpl
+++ b/view/event_form.tpl
diff --git a/view/event_head.tpl b/view/event_head.tpl
index 97201e722..97201e722 100755..100644
--- a/view/event_head.tpl
+++ b/view/event_head.tpl
diff --git a/view/fake_feed.tpl b/view/fake_feed.tpl
index c37071cf4..c37071cf4 100755..100644
--- a/view/fake_feed.tpl
+++ b/view/fake_feed.tpl
diff --git a/view/field.tpl b/view/field.tpl
index 35f5afd39..35f5afd39 100755..100644
--- a/view/field.tpl
+++ b/view/field.tpl
diff --git a/view/field_checkbox.tpl b/view/field_checkbox.tpl
index 725df4cdf..afab29243 100755..100644
--- a/view/field_checkbox.tpl
+++ b/view/field_checkbox.tpl
@@ -1,6 +1,6 @@
 	
 	<div class='field checkbox'>
 		<label for='id_$field.0'>$field.1</label>
-		<input type="checkbox" name='$field.0' id='id_$field.0' value="1" {{ if $field.2 }}checked="true"{{ endif }}>
+		<input type="checkbox" name='$field.0' id='id_$field.0' value="1" {{ if $field.2 }}checked="checked"{{ endif }}>
 		<span class='field_help'>$field.3</span>
 	</div>
diff --git a/view/field_custom.tpl b/view/field_custom.tpl
index be15d3f60..be15d3f60 100755..100644
--- a/view/field_custom.tpl
+++ b/view/field_custom.tpl
diff --git a/view/field_input.tpl b/view/field_input.tpl
index 748d93f3e..748d93f3e 100755..100644
--- a/view/field_input.tpl
+++ b/view/field_input.tpl
diff --git a/view/field_intcheckbox.tpl b/view/field_intcheckbox.tpl
index 47a513a55..47a513a55 100755..100644
--- a/view/field_intcheckbox.tpl
+++ b/view/field_intcheckbox.tpl
diff --git a/view/field_openid.tpl b/view/field_openid.tpl
index acd93ff62..acd93ff62 100755..100644
--- a/view/field_openid.tpl
+++ b/view/field_openid.tpl
diff --git a/view/field_password.tpl b/view/field_password.tpl
index e604b7f5d..e604b7f5d 100755..100644
--- a/view/field_password.tpl
+++ b/view/field_password.tpl
diff --git a/view/field_radio.tpl b/view/field_radio.tpl
index a915e8eb3..a915e8eb3 100755..100644
--- a/view/field_radio.tpl
+++ b/view/field_radio.tpl
diff --git a/view/field_richtext.tpl b/view/field_richtext.tpl
index c124ee000..c124ee000 100755..100644
--- a/view/field_richtext.tpl
+++ b/view/field_richtext.tpl
diff --git a/view/field_select.tpl b/view/field_select.tpl
index d79eb48e0..d79eb48e0 100755..100644
--- a/view/field_select.tpl
+++ b/view/field_select.tpl
diff --git a/view/field_select_raw.tpl b/view/field_select_raw.tpl
index 765b285d9..765b285d9 100755..100644
--- a/view/field_select_raw.tpl
+++ b/view/field_select_raw.tpl
diff --git a/view/field_textarea.tpl b/view/field_textarea.tpl
index 2425cdd3b..2425cdd3b 100755..100644
--- a/view/field_textarea.tpl
+++ b/view/field_textarea.tpl
diff --git a/view/field_themeselect.tpl b/view/field_themeselect.tpl
index f9f99492c..5847d8664 100755..100644
--- a/view/field_themeselect.tpl
+++ b/view/field_themeselect.tpl
@@ -1,4 +1,4 @@
-	
+	<script>$(function(){ previewTheme($("#id_$field.0")[0]); });</script>
 	<div class='field select'>
 		<label for='id_$field.0'>$field.1</label>
 		<select name='$field.0' id='id_$field.0' onchange="previewTheme(this);" >
diff --git a/view/field_yesno.tpl b/view/field_yesno.tpl
index 5d4a775c2..5d4a775c2 100755..100644
--- a/view/field_yesno.tpl
+++ b/view/field_yesno.tpl
diff --git a/view/fileas_widget.tpl b/view/fileas_widget.tpl
index 54fba7435..54fba7435 100755..100644
--- a/view/fileas_widget.tpl
+++ b/view/fileas_widget.tpl
diff --git a/view/filebrowser.tpl b/view/filebrowser.tpl
new file mode 100644
index 000000000..1e97237f4
--- /dev/null
+++ b/view/filebrowser.tpl
@@ -0,0 +1,84 @@
+<!DOCTYPE html>
+<html>
+	<head>
+	<script type="text/javascript" src="$baseurl/library/tinymce/jscripts/tiny_mce/tiny_mce_popup.js"></script>
+	<style>
+		.panel_wrapper div.current{.overflow: auto; height: auto!important; }
+		.filebrowser.path { font-family: fixed; font-size: 10px; background-color: #f0f0ee; height:auto; overflow:auto;}
+		.filebrowser.path a { border-left: 1px solid #C0C0AA; background-color: #E0E0DD; display: block; float:left; padding: 0.3em 1em;}
+		.filebrowser ul{ list-style-type: none; padding:0px; }
+		.filebrowser.folders a { display: block; padding: 0.3em }
+		.filebrowser.folders a:hover { background-color: #f0f0ee; }
+		.filebrowser.files.image { overflow: auto; height: auto; }
+		.filebrowser.files.image img { height:50px;}
+		.filebrowser.files.image li { display: block; padding: 5px; float: left; }
+		.filebrowser.files.image span { display: none;}
+		.filebrowser.files.file img { height:16px; vertical-align: bottom;}
+		.filebrowser.files a { display: block;  padding: 0.3em}
+		.filebrowser.files a:hover { background-color: #f0f0ee; }
+		.filebrowser a { text-decoration: none; }
+	</style>
+	<script>
+		var FileBrowserDialogue = {
+			init : function () {
+				// Here goes your code for setting your custom things onLoad.
+			},
+			mySubmit : function (URL) {
+				//var URL = document.my_form.my_field.value;
+				var win = tinyMCEPopup.getWindowArg("window");
+
+				// insert information now
+				win.document.getElementById(tinyMCEPopup.getWindowArg("input")).value = URL;
+
+				// are we an image browser
+				if (typeof(win.ImageDialog) != "undefined") {
+					// we are, so update image dimensions...
+					if (win.ImageDialog.getImageData)
+						win.ImageDialog.getImageData();
+
+					// ... and preview if necessary
+					if (win.ImageDialog.showPreviewImage)
+						win.ImageDialog.showPreviewImage(URL);
+				}
+
+				// close popup window
+				tinyMCEPopup.close();
+			}
+		}
+
+		tinyMCEPopup.onInit.add(FileBrowserDialogue.init, FileBrowserDialogue);
+	</script>
+	</head>
+	<body>
+	
+	<div class="tabs">
+		<ul >
+			<li class="current"><span>FileBrowser</span></li>
+		</ul>
+	</div>
+	<div class="panel_wrapper">
+
+		<div id="general_panel" class="panel current">
+			<div class="filebrowser path">
+				{{ for $path as $p }}<a href="$p.0">$p.1</a>{{ endfor }}
+			</div>
+			<div class="filebrowser folders">
+				<ul>
+					{{ for $folders as $f }}<li><a href="$f.0/">$f.1</a></li>{{ endfor }}
+				</ul>
+			</div>
+			<div class="filebrowser files $type">
+				<ul>
+				{{ for $files as $f }}
+					<li><a href="#" onclick="FileBrowserDialogue.mySubmit('$f.0'); return false;"><img src="$f.2"><span>$f.1</span></a></li>
+				{{ endfor }}
+				</ul>
+			</div>
+		</div>
+	</div>
+	<div class="mceActionPanel">
+		<input type="button" id="cancel" name="cancel" value="{#cancel}" onclick="tinyMCEPopup.close();" />
+	</div>	
+	</body>
+	
+</html>
diff --git a/view/follow.tpl b/view/follow.tpl
index 259e74a93..259e74a93 100755..100644
--- a/view/follow.tpl
+++ b/view/follow.tpl
diff --git a/view/follow_slap.tpl b/view/follow_slap.tpl
index 0d0889f7d..0d0889f7d 100755..100644
--- a/view/follow_slap.tpl
+++ b/view/follow_slap.tpl
diff --git a/view/fr/cmnt_received_eml.tpl b/view/fr/cmnt_received_eml.tpl
index ee98d98de..ee98d98de 100755..100644
--- a/view/fr/cmnt_received_eml.tpl
+++ b/view/fr/cmnt_received_eml.tpl
diff --git a/view/fr/cmnt_received_html_body_eml.tpl b/view/fr/cmnt_received_html_body_eml.tpl
index 1d904c53c..1d904c53c 100755..100644
--- a/view/fr/cmnt_received_html_body_eml.tpl
+++ b/view/fr/cmnt_received_html_body_eml.tpl
diff --git a/view/fr/cmnt_received_text_body_eml.tpl b/view/fr/cmnt_received_text_body_eml.tpl
index d46632138..d46632138 100755..100644
--- a/view/fr/cmnt_received_text_body_eml.tpl
+++ b/view/fr/cmnt_received_text_body_eml.tpl
diff --git a/view/fr/follow_notify_eml.tpl b/view/fr/follow_notify_eml.tpl
index c77a3e427..c77a3e427 100755..100644
--- a/view/fr/follow_notify_eml.tpl
+++ b/view/fr/follow_notify_eml.tpl
diff --git a/view/fr/friend_complete_eml.tpl b/view/fr/friend_complete_eml.tpl
index 9b9c551fe..9b9c551fe 100755..100644
--- a/view/fr/friend_complete_eml.tpl
+++ b/view/fr/friend_complete_eml.tpl
diff --git a/view/fr/htconfig.tpl b/view/fr/htconfig.tpl
index 76709ea75..76709ea75 100755..100644
--- a/view/fr/htconfig.tpl
+++ b/view/fr/htconfig.tpl
diff --git a/view/fr/intro_complete_eml.tpl b/view/fr/intro_complete_eml.tpl
index b8a7a3457..b8a7a3457 100755..100644
--- a/view/fr/intro_complete_eml.tpl
+++ b/view/fr/intro_complete_eml.tpl
diff --git a/view/fr/lostpass_eml.tpl b/view/fr/lostpass_eml.tpl
index 168e9a5e2..168e9a5e2 100755..100644
--- a/view/fr/lostpass_eml.tpl
+++ b/view/fr/lostpass_eml.tpl
diff --git a/view/fr/mail_received_html_body_eml.tpl b/view/fr/mail_received_html_body_eml.tpl
index 55e8b8a73..55e8b8a73 100755..100644
--- a/view/fr/mail_received_html_body_eml.tpl
+++ b/view/fr/mail_received_html_body_eml.tpl
diff --git a/view/fr/mail_received_text_body_eml.tpl b/view/fr/mail_received_text_body_eml.tpl
index c877344e0..c877344e0 100755..100644
--- a/view/fr/mail_received_text_body_eml.tpl
+++ b/view/fr/mail_received_text_body_eml.tpl
diff --git a/view/fr/messages.po b/view/fr/messages.po
index 345405760..5628299b8 100755..100644
--- a/view/fr/messages.po
+++ b/view/fr/messages.po
@@ -3111,7 +3111,7 @@ msgstr "Les comptes sont abandonnés après x jours"
 
 #: ../../mod/admin.php:313
 msgid ""
-"Will not waste system resources polling external sites for abandonded "
+"Will not waste system resources polling external sites for abandoned "
 "accounts. Enter 0 for no time limit."
 msgstr ""
 "Pour ne pas gaspiller les ressources système, on cesse d'interroger les "
diff --git a/view/fr/passchanged_eml.tpl b/view/fr/passchanged_eml.tpl
index c1881b13e..c1881b13e 100755..100644
--- a/view/fr/passchanged_eml.tpl
+++ b/view/fr/passchanged_eml.tpl
diff --git a/view/fr/register_open_eml.tpl b/view/fr/register_open_eml.tpl
index d61a5996d..d61a5996d 100755..100644
--- a/view/fr/register_open_eml.tpl
+++ b/view/fr/register_open_eml.tpl
diff --git a/view/fr/register_verify_eml.tpl b/view/fr/register_verify_eml.tpl
index 54362ce18..54362ce18 100755..100644
--- a/view/fr/register_verify_eml.tpl
+++ b/view/fr/register_verify_eml.tpl
diff --git a/view/fr/request_notify_eml.tpl b/view/fr/request_notify_eml.tpl
index afbb2ab7e..afbb2ab7e 100755..100644
--- a/view/fr/request_notify_eml.tpl
+++ b/view/fr/request_notify_eml.tpl
diff --git a/view/fr/strings.php b/view/fr/strings.php
index dda24d3be..e24070ab9 100755..100644
--- a/view/fr/strings.php
+++ b/view/fr/strings.php
@@ -674,7 +674,7 @@ $a->strings["Maximum image size"] = "Taille maximale des images";
 $a->strings["Register policy"] = "Politique d'inscription";
 $a->strings["Register text"] = "Texte d'inscription";
 $a->strings["Accounts abandoned after x days"] = "Les comptes sont abandonnés après x jours";
-$a->strings["Will not waste system resources polling external sites for abandonded accounts. Enter 0 for no time limit."] = "Pour ne pas gaspiller les ressources système, on cesse d'interroger les sites distants pour les comptes abandonnés. Mettre 0 pour désactiver cette fonction.";
+$a->strings["Will not waste system resources polling external sites for abandoned accounts. Enter 0 for no time limit."] = "Pour ne pas gaspiller les ressources système, on cesse d'interroger les sites distants pour les comptes abandonnés. Mettre 0 pour désactiver cette fonction.";
 $a->strings["Allowed friend domains"] = "Domaines autorisés";
 $a->strings["Allowed email domains"] = "Domaines courriel autorisés";
 $a->strings["Block public"] = "Interdire la publication globale";
diff --git a/view/fr/wall_received_eml.tpl b/view/fr/wall_received_eml.tpl
index adfb91dd8..adfb91dd8 100755..100644
--- a/view/fr/wall_received_eml.tpl
+++ b/view/fr/wall_received_eml.tpl
diff --git a/view/generic_links_widget.tpl b/view/generic_links_widget.tpl
new file mode 100644
index 000000000..45813b876
--- /dev/null
+++ b/view/generic_links_widget.tpl
@@ -0,0 +1,11 @@
+<div class="widget">
+	{{if $title}}<h3>$title</h3>{{endif}}
+	{{if $desc}}<div class="desc">$desc</div>{{endif}}
+	
+	<ul>
+		{{ for $items as $item }}
+			<li class="tool"><a href="$item.url" class="{{ if $item.selected }}selected{{ endif }}">$item.label</a></li>
+		{{ endfor }}
+	</ul>
+	
+</div>
diff --git a/view/group_drop.tpl b/view/group_drop.tpl
index 2cbebbb8e..2cbebbb8e 100755..100644
--- a/view/group_drop.tpl
+++ b/view/group_drop.tpl
diff --git a/view/group_edit.tpl b/view/group_edit.tpl
index 2fa2b1a55..2fa2b1a55 100755..100644
--- a/view/group_edit.tpl
+++ b/view/group_edit.tpl
diff --git a/view/group_side.tpl b/view/group_side.tpl
index 0353b1d2c..ebb194d9c 100755..100644
--- a/view/group_side.tpl
+++ b/view/group_side.tpl
@@ -23,6 +23,11 @@
   <div id="sidebar-new-group">
   <a href="group/new">$createtext</a>
   </div>
+  {{ if $ungrouped }}
+  <div id="sidebar-ungrouped">
+  <a href="nogroup">$ungrouped</a>
+  </div>
+  {{ endif }}
 </div>
 
 
diff --git a/view/head.tpl b/view/head.tpl
index cd6f5ca97..cd6f5ca97 100755..100644
--- a/view/head.tpl
+++ b/view/head.tpl
diff --git a/view/hide_comments.tpl b/view/hide_comments.tpl
index 55ee9dd7b..55ee9dd7b 100755..100644
--- a/view/hide_comments.tpl
+++ b/view/hide_comments.tpl
diff --git a/view/install.tpl b/view/install.tpl
index b3a5f46ff..b3a5f46ff 100755..100644
--- a/view/install.tpl
+++ b/view/install.tpl
diff --git a/view/install_checks.tpl b/view/install_checks.tpl
index a1a75ade6..a1a75ade6 100755..100644
--- a/view/install_checks.tpl
+++ b/view/install_checks.tpl
diff --git a/view/install_db.tpl b/view/install_db.tpl
index 1302b5a70..1302b5a70 100755..100644
--- a/view/install_db.tpl
+++ b/view/install_db.tpl
diff --git a/view/install_settings.tpl b/view/install_settings.tpl
index 05b87f904..05b87f904 100755..100644
--- a/view/install_settings.tpl
+++ b/view/install_settings.tpl
diff --git a/view/intros.tpl b/view/intros.tpl
index e7fd53ca4..e7fd53ca4 100755..100644
--- a/view/intros.tpl
+++ b/view/intros.tpl
diff --git a/view/invite.tpl b/view/invite.tpl
index 01a45c774..01a45c774 100755..100644
--- a/view/invite.tpl
+++ b/view/invite.tpl
diff --git a/view/it/cmnt_received_eml.tpl b/view/it/cmnt_received_eml.tpl
index 1991d29ae..1991d29ae 100755..100644
--- a/view/it/cmnt_received_eml.tpl
+++ b/view/it/cmnt_received_eml.tpl
diff --git a/view/it/cmnt_received_html_body_eml.tpl b/view/it/cmnt_received_html_body_eml.tpl
index 5f2edb84b..5f2edb84b 100755..100644
--- a/view/it/cmnt_received_html_body_eml.tpl
+++ b/view/it/cmnt_received_html_body_eml.tpl
diff --git a/view/it/cmnt_received_text_body_eml.tpl b/view/it/cmnt_received_text_body_eml.tpl
index 1991d29ae..1991d29ae 100755..100644
--- a/view/it/cmnt_received_text_body_eml.tpl
+++ b/view/it/cmnt_received_text_body_eml.tpl
diff --git a/view/it/follow_notify_eml.tpl b/view/it/follow_notify_eml.tpl
index 635dbbc29..635dbbc29 100755..100644
--- a/view/it/follow_notify_eml.tpl
+++ b/view/it/follow_notify_eml.tpl
diff --git a/view/it/friend_complete_eml.tpl b/view/it/friend_complete_eml.tpl
index 67ad67b05..67ad67b05 100755..100644
--- a/view/it/friend_complete_eml.tpl
+++ b/view/it/friend_complete_eml.tpl
diff --git a/view/it/htconfig.tpl b/view/it/htconfig.tpl
index 6158f6a33..6158f6a33 100755..100644
--- a/view/it/htconfig.tpl
+++ b/view/it/htconfig.tpl
diff --git a/view/it/intro_complete_eml.tpl b/view/it/intro_complete_eml.tpl
index 9da946a56..9da946a56 100755..100644
--- a/view/it/intro_complete_eml.tpl
+++ b/view/it/intro_complete_eml.tpl
diff --git a/view/it/lostpass_eml.tpl b/view/it/lostpass_eml.tpl
index 7349717ea..7349717ea 100755..100644
--- a/view/it/lostpass_eml.tpl
+++ b/view/it/lostpass_eml.tpl
diff --git a/view/it/mail_received_html_body_eml.tpl b/view/it/mail_received_html_body_eml.tpl
index 847954550..847954550 100755..100644
--- a/view/it/mail_received_html_body_eml.tpl
+++ b/view/it/mail_received_html_body_eml.tpl
diff --git a/view/it/mail_received_text_body_eml.tpl b/view/it/mail_received_text_body_eml.tpl
index c7da9533f..c7da9533f 100755..100644
--- a/view/it/mail_received_text_body_eml.tpl
+++ b/view/it/mail_received_text_body_eml.tpl
diff --git a/view/it/messages.po b/view/it/messages.po
index e0375764f..855a24ee8 100755..100644
--- a/view/it/messages.po
+++ b/view/it/messages.po
@@ -3104,7 +3104,7 @@ msgstr "Account abbandonati dopo x giorni"
 
 #: ../../mod/admin.php:313
 msgid ""
-"Will not waste system resources polling external sites for abandonded "
+"Will not waste system resources polling external sites for abandoned "
 "accounts. Enter 0 for no time limit."
 msgstr ""
 "Non spreca risorse di sistema controllando siti esterni per gli account "
diff --git a/view/it/passchanged_eml.tpl b/view/it/passchanged_eml.tpl
index 290e4db94..290e4db94 100755..100644
--- a/view/it/passchanged_eml.tpl
+++ b/view/it/passchanged_eml.tpl
diff --git a/view/it/register_open_eml.tpl b/view/it/register_open_eml.tpl
index e5f5af80c..e5f5af80c 100755..100644
--- a/view/it/register_open_eml.tpl
+++ b/view/it/register_open_eml.tpl
diff --git a/view/it/register_verify_eml.tpl b/view/it/register_verify_eml.tpl
index f1a34dbf4..f1a34dbf4 100755..100644
--- a/view/it/register_verify_eml.tpl
+++ b/view/it/register_verify_eml.tpl
diff --git a/view/it/request_notify_eml.tpl b/view/it/request_notify_eml.tpl
index 50532cbd4..50532cbd4 100755..100644
--- a/view/it/request_notify_eml.tpl
+++ b/view/it/request_notify_eml.tpl
diff --git a/view/it/strings.php b/view/it/strings.php
index 5fd187f7a..93bcbd465 100755..100644
--- a/view/it/strings.php
+++ b/view/it/strings.php
@@ -674,7 +674,7 @@ $a->strings["Maximum image size"] = "Massima dimensione immagini";
 $a->strings["Register policy"] = "Politica di registrazione";
 $a->strings["Register text"] = "Testo registrazione";
 $a->strings["Accounts abandoned after x days"] = "Account abbandonati dopo x giorni";
-$a->strings["Will not waste system resources polling external sites for abandonded accounts. Enter 0 for no time limit."] = "Non spreca risorse di sistema controllando siti esterni per gli account abbandonati. Immettere 0 per nessun limite di tempo.";
+$a->strings["Will not waste system resources polling external sites for abandoned accounts. Enter 0 for no time limit."] = "Non spreca risorse di sistema controllando siti esterni per gli account abbandonati. Immettere 0 per nessun limite di tempo.";
 $a->strings["Allowed friend domains"] = "Domini amici consentiti";
 $a->strings["Allowed email domains"] = "Domini email consentiti";
 $a->strings["Block public"] = "Blocca pagine pubbliche";
diff --git a/view/it/wall_received_eml.tpl b/view/it/wall_received_eml.tpl
index ba9e25901..ba9e25901 100755..100644
--- a/view/it/wall_received_eml.tpl
+++ b/view/it/wall_received_eml.tpl
diff --git a/view/it/wall_received_html_body_eml.tpl b/view/it/wall_received_html_body_eml.tpl
index cdc05cfa3..cdc05cfa3 100755..100644
--- a/view/it/wall_received_html_body_eml.tpl
+++ b/view/it/wall_received_html_body_eml.tpl
diff --git a/view/it/wall_received_text_body_eml.tpl b/view/it/wall_received_text_body_eml.tpl
index 327557ea1..327557ea1 100755..100644
--- a/view/it/wall_received_text_body_eml.tpl
+++ b/view/it/wall_received_text_body_eml.tpl
diff --git a/view/jot-header.tpl b/view/jot-header.tpl
index 67e5eb681..f1c283470 100755..100644
--- a/view/jot-header.tpl
+++ b/view/jot-header.tpl
@@ -26,7 +26,7 @@ function initEditor(cb){
 			mode : "specific_textareas",
 			editor_selector: $editselect,
 			auto_focus: "profile-jot-text",
-			plugins : "bbcode,paste,autoresize",
+			plugins : "bbcode,paste,autoresize, inlinepopups",
 			theme_advanced_buttons1 : "bold,italic,underline,undo,redo,link,unlink,image,forecolor,formatselect,code",
 			theme_advanced_buttons2 : "",
 			theme_advanced_buttons3 : "",
@@ -44,6 +44,7 @@ function initEditor(cb){
 			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) {
diff --git a/view/jot.tpl b/view/jot.tpl
index 5fe1f954e..91de628ac 100755..100644
--- a/view/jot.tpl
+++ b/view/jot.tpl
@@ -15,6 +15,7 @@
 		<input type="hidden" name="post_id" value="$post_id" />
 		<input type="hidden" name="preview" id="jot-preview" value="0" />
 		<div id="jot-title-wrap"><input name="title" id="jot-title" type="text" placeholder="$placeholdertitle" value="$title" class="jothidden" style="display:none"></div>
+		<div id="jot-category-wrap"><input name="category" id="jot-category" type="text" placeholder="$placeholdercategory" value="$category" class="jothidden" style="display:none" /></div>
 		<div id="jot-text-wrap">
 		<img id="profile-jot-text-loading" src="images/rotator.gif" alt="$wait" title="$wait" style="display: none;" />
 		<textarea rows="5" cols="64" class="profile-jot-text" id="profile-jot-text" name="body" >{{ if $content }}$content{{ else }}$share{{ endif }}</textarea>
diff --git a/view/jot_geotag.tpl b/view/jot_geotag.tpl
index b0f71e73b..b0f71e73b 100755..100644
--- a/view/jot_geotag.tpl
+++ b/view/jot_geotag.tpl
diff --git a/view/lang_selector.tpl b/view/lang_selector.tpl
new file mode 100644
index 000000000..b3a527b40
--- /dev/null
+++ b/view/lang_selector.tpl
@@ -0,0 +1,10 @@
+<div id="lang-select-icon" class="icon s22 language" title="$title" onclick="openClose('language-selector');" >lang</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/like_noshare.tpl b/view/like_noshare.tpl
index 2651ea1f8..2651ea1f8 100755..100644
--- a/view/like_noshare.tpl
+++ b/view/like_noshare.tpl
diff --git a/view/login.tpl b/view/login.tpl
index 4cbbb1624..4cbbb1624 100755..100644
--- a/view/login.tpl
+++ b/view/login.tpl
diff --git a/view/logout.tpl b/view/logout.tpl
index efc971df8..efc971df8 100755..100644
--- a/view/logout.tpl
+++ b/view/logout.tpl
diff --git a/view/lostpass.tpl b/view/lostpass.tpl
index cd3644157..cd3644157 100755..100644
--- a/view/lostpass.tpl
+++ b/view/lostpass.tpl
diff --git a/view/magicsig.tpl b/view/magicsig.tpl
index 75f9bc475..75f9bc475 100755..100644
--- a/view/magicsig.tpl
+++ b/view/magicsig.tpl
diff --git a/view/mail_conv.tpl b/view/mail_conv.tpl
index 75a4506f6..75a4506f6 100755..100644
--- a/view/mail_conv.tpl
+++ b/view/mail_conv.tpl
diff --git a/view/mail_head.tpl b/view/mail_head.tpl
index afb65f537..afb65f537 100755..100644
--- a/view/mail_head.tpl
+++ b/view/mail_head.tpl
diff --git a/view/match.tpl b/view/match.tpl
index 5f2fc7a30..5f2fc7a30 100755..100644
--- a/view/match.tpl
+++ b/view/match.tpl
diff --git a/view/minimal.php b/view/minimal.php
index a8c693985..a8c693985 100755..100644
--- a/view/minimal.php
+++ b/view/minimal.php
diff --git a/view/msg-header.tpl b/view/msg-header.tpl
index 2d1ea7a61..2d1ea7a61 100755..100644
--- a/view/msg-header.tpl
+++ b/view/msg-header.tpl
diff --git a/view/nav.tpl b/view/nav.tpl
index 4675c3e5c..4675c3e5c 100755..100644
--- a/view/nav.tpl
+++ b/view/nav.tpl
diff --git a/view/netfriend.tpl b/view/netfriend.tpl
index c2a92ce9e..c2a92ce9e 100755..100644
--- a/view/netfriend.tpl
+++ b/view/netfriend.tpl
diff --git a/view/nets.tpl b/view/nets.tpl
index b0cb8890c..b0cb8890c 100755..100644
--- a/view/nets.tpl
+++ b/view/nets.tpl
diff --git a/view/nogroup-template.tpl b/view/nogroup-template.tpl
new file mode 100644
index 000000000..dd00ed097
--- /dev/null
+++ b/view/nogroup-template.tpl
@@ -0,0 +1,12 @@
+<h1>$header</h1>
+
+{{ for $contacts as $contact }}
+	{{ inc contact_template.tpl }}{{ endinc }}
+{{ endfor }}
+<div id="contact-edit-end"></div>
+
+$paginate
+
+
+
+
diff --git a/view/notifications.tpl b/view/notifications.tpl
index 1a13b68b9..1a13b68b9 100755..100644
--- a/view/notifications.tpl
+++ b/view/notifications.tpl
diff --git a/view/notifications_comments_item.tpl b/view/notifications_comments_item.tpl
index 73cc9f948..73cc9f948 100755..100644
--- a/view/notifications_comments_item.tpl
+++ b/view/notifications_comments_item.tpl
diff --git a/view/notifications_dislikes_item.tpl b/view/notifications_dislikes_item.tpl
index 73cc9f948..73cc9f948 100755..100644
--- a/view/notifications_dislikes_item.tpl
+++ b/view/notifications_dislikes_item.tpl
diff --git a/view/notifications_friends_item.tpl b/view/notifications_friends_item.tpl
index 73cc9f948..73cc9f948 100755..100644
--- a/view/notifications_friends_item.tpl
+++ b/view/notifications_friends_item.tpl
diff --git a/view/notifications_likes_item.tpl b/view/notifications_likes_item.tpl
index 389144d9b..389144d9b 100755..100644
--- a/view/notifications_likes_item.tpl
+++ b/view/notifications_likes_item.tpl
diff --git a/view/notifications_network_item.tpl b/view/notifications_network_item.tpl
index bd86548fc..bd86548fc 100755..100644
--- a/view/notifications_network_item.tpl
+++ b/view/notifications_network_item.tpl
diff --git a/view/notifications_posts_item.tpl b/view/notifications_posts_item.tpl
index 73cc9f948..73cc9f948 100755..100644
--- a/view/notifications_posts_item.tpl
+++ b/view/notifications_posts_item.tpl
diff --git a/view/notify.tpl b/view/notify.tpl
index 73cc9f948..73cc9f948 100755..100644
--- a/view/notify.tpl
+++ b/view/notify.tpl
diff --git a/view/oauth_authorize.tpl b/view/oauth_authorize.tpl
index 31f02ac50..31f02ac50 100755..100644
--- a/view/oauth_authorize.tpl
+++ b/view/oauth_authorize.tpl
diff --git a/view/oauth_authorize_done.tpl b/view/oauth_authorize_done.tpl
index 51eaea248..51eaea248 100755..100644
--- a/view/oauth_authorize_done.tpl
+++ b/view/oauth_authorize_done.tpl
diff --git a/view/oembed_video.tpl b/view/oembed_video.tpl
index 5824d8d4e..5824d8d4e 100755..100644
--- a/view/oembed_video.tpl
+++ b/view/oembed_video.tpl
diff --git a/view/oexchange_xrd.tpl b/view/oexchange_xrd.tpl
index c7e6df498..c7e6df498 100755..100644
--- a/view/oexchange_xrd.tpl
+++ b/view/oexchange_xrd.tpl
diff --git a/view/opensearch.tpl b/view/opensearch.tpl
index 374fcaac9..374fcaac9 100755..100644
--- a/view/opensearch.tpl
+++ b/view/opensearch.tpl
diff --git a/view/pagetypes.tpl b/view/pagetypes.tpl
index d9f873ea0..d9f873ea0 100755..100644
--- a/view/pagetypes.tpl
+++ b/view/pagetypes.tpl
diff --git a/view/peoplefind.tpl b/view/peoplefind.tpl
index eeae2a29a..3c2692d25 100755..100644
--- a/view/peoplefind.tpl
+++ b/view/peoplefind.tpl
@@ -6,6 +6,7 @@
 	</form>
 	<div class="side-link" id="side-match-link"><a href="match" >$similar</a></div>
 	<div class="side-link" id="side-suggest-link"><a href="suggest" >$suggest</a></div>
+	<div class="side-link" id="side-random-profile-link" ><a href="randprof" target="extlink" >$random</a></div>
 	{{ if $inv }} 
 	<div class="side-link" id="side-invite-link" ><a href="invite" >$inv</a></div>
 	{{ endif }}
diff --git a/view/photo_album.tpl b/view/photo_album.tpl
index 3ab9fe723..3ab9fe723 100755..100644
--- a/view/photo_album.tpl
+++ b/view/photo_album.tpl
diff --git a/view/photo_drop.tpl b/view/photo_drop.tpl
index b4ea62b45..b4ea62b45 100755..100644
--- a/view/photo_drop.tpl
+++ b/view/photo_drop.tpl
diff --git a/view/photo_edit.tpl b/view/photo_edit.tpl
index 9950cc4ac..9950cc4ac 100755..100644
--- a/view/photo_edit.tpl
+++ b/view/photo_edit.tpl
diff --git a/view/photo_item.tpl b/view/photo_item.tpl
index 22884e848..22884e848 100755..100644
--- a/view/photo_item.tpl
+++ b/view/photo_item.tpl
diff --git a/view/photo_top.tpl b/view/photo_top.tpl
index 04a054b52..04a054b52 100755..100644
--- a/view/photo_top.tpl
+++ b/view/photo_top.tpl
diff --git a/view/photo_view.tpl b/view/photo_view.tpl
index 732caf690..732caf690 100755..100644
--- a/view/photo_view.tpl
+++ b/view/photo_view.tpl
diff --git a/view/photos_recent.tpl b/view/photos_recent.tpl
index b8cb924b7..b8cb924b7 100755..100644
--- a/view/photos_recent.tpl
+++ b/view/photos_recent.tpl
diff --git a/view/photos_upload.tpl b/view/photos_upload.tpl
index 318a92427..318a92427 100755..100644
--- a/view/photos_upload.tpl
+++ b/view/photos_upload.tpl
diff --git a/view/poco_entry_xml.tpl b/view/poco_entry_xml.tpl
index 4d84cee41..4d84cee41 100755..100644
--- a/view/poco_entry_xml.tpl
+++ b/view/poco_entry_xml.tpl
diff --git a/view/poco_xml.tpl b/view/poco_xml.tpl
index 9549b695d..9549b695d 100755..100644
--- a/view/poco_xml.tpl
+++ b/view/poco_xml.tpl
diff --git a/view/profed_head.tpl b/view/profed_head.tpl
index a3267d591..2477654b3 100755..100644
--- a/view/profed_head.tpl
+++ b/view/profed_head.tpl
@@ -5,7 +5,7 @@
 
 tinyMCE.init({
 	theme : "advanced",
-	mode : "textareas",
+	mode : "$editselect",
 	plugins : "bbcode,paste",
 	theme_advanced_buttons1 : "bold,italic,underline,undo,redo,link,unlink,image,forecolor,formatselect,code",
 	theme_advanced_buttons2 : "",
diff --git a/view/profile-hide-friends.tpl b/view/profile-hide-friends.tpl
index 9ecacfbe0..9ecacfbe0 100755..100644
--- a/view/profile-hide-friends.tpl
+++ b/view/profile-hide-friends.tpl
diff --git a/view/profile-hide-wall.tpl b/view/profile-hide-wall.tpl
index 10185e243..10185e243 100755..100644
--- a/view/profile-hide-wall.tpl
+++ b/view/profile-hide-wall.tpl
diff --git a/view/profile-in-directory.tpl b/view/profile-in-directory.tpl
index 56b28d37e..56b28d37e 100755..100644
--- a/view/profile-in-directory.tpl
+++ b/view/profile-in-directory.tpl
diff --git a/view/profile-in-netdir.tpl b/view/profile-in-netdir.tpl
index 882ad2d17..882ad2d17 100755..100644
--- a/view/profile-in-netdir.tpl
+++ b/view/profile-in-netdir.tpl
diff --git a/view/profile_advanced.tpl b/view/profile_advanced.tpl
index 470404fc3..470404fc3 100755..100644
--- a/view/profile_advanced.tpl
+++ b/view/profile_advanced.tpl
diff --git a/view/profile_edit.tpl b/view/profile_edit.tpl
index e5c7162d0..2139fcf13 100755..100644
--- a/view/profile_edit.tpl
+++ b/view/profile_edit.tpl
@@ -159,7 +159,7 @@ $sexual
 $lbl_about
 </p>
 
-<textarea rows="10" cols="72" id="profile-jot-text" name="about" >$about</textarea>
+<textarea rows="10" cols="72" id="profile-about-text" name="about" >$about</textarea>
 
 </div>
 <div id="about-jot-end"></div>
diff --git a/view/profile_edlink.tpl b/view/profile_edlink.tpl
index ea787b9f5..ea787b9f5 100755..100644
--- a/view/profile_edlink.tpl
+++ b/view/profile_edlink.tpl
diff --git a/view/profile_entry.tpl b/view/profile_entry.tpl
index 7ff6d685b..7ff6d685b 100755..100644
--- a/view/profile_entry.tpl
+++ b/view/profile_entry.tpl
diff --git a/view/profile_listing_header.tpl b/view/profile_listing_header.tpl
index 61a273792..61a273792 100755..100644
--- a/view/profile_listing_header.tpl
+++ b/view/profile_listing_header.tpl
diff --git a/view/profile_photo.tpl b/view/profile_photo.tpl
index 0b3a1cac1..0b3a1cac1 100755..100644
--- a/view/profile_photo.tpl
+++ b/view/profile_photo.tpl
diff --git a/view/profile_publish.tpl b/view/profile_publish.tpl
index 8fd0bc913..8fd0bc913 100755..100644
--- a/view/profile_publish.tpl
+++ b/view/profile_publish.tpl
diff --git a/view/profile_vcard.tpl b/view/profile_vcard.tpl
index d1e684795..d1e684795 100755..100644
--- a/view/profile_vcard.tpl
+++ b/view/profile_vcard.tpl
diff --git a/view/prv_message.tpl b/view/prv_message.tpl
index 2ce07ce6f..2ce07ce6f 100755..100644
--- a/view/prv_message.tpl
+++ b/view/prv_message.tpl
diff --git a/view/pt-br/messages.po b/view/pt-br/messages.po
index c6aca3dd9..c6aca3dd9 100755..100644
--- a/view/pt-br/messages.po
+++ b/view/pt-br/messages.po
diff --git a/view/pt-br/strings.php b/view/pt-br/strings.php
index 0cf143db4..0cf143db4 100755..100644
--- a/view/pt-br/strings.php
+++ b/view/pt-br/strings.php
diff --git a/view/pwdreset.tpl b/view/pwdreset.tpl
index 497b93396..497b93396 100755..100644
--- a/view/pwdreset.tpl
+++ b/view/pwdreset.tpl
diff --git a/view/register.tpl b/view/register.tpl
index 8ce1d20ac..8ce1d20ac 100755..100644
--- a/view/register.tpl
+++ b/view/register.tpl
diff --git a/view/removeme.tpl b/view/removeme.tpl
index a3ca8d4cf..a3ca8d4cf 100755..100644
--- a/view/removeme.tpl
+++ b/view/removeme.tpl
diff --git a/view/ru/messages.po b/view/ru/messages.po
index 31a830935..31a830935 100755..100644
--- a/view/ru/messages.po
+++ b/view/ru/messages.po
diff --git a/view/ru/strings.php b/view/ru/strings.php
index 4578c37e8..4578c37e8 100755..100644
--- a/view/ru/strings.php
+++ b/view/ru/strings.php
diff --git a/view/saved_searches_aside.tpl b/view/saved_searches_aside.tpl
index e6a0d6278..e6a0d6278 100755..100644
--- a/view/saved_searches_aside.tpl
+++ b/view/saved_searches_aside.tpl
diff --git a/view/search_item.tpl b/view/search_item.tpl
index bfad1b7b7..bfad1b7b7 100755..100644
--- a/view/search_item.tpl
+++ b/view/search_item.tpl
diff --git a/view/settings.tpl b/view/settings.tpl
index 8753474af..59c669a87 100755..100644
--- a/view/settings.tpl
+++ b/view/settings.tpl
@@ -1,5 +1,3 @@
-$tabs
-
 <h1>$ptitle</h1>
 
 $nickname_block
@@ -101,7 +99,13 @@ $unkmail
 
 <h3 class="settings-heading">$h_not</h3>
 
-<div id="settings-notify-desc">$lbl_not </div>
+<strong>$activity_options</strong>
+
+{{inc field_checkbox.tpl with $field=$post_newfriend }}{{endinc}}
+{{inc field_checkbox.tpl with $field=$post_profilechange }}{{endinc}}
+
+
+<div id="settings-notify-desc"><strong>$lbl_not </strong></div>
 
 <div class="group">
 {{inc field_intcheckbox.tpl with $field=$notify1 }}{{endinc}}
diff --git a/view/settings_addons.tpl b/view/settings_addons.tpl
index 28fca5362..84171dc8d 100755..100644
--- a/view/settings_addons.tpl
+++ b/view/settings_addons.tpl
@@ -1,5 +1,3 @@
-$tabs
-
 <h1>$title</h1>
 
 
diff --git a/view/settings_connectors.tpl b/view/settings_connectors.tpl
index 43c0346bb..bd3d60f0f 100755..100644
--- a/view/settings_connectors.tpl
+++ b/view/settings_connectors.tpl
@@ -1,5 +1,3 @@
-$tabs
-
 <h1>$title</h1>
 
 <div class="connector_statusmsg">$diasp_enabled</div>
diff --git a/view/settings_display.tpl b/view/settings_display.tpl
index fc7a56c8a..70895a1f8 100644
--- a/view/settings_display.tpl
+++ b/view/settings_display.tpl
@@ -1,5 +1,3 @@
-$tabs
-
 <h1>$ptitle</h1>
 
 <form action="settings/display" id="settings-form" method="post" autocomplete="off" >
diff --git a/view/settings_nick_set.tpl b/view/settings_nick_set.tpl
index eb4721d50..eb4721d50 100755..100644
--- a/view/settings_nick_set.tpl
+++ b/view/settings_nick_set.tpl
diff --git a/view/settings_nick_subdir.tpl b/view/settings_nick_subdir.tpl
index 303c24df7..303c24df7 100755..100644
--- a/view/settings_nick_subdir.tpl
+++ b/view/settings_nick_subdir.tpl
diff --git a/view/settings_oauth.tpl b/view/settings_oauth.tpl
index da1398ab9..890c4ee6c 100755..100644
--- a/view/settings_oauth.tpl
+++ b/view/settings_oauth.tpl
@@ -1,5 +1,3 @@
-$tabs
-
 <h1>$title</h1>
 
 
diff --git a/view/settings_oauth_edit.tpl b/view/settings_oauth_edit.tpl
index d29341386..e6f2abdc2 100755..100644
--- a/view/settings_oauth_edit.tpl
+++ b/view/settings_oauth_edit.tpl
@@ -1,5 +1,3 @@
-$tabs
-
 <h1>$title</h1>
 
 <form method="POST">
diff --git a/view/suggest_friends.tpl b/view/suggest_friends.tpl
index e97b5e8cc..e97b5e8cc 100755..100644
--- a/view/suggest_friends.tpl
+++ b/view/suggest_friends.tpl
diff --git a/view/suggestions.tpl b/view/suggestions.tpl
index 656336496..656336496 100755..100644
--- a/view/suggestions.tpl
+++ b/view/suggestions.tpl
diff --git a/view/sv/cmnt_received_eml.tpl b/view/sv/cmnt_received_eml.tpl
index d87c7a1d1..d87c7a1d1 100755..100644
--- a/view/sv/cmnt_received_eml.tpl
+++ b/view/sv/cmnt_received_eml.tpl
diff --git a/view/sv/follow_notify_eml.tpl b/view/sv/follow_notify_eml.tpl
index fee08bdca..fee08bdca 100755..100644
--- a/view/sv/follow_notify_eml.tpl
+++ b/view/sv/follow_notify_eml.tpl
diff --git a/view/sv/friend_complete_eml.tpl b/view/sv/friend_complete_eml.tpl
index 2b8b0238e..2b8b0238e 100755..100644
--- a/view/sv/friend_complete_eml.tpl
+++ b/view/sv/friend_complete_eml.tpl
diff --git a/view/sv/htconfig.tpl b/view/sv/htconfig.tpl
index 76709ea75..76709ea75 100755..100644
--- a/view/sv/htconfig.tpl
+++ b/view/sv/htconfig.tpl
diff --git a/view/sv/intro_complete_eml.tpl b/view/sv/intro_complete_eml.tpl
index 1f24af25f..1f24af25f 100755..100644
--- a/view/sv/intro_complete_eml.tpl
+++ b/view/sv/intro_complete_eml.tpl
diff --git a/view/sv/lostpass_eml.tpl b/view/sv/lostpass_eml.tpl
index df338fa69..df338fa69 100755..100644
--- a/view/sv/lostpass_eml.tpl
+++ b/view/sv/lostpass_eml.tpl
diff --git a/view/sv/mail_received_html_body_eml.tpl b/view/sv/mail_received_html_body_eml.tpl
index a9a34c23a..a9a34c23a 100755..100644
--- a/view/sv/mail_received_html_body_eml.tpl
+++ b/view/sv/mail_received_html_body_eml.tpl
diff --git a/view/sv/mail_received_text_body_eml.tpl b/view/sv/mail_received_text_body_eml.tpl
index ac2857b58..ac2857b58 100755..100644
--- a/view/sv/mail_received_text_body_eml.tpl
+++ b/view/sv/mail_received_text_body_eml.tpl
diff --git a/view/sv/passchanged_eml.tpl b/view/sv/passchanged_eml.tpl
index 590462468..590462468 100755..100644
--- a/view/sv/passchanged_eml.tpl
+++ b/view/sv/passchanged_eml.tpl
diff --git a/view/sv/register_open_eml.tpl b/view/sv/register_open_eml.tpl
index 1471c9b98..1471c9b98 100755..100644
--- a/view/sv/register_open_eml.tpl
+++ b/view/sv/register_open_eml.tpl
diff --git a/view/sv/register_verify_eml.tpl b/view/sv/register_verify_eml.tpl
index aa72bc9aa..aa72bc9aa 100755..100644
--- a/view/sv/register_verify_eml.tpl
+++ b/view/sv/register_verify_eml.tpl
diff --git a/view/sv/request_notify_eml.tpl b/view/sv/request_notify_eml.tpl
index 893bce17c..893bce17c 100755..100644
--- a/view/sv/request_notify_eml.tpl
+++ b/view/sv/request_notify_eml.tpl
diff --git a/view/sv/strings.php b/view/sv/strings.php
index eb434df66..eb434df66 100755..100644
--- a/view/sv/strings.php
+++ b/view/sv/strings.php
diff --git a/view/sv/wall_received_eml.tpl b/view/sv/wall_received_eml.tpl
index fc450a06d..fc450a06d 100755..100644
--- a/view/sv/wall_received_eml.tpl
+++ b/view/sv/wall_received_eml.tpl
diff --git a/view/tag_slap.tpl b/view/tag_slap.tpl
index 6449df496..6449df496 100755..100644
--- a/view/tag_slap.tpl
+++ b/view/tag_slap.tpl
diff --git a/view/theme/clean/screenshot.jpg b/view/theme/clean/screenshot.jpg
deleted file mode 100644
index 8d9d772f4..000000000
--- a/view/theme/clean/screenshot.jpg
+++ /dev/null
diff --git a/view/theme/clean/style.css b/view/theme/clean/style.css
deleted file mode 100755
index 86bca371c..000000000
--- a/view/theme/clean/style.css
+++ /dev/null
@@ -1,115 +0,0 @@
-@import url('../loozah/style.css');
-
-footer {
-	background: #CCC;
-}
-
-#banner {
-	color: #444444;
-}
-
-body { 
-	background: #FFFFFF;
-	color: #000000;
-}
-.nav-selected {
-	background: #FFFFFF !important;
-	color: #888888 !important;
-}
-
-input:hover {
-	background-color: #CCCCCC;
-	color: #000000;
-	border: 1px solid #FFFFFF;
-}
-
-input, select {
-	background-color: #FFFFFF;
-	color: #000000;
-}
-.nav-link:hover, .nav-commlink:hover {
-	background: #DDDDDD;
-	color: #0000EE;
-}
-option {
-	background-color: #FFFFFF;
-}
-#page-footer {
-	border: none;
-}
-
-nav {
-	background: #F4F4F4;
-}
-
-body { 
-	background: #FFFFFF;
-	color: #444444;
-}
-
-.nav-link {
-	color: #444444;
-	background: #EEE;
-	border: 2px solid #CCCCCC;
-}
-
-.nav-commlink {
-	color: #444444;
-	background: #EEE;
-	border: 2px solid #CCCCCC;
-}
-
-.tab {
-	color: #444444;
-	background: #EEE;
-
-}
-
-a, a:visited {
-	color: #8888FF;
-	text-decoration: none;
-}
-
-a:hover {
-	color: #0000FF;
-	text-decoration: underline;
-}
-
-.fakelink, .fakelink:visited {
-	color: #8888FF;
-}
-
-.fakelink:hover {
-	color: #0000FF;
-}
-
-.wall-item-content-wrapper {
-	border: 1px solid #CCC;
-}
-
-.wall-item-content-wrapper.comment {
-	background: #CCC;
-}
-
-.comment-edit-wrapper {
-	background: #CCC;
-}
-
-.comment-wwedit-wrapper {
-	background: #CCC;
-}
-
-#photos-upload-perms-menu, #photos-upload-perms-menu:visited {
-	color: #8888FF;
-}
-
-#photos-upload-perms-menu:hover {
-	color: #0000FF;
-}
-#settings-default-perms-menu, #settings-default-perms-menu:visited {
-	color: #8888FF;
-}
-
-#settings-default-perms-menu:hover {
-	color: #0000FF;
-}
diff --git a/view/theme/clean/theme.php b/view/theme/clean/theme.php
deleted file mode 100755
index 47b43cf13..000000000
--- a/view/theme/clean/theme.php
+++ /dev/null
@@ -1,4 +0,0 @@
-<?php
-$a->theme_info = array(
-  'extends' => 'loozah',
-);
diff --git a/view/theme/comix-plain/comment_item.tpl b/view/theme/comix-plain/comment_item.tpl
index 9c3facaff..9c3facaff 100755..100644
--- a/view/theme/comix-plain/comment_item.tpl
+++ b/view/theme/comix-plain/comment_item.tpl
diff --git a/view/theme/comix-plain/search_item.tpl b/view/theme/comix-plain/search_item.tpl
index dba289031..dba289031 100755..100644
--- a/view/theme/comix-plain/search_item.tpl
+++ b/view/theme/comix-plain/search_item.tpl
diff --git a/view/theme/comix-plain/style.css b/view/theme/comix-plain/style.css
index 1a89cae7c..1a89cae7c 100755..100644
--- a/view/theme/comix-plain/style.css
+++ b/view/theme/comix-plain/style.css
diff --git a/view/theme/comix-plain/theme.php b/view/theme/comix-plain/theme.php
index be3180dc9..be3180dc9 100755..100644
--- a/view/theme/comix-plain/theme.php
+++ b/view/theme/comix-plain/theme.php
diff --git a/view/theme/comix-plain/wall_item.tpl b/view/theme/comix-plain/wall_item.tpl
index dfcd8ca96..dfcd8ca96 100755..100644
--- a/view/theme/comix-plain/wall_item.tpl
+++ b/view/theme/comix-plain/wall_item.tpl
diff --git a/view/theme/comix-plain/wallwall_item.tpl b/view/theme/comix-plain/wallwall_item.tpl
index abd5967b2..abd5967b2 100755..100644
--- a/view/theme/comix-plain/wallwall_item.tpl
+++ b/view/theme/comix-plain/wallwall_item.tpl
diff --git a/view/theme/comix/comment_item.tpl b/view/theme/comix/comment_item.tpl
index 9c3facaff..9c3facaff 100755..100644
--- a/view/theme/comix/comment_item.tpl
+++ b/view/theme/comix/comment_item.tpl
diff --git a/view/theme/comix/search_item.tpl b/view/theme/comix/search_item.tpl
index dba289031..dba289031 100755..100644
--- a/view/theme/comix/search_item.tpl
+++ b/view/theme/comix/search_item.tpl
diff --git a/view/theme/comix/style.css b/view/theme/comix/style.css
index 534e79cf4..534e79cf4 100755..100644
--- a/view/theme/comix/style.css
+++ b/view/theme/comix/style.css
diff --git a/view/theme/comix/theme.php b/view/theme/comix/theme.php
index e2f7f4db3..e2f7f4db3 100755..100644
--- a/view/theme/comix/theme.php
+++ b/view/theme/comix/theme.php
diff --git a/view/theme/comix/wall_item.tpl b/view/theme/comix/wall_item.tpl
index dfcd8ca96..dfcd8ca96 100755..100644
--- a/view/theme/comix/wall_item.tpl
+++ b/view/theme/comix/wall_item.tpl
diff --git a/view/theme/comix/wallwall_item.tpl b/view/theme/comix/wallwall_item.tpl
index abd5967b2..abd5967b2 100755..100644
--- a/view/theme/comix/wallwall_item.tpl
+++ b/view/theme/comix/wallwall_item.tpl
diff --git a/view/theme/darkbubble/dbicons.png b/view/theme/darkbubble/dbicons.png
index 696ef779c..696ef779c 100755..100644
--- a/view/theme/darkbubble/dbicons.png
+++ b/view/theme/darkbubble/dbicons.png
diff --git a/view/theme/darkbubble/style.css b/view/theme/darkbubble/style.css
index 9336dc01b..9336dc01b 100755..100644
--- a/view/theme/darkbubble/style.css
+++ b/view/theme/darkbubble/style.css
diff --git a/view/theme/darkbubble/theme.php b/view/theme/darkbubble/theme.php
index 053730c21..053730c21 100755..100644
--- a/view/theme/darkbubble/theme.php
+++ b/view/theme/darkbubble/theme.php
diff --git a/view/theme/darkness/screenshot.jpg b/view/theme/darkness/screenshot.jpg
deleted file mode 100644
index aec866e99..000000000
--- a/view/theme/darkness/screenshot.jpg
+++ /dev/null
diff --git a/view/theme/darkness/style.css b/view/theme/darkness/style.css
deleted file mode 100755
index 3bc4c6aea..000000000
--- a/view/theme/darkness/style.css
+++ /dev/null
@@ -1,67 +0,0 @@
-@import url('../loozah/style.css');
-
-nav {
-	background: #CCC;
-}
-footer {
-	background: #CCC;
-}
-#banner {
-	color: #FF0000;
-}
-
-body { 
-	background: #000000;
-	color: #FF0000;
-}
-.nav-selected {
-	background: #000000 !important;
-	color: #888888 !important;
-}
-
-input:hover {
-	background-color: #800000;
-}
-input, select {
-	background-color: #000000;
-	color: #FF0000;
-}
-.nav-link:hover, .nav-commlink:hover, .tab:hover {
-	background: #DDDDDD;
-	color: #FF0000;
-}
-
-#logo-text a, #logo-text a:visited, #site-location {
-	color: #000000;
-}
-
-
-#page-footer {
-	border: none;
-}
-.nav-link {
-	color: #FF0000;
-	background: #444444;
-}
-
-.nav-commlink {
-	color: #FF0000;
-	background: #444444;
-}
-
-.tab {
-	color: #FF0000;
-	background: #444444;
-
-}
-
-a, a:visited, .fakelink, .fakelink:visited {
-	color: #888888;
-	text-decoration: none;
-}
-
-a:hover, .fakelink:hover {
-	color: #FF0000;
-	text-decoration: underline;
-}
-
diff --git a/view/theme/darkness/theme.php b/view/theme/darkness/theme.php
deleted file mode 100755
index 47b43cf13..000000000
--- a/view/theme/darkness/theme.php
+++ /dev/null
@@ -1,4 +0,0 @@
-<?php
-$a->theme_info = array(
-  'extends' => 'loozah',
-);
diff --git a/view/theme/darkzero-NS/border.jpg b/view/theme/darkzero-NS/border.jpg
index 4967412bf..4967412bf 100755..100644
--- a/view/theme/darkzero-NS/border.jpg
+++ b/view/theme/darkzero-NS/border.jpg
diff --git a/view/theme/darkzero-NS/head.jpg b/view/theme/darkzero-NS/head.jpg
index 67e852140..67e852140 100755..100644
--- a/view/theme/darkzero-NS/head.jpg
+++ b/view/theme/darkzero-NS/head.jpg
diff --git a/view/theme/darkzero-NS/sectionend.jpg b/view/theme/darkzero-NS/sectionend.jpg
index 9d5d5c8f3..9d5d5c8f3 100755..100644
--- a/view/theme/darkzero-NS/sectionend.jpg
+++ b/view/theme/darkzero-NS/sectionend.jpg
diff --git a/view/theme/darkzero-NS/shiny.png b/view/theme/darkzero-NS/shiny.png
index 994c0d05d..994c0d05d 100755..100644
--- a/view/theme/darkzero-NS/shiny.png
+++ b/view/theme/darkzero-NS/shiny.png
diff --git a/view/theme/darkzero-NS/style.css b/view/theme/darkzero-NS/style.css
index 047381a92..047381a92 100755..100644
--- a/view/theme/darkzero-NS/style.css
+++ b/view/theme/darkzero-NS/style.css
diff --git a/view/theme/darkzero-NS/theme.php b/view/theme/darkzero-NS/theme.php
index 2d3e4fd56..6c1aa7f12 100755..100644
--- a/view/theme/darkzero-NS/theme.php
+++ b/view/theme/darkzero-NS/theme.php
@@ -11,6 +11,7 @@ $a->theme_info = array(
   'extends' => 'duepuntozero',
 );
 
+function darkzero_NS_init(&$a) {
 $a->page['htmlhead'] .= <<< EOT
 <script>
 $(document).ready(function() {
@@ -57,3 +58,4 @@ $('.savedsearchterm').hover(
 
 </script>
 EOT;
+}
\ No newline at end of file
diff --git a/view/theme/darkzero/border.jpg b/view/theme/darkzero/border.jpg
index 4967412bf..4967412bf 100755..100644
--- a/view/theme/darkzero/border.jpg
+++ b/view/theme/darkzero/border.jpg
diff --git a/view/theme/darkzero/head.jpg b/view/theme/darkzero/head.jpg
index 67e852140..67e852140 100755..100644
--- a/view/theme/darkzero/head.jpg
+++ b/view/theme/darkzero/head.jpg
diff --git a/view/theme/darkzero/sectionend.jpg b/view/theme/darkzero/sectionend.jpg
index 9d5d5c8f3..9d5d5c8f3 100755..100644
--- a/view/theme/darkzero/sectionend.jpg
+++ b/view/theme/darkzero/sectionend.jpg
diff --git a/view/theme/darkzero/shiny.png b/view/theme/darkzero/shiny.png
index 994c0d05d..994c0d05d 100755..100644
--- a/view/theme/darkzero/shiny.png
+++ b/view/theme/darkzero/shiny.png
diff --git a/view/theme/darkzero/style.css b/view/theme/darkzero/style.css
index 3b395ff2a..12c7d3c25 100755..100644
--- a/view/theme/darkzero/style.css
+++ b/view/theme/darkzero/style.css
@@ -76,17 +76,21 @@ input#dfrn-url {
 }
 
 
-#jot-title {
+#jot-title, #jot-category {
 	background-color: #333333;
 	border: 1px solid #333333;
 }
 
 #jot-title::-webkit-input-placeholder{ color: #555555!important;}
 #jot-title:-moz-placeholder{color: #555555!important;}
+#jot-category::-webkit-input-placeholder{ color: #555555!important;}
+#jot-category:-moz-placeholder{color: #555555!important;}
 		
 	
 #jot-title:hover,
-#jot-title:focus {
+#jot-title:focus,
+#jot-category:hover,
+#jot-category:focus {
 	border: 1px solid #cccccc; 
 }
 blockquote {
diff --git a/view/theme/darkzero/theme.php b/view/theme/darkzero/theme.php
index 8c4d3e9ac..bbba3ef74 100755..100644
--- a/view/theme/darkzero/theme.php
+++ b/view/theme/darkzero/theme.php
@@ -12,6 +12,7 @@ $a->theme_info = array(
   'extends' => 'duepuntozero',
 );
 
+function darkzero_init(&$a) {
 $a->page['htmlhead'] .= <<< EOT
 <script>
 $(document).ready(function() {
@@ -58,3 +59,4 @@ $('.savedsearchterm').hover(
 
 </script>
 EOT;
+}
\ No newline at end of file
diff --git a/view/theme/diabook-aerith/communityhome.tpl b/view/theme/diabook-aerith/communityhome.tpl
deleted file mode 100755
index c26d02dc6..000000000
--- a/view/theme/diabook-aerith/communityhome.tpl
+++ /dev/null
@@ -1,93 +0,0 @@
-<div id="close_pages">
-{{ if $page }}
-<div>$page</div>
-{{ endif }}
-</div>
-
-<div id="close_helpers">
-{{ if $lastusers_title }}
-<h3 style="margin-top:0px;">Help or @NewHere ?<a id="close_helpers_icon"  onClick="close_helpers()" class="icon close_box" title="close"></a></h3>
-<a href="http://kakste.com/profile/newhere" title="#NewHere" style="margin-left: 10px; " target="blank">NewHere</a><br>
-<a href="https://helpers.pyxis.uberspace.de/profile/helpers" style="margin-left: 10px; " title="Friendica Support" target="blank">Friendica Support</a><br>
-<a href="https://letstalk.pyxis.uberspace.de/profile/letstalk" style="margin-left: 10px; " title="Let's talk" target="blank">Let's talk</a><br>
-<a href="http://newzot.hydra.uberspace.de/profile/newzot" title="Local Friendica" style="margin-left: 10px; " target="blank">Local Friendica</a>
-{{ endif }}
-</div>
-
-<div id="close_services">
-{{ if $lastusers_title }}
-<h3>Connectable Services<a id="close_services_icon" onClick="close_services()" class="icon close_box" title="close"></a></h3>
-<div id="right_service_icons" style="margin-left: 16px; margin-top: 5px;">
-<a href="$url/facebook"><img alt="Facebook" src="view/theme/diabook-aerith/icons/facebook.png" title="Facebook"></a>
-<a href="$url/settings/connectors"><img alt="StatusNet" src="view/theme/diabook-aerith/icons/StatusNet.png?" title="StatusNet"></a>
-<a href="$url/settings/connectors"><img alt="LiveJournal" src="view/theme/diabook-aerith/icons/livejournal.png?" title="LiveJournal"></a>
-<a href="$url/settings/connectors"><img alt="Posterous" src="view/theme/diabook-aerith/icons/posterous.png?" title="Posterous"></a>
-<a href="$url/settings/connectors"><img alt="Tumblr" src="view/theme/diabook-aerith/icons/tumblr.png?" title="Tumblr"></a>
-<a href="$url/settings/connectors"><img alt="Twitter" src="view/theme/diabook-aerith/icons/twitter.png?" title="Twitter"></a>
-<a href="$url/settings/connectors"><img alt="WordPress" src="view/theme/diabook-aerith/icons/wordpress.png?" title="WordPress"></a>
-<a href="$url/settings/connectors"><img alt="E-Mail" src="view/theme/diabook-aerith/icons/email.png?" title="E-Mail"></a>
-</div>
-{{ endif }}
-</div>
-
-<div id="close_friends" style="margin-bottom:53px;">
-{{ if $nv }}
-<h3>Find Friends<a id="close_friends_icon" onClick="close_friends()"  class="icon close_box" title="close"></a></h3>
-<a class="$nv.directory.2" href="$nv.directory.0" style="margin-left: 10px; " title="$nv.directory.3" >$nv.directory.1</a><br>
-<a class="$nv.global_directory.2" href="$nv.global_directory.0" style="margin-left: 10px; " title="$nv.global_directory.3" >$nv.global_directory.1</a><br>
-<a class="$nv.match.2" href="$nv.match.0" style="margin-left: 10px; " title="$nv.match.3" >$nv.match.1</a><br>
-<a class="$nv.suggest.2" href="$nv.suggest.0" style="margin-left: 10px; " title="$nv.suggest.3" >$nv.suggest.1</a><br>
-<a class="$nv.invite.2" href="$nv.invite.0" style="margin-left: 10px; " title="$nv.invite.3" >$nv.invite.1</a>			
-$nv.search
-{{ endif }}
-</div>
-
-<div id="close_postit">
-{{ if $lastusers_title }}
-<h3>PostIt to Friendica<a id="close_postit_icon" onClick="close_postit()" class="icon close_box" title="close"></a></h3>
-<div style="padding-left: 8px;"><span ><a href="$fostitJS" title="PostIt">Post to Friendica</a> from anywhere by bookmarking the Link.</span></div>
-{{ endif }}
-</div>
-
-<div id="close_lastusers">
-{{ if $lastusers_title }}
-<h3>$lastusers_title<a id="close_lastusers_icon" onClick="close_lastusers()" class="icon close_box" title="close"></a></h3>
-<div id='lastusers-wrapper' class='items-wrapper'>
-{{ for $lastusers_items as $i }}
-	$i
-{{ endfor }}
-</div>
-{{ endif }}
-</div>
-
-
-{{ if $activeusers_title }}
-<h3>$activeusers_title</h3>
-<div class='items-wrapper'>
-{{ for $activeusers_items as $i }}
-	$i
-{{ endfor }}
-</div>
-{{ endif }}
-
-<div id="close_lastphotos">
-{{ if $photos_title }}
-<h3>$photos_title<a id="close_photos_icon" onClick="close_lastphotos()"  class="icon close_box" title="close"></a></h3>
-<div id='ra-photos-wrapper' class='items-wrapper'>
-{{ for $photos_items as $i }}
-	$i
-{{ endfor }}
-</div>
-{{ endif }}
-</div>
-
-<div id="close_lastlikes">
-{{ if $like_title }}
-<h3>$like_title<a id="close_lastlikes_icon" onClick="close_lastlikes()" class="icon close_box" title="close"></a></h3>
-<ul id='likes'>
-{{ for $like_items as $i }}
-	<li id='ra-photos-wrapper'>$i</li>
-{{ endfor }}
-</ul>
-{{ endif }}
-</div>
diff --git a/view/theme/diabook-aerith/contact_template.tpl b/view/theme/diabook-aerith/contact_template.tpl
deleted file mode 100755
index 48930b48a..000000000
--- a/view/theme/diabook-aerith/contact_template.tpl
+++ /dev/null
@@ -1,25 +0,0 @@
-
-<div class="contact-entry-wrapper" id="contact-entry-wrapper-$contact.id" >
-	<div class="contact-entry-photo-wrapper" >
-		<div class="contact-entry-photo mframe" id="contact-entry-photo-$contact.id"
-		onmouseover="if (typeof t$contact.id != 'undefined') clearTimeout(t$contact.id); openMenu('contact-photo-menu-button-$contact.id')" 
-		onmouseout="t$contact.id=setTimeout('closeMenu(\'contact-photo-menu-button-$contact.id\'); closeMenu(\'contact-photo-menu-$contact.id\');',200)" >
-
-			<a href="$contact.url" title="$contact.img_hover" /><img src="$contact.thumb" $contact.sparkle alt="$contact.name" /></a>
-
-			{{ if $contact.photo_menu }}
-			<span onclick="openClose('contact-photo-menu-$contact.id');" class="fakelink contact-photo-menu-button" id="contact-photo-menu-button-$contact.id">menu</span>
-                <div class="contact-photo-menu" id="contact-photo-menu-$contact.id">
-                    <ul>
-                        $contact.photo_menu
-                    </ul>
-                </div>
-			{{ endif }}
-		</div>
-			
-	</div>
-	<div class="contact-entry-photo-end" ></div>
-		<div class="contact-entry-name" id="contact-entry-name-$contact.id" >$contact.name</div>
-
-	<div class="contact-entry-end" ></div>
-</div>
diff --git a/view/theme/diabook-aerith/fpostit/README b/view/theme/diabook-aerith/fpostit/README
deleted file mode 100644
index 39b7c5761..000000000
--- a/view/theme/diabook-aerith/fpostit/README
+++ /dev/null
@@ -1,8 +0,0 @@
-fpostit
-
-original author: Devlon Duthied
-
-see his blog posting:
-http://blog.duthied.com/2011/09/13/node-agnostic-friendika-bookmarklet/
-
-original published at github https://github.com/duthied/Friendika-Bookmarklet
diff --git a/view/theme/diabook-aerith/fpostit/fpostit.js b/view/theme/diabook-aerith/fpostit/fpostit.js
deleted file mode 100755
index d183c7573..000000000
--- a/view/theme/diabook-aerith/fpostit/fpostit.js
+++ /dev/null
@@ -1,6 +0,0 @@
-javascript: (function() {
-    					the_url = 'localhost/view/theme/diabook/fpostit/fpostit.php?url=' + encodeURIComponent(window.location.href) + '&title=' + encodeURIComponent(document.title) + '&text=' + encodeURIComponent(''+(window.getSelection ? window.getSelection() : document.getSelection ? document.getSelection() : document.selection.createRange().text));
-    						a_funct = function() {
-        						if (!window.open(the_url, 'fpostit', 'location=yes,links=no,scrollbars=no,toolbar=no,width=600,height=300')) location.href = the_url};
-    							if (/Firefox/.test(navigator.userAgent)) {setTimeout(a_funct, 0)} 
-    							else {a_funct()}})()"
\ No newline at end of file
diff --git a/view/theme/diabook-aerith/fpostit/fpostit.php b/view/theme/diabook-aerith/fpostit/fpostit.php
deleted file mode 100644
index 4505c9946..000000000
--- a/view/theme/diabook-aerith/fpostit/fpostit.php
+++ /dev/null
@@ -1,135 +0,0 @@
-<?php
-if (!isset($_POST["friendika_acct_name"])) $_POST["friendika_acct_name"] = '';
-if (!isset($_COOKIE['username'])) $_COOKIE['username'] = '';
-if (!isset($_COOKIE['password'])) $_COOKIE['password'] = '';
-if (!isset($hostname)) $hostname = '';
-if (!isset($username)) $username = '';
-
-
-if (($_POST["friendika_acct_name"] != '') && ($_POST["friendika_password"] != '')) {
-	setcookie("username", $_POST["friendika_acct_name"], time()+60*60*24*300);
-	setcookie("password", $_POST["friendika_password"], time()+60*60*24*300);
-}
-
-?>
-<html>
-<head>
-	<style>
-		body {
-			font-family: arial, Helvetica,sans-serif;
-			margin: 0px;
-		}
-		.wrap1 {
-			padding: 2px 5px;
-			background-color: #000;
-			margin-bottom: 10px;
-		}
-		.wrap2 {
-			margin-left: 10px;
-			font-size: 12px;
-		}
-		.logo {
-			margin-left: 3px;
-			margin-right: 5px;
-			float: left;
-		}
-		h2 {
-			color: #ffffff;
-		}
-		.error {
-			background-color: #FFFF66;
-			font-size: 12px;
-			margin-left: 10px;
-		}
-	</style>
-</head>
-
-<body>
-<?php
-
-if (isset($_GET['title'])) {
-	$title = $_GET['title'];
-}
-if (isset($_GET['text'])) {
-	$text = $_GET['text'];
-}
-if (isset($_GET['url'])) {
-	$url = $_GET['url'];
-}
-
-if ((isset($title)) && (isset($text)) && (isset($url))) {
-	$content = "$title\nsource:$url\n\n$text";
-} else {
-	$content = $_POST['content'];
-}
-
-if (isset($_POST['submit'])) {
-	
-	if (($_POST["friendika_acct_name"] != '') && ($_POST["friendika_password"] != '')) {
-		$acctname = $_POST["friendika_acct_name"];
-		$tmp_account_array = explode("@", $acctname);
-		if (isset($tmp_account_array[1])) {
-			$username = $tmp_account_array[0];
-			$hostname = $tmp_account_array[1];
-		}
-		$password = $_POST["friendika_password"];
-		$content = $_POST["content"];
-
-		$url = "http://" . $hostname . '/api/statuses/update';
-		$data = array('status' => $content);
-		
-		// echo "posting to: $url<br/>";
-
-		$c = curl_init();
-		curl_setopt($c, CURLOPT_URL, $url); 
-		curl_setopt($c, CURLOPT_USERPWD, "$username:$password");
-		curl_setopt($c, CURLOPT_POSTFIELDS, $data); 
-		curl_setopt($c, CURLOPT_RETURNTRANSFER, true); 
-		curl_setopt($c, CURLOPT_FOLLOWLOCATION, true);
-		$c_result = curl_exec($c); 
-		if(curl_errno($c)){ 
-			$error = curl_error($c);
-			showForm($error, $content);
-		}
-		
-		curl_close($c);
-		if (!isset($error)) {
-			echo '<script language="javascript" type="text/javascript">window.close();</script>';
-		}
-		
-	} else {
-		$error = "Missing account name and/or password...try again please";
-		showForm($error, $content);
-	}
-	
-} else {
-	showForm(null, $content);
-}
-
-function showForm($error, $content) {
-	$username_cookie = $_COOKIE['username'];
-	$password_cookie = $_COOKIE['password'];
-	
-	echo <<<EOF
-	<div class='wrap1'>
-		<h2><img class='logo' src='friendika-32.png' align='middle';/>
-		Friendica Bookmarklet</h2>
-	</div>
-
-	<div class="wrap2">
-		<form method="post" action="{$_SERVER['PHP_SELF']}">
-			Enter the email address of the Friendica Account that you want to cross-post to:(example: user@friendica.org)<br /><br />
-			Account ID: <input type="text" name="friendika_acct_name" value="{$username_cookie}" size="50"/><br />
-			Password: <input type="password" name="friendika_password" value="{$password_cookie}" size="50"/><br />
-			<textarea name="content" id="content" rows="6" cols="70">{$content}</textarea><br />
-			<input type="submit" value="PostIt!" name="submit" />&nbsp;&nbsp;<span class='error'>$error</span>
-		</form>
-		<p></p>
-	</div>
-EOF;
-	
-}
-?>
-
-</body>
-</html>
\ No newline at end of file
diff --git a/view/theme/diabook-aerith/fpostit/friendika-32.png b/view/theme/diabook-aerith/fpostit/friendika-32.png
deleted file mode 100644
index 61764bf20..000000000
--- a/view/theme/diabook-aerith/fpostit/friendika-32.png
+++ /dev/null
diff --git a/view/theme/diabook-aerith/group_side.tpl b/view/theme/diabook-aerith/group_side.tpl
deleted file mode 100755
index af183d04d..000000000
--- a/view/theme/diabook-aerith/group_side.tpl
+++ /dev/null
@@ -1,29 +0,0 @@
-<div id="group-sidebar" class="widget">
-	<div class="title tool">
-		<h3 class="label">$title</h3>
-		<a href="group/new" title="$createtext" class="action"><span class="icon text s16 add"></span></a>
-	</div>
-
-	<div id="sidebar-group-list">
-		<ul>
-			{{ for $groups as $group }}
-			<li class="tool  {{ if $group.selected }}selected{{ endif }}">
-				<a href="$group.href" class="label">
-					$group.text
-				</a>
-				{{ if $group.edit }}
-					<a href="$group.edit.href" class="action"><span class="icon text s10 edit"></span></a>
-				{{ endif }}
-				{{ if $group.cid }}
-					<input type="checkbox" 
-						class="{{ if $group.selected }}ticked{{ else }}unticked {{ endif }} action" 
-						onclick="contactgroupChangeMember('$group.id','$group.cid');return true;"
-						{{ if $group.ismember }}checked="checked"{{ endif }}
-					/>
-				{{ endif }}
-			</li>
-			{{ endfor }}
-		</ul>
-	</div>
-</div>	
-
diff --git a/view/theme/diabook-aerith/icons/com_side.png b/view/theme/diabook-aerith/icons/com_side.png
deleted file mode 100644
index bc5969ef1..000000000
--- a/view/theme/diabook-aerith/icons/com_side.png
+++ /dev/null
diff --git a/view/theme/diabook-aerith/icons/events.png b/view/theme/diabook-aerith/icons/events.png
deleted file mode 100644
index 4a0b3f3f1..000000000
--- a/view/theme/diabook-aerith/icons/events.png
+++ /dev/null
diff --git a/view/theme/diabook-aerith/icons/home.png b/view/theme/diabook-aerith/icons/home.png
deleted file mode 100644
index be47a48fc..000000000
--- a/view/theme/diabook-aerith/icons/home.png
+++ /dev/null
diff --git a/view/theme/diabook-aerith/icons/mess_side.png b/view/theme/diabook-aerith/icons/mess_side.png
deleted file mode 100644
index 49ef896bc..000000000
--- a/view/theme/diabook-aerith/icons/mess_side.png
+++ /dev/null
diff --git a/view/theme/diabook-aerith/icons/notes.png b/view/theme/diabook-aerith/icons/notes.png
deleted file mode 100644
index 7d4afca90..000000000
--- a/view/theme/diabook-aerith/icons/notes.png
+++ /dev/null
diff --git a/view/theme/diabook-aerith/icons/pscontacts.png b/view/theme/diabook-aerith/icons/pscontacts.png
deleted file mode 100644
index acf857f32..000000000
--- a/view/theme/diabook-aerith/icons/pscontacts.png
+++ /dev/null
diff --git a/view/theme/diabook-aerith/icons/pubgroups.png b/view/theme/diabook-aerith/icons/pubgroups.png
deleted file mode 100644
index 6d9539610..000000000
--- a/view/theme/diabook-aerith/icons/pubgroups.png
+++ /dev/null
diff --git a/view/theme/diabook-aerith/icons/selected.png b/view/theme/diabook-aerith/icons/selected.png
deleted file mode 100755
index 2a30ae252..000000000
--- a/view/theme/diabook-aerith/icons/selected.png
+++ /dev/null
diff --git a/view/theme/diabook-aerith/jot.tpl b/view/theme/diabook-aerith/jot.tpl
deleted file mode 100755
index 59066a19c..000000000
--- a/view/theme/diabook-aerith/jot.tpl
+++ /dev/null
@@ -1,84 +0,0 @@
-
-<div id="profile-jot-wrapper" >
-	<div id="profile-jot-banner-wrapper">
-		<div id="profile-jot-desc" >&nbsp;</div>
-		<div id="character-counter" class="grey"></div>
-	</div>
-	<div id="profile-jot-banner-end"></div>
-
-	<form id="profile-jot-form" action="$action" method="post" >
-		<input type="hidden" name="type" value="$ptyp" />
-		<input type="hidden" name="profile_uid" value="$profile_uid" />
-		<input type="hidden" name="return" value="$return_path" />
-		<input type="hidden" name="location" id="jot-location" value="$defloc" />
-		<input type="hidden" name="coord" id="jot-coord" value="" />
-		<input type="hidden" name="post_id" value="$post_id" />
-		<input type="hidden" name="preview" id="jot-preview" value="0" />
-		<input name="title" id="jot-title" type="text" placeholder="$placeholdertitle" value="$title" class="jothidden" style="display:none">
-		<img id="profile-jot-text-loading" src="images/rotator.gif" alt="$wait" title="$wait" style="display: none;" />
-		<textarea rows="5" cols="64" class="profile-jot-text" id="profile-jot-text" name="body" >{{ if $content }}$content{{ else }}$share{{ endif }}</textarea>
-
-
-<div id="profile-jot-submit-wrapper" class="jothidden">
-	
-	<div id="profile-upload-wrapper" style="display: $visitor;" >
-		<div id="wall-image-upload-div" ><a href="#" onclick="return false;" id="wall-image-upload" class="camera" title="$upload"></a></div>
-	</div> 
-	<div id="profile-attach-wrapper" style="display: $visitor;" >
-		<div id="wall-file-upload-div" ><a href="#" onclick="return false;" id="wall-file-upload" class="attach" title="$attach"></a></div>
-	</div> 
-
-	<div id="profile-link-wrapper" style="display: $visitor;" ondragenter="linkdropper(event);" ondragover="linkdropper(event);" ondrop="linkdrop(event);" >
-		<a id="profile-link" class="weblink" title="$weblink" ondragenter="return linkdropper(event);" ondragover="return linkdropper(event);" ondrop="linkdrop(event);" onclick="jotGetLink(); return false;"></a>
-	</div> 
-	<div id="profile-video-wrapper" style="display: $visitor;" >
-		<a id="profile-video" class="video2" title="$video" onclick="jotVideoURL();return false;"></a>
-	</div> 
-	<div id="profile-audio-wrapper" style="display: $visitor;" >
-		<a id="profile-audio" class="audio2" title="$audio" onclick="jotAudioURL();return false;"></a>
-	</div> 
-	<div id="profile-location-wrapper" style="display: $visitor;" >
-		<a id="profile-location" class="globe" title="$setloc" onclick="jotGetLocation();return false;"></a>
-	</div> 
-	<div id="profile-nolocation-wrapper" style="display: none;" >
-		<a id="profile-nolocation" class="noglobe" title="$noloc" onclick="jotClearLocation();return false;"></a>
-	</div> 
-
-	<input type="submit" id="profile-jot-submit" class="button creation2" name="submit" value="$share" />
-  
-   <span onclick="preview_post();" id="jot-preview-link" class="tab button">$preview</span>
-   
-	<div id="profile-jot-perms" class="profile-jot-perms" style="display: $pvisit;" >
-		<a href="#profile-jot-acl-wrapper" id="jot-perms-icon" class="icon $lockstate"  title="$permset" ></a>$bang
-	</div>
-
-
-	<div id="profile-jot-plugin-wrapper">
-  	$jotplugins
-	</div>
-	
-	<div id="profile-rotator-wrapper" style="display: $visitor;" >
-		<img id="profile-rotator" src="images/rotator.gif" alt="$wait" title="$wait" style="display: none;" />
-	</div> 
-	
-	</div>
-   <div id="profile-jot-perms-end"></div>
-	
-	<div id="jot-preview-content" style="display:none;"></div>
-
-	<div style="display: none;">
-		<div id="profile-jot-acl-wrapper" style="width:auto;height:auto;overflow:auto;">
-			$acl
-			<hr style="clear:both"/>
-			<div id="profile-jot-email-label">$emailcc</div><input type="text" name="emailcc" id="profile-jot-email" title="$emtitle" />
-			<div id="profile-jot-email-end"></div>
-			$jotnets
-		</div>
-	</div>
-
-
-
-
-</form>
-</div>
-		{{ if $content }}<script>initEditor();</script>{{ endif }}
diff --git a/view/theme/diabook-aerith/js/jquery.cookie.js b/view/theme/diabook-aerith/js/jquery.cookie.js
deleted file mode 100644
index 6d5974a2c..000000000
--- a/view/theme/diabook-aerith/js/jquery.cookie.js
+++ /dev/null
@@ -1,47 +0,0 @@
-/*!
- * jQuery Cookie Plugin
- * https://github.com/carhartl/jquery-cookie
- *
- * Copyright 2011, Klaus Hartl
- * Dual licensed under the MIT or GPL Version 2 licenses.
- * http://www.opensource.org/licenses/mit-license.php
- * http://www.opensource.org/licenses/GPL-2.0
- */
-(function($) {
-    $.cookie = function(key, value, options) {
-
-        // key and at least value given, set cookie...
-        if (arguments.length > 1 && (!/Object/.test(Object.prototype.toString.call(value)) || value === null || value === undefined)) {
-            options = $.extend({}, options);
-
-            if (value === null || value === undefined) {
-                options.expires = -1;
-            }
-
-            if (typeof options.expires === 'number') {
-                var days = options.expires, t = options.expires = new Date();
-                t.setDate(t.getDate() + days);
-            }
-
-            value = String(value);
-
-            return (document.cookie = [
-                encodeURIComponent(key), '=', options.raw ? value : encodeURIComponent(value),
-                options.expires ? '; expires=' + options.expires.toUTCString() : '', // use expires attribute, max-age is not supported by IE
-                options.path    ? '; path=' + options.path : '',
-                options.domain  ? '; domain=' + options.domain : '',
-                options.secure  ? '; secure' : ''
-            ].join(''));
-        }
-
-        // key and possibly options given, get cookie...
-        options = value || {};
-        var decode = options.raw ? function(s) { return s; } : decodeURIComponent;
-
-        var pairs = document.cookie.split('; ');
-        for (var i = 0, pair; pair = pairs[i] && pairs[i].split('='); i++) {
-            if (decode(pair[0]) === key) return decode(pair[1] || ''); // IE saves cookies with empty string as "c; ", e.g. without "=" as opposed to EOMB, thus pair[1] may be undefined
-        }
-        return null;
-    };
-})(jQuery);
diff --git a/view/theme/diabook-aerith/mail_conv.tpl b/view/theme/diabook-aerith/mail_conv.tpl
deleted file mode 100755
index 989f17878..000000000
--- a/view/theme/diabook-aerith/mail_conv.tpl
+++ /dev/null
@@ -1,60 +0,0 @@
-<div class="wall-item-container $item.indent">
-	<div class="wall-item-item">
-		<div class="wall-item-info">
-			<div class="contact-photo-wrapper"
-				<a href="$mail.profile_url" target="redir" title="$mail.from_name" class="contact-photo-link" id="wall-item-photo-link-$mail.id">
-					<img src="$mail.from_photo" class="contact-photo$mail.sparkle" id="wall-item-photo-$mail.id" alt="$mail.from_name" />
-				</a>
-			</div>
-		</div>
-		<div class="wall-item-content">
-			$mail.body
-		</div>
-	</div>
-	<div class="wall-item-bottom">
-		<div class="wall-item-links">
-		</div>
-		<div class="wall-item-tags">
-		</div>
-	</div>
-	<div class="wall-item-bottom">
-		<div class="">
-		</div>
-		<div class="wall-item-actions">
-			<div class="wall-item-actions-author">
-				<a href="$mail.from_url" target="redir" class="wall-item-name-link"><span class="wall-item-name$mail.sparkle">$mail.from_name</span></a> <span class="wall-item-ago">$mail.date</span>
-			</div>
-			
-			<div class="wall-item-actions-social">
-			</div>
-			
-			<div class="wall-item-actions-tools">
-				<a href="message/drop/$mail.id" onclick="return confirmDelete();" class="icon delete s16" title="$mail.delete">$mail.delete</a>
-			</div>
-			
-		</div>
-	</div>
-	<div class="wall-item-bottom">
-	</div>
-</div>
-
-
-{#
-
-
-<div class="mail-conv-outside-wrapper">
-	<div class="mail-conv-sender" >
-		<a href="$mail.from_url" class="mail-conv-sender-url" ><img class="mframe mail-conv-sender-photo$mail.sparkle" src="$mail.from_photo" heigth="80" width="80" alt="$mail.from_name" /></a>
-	</div>
-	<div class="mail-conv-detail" >
-		<div class="mail-conv-sender-name" >$mail.from_name</div>
-		<div class="mail-conv-date">$mail.date</div>
-		<div class="mail-conv-subject">$mail.subject</div>
-		<div class="mail-conv-body">$mail.body</div>
-	<div class="mail-conv-delete-wrapper" id="mail-conv-delete-wrapper-$mail.id" ><a href="message/drop/$mail.id" class="icon drophide delete-icon mail-list-delete-icon" onclick="return confirmDelete();" title="$mail.delete" id="mail-conv-delete-icon-$mail.id" class="mail-conv-delete-icon" onmouseover="imgbright(this);" onmouseout="imgdull(this);" ></a></div><div class="mail-conv-delete-end"></div>
-	<div class="mail-conv-outside-wrapper-end"></div>
-</div>
-</div>
-<hr class="mail-conv-break" />
-
-#}
diff --git a/view/theme/diabook-aerith/mail_display.tpl b/view/theme/diabook-aerith/mail_display.tpl
deleted file mode 100644
index 8b82e95c6..000000000
--- a/view/theme/diabook-aerith/mail_display.tpl
+++ /dev/null
@@ -1,12 +0,0 @@
-<div id="mail-display-subject">
-	<span class="{{if $thread_seen}}seen{{else}}unseen{{endif}}">$thread_subject</span>
-	<a href="message/dropconv/$thread_id" onclick="return confirmDelete();"  title="$delete" class="mail-delete icon s22 delete"></a>
-</div>
-
-{{ for $mails as $mail }}
-	<div id="tread-wrapper-$mail.id" class="tread-wrapper">
-		{{ inc mail_conv.tpl }}{{endinc}}
-	</div>
-{{ endfor }}
-
-{{ inc prv_message.tpl }}{{ endinc }}
diff --git a/view/theme/diabook-aerith/mail_list.tpl b/view/theme/diabook-aerith/mail_list.tpl
deleted file mode 100644
index 6bc6c84f6..000000000
--- a/view/theme/diabook-aerith/mail_list.tpl
+++ /dev/null
@@ -1,8 +0,0 @@
-<div class="mail-list-wrapper">
-	<span class="mail-subject {{if $seen}}seen{{else}}unseen{{endif}}"><a href="message/$id" class="mail-link">$subject</a></span>
-	<span class="mail-from">$from_name</span>
-	<span class="mail-date">$date</span>
-	<span class="mail-count">$count</span>
-	
-	<a href="message/dropconv/$id" onclick="return confirmDelete();"  title="$delete" class="mail-delete icon s22 delete"></a>
-</div>
diff --git a/view/theme/diabook-aerith/message_side.tpl b/view/theme/diabook-aerith/message_side.tpl
deleted file mode 100644
index 9f1587096..000000000
--- a/view/theme/diabook-aerith/message_side.tpl
+++ /dev/null
@@ -1,10 +0,0 @@
-<div id="message-sidebar" class="widget">
-	<div id="message-new" class="{{ if $new.sel }}selected{{ endif }}"><a href="$new.url">$new.label</a> </div>
-	
-	<ul class="message-ul">
-		{{ for $tabs as $t }}
-			<li class="tool {{ if $t.sel }}selected{{ endif }}"><a href="$t.url" class="message-link">$t.label</a></li>
-		{{ endfor }}
-	</ul>
-	
-</div>
diff --git a/view/theme/diabook-aerith/nav.tpl b/view/theme/diabook-aerith/nav.tpl
deleted file mode 100644
index f84b902d5..000000000
--- a/view/theme/diabook-aerith/nav.tpl
+++ /dev/null
@@ -1,188 +0,0 @@
-<header>
-	<div id="site-location">$sitelocation</div>
-	<div id="banner">$banner</div>
-</header>
-<nav>
-			
-			
-	<ul>
-			
-			
-			{{ if $nav.network }}
-			<li id="nav-network-link" class="nav-menu-icon">
-				<a class="$nav.network.2" href="$nav.network.0" title="$nav.network.3" >
-				<span class="icon notifications">Benachrichtigungen</span>
-				<span id="net-update" class="nav-notify"></span></a>
-			</li>
-		    {{ endif }}
-	
-			{{ if $nav.contacts }}
-			<li class="nav-menu-icon" id="nav-contacts-linkmenu">
-				<a href="$nav.contacts.0" rel="#nav-contacts-menu" title="$nav.contacts.1">
-				<span class="icon contacts">$nav.contacts.1</span>
-				<span id="intro-update" class="nav-notify"></span></a>
-				<ul id="nav-contacts-menu" class="menu-popup">
-					<li id="nav-contacts-see-intro"><a href="$nav.notifications.0">$nav.introductions.1</a><span id="intro-update" class="nav-notify"></span></li>
-					<li id="nav-contacts-all"><a href="contacts">$nav.contacts.1</a></li> 
-				</ul>
-			</li>	
-			{{ endif }}
-			
-			{{ if $nav.messages }}
-			<li  id="nav-messages-linkmenu" class="nav-menu-icon">
-			  <a href="$nav.messages.0" rel="#nav-messages-menu" title="$nav.messages.1">
-			  <span class="icon messages">$nav.messages.1</span>
-				<span id="mail-update" class="nav-notify"></span></a>
-				<ul id="nav-messages-menu" class="menu-popup">
-					<li id="nav-messages-see-all"><a href="$nav.messages.0">$nav.messages.1</a></li>
-					<li id="nav-messages-see-all"><a href="$nav.messages.inbox.0">$nav.messages.inbox.1</a></li>
-					<li id="nav-messages-see-all"><a href="$nav.messages.outbox.0">$nav.messages.outbox.1</a></li>
-					<li id="nav-messages-see-all"><a href="$nav.messages.new.0">$nav.messages.new.1</a></li>
-				</ul>
-			</li>		
-			{{ endif }}
-		
-      {{ if $nav.notifications }}
-			<li  id="nav-notifications-linkmenu" class="nav-menu-icon">
-			<a href="$nav.notifications.0" rel="#nav-notifications-menu" title="$nav.notifications.1">
-			   <span class="icon notify">$nav.notifications.1</span>
-				<span id="notify-update" class="nav-notify"></span></a>
-				<ul id="nav-notifications-menu" class="menu-popup">
-					<li id="nav-notifications-mark-all"><a href="#" onclick="notifyMarkAll(); return false;">$nav.notifications.mark.1</a></li>
-					<li id="nav-notifications-see-all"><a href="$nav.notifications.all.0">$nav.notifications.all.1</a></li>
-					<li class="empty">$emptynotifications</li>
-				</ul>
-			</li>		
-		{{ endif }}	
-			
-		{{ if $nav.search}}
-		<li id="search-box">
-			<form method="get" action="$nav.search.0">
-				<input id="search-text" class="nav-menu-search" type="text" value="" name="search">
-			</form>
-		</li>		
-		{{ endif }}	
-		
-		<li id="nav-site-linkmenu" class="nav-menu-icon"><a href="#" rel="#nav-site-menu"><span class="icon s22 gear">Site</span></a>
-			<ul id="nav-site-menu" class="menu-popup">
-				{{ if $nav.manage }}<li><a class="$nav.manage.2" href="$nav.manage.0" title="$nav.manage.3">$nav.manage.1</a></li>{{ endif }}				
-
-				{{ if $nav.settings }} <li><a class="$nav.search.2" onClick="restore_boxes()" title="Restore right-hand column" style="cursor: pointer;">Restore right-hand column</a></li>{{ endif }}
-
-				{{ if $nav.help }} <li><a class="$nav.help.2" target="friendika-help" href="$nav.help.0" title="$nav.help.3" >$nav.help.1</a></li>{{ endif }}
-										
-										 <li><a class="$nav.search.2" href="friendica" title="Site Info / Impressum" >Info/Impressum</a></li>
-
-				{{ if $nav.settings }}<li><a class="menu-sep $nav.settings.2" href="$nav.settings.0" title="$nav.settings.3">$nav.settings.1</a></li>{{ endif }}
-				{{ if $nav.admin }}<li><a class="$nav.admin.2" href="$nav.admin.0" title="$nav.admin.3" >$nav.admin.1</a></li>{{ endif }}
-
-				{{ if $nav.logout }}<li><a class="menu-sep $nav.logout.2" href="$nav.logout.0" title="$nav.logout.3" >$nav.logout.1</a></li>{{ endif }}
-
-				
-			</ul>		
-		</li>
-		
-		{{ if $nav.directory }}
-		<li id="nav-directory-link" class="nav-menu $sel.directory">
-			<a class="$nav.directory.2" href="$nav.directory.0" title="$nav.directory.3" >$nav.directory.1</a>
-		</li>
-		{{ endif }}
-		
-		
-		{{ if $nav.apps }}
-			<li id="nav-apps-link" class="nav-menu $sel.apps">
-				<a class=" $nav.apps.2" href="#" rel="#nav-apps-menu" title="$nav.apps.3" >$nav.apps.1</a>
-				<ul id="nav-apps-menu" class="menu-popup">
-					{{ for $apps as $ap }}
-					<li>$ap</li>
-					{{ endfor }}
-				</ul>
-			</li>	
-		{{ endif }}		
-		
-      {{ if $nav.settings }}
-			<li id="nav-home-link" class="nav-menu $sel.home">
-				<a class="$nav.home.2" href="$nav.home.0" title="$nav.home.3" >$nav.home.1
-				<span id="home-update" class="nav-notify"></span></a>
-			</li>
-		{{ endif }}		
-		
-		{{ if $userinfo }}
-			<li id="nav-user-linkmenu" class="nav-menu-icon"><a href="#" rel="#nav-user-menu" title="$sitelocation"><img src="$userinfo.icon" alt="$userinfo.name"></a>
-				<ul id="nav-user-menu" class="menu-popup">
-					{{ for $nav.usermenu as $usermenu }}
-						<li><a class="$usermenu.2" href="$usermenu.0" title="$usermenu.3">$usermenu.1</a></li>
-					{{ endfor }}
-					
-					{{ if $nav.profiles }}<li><a class="menu-sep $nav.profiles.2" href="$nav.profiles.0" title="$nav.profiles.3" >$nav.profiles.3</a></li>{{ endif }}
-					{{ if $nav.notifications }}<li><a class="$nav.notifications.2" href="$nav.notifications.0" title="$nav.notifications.3" >$nav.notifications.1</a></li>{{ endif }}
-					{{ if $nav.messages }}<li><a class="$nav.messages.2" href="$nav.messages.0" title="$nav.messages.3" >$nav.messages.1</a></li>{{ endif }}
-					{{ if $nav.contacts }}<li><a class="$nav.contacts.2" href="$nav.contacts.0" title="$nav.contacts.3" >$nav.contacts.1</a></li>{{ endif }}	
-				</ul>
-			</li>
-		{{ endif }}
-		
-					{{ if $nav.login }}
-					<li id="nav-home-link" class="nav-menu $sel.home">
-						<a class="$nav.login.2" href="$nav.login.0" title="$nav.login.3" >$nav.login.1</a>
-					<li>
-					{{ endif }}
-		
-		
-		
-	</ul>	
-
-
-	
-</nav>
-
-
-<div style="position: fixed; bottom: 5px; right: 10px;"><a href="javascript:scroll(0,0); "><img src="view/theme/diabook-aerith/icons/scroll_top.png" title="scroll to top"></a></div>
-<div style="position: fixed; bottom: 3px; left: 25px;">$langselector</div>
-<div style="position: fixed; bottom: 23px; left: 5px;"><a href="http://pad.toktan.org/p/diabook" target="blank" ><img src="view/theme/diabook-aerith/icons/bluebug.png" title="report bugs for the theme diabook-aerith"/></a></div>
-
-
-
-<ul id="nav-notifications-template" style="display:none;" rel="template">
-	<li class="{4}"><a href="{0}"><img src="{1}">{2} <span class="notif-when">{3}</span></a></li>
-</ul>
-
-
-
-{#
-
-{{ if $nav.logout }}<a id="nav-logout-link" class="nav-link $nav.logout.2" href="$nav.logout.0" title="$nav.logout.3" >$nav.logout.1</a> {{ endif }}
-{{ if $nav.login }}<a id="nav-login-link" class="nav-login-link $nav.login.2" href="$nav.login.0" title="$nav.login.3" >$nav.login.1</a> {{ endif }}
-
-<span id="nav-link-wrapper" >
-
-{{ if $nav.register }}<a id="nav-register-link" class="nav-commlink $nav.register.2" href="$nav.register.0" title="$nav.register.3" >$nav.register.1</a>{{ endif }}
-	
-<a id="nav-help-link" class="nav-link $nav.help.2" target="friendika-help" href="$nav.help.0" title="$nav.help.3" >$nav.help.1</a>
-	
-{{ if $nav.apps }}<a id="nav-apps-link" class="nav-link $nav.apps.2" href="$nav.apps.0" title="$nav.apps.3" >$nav.apps.1</a>{{ endif }}
-
-<a id="nav-search-link" class="nav-link $nav.search.2" href="$nav.search.0" title="$nav.search.3" >$nav.search.1</a>
-<a id="nav-directory-link" class="nav-link $nav.directory.2" href="$nav.directory.0" title="$nav.directory.3" >$nav.directory.1</a>
-
-{{ if $nav.admin }}<a id="nav-admin-link" class="nav-link $nav.admin.2" href="$nav.admin.0" title="$nav.admin.3" >$nav.admin.1</a>{{ endif }}
-
-{{ if $nav.notifications }}
-<a id="nav-notify-link" class="nav-commlink $nav.notifications.2" href="$nav.notifications.0" title="$nav.notifications.3" >$nav.notifications.1</a>
-<span id="notify-update" class="nav-ajax-left"></span>
-{{ endif }}
-{{ if $nav.messages }}
-<a id="nav-messages-link" class="nav-commlink $nav.messages.2" href="$nav.messages.0" title="$nav.messages.3" >$nav.messages.1</a>
-<span id="mail-update" class="nav-ajax-left"></span>
-{{ endif }}
-
-{{ if $nav.manage }}<a id="nav-manage-link" class="nav-commlink $nav.manage.2" href="$nav.manage.0" title="$nav.manage.3">$nav.manage.1</a>{{ endif }}
-
-{{ if $nav.settings }}<a id="nav-settings-link" class="nav-link $nav.settings.2" href="$nav.settings.0" title="$nav.settings.3">$nav.settings.1</a>{{ endif }}
-{{ if $nav.profiles }}<a id="nav-profiles-link" class="nav-link $nav.profiles.2" href="$nav.profiles.0" title="$nav.profiles.3" >$nav.profiles.1</a>{{ endif }}
-
-
-</span>
-<span id="nav-end"></span>
-<span id="banner">$banner</span>
-#}
diff --git a/view/theme/diabook-aerith/photo_view.tpl b/view/theme/diabook-aerith/photo_view.tpl
deleted file mode 100755
index 511fc73ac..000000000
--- a/view/theme/diabook-aerith/photo_view.tpl
+++ /dev/null
@@ -1,27 +0,0 @@
-<div id="live-display"></div>
-<h3><a href="$album.0">$album.1</a></h3>
-
-<div id="photo-edit-link-wrap">
-{{ if $tools }}
-<a id="photo-edit-link" href="$tools.edit.0">$tools.edit.1</a>
--
-<a id="photo-toprofile-link" href="$tools.profile.0">$tools.profile.1</a>
-{{ endif }}
-{{ if $lock }} - <img src="images/lock_icon.gif" class="lockview" alt="$lock" onclick="lockview(event,'photo$id');" /> {{ endif }}
-</div>
-
-<div id="photo-photo">
-	{{ if $prevlink }}<div id="photo-prev-link"><a href="$prevlink.0">$prevlink.1</a></div>{{ endif }}
-	<a href="$photo.href" class="lightbox" title="$photo.title"><img src="$photo.src" /></a>
-	{{ if $nextlink }}<div id="photo-next-link"><a href="$nextlink.0">$nextlink.1</a></div>{{ endif }}
-</div>
-
-<div id="photo-photo-end"></div>
-<div id="photo-caption" >$desc</div>
-{{ if $tags }}
-<div id="in-this-photo-text">$tags.0</div>
-<div id="in-this-photo">$tags.1</div>
-{{ endif }}
-{{ if $tags.2 }}<div id="tag-remove"><a href="$tags.2">$tags.3</a></div>{{ endif }}
-
-{{ if $edit }}$edit{{ endif }}
\ No newline at end of file
diff --git a/view/theme/diabook-aerith/profile_side.tpl b/view/theme/diabook-aerith/profile_side.tpl
deleted file mode 100644
index 94396300f..000000000
--- a/view/theme/diabook-aerith/profile_side.tpl
+++ /dev/null
@@ -1,21 +0,0 @@
-<div id="profile_side">
-	<div id="ps-usernameicon">
-		<a href="$ps.usermenu.status.0" title="$userinfo.name">
-			<img src="$userinfo.icon" id="ps-usericon" alt="$userinfo.name">
-		</a>
-		<a href="$ps.usermenu.status.0" id="ps-username" title="$userinfo.name">$userinfo.name</a>
-	</div>
-	
-<ul id="profile-side-menu" class="menu-profile-side">
-	<li id="profile-side-status" class="menu-profile-list home"><a class="menu-profile-list-item" href="$ps.usermenu.status.0">$ps.usermenu.status.1</a></li>
-	<li id="profile-side-photos" class="menu-profile-list photos"><a class="menu-profile-list-item" href="$ps.usermenu.photos.0">$ps.usermenu.photos.1</a></li>
-		<li id="profile-side-photos" class="menu-profile-list pscontacts"><a class="menu-profile-list-item" href="$ps.usermenu.contacts.0">$ps.usermenu.contacts.1</a></li>	
-	<li id="profile-side-events" class="menu-profile-list events"><a class="menu-profile-list-item" href="$ps.usermenu.events.0">$ps.usermenu.events.1</a></li>
-	<li id="profile-side-notes" class="menu-profile-list notes"><a class="menu-profile-list-item" href="$ps.usermenu.notes.0">$ps.usermenu.notes.1</a></li>
-	<li id="profile-side-foren" class="menu-profile-list foren"><a class="menu-profile-list-item" href="$ps.usermenu.pgroups.0" target="blanc">$ps.usermenu.pgroups.1</a></li>
-	<li id="profile-side-foren" class="menu-profile-list com_side"><a class="menu-profile-list-item" href="$ps.usermenu.community.0">$ps.usermenu.community.1</a></li>
-</ul>
-
-</div>
-
-				
diff --git a/view/theme/diabook-aerith/profile_vcard.tpl b/view/theme/diabook-aerith/profile_vcard.tpl
deleted file mode 100644
index 918cfc97c..000000000
--- a/view/theme/diabook-aerith/profile_vcard.tpl
+++ /dev/null
@@ -1,64 +0,0 @@
-<div class="vcard">
-
-	<div class="tool">
-		<div class="fn label">$profile.name</div>
-		{{ if $profile.edit }}
-			<div class="action">
-			<a class="icon s16 edit ttright" href="#" rel="#profiles-menu" title="$profile.edit.3"><span>$profile.edit.1</span></a>
-			<ul id="profiles-menu" class="menu-popup">
-				{{ for $profile.menu.entries as $e }}
-				<li>
-					<a href="profiles/$e.id"><img src='$e.photo'>$e.profile_name</a>
-				</li>
-				{{ endfor }}
-				<li><a href="profile_photo" >$profile.menu.chg_photo</a></li>
-				<li><a href="profiles/new" id="profile-listing-new-link">$profile.menu.cr_new</a></li>
-				<li><a href="profiles" >$profile.edit.3</a></li>
-								
-			</ul>
-			</div>
-		{{ endif }}
-	</div>
-				
-	
-	{{ if $pdesc }}<div class="title">$profile.pdesc</div>{{ endif }}
-	<div id="profile-photo-wrapper"><img class="photo" width="155" height="155" src="$profile.photo?rev=$profile.picdate" alt="$profile.name" /></div>
-
-
-
-	{{ if $location }}
-		<dl class="location"><dt class="location-label">$location</dt><br> 
-		<dd class="adr">
-			{{ if $profile.address }}<div class="street-address">$profile.address</div>{{ endif }}
-			<span class="city-state-zip">
-				<span class="locality">$profile.locality</span>{{ if $profile.locality }}, {{ endif }}
-				<span class="region">$profile.region</span>
-				<span class="postal-code">$profile.postal-code</span>
-			</span>
-			{{ if $profile.country-name }}<span class="country-name">$profile.country-name</span>{{ endif }}
-		</dd>
-		</dl>
-	{{ endif }}
-
-	{{ if $gender }}<dl class="mf"><dt class="gender-label">$gender</dt> <dd class="x-gender">$profile.gender</dd></dl>{{ endif }}
-	
-	{{ if $profile.pubkey }}<div class="key" style="display:none;">$profile.pubkey</div>{{ endif }}
-
-	{{ if $marital }}<dl class="marital"><dt class="marital-label"><span class="heart">&hearts;</span>$marital</dt><dd class="marital-text">$profile.marital</dd></dl>{{ endif }}
-
-	{{ if $homepage }}<dl class="homepage"><dt class="homepage-label">$homepage</dt><dd class="homepage-url"><a href="$profile.homepage" target="external-link">$profile.homepage</a></dd></dl>{{ endif }}
-
-	{{ inc diaspora_vcard.tpl }}{{ endinc }}
-	
-	<div id="profile-extra-links">
-		<ul>
-			{{ if $connect }}
-				<li><a id="dfrn-request-link" href="dfrn_request/$profile.nickname">$connect</a></li>
-			{{ endif }}
-		</ul>
-	</div>
-</div>
-
-$contact_block
-
-
diff --git a/view/theme/diabook-aerith/right_aside.tpl b/view/theme/diabook-aerith/right_aside.tpl
deleted file mode 100644
index a65677696..000000000
--- a/view/theme/diabook-aerith/right_aside.tpl
+++ /dev/null
@@ -1,20 +0,0 @@
-<div id="profile_side">
-	<div id="ps-usernameicon">
-		<a href="$ps.usermenu.status.0" title="$userinfo.name">
-			<img src="$userinfo.icon" id="ps-usericon" alt="$userinfo.name">
-		</a>
-		<a href="$ps.usermenu.status.0" id="ps-username" title="$userinfo.name">$userinfo.name</a>
-	</div>
-	
-<ul id="profile-side-menu" class="menu-profile-side">
-	<li id="profile-side-status" class="menu-profile-list home"><a class="menu-profile-list-item" href="$ps.usermenu.status.0">$ps.usermenu.status.1</a></li>
-	<li id="profile-side-photos" class="menu-profile-list photos"><a class="menu-profile-list-item" href="$ps.usermenu.photos.0">$ps.usermenu.photos.1</a></li>
-	<li id="profile-side-events" class="menu-profile-list events"><a class="menu-profile-list-item" href="$ps.usermenu.events.0">$ps.usermenu.events.1</a></li>
-	<li id="profile-side-notes" class="menu-profile-list notes"><a class="menu-profile-list-item" href="$ps.usermenu.notes.0">$ps.usermenu.notes.1</a></li>
-	<li id="profile-side-foren" class="menu-profile-list foren"><a class="menu-profile-list-item" href="http://dir.friendika.com/directory/forum" target="blanc">Public Groups</a></li>
-	<li id="profile-side-foren" class="menu-profile-list com_side"><a class="menu-profile-list-item" href="$ps.usermenu.community.0">$ps.usermenu.community.1</a></li>
-</ul>
-
-</div>
-
-				
\ No newline at end of file
diff --git a/view/theme/diabook-aerith/rs_common_tabs.tpl b/view/theme/diabook-aerith/rs_common_tabs.tpl
deleted file mode 100755
index 6a1c5c71b..000000000
--- a/view/theme/diabook-aerith/rs_common_tabs.tpl
+++ /dev/null
@@ -1,6 +0,0 @@
-<h3 style="border-bottom: 1px solid #D2D2D2;">Settings Menu</h3>
-<ul class="rs_tabs">
-	{{ for $tabs as $tab }}
-		<li><a href="$tab.url" class="rs_tab button $tab.sel">$tab.label</a></li>
-	{{ endfor }}
-</ul>
diff --git a/view/theme/diabook-aerith/screenshot.png b/view/theme/diabook-aerith/screenshot.png
deleted file mode 100644
index 0c2f50894..000000000
--- a/view/theme/diabook-aerith/screenshot.png
+++ /dev/null
diff --git a/view/theme/diabook-aerith/search_item.tpl b/view/theme/diabook-aerith/search_item.tpl
deleted file mode 100755
index 123834064..000000000
--- a/view/theme/diabook-aerith/search_item.tpl
+++ /dev/null
@@ -1,100 +0,0 @@
-{{ if $item.indent }}{{ else }}
-<div class="wall-item-decor">
-	<img id="like-rotator-$item.id" class="like-rotator" src="images/rotator.gif" alt="$item.wait" title="$item.wait" style="display: none;" />
-</div>
-{{ endif }}
-<div class="wall-item-container $item.indent">
-	<div class="wall-item-item">
-		<div class="wall-item-info">
-			<div class="contact-photo-wrapper"
-				onmouseover="if (typeof t$item.id != 'undefined') clearTimeout(t$item.id); openMenu('wall-item-photo-menu-button-$item.id')" 
-				onmouseout="t$item.id=setTimeout('closeMenu(\'wall-item-photo-menu-button-$item.id\'); closeMenu(\'wall-item-photo-menu-$item.id\');',200)">
-				<a href="$item.profile_url" target="redir" title="$item.linktitle" class="contact-photo-link" id="wall-item-photo-link-$item.id">
-					<img src="$item.thumb" class="contact-photo$item.sparkle" id="wall-item-photo-$item.id" alt="$item.name" />
-				</a>
-				<a href="#" rel="#wall-item-photo-menu-$item.id" class="contact-photo-menu-button icon s16 menu" id="wall-item-photo-menu-button-$item.id">menu</a>
-				<ul class="contact-menu menu-popup" id="wall-item-photo-menu-$item.id">
-				$item.item_photo_menu
-				</ul>
-				
-			</div>
-		</div>
-			<div class="wall-item-actions-author">
-				<a href="$item.profile_url" target="redir" title="$item.linktitle" class="wall-item-name-link"><span class="wall-item-name$item.sparkle">$item.name</span></a> 
-			<span class="wall-item-ago">-
-			{{ if $item.plink }}<a class="link" title="$item.plink.title" href="$item.plink.href" style="color: #999">$item.ago</a>{{ else }} $item.ago {{ endif }}
-			{{ if $item.lock }} - <span class="fakelink" style="color: #999" onclick="lockview(event,$item.id);">$item.lock</span> {{ endif }}
-			</span>
-			</div>
-		<div class="wall-item-content">
-			{{ if $item.title }}<h2><a href="$item.plink.href">$item.title</a></h2>{{ endif }}
-			$item.body
-		</div>
-	</div>
-	<div class="wall-item-bottom">
-		<div class="wall-item-links">
-		</div>
-		<div class="wall-item-tags">
-			{{ for $item.tags as $tag }}
-				<span class='tag'>$tag</span>
-			{{ endfor }}
-		</div>
-	</div>
-	<div class="wall-item-bottom">
-		<div class="">
-
-		</div>
-		<div class="wall-item-actions">
-
-			<div class="wall-item-actions-social">
-			
-			
-			{{ if $item.vote }}
-				<a href="#" id="like-$item.id" class="icon like" title="$item.vote.like.0" onclick="dolike($item.id,'like'); return false">$item.vote.like.1</a>
-				<a href="#" id="dislike-$item.id" class="icon dislike" title="$item.vote.dislike.0" onclick="dolike($item.id,'dislike'); return false"></a>
-			{{ endif }}
-						
-			{{ if $item.vote.share }}
-				<a href="#" id="share-$item.id" class="icon recycle" title="$item.vote.share.0" onclick="jotShare($item.id); return false"></a>
-			{{ endif }}	
-
-
-			{{ if $item.star }}
-				<a href="#" id="starred-$item.id" onclick="dostar($item.id); return false;" class="star-item icon $item.isstarred" title="$item.star.toggle">
-				<img src="images/star_dummy.png" class="icon star" alt="$item.star.do" /> </a>
-				<a href="#" id="tagger-$item.id" onclick="itemTag($item.id); return false;" class="tag-item icon tagged" title="$item.star.tagger"></a>					  
-			{{ endif }}	
-			
-			{{ if $item.filer }}
-			<a href="#" id="filer-$item.id" onclick="itemFiler($item.id); return false;" class="filer-item icon file-as" title="$item.star.filer"></a>
-			{{ endif }}				
-			
-			{{ if $item.plink }}<a class="icon link" title="$item.plink.title" href="$item.plink.href">$item.plink.title</a>{{ endif }}
-			
-					
-					
-			</div>
-			
-			<div class="wall-item-actions-tools">
-
-				{{ if $item.drop.dropping }}
-					<input type="checkbox" title="$item.drop.select" name="itemselected[]" class="item-select" value="$item.id" />
-					<a href="item/drop/$item.id" onclick="return confirmDelete();" class="icon drop" title="$item.drop.delete">$item.drop.delete</a>
-				{{ endif }}
-				{{ if $item.edpost }}
-					<a class="icon pencil" href="$item.edpost.0" title="$item.edpost.1"></a>
-				{{ endif }}
-			</div>
-			<div class="wall-item-location">$item.location&nbsp;</div>
-		</div>
-	</div>
-	<div class="wall-item-bottom">
-		<div class="wall-item-links"></div>
-		<div class="wall-item-like" id="wall-item-like-$item.id">$item.like</div>
-		<div class="wall-item-dislike" id="wall-item-dislike-$item.id">$item.dislike</div>	
-	</div>
-</div>
-
-<div class="wall-item-comment-wrapper" >
-	$item.comment
-</div>
diff --git a/view/theme/diabook-aerith/theme.php b/view/theme/diabook-aerith/theme.php
deleted file mode 100755
index 490010750..000000000
--- a/view/theme/diabook-aerith/theme.php
+++ /dev/null
@@ -1,430 +0,0 @@
-<?php
-
-/*
- * Name: Diabook-aerith
- * Description: Diabook-aerith : report bugs and request here: http://pad.toktan.org/p/diabook or contact me : thomas_bierey@friendica.eu
- * Version: 
- * Author: 
- */
-
-
-//change css on network and profilepages
-$cssFile = null;
-
-
-/**
- * prints last community activity
- */
-function diabook_aerith_community_info(){
-	$a = get_app();
-	//right_aside at networkpages
-
-	// last 12 users
-	$aside['$lastusers_title'] = t('Last users');
-	$aside['$lastusers_items'] = array();
-	$sql_extra = "";
-	$publish = (get_config('system','publish_all') ? '' : " AND `publish` = 1 " );
-	$order = " ORDER BY `register_date` DESC ";
-
-	$r = q("SELECT `profile`.*, `profile`.`uid` AS `profile_uid`, `user`.`nickname`
-			FROM `profile` LEFT JOIN `user` ON `user`.`uid` = `profile`.`uid` 
-			WHERE `is-default` = 1 $publish AND `user`.`blocked` = 0 $sql_extra $order LIMIT %d , %d ",
-		0,
-		9
-	);
-	$tpl = file_get_contents( dirname(__file__).'/directory_item.tpl');
-	if(count($r)) {
-		$photo = 'thumb';
-		foreach($r as $rr) {
-			$profile_link = $a->get_baseurl() . '/profile/' . ((strlen($rr['nickname'])) ? $rr['nickname'] : $rr['profile_uid']);
-			$entry = replace_macros($tpl,array(
-				'$id' => $rr['id'],
-				'$profile-link' => $profile_link,
-				'$photo' => $rr[$photo],
-				'$alt-text' => $rr['name'],
-			));
-			$aside['$lastusers_items'][] = $entry;
-		}
-	}
-	
-	
-	// last 10 liked items
-	$aside['$like_title'] = t('Last likes');
-	$aside['$like_items'] = array();
-	$r = q("SELECT `T1`.`created`, `T1`.`liker`, `T1`.`liker-link`, `item`.* FROM 
-			(SELECT `parent-uri`, `created`, `author-name` AS `liker`,`author-link` AS `liker-link` 
-				FROM `item` WHERE `verb`='http://activitystrea.ms/schema/1.0/like' GROUP BY `parent-uri` ORDER BY `created` DESC) AS T1
-			INNER JOIN `item` ON `item`.`uri`=`T1`.`parent-uri` 
-			WHERE `T1`.`liker-link` LIKE '%s%%' OR `item`.`author-link` LIKE '%s%%'
-			GROUP BY `uri`
-			ORDER BY `T1`.`created` DESC
-			LIMIT 0,5",
-			$a->get_baseurl(),$a->get_baseurl()
-			);
-
-	foreach ($r as $rr) {
-		$author	 = '<a href="' . $rr['liker-link'] . '">' . $rr['liker'] . '</a>';
-		$objauthor =  '<a href="' . $rr['author-link'] . '">' . $rr['author-name'] . '</a>';
-		
-		//var_dump($rr['verb'],$rr['object-type']); killme();
-		switch($rr['verb']){
-			case 'http://activitystrea.ms/schema/1.0/post':
-				switch ($rr['object-type']){
-					case 'http://activitystrea.ms/schema/1.0/event':
-						$post_type = t('event');
-						break;
-					default:
-						$post_type = t('status');
-				}
-				break;
-			default:
-				if ($rr['resource-id']){
-					$post_type = t('photo');
-					$m=array();	preg_match("/\[url=([^]]*)\]/", $rr['body'], $m);
-					$rr['plink'] = $m[1];
-				} else {
-					$post_type = t('status');
-				}
-		}
-		$plink = '<a href="' . $rr['plink'] . '">' . $post_type . '</a>';
-
-		$aside['$like_items'][] = sprintf( t('%1$s likes %2$s\'s %3$s'), $author, $objauthor, $plink);
-		
-	}
-	
-	
-	// last 12 photos
-	$aside['$photos_title'] = t('Last photos');
-	$aside['$photos_items'] = array();
-	$r = q("SELECT `photo`.`id`, `photo`.`resource-id`, `photo`.`scale`, `photo`.`desc`, `user`.`nickname`, `user`.`username` FROM 
-				(SELECT `resource-id`, MAX(`scale`) as maxscale FROM `photo` 
-					WHERE `profile`=0 AND `contact-id`=0 AND `album` NOT IN ('Contact Photos', '%s', 'Profile Photos', '%s')
-						AND `allow_cid`='' AND `allow_gid`='' AND `deny_cid`='' AND `deny_gid`='' GROUP BY `resource-id`) AS `t1`
-				INNER JOIN `photo` ON `photo`.`resource-id`=`t1`.`resource-id` AND `photo`.`scale` = `t1`.`maxscale`,
-				`user` 
-				WHERE `user`.`uid` = `photo`.`uid`
-				AND `user`.`blockwall`=0
-				AND `user`.`hidewall`=0
-				ORDER BY `photo`.`edited` DESC
-				LIMIT 0, 9",
-				dbesc(t('Contact Photos')),
-				dbesc(t('Profile Photos'))
-				);
-		if(count($r)) {
-		$tpl = file_get_contents( dirname(__file__).'/directory_item.tpl');
-		foreach($r as $rr) {
-			$photo_page = $a->get_baseurl() . '/photos/' . $rr['nickname'] . '/image/' . $rr['resource-id'];
-			$photo_url = $a->get_baseurl() . '/photo/' .  $rr['resource-id'] . '-' . $rr['scale'] .'.jpg';
-		
-			$entry = replace_macros($tpl,array(
-				'$id' => $rr['id'],
-				'$profile-link' => $photo_page,
-				'$photo' => $photo_url,
-				'$alt-text' => $rr['username']." : ".$rr['desc'],
-			));
-
-			$aside['$photos_items'][] = $entry;
-		}
-	}
-	
-	$fostitJS = "javascript: (function() {
-    					the_url = '".$a->get_baseurl($ssl_state)."/view/theme/diabook-aerith/fpostit/fpostit.php?url=' + encodeURIComponent(window.location.href) + '&title=' + encodeURIComponent(document.title) + '&text=' + encodeURIComponent(''+(window.getSelection ? window.getSelection() : document.getSelection ? document.getSelection() : document.selection.createRange().text));
-    						a_funct = function() {
-        						if (!window.open(the_url, 'fpostit', 'location=yes,links=no,scrollbars=no,toolbar=no,width=600,height=300')) location.href = the_url};
-    							if (/Firefox/.test(navigator.userAgent)) {setTimeout(a_funct, 0)} 
-    							else {a_funct()}})()" ;
-  
-   $aside['$fostitJS'] = $fostitJS;
-   
-   //nav FIND FRIENDS
-	if(local_user()) {
-	$nv = array();
-	$nv['directory'] = Array('directory', t('Local').' '.t('Directory'), "", "");
-	$nv['global_directory'] = Array('http://dir.friendica.com/', t('Global Directory'), "", "");
-	$nv['match'] = Array('match', t('Similar Interests'), "", "");
-	$nv['suggest'] = Array('suggest', t('Friend Suggestions'), "", "");
-	$nv['invite'] = Array('invite', t('Invite Friends'), "", "");
-	
-	$nv['search'] = '<form name="simple_bar" method="get" action="http://dir.friendika.com/directory">
-						<span class="sbox_l"></span>
-						<span class="sbox">
-						<input type="text" name="search" size="13" maxlength="50">
-						</span>
-						<span class="sbox_r" id="srch_clear"></span>';
-						
-	$aside['$nv'] = $nv;
-	};
-	//Community Page
-	if(local_user()) {
-   $page = '<div id="page-sidebar-right_aside" class="widget">
-			<div class="title tool">
-			<h3>'.t("Community Pages").'<a id="close_pages_icon"  onClick="close_pages()" class="icon close_box" title="close"></a></h3></div>
-			<div id="sidebar-page-list"><ul>';
-
-	$pagelist = array();
-
-	$contacts = q("SELECT `id`, `url`, `name`, `micro`FROM `contact`
-			WHERE `network`= 'dfrn' AND `forum` = 1 AND `uid` = %d",
-			intval($a->user['uid'])
-	);
-
-	$pageD = array();
-
-	// Look if the profile is a community page
-	foreach($contacts as $contact) {
-		$pageD[] = array("url"=>$contact["url"], "name"=>$contact["name"], "id"=>$contact["id"], "micro"=>$contact['micro']);
-	};
-	
-
-	$contacts = $pageD;
-
-	foreach($contacts as $contact) {
-		$page .= '<li style="list-style-type: none;" class="tool"><img height="20" width="20" style="float: left; margin-right: 3px;" src="' . $contact['micro'] .'" alt="' . $contact['url'] . '" /> <a href="'.$a->get_baseurl().'/redir/'.$contact["id"].'" style="margin-top: 2px;" title="' . $contact['url'] . '" class="label" target="external-link">'.
-				$contact["name"]."</a></li>";
-	}
-	$page .= '</ul></div></div>';
-	//if (sizeof($contacts) > 0)
-		
-		$aside['$page'] = $page;
-	}		
-  //END Community Page		   
-   
-   
-   
-   $url = $a->get_baseurl($ssl_state);   
-   $aside['$url'] = $url;
-
-	$tpl = file_get_contents(dirname(__file__).'/communityhome.tpl');
-	$a->page['right_aside'] = replace_macros($tpl, $aside);
-	
-}
-
-
-//profile_side at networkpages
-if ($a->argv[0] === "network" && local_user()){
-
-	// USER MENU
-	if(local_user()) {
-		
-		$r = q("SELECT micro FROM contact WHERE uid=%d AND self=1", intval($a->user['uid']));
-				
-		$userinfo = array(
-					'icon' => (count($r) ? $r[0]['micro']: $a->get_baseurl()."/images/default-profile-mm.jpg"),
-					'name' => $a->user['username'],
-				);	
-		$ps = array('usermenu'=>array());
-		$ps['usermenu']['status'] = Array('profile/' . $a->user['nickname'], t('Home'), "", t('Your posts and conversations'));
-		$ps['usermenu']['profile'] = Array('profile/' . $a->user['nickname']. '?tab=profile', t('Profile'), "", t('Your profile page'));
-		$ps['usermenu']['contacts'] = Array('contacts' , t('Contacts'), "", t('Your contacts'));		
-		$ps['usermenu']['photos'] = Array('photos/' . $a->user['nickname'], t('Photos'), "", t('Your photos'));
-		$ps['usermenu']['events'] = Array('events/', t('Events'), "", t('Your events'));
-		$ps['usermenu']['notes'] = Array('notes/', t('Personal notes'), "", t('Your personal photos'));
-		$ps['usermenu']['community'] = Array('community/', t('Community'), "", "");
-		$ps['usermenu']['pgroups'] = Array('http://dir.friendika.com/directory/forum', t('Community Pages'), "", "");
-
-		$tpl = get_markup_template('profile_side.tpl');
-
-		$a->page['aside'] .= replace_macros($tpl, array(
-				'$userinfo' => $userinfo,
-				'$ps' => $ps,
-			));
-
-	}
-	
-	$ccCookie = $_COOKIE['close_pages'] + $_COOKIE['close_helpers'] + $_COOKIE['close_services'] + $_COOKIE['close_friends'] + $_COOKIE['close_postit'] + $_COOKIE['close_lastusers'] + $_COOKIE['close_lastphotos'] + $_COOKIE['close_lastlikes'];
-	
-	if($ccCookie != "8") {
-	// COMMUNITY
-	diabook_aerith_community_info();
-	
-	// CUSTOM CSS
-	$cssFile = $a->get_baseurl($ssl_state)."/view/theme/diabook-aerith/style-network.css";
-	}
-}
-
-
-
-//right_aside at profile pages
-if ($a->argv[0].$a->argv[1] === "profile".$a->user['nickname']){
-	if($ccCookie != "8") {
-	// COMMUNITY
-	diabook_aerith_community_info();
-	
-	// CUSTOM CSS
-	$cssFile = $a->get_baseurl($ssl_state)."/view/theme/diabook-aerith/style-profile.css";
-	}
-}
-
-//tabs at right_aside on settings page
-if ($a->argv[0] === "settings"){
-	
-	$tabs = array(
-		array(
-			'label'	=> t('Account settings'),
-			'url' 	=> $a->get_baseurl(true).'/settings',
-			'sel'	=> (($a->argc == 1)?'active':''),
-		),	
-		array(
-			'label'	=> t('Display settings'),
-			'url' 	=> $a->get_baseurl(true).'/settings/display',
-			'sel'	=> (($a->argc > 1) && ($a->argv[1] === 'display')?'active':''),
-		),			
-		array(
-			'label'	=> t('Edit/Manage Profiles'),
-			'url' 	=> $a->get_baseurl(true).'/profiles',
-		),	
-		array(
-			'label'	=> t('Connector settings'),
-			'url' 	=> $a->get_baseurl(true).'/settings/connectors',
-			'sel'	=> (($a->argc > 1) && ($a->argv[1] === 'connectors')?'active':''),
-		),
-		array(
-			'label'	=> t('Plugin settings'),
-			'url' 	=> $a->get_baseurl(true).'/settings/addon',
-			'sel'	=> (($a->argc > 1) && ($a->argv[1] === 'addon')?'active':''),
-		),
-		array(
-			'label' => t('Connections'),
-			'url' => $a->get_baseurl(true) . '/settings/oauth',
-			'sel' => (($a->argc > 1) && ($a->argv[1] === 'oauth')?'active':''),
-		),
-		array(
-			'label' => t('Export personal data'),
-			'url' => $a->get_baseurl(true) . '/uexport',
-			'sel' => ''
-		)
-	);
-	$tabtpl = file_get_contents(dirname(__file__).'/rs_common_tabs.tpl') ;
-	$a->page['aside'] = replace_macros($tabtpl, array(
-		'$tabs' => $tabs,
-	));
-	
-	
-	// CUSTOM CSS
-	$cssFile = $a->get_baseurl($ssl_state)."/view/theme/diabook-aerith/style-settings.css";
-	
-}
-
-
-// custom css
-if (!is_null($cssFile)) $a->page['htmlhead'] .= sprintf('<link rel="stylesheet" type="text/css" href="%s" />', $cssFile);
-
-//load jquery.cookie.js
-$cookieJS = $a->get_baseurl($ssl_state)."/view/theme/diabook-aerith/js/jquery.cookie.js";
-$a->page['htmlhead'] .= sprintf('<script language="JavaScript" src="%s" ></script>', $cookieJS);
-
-
-//js scripts
-
-$a->page['htmlhead'] .= <<< EOT
-
-<script>
- $(function() {
-	$('a.lightbox').fancybox(); // Select all links with lightbox class
-	
- });
-
-</script>
-
-<script>
-
-$("right_aside").ready(function(){
-	
-	if($.cookie('close_pages') == '1') 
-		{
-		document.getElementById( "close_pages" ).style.display = "none";
-			};
-	
-	if($.cookie('close_helpers') == '1') 
-		{
-		document.getElementById( "close_helpers" ).style.display = "none";
-			};
-			
-	if($.cookie('close_services') == '1') 
-		{
-		document.getElementById( "close_services" ).style.display = "none";
-			};
-			
-	if($.cookie('close_friends') == '1') 
-		{
-		document.getElementById( "close_friends" ).style.display = "none";
-			};
-	
-	if($.cookie('close_postit') == '1') 
-		{
-		document.getElementById( "close_postit" ).style.display = "none";
-			};
-			
-	if($.cookie('close_lastusers') == '1') 
-		{
-		document.getElementById( "close_lastusers" ).style.display = "none";
-			};
-			
-	if($.cookie('close_lastphotos') == '1') 
-		{
-		document.getElementById( "close_lastphotos" ).style.display = "none";
-			};
-			
-	if($.cookie('close_lastlikes') == '1') 
-		{
-		document.getElementById( "close_lastlikes" ).style.display = "none";
-			};}
-
-);
-
-function close_pages(){
- document.getElementById( "close_pages" ).style.display = "none";
- $.cookie('close_pages','1', { expires: 365, path: '/' });
- };
- 
-function close_helpers(){
- document.getElementById( "close_helpers" ).style.display = "none";
-  $.cookie('close_helpers','1', { expires: 365, path: '/' });
- };
-
-function close_services(){
- document.getElementById( "close_services" ).style.display = "none";
- $.cookie('close_services','1', { expires: 365, path: '/' });
- };
- 
-function close_friends(){
- document.getElementById( "close_friends" ).style.display = "none";
- $.cookie('close_friends','1', { expires: 365, path: '/' });
- };
-
-function close_postit(){
- document.getElementById( "close_postit" ).style.display = "none";
- $.cookie('close_postit','1', { expires: 365, path: '/' });
- };
- 
-function close_lastusers(){
- document.getElementById( "close_lastusers" ).style.display = "none";
- $.cookie('close_lastusers','1', { expires: 365, path: '/' });
- };
-
-function close_lastphotos(){
- document.getElementById( "close_lastphotos" ).style.display = "none";
- $.cookie('close_lastphotos','1', { expires: 365, path: '/' });
- };
- 
-function close_lastlikes(){
- document.getElementById( "close_lastlikes" ).style.display = "none";
- $.cookie('close_lastlikes','1', { expires: 365, path: '/' });
- };
-
-function restore_boxes(){
-	$.cookie('close_pages','2', { expires: 365, path: '/' });
-	$.cookie('close_helpers','2', { expires: 365, path: '/' });
-	$.cookie('close_services','2', { expires: 365, path: '/' });
-	$.cookie('close_friends','2', { expires: 365, path: '/' });
-	$.cookie('close_postit','2', { expires: 365, path: '/' });
-	$.cookie('close_lastusers','2', { expires: 365, path: '/' });
-	$.cookie('close_lastphotos','2', { expires: 365, path: '/' });
-	$.cookie('close_lastlikes','2', { expires: 365, path: '/' });
-	alert('Right-hand column was restored. Please refresh your browser');
-  }; 
- 
-</script>
-
-EOT;
-
diff --git a/view/theme/diabook-aerith/wall_item.tpl b/view/theme/diabook-aerith/wall_item.tpl
deleted file mode 100644
index 123834064..000000000
--- a/view/theme/diabook-aerith/wall_item.tpl
+++ /dev/null
@@ -1,100 +0,0 @@
-{{ if $item.indent }}{{ else }}
-<div class="wall-item-decor">
-	<img id="like-rotator-$item.id" class="like-rotator" src="images/rotator.gif" alt="$item.wait" title="$item.wait" style="display: none;" />
-</div>
-{{ endif }}
-<div class="wall-item-container $item.indent">
-	<div class="wall-item-item">
-		<div class="wall-item-info">
-			<div class="contact-photo-wrapper"
-				onmouseover="if (typeof t$item.id != 'undefined') clearTimeout(t$item.id); openMenu('wall-item-photo-menu-button-$item.id')" 
-				onmouseout="t$item.id=setTimeout('closeMenu(\'wall-item-photo-menu-button-$item.id\'); closeMenu(\'wall-item-photo-menu-$item.id\');',200)">
-				<a href="$item.profile_url" target="redir" title="$item.linktitle" class="contact-photo-link" id="wall-item-photo-link-$item.id">
-					<img src="$item.thumb" class="contact-photo$item.sparkle" id="wall-item-photo-$item.id" alt="$item.name" />
-				</a>
-				<a href="#" rel="#wall-item-photo-menu-$item.id" class="contact-photo-menu-button icon s16 menu" id="wall-item-photo-menu-button-$item.id">menu</a>
-				<ul class="contact-menu menu-popup" id="wall-item-photo-menu-$item.id">
-				$item.item_photo_menu
-				</ul>
-				
-			</div>
-		</div>
-			<div class="wall-item-actions-author">
-				<a href="$item.profile_url" target="redir" title="$item.linktitle" class="wall-item-name-link"><span class="wall-item-name$item.sparkle">$item.name</span></a> 
-			<span class="wall-item-ago">-
-			{{ if $item.plink }}<a class="link" title="$item.plink.title" href="$item.plink.href" style="color: #999">$item.ago</a>{{ else }} $item.ago {{ endif }}
-			{{ if $item.lock }} - <span class="fakelink" style="color: #999" onclick="lockview(event,$item.id);">$item.lock</span> {{ endif }}
-			</span>
-			</div>
-		<div class="wall-item-content">
-			{{ if $item.title }}<h2><a href="$item.plink.href">$item.title</a></h2>{{ endif }}
-			$item.body
-		</div>
-	</div>
-	<div class="wall-item-bottom">
-		<div class="wall-item-links">
-		</div>
-		<div class="wall-item-tags">
-			{{ for $item.tags as $tag }}
-				<span class='tag'>$tag</span>
-			{{ endfor }}
-		</div>
-	</div>
-	<div class="wall-item-bottom">
-		<div class="">
-
-		</div>
-		<div class="wall-item-actions">
-
-			<div class="wall-item-actions-social">
-			
-			
-			{{ if $item.vote }}
-				<a href="#" id="like-$item.id" class="icon like" title="$item.vote.like.0" onclick="dolike($item.id,'like'); return false">$item.vote.like.1</a>
-				<a href="#" id="dislike-$item.id" class="icon dislike" title="$item.vote.dislike.0" onclick="dolike($item.id,'dislike'); return false"></a>
-			{{ endif }}
-						
-			{{ if $item.vote.share }}
-				<a href="#" id="share-$item.id" class="icon recycle" title="$item.vote.share.0" onclick="jotShare($item.id); return false"></a>
-			{{ endif }}	
-
-
-			{{ if $item.star }}
-				<a href="#" id="starred-$item.id" onclick="dostar($item.id); return false;" class="star-item icon $item.isstarred" title="$item.star.toggle">
-				<img src="images/star_dummy.png" class="icon star" alt="$item.star.do" /> </a>
-				<a href="#" id="tagger-$item.id" onclick="itemTag($item.id); return false;" class="tag-item icon tagged" title="$item.star.tagger"></a>					  
-			{{ endif }}	
-			
-			{{ if $item.filer }}
-			<a href="#" id="filer-$item.id" onclick="itemFiler($item.id); return false;" class="filer-item icon file-as" title="$item.star.filer"></a>
-			{{ endif }}				
-			
-			{{ if $item.plink }}<a class="icon link" title="$item.plink.title" href="$item.plink.href">$item.plink.title</a>{{ endif }}
-			
-					
-					
-			</div>
-			
-			<div class="wall-item-actions-tools">
-
-				{{ if $item.drop.dropping }}
-					<input type="checkbox" title="$item.drop.select" name="itemselected[]" class="item-select" value="$item.id" />
-					<a href="item/drop/$item.id" onclick="return confirmDelete();" class="icon drop" title="$item.drop.delete">$item.drop.delete</a>
-				{{ endif }}
-				{{ if $item.edpost }}
-					<a class="icon pencil" href="$item.edpost.0" title="$item.edpost.1"></a>
-				{{ endif }}
-			</div>
-			<div class="wall-item-location">$item.location&nbsp;</div>
-		</div>
-	</div>
-	<div class="wall-item-bottom">
-		<div class="wall-item-links"></div>
-		<div class="wall-item-like" id="wall-item-like-$item.id">$item.like</div>
-		<div class="wall-item-dislike" id="wall-item-dislike-$item.id">$item.dislike</div>	
-	</div>
-</div>
-
-<div class="wall-item-comment-wrapper" >
-	$item.comment
-</div>
diff --git a/view/theme/diabook-aerith/wallwall_item.tpl b/view/theme/diabook-aerith/wallwall_item.tpl
deleted file mode 100644
index c5b6b36b5..000000000
--- a/view/theme/diabook-aerith/wallwall_item.tpl
+++ /dev/null
@@ -1,102 +0,0 @@
-{{ if $item.indent }}{{ else }}
-<div class="wall-item-decor">
-	<img id="like-rotator-$item.id" class="like-rotator" src="images/rotator.gif" alt="$item.wait" title="$item.wait" style="display: none;" />
-</div>
-{{ endif }}
-<div class="wall-item-container $item.indent">
-	<div class="wall-item-item">
-		<div class="wall-item-info">
-			<div class="contact-photo-wrapper mframe wwto" id="wall-item-ownerphoto-wrapper-$item.id" >
-				<a href="$item.owner_url" target="redir" title="$item.olinktitle" class="contact-photo-link" id="wall-item-ownerphoto-link-$item.id">
-					<img src="$item.owner_photo" class="contact-photo $item.osparkle" id="wall-item-ownerphoto-$item.id" alt="$item.owner_name" />
-				</a>
-			</div>
-			<div class="contact-photo-wrapper mframe wwfrom"
-				onmouseover="if (typeof t$item.id != 'undefined') clearTimeout(t$item.id); openMenu('wall-item-photo-menu-button-$item.id')" 
-				onmouseout="t$item.id=setTimeout('closeMenu(\'wall-item-photo-menu-button-$item.id\'); closeMenu(\'wall-item-photo-menu-$item.id\');',200)">
-				<a href="$item.profile_url" target="redir" title="$item.linktitle" class="contact-photo-link" id="wall-item-photo-link-$item.id">
-					<img src="$item.thumb" class="contact-photo$item.sparkle" id="wall-item-photo-$item.id" alt="$item.name" />
-				</a>
-				<a href="#" rel="#wall-item-photo-menu-$item.id" class="contact-photo-menu-button icon s16 menu" id="wall-item-photo-menu-button-$item.id">menu</a>
-				<ul class="contact-menu menu-popup" id="wall-item-photo-menu-$item.id">
-				$item.item_photo_menu
-				</ul>
-				
-			</div>
-		</div>
-			<div class="wall-item-actions-author">
-				<a href="$item.profile_url" target="redir" title="$item.linktitle" class="wall-item-name-link"><span class="wall-item-name$item.sparkle">$item.name</span></a>
-				$item.to <a href="$item.owner_url" target="redir" title="$item.olinktitle" class="wall-item-name-link"><span class="wall-item-name$item.osparkle" id="wall-item-ownername-$item.id">$item.owner_name</span></a>
-				 $item.vwall <span class="wall-item-ago">- &nbsp;
-			{{ if $item.plink }}<a class="link" title="$item.plink.title" href="$item.plink.href" style="color: #999">$item.ago</a>{{ else }} $item.ago {{ endif }}
-			{{ if $item.lock }} - <span class="fakelink" style="color: #999" onclick="lockview(event,$item.id);">$item.lock</span> {{ endif }}
-			</span>
-			</div>
-		<div class="wall-item-content">
-			{{ if $item.title }}<h2><a href="$item.plink.href">$item.title</a></h2>{{ endif }}
-			$item.body
-		</div>
-	</div>
-	<div class="wall-item-bottom">
-		<div class="wall-item-links">
-		</div>
-		<div class="wall-item-tags">
-			{{ for $item.tags as $tag }}
-				<span class='tag'>$tag</span>
-			{{ endfor }}
-		</div>
-	</div>
-	<div class="wall-item-bottom">
-		<div class="">
-
-		</div>
-		<div class="wall-item-actions">
-
-			<div class="wall-item-actions-social">
-			
-			
-			{{ if $item.vote }}
-				<a href="#" id="like-$item.id" class="icon like" title="$item.vote.like.0" onclick="dolike($item.id,'like'); return false">$item.vote.like.1</a>
-				<a href="#" id="dislike-$item.id" class="icon dislike" title="$item.vote.dislike.0" onclick="dolike($item.id,'dislike'); return false"></a>
-			{{ endif }}
-						
-			{{ if $item.vote.share }}
-				<a href="#" id="share-$item.id" class="icon recycle" title="$item.vote.share.0" onclick="jotShare($item.id); return false"></a>
-			{{ endif }}	
-
-
-			{{ if $item.star }}
-				<a href="#" id="starred-$item.id" onclick="dostar($item.id); return false;" class="star-item icon $item.isstarred" title="$item.star.toggle">
-				<img src="images/star_dummy.png" class="icon star" alt="$item.star.do" /> </a>
-				<a href="#" id="tagger-$item.id" onclick="itemTag($item.id); return false;" class="tag-item icon tagged" title="$item.star.tagger"></a>
-			{{ endif }}	
-			
-			{{ if $item.plink }}<a class="icon link" title="$item.plink.title" href="$item.plink.href">$item.plink.title</a>{{ endif }}
-			
-					
-					
-			</div>
-			
-			<div class="wall-item-actions-tools">
-
-				{{ if $item.drop.dropping }}
-					<input type="checkbox" title="$item.drop.select" name="itemselected[]" class="item-select" value="$item.id" />
-					<a href="item/drop/$item.id" onclick="return confirmDelete();" class="icon drop" title="$item.drop.delete">$item.drop.delete</a>
-				{{ endif }}
-				{{ if $item.edpost }}
-					<a class="icon pencil" href="$item.edpost.0" title="$item.edpost.1"></a>
-				{{ endif }}
-			</div>
-			<div class="wall-item-location">$item.location&nbsp;</div>
-		</div>
-	</div>
-	<div class="wall-item-bottom">
-		<div class="wall-item-links"></div>
-		<div class="wall-item-like" id="wall-item-like-$item.id">$item.like</div>
-		<div class="wall-item-dislike" id="wall-item-dislike-$item.id">$item.dislike</div>	
-	</div>
-</div>
-
-<div class="wall-item-comment-wrapper" >
-	$item.comment
-</div>
\ No newline at end of file
diff --git a/view/theme/diabook-blue/communityhome.tpl b/view/theme/diabook-blue/communityhome.tpl
deleted file mode 100755
index 3b95b376e..000000000
--- a/view/theme/diabook-blue/communityhome.tpl
+++ /dev/null
@@ -1,93 +0,0 @@
-<div id="close_pages">
-{{ if $page }}
-<div>$page</div>
-{{ endif }}
-</div>
-
-<div id="close_helpers">
-{{ if $lastusers_title }}
-<h3 style="margin-top:0px;">Help or @NewHere ?<a id="close_helpers_icon"  onClick="close_helpers()" class="icon close_box" title="close"></a></h3>
-<a href="http://kakste.com/profile/newhere" title="#NewHere" style="margin-left: 10px; " target="blank">NewHere</a><br>
-<a href="https://helpers.pyxis.uberspace.de/profile/helpers" style="margin-left: 10px; " title="Friendica Support" target="blank">Friendica Support</a><br>
-<a href="https://letstalk.pyxis.uberspace.de/profile/letstalk" style="margin-left: 10px; " title="Let's talk" target="blank">Let's talk</a><br>
-<a href="http://newzot.hydra.uberspace.de/profile/newzot" title="Local Friendica" style="margin-left: 10px; " target="blank">Local Friendica</a>
-{{ endif }}
-</div>
-
-<div id="close_services">
-{{ if $lastusers_title }}
-<h3>Connectable Services<a id="close_services_icon" onClick="close_services()" class="icon close_box" title="close"></a></h3>
-<div id="right_service_icons" style="margin-left: 11px; margin-top: 5px;">
-<a href="$url/facebook"><img alt="Facebook" src="view/theme/diabook-blue/icons/facebook.png" title="Facebook"></a>
-<a href="$url/settings/connectors"><img alt="StatusNet" src="view/theme/diabook-blue/icons/StatusNet.png?" title="StatusNet"></a>
-<a href="$url/settings/connectors"><img alt="LiveJournal" src="view/theme/diabook-blue/icons/livejournal.png?" title="LiveJournal"></a>
-<a href="$url/settings/connectors"><img alt="Posterous" src="view/theme/diabook-blue/icons/posterous.png?" title="Posterous"></a>
-<a href="$url/settings/connectors"><img alt="Tumblr" src="view/theme/diabook-blue/icons/tumblr.png?" title="Tumblr"></a>
-<a href="$url/settings/connectors"><img alt="Twitter" src="view/theme/diabook-blue/icons/twitter.png?" title="Twitter"></a>
-<a href="$url/settings/connectors"><img alt="WordPress" src="view/theme/diabook-blue/icons/wordpress.png?" title="WordPress"></a>
-<a href="$url/settings/connectors"><img alt="E-Mail" src="view/theme/diabook-blue/icons/email.png?" title="E-Mail"></a>
-</div>
-{{ endif }}
-</div>
-
-<div id="close_friends" style="margin-bottom:53px;">
-{{ if $nv }}
-<h3>Find Friends<a id="close_friends_icon" onClick="close_friends()"  class="icon close_box" title="close"></a></h3>
-<a class="$nv.directory.2" href="$nv.directory.0" style="margin-left: 10px; " title="$nv.directory.3" >$nv.directory.1</a><br>
-<a class="$nv.global_directory.2" href="$nv.global_directory.0" style="margin-left: 10px; " title="$nv.global_directory.3" >$nv.global_directory.1</a><br>
-<a class="$nv.match.2" href="$nv.match.0" style="margin-left: 10px; " title="$nv.match.3" >$nv.match.1</a><br>
-<a class="$nv.suggest.2" href="$nv.suggest.0" style="margin-left: 10px; " title="$nv.suggest.3" >$nv.suggest.1</a><br>
-<a class="$nv.invite.2" href="$nv.invite.0" style="margin-left: 10px; " title="$nv.invite.3" >$nv.invite.1</a>			
-$nv.search
-{{ endif }}
-</div>
-
-<div id="close_postit">
-{{ if $lastusers_title }}
-<h3>PostIt to Friendica<a id="close_postit_icon" onClick="close_postit()" class="icon close_box" title="close"></a></h3>
-<div style="padding-left: 8px;"><span ><a href="$fostitJS" title="PostIt">Post to Friendica</a> from anywhere by bookmarking the Link.</span></div>
-{{ endif }}
-</div>
-
-<div id="close_lastusers">
-{{ if $lastusers_title }}
-<h3>$lastusers_title<a id="close_lastusers_icon" onClick="close_lastusers()" class="icon close_box" title="close"></a></h3>
-<div id='lastusers-wrapper' class='items-wrapper'>
-{{ for $lastusers_items as $i }}
-	$i
-{{ endfor }}
-</div>
-{{ endif }}
-</div>
-
-
-{{ if $activeusers_title }}
-<h3>$activeusers_title</h3>
-<div class='items-wrapper'>
-{{ for $activeusers_items as $i }}
-	$i
-{{ endfor }}
-</div>
-{{ endif }}
-
-<div id="close_lastphotos">
-{{ if $photos_title }}
-<h3>$photos_title<a id="close_photos_icon" onClick="close_lastphotos()"  class="icon close_box" title="close"></a></h3>
-<div id='ra-photos-wrapper' class='items-wrapper'>
-{{ for $photos_items as $i }}
-	$i
-{{ endfor }}
-</div>
-{{ endif }}
-</div>
-
-<div id="close_lastlikes">
-{{ if $like_title }}
-<h3>$like_title<a id="close_lastlikes_icon" onClick="close_lastlikes()" class="icon close_box" title="close"></a></h3>
-<ul id='likes'>
-{{ for $like_items as $i }}
-	<li id='ra-photos-wrapper'>$i</li>
-{{ endfor }}
-</ul>
-{{ endif }}
-</div>
diff --git a/view/theme/diabook-blue/contact_template.tpl b/view/theme/diabook-blue/contact_template.tpl
deleted file mode 100755
index 48930b48a..000000000
--- a/view/theme/diabook-blue/contact_template.tpl
+++ /dev/null
@@ -1,25 +0,0 @@
-
-<div class="contact-entry-wrapper" id="contact-entry-wrapper-$contact.id" >
-	<div class="contact-entry-photo-wrapper" >
-		<div class="contact-entry-photo mframe" id="contact-entry-photo-$contact.id"
-		onmouseover="if (typeof t$contact.id != 'undefined') clearTimeout(t$contact.id); openMenu('contact-photo-menu-button-$contact.id')" 
-		onmouseout="t$contact.id=setTimeout('closeMenu(\'contact-photo-menu-button-$contact.id\'); closeMenu(\'contact-photo-menu-$contact.id\');',200)" >
-
-			<a href="$contact.url" title="$contact.img_hover" /><img src="$contact.thumb" $contact.sparkle alt="$contact.name" /></a>
-
-			{{ if $contact.photo_menu }}
-			<span onclick="openClose('contact-photo-menu-$contact.id');" class="fakelink contact-photo-menu-button" id="contact-photo-menu-button-$contact.id">menu</span>
-                <div class="contact-photo-menu" id="contact-photo-menu-$contact.id">
-                    <ul>
-                        $contact.photo_menu
-                    </ul>
-                </div>
-			{{ endif }}
-		</div>
-			
-	</div>
-	<div class="contact-entry-photo-end" ></div>
-		<div class="contact-entry-name" id="contact-entry-name-$contact.id" >$contact.name</div>
-
-	<div class="contact-entry-end" ></div>
-</div>
diff --git a/view/theme/diabook-blue/directory_item.tpl b/view/theme/diabook-blue/directory_item.tpl
deleted file mode 100755
index db1936e4b..000000000
--- a/view/theme/diabook-blue/directory_item.tpl
+++ /dev/null
@@ -1,10 +0,0 @@
-
-<div class="directory-item" id="directory-item-$id" >
-	<div class="directory-photo-wrapper" id="directory-photo-wrapper-$id" > 
-		<div class="directory-photo" id="directory-photo-$id" >
-			<a href="$profile-link" class="directory-profile-link" id="directory-profile-link-$id" >
-				<img class="directory-photo-img" src="$photo" alt="$alt-text" title="$alt-text" />
-			</a>
-		</div>
-	</div>
-</div>
diff --git a/view/theme/diabook-blue/fpostit/README b/view/theme/diabook-blue/fpostit/README
deleted file mode 100644
index 39b7c5761..000000000
--- a/view/theme/diabook-blue/fpostit/README
+++ /dev/null
@@ -1,8 +0,0 @@
-fpostit
-
-original author: Devlon Duthied
-
-see his blog posting:
-http://blog.duthied.com/2011/09/13/node-agnostic-friendika-bookmarklet/
-
-original published at github https://github.com/duthied/Friendika-Bookmarklet
diff --git a/view/theme/diabook-blue/fpostit/fpostit.js b/view/theme/diabook-blue/fpostit/fpostit.js
deleted file mode 100755
index d183c7573..000000000
--- a/view/theme/diabook-blue/fpostit/fpostit.js
+++ /dev/null
@@ -1,6 +0,0 @@
-javascript: (function() {
-    					the_url = 'localhost/view/theme/diabook/fpostit/fpostit.php?url=' + encodeURIComponent(window.location.href) + '&title=' + encodeURIComponent(document.title) + '&text=' + encodeURIComponent(''+(window.getSelection ? window.getSelection() : document.getSelection ? document.getSelection() : document.selection.createRange().text));
-    						a_funct = function() {
-        						if (!window.open(the_url, 'fpostit', 'location=yes,links=no,scrollbars=no,toolbar=no,width=600,height=300')) location.href = the_url};
-    							if (/Firefox/.test(navigator.userAgent)) {setTimeout(a_funct, 0)} 
-    							else {a_funct()}})()"
\ No newline at end of file
diff --git a/view/theme/diabook-blue/fpostit/fpostit.php b/view/theme/diabook-blue/fpostit/fpostit.php
deleted file mode 100644
index 4505c9946..000000000
--- a/view/theme/diabook-blue/fpostit/fpostit.php
+++ /dev/null
@@ -1,135 +0,0 @@
-<?php
-if (!isset($_POST["friendika_acct_name"])) $_POST["friendika_acct_name"] = '';
-if (!isset($_COOKIE['username'])) $_COOKIE['username'] = '';
-if (!isset($_COOKIE['password'])) $_COOKIE['password'] = '';
-if (!isset($hostname)) $hostname = '';
-if (!isset($username)) $username = '';
-
-
-if (($_POST["friendika_acct_name"] != '') && ($_POST["friendika_password"] != '')) {
-	setcookie("username", $_POST["friendika_acct_name"], time()+60*60*24*300);
-	setcookie("password", $_POST["friendika_password"], time()+60*60*24*300);
-}
-
-?>
-<html>
-<head>
-	<style>
-		body {
-			font-family: arial, Helvetica,sans-serif;
-			margin: 0px;
-		}
-		.wrap1 {
-			padding: 2px 5px;
-			background-color: #000;
-			margin-bottom: 10px;
-		}
-		.wrap2 {
-			margin-left: 10px;
-			font-size: 12px;
-		}
-		.logo {
-			margin-left: 3px;
-			margin-right: 5px;
-			float: left;
-		}
-		h2 {
-			color: #ffffff;
-		}
-		.error {
-			background-color: #FFFF66;
-			font-size: 12px;
-			margin-left: 10px;
-		}
-	</style>
-</head>
-
-<body>
-<?php
-
-if (isset($_GET['title'])) {
-	$title = $_GET['title'];
-}
-if (isset($_GET['text'])) {
-	$text = $_GET['text'];
-}
-if (isset($_GET['url'])) {
-	$url = $_GET['url'];
-}
-
-if ((isset($title)) && (isset($text)) && (isset($url))) {
-	$content = "$title\nsource:$url\n\n$text";
-} else {
-	$content = $_POST['content'];
-}
-
-if (isset($_POST['submit'])) {
-	
-	if (($_POST["friendika_acct_name"] != '') && ($_POST["friendika_password"] != '')) {
-		$acctname = $_POST["friendika_acct_name"];
-		$tmp_account_array = explode("@", $acctname);
-		if (isset($tmp_account_array[1])) {
-			$username = $tmp_account_array[0];
-			$hostname = $tmp_account_array[1];
-		}
-		$password = $_POST["friendika_password"];
-		$content = $_POST["content"];
-
-		$url = "http://" . $hostname . '/api/statuses/update';
-		$data = array('status' => $content);
-		
-		// echo "posting to: $url<br/>";
-
-		$c = curl_init();
-		curl_setopt($c, CURLOPT_URL, $url); 
-		curl_setopt($c, CURLOPT_USERPWD, "$username:$password");
-		curl_setopt($c, CURLOPT_POSTFIELDS, $data); 
-		curl_setopt($c, CURLOPT_RETURNTRANSFER, true); 
-		curl_setopt($c, CURLOPT_FOLLOWLOCATION, true);
-		$c_result = curl_exec($c); 
-		if(curl_errno($c)){ 
-			$error = curl_error($c);
-			showForm($error, $content);
-		}
-		
-		curl_close($c);
-		if (!isset($error)) {
-			echo '<script language="javascript" type="text/javascript">window.close();</script>';
-		}
-		
-	} else {
-		$error = "Missing account name and/or password...try again please";
-		showForm($error, $content);
-	}
-	
-} else {
-	showForm(null, $content);
-}
-
-function showForm($error, $content) {
-	$username_cookie = $_COOKIE['username'];
-	$password_cookie = $_COOKIE['password'];
-	
-	echo <<<EOF
-	<div class='wrap1'>
-		<h2><img class='logo' src='friendika-32.png' align='middle';/>
-		Friendica Bookmarklet</h2>
-	</div>
-
-	<div class="wrap2">
-		<form method="post" action="{$_SERVER['PHP_SELF']}">
-			Enter the email address of the Friendica Account that you want to cross-post to:(example: user@friendica.org)<br /><br />
-			Account ID: <input type="text" name="friendika_acct_name" value="{$username_cookie}" size="50"/><br />
-			Password: <input type="password" name="friendika_password" value="{$password_cookie}" size="50"/><br />
-			<textarea name="content" id="content" rows="6" cols="70">{$content}</textarea><br />
-			<input type="submit" value="PostIt!" name="submit" />&nbsp;&nbsp;<span class='error'>$error</span>
-		</form>
-		<p></p>
-	</div>
-EOF;
-	
-}
-?>
-
-</body>
-</html>
\ No newline at end of file
diff --git a/view/theme/diabook-blue/fpostit/friendika-32.png b/view/theme/diabook-blue/fpostit/friendika-32.png
deleted file mode 100644
index 61764bf20..000000000
--- a/view/theme/diabook-blue/fpostit/friendika-32.png
+++ /dev/null
diff --git a/view/theme/diabook-blue/group_side.tpl b/view/theme/diabook-blue/group_side.tpl
deleted file mode 100755
index af183d04d..000000000
--- a/view/theme/diabook-blue/group_side.tpl
+++ /dev/null
@@ -1,29 +0,0 @@
-<div id="group-sidebar" class="widget">
-	<div class="title tool">
-		<h3 class="label">$title</h3>
-		<a href="group/new" title="$createtext" class="action"><span class="icon text s16 add"></span></a>
-	</div>
-
-	<div id="sidebar-group-list">
-		<ul>
-			{{ for $groups as $group }}
-			<li class="tool  {{ if $group.selected }}selected{{ endif }}">
-				<a href="$group.href" class="label">
-					$group.text
-				</a>
-				{{ if $group.edit }}
-					<a href="$group.edit.href" class="action"><span class="icon text s10 edit"></span></a>
-				{{ endif }}
-				{{ if $group.cid }}
-					<input type="checkbox" 
-						class="{{ if $group.selected }}ticked{{ else }}unticked {{ endif }} action" 
-						onclick="contactgroupChangeMember('$group.id','$group.cid');return true;"
-						{{ if $group.ismember }}checked="checked"{{ endif }}
-					/>
-				{{ endif }}
-			</li>
-			{{ endfor }}
-		</ul>
-	</div>
-</div>	
-
diff --git a/view/theme/diabook-blue/icons/com_side.png b/view/theme/diabook-blue/icons/com_side.png
deleted file mode 100644
index bc5969ef1..000000000
--- a/view/theme/diabook-blue/icons/com_side.png
+++ /dev/null
diff --git a/view/theme/diabook-blue/icons/events.png b/view/theme/diabook-blue/icons/events.png
deleted file mode 100644
index 4a0b3f3f1..000000000
--- a/view/theme/diabook-blue/icons/events.png
+++ /dev/null
diff --git a/view/theme/diabook-blue/icons/home.png b/view/theme/diabook-blue/icons/home.png
deleted file mode 100644
index be47a48fc..000000000
--- a/view/theme/diabook-blue/icons/home.png
+++ /dev/null
diff --git a/view/theme/diabook-blue/icons/mess_side.png b/view/theme/diabook-blue/icons/mess_side.png
deleted file mode 100644
index 49ef896bc..000000000
--- a/view/theme/diabook-blue/icons/mess_side.png
+++ /dev/null
diff --git a/view/theme/diabook-blue/icons/notes.png b/view/theme/diabook-blue/icons/notes.png
deleted file mode 100644
index 7d4afca90..000000000
--- a/view/theme/diabook-blue/icons/notes.png
+++ /dev/null
diff --git a/view/theme/diabook-blue/icons/pscontacts.png b/view/theme/diabook-blue/icons/pscontacts.png
deleted file mode 100644
index acf857f32..000000000
--- a/view/theme/diabook-blue/icons/pscontacts.png
+++ /dev/null
diff --git a/view/theme/diabook-blue/icons/pubgroups.png b/view/theme/diabook-blue/icons/pubgroups.png
deleted file mode 100644
index 6d9539610..000000000
--- a/view/theme/diabook-blue/icons/pubgroups.png
+++ /dev/null
diff --git a/view/theme/diabook-blue/icons/selected.png b/view/theme/diabook-blue/icons/selected.png
deleted file mode 100755
index 2a30ae252..000000000
--- a/view/theme/diabook-blue/icons/selected.png
+++ /dev/null
diff --git a/view/theme/diabook-blue/jot.tpl b/view/theme/diabook-blue/jot.tpl
deleted file mode 100755
index 9aef99787..000000000
--- a/view/theme/diabook-blue/jot.tpl
+++ /dev/null
@@ -1,84 +0,0 @@
-
-<div id="profile-jot-wrapper" >
-	<div id="profile-jot-banner-wrapper">
-		<div id="profile-jot-desc" >&nbsp;</div>
-		<div id="character-counter" class="grey"></div>
-	</div>
-	<div id="profile-jot-banner-end"></div>
-
-	<form id="profile-jot-form" action="$action" method="post" >
-		<input type="hidden" name="type" value="$ptyp" />
-		<input type="hidden" name="profile_uid" value="$profile_uid" />
-		<input type="hidden" name="return" value="$return_path" />
-		<input type="hidden" name="location" id="jot-location" value="$defloc" />
-		<input type="hidden" name="coord" id="jot-coord" value="" />
-		<input type="hidden" name="post_id" value="$post_id" />
-		<input type="hidden" name="preview" id="jot-preview" value="0" />
-		<input name="title" id="jot-title" type="text" placeholder="$placeholdertitle" value="$title" class="jothidden" style="display:none">
-		<img id="profile-jot-text-loading" src="images/rotator.gif" alt="$wait" title="$wait" style="display: none;" />
-		<textarea rows="5" cols="64" class="profile-jot-text" id="profile-jot-text" name="body" >{{ if $content }}$content{{ else }}$share{{ endif }}</textarea>
-
-
-<div id="profile-jot-submit-wrapper" class="jothidden">
-	
-	<div id="profile-upload-wrapper" style="display: $visitor;" >
-		<div id="wall-image-upload-div" ><a href="#" onclick="return false;" id="wall-image-upload" class="camera" title="$upload"></a></div>
-	</div> 
-	<div id="profile-attach-wrapper" style="display: $visitor;" >
-		<div id="wall-file-upload-div" ><a href="#" onclick="return false;" id="wall-file-upload" class="attach" title="$attach"></a></div>
-	</div> 
-
-	<div id="profile-link-wrapper" style="display: $visitor;" ondragenter="linkdropper(event);" ondragover="linkdropper(event);" ondrop="linkdrop(event);" >
-		<a id="profile-link" class="weblink" title="$weblink" ondragenter="return linkdropper(event);" ondragover="return linkdropper(event);" ondrop="linkdrop(event);" onclick="jotGetLink(); return false;"></a>
-	</div> 
-	<div id="profile-video-wrapper" style="display: $visitor;" >
-		<a id="profile-video" class="video2" title="$video" onclick="jotVideoURL();return false;"></a>
-	</div> 
-	<div id="profile-audio-wrapper" style="display: $visitor;" >
-		<a id="profile-audio" class="audio2" title="$audio" onclick="jotAudioURL();return false;"></a>
-	</div> 
-	<div id="profile-location-wrapper" style="display: $visitor;" >
-		<a id="profile-location" class="globe" title="$setloc" onclick="jotGetLocation();return false;"></a>
-	</div> 
-	<div id="profile-nolocation-wrapper" style="/*display: none;*/" >
-		<a id="profile-nolocation" class="noglobe" title="$noloc" onclick="jotClearLocation();return false;"></a>
-	</div> 
-
-	<input type="submit" id="profile-jot-submit" class="button creation2" name="submit" value="$share" />
-  
-   <span onclick="preview_post();" id="jot-preview-link" class="tab button">$preview</span>
-   
-	<div id="profile-jot-perms" class="profile-jot-perms" style="display: $pvisit;" >
-		<a href="#profile-jot-acl-wrapper" id="jot-perms-icon" class="icon $lockstate"  title="$permset" ></a>$bang
-	</div>
-
-
-	<div id="profile-jot-plugin-wrapper">
-  	$jotplugins
-	</div>
-	
-	<div id="profile-rotator-wrapper" style="display: $visitor;" >
-		<img id="profile-rotator" src="images/rotator.gif" alt="$wait" title="$wait" style="display: none;" />
-	</div> 
-	
-	</div>
-   <div id="profile-jot-perms-end"></div>
-	
-	<div id="jot-preview-content" style="display:none;"></div>
-
-	<div style="display: none;">
-		<div id="profile-jot-acl-wrapper" style="width:auto;height:auto;overflow:auto;">
-			$acl
-			<hr style="clear:both"/>
-			<div id="profile-jot-email-label">$emailcc</div><input type="text" name="emailcc" id="profile-jot-email" title="$emtitle" />
-			<div id="profile-jot-email-end"></div>
-			$jotnets
-		</div>
-	</div>
-
-
-
-
-</form>
-</div>
-		{{ if $content }}<script>initEditor();</script>{{ endif }}
diff --git a/view/theme/diabook-blue/js/jquery.cookie.js b/view/theme/diabook-blue/js/jquery.cookie.js
deleted file mode 100644
index 6d5974a2c..000000000
--- a/view/theme/diabook-blue/js/jquery.cookie.js
+++ /dev/null
@@ -1,47 +0,0 @@
-/*!
- * jQuery Cookie Plugin
- * https://github.com/carhartl/jquery-cookie
- *
- * Copyright 2011, Klaus Hartl
- * Dual licensed under the MIT or GPL Version 2 licenses.
- * http://www.opensource.org/licenses/mit-license.php
- * http://www.opensource.org/licenses/GPL-2.0
- */
-(function($) {
-    $.cookie = function(key, value, options) {
-
-        // key and at least value given, set cookie...
-        if (arguments.length > 1 && (!/Object/.test(Object.prototype.toString.call(value)) || value === null || value === undefined)) {
-            options = $.extend({}, options);
-
-            if (value === null || value === undefined) {
-                options.expires = -1;
-            }
-
-            if (typeof options.expires === 'number') {
-                var days = options.expires, t = options.expires = new Date();
-                t.setDate(t.getDate() + days);
-            }
-
-            value = String(value);
-
-            return (document.cookie = [
-                encodeURIComponent(key), '=', options.raw ? value : encodeURIComponent(value),
-                options.expires ? '; expires=' + options.expires.toUTCString() : '', // use expires attribute, max-age is not supported by IE
-                options.path    ? '; path=' + options.path : '',
-                options.domain  ? '; domain=' + options.domain : '',
-                options.secure  ? '; secure' : ''
-            ].join(''));
-        }
-
-        // key and possibly options given, get cookie...
-        options = value || {};
-        var decode = options.raw ? function(s) { return s; } : decodeURIComponent;
-
-        var pairs = document.cookie.split('; ');
-        for (var i = 0, pair; pair = pairs[i] && pairs[i].split('='); i++) {
-            if (decode(pair[0]) === key) return decode(pair[1] || ''); // IE saves cookies with empty string as "c; ", e.g. without "=" as opposed to EOMB, thus pair[1] may be undefined
-        }
-        return null;
-    };
-})(jQuery);
diff --git a/view/theme/diabook-blue/mail_conv.tpl b/view/theme/diabook-blue/mail_conv.tpl
deleted file mode 100755
index 989f17878..000000000
--- a/view/theme/diabook-blue/mail_conv.tpl
+++ /dev/null
@@ -1,60 +0,0 @@
-<div class="wall-item-container $item.indent">
-	<div class="wall-item-item">
-		<div class="wall-item-info">
-			<div class="contact-photo-wrapper"
-				<a href="$mail.profile_url" target="redir" title="$mail.from_name" class="contact-photo-link" id="wall-item-photo-link-$mail.id">
-					<img src="$mail.from_photo" class="contact-photo$mail.sparkle" id="wall-item-photo-$mail.id" alt="$mail.from_name" />
-				</a>
-			</div>
-		</div>
-		<div class="wall-item-content">
-			$mail.body
-		</div>
-	</div>
-	<div class="wall-item-bottom">
-		<div class="wall-item-links">
-		</div>
-		<div class="wall-item-tags">
-		</div>
-	</div>
-	<div class="wall-item-bottom">
-		<div class="">
-		</div>
-		<div class="wall-item-actions">
-			<div class="wall-item-actions-author">
-				<a href="$mail.from_url" target="redir" class="wall-item-name-link"><span class="wall-item-name$mail.sparkle">$mail.from_name</span></a> <span class="wall-item-ago">$mail.date</span>
-			</div>
-			
-			<div class="wall-item-actions-social">
-			</div>
-			
-			<div class="wall-item-actions-tools">
-				<a href="message/drop/$mail.id" onclick="return confirmDelete();" class="icon delete s16" title="$mail.delete">$mail.delete</a>
-			</div>
-			
-		</div>
-	</div>
-	<div class="wall-item-bottom">
-	</div>
-</div>
-
-
-{#
-
-
-<div class="mail-conv-outside-wrapper">
-	<div class="mail-conv-sender" >
-		<a href="$mail.from_url" class="mail-conv-sender-url" ><img class="mframe mail-conv-sender-photo$mail.sparkle" src="$mail.from_photo" heigth="80" width="80" alt="$mail.from_name" /></a>
-	</div>
-	<div class="mail-conv-detail" >
-		<div class="mail-conv-sender-name" >$mail.from_name</div>
-		<div class="mail-conv-date">$mail.date</div>
-		<div class="mail-conv-subject">$mail.subject</div>
-		<div class="mail-conv-body">$mail.body</div>
-	<div class="mail-conv-delete-wrapper" id="mail-conv-delete-wrapper-$mail.id" ><a href="message/drop/$mail.id" class="icon drophide delete-icon mail-list-delete-icon" onclick="return confirmDelete();" title="$mail.delete" id="mail-conv-delete-icon-$mail.id" class="mail-conv-delete-icon" onmouseover="imgbright(this);" onmouseout="imgdull(this);" ></a></div><div class="mail-conv-delete-end"></div>
-	<div class="mail-conv-outside-wrapper-end"></div>
-</div>
-</div>
-<hr class="mail-conv-break" />
-
-#}
diff --git a/view/theme/diabook-blue/mail_display.tpl b/view/theme/diabook-blue/mail_display.tpl
deleted file mode 100644
index 8b82e95c6..000000000
--- a/view/theme/diabook-blue/mail_display.tpl
+++ /dev/null
@@ -1,12 +0,0 @@
-<div id="mail-display-subject">
-	<span class="{{if $thread_seen}}seen{{else}}unseen{{endif}}">$thread_subject</span>
-	<a href="message/dropconv/$thread_id" onclick="return confirmDelete();"  title="$delete" class="mail-delete icon s22 delete"></a>
-</div>
-
-{{ for $mails as $mail }}
-	<div id="tread-wrapper-$mail.id" class="tread-wrapper">
-		{{ inc mail_conv.tpl }}{{endinc}}
-	</div>
-{{ endfor }}
-
-{{ inc prv_message.tpl }}{{ endinc }}
diff --git a/view/theme/diabook-blue/mail_list.tpl b/view/theme/diabook-blue/mail_list.tpl
deleted file mode 100644
index 6bc6c84f6..000000000
--- a/view/theme/diabook-blue/mail_list.tpl
+++ /dev/null
@@ -1,8 +0,0 @@
-<div class="mail-list-wrapper">
-	<span class="mail-subject {{if $seen}}seen{{else}}unseen{{endif}}"><a href="message/$id" class="mail-link">$subject</a></span>
-	<span class="mail-from">$from_name</span>
-	<span class="mail-date">$date</span>
-	<span class="mail-count">$count</span>
-	
-	<a href="message/dropconv/$id" onclick="return confirmDelete();"  title="$delete" class="mail-delete icon s22 delete"></a>
-</div>
diff --git a/view/theme/diabook-blue/message_side.tpl b/view/theme/diabook-blue/message_side.tpl
deleted file mode 100644
index 9f1587096..000000000
--- a/view/theme/diabook-blue/message_side.tpl
+++ /dev/null
@@ -1,10 +0,0 @@
-<div id="message-sidebar" class="widget">
-	<div id="message-new" class="{{ if $new.sel }}selected{{ endif }}"><a href="$new.url">$new.label</a> </div>
-	
-	<ul class="message-ul">
-		{{ for $tabs as $t }}
-			<li class="tool {{ if $t.sel }}selected{{ endif }}"><a href="$t.url" class="message-link">$t.label</a></li>
-		{{ endfor }}
-	</ul>
-	
-</div>
diff --git a/view/theme/diabook-blue/nav.tpl b/view/theme/diabook-blue/nav.tpl
deleted file mode 100644
index 3b78b5995..000000000
--- a/view/theme/diabook-blue/nav.tpl
+++ /dev/null
@@ -1,188 +0,0 @@
-<header>
-	<div id="site-location">$sitelocation</div>
-	<div id="banner">$banner</div>
-</header>
-<nav>
-			
-			
-	<ul>
-			
-			
-			{{ if $nav.network }}
-			<li id="nav-network-link" class="nav-menu-icon">
-				<a class="$nav.network.2" href="$nav.network.0" title="$nav.network.3" >
-				<span class="icon notifications">Benachrichtigungen</span>
-				<span id="net-update" class="nav-notify"></span></a>
-			</li>
-		    {{ endif }}
-	
-			{{ if $nav.contacts }}
-			<li class="nav-menu-icon" id="nav-contacts-linkmenu">
-				<a href="$nav.contacts.0" rel="#nav-contacts-menu" title="$nav.contacts.1">
-				<span class="icon contacts">$nav.contacts.1</span>
-				<span id="intro-update" class="nav-notify"></span></a>
-				<ul id="nav-contacts-menu" class="menu-popup">
-					<li id="nav-contacts-see-intro"><a href="$nav.notifications.0">$nav.introductions.1</a><span id="intro-update" class="nav-notify"></span></li>
-					<li id="nav-contacts-all"><a href="contacts">$nav.contacts.1</a></li> 
-				</ul>
-			</li>	
-			{{ endif }}
-			
-			{{ if $nav.messages }}
-			<li  id="nav-messages-linkmenu" class="nav-menu-icon">
-			  <a href="$nav.messages.0" rel="#nav-messages-menu" title="$nav.messages.1">
-			  <span class="icon messages">$nav.messages.1</span>
-				<span id="mail-update" class="nav-notify"></span></a>
-				<ul id="nav-messages-menu" class="menu-popup">
-					<li id="nav-messages-see-all"><a href="$nav.messages.0">$nav.messages.1</a></li>
-					<li id="nav-messages-see-all"><a href="$nav.messages.inbox.0">$nav.messages.inbox.1</a></li>
-					<li id="nav-messages-see-all"><a href="$nav.messages.outbox.0">$nav.messages.outbox.1</a></li>
-					<li id="nav-messages-see-all"><a href="$nav.messages.new.0">$nav.messages.new.1</a></li>
-				</ul>
-			</li>		
-			{{ endif }}
-		
-      {{ if $nav.notifications }}
-			<li  id="nav-notifications-linkmenu" class="nav-menu-icon">
-			<a href="$nav.notifications.0" rel="#nav-notifications-menu" title="$nav.notifications.1">
-			<span class="icon notify">$nav.notifications.1</span>
-				<span id="notify-update" class="nav-notify"></span></a>
-				<ul id="nav-notifications-menu" class="menu-popup">
-					<li id="nav-notifications-mark-all"><a href="#" onclick="notifyMarkAll(); return false;">$nav.notifications.mark.1</a></li>
-					<li id="nav-notifications-see-all"><a href="$nav.notifications.all.0">$nav.notifications.all.1</a></li>
-					<li class="empty">$emptynotifications</li>
-				</ul>
-			</li>		
-		{{ endif }}	
-			
-		{{ if $nav.search}}
-		<li id="search-box">
-			<form method="get" action="$nav.search.0">
-				<input id="search-text" class="nav-menu-search" type="text" value="" name="search">
-			</form>
-		</li>		
-		{{ endif }}	
-		
-		<li id="nav-site-linkmenu" class="nav-menu-icon"><a href="#" rel="#nav-site-menu"><span class="icon s22 gear">Site</span></a>
-			<ul id="nav-site-menu" class="menu-popup">
-				{{ if $nav.manage }}<li><a class="$nav.manage.2" href="$nav.manage.0" title="$nav.manage.3">$nav.manage.1</a></li>{{ endif }}				
-
-				{{ if $nav.settings }} <li><a class="$nav.search.2" onClick="restore_boxes()" title="Restore right-hand column" style="cursor: pointer;">Restore right-hand column</a></li>{{ endif }}
-
-				{{ if $nav.help }} <li><a class="$nav.help.2" target="friendika-help" href="$nav.help.0" title="$nav.help.3" >$nav.help.1</a></li>{{ endif }}
-										
-										 <li><a class="$nav.search.2" href="friendica" title="Site Info / Impressum" >Info/Impressum</a></li>
-
-				{{ if $nav.settings }}<li><a class="menu-sep $nav.settings.2" href="$nav.settings.0" title="$nav.settings.3">$nav.settings.1</a></li>{{ endif }}
-				{{ if $nav.admin }}<li><a class="$nav.admin.2" href="$nav.admin.0" title="$nav.admin.3" >$nav.admin.1</a></li>{{ endif }}
-
-				{{ if $nav.logout }}<li><a class="menu-sep $nav.logout.2" href="$nav.logout.0" title="$nav.logout.3" >$nav.logout.1</a></li>{{ endif }}
-
-				
-			</ul>		
-		</li>
-		
-		{{ if $nav.directory }}
-		<li id="nav-directory-link" class="nav-menu $sel.directory">
-			<a class="$nav.directory.2" href="$nav.directory.0" title="$nav.directory.3" >$nav.directory.1</a>
-		</li>
-		{{ endif }}
-		
-		
-		{{ if $nav.apps }}
-			<li id="nav-apps-link" class="nav-menu $sel.apps">
-				<a class=" $nav.apps.2" href="#" rel="#nav-apps-menu" title="$nav.apps.3" >$nav.apps.1</a>
-				<ul id="nav-apps-menu" class="menu-popup">
-					{{ for $apps as $ap }}
-					<li>$ap</li>
-					{{ endfor }}
-				</ul>
-			</li>	
-		{{ endif }}		
-		
-      {{ if $nav.settings }}
-			<li id="nav-home-link" class="nav-menu $sel.home">
-				<a class="$nav.home.2" href="$nav.home.0" title="$nav.home.3" >$nav.home.1
-				<span id="home-update" class="nav-notify"></span></a>
-			</li>
-		{{ endif }}		
-		
-		{{ if $userinfo }}
-			<li id="nav-user-linkmenu" class="nav-menu-icon"><a href="#" rel="#nav-user-menu" title="$sitelocation"><img src="$userinfo.icon" alt="$userinfo.name"></a>
-				<ul id="nav-user-menu" class="menu-popup">
-					{{ for $nav.usermenu as $usermenu }}
-						<li><a class="$usermenu.2" href="$usermenu.0" title="$usermenu.3">$usermenu.1</a></li>
-					{{ endfor }}
-					
-					{{ if $nav.profiles }}<li><a class="menu-sep $nav.profiles.2" href="$nav.profiles.0" title="$nav.profiles.3" >$nav.profiles.3</a></li>{{ endif }}
-					{{ if $nav.notifications }}<li><a class="$nav.notifications.2" href="$nav.notifications.0" title="$nav.notifications.3" >$nav.notifications.1</a></li>{{ endif }}
-					{{ if $nav.messages }}<li><a class="$nav.messages.2" href="$nav.messages.0" title="$nav.messages.3" >$nav.messages.1</a></li>{{ endif }}
-					{{ if $nav.contacts }}<li><a class="$nav.contacts.2" href="$nav.contacts.0" title="$nav.contacts.3" >$nav.contacts.1</a></li>{{ endif }}	
-				</ul>
-			</li>
-		{{ endif }}
-		
-					{{ if $nav.login }}
-					<li id="nav-home-link" class="nav-menu $sel.home">
-						<a class="$nav.login.2" href="$nav.login.0" title="$nav.login.3" >$nav.login.1</a>
-					<li>
-					{{ endif }}
-		
-		
-		
-	</ul>	
-
-
-	
-</nav>
-
-
-<div style="position: fixed; bottom: 5px; right: 10px;"><a href="javascript:scroll(0,0); "><img src="view/theme/diabook/icons/scroll_top.png" title="scroll to top"></a></div>
-<div style="position: fixed; bottom: 3px; left: 25px;">$langselector</div>
-<div style="position: fixed; bottom: 23px; left: 5px;"><a href="http://pad.toktan.org/p/diabook" target="blank" ><img src="view/theme/diabook/icons/bluebug.png" title="report bugs for the theme diabook"/></a></div>
-
-
-
-<ul id="nav-notifications-template" style="display:none;" rel="template">
-	<li class="{4}"><a href="{0}"><img src="{1}">{2} <span class="notif-when">{3}</span></a></li>
-</ul>
-
-
-
-{#
-
-{{ if $nav.logout }}<a id="nav-logout-link" class="nav-link $nav.logout.2" href="$nav.logout.0" title="$nav.logout.3" >$nav.logout.1</a> {{ endif }}
-{{ if $nav.login }}<a id="nav-login-link" class="nav-login-link $nav.login.2" href="$nav.login.0" title="$nav.login.3" >$nav.login.1</a> {{ endif }}
-
-<span id="nav-link-wrapper" >
-
-{{ if $nav.register }}<a id="nav-register-link" class="nav-commlink $nav.register.2" href="$nav.register.0" title="$nav.register.3" >$nav.register.1</a>{{ endif }}
-	
-<a id="nav-help-link" class="nav-link $nav.help.2" target="friendika-help" href="$nav.help.0" title="$nav.help.3" >$nav.help.1</a>
-	
-{{ if $nav.apps }}<a id="nav-apps-link" class="nav-link $nav.apps.2" href="$nav.apps.0" title="$nav.apps.3" >$nav.apps.1</a>{{ endif }}
-
-<a id="nav-search-link" class="nav-link $nav.search.2" href="$nav.search.0" title="$nav.search.3" >$nav.search.1</a>
-<a id="nav-directory-link" class="nav-link $nav.directory.2" href="$nav.directory.0" title="$nav.directory.3" >$nav.directory.1</a>
-
-{{ if $nav.admin }}<a id="nav-admin-link" class="nav-link $nav.admin.2" href="$nav.admin.0" title="$nav.admin.3" >$nav.admin.1</a>{{ endif }}
-
-{{ if $nav.notifications }}
-<a id="nav-notify-link" class="nav-commlink $nav.notifications.2" href="$nav.notifications.0" title="$nav.notifications.3" >$nav.notifications.1</a>
-<span id="notify-update" class="nav-ajax-left"></span>
-{{ endif }}
-{{ if $nav.messages }}
-<a id="nav-messages-link" class="nav-commlink $nav.messages.2" href="$nav.messages.0" title="$nav.messages.3" >$nav.messages.1</a>
-<span id="mail-update" class="nav-ajax-left"></span>
-{{ endif }}
-
-{{ if $nav.manage }}<a id="nav-manage-link" class="nav-commlink $nav.manage.2" href="$nav.manage.0" title="$nav.manage.3">$nav.manage.1</a>{{ endif }}
-
-{{ if $nav.settings }}<a id="nav-settings-link" class="nav-link $nav.settings.2" href="$nav.settings.0" title="$nav.settings.3">$nav.settings.1</a>{{ endif }}
-{{ if $nav.profiles }}<a id="nav-profiles-link" class="nav-link $nav.profiles.2" href="$nav.profiles.0" title="$nav.profiles.3" >$nav.profiles.1</a>{{ endif }}
-
-
-</span>
-<span id="nav-end"></span>
-<span id="banner">$banner</span>
-#}
diff --git a/view/theme/diabook-blue/photo_view.tpl b/view/theme/diabook-blue/photo_view.tpl
deleted file mode 100755
index 20926656a..000000000
--- a/view/theme/diabook-blue/photo_view.tpl
+++ /dev/null
@@ -1,28 +0,0 @@
-<div id="live-display"></div>
-<h3><a href="$album.0">$album.1</a></h3>
-
-<div id="photo-edit-link-wrap">
-{{ if $tools }}
-<a id="photo-edit-link" href="$tools.edit.0">$tools.edit.1</a>
--
-<a id="photo-toprofile-link" href="$tools.profile.0">$tools.profile.1</a>
-{{ endif }}
-{{ if $lock }} - <img src="images/lock_icon.gif" class="lockview" alt="$lock" onclick="lockview(event,'photo$id');" /> {{ endif }}
-</div>
-
-<div id="photo-photo">
-	{{ if $prevlink }}<div id="photo-prev-link"><a href="$prevlink.0">$prevlink.1</a></div>{{ endif }}
-	<a href="$photo.href" class="lightbox" title="$photo.title"><img src="$photo.src" /></a>
-	{{ if $nextlink }}<div id="photo-next-link"><a href="$nextlink.0">$nextlink.1</a></div>{{ endif }}
-</div>
-
-<div id="photo-photo-end"></div>
-<div id="photo-caption" >$desc</div>
-{{ if $tags }}
-<div id="in-this-photo-text">$tags.0</div>
-<div id="in-this-photo">$tags.1</div>
-{{ endif }}
-{{ if $tags.2 }}<div id="tag-remove"><a href="$tags.2">$tags.3</a></div>{{ endif }}
-
-{{ if $edit }}$edit{{ endif }}
-
diff --git a/view/theme/diabook-blue/profile_side.tpl b/view/theme/diabook-blue/profile_side.tpl
deleted file mode 100644
index 94396300f..000000000
--- a/view/theme/diabook-blue/profile_side.tpl
+++ /dev/null
@@ -1,21 +0,0 @@
-<div id="profile_side">
-	<div id="ps-usernameicon">
-		<a href="$ps.usermenu.status.0" title="$userinfo.name">
-			<img src="$userinfo.icon" id="ps-usericon" alt="$userinfo.name">
-		</a>
-		<a href="$ps.usermenu.status.0" id="ps-username" title="$userinfo.name">$userinfo.name</a>
-	</div>
-	
-<ul id="profile-side-menu" class="menu-profile-side">
-	<li id="profile-side-status" class="menu-profile-list home"><a class="menu-profile-list-item" href="$ps.usermenu.status.0">$ps.usermenu.status.1</a></li>
-	<li id="profile-side-photos" class="menu-profile-list photos"><a class="menu-profile-list-item" href="$ps.usermenu.photos.0">$ps.usermenu.photos.1</a></li>
-		<li id="profile-side-photos" class="menu-profile-list pscontacts"><a class="menu-profile-list-item" href="$ps.usermenu.contacts.0">$ps.usermenu.contacts.1</a></li>	
-	<li id="profile-side-events" class="menu-profile-list events"><a class="menu-profile-list-item" href="$ps.usermenu.events.0">$ps.usermenu.events.1</a></li>
-	<li id="profile-side-notes" class="menu-profile-list notes"><a class="menu-profile-list-item" href="$ps.usermenu.notes.0">$ps.usermenu.notes.1</a></li>
-	<li id="profile-side-foren" class="menu-profile-list foren"><a class="menu-profile-list-item" href="$ps.usermenu.pgroups.0" target="blanc">$ps.usermenu.pgroups.1</a></li>
-	<li id="profile-side-foren" class="menu-profile-list com_side"><a class="menu-profile-list-item" href="$ps.usermenu.community.0">$ps.usermenu.community.1</a></li>
-</ul>
-
-</div>
-
-				
diff --git a/view/theme/diabook-blue/profile_vcard.tpl b/view/theme/diabook-blue/profile_vcard.tpl
deleted file mode 100644
index 918cfc97c..000000000
--- a/view/theme/diabook-blue/profile_vcard.tpl
+++ /dev/null
@@ -1,64 +0,0 @@
-<div class="vcard">
-
-	<div class="tool">
-		<div class="fn label">$profile.name</div>
-		{{ if $profile.edit }}
-			<div class="action">
-			<a class="icon s16 edit ttright" href="#" rel="#profiles-menu" title="$profile.edit.3"><span>$profile.edit.1</span></a>
-			<ul id="profiles-menu" class="menu-popup">
-				{{ for $profile.menu.entries as $e }}
-				<li>
-					<a href="profiles/$e.id"><img src='$e.photo'>$e.profile_name</a>
-				</li>
-				{{ endfor }}
-				<li><a href="profile_photo" >$profile.menu.chg_photo</a></li>
-				<li><a href="profiles/new" id="profile-listing-new-link">$profile.menu.cr_new</a></li>
-				<li><a href="profiles" >$profile.edit.3</a></li>
-								
-			</ul>
-			</div>
-		{{ endif }}
-	</div>
-				
-	
-	{{ if $pdesc }}<div class="title">$profile.pdesc</div>{{ endif }}
-	<div id="profile-photo-wrapper"><img class="photo" width="155" height="155" src="$profile.photo?rev=$profile.picdate" alt="$profile.name" /></div>
-
-
-
-	{{ if $location }}
-		<dl class="location"><dt class="location-label">$location</dt><br> 
-		<dd class="adr">
-			{{ if $profile.address }}<div class="street-address">$profile.address</div>{{ endif }}
-			<span class="city-state-zip">
-				<span class="locality">$profile.locality</span>{{ if $profile.locality }}, {{ endif }}
-				<span class="region">$profile.region</span>
-				<span class="postal-code">$profile.postal-code</span>
-			</span>
-			{{ if $profile.country-name }}<span class="country-name">$profile.country-name</span>{{ endif }}
-		</dd>
-		</dl>
-	{{ endif }}
-
-	{{ if $gender }}<dl class="mf"><dt class="gender-label">$gender</dt> <dd class="x-gender">$profile.gender</dd></dl>{{ endif }}
-	
-	{{ if $profile.pubkey }}<div class="key" style="display:none;">$profile.pubkey</div>{{ endif }}
-
-	{{ if $marital }}<dl class="marital"><dt class="marital-label"><span class="heart">&hearts;</span>$marital</dt><dd class="marital-text">$profile.marital</dd></dl>{{ endif }}
-
-	{{ if $homepage }}<dl class="homepage"><dt class="homepage-label">$homepage</dt><dd class="homepage-url"><a href="$profile.homepage" target="external-link">$profile.homepage</a></dd></dl>{{ endif }}
-
-	{{ inc diaspora_vcard.tpl }}{{ endinc }}
-	
-	<div id="profile-extra-links">
-		<ul>
-			{{ if $connect }}
-				<li><a id="dfrn-request-link" href="dfrn_request/$profile.nickname">$connect</a></li>
-			{{ endif }}
-		</ul>
-	</div>
-</div>
-
-$contact_block
-
-
diff --git a/view/theme/diabook-blue/right_aside.tpl b/view/theme/diabook-blue/right_aside.tpl
deleted file mode 100644
index a65677696..000000000
--- a/view/theme/diabook-blue/right_aside.tpl
+++ /dev/null
@@ -1,20 +0,0 @@
-<div id="profile_side">
-	<div id="ps-usernameicon">
-		<a href="$ps.usermenu.status.0" title="$userinfo.name">
-			<img src="$userinfo.icon" id="ps-usericon" alt="$userinfo.name">
-		</a>
-		<a href="$ps.usermenu.status.0" id="ps-username" title="$userinfo.name">$userinfo.name</a>
-	</div>
-	
-<ul id="profile-side-menu" class="menu-profile-side">
-	<li id="profile-side-status" class="menu-profile-list home"><a class="menu-profile-list-item" href="$ps.usermenu.status.0">$ps.usermenu.status.1</a></li>
-	<li id="profile-side-photos" class="menu-profile-list photos"><a class="menu-profile-list-item" href="$ps.usermenu.photos.0">$ps.usermenu.photos.1</a></li>
-	<li id="profile-side-events" class="menu-profile-list events"><a class="menu-profile-list-item" href="$ps.usermenu.events.0">$ps.usermenu.events.1</a></li>
-	<li id="profile-side-notes" class="menu-profile-list notes"><a class="menu-profile-list-item" href="$ps.usermenu.notes.0">$ps.usermenu.notes.1</a></li>
-	<li id="profile-side-foren" class="menu-profile-list foren"><a class="menu-profile-list-item" href="http://dir.friendika.com/directory/forum" target="blanc">Public Groups</a></li>
-	<li id="profile-side-foren" class="menu-profile-list com_side"><a class="menu-profile-list-item" href="$ps.usermenu.community.0">$ps.usermenu.community.1</a></li>
-</ul>
-
-</div>
-
-				
\ No newline at end of file
diff --git a/view/theme/diabook-blue/rs_common_tabs.tpl b/view/theme/diabook-blue/rs_common_tabs.tpl
deleted file mode 100755
index 6a1c5c71b..000000000
--- a/view/theme/diabook-blue/rs_common_tabs.tpl
+++ /dev/null
@@ -1,6 +0,0 @@
-<h3 style="border-bottom: 1px solid #D2D2D2;">Settings Menu</h3>
-<ul class="rs_tabs">
-	{{ for $tabs as $tab }}
-		<li><a href="$tab.url" class="rs_tab button $tab.sel">$tab.label</a></li>
-	{{ endfor }}
-</ul>
diff --git a/view/theme/diabook-blue/screenshot.png b/view/theme/diabook-blue/screenshot.png
deleted file mode 100644
index b1c890285..000000000
--- a/view/theme/diabook-blue/screenshot.png
+++ /dev/null
diff --git a/view/theme/diabook-blue/search_item.tpl b/view/theme/diabook-blue/search_item.tpl
deleted file mode 100755
index 123834064..000000000
--- a/view/theme/diabook-blue/search_item.tpl
+++ /dev/null
@@ -1,100 +0,0 @@
-{{ if $item.indent }}{{ else }}
-<div class="wall-item-decor">
-	<img id="like-rotator-$item.id" class="like-rotator" src="images/rotator.gif" alt="$item.wait" title="$item.wait" style="display: none;" />
-</div>
-{{ endif }}
-<div class="wall-item-container $item.indent">
-	<div class="wall-item-item">
-		<div class="wall-item-info">
-			<div class="contact-photo-wrapper"
-				onmouseover="if (typeof t$item.id != 'undefined') clearTimeout(t$item.id); openMenu('wall-item-photo-menu-button-$item.id')" 
-				onmouseout="t$item.id=setTimeout('closeMenu(\'wall-item-photo-menu-button-$item.id\'); closeMenu(\'wall-item-photo-menu-$item.id\');',200)">
-				<a href="$item.profile_url" target="redir" title="$item.linktitle" class="contact-photo-link" id="wall-item-photo-link-$item.id">
-					<img src="$item.thumb" class="contact-photo$item.sparkle" id="wall-item-photo-$item.id" alt="$item.name" />
-				</a>
-				<a href="#" rel="#wall-item-photo-menu-$item.id" class="contact-photo-menu-button icon s16 menu" id="wall-item-photo-menu-button-$item.id">menu</a>
-				<ul class="contact-menu menu-popup" id="wall-item-photo-menu-$item.id">
-				$item.item_photo_menu
-				</ul>
-				
-			</div>
-		</div>
-			<div class="wall-item-actions-author">
-				<a href="$item.profile_url" target="redir" title="$item.linktitle" class="wall-item-name-link"><span class="wall-item-name$item.sparkle">$item.name</span></a> 
-			<span class="wall-item-ago">-
-			{{ if $item.plink }}<a class="link" title="$item.plink.title" href="$item.plink.href" style="color: #999">$item.ago</a>{{ else }} $item.ago {{ endif }}
-			{{ if $item.lock }} - <span class="fakelink" style="color: #999" onclick="lockview(event,$item.id);">$item.lock</span> {{ endif }}
-			</span>
-			</div>
-		<div class="wall-item-content">
-			{{ if $item.title }}<h2><a href="$item.plink.href">$item.title</a></h2>{{ endif }}
-			$item.body
-		</div>
-	</div>
-	<div class="wall-item-bottom">
-		<div class="wall-item-links">
-		</div>
-		<div class="wall-item-tags">
-			{{ for $item.tags as $tag }}
-				<span class='tag'>$tag</span>
-			{{ endfor }}
-		</div>
-	</div>
-	<div class="wall-item-bottom">
-		<div class="">
-
-		</div>
-		<div class="wall-item-actions">
-
-			<div class="wall-item-actions-social">
-			
-			
-			{{ if $item.vote }}
-				<a href="#" id="like-$item.id" class="icon like" title="$item.vote.like.0" onclick="dolike($item.id,'like'); return false">$item.vote.like.1</a>
-				<a href="#" id="dislike-$item.id" class="icon dislike" title="$item.vote.dislike.0" onclick="dolike($item.id,'dislike'); return false"></a>
-			{{ endif }}
-						
-			{{ if $item.vote.share }}
-				<a href="#" id="share-$item.id" class="icon recycle" title="$item.vote.share.0" onclick="jotShare($item.id); return false"></a>
-			{{ endif }}	
-
-
-			{{ if $item.star }}
-				<a href="#" id="starred-$item.id" onclick="dostar($item.id); return false;" class="star-item icon $item.isstarred" title="$item.star.toggle">
-				<img src="images/star_dummy.png" class="icon star" alt="$item.star.do" /> </a>
-				<a href="#" id="tagger-$item.id" onclick="itemTag($item.id); return false;" class="tag-item icon tagged" title="$item.star.tagger"></a>					  
-			{{ endif }}	
-			
-			{{ if $item.filer }}
-			<a href="#" id="filer-$item.id" onclick="itemFiler($item.id); return false;" class="filer-item icon file-as" title="$item.star.filer"></a>
-			{{ endif }}				
-			
-			{{ if $item.plink }}<a class="icon link" title="$item.plink.title" href="$item.plink.href">$item.plink.title</a>{{ endif }}
-			
-					
-					
-			</div>
-			
-			<div class="wall-item-actions-tools">
-
-				{{ if $item.drop.dropping }}
-					<input type="checkbox" title="$item.drop.select" name="itemselected[]" class="item-select" value="$item.id" />
-					<a href="item/drop/$item.id" onclick="return confirmDelete();" class="icon drop" title="$item.drop.delete">$item.drop.delete</a>
-				{{ endif }}
-				{{ if $item.edpost }}
-					<a class="icon pencil" href="$item.edpost.0" title="$item.edpost.1"></a>
-				{{ endif }}
-			</div>
-			<div class="wall-item-location">$item.location&nbsp;</div>
-		</div>
-	</div>
-	<div class="wall-item-bottom">
-		<div class="wall-item-links"></div>
-		<div class="wall-item-like" id="wall-item-like-$item.id">$item.like</div>
-		<div class="wall-item-dislike" id="wall-item-dislike-$item.id">$item.dislike</div>	
-	</div>
-</div>
-
-<div class="wall-item-comment-wrapper" >
-	$item.comment
-</div>
diff --git a/view/theme/diabook-blue/theme.php b/view/theme/diabook-blue/theme.php
deleted file mode 100755
index 891c13cbf..000000000
--- a/view/theme/diabook-blue/theme.php
+++ /dev/null
@@ -1,430 +0,0 @@
-<?php
-
-/*
- * Name: Diabook-blue
- * Description: Diabook-blue: report bugs and request here: http://pad.toktan.org/p/diabook or contact me : thomas_bierey@friendica.eu
- * Version: 
- * Author: 
- */
-
-
-//change css on network and profilepages
-$cssFile = null;
-
-
-/**
- * prints last community activity
- */
-function diabook_blue_community_info(){
-	$a = get_app();
-	//right_aside at networkpages
-
-	// last 12 users
-	$aside['$lastusers_title'] = t('Last users');
-	$aside['$lastusers_items'] = array();
-	$sql_extra = "";
-	$publish = (get_config('system','publish_all') ? '' : " AND `publish` = 1 " );
-	$order = " ORDER BY `register_date` DESC ";
-
-	$r = q("SELECT `profile`.*, `profile`.`uid` AS `profile_uid`, `user`.`nickname`
-			FROM `profile` LEFT JOIN `user` ON `user`.`uid` = `profile`.`uid` 
-			WHERE `is-default` = 1 $publish AND `user`.`blocked` = 0 $sql_extra $order LIMIT %d , %d ",
-		0,
-		9
-	);
-	$tpl = file_get_contents( dirname(__file__).'/directory_item.tpl');
-	if(count($r)) {
-		$photo = 'thumb';
-		foreach($r as $rr) {
-			$profile_link = $a->get_baseurl() . '/profile/' . ((strlen($rr['nickname'])) ? $rr['nickname'] : $rr['profile_uid']);
-			$entry = replace_macros($tpl,array(
-				'$id' => $rr['id'],
-				'$profile-link' => $profile_link,
-				'$photo' => $rr[$photo],
-				'$alt-text' => $rr['name'],
-			));
-			$aside['$lastusers_items'][] = $entry;
-		}
-	}
-	
-	
-	// last 10 liked items
-	$aside['$like_title'] = t('Last likes');
-	$aside['$like_items'] = array();
-	$r = q("SELECT `T1`.`created`, `T1`.`liker`, `T1`.`liker-link`, `item`.* FROM 
-			(SELECT `parent-uri`, `created`, `author-name` AS `liker`,`author-link` AS `liker-link` 
-				FROM `item` WHERE `verb`='http://activitystrea.ms/schema/1.0/like' GROUP BY `parent-uri` ORDER BY `created` DESC) AS T1
-			INNER JOIN `item` ON `item`.`uri`=`T1`.`parent-uri` 
-			WHERE `T1`.`liker-link` LIKE '%s%%' OR `item`.`author-link` LIKE '%s%%'
-			GROUP BY `uri`
-			ORDER BY `T1`.`created` DESC
-			LIMIT 0,5",
-			$a->get_baseurl(),$a->get_baseurl()
-			);
-
-	foreach ($r as $rr) {
-		$author	 = '<a href="' . $rr['liker-link'] . '">' . $rr['liker'] . '</a>';
-		$objauthor =  '<a href="' . $rr['author-link'] . '">' . $rr['author-name'] . '</a>';
-		
-		//var_dump($rr['verb'],$rr['object-type']); killme();
-		switch($rr['verb']){
-			case 'http://activitystrea.ms/schema/1.0/post':
-				switch ($rr['object-type']){
-					case 'http://activitystrea.ms/schema/1.0/event':
-						$post_type = t('event');
-						break;
-					default:
-						$post_type = t('status');
-				}
-				break;
-			default:
-				if ($rr['resource-id']){
-					$post_type = t('photo');
-					$m=array();	preg_match("/\[url=([^]]*)\]/", $rr['body'], $m);
-					$rr['plink'] = $m[1];
-				} else {
-					$post_type = t('status');
-				}
-		}
-		$plink = '<a href="' . $rr['plink'] . '">' . $post_type . '</a>';
-
-		$aside['$like_items'][] = sprintf( t('%1$s likes %2$s\'s %3$s'), $author, $objauthor, $plink);
-		
-	}
-	
-	
-	// last 12 photos
-	$aside['$photos_title'] = t('Last photos');
-	$aside['$photos_items'] = array();
-	$r = q("SELECT `photo`.`id`, `photo`.`resource-id`, `photo`.`scale`, `photo`.`desc`, `user`.`nickname`, `user`.`username` FROM 
-				(SELECT `resource-id`, MAX(`scale`) as maxscale FROM `photo` 
-					WHERE `profile`=0 AND `contact-id`=0 AND `album` NOT IN ('Contact Photos', '%s', 'Profile Photos', '%s')
-						AND `allow_cid`='' AND `allow_gid`='' AND `deny_cid`='' AND `deny_gid`='' GROUP BY `resource-id`) AS `t1`
-				INNER JOIN `photo` ON `photo`.`resource-id`=`t1`.`resource-id` AND `photo`.`scale` = `t1`.`maxscale`,
-				`user` 
-				WHERE `user`.`uid` = `photo`.`uid`
-				AND `user`.`blockwall`=0
-				AND `user`.`hidewall`=0
-				ORDER BY `photo`.`edited` DESC
-				LIMIT 0, 9",
-				dbesc(t('Contact Photos')),
-				dbesc(t('Profile Photos'))
-				);
-		if(count($r)) {
-		$tpl = file_get_contents( dirname(__file__).'/directory_item.tpl');
-		foreach($r as $rr) {
-			$photo_page = $a->get_baseurl() . '/photos/' . $rr['nickname'] . '/image/' . $rr['resource-id'];
-			$photo_url = $a->get_baseurl() . '/photo/' .  $rr['resource-id'] . '-' . $rr['scale'] .'.jpg';
-		
-			$entry = replace_macros($tpl,array(
-				'$id' => $rr['id'],
-				'$profile-link' => $photo_page,
-				'$photo' => $photo_url,
-				'$alt-text' => $rr['username']." : ".$rr['desc'],
-			));
-
-			$aside['$photos_items'][] = $entry;
-		}
-	}
-	
-	$fostitJS = "javascript: (function() {
-    					the_url = '".$a->get_baseurl($ssl_state)."/view/theme/diabook-blue/fpostit/fpostit.php?url=' + encodeURIComponent(window.location.href) + '&title=' + encodeURIComponent(document.title) + '&text=' + encodeURIComponent(''+(window.getSelection ? window.getSelection() : document.getSelection ? document.getSelection() : document.selection.createRange().text));
-    						a_funct = function() {
-        						if (!window.open(the_url, 'fpostit', 'location=yes,links=no,scrollbars=no,toolbar=no,width=600,height=300')) location.href = the_url};
-    							if (/Firefox/.test(navigator.userAgent)) {setTimeout(a_funct, 0)} 
-    							else {a_funct()}})()" ;
-  
-   $aside['$fostitJS'] = $fostitJS;
-   
-   //nav FIND FRIENDS
-	if(local_user()) {
-	$nv = array();
-	$nv['directory'] = Array('directory', t('Local').' '.t('Directory'), "", "");
-	$nv['global_directory'] = Array('http://dir.friendica.com/', t('Global Directory'), "", "");
-	$nv['match'] = Array('match', t('Similar Interests'), "", "");
-	$nv['suggest'] = Array('suggest', t('Friend Suggestions'), "", "");
-	$nv['invite'] = Array('invite', t('Invite Friends'), "", "");
-	
-	$nv['search'] = '<form name="simple_bar" method="get" action="http://dir.friendika.com/directory">
-						<span class="sbox_l"></span>
-						<span class="sbox">
-						<input type="text" name="search" size="13" maxlength="50">
-						</span>
-						<span class="sbox_r" id="srch_clear"></span>';
-						
-	$aside['$nv'] = $nv;
-	};
-	//Community Page
-	if(local_user()) {
-   $page = '<div id="page-sidebar-right_aside" class="widget">
-			<div class="title tool">
-			<h3>'.t("Community Pages").'<a id="close_pages_icon"  onClick="close_pages()" class="icon close_box" title="close"></a></h3></div>
-			<div id="sidebar-page-list"><ul>';
-
-	$pagelist = array();
-
-	$contacts = q("SELECT `id`, `url`, `name`, `micro`FROM `contact`
-			WHERE `network`= 'dfrn' AND `forum` = 1 AND `uid` = %d",
-			intval($a->user['uid'])
-	);
-
-	$pageD = array();
-
-	// Look if the profile is a community page
-	foreach($contacts as $contact) {
-		$pageD[] = array("url"=>$contact["url"], "name"=>$contact["name"], "id"=>$contact["id"], "micro"=>$contact['micro']);
-	};
-	
-
-	$contacts = $pageD;
-
-	foreach($contacts as $contact) {
-		$page .= '<li style="list-style-type: none;" class="tool"><img height="20" width="20" style="float: left; margin-right: 3px;" src="' . $contact['micro'] .'" alt="' . $contact['url'] . '" /> <a href="'.$a->get_baseurl().'/redir/'.$contact["id"].'" style="margin-top: 2px;" title="' . $contact['url'] . '" class="label" target="external-link">'.
-				$contact["name"]."</a></li>";
-	}
-	$page .= '</ul></div></div>';
-	//if (sizeof($contacts) > 0)
-		
-		$aside['$page'] = $page;
-	}		
-  //END Community Page		   
-   
-   
-   
-   $url = $a->get_baseurl($ssl_state);   
-   $aside['$url'] = $url;
-
-	$tpl = file_get_contents(dirname(__file__).'/communityhome.tpl');
-	$a->page['right_aside'] = replace_macros($tpl, $aside);
-	
-}
-
-
-//profile_side at networkpages
-if ($a->argv[0] === "network" && local_user()){
-
-	// USER MENU
-	if(local_user()) {
-		
-		$r = q("SELECT micro FROM contact WHERE uid=%d AND self=1", intval($a->user['uid']));
-				
-		$userinfo = array(
-					'icon' => (count($r) ? $r[0]['micro']: $a->get_baseurl()."/images/default-profile-mm.jpg"),
-					'name' => $a->user['username'],
-				);	
-		$ps = array('usermenu'=>array());
-		$ps['usermenu']['status'] = Array('profile/' . $a->user['nickname'], t('Home'), "", t('Your posts and conversations'));
-		$ps['usermenu']['profile'] = Array('profile/' . $a->user['nickname']. '?tab=profile', t('Profile'), "", t('Your profile page'));
-		$ps['usermenu']['contacts'] = Array('contacts' , t('Contacts'), "", t('Your contacts'));		
-		$ps['usermenu']['photos'] = Array('photos/' . $a->user['nickname'], t('Photos'), "", t('Your photos'));
-		$ps['usermenu']['events'] = Array('events/', t('Events'), "", t('Your events'));
-		$ps['usermenu']['notes'] = Array('notes/', t('Personal notes'), "", t('Your personal photos'));
-		$ps['usermenu']['community'] = Array('community/', t('Community'), "", "");
-		$ps['usermenu']['pgroups'] = Array('http://dir.friendika.com/directory/forum', t('Community Pages'), "", "");
-
-		$tpl = get_markup_template('profile_side.tpl');
-
-		$a->page['aside'] .= replace_macros($tpl, array(
-				'$userinfo' => $userinfo,
-				'$ps' => $ps,
-			));
-
-	}
-	
-	$ccCookie = $_COOKIE['close_pages'] + $_COOKIE['close_helpers'] + $_COOKIE['close_services'] + $_COOKIE['close_friends'] + $_COOKIE['close_postit'] + $_COOKIE['close_lastusers'] + $_COOKIE['close_lastphotos'] + $_COOKIE['close_lastlikes'];
-	
-	if($ccCookie != "8") {
-	// COMMUNITY
-	diabook_blue_community_info();
-	
-	// CUSTOM CSS
-	$cssFile = $a->get_baseurl($ssl_state)."/view/theme/diabook-blue/style-network.css";
-	}
-}
-
-
-
-//right_aside at profile pages
-if ($a->argv[0].$a->argv[1] === "profile".$a->user['nickname']){
-	if($ccCookie != "8") {
-	// COMMUNITY
-	diabook_blue_community_info();
-	
-	// CUSTOM CSS
-	$cssFile = $a->get_baseurl($ssl_state)."/view/theme/diabook-blue/style-profile.css";
-	}
-}
-
-//tabs at right_aside on settings page
-if ($a->argv[0] === "settings"){
-	
-	$tabs = array(
-		array(
-			'label'	=> t('Account settings'),
-			'url' 	=> $a->get_baseurl(true).'/settings',
-			'sel'	=> (($a->argc == 1)?'active':''),
-		),	
-		array(
-			'label'	=> t('Display settings'),
-			'url' 	=> $a->get_baseurl(true).'/settings/display',
-			'sel'	=> (($a->argc > 1) && ($a->argv[1] === 'display')?'active':''),
-		),	
-		array(
-			'label'	=> t('Edit/Manage Profiles'),
-			'url' 	=> $a->get_baseurl(true).'/profiles',
-		),	
-		array(
-			'label'	=> t('Connector settings'),
-			'url' 	=> $a->get_baseurl(true).'/settings/connectors',
-			'sel'	=> (($a->argc > 1) && ($a->argv[1] === 'connectors')?'active':''),
-		),
-		array(
-			'label'	=> t('Plugin settings'),
-			'url' 	=> $a->get_baseurl(true).'/settings/addon',
-			'sel'	=> (($a->argc > 1) && ($a->argv[1] === 'addon')?'active':''),
-		),
-		array(
-			'label' => t('Connections'),
-			'url' => $a->get_baseurl(true) . '/settings/oauth',
-			'sel' => (($a->argc > 1) && ($a->argv[1] === 'oauth')?'active':''),
-		),
-		array(
-			'label' => t('Export personal data'),
-			'url' => $a->get_baseurl(true) . '/uexport',
-			'sel' => ''
-		)
-	);
-	$tabtpl = file_get_contents(dirname(__file__).'/rs_common_tabs.tpl') ;
-	$a->page['aside'] = replace_macros($tabtpl, array(
-		'$tabs' => $tabs,
-	));
-	
-	
-	// CUSTOM CSS
-	$cssFile = $a->get_baseurl($ssl_state)."/view/theme/diabook-blue/style-settings.css";
-	
-}
-
-
-// custom css
-if (!is_null($cssFile)) $a->page['htmlhead'] .= sprintf('<link rel="stylesheet" type="text/css" href="%s" />', $cssFile);
-
-//load jquery.cookie.js
-$cookieJS = $a->get_baseurl($ssl_state)."/view/theme/diabook-blue/js/jquery.cookie.js";
-$a->page['htmlhead'] .= sprintf('<script language="JavaScript" src="%s" ></script>', $cookieJS);
-
-
-//js scripts
-
-$a->page['htmlhead'] .= <<< EOT
-
-<script>
- $(function() {
-	$('a.lightbox').fancybox(); // Select all links with lightbox class
-	
- });
-
-</script>
-
-<script>
-
-$("right_aside").ready(function(){
-	
-	if($.cookie('close_pages') == '1') 
-		{
-		document.getElementById( "close_pages" ).style.display = "none";
-			};
-	
-	if($.cookie('close_helpers') == '1') 
-		{
-		document.getElementById( "close_helpers" ).style.display = "none";
-			};
-			
-	if($.cookie('close_services') == '1') 
-		{
-		document.getElementById( "close_services" ).style.display = "none";
-			};
-			
-	if($.cookie('close_friends') == '1') 
-		{
-		document.getElementById( "close_friends" ).style.display = "none";
-			};
-	
-	if($.cookie('close_postit') == '1') 
-		{
-		document.getElementById( "close_postit" ).style.display = "none";
-			};
-			
-	if($.cookie('close_lastusers') == '1') 
-		{
-		document.getElementById( "close_lastusers" ).style.display = "none";
-			};
-			
-	if($.cookie('close_lastphotos') == '1') 
-		{
-		document.getElementById( "close_lastphotos" ).style.display = "none";
-			};
-			
-	if($.cookie('close_lastlikes') == '1') 
-		{
-		document.getElementById( "close_lastlikes" ).style.display = "none";
-			};}
-
-);
-
-function close_pages(){
- document.getElementById( "close_pages" ).style.display = "none";
- $.cookie('close_pages','1', { expires: 365, path: '/' });
- };
- 
-function close_helpers(){
- document.getElementById( "close_helpers" ).style.display = "none";
-  $.cookie('close_helpers','1', { expires: 365, path: '/' });
- };
-
-function close_services(){
- document.getElementById( "close_services" ).style.display = "none";
- $.cookie('close_services','1', { expires: 365, path: '/' });
- };
- 
-function close_friends(){
- document.getElementById( "close_friends" ).style.display = "none";
- $.cookie('close_friends','1', { expires: 365, path: '/' });
- };
-
-function close_postit(){
- document.getElementById( "close_postit" ).style.display = "none";
- $.cookie('close_postit','1', { expires: 365, path: '/' });
- };
- 
-function close_lastusers(){
- document.getElementById( "close_lastusers" ).style.display = "none";
- $.cookie('close_lastusers','1', { expires: 365, path: '/' });
- };
-
-function close_lastphotos(){
- document.getElementById( "close_lastphotos" ).style.display = "none";
- $.cookie('close_lastphotos','1', { expires: 365, path: '/' });
- };
- 
-function close_lastlikes(){
- document.getElementById( "close_lastlikes" ).style.display = "none";
- $.cookie('close_lastlikes','1', { expires: 365, path: '/' });
- };
-
-function restore_boxes(){
-	$.cookie('close_pages','2', { expires: 365, path: '/' });
-	$.cookie('close_helpers','2', { expires: 365, path: '/' });
-	$.cookie('close_services','2', { expires: 365, path: '/' });
-	$.cookie('close_friends','2', { expires: 365, path: '/' });
-	$.cookie('close_postit','2', { expires: 365, path: '/' });
-	$.cookie('close_lastusers','2', { expires: 365, path: '/' });
-	$.cookie('close_lastphotos','2', { expires: 365, path: '/' });
-	$.cookie('close_lastlikes','2', { expires: 365, path: '/' });
-	alert('Right-hand column was restored. Please refresh your browser');
-  }; 
- 
-</script>
-
-EOT;
-
diff --git a/view/theme/diabook-blue/wall_item.tpl b/view/theme/diabook-blue/wall_item.tpl
deleted file mode 100644
index 123834064..000000000
--- a/view/theme/diabook-blue/wall_item.tpl
+++ /dev/null
@@ -1,100 +0,0 @@
-{{ if $item.indent }}{{ else }}
-<div class="wall-item-decor">
-	<img id="like-rotator-$item.id" class="like-rotator" src="images/rotator.gif" alt="$item.wait" title="$item.wait" style="display: none;" />
-</div>
-{{ endif }}
-<div class="wall-item-container $item.indent">
-	<div class="wall-item-item">
-		<div class="wall-item-info">
-			<div class="contact-photo-wrapper"
-				onmouseover="if (typeof t$item.id != 'undefined') clearTimeout(t$item.id); openMenu('wall-item-photo-menu-button-$item.id')" 
-				onmouseout="t$item.id=setTimeout('closeMenu(\'wall-item-photo-menu-button-$item.id\'); closeMenu(\'wall-item-photo-menu-$item.id\');',200)">
-				<a href="$item.profile_url" target="redir" title="$item.linktitle" class="contact-photo-link" id="wall-item-photo-link-$item.id">
-					<img src="$item.thumb" class="contact-photo$item.sparkle" id="wall-item-photo-$item.id" alt="$item.name" />
-				</a>
-				<a href="#" rel="#wall-item-photo-menu-$item.id" class="contact-photo-menu-button icon s16 menu" id="wall-item-photo-menu-button-$item.id">menu</a>
-				<ul class="contact-menu menu-popup" id="wall-item-photo-menu-$item.id">
-				$item.item_photo_menu
-				</ul>
-				
-			</div>
-		</div>
-			<div class="wall-item-actions-author">
-				<a href="$item.profile_url" target="redir" title="$item.linktitle" class="wall-item-name-link"><span class="wall-item-name$item.sparkle">$item.name</span></a> 
-			<span class="wall-item-ago">-
-			{{ if $item.plink }}<a class="link" title="$item.plink.title" href="$item.plink.href" style="color: #999">$item.ago</a>{{ else }} $item.ago {{ endif }}
-			{{ if $item.lock }} - <span class="fakelink" style="color: #999" onclick="lockview(event,$item.id);">$item.lock</span> {{ endif }}
-			</span>
-			</div>
-		<div class="wall-item-content">
-			{{ if $item.title }}<h2><a href="$item.plink.href">$item.title</a></h2>{{ endif }}
-			$item.body
-		</div>
-	</div>
-	<div class="wall-item-bottom">
-		<div class="wall-item-links">
-		</div>
-		<div class="wall-item-tags">
-			{{ for $item.tags as $tag }}
-				<span class='tag'>$tag</span>
-			{{ endfor }}
-		</div>
-	</div>
-	<div class="wall-item-bottom">
-		<div class="">
-
-		</div>
-		<div class="wall-item-actions">
-
-			<div class="wall-item-actions-social">
-			
-			
-			{{ if $item.vote }}
-				<a href="#" id="like-$item.id" class="icon like" title="$item.vote.like.0" onclick="dolike($item.id,'like'); return false">$item.vote.like.1</a>
-				<a href="#" id="dislike-$item.id" class="icon dislike" title="$item.vote.dislike.0" onclick="dolike($item.id,'dislike'); return false"></a>
-			{{ endif }}
-						
-			{{ if $item.vote.share }}
-				<a href="#" id="share-$item.id" class="icon recycle" title="$item.vote.share.0" onclick="jotShare($item.id); return false"></a>
-			{{ endif }}	
-
-
-			{{ if $item.star }}
-				<a href="#" id="starred-$item.id" onclick="dostar($item.id); return false;" class="star-item icon $item.isstarred" title="$item.star.toggle">
-				<img src="images/star_dummy.png" class="icon star" alt="$item.star.do" /> </a>
-				<a href="#" id="tagger-$item.id" onclick="itemTag($item.id); return false;" class="tag-item icon tagged" title="$item.star.tagger"></a>					  
-			{{ endif }}	
-			
-			{{ if $item.filer }}
-			<a href="#" id="filer-$item.id" onclick="itemFiler($item.id); return false;" class="filer-item icon file-as" title="$item.star.filer"></a>
-			{{ endif }}				
-			
-			{{ if $item.plink }}<a class="icon link" title="$item.plink.title" href="$item.plink.href">$item.plink.title</a>{{ endif }}
-			
-					
-					
-			</div>
-			
-			<div class="wall-item-actions-tools">
-
-				{{ if $item.drop.dropping }}
-					<input type="checkbox" title="$item.drop.select" name="itemselected[]" class="item-select" value="$item.id" />
-					<a href="item/drop/$item.id" onclick="return confirmDelete();" class="icon drop" title="$item.drop.delete">$item.drop.delete</a>
-				{{ endif }}
-				{{ if $item.edpost }}
-					<a class="icon pencil" href="$item.edpost.0" title="$item.edpost.1"></a>
-				{{ endif }}
-			</div>
-			<div class="wall-item-location">$item.location&nbsp;</div>
-		</div>
-	</div>
-	<div class="wall-item-bottom">
-		<div class="wall-item-links"></div>
-		<div class="wall-item-like" id="wall-item-like-$item.id">$item.like</div>
-		<div class="wall-item-dislike" id="wall-item-dislike-$item.id">$item.dislike</div>	
-	</div>
-</div>
-
-<div class="wall-item-comment-wrapper" >
-	$item.comment
-</div>
diff --git a/view/theme/diabook-blue/wallwall_item.tpl b/view/theme/diabook-blue/wallwall_item.tpl
deleted file mode 100644
index c5b6b36b5..000000000
--- a/view/theme/diabook-blue/wallwall_item.tpl
+++ /dev/null
@@ -1,102 +0,0 @@
-{{ if $item.indent }}{{ else }}
-<div class="wall-item-decor">
-	<img id="like-rotator-$item.id" class="like-rotator" src="images/rotator.gif" alt="$item.wait" title="$item.wait" style="display: none;" />
-</div>
-{{ endif }}
-<div class="wall-item-container $item.indent">
-	<div class="wall-item-item">
-		<div class="wall-item-info">
-			<div class="contact-photo-wrapper mframe wwto" id="wall-item-ownerphoto-wrapper-$item.id" >
-				<a href="$item.owner_url" target="redir" title="$item.olinktitle" class="contact-photo-link" id="wall-item-ownerphoto-link-$item.id">
-					<img src="$item.owner_photo" class="contact-photo $item.osparkle" id="wall-item-ownerphoto-$item.id" alt="$item.owner_name" />
-				</a>
-			</div>
-			<div class="contact-photo-wrapper mframe wwfrom"
-				onmouseover="if (typeof t$item.id != 'undefined') clearTimeout(t$item.id); openMenu('wall-item-photo-menu-button-$item.id')" 
-				onmouseout="t$item.id=setTimeout('closeMenu(\'wall-item-photo-menu-button-$item.id\'); closeMenu(\'wall-item-photo-menu-$item.id\');',200)">
-				<a href="$item.profile_url" target="redir" title="$item.linktitle" class="contact-photo-link" id="wall-item-photo-link-$item.id">
-					<img src="$item.thumb" class="contact-photo$item.sparkle" id="wall-item-photo-$item.id" alt="$item.name" />
-				</a>
-				<a href="#" rel="#wall-item-photo-menu-$item.id" class="contact-photo-menu-button icon s16 menu" id="wall-item-photo-menu-button-$item.id">menu</a>
-				<ul class="contact-menu menu-popup" id="wall-item-photo-menu-$item.id">
-				$item.item_photo_menu
-				</ul>
-				
-			</div>
-		</div>
-			<div class="wall-item-actions-author">
-				<a href="$item.profile_url" target="redir" title="$item.linktitle" class="wall-item-name-link"><span class="wall-item-name$item.sparkle">$item.name</span></a>
-				$item.to <a href="$item.owner_url" target="redir" title="$item.olinktitle" class="wall-item-name-link"><span class="wall-item-name$item.osparkle" id="wall-item-ownername-$item.id">$item.owner_name</span></a>
-				 $item.vwall <span class="wall-item-ago">- &nbsp;
-			{{ if $item.plink }}<a class="link" title="$item.plink.title" href="$item.plink.href" style="color: #999">$item.ago</a>{{ else }} $item.ago {{ endif }}
-			{{ if $item.lock }} - <span class="fakelink" style="color: #999" onclick="lockview(event,$item.id);">$item.lock</span> {{ endif }}
-			</span>
-			</div>
-		<div class="wall-item-content">
-			{{ if $item.title }}<h2><a href="$item.plink.href">$item.title</a></h2>{{ endif }}
-			$item.body
-		</div>
-	</div>
-	<div class="wall-item-bottom">
-		<div class="wall-item-links">
-		</div>
-		<div class="wall-item-tags">
-			{{ for $item.tags as $tag }}
-				<span class='tag'>$tag</span>
-			{{ endfor }}
-		</div>
-	</div>
-	<div class="wall-item-bottom">
-		<div class="">
-
-		</div>
-		<div class="wall-item-actions">
-
-			<div class="wall-item-actions-social">
-			
-			
-			{{ if $item.vote }}
-				<a href="#" id="like-$item.id" class="icon like" title="$item.vote.like.0" onclick="dolike($item.id,'like'); return false">$item.vote.like.1</a>
-				<a href="#" id="dislike-$item.id" class="icon dislike" title="$item.vote.dislike.0" onclick="dolike($item.id,'dislike'); return false"></a>
-			{{ endif }}
-						
-			{{ if $item.vote.share }}
-				<a href="#" id="share-$item.id" class="icon recycle" title="$item.vote.share.0" onclick="jotShare($item.id); return false"></a>
-			{{ endif }}	
-
-
-			{{ if $item.star }}
-				<a href="#" id="starred-$item.id" onclick="dostar($item.id); return false;" class="star-item icon $item.isstarred" title="$item.star.toggle">
-				<img src="images/star_dummy.png" class="icon star" alt="$item.star.do" /> </a>
-				<a href="#" id="tagger-$item.id" onclick="itemTag($item.id); return false;" class="tag-item icon tagged" title="$item.star.tagger"></a>
-			{{ endif }}	
-			
-			{{ if $item.plink }}<a class="icon link" title="$item.plink.title" href="$item.plink.href">$item.plink.title</a>{{ endif }}
-			
-					
-					
-			</div>
-			
-			<div class="wall-item-actions-tools">
-
-				{{ if $item.drop.dropping }}
-					<input type="checkbox" title="$item.drop.select" name="itemselected[]" class="item-select" value="$item.id" />
-					<a href="item/drop/$item.id" onclick="return confirmDelete();" class="icon drop" title="$item.drop.delete">$item.drop.delete</a>
-				{{ endif }}
-				{{ if $item.edpost }}
-					<a class="icon pencil" href="$item.edpost.0" title="$item.edpost.1"></a>
-				{{ endif }}
-			</div>
-			<div class="wall-item-location">$item.location&nbsp;</div>
-		</div>
-	</div>
-	<div class="wall-item-bottom">
-		<div class="wall-item-links"></div>
-		<div class="wall-item-like" id="wall-item-like-$item.id">$item.like</div>
-		<div class="wall-item-dislike" id="wall-item-dislike-$item.id">$item.dislike</div>	
-	</div>
-</div>
-
-<div class="wall-item-comment-wrapper" >
-	$item.comment
-</div>
\ No newline at end of file
diff --git a/view/theme/diabook-red/communityhome.tpl b/view/theme/diabook-red/communityhome.tpl
deleted file mode 100755
index 91935a9d3..000000000
--- a/view/theme/diabook-red/communityhome.tpl
+++ /dev/null
@@ -1,93 +0,0 @@
-<div id="close_pages">
-{{ if $page }}
-<div>$page</div>
-{{ endif }}
-</div>
-
-<div id="close_helpers">
-{{ if $lastusers_title }}
-<h3 style="margin-top:0px;">Help or @NewHere ?<a id="close_helpers_icon"  onClick="close_helpers()" class="icon close_box" title="close"></a></h3>
-<a href="http://kakste.com/profile/newhere" title="#NewHere" style="margin-left: 10px; " target="blank">NewHere</a><br>
-<a href="https://helpers.pyxis.uberspace.de/profile/helpers" style="margin-left: 10px; " title="Friendica Support" target="blank">Friendica Support</a><br>
-<a href="https://letstalk.pyxis.uberspace.de/profile/letstalk" style="margin-left: 10px; " title="Let's talk" target="blank">Let's talk</a><br>
-<a href="http://newzot.hydra.uberspace.de/profile/newzot" title="Local Friendica" style="margin-left: 10px; " target="blank">Local Friendica</a>
-{{ endif }}
-</div>
-
-<div id="close_services">
-{{ if $lastusers_title }}
-<h3>Connectable Services<a id="close_services_icon" onClick="close_services()" class="icon close_box" title="close"></a></h3>
-<div id="right_service_icons" style="margin-left: 16px; margin-top: 5px;">
-<a href="$url/facebook"><img alt="Facebook" src="view/theme/diabook-red/icons/facebook.png" title="Facebook"></a>
-<a href="$url/settings/connectors"><img alt="StatusNet" src="view/theme/diabook-red/icons/StatusNet.png?" title="StatusNet"></a>
-<a href="$url/settings/connectors"><img alt="LiveJournal" src="view/theme/diabook-red/icons/livejournal.png?" title="LiveJournal"></a>
-<a href="$url/settings/connectors"><img alt="Posterous" src="view/theme/diabook-red/icons/posterous.png?" title="Posterous"></a>
-<a href="$url/settings/connectors"><img alt="Tumblr" src="view/theme/diabook-red/icons/tumblr.png?" title="Tumblr"></a>
-<a href="$url/settings/connectors"><img alt="Twitter" src="view/theme/diabook-red/icons/twitter.png?" title="Twitter"></a>
-<a href="$url/settings/connectors"><img alt="WordPress" src="view/theme/diabook-red/icons/wordpress.png?" title="WordPress"></a>
-<a href="$url/settings/connectors"><img alt="E-Mail" src="view/theme/diabook-red/icons/email.png?" title="E-Mail"></a>
-</div>
-{{ endif }}
-</div>
-
-<div id="close_friends" style="margin-bottom:53px;">
-{{ if $nv }}
-<h3>Find Friends<a id="close_friends_icon" onClick="close_friends()"  class="icon close_box" title="close"></a></h3>
-<a class="$nv.directory.2" href="$nv.directory.0" style="margin-left: 10px; " title="$nv.directory.3" >$nv.directory.1</a><br>
-<a class="$nv.global_directory.2" href="$nv.global_directory.0" style="margin-left: 10px; " title="$nv.global_directory.3" >$nv.global_directory.1</a><br>
-<a class="$nv.match.2" href="$nv.match.0" style="margin-left: 10px; " title="$nv.match.3" >$nv.match.1</a><br>
-<a class="$nv.suggest.2" href="$nv.suggest.0" style="margin-left: 10px; " title="$nv.suggest.3" >$nv.suggest.1</a><br>
-<a class="$nv.invite.2" href="$nv.invite.0" style="margin-left: 10px; " title="$nv.invite.3" >$nv.invite.1</a>			
-$nv.search
-{{ endif }}
-</div>
-
-<div id="close_postit">
-{{ if $lastusers_title }}
-<h3>PostIt to Friendica<a id="close_postit_icon" onClick="close_postit()" class="icon close_box" title="close"></a></h3>
-<div style="padding-left: 8px;"><span ><a href="$fostitJS" title="PostIt">Post to Friendica</a> from anywhere by bookmarking the Link.</span></div>
-{{ endif }}
-</div>
-
-<div id="close_lastusers">
-{{ if $lastusers_title }}
-<h3>$lastusers_title<a id="close_lastusers_icon" onClick="close_lastusers()" class="icon close_box" title="close"></a></h3>
-<div id='lastusers-wrapper' class='items-wrapper'>
-{{ for $lastusers_items as $i }}
-	$i
-{{ endfor }}
-</div>
-{{ endif }}
-</div>
-
-
-{{ if $activeusers_title }}
-<h3>$activeusers_title</h3>
-<div class='items-wrapper'>
-{{ for $activeusers_items as $i }}
-	$i
-{{ endfor }}
-</div>
-{{ endif }}
-
-<div id="close_lastphotos">
-{{ if $photos_title }}
-<h3>$photos_title<a id="close_photos_icon" onClick="close_lastphotos()"  class="icon close_box" title="close"></a></h3>
-<div id='ra-photos-wrapper' class='items-wrapper'>
-{{ for $photos_items as $i }}
-	$i
-{{ endfor }}
-</div>
-{{ endif }}
-</div>
-
-<div id="close_lastlikes">
-{{ if $like_title }}
-<h3>$like_title<a id="close_lastlikes_icon" onClick="close_lastlikes()" class="icon close_box" title="close"></a></h3>
-<ul id='likes'>
-{{ for $like_items as $i }}
-	<li id='ra-photos-wrapper'>$i</li>
-{{ endfor }}
-</ul>
-{{ endif }}
-</div>
diff --git a/view/theme/diabook-red/contact_template.tpl b/view/theme/diabook-red/contact_template.tpl
deleted file mode 100755
index 48930b48a..000000000
--- a/view/theme/diabook-red/contact_template.tpl
+++ /dev/null
@@ -1,25 +0,0 @@
-
-<div class="contact-entry-wrapper" id="contact-entry-wrapper-$contact.id" >
-	<div class="contact-entry-photo-wrapper" >
-		<div class="contact-entry-photo mframe" id="contact-entry-photo-$contact.id"
-		onmouseover="if (typeof t$contact.id != 'undefined') clearTimeout(t$contact.id); openMenu('contact-photo-menu-button-$contact.id')" 
-		onmouseout="t$contact.id=setTimeout('closeMenu(\'contact-photo-menu-button-$contact.id\'); closeMenu(\'contact-photo-menu-$contact.id\');',200)" >
-
-			<a href="$contact.url" title="$contact.img_hover" /><img src="$contact.thumb" $contact.sparkle alt="$contact.name" /></a>
-
-			{{ if $contact.photo_menu }}
-			<span onclick="openClose('contact-photo-menu-$contact.id');" class="fakelink contact-photo-menu-button" id="contact-photo-menu-button-$contact.id">menu</span>
-                <div class="contact-photo-menu" id="contact-photo-menu-$contact.id">
-                    <ul>
-                        $contact.photo_menu
-                    </ul>
-                </div>
-			{{ endif }}
-		</div>
-			
-	</div>
-	<div class="contact-entry-photo-end" ></div>
-		<div class="contact-entry-name" id="contact-entry-name-$contact.id" >$contact.name</div>
-
-	<div class="contact-entry-end" ></div>
-</div>
diff --git a/view/theme/diabook-red/directory_item.tpl b/view/theme/diabook-red/directory_item.tpl
deleted file mode 100755
index db1936e4b..000000000
--- a/view/theme/diabook-red/directory_item.tpl
+++ /dev/null
@@ -1,10 +0,0 @@
-
-<div class="directory-item" id="directory-item-$id" >
-	<div class="directory-photo-wrapper" id="directory-photo-wrapper-$id" > 
-		<div class="directory-photo" id="directory-photo-$id" >
-			<a href="$profile-link" class="directory-profile-link" id="directory-profile-link-$id" >
-				<img class="directory-photo-img" src="$photo" alt="$alt-text" title="$alt-text" />
-			</a>
-		</div>
-	</div>
-</div>
diff --git a/view/theme/diabook-red/fpostit/README b/view/theme/diabook-red/fpostit/README
deleted file mode 100644
index 39b7c5761..000000000
--- a/view/theme/diabook-red/fpostit/README
+++ /dev/null
@@ -1,8 +0,0 @@
-fpostit
-
-original author: Devlon Duthied
-
-see his blog posting:
-http://blog.duthied.com/2011/09/13/node-agnostic-friendika-bookmarklet/
-
-original published at github https://github.com/duthied/Friendika-Bookmarklet
diff --git a/view/theme/diabook-red/fpostit/fpostit.js b/view/theme/diabook-red/fpostit/fpostit.js
deleted file mode 100755
index d183c7573..000000000
--- a/view/theme/diabook-red/fpostit/fpostit.js
+++ /dev/null
@@ -1,6 +0,0 @@
-javascript: (function() {
-    					the_url = 'localhost/view/theme/diabook/fpostit/fpostit.php?url=' + encodeURIComponent(window.location.href) + '&title=' + encodeURIComponent(document.title) + '&text=' + encodeURIComponent(''+(window.getSelection ? window.getSelection() : document.getSelection ? document.getSelection() : document.selection.createRange().text));
-    						a_funct = function() {
-        						if (!window.open(the_url, 'fpostit', 'location=yes,links=no,scrollbars=no,toolbar=no,width=600,height=300')) location.href = the_url};
-    							if (/Firefox/.test(navigator.userAgent)) {setTimeout(a_funct, 0)} 
-    							else {a_funct()}})()"
\ No newline at end of file
diff --git a/view/theme/diabook-red/fpostit/fpostit.php b/view/theme/diabook-red/fpostit/fpostit.php
deleted file mode 100644
index 4505c9946..000000000
--- a/view/theme/diabook-red/fpostit/fpostit.php
+++ /dev/null
@@ -1,135 +0,0 @@
-<?php
-if (!isset($_POST["friendika_acct_name"])) $_POST["friendika_acct_name"] = '';
-if (!isset($_COOKIE['username'])) $_COOKIE['username'] = '';
-if (!isset($_COOKIE['password'])) $_COOKIE['password'] = '';
-if (!isset($hostname)) $hostname = '';
-if (!isset($username)) $username = '';
-
-
-if (($_POST["friendika_acct_name"] != '') && ($_POST["friendika_password"] != '')) {
-	setcookie("username", $_POST["friendika_acct_name"], time()+60*60*24*300);
-	setcookie("password", $_POST["friendika_password"], time()+60*60*24*300);
-}
-
-?>
-<html>
-<head>
-	<style>
-		body {
-			font-family: arial, Helvetica,sans-serif;
-			margin: 0px;
-		}
-		.wrap1 {
-			padding: 2px 5px;
-			background-color: #000;
-			margin-bottom: 10px;
-		}
-		.wrap2 {
-			margin-left: 10px;
-			font-size: 12px;
-		}
-		.logo {
-			margin-left: 3px;
-			margin-right: 5px;
-			float: left;
-		}
-		h2 {
-			color: #ffffff;
-		}
-		.error {
-			background-color: #FFFF66;
-			font-size: 12px;
-			margin-left: 10px;
-		}
-	</style>
-</head>
-
-<body>
-<?php
-
-if (isset($_GET['title'])) {
-	$title = $_GET['title'];
-}
-if (isset($_GET['text'])) {
-	$text = $_GET['text'];
-}
-if (isset($_GET['url'])) {
-	$url = $_GET['url'];
-}
-
-if ((isset($title)) && (isset($text)) && (isset($url))) {
-	$content = "$title\nsource:$url\n\n$text";
-} else {
-	$content = $_POST['content'];
-}
-
-if (isset($_POST['submit'])) {
-	
-	if (($_POST["friendika_acct_name"] != '') && ($_POST["friendika_password"] != '')) {
-		$acctname = $_POST["friendika_acct_name"];
-		$tmp_account_array = explode("@", $acctname);
-		if (isset($tmp_account_array[1])) {
-			$username = $tmp_account_array[0];
-			$hostname = $tmp_account_array[1];
-		}
-		$password = $_POST["friendika_password"];
-		$content = $_POST["content"];
-
-		$url = "http://" . $hostname . '/api/statuses/update';
-		$data = array('status' => $content);
-		
-		// echo "posting to: $url<br/>";
-
-		$c = curl_init();
-		curl_setopt($c, CURLOPT_URL, $url); 
-		curl_setopt($c, CURLOPT_USERPWD, "$username:$password");
-		curl_setopt($c, CURLOPT_POSTFIELDS, $data); 
-		curl_setopt($c, CURLOPT_RETURNTRANSFER, true); 
-		curl_setopt($c, CURLOPT_FOLLOWLOCATION, true);
-		$c_result = curl_exec($c); 
-		if(curl_errno($c)){ 
-			$error = curl_error($c);
-			showForm($error, $content);
-		}
-		
-		curl_close($c);
-		if (!isset($error)) {
-			echo '<script language="javascript" type="text/javascript">window.close();</script>';
-		}
-		
-	} else {
-		$error = "Missing account name and/or password...try again please";
-		showForm($error, $content);
-	}
-	
-} else {
-	showForm(null, $content);
-}
-
-function showForm($error, $content) {
-	$username_cookie = $_COOKIE['username'];
-	$password_cookie = $_COOKIE['password'];
-	
-	echo <<<EOF
-	<div class='wrap1'>
-		<h2><img class='logo' src='friendika-32.png' align='middle';/>
-		Friendica Bookmarklet</h2>
-	</div>
-
-	<div class="wrap2">
-		<form method="post" action="{$_SERVER['PHP_SELF']}">
-			Enter the email address of the Friendica Account that you want to cross-post to:(example: user@friendica.org)<br /><br />
-			Account ID: <input type="text" name="friendika_acct_name" value="{$username_cookie}" size="50"/><br />
-			Password: <input type="password" name="friendika_password" value="{$password_cookie}" size="50"/><br />
-			<textarea name="content" id="content" rows="6" cols="70">{$content}</textarea><br />
-			<input type="submit" value="PostIt!" name="submit" />&nbsp;&nbsp;<span class='error'>$error</span>
-		</form>
-		<p></p>
-	</div>
-EOF;
-	
-}
-?>
-
-</body>
-</html>
\ No newline at end of file
diff --git a/view/theme/diabook-red/fpostit/friendika-32.png b/view/theme/diabook-red/fpostit/friendika-32.png
deleted file mode 100644
index 61764bf20..000000000
--- a/view/theme/diabook-red/fpostit/friendika-32.png
+++ /dev/null
diff --git a/view/theme/diabook-red/group_side.tpl b/view/theme/diabook-red/group_side.tpl
deleted file mode 100755
index af183d04d..000000000
--- a/view/theme/diabook-red/group_side.tpl
+++ /dev/null
@@ -1,29 +0,0 @@
-<div id="group-sidebar" class="widget">
-	<div class="title tool">
-		<h3 class="label">$title</h3>
-		<a href="group/new" title="$createtext" class="action"><span class="icon text s16 add"></span></a>
-	</div>
-
-	<div id="sidebar-group-list">
-		<ul>
-			{{ for $groups as $group }}
-			<li class="tool  {{ if $group.selected }}selected{{ endif }}">
-				<a href="$group.href" class="label">
-					$group.text
-				</a>
-				{{ if $group.edit }}
-					<a href="$group.edit.href" class="action"><span class="icon text s10 edit"></span></a>
-				{{ endif }}
-				{{ if $group.cid }}
-					<input type="checkbox" 
-						class="{{ if $group.selected }}ticked{{ else }}unticked {{ endif }} action" 
-						onclick="contactgroupChangeMember('$group.id','$group.cid');return true;"
-						{{ if $group.ismember }}checked="checked"{{ endif }}
-					/>
-				{{ endif }}
-			</li>
-			{{ endfor }}
-		</ul>
-	</div>
-</div>	
-
diff --git a/view/theme/diabook-red/icons/com_side.png b/view/theme/diabook-red/icons/com_side.png
deleted file mode 100644
index bc5969ef1..000000000
--- a/view/theme/diabook-red/icons/com_side.png
+++ /dev/null
diff --git a/view/theme/diabook-red/icons/events.png b/view/theme/diabook-red/icons/events.png
deleted file mode 100644
index 4a0b3f3f1..000000000
--- a/view/theme/diabook-red/icons/events.png
+++ /dev/null
diff --git a/view/theme/diabook-red/icons/home.png b/view/theme/diabook-red/icons/home.png
deleted file mode 100644
index be47a48fc..000000000
--- a/view/theme/diabook-red/icons/home.png
+++ /dev/null
diff --git a/view/theme/diabook-red/icons/mess_side.png b/view/theme/diabook-red/icons/mess_side.png
deleted file mode 100644
index 49ef896bc..000000000
--- a/view/theme/diabook-red/icons/mess_side.png
+++ /dev/null
diff --git a/view/theme/diabook-red/icons/notes.png b/view/theme/diabook-red/icons/notes.png
deleted file mode 100644
index 7d4afca90..000000000
--- a/view/theme/diabook-red/icons/notes.png
+++ /dev/null
diff --git a/view/theme/diabook-red/icons/pscontacts.png b/view/theme/diabook-red/icons/pscontacts.png
deleted file mode 100644
index acf857f32..000000000
--- a/view/theme/diabook-red/icons/pscontacts.png
+++ /dev/null
diff --git a/view/theme/diabook-red/icons/pubgroups.png b/view/theme/diabook-red/icons/pubgroups.png
deleted file mode 100644
index 6d9539610..000000000
--- a/view/theme/diabook-red/icons/pubgroups.png
+++ /dev/null
diff --git a/view/theme/diabook-red/icons/selected.png b/view/theme/diabook-red/icons/selected.png
deleted file mode 100755
index 2a30ae252..000000000
--- a/view/theme/diabook-red/icons/selected.png
+++ /dev/null
diff --git a/view/theme/diabook-red/jot.tpl b/view/theme/diabook-red/jot.tpl
deleted file mode 100755
index 9aef99787..000000000
--- a/view/theme/diabook-red/jot.tpl
+++ /dev/null
@@ -1,84 +0,0 @@
-
-<div id="profile-jot-wrapper" >
-	<div id="profile-jot-banner-wrapper">
-		<div id="profile-jot-desc" >&nbsp;</div>
-		<div id="character-counter" class="grey"></div>
-	</div>
-	<div id="profile-jot-banner-end"></div>
-
-	<form id="profile-jot-form" action="$action" method="post" >
-		<input type="hidden" name="type" value="$ptyp" />
-		<input type="hidden" name="profile_uid" value="$profile_uid" />
-		<input type="hidden" name="return" value="$return_path" />
-		<input type="hidden" name="location" id="jot-location" value="$defloc" />
-		<input type="hidden" name="coord" id="jot-coord" value="" />
-		<input type="hidden" name="post_id" value="$post_id" />
-		<input type="hidden" name="preview" id="jot-preview" value="0" />
-		<input name="title" id="jot-title" type="text" placeholder="$placeholdertitle" value="$title" class="jothidden" style="display:none">
-		<img id="profile-jot-text-loading" src="images/rotator.gif" alt="$wait" title="$wait" style="display: none;" />
-		<textarea rows="5" cols="64" class="profile-jot-text" id="profile-jot-text" name="body" >{{ if $content }}$content{{ else }}$share{{ endif }}</textarea>
-
-
-<div id="profile-jot-submit-wrapper" class="jothidden">
-	
-	<div id="profile-upload-wrapper" style="display: $visitor;" >
-		<div id="wall-image-upload-div" ><a href="#" onclick="return false;" id="wall-image-upload" class="camera" title="$upload"></a></div>
-	</div> 
-	<div id="profile-attach-wrapper" style="display: $visitor;" >
-		<div id="wall-file-upload-div" ><a href="#" onclick="return false;" id="wall-file-upload" class="attach" title="$attach"></a></div>
-	</div> 
-
-	<div id="profile-link-wrapper" style="display: $visitor;" ondragenter="linkdropper(event);" ondragover="linkdropper(event);" ondrop="linkdrop(event);" >
-		<a id="profile-link" class="weblink" title="$weblink" ondragenter="return linkdropper(event);" ondragover="return linkdropper(event);" ondrop="linkdrop(event);" onclick="jotGetLink(); return false;"></a>
-	</div> 
-	<div id="profile-video-wrapper" style="display: $visitor;" >
-		<a id="profile-video" class="video2" title="$video" onclick="jotVideoURL();return false;"></a>
-	</div> 
-	<div id="profile-audio-wrapper" style="display: $visitor;" >
-		<a id="profile-audio" class="audio2" title="$audio" onclick="jotAudioURL();return false;"></a>
-	</div> 
-	<div id="profile-location-wrapper" style="display: $visitor;" >
-		<a id="profile-location" class="globe" title="$setloc" onclick="jotGetLocation();return false;"></a>
-	</div> 
-	<div id="profile-nolocation-wrapper" style="/*display: none;*/" >
-		<a id="profile-nolocation" class="noglobe" title="$noloc" onclick="jotClearLocation();return false;"></a>
-	</div> 
-
-	<input type="submit" id="profile-jot-submit" class="button creation2" name="submit" value="$share" />
-  
-   <span onclick="preview_post();" id="jot-preview-link" class="tab button">$preview</span>
-   
-	<div id="profile-jot-perms" class="profile-jot-perms" style="display: $pvisit;" >
-		<a href="#profile-jot-acl-wrapper" id="jot-perms-icon" class="icon $lockstate"  title="$permset" ></a>$bang
-	</div>
-
-
-	<div id="profile-jot-plugin-wrapper">
-  	$jotplugins
-	</div>
-	
-	<div id="profile-rotator-wrapper" style="display: $visitor;" >
-		<img id="profile-rotator" src="images/rotator.gif" alt="$wait" title="$wait" style="display: none;" />
-	</div> 
-	
-	</div>
-   <div id="profile-jot-perms-end"></div>
-	
-	<div id="jot-preview-content" style="display:none;"></div>
-
-	<div style="display: none;">
-		<div id="profile-jot-acl-wrapper" style="width:auto;height:auto;overflow:auto;">
-			$acl
-			<hr style="clear:both"/>
-			<div id="profile-jot-email-label">$emailcc</div><input type="text" name="emailcc" id="profile-jot-email" title="$emtitle" />
-			<div id="profile-jot-email-end"></div>
-			$jotnets
-		</div>
-	</div>
-
-
-
-
-</form>
-</div>
-		{{ if $content }}<script>initEditor();</script>{{ endif }}
diff --git a/view/theme/diabook-red/js/jquery.cookie.js b/view/theme/diabook-red/js/jquery.cookie.js
deleted file mode 100644
index 6d5974a2c..000000000
--- a/view/theme/diabook-red/js/jquery.cookie.js
+++ /dev/null
@@ -1,47 +0,0 @@
-/*!
- * jQuery Cookie Plugin
- * https://github.com/carhartl/jquery-cookie
- *
- * Copyright 2011, Klaus Hartl
- * Dual licensed under the MIT or GPL Version 2 licenses.
- * http://www.opensource.org/licenses/mit-license.php
- * http://www.opensource.org/licenses/GPL-2.0
- */
-(function($) {
-    $.cookie = function(key, value, options) {
-
-        // key and at least value given, set cookie...
-        if (arguments.length > 1 && (!/Object/.test(Object.prototype.toString.call(value)) || value === null || value === undefined)) {
-            options = $.extend({}, options);
-
-            if (value === null || value === undefined) {
-                options.expires = -1;
-            }
-
-            if (typeof options.expires === 'number') {
-                var days = options.expires, t = options.expires = new Date();
-                t.setDate(t.getDate() + days);
-            }
-
-            value = String(value);
-
-            return (document.cookie = [
-                encodeURIComponent(key), '=', options.raw ? value : encodeURIComponent(value),
-                options.expires ? '; expires=' + options.expires.toUTCString() : '', // use expires attribute, max-age is not supported by IE
-                options.path    ? '; path=' + options.path : '',
-                options.domain  ? '; domain=' + options.domain : '',
-                options.secure  ? '; secure' : ''
-            ].join(''));
-        }
-
-        // key and possibly options given, get cookie...
-        options = value || {};
-        var decode = options.raw ? function(s) { return s; } : decodeURIComponent;
-
-        var pairs = document.cookie.split('; ');
-        for (var i = 0, pair; pair = pairs[i] && pairs[i].split('='); i++) {
-            if (decode(pair[0]) === key) return decode(pair[1] || ''); // IE saves cookies with empty string as "c; ", e.g. without "=" as opposed to EOMB, thus pair[1] may be undefined
-        }
-        return null;
-    };
-})(jQuery);
diff --git a/view/theme/diabook-red/mail_conv.tpl b/view/theme/diabook-red/mail_conv.tpl
deleted file mode 100755
index 989f17878..000000000
--- a/view/theme/diabook-red/mail_conv.tpl
+++ /dev/null
@@ -1,60 +0,0 @@
-<div class="wall-item-container $item.indent">
-	<div class="wall-item-item">
-		<div class="wall-item-info">
-			<div class="contact-photo-wrapper"
-				<a href="$mail.profile_url" target="redir" title="$mail.from_name" class="contact-photo-link" id="wall-item-photo-link-$mail.id">
-					<img src="$mail.from_photo" class="contact-photo$mail.sparkle" id="wall-item-photo-$mail.id" alt="$mail.from_name" />
-				</a>
-			</div>
-		</div>
-		<div class="wall-item-content">
-			$mail.body
-		</div>
-	</div>
-	<div class="wall-item-bottom">
-		<div class="wall-item-links">
-		</div>
-		<div class="wall-item-tags">
-		</div>
-	</div>
-	<div class="wall-item-bottom">
-		<div class="">
-		</div>
-		<div class="wall-item-actions">
-			<div class="wall-item-actions-author">
-				<a href="$mail.from_url" target="redir" class="wall-item-name-link"><span class="wall-item-name$mail.sparkle">$mail.from_name</span></a> <span class="wall-item-ago">$mail.date</span>
-			</div>
-			
-			<div class="wall-item-actions-social">
-			</div>
-			
-			<div class="wall-item-actions-tools">
-				<a href="message/drop/$mail.id" onclick="return confirmDelete();" class="icon delete s16" title="$mail.delete">$mail.delete</a>
-			</div>
-			
-		</div>
-	</div>
-	<div class="wall-item-bottom">
-	</div>
-</div>
-
-
-{#
-
-
-<div class="mail-conv-outside-wrapper">
-	<div class="mail-conv-sender" >
-		<a href="$mail.from_url" class="mail-conv-sender-url" ><img class="mframe mail-conv-sender-photo$mail.sparkle" src="$mail.from_photo" heigth="80" width="80" alt="$mail.from_name" /></a>
-	</div>
-	<div class="mail-conv-detail" >
-		<div class="mail-conv-sender-name" >$mail.from_name</div>
-		<div class="mail-conv-date">$mail.date</div>
-		<div class="mail-conv-subject">$mail.subject</div>
-		<div class="mail-conv-body">$mail.body</div>
-	<div class="mail-conv-delete-wrapper" id="mail-conv-delete-wrapper-$mail.id" ><a href="message/drop/$mail.id" class="icon drophide delete-icon mail-list-delete-icon" onclick="return confirmDelete();" title="$mail.delete" id="mail-conv-delete-icon-$mail.id" class="mail-conv-delete-icon" onmouseover="imgbright(this);" onmouseout="imgdull(this);" ></a></div><div class="mail-conv-delete-end"></div>
-	<div class="mail-conv-outside-wrapper-end"></div>
-</div>
-</div>
-<hr class="mail-conv-break" />
-
-#}
diff --git a/view/theme/diabook-red/mail_display.tpl b/view/theme/diabook-red/mail_display.tpl
deleted file mode 100644
index 8b82e95c6..000000000
--- a/view/theme/diabook-red/mail_display.tpl
+++ /dev/null
@@ -1,12 +0,0 @@
-<div id="mail-display-subject">
-	<span class="{{if $thread_seen}}seen{{else}}unseen{{endif}}">$thread_subject</span>
-	<a href="message/dropconv/$thread_id" onclick="return confirmDelete();"  title="$delete" class="mail-delete icon s22 delete"></a>
-</div>
-
-{{ for $mails as $mail }}
-	<div id="tread-wrapper-$mail.id" class="tread-wrapper">
-		{{ inc mail_conv.tpl }}{{endinc}}
-	</div>
-{{ endfor }}
-
-{{ inc prv_message.tpl }}{{ endinc }}
diff --git a/view/theme/diabook-red/mail_list.tpl b/view/theme/diabook-red/mail_list.tpl
deleted file mode 100644
index 6bc6c84f6..000000000
--- a/view/theme/diabook-red/mail_list.tpl
+++ /dev/null
@@ -1,8 +0,0 @@
-<div class="mail-list-wrapper">
-	<span class="mail-subject {{if $seen}}seen{{else}}unseen{{endif}}"><a href="message/$id" class="mail-link">$subject</a></span>
-	<span class="mail-from">$from_name</span>
-	<span class="mail-date">$date</span>
-	<span class="mail-count">$count</span>
-	
-	<a href="message/dropconv/$id" onclick="return confirmDelete();"  title="$delete" class="mail-delete icon s22 delete"></a>
-</div>
diff --git a/view/theme/diabook-red/message_side.tpl b/view/theme/diabook-red/message_side.tpl
deleted file mode 100644
index 9f1587096..000000000
--- a/view/theme/diabook-red/message_side.tpl
+++ /dev/null
@@ -1,10 +0,0 @@
-<div id="message-sidebar" class="widget">
-	<div id="message-new" class="{{ if $new.sel }}selected{{ endif }}"><a href="$new.url">$new.label</a> </div>
-	
-	<ul class="message-ul">
-		{{ for $tabs as $t }}
-			<li class="tool {{ if $t.sel }}selected{{ endif }}"><a href="$t.url" class="message-link">$t.label</a></li>
-		{{ endfor }}
-	</ul>
-	
-</div>
diff --git a/view/theme/diabook-red/nav.tpl b/view/theme/diabook-red/nav.tpl
deleted file mode 100644
index fdf748cb2..000000000
--- a/view/theme/diabook-red/nav.tpl
+++ /dev/null
@@ -1,188 +0,0 @@
-<header>
-	<div id="site-location">$sitelocation</div>
-	<div id="banner">$banner</div>
-</header>
-<nav>
-			
-			
-	<ul>
-			
-			
-			{{ if $nav.network }}
-			<li id="nav-network-link" class="nav-menu-icon">
-				<a class="$nav.network.2" href="$nav.network.0" title="$nav.network.3" >
-				<span class="icon notifications">Benachrichtigungen</span>
-				<span id="net-update" class="nav-notify"></span></a>
-			</li>
-		    {{ endif }}
-	
-			{{ if $nav.contacts }}
-			<li class="nav-menu-icon" id="nav-contacts-linkmenu">
-				<a href="$nav.contacts.0" rel="#nav-contacts-menu" title="$nav.contacts.1">
-				<span class="icon contacts">$nav.contacts.1</span>
-				<span id="intro-update" class="nav-notify"></span></a>
-				<ul id="nav-contacts-menu" class="menu-popup">
-					<li id="nav-contacts-see-intro"><a href="$nav.notifications.0">$nav.introductions.1</a><span id="intro-update" class="nav-notify"></span></li>
-					<li id="nav-contacts-all"><a href="contacts">$nav.contacts.1</a></li> 
-				</ul>
-			</li>	
-			{{ endif }}
-			
-			{{ if $nav.messages }}
-			<li  id="nav-messages-linkmenu" class="nav-menu-icon">
-			  <a href="$nav.messages.0" rel="#nav-messages-menu" title="$nav.messages.1">
-			  <span class="icon messages">$nav.messages.1</span>
-				<span id="mail-update" class="nav-notify"></span></a>
-				<ul id="nav-messages-menu" class="menu-popup">
-					<li id="nav-messages-see-all"><a href="$nav.messages.0">$nav.messages.1</a></li>
-					<li id="nav-messages-see-all"><a href="$nav.messages.inbox.0">$nav.messages.inbox.1</a></li>
-					<li id="nav-messages-see-all"><a href="$nav.messages.outbox.0">$nav.messages.outbox.1</a></li>
-					<li id="nav-messages-see-all"><a href="$nav.messages.new.0">$nav.messages.new.1</a></li>
-				</ul>
-			</li>		
-			{{ endif }}
-		
-      {{ if $nav.notifications }}
-			<li  id="nav-notifications-linkmenu" class="nav-menu-icon">
-			<a href="$nav.notifications.0" rel="#nav-notifications-menu" title="$nav.notifications.1">
-			<span class="icon notify">$nav.notifications.1</span>
-				<span id="notify-update" class="nav-notify"></span></a>
-				<ul id="nav-notifications-menu" class="menu-popup">
-					<li id="nav-notifications-mark-all"><a href="#" onclick="notifyMarkAll(); return false;">$nav.notifications.mark.1</a></li>
-					<li id="nav-notifications-see-all"><a href="$nav.notifications.all.0">$nav.notifications.all.1</a></li>
-					<li class="empty">$emptynotifications</li>
-				</ul>
-			</li>		
-		{{ endif }}	
-			
-		{{ if $nav.search}}
-		<li id="search-box">
-			<form method="get" action="$nav.search.0">
-				<input id="search-text" class="nav-menu-search" type="text" value="" name="search">
-			</form>
-		</li>		
-		{{ endif }}	
-		
-		<li id="nav-site-linkmenu" class="nav-menu-icon"><a href="#" rel="#nav-site-menu"><span class="icon s22 gear">Site</span></a>
-			<ul id="nav-site-menu" class="menu-popup">
-				{{ if $nav.manage }}<li><a class="$nav.manage.2" href="$nav.manage.0" title="$nav.manage.3">$nav.manage.1</a></li>{{ endif }}				
-
-				{{ if $nav.settings }} <li><a class="$nav.search.2" onClick="restore_boxes()" title="Restore right-hand column" style="cursor: pointer;">Restore right-hand column</a></li>{{ endif }}
-
-				{{ if $nav.help }} <li><a class="$nav.help.2" target="friendika-help" href="$nav.help.0" title="$nav.help.3" >$nav.help.1</a></li>{{ endif }}
-										
-										 <li><a class="$nav.search.2" href="friendica" title="Site Info / Impressum" >Info/Impressum</a></li>
-
-				{{ if $nav.settings }}<li><a class="menu-sep $nav.settings.2" href="$nav.settings.0" title="$nav.settings.3">$nav.settings.1</a></li>{{ endif }}
-				{{ if $nav.admin }}<li><a class="$nav.admin.2" href="$nav.admin.0" title="$nav.admin.3" >$nav.admin.1</a></li>{{ endif }}
-
-				{{ if $nav.logout }}<li><a class="menu-sep $nav.logout.2" href="$nav.logout.0" title="$nav.logout.3" >$nav.logout.1</a></li>{{ endif }}
-
-				
-			</ul>		
-		</li>
-		
-		{{ if $nav.directory }}
-		<li id="nav-directory-link" class="nav-menu $sel.directory">
-			<a class="$nav.directory.2" href="$nav.directory.0" title="$nav.directory.3" >$nav.directory.1</a>
-		</li>
-		{{ endif }}
-		
-		
-		{{ if $nav.apps }}
-			<li id="nav-apps-link" class="nav-menu $sel.apps">
-				<a class=" $nav.apps.2" href="#" rel="#nav-apps-menu" title="$nav.apps.3" >$nav.apps.1</a>
-				<ul id="nav-apps-menu" class="menu-popup">
-					{{ for $apps as $ap }}
-					<li>$ap</li>
-					{{ endfor }}
-				</ul>
-			</li>	
-		{{ endif }}		
-		
-      {{ if $nav.settings }}
-			<li id="nav-home-link" class="nav-menu $sel.home">
-				<a class="$nav.home.2" href="$nav.home.0" title="$nav.home.3" >$nav.home.1
-				<span id="home-update" class="nav-notify"></span></a>
-			</li>
-		{{ endif }}		
-		
-		{{ if $userinfo }}
-			<li id="nav-user-linkmenu" class="nav-menu-icon"><a href="#" rel="#nav-user-menu" title="$sitelocation"><img src="$userinfo.icon" alt="$userinfo.name"></a>
-				<ul id="nav-user-menu" class="menu-popup">
-					{{ for $nav.usermenu as $usermenu }}
-						<li><a class="$usermenu.2" href="$usermenu.0" title="$usermenu.3">$usermenu.1</a></li>
-					{{ endfor }}
-					
-					{{ if $nav.profiles }}<li><a class="menu-sep $nav.profiles.2" href="$nav.profiles.0" title="$nav.profiles.3" >$nav.profiles.3</a></li>{{ endif }}
-					{{ if $nav.notifications }}<li><a class="$nav.notifications.2" href="$nav.notifications.0" title="$nav.notifications.3" >$nav.notifications.1</a></li>{{ endif }}
-					{{ if $nav.messages }}<li><a class="$nav.messages.2" href="$nav.messages.0" title="$nav.messages.3" >$nav.messages.1</a></li>{{ endif }}
-					{{ if $nav.contacts }}<li><a class="$nav.contacts.2" href="$nav.contacts.0" title="$nav.contacts.3" >$nav.contacts.1</a></li>{{ endif }}	
-				</ul>
-			</li>
-		{{ endif }}
-		
-					{{ if $nav.login }}
-					<li id="nav-home-link" class="nav-menu $sel.home">
-						<a class="$nav.login.2" href="$nav.login.0" title="$nav.login.3" >$nav.login.1</a>
-					<li>
-					{{ endif }}
-		
-		
-		
-	</ul>	
-
-
-	
-</nav>
-
-
-<div style="position: fixed; bottom: 5px; right: 10px;"><a href="javascript:scroll(0,0); "><img src="view/theme/diabook-red/icons/scroll_top.png" title="scroll to top"></a></div>
-<div style="position: fixed; bottom: 3px; left: 25px;">$langselector</div>
-<div style="position: fixed; bottom: 23px; left: 5px;"><a href="http://pad.toktan.org/p/diabook" target="blank" ><img src="view/theme/diabook-red/icons/bluebug.png" title="report bugs for the theme diabook"/></a></div>
-
-
-
-<ul id="nav-notifications-template" style="display:none;" rel="template">
-	<li class="{4}"><a href="{0}"><img src="{1}">{2} <span class="notif-when">{3}</span></a></li>
-</ul>
-
-
-
-{#
-
-{{ if $nav.logout }}<a id="nav-logout-link" class="nav-link $nav.logout.2" href="$nav.logout.0" title="$nav.logout.3" >$nav.logout.1</a> {{ endif }}
-{{ if $nav.login }}<a id="nav-login-link" class="nav-login-link $nav.login.2" href="$nav.login.0" title="$nav.login.3" >$nav.login.1</a> {{ endif }}
-
-<span id="nav-link-wrapper" >
-
-{{ if $nav.register }}<a id="nav-register-link" class="nav-commlink $nav.register.2" href="$nav.register.0" title="$nav.register.3" >$nav.register.1</a>{{ endif }}
-	
-<a id="nav-help-link" class="nav-link $nav.help.2" target="friendika-help" href="$nav.help.0" title="$nav.help.3" >$nav.help.1</a>
-	
-{{ if $nav.apps }}<a id="nav-apps-link" class="nav-link $nav.apps.2" href="$nav.apps.0" title="$nav.apps.3" >$nav.apps.1</a>{{ endif }}
-
-<a id="nav-search-link" class="nav-link $nav.search.2" href="$nav.search.0" title="$nav.search.3" >$nav.search.1</a>
-<a id="nav-directory-link" class="nav-link $nav.directory.2" href="$nav.directory.0" title="$nav.directory.3" >$nav.directory.1</a>
-
-{{ if $nav.admin }}<a id="nav-admin-link" class="nav-link $nav.admin.2" href="$nav.admin.0" title="$nav.admin.3" >$nav.admin.1</a>{{ endif }}
-
-{{ if $nav.notifications }}
-<a id="nav-notify-link" class="nav-commlink $nav.notifications.2" href="$nav.notifications.0" title="$nav.notifications.3" >$nav.notifications.1</a>
-<span id="notify-update" class="nav-ajax-left"></span>
-{{ endif }}
-{{ if $nav.messages }}
-<a id="nav-messages-link" class="nav-commlink $nav.messages.2" href="$nav.messages.0" title="$nav.messages.3" >$nav.messages.1</a>
-<span id="mail-update" class="nav-ajax-left"></span>
-{{ endif }}
-
-{{ if $nav.manage }}<a id="nav-manage-link" class="nav-commlink $nav.manage.2" href="$nav.manage.0" title="$nav.manage.3">$nav.manage.1</a>{{ endif }}
-
-{{ if $nav.settings }}<a id="nav-settings-link" class="nav-link $nav.settings.2" href="$nav.settings.0" title="$nav.settings.3">$nav.settings.1</a>{{ endif }}
-{{ if $nav.profiles }}<a id="nav-profiles-link" class="nav-link $nav.profiles.2" href="$nav.profiles.0" title="$nav.profiles.3" >$nav.profiles.1</a>{{ endif }}
-
-
-</span>
-<span id="nav-end"></span>
-<span id="banner">$banner</span>
-#}
diff --git a/view/theme/diabook-red/photo_view.tpl b/view/theme/diabook-red/photo_view.tpl
deleted file mode 100755
index 511fc73ac..000000000
--- a/view/theme/diabook-red/photo_view.tpl
+++ /dev/null
@@ -1,27 +0,0 @@
-<div id="live-display"></div>
-<h3><a href="$album.0">$album.1</a></h3>
-
-<div id="photo-edit-link-wrap">
-{{ if $tools }}
-<a id="photo-edit-link" href="$tools.edit.0">$tools.edit.1</a>
--
-<a id="photo-toprofile-link" href="$tools.profile.0">$tools.profile.1</a>
-{{ endif }}
-{{ if $lock }} - <img src="images/lock_icon.gif" class="lockview" alt="$lock" onclick="lockview(event,'photo$id');" /> {{ endif }}
-</div>
-
-<div id="photo-photo">
-	{{ if $prevlink }}<div id="photo-prev-link"><a href="$prevlink.0">$prevlink.1</a></div>{{ endif }}
-	<a href="$photo.href" class="lightbox" title="$photo.title"><img src="$photo.src" /></a>
-	{{ if $nextlink }}<div id="photo-next-link"><a href="$nextlink.0">$nextlink.1</a></div>{{ endif }}
-</div>
-
-<div id="photo-photo-end"></div>
-<div id="photo-caption" >$desc</div>
-{{ if $tags }}
-<div id="in-this-photo-text">$tags.0</div>
-<div id="in-this-photo">$tags.1</div>
-{{ endif }}
-{{ if $tags.2 }}<div id="tag-remove"><a href="$tags.2">$tags.3</a></div>{{ endif }}
-
-{{ if $edit }}$edit{{ endif }}
\ No newline at end of file
diff --git a/view/theme/diabook-red/profile_side.tpl b/view/theme/diabook-red/profile_side.tpl
deleted file mode 100644
index 94396300f..000000000
--- a/view/theme/diabook-red/profile_side.tpl
+++ /dev/null
@@ -1,21 +0,0 @@
-<div id="profile_side">
-	<div id="ps-usernameicon">
-		<a href="$ps.usermenu.status.0" title="$userinfo.name">
-			<img src="$userinfo.icon" id="ps-usericon" alt="$userinfo.name">
-		</a>
-		<a href="$ps.usermenu.status.0" id="ps-username" title="$userinfo.name">$userinfo.name</a>
-	</div>
-	
-<ul id="profile-side-menu" class="menu-profile-side">
-	<li id="profile-side-status" class="menu-profile-list home"><a class="menu-profile-list-item" href="$ps.usermenu.status.0">$ps.usermenu.status.1</a></li>
-	<li id="profile-side-photos" class="menu-profile-list photos"><a class="menu-profile-list-item" href="$ps.usermenu.photos.0">$ps.usermenu.photos.1</a></li>
-		<li id="profile-side-photos" class="menu-profile-list pscontacts"><a class="menu-profile-list-item" href="$ps.usermenu.contacts.0">$ps.usermenu.contacts.1</a></li>	
-	<li id="profile-side-events" class="menu-profile-list events"><a class="menu-profile-list-item" href="$ps.usermenu.events.0">$ps.usermenu.events.1</a></li>
-	<li id="profile-side-notes" class="menu-profile-list notes"><a class="menu-profile-list-item" href="$ps.usermenu.notes.0">$ps.usermenu.notes.1</a></li>
-	<li id="profile-side-foren" class="menu-profile-list foren"><a class="menu-profile-list-item" href="$ps.usermenu.pgroups.0" target="blanc">$ps.usermenu.pgroups.1</a></li>
-	<li id="profile-side-foren" class="menu-profile-list com_side"><a class="menu-profile-list-item" href="$ps.usermenu.community.0">$ps.usermenu.community.1</a></li>
-</ul>
-
-</div>
-
-				
diff --git a/view/theme/diabook-red/profile_vcard.tpl b/view/theme/diabook-red/profile_vcard.tpl
deleted file mode 100644
index 918cfc97c..000000000
--- a/view/theme/diabook-red/profile_vcard.tpl
+++ /dev/null
@@ -1,64 +0,0 @@
-<div class="vcard">
-
-	<div class="tool">
-		<div class="fn label">$profile.name</div>
-		{{ if $profile.edit }}
-			<div class="action">
-			<a class="icon s16 edit ttright" href="#" rel="#profiles-menu" title="$profile.edit.3"><span>$profile.edit.1</span></a>
-			<ul id="profiles-menu" class="menu-popup">
-				{{ for $profile.menu.entries as $e }}
-				<li>
-					<a href="profiles/$e.id"><img src='$e.photo'>$e.profile_name</a>
-				</li>
-				{{ endfor }}
-				<li><a href="profile_photo" >$profile.menu.chg_photo</a></li>
-				<li><a href="profiles/new" id="profile-listing-new-link">$profile.menu.cr_new</a></li>
-				<li><a href="profiles" >$profile.edit.3</a></li>
-								
-			</ul>
-			</div>
-		{{ endif }}
-	</div>
-				
-	
-	{{ if $pdesc }}<div class="title">$profile.pdesc</div>{{ endif }}
-	<div id="profile-photo-wrapper"><img class="photo" width="155" height="155" src="$profile.photo?rev=$profile.picdate" alt="$profile.name" /></div>
-
-
-
-	{{ if $location }}
-		<dl class="location"><dt class="location-label">$location</dt><br> 
-		<dd class="adr">
-			{{ if $profile.address }}<div class="street-address">$profile.address</div>{{ endif }}
-			<span class="city-state-zip">
-				<span class="locality">$profile.locality</span>{{ if $profile.locality }}, {{ endif }}
-				<span class="region">$profile.region</span>
-				<span class="postal-code">$profile.postal-code</span>
-			</span>
-			{{ if $profile.country-name }}<span class="country-name">$profile.country-name</span>{{ endif }}
-		</dd>
-		</dl>
-	{{ endif }}
-
-	{{ if $gender }}<dl class="mf"><dt class="gender-label">$gender</dt> <dd class="x-gender">$profile.gender</dd></dl>{{ endif }}
-	
-	{{ if $profile.pubkey }}<div class="key" style="display:none;">$profile.pubkey</div>{{ endif }}
-
-	{{ if $marital }}<dl class="marital"><dt class="marital-label"><span class="heart">&hearts;</span>$marital</dt><dd class="marital-text">$profile.marital</dd></dl>{{ endif }}
-
-	{{ if $homepage }}<dl class="homepage"><dt class="homepage-label">$homepage</dt><dd class="homepage-url"><a href="$profile.homepage" target="external-link">$profile.homepage</a></dd></dl>{{ endif }}
-
-	{{ inc diaspora_vcard.tpl }}{{ endinc }}
-	
-	<div id="profile-extra-links">
-		<ul>
-			{{ if $connect }}
-				<li><a id="dfrn-request-link" href="dfrn_request/$profile.nickname">$connect</a></li>
-			{{ endif }}
-		</ul>
-	</div>
-</div>
-
-$contact_block
-
-
diff --git a/view/theme/diabook-red/right_aside.tpl b/view/theme/diabook-red/right_aside.tpl
deleted file mode 100644
index a65677696..000000000
--- a/view/theme/diabook-red/right_aside.tpl
+++ /dev/null
@@ -1,20 +0,0 @@
-<div id="profile_side">
-	<div id="ps-usernameicon">
-		<a href="$ps.usermenu.status.0" title="$userinfo.name">
-			<img src="$userinfo.icon" id="ps-usericon" alt="$userinfo.name">
-		</a>
-		<a href="$ps.usermenu.status.0" id="ps-username" title="$userinfo.name">$userinfo.name</a>
-	</div>
-	
-<ul id="profile-side-menu" class="menu-profile-side">
-	<li id="profile-side-status" class="menu-profile-list home"><a class="menu-profile-list-item" href="$ps.usermenu.status.0">$ps.usermenu.status.1</a></li>
-	<li id="profile-side-photos" class="menu-profile-list photos"><a class="menu-profile-list-item" href="$ps.usermenu.photos.0">$ps.usermenu.photos.1</a></li>
-	<li id="profile-side-events" class="menu-profile-list events"><a class="menu-profile-list-item" href="$ps.usermenu.events.0">$ps.usermenu.events.1</a></li>
-	<li id="profile-side-notes" class="menu-profile-list notes"><a class="menu-profile-list-item" href="$ps.usermenu.notes.0">$ps.usermenu.notes.1</a></li>
-	<li id="profile-side-foren" class="menu-profile-list foren"><a class="menu-profile-list-item" href="http://dir.friendika.com/directory/forum" target="blanc">Public Groups</a></li>
-	<li id="profile-side-foren" class="menu-profile-list com_side"><a class="menu-profile-list-item" href="$ps.usermenu.community.0">$ps.usermenu.community.1</a></li>
-</ul>
-
-</div>
-
-				
\ No newline at end of file
diff --git a/view/theme/diabook-red/rs_common_tabs.tpl b/view/theme/diabook-red/rs_common_tabs.tpl
deleted file mode 100755
index 6a1c5c71b..000000000
--- a/view/theme/diabook-red/rs_common_tabs.tpl
+++ /dev/null
@@ -1,6 +0,0 @@
-<h3 style="border-bottom: 1px solid #D2D2D2;">Settings Menu</h3>
-<ul class="rs_tabs">
-	{{ for $tabs as $tab }}
-		<li><a href="$tab.url" class="rs_tab button $tab.sel">$tab.label</a></li>
-	{{ endfor }}
-</ul>
diff --git a/view/theme/diabook-red/screenshot.png b/view/theme/diabook-red/screenshot.png
deleted file mode 100644
index eced010b9..000000000
--- a/view/theme/diabook-red/screenshot.png
+++ /dev/null
diff --git a/view/theme/diabook-red/search_item.tpl b/view/theme/diabook-red/search_item.tpl
deleted file mode 100755
index 123834064..000000000
--- a/view/theme/diabook-red/search_item.tpl
+++ /dev/null
@@ -1,100 +0,0 @@
-{{ if $item.indent }}{{ else }}
-<div class="wall-item-decor">
-	<img id="like-rotator-$item.id" class="like-rotator" src="images/rotator.gif" alt="$item.wait" title="$item.wait" style="display: none;" />
-</div>
-{{ endif }}
-<div class="wall-item-container $item.indent">
-	<div class="wall-item-item">
-		<div class="wall-item-info">
-			<div class="contact-photo-wrapper"
-				onmouseover="if (typeof t$item.id != 'undefined') clearTimeout(t$item.id); openMenu('wall-item-photo-menu-button-$item.id')" 
-				onmouseout="t$item.id=setTimeout('closeMenu(\'wall-item-photo-menu-button-$item.id\'); closeMenu(\'wall-item-photo-menu-$item.id\');',200)">
-				<a href="$item.profile_url" target="redir" title="$item.linktitle" class="contact-photo-link" id="wall-item-photo-link-$item.id">
-					<img src="$item.thumb" class="contact-photo$item.sparkle" id="wall-item-photo-$item.id" alt="$item.name" />
-				</a>
-				<a href="#" rel="#wall-item-photo-menu-$item.id" class="contact-photo-menu-button icon s16 menu" id="wall-item-photo-menu-button-$item.id">menu</a>
-				<ul class="contact-menu menu-popup" id="wall-item-photo-menu-$item.id">
-				$item.item_photo_menu
-				</ul>
-				
-			</div>
-		</div>
-			<div class="wall-item-actions-author">
-				<a href="$item.profile_url" target="redir" title="$item.linktitle" class="wall-item-name-link"><span class="wall-item-name$item.sparkle">$item.name</span></a> 
-			<span class="wall-item-ago">-
-			{{ if $item.plink }}<a class="link" title="$item.plink.title" href="$item.plink.href" style="color: #999">$item.ago</a>{{ else }} $item.ago {{ endif }}
-			{{ if $item.lock }} - <span class="fakelink" style="color: #999" onclick="lockview(event,$item.id);">$item.lock</span> {{ endif }}
-			</span>
-			</div>
-		<div class="wall-item-content">
-			{{ if $item.title }}<h2><a href="$item.plink.href">$item.title</a></h2>{{ endif }}
-			$item.body
-		</div>
-	</div>
-	<div class="wall-item-bottom">
-		<div class="wall-item-links">
-		</div>
-		<div class="wall-item-tags">
-			{{ for $item.tags as $tag }}
-				<span class='tag'>$tag</span>
-			{{ endfor }}
-		</div>
-	</div>
-	<div class="wall-item-bottom">
-		<div class="">
-
-		</div>
-		<div class="wall-item-actions">
-
-			<div class="wall-item-actions-social">
-			
-			
-			{{ if $item.vote }}
-				<a href="#" id="like-$item.id" class="icon like" title="$item.vote.like.0" onclick="dolike($item.id,'like'); return false">$item.vote.like.1</a>
-				<a href="#" id="dislike-$item.id" class="icon dislike" title="$item.vote.dislike.0" onclick="dolike($item.id,'dislike'); return false"></a>
-			{{ endif }}
-						
-			{{ if $item.vote.share }}
-				<a href="#" id="share-$item.id" class="icon recycle" title="$item.vote.share.0" onclick="jotShare($item.id); return false"></a>
-			{{ endif }}	
-
-
-			{{ if $item.star }}
-				<a href="#" id="starred-$item.id" onclick="dostar($item.id); return false;" class="star-item icon $item.isstarred" title="$item.star.toggle">
-				<img src="images/star_dummy.png" class="icon star" alt="$item.star.do" /> </a>
-				<a href="#" id="tagger-$item.id" onclick="itemTag($item.id); return false;" class="tag-item icon tagged" title="$item.star.tagger"></a>					  
-			{{ endif }}	
-			
-			{{ if $item.filer }}
-			<a href="#" id="filer-$item.id" onclick="itemFiler($item.id); return false;" class="filer-item icon file-as" title="$item.star.filer"></a>
-			{{ endif }}				
-			
-			{{ if $item.plink }}<a class="icon link" title="$item.plink.title" href="$item.plink.href">$item.plink.title</a>{{ endif }}
-			
-					
-					
-			</div>
-			
-			<div class="wall-item-actions-tools">
-
-				{{ if $item.drop.dropping }}
-					<input type="checkbox" title="$item.drop.select" name="itemselected[]" class="item-select" value="$item.id" />
-					<a href="item/drop/$item.id" onclick="return confirmDelete();" class="icon drop" title="$item.drop.delete">$item.drop.delete</a>
-				{{ endif }}
-				{{ if $item.edpost }}
-					<a class="icon pencil" href="$item.edpost.0" title="$item.edpost.1"></a>
-				{{ endif }}
-			</div>
-			<div class="wall-item-location">$item.location&nbsp;</div>
-		</div>
-	</div>
-	<div class="wall-item-bottom">
-		<div class="wall-item-links"></div>
-		<div class="wall-item-like" id="wall-item-like-$item.id">$item.like</div>
-		<div class="wall-item-dislike" id="wall-item-dislike-$item.id">$item.dislike</div>	
-	</div>
-</div>
-
-<div class="wall-item-comment-wrapper" >
-	$item.comment
-</div>
diff --git a/view/theme/diabook-red/theme.php b/view/theme/diabook-red/theme.php
deleted file mode 100755
index 44a76a5e4..000000000
--- a/view/theme/diabook-red/theme.php
+++ /dev/null
@@ -1,431 +0,0 @@
-<?php
-
-/*
- * Name: Diabook-red
- * Description: Diabook-red: report bugs and request here: http://pad.toktan.org/p/diabook or contact me : thomas_bierey@friendica.eu
- * Version: 
- * Author: 
- */
-
-
-//change css on network and profilepages
-$cssFile = null;
-
-
-/**
- * prints last community activity
- */
-function diabook_red_community_info(){
-	$a = get_app();
-	//right_aside at networkpages
-
-	// last 12 users
-	$aside['$lastusers_title'] = t('Last users');
-	$aside['$lastusers_items'] = array();
-	$sql_extra = "";
-	$publish = (get_config('system','publish_all') ? '' : " AND `publish` = 1 " );
-	$order = " ORDER BY `register_date` DESC ";
-
-	$r = q("SELECT `profile`.*, `profile`.`uid` AS `profile_uid`, `user`.`nickname`
-			FROM `profile` LEFT JOIN `user` ON `user`.`uid` = `profile`.`uid` 
-			WHERE `is-default` = 1 $publish AND `user`.`blocked` = 0 $sql_extra $order LIMIT %d , %d ",
-		0,
-		9
-	);
-	$tpl = file_get_contents( dirname(__file__).'/directory_item.tpl');
-	if(count($r)) {
-		$photo = 'thumb';
-		foreach($r as $rr) {
-			$profile_link = $a->get_baseurl() . '/profile/' . ((strlen($rr['nickname'])) ? $rr['nickname'] : $rr['profile_uid']);
-			$entry = replace_macros($tpl,array(
-				'$id' => $rr['id'],
-				'$profile-link' => $profile_link,
-				'$photo' => $rr[$photo],
-				'$alt-text' => $rr['name'],
-			));
-			$aside['$lastusers_items'][] = $entry;
-		}
-	}
-	
-	
-	// last 10 liked items
-	$aside['$like_title'] = t('Last likes');
-	$aside['$like_items'] = array();
-	$r = q("SELECT `T1`.`created`, `T1`.`liker`, `T1`.`liker-link`, `item`.* FROM 
-			(SELECT `parent-uri`, `created`, `author-name` AS `liker`,`author-link` AS `liker-link` 
-				FROM `item` WHERE `verb`='http://activitystrea.ms/schema/1.0/like' GROUP BY `parent-uri` ORDER BY `created` DESC) AS T1
-			INNER JOIN `item` ON `item`.`uri`=`T1`.`parent-uri` 
-			WHERE `T1`.`liker-link` LIKE '%s%%' OR `item`.`author-link` LIKE '%s%%'
-			GROUP BY `uri`
-			ORDER BY `T1`.`created` DESC
-			LIMIT 0,5",
-			$a->get_baseurl(),$a->get_baseurl()
-			);
-
-	foreach ($r as $rr) {
-		$author	 = '<a href="' . $rr['liker-link'] . '">' . $rr['liker'] . '</a>';
-		$objauthor =  '<a href="' . $rr['author-link'] . '">' . $rr['author-name'] . '</a>';
-		
-		//var_dump($rr['verb'],$rr['object-type']); killme();
-		switch($rr['verb']){
-			case 'http://activitystrea.ms/schema/1.0/post':
-				switch ($rr['object-type']){
-					case 'http://activitystrea.ms/schema/1.0/event':
-						$post_type = t('event');
-						break;
-					default:
-						$post_type = t('status');
-				}
-				break;
-			default:
-				if ($rr['resource-id']){
-					$post_type = t('photo');
-					$m=array();	preg_match("/\[url=([^]]*)\]/", $rr['body'], $m);
-					$rr['plink'] = $m[1];
-				} else {
-					$post_type = t('status');
-				}
-		}
-		$plink = '<a href="' . $rr['plink'] . '">' . $post_type . '</a>';
-
-		$aside['$like_items'][] = sprintf( t('%1$s likes %2$s\'s %3$s'), $author, $objauthor, $plink);
-		
-	}
-	
-	
-	// last 12 photos
-	$aside['$photos_title'] = t('Last photos');
-	$aside['$photos_items'] = array();
-	$r = q("SELECT `photo`.`id`, `photo`.`resource-id`, `photo`.`scale`, `photo`.`desc`, `user`.`nickname`, `user`.`username` FROM 
-				(SELECT `resource-id`, MAX(`scale`) as maxscale FROM `photo` 
-					WHERE `profile`=0 AND `contact-id`=0 AND `album` NOT IN ('Contact Photos', '%s', 'Profile Photos', '%s')
-						AND `allow_cid`='' AND `allow_gid`='' AND `deny_cid`='' AND `deny_gid`='' GROUP BY `resource-id`) AS `t1`
-				INNER JOIN `photo` ON `photo`.`resource-id`=`t1`.`resource-id` AND `photo`.`scale` = `t1`.`maxscale`,
-				`user` 
-				WHERE `user`.`uid` = `photo`.`uid`
-				AND `user`.`blockwall`=0
-				AND `user`.`hidewall`=0
-				ORDER BY `photo`.`edited` DESC
-				LIMIT 0, 9",
-				dbesc(t('Contact Photos')),
-				dbesc(t('Profile Photos'))
-				);
-		if(count($r)) {
-		$tpl = file_get_contents( dirname(__file__).'/directory_item.tpl');
-		foreach($r as $rr) {
-			$photo_page = $a->get_baseurl() . '/photos/' . $rr['nickname'] . '/image/' . $rr['resource-id'];
-			$photo_url = $a->get_baseurl() . '/photo/' .  $rr['resource-id'] . '-' . $rr['scale'] .'.jpg';
-		
-			$entry = replace_macros($tpl,array(
-				'$id' => $rr['id'],
-				'$profile-link' => $photo_page,
-				'$photo' => $photo_url,
-				'$alt-text' => $rr['username']." : ".$rr['desc'],
-			));
-
-			$aside['$photos_items'][] = $entry;
-		}
-	}
-	
-	$fostitJS = "javascript: (function() {
-    					the_url = '".$a->get_baseurl($ssl_state)."/view/theme/diabook-red/fpostit/fpostit.php?url=' + encodeURIComponent(window.location.href) + '&title=' + encodeURIComponent(document.title) + '&text=' + encodeURIComponent(''+(window.getSelection ? window.getSelection() : document.getSelection ? document.getSelection() : document.selection.createRange().text));
-    						a_funct = function() {
-        						if (!window.open(the_url, 'fpostit', 'location=yes,links=no,scrollbars=no,toolbar=no,width=600,height=300')) location.href = the_url};
-    							if (/Firefox/.test(navigator.userAgent)) {setTimeout(a_funct, 0)} 
-    							else {a_funct()}})()" ;
-  
-   $aside['$fostitJS'] = $fostitJS;
-   
-   //nav FIND FRIENDS
-	if(local_user()) {
-	$nv = array();
-	$nv['directory'] = Array('directory', t('Local').' '.t('Directory'), "", "");
-	$nv['global_directory'] = Array('http://dir.friendica.com/', t('Global Directory'), "", "");
-	$nv['match'] = Array('match', t('Similar Interests'), "", "");
-	$nv['suggest'] = Array('suggest', t('Friend Suggestions'), "", "");
-	$nv['invite'] = Array('invite', t('Invite Friends'), "", "");
-	
-	$nv['search'] = '<form name="simple_bar" method="get" action="http://dir.friendika.com/directory">
-						<span class="sbox_l"></span>
-						<span class="sbox">
-						<input type="text" name="search" size="13" maxlength="50">
-						</span>
-						<span class="sbox_r" id="srch_clear"></span>';
-						
-	$aside['$nv'] = $nv;
-	};
-	//Community Page
-	if(local_user()) {
-   $page = '<div id="page-sidebar-right_aside" class="widget">
-			<div class="title tool">
-			<h3>'.t("Community Pages").'<a id="close_pages_icon"  onClick="close_pages()" class="icon close_box" title="close"></a></h3></div>
-			<div id="sidebar-page-list"><ul>';
-
-	$pagelist = array();
-
-	$contacts = q("SELECT `id`, `url`, `name`, `micro`FROM `contact`
-			WHERE `network`= 'dfrn' AND `forum` = 1 AND `uid` = %d",
-			intval($a->user['uid'])
-	);
-
-	$pageD = array();
-
-	// Look if the profile is a community page
-	foreach($contacts as $contact) {
-		$pageD[] = array("url"=>$contact["url"], "name"=>$contact["name"], "id"=>$contact["id"], "micro"=>$contact['micro']);
-	};
-	
-
-	$contacts = $pageD;
-
-	foreach($contacts as $contact) {
-		$page .= '<li style="list-style-type: none;" class="tool"><img height="20" width="20" style="float: left; margin-right: 3px;" src="' . $contact['micro'] .'" alt="' . $contact['url'] . '" /> <a href="'.$a->get_baseurl().'/redir/'.$contact["id"].'" style="margin-top: 2px;" title="' . $contact['url'] . '" class="label" target="external-link">'.
-				$contact["name"]."</a></li>";
-	}
-	$page .= '</ul></div></div>';
-	//if (sizeof($contacts) > 0)
-		
-		$aside['$page'] = $page;
-	}		
-  //END Community Page		   
-   
-   
-   
-   $url = $a->get_baseurl($ssl_state);   
-   $aside['$url'] = $url;
-
-	$tpl = file_get_contents(dirname(__file__).'/communityhome.tpl');
-	$a->page['right_aside'] = replace_macros($tpl, $aside);
-	
-}
-
-
-//profile_side at networkpages
-if ($a->argv[0] === "network" && local_user()){
-
-	// USER MENU
-	if(local_user()) {
-		
-		$r = q("SELECT micro FROM contact WHERE uid=%d AND self=1", intval($a->user['uid']));
-				
-		$userinfo = array(
-					'icon' => (count($r) ? $r[0]['micro']: $a->get_baseurl()."/images/default-profile-mm.jpg"),
-					'name' => $a->user['username'],
-				);	
-		$ps = array('usermenu'=>array());
-		$ps['usermenu']['status'] = Array('profile/' . $a->user['nickname'], t('Home'), "", t('Your posts and conversations'));
-		$ps['usermenu']['profile'] = Array('profile/' . $a->user['nickname']. '?tab=profile', t('Profile'), "", t('Your profile page'));
-		$ps['usermenu']['contacts'] = Array('contacts' , t('Contacts'), "", t('Your contacts'));		
-		$ps['usermenu']['photos'] = Array('photos/' . $a->user['nickname'], t('Photos'), "", t('Your photos'));
-		$ps['usermenu']['events'] = Array('events/', t('Events'), "", t('Your events'));
-		$ps['usermenu']['notes'] = Array('notes/', t('Personal notes'), "", t('Your personal photos'));
-		$ps['usermenu']['community'] = Array('community/', t('Community'), "", "");
-		$ps['usermenu']['pgroups'] = Array('http://dir.friendika.com/directory/forum', t('Community Pages'), "", "");
-
-		$tpl = get_markup_template('profile_side.tpl');
-
-		$a->page['aside'] .= replace_macros($tpl, array(
-				'$userinfo' => $userinfo,
-				'$ps' => $ps,
-			));
-
-	}
-	
-	$ccCookie = $_COOKIE['close_pages'] + $_COOKIE['close_helpers'] + $_COOKIE['close_services'] + $_COOKIE['close_friends'] + $_COOKIE['close_postit'] + $_COOKIE['close_lastusers'] + $_COOKIE['close_lastphotos'] + $_COOKIE['close_lastlikes'];
-	
-	if($ccCookie != "8") {
-	// COMMUNITY
-	diabook_red_community_info();
-	
-	// CUSTOM CSS
-	$cssFile = $a->get_baseurl($ssl_state)."/view/theme/diabook-red/style-network.css";
-	}
-}
-
-
-
-//right_aside at profile pages
-if ($a->argv[0].$a->argv[1] === "profile".$a->user['nickname']){
-	if($ccCookie != "8") {
-	// COMMUNITY
-	diabook_red_community_info();
-	
-	// CUSTOM CSS
-	$cssFile = $a->get_baseurl($ssl_state)."/view/theme/diabook-red/style-profile.css";
-	}
-}
-
-
-//tabs at right_aside on settings page
-if ($a->argv[0] === "settings"){
-	
-	$tabs = array(
-		array(
-			'label'	=> t('Account settings'),
-			'url' 	=> $a->get_baseurl(true).'/settings',
-			'sel'	=> (($a->argc == 1)?'active':''),
-		),	
-		array(
-			'label'	=> t('Display settings'),
-			'url' 	=> $a->get_baseurl(true).'/settings/display',
-			'sel'	=> (($a->argc > 1) && ($a->argv[1] === 'display')?'active':''),
-		),	
-		array(
-			'label'	=> t('Edit/Manage Profiles'),
-			'url' 	=> $a->get_baseurl(true).'/profiles',
-		),	
-		array(
-			'label'	=> t('Connector settings'),
-			'url' 	=> $a->get_baseurl(true).'/settings/connectors',
-			'sel'	=> (($a->argc > 1) && ($a->argv[1] === 'connectors')?'active':''),
-		),
-		array(
-			'label'	=> t('Plugin settings'),
-			'url' 	=> $a->get_baseurl(true).'/settings/addon',
-			'sel'	=> (($a->argc > 1) && ($a->argv[1] === 'addon')?'active':''),
-		),
-		array(
-			'label' => t('Connections'),
-			'url' => $a->get_baseurl(true) . '/settings/oauth',
-			'sel' => (($a->argc > 1) && ($a->argv[1] === 'oauth')?'active':''),
-		),
-		array(
-			'label' => t('Export personal data'),
-			'url' => $a->get_baseurl(true) . '/uexport',
-			'sel' => ''
-		)
-	);
-	$tabtpl = file_get_contents(dirname(__file__).'/rs_common_tabs.tpl') ;
-	$a->page['aside'] = replace_macros($tabtpl, array(
-		'$tabs' => $tabs,
-	));
-	
-	
-	// CUSTOM CSS
-	$cssFile = $a->get_baseurl($ssl_state)."/view/theme/diabook-red/style-settings.css";
-	
-}
-
-
-// custom css
-if (!is_null($cssFile)) $a->page['htmlhead'] .= sprintf('<link rel="stylesheet" type="text/css" href="%s" />', $cssFile);
-
-//load jquery.cookie.js
-$cookieJS = $a->get_baseurl($ssl_state)."/view/theme/diabook-red/js/jquery.cookie.js";
-$a->page['htmlhead'] .= sprintf('<script language="JavaScript" src="%s" ></script>', $cookieJS);
-
-
-//js scripts
-
-$a->page['htmlhead'] .= <<< EOT
-
-<script>
- $(function() {
-	$('a.lightbox').fancybox(); // Select all links with lightbox class
-	
- });
-
-</script>
-
-<script>
-
-$("right_aside").ready(function(){
-	
-	if($.cookie('close_pages') == '1') 
-		{
-		document.getElementById( "close_pages" ).style.display = "none";
-			};
-	
-	if($.cookie('close_helpers') == '1') 
-		{
-		document.getElementById( "close_helpers" ).style.display = "none";
-			};
-			
-	if($.cookie('close_services') == '1') 
-		{
-		document.getElementById( "close_services" ).style.display = "none";
-			};
-			
-	if($.cookie('close_friends') == '1') 
-		{
-		document.getElementById( "close_friends" ).style.display = "none";
-			};
-	
-	if($.cookie('close_postit') == '1') 
-		{
-		document.getElementById( "close_postit" ).style.display = "none";
-			};
-			
-	if($.cookie('close_lastusers') == '1') 
-		{
-		document.getElementById( "close_lastusers" ).style.display = "none";
-			};
-			
-	if($.cookie('close_lastphotos') == '1') 
-		{
-		document.getElementById( "close_lastphotos" ).style.display = "none";
-			};
-			
-	if($.cookie('close_lastlikes') == '1') 
-		{
-		document.getElementById( "close_lastlikes" ).style.display = "none";
-			};}
-
-);
-
-function close_pages(){
- document.getElementById( "close_pages" ).style.display = "none";
- $.cookie('close_pages','1', { expires: 365, path: '/' });
- };
- 
-function close_helpers(){
- document.getElementById( "close_helpers" ).style.display = "none";
-  $.cookie('close_helpers','1', { expires: 365, path: '/' });
- };
-
-function close_services(){
- document.getElementById( "close_services" ).style.display = "none";
- $.cookie('close_services','1', { expires: 365, path: '/' });
- };
- 
-function close_friends(){
- document.getElementById( "close_friends" ).style.display = "none";
- $.cookie('close_friends','1', { expires: 365, path: '/' });
- };
-
-function close_postit(){
- document.getElementById( "close_postit" ).style.display = "none";
- $.cookie('close_postit','1', { expires: 365, path: '/' });
- };
- 
-function close_lastusers(){
- document.getElementById( "close_lastusers" ).style.display = "none";
- $.cookie('close_lastusers','1', { expires: 365, path: '/' });
- };
-
-function close_lastphotos(){
- document.getElementById( "close_lastphotos" ).style.display = "none";
- $.cookie('close_lastphotos','1', { expires: 365, path: '/' });
- };
- 
-function close_lastlikes(){
- document.getElementById( "close_lastlikes" ).style.display = "none";
- $.cookie('close_lastlikes','1', { expires: 365, path: '/' });
- };
-
-function restore_boxes(){
-	$.cookie('close_pages','2', { expires: 365, path: '/' });
-	$.cookie('close_helpers','2', { expires: 365, path: '/' });
-	$.cookie('close_services','2', { expires: 365, path: '/' });
-	$.cookie('close_friends','2', { expires: 365, path: '/' });
-	$.cookie('close_postit','2', { expires: 365, path: '/' });
-	$.cookie('close_lastusers','2', { expires: 365, path: '/' });
-	$.cookie('close_lastphotos','2', { expires: 365, path: '/' });
-	$.cookie('close_lastlikes','2', { expires: 365, path: '/' });
-	alert('Right-hand column was restored. Please refresh your browser');
-  }; 
- 
-</script>
-
-EOT;
-
diff --git a/view/theme/diabook-red/wall_item.tpl b/view/theme/diabook-red/wall_item.tpl
deleted file mode 100644
index 123834064..000000000
--- a/view/theme/diabook-red/wall_item.tpl
+++ /dev/null
@@ -1,100 +0,0 @@
-{{ if $item.indent }}{{ else }}
-<div class="wall-item-decor">
-	<img id="like-rotator-$item.id" class="like-rotator" src="images/rotator.gif" alt="$item.wait" title="$item.wait" style="display: none;" />
-</div>
-{{ endif }}
-<div class="wall-item-container $item.indent">
-	<div class="wall-item-item">
-		<div class="wall-item-info">
-			<div class="contact-photo-wrapper"
-				onmouseover="if (typeof t$item.id != 'undefined') clearTimeout(t$item.id); openMenu('wall-item-photo-menu-button-$item.id')" 
-				onmouseout="t$item.id=setTimeout('closeMenu(\'wall-item-photo-menu-button-$item.id\'); closeMenu(\'wall-item-photo-menu-$item.id\');',200)">
-				<a href="$item.profile_url" target="redir" title="$item.linktitle" class="contact-photo-link" id="wall-item-photo-link-$item.id">
-					<img src="$item.thumb" class="contact-photo$item.sparkle" id="wall-item-photo-$item.id" alt="$item.name" />
-				</a>
-				<a href="#" rel="#wall-item-photo-menu-$item.id" class="contact-photo-menu-button icon s16 menu" id="wall-item-photo-menu-button-$item.id">menu</a>
-				<ul class="contact-menu menu-popup" id="wall-item-photo-menu-$item.id">
-				$item.item_photo_menu
-				</ul>
-				
-			</div>
-		</div>
-			<div class="wall-item-actions-author">
-				<a href="$item.profile_url" target="redir" title="$item.linktitle" class="wall-item-name-link"><span class="wall-item-name$item.sparkle">$item.name</span></a> 
-			<span class="wall-item-ago">-
-			{{ if $item.plink }}<a class="link" title="$item.plink.title" href="$item.plink.href" style="color: #999">$item.ago</a>{{ else }} $item.ago {{ endif }}
-			{{ if $item.lock }} - <span class="fakelink" style="color: #999" onclick="lockview(event,$item.id);">$item.lock</span> {{ endif }}
-			</span>
-			</div>
-		<div class="wall-item-content">
-			{{ if $item.title }}<h2><a href="$item.plink.href">$item.title</a></h2>{{ endif }}
-			$item.body
-		</div>
-	</div>
-	<div class="wall-item-bottom">
-		<div class="wall-item-links">
-		</div>
-		<div class="wall-item-tags">
-			{{ for $item.tags as $tag }}
-				<span class='tag'>$tag</span>
-			{{ endfor }}
-		</div>
-	</div>
-	<div class="wall-item-bottom">
-		<div class="">
-
-		</div>
-		<div class="wall-item-actions">
-
-			<div class="wall-item-actions-social">
-			
-			
-			{{ if $item.vote }}
-				<a href="#" id="like-$item.id" class="icon like" title="$item.vote.like.0" onclick="dolike($item.id,'like'); return false">$item.vote.like.1</a>
-				<a href="#" id="dislike-$item.id" class="icon dislike" title="$item.vote.dislike.0" onclick="dolike($item.id,'dislike'); return false"></a>
-			{{ endif }}
-						
-			{{ if $item.vote.share }}
-				<a href="#" id="share-$item.id" class="icon recycle" title="$item.vote.share.0" onclick="jotShare($item.id); return false"></a>
-			{{ endif }}	
-
-
-			{{ if $item.star }}
-				<a href="#" id="starred-$item.id" onclick="dostar($item.id); return false;" class="star-item icon $item.isstarred" title="$item.star.toggle">
-				<img src="images/star_dummy.png" class="icon star" alt="$item.star.do" /> </a>
-				<a href="#" id="tagger-$item.id" onclick="itemTag($item.id); return false;" class="tag-item icon tagged" title="$item.star.tagger"></a>					  
-			{{ endif }}	
-			
-			{{ if $item.filer }}
-			<a href="#" id="filer-$item.id" onclick="itemFiler($item.id); return false;" class="filer-item icon file-as" title="$item.star.filer"></a>
-			{{ endif }}				
-			
-			{{ if $item.plink }}<a class="icon link" title="$item.plink.title" href="$item.plink.href">$item.plink.title</a>{{ endif }}
-			
-					
-					
-			</div>
-			
-			<div class="wall-item-actions-tools">
-
-				{{ if $item.drop.dropping }}
-					<input type="checkbox" title="$item.drop.select" name="itemselected[]" class="item-select" value="$item.id" />
-					<a href="item/drop/$item.id" onclick="return confirmDelete();" class="icon drop" title="$item.drop.delete">$item.drop.delete</a>
-				{{ endif }}
-				{{ if $item.edpost }}
-					<a class="icon pencil" href="$item.edpost.0" title="$item.edpost.1"></a>
-				{{ endif }}
-			</div>
-			<div class="wall-item-location">$item.location&nbsp;</div>
-		</div>
-	</div>
-	<div class="wall-item-bottom">
-		<div class="wall-item-links"></div>
-		<div class="wall-item-like" id="wall-item-like-$item.id">$item.like</div>
-		<div class="wall-item-dislike" id="wall-item-dislike-$item.id">$item.dislike</div>	
-	</div>
-</div>
-
-<div class="wall-item-comment-wrapper" >
-	$item.comment
-</div>
diff --git a/view/theme/diabook-red/wallwall_item.tpl b/view/theme/diabook-red/wallwall_item.tpl
deleted file mode 100644
index c5b6b36b5..000000000
--- a/view/theme/diabook-red/wallwall_item.tpl
+++ /dev/null
@@ -1,102 +0,0 @@
-{{ if $item.indent }}{{ else }}
-<div class="wall-item-decor">
-	<img id="like-rotator-$item.id" class="like-rotator" src="images/rotator.gif" alt="$item.wait" title="$item.wait" style="display: none;" />
-</div>
-{{ endif }}
-<div class="wall-item-container $item.indent">
-	<div class="wall-item-item">
-		<div class="wall-item-info">
-			<div class="contact-photo-wrapper mframe wwto" id="wall-item-ownerphoto-wrapper-$item.id" >
-				<a href="$item.owner_url" target="redir" title="$item.olinktitle" class="contact-photo-link" id="wall-item-ownerphoto-link-$item.id">
-					<img src="$item.owner_photo" class="contact-photo $item.osparkle" id="wall-item-ownerphoto-$item.id" alt="$item.owner_name" />
-				</a>
-			</div>
-			<div class="contact-photo-wrapper mframe wwfrom"
-				onmouseover="if (typeof t$item.id != 'undefined') clearTimeout(t$item.id); openMenu('wall-item-photo-menu-button-$item.id')" 
-				onmouseout="t$item.id=setTimeout('closeMenu(\'wall-item-photo-menu-button-$item.id\'); closeMenu(\'wall-item-photo-menu-$item.id\');',200)">
-				<a href="$item.profile_url" target="redir" title="$item.linktitle" class="contact-photo-link" id="wall-item-photo-link-$item.id">
-					<img src="$item.thumb" class="contact-photo$item.sparkle" id="wall-item-photo-$item.id" alt="$item.name" />
-				</a>
-				<a href="#" rel="#wall-item-photo-menu-$item.id" class="contact-photo-menu-button icon s16 menu" id="wall-item-photo-menu-button-$item.id">menu</a>
-				<ul class="contact-menu menu-popup" id="wall-item-photo-menu-$item.id">
-				$item.item_photo_menu
-				</ul>
-				
-			</div>
-		</div>
-			<div class="wall-item-actions-author">
-				<a href="$item.profile_url" target="redir" title="$item.linktitle" class="wall-item-name-link"><span class="wall-item-name$item.sparkle">$item.name</span></a>
-				$item.to <a href="$item.owner_url" target="redir" title="$item.olinktitle" class="wall-item-name-link"><span class="wall-item-name$item.osparkle" id="wall-item-ownername-$item.id">$item.owner_name</span></a>
-				 $item.vwall <span class="wall-item-ago">- &nbsp;
-			{{ if $item.plink }}<a class="link" title="$item.plink.title" href="$item.plink.href" style="color: #999">$item.ago</a>{{ else }} $item.ago {{ endif }}
-			{{ if $item.lock }} - <span class="fakelink" style="color: #999" onclick="lockview(event,$item.id);">$item.lock</span> {{ endif }}
-			</span>
-			</div>
-		<div class="wall-item-content">
-			{{ if $item.title }}<h2><a href="$item.plink.href">$item.title</a></h2>{{ endif }}
-			$item.body
-		</div>
-	</div>
-	<div class="wall-item-bottom">
-		<div class="wall-item-links">
-		</div>
-		<div class="wall-item-tags">
-			{{ for $item.tags as $tag }}
-				<span class='tag'>$tag</span>
-			{{ endfor }}
-		</div>
-	</div>
-	<div class="wall-item-bottom">
-		<div class="">
-
-		</div>
-		<div class="wall-item-actions">
-
-			<div class="wall-item-actions-social">
-			
-			
-			{{ if $item.vote }}
-				<a href="#" id="like-$item.id" class="icon like" title="$item.vote.like.0" onclick="dolike($item.id,'like'); return false">$item.vote.like.1</a>
-				<a href="#" id="dislike-$item.id" class="icon dislike" title="$item.vote.dislike.0" onclick="dolike($item.id,'dislike'); return false"></a>
-			{{ endif }}
-						
-			{{ if $item.vote.share }}
-				<a href="#" id="share-$item.id" class="icon recycle" title="$item.vote.share.0" onclick="jotShare($item.id); return false"></a>
-			{{ endif }}	
-
-
-			{{ if $item.star }}
-				<a href="#" id="starred-$item.id" onclick="dostar($item.id); return false;" class="star-item icon $item.isstarred" title="$item.star.toggle">
-				<img src="images/star_dummy.png" class="icon star" alt="$item.star.do" /> </a>
-				<a href="#" id="tagger-$item.id" onclick="itemTag($item.id); return false;" class="tag-item icon tagged" title="$item.star.tagger"></a>
-			{{ endif }}	
-			
-			{{ if $item.plink }}<a class="icon link" title="$item.plink.title" href="$item.plink.href">$item.plink.title</a>{{ endif }}
-			
-					
-					
-			</div>
-			
-			<div class="wall-item-actions-tools">
-
-				{{ if $item.drop.dropping }}
-					<input type="checkbox" title="$item.drop.select" name="itemselected[]" class="item-select" value="$item.id" />
-					<a href="item/drop/$item.id" onclick="return confirmDelete();" class="icon drop" title="$item.drop.delete">$item.drop.delete</a>
-				{{ endif }}
-				{{ if $item.edpost }}
-					<a class="icon pencil" href="$item.edpost.0" title="$item.edpost.1"></a>
-				{{ endif }}
-			</div>
-			<div class="wall-item-location">$item.location&nbsp;</div>
-		</div>
-	</div>
-	<div class="wall-item-bottom">
-		<div class="wall-item-links"></div>
-		<div class="wall-item-like" id="wall-item-like-$item.id">$item.like</div>
-		<div class="wall-item-dislike" id="wall-item-dislike-$item.id">$item.dislike</div>	
-	</div>
-</div>
-
-<div class="wall-item-comment-wrapper" >
-	$item.comment
-</div>
\ No newline at end of file
diff --git a/view/theme/diabook/admin_site.tpl b/view/theme/diabook/admin_site.tpl
new file mode 100644
index 000000000..dd89b81a9
--- /dev/null
+++ b/view/theme/diabook/admin_site.tpl
@@ -0,0 +1,57 @@
+<script>
+	$(function(){
+				var theme = $("#id_theme :selected").val();
+				$("#cnftheme").attr('href',"$baseurl/admin/themes/"+theme);
+	});
+</script>
+<div id='adminpage'>
+	<h1>$title - $page</h1>
+	
+	<form action="$baseurl/admin/site" method="post">
+	    <input type='hidden' name='form_security_token' value='$form_security_token'>
+	{{ inc field_input.tpl with $field=$sitename }}{{ endinc }}
+	{{ inc field_textarea.tpl with $field=$banner }}{{ endinc }}
+	{{ inc field_select.tpl with $field=$language }}{{ endinc }}
+	{{ inc field_select.tpl with $field=$theme }}{{ endinc }}
+	{{ inc field_select.tpl with $field=$ssl_policy }}{{ endinc }}
+	
+	<div class="submit"><input type="submit" name="page_site" value="$submit" /></div>
+	
+	<h3>$registration</h3>
+	{{ inc field_input.tpl with $field=$register_text }}{{ endinc }}
+	{{ inc field_select.tpl with $field=$register_policy }}{{ endinc }}
+	
+	{{ inc field_checkbox.tpl with $field=$no_multi_reg }}{{ endinc }}
+	{{ inc field_checkbox.tpl with $field=$no_openid }}{{ endinc }}
+	{{ inc field_checkbox.tpl with $field=$no_regfullname }}{{ endinc }}
+	
+	<div class="submit"><input type="submit" name="page_site" value="$submit" /></div>
+
+	<h3>$upload</h3>
+	{{ inc field_input.tpl with $field=$maximagesize }}{{ endinc }}
+	
+	<h3>$corporate</h3>
+	{{ inc field_input.tpl with $field=$allowed_sites }}{{ endinc }}
+	{{ inc field_input.tpl with $field=$allowed_email }}{{ endinc }}
+	{{ inc field_checkbox.tpl with $field=$block_public }}{{ endinc }}
+	{{ inc field_checkbox.tpl with $field=$force_publish }}{{ endinc }}
+	{{ inc field_checkbox.tpl with $field=$no_community_page }}{{ endinc }}
+	{{ inc field_checkbox.tpl with $field=$ostatus_disabled }}{{ endinc }}
+	{{ inc field_checkbox.tpl with $field=$diaspora_enabled }}{{ endinc }}
+	{{ inc field_checkbox.tpl with $field=$dfrn_only }}{{ endinc }}
+	{{ inc field_input.tpl with $field=$global_directory }}{{ endinc }}
+	
+	<div class="submit"><input type="submit" name="page_site" value="$submit" /></div>
+	
+	<h3>$advanced</h3>
+	{{ inc field_checkbox.tpl with $field=$no_utf }}{{ endinc }}
+	{{ inc field_checkbox.tpl with $field=$verifyssl }}{{ endinc }}
+	{{ inc field_input.tpl with $field=$proxy }}{{ endinc }}
+	{{ inc field_input.tpl with $field=$proxyuser }}{{ endinc }}
+	{{ inc field_input.tpl with $field=$timeout }}{{ endinc }}
+	{{ inc field_input.tpl with $field=$abandon_days }}{{ endinc }}
+	
+	<div class="submit"><input type="submit" name="page_site" value="$submit" /></div>
+	
+	</form>
+</div>
diff --git a/view/theme/diabook/admin_users.tpl b/view/theme/diabook/admin_users.tpl
new file mode 100644
index 000000000..8aabb51ec
--- /dev/null
+++ b/view/theme/diabook/admin_users.tpl
@@ -0,0 +1,88 @@
+<script>
+	function confirm_delete(uname){
+		return confirm( "$confirm_delete".format(uname));
+	}
+	function confirm_delete_multi(){
+		return confirm("$confirm_delete_multi");
+	}
+	function selectall(cls){
+		$("."+cls).attr('checked','checked');
+		return false;
+	}
+</script>
+<div id='adminpage'>
+	<h1>$title - $page</h1>
+	
+	<form action="$baseurl/admin/users" method="post">
+		        <input type='hidden' name='form_security_token' value='$form_security_token'>
+		<h3>$h_pending</h3>
+		{{ if $pending }}
+			<table id='pending'>
+				<thead>
+				<tr>
+					{{ for $th_pending as $th }}<th>$th</th>{{ endfor }}
+					<th></th>
+					<th></th>
+				</tr>
+				</thead>
+				<tbody>
+			{{ for $pending as $u }}
+				<tr>
+					<td class="created">$u.created</td>
+					<td class="name">$u.name</td>
+					<td class="email">$u.email</td>
+					<td class="checkbox"><input type="checkbox" class="pending_ckbx" id="id_pending_$u.hash" name="pending[]" value="$u.hash" /></td>
+					<td class="tools">
+						<a href="$baseurl/regmod/allow/$u.hash" title='$approve'><span class='icon like'></span></a>
+						<a href="$baseurl/regmod/deny/$u.hash" title='$deny'><span class='icon dislike'></span></a>
+					</td>
+				</tr>
+			{{ endfor }}
+				</tbody>
+			</table>
+			<div class='selectall'><a href='#' onclick="return selectall('pending_ckbx');">$select_all</a></div>
+			<div class="submit"><input type="submit" name="page_users_deny" value="$deny"/> <input type="submit" name="page_users_approve" value="$approve" /></div>			
+		{{ else }}
+			<p>$no_pending</p>
+		{{ endif }}
+	
+	
+		
+	
+		<h3>$h_users</h3>
+		{{ if $users }}
+			<table id='users'>
+				<thead>
+				<tr>
+					<th></th>
+					{{ for $th_users as $th }}<th>$th</th>{{ endfor }}
+					<th></th>
+					<th></th>
+				</tr>
+				</thead>
+				<tbody>
+				{{ for $users as $u }}
+					<tr>
+						<td><img src="$u.micro" alt="$u.nickname" title="$u.nickname"></td>
+						<td class='name'><a href="$u.url" title="$u.nickname" >$u.name</a></td>
+						<td class='email'>$u.email</td>
+						<td class='register_date'>$u.register_date</td>
+						<td class='login_date'>$u.login_date</td>
+						<td class='lastitem_date'>$u.lastitem_date</td>
+						<td class='login_date'>$u.page-flags</td>
+						<td class="checkbox"><input type="checkbox" class="users_ckbx" id="id_user_$u.uid" name="user[]" value="$u.uid"/></td>
+						<td class="tools" style="width:60px;">
+							<a href="$baseurl/admin/users/block/$u.uid?t=$form_security_token" title='{{ if $u.blocked }}$unblock{{ else }}$block{{ endif }}'><span class='icon block {{ if $u.blocked==0 }}dim{{ endif }}'></span></a>
+							<a href="$baseurl/admin/users/delete/$u.uid?t=$form_security_token" title='$delete' onclick="return confirm_delete('$u.name')"><span class='icon ad_drop'></span></a>
+						</td>
+					</tr>
+				{{ endfor }}
+				</tbody>
+			</table>
+			<div class='selectall'><a href='#' onclick="return selectall('users_ckbx');">$select_all</a></div>
+			<div class="submit"><input type="submit" name="page_users_block" value="$block/$unblock" /> <input type="submit" name="page_users_delete" value="$delete" onclick="return confirm_delete_multi()" /></div>						
+		{{ else }}
+			NO USERS?!?
+		{{ endif }}
+	</form>
+</div>
diff --git a/view/theme/diabook-aerith/directory_item.tpl b/view/theme/diabook/ch_directory_item.tpl
index db1936e4b..db1936e4b 100755
--- a/view/theme/diabook-aerith/directory_item.tpl
+++ b/view/theme/diabook/ch_directory_item.tpl
diff --git a/view/theme/loozah/comment_item.tpl b/view/theme/diabook/comment_item.tpl
index 3503c3843..e10b86845 100755..100644
--- a/view/theme/loozah/comment_item.tpl
+++ b/view/theme/diabook/comment_item.tpl
@@ -11,12 +11,23 @@
 					<a class="comment-edit-photo-link" href="$mylink" title="$mytitle"><img class="my-comment-photo" src="$myphoto" alt="$mytitle" title="$mytitle" /></a>
 				</div>
 				<div class="comment-edit-photo-end"></div>
-				<textarea id="comment-edit-text-$id" class="comment-edit-text-empty" name="body" onFocus="commentOpen(this,$id);" onBlur="commentClose(this,$id);" >$comment</textarea>
+				<textarea id="comment-edit-text-$id" class="comment-edit-text-empty" name="body" onFocus="commentOpen(this,$id);tautogrow($id);cmtBbOpen($id);"  >$comment</textarea>
+				<div class="comment-edit-bb-$id" style="display:none;">				
+				<a class="icon bb-image" style="cursor: pointer;" onclick="insertFormatting('$comment','img',$id);">img</a>	
+				<a class="icon bb-url" style="cursor: pointer;" onclick="insertFormatting('$comment','url',$id);">url</a>
+				<a class="icon bb-video" style="cursor: pointer;" onclick="insertFormatting('$comment','video',$id);">video</a>														
+				<a class="icon underline" style="cursor: pointer;" onclick="insertFormatting('$comment','u',$id);">u</a>
+				<a class="icon italic" style="cursor: pointer;" onclick="insertFormatting('$comment','i',$id);">i</a>
+				<a class="icon bold" style="cursor: pointer;" onclick="insertFormatting('$comment','b',$id);">b</a>
+				<a class="icon quote" style="cursor: pointer;" onclick="insertFormatting('$comment','quote',$id);">quote</a>																			
+				</div>				
 				{{ if $qcomment }}
-				{{ for $qcomment as $qc }}				
-					<span class="fakelink qcomment" onclick="commentInsert(this,$id); return false;" >$qc</span>
-					&nbsp;
+					<select id="qcomment-select-$id" name="qcomment-$id" class="qcomment" onchange="qCommentInsert(this,$id);" >
+					<option value=""></option>
+				{{ for $qcomment as $qc }}
+					<option value="$qc">$qc</option>				
 				{{ endfor }}
+					</select>
 				{{ endif }}
 
 				<div class="comment-edit-text-end"></div>
diff --git a/view/theme/diabook/communityhome.tpl b/view/theme/diabook/communityhome.tpl
index d344cad31..66f93c32d 100755
--- a/view/theme/diabook/communityhome.tpl
+++ b/view/theme/diabook/communityhome.tpl
@@ -6,7 +6,7 @@
 
 <div id="close_helpers">
 {{ if $lastusers_title }}
-<h3 style="margin-top:0px;">Help or @NewHere ?<a id="close_helpers_icon"  onClick="close_helpers()" class="icon close_box" title="close"></a></h3>
+<h3 style="margin-top:0px;">$helpers.title.1<a id="close_helpers_icon"  onClick="close_helpers()" class="icon close_box" title="close"></a></h3>
 <a href="http://kakste.com/profile/newhere" title="@NewHere" style="margin-left: 10px; " target="blank">NewHere</a><br>
 <a href="https://helpers.pyxis.uberspace.de/profile/helpers" style="margin-left: 10px; " title="Friendica Support" target="blank">Friendica Support</a><br>
 <a href="https://letstalk.pyxis.uberspace.de/profile/letstalk" style="margin-left: 10px; " title="Let's talk" target="blank">Let's talk</a><br>
@@ -16,8 +16,8 @@
 
 <div id="close_services">
 {{ if $lastusers_title }}
-<h3>Connectable Services<a id="close_services_icon" onClick="close_services()" class="icon close_box" title="close"></a></h3>
-<div id="right_service_icons" style="margin-left: 11px; margin-top: 5px;">
+<h3>$con_services.title.1<a id="close_services_icon" onClick="close_services()" class="icon close_box" title="close"></a></h3>
+<div id="right_service_icons" style="margin-left: 16px; margin-top: 5px;">
 <a href="$url/facebook"><img alt="Facebook" src="view/theme/diabook/icons/facebook.png" title="Facebook"></a>
 <a href="$url/settings/connectors"><img alt="StatusNet" src="view/theme/diabook/icons/StatusNet.png?" title="StatusNet"></a>
 <a href="$url/settings/connectors"><img alt="LiveJournal" src="view/theme/diabook/icons/livejournal.png?" title="LiveJournal"></a>
@@ -32,9 +32,9 @@
 
 <div id="close_friends" style="margin-bottom:53px;">
 {{ if $nv }}
-<h3>Find Friends<a id="close_friends_icon" onClick="close_friends()"  class="icon close_box" title="close"></a></h3>
+<h3>$nv.title.1<a id="close_friends_icon" onClick="close_friends()"  class="icon close_box" title="close"></a></h3>
 <a class="$nv.directory.2" href="$nv.directory.0" style="margin-left: 10px; " title="$nv.directory.3" >$nv.directory.1</a><br>
-<a class="$nv.global_directory.2" href="$nv.global_directory.0" style="margin-left: 10px; " title="$nv.global_directory.3" >$nv.global_directory.1</a><br>
+<a class="$nv.global_directory.2" href="$nv.global_directory.0" target="blank" style="margin-left: 10px; " title="$nv.global_directory.3" >$nv.global_directory.1</a><br>
 <a class="$nv.match.2" href="$nv.match.0" style="margin-left: 10px; " title="$nv.match.3" >$nv.match.1</a><br>
 <a class="$nv.suggest.2" href="$nv.suggest.0" style="margin-left: 10px; " title="$nv.suggest.3" >$nv.suggest.1</a><br>
 <a class="$nv.invite.2" href="$nv.invite.0" style="margin-left: 10px; " title="$nv.invite.3" >$nv.invite.1</a>
@@ -42,13 +42,6 @@ $nv.search
 {{ endif }}
 </div>
 
-<div id="close_postit">
-{{ if $lastusers_title }}
-<h3>PostIt to Friendica<a id="close_postit_icon" onClick="close_postit()" class="icon close_box" title="close"></a></h3>
-<div style="padding-left: 8px;"><span ><a href="$fostitJS" title="PostIt">Post to Friendica</a> from anywhere by bookmarking this Link.</span></div>
-{{ endif }}
-</div>
-
 <div id="close_lastusers">
 {{ if $lastusers_title }}
 <h3>$lastusers_title<a id="close_lastusers_icon" onClick="close_lastusers()" class="icon close_box" title="close"></a></h3>
@@ -89,4 +82,4 @@ $nv.search
 {{ endfor }}
 </ul>
 {{ endif }}
-</div>
+</div>
\ No newline at end of file
diff --git a/view/theme/diabook/config.php b/view/theme/diabook/config.php
new file mode 100644
index 000000000..2477bb3d3
--- /dev/null
+++ b/view/theme/diabook/config.php
@@ -0,0 +1,100 @@
+<?php
+/**
+ * Theme settings
+ */
+
+
+
+function theme_content(&$a){
+	if(!local_user())
+		return;		
+	
+	$font_size = get_pconfig(local_user(), 'diabook', 'font_size' );
+	$line_height = get_pconfig(local_user(), 'diabook', 'line_height' );
+	$resolution = get_pconfig(local_user(), 'diabook', 'resolution' );
+	$color = get_pconfig(local_user(), 'diabook', 'color' );
+	
+	return diabook_form($a,$font_size, $line_height, $resolution, $color);
+}
+
+function theme_post(&$a){
+	if(! local_user())
+		return;
+	
+	if (isset($_POST['diabook-settings-submit'])){
+		set_pconfig(local_user(), 'diabook', 'font_size', $_POST['diabook_font_size']);
+		set_pconfig(local_user(), 'diabook', 'line_height', $_POST['diabook_line_height']);
+		set_pconfig(local_user(), 'diabook', 'resolution', $_POST['diabook_resolution']);
+		set_pconfig(local_user(), 'diabook', 'color', $_POST['diabook_color']);	
+	}
+}
+
+
+function theme_admin(&$a){
+	$font_size = get_config('diabook', 'font_size' );
+	$line_height = get_config('diabook', 'line_height' );
+	$resolution = get_config('diabook', 'resolution' );
+	$color = get_config('diabook', 'color' );	
+	
+	return diabook_form($a,$font_size, $line_height, $resolution, $color);
+}
+
+function theme_admin_post(&$a){
+	if (isset($_POST['diabook-settings-submit'])){
+		set_config('diabook', 'font_size', $_POST['diabook_font_size']);
+		set_config('diabook', 'line_height', $_POST['diabook_line_height']);
+		set_config('diabook', 'resolution', $_POST['diabook_resolution']);
+		set_config('diabook', 'color', $_POST['diabook_color']);
+	}
+}
+
+
+function diabook_form(&$a, $font_size, $line_height, $resolution, $color){
+	$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(
+		'14'=>'14',
+		"---"=>"---",
+		"16"=>"16",		
+		"15"=>"15",
+		'13.5'=>'13.5',
+		'13'=>'13',		
+		'12.5'=>'12.5',
+		'12'=>'12',
+		);
+	$resolutions = array(
+		'normal'=>'normal',
+		'wide'=>'wide',		
+		);
+	$colors = array(
+		'diabook'=>'diabook',
+		'aerith'=>'aerith',		
+		'blue'=>'blue',		
+		'green'=>'green',
+		'pink'=>'pink',	
+		'red'=>'red',
+		'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('diabook_font_size', t('Set font-size for posts and comments'), $font_size, '', $font_sizes),
+		'$line_height' => array('diabook_line_height', t('Set line-height for posts and comments'), $line_height, '', $line_heights),
+		'$resolution' => array('diabook_resolution', t('Set resolution for middle column'), $resolution, '', $resolutions),
+		'$color' => array('diabook_color', t('Set color scheme'), $color, '', $colors),	
+	));
+	return $o;
+}
diff --git a/view/theme/diabook-aerith/icons/StatusNet.png b/view/theme/diabook/diabook-aerith/icons/StatusNet.png
index 398bca716..398bca716 100644
--- a/view/theme/diabook-aerith/icons/StatusNet.png
+++ b/view/theme/diabook/diabook-aerith/icons/StatusNet.png
diff --git a/view/theme/diabook-aerith/icons/attach.png b/view/theme/diabook/diabook-aerith/icons/attach.png
index 1958041cf..1958041cf 100755..100644
--- a/view/theme/diabook-aerith/icons/attach.png
+++ b/view/theme/diabook/diabook-aerith/icons/attach.png
diff --git a/view/theme/diabook-aerith/icons/audio.png b/view/theme/diabook/diabook-aerith/icons/audio.png
index 8d779a409..8d779a409 100755..100644
--- a/view/theme/diabook-aerith/icons/audio.png
+++ b/view/theme/diabook/diabook-aerith/icons/audio.png
diff --git a/view/theme/diabook/diabook-aerith/icons/bb-image.png b/view/theme/diabook/diabook-aerith/icons/bb-image.png
new file mode 100644
index 000000000..9a1b32113
--- /dev/null
+++ b/view/theme/diabook/diabook-aerith/icons/bb-image.png
diff --git a/view/theme/diabook/diabook-aerith/icons/bb-url.png b/view/theme/diabook/diabook-aerith/icons/bb-url.png
new file mode 100644
index 000000000..071fc1865
--- /dev/null
+++ b/view/theme/diabook/diabook-aerith/icons/bb-url.png
diff --git a/view/theme/diabook/diabook-aerith/icons/bb-video.png b/view/theme/diabook/diabook-aerith/icons/bb-video.png
new file mode 100644
index 000000000..bd323531e
--- /dev/null
+++ b/view/theme/diabook/diabook-aerith/icons/bb-video.png
diff --git a/view/theme/diabook/diabook-aerith/icons/block.png b/view/theme/diabook/diabook-aerith/icons/block.png
new file mode 100755
index 000000000..a0b1dffe9
--- /dev/null
+++ b/view/theme/diabook/diabook-aerith/icons/block.png
diff --git a/view/theme/diabook-aerith/icons/bluebug.png b/view/theme/diabook/diabook-aerith/icons/bluebug.png
index 3979e7d8e..3979e7d8e 100644
--- a/view/theme/diabook-aerith/icons/bluebug.png
+++ b/view/theme/diabook/diabook-aerith/icons/bluebug.png
diff --git a/view/theme/diabook/diabook-aerith/icons/bold.png b/view/theme/diabook/diabook-aerith/icons/bold.png
new file mode 100644
index 000000000..8fab2a10f
--- /dev/null
+++ b/view/theme/diabook/diabook-aerith/icons/bold.png
diff --git a/view/theme/diabook-aerith/icons/camera.png b/view/theme/diabook/diabook-aerith/icons/camera.png
index a5c7f1236..a5c7f1236 100755..100644
--- a/view/theme/diabook-aerith/icons/camera.png
+++ b/view/theme/diabook/diabook-aerith/icons/camera.png
diff --git a/view/theme/diabook-aerith/icons/close_box.png b/view/theme/diabook/diabook-aerith/icons/close_box.png
index 28e2675b8..28e2675b8 100755..100644
--- a/view/theme/diabook-aerith/icons/close_box.png
+++ b/view/theme/diabook/diabook-aerith/icons/close_box.png
diff --git a/view/theme/diabook/diabook-aerith/icons/com_side.png b/view/theme/diabook/diabook-aerith/icons/com_side.png
new file mode 100644
index 000000000..00186ba05
--- /dev/null
+++ b/view/theme/diabook/diabook-aerith/icons/com_side.png
diff --git a/view/theme/diabook-aerith/icons/community.png b/view/theme/diabook/diabook-aerith/icons/community.png
index 7c91e8b75..7c91e8b75 100644
--- a/view/theme/diabook-aerith/icons/community.png
+++ b/view/theme/diabook/diabook-aerith/icons/community.png
diff --git a/view/theme/diabook/diabook-aerith/icons/contacts.png b/view/theme/diabook/diabook-aerith/icons/contacts.png
new file mode 100644
index 000000000..79f6d497c
--- /dev/null
+++ b/view/theme/diabook/diabook-aerith/icons/contacts.png
diff --git a/view/theme/diabook-aerith/icons/contacts2.png b/view/theme/diabook/diabook-aerith/icons/contacts2.png
index cd0e289a7..cd0e289a7 100644
--- a/view/theme/diabook-aerith/icons/contacts2.png
+++ b/view/theme/diabook/diabook-aerith/icons/contacts2.png
diff --git a/view/theme/diabook-aerith/icons/contacts.png b/view/theme/diabook/diabook-aerith/icons/contacts3.png
index cd0e289a7..cd0e289a7 100644
--- a/view/theme/diabook-aerith/icons/contacts.png
+++ b/view/theme/diabook/diabook-aerith/icons/contacts3.png
diff --git a/view/theme/diabook-aerith/icons/dislike.png b/view/theme/diabook/diabook-aerith/icons/dislike.png
index 23de426c5..23de426c5 100644
--- a/view/theme/diabook-aerith/icons/dislike.png
+++ b/view/theme/diabook/diabook-aerith/icons/dislike.png
diff --git a/view/theme/diabook-aerith/icons/drop.png b/view/theme/diabook/diabook-aerith/icons/drop.png
index 2abb82ef2..2abb82ef2 100755..100644
--- a/view/theme/diabook-aerith/icons/drop.png
+++ b/view/theme/diabook/diabook-aerith/icons/drop.png
diff --git a/view/theme/diabook-aerith/icons/email.png b/view/theme/diabook/diabook-aerith/icons/email.png
index 240cef2c3..240cef2c3 100644
--- a/view/theme/diabook-aerith/icons/email.png
+++ b/view/theme/diabook/diabook-aerith/icons/email.png
diff --git a/view/theme/diabook/diabook-aerith/icons/events.png b/view/theme/diabook/diabook-aerith/icons/events.png
new file mode 100644
index 000000000..cf195fbb6
--- /dev/null
+++ b/view/theme/diabook/diabook-aerith/icons/events.png
diff --git a/view/theme/diabook-aerith/icons/facebook.png b/view/theme/diabook/diabook-aerith/icons/facebook.png
index 3e5dd39c3..3e5dd39c3 100644
--- a/view/theme/diabook-aerith/icons/facebook.png
+++ b/view/theme/diabook/diabook-aerith/icons/facebook.png
diff --git a/view/theme/diabook-aerith/icons/file_as.png b/view/theme/diabook/diabook-aerith/icons/file_as.png
index 16713fa53..16713fa53 100755..100644
--- a/view/theme/diabook-aerith/icons/file_as.png
+++ b/view/theme/diabook/diabook-aerith/icons/file_as.png
diff --git a/view/theme/diabook-aerith/icons/ftdevs.gif b/view/theme/diabook/diabook-aerith/icons/ftdevs.gif
index e0fc25743..e0fc25743 100644
--- a/view/theme/diabook-aerith/icons/ftdevs.gif
+++ b/view/theme/diabook/diabook-aerith/icons/ftdevs.gif
diff --git a/view/theme/diabook-aerith/icons/globe.png b/view/theme/diabook/diabook-aerith/icons/globe.png
index 6bb9bc09d..6bb9bc09d 100644
--- a/view/theme/diabook-aerith/icons/globe.png
+++ b/view/theme/diabook/diabook-aerith/icons/globe.png
diff --git a/view/theme/diabook/diabook-aerith/icons/home.png b/view/theme/diabook/diabook-aerith/icons/home.png
new file mode 100644
index 000000000..5c610805f
--- /dev/null
+++ b/view/theme/diabook/diabook-aerith/icons/home.png
diff --git a/view/theme/diabook/diabook-aerith/icons/italic.png b/view/theme/diabook/diabook-aerith/icons/italic.png
new file mode 100644
index 000000000..bf4b2b81d
--- /dev/null
+++ b/view/theme/diabook/diabook-aerith/icons/italic.png
diff --git a/view/theme/diabook-aerith/icons/language.png b/view/theme/diabook/diabook-aerith/icons/language.png
index 8029c0155..8029c0155 100644
--- a/view/theme/diabook-aerith/icons/language.png
+++ b/view/theme/diabook/diabook-aerith/icons/language.png
diff --git a/view/theme/diabook-aerith/icons/like.png b/view/theme/diabook/diabook-aerith/icons/like.png
index b65edccc0..b65edccc0 100644
--- a/view/theme/diabook-aerith/icons/like.png
+++ b/view/theme/diabook/diabook-aerith/icons/like.png
diff --git a/view/theme/diabook-aerith/icons/link.png b/view/theme/diabook/diabook-aerith/icons/link.png
index 0ef666a67..0ef666a67 100755..100644
--- a/view/theme/diabook-aerith/icons/link.png
+++ b/view/theme/diabook/diabook-aerith/icons/link.png
diff --git a/view/theme/diabook-aerith/icons/livejournal.png b/view/theme/diabook/diabook-aerith/icons/livejournal.png
index 6d27d265e..6d27d265e 100644
--- a/view/theme/diabook-aerith/icons/livejournal.png
+++ b/view/theme/diabook/diabook-aerith/icons/livejournal.png
diff --git a/view/theme/diabook-aerith/icons/lock.png b/view/theme/diabook/diabook-aerith/icons/lock.png
index 7e34bf279..7e34bf279 100755..100644
--- a/view/theme/diabook-aerith/icons/lock.png
+++ b/view/theme/diabook/diabook-aerith/icons/lock.png
diff --git a/view/theme/diabook-aerith/icons/lupe.png b/view/theme/diabook/diabook-aerith/icons/lupe.png
index f8b228347..f8b228347 100755..100644
--- a/view/theme/diabook-aerith/icons/lupe.png
+++ b/view/theme/diabook/diabook-aerith/icons/lupe.png
diff --git a/view/theme/diabook/diabook-aerith/icons/mess_side.png b/view/theme/diabook/diabook-aerith/icons/mess_side.png
new file mode 100644
index 000000000..5295e2e74
--- /dev/null
+++ b/view/theme/diabook/diabook-aerith/icons/mess_side.png
diff --git a/view/theme/diabook/diabook-aerith/icons/messages.png b/view/theme/diabook/diabook-aerith/icons/messages.png
new file mode 100644
index 000000000..c83ba186a
--- /dev/null
+++ b/view/theme/diabook/diabook-aerith/icons/messages.png
diff --git a/view/theme/diabook-aerith/icons/messages2.png b/view/theme/diabook/diabook-aerith/icons/messages2.png
index e2bf7d24d..e2bf7d24d 100755..100644
--- a/view/theme/diabook-aerith/icons/messages2.png
+++ b/view/theme/diabook/diabook-aerith/icons/messages2.png
diff --git a/view/theme/diabook-aerith/icons/messages.png b/view/theme/diabook/diabook-aerith/icons/messages3.png
index e2bf7d24d..e2bf7d24d 100755..100644
--- a/view/theme/diabook-aerith/icons/messages.png
+++ b/view/theme/diabook/diabook-aerith/icons/messages3.png
diff --git a/view/theme/diabook-aerith/icons/next.png b/view/theme/diabook/diabook-aerith/icons/next.png
index 7b5e25b90..7b5e25b90 100755..100644
--- a/view/theme/diabook-aerith/icons/next.png
+++ b/view/theme/diabook/diabook-aerith/icons/next.png
diff --git a/view/theme/diabook/diabook-aerith/icons/notes.png b/view/theme/diabook/diabook-aerith/icons/notes.png
new file mode 100644
index 000000000..28dca30a3
--- /dev/null
+++ b/view/theme/diabook/diabook-aerith/icons/notes.png
diff --git a/view/theme/diabook/diabook-aerith/icons/notifications.png b/view/theme/diabook/diabook-aerith/icons/notifications.png
new file mode 100644
index 000000000..2bcd74927
--- /dev/null
+++ b/view/theme/diabook/diabook-aerith/icons/notifications.png
diff --git a/view/theme/diabook-aerith/icons/notifications.png b/view/theme/diabook/diabook-aerith/icons/notifications3.png
index 2b4fbb818..2b4fbb818 100755..100644
--- a/view/theme/diabook-aerith/icons/notifications.png
+++ b/view/theme/diabook/diabook-aerith/icons/notifications3.png
diff --git a/view/theme/diabook/diabook-aerith/icons/notify.png b/view/theme/diabook/diabook-aerith/icons/notify.png
new file mode 100644
index 000000000..159cd2c59
--- /dev/null
+++ b/view/theme/diabook/diabook-aerith/icons/notify.png
diff --git a/view/theme/diabook-aerith/icons/notify2.png b/view/theme/diabook/diabook-aerith/icons/notify2.png
index 9765bfd53..9765bfd53 100755..100644
--- a/view/theme/diabook-aerith/icons/notify2.png
+++ b/view/theme/diabook/diabook-aerith/icons/notify2.png
diff --git a/view/theme/diabook-aerith/icons/notify.png b/view/theme/diabook/diabook-aerith/icons/notify3.png
index 9765bfd53..9765bfd53 100755..100644
--- a/view/theme/diabook-aerith/icons/notify.png
+++ b/view/theme/diabook/diabook-aerith/icons/notify3.png
diff --git a/view/theme/diabook-aerith/icons/pencil.png b/view/theme/diabook/diabook-aerith/icons/pencil.png
index 772e49b17..772e49b17 100755..100644
--- a/view/theme/diabook-aerith/icons/pencil.png
+++ b/view/theme/diabook/diabook-aerith/icons/pencil.png
diff --git a/view/theme/diabook-aerith/icons/pencil2.png b/view/theme/diabook/diabook-aerith/icons/pencil2.png
index 3b47d1864..3b47d1864 100644
--- a/view/theme/diabook-aerith/icons/pencil2.png
+++ b/view/theme/diabook/diabook-aerith/icons/pencil2.png
diff --git a/view/theme/diabook-aerith/icons/photo-menu.jpg b/view/theme/diabook/diabook-aerith/icons/photo-menu.jpg
index fde5eb535..fde5eb535 100755..100644
--- a/view/theme/diabook-aerith/icons/photo-menu.jpg
+++ b/view/theme/diabook/diabook-aerith/icons/photo-menu.jpg
diff --git a/view/theme/diabook-aerith/icons/posterous.png b/view/theme/diabook/diabook-aerith/icons/posterous.png
index c8e86078e..c8e86078e 100644
--- a/view/theme/diabook-aerith/icons/posterous.png
+++ b/view/theme/diabook/diabook-aerith/icons/posterous.png
diff --git a/view/theme/diabook-aerith/icons/prev.png b/view/theme/diabook/diabook-aerith/icons/prev.png
index 55c1464ba..55c1464ba 100755..100644
--- a/view/theme/diabook-aerith/icons/prev.png
+++ b/view/theme/diabook/diabook-aerith/icons/prev.png
diff --git a/view/theme/diabook/diabook-aerith/icons/pscontacts.png b/view/theme/diabook/diabook-aerith/icons/pscontacts.png
new file mode 100644
index 000000000..23a78bcac
--- /dev/null
+++ b/view/theme/diabook/diabook-aerith/icons/pscontacts.png
diff --git a/view/theme/diabook/diabook-aerith/icons/pubgroups.png b/view/theme/diabook/diabook-aerith/icons/pubgroups.png
new file mode 100644
index 000000000..ae04194b1
--- /dev/null
+++ b/view/theme/diabook/diabook-aerith/icons/pubgroups.png
diff --git a/view/theme/diabook/diabook-aerith/icons/quote.png b/view/theme/diabook/diabook-aerith/icons/quote.png
new file mode 100644
index 000000000..a464f2859
--- /dev/null
+++ b/view/theme/diabook/diabook-aerith/icons/quote.png
diff --git a/view/theme/diabook-aerith/icons/recycle.png b/view/theme/diabook/diabook-aerith/icons/recycle.png
index c3b8d2bf4..c3b8d2bf4 100755..100644
--- a/view/theme/diabook-aerith/icons/recycle.png
+++ b/view/theme/diabook/diabook-aerith/icons/recycle.png
diff --git a/view/theme/diabook-aerith/icons/remote.png b/view/theme/diabook/diabook-aerith/icons/remote.png
index a560cc55e..a560cc55e 100755..100644
--- a/view/theme/diabook-aerith/icons/remote.png
+++ b/view/theme/diabook/diabook-aerith/icons/remote.png
diff --git a/view/theme/diabook-aerith/icons/scroll_top.png b/view/theme/diabook/diabook-aerith/icons/scroll_top.png
index 0e7f7ae6a..0e7f7ae6a 100755..100644
--- a/view/theme/diabook-aerith/icons/scroll_top.png
+++ b/view/theme/diabook/diabook-aerith/icons/scroll_top.png
diff --git a/view/theme/diabook/diabook-aerith/icons/selected.png b/view/theme/diabook/diabook-aerith/icons/selected.png
new file mode 100644
index 000000000..3fcb95c29
--- /dev/null
+++ b/view/theme/diabook/diabook-aerith/icons/selected.png
diff --git a/view/theme/diabook-aerith/icons/srch_bg.gif b/view/theme/diabook/diabook-aerith/icons/srch_bg.gif
index 6a523ba8f..6a523ba8f 100644
--- a/view/theme/diabook-aerith/icons/srch_bg.gif
+++ b/view/theme/diabook/diabook-aerith/icons/srch_bg.gif
diff --git a/view/theme/diabook-aerith/icons/srch_l.gif b/view/theme/diabook/diabook-aerith/icons/srch_l.gif
index 6d95bf35d..6d95bf35d 100644
--- a/view/theme/diabook-aerith/icons/srch_l.gif
+++ b/view/theme/diabook/diabook-aerith/icons/srch_l.gif
diff --git a/view/theme/diabook-aerith/icons/srch_r.gif b/view/theme/diabook/diabook-aerith/icons/srch_r.gif
index 89833a316..89833a316 100644
--- a/view/theme/diabook-aerith/icons/srch_r.gif
+++ b/view/theme/diabook/diabook-aerith/icons/srch_r.gif
diff --git a/view/theme/diabook-aerith/icons/srch_r_f2.gif b/view/theme/diabook/diabook-aerith/icons/srch_r_f2.gif
index 6df457bed..6df457bed 100644
--- a/view/theme/diabook-aerith/icons/srch_r_f2.gif
+++ b/view/theme/diabook/diabook-aerith/icons/srch_r_f2.gif
diff --git a/view/theme/diabook-aerith/icons/star.png b/view/theme/diabook/diabook-aerith/icons/star.png
index 0b00cb189..0b00cb189 100755..100644
--- a/view/theme/diabook-aerith/icons/star.png
+++ b/view/theme/diabook/diabook-aerith/icons/star.png
diff --git a/view/theme/diabook-aerith/icons/star_dummy.png b/view/theme/diabook/diabook-aerith/icons/star_dummy.png
index ce11f30d4..ce11f30d4 100644
--- a/view/theme/diabook-aerith/icons/star_dummy.png
+++ b/view/theme/diabook/diabook-aerith/icons/star_dummy.png
diff --git a/view/theme/diabook-aerith/icons/starred.png b/view/theme/diabook/diabook-aerith/icons/starred.png
index 2b82dfca3..2b82dfca3 100755..100644
--- a/view/theme/diabook-aerith/icons/starred.png
+++ b/view/theme/diabook/diabook-aerith/icons/starred.png
diff --git a/view/theme/diabook-aerith/icons/tagged.png b/view/theme/diabook/diabook-aerith/icons/tagged.png
index 144649ef8..144649ef8 100755..100644
--- a/view/theme/diabook-aerith/icons/tagged.png
+++ b/view/theme/diabook/diabook-aerith/icons/tagged.png
diff --git a/view/theme/diabook-aerith/icons/toogle_off.png b/view/theme/diabook/diabook-aerith/icons/toogle_off.png
index 0fcce4d5a..0fcce4d5a 100644
--- a/view/theme/diabook-aerith/icons/toogle_off.png
+++ b/view/theme/diabook/diabook-aerith/icons/toogle_off.png
diff --git a/view/theme/diabook-aerith/icons/toogle_on.png b/view/theme/diabook/diabook-aerith/icons/toogle_on.png
index 79ce07f0e..79ce07f0e 100644
--- a/view/theme/diabook-aerith/icons/toogle_on.png
+++ b/view/theme/diabook/diabook-aerith/icons/toogle_on.png
diff --git a/view/theme/diabook-aerith/icons/tumblr.png b/view/theme/diabook/diabook-aerith/icons/tumblr.png
index 1dc7fa072..1dc7fa072 100644
--- a/view/theme/diabook-aerith/icons/tumblr.png
+++ b/view/theme/diabook/diabook-aerith/icons/tumblr.png
diff --git a/view/theme/diabook-aerith/icons/twitter.png b/view/theme/diabook/diabook-aerith/icons/twitter.png
index b7a687b9f..b7a687b9f 100644
--- a/view/theme/diabook-aerith/icons/twitter.png
+++ b/view/theme/diabook/diabook-aerith/icons/twitter.png
diff --git a/view/theme/diabook/diabook-aerith/icons/underline.png b/view/theme/diabook/diabook-aerith/icons/underline.png
new file mode 100644
index 000000000..b1b4d3574
--- /dev/null
+++ b/view/theme/diabook/diabook-aerith/icons/underline.png
diff --git a/view/theme/diabook-aerith/icons/unlock.png b/view/theme/diabook/diabook-aerith/icons/unlock.png
index a0cda0ae5..a0cda0ae5 100755..100644
--- a/view/theme/diabook-aerith/icons/unlock.png
+++ b/view/theme/diabook/diabook-aerith/icons/unlock.png
diff --git a/view/theme/diabook/diabook-aerith/icons/unselected.png b/view/theme/diabook/diabook-aerith/icons/unselected.png
new file mode 100644
index 000000000..9e9cead4b
--- /dev/null
+++ b/view/theme/diabook/diabook-aerith/icons/unselected.png
diff --git a/view/theme/diabook-aerith/icons/unstarred.png b/view/theme/diabook/diabook-aerith/icons/unstarred.png
index ba3183f5c..ba3183f5c 100755..100644
--- a/view/theme/diabook-aerith/icons/unstarred.png
+++ b/view/theme/diabook/diabook-aerith/icons/unstarred.png
diff --git a/view/theme/diabook-aerith/icons/video.png b/view/theme/diabook/diabook-aerith/icons/video.png
index a03d1d818..a03d1d818 100755..100644
--- a/view/theme/diabook-aerith/icons/video.png
+++ b/view/theme/diabook/diabook-aerith/icons/video.png
diff --git a/view/theme/diabook-aerith/icons/weblink.png b/view/theme/diabook/diabook-aerith/icons/weblink.png
index 216e78344..216e78344 100755..100644
--- a/view/theme/diabook-aerith/icons/weblink.png
+++ b/view/theme/diabook/diabook-aerith/icons/weblink.png
diff --git a/view/theme/diabook-aerith/icons/wordpress.png b/view/theme/diabook/diabook-aerith/icons/wordpress.png
index f564c4300..f564c4300 100644
--- a/view/theme/diabook-aerith/icons/wordpress.png
+++ b/view/theme/diabook/diabook-aerith/icons/wordpress.png
diff --git a/view/theme/diabook-aerith/style-settings.css b/view/theme/diabook/diabook-aerith/style-network-wide.css
index 0326dbcfc..d5c91c9a4 100644
--- a/view/theme/diabook-aerith/style-settings.css
+++ b/view/theme/diabook/diabook-aerith/style-network-wide.css
@@ -84,61 +84,61 @@
 /* icons */
 
 .icon.contacts {
-  background-image: url("../../../view/theme/diabook-aerith/icons/contacts.png");}
+  background-image: url("../diabook-aerith/icons/contacts.png");}
 .icon.notifications {
-  background-image: url("../../../view/theme/diabook-aerith/icons/notifications.png");}
+  background-image: url("../diabook-aerith/icons/notifications.png");}
 .icon.notify {
-  background-image: url("../../../view/theme/diabook-aerith/icons/notify.png");}
+  background-image: url("../diabook-aerith/icons/notify.png");}
 .icon.messages {
-  background-image: url("../../../view/theme/diabook-aerith/icons/messages.png");}
+  background-image: url("../diabook-aerith/icons/messages.png");}
 .icon.community {
-  background-image: url("../../../view/theme/diabook-aerith/icons/community.png");}
+  background-image: url("../diabook-aerith/icons/community.png");}
   
-.icon.drop 	{ background-image: url("../../../view/theme/diabook-aerith/icons/drop.png");}
-.icon.drophide 	{ background-image: url("../../../view/theme/diabook-aerith/icons/drop.png");}
-.icon.dislike 	{ background-image: url("../../../view/theme/diabook-aerith/icons/dislike.png");}
-.icon.like 	{ background-image: url("../../../view/theme/diabook-aerith/icons/like.png");}
-.icon.pencil 	{ background-image: url("../../../view/theme/diabook-aerith/icons/pencil.png");}
-.icon.recycle 	{ background-image: url("../../../view/theme/diabook-aerith/icons/recycle.png");}
-.icon.remote-link { background-image: url("../../../view/theme/diabook-aerith/icons/remote.png");}
-.icon.tagged    { background-image: url("../../../view/theme/diabook-aerith/icons/tagged.png");}
-.icon.file-as { background-image: url("../../../view/theme/diabook-aerith/icons/file_as.png");}
-.star-item.icon.unstarred { background-image: url("../../../view/theme/diabook-aerith/icons/unstarred.png");}
-.star-item.icon.starred { background-image: url("../../../view/theme/diabook-aerith/icons/starred.png");}
-.icon.link		{ background-image: url("../../../view/theme/diabook-aerith/icons/link.png");}
-.icon.lock		{ background-image: url("../../../view/theme/diabook-aerith/icons/lock.png");}
-.icon.unlock		{ background-image: url("../../../view/theme/diabook-aerith/icons/unlock.png");}
-.icon.language    { background-image: url("../../../view/theme/diabook-aerith/icons/language.png");}
-
-
-.camera 	{ background-image: url("../../../view/theme/diabook-aerith/icons/camera.png"); 
+.icon.drop 	{ background-image: url("../diabook-aerith/icons/drop.png");}
+.icon.drophide 	{ background-image: url("../diabook-aerith/icons/drop.png");}
+.icon.dislike 	{ background-image: url("../diabook-aerith/icons/dislike.png");}
+.icon.like 	{ background-image: url("../diabook-aerith/icons/like.png");}
+.icon.pencil 	{ background-image: url("../diabook-aerith/icons/pencil.png");}
+.icon.recycle 	{ background-image: url("../diabook-aerith/icons/recycle.png");}
+.icon.remote-link { background-image: url("../diabook-aerith/icons/remote.png");}
+.icon.tagged    { background-image: url("../diabook-aerith/icons/tagged.png");}
+.icon.file-as { background-image: url("../diabook-aerith/icons/file_as.png");}
+.star-item.icon.unstarred { background-image: url("../diabook-aerith/icons/unstarred.png");}
+.star-item.icon.starred { background-image: url("../diabook-aerith/icons/starred.png");}
+.icon.link		{ background-image: url("../diabook-aerith/icons/link.png");}
+.icon.lock		{ background-image: url("../diabook-aerith/icons/lock.png");}
+.icon.unlock		{ background-image: url("../diabook-aerith/icons/unlock.png");}
+.icon.language    { background-image: url("../diabook-aerith/icons/language.png");}
+
+
+.camera 	{ background-image: url("../diabook-aerith/icons/camera.png"); 
 			  display: block; width: 28px; height: 28px; background-repeat: no-repeat;
 			  }
-.attach 	{ background-image: url("../../../view/theme/diabook-aerith/icons/attach.png"); 
+.attach 	{ background-image: url("../diabook-aerith/icons/attach.png"); 
 			  display: block; width: 28px; height: 28px; background-repeat: no-repeat;
 			  }
-.video2 	{ background-image: url("../../../view/theme/diabook-aerith/icons/video.png"); 
+.video2 	{ background-image: url("../diabook-aerith/icons/video.png"); 
 			  display: block; width: 28px; height: 28px; background-repeat: no-repeat;
 			  }	
-.video 	{ background-image: url("../../../view/theme/diabook-aerith/icons/video.png"); 
-			  display: block; width: 100%; height: 28px; background-repeat: no-repeat;
+.video 	{ background-image: url("../diabook-aerith/icons/video.png"); 
+			  display: block; width: 100%; height: 140px; background-repeat: no-repeat;
 			  }
-.audio2 	{ background-image: url("../../../view/theme/diabook-aerith/icons/audio.png"); 
+.audio2 	{ background-image: url("../diabook-aerith/icons/audio.png"); 
 			  display: block; width: 28px; height: 28px; background-repeat: no-repeat;
 			  }
-.audio 	{ background-image: url("../../../view/theme/diabook-aerith/icons/audio.png"); 
+.audio 	{ background-image: url("../diabook-aerith/icons/audio.png"); 
 			  display: block; width: 28px; height: 28px; background-repeat: no-repeat;
 			  }
-.weblink 	{ background-image: url("../../../view/theme/diabook-aerith/icons/weblink.png"); 
+.weblink 	{ background-image: url("../diabook-aerith/icons/weblink.png"); 
 			  display: block; width: 28px; height: 28px; background-repeat: no-repeat;
 			  }
-.globe 	{ background-image: url("../../../view/theme/diabook-aerith/icons/globe.png"); 
+.globe 	{ background-image: url("../diabook-aerith/icons/globe.png"); 
 			  display: block; width: 28px; height: 28px; background-repeat: no-repeat;
 			  }
-.unglobe 	{ background-image: url("../../../view/theme/diabook-aerith/icons/unglobe.png"); 
+.unglobe 	{ background-image: url("../diabook-aerith/icons/unglobe.png"); 
 			  display: block; width: 28px; height: 28px; background-repeat: no-repeat;
 			  }
-.edit    {background-image: url("../../../view/theme/diabook-aerith/icons/pencil2.png"); 
+.edit    {background-image: url("../diabook-aerith/icons/pencil2.png"); 
 			  display: block; width: 28px; height: 28px; background-repeat: no-repeat;}
 			  
 			  
@@ -176,15 +176,15 @@
 /*.language       { background-position: -210px -40px;}*/
 
 
-.icon.on             { background-image: url("../../../view/theme/diabook-aerith/icons/toogle_on.png"); background-repeat: no-repeat;}
-.icon.off            { background-image: url("../../../view/theme/diabook-aerith/icons/toogle_off.png"); background-repeat: no-repeat;}
+.icon.on             { background-image: url("../diabook-aerith/icons/toogle_on.png"); background-repeat: no-repeat;}
+.icon.off            { background-image: url("../diabook-aerith/icons/toogle_off.png"); background-repeat: no-repeat;}
 .prev           { background-position: -90px  -60px;}
 .next           { background-position: -110px -60px;}
 /*.tagged     { background-position: -130px -60px;}*/
 
 .attachtype {
         display: block; width: 20px; height: 23px;
-        background-image: url('../../../images/content-types.png');
+        background-image: url('../../../../images/content-types.png');
 }
 
 .type-video { background-position: 0px 0px; }
@@ -215,12 +215,12 @@
 }
 
 .icon.border.camera{
-  background-image: url("../../../view/theme/diabook-aerith/icons/camera.png"); 
+  background-image: url("../diabook-aerith/icons/camera.png"); 
   display: block; width: 28px; height: 28px; background-repeat: no-repeat;
 	}
 	
 .icon.border.link{
-  background-image: url("../../../view/theme/diabook-aerith/icons/weblink.png"); 
+  background-image: url("../diabook-aerith/icons/weblink.png"); 
   display: block; width: 28px; height: 28px; background-repeat: no-repeat;
   margin-left: 10px;
 	}
@@ -233,34 +233,34 @@
   height: 10px;
 }
 .icon.s10.notify {
-  background-image: url("../../../images/icons/10/notify_off.png");
+  background-image: url("../../../../images/icons/10/notify_off.png");
 }
 .icon.s10.gear {
-  background-image: url("../../../images/icons/10/gear.png");
+  background-image: url("../../../../images/icons/10/gear.png");
 }
 .icon.s10.add {
-  background-image: url("../../../images/icons/10/add.png");
+  background-image: url("../../../../images/icons/10/add.png");
 }
 .icon.s10.delete {
-  background-image: url("../../../images/icons/10/delete.png");
+  background-image: url("../../../../images/icons/10/delete.png");
 }
 .icon.s10.edit {
-  background-image: url("../../../images/icons/10/edit.png");
+  background-image: url("../../../../images/icons/10/edit.png");
 }
 .icon.s10.star {
-  background-image: url("../../../images/star_dummy.png");
+  background-image: url("../../../../images/star_dummy.png");
 }
 .icon.s10.menu {
-  background-image: url("../../../images/icons/10/menu.png");
+  background-image: url("../../../../images/icons/10/menu.png");
 }
 .icon.s10.link {
-  background-image: url("../../../images/icons/10/link.png");
+  background-image: url("../../../../images/icons/10/link.png");
 }
 .icon.s10.lock {
-  background-image: url("../../../images/icons/10/lock.png");
+  background-image: url("../../../../images/icons/10/lock.png");
 }
 .icon.s10.unlock {
-  background-image: url("../../../images/icons/10/unlock.png");
+  background-image: url("../../../../images/icons/10/unlock.png");
 }
 .icon.s10.text {
   padding: 2px 0px 0px 15px;
@@ -271,34 +271,34 @@
   height: 16px;
 }
 .icon.s16.notify {
-  background-image: url("../../../images/icons/16/notify_off.png");
+  background-image: url("../../../../images/icons/16/notify_off.png");
 }
 .icon.s16.gear {
-  background-image: url("../../../images/icons/16/gear.png");
+  background-image: url("../../../../images/icons/16/gear.png");
 }
 .icon.s16.add {
-  background-image: url("../../../images/icons/16/add.png");
+  background-image: url("../../../../images/icons/16/add.png");
 }
 .icon.s16.delete {
-  background-image: url("../../../images/icons/16/delete.png");
+  background-image: url("../../../../images/icons/16/delete.png");
 }
 /*.icon.s16.edit {
-  background-image: url("../../../images/icons/16/edit.png");
+  background-image: url("../../../../images/icons/16/edit.png");
 }*/
 .icon.s16.star {
-  background-image: url("../../../images/star_dummy.png");
+  background-image: url("../../../../images/star_dummy.png");
 }
 .icon.s16.menu {
-  background-image: url("../../../images/icons/16/menu.png");
+  background-image: url("../../../../images/icons/16/menu.png");
 }
 /*.icon.s16.link {
-  background-image: url("../../../images/icons/16/link.png");
+  background-image: url("../../../../images/icons/16/link.png");
 }*/
 .icon.s16.lock {
-  background-image: url("../../../images/icons/16/lock.png");
+  background-image: url("../../../../images/icons/16/lock.png");
 }
 .icon.s16.unlock {
-  background-image: url("../../../images/icons/16/unlock.png");
+  background-image: url("../../../../images/icons/16/unlock.png");
 }
 .icon.s16.text {
   padding: 4px 0px 0px 20px;
@@ -309,34 +309,34 @@
   height: 22px;
 }
 .icon.s22.notify {
-  background-image: url("../../../images/icons/22/notify_off.png");
+  background-image: url("../../../../images/icons/22/notify_off.png");
 }
 .icon.s22.gear {
-  background-image: url("../../../images/icons/22/gear.png");
+  background-image: url("../../../../images/icons/22/gear.png");
 }
 .icon.s22.add {
-  background-image: url("../../../images/icons/22/add.png");
+  background-image: url("../../../../images/icons/22/add.png");
 }
 .icon.s22.delete {
-  background-image: url("../../../images/icons/22/delete.png");
+  background-image: url("../../../../images/icons/22/delete.png");
 }
 .icon.s22.edit {
-  background-image: url("../../../images/icons/22/edit.png");
+  background-image: url("../../../../images/icons/22/edit.png");
 }
 .icon.s22.star {
-  background-image: url("../../../images/star_dummy.png");
+  background-image: url("../../../../images/star_dummy.png");
 }
 .icon.s22.menu {
-  background-image: url("../../../images/icons/22/menu.png");
+  background-image: url("../../../../images/icons/22/menu.png");
 }
 .icon.s22.link {
-  background-image: url("../../../images/icons/22/link.png");
+  background-image: url("../../../../images/icons/22/link.png");
 }
 .icon.s22.lock {
-  background-image: url("../../../images/icons/22/lock.png");
+  background-image: url("../../../../images/icons/22/lock.png");
 }
 .icon.s22.unlock {
-  background-image: url("../../../images/icons/22/unlock.png");
+  background-image: url("../../../../images/icons/22/unlock.png");
 }
 .icon.s22.text {
   padding: 10px 0px 0px 25px;
@@ -347,34 +347,34 @@
   height: 48px;
 }
 .icon.s48.notify {
-  background-image: url("../../../images/icons/48/notify_off.png");
+  background-image: url("../../../../images/icons/48/notify_off.png");
 }
 .icon.s48.gear {
-  background-image: url("../../../images/icons/48/gear.png");
+  background-image: url("../../../../images/icons/48/gear.png");
 }
 .icon.s48.add {
-  background-image: url("../../../images/icons/48/add.png");
+  background-image: url("../../../../images/icons/48/add.png");
 }
 .icon.s48.delete {
-  background-image: url("../../../images/icons/48/delete.png");
+  background-image: url("../../../../images/icons/48/delete.png");
 }
 .icon.s48.edit {
-  background-image: url("../../../images/icons/48/edit.png");
+  background-image: url("../../../../images/icons/48/edit.png");
 }
 .icon.s48.star {
-  background-image: url("../../../images/star_dummy.png");
+  background-image: url("../../../../images/star_dummy.png");
 }
 .icon.s48.menu {
-  background-image: url("../../../images/icons/48/menu.png");
+  background-image: url("../../../../images/icons/48/menu.png");
 }
 .icon.s48.link {
-  background-image: url("../../../images/icons/48/link.png");
+  background-image: url("../../../../images/icons/48/link.png");
 }
 .icon.s48.lock {
-  background-image: url("../../../images/icons/48/lock.png");
+  background-image: url("../../../../images/icons/48/lock.png");
 }
 .icon.s48.unlock {
-  background-image: url("../../../images/icons/48/unlock.png");
+  background-image: url("../../../../images/icons/48/unlock.png");
 }
 
 #contact-edit-links ul {
@@ -385,7 +385,7 @@
 .hide-comments-outer {
   margin-left: 80px;
   margin-bottom: 1px;
-  width: 484px;
+  width: 675px;
   border-bottom: 1px solid #BDCDD4;
   background-color: #fff;
   padding: 8px;
@@ -394,7 +394,7 @@
 /* global */
 body {
   font-family: 'Lato', "Helvetica Neue", Helvetica, Arial, sans-serif;
-  font-size: 12.5px;
+  font-size: 13px;
   background-color: #ffffff;
   color: #2d2d2d;
   margin: 50px auto auto;
@@ -482,8 +482,9 @@ code {
 }
 #saved-search-ul .tool:hover,
 #nets-sidebar .tool:hover,
-#sidebar-group-list .tool:hover {
-	background: #EEE;
+#sidebar-group-list .tool:hover ,
+#fileas-sidebar .tool:hover {
+	background: aliceBlue;
 }
 .tool .label {
   float: left;
@@ -499,12 +500,12 @@ code {
 }
 /* popup notifications */
 div.jGrowl div.notice {
-  background: #511919 url("../../../images/icons/48/notice.png") no-repeat 5px center;
+  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;
+  background: #364e59 url("../../../../images/icons/48/info.png") no-repeat 5px center;
   color: #ffffff;
   padding-left: 58px;
 }
@@ -705,12 +706,13 @@ nav .nav-menu-icon img {
 nav .nav-menu-icon .nav-notify {
   top: 3px;
 }
+/*marker*/
 nav .nav-menu {
   position: relative;
   height: 16px;
   padding: 5px;
   margin: 3px 15px 0px;
-  font-size: 13px;
+  font-size: 15px;
   /*border: 3px solid #364A84;*/
 }
 nav .nav-menu.selected {
@@ -772,15 +774,15 @@ nav #nav-site-linkmenu .menu-popup {
 }
 
 nav #nav-messages-linkmenu.on .icon.messages, nav #nav-messages-linkmenu.selected .icon.messages{
-	background-image: url("../../../view/theme/diabook-aerith/icons/messages.png");
+	background-image: url("../diabook-aerith/icons/messages.png");
 	}
 	
 /*nav #nav-notifications-linkmenu.on .icon.notify,*/ nav #nav-notifications-linkmenu.selected .icon.notify{
-	background-image: url("../../../view/theme/diabook-aerith/icons/notify.png");
+	background-image: url("../diabook-aerith/icons/notify.png");
 	}
 	
 nav #nav-contacts-linkmenu.on .icon.contacts, nav #nav-contacts-linkmenu.selected .icon.contacts{
-	background-image: url("../../../view/theme/diabook-aerith/icons/contacts.png");
+	background-image: url("../diabook-aerith/icons/contacts.png");
 	}
 	
 nav #nav-apps-link.selected {
@@ -940,56 +942,75 @@ ul.menu-popup .empty {
 	}
 .menu-profile-list{
   height: auto;
-  overflow: auto;
-  padding-top: 3px;
-  padding-bottom: 3px;
-  padding-left: 16px;
+  overflow: auto;  
   min-height: 16px;
   list-style: none;
 	}
 .menu-profile-list:hover{
-	background: #EEE;
+	background: aliceBlue; 
 	}
 .menu-profile-list-item{
 	padding-left: 5px;
+	vertical-align: middle;
 	}	
 .menu-profile-list-item:hover{	
 	text-decoration: none;
    }
 /*http://prothemedesign.com/circular-icons/*/
-.menu-profile-list.home{
-	background: url("../../../view/theme/diabook-aerith/icons/home.png") no-repeat;
-	}
-.menu-profile-list.photos{
-	background: url("../../../view/theme/diabook-aerith/icons/mess_side.png") no-repeat;
-	}
-.menu-profile-list.events{
-	background: url("../../../view/theme/diabook-aerith/icons/events.png") no-repeat;
-	}
-.menu-profile-list.notes{
-	background: url("../../../view/theme/diabook-aerith/icons/notes.png") no-repeat;
-	}
-.menu-profile-list.foren{
-	background: url("../../../view/theme/diabook-aerith/icons/pubgroups.png") no-repeat;
-	}
-.menu-profile-list.com_side{
-	background: url("../../../view/theme/diabook-aerith/icons/com_side.png") no-repeat;
-	}
-.menu-profile-list.pscontacts{
-	background: url("../../../view/theme/diabook-aerith/icons/pscontacts.png") no-repeat;
+.menu-profile-icon.home{
+	background: url("../diabook-aerith/icons/home.png") no-repeat;
+	float: left;
+	height: 22px;
+	width: 22px;
 	}
+.menu-profile-icon.photos{
+	background: url("../diabook-aerith/icons/mess_side.png") no-repeat;
+	float: left;
+	height: 22px;
+   width: 22px;}
+.menu-profile-icon.events{
+	background: url("../diabook-aerith/icons/events.png") no-repeat;
+	float: left;
+	height: 22px;
+   width: 22px;}
+.menu-profile-icon.notes{
+	background: url("../diabook-aerith/icons/notes.png") no-repeat;
+	float: left;
+	height: 22px;
+   width: 22px;}
+.menu-profile-icon.foren{
+	background: url("../diabook-aerith/icons/pubgroups.png") no-repeat;
+	float: left;
+	height: 22px;
+   width: 22px;}
+.menu-profile-icon.com_side{
+	background: url("../diabook-aerith/icons/com_side.png") no-repeat;
+	float: left;
+	height: 22px;
+   width: 22px;}
+.menu-profile-icon.pscontacts{
+	background: url("../diabook-aerith/icons/pscontacts.png") no-repeat;
+	float: left;
+	height: 22px;
+   width: 22px;}
+
 /* aside */
+/*marker*/
 aside {
   display: table-cell;
   vertical-align: top;
-  width: 200px;
-  padding: 0px 10px 0px 10px;
+  width: 180px;
+  padding: 0px 5px 0px 0px;
   border-right: 1px solid #D2D2D2;
   float: left;
   /* background: #F1F1F1; */
 }
 aside #page-sidebar{display: none;}
-aside .vcard {display: none;}
+aside .vcard .fn {
+  font-size: 18px;
+  font-weight: bold;
+  margin-bottom: 5px;
+}
 aside .vcard .title {
   margin-bottom: 5px;
 }
@@ -1024,7 +1045,7 @@ aside #dfrn-request-link {
   -webkit-border-radius: 5px 5px 5px 5px;
   border-radius: 5px 5px 5px 5px;
   color: #ffffff;
-  background: #005c94 url('../../../images/connect-bg.png') no-repeat left center;
+  background: #005c94 url('../../../../images/connect-bg.png') no-repeat left center;
   font-weight: bold;
   text-transform: uppercase;
   padding: 4px 2px 2px 35px;
@@ -1045,6 +1066,10 @@ aside #search-text {
 border-top-right-radius: 15px;
 border-bottom-right-radius: 15px;
 border-bottom-left-radius: 15px;
+-moz-border-bottom-colors: #dbdbdb;
+  -moz-border-top-colors: #999;
+  -moz-border-left-colors: #999;
+  -moz-border-right-colors: #dbdbdb;
 }
 aside #side-follow-url {
 	width: 150px;
@@ -1052,7 +1077,10 @@ aside #side-follow-url {
 aside #side-peoplefind-url {
 	width: 150px;
 	}
-#contact-block {display: none;}
+#contact-block {
+  overflow: auto;
+  height: auto;
+}
 #contact-block .contact-block-h4 {
   float: left;
   margin: 5px 0px;
@@ -1085,9 +1113,11 @@ aside #side-peoplefind-url {
 	.action .s16 { width: 16px; overflow: hidden; padding: 0px;}*/
 /*  font-size: 12px; */
 }
+/*marker*/
 .widget h3 {
   padding: 0px;
   margin: 2px;
+  font-size: 1.05em;
 }
 .widget .action {
   opacity: 0.1;
@@ -1148,11 +1178,11 @@ list-style-type: disc;
   color: #3465A4;
 }
 .widget .tool.selected {
-  background: url("../../../view/theme/diabook-aerith/icons/selected.png") no-repeat left center;
+  background: url("../diabook-aerith/icons/selected.png") no-repeat left center;
 }
 /* widget: search */
 span.sbox_l  {
-	background: white url('../../../view/theme/diabook/icons/srch_l.gif') no-repeat top left;
+	background: white url('../diabook/icons/srch_l.gif') no-repeat top left;
 	float: left;
 	width: 19px; height: 19px;
 	margin-left: 10px;
@@ -1161,14 +1191,14 @@ span.sbox_l  {
 }
 
 span.sbox_r  {
-	background: white url('../../../view/theme/diabook/icons/srch_r.gif') no-repeat top left;
+	background: white url('../diabook/icons/srch_r.gif') no-repeat top left;
 	float: left;
 	width: 19px; height: 19px;
 	margin-top: 5px;
 }
 
 span.sbox input {
-	background: white url('../../../view/theme/diabook/icons/srch_bg.gif') repeat-x top left;
+	background: white url('../diabook/icons/srch_bg.gif') repeat-x top left;
 	float: left;
 	margin-top: 5px;
 	border: 0;
@@ -1185,16 +1215,20 @@ span.sbox input {
 section {
   display: table-cell;
   vertical-align: top;
-  width: 650px;
-  padding: 0px 0px 0px 20px;
+  width: auto;
+  padding: 0px 0px 0px 12px;
 }
 
 body .pageheader{
   text-align: center;
-  margin-top: 25px;
-  font-size: 0px;
+  font-size: 20px;
+  margin-bottom: 20px;
+  margin-top: 0px;
+  max-width: 575px;
+	}
+.qcomment{
+  max-width: 122px;	
 	}
-
 #id_username {
   width: 173px;	
 	}
@@ -1213,23 +1247,22 @@ body .pageheader{
 	clear: both;
 	display: block;
 }	
-.tabs {display: none;}
-.tab.button{display: none;}
-.rs_tabs {
+
+.tabs {
     
     background-position: 0 -20px;
     background-repeat: repeat-x;
     height: 27px;
     padding: 0;
  }
-.rs_tab.button {	
+.tab.button {
+    margin-left: 5px;	
     /*background: none repeat scroll 0 0 #F8F8F8;*/
     border: 1px solid #CCCCCC;
     border-radius: 3px 3px 3px 3px;
-    font-weight: bolder;
+    font-weight: normal;
     padding: 3px;
     color:  #333333;
-    text-decoration: none;
 	}
 	
 #birthday-notice, #event-notice, #birthday-wrapper, #event-wrapper{
@@ -1239,17 +1272,18 @@ body .pageheader{
 	color: #3465A4;
 	}
 
+/*marker*/
 right_aside {
   display: table-cell;
   vertical-align: top;
-  width: 170px;
-  
+  width: 180px;
   /*border-left: 1px solid #D2D2D2;*/
   
   /* background: #F1F1F1; */
 }
 right_aside a{color: #3465A4;}
-right_aside h3 {border-bottom: 1px solid #D2D2D2; padding-top: 5px; padding-bottom: 0px; padding-left: 5px; margin-bottom: 0px; 
+/*marker*/
+right_aside h3 {font-size: 1.05em; border-bottom: 1px solid #D2D2D2; padding-top: 5px; padding-bottom: 0px; padding-left: 9px; margin-bottom: 0px; 
 margin-top:30px;}
 right_aside .directory-item {	width: 50px; height: 50px; vertical-align: center; text-align: center; }
 right_aside .directory-photo { margin: 0px; }
@@ -1263,13 +1297,13 @@ right_aside #ra-photos-wrapper { padding-left: 5px; padding-top: 3px; overflow:
 #page-sidebar-right_aside .label {max-width: 128px;}
 right_aside .icon {width: 10px; height: 10px;}
 .close_box		{ 
-		background-image: url("../../../view/theme/diabook-aerith/icons/close_box.png");
+		background-image: url("../diabook-aerith/icons/close_box.png");
 		float: right;
 		cursor: pointer;
 		opacity: 0.1;
 		}
 .close_box:hover	{ 
-		background-image: url("../../../view/theme/diabook-aerith/icons/close_box.png");
+		background-image: url("../diabook-aerith/icons/close_box.png");
 		float: right;
 		cursor: pointer;
 		opacity: 1;
@@ -1287,22 +1321,24 @@ transition: all 0.2s ease-in-out;
   position: relative;
   padding: 5px;
   margin-bottom: 0px;
-  width: 575px;
+  width: 775px;
+  padding-top: 10px;
 }
 .tread-wrapper a{
   color: #3465A4;
 }
 
+/*marker*/
 .wall-item-decor {
   position: absolute;
-  left: 790px;
+  left: 780px;
   top: -10px;
   width: 16px;
 }
-
+/*marker*/
 .wall-item-container {
   display: table;
-  width: 580px;
+  width: 770px;
 }
 
 
@@ -1353,15 +1389,18 @@ transition: all 0.2s ease-in-out;
   margin-bottom: 5px;
 }
 
+/*marker*/
 .wall-item-container .wall-item-content {
-  font-size: 12.5px;
-  max-width: 420px;
+
+  max-width: 690px;
   word-wrap: break-word;
-  line-height: 1.2;
-}
 
+
+}
+/*marker*/
 .wall-item-container .wall-item-content img {
-  max-width: 400px; 
+
+
 }
 .wall-item-container .wall-item-links, .wall-item-container .wall-item-actions {
   display: table-cell;
@@ -1412,18 +1451,19 @@ transition: all 0.2s ease-in-out;
 .wall-item-container .wall-item-actions-tools input {
   float: right;
 }
+/*marker*/
 .wall-item-container.comment {
   margin-top: 5px;
   margin-bottom: 5px;
   margin-left: 80px;
-  width: 500px;
+  width: 690px;
   border-bottom: 1px solid hsl(198, 21%, 79%);
 }
 .wall-item-container.comment .contact-photo {
   width: 32px;
   height: 32px;
   margin-left: 16px;
-  /*background: url(../../../images/icons/22/user.png) no-repeat center center;*/
+  /*background: url(../../../../images/icons/22/user.png) no-repeat center center;*/
 
 }
 .wall-item-container.comment {
@@ -1435,7 +1475,7 @@ transition: all 0.2s ease-in-out;
 }
 
 .wall-item-comment-wrapper {
-  margin: 1px 0px 0px 80px;
+  margin: 1px 5px 5px 80px;
   background-color: #fff;
   width: 500px;
 }
@@ -1443,14 +1483,13 @@ transition: all 0.2s ease-in-out;
   display: none;
 }
 .wall-item-comment-wrapper textarea {
-  height: 2.0em;
-  width: 93%;
+  height: 1.6em ;
+  width: 100%;
   font-size: 10px;
   color: #999999;
   border: 1px solid #DDD;
   padding: 0.3em;
   font-size: 14px;
-  margin-left: 20px;
 }
 .wall-item-comment-wrapper .comment-edit-text-full {
   font-size: 14px;
@@ -1459,15 +1498,15 @@ transition: all 0.2s ease-in-out;
   border: 1px solid #2d2d2d;
 }
 .comment-edit-preview {
-  width: 710px;
-  border: 1px solid #2d2d2d;
+  width: 500px;
   margin-top: 10px;
+  background-color:  #fff797;
 }
 .comment-edit-preview .contact-photo {
   width: 32px;
   height: 32px;
   margin-left: 16px;
-  /*background: url(../../../images/icons/22/user.png) no-repeat center center;*/
+  /*background: url(../../../../images/icons/22/user.png) no-repeat center center;*/
 
 }
 .comment-edit-preview {
@@ -1504,14 +1543,14 @@ transition: all 0.2s ease-in-out;
   padding-bottom: 2px;
 }
 .tag {
-  /*background: url("../../../images/tag_b.png") repeat-x center left;*/
+  /*background: url("../../../../images/tag_b.png") repeat-x center left;*/
   color: #999;
   padding-left: 3px;
   font-size: 12px;
 }
 .tag a {
   padding-right: 5px;
-  /*background: url("../../../images/tag.png") no-repeat center right;*/
+  /*background: url("../../../../images/tag.png") no-repeat center right;*/
   color: #999;
 }
 .wwto {
@@ -1607,6 +1646,11 @@ transition: all 0.2s ease-in-out;
   padding: 0.3em;
   margin-bottom: 10px;
 }
+.grey
+{
+  display: inline;
+  float: right;	
+	}
 #jot #jot-tools {
   margin: 0px;
   padding: 0px;
@@ -1692,7 +1736,7 @@ transition: all 0.2s ease-in-out;
     height: 20px;
     margin: 0 0 5px;
     width: 60%;
-    border: 1px solid #ffffff;
+    border: 1px solid #d2d2d2;
 }
 #profile-jot-form #jot-title:-webkit-input-placeholder {
   font-weight: normal;
@@ -1734,14 +1778,15 @@ transition: all 0.2s ease-in-out;
 	cursor: pointer;
 	margin-top: 2px;
 }
+/*marker*/
 #profile-jot-wrapper{
-	margin: 0 2em 20px 0;
-   width: 585px;
+	margin: 0 20px 20px 0;
+   width: 785px;
 	}
-
+/*marker*/
 #profile-jot-submit-wrapper {
 	margin-bottom: 50px;
-	width: 585px;
+	width: 785px;
 }
 
 #profile-jot-submit {
@@ -1846,7 +1891,7 @@ transition: all 0.2s ease-in-out;
 }
 #acl-search {
   float: right;
-  background: #ffffff url("../../../images/search_18.png") no-repeat right center;
+  background: #ffffff url("../../../../images/search_18.png") no-repeat right center;
   padding-right: 20px;
 }
 #acl-showall {
@@ -1855,7 +1900,7 @@ transition: all 0.2s ease-in-out;
   width: auto;
   height: 18px;
   background-color: #cccccc;
-  background-image: url("../../../images/show_all_off.png");
+  background-image: url("../../../../images/show_all_off.png");
   background-position: 7px 7px;
   background-repeat: no-repeat;
   padding: 7px 5px 0px 30px;
@@ -1867,7 +1912,7 @@ transition: all 0.2s ease-in-out;
 #acl-showall.selected {
   color: #000000;
   background-color: #ff9900;
-  background-image: url("../../../images/show_all_on.png");
+  background-image: url("../../../../images/show_all_on.png");
 }
 #acl-list {
   height: 210px;
@@ -1918,20 +1963,20 @@ transition: all 0.2s ease-in-out;
   color: #000000;
 }
 .acl-button-show {
-  background-image: url("../../../images/show_off.png");
+  background-image: url("../../../../images/show_off.png");
 }
 .acl-button-hide {
-  background-image: url("../../../images/hide_off.png");
+  background-image: url("../../../../images/hide_off.png");
 }
 .acl-button-show.selected {
   color: #000000;
   background-color: #9ade00;
-  background-image: url("../../../images/show_on.png");
+  background-image: url("../../../../images/show_on.png");
 }
 .acl-button-hide.selected {
   color: #000000;
   background-color: #ff4141;
-  background-image: url("../../../images/hide_on.png");
+  background-image: url("../../../../images/hide_on.png");
 }
 .acl-list-item.groupshow {
   border-color: #9ade00;
@@ -1941,23 +1986,24 @@ transition: all 0.2s ease-in-out;
 }
 /** /acl **/
 /** tab buttons 14618a**/
-ul.rs_tabs {
+/*marker*/
+ul.tabs {
   list-style-type: none;
-
-  font-size: 11px;
+  padding-bottom: 10px;
+  font-size: 13px;
+  width: 805px;
 }
-ul.rs_tabs li {
+ul.tabs li {
   float: left;
-  margin-bottom: 30px;
-  clear: both;
+  margin-left: 5px;
 }
-ul.rs_tabs li .active {
+ul.tabs li .active {
     background-color: #3465A4;
     border: 1px solid #777777;
     color: white;
     border-radius: 3px 3px 3px 3px;
     box-shadow: 2px 2px 2px #CFCFCF;
-    font-size: 13px;
+    margin-left: 5px;
 }
 /**
  * Form fields
@@ -1990,7 +2036,7 @@ ul.rs_tabs li .active {
 .field .onoff a {
   display: block;
   border: 1px solid #666666;
-  background-image: url("../../../images/onoff.jpg");
+  background-image: url("../../../../images/onoff.jpg");
   background-repeat: no-repeat;
   padding: 4px 2px 2px 2px;
   height: 16px;
@@ -2063,7 +2109,7 @@ ul.rs_tabs li .active {
   margin: 10px;
 }
 .oauthapp img.noicon {
-  background-image: url("../../../images/icons/48/plugin.png");
+  background-image: url("../../../../images/icons/48/plugin.png");
   background-position: center center;
   background-repeat: no-repeat;
 }
@@ -2079,9 +2125,10 @@ ul.rs_tabs li .active {
 /* photo */
 .photo {
 box-shadow: 2px 2px 5px 0px #000000;
-margin: 2px 5px 2px 5px;
-max-height: 85%;
-max-width: 85%;
+margin: 0px;
+border-radius: 10px;
+height: 145px !important;
+width: 145px !important;
 }
 .lframe {
   float: left;
@@ -2109,14 +2156,14 @@ max-width: 85%;
 
 .contact-photo-menu-button {
         position: relative;
-        background-image: url("../../../images/icons/16/menu.png");
+        background-image: url("../../../../images/icons/16/menu.png");
         background-position: top left; 
         background-repeat: no-repeat;
         margin: 0px 0px -16px 0px; 
 	padding: 0px;
         width: 16px;
         height: 16px;
-        top: -20px; left:0px;
+        top: -16px; left:0px;
         overflow: hidden;
         text-indent: 40px;
         display: none;
@@ -2154,6 +2201,11 @@ blockquote {
     border-left: 1px solid #D2D2D2;
     padding-left: 9px;
     margin: 0 0 0 .8ex;
+	 color: #777;
+}
+.oembed {
+	
+	font-weight: bold;
 }
 .aprofile dt{
 box-shadow: 1px 1px 5px 0;
@@ -2192,6 +2244,9 @@ box-shadow: 1px 1px 5px 0;
 #group-separator,
 #prof-separator { display: none;}
 */
+#prof-members-end{
+	clear: both;
+	}
 
 #prvmail-to-label, #prvmail-subject-label, #prvmail-message-label {
 	margin-bottom: 10px;
@@ -2317,7 +2372,7 @@ a.mail-list-link {
 }
 
 .vevent {
-        border: 1px solid #CCCCCC;
+
 }
 .vevent .event-description, .vevent .event-location {
         margin-left: 10px;
@@ -2340,7 +2395,7 @@ a.mail-list-link {
 }
 
 .event-description:before {
-        content: url('../../../images/calendar.png');
+        content: url('../../../../images/calendar.png');
         margin-right: 15px;
 }
 
@@ -2495,8 +2550,8 @@ float: left;
   display: none;
   /* position: absolute; */
   /* position: absolute; */
-  left: -2px;
-  top: -20px;
+  left: 0px;
+  top: -16px;
 }
 .contact-wrapper {
   float: left;
diff --git a/view/theme/diabook-aerith/style-network.css b/view/theme/diabook/diabook-aerith/style-network.css
index f6c7bc69a..21273c19c 100644
--- a/view/theme/diabook-aerith/style-network.css
+++ b/view/theme/diabook/diabook-aerith/style-network.css
@@ -84,61 +84,61 @@
 /* icons */
 
 .icon.contacts {
-  background-image: url("../../../view/theme/diabook-aerith/icons/contacts.png");}
+  background-image: url("../diabook-aerith/icons/contacts.png");}
 .icon.notifications {
-  background-image: url("../../../view/theme/diabook-aerith/icons/notifications.png");}
+  background-image: url("../diabook-aerith/icons/notifications.png");}
 .icon.notify {
-  background-image: url("../../../view/theme/diabook-aerith/icons/notify.png");}
+  background-image: url("../diabook-aerith/icons/notify.png");}
 .icon.messages {
-  background-image: url("../../../view/theme/diabook-aerith/icons/messages.png");}
+  background-image: url("../diabook-aerith/icons/messages.png");}
 .icon.community {
-  background-image: url("../../../view/theme/diabook-aerith/icons/community.png");}
+  background-image: url("../diabook-aerith/icons/community.png");}
   
-.icon.drop 	{ background-image: url("../../../view/theme/diabook-aerith/icons/drop.png");}
-.icon.drophide 	{ background-image: url("../../../view/theme/diabook-aerith/icons/drop.png");}
-.icon.dislike 	{ background-image: url("../../../view/theme/diabook-aerith/icons/dislike.png");}
-.icon.like 	{ background-image: url("../../../view/theme/diabook-aerith/icons/like.png");}
-.icon.pencil 	{ background-image: url("../../../view/theme/diabook-aerith/icons/pencil.png");}
-.icon.recycle 	{ background-image: url("../../../view/theme/diabook-aerith/icons/recycle.png");}
-.icon.remote-link { background-image: url("../../../view/theme/diabook-aerith/icons/remote.png");}
-.icon.tagged    { background-image: url("../../../view/theme/diabook-aerith/icons/tagged.png");}
-.icon.file-as { background-image: url("../../../view/theme/diabook-aerith/icons/file_as.png");}
-.star-item.icon.unstarred { background-image: url("../../../view/theme/diabook-aerith/icons/unstarred.png");}
-.star-item.icon.starred { background-image: url("../../../view/theme/diabook-aerith/icons/starred.png");}
-.icon.link		{ background-image: url("../../../view/theme/diabook-aerith/icons/link.png");}
-.icon.lock		{ background-image: url("../../../view/theme/diabook-aerith/icons/lock.png");}
-.icon.unlock		{ background-image: url("../../../view/theme/diabook-aerith/icons/unlock.png");}
-.icon.language    { background-image: url("../../../view/theme/diabook-aerith/icons/language.png");}
-
-
-.camera 	{ background-image: url("../../../view/theme/diabook-aerith/icons/camera.png"); 
+.icon.drop 	{ background-image: url("../diabook-aerith/icons/drop.png");}
+.icon.drophide 	{ background-image: url("../diabook-aerith/icons/drop.png");}
+.icon.dislike 	{ background-image: url("../diabook-aerith/icons/dislike.png");}
+.icon.like 	{ background-image: url("../diabook-aerith/icons/like.png");}
+.icon.pencil 	{ background-image: url("../diabook-aerith/icons/pencil.png");}
+.icon.recycle 	{ background-image: url("../diabook-aerith/icons/recycle.png");}
+.icon.remote-link { background-image: url("../diabook-aerith/icons/remote.png");}
+.icon.tagged    { background-image: url("../diabook-aerith/icons/tagged.png");}
+.icon.file-as { background-image: url("../diabook-aerith/icons/file_as.png");}
+.star-item.icon.unstarred { background-image: url("../diabook-aerith/icons/unstarred.png");}
+.star-item.icon.starred { background-image: url("../diabook-aerith/icons/starred.png");}
+.icon.link		{ background-image: url("../diabook-aerith/icons/link.png");}
+.icon.lock		{ background-image: url("../diabook-aerith/icons/lock.png");}
+.icon.unlock		{ background-image: url("../diabook-aerith/icons/unlock.png");}
+.icon.language    { background-image: url("../diabook-aerith/icons/language.png");}
+
+
+.camera 	{ background-image: url("../diabook-aerith/icons/camera.png"); 
 			  display: block; width: 28px; height: 28px; background-repeat: no-repeat;
 			  }
-.attach 	{ background-image: url("../../../view/theme/diabook-aerith/icons/attach.png"); 
+.attach 	{ background-image: url("../diabook-aerith/icons/attach.png"); 
 			  display: block; width: 28px; height: 28px; background-repeat: no-repeat;
 			  }
-.video2 	{ background-image: url("../../../view/theme/diabook-aerith/icons/video.png"); 
+.video2 	{ background-image: url("../diabook-aerith/icons/video.png"); 
 			  display: block; width: 28px; height: 28px; background-repeat: no-repeat;
 			  }	
-.video 	{ background-image: url("../../../view/theme/diabook-aerith/icons/video.png"); 
-			  display: block; width: 100%; height: 28px; background-repeat: no-repeat;
+.video 	{ background-image: url("../diabook-aerith/icons/video.png"); 
+			  display: block; width: 100%; height: 140px; background-repeat: no-repeat;
 			  }
-.audio2 	{ background-image: url("../../../view/theme/diabook-aerith/icons/audio.png"); 
+.audio2 	{ background-image: url("../diabook-aerith/icons/audio.png"); 
 			  display: block; width: 28px; height: 28px; background-repeat: no-repeat;
 			  }
-.audio 	{ background-image: url("../../../view/theme/diabook-aerith/icons/audio.png"); 
+.audio 	{ background-image: url("../diabook-aerith/icons/audio.png"); 
 			  display: block; width: 28px; height: 28px; background-repeat: no-repeat;
 			  }
-.weblink 	{ background-image: url("../../../view/theme/diabook-aerith/icons/weblink.png"); 
+.weblink 	{ background-image: url("../diabook-aerith/icons/weblink.png"); 
 			  display: block; width: 28px; height: 28px; background-repeat: no-repeat;
 			  }
-.globe 	{ background-image: url("../../../view/theme/diabook-aerith/icons/globe.png"); 
+.globe 	{ background-image: url("../diabook-aerith/icons/globe.png"); 
 			  display: block; width: 28px; height: 28px; background-repeat: no-repeat;
 			  }
-.unglobe 	{ background-image: url("../../../view/theme/diabook-aerith/icons/unglobe.png"); 
+.unglobe 	{ background-image: url("../diabook-aerith/icons/unglobe.png"); 
 			  display: block; width: 28px; height: 28px; background-repeat: no-repeat;
 			  }
-.edit    {background-image: url("../../../view/theme/diabook-aerith/icons/pencil2.png"); 
+.edit    {background-image: url("../diabook-aerith/icons/pencil2.png"); 
 			  display: block; width: 28px; height: 28px; background-repeat: no-repeat;}
 			  
 			  
@@ -176,15 +176,15 @@
 /*.language       { background-position: -210px -40px;}*/
 
 
-.icon.on             { background-image: url("../../../view/theme/diabook-aerith/icons/toogle_on.png"); background-repeat: no-repeat;}
-.icon.off            { background-image: url("../../../view/theme/diabook-aerith/icons/toogle_off.png"); background-repeat: no-repeat;}
+.icon.on             { background-image: url("../diabook-aerith/icons/toogle_on.png"); background-repeat: no-repeat;}
+.icon.off            { background-image: url("../diabook-aerith/icons/toogle_off.png"); background-repeat: no-repeat;}
 .prev           { background-position: -90px  -60px;}
 .next           { background-position: -110px -60px;}
 /*.tagged     { background-position: -130px -60px;}*/
 
 .attachtype {
         display: block; width: 20px; height: 23px;
-        background-image: url('../../../images/content-types.png');
+        background-image: url('../../../../images/content-types.png');
 }
 
 .type-video { background-position: 0px 0px; }
@@ -215,12 +215,12 @@
 }
 
 .icon.border.camera{
-  background-image: url("../../../view/theme/diabook-aerith/icons/camera.png"); 
+  background-image: url("../diabook-aerith/icons/camera.png"); 
   display: block; width: 28px; height: 28px; background-repeat: no-repeat;
 	}
 	
 .icon.border.link{
-  background-image: url("../../../view/theme/diabook-aerith/icons/weblink.png"); 
+  background-image: url("../diabook-aerith/icons/weblink.png"); 
   display: block; width: 28px; height: 28px; background-repeat: no-repeat;
   margin-left: 10px;
 	}
@@ -233,34 +233,34 @@
   height: 10px;
 }
 .icon.s10.notify {
-  background-image: url("../../../images/icons/10/notify_off.png");
+  background-image: url("../../../../images/icons/10/notify_off.png");
 }
 .icon.s10.gear {
-  background-image: url("../../../images/icons/10/gear.png");
+  background-image: url("../../../../images/icons/10/gear.png");
 }
 .icon.s10.add {
-  background-image: url("../../../images/icons/10/add.png");
+  background-image: url("../../../../images/icons/10/add.png");
 }
 .icon.s10.delete {
-  background-image: url("../../../images/icons/10/delete.png");
+  background-image: url("../../../../images/icons/10/delete.png");
 }
 .icon.s10.edit {
-  background-image: url("../../../images/icons/10/edit.png");
+  background-image: url("../../../../images/icons/10/edit.png");
 }
 .icon.s10.star {
-  background-image: url("../../../images/star_dummy.png");
+  background-image: url("../../../../images/star_dummy.png");
 }
 .icon.s10.menu {
-  background-image: url("../../../images/icons/10/menu.png");
+  background-image: url("../../../../images/icons/10/menu.png");
 }
 .icon.s10.link {
-  background-image: url("../../../images/icons/10/link.png");
+  background-image: url("../../../../images/icons/10/link.png");
 }
 .icon.s10.lock {
-  background-image: url("../../../images/icons/10/lock.png");
+  background-image: url("../../../../images/icons/10/lock.png");
 }
 .icon.s10.unlock {
-  background-image: url("../../../images/icons/10/unlock.png");
+  background-image: url("../../../../images/icons/10/unlock.png");
 }
 .icon.s10.text {
   padding: 2px 0px 0px 15px;
@@ -271,34 +271,34 @@
   height: 16px;
 }
 .icon.s16.notify {
-  background-image: url("../../../images/icons/16/notify_off.png");
+  background-image: url("../../../../images/icons/16/notify_off.png");
 }
 .icon.s16.gear {
-  background-image: url("../../../images/icons/16/gear.png");
+  background-image: url("../../../../images/icons/16/gear.png");
 }
 .icon.s16.add {
-  background-image: url("../../../images/icons/16/add.png");
+  background-image: url("../../../../images/icons/16/add.png");
 }
 .icon.s16.delete {
-  background-image: url("../../../images/icons/16/delete.png");
+  background-image: url("../../../../images/icons/16/delete.png");
 }
 /*.icon.s16.edit {
-  background-image: url("../../../images/icons/16/edit.png");
+  background-image: url("../../../../images/icons/16/edit.png");
 }*/
 .icon.s16.star {
-  background-image: url("../../../images/star_dummy.png");
+  background-image: url("../../../../images/star_dummy.png");
 }
 .icon.s16.menu {
-  background-image: url("../../../images/icons/16/menu.png");
+  background-image: url("../../../../images/icons/16/menu.png");
 }
 /*.icon.s16.link {
-  background-image: url("../../../images/icons/16/link.png");
+  background-image: url("../../../../images/icons/16/link.png");
 }*/
 .icon.s16.lock {
-  background-image: url("../../../images/icons/16/lock.png");
+  background-image: url("../../../../images/icons/16/lock.png");
 }
 .icon.s16.unlock {
-  background-image: url("../../../images/icons/16/unlock.png");
+  background-image: url("../../../../images/icons/16/unlock.png");
 }
 .icon.s16.text {
   padding: 4px 0px 0px 20px;
@@ -309,34 +309,34 @@
   height: 22px;
 }
 .icon.s22.notify {
-  background-image: url("../../../images/icons/22/notify_off.png");
+  background-image: url("../../../../images/icons/22/notify_off.png");
 }
 .icon.s22.gear {
-  background-image: url("../../../images/icons/22/gear.png");
+  background-image: url("../../../../images/icons/22/gear.png");
 }
 .icon.s22.add {
-  background-image: url("../../../images/icons/22/add.png");
+  background-image: url("../../../../images/icons/22/add.png");
 }
 .icon.s22.delete {
-  background-image: url("../../../images/icons/22/delete.png");
+  background-image: url("../../../../images/icons/22/delete.png");
 }
 .icon.s22.edit {
-  background-image: url("../../../images/icons/22/edit.png");
+  background-image: url("../../../../images/icons/22/edit.png");
 }
 .icon.s22.star {
-  background-image: url("../../../images/star_dummy.png");
+  background-image: url("../../../../images/star_dummy.png");
 }
 .icon.s22.menu {
-  background-image: url("../../../images/icons/22/menu.png");
+  background-image: url("../../../../images/icons/22/menu.png");
 }
 .icon.s22.link {
-  background-image: url("../../../images/icons/22/link.png");
+  background-image: url("../../../../images/icons/22/link.png");
 }
 .icon.s22.lock {
-  background-image: url("../../../images/icons/22/lock.png");
+  background-image: url("../../../../images/icons/22/lock.png");
 }
 .icon.s22.unlock {
-  background-image: url("../../../images/icons/22/unlock.png");
+  background-image: url("../../../../images/icons/22/unlock.png");
 }
 .icon.s22.text {
   padding: 10px 0px 0px 25px;
@@ -347,34 +347,34 @@
   height: 48px;
 }
 .icon.s48.notify {
-  background-image: url("../../../images/icons/48/notify_off.png");
+  background-image: url("../../../../images/icons/48/notify_off.png");
 }
 .icon.s48.gear {
-  background-image: url("../../../images/icons/48/gear.png");
+  background-image: url("../../../../images/icons/48/gear.png");
 }
 .icon.s48.add {
-  background-image: url("../../../images/icons/48/add.png");
+  background-image: url("../../../../images/icons/48/add.png");
 }
 .icon.s48.delete {
-  background-image: url("../../../images/icons/48/delete.png");
+  background-image: url("../../../../images/icons/48/delete.png");
 }
 .icon.s48.edit {
-  background-image: url("../../../images/icons/48/edit.png");
+  background-image: url("../../../../images/icons/48/edit.png");
 }
 .icon.s48.star {
-  background-image: url("../../../images/star_dummy.png");
+  background-image: url("../../../../images/star_dummy.png");
 }
 .icon.s48.menu {
-  background-image: url("../../../images/icons/48/menu.png");
+  background-image: url("../../../../images/icons/48/menu.png");
 }
 .icon.s48.link {
-  background-image: url("../../../images/icons/48/link.png");
+  background-image: url("../../../../images/icons/48/link.png");
 }
 .icon.s48.lock {
-  background-image: url("../../../images/icons/48/lock.png");
+  background-image: url("../../../../images/icons/48/lock.png");
 }
 .icon.s48.unlock {
-  background-image: url("../../../images/icons/48/unlock.png");
+  background-image: url("../../../../images/icons/48/unlock.png");
 }
 
 #contact-edit-links ul {
@@ -482,8 +482,9 @@ code {
 }
 #saved-search-ul .tool:hover,
 #nets-sidebar .tool:hover,
-#sidebar-group-list .tool:hover {
-	background: #EEE;
+#sidebar-group-list .tool:hover ,
+#fileas-sidebar .tool:hover {
+	background: aliceBlue;
 }
 .tool .label {
   float: left;
@@ -499,12 +500,12 @@ code {
 }
 /* popup notifications */
 div.jGrowl div.notice {
-  background: #511919 url("../../../images/icons/48/notice.png") no-repeat 5px center;
+  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;
+  background: #364e59 url("../../../../images/icons/48/info.png") no-repeat 5px center;
   color: #ffffff;
   padding-left: 58px;
 }
@@ -772,15 +773,15 @@ nav #nav-site-linkmenu .menu-popup {
 }
 
 nav #nav-messages-linkmenu.on .icon.messages, nav #nav-messages-linkmenu.selected .icon.messages{
-	background-image: url("../../../view/theme/diabook-aerith/icons/messages.png");
+	background-image: url("../diabook-aerith/icons/messages.png");
 	}
 	
 /*nav #nav-notifications-linkmenu.on .icon.notify,*/ nav #nav-notifications-linkmenu.selected .icon.notify{
-	background-image: url("../../../view/theme/diabook-aerith/icons/notify.png");
+	background-image: url("../diabook-aerith/icons/notify.png");
 	}
 	
 nav #nav-contacts-linkmenu.on .icon.contacts, nav #nav-contacts-linkmenu.selected .icon.contacts{
-	background-image: url("../../../view/theme/diabook-aerith/icons/contacts.png");
+	background-image: url("../diabook-aerith/icons/contacts.png");
 	}
 	
 nav #nav-apps-link.selected {
@@ -940,44 +941,58 @@ ul.menu-popup .empty {
 	}
 .menu-profile-list{
   height: auto;
-  overflow: auto;
-  padding-top: 3px;
-  padding-bottom: 3px;
-  padding-left: 16px;
+  overflow: auto;  
   min-height: 16px;
   list-style: none;
 	}
 .menu-profile-list:hover{
-	background: #EEE;
+	background: aliceBlue; 
 	}
 .menu-profile-list-item{
 	padding-left: 5px;
+	vertical-align: middle;
 	}	
 .menu-profile-list-item:hover{	
 	text-decoration: none;
    }
 /*http://prothemedesign.com/circular-icons/*/
-.menu-profile-list.home{
-	background: url("../../../view/theme/diabook-aerith/icons/home.png") no-repeat;
-	}
-.menu-profile-list.photos{
-	background: url("../../../view/theme/diabook-aerith/icons/mess_side.png") no-repeat;
-	}
-.menu-profile-list.events{
-	background: url("../../../view/theme/diabook-aerith/icons/events.png") no-repeat;
-	}
-.menu-profile-list.notes{
-	background: url("../../../view/theme/diabook-aerith/icons/notes.png") no-repeat;
-	}
-.menu-profile-list.foren{
-	background: url("../../../view/theme/diabook-aerith/icons/pubgroups.png") no-repeat;
-	}
-.menu-profile-list.com_side{
-	background: url("../../../view/theme/diabook-aerith/icons/com_side.png") no-repeat;
-	}
-.menu-profile-list.pscontacts{
-	background: url("../../../view/theme/diabook-aerith/icons/pscontacts.png") no-repeat;
+.menu-profile-icon.home{
+	background: url("../diabook-aerith/icons/home.png") no-repeat;
+	float: left;
+	height: 22px;
+	width: 22px;
 	}
+.menu-profile-icon.photos{
+	background: url("../diabook-aerith/icons/mess_side.png") no-repeat;
+	float: left;
+	height: 22px;
+   width: 22px;}
+.menu-profile-icon.events{
+	background: url("../diabook-aerith/icons/events.png") no-repeat;
+	float: left;
+	height: 22px;
+   width: 22px;}
+.menu-profile-icon.notes{
+	background: url("../diabook-aerith/icons/notes.png") no-repeat;
+	float: left;
+	height: 22px;
+   width: 22px;}
+.menu-profile-icon.foren{
+	background: url("../diabook-aerith/icons/pubgroups.png") no-repeat;
+	float: left;
+	height: 22px;
+   width: 22px;}
+.menu-profile-icon.com_side{
+	background: url("../diabook-aerith/icons/com_side.png") no-repeat;
+	float: left;
+	height: 22px;
+   width: 22px;}
+.menu-profile-icon.pscontacts{
+	background: url("../diabook-aerith/icons/pscontacts.png") no-repeat;
+	float: left;
+	height: 22px;
+   width: 22px;}
+
 /* aside */
 aside {
   display: table-cell;
@@ -1028,7 +1043,7 @@ aside #dfrn-request-link {
   -webkit-border-radius: 5px 5px 5px 5px;
   border-radius: 5px 5px 5px 5px;
   color: #ffffff;
-  background: #005c94 url('../../../images/connect-bg.png') no-repeat left center;
+  background: #005c94 url('../../../../images/connect-bg.png') no-repeat left center;
   font-weight: bold;
   text-transform: uppercase;
   padding: 4px 2px 2px 35px;
@@ -1049,6 +1064,10 @@ aside #search-text {
 border-top-right-radius: 15px;
 border-bottom-right-radius: 15px;
 border-bottom-left-radius: 15px;
+-moz-border-bottom-colors: #dbdbdb;
+  -moz-border-top-colors: #999;
+  -moz-border-left-colors: #999;
+  -moz-border-right-colors: #dbdbdb;
 }
 aside #side-follow-url {
 	width: 150px;
@@ -1155,11 +1174,11 @@ list-style-type: disc;
   color: #3465A4;
 }
 .widget .tool.selected {
-  background: url("../../../view/theme/diabook-aerith/icons/selected.png") no-repeat left center;
+  background: url("../diabook-aerith/icons/selected.png") no-repeat left center;
 }
 /* widget: search */
 span.sbox_l  {
-	background: white url('../../../view/theme/diabook/icons/srch_l.gif') no-repeat top left;
+	background: white url('../diabook/icons/srch_l.gif') no-repeat top left;
 	float: left;
 	width: 19px; height: 19px;
 	margin-left: 10px;
@@ -1168,14 +1187,14 @@ span.sbox_l  {
 }
 
 span.sbox_r  {
-	background: white url('../../../view/theme/diabook/icons/srch_r.gif') no-repeat top left;
+	background: white url('../diabook/icons/srch_r.gif') no-repeat top left;
 	float: left;
 	width: 19px; height: 19px;
 	margin-top: 5px;
 }
 
 span.sbox input {
-	background: white url('../../../view/theme/diabook/icons/srch_bg.gif') repeat-x top left;
+	background: white url('../diabook/icons/srch_bg.gif') repeat-x top left;
 	float: left;
 	margin-top: 5px;
 	border: 0;
@@ -1198,10 +1217,14 @@ section {
 
 body .pageheader{
   text-align: center;
-  margin-top: 25px;
-  font-size: 0px;
+  font-size: 20px;
+  margin-bottom: 20px;
+  margin-top: 0px;
+  max-width: 575px;
+	}
+.qcomment{
+  max-width: 122px;	
 	}
-
 #id_username {
   width: 173px;	
 	}
@@ -1229,7 +1252,6 @@ body .pageheader{
     padding: 0;
  }
 .tab.button {
-    margin-right: 5px; 
     margin-left: 5px;	
     /*background: none repeat scroll 0 0 #F8F8F8;*/
     border: 1px solid #CCCCCC;
@@ -1256,7 +1278,7 @@ right_aside {
   /* background: #F1F1F1; */
 }
 right_aside a{color: #3465A4;}
-right_aside h3 {border-bottom: 1px solid #D2D2D2; padding-top: 5px; padding-bottom: 0px; padding-left: 5px; margin-bottom: 0px; 
+right_aside h3 {border-bottom: 1px solid #D2D2D2; padding-top: 5px; padding-bottom: 0px; padding-left: 9px; margin-bottom: 0px; 
 margin-top:30px;}
 right_aside .directory-item {	width: 50px; height: 50px; vertical-align: center; text-align: center; }
 right_aside .directory-photo { margin: 0px; }
@@ -1270,13 +1292,13 @@ right_aside #ra-photos-wrapper { padding-left: 5px; padding-top: 3px; overflow:
 #page-sidebar-right_aside .label {max-width: 128px;}
 right_aside .icon {width: 10px; height: 10px;}
 .close_box		{ 
-		background-image: url("../../../view/theme/diabook-aerith/icons/close_box.png");
+		background-image: url("../diabook-aerith/icons/close_box.png");
 		float: right;
 		cursor: pointer;
 		opacity: 0.1;
 		}
 .close_box:hover	{ 
-		background-image: url("../../../view/theme/diabook-aerith/icons/close_box.png");
+		background-image: url("../diabook-aerith/icons/close_box.png");
 		float: right;
 		cursor: pointer;
 		opacity: 1;
@@ -1295,6 +1317,7 @@ transition: all 0.2s ease-in-out;
   padding: 5px;
   margin-bottom: 0px;
   width: 575px;
+  padding-top: 10px;
 }
 .tread-wrapper a{
   color: #3465A4;
@@ -1361,14 +1384,16 @@ transition: all 0.2s ease-in-out;
 }
 
 .wall-item-container .wall-item-content {
-  font-size: 12.5px;
+
   max-width: 420px;
   word-wrap: break-word;
-  line-height: 1.2;
+
+
 }
 
 .wall-item-container .wall-item-content img {
   max-width: 400px; 
+
 }
 .wall-item-container .wall-item-links, .wall-item-container .wall-item-actions {
   display: table-cell;
@@ -1430,7 +1455,7 @@ transition: all 0.2s ease-in-out;
   width: 32px;
   height: 32px;
   margin-left: 16px;
-  /*background: url(../../../images/icons/22/user.png) no-repeat center center;*/
+  /*background: url(../../../../images/icons/22/user.png) no-repeat center center;*/
 
 }
 .wall-item-container.comment {
@@ -1442,7 +1467,7 @@ transition: all 0.2s ease-in-out;
 }
 
 .wall-item-comment-wrapper {
-  margin: 1px 0px 0px 80px;
+  margin: 1px 5px 5px 80px;
   background-color: #fff;
   width: 500px;
 }
@@ -1450,7 +1475,7 @@ transition: all 0.2s ease-in-out;
   display: none;
 }
 .wall-item-comment-wrapper textarea {
-  height: 2.0em;
+  height: 1.6em ;
   width: 100%;
   font-size: 10px;
   color: #999999;
@@ -1465,15 +1490,15 @@ transition: all 0.2s ease-in-out;
   border: 1px solid #2d2d2d;
 }
 .comment-edit-preview {
-  width: 710px;
-  border: 1px solid #2d2d2d;
+  width: 500px;
   margin-top: 10px;
+  background-color:  #fff797;
 }
 .comment-edit-preview .contact-photo {
   width: 32px;
   height: 32px;
   margin-left: 16px;
-  /*background: url(../../../images/icons/22/user.png) no-repeat center center;*/
+  /*background: url(../../../../images/icons/22/user.png) no-repeat center center;*/
 
 }
 .comment-edit-preview {
@@ -1510,14 +1535,14 @@ transition: all 0.2s ease-in-out;
   padding-bottom: 2px;
 }
 .tag {
-  /*background: url("../../../images/tag_b.png") repeat-x center left;*/
+  /*background: url("../../../../images/tag_b.png") repeat-x center left;*/
   color: #999;
   padding-left: 3px;
   font-size: 12px;
 }
 .tag a {
   padding-right: 5px;
-  /*background: url("../../../images/tag.png") no-repeat center right;*/
+  /*background: url("../../../../images/tag.png") no-repeat center right;*/
   color: #999;
 }
 .wwto {
@@ -1613,6 +1638,11 @@ transition: all 0.2s ease-in-out;
   padding: 0.3em;
   margin-bottom: 10px;
 }
+.grey
+{
+  display: inline;
+  float: right;	
+	}
 #jot #jot-tools {
   margin: 0px;
   padding: 0px;
@@ -1698,7 +1728,7 @@ transition: all 0.2s ease-in-out;
     height: 20px;
     margin: 0 0 5px;
     width: 60%;
-    border: 1px solid #ffffff;
+    border: 1px solid #d2d2d2;
 }
 #profile-jot-form #jot-title:-webkit-input-placeholder {
   font-weight: normal;
@@ -1852,7 +1882,7 @@ transition: all 0.2s ease-in-out;
 }
 #acl-search {
   float: right;
-  background: #ffffff url("../../../images/search_18.png") no-repeat right center;
+  background: #ffffff url("../../../../images/search_18.png") no-repeat right center;
   padding-right: 20px;
 }
 #acl-showall {
@@ -1861,7 +1891,7 @@ transition: all 0.2s ease-in-out;
   width: auto;
   height: 18px;
   background-color: #cccccc;
-  background-image: url("../../../images/show_all_off.png");
+  background-image: url("../../../../images/show_all_off.png");
   background-position: 7px 7px;
   background-repeat: no-repeat;
   padding: 7px 5px 0px 30px;
@@ -1873,7 +1903,7 @@ transition: all 0.2s ease-in-out;
 #acl-showall.selected {
   color: #000000;
   background-color: #ff9900;
-  background-image: url("../../../images/show_all_on.png");
+  background-image: url("../../../../images/show_all_on.png");
 }
 #acl-list {
   height: 210px;
@@ -1924,20 +1954,20 @@ transition: all 0.2s ease-in-out;
   color: #000000;
 }
 .acl-button-show {
-  background-image: url("../../../images/show_off.png");
+  background-image: url("../../../../images/show_off.png");
 }
 .acl-button-hide {
-  background-image: url("../../../images/hide_off.png");
+  background-image: url("../../../../images/hide_off.png");
 }
 .acl-button-show.selected {
   color: #000000;
   background-color: #9ade00;
-  background-image: url("../../../images/show_on.png");
+  background-image: url("../../../../images/show_on.png");
 }
 .acl-button-hide.selected {
   color: #000000;
   background-color: #ff4141;
-  background-image: url("../../../images/hide_on.png");
+  background-image: url("../../../../images/hide_on.png");
 }
 .acl-list-item.groupshow {
   border-color: #9ade00;
@@ -1995,7 +2025,7 @@ ul.tabs li .active {
 .field .onoff a {
   display: block;
   border: 1px solid #666666;
-  background-image: url("../../../images/onoff.jpg");
+  background-image: url("../../../../images/onoff.jpg");
   background-repeat: no-repeat;
   padding: 4px 2px 2px 2px;
   height: 16px;
@@ -2068,7 +2098,7 @@ ul.tabs li .active {
   margin: 10px;
 }
 .oauthapp img.noicon {
-  background-image: url("../../../images/icons/48/plugin.png");
+  background-image: url("../../../../images/icons/48/plugin.png");
   background-position: center center;
   background-repeat: no-repeat;
 }
@@ -2084,9 +2114,10 @@ ul.tabs li .active {
 /* photo */
 .photo {
 box-shadow: 2px 2px 5px 0px #000000;
-margin: 2px 5px 2px 5px;
-max-height: 85%;
-max-width: 85%;
+margin: 0px;
+border-radius: 10px;
+height: 145px !important;
+width: 145px !important;
 }
 .lframe {
   float: left;
@@ -2114,7 +2145,7 @@ max-width: 85%;
 
 .contact-photo-menu-button {
         position: relative;
-        background-image: url("../../../images/icons/16/menu.png");
+        background-image: url("../../../../images/icons/16/menu.png");
         background-position: top left; 
         background-repeat: no-repeat;
         margin: 0px 0px -16px 0px; 
@@ -2159,6 +2190,11 @@ blockquote {
     border-left: 1px solid #D2D2D2;
     padding-left: 9px;
     margin: 0 0 0 .8ex;
+	 color: #777;
+}
+.oembed {
+	
+	font-weight: bold;
 }
 .aprofile dt{
 box-shadow: 1px 1px 5px 0;
@@ -2197,6 +2233,9 @@ box-shadow: 1px 1px 5px 0;
 #group-separator,
 #prof-separator { display: none;}
 */
+#prof-members-end{
+	clear: both;
+	}
 
 #prvmail-to-label, #prvmail-subject-label, #prvmail-message-label {
 	margin-bottom: 10px;
@@ -2322,7 +2361,7 @@ a.mail-list-link {
 }
 
 .vevent {
-        border: 1px solid #CCCCCC;
+
 }
 .vevent .event-description, .vevent .event-location {
         margin-left: 10px;
@@ -2345,7 +2384,7 @@ a.mail-list-link {
 }
 
 .event-description:before {
-        content: url('../../../images/calendar.png');
+        content: url('../../../../images/calendar.png');
         margin-right: 15px;
 }
 
diff --git a/view/theme/diabook/diabook-aerith/style-profile-wide.css b/view/theme/diabook/diabook-aerith/style-profile-wide.css
new file mode 100644
index 000000000..1b8e38481
--- /dev/null
+++ b/view/theme/diabook/diabook-aerith/style-profile-wide.css
@@ -0,0 +1,2639 @@
+/**
+ * Fabio Comuni <http://kirgroup.com/profile/fabrixxm>
+ * Additional Changes: Michael Vogel <icarus@dabo.de>
+ **/
+
+/* ========= */
+/* = Admin = */
+/* ========= */
+
+#adminpage {
+/*        width: 80%;*/
+}
+
+#pending-update {
+        float:right;
+        color: #ffffff;
+        font-weight: bold;
+        background-color: #FF0000;
+        padding: 0em 0.3em;
+}
+
+.admin.linklist {
+        border: 0px; padding: 0px;
+}
+
+.admin.link {
+        list-style-position: inside;
+        font-size: 1em;
+        padding: 5px;
+        width: 100px;
+        margin: 5px;
+}
+
+#adminpage dl {
+        clear: left;
+        margin-bottom: 2px;
+        padding-bottom: 2px;
+        border-bottom: 1px solid black;
+}
+
+#adminpage dt {
+        width: 200px;
+        float: left;
+        font-weight: bold;
+}
+
+#adminpage dd {
+        margin-left: 200px;
+}
+#adminpage h3 {
+        border-bottom: 1px solid #898989;
+        margin-bottom: 5px;
+        margin-top: 10px;
+}
+
+#adminpage .submit {
+        clear:left;
+}
+
+#adminpage #pluginslist {
+        margin: 0px; padding: 0px;
+}
+
+#adminpage .plugin {
+        list-style: none;
+        display: block;
+	/* border: 1px solid #888888; */
+        padding: 1em;
+        margin-bottom: 5px;
+        clear: left;
+}
+
+#adminpage .toggleplugin {
+        float:left;
+        margin-right: 1em;
+}
+
+#adminpage table {width:100%; border-bottom: 1p solid #000000; margin: 5px 0px;}
+#adminpage table th { text-align: left;}
+#adminpage td .icon { float: left;}
+#adminpage table#users img { width: 16px; height: 16px; }
+#adminpage table tr:hover { background-color: #eeeeee; }
+#adminpage .selectall { text-align: right; }
+/* icons */
+
+.icon.contacts {
+  background-image: url("../diabook-aerith/icons/contacts.png");}
+.icon.notifications {
+  background-image: url("../diabook-aerith/icons/notifications.png");}
+.icon.notify {
+  background-image: url("../diabook-aerith/icons/notify.png");}
+.icon.messages {
+  background-image: url("../diabook-aerith/icons/messages.png");}
+.icon.community {
+  background-image: url("../diabook-aerith/icons/community.png");}
+  
+.icon.drop 	{ background-image: url("../diabook-aerith/icons/drop.png");}
+.icon.drophide 	{ background-image: url("../diabook-aerith/icons/drop.png");}
+.icon.dislike 	{ background-image: url("../diabook-aerith/icons/dislike.png");}
+.icon.like 	{ background-image: url("../diabook-aerith/icons/like.png");}
+.icon.pencil 	{ background-image: url("../diabook-aerith/icons/pencil.png");}
+.icon.recycle 	{ background-image: url("../diabook-aerith/icons/recycle.png");}
+.icon.remote-link { background-image: url("../diabook-aerith/icons/remote.png");}
+.icon.tagged    { background-image: url("../diabook-aerith/icons/tagged.png");}
+.icon.file-as { background-image: url("../diabook-aerith/icons/file_as.png");}
+.star-item.icon.unstarred { background-image: url("../diabook-aerith/icons/unstarred.png");}
+.star-item.icon.starred { background-image: url("../diabook-aerith/icons/starred.png");}
+.icon.link		{ background-image: url("../diabook-aerith/icons/link.png");}
+.icon.lock		{ background-image: url("../diabook-aerith/icons/lock.png");}
+.icon.unlock		{ background-image: url("../diabook-aerith/icons/unlock.png");}
+.icon.language    { background-image: url("../diabook-aerith/icons/language.png");}
+
+
+.camera 	{ background-image: url("../diabook-aerith/icons/camera.png"); 
+			  display: block; width: 28px; height: 28px; background-repeat: no-repeat;
+			  }
+.attach 	{ background-image: url("../diabook-aerith/icons/attach.png"); 
+			  display: block; width: 28px; height: 28px; background-repeat: no-repeat;
+			  }
+.video2 	{ background-image: url("../diabook-aerith/icons/video.png"); 
+			  display: block; width: 28px; height: 28px; background-repeat: no-repeat;
+			  }	
+.video 	{ background-image: url("../diabook-aerith/icons/video.png"); 
+			  display: block; width: 100%; height: 140px; background-repeat: no-repeat;
+			  }
+.audio2 	{ background-image: url("../diabook-aerith/icons/audio.png"); 
+			  display: block; width: 28px; height: 28px; background-repeat: no-repeat;
+			  }
+.audio 	{ background-image: url("../diabook-aerith/icons/audio.png"); 
+			  display: block; width: 28px; height: 28px; background-repeat: no-repeat;
+			  }
+.weblink 	{ background-image: url("../diabook-aerith/icons/weblink.png"); 
+			  display: block; width: 28px; height: 28px; background-repeat: no-repeat;
+			  }
+.globe 	{ background-image: url("../diabook-aerith/icons/globe.png"); 
+			  display: block; width: 28px; height: 28px; background-repeat: no-repeat;
+			  }
+.unglobe 	{ background-image: url("../diabook-aerith/icons/unglobe.png"); 
+			  display: block; width: 28px; height: 28px; background-repeat: no-repeat;
+			  }
+.edit    {background-image: url("../diabook-aerith/icons/pencil2.png"); 
+			  display: block; width: 28px; height: 28px; background-repeat: no-repeat;}
+			  
+			  
+
+
+.article	{ background-position: -50px  0px;}
+/*.audio 		{ background-position: -70px  0px;}*/
+.block 		{ background-position: -90px  0px;}
+/*.drop 		{ background-position: -110px 0px;}*/
+/*.drophide 	{ background-position: -130px 0px;}*/
+/*.edit 		{ background-position: -150px 0px;}*/
+/*.camera 	{ background-position: -170px 0px;}*/
+/*.dislike 	{ background-position: -190px 0px;}*/
+/*.like 		{ background-position: -210px 0px;}*/
+/*.link 		{ background-position: -230px 0px;}*/
+
+/*.globe 		{ background-position: -50px  -20px;}*/
+/*.noglobe 	{ background-position: -70px  -20px;}*/
+.no 		{ background-position: -90px  -20px;}
+.pause 		{ background-position: -110px -20px;}
+.play 		{ background-position: -130px -20px;}
+/*.pencil 	{ background-position: -150px -20px;}*/
+.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;}*/
+
+/*.video          { background-position: -110px -40px;}*/
+.youtube        { background-position: -130px -40px;}
+
+/*.attach         { background-position: -190px -40px;}*/
+/*.language       { background-position: -210px -40px;}*/
+
+
+.icon.on             { background-image: url("../diabook-aerith/icons/toogle_on.png"); background-repeat: no-repeat;}
+.icon.off            { background-image: url("../diabook-aerith/icons/toogle_off.png"); background-repeat: no-repeat;}
+.prev           { background-position: -90px  -60px;}
+.next           { background-position: -110px -60px;}
+/*.tagged     { background-position: -130px -60px;}*/
+
+.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 0px; }
+.type-audio { background-position: -40px 0px; }
+.type-text  { background-position: -60px 0px; }
+.type-unkn  { background-position: -80px 0px; }
+
+.icon.drop, .icon.drophide {
+ float: left;
+}
+
+.icon {
+  display: block;
+  width: 20px;
+  height: 20px;
+  /*background-image: url('icons.png');*/
+}
+
+.icon {
+  background-color: transparent ;
+  background-repeat: no-repeat;
+  /* background-position: left center; */
+  display: block;
+  overflow: hidden;
+  text-indent: -9999px;
+  padding: 1px;
+}
+
+.icon.border.camera{
+  background-image: url("../diabook-aerith/icons/camera.png"); 
+  display: block; width: 28px; height: 28px; background-repeat: no-repeat;
+	}
+	
+.icon.border.link{
+  background-image: url("../diabook-aerith/icons/weblink.png"); 
+  display: block; width: 28px; height: 28px; background-repeat: no-repeat;
+  margin-left: 10px;
+	}
+
+.icon.text {
+  text-indent: 0px;
+}
+.icon.s10 {
+  min-width: 10px;
+  height: 10px;
+}
+.icon.s10.notify {
+  background-image: url("../../../../images/icons/10/notify_off.png");
+}
+.icon.s10.gear {
+  background-image: url("../../../../images/icons/10/gear.png");
+}
+.icon.s10.add {
+  background-image: url("../../../../images/icons/10/add.png");
+}
+.icon.s10.delete {
+  background-image: url("../../../../images/icons/10/delete.png");
+}
+.icon.s10.edit {
+  background-image: url("../../../../images/icons/10/edit.png");
+}
+.icon.s10.star {
+  background-image: url("../../../../images/star_dummy.png");
+}
+.icon.s10.menu {
+  background-image: url("../../../../images/icons/10/menu.png");
+}
+.icon.s10.link {
+  background-image: url("../../../../images/icons/10/link.png");
+}
+.icon.s10.lock {
+  background-image: url("../../../../images/icons/10/lock.png");
+}
+.icon.s10.unlock {
+  background-image: url("../../../../images/icons/10/unlock.png");
+}
+.icon.s10.text {
+  padding: 2px 0px 0px 15px;
+  font-size: 10px;
+}
+.icon.s16 {
+  min-width: 16px;
+  height: 16px;
+}
+.icon.s16.notify {
+  background-image: url("../../../../images/icons/16/notify_off.png");
+}
+.icon.s16.gear {
+  background-image: url("../../../../images/icons/16/gear.png");
+}
+.icon.s16.add {
+  background-image: url("../../../../images/icons/16/add.png");
+}
+.icon.s16.delete {
+  background-image: url("../../../../images/icons/16/delete.png");
+}
+/*.icon.s16.edit {
+  background-image: url("../../../../images/icons/16/edit.png");
+}*/
+.icon.s16.star {
+  background-image: url("../../../../images/star_dummy.png");
+}
+.icon.s16.menu {
+  background-image: url("../../../../images/icons/16/menu.png");
+}
+/*.icon.s16.link {
+  background-image: url("../../../../images/icons/16/link.png");
+}*/
+.icon.s16.lock {
+  background-image: url("../../../../images/icons/16/lock.png");
+}
+.icon.s16.unlock {
+  background-image: url("../../../../images/icons/16/unlock.png");
+}
+.icon.s16.text {
+  padding: 4px 0px 0px 20px;
+  font-size: 10px;
+}
+.icon.s22 {
+  min-width: 22px;
+  height: 22px;
+}
+.icon.s22.notify {
+  background-image: url("../../../../images/icons/22/notify_off.png");
+}
+.icon.s22.gear {
+  background-image: url("../../../../images/icons/22/gear.png");
+}
+.icon.s22.add {
+  background-image: url("../../../../images/icons/22/add.png");
+}
+.icon.s22.delete {
+  background-image: url("../../../../images/icons/22/delete.png");
+}
+.icon.s22.edit {
+  background-image: url("../../../../images/icons/22/edit.png");
+}
+.icon.s22.star {
+  background-image: url("../../../../images/star_dummy.png");
+}
+.icon.s22.menu {
+  background-image: url("../../../../images/icons/22/menu.png");
+}
+.icon.s22.link {
+  background-image: url("../../../../images/icons/22/link.png");
+}
+.icon.s22.lock {
+  background-image: url("../../../../images/icons/22/lock.png");
+}
+.icon.s22.unlock {
+  background-image: url("../../../../images/icons/22/unlock.png");
+}
+.icon.s22.text {
+  padding: 10px 0px 0px 25px;
+  width: 200px;
+}
+.icon.s48 {
+  width: 48px;
+  height: 48px;
+}
+.icon.s48.notify {
+  background-image: url("../../../../images/icons/48/notify_off.png");
+}
+.icon.s48.gear {
+  background-image: url("../../../../images/icons/48/gear.png");
+}
+.icon.s48.add {
+  background-image: url("../../../../images/icons/48/add.png");
+}
+.icon.s48.delete {
+  background-image: url("../../../../images/icons/48/delete.png");
+}
+.icon.s48.edit {
+  background-image: url("../../../../images/icons/48/edit.png");
+}
+.icon.s48.star {
+  background-image: url("../../../../images/star_dummy.png");
+}
+.icon.s48.menu {
+  background-image: url("../../../../images/icons/48/menu.png");
+}
+.icon.s48.link {
+  background-image: url("../../../../images/icons/48/link.png");
+}
+.icon.s48.lock {
+  background-image: url("../../../../images/icons/48/lock.png");
+}
+.icon.s48.unlock {
+  background-image: url("../../../../images/icons/48/unlock.png");
+}
+
+#contact-edit-links ul {
+  list-style: none;
+  list-style-type: none;
+}
+
+.hide-comments-outer {
+  margin-left: 80px;
+  margin-bottom: 5px;
+  width: 675px;
+  border-bottom: 1px solid #BDCDD4;
+  border-top: 1px solid #BDCDD4;
+
+  padding: 8px;
+}
+
+/* global */
+body {
+  font-family: 'Lato', "Helvetica Neue", Helvetica, Arial, sans-serif;
+  font-size: 13px;
+  background-color: #ffffff;
+  color: #2d2d2d;
+  margin: 50px auto auto;
+  display: table;
+}
+
+h4 {
+  font-size: 1.1em;
+}
+
+a {
+	color: #333333;
+	/* color: #3e3e8c; */
+	text-decoration: none;
+}
+a:hover {
+	/* color: blue; */
+	text-decoration: underline
+}
+
+.wall-item-name-link {
+/*  float: left;*/
+}
+
+.wall-item-photo {
+  width: 48px;
+  height: 48px;
+  overflow: hidden;
+  display: block;
+}
+
+.left {
+  float: left;
+}
+.right {
+  float: right;
+}
+.hidden {
+  display: none;
+}
+.clear {
+  clear: both;
+}
+.fakelink {
+  color: #3465A4;
+  /* color: #3e3e8c; */
+  text-decoration: none;
+  cursor: pointer;
+}
+.fakelink:hover {
+  /* color: blue; */
+  /*color: #005c94; */
+  text-decoration: underline;
+}
+code {
+  font-family: Courier, monospace;
+  white-space: pre;
+  display: block;
+  overflow: auto;
+  border: 1px solid #444;
+  background: #EEE;
+  color: #444;
+  padding: 10px;
+  margin-top: 20px;
+}
+#panel {
+  position: absolute;
+  width: 12em;
+  background: #ffffff;
+  color: #2d2d2d;
+  margin: 0px;
+  padding: 1em;
+  list-style: none;
+  border: 3px solid #364e59;
+  z-index: 100000;
+  -webkit-box-shadow: 0px 5px 10px rgba(0, 0, 0, 0.7);
+  -moz-box-shadow: 0px 5px 10px rgba(0, 0, 0, 0.7);
+  box-shadow: 0px 5px 10px rgba(0, 0, 0, 0.7);
+}
+/* tool */
+.tool {
+  height: auto;
+  overflow: auto;
+  padding: 3px;
+}
+#saved-search-ul .tool:hover,
+#nets-sidebar .tool:hover,
+#sidebar-group-list .tool:hover {
+	background: #EEE;
+}
+.tool .label {
+  float: left;
+}
+.tool .action {
+  float: right;
+}
+.tool a {
+  color: ##3F8FBA;
+}
+.tool a:hover {
+  text-decoration: none;
+}
+/* popup notifications */
+div.jGrowl div.notice {
+  background: #511919 url("../../../../images/icons/48/notice.png") no-repeat 5px center;
+  color: #ffffff;
+  padding-left: 58px;
+}
+div.jGrowl div.info {
+  background: #364e59 url("../../../../images/icons/48/info.png") no-repeat 5px center;
+  color: #ffffff;
+  padding-left: 58px;
+}
+/* header */
+header {
+  position: fixed;
+  left: 0%;
+  right: 80%;
+  top: 0px;
+  margin: 0px;
+  padding: 0px;
+  width: 22%;
+  height: 32px;
+  background: #ff500f;
+  background-color: #ff500f;
+  z-index: 100;
+  border-bottom: 1px;
+  border-bottom-color: black;
+  border-bottom-style: inset;
+   background-image: linear-gradient(bottom, rgb(215,227,241) 26%, rgb(255,255,255) 82%);
+background-image: -o-linear-gradient(bottom, rgb(215,227,241) 26%, rgb(255,255,255) 82%);
+background-image: -moz-linear-gradient(bottom, rgb(215,227,241) 26%, rgb(255,255,255) 82%);
+background-image: -webkit-linear-gradient(bottom, rgb(215,227,241) 26%, rgb(255,255,255) 82%);
+background-image: -ms-linear-gradient(bottom, rgb(215,227,241) 26%, rgb(255,255,255) 82%);
+
+background-image: -webkit-gradient(
+	linear,
+	left bottom,
+	left top,
+	color-stop(0.26, rgb(215,227,241)),
+	color-stop(0.82, rgb(255,255,255))
+);
+}
+header #site-location {
+  display: none;
+}
+header #banner {
+  overflow: hidden;
+  text-align: left;
+  width: 82%%;
+  margin-left: 25%;
+}
+header #banner a,
+header #banner a:active,
+header #banner a:visited,
+header #banner a:link,
+header #banner a:hover {
+  color: #1f1f1f;
+  text-decoration: none;
+  outline: none;
+  vertical-align: middle;
+  font-weight: bolder;
+  margin-left: 3px;
+}
+header #banner #logo-img {
+  height: 25px;
+  margin-top: 3px;
+}
+header #banner #logo-text {
+  font-size: 20px;
+  position: absolute;
+  top: 10%;
+}
+/* nav */
+nav {
+  width: 80%;
+  height: 32px;
+  position: fixed;
+  left: 22%;
+  top: 0px;
+  padding: 0px;
+  background: #ff500f;
+  color: #1f1f1f;
+  z-index: 99;
+  border-bottom: 1px;
+  border-bottom-color: black;
+  border-bottom-style: inset;
+  background-image: linear-gradient(bottom, rgb(215,227,241) 26%, rgb(255,255,255) 82%);
+background-image: -o-linear-gradient(bottom, rgb(215,227,241) 26%, rgb(255,255,255) 82%);
+background-image: -moz-linear-gradient(bottom, rgb(215,227,241) 26%, rgb(255,255,255) 82%);
+background-image: -webkit-linear-gradient(bottom, rgb(215,227,241) 26%, rgb(255,255,255) 82%);
+background-image: -ms-linear-gradient(bottom, rgb(215,227,241) 26%, rgb(255,255,255) 82%);
+
+background-image: -webkit-gradient(
+	linear,
+	left bottom,
+	left top,
+	color-stop(0.26, rgb(215,227,241)),
+	color-stop(0.82, rgb(255,255,255))
+);
+}
+nav a,
+nav a:active,
+nav a:visited,
+nav a:link,
+nav a:hover {
+  color: #1f1f1f;
+  text-decoration: none;
+  outline: none;
+}
+nav #banner {
+  overflow: hidden;
+  /*text-align: center;*/
+  width: 100%;
+}
+nav #banner a,
+nav #banner a:active,
+nav #banner a:visited,
+nav #banner a:link,
+nav #banner a:hover {
+  color: #1f1f1f;
+  text-decoration: none;
+  outline: none;
+  vertical-align: bottom;
+}
+nav #banner #logo-img {
+  height: 22px;
+  margin-top: 5px;
+}
+nav #banner #logo-text {
+  font-size: 22px;
+}
+nav #navbar{
+	}
+nav ul {
+  margin: 0px;
+  padding: 0px 20px;
+}
+nav ul li {
+  list-style: none;
+  margin: 0px;
+  /* padding: 1px 1px 3px 1px; */
+  float: left;
+}
+nav ul li .menu-popup {
+  left: 0px;
+  right: auto;
+}
+
+nav #logo-img {
+  height: 25px;
+  margin-top: 4px;
+  margin-left: 30px;
+}
+
+nav #logo-text {
+    font-size: 22px;
+    margin-top: 3px;
+    margin-right: 15px;
+}
+nav .nav-menu-search {
+  position: relative;
+
+  margin: 4px 17px;
+  margin-right: 0px;
+  height: 17px;
+  width: 180px;
+  
+}
+
+nav #search-box #search-text {
+  background-image:  url('icons/lupe.png');
+  background-repeat:no-repeat;
+  padding-left:20px;
+  border-top-left-radius: 15px;
+border-top-right-radius: 15px;
+border-bottom-right-radius: 15px;
+border-bottom-left-radius: 15px;
+	}
+
+
+nav .nav-menu-icon {
+  position: relative;
+  height: 22px;
+  padding: 5px;
+  margin: 0px 5px;
+  -moz-border-radius: 5px 5px 0 0;
+  -webkit-border-radius: 5px 5px 0 0;
+  border-radius: 5px 5px 0 0;
+}
+nav .nav-menu-icon:hover {
+  position: relative;
+  height: 22px;
+  padding: 5px;
+  margin: 0px 5px;
+  -moz-border-radius: 5px 5px 0 0;
+  -webkit-border-radius: 5px 5px 0 0;
+  border-radius: 5px 5px 0 0;
+}
+
+nav .nav-menu-icon.selected {
+  background-color: #fff;
+}
+nav .nav-menu-icon img {
+  width: 22px;
+  height: 22px;
+}
+nav .nav-menu-icon .nav-notify {
+  top: 3px;
+}
+/*marker*/
+nav .nav-menu {
+  position: relative;
+  height: 16px;
+  padding: 5px;
+  margin: 3px 15px 0px;
+  font-size: 15px;
+  /*border-bottom: 3px solid #364A84;*/
+}
+nav .nav-menu.selected {
+  /*border-bottom: 3px solid #9eabb0;*/
+}
+nav .nav-notify {
+  display: none;
+  position: absolute;
+  background-color: #fff;
+  /* background-color: #19aeff; */
+  -moz-border-radius: 5px 5px 5px 5px;
+  -webkit-border-radius: 5px 5px 5px 5px;
+  border-radius: 5px 5px 5px 5px;
+  font-size: 10px;
+  font-weight: 900;
+  padding: 1px 4px;
+  top: 0px;
+  right: -6px;
+  min-width: 10px;
+  text-align: center;
+  border: 1px solid black;
+}
+nav .nav-notify.show {
+  display: block;
+}
+nav #nav-help-link,
+nav #nav-search-link,
+nav #nav-directory-link,
+nav #nav-apps-link,
+nav #nav-site-linkmenu, 
+nav #nav-home-link,
+nav #nav-user-linkmenu
+{
+  float: right;
+}
+nav #nav-user-linkmenu{
+	margin-right: 0px;
+	}
+nav #nav-home-link, #nav-directory-link, #nav-apps-link{
+	margin-left: 0px;
+	margin-right: 0px;
+	font-weight: bold;
+	margin: 3px 5px;
+	font-size: 14px;
+	}
+nav #nav-directory-link{
+  margin-right: 0px;	
+	}
+nav #nav-home-link{
+  margin-left: 0px;	
+	}
+nav #nav-help-link .menu-popup,
+nav #nav-search-link .menu-popup,
+nav #nav-directory-link .menu-popup,
+nav #nav-apps-link .menu-popup,
+nav #nav-site-linkmenu .menu-popup {
+  right: 0px;
+  left: auto;
+}
+
+nav #nav-messages-linkmenu.on .icon.messages, nav #nav-messages-linkmenu.selected .icon.messages{
+	background-image: url("../diabook-aerith/icons/messages.png");
+	}
+	
+/*nav #nav-notifications-linkmenu.on .icon.notify,*/ nav #nav-notifications-linkmenu.selected .icon.notify{
+	background-image: url("../diabook-aerith/icons/notify.png");
+	}
+	
+nav #nav-contacts-linkmenu.on .icon.contacts, nav #nav-contacts-linkmenu.selected .icon.contacts{
+	background-image: url("../diabook-aerith/icons/contacts.png");
+	}
+	
+nav #nav-apps-link.selected {
+ background-color: #fff;
+  moz-border-radius: 5px 5px 0 0;
+-webkit-border-radius: 5px 5px 0 0;
+border-radius: 5px 5px 0 0;
+}
+
+#nav-notifications-mark-all {
+	/* padding: 1px 1px 2px 26px; */
+	/* border-bottom: 1px solid #364E59; */
+	/* margin: 0px 0px 2px 0px;
+	padding: 5px 10px; */
+}
+
+#nav-notifications-see-all {
+	/* padding: 1px 1px 2px 26px; */
+	/* border-bottom: 1px solid #364E59; */
+	/* margin: 0px 0px 2px 0px;
+	padding: 5px 10px; */
+}
+
+.notify-seen {
+	background: none repeat scroll 0 0 #DDDDDD;
+	}
+
+ul.menu-popup {
+  position: absolute;
+  display: none;
+  width: 11em;
+  background: #fff;
+  color: #2d2d2d;
+  margin: 0px;
+  padding: 0px;
+  list-style: none;
+  z-index: 100000;
+  -webkit-box-shadow: 0px 5px 10px rgba(0, 0, 0, 0.7);
+  -moz-box-shadow: 0px 5px 10px rgba(0, 0, 0, 0.7);
+  box-shadow: 0px 5px 10px rgba(0, 0, 0, 0.7);
+}
+ul.menu-popup a {
+  display: block;
+  color: #2d2d2d;
+  padding: 5px 10px;
+  text-decoration: none;
+}
+ul.menu-popup a:hover {
+  background-color: #3465A4; /*bdcdd4;*/
+  color: #fff;
+}
+ul.menu-popup .menu-sep {
+  border-top: 1px solid #9eabb0;
+}
+ul.menu-popup li {
+  float: none;
+  overflow: auto;
+  height: auto;
+  display: block;
+}
+ul.menu-popup li img {
+  float: left;
+  width: 16px;
+  height: 16px;
+  padding-right: 5px;
+}
+ul.menu-popup .empty {
+  padding: 5px;
+  text-align: center;
+  color: #9eabb0;
+}
+/* autocomplete popup */
+.acpopup {
+  max-height: 150px;
+  background-color: #ffffff;
+  color: #2d2d2d;
+  border: 1px solid #MenuBorder;
+  overflow: auto;
+  z-index: 100000;
+  -webkit-box-shadow: 0px 5px 10px rgba(0, 0, 0, 0.7);
+  -moz-box-shadow: 0px 5px 10px rgba(0, 0, 0, 0.7);
+  box-shadow: 0px 5px 10px rgba(0, 0, 0, 0.7);
+}
+.acpopupitem {
+  color: #2d2d2d;
+  padding: 4px;
+  clear: left;
+}
+.acpopupitem img {
+  float: left;
+  margin-right: 4px;
+}
+.acpopupitem.selected {
+  background-color: #bdcdd4;
+}
+#nav-notifications-menu {
+  width: 400px;
+  max-height: 550px;
+  overflow: auto;
+}
+/* #nav-notifications-menu a {
+	display: inline;
+	padding: 5px 0px;
+	margin: 0px 0px 2px 0px;
+}
+#nav-notifications-menu li:hover {
+  background-color: #bdcdd4;
+}*/
+
+#nav-notifications-menu img {
+  float: left;
+  margin-right: 5px;
+}
+#nav-notifications-menu .contactname {
+  font-weight: bold;
+}
+#nav-notifications-menu .notif-when {
+  font-size: 10px;
+  color: #9eabb0;
+  display: block;
+}
+
+.notif-image {
+        width: 32px;
+        height: 32px;
+        padding: 7px 7px 0px 0px;
+}
+
+/*profile_side*/
+#profile_side {
+  margin-bottom: 30px;
+}
+#ps-usericon{
+	height: 25px	
+	}
+#ps-username{
+  font-size: 1.17em;
+  font-weight: bold;
+  vertical-align: top;
+  position: absolute;
+  padding-top: 4px;
+  padding-left: 5px;	
+  word-wrap: break-word;
+  width: 130px;
+	}
+#ps-username:hover{
+  text-decoration: none;	
+	}
+.menu-profile-side{
+  list-style: none;	
+  padding-left: 0px;
+  min-height: 0px;
+	}
+.menu-profile-list{
+  height: auto;
+  overflow: auto;
+  padding-top: 3px;
+  padding-bottom: 3px;
+  padding-left: 16px;
+  min-height: 16px;
+  list-style: none;
+	}
+.menu-profile-list:hover{
+	background: #EEE;
+	}
+.menu-profile-list-item{
+	padding-left: 5px;
+	}	
+.menu-profile-list-item:hover{	
+	text-decoration: none;
+   }
+/*http://prothemedesign.com/circular-icons/*/
+.menu-profile-list.home{
+	background: url("../diabook-aerith/icons/home.png") no-repeat;
+	}
+.menu-profile-list.photos{
+	background: url("../diabook-aerith/icons/mess_side.png") no-repeat;
+	}
+.menu-profile-list.events{
+	background: url("../diabook-aerith/icons/events.png") no-repeat;
+	}
+.menu-profile-list.notes{
+	background: url("../diabook-aerith/icons/notes.png") no-repeat;
+	}
+.menu-profile-list.foren{
+	background: url("../diabook-aerith/icons/pubgroups.png") no-repeat;
+	}
+.menu-profile-list.com_side{
+	background: url("../diabook-aerith/icons/com_side.png") no-repeat;
+	}
+
+/* aside */
+/*marker*/
+aside {
+  display: table-cell;
+  vertical-align: top;
+  width: 180px;
+  padding: 0px 5px 0px 0px;
+  border-right: 1px solid #D2D2D2;
+  float: left;
+  /* background: #F1F1F1; */
+}
+
+aside .vcard .fn {
+  font-size: 18px;
+  font-weight: bold;
+  margin-bottom: 5px;
+}
+aside .vcard .title {
+  margin-bottom: 5px;
+}
+aside .vcard dl {
+  height: auto;
+  overflow: auto;
+}
+aside .vcard dt {
+  float: left;
+  margin-left: 0px;
+  /*width: 35%;*/
+  text-align: right;
+  color: #999999;
+}
+aside .vcard dd {
+  float: left;
+  margin-left: 5px;
+  /*width: 60%;*/
+}
+aside #profile-extra-links ul {
+  padding: 0px;
+  margin: 0px;
+}
+aside #profile-extra-links li {
+  padding: 0px;
+  margin: 0px;
+  list-style: none;
+}
+aside #dfrn-request-link {
+  display: block;
+  -moz-border-radius: 5px 5px 5px 5px;
+  -webkit-border-radius: 5px 5px 5px 5px;
+  border-radius: 5px 5px 5px 5px;
+  color: #ffffff;
+  background: #005c94 url('../../../../images/connect-bg.png') no-repeat left center;
+  font-weight: bold;
+  text-transform: uppercase;
+  padding: 4px 2px 2px 35px;
+}
+aside #dfrn-request-link:hover {
+  text-decoration: none;
+  background-color: #36c;
+  /* background-color: #19aeff; */
+}
+aside #profiles-menu {
+  width: 20em;
+}
+aside #search-text {
+	width: 150px;
+	height: 17px;
+	padding-left: 10px;
+	border-top-left-radius: 15px;
+border-top-right-radius: 15px;
+border-bottom-right-radius: 15px;
+border-bottom-left-radius: 15px;
+}
+aside #side-follow-url {
+	width: 150px;
+	}
+aside #side-peoplefind-url {
+	width: 150px;
+	}
+#contact-block {
+  overflow: auto;
+  height: auto;
+}
+#contact-block .contact-block-h4 {
+  float: left;
+  margin: 5px 0px;
+}
+#contact-block .allcontact-link {
+  float: right;
+  margin: 5px 0px;
+}
+#contact-block .contact-block-content {
+  clear: both;
+  overflow: auto;
+  height: auto;
+}
+#contact-block .contact-block-link {
+  float: left;
+  margin: 0px 2px 2px 0px;
+}
+#contact-block .contact-block-link img {
+  widht: 48px;
+  height: 48px;
+}
+#lost-password-link {
+  float: left;
+  margin-right: 20px;	
+	}
+/* widget */
+.widget {
+  margin-bottom: 2em;
+  /*.action .s10 { width: 10px; overflow: hidden; padding: 0px;}
+	.action .s16 { width: 16px; overflow: hidden; padding: 0px;}*/
+/*  font-size: 12px; */
+}
+/*marker*/
+.widget h3 {
+  padding: 0px;
+  margin: 2px;
+  font-size: 1.05em;
+}
+.widget .action {
+  opacity: 0.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;
+}
+.widget input.action {
+  opacity: 0.5;
+  -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;
+}
+.widget:hover .title .action {
+  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;
+}
+.widget .tool:hover .action {
+  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;
+}
+.widget .tool:hover .action.ticked {
+  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;
+}
+.widget ul {
+  padding: 0px;
+}
+.widget ul li {
+  padding-left: 16px;
+  min-height: 16px;
+  list-style: none;
+}
+#side-bar-photos-albums li{
+list-style-type: disc;
+}
+#side-bar-photos-albums ul li{
+  margin-left: 30px;
+  padding-left: 0px;
+	}
+#side-bar-photos-albums ul li a{
+  color: #3465A4;
+}
+.widget .tool.selected {
+  background: url("../diabook-aerith/icons/selected.png") no-repeat left center;
+}
+/* widget: search */
+span.sbox_l  {
+	background: white url('../diabook/icons/srch_l.gif') no-repeat top left;
+	float: left;
+	width: 19px; height: 19px;
+	margin-left: 10px;
+	margin-top: 5px;
+	
+}
+
+span.sbox_r  {
+	background: white url('../diabook/icons/srch_r.gif') no-repeat top left;
+	float: left;
+	width: 19px; height: 19px;
+	margin-top: 5px;
+}
+
+span.sbox input {
+	background: white url('../diabook/icons/srch_bg.gif') repeat-x top left;
+	float: left;
+	margin-top: 5px;
+	border: 0;
+	height: 13px; width: 100px;
+	padding: 3px;
+	font: 11px/13px arial;
+	color: #000;
+}
+#add-search-popup {
+  width: 200px;
+  top: 18px;
+}
+/* section */
+section {
+  display: table-cell;
+  vertical-align: top;
+  width: 611px;
+  padding: 0px 0px 0px 12px;
+}
+
+body .pageheader{
+  text-align: center;
+  font-size: 20px;
+  margin-bottom: 20px;
+  margin-top: 0px;
+  max-width: 575px;
+	}
+.qcomment{
+  max-width: 122px;	
+	}
+#id_username {
+  width: 173px;	
+	}
+#id_password {
+  width: 173px;		
+	}
+#id_openid_url {
+  width: 173px;	
+	}
+#contact-edit-end {
+	}
+.pager {
+   padding: 10px;
+	text-align: center;
+	font-size: 1.0em;
+	clear: both;
+	display: block;
+}	
+
+.tabs {
+    
+    background-position: 0 -20px;
+    background-repeat: repeat-x;
+    height: 27px;
+    padding: 0;
+ }
+.tab.button {
+    margin-left: 5px;	
+    /*background: none repeat scroll 0 0 #F8F8F8;*/
+    border: 1px solid #CCCCCC;
+    border-radius: 3px 3px 3px 3px;
+    font-weight: normal;
+    padding: 3px;
+    color:  #333333;
+	}
+	
+#birthday-notice, #event-notice, #birthday-wrapper, #event-wrapper{
+	margin-bottom: 10px;
+	}
+#birthday-wrapper a {
+	color: #3465A4;
+	}
+
+/*marker*/
+right_aside {
+  display: table-cell;
+  vertical-align: top;
+  width: 180px;
+  /*border-left: 1px solid #D2D2D2;*/
+  
+  /* background: #F1F1F1; */
+}
+right_aside a{color: #3465A4;}
+/*marker*/
+right_aside h3 {font-size: 1.05em; border-bottom: 1px solid #D2D2D2; padding-top: 5px; padding-bottom: 0px; padding-left: 9px; margin-bottom: 0px; 
+margin-top:30px;}
+right_aside .directory-item {	width: 50px; height: 50px; vertical-align: center; text-align: center; }
+right_aside .directory-photo { margin: 0px; }
+right_aside .directory-photo-img { max-width: 45px; max-height: 45px; }
+right_aside #likes { margin: 0px; padding: 0px; list-style: none; }
+right_aside .items-wrapper{ overflow: auto;	width: 100%; }
+right_aside #lastusers-wrapper { padding-left: 6px; padding-top: 3px; overflow: auto;	width: 100%; }
+right_aside #ra-photos-wrapper { padding-left: 5px; padding-top: 3px; overflow: auto;	width: 100%; }
+#page-sidebar-right_aside{margin-top: 0px; margin-bottom: 30px;}
+#page-sidebar-right_aside ul {margin-top: 0px;}
+#page-sidebar-right_aside .label {max-width: 128px;}
+right_aside .icon {width: 10px; height: 10px;}
+.close_box		{ 
+		background-image: url("../diabook-aerith/icons/close_box.png");
+		float: right;
+		cursor: pointer;
+		opacity: 0.1;
+		}
+.close_box:hover	{ 
+		background-image: url("../diabook-aerith/icons/close_box.png");
+		float: right;
+		cursor: pointer;
+		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;
+		}
+/* wall item */
+/*marker*/
+.tread-wrapper {
+  border-bottom: 1px solid #D2D2D2;
+  position: relative;
+  padding: 5px;
+  margin-bottom: 0px;
+  width: 775px;
+  padding-top: 10px;
+}
+.tread-wrapper a{
+  color: #3465A4;
+}
+
+/*marker*/
+.wall-item-decor {
+  position: absolute;
+  left: 780px;
+  top: -10px;
+  width: 16px;
+}
+/*marker*/
+.wall-item-container {
+  display: table;
+  width: 770px;
+}
+
+
+.wall-item-container .wall-item-item, .wall-item-container .wall-item-bottom {
+  display: table-row;
+}
+
+.wall-item-bottom {
+  font-size: 13px;
+}
+.wall-item-container .wall-item-bottom {
+/*  opacity: 0.5;
+  -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; */
+}
+.wall-item-container:hover .wall-item-bottom {
+/*  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; */
+}
+.wall-item-container .wall-item-info {
+  display: table-cell;
+  vertical-align: top;
+  text-align: left;
+  width: 80px;
+}
+.wall-item-container .wall-item-location {
+  padding-right: 40px;
+  display: table-cell;
+}
+.wall-item-container .wall-item-ago {
+  word-wrap: break-word;
+  width: 50px;
+  margin-left: 10px;
+  color: #999;
+}
+.wall-item-location {
+  
+  clear: both;
+  overflow: hidden;
+  
+  margin-bottom: 5px;
+}
+
+/*marker*/
+.wall-item-container .wall-item-content {
+
+  max-width: 690px;
+  word-wrap: break-word;
+
+
+}
+/*marker*/
+.wall-item-container .wall-item-content img {
+
+
+}
+.wall-item-container .wall-item-links, .wall-item-container .wall-item-actions {
+  display: table-cell;
+  vertical-align: middle;
+}
+.wall-item-container .wall-item-links .icon, .wall-item-container .wall-item-actions .icon {
+  opacity: 0.5;
+  -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;
+}
+.wall-item-container .wall-item-links .icon:hover, .wall-item-container .wall-item-actions .icon: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;
+}
+.wall-item-container .wall-item-name {
+  font-weight: bold;
+}
+.wall-item-container .wall-item-actions-author {
+  width: 100%;
+  margin-bottom: 0.3em;
+}
+.wall-item-container .wall-item-actions-social {
+  float: left;
+  margin-bottom: 1px;
+  display: table-cell;
+}
+.wall-item-container .wall-item-actions-social a {
+  margin-right: 1em;
+}
+.wall-item-actions-social a {
+  float: left;
+}
+.wall-item-container .wall-item-actions-tools {
+  float: right;
+  width: 80px;
+  display: table-cell;
+}
+.wall-item-container .wall-item-actions-tools a {
+  float: right;
+}
+.wall-item-container .wall-item-actions-tools input {
+  float: right;
+}
+/*marker*/
+.wall-item-container.comment {
+  margin-top: 5px;
+  margin-bottom: 5px;
+  margin-left: 80px;
+  width: 690px;
+  border-bottom: 1px solid hsl(198, 21%, 79%);
+}
+.wall-item-container.comment .contact-photo {
+  width: 32px;
+  height: 32px;
+  margin-left: 16px;
+  /*background: url(../../../../images/icons/22/user.png) no-repeat center center;*/
+
+}
+.wall-item-container.comment {
+  top: 15px !important;
+  left: 15px !important;
+}
+.wall-item-container.comment .wall-item-links {
+  padding-left: 12px;
+}
+.wall-item-comment-wrapper {
+  margin: 1px 5px 5px 80px;
+}
+.wall-item-comment-wrapper .comment-edit-photo {
+  display: none;
+}
+.wall-item-comment-wrapper textarea {
+  height: 1.6em ;
+  width: 100%;
+  font-size: 10px;
+  color: #999999;
+  border: 1px solid #DDD;
+  padding: 0.3em;
+  font-size: 14px;
+}
+.wall-item-comment-wrapper .comment-edit-text-full {
+  font-size: 14px;
+  height: 4em;
+  color: #2d2d2d;
+  border: 1px solid #2d2d2d;
+}
+.comment-edit-preview {
+  width: 500px;
+  margin-top: 10px;
+  background-color:  #fff797;
+}
+.comment-edit-preview .contact-photo {
+  width: 32px;
+  height: 32px;
+  margin-left: 16px;
+  /*background: url(../../../../images/icons/22/user.png) no-repeat center center;*/
+
+}
+.comment-edit-preview {
+  top: 15px !important;
+  left: 15px !important;
+}
+.comment-edit-preview .wall-item-links {
+  padding-left: 12px;
+}
+.comment-edit-preview .wall-item-container {
+  width: 700px;
+}
+.comment-edit-preview .tread-wrapper {
+  width: 700px;
+  padding: 0;
+  margin: 10px 0;
+}
+
+.shiny {
+  /* border-right: 10px solid #fce94f; */
+	border-right: 1px solid #A7C7F7;
+	padding-right: 12px;
+}
+
+#jot-preview-content{
+	margin-top: 30px;}
+	
+#jot-preview-content .tread-wrapper {
+  background-color: #fff797;
+}
+
+.wall-item-tags {
+  padding-top: 1px;
+  padding-bottom: 2px;
+}
+.tag {
+  /*background: url("../../../../images/tag_b.png") repeat-x center left;*/
+  color: #999;
+  padding-left: 3px;
+  font-size: 12px;
+}
+.tag a {
+  padding-right: 5px;
+  /*background: url("../../../../images/tag.png") no-repeat center right;*/
+  color: #999;
+}
+.wwto {
+  position: absolute !important;
+  width: 25px;
+  height: 25px;
+  background: #FFFFFF;
+  border: 2px solid #364e59;
+  height: 25px;
+  width: 25px;
+  overflow: hidden;
+  padding: 1px;
+  position: absolute !important;
+  top: 40px;
+  left: 30px;
+  -webkit-box-shadow: 0px 0px 10px rgba(0, 0, 0, 0.7);
+  -moz-box-shadow: 0px 0px 10px rgba(0, 0, 0, 0.7);
+  box-shadow: 0px 0px 10px rgba(0, 0, 0, 0.7);
+}
+.wwto .contact-photo {
+  width: auto;
+  height: 25px;
+}
+/* contacts menu */
+.contact-photo-wrapper {
+  position: relative;
+  width: 80px;
+}
+
+.contact-photo-wrapper.wwto {
+  width: 25px;
+}
+
+.contact-photo {
+  width: 48px;
+  height: 48px;
+  overflow: hidden;
+  display: block;
+}
+.contact-photo img {
+  width: 48px;
+  height: 48px;
+}
+
+.contact-wrapper {
+  float: left;
+  width: 90px;
+  height: 90px;
+  margin-bottom: 15px;
+}
+.contact-wrapper .contact-photo {
+  width: 80px;
+  height: 80px;
+}
+.contact-wrapper .contact-photo img {
+  width: 80px;
+  height: 80px;
+}
+.contact-wrapper {
+  left: 0px;
+  top: 63px;
+}
+.contact-photo {
+  width: 48px;
+  height: 48px;
+}
+.contact-photo img {
+  width: 48px;
+  height: 48px;
+}
+.contact-name {
+  /* text-align: center; */
+  /*font-weight: bold;*/
+  font-size: 12px;
+}
+.contact-details {
+  color: #999999;
+}
+/* editor */
+.jothidden {
+  display: none;
+}
+#jot {
+  width: 585px;
+  margin: 0px 2em 20px 0px;
+}
+#profile-jot-form #profile-jot-text {
+  height: 2.0em;
+  width: 99%;
+  font-size: 15px;
+  color: #999999;
+  border: 1px solid #DDD;
+  padding: 0.3em;
+  margin-bottom: 10px;
+}
+.grey
+{
+  display: inline;
+  float: right;	
+	}
+#jot #jot-tools {
+  margin: 0px;
+  padding: 0px;
+  height: 40px;
+  overflow: none;
+  width: 583px;
+  background-color: #fff;
+  border-bottom: 2px solid #9eabb0;
+}
+
+#jot #jot-tools li {
+  list-style: none;
+  float: left;
+  width: 80px;
+  height: 40px;
+  border-bottom: 2px solid #9eabb0;
+}
+#jot #jot-tools li a {
+  display: block;
+  color: #cccccc;
+  width: 100%;
+  height: 40px;
+  text-align: center;
+  line-height: 40px;
+  overflow: hidden;
+}
+#jot #jot-tools li:hover {
+  background-color: #364e59;
+  border-bottom: 2px solid #bdcdd4;
+}
+#jot #jot-tools li.perms {
+  float: right;
+  width: 40px;
+}
+#jot #jot-tools li.perms a.unlock {
+  width: 30px;
+  border-left: 10px solid #cccccc;
+  background-color: #cccccc;
+  background-position: left center;
+}
+#jot #jot-tools li.perms a.lock {
+  width: 30px;
+  border-left: 10px solid #666666;
+  background-color: #666666;
+}
+#jot #jot-tools li.submit {
+  float: right;
+  background-color: #cccccc;
+  border-bottom: 2px solid #cccccc;
+  border-right: 1px solid #666666;
+  border-left: 1px solid #666666;
+}
+#jot #jot-tools li.submit input {
+  border: 0px;
+  margin: 0px;
+  padding: 0px;
+  background-color: #cccccc;
+  color: #666666;
+  width: 80px;
+  height: 40px;
+  line-height: 40px;
+}
+#jot #jot-tools li.submit input:hover {
+  background-color: #bdcdd4;
+  color: #666666;
+}
+#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;
+}
+#profile-jot-form #jot-title {
+    
+  	 border-radius: 5px 5px 5px 5px;
+    font-weight: bold;
+    height: 20px;
+    margin: 0 0 5px;
+    width: 60%;
+    border: 1px solid #d2d2d2;
+}
+#profile-jot-form #jot-title:-webkit-input-placeholder {
+  font-weight: normal;
+}
+#profile-jot-form #jot-title:-moz-placeholder {
+  font-weight: normal;
+}
+#profile-jot-form #profile-jot-text_parent #profile-jot-text_tbl{
+	width: 585px;
+	height: 100px;
+	}
+#jot #jot-title:hover {
+  border: 1px solid #999999;
+}
+#jot #jot-title:focus {
+  border: 1px solid #999999;
+}
+#jot #character-counter {
+  width: 80px;
+  float: right;
+  text-align: right;
+  height: 20px;
+  line-height: 20px;
+  padding-right: 20px;
+}
+#jot-perms-icon, 
+#profile-location,
+#profile-nolocation,
+#profile-youtube, 
+#profile-video, 
+#profile-audio,
+#profile-link,
+#profile-title, 
+#wall-image-upload,
+#wall-file-upload,
+#wall-image-upload-div,
+#wall-file-upload-div,
+.hover, .focus {
+	cursor: pointer;
+	margin-top: 2px;
+}
+/*marker*/
+#profile-jot-wrapper{
+	margin: 0 20px 20px 0;
+   width: 785px;
+	}
+/*marker*/
+#profile-jot-submit-wrapper {
+	margin-bottom: 50px;
+	width: 785px;
+}
+
+#profile-jot-submit {
+	float: right;
+	margin-top: 2px;
+	font-size: 14px;
+}
+#profile-upload-wrapper {
+	float: left;
+	margin-top: 2px;
+	margin-left: 10px;
+	
+}
+#profile-attach-wrapper {
+	float: left;
+	margin-left: 15px;
+	margin-top: 2px;
+}
+#profile-rotator {
+	float: left;
+	margin-left: 30px;
+	margin-top: 2px;
+}
+#profile-link-wrapper {
+	float: left;
+	margin-left: 15px;
+	margin-top: 2px;
+}
+#profile-youtube-wrapper {
+	float: left;
+	margin-left: 15px;
+	margin-top: 2px;
+}
+#profile-video-wrapper {
+	float: left;
+	margin-left: 15px;
+	margin-top: 2px;
+}
+#profile-audio-wrapper {
+	float: left;
+	margin-left: 15px;
+	margin-top: 2px;
+}
+#profile-location-wrapper {
+	float: left;
+	margin-left: 15px;
+	margin-top: 2px;
+}
+#profile-jot-perms {
+	float: left;
+	margin-left: 45px;
+	margin-top: 2px;
+}
+#jot-preview-link {
+	float: right;
+	margin-left: 10px;
+	margin-top: 2px;
+	font-size: 9px;
+	font-weight: bolder;
+	cursor: pointer;
+}
+#profile-jot-perms{
+   float: right;
+	margin-left: 10px;
+	margin-top: 2px;	
+	}
+/** buttons **/
+.button.creation1 {
+    background-color: #fff;
+    border: 1px solid #777777;
+    border-radius: 3px 3px 3px 3px;
+    box-shadow: 0 1px 1px #CFCFCF;
+ 	 font-weight: bolder;
+	 cursor: pointer;
+}
+.button.creation2 {
+    background-color: #3465A4;
+    border: 1px solid #777777;
+    color: white;
+    border-radius: 3px 3px 3px 3px;
+    box-shadow: 0 1px 1px #CFCFCF;
+    margin-left: 5px;
+    font-weight: bolder;
+	 cursor: pointer;
+}
+/*input[type="submit"] {
+	border: 0px;
+    background-color: @ButtonBackgroundColor;
+    color: @ButtonColor;
+    padding: 0px 10px;
+	.rounded(5px);
+    height: 18px;
+}*/
+/** acl **/
+#photo-edit-perms-select, #photos-upload-permissions-wrapper, #profile-jot-acl-wrapper {
+  display: block!important;
+}
+#acl-wrapper {
+  width: 690px;
+  float: left;
+}
+#acl-search {
+  float: right;
+  background: #ffffff url("../../../../images/search_18.png") no-repeat right center;
+  padding-right: 20px;
+}
+#acl-showall {
+  float: left;
+  display: block;
+  width: auto;
+  height: 18px;
+  background-color: #cccccc;
+  background-image: url("../../../../images/show_all_off.png");
+  background-position: 7px 7px;
+  background-repeat: no-repeat;
+  padding: 7px 5px 0px 30px;
+  color: #999999;
+  -moz-border-radius: 5px 5px 5px 5px;
+  -webkit-border-radius: 5px 5px 5px 5px;
+  border-radius: 5px 5px 5px 5px;
+}
+#acl-showall.selected {
+  color: #000000;
+  background-color: #ff9900;
+  background-image: url("../../../../images/show_all_on.png");
+}
+#acl-list {
+  height: 210px;
+  border: 1px solid #cccccc;
+  clear: both;
+  margin-top: 30px;
+  overflow: auto;
+}
+.acl-list-item {
+  display: block;
+  width: 150px;
+  height: 30px;
+  border: 1px solid #cccccc;
+  margin: 5px;
+  float: left;
+}
+.acl-list-item img {
+  width: 22px;
+  height: 22px;
+  float: left;
+  margin: 4px;
+}
+.acl-list-item p {
+  height: 12px;
+  font-size: 10px;
+  margin: 0px;
+  padding: 2px 0px 1px;
+  overflow: hidden;
+}
+.acl-list-item a {
+  font-size: 8px;
+  display: block;
+  width: 40px;
+  height: 10px;
+  float: left;
+  color: #999999;
+  background-color: #cccccc;
+  background-position: 3px 3px;
+  background-repeat: no-repeat;
+  margin-right: 5px;
+  -webkit-border-radius: 2px ;
+  -moz-border-radius: 2px;
+  border-radius: 2px;
+  padding-left: 15px;
+}
+#acl-wrapper a:hover {
+  text-decoration: none;
+  color: #000000;
+}
+.acl-button-show {
+  background-image: url("../../../../images/show_off.png");
+}
+.acl-button-hide {
+  background-image: url("../../../../images/hide_off.png");
+}
+.acl-button-show.selected {
+  color: #000000;
+  background-color: #9ade00;
+  background-image: url("../../../../images/show_on.png");
+}
+.acl-button-hide.selected {
+  color: #000000;
+  background-color: #ff4141;
+  background-image: url("../../../../images/hide_on.png");
+}
+.acl-list-item.groupshow {
+  border-color: #9ade00;
+}
+.acl-list-item.grouphide {
+  border-color: #ff4141;
+}
+/** /acl **/
+/** tab buttons 14618a**/
+/*marker*/
+ul.tabs {
+  list-style-type: none;
+  padding-bottom: 10px;
+  font-size: 13px;
+  width: 805px;
+}
+ul.tabs li {
+  float: left;
+  margin-left: 5px;
+}
+ul.tabs li .active {
+    background-color: #3465A4;
+    border: 1px solid #777777;
+    color: white;
+    border-radius: 3px 3px 3px 3px;
+    box-shadow: 2px 2px 2px #CFCFCF;
+    margin-left: 5px;
+}
+/**
+ * Form fields
+ */
+.field {
+  margin-bottom: 10px;
+  padding-bottom: 10px;
+  overflow: auto;
+  width: 100%;
+}
+.field label {
+  float: left;
+  width: 200px;
+}
+.field input, .field textarea {
+  width: 400px;
+}
+.field textarea {
+  height: 100px;
+}
+.field .field_help {
+  display: block;
+  margin-left: 200px;
+  color: #666666;
+}
+.field .onoff {
+  float: left;
+  width: 80px;
+}
+.field .onoff a {
+  display: block;
+  border: 1px solid #666666;
+  background-image: url("../../../../images/onoff.jpg");
+  background-repeat: no-repeat;
+  padding: 4px 2px 2px 2px;
+  height: 16px;
+  text-decoration: none;
+}
+.field .onoff .off {
+  border-color: #666666;
+  padding-left: 40px;
+  background-position: left center;
+  background-color: #cccccc;
+  color: #666666;
+  text-align: right;
+}
+.field .onoff .on {
+  border-color: #204A87;
+  padding-right: 40px;
+  background-position: right center;
+  background-color: #D7E3F1;
+  color: #204A87;
+  text-align: left;
+}
+.field .hidden {
+  display: none!important;
+}
+.field.radio .field_help {
+  margin-left: 0px;
+}
+#directory-search-form{
+	margin-bottom: 50px;
+	}
+#profile-edit-links-end {
+        clear: both;
+        margin-bottom: 15px;
+}
+
+#profile-edit-links ul { margin: 20px; padding-bottom: 20px; list-style: none; }
+
+#profile-edit-links li {
+  float: left;
+  list-style: none;
+  margin-left: 10px;
+}
+
+.profile-edit-side-div {
+  display: none;
+}
+
+#register-form label,
+#profile-edit-form label {
+        width: 300px; float: left;
+}
+
+.required {
+  display: inline;
+  color: #B20202;
+}
+
+/* oauth */
+.oauthapp {
+  height: auto;
+  overflow: auto;
+  border-bottom: 2px solid #cccccc;
+  padding-bottom: 1em;
+  margin-bottom: 1em;
+}
+.oauthapp img {
+  float: left;
+  width: 48px;
+  height: 48px;
+  margin: 10px;
+}
+.oauthapp img.noicon {
+  background-image: url("../../../../images/icons/48/plugin.png");
+  background-position: center center;
+  background-repeat: no-repeat;
+}
+.oauthapp a {
+  float: left;
+}
+/* contacts */
+.contact-entry-wrapper {
+  width: 120px;
+  height: 120px;
+  float: left;
+}
+/* photo */
+.photo {
+box-shadow: 2px 2px 5px 0px #000000;
+margin: 0px;
+border-radius: 10px;
+height: 145px !important;
+width: 145px !important;
+}
+.lframe {
+  float: left;
+  /*margin: 0px 10px 10px 0px;*/
+}
+/* profile match wrapper */
+.profile-match-wrapper {
+  float: left;
+  width: 90px;
+  height: 90px;
+  margin-bottom: 20px;
+}
+.profile-match-wrapper .contact-photo {
+  width: 80px;
+  height: 80px;
+}
+.profile-match-wrapper .contact-photo img {
+  width: 80px;
+  height: 80px;
+}
+.profile-match-wrapper {
+  left: 0px;
+  top: 63px;
+}
+
+.contact-photo-menu-button {
+        position: relative;
+        background-image: url("../../../../images/icons/16/menu.png");
+        background-position: top left; 
+        background-repeat: no-repeat;
+        margin: 0px 0px -16px 0px; 
+	padding: 0px;
+        width: 16px;
+        height: 16px;
+        top: -16px; left:0px;
+        overflow: hidden;
+        text-indent: 40px;
+        display: none;
+        
+}
+.contact-photo-menu {
+        width: 11em;
+        border: 3px solid #364e59;
+	color: #2d2d2d;
+        background: #FFFFFF;
+/*        position: absolute;*/
+        position: relative;
+        left: 0px; top: 0px;
+        display: none;
+        z-index: 10000;
+}
+.contact-photo-menu ul { margin:0px; padding: 0px; list-style: none }
+.contact-photo-menu li a {
+	display: block; 
+	padding: 5px 10px; 
+	color: #2d2d2d;
+	text-decoration: none;
+}
+.contact-photo-menu li a:hover {
+	background-color: #bdcdd4; 
+}
+
+/* page footer */
+footer {
+  height: 100px;
+  display: table-row;
+}
+
+blockquote {
+    border-left: 1px solid #D2D2D2;
+    padding-left: 9px;
+    margin: 0 0 0 .8ex;
+	 color: #777;
+}
+.oembed {
+	
+	font-weight: bold;
+}
+.aprofile dt{
+box-shadow: 1px 1px 5px 0;
+    color: #666666;
+    margin: 15px 0 5px;
+    padding-left: 5px;	
+	}
+/* ================== */
+/* = Contacts Block = */
+/* ================== */
+
+.contact-block-img {
+        width: 48px;
+        height: 48px;
+        padding-right: 3px;
+}
+.contact-block-div {
+        float: left;
+}
+
+.contact-block-textdiv { width: 150px; height: 34px; float: left; }
+#contact-block-end { clear: both; } 
+
+#group-edit-wrapper {
+        margin-bottom: 10px;
+}
+
+#group-members-end {
+        clear: both;
+}
+#group-edit-desc {
+ margin-top: 15px;
+}
+
+/*
+#group-separator,
+#prof-separator { display: none;}
+*/
+#prof-members-end{
+	clear: both;
+	}
+
+#prvmail-to-label, #prvmail-subject-label, #prvmail-message-label {
+	margin-bottom: 10px;
+	margin-top: 20px;
+}
+
+#prvmail-submit {
+	float: right;
+	margin-top: 10px;
+}
+
+#prvmail-subject
+{
+background: none repeat scroll 0 0 #FFFFFF;
+border: 1px solid #CCCCCC;
+border-radius: 5px 5px 5px 5px;
+font-weight: bold;
+height: 20px;
+margin: 0 0 5px;
+vertical-align: middle;
+}
+#prvmail-form{
+ width: 597px;	
+	}
+	
+#prvmail-upload-wrapper,
+#prvmail-link-wrapper,
+#prvmail-rotator-wrapper {
+	float: left;
+	margin-top: 10px;
+	margin-right: 10px;
+	width: 24px;
+}
+
+#prvmail-end {
+	clear: both;
+}
+
+.mail-list-sender,
+.mail-list-detail {
+	float: left;
+}
+.mail-list-detail {
+	margin-left: 20px;
+}
+
+.mail-list-subject {
+	font-size: 1.1em;
+	margin-top: 10px;
+}
+a.mail-list-link {
+    display: block;
+    font-size: 1.3em;
+    padding: 4px 0;
+}
+
+/*
+*a.mail-list-link:hover {
+*	background-color: #15607B;
+*	color: #F5F6FB;
+*}
+*/
+
+.mail-list-outside-wrapper-end {
+	clear: both;
+}
+
+.mail-list-outside-wrapper {
+	margin-top: 30px;
+}
+
+.mail-list-delete-wrapper {
+	float: right;
+	margin-right: 30px;
+	margin-top: 15px;
+}
+
+.mail-list-delete-icon {
+	border: none;
+}
+
+.mail-conv-sender,
+.mail-conv-detail {
+	float: left;
+}
+.mail-conv-detail {
+	margin-left: 20px;
+	width: 500px;
+}
+
+.mail-conv-subject {
+    font-size: 1.4em;
+    margin: 10px 0;
+}
+
+.mail-conv-outside-wrapper-end {
+	clear: both;
+}
+
+.mail-conv-outside-wrapper {
+	margin-top: 30px;
+}
+
+.mail-conv-delete-wrapper {
+	float: right;
+	margin-right: 30px;
+	margin-top: 15px;
+}
+.mail-conv-break {
+	clear: both;
+}
+
+.mail-conv-delete-icon {
+	border: none;
+}
+
+/* ========== */
+/* = Events = */
+/* ========== */
+.eventcal {
+        float: left;
+        font-size: 20px;
+}
+
+.vevent {
+
+}
+.vevent .event-description, .vevent .event-location {
+        margin-left: 10px;
+        margin-right: 10px;
+}
+.vevent .event-start {
+        margin-left: 10px;
+        margin-right: 10px;
+}
+
+#new-event-link {
+        margin-bottom: 10px;
+}
+
+.edit-event-link, .plink-event-link {
+        float: left;
+        margin-top: 4px;
+        margin-right: 4px;
+        margin-bottom: 15px;
+}
+
+.event-description:before {
+        content: url('../../../../images/calendar.png');
+        margin-right: 15px;
+}
+
+.event-start, .event-end {
+        margin-left: 10px;
+        width: 330px;
+        clear: both;
+}
+
+.event-start .dtstart, .event-end .dtend {
+        float: right;
+}
+
+.event-list-date {
+        margin-bottom: 10px;
+}
+
+.prevcal, .nextcal {
+        float: left;
+        margin-left: 32px;
+        margin-right: 32px;
+        margin-top: 64px;
+}
+.event-calendar-end {
+        clear: both;
+}
+
+ 
+.calendar {
+        font-family: Courier, monospace;
+}
+.calendar.eventcal a {
+  color: #3465A4;	
+	}
+.today {
+        font-weight: bold;
+        color: #FF0000;
+}
+
+.settings-block {
+        border: 1px solid #AAA;
+        margin: 10px;
+        padding: 10px;
+}
+
+.app-title {
+        margin: 10px;
+}
+
+#identity-manage-desc {
+        margin-top:15px;
+        margin-bottom: 15px;
+}
+
+#identity-manage-choose {
+        margin-bottom: 15px;
+}
+
+#identity-submit {
+        margin-top: 20px;
+}
+
+#photo-prev-link, #photo-next-link {
+        padding: 10px;
+        float: left;
+}
+.lightbox{
+	float: left;
+	}
+
+#photo-photo {
+        float: left;
+}
+#photo-like-div .wall-item-like-buttons {
+	 float: left;
+    margin-right: 5px;
+    margin-top: 30px;
+	}
+.comment-edit-text-empty {
+    margin: 10px 0 0;
+    width: 85%;
+}
+.comment-edit-photo {
+    margin: 10px 0 0;
+}
+.wall-item-like-buttons .icon.like {
+float: left;
+}
+
+#photo-photo-end {
+        clear: both;
+}
+
+.tabs .comment-wwedit-wrapper {
+	display: block;
+   margin-top: 30px;
+   margin-left: 50px;
+	}
+
+.profile-match-photo {
+        float: left;
+        text-align: center;
+        width: 120px;
+}
+
+.profile-match-name {
+        float: left;
+        text-align: center;
+        width: 120px;
+        overflow: hidden;
+}
+
+.profile-match-break,
+.profile-match-end {
+        clear: both;
+}
+
+.profile-match-connect {
+        text-align: center;
+        font-weight: bold;
+}
+
+.profile-match-wrapper {
+        float: left;
+        padding: 10px;
+        width: 120px;
+        height: 120px;
+        scroll: auto;
+}
+#profile-match-wrapper-end {
+        clear: both;
+}
+
+/* ============= */
+/* = Directory = */
+/* ============= */
+/* contacts menu */
+.contact-photo-wrapper {
+  position: relative;
+}
+.contact-photo {
+  width: 48px;
+  height: 48px;
+  overflow: hidden;
+  display: block;
+}
+.contact-photo img {
+  width: 48px;
+  height: 48px;
+}
+.contact-photo-menu-button {
+  display: none;
+  /* position: absolute; */
+  /* position: absolute; */
+  left: 0px;
+  top: -16px;
+}
+.contact-wrapper {
+  float: left;
+  width: 90px;
+  height: 90px;
+  margin-bottom: 15px;
+}
+.contact-wrapper .contact-photo {
+  width: 80px;
+  height: 80px;
+}
+.contact-wrapper .contact-photo img {
+  width: 80px;
+  height: 80px;
+}
+.contact-wrapper .contact-photo-menu-button {
+  left: 0px;
+  top: 63px;
+}
+.directory-item {
+  float: left;
+  width: 200px;
+  height: 200px;
+}
+.directory-item .contact-photo {
+  width: 175px;
+  height: 175px;
+}
+.directory-item .contact-photo img {
+  width: 175px;
+  height: 175px;
+}
+.contact-name {
+  text-align: left;
+  font-weight: bold;
+  font-size: 12px;
+}
+.contact-details {
+  color: #999999;
+}
+#side-bar-photos-albums li{
+list-style-type: disc;
+}
+#side-bar-photos-albums ul li{
+  margin-left: 30px;
+  padding-left: 0px;
+	}
+#side-bar-photos-albums{
+	margin-top: 15px;	
+	}
+.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-album-image-wrapper, .photo-top-image-wrapper {
+  float: left;
+   -moz-box-shadow: 0 0 5px #888;
+   -webkit-box-shadow: 0 0 5px #888;
+   box-shadow: 0 0 5px #888;
+  background-color: #000;
+   -webkit-border-radius: 5px;
+   -moz-border-radius: 5px;
+  border-radius: 5px;
+  padding-bottom: 20px;
+  position: relative;
+  margin: 0 10px 10px 0;
+  width: 200px; height: 140px;
+  overflow: hidden;  
+}
+.photo-top-album-name {
+        width: 100%;
+        position: absolute; 
+        bottom: 0px; 
+        padding-left: 3px;
+        background-color: #EEE;
+}
+.photo-top-album-link{
+  color: #3465A4;
+	}
+.photo-top-album-img{
+	
+	}
+/*.photo-top-image-wrapper {
+        position: relative;
+        float: left;
+        margin-top: 15px;
+        margin-right: 15px;
+        width: 200px; height: 200px; 
+        overflow: hidden; 
+}
+.photo-top-album-name {
+        width: 100%;
+        min-height: 2em;
+        position: absolute; 
+        bottom: 0px; 
+        padding: 0px 3px;
+        padding-top: 0.5em;
+        background-color: rgb(255, 255, 255);
+}*/
+#photo-top-end {
+        clear: both;
+}
+
+#photo-top-links {
+        margin-bottom: 30px;
+        margin-left: 30px;
+}
+
+#photos-upload-newalbum-div {
+        float: left;
+        width: 175px;
+}
+
diff --git a/view/theme/diabook-aerith/style-profile.css b/view/theme/diabook/diabook-aerith/style-profile.css
index c4f89359a..e21432d4e 100644
--- a/view/theme/diabook-aerith/style-profile.css
+++ b/view/theme/diabook/diabook-aerith/style-profile.css
@@ -84,61 +84,61 @@
 /* icons */
 
 .icon.contacts {
-  background-image: url("../../../view/theme/diabook-aerith/icons/contacts.png");}
+  background-image: url("../diabook-aerith/icons/contacts.png");}
 .icon.notifications {
-  background-image: url("../../../view/theme/diabook-aerith/icons/notifications.png");}
+  background-image: url("../diabook-aerith/icons/notifications.png");}
 .icon.notify {
-  background-image: url("../../../view/theme/diabook-aerith/icons/notify.png");}
+  background-image: url("../diabook-aerith/icons/notify.png");}
 .icon.messages {
-  background-image: url("../../../view/theme/diabook-aerith/icons/messages.png");}
+  background-image: url("../diabook-aerith/icons/messages.png");}
 .icon.community {
-  background-image: url("../../../view/theme/diabook-aerith/icons/community.png");}
+  background-image: url("../diabook-aerith/icons/community.png");}
   
-.icon.drop 	{ background-image: url("../../../view/theme/diabook-aerith/icons/drop.png");}
-.icon.drophide 	{ background-image: url("../../../view/theme/diabook-aerith/icons/drop.png");}
-.icon.dislike 	{ background-image: url("../../../view/theme/diabook-aerith/icons/dislike.png");}
-.icon.like 	{ background-image: url("../../../view/theme/diabook-aerith/icons/like.png");}
-.icon.pencil 	{ background-image: url("../../../view/theme/diabook-aerith/icons/pencil.png");}
-.icon.recycle 	{ background-image: url("../../../view/theme/diabook-aerith/icons/recycle.png");}
-.icon.remote-link { background-image: url("../../../view/theme/diabook-aerith/icons/remote.png");}
-.icon.tagged    { background-image: url("../../../view/theme/diabook-aerith/icons/tagged.png");}
-.icon.file-as { background-image: url("../../../view/theme/diabook-aerith/icons/file_as.png");}
-.star-item.icon.unstarred { background-image: url("../../../view/theme/diabook-aerith/icons/unstarred.png");}
-.star-item.icon.starred { background-image: url("../../../view/theme/diabook-aerith/icons/starred.png");}
-.icon.link		{ background-image: url("../../../view/theme/diabook-aerith/icons/link.png");}
-.icon.lock		{ background-image: url("../../../view/theme/diabook-aerith/icons/lock.png");}
-.icon.unlock		{ background-image: url("../../../view/theme/diabook-aerith/icons/unlock.png");}
-.icon.language    { background-image: url("../../../view/theme/diabook-aerith/icons/language.png");}
-
-
-.camera 	{ background-image: url("../../../view/theme/diabook-aerith/icons/camera.png"); 
+.icon.drop 	{ background-image: url("../diabook-aerith/icons/drop.png");}
+.icon.drophide 	{ background-image: url("../diabook-aerith/icons/drop.png");}
+.icon.dislike 	{ background-image: url("../diabook-aerith/icons/dislike.png");}
+.icon.like 	{ background-image: url("../diabook-aerith/icons/like.png");}
+.icon.pencil 	{ background-image: url("../diabook-aerith/icons/pencil.png");}
+.icon.recycle 	{ background-image: url("../diabook-aerith/icons/recycle.png");}
+.icon.remote-link { background-image: url("../diabook-aerith/icons/remote.png");}
+.icon.tagged    { background-image: url("../diabook-aerith/icons/tagged.png");}
+.icon.file-as { background-image: url("../diabook-aerith/icons/file_as.png");}
+.star-item.icon.unstarred { background-image: url("../diabook-aerith/icons/unstarred.png");}
+.star-item.icon.starred { background-image: url("../diabook-aerith/icons/starred.png");}
+.icon.link		{ background-image: url("../diabook-aerith/icons/link.png");}
+.icon.lock		{ background-image: url("../diabook-aerith/icons/lock.png");}
+.icon.unlock		{ background-image: url("../diabook-aerith/icons/unlock.png");}
+.icon.language    { background-image: url("../diabook-aerith/icons/language.png");}
+
+
+.camera 	{ background-image: url("../diabook-aerith/icons/camera.png"); 
 			  display: block; width: 28px; height: 28px; background-repeat: no-repeat;
 			  }
-.attach 	{ background-image: url("../../../view/theme/diabook-aerith/icons/attach.png"); 
+.attach 	{ background-image: url("../diabook-aerith/icons/attach.png"); 
 			  display: block; width: 28px; height: 28px; background-repeat: no-repeat;
 			  }
-.video2 	{ background-image: url("../../../view/theme/diabook-aerith/icons/video.png"); 
+.video2 	{ background-image: url("../diabook-aerith/icons/video.png"); 
 			  display: block; width: 28px; height: 28px; background-repeat: no-repeat;
 			  }	
-.video 	{ background-image: url("../../../view/theme/diabook-aerith/icons/video.png"); 
-			  display: block; width: 100%; height: 28px; background-repeat: no-repeat;
+.video 	{ background-image: url("../diabook-aerith/icons/video.png"); 
+			  display: block; width: 100%; height: 140px; background-repeat: no-repeat;
 			  }
-.audio2 	{ background-image: url("../../../view/theme/diabook-aerith/icons/audio.png"); 
+.audio2 	{ background-image: url("../diabook-aerith/icons/audio.png"); 
 			  display: block; width: 28px; height: 28px; background-repeat: no-repeat;
 			  }
-.audio 	{ background-image: url("../../../view/theme/diabook-aerith/icons/audio.png"); 
+.audio 	{ background-image: url("../diabook-aerith/icons/audio.png"); 
 			  display: block; width: 28px; height: 28px; background-repeat: no-repeat;
 			  }
-.weblink 	{ background-image: url("../../../view/theme/diabook-aerith/icons/weblink.png"); 
+.weblink 	{ background-image: url("../diabook-aerith/icons/weblink.png"); 
 			  display: block; width: 28px; height: 28px; background-repeat: no-repeat;
 			  }
-.globe 	{ background-image: url("../../../view/theme/diabook-aerith/icons/globe.png"); 
+.globe 	{ background-image: url("../diabook-aerith/icons/globe.png"); 
 			  display: block; width: 28px; height: 28px; background-repeat: no-repeat;
 			  }
-.unglobe 	{ background-image: url("../../../view/theme/diabook-aerith/icons/unglobe.png"); 
+.unglobe 	{ background-image: url("../diabook-aerith/icons/unglobe.png"); 
 			  display: block; width: 28px; height: 28px; background-repeat: no-repeat;
 			  }
-.edit    {background-image: url("../../../view/theme/diabook-aerith/icons/pencil2.png"); 
+.edit    {background-image: url("../diabook-aerith/icons/pencil2.png"); 
 			  display: block; width: 28px; height: 28px; background-repeat: no-repeat;}
 			  
 			  
@@ -176,15 +176,15 @@
 /*.language       { background-position: -210px -40px;}*/
 
 
-.icon.on             { background-image: url("../../../view/theme/diabook-aerith/icons/toogle_on.png"); background-repeat: no-repeat;}
-.icon.off            { background-image: url("../../../view/theme/diabook-aerith/icons/toogle_off.png"); background-repeat: no-repeat;}
+.icon.on             { background-image: url("../diabook-aerith/icons/toogle_on.png"); background-repeat: no-repeat;}
+.icon.off            { background-image: url("../diabook-aerith/icons/toogle_off.png"); background-repeat: no-repeat;}
 .prev           { background-position: -90px  -60px;}
 .next           { background-position: -110px -60px;}
 /*.tagged     { background-position: -130px -60px;}*/
 
 .attachtype {
         display: block; width: 20px; height: 23px;
-        background-image: url('../../../images/content-types.png');
+        background-image: url('../../../../images/content-types.png');
 }
 
 .type-video { background-position: 0px 0px; }
@@ -215,12 +215,12 @@
 }
 
 .icon.border.camera{
-  background-image: url("../../../view/theme/diabook-aerith/icons/camera.png"); 
+  background-image: url("../diabook-aerith/icons/camera.png"); 
   display: block; width: 28px; height: 28px; background-repeat: no-repeat;
 	}
 	
 .icon.border.link{
-  background-image: url("../../../view/theme/diabook-aerith/icons/weblink.png"); 
+  background-image: url("../diabook-aerith/icons/weblink.png"); 
   display: block; width: 28px; height: 28px; background-repeat: no-repeat;
   margin-left: 10px;
 	}
@@ -233,34 +233,34 @@
   height: 10px;
 }
 .icon.s10.notify {
-  background-image: url("../../../images/icons/10/notify_off.png");
+  background-image: url("../../../../images/icons/10/notify_off.png");
 }
 .icon.s10.gear {
-  background-image: url("../../../images/icons/10/gear.png");
+  background-image: url("../../../../images/icons/10/gear.png");
 }
 .icon.s10.add {
-  background-image: url("../../../images/icons/10/add.png");
+  background-image: url("../../../../images/icons/10/add.png");
 }
 .icon.s10.delete {
-  background-image: url("../../../images/icons/10/delete.png");
+  background-image: url("../../../../images/icons/10/delete.png");
 }
 .icon.s10.edit {
-  background-image: url("../../../images/icons/10/edit.png");
+  background-image: url("../../../../images/icons/10/edit.png");
 }
 .icon.s10.star {
-  background-image: url("../../../images/star_dummy.png");
+  background-image: url("../../../../images/star_dummy.png");
 }
 .icon.s10.menu {
-  background-image: url("../../../images/icons/10/menu.png");
+  background-image: url("../../../../images/icons/10/menu.png");
 }
 .icon.s10.link {
-  background-image: url("../../../images/icons/10/link.png");
+  background-image: url("../../../../images/icons/10/link.png");
 }
 .icon.s10.lock {
-  background-image: url("../../../images/icons/10/lock.png");
+  background-image: url("../../../../images/icons/10/lock.png");
 }
 .icon.s10.unlock {
-  background-image: url("../../../images/icons/10/unlock.png");
+  background-image: url("../../../../images/icons/10/unlock.png");
 }
 .icon.s10.text {
   padding: 2px 0px 0px 15px;
@@ -271,34 +271,34 @@
   height: 16px;
 }
 .icon.s16.notify {
-  background-image: url("../../../images/icons/16/notify_off.png");
+  background-image: url("../../../../images/icons/16/notify_off.png");
 }
 .icon.s16.gear {
-  background-image: url("../../../images/icons/16/gear.png");
+  background-image: url("../../../../images/icons/16/gear.png");
 }
 .icon.s16.add {
-  background-image: url("../../../images/icons/16/add.png");
+  background-image: url("../../../../images/icons/16/add.png");
 }
 .icon.s16.delete {
-  background-image: url("../../../images/icons/16/delete.png");
+  background-image: url("../../../../images/icons/16/delete.png");
 }
 /*.icon.s16.edit {
-  background-image: url("../../../images/icons/16/edit.png");
+  background-image: url("../../../../images/icons/16/edit.png");
 }*/
 .icon.s16.star {
-  background-image: url("../../../images/star_dummy.png");
+  background-image: url("../../../../images/star_dummy.png");
 }
 .icon.s16.menu {
-  background-image: url("../../../images/icons/16/menu.png");
+  background-image: url("../../../../images/icons/16/menu.png");
 }
 /*.icon.s16.link {
-  background-image: url("../../../images/icons/16/link.png");
+  background-image: url("../../../../images/icons/16/link.png");
 }*/
 .icon.s16.lock {
-  background-image: url("../../../images/icons/16/lock.png");
+  background-image: url("../../../../images/icons/16/lock.png");
 }
 .icon.s16.unlock {
-  background-image: url("../../../images/icons/16/unlock.png");
+  background-image: url("../../../../images/icons/16/unlock.png");
 }
 .icon.s16.text {
   padding: 4px 0px 0px 20px;
@@ -309,34 +309,34 @@
   height: 22px;
 }
 .icon.s22.notify {
-  background-image: url("../../../images/icons/22/notify_off.png");
+  background-image: url("../../../../images/icons/22/notify_off.png");
 }
 .icon.s22.gear {
-  background-image: url("../../../images/icons/22/gear.png");
+  background-image: url("../../../../images/icons/22/gear.png");
 }
 .icon.s22.add {
-  background-image: url("../../../images/icons/22/add.png");
+  background-image: url("../../../../images/icons/22/add.png");
 }
 .icon.s22.delete {
-  background-image: url("../../../images/icons/22/delete.png");
+  background-image: url("../../../../images/icons/22/delete.png");
 }
 .icon.s22.edit {
-  background-image: url("../../../images/icons/22/edit.png");
+  background-image: url("../../../../images/icons/22/edit.png");
 }
 .icon.s22.star {
-  background-image: url("../../../images/star_dummy.png");
+  background-image: url("../../../../images/star_dummy.png");
 }
 .icon.s22.menu {
-  background-image: url("../../../images/icons/22/menu.png");
+  background-image: url("../../../../images/icons/22/menu.png");
 }
 .icon.s22.link {
-  background-image: url("../../../images/icons/22/link.png");
+  background-image: url("../../../../images/icons/22/link.png");
 }
 .icon.s22.lock {
-  background-image: url("../../../images/icons/22/lock.png");
+  background-image: url("../../../../images/icons/22/lock.png");
 }
 .icon.s22.unlock {
-  background-image: url("../../../images/icons/22/unlock.png");
+  background-image: url("../../../../images/icons/22/unlock.png");
 }
 .icon.s22.text {
   padding: 10px 0px 0px 25px;
@@ -347,34 +347,34 @@
   height: 48px;
 }
 .icon.s48.notify {
-  background-image: url("../../../images/icons/48/notify_off.png");
+  background-image: url("../../../../images/icons/48/notify_off.png");
 }
 .icon.s48.gear {
-  background-image: url("../../../images/icons/48/gear.png");
+  background-image: url("../../../../images/icons/48/gear.png");
 }
 .icon.s48.add {
-  background-image: url("../../../images/icons/48/add.png");
+  background-image: url("../../../../images/icons/48/add.png");
 }
 .icon.s48.delete {
-  background-image: url("../../../images/icons/48/delete.png");
+  background-image: url("../../../../images/icons/48/delete.png");
 }
 .icon.s48.edit {
-  background-image: url("../../../images/icons/48/edit.png");
+  background-image: url("../../../../images/icons/48/edit.png");
 }
 .icon.s48.star {
-  background-image: url("../../../images/star_dummy.png");
+  background-image: url("../../../../images/star_dummy.png");
 }
 .icon.s48.menu {
-  background-image: url("../../../images/icons/48/menu.png");
+  background-image: url("../../../../images/icons/48/menu.png");
 }
 .icon.s48.link {
-  background-image: url("../../../images/icons/48/link.png");
+  background-image: url("../../../../images/icons/48/link.png");
 }
 .icon.s48.lock {
-  background-image: url("../../../images/icons/48/lock.png");
+  background-image: url("../../../../images/icons/48/lock.png");
 }
 .icon.s48.unlock {
-  background-image: url("../../../images/icons/48/unlock.png");
+  background-image: url("../../../../images/icons/48/unlock.png");
 }
 
 #contact-edit-links ul {
@@ -500,12 +500,12 @@ code {
 }
 /* popup notifications */
 div.jGrowl div.notice {
-  background: #511919 url("../../../images/icons/48/notice.png") no-repeat 5px center;
+  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;
+  background: #364e59 url("../../../../images/icons/48/info.png") no-repeat 5px center;
   color: #ffffff;
   padding-left: 58px;
 }
@@ -773,15 +773,15 @@ nav #nav-site-linkmenu .menu-popup {
 }
 
 nav #nav-messages-linkmenu.on .icon.messages, nav #nav-messages-linkmenu.selected .icon.messages{
-	background-image: url("../../../view/theme/diabook-aerith/icons/messages.png");
+	background-image: url("../diabook-aerith/icons/messages.png");
 	}
 	
 /*nav #nav-notifications-linkmenu.on .icon.notify,*/ nav #nav-notifications-linkmenu.selected .icon.notify{
-	background-image: url("../../../view/theme/diabook-aerith/icons/notify.png");
+	background-image: url("../diabook-aerith/icons/notify.png");
 	}
 	
 nav #nav-contacts-linkmenu.on .icon.contacts, nav #nav-contacts-linkmenu.selected .icon.contacts{
-	background-image: url("../../../view/theme/diabook-aerith/icons/contacts.png");
+	background-image: url("../diabook-aerith/icons/contacts.png");
 	}
 	
 nav #nav-apps-link.selected {
@@ -955,22 +955,22 @@ ul.menu-popup .empty {
    }
 /*http://prothemedesign.com/circular-icons/*/
 .menu-profile-list.home{
-	background: url("../../../view/theme/diabook-aerith/icons/home.png") no-repeat;
+	background: url("../diabook-aerith/icons/home.png") no-repeat;
 	}
 .menu-profile-list.photos{
-	background: url("../../../view/theme/diabook-aerith/icons/mess_side.png") no-repeat;
+	background: url("../diabook-aerith/icons/mess_side.png") no-repeat;
 	}
 .menu-profile-list.events{
-	background: url("../../../view/theme/diabook-aerith/icons/events.png") no-repeat;
+	background: url("../diabook-aerith/icons/events.png") no-repeat;
 	}
 .menu-profile-list.notes{
-	background: url("../../../view/theme/diabook-aerith/icons/notes.png") no-repeat;
+	background: url("../diabook-aerith/icons/notes.png") no-repeat;
 	}
 .menu-profile-list.foren{
-	background: url("../../../view/theme/diabook-aerith/icons/pubgroups.png") no-repeat;
+	background: url("../diabook-aerith/icons/pubgroups.png") no-repeat;
 	}
 .menu-profile-list.com_side{
-	background: url("../../../view/theme/diabook-aerith/icons/com_side.png") no-repeat;
+	background: url("../diabook-aerith/icons/com_side.png") no-repeat;
 	}
 
 /* aside */
@@ -1023,7 +1023,7 @@ aside #dfrn-request-link {
   -webkit-border-radius: 5px 5px 5px 5px;
   border-radius: 5px 5px 5px 5px;
   color: #ffffff;
-  background: #005c94 url('../../../images/connect-bg.png') no-repeat left center;
+  background: #005c94 url('../../../../images/connect-bg.png') no-repeat left center;
   font-weight: bold;
   text-transform: uppercase;
   padding: 4px 2px 2px 35px;
@@ -1150,11 +1150,11 @@ list-style-type: disc;
   color: #3465A4;
 }
 .widget .tool.selected {
-  background: url("../../../view/theme/diabook-aerith/icons/selected.png") no-repeat left center;
+  background: url("../diabook-aerith/icons/selected.png") no-repeat left center;
 }
 /* widget: search */
 span.sbox_l  {
-	background: white url('../../../view/theme/diabook/icons/srch_l.gif') no-repeat top left;
+	background: white url('../diabook/icons/srch_l.gif') no-repeat top left;
 	float: left;
 	width: 19px; height: 19px;
 	margin-left: 10px;
@@ -1163,14 +1163,14 @@ span.sbox_l  {
 }
 
 span.sbox_r  {
-	background: white url('../../../view/theme/diabook/icons/srch_r.gif') no-repeat top left;
+	background: white url('../diabook/icons/srch_r.gif') no-repeat top left;
 	float: left;
 	width: 19px; height: 19px;
 	margin-top: 5px;
 }
 
 span.sbox input {
-	background: white url('../../../view/theme/diabook/icons/srch_bg.gif') repeat-x top left;
+	background: white url('../diabook/icons/srch_bg.gif') repeat-x top left;
 	float: left;
 	margin-top: 5px;
 	border: 0;
@@ -1193,10 +1193,14 @@ section {
 
 body .pageheader{
   text-align: center;
-  margin-top: 25px;
-  font-size: 0px;
+  font-size: 20px;
+  margin-bottom: 20px;
+  margin-top: 0px;
+  max-width: 575px;
+	}
+.qcomment{
+  max-width: 122px;	
 	}
-
 #id_username {
   width: 173px;	
 	}
@@ -1224,7 +1228,6 @@ body .pageheader{
     padding: 0;
  }
 .tab.button {
-    margin-right: 5px; 
     margin-left: 5px;	
     /*background: none repeat scroll 0 0 #F8F8F8;*/
     border: 1px solid #CCCCCC;
@@ -1251,7 +1254,7 @@ right_aside {
   /* background: #F1F1F1; */
 }
 right_aside a{color: #3465A4;}
-right_aside h3 {border-bottom: 1px solid #D2D2D2; padding-top: 5px; padding-bottom: 0px; padding-left: 5px; margin-bottom: 0px; 
+right_aside h3 {border-bottom: 1px solid #D2D2D2; padding-top: 5px; padding-bottom: 0px; padding-left: 9px; margin-bottom: 0px; 
 margin-top:30px;}
 right_aside .directory-item {	width: 50px; height: 50px; vertical-align: center; text-align: center; }
 right_aside .directory-photo { margin: 0px; }
@@ -1265,13 +1268,13 @@ right_aside #ra-photos-wrapper { padding-left: 5px; padding-top: 3px; overflow:
 #page-sidebar-right_aside .label {max-width: 128px;}
 right_aside .icon {width: 10px; height: 10px;}
 .close_box		{ 
-		background-image: url("../../../view/theme/diabook-aerith/icons/close_box.png");
+		background-image: url("../diabook-aerith/icons/close_box.png");
 		float: right;
 		cursor: pointer;
 		opacity: 0.1;
 		}
 .close_box:hover	{ 
-		background-image: url("../../../view/theme/diabook-aerith/icons/close_box.png");
+		background-image: url("../diabook-aerith/icons/close_box.png");
 		float: right;
 		cursor: pointer;
 		opacity: 1;
@@ -1288,6 +1291,7 @@ transition: all 0.2s ease-in-out;
   padding: 5px;
   margin-bottom: 0px;
   width: 575px;
+  padding-top: 10px;
 }
 .tread-wrapper a{
   color: #3465A4;
@@ -1354,14 +1358,16 @@ transition: all 0.2s ease-in-out;
 }
 
 .wall-item-container .wall-item-content {
-  font-size: 12.5px;
+
   max-width: 420px;
   word-wrap: break-word;
-  line-height: 1.2;
+
+
 }
 
 .wall-item-container .wall-item-content img {
   max-width: 400px;
+
 }
 .wall-item-container .wall-item-links, .wall-item-container .wall-item-actions {
   display: table-cell;
@@ -1423,7 +1429,7 @@ transition: all 0.2s ease-in-out;
   width: 32px;
   height: 32px;
   margin-left: 16px;
-  /*background: url(../../../images/icons/22/user.png) no-repeat center center;*/
+  /*background: url(../../../../images/icons/22/user.png) no-repeat center center;*/
 
 }
 .wall-item-container.comment {
@@ -1434,13 +1440,13 @@ transition: all 0.2s ease-in-out;
   padding-left: 12px;
 }
 .wall-item-comment-wrapper {
-  margin: 1px 5px 1px 80px;
+  margin: 1px 5px 5px 80px;
 }
 .wall-item-comment-wrapper .comment-edit-photo {
   display: none;
 }
 .wall-item-comment-wrapper textarea {
-  height: 2.0em;
+  height: 1.6em ;
   width: 100%;
   font-size: 10px;
   color: #999999;
@@ -1455,15 +1461,15 @@ transition: all 0.2s ease-in-out;
   border: 1px solid #2d2d2d;
 }
 .comment-edit-preview {
-  width: 710px;
-  border: 1px solid #2d2d2d;
+  width: 500px;
   margin-top: 10px;
+  background-color:  #fff797;
 }
 .comment-edit-preview .contact-photo {
   width: 32px;
   height: 32px;
   margin-left: 16px;
-  /*background: url(../../../images/icons/22/user.png) no-repeat center center;*/
+  /*background: url(../../../../images/icons/22/user.png) no-repeat center center;*/
 
 }
 .comment-edit-preview {
@@ -1500,14 +1506,14 @@ transition: all 0.2s ease-in-out;
   padding-bottom: 2px;
 }
 .tag {
-  /*background: url("../../../images/tag_b.png") repeat-x center left;*/
+  /*background: url("../../../../images/tag_b.png") repeat-x center left;*/
   color: #999;
   padding-left: 3px;
   font-size: 12px;
 }
 .tag a {
   padding-right: 5px;
-  /*background: url("../../../images/tag.png") no-repeat center right;*/
+  /*background: url("../../../../images/tag.png") no-repeat center right;*/
   color: #999;
 }
 .wwto {
@@ -1603,6 +1609,11 @@ transition: all 0.2s ease-in-out;
   padding: 0.3em;
   margin-bottom: 10px;
 }
+.grey
+{
+  display: inline;
+  float: right;	
+	}
 #jot #jot-tools {
   margin: 0px;
   padding: 0px;
@@ -1688,7 +1699,7 @@ transition: all 0.2s ease-in-out;
     height: 20px;
     margin: 0 0 5px;
     width: 60%;
-    border: 1px solid #ffffff;
+    border: 1px solid #d2d2d2;
 }
 #profile-jot-form #jot-title:-webkit-input-placeholder {
   font-weight: normal;
@@ -1841,7 +1852,7 @@ transition: all 0.2s ease-in-out;
 }
 #acl-search {
   float: right;
-  background: #ffffff url("../../../images/search_18.png") no-repeat right center;
+  background: #ffffff url("../../../../images/search_18.png") no-repeat right center;
   padding-right: 20px;
 }
 #acl-showall {
@@ -1850,7 +1861,7 @@ transition: all 0.2s ease-in-out;
   width: auto;
   height: 18px;
   background-color: #cccccc;
-  background-image: url("../../../images/show_all_off.png");
+  background-image: url("../../../../images/show_all_off.png");
   background-position: 7px 7px;
   background-repeat: no-repeat;
   padding: 7px 5px 0px 30px;
@@ -1862,7 +1873,7 @@ transition: all 0.2s ease-in-out;
 #acl-showall.selected {
   color: #000000;
   background-color: #ff9900;
-  background-image: url("../../../images/show_all_on.png");
+  background-image: url("../../../../images/show_all_on.png");
 }
 #acl-list {
   height: 210px;
@@ -1913,20 +1924,20 @@ transition: all 0.2s ease-in-out;
   color: #000000;
 }
 .acl-button-show {
-  background-image: url("../../../images/show_off.png");
+  background-image: url("../../../../images/show_off.png");
 }
 .acl-button-hide {
-  background-image: url("../../../images/hide_off.png");
+  background-image: url("../../../../images/hide_off.png");
 }
 .acl-button-show.selected {
   color: #000000;
   background-color: #9ade00;
-  background-image: url("../../../images/show_on.png");
+  background-image: url("../../../../images/show_on.png");
 }
 .acl-button-hide.selected {
   color: #000000;
   background-color: #ff4141;
-  background-image: url("../../../images/hide_on.png");
+  background-image: url("../../../../images/hide_on.png");
 }
 .acl-list-item.groupshow {
   border-color: #9ade00;
@@ -1984,7 +1995,7 @@ ul.tabs li .active {
 .field .onoff a {
   display: block;
   border: 1px solid #666666;
-  background-image: url("../../../images/onoff.jpg");
+  background-image: url("../../../../images/onoff.jpg");
   background-repeat: no-repeat;
   padding: 4px 2px 2px 2px;
   height: 16px;
@@ -2057,7 +2068,7 @@ ul.tabs li .active {
   margin: 10px;
 }
 .oauthapp img.noicon {
-  background-image: url("../../../images/icons/48/plugin.png");
+  background-image: url("../../../../images/icons/48/plugin.png");
   background-position: center center;
   background-repeat: no-repeat;
 }
@@ -2073,9 +2084,10 @@ ul.tabs li .active {
 /* photo */
 .photo {
 box-shadow: 2px 2px 5px 0px #000000;
-margin: 2px 5px 2px 5px;
-max-height: 85%;
-max-width: 85%;
+margin: 0px;
+border-radius: 10px;
+height: 145px !important;
+width: 145px !important;
 }
 .lframe {
   float: left;
@@ -2103,7 +2115,7 @@ max-width: 85%;
 
 .contact-photo-menu-button {
         position: relative;
-        background-image: url("../../../images/icons/16/menu.png");
+        background-image: url("../../../../images/icons/16/menu.png");
         background-position: top left; 
         background-repeat: no-repeat;
         margin: 0px 0px -16px 0px; 
@@ -2148,6 +2160,11 @@ blockquote {
     border-left: 1px solid #D2D2D2;
     padding-left: 9px;
     margin: 0 0 0 .8ex;
+	 color: #777;
+}
+.oembed {
+	
+	font-weight: bold;
 }
 .aprofile dt{
 box-shadow: 1px 1px 5px 0;
@@ -2186,6 +2203,9 @@ box-shadow: 1px 1px 5px 0;
 #group-separator,
 #prof-separator { display: none;}
 */
+#prof-members-end{
+	clear: both;
+	}
 
 #prvmail-to-label, #prvmail-subject-label, #prvmail-message-label {
 	margin-bottom: 10px;
@@ -2311,7 +2331,7 @@ a.mail-list-link {
 }
 
 .vevent {
-        border: 1px solid #CCCCCC;
+
 }
 .vevent .event-description, .vevent .event-location {
         margin-left: 10px;
@@ -2334,7 +2354,7 @@ a.mail-list-link {
 }
 
 .event-description:before {
-        content: url('../../../images/calendar.png');
+        content: url('../../../../images/calendar.png');
         margin-right: 15px;
 }
 
diff --git a/view/theme/diabook/diabook-aerith/style-wide.css b/view/theme/diabook/diabook-aerith/style-wide.css
new file mode 100644
index 000000000..388a05b46
--- /dev/null
+++ b/view/theme/diabook/diabook-aerith/style-wide.css
@@ -0,0 +1,2943 @@
+/**
+ * Fabio Comuni <http://kirgroup.com/profile/fabrixxm>
+ * Additional Changes: Michael Vogel <icarus@dabo.de>
+ **/
+
+/* ========= */
+/* = Admin = */
+/* ========= */
+
+#adminpage {
+/*        width: 80%;*/
+}
+
+#pending-update {
+        float:right;
+        color: #ffffff;
+        font-weight: bold;
+        background-color: #FF0000;
+        padding: 0em 0.3em;
+}
+
+.admin.linklist {
+        border: 0px; padding: 0px;
+}
+
+.admin.link {
+        list-style-position: inside;
+        font-size: 1em;
+        padding: 5px;
+        width: 100px;
+        margin: 5px;
+}
+
+#adminpage dl {
+        clear: left;
+        margin-bottom: 2px;
+        padding-bottom: 2px;
+        border-bottom: 1px solid black;
+}
+
+#adminpage dt {
+        width: 200px;
+        float: left;
+        font-weight: bold;
+}
+
+#adminpage dd {
+        margin-left: 200px;
+}
+#adminpage h3 {
+        border-bottom: 1px solid #898989;
+        margin-bottom: 5px;
+        margin-top: 10px;
+}
+
+#adminpage .submit {
+        clear:left;
+}
+
+#adminpage #pluginslist {
+        margin: 0px; padding: 0px;
+}
+
+#adminpage .plugin {
+        list-style: none;
+        display: block;
+	/* border: 1px solid #888888; */
+        padding: 1em;
+        margin-bottom: 5px;
+        clear: left;
+}
+
+#adminpage .toggleplugin {
+        float:left;
+        margin-right: 1em;
+}
+
+#adminpage table {width:100%; border-bottom: 1p solid #000000; margin: 5px 0px;}
+#adminpage table th { text-align: left;}
+#adminpage td .icon { float: left;}
+#adminpage table#users img { width: 16px; height: 16px; }
+#adminpage table tr:hover { background-color: #eeeeee; }
+#adminpage .selectall { text-align: right; }
+/* icons */
+
+.icon.bb-url{
+  background-image: url("../../../view/theme/diabook/diabook-aerith/icons/bb-url.png");
+  float: right;
+  margin-top: 2px;}
+.icon.quote{
+  background-image: url("../../../view/theme/diabook/diabook-aerith/icons/quote.png");
+  float: right;
+  margin-top: 2px;}
+.icon.bold{
+  background-image: url("../../../view/theme/diabook/diabook-aerith/icons/bold.png");
+  float: right;
+  margin-top: 2px;}
+.icon.underline{
+  background-image: url("../../../view/theme/diabook/diabook-aerith/icons/underline.png");
+  float: right;
+  margin-top: 2px;}
+.icon.italic{
+  background-image: url("../../../view/theme/diabook/diabook-aerith/icons/italic.png");
+  float: right;
+  margin-top: 2px;}
+.icon.bb-image{
+  background-image: url("../../../view/theme/diabook/diabook-aerith/icons/bb-image.png");
+  float: right;
+  margin-top: 2px;}
+.icon.bb-video{
+  background-image: url("../../../view/theme/diabook/diabook-aerith/icons/bb-video.png");
+  float: right;
+  margin-top: 2px;}
+  
+.icon.contacts {
+  background-image: url("../../../view/theme/diabook/diabook-aerith/icons/contacts.png");}
+.icon.notifications {
+  background-image: url("../../../view/theme/diabook/diabook-aerith/icons/notifications.png");}
+.icon.notify {
+  background-image: url("../../../view/theme/diabook/diabook-aerith/icons/notify.png");}
+.icon.messages {
+  background-image: url("../../../view/theme/diabook/diabook-aerith/icons/messages.png");}
+.icon.community {
+  background-image: url("../../../view/theme/diabook/diabook-aerith/icons/community.png");}
+  
+.icon.drop 	{ background-image: url("../../../view/theme/diabook/diabook-aerith/icons/drop.png");}
+.icon.drophide 	{ background-image: url("../../../view/theme/diabook/diabook-aerith/icons/drop.png");}
+.icon.dislike 	{ background-image: url("../../../view/theme/diabook/diabook-aerith/icons/dislike.png");}
+.icon.like 	{ background-image: url("../../../view/theme/diabook/diabook-aerith/icons/like.png");}
+.icon.pencil 	{ background-image: url("../../../view/theme/diabook/diabook-aerith/icons/pencil.png");}
+.icon.recycle 	{ background-image: url("../../../view/theme/diabook/diabook-aerith/icons/recycle.png");}
+.icon.remote-link { background-image: url("../../../view/theme/diabook/diabook-aerith/icons/remote.png");}
+.icon.tagged    { background-image: url("../../../view/theme/diabook/diabook-aerith/icons/tagged.png");}
+.icon.file-as { background-image: url("../../../view/theme/diabook/diabook-aerith/icons/file_as.png");}
+.star-item.icon.unstarred { background-image: url("../../../view/theme/diabook/diabook-aerith/icons/unstarred.png");}
+.star-item.icon.starred { background-image: url("../../../view/theme/diabook/diabook-aerith/icons/starred.png");}
+.icon.link		{ background-image: url("../../../view/theme/diabook/diabook-aerith/icons/link.png");}
+.icon.lock		{ background-image: url("../../../view/theme/diabook/diabook-aerith/icons/lock.png");}
+.icon.unlock		{ background-image: url("../../../view/theme/diabook/diabook-aerith/icons/unlock.png");}
+.icon.language    { background-image: url("../../../view/theme/diabook/diabook-aerith/icons/language.png");}
+
+
+.camera 	{ background-image: url("../../../view/theme/diabook/diabook-aerith/icons/camera.png"); 
+			  display: block; width: 28px; height: 28px; background-repeat: no-repeat;
+			  }
+.attach 	{ background-image: url("../../../view/theme/diabook/diabook-aerith/icons/attach.png"); 
+			  display: block; width: 28px; height: 28px; background-repeat: no-repeat;
+			  }
+.video2 	{ background-image: url("../../../view/theme/diabook/diabook-aerith/icons/video.png"); 
+			  display: block; width: 28px; height: 28px; background-repeat: no-repeat;
+			  }	
+.video 	{ background-image: url("../../../view/theme/diabook/diabook-aerith/icons/video.png"); 
+			  display: block; width: 100%; height: 140px; background-repeat: no-repeat;
+			  }
+.audio2 	{ background-image: url("../../../view/theme/diabook/diabook-aerith/icons/audio.png"); 
+			  display: block; width: 28px; height: 28px; background-repeat: no-repeat;
+			  }
+.audio 	{ background-image: url("../../../view/theme/diabook/diabook-aerith/icons/audio.png"); 
+			  display: block; width: 28px; height: 28px; background-repeat: no-repeat;
+			  }
+.weblink 	{ background-image: url("../../../view/theme/diabook/diabook-aerith/icons/weblink.png"); 
+			  display: block; width: 28px; height: 28px; background-repeat: no-repeat;
+			  }
+.globe 	{ background-image: url("../../../view/theme/diabook/diabook-aerith/icons/globe.png"); 
+			  display: block; width: 28px; height: 28px; background-repeat: no-repeat;
+			  }
+.unglobe 	{ background-image: url("../../../view/theme/diabook/diabook-aerith/icons/unglobe.png"); 
+			  display: block; width: 28px; height: 28px; background-repeat: no-repeat;
+			  }
+.edit    {background-image: url("../../../view/theme/diabook/diabook-aerith/icons/pencil2.png"); 
+			  display: block; width: 28px; height: 28px; background-repeat: no-repeat;}
+.icon.block   {background-image: url("../../../view/theme/diabook/icons/block.png"); 
+			  display: block; width: 16px; height: 16px; background-repeat: no-repeat;}
+.icon.block.dim  {background-image: url("../../../view/theme/diabook/icons/block.png"); 
+			  display: block; width: 16px; height: 16px; background-repeat: no-repeat; opacity: 0.3;}
+.icon.ad_drop 	{ background-image: url("../../../view/theme/diabook/icons/drop.png");
+			  display: block; margin-left:5px; width: 16px; height: 16px; background-repeat: no-repeat;}			  
+			  
+
+
+.article	{ background-position: -50px  0px;}
+/*.audio 		{ background-position: -70px  0px;}*/
+/*.drop 		{ background-position: -110px 0px;}*/
+/*.drophide 	{ background-position: -130px 0px;}*/
+/*.edit 		{ background-position: -150px 0px;}*/
+/*.camera 	{ background-position: -170px 0px;}*/
+/*.dislike 	{ background-position: -190px 0px;}*/
+/*.like 		{ background-position: -210px 0px;}*/
+/*.link 		{ background-position: -230px 0px;}*/
+
+/*.globe 		{ background-position: -50px  -20px;}*/
+/*.noglobe 	{ background-position: -70px  -20px;}*/
+.no 		{ background-position: -90px  -20px;}
+.pause 		{ background-position: -110px -20px;}
+.play 		{ background-position: -130px -20px;}
+/*.pencil 	{ background-position: -150px -20px;}*/
+.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;}*/
+
+/*.video          { background-position: -110px -40px;}*/
+.youtube        { background-position: -130px -40px;}
+
+/*.attach         { background-position: -190px -40px;}*/
+/*.language       { background-position: -210px -40px;}*/
+
+
+.icon.on             { background-image: url("../../../view/theme/diabook/diabook-aerith/icons/toogle_on.png"); background-repeat: no-repeat;}
+.icon.off            { background-image: url("../../../view/theme/diabook/diabook-aerith/icons/toogle_off.png"); background-repeat: no-repeat;}
+.icon.prev           { background-image: url("../../../view/theme/diabook/diabook-aerith/icons/prev.png"); background-repeat: no-repeat;}
+.icon.next           { background-image: url("../../../view/theme/diabook/diabook-aerith/icons/next.png"); background-repeat: no-repeat;}
+/*.tagged     { background-position: -130px -60px;}*/
+
+.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 0px; }
+.type-audio { background-position: -40px 0px; }
+.type-text  { background-position: -60px 0px; }
+.type-unkn  { background-position: -80px 0px; }
+
+.icon.drop, .icon.drophide {
+ float: left;
+}
+
+.icon {
+  display: block;
+  width: 20px;
+  height: 20px;
+  /*background-image: url('icons.png');*/
+}
+
+.icon {
+  background-color: transparent ;
+  background-repeat: no-repeat;
+  /* background-position: left center; */
+  display: block;
+  overflow: hidden;
+  text-indent: -9999px;
+  padding: 1px;
+}
+
+.icon.border.camera{
+  background-image: url("../../../view/theme/diabook/diabook-aerith/icons/camera.png"); 
+  display: block; width: 28px; height: 28px; background-repeat: no-repeat;
+	}
+	
+.icon.border.link{
+  background-image: url("../../../view/theme/diabook/diabook-aerith/icons/weblink.png"); 
+  display: block; width: 28px; height: 28px; background-repeat: no-repeat;
+  margin-left: 10px;
+	}
+
+.icon.text {
+  text-indent: 0px;
+}
+.icon.s10 {
+  min-width: 10px;
+  height: 10px;
+}
+.icon.s10.notify {
+  background-image: url("../../../images/icons/10/notify_off.png");
+}
+.icon.s10.gear {
+  background-image: url("../../../images/icons/10/gear.png");
+}
+.icon.s10.add {
+  background-image: url("../../../images/icons/10/add.png");
+}
+.icon.s10.delete {
+  background-image: url("../../../images/icons/10/delete.png");
+}
+.icon.s10.edit {
+  background-image: url("../../../images/icons/10/edit.png");
+}
+.icon.s10.star {
+  background-image: url("../../../images/star_dummy.png");
+}
+.icon.s10.menu {
+  background-image: url("../../../images/icons/10/menu.png");
+}
+.icon.s10.link {
+  background-image: url("../../../images/icons/10/link.png");
+}
+.icon.s10.lock {
+  background-image: url("../../../images/icons/10/lock.png");
+}
+.icon.s10.unlock {
+  background-image: url("../../../images/icons/10/unlock.png");
+}
+.icon.s10.text {
+  padding: 2px 0px 0px 15px;
+  font-size: 10px;
+}
+.icon.s16 {
+  min-width: 16px;
+  height: 16px;
+}
+.icon.s16.notify {
+  background-image: url("../../../images/icons/16/notify_off.png");
+}
+.icon.s16.gear {
+  background-image: url("../../../images/icons/16/gear.png");
+}
+.icon.s16.add {
+  background-image: url("../../../images/icons/16/add.png");
+}
+.icon.s16.delete {
+  background-image: url("../../../images/icons/16/delete.png");
+}
+/*.icon.s16.edit {
+  background-image: url("../../../images/icons/16/edit.png");
+}*/
+.icon.s16.star {
+  background-image: url("../../../images/star_dummy.png");
+}
+.icon.s16.menu {
+  background-image: url("../../../images/icons/16/menu.png");
+}
+/*.icon.s16.link {
+  background-image: url("../../../images/icons/16/link.png");
+}*/
+.icon.s16.lock {
+  background-image: url("../../../images/icons/16/lock.png");
+}
+.icon.s16.unlock {
+  background-image: url("../../../images/icons/16/unlock.png");
+}
+.icon.s16.text {
+  padding: 4px 0px 0px 20px;
+  font-size: 10px;
+}
+.icon.s22 {
+  min-width: 22px;
+  height: 22px;
+}
+.icon.s22.notify {
+  background-image: url("../../../images/icons/22/notify_off.png");
+}
+.icon.s22.gear {
+  background-image: url("../../../images/icons/22/gear.png");
+}
+.icon.s22.add {
+  background-image: url("../../../images/icons/22/add.png");
+}
+.icon.s22.delete {
+  background-image: url("../../../images/icons/22/delete.png");
+}
+.icon.s22.edit {
+  background-image: url("../../../images/icons/22/edit.png");
+}
+.icon.s22.star {
+  background-image: url("../../../images/star_dummy.png");
+}
+.icon.s22.menu {
+  background-image: url("../../../images/icons/22/menu.png");
+}
+.icon.s22.link {
+  background-image: url("../../../images/icons/22/link.png");
+}
+.icon.s22.lock {
+  background-image: url("../../../images/icons/22/lock.png");
+}
+.icon.s22.unlock {
+  background-image: url("../../../images/icons/22/unlock.png");
+}
+.icon.s22.text {
+  padding: 10px 0px 0px 25px;
+  width: 200px;
+}
+.icon.s48 {
+  width: 48px;
+  height: 48px;
+}
+.icon.s48.notify {
+  background-image: url("../../../images/icons/48/notify_off.png");
+}
+.icon.s48.gear {
+  background-image: url("../../../images/icons/48/gear.png");
+}
+.icon.s48.add {
+  background-image: url("../../../images/icons/48/add.png");
+}
+.icon.s48.delete {
+  background-image: url("../../../images/icons/48/delete.png");
+}
+.icon.s48.edit {
+  background-image: url("../../../images/icons/48/edit.png");
+}
+.icon.s48.star {
+  background-image: url("../../../images/star_dummy.png");
+}
+.icon.s48.menu {
+  background-image: url("../../../images/icons/48/menu.png");
+}
+.icon.s48.link {
+  background-image: url("../../../images/icons/48/link.png");
+}
+.icon.s48.lock {
+  background-image: url("../../../images/icons/48/lock.png");
+}
+.icon.s48.unlock {
+  background-image: url("../../../images/icons/48/unlock.png");
+}
+
+#contact-edit-links ul {
+  list-style: none;
+  list-style-type: none;
+}
+
+.hide-comments-outer {
+  margin-left: 80px;
+  margin-bottom: 5px;
+  width: 675px;
+  border-bottom: 1px solid #BDCDD4;
+  padding: 8px;
+}
+
+/* global */
+body {
+  font-family: 'Lato', "Helvetica Neue", Helvetica, Arial, sans-serif;
+  font-size: 13px;
+  background-color: #ffffff;
+  color: #2d2d2d;
+  margin: 50px auto auto;
+  display: table;
+}
+
+#jappix_mini {
+right: 45px !important;
+}
+
+
+h4 {
+  font-size: 1.1em;
+}
+
+a {
+	color: #333333;
+	/* color: #3e3e8c; */
+	text-decoration: none;
+}
+a:hover {
+	/* color: blue; */
+	text-decoration: underline
+}
+
+.wall-item-name-link {
+/*  float: left;*/
+}
+
+.wall-item-photo {
+  width: 48px;
+  height: 48px;
+  overflow: hidden;
+  display: block;
+}
+
+.left {
+  float: left;
+}
+.right {
+  float: right;
+}
+.hidden {
+  display: none;
+}
+.clear {
+  clear: both;
+}
+.fakelink {
+  color: #3465A4;
+  /* color: #3e3e8c; */
+  text-decoration: none;
+  cursor: pointer;
+}
+.fakelink:hover {
+  /* color: blue; */
+  /*color: #005c94; */
+  text-decoration: underline;
+}
+.intro-end {
+	border-bottom: 1px solid black;
+   clear: both;
+   margin-bottom: 25px;
+   padding-bottom: 25px;
+   width: 75%;
+	}
+.intro-form-end {
+	clear: both;
+	}
+.intro-fullname {
+	padding-bottom: 5px;
+   padding-top: 5px;
+	}
+.intro-wrapper-end {
+	clear: both;
+   padding-bottom: 5px;
+	}
+code {
+  font-family: Courier, monospace;
+  white-space: pre;
+  display: block;
+  overflow: auto;
+  border: 1px solid #444;
+  background: #EEE;
+  color: #444;
+  padding: 10px;
+  margin-top: 20px;
+}
+#panel {
+  position: absolute;
+  width: 12em;
+  background: #ffffff;
+  color: #2d2d2d;
+  margin: 0px;
+  padding: 1em;
+  list-style: none;
+  border: 3px solid #364e59;
+  z-index: 100000;
+  -webkit-box-shadow: 0px 5px 10px rgba(0, 0, 0, 0.7);
+  -moz-box-shadow: 0px 5px 10px rgba(0, 0, 0, 0.7);
+  box-shadow: 0px 5px 10px rgba(0, 0, 0, 0.7);
+}
+/* tool */
+.tool {
+  height: auto;
+  overflow: auto;
+  padding: 3px;
+}
+#saved-search-ul .tool:hover,
+#nets-sidebar .tool:hover,
+#sidebar-group-list .tool:hover,
+#fileas-sidebar .tool:hover  {
+	background: aliceBlue;
+}
+.tool .label {
+  float: left;
+}
+.tool .action {
+  float: right;
+}
+.tool a {
+  color: ##3F8FBA;
+}
+.tool a:hover {
+  text-decoration: none;
+}
+/* popup notifications */
+div.jGrowl div.notice {
+  background: #511919 url("../../../images/icons/48/notice.png") no-repeat 5px center;
+  color: #ffffff;
+  padding-left: 58px;
+}
+div.jGrowl div.info {
+  background: #364e59 url("../../../images/icons/48/info.png") no-repeat 5px center;
+  color: #ffffff;
+  padding-left: 58px;
+}
+/* header */
+header {
+  position: fixed;
+  left: 0%;
+  right: 80%;
+  top: 0px;
+  margin: 0px;
+  padding: 0px;
+  width: 22%;
+  height: 32px;
+  background: #ff500f;
+  background-color: #ff500f;
+  z-index: 100;
+  border-bottom: 1px;
+  border-bottom-color: black;
+  border-bottom-style: inset;
+  background-image: linear-gradient(bottom, rgb(215,227,241) 26%, rgb(255,255,255) 82%);
+background-image: -o-linear-gradient(bottom, rgb(215,227,241) 26%, rgb(255,255,255) 82%);
+background-image: -moz-linear-gradient(bottom, rgb(215,227,241) 26%, rgb(255,255,255) 82%);
+background-image: -webkit-linear-gradient(bottom, rgb(215,227,241) 26%, rgb(255,255,255) 82%);
+background-image: -ms-linear-gradient(bottom, rgb(215,227,241) 26%, rgb(255,255,255) 82%);
+
+background-image: -webkit-gradient(
+	linear,
+	left bottom,
+	left top,
+	color-stop(0.26, rgb(215,227,241)),
+	color-stop(0.82, rgb(255,255,255))
+);
+}
+header #site-location {
+  display: none;
+}
+header #banner {
+  overflow: hidden;
+  text-align: banner;
+  width: 82%;
+  margin-left: 25%;
+}
+header #banner a,
+header #banner a:active,
+header #banner a:visited,
+header #banner a:link,
+header #banner a:hover {
+  color: #1f1f1f;
+  text-decoration: none;
+  outline: none;
+  vertical-align: middle;
+  font-weight: bolder;
+  margin-left: 3px;
+}
+header #banner #logo-img {
+  height: 25px;
+  margin-top: 3px;
+}
+header #banner #logo-text {
+  font-size: 20px;
+  position: absolute;
+  top: 10%;
+}
+/* messages */
+#message-new {
+  background: #3465A4;
+  border: 1px solid #333;
+  width: 150px;
+}
+#message-new a {
+  color: #ffffff;
+  text-align: center;
+  display: block;
+  font-weight: bold;
+  padding: 1em 0px;
+    text-decoration: none;
+}
+.mail-list-wrapper {
+  background-color: #f6f7f8;
+  margin-bottom: 5px;
+  width: 100%;
+  height: auto;
+  overflow: hidden;
+}
+.mail-list-wrapper span {
+  display: block;
+  float: left;
+  width: 20%;
+  overflow: hidden;
+}
+.mail-list-wrapper .mail-subject {
+  width: 30%;
+  padding: 4px 0px 0px 4px;
+}
+.mail-list-wrapper .mail-subject a {
+  display: block;
+}
+.mail-list-wrapper .mail-subject.unseen a {
+  font-weight: bold;
+}
+.mail-list-wrapper .mail-date {
+  padding: 4px 4px 0px 4px;
+}
+.mail-list-wrapper .mail-from {
+  padding: 4px 4px 0px 4px;
+}
+.mail-list-wrapper .mail-count {
+  padding: 4px 4px 0px 4px;
+  text-align: right;
+}
+.mail-list-wrapper .mail-delete {
+  float: right;
+}
+#mail-display-subject {
+  background-color: #f6f7f8;
+  color: #2d2d2d;
+  margin-bottom: 10px;
+  width: 100%;
+  height: auto;
+  overflow: hidden;
+}
+#mail-display-subject span {
+  float: left;
+  overflow: hidden;
+  padding: 4px 0px 0px 10px;
+}
+#mail-display-subject .mail-delete {
+  float: right;
+  opacity: 0.5;
+  -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;
+}
+#mail-display-subject:hover .mail-delete {
+  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;
+}
+/* nav */
+nav {
+  width: 80%;
+  height: 32px;
+  position: fixed;
+  left: 22%;
+  top: 0px;
+  padding: 0px;
+  background: #ff500f;
+  color: #1f1f1f;
+  z-index: 99;
+  border-bottom: 1px;
+  border-bottom-color: black;
+  border-bottom-style: inset;
+  background-image: linear-gradient(bottom, rgb(215,227,241) 26%, rgb(255,255,255) 82%);
+background-image: -o-linear-gradient(bottom, rgb(215,227,241) 26%, rgb(255,255,255) 82%);
+background-image: -moz-linear-gradient(bottom, rgb(215,227,241) 26%, rgb(255,255,255) 82%);
+background-image: -webkit-linear-gradient(bottom, rgb(215,227,241) 26%, rgb(255,255,255) 82%);
+background-image: -ms-linear-gradient(bottom, rgb(215,227,241) 26%, rgb(255,255,255) 82%);
+
+background-image: -webkit-gradient(
+	linear,
+	left bottom,
+	left top,
+	color-stop(0.26, rgb(215,227,241)),
+	color-stop(0.82, rgb(255,255,255))
+);
+}
+nav a,
+nav a:active,
+nav a:visited,
+nav a:link,
+nav a:hover {
+  color: #1f1f1f;
+  text-decoration: none;
+  outline: none;
+}
+nav #banner {
+  overflow: hidden;
+  /*text-align: center;*/
+  width: 100%;
+}
+nav #banner a,
+nav #banner a:active,
+nav #banner a:visited,
+nav #banner a:link,
+nav #banner a:hover {
+  color: #ffffff;
+  text-decoration: none;
+  outline: none;
+  vertical-align: bottom;
+}
+nav #banner #logo-img {
+  height: 22px;
+  margin-top: 5px;
+}
+nav #banner #logo-text {
+  font-size: 22px;
+}
+nav #navbar{
+	}
+nav ul {
+  margin: 0px;
+  padding: 0px 20px;
+}
+nav ul li {
+  list-style: none;
+  margin: 0px;
+  /* padding: 1px 1px 3px 1px; */
+  float: left;
+}
+nav ul li .menu-popup {
+  left: 0px;
+  right: auto;
+}
+
+nav #logo-img {
+  height: 25px;
+  margin-top: 4px;
+  margin-left: 30px;
+}
+
+nav #logo-text {
+    font-size: 22px;
+    margin-top: 3px;
+    margin-right: 15px;
+}
+nav .nav-menu-search {
+  position: relative;
+
+  margin: 4px 17px;
+  margin-right: 0px;
+  height: 17px;
+  width: 180px;
+  
+}
+
+nav #search-box #search-text {
+  background-image:  url('icons/lupe.png');
+  background-repeat:no-repeat;
+  padding-left:20px;
+  border-top-left-radius: 15px;
+border-top-right-radius: 15px;
+border-bottom-right-radius: 15px;
+border-bottom-left-radius: 15px;
+	}
+
+
+nav .nav-menu-icon {
+  position: relative;
+  height: 22px;
+  padding: 5px;
+  margin: 0px 5px;
+  -moz-border-radius: 5px 5px 0 0;
+  -webkit-border-radius: 5px 5px 0 0;
+  border-radius: 5px 5px 0 0;
+}
+nav .nav-menu-icon:hover {
+  position: relative;
+  height: 22px;
+  padding: 5px;
+  margin: 0px 5px;
+  -moz-border-radius: 5px 5px 0 0;
+  -webkit-border-radius: 5px 5px 0 0;
+  border-radius: 5px 5px 0 0;
+}
+
+nav .nav-menu-icon.selected {
+  background-color: #fff;
+}
+nav .nav-menu-icon img {
+  width: 22px;
+  height: 22px;
+}
+nav .nav-menu-icon .nav-notify {
+  top: 3px;
+}
+/*marker*/
+nav .nav-menu {
+  position: relative;
+  height: 16px;
+  padding: 5px;
+  margin: 3px 15px 0px;
+  font-size: 15px;
+  /*border-bottom: 3px solid #364A84;*/
+}
+nav .nav-menu.selected {
+  /*border-bottom: 3px solid #9eabb0;*/
+}
+nav .nav-notify {
+  display: none;
+  position: absolute;
+  background-color: #fff;
+  /* background-color: #19aeff; */
+  -moz-border-radius: 5px 5px 5px 5px;
+  -webkit-border-radius: 5px 5px 5px 5px;
+  border-radius: 5px 5px 5px 5px;
+  font-size: 10px;
+  font-weight: 900;
+  padding: 1px 4px;
+  top: 0px;
+  right: -6px;
+  min-width: 10px;
+  text-align: center;
+  border: 1px solid black;
+}
+nav .nav-notify.show {
+  display: block;
+}
+nav #nav-help-link,
+nav #nav-search-link,
+nav #nav-directory-link,
+nav #nav-apps-link,
+nav #nav-site-linkmenu, 
+nav #nav-home-link,
+nav #nav-user-linkmenu
+{
+  float: right;
+}
+nav #nav-user-linkmenu{
+	margin-right: 0px;
+	}
+nav #nav-home-link, #nav-directory-link, #nav-apps-link{
+	margin-left: 0px;
+	margin-right: 0px;
+	font-weight: bold;
+	margin: 3px 5px;
+	font-size: 14px;
+	}
+nav #nav-directory-link{
+  margin-right: 0px;	
+	}
+nav #nav-home-link{
+  margin-left: 0px;	
+	}
+nav #nav-help-link .menu-popup,
+nav #nav-search-link .menu-popup,
+nav #nav-directory-link .menu-popup,
+nav #nav-apps-link .menu-popup,
+nav #nav-site-linkmenu .menu-popup {
+  right: 0px;
+  left: auto;
+}
+
+nav #nav-messages-linkmenu.on .icon.messages, nav #nav-messages-linkmenu.selected .icon.messages{
+	background-image: url("../../../view/theme/diabook/diabook-aerith/icons/messages.png");
+	}
+	
+/*nav #nav-notifications-linkmenu.on .icon.notify,*/ nav #nav-notifications-linkmenu.selected .icon.notify{
+	background-image: url("../../../view/theme/diabook/diabook-aerith/icons/notify.png");
+	}
+	
+nav #nav-contacts-linkmenu.on .icon.contacts, nav #nav-contacts-linkmenu.selected .icon.contacts{
+	background-image: url("../../../view/theme/diabook/diabook-aerith/icons/contacts.png");
+	}
+	
+nav #nav-apps-link.selected {
+ background-color: #fff;
+  moz-border-radius: 5px 5px 0 0;
+-webkit-border-radius: 5px 5px 0 0;
+border-radius: 5px 5px 0 0;
+}
+
+#nav-notifications-mark-all {
+	/* padding: 1px 1px 2px 26px; */
+	/* border-bottom: 1px solid #364E59; */
+	/* margin: 0px 0px 2px 0px;
+	padding: 5px 10px; */
+}
+
+#nav-notifications-see-all {
+	/* padding: 1px 1px 2px 26px; */
+	/* border-bottom: 1px solid #364E59; */
+	/* margin: 0px 0px 2px 0px;
+	padding: 5px 10px; */
+}
+
+.notify-seen {
+	background: none repeat scroll 0 0 #DDDDDD;
+	}
+
+ul.menu-popup {
+  position: absolute;
+  display: none;
+  width: 11em;
+  background: #fff;
+  color: #2d2d2d;
+  margin: 0px;
+  padding: 0px;
+  list-style: none;
+  z-index: 100000;
+  -webkit-box-shadow: 0px 5px 10px rgba(0, 0, 0, 0.7);
+  -moz-box-shadow: 0px 5px 10px rgba(0, 0, 0, 0.7);
+  box-shadow: 0px 5px 10px rgba(0, 0, 0, 0.7);
+}
+ul.menu-popup a {
+  display: block;
+  color: #2d2d2d;
+  padding: 5px 10px;
+  text-decoration: none;
+}
+ul.menu-popup a:hover {
+  background-color: #3465A4; /*bdcdd4;*/
+  color: #fff;
+}
+ul.menu-popup .menu-sep {
+  border-top: 1px solid #9eabb0;
+}
+ul.menu-popup li {
+  float: none;
+  overflow: auto;
+  height: auto;
+  display: block;
+}
+ul.menu-popup li img {
+  float: left;
+  width: 16px;
+  height: 16px;
+  padding-right: 5px;
+}
+ul.menu-popup .empty {
+  padding: 5px;
+  text-align: center;
+  color: #9eabb0;
+}
+/* autocomplete popup */
+.acpopup {
+  max-height: 150px;
+  background-color: #ffffff;
+  color: #2d2d2d;
+  border: 1px solid #MenuBorder;
+  overflow: auto;
+  z-index: 100000;
+  -webkit-box-shadow: 0px 5px 10px rgba(0, 0, 0, 0.7);
+  -moz-box-shadow: 0px 5px 10px rgba(0, 0, 0, 0.7);
+  box-shadow: 0px 5px 10px rgba(0, 0, 0, 0.7);
+}
+.acpopupitem {
+  color: #2d2d2d;
+  padding: 4px;
+  clear: left;
+}
+.acpopupitem img {
+  float: left;
+  margin-right: 4px;
+}
+.acpopupitem.selected {
+  background-color: #bdcdd4;
+}
+#nav-notifications-menu {
+  width: 400px;
+  max-height: 550px;
+  overflow: auto;
+}
+/* #nav-notifications-menu a {
+	display: inline;
+	padding: 5px 0px;
+	margin: 0px 0px 2px 0px;
+}
+#nav-notifications-menu li:hover {
+  background-color: #bdcdd4;
+}*/
+
+#nav-notifications-menu img {
+  float: left;
+  margin-right: 5px;
+}
+#nav-notifications-menu .contactname {
+  font-weight: bold;
+}
+#nav-notifications-menu .notif-when {
+  font-size: 10px;
+  color: #9eabb0;
+  display: block;
+}
+
+.notif-image {
+        width: 32px;
+        height: 32px;
+        padding: 7px 7px 0px 0px;
+}
+
+/*profile_side*/
+#profile_side {
+  margin-bottom: 30px;
+}
+#ps-usericon{
+	height: 25px	
+	}
+#ps-username{
+  font-size: 1.17em;
+  font-weight: bold;
+  vertical-align: top;
+  position: absolute;
+  padding-top: 4px;
+  padding-left: 5px;	
+  word-wrap: break-word;
+  width: 130px;
+	}
+#ps-username:hover{
+  text-decoration: none;	
+	}
+.menu-profile-side{
+  list-style: none;	
+  padding-left: 0px;
+  min-height: 0px;
+	}
+.menu-profile-list{
+  height: auto;
+  overflow: auto;  
+  min-height: 16px;
+  list-style: none;
+	}
+.menu-profile-list:hover{
+	background: aliceBlue; 
+	}
+.menu-profile-list-item{
+	padding-left: 5px;
+	vertical-align: middle;
+	}	
+.menu-profile-list-item:hover{	
+	text-decoration: none;
+   }
+/*http://prothemedesign.com/circular-icons/*/
+.menu-profile-icon.home{
+	background: url("../../../view/theme/diabook/diabook-aerith/icons/home.png") no-repeat;
+	float: left;
+	height: 22px;
+	width: 22px;
+	}
+.menu-profile-icon.photos{
+	background: url("../../../view/theme/diabook/diabook-aerith/icons/mess_side.png") no-repeat;
+	float: left;
+	height: 22px;
+   width: 22px;}
+.menu-profile-icon.events{
+	background: url("../../../view/theme/diabook/diabook-aerith/icons/events.png") no-repeat;
+	float: left;
+	height: 22px;
+   width: 22px;}
+.menu-profile-icon.notes{
+	background: url("../../../view/theme/diabook/diabook-aerith/icons/notes.png") no-repeat;
+	float: left;
+	height: 22px;
+   width: 22px;}
+.menu-profile-icon.foren{
+	background: url("../../../view/theme/diabook/diabook-aerith/icons/pubgroups.png") no-repeat;
+	float: left;
+	height: 22px;
+   width: 22px;}
+.menu-profile-icon.com_side{
+	background: url("../../../view/theme/diabook/diabook-aerith/icons/com_side.png") no-repeat;
+	float: left;
+	height: 22px;
+   width: 22px;}
+.menu-profile-icon.pscontacts{
+	background: url("../../../view/theme/diabook/diabook-aerith/icons/pscontacts.png") no-repeat;
+	float: left;
+	height: 22px;
+   width: 22px;}
+/* aside */
+/*marker*/
+aside {
+  display: table-cell;
+  vertical-align: top;
+  width: 180px;
+  padding: 0px 5px 0px 0px;
+  border-right: 1px solid #D2D2D2;
+  float: left;
+  /* background: #F1F1F1; */
+}
+aside #page-sidebar{display: none;}
+aside .vcard .fn {
+  font-size: 18px;
+  font-weight: bold;
+  margin-bottom: 5px;
+}
+aside .vcard .title {
+  margin-bottom: 5px;
+}
+aside .vcard dl {
+  height: auto;
+  overflow: auto;
+}
+aside .vcard dt {
+  float: left;
+  margin-left: 0px;
+  /*width: 35%;*/
+  text-align: right;
+  color: #999999;
+}
+aside .vcard dd {
+  float: left;
+  margin-left: 5px;
+  /*width: 60%;*/
+}
+aside #profile-extra-links ul {
+  padding: 0px;
+  margin: 0px;
+}
+aside #profile-extra-links li {
+  padding: 0px;
+  margin: 0px;
+  list-style: none;
+}
+aside #dfrn-request-link {
+  display: block;
+  -moz-border-radius: 5px 5px 5px 5px;
+  -webkit-border-radius: 5px 5px 5px 5px;
+  border-radius: 5px 5px 5px 5px;
+  color: #ffffff;
+  background: #005c94 url('../../../images/connect-bg.png') no-repeat left center;
+  font-weight: bold;
+  text-transform: uppercase;
+  padding: 4px 2px 2px 35px;
+}
+aside #dfrn-request-link:hover {
+  text-decoration: none;
+  background-color: #36c;
+  /* background-color: #19aeff; */
+}
+aside #profiles-menu {
+  width: 20em;
+}
+aside #search-text {
+	width: 173px;
+	height: 17px;
+	padding-left: 10px;
+	border-top-left-radius: 15px;
+border-top-right-radius: 15px;
+border-bottom-right-radius: 15px;
+border-bottom-left-radius: 15px;
+}
+aside #side-follow-url {
+	width: 173px;
+	}
+aside #side-peoplefind-url {
+	width: 173px;
+	}
+#contact-block {
+  overflow: auto;
+  height: auto;
+}
+aside #likes a, a:visited, a:link {
+		color: #3465A4;
+		text-decoration: none;
+		cursor: pointer;
+		
+}
+aside #likes a:hover{
+	text-decoration: underline;
+	}
+
+#contact-block .contact-block-h4 {
+  float: left;
+  margin: 5px 0px;
+}
+#contact-block .allcontact-link {
+  float: right;
+  margin: 5px 0px;
+}
+#contact-block .contact-block-content {
+  clear: both;
+  overflow: auto;
+  height: auto;
+}
+#contact-block .contact-block-link {
+  float: left;
+  margin: 0px 2px 2px 0px;
+}
+#contact-block .contact-block-link img {
+  widht: 55px;
+  height: 55px;
+}
+#lost-password-link {
+  float: left;
+  margin-right: 20px;		
+	}
+#login-submit-wrapper{
+margin-bottom: 15px;
+	}
+.group_selected {
+  background: url("../../../view/theme/diabook/icons/selected.png") no-repeat left center;
+  float: left;
+  height: 22px;
+  width: 22px;
+}
+.group_unselected {
+  background: url("../../../view/theme/diabook/icons/unselected.png") no-repeat left center;
+  float: left;
+  height: 22px;
+  width: 22px;
+}
+.icon.text_add		{ 
+		background-image: url("../../../images/icons/16/add.png");
+		float: right;
+		opacity: 0.2;
+		margin-right: 14px;
+		}
+.icon.text_add:hover	{ 
+		background-image: url("../../../images/icons/16/add.png");
+		float: right;
+		cursor: pointer;
+		margin-right: 14px;
+		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;
+		}
+.icon.text_edit {
+  background-image: url("../../../images/icons/10/edit.png");
+  opacity: 0.2;
+  margin-top: 6px;
+  float: right;
+  height: 10px;
+}
+.icon.text_edit:hover {
+  background-image: url("../../../images/icons/10/edit.png");
+  opacity: 1;
+  margin-top: 6px;
+  float: right;
+  height: 10px;
+}
+/* widget */
+.widget {
+  margin-bottom: 2em;
+  /*.action .s10 { width: 10px; overflow: hidden; padding: 0px;}
+	.action .s16 { width: 16px; overflow: hidden; padding: 0px;}*/
+/*  font-size: 12px; */
+}
+/*marker*/
+.widget h3 {
+  padding: 0px;
+  margin: 2px;
+  font-size: 1.05em;
+}
+.widget .action {
+  opacity: 0.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;
+}
+.widget input.action {
+  opacity: 0.5;
+  -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;
+}
+.widget:hover .title .action {
+  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;
+}
+.widget .tool:hover .action {
+  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;
+}
+.widget .tool:hover .action.ticked {
+  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;
+}
+.widget ul {
+  padding: 0px;
+}
+.widget ul li {
+  padding-left: 16px;
+  min-height: 16px;
+  list-style: none;
+}
+#side-bar-photos-albums li{
+list-style-type: disc;
+}
+#side-bar-photos-albums ul li{
+  margin-left: 30px;
+  padding-left: 0px;
+	}
+#side-bar-photos-albums ul li a{
+  color: #3465A4;
+}
+.widget .tool.selected {
+  background: url("../../../view/theme/diabook/diabook-aerith/icons/selected.png") no-repeat left center;
+}
+/* widget: search */
+#add-search-popup {
+  width: 200px;
+  top: 18px;
+}
+/* section */
+section {
+  display: table-cell;
+  vertical-align: top;
+  width: 800px;
+  padding: 0px 0px 0px 12px;
+}
+body .pageheader{
+  text-align: center;
+  font-size: 20px;
+  margin-bottom: 20px;
+  margin-top: 0px;
+  max-width: 775px;
+	}
+.qcomment{
+  max-width: 122px;	
+	}
+#id_username {
+  width: 173px;	
+	}
+#id_password {
+  width: 173px;		
+	}
+#id_openid_url {
+  width: 173px;	
+	}
+#contact-edit-end {
+	}
+.pager {
+   padding: 10px;
+	text-align: center;
+	font-size: 1.0em;
+	clear: both;
+	display: block;
+}	
+
+.tabs {
+    
+    background-position: 0 -20px;
+    background-repeat: repeat-x;
+    height: 27px;
+    padding: 0;
+ }
+.tab.button {
+    margin-left: 5px;	
+    /*background: none repeat scroll 0 0 #F8F8F8;*/
+    border: 1px solid #CCCCCC;
+    border-radius: 3px 3px 3px 3px;
+    font-weight: normal;
+    padding: 3px;
+    color:  #333333;
+	}
+	
+#birthday-notice, #event-notice, #birthday-wrapper, #event-wrapper{
+	margin-bottom: 10px;
+	}
+
+#birthday-wrapper a {
+	color: #3465A4;
+	}
+/* wall item */
+.tread-wrapper {
+  border-bottom: 1px solid #D2D2D2;
+  position: relative;
+  padding: 5px;
+  margin-bottom: 0px;
+  width: 775px;
+  padding-top: 10px;
+}
+.tread-wrapper a{
+  color: #3465A4;
+}
+
+/*marker*/
+.wall-item-decor {
+  position: absolute;
+  left: 780px;
+  top: -10px;
+  width: 16px;
+}
+/*marker*/
+.wall-item-container {
+  display: table;
+  width: 770px;
+}
+.wall-item-photo-container .wall-item-item, .wall-item-container .wall-item-bottom {
+  display: table-row;
+}
+.wall-item-photo-container .wall-item-info {
+  display: table-cell;
+  vertical-align: top;
+  text-align: left;
+  width: 80px;
+}
+.wall-item-photo-container .wall-item-location {
+  padding-right: 40px;
+  display: table-cell;
+}
+.wall-item-photo-container .wall-item-ago {
+  word-wrap: break-word;
+  width: 50px;
+  margin-left: 10px;
+  color: #999;
+}
+/*marker*/
+.wall-item-photo-container .wall-item-content {
+
+  max-width: 690px;
+  word-wrap: break-word;
+  
+  margin-bottom: 14px;
+}
+.wall-item-photo-container .wall-item-content img {
+  max-width: 700px;
+}
+.wall-item-photo-container .wall-item-links, .wall-item-photo-container .wall-item-actions {
+  display: table-cell;
+  vertical-align: middle;
+}
+.wall-item-photo-container .wall-item-links .icon, .wall-item-photo-container .wall-item-actions .icon {
+  opacity: 0.5;
+  -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;
+}
+.wall-item-photo-container .wall-item-links .icon:hover, .wall-item-photo-container .wall-item-actions .icon: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;
+}
+.wall-item-photo-container .wall-item-name {
+  font-weight: bold;
+}
+.wall-item-photo-container .wall-item-actions-author {
+  width: 100%;
+  margin-bottom: 0.3em;
+}
+.wall-item-photo-container .wall-item-actions-social {
+  float: left;
+  margin-bottom: 1px;
+  display: table-cell;
+}
+.wall-item-photo-container .wall-item-actions-social a {
+  margin-right: 1em;
+}
+.wall-item-photo-container .wall-item-actions-tools {
+  float: right;
+  width: 80px;
+  display: table-cell;
+}
+.wall-item-photo-container .wall-item-actions-tools a {
+  float: right;
+}
+.wall-item-photo-container .wall-item-actions-tools input {
+  float: right;
+}
+.wall-item-photo-container.comment {
+  margin-top: 5px;
+  margin-bottom: 5px;
+  margin-left: 40px;
+  width: 650px;
+  border-bottom: 1px solid #D2D2D2;
+}
+.wall-item-photo-container.comment {
+  top: 15px !important;
+  left: 15px !important;
+}
+.wall-item-photo-container {
+  display: table;
+  width: 780px;
+}
+.my-comment-photo {
+  width: 48px;
+  margin-left: 40px;
+  margin-right: 32px;
+	}
+.comment-edit-preview {
+  width: 500px;
+  margin-top: 10px;
+}
+.comment-edit-text-empty {
+    width: 500px;
+    border: 1px solid #D2D2D2;
+    height: 3.2em;
+    color: #2d2d2d;
+}
+.comment-edit-text-full {
+  font-size: 12.5px;
+  height: 3.3em;
+  
+  border: 1px solid #D2D2D2;
+  width: 500px;
+}
+.comment-edit-photo {
+    margin: 10px 0 0;
+    display: table-cell;
+}
+
+
+.wall-item-container .wall-item-item, .wall-item-container .wall-item-bottom {
+  display: table-row;
+}
+.wall-item-bottom {
+  font-size: 13px;
+}
+.wall-item-container .wall-item-bottom {
+/*  opacity: 0.5;
+  -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; */
+}
+.wall-item-container:hover .wall-item-bottom {
+/*  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; */
+}
+.wall-item-container .wall-item-info {
+  display: table-cell;
+  vertical-align: top;
+  text-align: left;
+  width: 80px;
+}
+.wall-item-container .wall-item-location {
+  padding-right: 40px;
+  display: table-cell;
+}
+.wall-item-container .wall-item-ago {
+  word-wrap: break-word;
+  width: 50px;
+  margin-left: 10px;
+  color: #999;
+}
+.wall-item-location {
+  
+  clear: both;
+  overflow: hidden;
+  
+  margin-bottom: 5px;
+}
+
+/*marker*/
+.wall-item-container .wall-item-content {
+
+  max-width: 690px;
+  word-wrap: break-word;
+
+
+}
+
+.wall-item-container .wall-item-content img {
+  max-width: 700px;
+}
+.wall-item-container .wall-item-links, .wall-item-container .wall-item-actions {
+  display: table-cell;
+  vertical-align: middle;
+}
+.wall-item-container .wall-item-links .icon, .wall-item-container .wall-item-actions .icon {
+  opacity: 0.5;
+  -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;
+}
+.wall-item-container .wall-item-links .icon:hover, .wall-item-container .wall-item-actions .icon: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;
+}
+.wall-item-container .wall-item-name {
+  font-weight: bold;
+}
+.wall-item-container .wall-item-actions-author {
+  width: 100%;
+  margin-bottom: 0.3em;
+}
+.wall-item-container .wall-item-actions-social {
+  float: left;
+  margin-bottom: 1px;
+  display: table-cell;
+}
+.wall-item-container .wall-item-actions-social a {
+  margin-right: 1em;
+}
+.wall-item-actions-social a {
+  float: left;
+}
+.wall-item-container .wall-item-actions-tools {
+  float: right;
+  width: 80px;
+  display: table-cell;done
+}
+.wall-item-container .wall-item-actions-tools a {
+  float: right;
+}
+.wall-item-container .wall-item-actions-tools input {
+  float: right;
+}
+/*marker*/
+.wall-item-container.comment {
+  margin-top: 5px;
+  margin-bottom: 5px;
+  margin-left: 80px;
+  width: 690px;
+  border-bottom: 1px solid hsl(198, 21%, 79%);
+}
+.wall-item-container.comment .contact-photo {
+  width: 32px;
+  height: 32px;
+  margin-left: 16px;
+  /*background: url(../../../images/icons/22/user.png) no-repeat center center;*/
+
+}
+.wall-item-container.comment {
+  top: 15px !important;
+  left: 15px !important;
+}
+.wall-item-container.comment .wall-item-links {
+  padding-left: 12px;
+}
+.wall-item-comment-wrapper {
+  margin: 1px 5px 5px 80px;
+}
+.wall-item-comment-wrapper .comment-edit-photo {
+  display: none;
+}
+.wall-item-comment-wrapper textarea {
+  height: 1.6em ;
+  width: 100%;
+  font-size: 10px;
+  color: #999999;
+  border: 1px solid #DDD;
+  padding: 0.3em;
+  font-size: 14px;
+}
+.wall-item-comment-wrapper .comment-edit-text-full {
+  font-size: 14px;
+  height: 4em;
+  color: #2d2d2d;
+  border: 1px solid #2d2d2d;
+}
+.comment-edit-preview {
+  width: 500px;
+  margin-top: 10px;
+  background-color:  #fff797;
+}
+.comment-edit-preview .contact-photo {
+  width: 32px;
+  height: 32px;
+  margin-left: 16px;
+  /*background: url(../../../images/icons/22/user.png) no-repeat center center;*/
+
+}
+.comment-edit-preview {
+  top: 15px !important;
+  left: 15px !important;
+}
+.comment-edit-preview .wall-item-links {
+  padding-left: 12px;
+}
+.comment-edit-preview .wall-item-container {
+  width: 700px;
+}
+.comment-edit-preview .tread-wrapper {
+  width: 700px;
+  padding: 0;
+  margin: 10px 0;
+}
+
+.shiny {
+  /* border-right: 10px solid #fce94f; */
+	border-right: 1px solid #A7C7F7;
+	padding-right: 12px;
+}
+
+#jot-preview-content{
+	margin-top: 30px;}
+	
+#jot-preview-content .tread-wrapper {
+  background-color: #fff797;
+}
+
+.wall-item-tags {
+  padding-top: 1px;
+  padding-bottom: 2px;
+}
+.tag {
+  /*background: url("../../../images/tag_b.png") repeat-x center left;*/
+  color: #999;
+  padding-left: 3px;
+  font-size: 12px;
+}
+.tag a {
+  padding-right: 5px;
+  /*background: url("../../../images/tag.png") no-repeat center right;*/
+  color: #999;
+}
+.wwto {
+  position: absolute !important;
+  width: 25px;
+  height: 25px;
+  background: #FFFFFF;
+  border: 2px solid #364e59;
+  height: 25px;
+  width: 25px;
+  overflow: hidden;
+  padding: 1px;
+  position: absolute !important;
+  top: 40px;
+  left: 30px;
+  -webkit-box-shadow: 0px 0px 10px rgba(0, 0, 0, 0.7);
+  -moz-box-shadow: 0px 0px 10px rgba(0, 0, 0, 0.7);
+  box-shadow: 0px 0px 10px rgba(0, 0, 0, 0.7);
+}
+.wwto .contact-photo {
+  width: auto;
+  height: 25px;
+}
+/* contacts menu */
+.contact-photo-wrapper {
+  position: relative;
+  width: 80px;
+}
+
+.contact-photo-wrapper.wwto {
+  width: 25px;
+}
+
+.contact-photo {
+  width: 48px;
+  height: 48px;
+  overflow: hidden;
+  display: block;
+}
+.contact-photo img {
+  width: 48px;
+  height: 48px;
+}
+
+.contact-wrapper {
+  float: left;
+  width: 90px;
+  height: 90px;
+  margin-bottom: 15px;
+}
+.contact-wrapper .contact-photo {
+  width: 80px;
+  height: 80px;
+}
+.contact-wrapper .contact-photo img {
+  width: 80px;
+  height: 80px;
+}
+.contact-wrapper {
+  left: 0px;
+  top: 63px;
+}
+.contact-photo {
+  width: 48px;
+  height: 48px;
+}
+.contact-photo img {
+  width: 48px;
+  height: 48px;
+}
+.contact-name {
+  /* text-align: center; */
+  /*font-weight: bold;*/
+  font-size: 12px;
+}
+.contact-details {
+  color: #999999;
+}
+/* editor */
+.jothidden {
+  display: none;
+}
+#jot {
+  width: 785px;
+  margin: 0px 2em 20px 0px;
+}
+#profile-jot-form #profile-jot-text {
+  height: 2.0em;
+  width: 99%;
+  font-size: 15px;
+  color: #999999;
+  border: 1px solid #DDD;
+  padding: 0.3em;
+  margin-bottom: 10px;
+}
+.grey
+{
+  display: inline;
+  float: right;	
+	}
+#jot #jot-tools {
+  margin: 0px;
+  padding: 0px;
+  height: 40px;
+  overflow: none;
+  width: 783px;
+  background-color: #fff;
+  border-bottom: 2px solid #9eabb0;
+}
+
+#jot #jot-tools li {
+  list-style: none;
+  float: left;
+  width: 80px;
+  height: 40px;
+  border-bottom: 2px solid #9eabb0;
+}
+#jot #jot-tools li a {
+  display: block;
+  color: #cccccc;
+  width: 100%;
+  height: 40px;
+  text-align: center;
+  line-height: 40px;
+  overflow: hidden;
+}
+#jot #jot-tools li:hover {
+  background-color: #364e59;
+  border-bottom: 2px solid #bdcdd4;
+}
+#jot #jot-tools li.perms {
+  float: right;
+  width: 40px;
+}
+#jot #jot-tools li.perms a.unlock {
+  width: 30px;
+  border-left: 10px solid #cccccc;
+  background-color: #cccccc;
+  background-position: left center;
+}
+#jot #jot-tools li.perms a.lock {
+  width: 30px;
+  border-left: 10px solid #666666;
+  background-color: #666666;
+}
+#jot #jot-tools li.submit {
+  float: right;
+  background-color: #cccccc;
+  border-bottom: 2px solid #cccccc;
+  border-right: 1px solid #666666;
+  border-left: 1px solid #666666;
+}
+#jot #jot-tools li.submit input {
+  border: 0px;
+  margin: 0px;
+  padding: 0px;
+  background-color: #cccccc;
+  color: #666666;
+  width: 80px;
+  height: 40px;
+  line-height: 40px;
+}
+#jot #jot-tools li.submit input:hover {
+  background-color: #bdcdd4;
+  color: #666666;
+}
+#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;
+}
+#profile-jot-form #jot-title, #profile-jot-form #jot-category {
+    
+  	 border-radius: 5px 5px 5px 5px;
+    font-weight: bold;
+    height: 20px;
+    margin: 0 0 5px;
+    width: 60%;
+    border: 1px solid #d2d2d2;
+}
+#profile-jot-form #jot-title:-webkit-input-placeholder {
+  font-weight: normal;
+}
+#profile-jot-form #jot-title:-moz-placeholder {
+  font-weight: normal;
+}
+#profile-jot-form #profile-jot-text_parent #profile-jot-text_tbl{
+	width: 785px;
+	height: 100px;
+	}
+#jot #jot-title:hover {
+  border: 1px solid #999999;
+}
+#jot #jot-title:focus {
+  border: 1px solid #999999;
+}
+#jot #character-counter {
+  width: 80px;
+  float: right;
+  text-align: right;
+  height: 20px;
+  line-height: 20px;
+  padding-right: 20px;
+}
+#jot-perms-icon, 
+#profile-location,
+#profile-nolocation,
+#profile-youtube, 
+#profile-video, 
+#profile-audio,
+#profile-link,
+#profile-title, 
+#wall-image-upload,
+#wall-file-upload,
+#wall-image-upload-div,
+#wall-file-upload-div,
+.hover, .focus {
+	cursor: pointer;
+	margin-top: 2px;
+}
+/*marker*/
+#profile-jot-wrapper{
+	margin: 0 20px 20px 0;
+   width: 785px;
+	}
+/*marker*/
+#profile-jot-submit-wrapper {
+	margin-bottom: 50px;
+	width: 785px;
+}
+
+#profile-jot-submit {
+	float: right;
+	margin-top: 2px;
+	font-size: 14px;
+	
+}
+#profile-upload-wrapper {
+	float: left;
+	margin-top: 2px;
+	margin-left: 10px;
+	
+}
+#profile-attach-wrapper {
+	float: left;
+	margin-left: 15px;
+	margin-top: 2px;
+}
+#profile-rotator {
+	float: left;
+	margin-left: 30px;
+	margin-top: 2px;
+}
+#profile-link-wrapper {
+	float: left;
+	margin-left: 15px;
+	margin-top: 2px;
+}
+#profile-youtube-wrapper {
+	float: left;
+	margin-left: 15px;
+	margin-top: 2px;
+}
+#profile-video-wrapper {
+	float: left;
+	margin-left: 15px;
+	margin-top: 2px;
+}
+#profile-audio-wrapper {
+	float: left;
+	margin-left: 15px;
+	margin-top: 2px;
+}
+#profile-location-wrapper {
+	float: left;
+	margin-left: 15px;
+	margin-top: 2px;
+}
+#profile-jot-perms {
+	float: left;
+	margin-left: 45px;
+	margin-top: 2px;
+}
+#jot-preview-link {
+	float: right;
+	margin-left: 10px;
+	margin-top: 2px;
+	font-size: 9px;
+	font-weight: bolder;
+	cursor: pointer;
+}
+#profile-jot-perms{
+   float: right;
+	margin-left: 10px;
+	margin-top: 2px;	
+	}
+/** buttons **/
+.button.creation1 {
+    background-color: #fff;
+    border: 1px solid #777777;
+    border-radius: 3px 3px 3px 3px;
+    box-shadow: 0 1px 1px #CFCFCF;
+    font-weight: bolder;
+	 cursor: pointer;
+}
+.button.creation2 {
+    background-color: #3465A4;
+    border: 1px solid #777777;
+    color: white;
+    border-radius: 3px 3px 3px 3px;
+    box-shadow: 0 1px 1px #CFCFCF;
+    margin-left: 5px;
+    font-weight: bolder;
+	 cursor: pointer;
+}
+/*input[type="submit"] {
+	border: 0px;
+    background-color: @ButtonBackgroundColor;
+    color: @ButtonColor;
+    padding: 0px 10px;
+	.rounded(5px);
+    height: 18px;
+}*/
+/** acl **/
+#photo-edit-perms-select, #photos-upload-permissions-wrapper, #profile-jot-acl-wrapper {
+  display: block!important;
+}
+#acl-wrapper {
+  width: 690px;
+  float: left;
+}
+#acl-search {
+  float: right;
+  background: #ffffff url("../../../images/search_18.png") no-repeat right center;
+  padding-right: 20px;
+}
+#acl-showall {
+  float: left;
+  display: block;
+  width: auto;
+  height: 18px;
+  background-color: #cccccc;
+  background-image: url("../../../images/show_all_off.png");
+  background-position: 7px 7px;
+  background-repeat: no-repeat;
+  padding: 7px 5px 0px 30px;
+  color: #999999;
+  -moz-border-radius: 5px 5px 5px 5px;
+  -webkit-border-radius: 5px 5px 5px 5px;
+  border-radius: 5px 5px 5px 5px;
+}
+#acl-showall.selected {
+  color: #000000;
+  background-color: #ff9900;
+  background-image: url("../../../images/show_all_on.png");
+}
+#acl-list {
+  height: 210px;
+  border: 1px solid #cccccc;
+  clear: both;
+  margin-top: 30px;
+  overflow: auto;
+}
+.acl-list-item {
+  display: block;
+  width: 150px;
+  height: 30px;
+  border: 1px solid #cccccc;
+  margin: 5px;
+  float: left;
+}
+.acl-list-item img {
+  width: 22px;
+  height: 22px;
+  float: left;
+  margin: 4px;
+}
+.acl-list-item p {
+  height: 12px;
+  font-size: 10px;
+  margin: 0px;
+  padding: 2px 0px 1px;
+  overflow: hidden;
+}
+.acl-list-item a {
+  font-size: 8px;
+  display: block;
+  width: 40px;
+  height: 10px;
+  float: left;
+  color: #999999;
+  background-color: #cccccc;
+  background-position: 3px 3px;
+  background-repeat: no-repeat;
+  margin-right: 5px;
+  -webkit-border-radius: 2px ;
+  -moz-border-radius: 2px;
+  border-radius: 2px;
+  padding-left: 15px;
+}
+#acl-wrapper a:hover {
+  text-decoration: none;
+  color: #000000;
+}
+.acl-button-show {
+  background-image: url("../../../images/show_off.png");
+}
+.acl-button-hide {
+  background-image: url("../../../images/hide_off.png");
+}
+.acl-button-show.selected {
+  color: #000000;
+  background-color: #9ade00;
+  background-image: url("../../../images/show_on.png");
+}
+.acl-button-hide.selected {
+  color: #000000;
+  background-color: #ff4141;
+  background-image: url("../../../images/hide_on.png");
+}
+.acl-list-item.groupshow {
+  border-color: #9ade00;
+}
+.acl-list-item.grouphide {
+  border-color: #ff4141;
+}
+/** /acl **/
+/** tab buttons 14618a**/
+/*marker*/
+ul.tabs {
+  list-style-type: none;
+  padding-bottom: 10px;
+  font-size: 13px;
+  width: 805px;
+}
+ul.tabs li {
+  float: left;
+  margin-left: 5px;
+}
+ul.tabs li .active {
+    background-color: #3465A4;
+    border: 1px solid #777777;
+    color: white;
+    border-radius: 3px 3px 3px 3px;
+    box-shadow: 2px 2px 2px #CFCFCF;
+    margin-left: 5px;
+}
+//settings tabs
+ul.rs_tabs {
+  list-style-type: none;
+  font-size: 11px;
+}
+ul.rs_tabs li {
+  float: left;
+  margin-bottom: 30px;
+  clear: both;
+}
+ul.rs_tabs li .selected {
+    background-color: #3465A4;
+    border: 1px solid #777777;
+    color: white;
+    border-radius: 3px 3px 3px 3px;
+    box-shadow: 2px 2px 2px #CFCFCF;
+    font-size: 13px;
+}
+.rs_tabs {
+    list-style-type: none;
+    font-size: 11px;
+    background-position: 0 -20px;
+    background-repeat: repeat-x;
+    height: 27px;
+    padding: 0;
+ }
+.rs_tab.button {	
+    /*background: none repeat scroll 0 0 #F8F8F8;*/
+    border: 1px solid #CCCCCC;
+    border-radius: 3px 3px 3px 3px;
+    font-weight: bolder;
+    padding: 3px;
+    color:  #333333;
+    text-decoration: none;
+	}
+/**
+ * Form fields
+ */
+.field {
+  margin-bottom: 10px;
+  padding-bottom: 10px;
+  overflow: auto;
+  width: 100%;
+}
+.field label {
+  float: left;
+  width: 200px;
+}
+.field input, .field textarea {
+  width: 400px;
+}
+.field textarea {
+  height: 100px;
+}
+.field .field_help {
+  display: block;
+  margin-left: 200px;
+  color: #666666;
+}
+.field .onoff {
+  float: left;
+  width: 80px;
+}
+.field .onoff a {
+  display: block;
+  border: 1px solid #666666;
+  background-image: url("../../../images/onoff.jpg");
+  background-repeat: no-repeat;
+  padding: 4px 2px 2px 2px;
+  height: 16px;
+  text-decoration: none;
+}
+.field .onoff .off {
+  border-color: #666666;
+  padding-left: 40px;
+  background-position: left center;
+  background-color: #cccccc;
+  color: #666666;
+  text-align: right;
+}
+.field .onoff .on {
+  border-color: #204A87;
+  padding-right: 40px;
+  background-position: right center;
+  background-color: #D7E3F1;
+  color: #204A87;
+  text-align: left;
+}
+.field .hidden {
+  display: none!important;
+}
+.field.radio .field_help {
+  margin-left: 0px;
+}
+.suggest-select {
+width: 500px;
+height: 350px;	
+	}
+.message-to-select {
+	width: 400px;
+   height: 150px;
+	}
+#directory-search-form{
+	margin-bottom: 50px;
+	}
+#profile-edit-links-end {
+        clear: both;
+        margin-bottom: 15px;
+}
+
+#profile-edit-links ul { margin: 20px; padding-bottom: 20px; list-style: none; }
+
+#profile-edit-links li {
+  float: left;
+  list-style: none;
+  margin-left: 10px;
+}
+
+.profile-edit-side-div {
+  display: none;
+}
+
+#register-form label,
+#profile-edit-form label {
+        width: 300px; float: left;
+}
+
+.required {
+  display: inline;
+  color: #B20202;
+}
+
+/* oauth */
+.oauthapp {
+  height: auto;
+  overflow: auto;
+  border-bottom: 2px solid #cccccc;
+  padding-bottom: 1em;
+  margin-bottom: 1em;
+}
+.oauthapp img {
+  float: left;
+  width: 48px;
+  height: 48px;
+  margin: 10px;
+}
+.oauthapp img.noicon {
+  background-image: url("../../../images/icons/48/plugin.png");
+  background-position: center center;
+  background-repeat: no-repeat;
+}
+.oauthapp a {
+  float: left;
+}
+/* contacts */
+.contact-entry-wrapper {
+  width: 120px;
+  height: 120px;
+  float: left;
+}
+/* photo */
+.photo {
+box-shadow: 2px 2px 5px 0px #000000;
+margin: 0px;
+border-radius: 10px;
+height: 145px !important;
+width: 145px !important;
+}
+.lframe {
+  float: left;
+  /*margin: 0px 10px 10px 0px;*/
+}
+/* profile match wrapper */
+.profile-match-wrapper {
+  float: left;
+  width: 90px;
+  height: 90px;
+  margin-bottom: 20px;
+}
+.profile-match-wrapper .contact-photo {
+  width: 80px;
+  height: 80px;
+}
+.profile-match-wrapper .contact-photo img {
+  width: 80px;
+  height: 80px;
+}
+.profile-match-wrapper {
+  left: 0px;
+  top: 63px;
+}
+
+.contact-photo-menu-button {
+        position: relative;
+        background-image: url("../../../images/icons/16/menu.png");
+        background-position: top left; 
+        background-repeat: no-repeat;
+        margin: 0px 0px -16px 0px; 
+	padding: 0px;
+        width: 16px;
+        height: 16px;
+        top: -16px; left:0px;
+        overflow: hidden;
+        text-indent: 40px;
+        display: none;
+        
+}
+.contact-photo-menu {
+        width: 11em;
+        border: 3px solid #364e59;
+	color: #2d2d2d;
+        background: #FFFFFF;
+/*        position: absolute;*/
+        position: relative;
+        left: 0px; top: 0px;
+        display: none;
+        z-index: 10000;
+}
+.contact-photo-menu ul { margin:0px; padding: 0px; list-style: none }
+.contact-photo-menu li a {
+	display: block; 
+	padding: 5px 10px; 
+	color: #2d2d2d;
+	text-decoration: none;
+}
+.contact-photo-menu li a:hover {
+	background-color: #bdcdd4; 
+}
+
+/* page footer */
+footer {
+  height: 100px;
+  display: table-row;
+}
+
+blockquote {
+    border-left: 1px solid #D2D2D2;
+    padding-left: 9px;
+    margin: 0 0 0 .8ex;
+    color: #777;
+}
+.oembed {
+	
+	font-weight: bold;
+}
+.aprofile dt{
+box-shadow: 1px 1px 5px 0;
+    color: #666666;
+    margin: 15px 0 5px;
+    padding-left: 5px;	
+	}
+/* ================== */
+/* = Contacts Block = */
+/* ================== */
+
+.contact-block-img {
+        width: 55px;
+        height: 55px;
+        padding-right: 3px;
+}
+.contact-block-div {
+        float: left;
+}
+
+.contact-block-textdiv { width: 150px; height: 34px; float: left; }
+#contact-block-end { clear: both; } 
+
+#group-edit-wrapper {
+        margin-bottom: 10px;
+}
+
+#group-members-end {
+        clear: both;
+}
+#group-edit-desc {
+ margin-top: 15px;
+}
+
+/*
+#group-separator,
+#prof-separator { display: none;}
+*/
+#prof-members-end{
+	clear: both;
+	}
+
+#prvmail-to-label, #prvmail-subject-label, #prvmail-message-label {
+	margin-bottom: 10px;
+	margin-top: 20px;
+}
+
+#prvmail-submit {
+	float: right;
+	margin-top: 10px;
+}
+
+#prvmail-subject
+{
+background: none repeat scroll 0 0 #FFFFFF;
+border: 1px solid #CCCCCC;
+border-radius: 5px 5px 5px 5px;
+font-weight: bold;
+height: 20px;
+margin: 0 0 5px;
+vertical-align: middle;
+}
+#prvmail-form{
+ width: 597px;	
+	}
+	
+#prvmail-upload-wrapper,
+#prvmail-link-wrapper,
+#prvmail-rotator-wrapper {
+	float: left;
+	margin-top: 10px;
+	margin-right: 10px;
+	width: 24px;
+}
+
+#prvmail-end {
+	clear: both;
+}
+
+.mail-list-sender,
+.mail-list-detail {
+	float: left;
+}
+.mail-list-detail {
+	margin-left: 20px;
+}
+
+.mail-list-subject {
+	font-size: 1.1em;
+	margin-top: 10px;
+}
+a.mail-list-link {
+    display: block;
+    font-size: 1.3em;
+    padding: 4px 0;
+}
+
+/*
+*a.mail-list-link:hover {
+*	background-color: #15607B;
+*	color: #F5F6FB;
+*}
+*/
+
+.mail-list-outside-wrapper-end {
+	clear: both;
+}
+
+.mail-list-outside-wrapper {
+	margin-top: 30px;
+}
+
+.mail-list-delete-wrapper {
+	float: right;
+	margin-right: 30px;
+	margin-top: 15px;
+}
+
+.mail-list-delete-icon {
+	border: none;
+}
+
+.mail-conv-sender,
+.mail-conv-detail {
+	float: left;
+}
+.mail-conv-detail {
+	margin-left: 20px;
+	width: 500px;
+}
+
+.mail-conv-subject {
+    font-size: 1.4em;
+    margin: 10px 0;
+}
+
+.mail-conv-outside-wrapper-end {
+	clear: both;
+}
+
+.mail-conv-outside-wrapper {
+	margin-top: 30px;
+}
+
+.mail-conv-delete-wrapper {
+	float: right;
+	margin-right: 30px;
+	margin-top: 15px;
+}
+.mail-conv-break {
+	clear: both;
+}
+
+.mail-conv-delete-icon {
+	border: none;
+}
+
+/* ========== */
+/* = Events = */
+/* ========== */
+.eventcal {
+        float: left;
+        font-size: 20px;
+}
+
+.vevent {
+position: relative;
+width: 400px;
+padding: 20px;
+padding-top: 10px;
+margin: 0 0px;
+margin-bottom: 10px;
+background-color: white;
+-webkit-box-shadow: 0 0 4px rgba(0, 0, 0, 0.2), inset 0 0 50px rgba(0, 0, 0, 0.1);
+-moz-box-shadow: 0 0 4px rgba(0, 0, 0, 0.2), inset 0 0 50px rgba(0, 0, 0, 0.1);
+box-shadow: 0 0 5px rgba(0, 0, 0, 0.2), inset 0 0 50px rgba(0, 0, 0, 0.1);
+}
+.vevent .event-location {
+        margin-left: 10px;
+        margin-right: 10px;
+}
+.vevent .event-description {
+margin-left: 10px;
+margin-right: 10px;
+font-size: 1.1em;
+font-weight: bolder;
+}
+.vevent .event-start, .vevent .event-end {
+
+margin-right: 20px;
+margin-bottom: 2px;
+margin-top: 2px;
+font-size: 0.9em;
+text-align: left;
+}
+.event-start .dtstart, .event-end .dtend {
+float: right;
+}
+
+
+#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("../../../view/theme/diabook/icons/events2.png") !important;
+        margin-right: 15px;
+}
+
+.event-start, .event-end {
+        margin-left: 10px;
+        width: 330px;
+        clear: both;
+}
+
+.event-start .dtstart, .event-end .dtend {
+        float: right;
+}
+
+.event-list-date {
+        margin-bottom: 10px;
+}
+
+.prevcal, .nextcal {
+        float: left;
+        margin-left: 32px;
+        margin-right: 32px;
+        margin-top: 64px;
+}
+.event-calendar-end {
+        clear: both;
+}
+
+ 
+.calendar {
+        font-family: Courier, monospace;
+}
+.calendar.eventcal a {
+  color: #3465A4;	
+	}
+.today {
+        font-weight: bold;
+        color: #FF0000;
+}
+
+.settings-block {
+        border: 1px solid #AAA;
+        margin: 10px;
+        padding: 10px;
+}
+
+.app-title {
+        margin: 10px;
+}
+
+#identity-manage-desc {
+        margin-top:15px;
+        margin-bottom: 15px;
+}
+
+#identity-manage-choose {
+        margin-bottom: 15px;
+}
+
+#identity-submit {
+        margin-top: 20px;
+}
+
+#photo-prev-link, #photo-next-link {
+        padding: 10px;
+        float: left;
+}
+.lightbox{
+	float: left;
+	}
+#photo-photo {
+        float: left;
+}
+#photo-like-div .wall-item-like-buttons {
+	float: left;
+   margin-right: 10px;
+	}
+.wall-item-like-buttons .icon.like {
+float: left;
+}
+
+#photo-photo-end {
+        clear: both;
+}
+
+.tabs .comment-wwedit-wrapper {
+	display: block;
+   margin-top: 30px;
+   margin-left: 50px;
+	}
+
+.profile-match-photo {
+        float: left;
+        text-align: center;
+        width: 120px;
+}
+
+.profile-match-name {
+        float: left;
+        text-align: center;
+        width: 120px;
+        overflow: hidden;
+}
+
+.profile-match-break,
+.profile-match-end {
+        clear: both;
+}
+
+.profile-match-connect {
+        text-align: center;
+        font-weight: bold;
+}
+
+.profile-match-wrapper {
+        float: left;
+        padding: 10px;
+        width: 120px;
+        height: 120px;
+        scroll: auto;
+}
+#profile-match-wrapper-end {
+        clear: both;
+}
+
+/* ============= */
+/* = Directory = */
+/* ============= */
+/* contacts menu */
+.contact-photo-wrapper {
+  position: relative;
+}
+.contact-photo {
+  width: 48px;
+  height: 48px;
+  overflow: hidden;
+  display: block;
+}
+.contact-photo img {
+  width: 48px;
+  height: 48px;
+}
+.contact-photo-menu-button {
+  display: none;
+  /* position: absolute; */
+  /* position: absolute; */
+  left: 0px;
+  top: -16px;
+}
+.contact-wrapper {
+  float: left;
+  width: 90px;
+  height: 90px;
+  margin-bottom: 15px;
+}
+.contact-wrapper .contact-photo {
+  width: 80px;
+  height: 80px;
+}
+.contact-wrapper .contact-photo img {
+  width: 80px;
+  height: 80px;
+}
+.contact-wrapper .contact-photo-menu-button {
+  left: 0px;
+  top: 63px;
+}
+.directory-item {
+  float: left;
+  width: 200px;
+  height: 200px;
+}
+.directory-item .contact-photo {
+  width: 175px;
+  height: 175px;
+}
+.directory-item .contact-photo img {
+  width: 175px;
+  height: 175px;
+}
+.contact-name {
+  text-align: left;
+  font-weight: bold;
+  font-size: 12px;
+}
+.contact-details {
+  color: #999999;
+}
+#side-bar-photos-albums{
+	margin-top: 15px;	
+	}
+.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-album-image-wrapper, .photo-top-image-wrapper {
+  float: left;
+   -moz-box-shadow: 0 0 5px #888;
+   -webkit-box-shadow: 0 0 5px #888;
+   box-shadow: 0 0 5px #888;
+  background-color: #000;
+   -webkit-border-radius: 5px;
+   -moz-border-radius: 5px;
+  border-radius: 5px;
+  padding-bottom: 20px;
+  position: relative;
+  margin: 0 10px 10px 0;
+  width: 200px; height: 140px;
+  overflow: hidden;  
+}
+.photo-top-album-name {
+        width: 100%;
+        position: absolute; 
+        bottom: 0px; 
+        padding-left: 3px;
+        background-color: #EEE;
+}
+.photo-top-album-link{
+  color: #3465A4;
+	}
+.photo-top-album-img{
+	
+	}
+/*.photo-top-image-wrapper {
+        position: relative;
+        float: left;
+        margin-top: 15px;
+        margin-right: 15px;
+        width: 200px; height: 200px; 
+        overflow: hidden; 
+}
+.photo-top-album-name {
+        width: 100%;
+        min-height: 2em;
+        position: absolute; 
+        bottom: 0px; 
+        padding: 0px 3px;
+        padding-top: 0.5em;
+        background-color: rgb(255, 255, 255);
+}*/
+#photo-top-end {
+        clear: both;
+}
+
+#photo-top-links {
+        margin-bottom: 30px;
+        margin-left: 30px;
+}
+
+#photos-upload-newalbum-div {
+        float: left;
+        width: 175px;
+}
+
diff --git a/view/theme/diabook-aerith/style.css b/view/theme/diabook/diabook-aerith/style.css
index 796af62ed..1f3e65cca 100644
--- a/view/theme/diabook-aerith/style.css
+++ b/view/theme/diabook/diabook-aerith/style.css
@@ -1,4 +1,4 @@
-/opt/lampp/htdocs/friendica/view/theme/diabook/search_item.tpl/**
+/**
  * Fabio Comuni <http://kirgroup.com/profile/fabrixxm>
  * Additional Changes: Michael Vogel <icarus@dabo.de>
  **/
@@ -83,70 +83,103 @@
 #adminpage .selectall { text-align: right; }
 /* icons */
 
+.icon.bb-url{
+  background-image: url("../../../view/theme/diabook/diabook-aerith/icons/bb-url.png");
+  float: right;
+  margin-top: 2px;}
+.icon.quote{
+  background-image: url("../../../view/theme/diabook/diabook-aerith/icons/quote.png");
+  float: right;
+  margin-top: 2px;}
+.icon.bold{
+  background-image: url("../../../view/theme/diabook/diabook-aerith/icons/bold.png");
+  float: right;
+  margin-top: 2px;}
+.icon.underline{
+  background-image: url("../../../view/theme/diabook/diabook-aerith/icons/underline.png");
+  float: right;
+  margin-top: 2px;}
+.icon.italic{
+  background-image: url("../../../view/theme/diabook/diabook-aerith/icons/italic.png");
+  float: right;
+  margin-top: 2px;}
+.icon.bb-image{
+  background-image: url("../../../view/theme/diabook/diabook-aerith/icons/bb-image.png");
+  float: right;
+  margin-top: 2px;}
+.icon.bb-video{
+  background-image: url("../../../view/theme/diabook/diabook-aerith/icons/bb-video.png");
+  float: right;
+  margin-top: 2px;}
+  
 .icon.contacts {
-  background-image: url("../../../view/theme/diabook-aerith/icons/contacts.png");}
+  background-image: url("../../../view/theme/diabook/diabook-aerith/icons/contacts.png");}
 .icon.notifications {
-  background-image: url("../../../view/theme/diabook-aerith/icons/notifications.png");}
+  background-image: url("../../../view/theme/diabook/diabook-aerith/icons/notifications.png");}
 .icon.notify {
-  background-image: url("../../../view/theme/diabook-aerith/icons/notify.png");}
+  background-image: url("../../../view/theme/diabook/diabook-aerith/icons/notify.png");}
 .icon.messages {
-  background-image: url("../../../view/theme/diabook-aerith/icons/messages.png");}
+  background-image: url("../../../view/theme/diabook/diabook-aerith/icons/messages.png");}
 .icon.community {
-  background-image: url("../../../view/theme/diabook-aerith/icons/community.png");}
+  background-image: url("../../../view/theme/diabook/diabook-aerith/icons/community.png");}
   
-.icon.drop 	{ background-image: url("../../../view/theme/diabook-aerith/icons/drop.png");}
-.icon.drophide 	{ background-image: url("../../../view/theme/diabook-aerith/icons/drop.png");}
-.icon.dislike 	{ background-image: url("../../../view/theme/diabook-aerith/icons/dislike.png");}
-.icon.like 	{ background-image: url("../../../view/theme/diabook-aerith/icons/like.png");}
-.icon.pencil 	{ background-image: url("../../../view/theme/diabook-aerith/icons/pencil.png");}
-.icon.recycle 	{ background-image: url("../../../view/theme/diabook-aerith/icons/recycle.png");}
-.icon.remote-link { background-image: url("../../../view/theme/diabook-aerith/icons/remote.png");}
-.icon.tagged    { background-image: url("../../../view/theme/diabook-aerith/icons/tagged.png");}
-.icon.file-as { background-image: url("../../../view/theme/diabook-aerith/icons/file_as.png");}
-.star-item.icon.unstarred { background-image: url("../../../view/theme/diabook-aerith/icons/unstarred.png");}
-.star-item.icon.starred { background-image: url("../../../view/theme/diabook-aerith/icons/starred.png");}
-.icon.link		{ background-image: url("../../../view/theme/diabook-aerith/icons/link.png");}
-.icon.lock		{ background-image: url("../../../view/theme/diabook-aerith/icons/lock.png");}
-.icon.unlock		{ background-image: url("../../../view/theme/diabook-aerith/icons/unlock.png");}
-.icon.language    { background-image: url("../../../view/theme/diabook-aerith/icons/language.png");}
-
-
-.camera 	{ background-image: url("../../../view/theme/diabook-aerith/icons/camera.png"); 
+.icon.drop 	{ background-image: url("../../../view/theme/diabook/diabook-aerith/icons/drop.png");}
+.icon.drophide 	{ background-image: url("../../../view/theme/diabook/diabook-aerith/icons/drop.png");}
+.icon.dislike 	{ background-image: url("../../../view/theme/diabook/diabook-aerith/icons/dislike.png");}
+.icon.like 	{ background-image: url("../../../view/theme/diabook/diabook-aerith/icons/like.png");}
+.icon.pencil 	{ background-image: url("../../../view/theme/diabook/diabook-aerith/icons/pencil.png");}
+.icon.recycle 	{ background-image: url("../../../view/theme/diabook/diabook-aerith/icons/recycle.png");}
+.icon.remote-link { background-image: url("../../../view/theme/diabook/diabook-aerith/icons/remote.png");}
+.icon.tagged    { background-image: url("../../../view/theme/diabook/diabook-aerith/icons/tagged.png");}
+.icon.file-as { background-image: url("../../../view/theme/diabook/diabook-aerith/icons/file_as.png");}
+.star-item.icon.unstarred { background-image: url("../../../view/theme/diabook/diabook-aerith/icons/unstarred.png");}
+.star-item.icon.starred { background-image: url("../../../view/theme/diabook/diabook-aerith/icons/starred.png");}
+.icon.link		{ background-image: url("../../../view/theme/diabook/diabook-aerith/icons/link.png");}
+.icon.lock		{ background-image: url("../../../view/theme/diabook/diabook-aerith/icons/lock.png");}
+.icon.unlock		{ background-image: url("../../../view/theme/diabook/diabook-aerith/icons/unlock.png");}
+.icon.language    { background-image: url("../../../view/theme/diabook/diabook-aerith/icons/language.png");}
+
+
+.camera 	{ background-image: url("../../../view/theme/diabook/diabook-aerith/icons/camera.png"); 
 			  display: block; width: 28px; height: 28px; background-repeat: no-repeat;
 			  }
-.attach 	{ background-image: url("../../../view/theme/diabook-aerith/icons/attach.png"); 
+.attach 	{ background-image: url("../../../view/theme/diabook/diabook-aerith/icons/attach.png"); 
 			  display: block; width: 28px; height: 28px; background-repeat: no-repeat;
 			  }
-.video2 	{ background-image: url("../../../view/theme/diabook-aerith/icons/video.png"); 
+.video2 	{ background-image: url("../../../view/theme/diabook/diabook-aerith/icons/video.png"); 
 			  display: block; width: 28px; height: 28px; background-repeat: no-repeat;
 			  }	
-.video 	{ background-image: url("../../../view/theme/diabook-aerith/icons/video.png"); 
-			  display: block; width: 100%; height: 28px; background-repeat: no-repeat;
+.video 	{ background-image: url("../../../view/theme/diabook/diabook-aerith/icons/video.png"); 
+			  display: block; width: 100%; height: 140px; background-repeat: no-repeat;
 			  }
-.audio2 	{ background-image: url("../../../view/theme/diabook-aerith/icons/audio.png"); 
+.audio2 	{ background-image: url("../../../view/theme/diabook/diabook-aerith/icons/audio.png"); 
 			  display: block; width: 28px; height: 28px; background-repeat: no-repeat;
 			  }
-.audio 	{ background-image: url("../../../view/theme/diabook-aerith/icons/audio.png"); 
+.audio 	{ background-image: url("../../../view/theme/diabook/diabook-aerith/icons/audio.png"); 
 			  display: block; width: 28px; height: 28px; background-repeat: no-repeat;
 			  }
-.weblink 	{ background-image: url("../../../view/theme/diabook-aerith/icons/weblink.png"); 
+.weblink 	{ background-image: url("../../../view/theme/diabook/diabook-aerith/icons/weblink.png"); 
 			  display: block; width: 28px; height: 28px; background-repeat: no-repeat;
 			  }
-.globe 	{ background-image: url("../../../view/theme/diabook-aerith/icons/globe.png"); 
+.globe 	{ background-image: url("../../../view/theme/diabook/diabook-aerith/icons/globe.png"); 
 			  display: block; width: 28px; height: 28px; background-repeat: no-repeat;
 			  }
-.unglobe 	{ background-image: url("../../../view/theme/diabook-aerith/icons/unglobe.png"); 
+.unglobe 	{ background-image: url("../../../view/theme/diabook/diabook-aerith/icons/unglobe.png"); 
 			  display: block; width: 28px; height: 28px; background-repeat: no-repeat;
 			  }
-.edit    {background-image: url("../../../view/theme/diabook-aerith/icons/pencil2.png"); 
+.edit    {background-image: url("../../../view/theme/diabook/diabook-aerith/icons/pencil2.png"); 
 			  display: block; width: 28px; height: 28px; background-repeat: no-repeat;}
-			  
+.icon.block   {background-image: url("../../../view/theme/diabook/icons/block.png"); 
+			  display: block; width: 16px; height: 16px; background-repeat: no-repeat;}
+.icon.block.dim  {background-image: url("../../../view/theme/diabook/icons/block.png"); 
+			  display: block; width: 16px; height: 16px; background-repeat: no-repeat; opacity: 0.3;}
+.icon.ad_drop 	{ background-image: url("../../../view/theme/diabook/icons/drop.png");
+			  display: block; margin-left:5px; width: 16px; height: 16px; background-repeat: no-repeat;}			  
 			  
 
 
 .article	{ background-position: -50px  0px;}
 /*.audio 		{ background-position: -70px  0px;}*/
-.block 		{ background-position: -90px  0px;}
 /*.drop 		{ background-position: -110px 0px;}*/
 /*.drophide 	{ background-position: -130px 0px;}*/
 /*.edit 		{ background-position: -150px 0px;}*/
@@ -176,10 +209,10 @@
 /*.language       { background-position: -210px -40px;}*/
 
 
-.icon.on             { background-image: url("../../../view/theme/diabook-aerith/icons/toogle_on.png"); background-repeat: no-repeat;}
-.icon.off            { background-image: url("../../../view/theme/diabook-aerith/icons/toogle_off.png"); background-repeat: no-repeat;}
-.icon.prev           { background-image: url("../../../view/theme/diabook-aerith/icons/prev.png"); background-repeat: no-repeat;}
-.icon.next           { background-image: url("../../../view/theme/diabook-aerith/icons/next.png"); background-repeat: no-repeat;}
+.icon.on             { background-image: url("../../../view/theme/diabook/diabook-aerith/icons/toogle_on.png"); background-repeat: no-repeat;}
+.icon.off            { background-image: url("../../../view/theme/diabook/diabook-aerith/icons/toogle_off.png"); background-repeat: no-repeat;}
+.icon.prev           { background-image: url("../../../view/theme/diabook/diabook-aerith/icons/prev.png"); background-repeat: no-repeat;}
+.icon.next           { background-image: url("../../../view/theme/diabook/diabook-aerith/icons/next.png"); background-repeat: no-repeat;}
 /*.tagged     { background-position: -130px -60px;}*/
 
 .attachtype {
@@ -215,12 +248,12 @@
 }
 
 .icon.border.camera{
-  background-image: url("../../../view/theme/diabook-aerith/icons/camera.png"); 
+  background-image: url("../../../view/theme/diabook/diabook-aerith/icons/camera.png"); 
   display: block; width: 28px; height: 28px; background-repeat: no-repeat;
 	}
 	
 .icon.border.link{
-  background-image: url("../../../view/theme/diabook-aerith/icons/weblink.png"); 
+  background-image: url("../../../view/theme/diabook/diabook-aerith/icons/weblink.png"); 
   display: block; width: 28px; height: 28px; background-repeat: no-repeat;
   margin-left: 10px;
 	}
@@ -399,6 +432,12 @@ body {
   margin: 50px auto auto;
   display: table;
 }
+
+#jappix_mini {
+right: 45px !important;
+}
+
+
 h4 {
   font-size: 1.1em;
 }
@@ -447,6 +486,24 @@ a:hover {
   /*color: #005c94; */
   text-decoration: underline;
 }
+.intro-end {
+	border-bottom: 1px solid black;
+   clear: both;
+   margin-bottom: 25px;
+   padding-bottom: 25px;
+   width: 75%;
+	}
+.intro-form-end {
+	clear: both;
+	}
+.intro-fullname {
+	padding-bottom: 5px;
+   padding-top: 5px;
+	}
+.intro-wrapper-end {
+	clear: both;
+   padding-bottom: 5px;
+	}
 code {
   font-family: Courier, monospace;
   white-space: pre;
@@ -480,8 +537,9 @@ code {
 }
 #saved-search-ul .tool:hover,
 #nets-sidebar .tool:hover,
-#sidebar-group-list .tool:hover {
-	background: #EEE;
+#sidebar-group-list .tool:hover,
+#fileas-sidebar .tool:hover  {
+	background: aliceBlue;
 }
 .tool .label {
   float: left;
@@ -850,15 +908,15 @@ nav #nav-site-linkmenu .menu-popup {
 }
 
 nav #nav-messages-linkmenu.on .icon.messages, nav #nav-messages-linkmenu.selected .icon.messages{
-	background-image: url("../../../view/theme/diabook-aerith/icons/messages.png");
+	background-image: url("../../../view/theme/diabook/diabook-aerith/icons/messages.png");
 	}
 	
 /*nav #nav-notifications-linkmenu.on .icon.notify,*/ nav #nav-notifications-linkmenu.selected .icon.notify{
-	background-image: url("../../../view/theme/diabook-aerith/icons/notify.png");
+	background-image: url("../../../view/theme/diabook/diabook-aerith/icons/notify.png");
 	}
 	
 nav #nav-contacts-linkmenu.on .icon.contacts, nav #nav-contacts-linkmenu.selected .icon.contacts{
-	background-image: url("../../../view/theme/diabook-aerith/icons/contacts.png");
+	background-image: url("../../../view/theme/diabook/diabook-aerith/icons/contacts.png");
 	}
 	
 nav #nav-apps-link.selected {
@@ -1014,44 +1072,57 @@ ul.menu-popup .empty {
 	}
 .menu-profile-list{
   height: auto;
-  overflow: auto;
-  padding-top: 3px;
-  padding-bottom: 3px;
-  padding-left: 16px;
+  overflow: auto;  
   min-height: 16px;
   list-style: none;
 	}
 .menu-profile-list:hover{
-	background: #EEE;
+	background: aliceBlue; 
 	}
 .menu-profile-list-item{
 	padding-left: 5px;
+	vertical-align: middle;
 	}	
 .menu-profile-list-item:hover{	
 	text-decoration: none;
    }
 /*http://prothemedesign.com/circular-icons/*/
-.menu-profile-list.home{
-	background: url("../../../view/theme/diabook-aerith/icons/home.png") no-repeat;
-	}
-.menu-profile-list.photos{
-	background: url("../../../view/theme/diabook-aerith/icons/mess_side.png") no-repeat;
-	}
-.menu-profile-list.events{
-	background: url("../../../view/theme/diabook-aerith/icons/events.png") no-repeat;
-	}
-.menu-profile-list.notes{
-	background: url("../../../view/theme/diabook-aerith/icons/notes.png") no-repeat;
-	}
-.menu-profile-list.foren{
-	background: url("../../../view/theme/diabook-aerith/icons/pubgroups.png") no-repeat;
-	}
-.menu-profile-list.com_side{
-	background: url("../../../view/theme/diabook-aerith/icons/com_side.png") no-repeat;
-	}
-.menu-profile-list.pscontacts{
-	background: url("../../../view/theme/diabook-aerith/icons/pscontacts.png") no-repeat;
+.menu-profile-icon.home{
+	background: url("../../../view/theme/diabook/diabook-aerith/icons/home.png") no-repeat;
+	float: left;
+	height: 22px;
+	width: 22px;
 	}
+.menu-profile-icon.photos{
+	background: url("../../../view/theme/diabook/diabook-aerith/icons/mess_side.png") no-repeat;
+	float: left;
+	height: 22px;
+   width: 22px;}
+.menu-profile-icon.events{
+	background: url("../../../view/theme/diabook/diabook-aerith/icons/events.png") no-repeat;
+	float: left;
+	height: 22px;
+   width: 22px;}
+.menu-profile-icon.notes{
+	background: url("../../../view/theme/diabook/diabook-aerith/icons/notes.png") no-repeat;
+	float: left;
+	height: 22px;
+   width: 22px;}
+.menu-profile-icon.foren{
+	background: url("../../../view/theme/diabook/diabook-aerith/icons/pubgroups.png") no-repeat;
+	float: left;
+	height: 22px;
+   width: 22px;}
+.menu-profile-icon.com_side{
+	background: url("../../../view/theme/diabook/diabook-aerith/icons/com_side.png") no-repeat;
+	float: left;
+	height: 22px;
+   width: 22px;}
+.menu-profile-icon.pscontacts{
+	background: url("../../../view/theme/diabook/diabook-aerith/icons/pscontacts.png") no-repeat;
+	float: left;
+	height: 22px;
+   width: 22px;}
 /* aside */
 aside {
   display: table-cell;
@@ -1062,6 +1133,7 @@ aside {
   float: left;
   /* background: #F1F1F1; */
 }
+aside #page-sidebar{display: none;}
 aside .vcard .fn {
   font-size: 18px;
   font-weight: bold;
@@ -1168,6 +1240,53 @@ aside #likes a:hover{
   float: left;
   margin-right: 20px;		
 	}
+#login-submit-wrapper{
+margin-bottom: 15px;
+	}
+.group_selected {
+  background: url("../../../view/theme/diabook/icons/selected.png") no-repeat left center;
+  float: left;
+  height: 22px;
+  width: 22px;
+}
+.group_unselected {
+  background: url("../../../view/theme/diabook/icons/unselected.png") no-repeat left center;
+  float: left;
+  height: 22px;
+  width: 22px;
+}
+.icon.text_add		{ 
+		background-image: url("../../../images/icons/16/add.png");
+		float: right;
+		opacity: 0.2;
+		margin-right: 14px;
+		}
+.icon.text_add:hover	{ 
+		background-image: url("../../../images/icons/16/add.png");
+		float: right;
+		cursor: pointer;
+		margin-right: 14px;
+		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;
+		}
+.icon.text_edit {
+  background-image: url("../../../images/icons/10/edit.png");
+  opacity: 0.2;
+  margin-top: 6px;
+  float: right;
+  height: 10px;
+}
+.icon.text_edit:hover {
+  background-image: url("../../../images/icons/10/edit.png");
+  opacity: 1;
+  margin-top: 6px;
+  float: right;
+  height: 10px;
+}
 /* widget */
 .widget {
   margin-bottom: 2em;
@@ -1238,7 +1357,7 @@ list-style-type: disc;
   color: #3465A4;
 }
 .widget .tool.selected {
-  background: url("../../../view/theme/diabook-aerith/icons/selected.png") no-repeat left center;
+  background: url("../../../view/theme/diabook/diabook-aerith/icons/selected.png") no-repeat left center;
 }
 /* widget: search */
 #add-search-popup {
@@ -1254,10 +1373,14 @@ section {
 }
 body .pageheader{
   text-align: center;
-  margin-top: 25px;
-  font-size: 0px;
+  font-size: 20px;
+  margin-bottom: 20px;
+  margin-top: 0px;
+  max-width: 775px;
+	}
+.qcomment{
+  max-width: 122px;	
 	}
-
 #id_username {
   width: 173px;	
 	}
@@ -1285,7 +1408,6 @@ body .pageheader{
     padding: 0;
  }
 .tab.button {
-    margin-right: 5px; 
     margin-left: 5px;	
     /*background: none repeat scroll 0 0 #F8F8F8;*/
     border: 1px solid #CCCCCC;
@@ -1309,6 +1431,7 @@ body .pageheader{
   padding: 5px;
   margin-bottom: 0px;
   width: 775px;
+  padding-top: 10px;
 }
 .tread-wrapper a{
   color: #3465A4;
@@ -1324,6 +1447,122 @@ body .pageheader{
   display: table;
   width: 780px;
 }
+.wall-item-photo-container .wall-item-item, .wall-item-container .wall-item-bottom {
+  display: table-row;
+}
+.wall-item-photo-container .wall-item-info {
+  display: table-cell;
+  vertical-align: top;
+  text-align: left;
+  width: 80px;
+}
+.wall-item-photo-container .wall-item-location {
+  padding-right: 40px;
+  display: table-cell;
+}
+.wall-item-photo-container .wall-item-ago {
+  word-wrap: break-word;
+  width: 50px;
+  margin-left: 10px;
+  color: #999;
+}
+.wall-item-photo-container .wall-item-content {
+
+  max-width: 720px;
+  word-wrap: break-word;
+
+  margin-bottom: 14px;
+}
+.wall-item-photo-container .wall-item-content img {
+  max-width: 700px;
+}
+.wall-item-photo-container .wall-item-links, .wall-item-photo-container .wall-item-actions {
+  display: table-cell;
+  vertical-align: middle;
+}
+.wall-item-photo-container .wall-item-links .icon, .wall-item-photo-container .wall-item-actions .icon {
+  opacity: 0.5;
+  -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;
+}
+.wall-item-photo-container .wall-item-links .icon:hover, .wall-item-photo-container .wall-item-actions .icon: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;
+}
+.wall-item-photo-container .wall-item-name {
+  font-weight: bold;
+}
+.wall-item-photo-container .wall-item-actions-author {
+  width: 100%;
+  margin-bottom: 0.3em;
+}
+.wall-item-photo-container .wall-item-actions-social {
+  float: left;
+  margin-bottom: 1px;
+  display: table-cell;
+}
+.wall-item-photo-container .wall-item-actions-social a {
+  margin-right: 1em;
+}
+.wall-item-photo-container .wall-item-actions-tools {
+  float: right;
+  width: 80px;
+  display: table-cell;
+}
+.wall-item-photo-container .wall-item-actions-tools a {
+  float: right;
+}
+.wall-item-photo-container .wall-item-actions-tools input {
+  float: right;
+}
+.wall-item-photo-container.comment {
+  margin-top: 5px;
+  margin-bottom: 5px;
+  margin-left: 40px;
+  width: 650px;
+  border-bottom: 1px solid #D2D2D2;
+}
+.wall-item-photo-container.comment {
+  top: 15px !important;
+  left: 15px !important;
+}
+.wall-item-photo-container {
+  display: table;
+  width: 780px;
+}
+.my-comment-photo {
+  width: 48px;
+  margin-left: 40px;
+  margin-right: 32px;
+	}
+.comment-edit-preview {
+  width: 500px;
+  margin-top: 10px;
+}
+.comment-edit-text-empty {
+    width: 500px;
+    border: 1px solid #D2D2D2;
+    height: 3.2em;
+    color: #2d2d2d;
+}
+.comment-edit-text-full {
+  font-size: 12.5px;
+  height: 3.3em;
+  
+  border: 1px solid #D2D2D2;
+  width: 500px;
+}
+.comment-edit-photo {
+    margin: 10px 0 0;
+    display: table-cell;
+}
 
 
 .wall-item-container .wall-item-item, .wall-item-container .wall-item-bottom {
@@ -1373,10 +1612,11 @@ body .pageheader{
 }
 
 .wall-item-container .wall-item-content {
-  font-size: 12.5px;
+
   max-width: 720px;
   word-wrap: break-word;
-  line-height: 1.2;
+
+
 }
 
 .wall-item-container .wall-item-content img {
@@ -1453,13 +1693,13 @@ body .pageheader{
   padding-left: 12px;
 }
 .wall-item-comment-wrapper {
-  margin: 1px 5px 1px 80px;
+  margin: 1px 5px 5px 80px;
 }
 .wall-item-comment-wrapper .comment-edit-photo {
   display: none;
 }
 .wall-item-comment-wrapper textarea {
-  height: 2.0em;
+  height: 1.6em ;
   width: 100%;
   font-size: 10px;
   color: #999999;
@@ -1474,9 +1714,9 @@ body .pageheader{
   border: 1px solid #2d2d2d;
 }
 .comment-edit-preview {
-  width: 710px;
-  border: 1px solid #2d2d2d;
+  width: 500px;
   margin-top: 10px;
+  background-color:  #fff797;
 }
 .comment-edit-preview .contact-photo {
   width: 32px;
@@ -1622,6 +1862,11 @@ body .pageheader{
   padding: 0.3em;
   margin-bottom: 10px;
 }
+.grey
+{
+  display: inline;
+  float: right;	
+	}
 #jot #jot-tools {
   margin: 0px;
   padding: 0px;
@@ -1700,14 +1945,14 @@ body .pageheader{
 #jot #jot-tools li.loading img {
   margin-top: 10px;
 }
-#profile-jot-form #jot-title {
+#profile-jot-form #jot-title, #profile-jot-form #jot-category {
     
   	 border-radius: 5px 5px 5px 5px;
     font-weight: bold;
     height: 20px;
     margin: 0 0 5px;
     width: 60%;
-    border: 1px solid #ffffff;
+    border: 1px solid #d2d2d2;
 }
 #profile-jot-form #jot-title:-webkit-input-placeholder {
   font-weight: normal;
@@ -1973,6 +2218,41 @@ ul.tabs li .active {
     box-shadow: 2px 2px 2px #CFCFCF;
     margin-left: 5px;
 }
+//settings tabs
+ul.rs_tabs {
+  list-style-type: none;
+  font-size: 11px;
+}
+ul.rs_tabs li {
+  float: left;
+  margin-bottom: 30px;
+  clear: both;
+}
+ul.rs_tabs li .selected {
+    background-color: #3465A4;
+    border: 1px solid #777777;
+    color: white;
+    border-radius: 3px 3px 3px 3px;
+    box-shadow: 2px 2px 2px #CFCFCF;
+    font-size: 13px;
+}
+.rs_tabs {
+    list-style-type: none;
+    font-size: 11px;
+    background-position: 0 -20px;
+    background-repeat: repeat-x;
+    height: 27px;
+    padding: 0;
+ }
+.rs_tab.button {	
+    /*background: none repeat scroll 0 0 #F8F8F8;*/
+    border: 1px solid #CCCCCC;
+    border-radius: 3px 3px 3px 3px;
+    font-weight: bolder;
+    padding: 3px;
+    color:  #333333;
+    text-decoration: none;
+	}
 /**
  * Form fields
  */
@@ -2032,6 +2312,14 @@ ul.tabs li .active {
 .field.radio .field_help {
   margin-left: 0px;
 }
+.suggest-select {
+width: 500px;
+height: 350px;	
+	}
+.message-to-select {
+	width: 400px;
+   height: 150px;
+	}
 #directory-search-form{
 	margin-bottom: 50px;
 	}
@@ -2093,9 +2381,10 @@ ul.tabs li .active {
 /* photo */
 .photo {
 box-shadow: 2px 2px 5px 0px #000000;
-margin: 2px 5px 2px 5px;
-max-height: 85%;
-max-width: 85%;
+margin: 0px;
+border-radius: 10px;
+height: 145px !important;
+width: 145px !important;
 }
 .lframe {
   float: left;
@@ -2168,6 +2457,11 @@ blockquote {
     border-left: 1px solid #D2D2D2;
     padding-left: 9px;
     margin: 0 0 0 .8ex;
+    color: #777;
+}
+.oembed {
+	
+	font-weight: bold;
 }
 .aprofile dt{
 box-shadow: 1px 1px 5px 0;
@@ -2206,6 +2500,9 @@ box-shadow: 1px 1px 5px 0;
 #group-separator,
 #prof-separator { display: none;}
 */
+#prof-members-end{
+	clear: both;
+	}
 
 #prvmail-to-label, #prvmail-subject-label, #prvmail-message-label {
 	margin-bottom: 10px;
@@ -2331,16 +2628,39 @@ a.mail-list-link {
 }
 
 .vevent {
-        border: 1px solid #CCCCCC;
-}
-.vevent .event-description, .vevent .event-location {
+position: relative;
+width: 400px;
+padding: 20px;
+padding-top: 10px;
+margin: 0 0px;
+margin-bottom: 10px;
+background-color: white;
+-webkit-box-shadow: 0 0 4px rgba(0, 0, 0, 0.2), inset 0 0 50px rgba(0, 0, 0, 0.1);
+-moz-box-shadow: 0 0 4px rgba(0, 0, 0, 0.2), inset 0 0 50px rgba(0, 0, 0, 0.1);
+box-shadow: 0 0 5px rgba(0, 0, 0, 0.2), inset 0 0 50px rgba(0, 0, 0, 0.1);
+}
+.vevent .event-location {
         margin-left: 10px;
         margin-right: 10px;
 }
-.vevent .event-start {
-        margin-left: 10px;
-        margin-right: 10px;
+.vevent .event-description {
+margin-left: 10px;
+margin-right: 10px;
+font-size: 1.1em;
+font-weight: bolder;
 }
+.vevent .event-start, .vevent .event-end {
+
+margin-right: 20px;
+margin-bottom: 2px;
+margin-top: 2px;
+font-size: 0.9em;
+text-align: left;
+}
+.event-start .dtstart, .event-end .dtend {
+float: right;
+}
+
 
 #new-event-link {
         margin-bottom: 10px;
@@ -2354,7 +2674,7 @@ a.mail-list-link {
 }
 
 .event-description:before {
-        content: url('../../../images/calendar.png');
+        content:   url("../../../view/theme/diabook/icons/events2.png") !important;
         margin-right: 15px;
 }
 
@@ -2367,7 +2687,6 @@ a.mail-list-link {
 .event-start .dtstart, .event-end .dtend {
         float: right;
 }
-
 .event-list-date {
         margin-bottom: 10px;
 }
diff --git a/view/theme/diabook-blue/icons/StatusNet.png b/view/theme/diabook/diabook-blue/icons/StatusNet.png
index 398bca716..398bca716 100644
--- a/view/theme/diabook-blue/icons/StatusNet.png
+++ b/view/theme/diabook/diabook-blue/icons/StatusNet.png
diff --git a/view/theme/diabook-blue/icons/attach.png b/view/theme/diabook/diabook-blue/icons/attach.png
index 1958041cf..1958041cf 100755..100644
--- a/view/theme/diabook-blue/icons/attach.png
+++ b/view/theme/diabook/diabook-blue/icons/attach.png
diff --git a/view/theme/diabook-blue/icons/audio.png b/view/theme/diabook/diabook-blue/icons/audio.png
index 8d779a409..8d779a409 100755..100644
--- a/view/theme/diabook-blue/icons/audio.png
+++ b/view/theme/diabook/diabook-blue/icons/audio.png
diff --git a/view/theme/diabook/diabook-blue/icons/bb-image.png b/view/theme/diabook/diabook-blue/icons/bb-image.png
new file mode 100644
index 000000000..9a1b32113
--- /dev/null
+++ b/view/theme/diabook/diabook-blue/icons/bb-image.png
diff --git a/view/theme/diabook/diabook-blue/icons/bb-url.png b/view/theme/diabook/diabook-blue/icons/bb-url.png
new file mode 100644
index 000000000..071fc1865
--- /dev/null
+++ b/view/theme/diabook/diabook-blue/icons/bb-url.png
diff --git a/view/theme/diabook/diabook-blue/icons/bb-video.png b/view/theme/diabook/diabook-blue/icons/bb-video.png
new file mode 100644
index 000000000..bd323531e
--- /dev/null
+++ b/view/theme/diabook/diabook-blue/icons/bb-video.png
diff --git a/view/theme/diabook/diabook-blue/icons/block.png b/view/theme/diabook/diabook-blue/icons/block.png
new file mode 100755
index 000000000..a0b1dffe9
--- /dev/null
+++ b/view/theme/diabook/diabook-blue/icons/block.png
diff --git a/view/theme/diabook-blue/icons/bluebug.png b/view/theme/diabook/diabook-blue/icons/bluebug.png
index 3979e7d8e..3979e7d8e 100644
--- a/view/theme/diabook-blue/icons/bluebug.png
+++ b/view/theme/diabook/diabook-blue/icons/bluebug.png
diff --git a/view/theme/diabook/diabook-blue/icons/bold.png b/view/theme/diabook/diabook-blue/icons/bold.png
new file mode 100644
index 000000000..8fab2a10f
--- /dev/null
+++ b/view/theme/diabook/diabook-blue/icons/bold.png
diff --git a/view/theme/diabook-blue/icons/camera.png b/view/theme/diabook/diabook-blue/icons/camera.png
index a5c7f1236..a5c7f1236 100755..100644
--- a/view/theme/diabook-blue/icons/camera.png
+++ b/view/theme/diabook/diabook-blue/icons/camera.png
diff --git a/view/theme/diabook-blue/icons/close_box.png b/view/theme/diabook/diabook-blue/icons/close_box.png
index 28e2675b8..28e2675b8 100755..100644
--- a/view/theme/diabook-blue/icons/close_box.png
+++ b/view/theme/diabook/diabook-blue/icons/close_box.png
diff --git a/view/theme/diabook/diabook-blue/icons/com_side.png b/view/theme/diabook/diabook-blue/icons/com_side.png
new file mode 100644
index 000000000..00186ba05
--- /dev/null
+++ b/view/theme/diabook/diabook-blue/icons/com_side.png
diff --git a/view/theme/diabook-blue/icons/community.png b/view/theme/diabook/diabook-blue/icons/community.png
index 7c91e8b75..7c91e8b75 100644
--- a/view/theme/diabook-blue/icons/community.png
+++ b/view/theme/diabook/diabook-blue/icons/community.png
diff --git a/view/theme/diabook-blue/icons/contacts.png b/view/theme/diabook/diabook-blue/icons/contacts.png
index ca714acaf..ca714acaf 100644
--- a/view/theme/diabook-blue/icons/contacts.png
+++ b/view/theme/diabook/diabook-blue/icons/contacts.png
diff --git a/view/theme/diabook-blue/icons/contacts2.png b/view/theme/diabook/diabook-blue/icons/contacts2.png
index 7817279f4..7817279f4 100755..100644
--- a/view/theme/diabook-blue/icons/contacts2.png
+++ b/view/theme/diabook/diabook-blue/icons/contacts2.png
diff --git a/view/theme/diabook-blue/icons/dislike.png b/view/theme/diabook/diabook-blue/icons/dislike.png
index 23de426c5..23de426c5 100644
--- a/view/theme/diabook-blue/icons/dislike.png
+++ b/view/theme/diabook/diabook-blue/icons/dislike.png
diff --git a/view/theme/diabook-blue/icons/drop.png b/view/theme/diabook/diabook-blue/icons/drop.png
index 2abb82ef2..2abb82ef2 100755..100644
--- a/view/theme/diabook-blue/icons/drop.png
+++ b/view/theme/diabook/diabook-blue/icons/drop.png
diff --git a/view/theme/diabook-blue/icons/email.png b/view/theme/diabook/diabook-blue/icons/email.png
index 240cef2c3..240cef2c3 100644
--- a/view/theme/diabook-blue/icons/email.png
+++ b/view/theme/diabook/diabook-blue/icons/email.png
diff --git a/view/theme/diabook/diabook-blue/icons/events.png b/view/theme/diabook/diabook-blue/icons/events.png
new file mode 100644
index 000000000..cf195fbb6
--- /dev/null
+++ b/view/theme/diabook/diabook-blue/icons/events.png
diff --git a/view/theme/diabook-blue/icons/facebook.png b/view/theme/diabook/diabook-blue/icons/facebook.png
index 3e5dd39c3..3e5dd39c3 100644
--- a/view/theme/diabook-blue/icons/facebook.png
+++ b/view/theme/diabook/diabook-blue/icons/facebook.png
diff --git a/view/theme/diabook-blue/icons/file_as.png b/view/theme/diabook/diabook-blue/icons/file_as.png
index 16713fa53..16713fa53 100755..100644
--- a/view/theme/diabook-blue/icons/file_as.png
+++ b/view/theme/diabook/diabook-blue/icons/file_as.png
diff --git a/view/theme/diabook-blue/icons/ftdevs.gif b/view/theme/diabook/diabook-blue/icons/ftdevs.gif
index e0fc25743..e0fc25743 100644
--- a/view/theme/diabook-blue/icons/ftdevs.gif
+++ b/view/theme/diabook/diabook-blue/icons/ftdevs.gif
diff --git a/view/theme/diabook-blue/icons/globe.png b/view/theme/diabook/diabook-blue/icons/globe.png
index 6bb9bc09d..6bb9bc09d 100644
--- a/view/theme/diabook-blue/icons/globe.png
+++ b/view/theme/diabook/diabook-blue/icons/globe.png
diff --git a/view/theme/diabook/diabook-blue/icons/home.png b/view/theme/diabook/diabook-blue/icons/home.png
new file mode 100644
index 000000000..5c610805f
--- /dev/null
+++ b/view/theme/diabook/diabook-blue/icons/home.png
diff --git a/view/theme/diabook/diabook-blue/icons/italic.png b/view/theme/diabook/diabook-blue/icons/italic.png
new file mode 100644
index 000000000..bf4b2b81d
--- /dev/null
+++ b/view/theme/diabook/diabook-blue/icons/italic.png
diff --git a/view/theme/diabook-blue/icons/language.png b/view/theme/diabook/diabook-blue/icons/language.png
index 8029c0155..8029c0155 100644
--- a/view/theme/diabook-blue/icons/language.png
+++ b/view/theme/diabook/diabook-blue/icons/language.png
diff --git a/view/theme/diabook-blue/icons/like.png b/view/theme/diabook/diabook-blue/icons/like.png
index b65edccc0..b65edccc0 100644
--- a/view/theme/diabook-blue/icons/like.png
+++ b/view/theme/diabook/diabook-blue/icons/like.png
diff --git a/view/theme/diabook-blue/icons/link.png b/view/theme/diabook/diabook-blue/icons/link.png
index 0ef666a67..0ef666a67 100755..100644
--- a/view/theme/diabook-blue/icons/link.png
+++ b/view/theme/diabook/diabook-blue/icons/link.png
diff --git a/view/theme/diabook-blue/icons/livejournal.png b/view/theme/diabook/diabook-blue/icons/livejournal.png
index 6d27d265e..6d27d265e 100644
--- a/view/theme/diabook-blue/icons/livejournal.png
+++ b/view/theme/diabook/diabook-blue/icons/livejournal.png
diff --git a/view/theme/diabook-blue/icons/lock.png b/view/theme/diabook/diabook-blue/icons/lock.png
index 7e34bf279..7e34bf279 100755..100644
--- a/view/theme/diabook-blue/icons/lock.png
+++ b/view/theme/diabook/diabook-blue/icons/lock.png
diff --git a/view/theme/diabook-blue/icons/lupe.png b/view/theme/diabook/diabook-blue/icons/lupe.png
index f8b228347..f8b228347 100755..100644
--- a/view/theme/diabook-blue/icons/lupe.png
+++ b/view/theme/diabook/diabook-blue/icons/lupe.png
diff --git a/view/theme/diabook/diabook-blue/icons/mess_side.png b/view/theme/diabook/diabook-blue/icons/mess_side.png
new file mode 100644
index 000000000..5295e2e74
--- /dev/null
+++ b/view/theme/diabook/diabook-blue/icons/mess_side.png
diff --git a/view/theme/diabook-blue/icons/messages.png b/view/theme/diabook/diabook-blue/icons/messages.png
index f7010c98c..f7010c98c 100755..100644
--- a/view/theme/diabook-blue/icons/messages.png
+++ b/view/theme/diabook/diabook-blue/icons/messages.png
diff --git a/view/theme/diabook-blue/icons/messages2.png b/view/theme/diabook/diabook-blue/icons/messages2.png
index 54b68e7f7..54b68e7f7 100644
--- a/view/theme/diabook-blue/icons/messages2.png
+++ b/view/theme/diabook/diabook-blue/icons/messages2.png
diff --git a/view/theme/diabook-blue/icons/next.png b/view/theme/diabook/diabook-blue/icons/next.png
index 7b5e25b90..7b5e25b90 100755..100644
--- a/view/theme/diabook-blue/icons/next.png
+++ b/view/theme/diabook/diabook-blue/icons/next.png
diff --git a/view/theme/diabook/diabook-blue/icons/notes.png b/view/theme/diabook/diabook-blue/icons/notes.png
new file mode 100644
index 000000000..28dca30a3
--- /dev/null
+++ b/view/theme/diabook/diabook-blue/icons/notes.png
diff --git a/view/theme/diabook-blue/icons/notifications.png b/view/theme/diabook/diabook-blue/icons/notifications.png
index c23673dbd..c23673dbd 100755..100644
--- a/view/theme/diabook-blue/icons/notifications.png
+++ b/view/theme/diabook/diabook-blue/icons/notifications.png
diff --git a/view/theme/diabook-blue/icons/notify.png b/view/theme/diabook/diabook-blue/icons/notify.png
index 8a7bdc38f..8a7bdc38f 100755..100644
--- a/view/theme/diabook-blue/icons/notify.png
+++ b/view/theme/diabook/diabook-blue/icons/notify.png
diff --git a/view/theme/diabook-blue/icons/notify2.png b/view/theme/diabook/diabook-blue/icons/notify2.png
index 407e2dbb4..407e2dbb4 100644
--- a/view/theme/diabook-blue/icons/notify2.png
+++ b/view/theme/diabook/diabook-blue/icons/notify2.png
diff --git a/view/theme/diabook-blue/icons/pencil.png b/view/theme/diabook/diabook-blue/icons/pencil.png
index 772e49b17..772e49b17 100755..100644
--- a/view/theme/diabook-blue/icons/pencil.png
+++ b/view/theme/diabook/diabook-blue/icons/pencil.png
diff --git a/view/theme/diabook-blue/icons/pencil2.png b/view/theme/diabook/diabook-blue/icons/pencil2.png
index 3b47d1864..3b47d1864 100644
--- a/view/theme/diabook-blue/icons/pencil2.png
+++ b/view/theme/diabook/diabook-blue/icons/pencil2.png
diff --git a/view/theme/diabook-blue/icons/posterous.png b/view/theme/diabook/diabook-blue/icons/posterous.png
index c8e86078e..c8e86078e 100644
--- a/view/theme/diabook-blue/icons/posterous.png
+++ b/view/theme/diabook/diabook-blue/icons/posterous.png
diff --git a/view/theme/diabook-blue/icons/prev.png b/view/theme/diabook/diabook-blue/icons/prev.png
index 55c1464ba..55c1464ba 100755..100644
--- a/view/theme/diabook-blue/icons/prev.png
+++ b/view/theme/diabook/diabook-blue/icons/prev.png
diff --git a/view/theme/diabook/diabook-blue/icons/pscontacts.png b/view/theme/diabook/diabook-blue/icons/pscontacts.png
new file mode 100644
index 000000000..23a78bcac
--- /dev/null
+++ b/view/theme/diabook/diabook-blue/icons/pscontacts.png
diff --git a/view/theme/diabook/diabook-blue/icons/pubgroups.png b/view/theme/diabook/diabook-blue/icons/pubgroups.png
new file mode 100644
index 000000000..ae04194b1
--- /dev/null
+++ b/view/theme/diabook/diabook-blue/icons/pubgroups.png
diff --git a/view/theme/diabook/diabook-blue/icons/quote.png b/view/theme/diabook/diabook-blue/icons/quote.png
new file mode 100644
index 000000000..a464f2859
--- /dev/null
+++ b/view/theme/diabook/diabook-blue/icons/quote.png
diff --git a/view/theme/diabook-blue/icons/recycle.png b/view/theme/diabook/diabook-blue/icons/recycle.png
index c3b8d2bf4..c3b8d2bf4 100755..100644
--- a/view/theme/diabook-blue/icons/recycle.png
+++ b/view/theme/diabook/diabook-blue/icons/recycle.png
diff --git a/view/theme/diabook-blue/icons/remote.png b/view/theme/diabook/diabook-blue/icons/remote.png
index a560cc55e..a560cc55e 100755..100644
--- a/view/theme/diabook-blue/icons/remote.png
+++ b/view/theme/diabook/diabook-blue/icons/remote.png
diff --git a/view/theme/diabook-blue/icons/scroll_top.png b/view/theme/diabook/diabook-blue/icons/scroll_top.png
index 0e7f7ae6a..0e7f7ae6a 100755..100644
--- a/view/theme/diabook-blue/icons/scroll_top.png
+++ b/view/theme/diabook/diabook-blue/icons/scroll_top.png
diff --git a/view/theme/diabook/diabook-blue/icons/selected.png b/view/theme/diabook/diabook-blue/icons/selected.png
new file mode 100644
index 000000000..3fcb95c29
--- /dev/null
+++ b/view/theme/diabook/diabook-blue/icons/selected.png
diff --git a/view/theme/diabook-blue/icons/srch_bg.gif b/view/theme/diabook/diabook-blue/icons/srch_bg.gif
index 6a523ba8f..6a523ba8f 100644
--- a/view/theme/diabook-blue/icons/srch_bg.gif
+++ b/view/theme/diabook/diabook-blue/icons/srch_bg.gif
diff --git a/view/theme/diabook-blue/icons/srch_l.gif b/view/theme/diabook/diabook-blue/icons/srch_l.gif
index 6d95bf35d..6d95bf35d 100644
--- a/view/theme/diabook-blue/icons/srch_l.gif
+++ b/view/theme/diabook/diabook-blue/icons/srch_l.gif
diff --git a/view/theme/diabook-blue/icons/srch_r.gif b/view/theme/diabook/diabook-blue/icons/srch_r.gif
index 89833a316..89833a316 100644
--- a/view/theme/diabook-blue/icons/srch_r.gif
+++ b/view/theme/diabook/diabook-blue/icons/srch_r.gif
diff --git a/view/theme/diabook-blue/icons/srch_r_f2.gif b/view/theme/diabook/diabook-blue/icons/srch_r_f2.gif
index 6df457bed..6df457bed 100644
--- a/view/theme/diabook-blue/icons/srch_r_f2.gif
+++ b/view/theme/diabook/diabook-blue/icons/srch_r_f2.gif
diff --git a/view/theme/diabook-blue/icons/star.png b/view/theme/diabook/diabook-blue/icons/star.png
index 0b00cb189..0b00cb189 100755..100644
--- a/view/theme/diabook-blue/icons/star.png
+++ b/view/theme/diabook/diabook-blue/icons/star.png
diff --git a/view/theme/diabook-blue/icons/star_dummy.png b/view/theme/diabook/diabook-blue/icons/star_dummy.png
index ce11f30d4..ce11f30d4 100644
--- a/view/theme/diabook-blue/icons/star_dummy.png
+++ b/view/theme/diabook/diabook-blue/icons/star_dummy.png
diff --git a/view/theme/diabook-blue/icons/starred.png b/view/theme/diabook/diabook-blue/icons/starred.png
index 2b82dfca3..2b82dfca3 100755..100644
--- a/view/theme/diabook-blue/icons/starred.png
+++ b/view/theme/diabook/diabook-blue/icons/starred.png
diff --git a/view/theme/diabook-blue/icons/tagged.png b/view/theme/diabook/diabook-blue/icons/tagged.png
index 144649ef8..144649ef8 100755..100644
--- a/view/theme/diabook-blue/icons/tagged.png
+++ b/view/theme/diabook/diabook-blue/icons/tagged.png
diff --git a/view/theme/diabook-blue/icons/toogle_off.png b/view/theme/diabook/diabook-blue/icons/toogle_off.png
index 0fcce4d5a..0fcce4d5a 100644
--- a/view/theme/diabook-blue/icons/toogle_off.png
+++ b/view/theme/diabook/diabook-blue/icons/toogle_off.png
diff --git a/view/theme/diabook-blue/icons/toogle_on.png b/view/theme/diabook/diabook-blue/icons/toogle_on.png
index 79ce07f0e..79ce07f0e 100644
--- a/view/theme/diabook-blue/icons/toogle_on.png
+++ b/view/theme/diabook/diabook-blue/icons/toogle_on.png
diff --git a/view/theme/diabook-blue/icons/tumblr.png b/view/theme/diabook/diabook-blue/icons/tumblr.png
index 1dc7fa072..1dc7fa072 100644
--- a/view/theme/diabook-blue/icons/tumblr.png
+++ b/view/theme/diabook/diabook-blue/icons/tumblr.png
diff --git a/view/theme/diabook-blue/icons/twitter.png b/view/theme/diabook/diabook-blue/icons/twitter.png
index b7a687b9f..b7a687b9f 100644
--- a/view/theme/diabook-blue/icons/twitter.png
+++ b/view/theme/diabook/diabook-blue/icons/twitter.png
diff --git a/view/theme/diabook/diabook-blue/icons/underline.png b/view/theme/diabook/diabook-blue/icons/underline.png
new file mode 100644
index 000000000..b1b4d3574
--- /dev/null
+++ b/view/theme/diabook/diabook-blue/icons/underline.png
diff --git a/view/theme/diabook-blue/icons/unlock.png b/view/theme/diabook/diabook-blue/icons/unlock.png
index a0cda0ae5..a0cda0ae5 100755..100644
--- a/view/theme/diabook-blue/icons/unlock.png
+++ b/view/theme/diabook/diabook-blue/icons/unlock.png
diff --git a/view/theme/diabook/diabook-blue/icons/unselected.png b/view/theme/diabook/diabook-blue/icons/unselected.png
new file mode 100644
index 000000000..9e9cead4b
--- /dev/null
+++ b/view/theme/diabook/diabook-blue/icons/unselected.png
diff --git a/view/theme/diabook-blue/icons/unstarred.png b/view/theme/diabook/diabook-blue/icons/unstarred.png
index ba3183f5c..ba3183f5c 100755..100644
--- a/view/theme/diabook-blue/icons/unstarred.png
+++ b/view/theme/diabook/diabook-blue/icons/unstarred.png
diff --git a/view/theme/diabook-blue/icons/video.png b/view/theme/diabook/diabook-blue/icons/video.png
index a03d1d818..a03d1d818 100755..100644
--- a/view/theme/diabook-blue/icons/video.png
+++ b/view/theme/diabook/diabook-blue/icons/video.png
diff --git a/view/theme/diabook-blue/icons/weblink.png b/view/theme/diabook/diabook-blue/icons/weblink.png
index 216e78344..216e78344 100755..100644
--- a/view/theme/diabook-blue/icons/weblink.png
+++ b/view/theme/diabook/diabook-blue/icons/weblink.png
diff --git a/view/theme/diabook-blue/icons/wordpress.png b/view/theme/diabook/diabook-blue/icons/wordpress.png
index f564c4300..f564c4300 100644
--- a/view/theme/diabook-blue/icons/wordpress.png
+++ b/view/theme/diabook/diabook-blue/icons/wordpress.png
diff --git a/view/theme/diabook/diabook-blue/style-network-wide.css b/view/theme/diabook/diabook-blue/style-network-wide.css
new file mode 100644
index 000000000..eb1cee255
--- /dev/null
+++ b/view/theme/diabook/diabook-blue/style-network-wide.css
@@ -0,0 +1,2629 @@
+/**
+ * Fabio Comuni <http://kirgroup.com/profile/fabrixxm>
+ * Additional Changes: Michael Vogel <icarus@dabo.de>
+ **/
+
+/* ========= */
+/* = Admin = */
+/* ========= */
+
+#adminpage {
+/*        width: 80%;*/
+}
+
+#pending-update {
+        float:right;
+        color: #ffffff;
+        font-weight: bold;
+        background-color: #FF0000;
+        padding: 0em 0.3em;
+}
+
+.admin.linklist {
+        border: 0px; padding: 0px;
+}
+
+.admin.link {
+        list-style-position: inside;
+        font-size: 1em;
+        padding: 5px;
+        width: 100px;
+        margin: 5px;
+}
+
+#adminpage dl {
+        clear: left;
+        margin-bottom: 2px;
+        padding-bottom: 2px;
+        border-bottom: 1px solid black;
+}
+
+#adminpage dt {
+        width: 200px;
+        float: left;
+        font-weight: bold;
+}
+
+#adminpage dd {
+        margin-left: 200px;
+}
+#adminpage h3 {
+        border-bottom: 1px solid #898989;
+        margin-bottom: 5px;
+        margin-top: 10px;
+}
+
+#adminpage .submit {
+        clear:left;
+}
+
+#adminpage #pluginslist {
+        margin: 0px; padding: 0px;
+}
+
+#adminpage .plugin {
+        list-style: none;
+        display: block;
+	/* border: 1px solid #888888; */
+        padding: 1em;
+        margin-bottom: 5px;
+        clear: left;
+}
+
+#adminpage .toggleplugin {
+        float:left;
+        margin-right: 1em;
+}
+
+#adminpage table {width:100%; border-bottom: 1p solid #000000; margin: 5px 0px;}
+#adminpage table th { text-align: left;}
+#adminpage td .icon { float: left;}
+#adminpage table#users img { width: 16px; height: 16px; }
+#adminpage table tr:hover { background-color: #eeeeee; }
+#adminpage .selectall { text-align: right; }
+/* icons */
+
+.icon.contacts {
+  background-image: url("../diabook-blue/icons/contacts.png");}
+.icon.notifications {
+  background-image: url("../diabook-blue/icons/notifications.png");}
+.icon.notify {
+  background-image: url("../diabook-blue/icons/notify.png");}
+.icon.messages {
+  background-image: url("../diabook-blue/icons/messages.png");}
+.icon.community {
+  background-image: url("../diabook-blue/icons/community.png");}
+  
+.icon.drop 	{ background-image: url("../diabook-blue/icons/drop.png");}
+.icon.drophide 	{ background-image: url("../diabook-blue/icons/drop.png");}
+.icon.dislike 	{ background-image: url("../diabook-blue/icons/dislike.png");}
+.icon.like 	{ background-image: url("../diabook-blue/icons/like.png");}
+.icon.pencil 	{ background-image: url("../diabook-blue/icons/pencil.png");}
+.icon.recycle 	{ background-image: url("../diabook-blue/icons/recycle.png");}
+.icon.remote-link { background-image: url("../diabook-blue/icons/remote.png");}
+.icon.tagged    { background-image: url("../diabook-blue/icons/tagged.png");}
+.icon.file-as { background-image: url("../diabook-blue/icons/file_as.png");}
+.star-item.icon.unstarred { background-image: url("../diabook-blue/icons/unstarred.png");}
+.star-item.icon.starred { background-image: url("../diabook-blue/icons/starred.png");}
+.icon.link		{ background-image: url("../diabook-blue/icons/link.png");}
+.icon.lock		{ background-image: url("../diabook-blue/icons/lock.png");}
+.icon.unlock		{ background-image: url("../diabook-blue/icons/unlock.png");}
+.icon.language    { background-image: url("../diabook-blue/icons/language.png");}
+
+
+.camera 	{ background-image: url("../diabook-blue/icons/camera.png"); 
+			  display: block; width: 28px; height: 28px; background-repeat: no-repeat;
+			  }
+.attach 	{ background-image: url("../diabook-blue/icons/attach.png"); 
+			  display: block; width: 28px; height: 28px; background-repeat: no-repeat;
+			  }
+.video2 	{ background-image: url("../diabook-blue/icons/video.png"); 
+			  display: block; width: 28px; height: 28px; background-repeat: no-repeat;
+			  }	
+.video 	{ background-image: url("../diabook-blue/icons/video.png"); 
+			  display: block; width: 100%; height: 140px; background-repeat: no-repeat;
+			  }
+.audio2 	{ background-image: url("../diabook-blue/icons/audio.png"); 
+			  display: block; width: 28px; height: 28px; background-repeat: no-repeat;
+			  }
+.audio 	{ background-image: url("../diabook-blue/icons/audio.png"); 
+			  display: block; width: 28px; height: 28px; background-repeat: no-repeat;
+			  }
+.weblink 	{ background-image: url("../diabook-blue/icons/weblink.png"); 
+			  display: block; width: 28px; height: 28px; background-repeat: no-repeat;
+			  }
+.globe 	{ background-image: url("../diabook-blue/icons/globe.png"); 
+			  display: block; width: 28px; height: 28px; background-repeat: no-repeat;
+			  }
+.unglobe 	{ background-image: url("../diabook-blue/icons/unglobe.png"); 
+			  display: block; width: 28px; height: 28px; background-repeat: no-repeat;
+			  }
+.edit    {background-image: url("../diabook-blue/icons/pencil2.png"); 
+			  display: block; width: 28px; height: 28px; background-repeat: no-repeat;}
+			  
+			  
+
+
+.article	{ background-position: -50px  0px;}
+/*.audio 		{ background-position: -70px  0px;}*/
+.block 		{ background-position: -90px  0px;}
+/*.drop 		{ background-position: -110px 0px;}*/
+/*.drophide 	{ background-position: -130px 0px;}*/
+/*.edit 		{ background-position: -150px 0px;}*/
+/*.camera 	{ background-position: -170px 0px;}*/
+/*.dislike 	{ background-position: -190px 0px;}*/
+/*.like 		{ background-position: -210px 0px;}*/
+/*.link 		{ background-position: -230px 0px;}*/
+
+/*.globe 		{ background-position: -50px  -20px;}*/
+/*.noglobe 	{ background-position: -70px  -20px;}*/
+.no 		{ background-position: -90px  -20px;}
+.pause 		{ background-position: -110px -20px;}
+.play 		{ background-position: -130px -20px;}
+/*.pencil 	{ background-position: -150px -20px;}*/
+.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;}*/
+
+/*.video          { background-position: -110px -40px;}*/
+.youtube        { background-position: -130px -40px;}
+
+/*.attach         { background-position: -190px -40px;}*/
+/*.language       { background-position: -210px -40px;}*/
+
+
+.icon.on             { background-image: url("../diabook-blue/icons/toogle_on.png"); background-repeat: no-repeat;}
+.icon.off            { background-image: url("../diabook-blue/icons/toogle_off.png"); background-repeat: no-repeat;}
+.prev           { background-position: -90px  -60px;}
+.next           { background-position: -110px -60px;}
+/*.tagged     { background-position: -130px -60px;}*/
+
+.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 0px; }
+.type-audio { background-position: -40px 0px; }
+.type-text  { background-position: -60px 0px; }
+.type-unkn  { background-position: -80px 0px; }
+
+.icon.drop, .icon.drophide {
+ float: left;
+}
+
+.icon {
+  display: block;
+  width: 20px;
+  height: 20px;
+  /*background-image: url('icons.png');*/
+}
+
+.icon {
+  background-color: transparent ;
+  background-repeat: no-repeat;
+  /* background-position: left center; */
+  display: block;
+  overflow: hidden;
+  text-indent: -9999px;
+  padding: 1px;
+}
+
+.icon.border.camera{
+  background-image: url("../diabook-blue/icons/camera.png"); 
+  display: block; width: 28px; height: 28px; background-repeat: no-repeat;
+	}
+	
+.icon.border.link{
+  background-image: url("../diabook-blue/icons/weblink.png"); 
+  display: block; width: 28px; height: 28px; background-repeat: no-repeat;
+  margin-left: 10px;
+	}
+
+.icon.text {
+  text-indent: 0px;
+}
+.icon.s10 {
+  min-width: 10px;
+  height: 10px;
+}
+.icon.s10.notify {
+  background-image: url("../../../../images/icons/10/notify_off.png");
+}
+.icon.s10.gear {
+  background-image: url("../../../../images/icons/10/gear.png");
+}
+.icon.s10.add {
+  background-image: url("../../../../images/icons/10/add.png");
+}
+.icon.s10.delete {
+  background-image: url("../../../../images/icons/10/delete.png");
+}
+.icon.s10.edit {
+  background-image: url("../../../../images/icons/10/edit.png");
+}
+.icon.s10.star {
+  background-image: url("../../../../images/star_dummy.png");
+}
+.icon.s10.menu {
+  background-image: url("../../../../images/icons/10/menu.png");
+}
+.icon.s10.link {
+  background-image: url("../../../../images/icons/10/link.png");
+}
+.icon.s10.lock {
+  background-image: url("../../../../images/icons/10/lock.png");
+}
+.icon.s10.unlock {
+  background-image: url("../../../../images/icons/10/unlock.png");
+}
+.icon.s10.text {
+  padding: 2px 0px 0px 15px;
+  font-size: 10px;
+}
+.icon.s16 {
+  min-width: 16px;
+  height: 16px;
+}
+.icon.s16.notify {
+  background-image: url("../../../../images/icons/16/notify_off.png");
+}
+.icon.s16.gear {
+  background-image: url("../../../../images/icons/16/gear.png");
+}
+.icon.s16.add {
+  background-image: url("../../../../images/icons/16/add.png");
+}
+.icon.s16.delete {
+  background-image: url("../../../../images/icons/16/delete.png");
+}
+/*.icon.s16.edit {
+  background-image: url("../../../../images/icons/16/edit.png");
+}*/
+.icon.s16.star {
+  background-image: url("../../../../images/star_dummy.png");
+}
+.icon.s16.menu {
+  background-image: url("../../../../images/icons/16/menu.png");
+}
+/*.icon.s16.link {
+  background-image: url("../../../../images/icons/16/link.png");
+}*/
+.icon.s16.lock {
+  background-image: url("../../../../images/icons/16/lock.png");
+}
+.icon.s16.unlock {
+  background-image: url("../../../../images/icons/16/unlock.png");
+}
+.icon.s16.text {
+  padding: 4px 0px 0px 20px;
+  font-size: 10px;
+}
+.icon.s22 {
+  min-width: 22px;
+  height: 22px;
+}
+.icon.s22.notify {
+  background-image: url("../../../../images/icons/22/notify_off.png");
+}
+.icon.s22.gear {
+  background-image: url("../../../../images/icons/22/gear.png");
+}
+.icon.s22.add {
+  background-image: url("../../../../images/icons/22/add.png");
+}
+.icon.s22.delete {
+  background-image: url("../../../../images/icons/22/delete.png");
+}
+.icon.s22.edit {
+  background-image: url("../../../../images/icons/22/edit.png");
+}
+.icon.s22.star {
+  background-image: url("../../../../images/star_dummy.png");
+}
+.icon.s22.menu {
+  background-image: url("../../../../images/icons/22/menu.png");
+}
+.icon.s22.link {
+  background-image: url("../../../../images/icons/22/link.png");
+}
+.icon.s22.lock {
+  background-image: url("../../../../images/icons/22/lock.png");
+}
+.icon.s22.unlock {
+  background-image: url("../../../../images/icons/22/unlock.png");
+}
+.icon.s22.text {
+  padding: 10px 0px 0px 25px;
+  width: 200px;
+}
+.icon.s48 {
+  width: 48px;
+  height: 48px;
+}
+.icon.s48.notify {
+  background-image: url("../../../../images/icons/48/notify_off.png");
+}
+.icon.s48.gear {
+  background-image: url("../../../../images/icons/48/gear.png");
+}
+.icon.s48.add {
+  background-image: url("../../../../images/icons/48/add.png");
+}
+.icon.s48.delete {
+  background-image: url("../../../../images/icons/48/delete.png");
+}
+.icon.s48.edit {
+  background-image: url("../../../../images/icons/48/edit.png");
+}
+.icon.s48.star {
+  background-image: url("../../../../images/star_dummy.png");
+}
+.icon.s48.menu {
+  background-image: url("../../../../images/icons/48/menu.png");
+}
+.icon.s48.link {
+  background-image: url("../../../../images/icons/48/link.png");
+}
+.icon.s48.lock {
+  background-image: url("../../../../images/icons/48/lock.png");
+}
+.icon.s48.unlock {
+  background-image: url("../../../../images/icons/48/unlock.png");
+}
+
+#contact-edit-links ul {
+  list-style: none;
+  list-style-type: none;
+}
+
+.hide-comments-outer {
+  margin-left: 80px;
+  margin-bottom: 1px;
+  width: 675px;
+  border-bottom: 1px solid #BDCDD4;
+  background-color: #fff;
+  padding: 8px;
+}
+
+/* global */
+body {
+  font-family: 'Lato', "Helvetica Neue", Helvetica, Arial, sans-serif;
+  font-size: 13px;
+  background-color: #ffffff;
+  color: #2d2d2d;
+  margin: 50px auto auto;
+  display: table;
+}
+
+h4 {
+  font-size: 1.1em;
+}
+
+a {
+	color: #333333;
+	/* color: #3e3e8c; */
+	text-decoration: none;
+}
+a:hover {
+	/* color: blue; */
+	text-decoration: underline
+}
+
+.wall-item-name-link {
+/*  float: left;*/
+}
+
+.wall-item-photo {
+  width: 48px;
+  height: 48px;
+  overflow: hidden;
+  display: block;
+}
+
+.left {
+  float: left;
+}
+.right {
+  float: right;
+}
+.hidden {
+  display: none;
+}
+.clear {
+  clear: both;
+}
+.fakelink {
+  color: #1872A2;
+  /* color: #3e3e8c; */
+  text-decoration: none;
+  cursor: pointer;
+}
+.fakelink:hover {
+  /* color: blue; */
+  /*color: #005c94; */
+  text-decoration: underline;
+}
+code {
+  font-family: Courier, monospace;
+  white-space: pre;
+  display: block;
+  overflow: auto;
+  border: 1px solid #444;
+  background: #EEE;
+  color: #444;
+  padding: 10px;
+  margin-top: 20px;
+}
+#panel {
+  position: absolute;
+  width: 12em;
+  background: #ffffff;
+  color: #2d2d2d;
+  margin: 0px;
+  padding: 1em;
+  list-style: none;
+  border: 3px solid #364e59;
+  z-index: 100000;
+  -webkit-box-shadow: 0px 5px 10px rgba(0, 0, 0, 0.7);
+  -moz-box-shadow: 0px 5px 10px rgba(0, 0, 0, 0.7);
+  box-shadow: 0px 5px 10px rgba(0, 0, 0, 0.7);
+}
+/* tool */
+.tool {
+  height: auto;
+  overflow: auto;
+  padding: 3px;
+}
+#saved-search-ul .tool:hover,
+#nets-sidebar .tool:hover,
+#sidebar-group-list .tool:hover,
+#fileas-sidebar .tool:hover {
+	background: #308DBF;
+}
+.tool .label {
+  float: left;
+}
+.tool .action {
+  float: right;
+}
+.tool a {
+  color: ##3F8FBA;
+}
+.tool a:hover {
+  text-decoration: none;
+}
+/* popup notifications */
+div.jGrowl div.notice {
+  background: #511919 url("../../../../images/icons/48/notice.png") no-repeat 5px center;
+  color: #ffffff;
+  padding-left: 58px;
+}
+div.jGrowl div.info {
+  background: #364e59 url("../../../../images/icons/48/info.png") no-repeat 5px center;
+  color: #ffffff;
+  padding-left: 58px;
+}
+/* header */
+header {
+  position: fixed;
+  left: 0%;
+  right: 80%;
+  top: 0px;
+  margin: 0px;
+  padding: 0px;
+  width: 22%;
+  height: 32px;
+  background: #1872a2;
+  background-color: #1872a2;
+  z-index: 100;
+  border-bottom: 1px;
+  border-bottom-color: black;
+  border-bottom-style: inset;
+}
+header #site-location {
+  display: none;
+}
+header #banner {
+  overflow: hidden;
+  text-align: left;
+  width: 82%%;
+  margin-left: 25%;
+}
+header #banner a,
+header #banner a:active,
+header #banner a:visited,
+header #banner a:link,
+header #banner a:hover {
+  color: #ffffff;
+  text-decoration: none;
+  outline: none;
+  vertical-align: middle;
+ font-weight: bolder;
+  margin-left: 3px;
+}
+header #banner #logo-img {
+  height: 25px;
+  margin-top: 3px;
+}
+header #banner #logo-text {
+  font-size: 20px;
+  position: absolute;
+  top: 10%;
+}
+/* nav */
+nav {
+  width: 80%;
+  height: 32px;
+  position: fixed;
+  left: 22%;
+  top: 0px;
+  padding: 0px;
+  background: #1872a2;
+  color: #ffffff;
+  z-index: 99;
+  border-bottom: 1px;
+  border-bottom-color: black;
+  border-bottom-style: inset;
+}
+nav a,
+nav a:active,
+nav a:visited,
+nav a:link,
+nav a:hover {
+  color: #ffffff;
+  text-decoration: none;
+  outline: none;
+}
+nav #banner {
+  overflow: hidden;
+  /*text-align: center;*/
+  width: 100%;
+}
+nav #banner a,
+nav #banner a:active,
+nav #banner a:visited,
+nav #banner a:link,
+nav #banner a:hover {
+  color: #ffffff;
+  text-decoration: none;
+  outline: none;
+  vertical-align: bottom;
+}
+nav #banner #logo-img {
+  height: 22px;
+  margin-top: 5px;
+}
+nav #banner #logo-text {
+  font-size: 22px;
+}
+nav #navbar{
+	}
+nav ul {
+  margin: 0px;
+  padding: 0px 20px;
+}
+nav ul li {
+  list-style: none;
+  margin: 0px;
+  /* padding: 1px 1px 3px 1px; */
+  float: left;
+}
+nav ul li .menu-popup {
+  left: 0px;
+  right: auto;
+}
+
+nav #logo-img {
+  height: 25px;
+  margin-top: 4px;
+  margin-left: 30px;
+}
+
+nav #logo-text {
+    font-size: 22px;
+    margin-top: 3px;
+    margin-right: 15px;
+}
+nav .nav-menu-search {
+  position: relative;
+
+  margin: 4px 17px;
+  margin-right: 0px;
+  height: 17px;
+  width: 180px;
+  
+}
+
+nav #search-box #search-text {
+  background-image:  url('icons/lupe.png');
+  background-repeat:no-repeat;
+  padding-left:20px;
+  border-top-left-radius: 15px;
+border-top-right-radius: 15px;
+border-bottom-right-radius: 15px;
+border-bottom-left-radius: 15px;
+	}
+
+
+nav .nav-menu-icon {
+  position: relative;
+  height: 22px;
+  padding: 5px;
+  margin: 0px 5px;
+  -moz-border-radius: 5px 5px 0 0;
+  -webkit-border-radius: 5px 5px 0 0;
+  border-radius: 5px 5px 0 0;
+}
+nav .nav-menu-icon:hover {
+  background-color: #308dbf;  
+  position: relative;
+  height: 22px;
+  padding: 5px;
+  margin: 0px 5px;
+  -moz-border-radius: 5px 5px 0 0;
+  -webkit-border-radius: 5px 5px 0 0;
+  border-radius: 5px 5px 0 0;
+}
+
+nav .nav-menu-icon.selected {
+  background-color: #fff;
+}
+nav .nav-menu-icon img {
+  width: 22px;
+  height: 22px;
+}
+nav .nav-menu-icon .nav-notify {
+  top: 3px;
+}
+/*marker*/
+nav .nav-menu {
+  position: relative;
+  height: 16px;
+  padding: 5px;
+  margin: 3px 15px 0px;
+  font-size: 15px;
+  /*border-bottom: 3px solid #364A84;*/
+}
+nav .nav-menu.selected {
+  /*border-bottom: 3px solid #9eabb0;*/
+}
+nav .nav-notify {
+  display: none;
+  position: absolute;
+  background-color: #ff0000;
+  /* background-color: #19aeff; */
+  -moz-border-radius: 5px 5px 5px 5px;
+  -webkit-border-radius: 5px 5px 5px 5px;
+  border-radius: 5px 5px 5px 5px;
+  font-size: 10px;
+  font-weight: 900;
+  padding: 1px 4px;
+  top: 0px;
+  right: -6px;
+  min-width: 10px;
+  text-align: center;
+}
+nav .nav-notify.show {
+  display: block;
+}
+nav #nav-help-link,
+nav #nav-search-link,
+nav #nav-directory-link,
+nav #nav-apps-link,
+nav #nav-site-linkmenu, 
+nav #nav-home-link,
+nav #nav-user-linkmenu
+{
+  float: right;
+}
+nav #nav-user-linkmenu{
+	margin-right: 0px;
+	}
+nav #nav-home-link, #nav-directory-link, #nav-apps-link{
+	margin-left: 0px;
+	margin-right: 0px;
+	font-weight: bold;
+	margin: 3px 5px;
+	}
+nav #nav-directory-link{
+  margin-right: 0px;	
+	}
+nav #nav-home-link{
+  margin-left: 0px;	
+	}
+nav #nav-help-link .menu-popup,
+nav #nav-search-link .menu-popup,
+nav #nav-directory-link .menu-popup,
+nav #nav-apps-link .menu-popup,
+nav #nav-site-linkmenu .menu-popup {
+  right: 0px;
+  left: auto;
+}
+
+nav #nav-messages-linkmenu.on .icon.messages, nav #nav-messages-linkmenu.selected .icon.messages{
+	background-image: url("../diabook-blue/icons/messages2.png");
+	}
+	
+/*nav #nav-notifications-linkmenu.on .icon.notify,*/ nav #nav-notifications-linkmenu.selected .icon.notify{
+	background-image: url("../diabook-blue/icons/notify2.png");
+	}
+	
+nav #nav-contacts-linkmenu.on .icon.contacts, nav #nav-contacts-linkmenu.selected .icon.contacts{
+	background-image: url("../diabook-blue/icons/contacts2.png");
+	}
+	
+nav #nav-apps-link.selected {
+  background-color: #364e59;
+}
+
+#nav-notifications-mark-all {
+	/* padding: 1px 1px 2px 26px; */
+	/* border-bottom: 1px solid #364E59; */
+	/* margin: 0px 0px 2px 0px;
+	padding: 5px 10px; */
+}
+
+#nav-notifications-see-all {
+	/* padding: 1px 1px 2px 26px; */
+	/* border-bottom: 1px solid #364E59; */
+	/* margin: 0px 0px 2px 0px;
+	padding: 5px 10px; */
+}
+
+.notify-seen {
+	background: none repeat scroll 0 0 #DDDDDD;
+	}
+
+ul.menu-popup {
+  position: absolute;
+  display: none;
+  width: 11em;
+  background: #ffffff;
+  color: #2d2d2d;
+  margin: 0px;
+  padding: 0px;
+  list-style: none;
+  z-index: 100000;
+  -webkit-box-shadow: 0px 5px 10px rgba(0, 0, 0, 0.7);
+  -moz-box-shadow: 0px 5px 10px rgba(0, 0, 0, 0.7);
+  box-shadow: 0px 5px 10px rgba(0, 0, 0, 0.7);
+}
+ul.menu-popup a {
+  display: block;
+  color: #2d2d2d;
+  padding: 5px 10px;
+  text-decoration: none;
+}
+ul.menu-popup a:hover {
+  background-color: #308DBF; /*bdcdd4;*/
+  color: #fff;
+}
+ul.menu-popup .menu-sep {
+  border-top: 1px solid #9eabb0;
+}
+ul.menu-popup li {
+  float: none;
+  overflow: auto;
+  height: auto;
+  display: block;
+}
+ul.menu-popup li img {
+  float: left;
+  width: 16px;
+  height: 16px;
+  padding-right: 5px;
+}
+ul.menu-popup .empty {
+  padding: 5px;
+  text-align: center;
+  color: #9eabb0;
+}
+/* autocomplete popup */
+.acpopup {
+  max-height: 150px;
+  background-color: #ffffff;
+  color: #2d2d2d;
+  border: 1px solid #MenuBorder;
+  overflow: auto;
+  z-index: 100000;
+  -webkit-box-shadow: 0px 5px 10px rgba(0, 0, 0, 0.7);
+  -moz-box-shadow: 0px 5px 10px rgba(0, 0, 0, 0.7);
+  box-shadow: 0px 5px 10px rgba(0, 0, 0, 0.7);
+}
+.acpopupitem {
+  color: #2d2d2d;
+  padding: 4px;
+  clear: left;
+}
+.acpopupitem img {
+  float: left;
+  margin-right: 4px;
+}
+.acpopupitem.selected {
+  background-color: #bdcdd4;
+}
+#nav-notifications-menu {
+  width: 400px;
+  max-height: 550px;
+  overflow: auto;
+}
+/* #nav-notifications-menu a {
+	display: inline;
+	padding: 5px 0px;
+	margin: 0px 0px 2px 0px;
+}
+#nav-notifications-menu li:hover {
+  background-color: #bdcdd4;
+}*/
+
+#nav-notifications-menu img {
+  float: left;
+  margin-right: 5px;
+}
+#nav-notifications-menu .contactname {
+  font-weight: bold;
+}
+#nav-notifications-menu .notif-when {
+  font-size: 10px;
+  color: #9eabb0;
+  display: block;
+}
+
+.notif-image {
+        width: 32px;
+        height: 32px;
+        padding: 7px 7px 0px 0px;
+}
+
+/*profile_side*/
+#profile_side {
+  margin-bottom: 30px;
+}
+#ps-usericon{
+	height: 25px	
+	}
+#ps-username{
+  font-size: 1.17em;
+  font-weight: bold;
+  vertical-align: top;
+  position: absolute;
+  padding-top: 4px;
+  padding-left: 5px;	
+  word-wrap: break-word;
+  width: 130px;
+	}
+#ps-username:hover{
+  text-decoration: none;	
+	}
+.menu-profile-side{
+  list-style: none;	
+  padding-left: 0px;
+  min-height: 0px;
+	}
+.menu-profile-list{
+  height: auto;
+  overflow: auto;
+  min-height: 16px;
+  list-style: none;
+	}
+.menu-profile-list:hover{
+	background: #308DBF;
+	}
+.menu-profile-list-item{
+	padding-left: 5px;
+	vertical-align: middle;
+	}	
+.menu-profile-list-item:hover{	
+	text-decoration: none;
+	
+   }
+/*http://prothemedesign.com/circular-icons/*/
+.menu-profile-icon.home{
+	background: url("../diabook-blue/icons/home.png") no-repeat;
+	float: left;
+	height: 22px;
+   width: 22px;
+	}
+.menu-profile-icon.photos{
+	background: url("../diabook-blue/icons/mess_side.png") no-repeat;
+	float: left;
+	height: 22px;
+   width: 22px;}
+.menu-profile-icon.events{
+	background: url("../diabook-blue/icons/events.png") no-repeat;
+	float: left;
+	height: 22px;
+   width: 22px;}
+.menu-profile-icon.notes{
+	background: url("../diabook-blue/icons/notes.png") no-repeat;
+	float: left;
+	height: 22px;
+   width: 22px;}
+.menu-profile-icon.foren{
+	background: url("../diabook-blue/icons/pubgroups.png") no-repeat;
+	float: left;
+	height: 22px;
+   width: 22px;}
+.menu-profile-icon.com_side{
+	background: url("../diabook-blue/icons/com_side.png") no-repeat;
+	float: left;
+	height: 22px;
+   width: 22px;}
+.menu-profile-icon.pscontacts{
+	background: url("../diabook-blue/icons/pscontacts.png") no-repeat;
+	float: left;
+	height: 22px;
+   width: 22px;}
+/* aside */
+/*marker*/
+aside {
+  display: table-cell;
+  vertical-align: top;
+  width: 180px;
+  padding: 0px 5px 0px 0px;
+  border-right: 1px solid #D2D2D2;
+  float: left;
+  /* background: #F1F1F1; */
+}
+aside #page-sidebar{display: none;}
+aside .vcard .fn {
+  font-size: 18px;
+  font-weight: bold;
+  margin-bottom: 5px;
+}
+aside .vcard .title {
+  margin-bottom: 5px;
+}
+aside .vcard dl {
+  height: auto;
+  overflow: auto;
+}
+aside .vcard dt {
+  float: left;
+  margin-left: 0px;
+  /*width: 35%;*/
+  text-align: right;
+  color: #999999;
+}
+aside .vcard dd {
+  float: left;
+  margin-left: 5px;
+  /*width: 60%;*/
+}
+aside #profile-extra-links ul {
+  padding: 0px;
+  margin: 0px;
+}
+aside #profile-extra-links li {
+  padding: 0px;
+  margin: 0px;
+  list-style: none;
+}
+aside #dfrn-request-link {
+  display: block;
+  -moz-border-radius: 5px 5px 5px 5px;
+  -webkit-border-radius: 5px 5px 5px 5px;
+  border-radius: 5px 5px 5px 5px;
+  color: #ffffff;
+  background: #005c94 url('../../../../images/connect-bg.png') no-repeat left center;
+  font-weight: bold;
+  text-transform: uppercase;
+  padding: 4px 2px 2px 35px;
+}
+aside #dfrn-request-link:hover {
+  text-decoration: none;
+  background-color: #36c;
+  /* background-color: #19aeff; */
+}
+aside #profiles-menu {
+  width: 20em;
+}
+aside #search-text {
+	width: 150px;
+		height: 17px;
+		padding-left: 10px;
+	border-top-left-radius: 15px;
+border-top-right-radius: 15px;
+border-bottom-right-radius: 15px;
+border-bottom-left-radius: 15px;
+-moz-border-bottom-colors: #dbdbdb;
+  -moz-border-top-colors: #999;
+  -moz-border-left-colors: #999;
+  -moz-border-right-colors: #dbdbdb;
+}
+aside #side-follow-url {
+	width: 150px;
+	}
+aside #side-peoplefind-url {
+	width: 150px;
+	}
+#contact-block {
+  overflow: auto;
+  height: auto;
+}
+#contact-block .contact-block-h4 {
+  float: left;
+  margin: 5px 0px;
+}
+#contact-block .allcontact-link {
+  float: right;
+  margin: 5px 0px;
+}
+#contact-block .contact-block-content {
+  clear: both;
+  overflow: auto;
+  height: auto;
+}
+#contact-block .contact-block-link {
+  float: left;
+  margin: 0px 2px 2px 0px;
+}
+#contact-block .contact-block-link img {
+  widht: 55px;
+  height: 55px;
+}
+#lost-password-link {
+  float: left;
+  margin-right: 20px;	
+	}
+/* widget */
+.widget {
+  margin-bottom: 2em;
+  /*.action .s10 { width: 10px; overflow: hidden; padding: 0px;}
+	.action .s16 { width: 16px; overflow: hidden; padding: 0px;}*/
+/*  font-size: 12px; */
+}
+/*marker*/
+.widget h3 {
+  padding: 0px;
+  margin: 2px;
+  font-size: 1.05em;
+}
+.widget .action {
+  opacity: 0.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;
+}
+.widget input.action {
+  opacity: 0.5;
+  -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;
+}
+.widget:hover .title .action {
+  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;
+}
+.widget .tool:hover .action {
+  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;
+}
+.widget .tool:hover .action.ticked {
+  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;
+}
+.widget ul {
+  padding: 0px;
+}
+.widget ul li {
+  padding-left: 16px;
+  min-height: 16px;
+  list-style: none;
+}
+#side-bar-photos-albums li{
+list-style-type: disc;
+}
+#side-bar-photos-albums ul li{
+  margin-left: 30px;
+  padding-left: 0px;
+	}
+#side-bar-photos-albums ul li a{
+  color: #1872A2;
+}
+.widget .tool.selected {
+  background: url("../diabook-blue/icons/selected.png") no-repeat left center;
+}
+/* widget: search */
+span.sbox_l  {
+	background: white url('../diabook/icons/srch_l.gif') no-repeat top left;
+	float: left;
+	width: 19px; height: 19px;
+	margin-left: 10px;
+	margin-top: 5px;
+	
+}
+
+span.sbox_r  {
+	background: white url('../diabook/icons/srch_r.gif') no-repeat top left;
+	float: left;
+	width: 19px; height: 19px;
+	margin-top: 5px;
+}
+
+span.sbox input {
+	background: white url('../diabook/icons/srch_bg.gif') repeat-x top left;
+	float: left;
+	margin-top: 5px;
+	border: 0;
+	height: 13px; width: 100px;
+	padding: 3px;
+	font: 11px/13px arial;
+	color: #000;
+}
+#add-search-popup {
+  width: 200px;
+  top: 18px;
+}
+/* section */
+section {
+  display: table-cell;
+  vertical-align: top;
+  width: auto;
+  padding: 0px 0px 0px 12px;
+}
+
+body .pageheader{
+  text-align: center;
+  font-size: 20px;
+  margin-bottom: 20px;
+  margin-top: 0px;
+  max-width: 575px;
+	}
+.qcomment{
+  max-width: 122px;	
+	}
+#id_username {
+  width: 173px;	
+	}
+#id_password {
+  width: 173px;		
+	}
+#id_openid_url {
+  width: 173px;	
+	}
+#contact-edit-end {
+	}
+.pager {
+   padding: 10px;
+	text-align: center;
+	font-size: 1.0em;
+	clear: both;
+	display: block;
+}	
+
+.tabs {
+    
+    background-position: 0 -20px;
+    background-repeat: repeat-x;
+    height: 27px;
+    padding: 0;
+ }
+.tab.button {
+    margin-left: 5px;	
+    /*background: none repeat scroll 0 0 #F8F8F8;*/
+    border: 1px solid #CCCCCC;
+    border-radius: 3px 3px 3px 3px;
+    font-weight: normal;
+    padding: 3px;
+    color:  #333333;
+	}
+	
+#birthday-notice, #event-notice, #birthday-wrapper, #event-wrapper{
+	margin-bottom: 10px;
+	}
+
+/*marker*/
+right_aside {
+  display: table-cell;
+  vertical-align: top;
+  width: 180px;
+  /*border-left: 1px solid #D2D2D2;*/
+  
+  /* background: #F1F1F1; */
+}
+right_aside a{color: #1872A2;}
+/*marker*/
+right_aside h3 {font-size: 1.05em; border-bottom: 1px solid #D2D2D2; padding-top: 5px; padding-bottom: 0px; padding-left: 9px; margin-bottom: 0px; 
+margin-top:30px;}
+right_aside .directory-item {	width: 50px; height: 50px; vertical-align: center; text-align: center; }
+right_aside .directory-photo { margin: 0px; }
+right_aside .directory-photo-img { max-width: 45px; max-height: 45px; }
+right_aside #likes { margin: 0px; padding: 0px; list-style: none; }
+right_aside .items-wrapper{ overflow: auto;	width: 100%; }
+right_aside #lastusers-wrapper { padding-left: 6px; padding-top: 3px; overflow: auto;	width: 100%; }
+right_aside #ra-photos-wrapper { padding-left: 5px; padding-top: 3px; overflow: auto;	width: 100%; }
+#page-sidebar-right_aside{margin-top: 0px; margin-bottom: 30px;}
+#page-sidebar-right_aside ul {margin-top: 0px;}
+#page-sidebar-right_aside .label {max-width: 128px;}
+right_aside .icon {width: 10px; height: 10px;}
+.close_box		{ 
+		background-image: url("../diabook-blue/icons/close_box.png");
+		float: right;
+		cursor: pointer;
+		opacity: 0.1;
+		}
+.close_box:hover	{ 
+		background-image: url("../diabook-blue/icons/close_box.png");
+		float: right;
+		cursor: pointer;
+		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;
+		}
+		
+/* wall item */
+.tread-wrapper {
+  border-bottom: 1px solid #D2D2D2;
+  position: relative;
+  padding: 5px;
+  margin-bottom: 0px;
+  width: 775px;
+  padding-top: 10px;
+}
+.tread-wrapper a{
+  color: #1872A2;
+}
+
+/*marker*/
+.wall-item-decor {
+  position: absolute;
+  left: 780px;
+  top: -10px;
+  width: 16px;
+}
+/*marker*/
+.wall-item-container {
+  display: table;
+  width: 770px;
+}
+
+
+.wall-item-container .wall-item-item, .wall-item-container .wall-item-bottom {
+  display: table-row;
+}
+
+.wall-item-bottom {
+  font-size: 13px;
+}
+.wall-item-container .wall-item-bottom {
+/*  opacity: 0.5;
+  -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; */
+}
+.wall-item-container:hover .wall-item-bottom {
+/*  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; */
+}
+.wall-item-container .wall-item-info {
+  display: table-cell;
+  vertical-align: top;
+  text-align: left;
+  width: 80px;
+}
+.wall-item-container .wall-item-location {
+  padding-right: 40px;
+  display: table-cell;
+}
+.wall-item-container .wall-item-ago {
+  word-wrap: break-word;
+  width: 50px;
+  margin-left: 10px;
+  color: #999;
+}
+.wall-item-location {
+  
+  clear: both;
+  overflow: hidden;
+  
+  margin-bottom: 5px;
+}
+
+/*marker*/
+.wall-item-container .wall-item-content {
+
+  max-width: 690px;
+  word-wrap: break-word;
+
+
+}
+/*marker*/
+.wall-item-container .wall-item-content img {
+
+
+}
+.wall-item-container .wall-item-links, .wall-item-container .wall-item-actions {
+  display: table-cell;
+  vertical-align: middle;
+}
+.wall-item-container .wall-item-links .icon, .wall-item-container .wall-item-actions .icon {
+  opacity: 0.5;
+  -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;
+}
+.wall-item-container .wall-item-links .icon:hover, .wall-item-container .wall-item-actions .icon: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;
+}
+.wall-item-container .wall-item-name {
+  font-weight: bold;
+}
+.wall-item-container .wall-item-actions-author {
+  width: 100%;
+  margin-bottom: 0.3em;
+}
+.wall-item-container .wall-item-actions-social {
+  float: left;
+  margin-bottom: 1px;
+  display: table-cell;
+}
+.wall-item-container .wall-item-actions-social a {
+  margin-right: 1em;
+}
+.wall-item-actions-social a {
+  float: left;
+}
+.wall-item-container .wall-item-actions-tools {
+  float: right;
+  width: 80px;
+  display: table-cell;
+}
+.wall-item-container .wall-item-actions-tools a {
+  float: right;
+}
+.wall-item-container .wall-item-actions-tools input {
+  float: right;
+}
+/*marker*/
+.wall-item-container.comment {
+  margin-top: 5px;
+  margin-bottom: 5px;
+  margin-left: 80px;
+  width: 690px;
+  border-bottom: 1px solid hsl(198, 21%, 79%);
+}
+.wall-item-container.comment .contact-photo {
+  width: 32px;
+  height: 32px;
+  margin-left: 16px;
+  /*background: url(../../../../images/icons/22/user.png) no-repeat center center;*/
+
+}
+.wall-item-container.comment {
+  top: 15px !important;
+  left: 15px !important;
+}
+.wall-item-container.comment .wall-item-links {
+  padding-left: 12px;
+}
+
+.wall-item-comment-wrapper {
+  margin: 1px 5px 5px 80px;
+  background-color: #fff;
+  width: 500px;
+}
+.wall-item-comment-wrapper .comment-edit-photo {
+  display: none;
+}
+.wall-item-comment-wrapper textarea {
+  height: 2.0em;
+  width: 100%;
+  font-size: 10px;
+  color: #999999;
+  border: 1px solid #DDD;
+  padding: 0.3em;
+  font-size: 14px;
+}
+.wall-item-comment-wrapper .comment-edit-text-full {
+  font-size: 14px;
+  height: 4em;
+  color: #2d2d2d;
+  border: 1px solid #2d2d2d;
+}
+.comment-edit-preview {
+  width: 500px;
+  margin-top: 10px;
+  background-color:  #fff797;
+}
+.comment-edit-preview .contact-photo {
+  width: 32px;
+  height: 32px;
+  margin-left: 16px;
+  /*background: url(../../../../images/icons/22/user.png) no-repeat center center;*/
+
+}
+.comment-edit-preview {
+  top: 15px !important;
+  left: 15px !important;
+}
+.comment-edit-preview .wall-item-links {
+  padding-left: 12px;
+}
+.comment-edit-preview .wall-item-container {
+  width: 700px;
+}
+.comment-edit-preview .tread-wrapper {
+  width: 700px;
+  padding: 0;
+  margin: 10px 0;
+}
+
+.shiny {
+  /* border-right: 10px solid #fce94f; */
+	border-right: 1px solid #A7C7F7;
+	padding-right: 12px;
+}
+
+#jot-preview-content{
+	margin-top: 30px;}
+	
+#jot-preview-content .tread-wrapper {
+  background-color: #fff797;
+}
+
+.wall-item-tags {
+  padding-top: 1px;
+  padding-bottom: 2px;
+}
+.tag {
+  /*background: url("../../../../images/tag_b.png") repeat-x center left;*/
+  color: #999;
+  padding-left: 3px;
+  font-size: 12px;
+}
+.tag a {
+  padding-right: 5px;
+  /*background: url("../../../../images/tag.png") no-repeat center right;*/
+  color: #999;
+}
+.wwto {
+  position: absolute !important;
+  width: 25px;
+  height: 25px;
+  background: #FFFFFF;
+  border: 2px solid #364e59;
+  height: 25px;
+  width: 25px;
+  overflow: hidden;
+  padding: 1px;
+  position: absolute !important;
+  top: 40px;
+  left: 30px;
+  -webkit-box-shadow: 0px 0px 10px rgba(0, 0, 0, 0.7);
+  -moz-box-shadow: 0px 0px 10px rgba(0, 0, 0, 0.7);
+  box-shadow: 0px 0px 10px rgba(0, 0, 0, 0.7);
+}
+.wwto .contact-photo {
+  width: auto;
+  height: 25px;
+}
+/* contacts menu */
+.contact-photo-wrapper {
+  position: relative;
+  width: 80px;
+}
+
+.contact-photo-wrapper.wwto {
+  width: 25px;
+}
+
+.contact-photo {
+  width: 48px;
+  height: 48px;
+  overflow: hidden;
+  display: block;
+}
+.contact-photo img {
+  width: 48px;
+  height: 48px;
+}
+
+.contact-wrapper {
+  float: left;
+  width: 90px;
+  height: 90px;
+  margin-bottom: 15px;
+}
+.contact-wrapper .contact-photo {
+  width: 80px;
+  height: 80px;
+}
+.contact-wrapper .contact-photo img {
+  width: 80px;
+  height: 80px;
+}
+.contact-wrapper {
+  left: 0px;
+  top: 63px;
+}
+.contact-photo {
+  width: 48px;
+  height: 48px;
+}
+.contact-photo img {
+  width: 48px;
+  height: 48px;
+}
+.contact-name {
+  /* text-align: center; */
+  /*font-weight: bold;*/
+  font-size: 12px;
+}
+.contact-details {
+  color: #999999;
+}
+/* editor */
+.jothidden {
+  display: none;
+}
+#jot {
+  width: 585px;
+  margin: 0px 2em 20px 0px;
+}
+#profile-jot-form #profile-jot-text {
+  height: 2.0em;
+  width: 99%;
+  font-size: 15px;
+  color: #999999;
+  border: 1px solid #DDD;
+  padding: 0.3em;
+  margin-bottom: 10px;
+}
+.grey
+{
+  display: inline;
+  float: right;	
+	}
+#jot #jot-tools {
+  margin: 0px;
+  padding: 0px;
+  height: 40px;
+  overflow: none;
+  width: 583px;
+  background-color: #fff;
+  border-bottom: 2px solid #9eabb0;
+}
+
+#jot #jot-tools li {
+  list-style: none;
+  float: left;
+  width: 80px;
+  height: 40px;
+  border-bottom: 2px solid #9eabb0;
+}
+#jot #jot-tools li a {
+  display: block;
+  color: #cccccc;
+  width: 100%;
+  height: 40px;
+  text-align: center;
+  line-height: 40px;
+  overflow: hidden;
+}
+#jot #jot-tools li:hover {
+  background-color: #364e59;
+  border-bottom: 2px solid #bdcdd4;
+}
+#jot #jot-tools li.perms {
+  float: right;
+  width: 40px;
+}
+#jot #jot-tools li.perms a.unlock {
+  width: 30px;
+  border-left: 10px solid #cccccc;
+  background-color: #cccccc;
+  background-position: left center;
+}
+#jot #jot-tools li.perms a.lock {
+  width: 30px;
+  border-left: 10px solid #666666;
+  background-color: #666666;
+}
+#jot #jot-tools li.submit {
+  float: right;
+  background-color: #cccccc;
+  border-bottom: 2px solid #cccccc;
+  border-right: 1px solid #666666;
+  border-left: 1px solid #666666;
+}
+#jot #jot-tools li.submit input {
+  border: 0px;
+  margin: 0px;
+  padding: 0px;
+  background-color: #cccccc;
+  color: #666666;
+  width: 80px;
+  height: 40px;
+  line-height: 40px;
+}
+#jot #jot-tools li.submit input:hover {
+  background-color: #bdcdd4;
+  color: #666666;
+}
+#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;
+}
+#profile-jot-form #jot-title {
+    
+  	 border-radius: 5px 5px 5px 5px;
+    font-weight: bold;
+    height: 20px;
+    margin: 0 0 5px;
+    width: 60%;
+    border: 1px solid #d2d2d2;
+}
+#profile-jot-form #jot-title:-webkit-input-placeholder {
+  font-weight: normal;
+}
+#profile-jot-form #jot-title:-moz-placeholder {
+  font-weight: normal;
+}
+#profile-jot-form #profile-jot-text_parent #profile-jot-text_tbl{
+	width: 585px;
+	height: 100px;
+	}
+#jot #jot-title:hover {
+  border: 1px solid #999999;
+}
+#jot #jot-title:focus {
+  border: 1px solid #999999;
+}
+#jot #character-counter {
+  width: 80px;
+  float: right;
+  text-align: right;
+  height: 20px;
+  line-height: 20px;
+  padding-right: 20px;
+}
+#jot-perms-icon, 
+#profile-location,
+#profile-nolocation,
+#profile-youtube, 
+#profile-video, 
+#profile-audio,
+#profile-link,
+#profile-title, 
+#wall-image-upload,
+#wall-file-upload,
+#wall-image-upload-div,
+#wall-file-upload-div,
+.hover, .focus {
+	cursor: pointer;
+	margin-top: 2px;
+}
+/*marker*/
+#profile-jot-wrapper{
+	margin: 0 20px 20px 0;
+   width: 785px;
+	}
+/*marker*/
+#profile-jot-submit-wrapper {
+	margin-bottom: 50px;
+	width: 785px;
+}
+
+#profile-jot-submit {
+	float: right;
+	margin-top: 2px;
+	font-size: 14px;
+}
+#profile-upload-wrapper {
+	float: left;
+	margin-top: 2px;
+	margin-left: 10px;
+	
+}
+#profile-attach-wrapper {
+	float: left;
+	margin-left: 15px;
+	margin-top: 2px;
+}
+#profile-rotator {
+	float: left;
+	margin-left: 30px;
+	margin-top: 2px;
+}
+#profile-link-wrapper {
+	float: left;
+	margin-left: 15px;
+	margin-top: 2px;
+}
+#profile-youtube-wrapper {
+	float: left;
+	margin-left: 15px;
+	margin-top: 2px;
+}
+#profile-video-wrapper {
+	float: left;
+	margin-left: 15px;
+	margin-top: 2px;
+}
+#profile-audio-wrapper {
+	float: left;
+	margin-left: 15px;
+	margin-top: 2px;
+}
+#profile-location-wrapper {
+	float: left;
+	margin-left: 15px;
+	margin-top: 2px;
+}
+#profile-jot-perms {
+	float: left;
+	margin-left: 45px;
+	margin-top: 2px;
+}
+#jot-preview-link {
+	float: right;
+	margin-left: 10px;
+	margin-top: 2px;
+	font-size: 9px;
+	font-weight: bolder;
+	cursor: pointer;
+}
+#profile-jot-perms{
+   float: right;
+	margin-left: 10px;
+	margin-top: 2px;	
+	}
+/** buttons **/
+.button.creation1 {
+    background-color: #fff;
+    border: 1px solid #777777;
+    border-radius: 3px 3px 3px 3px;
+    box-shadow: 0 1px 1px #CFCFCF;
+    cursor: pointer;
+    font-weight: bolder;
+}
+.button.creation2 {
+    background-color: #055580;
+    border: 1px solid #777777;
+    color: white;
+    border-radius: 3px 3px 3px 3px;
+    box-shadow: 0 1px 1px #CFCFCF;
+    margin-left: 5px;
+    cursor: pointer;
+    font-weight: bolder;
+}
+/*input[type="submit"] {
+	border: 0px;
+    background-color: @ButtonBackgroundColor;
+    color: @ButtonColor;
+    padding: 0px 10px;
+	.rounded(5px);
+    height: 18px;
+}*/
+/** acl **/
+#photo-edit-perms-select, #photos-upload-permissions-wrapper, #profile-jot-acl-wrapper {
+  display: block!important;
+}
+#acl-wrapper {
+  width: 690px;
+  float: left;
+}
+#acl-search {
+  float: right;
+  background: #ffffff url("../../../../images/search_18.png") no-repeat right center;
+  padding-right: 20px;
+}
+#acl-showall {
+  float: left;
+  display: block;
+  width: auto;
+  height: 18px;
+  background-color: #cccccc;
+  background-image: url("../../../../images/show_all_off.png");
+  background-position: 7px 7px;
+  background-repeat: no-repeat;
+  padding: 7px 5px 0px 30px;
+  color: #999999;
+  -moz-border-radius: 5px 5px 5px 5px;
+  -webkit-border-radius: 5px 5px 5px 5px;
+  border-radius: 5px 5px 5px 5px;
+}
+#acl-showall.selected {
+  color: #000000;
+  background-color: #ff9900;
+  background-image: url("../../../../images/show_all_on.png");
+}
+#acl-list {
+  height: 210px;
+  border: 1px solid #cccccc;
+  clear: both;
+  margin-top: 30px;
+  overflow: auto;
+}
+.acl-list-item {
+  display: block;
+  width: 150px;
+  height: 30px;
+  border: 1px solid #cccccc;
+  margin: 5px;
+  float: left;
+}
+.acl-list-item img {
+  width: 22px;
+  height: 22px;
+  float: left;
+  margin: 4px;
+}
+.acl-list-item p {
+  height: 12px;
+  font-size: 10px;
+  margin: 0px;
+  padding: 2px 0px 1px;
+  overflow: hidden;
+}
+.acl-list-item a {
+  font-size: 8px;
+  display: block;
+  width: 40px;
+  height: 10px;
+  float: left;
+  color: #999999;
+  background-color: #cccccc;
+  background-position: 3px 3px;
+  background-repeat: no-repeat;
+  margin-right: 5px;
+  -webkit-border-radius: 2px ;
+  -moz-border-radius: 2px;
+  border-radius: 2px;
+  padding-left: 15px;
+}
+#acl-wrapper a:hover {
+  text-decoration: none;
+  color: #000000;
+}
+.acl-button-show {
+  background-image: url("../../../../images/show_off.png");
+}
+.acl-button-hide {
+  background-image: url("../../../../images/hide_off.png");
+}
+.acl-button-show.selected {
+  color: #000000;
+  background-color: #9ade00;
+  background-image: url("../../../../images/show_on.png");
+}
+.acl-button-hide.selected {
+  color: #000000;
+  background-color: #ff4141;
+  background-image: url("../../../../images/hide_on.png");
+}
+.acl-list-item.groupshow {
+  border-color: #9ade00;
+}
+.acl-list-item.grouphide {
+  border-color: #ff4141;
+}
+/** /acl **/
+/** tab buttons 14618a**/
+/*marker*/
+ul.tabs {
+  list-style-type: none;
+  padding-bottom: 10px;
+  font-size: 13px;
+  width: 805px;
+}
+ul.tabs li {
+  float: left;
+  margin-left: 5px;
+}
+ul.tabs li .active {
+    background-color: #055580;
+    border: 1px solid #777777;
+    color: white;
+    border-radius: 3px 3px 3px 3px;
+    box-shadow: 0 1px 1px #CFCFCF;
+    margin-left: 5px;
+}
+/**
+ * Form fields
+ */
+.field {
+  margin-bottom: 10px;
+  padding-bottom: 10px;
+  overflow: auto;
+  width: 100%;
+}
+.field label {
+  float: left;
+  width: 200px;
+}
+.field input, .field textarea {
+  width: 400px;
+}
+.field textarea {
+  height: 100px;
+}
+.field .field_help {
+  display: block;
+  margin-left: 200px;
+  color: #666666;
+}
+.field .onoff {
+  float: left;
+  width: 80px;
+}
+.field .onoff a {
+  display: block;
+  border: 1px solid #666666;
+  background-image: url("../../../../images/onoff.jpg");
+  background-repeat: no-repeat;
+  padding: 4px 2px 2px 2px;
+  height: 16px;
+  text-decoration: none;
+}
+.field .onoff .off {
+  border-color: #666666;
+  padding-left: 40px;
+  background-position: left center;
+  background-color: #cccccc;
+  color: #666666;
+  text-align: right;
+}
+.field .onoff .on {
+  border-color: #204A87;
+  padding-right: 40px;
+  background-position: right center;
+  background-color: #D7E3F1;
+  color: #204A87;
+  text-align: left;
+}
+.field .hidden {
+  display: none!important;
+}
+.field.radio .field_help {
+  margin-left: 0px;
+}
+#directory-search-form{
+	margin-bottom: 50px;
+	}
+#profile-edit-links-end {
+        clear: both;
+        margin-bottom: 15px;
+}
+
+#profile-edit-links ul { margin: 20px; padding-bottom: 20px; list-style: none; }
+
+#profile-edit-links li {
+  float: left;
+  list-style: none;
+  margin-left: 10px;
+}
+
+.profile-edit-side-div {
+  display: none;
+}
+
+#register-form label,
+#profile-edit-form label {
+        width: 300px; float: left;
+}
+
+.required {
+  display: inline;
+  color: #B20202;
+}
+
+/* oauth */
+.oauthapp {
+  height: auto;
+  overflow: auto;
+  border-bottom: 2px solid #cccccc;
+  padding-bottom: 1em;
+  margin-bottom: 1em;
+}
+.oauthapp img {
+  float: left;
+  width: 48px;
+  height: 48px;
+  margin: 10px;
+}
+.oauthapp img.noicon {
+  background-image: url("../../../../images/icons/48/plugin.png");
+  background-position: center center;
+  background-repeat: no-repeat;
+}
+.oauthapp a {
+  float: left;
+}
+/* contacts */
+.contact-entry-wrapper {
+  width: 120px;
+  height: 120px;
+  float: left;
+}
+/* photo */
+.photo {
+box-shadow: 2px 2px 5px 0px #000000;
+margin: 0px;
+border-radius: 10px;
+height: 145px !important;
+width: 145px !important;
+}
+.lframe {
+  float: left;
+  /*margin: 0px 10px 10px 0px;*/
+}
+/* profile match wrapper */
+.profile-match-wrapper {
+  float: left;
+  width: 90px;
+  height: 90px;
+  margin-bottom: 20px;
+}
+.profile-match-wrapper .contact-photo {
+  width: 80px;
+  height: 80px;
+}
+.profile-match-wrapper .contact-photo img {
+  width: 80px;
+  height: 80px;
+}
+.profile-match-wrapper {
+  left: 0px;
+  top: 63px;
+}
+
+.contact-photo-menu-button {
+        position: relative;
+        background-image: url("../../../../images/icons/16/menu.png");
+        background-position: top left; 
+        background-repeat: no-repeat;
+        margin: 0px 0px -16px 0px; 
+	padding: 0px;
+        width: 16px;
+        height: 16px;
+        top: -20px; left:0px;
+        overflow: hidden;
+        text-indent: 40px;
+        display: none;
+        
+}
+.contact-photo-menu {
+        width: 11em;
+        border: 3px solid #364e59;
+	color: #2d2d2d;
+        background: #FFFFFF;
+/*        position: absolute;*/
+        position: relative;
+        left: 0px; top: 0px;
+        display: none;
+        z-index: 10000;
+}
+.contact-photo-menu ul { margin:0px; padding: 0px; list-style: none }
+.contact-photo-menu li a {
+	display: block; 
+	padding: 5px 10px; 
+	color: #2d2d2d;
+	text-decoration: none;
+}
+.contact-photo-menu li a:hover {
+	background-color: #bdcdd4; 
+}
+
+/* page footer */
+footer {
+  height: 100px;
+  display: table-row;
+}
+
+blockquote {
+    border-left: 1px solid #D2D2D2;
+    padding-left: 9px;
+    margin: 0 0 0 .8ex;
+	 color: #777;
+}
+.oembed {
+	
+	font-weight: bold;
+}
+.aprofile dt{
+box-shadow: 1px 1px 5px 0;
+    color: #666666;
+    margin: 15px 0 5px;
+    padding-left: 5px;	
+	}
+/* ================== */
+/* = Contacts Block = */
+/* ================== */
+
+.contact-block-img {
+        width: 55px;
+        height: 55px;
+        padding-right: 3px;
+}
+.contact-block-div {
+        float: left;
+}
+
+.contact-block-textdiv { width: 150px; height: 34px; float: left; }
+#contact-block-end { clear: both; } 
+
+#group-edit-wrapper {
+        margin-bottom: 10px;
+}
+
+#group-members-end {
+        clear: both;
+}
+#group-edit-desc {
+ margin-top: 15px;
+}
+
+/*
+#group-separator,
+#prof-separator { display: none;}
+*/
+#prof-members-end{
+	clear: both;
+	}
+
+#prvmail-to-label, #prvmail-subject-label, #prvmail-message-label {
+	margin-bottom: 10px;
+	margin-top: 20px;
+}
+
+#prvmail-submit {
+	float: right;
+	margin-top: 10px;
+}
+
+#prvmail-subject
+{
+background: none repeat scroll 0 0 #FFFFFF;
+border: 1px solid #CCCCCC;
+border-radius: 5px 5px 5px 5px;
+font-weight: bold;
+height: 20px;
+margin: 0 0 5px;
+vertical-align: middle;
+}
+#prvmail-form{
+ width: 597px;	
+	}
+	
+#prvmail-upload-wrapper,
+#prvmail-link-wrapper,
+#prvmail-rotator-wrapper {
+	float: left;
+	margin-top: 10px;
+	margin-right: 10px;
+	width: 24px;
+}
+
+#prvmail-end {
+	clear: both;
+}
+
+.mail-list-sender,
+.mail-list-detail {
+	float: left;
+}
+.mail-list-detail {
+	margin-left: 20px;
+}
+
+.mail-list-subject {
+	font-size: 1.1em;
+	margin-top: 10px;
+}
+a.mail-list-link {
+    display: block;
+    font-size: 1.3em;
+    padding: 4px 0;
+}
+
+/*
+*a.mail-list-link:hover {
+*	background-color: #15607B;
+*	color: #F5F6FB;
+*}
+*/
+
+.mail-list-outside-wrapper-end {
+	clear: both;
+}
+
+.mail-list-outside-wrapper {
+	margin-top: 30px;
+}
+
+.mail-list-delete-wrapper {
+	float: right;
+	margin-right: 30px;
+	margin-top: 15px;
+}
+
+.mail-list-delete-icon {
+	border: none;
+}
+
+.mail-conv-sender,
+.mail-conv-detail {
+	float: left;
+}
+.mail-conv-detail {
+	margin-left: 20px;
+	width: 500px;
+}
+
+.mail-conv-subject {
+    font-size: 1.4em;
+    margin: 10px 0;
+}
+
+.mail-conv-outside-wrapper-end {
+	clear: both;
+}
+
+.mail-conv-outside-wrapper {
+	margin-top: 30px;
+}
+
+.mail-conv-delete-wrapper {
+	float: right;
+	margin-right: 30px;
+	margin-top: 15px;
+}
+.mail-conv-break {
+	clear: both;
+}
+
+.mail-conv-delete-icon {
+	border: none;
+}
+
+/* ========== */
+/* = Events = */
+/* ========== */
+.eventcal {
+        float: left;
+        font-size: 20px;
+}
+
+.vevent {
+
+}
+.vevent .event-description, .vevent .event-location {
+        margin-left: 10px;
+        margin-right: 10px;
+}
+.vevent .event-start {
+        margin-left: 10px;
+        margin-right: 10px;
+}
+
+#new-event-link {
+        margin-bottom: 10px;
+}
+
+.edit-event-link, .plink-event-link {
+        float: left;
+        margin-top: 4px;
+        margin-right: 4px;
+        margin-bottom: 15px;
+}
+
+.event-description:before {
+        content: url('../../../../images/calendar.png');
+        margin-right: 15px;
+}
+
+.event-start, .event-end {
+        margin-left: 10px;
+        width: 330px;
+        clear: both;
+}
+
+.event-start .dtstart, .event-end .dtend {
+        float: right;
+}
+
+.event-list-date {
+        margin-bottom: 10px;
+}
+
+.prevcal, .nextcal {
+        float: left;
+        margin-left: 32px;
+        margin-right: 32px;
+        margin-top: 64px;
+}
+.event-calendar-end {
+        clear: both;
+}
+
+ 
+.calendar {
+        font-family: Courier, monospace;
+}
+.calendar.eventcal a {
+  color: #1872A2;	
+	}
+.today {
+        font-weight: bold;
+        color: #FF0000;
+}
+
+.settings-block {
+        border: 1px solid #AAA;
+        margin: 10px;
+        padding: 10px;
+}
+
+.app-title {
+        margin: 10px;
+}
+
+#identity-manage-desc {
+        margin-top:15px;
+        margin-bottom: 15px;
+}
+
+#identity-manage-choose {
+        margin-bottom: 15px;
+}
+
+#identity-submit {
+        margin-top: 20px;
+}
+
+#photo-prev-link, #photo-next-link {
+        padding: 10px;
+        float: left;
+}
+.lightbox{
+	float: left;
+	}
+
+#photo-photo {
+        float: left;
+}
+#photo-like-div .wall-item-like-buttons {
+	 float: left;
+    margin-right: 5px;
+    margin-top: 30px;
+	}
+.comment-edit-text-empty {
+    margin: 10px 0 0;
+    width: 85%;
+}
+.comment-edit-photo {
+    margin: 10px 0 0;
+}
+.wall-item-like-buttons .icon.like {
+float: left;
+}
+
+#photo-photo-end {
+        clear: both;
+}
+
+.tabs .comment-wwedit-wrapper {
+	display: block;
+   margin-top: 30px;
+   margin-left: 50px;
+	}
+
+.profile-match-photo {
+        float: left;
+        text-align: center;
+        width: 120px;
+}
+
+.profile-match-name {
+        float: left;
+        text-align: center;
+        width: 120px;
+        overflow: hidden;
+}
+
+.profile-match-break,
+.profile-match-end {
+        clear: both;
+}
+
+.profile-match-connect {
+        text-align: center;
+        font-weight: bold;
+}
+
+.profile-match-wrapper {
+        float: left;
+        padding: 10px;
+        width: 120px;
+        height: 120px;
+        scroll: auto;
+}
+#profile-match-wrapper-end {
+        clear: both;
+}
+
+/* ============= */
+/* = Directory = */
+/* ============= */
+/* contacts menu */
+.contact-photo-wrapper {
+  position: relative;
+}
+.contact-photo {
+  width: 48px;
+  height: 48px;
+  overflow: hidden;
+  display: block;
+}
+.contact-photo img {
+  width: 48px;
+  height: 48px;
+}
+.contact-photo-menu-button {
+  display: none;
+  /* position: absolute; */
+  /* position: absolute; */
+  left: 0px;
+  top: -16px;
+}
+.contact-wrapper {
+  float: left;
+  width: 90px;
+  height: 90px;
+  margin-bottom: 15px;
+}
+.contact-wrapper .contact-photo {
+  width: 80px;
+  height: 80px;
+}
+.contact-wrapper .contact-photo img {
+  width: 80px;
+  height: 80px;
+}
+.contact-wrapper .contact-photo-menu-button {
+  left: 0px;
+  top: 63px;
+}
+.directory-item {
+  float: left;
+  width: 200px;
+  height: 200px;
+}
+.directory-item .contact-photo {
+  width: 175px;
+  height: 175px;
+}
+.directory-item .contact-photo img {
+  width: 175px;
+  height: 175px;
+}
+.contact-name {
+  text-align: left;
+  font-weight: bold;
+  font-size: 12px;
+}
+.contact-details {
+  color: #999999;
+}
+#side-bar-photos-albums li{
+list-style-type: disc;
+}
+#side-bar-photos-albums ul li{
+  margin-left: 30px;
+  padding-left: 0px;
+	}
+#side-bar-photos-albums{
+	margin-top: 15px;	
+	}
+.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-album-image-wrapper, .photo-top-image-wrapper {
+  float: left;
+   -moz-box-shadow: 0 0 5px #888;
+   -webkit-box-shadow: 0 0 5px #888;
+   box-shadow: 0 0 5px #888;
+  background-color: #000;
+   -webkit-border-radius: 5px;
+   -moz-border-radius: 5px;
+  border-radius: 5px;
+  padding-bottom: 20px;
+  position: relative;
+  margin: 0 10px 10px 0;
+  width: 200px; height: 140px;
+  overflow: hidden;  
+}
+.photo-top-album-name {
+        width: 100%;
+        position: absolute; 
+        bottom: 0px; 
+        padding-left: 3px;
+        background-color: #EEE;
+}
+.photo-top-album-link{
+  color: #1872A2;
+	}
+.photo-top-album-img{
+	
+	}
+/*.photo-top-image-wrapper {
+        position: relative;
+        float: left;
+        margin-top: 15px;
+        margin-right: 15px;
+        width: 200px; height: 200px; 
+        overflow: hidden; 
+}
+.photo-top-album-name {
+        width: 100%;
+        min-height: 2em;
+        position: absolute; 
+        bottom: 0px; 
+        padding: 0px 3px;
+        padding-top: 0.5em;
+        background-color: rgb(255, 255, 255);
+}*/
+#photo-top-end {
+        clear: both;
+}
+
+#photo-top-links {
+        margin-bottom: 30px;
+        margin-left: 30px;
+}
+
+#photos-upload-newalbum-div {
+        float: left;
+        width: 175px;
+}
+
diff --git a/view/theme/diabook/diabook-blue/style-network.css b/view/theme/diabook/diabook-blue/style-network.css
new file mode 100644
index 000000000..3a972b832
--- /dev/null
+++ b/view/theme/diabook/diabook-blue/style-network.css
@@ -0,0 +1,2618 @@
+/**
+ * Fabio Comuni <http://kirgroup.com/profile/fabrixxm>
+ * Additional Changes: Michael Vogel <icarus@dabo.de>
+ **/
+
+/* ========= */
+/* = Admin = */
+/* ========= */
+
+#adminpage {
+/*        width: 80%;*/
+}
+
+#pending-update {
+        float:right;
+        color: #ffffff;
+        font-weight: bold;
+        background-color: #FF0000;
+        padding: 0em 0.3em;
+}
+
+.admin.linklist {
+        border: 0px; padding: 0px;
+}
+
+.admin.link {
+        list-style-position: inside;
+        font-size: 1em;
+        padding: 5px;
+        width: 100px;
+        margin: 5px;
+}
+
+#adminpage dl {
+        clear: left;
+        margin-bottom: 2px;
+        padding-bottom: 2px;
+        border-bottom: 1px solid black;
+}
+
+#adminpage dt {
+        width: 200px;
+        float: left;
+        font-weight: bold;
+}
+
+#adminpage dd {
+        margin-left: 200px;
+}
+#adminpage h3 {
+        border-bottom: 1px solid #898989;
+        margin-bottom: 5px;
+        margin-top: 10px;
+}
+
+#adminpage .submit {
+        clear:left;
+}
+
+#adminpage #pluginslist {
+        margin: 0px; padding: 0px;
+}
+
+#adminpage .plugin {
+        list-style: none;
+        display: block;
+	/* border: 1px solid #888888; */
+        padding: 1em;
+        margin-bottom: 5px;
+        clear: left;
+}
+
+#adminpage .toggleplugin {
+        float:left;
+        margin-right: 1em;
+}
+
+#adminpage table {width:100%; border-bottom: 1p solid #000000; margin: 5px 0px;}
+#adminpage table th { text-align: left;}
+#adminpage td .icon { float: left;}
+#adminpage table#users img { width: 16px; height: 16px; }
+#adminpage table tr:hover { background-color: #eeeeee; }
+#adminpage .selectall { text-align: right; }
+/* icons */
+
+.icon.contacts {
+  background-image: url("../diabook-blue/icons/contacts.png");}
+.icon.notifications {
+  background-image: url("../diabook-blue/icons/notifications.png");}
+.icon.notify {
+  background-image: url("../diabook-blue/icons/notify.png");}
+.icon.messages {
+  background-image: url("../diabook-blue/icons/messages.png");}
+.icon.community {
+  background-image: url("../diabook-blue/icons/community.png");}
+  
+.icon.drop 	{ background-image: url("../diabook-blue/icons/drop.png");}
+.icon.drophide 	{ background-image: url("../diabook-blue/icons/drop.png");}
+.icon.dislike 	{ background-image: url("../diabook-blue/icons/dislike.png");}
+.icon.like 	{ background-image: url("../diabook-blue/icons/like.png");}
+.icon.pencil 	{ background-image: url("../diabook-blue/icons/pencil.png");}
+.icon.recycle 	{ background-image: url("../diabook-blue/icons/recycle.png");}
+.icon.remote-link { background-image: url("../diabook-blue/icons/remote.png");}
+.icon.tagged    { background-image: url("../diabook-blue/icons/tagged.png");}
+.icon.file-as { background-image: url("../diabook-blue/icons/file_as.png");}
+.star-item.icon.unstarred { background-image: url("../diabook-blue/icons/unstarred.png");}
+.star-item.icon.starred { background-image: url("../diabook-blue/icons/starred.png");}
+.icon.link		{ background-image: url("../diabook-blue/icons/link.png");}
+.icon.lock		{ background-image: url("../diabook-blue/icons/lock.png");}
+.icon.unlock		{ background-image: url("../diabook-blue/icons/unlock.png");}
+.icon.language    { background-image: url("../diabook-blue/icons/language.png");}
+
+
+.camera 	{ background-image: url("../diabook-blue/icons/camera.png"); 
+			  display: block; width: 28px; height: 28px; background-repeat: no-repeat;
+			  }
+.attach 	{ background-image: url("../diabook-blue/icons/attach.png"); 
+			  display: block; width: 28px; height: 28px; background-repeat: no-repeat;
+			  }
+.video2 	{ background-image: url("../diabook-blue/icons/video.png"); 
+			  display: block; width: 28px; height: 28px; background-repeat: no-repeat;
+			  }	
+.video 	{ background-image: url("../diabook-blue/icons/video.png"); 
+			  display: block; width: 100%; height: 140px; background-repeat: no-repeat;
+			  }
+.audio2 	{ background-image: url("../diabook-blue/icons/audio.png"); 
+			  display: block; width: 28px; height: 28px; background-repeat: no-repeat;
+			  }
+.audio 	{ background-image: url("../diabook-blue/icons/audio.png"); 
+			  display: block; width: 28px; height: 28px; background-repeat: no-repeat;
+			  }
+.weblink 	{ background-image: url("../diabook-blue/icons/weblink.png"); 
+			  display: block; width: 28px; height: 28px; background-repeat: no-repeat;
+			  }
+.globe 	{ background-image: url("../diabook-blue/icons/globe.png"); 
+			  display: block; width: 28px; height: 28px; background-repeat: no-repeat;
+			  }
+.unglobe 	{ background-image: url("../diabook-blue/icons/unglobe.png"); 
+			  display: block; width: 28px; height: 28px; background-repeat: no-repeat;
+			  }
+.edit    {background-image: url("../diabook-blue/icons/pencil2.png"); 
+			  display: block; width: 28px; height: 28px; background-repeat: no-repeat;}
+			  
+			  
+
+
+.article	{ background-position: -50px  0px;}
+/*.audio 		{ background-position: -70px  0px;}*/
+.block 		{ background-position: -90px  0px;}
+/*.drop 		{ background-position: -110px 0px;}*/
+/*.drophide 	{ background-position: -130px 0px;}*/
+/*.edit 		{ background-position: -150px 0px;}*/
+/*.camera 	{ background-position: -170px 0px;}*/
+/*.dislike 	{ background-position: -190px 0px;}*/
+/*.like 		{ background-position: -210px 0px;}*/
+/*.link 		{ background-position: -230px 0px;}*/
+
+/*.globe 		{ background-position: -50px  -20px;}*/
+/*.noglobe 	{ background-position: -70px  -20px;}*/
+.no 		{ background-position: -90px  -20px;}
+.pause 		{ background-position: -110px -20px;}
+.play 		{ background-position: -130px -20px;}
+/*.pencil 	{ background-position: -150px -20px;}*/
+.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;}*/
+
+/*.video          { background-position: -110px -40px;}*/
+.youtube        { background-position: -130px -40px;}
+
+/*.attach         { background-position: -190px -40px;}*/
+/*.language       { background-position: -210px -40px;}*/
+
+
+.icon.on             { background-image: url("../diabook-blue/icons/toogle_on.png"); background-repeat: no-repeat;}
+.icon.off            { background-image: url("../diabook-blue/icons/toogle_off.png"); background-repeat: no-repeat;}
+.prev           { background-position: -90px  -60px;}
+.next           { background-position: -110px -60px;}
+/*.tagged     { background-position: -130px -60px;}*/
+
+.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 0px; }
+.type-audio { background-position: -40px 0px; }
+.type-text  { background-position: -60px 0px; }
+.type-unkn  { background-position: -80px 0px; }
+
+.icon.drop, .icon.drophide {
+ float: left;
+}
+
+.icon {
+  display: block;
+  width: 20px;
+  height: 20px;
+  /*background-image: url('icons.png');*/
+}
+
+.icon {
+  background-color: transparent ;
+  background-repeat: no-repeat;
+  /* background-position: left center; */
+  display: block;
+  overflow: hidden;
+  text-indent: -9999px;
+  padding: 1px;
+}
+
+.icon.border.camera{
+  background-image: url("../diabook-blue/icons/camera.png"); 
+  display: block; width: 28px; height: 28px; background-repeat: no-repeat;
+	}
+	
+.icon.border.link{
+  background-image: url("../diabook-blue/icons/weblink.png"); 
+  display: block; width: 28px; height: 28px; background-repeat: no-repeat;
+  margin-left: 10px;
+	}
+
+.icon.text {
+  text-indent: 0px;
+}
+.icon.s10 {
+  min-width: 10px;
+  height: 10px;
+}
+.icon.s10.notify {
+  background-image: url("../../../../images/icons/10/notify_off.png");
+}
+.icon.s10.gear {
+  background-image: url("../../../../images/icons/10/gear.png");
+}
+.icon.s10.add {
+  background-image: url("../../../../images/icons/10/add.png");
+}
+.icon.s10.delete {
+  background-image: url("../../../../images/icons/10/delete.png");
+}
+.icon.s10.edit {
+  background-image: url("../../../../images/icons/10/edit.png");
+}
+.icon.s10.star {
+  background-image: url("../../../../images/star_dummy.png");
+}
+.icon.s10.menu {
+  background-image: url("../../../../images/icons/10/menu.png");
+}
+.icon.s10.link {
+  background-image: url("../../../../images/icons/10/link.png");
+}
+.icon.s10.lock {
+  background-image: url("../../../../images/icons/10/lock.png");
+}
+.icon.s10.unlock {
+  background-image: url("../../../../images/icons/10/unlock.png");
+}
+.icon.s10.text {
+  padding: 2px 0px 0px 15px;
+  font-size: 10px;
+}
+.icon.s16 {
+  min-width: 16px;
+  height: 16px;
+}
+.icon.s16.notify {
+  background-image: url("../../../../images/icons/16/notify_off.png");
+}
+.icon.s16.gear {
+  background-image: url("../../../../images/icons/16/gear.png");
+}
+.icon.s16.add {
+  background-image: url("../../../../images/icons/16/add.png");
+}
+.icon.s16.delete {
+  background-image: url("../../../../images/icons/16/delete.png");
+}
+/*.icon.s16.edit {
+  background-image: url("../../../../images/icons/16/edit.png");
+}*/
+.icon.s16.star {
+  background-image: url("../../../../images/star_dummy.png");
+}
+.icon.s16.menu {
+  background-image: url("../../../../images/icons/16/menu.png");
+}
+/*.icon.s16.link {
+  background-image: url("../../../../images/icons/16/link.png");
+}*/
+.icon.s16.lock {
+  background-image: url("../../../../images/icons/16/lock.png");
+}
+.icon.s16.unlock {
+  background-image: url("../../../../images/icons/16/unlock.png");
+}
+.icon.s16.text {
+  padding: 4px 0px 0px 20px;
+  font-size: 10px;
+}
+.icon.s22 {
+  min-width: 22px;
+  height: 22px;
+}
+.icon.s22.notify {
+  background-image: url("../../../../images/icons/22/notify_off.png");
+}
+.icon.s22.gear {
+  background-image: url("../../../../images/icons/22/gear.png");
+}
+.icon.s22.add {
+  background-image: url("../../../../images/icons/22/add.png");
+}
+.icon.s22.delete {
+  background-image: url("../../../../images/icons/22/delete.png");
+}
+.icon.s22.edit {
+  background-image: url("../../../../images/icons/22/edit.png");
+}
+.icon.s22.star {
+  background-image: url("../../../../images/star_dummy.png");
+}
+.icon.s22.menu {
+  background-image: url("../../../../images/icons/22/menu.png");
+}
+.icon.s22.link {
+  background-image: url("../../../../images/icons/22/link.png");
+}
+.icon.s22.lock {
+  background-image: url("../../../../images/icons/22/lock.png");
+}
+.icon.s22.unlock {
+  background-image: url("../../../../images/icons/22/unlock.png");
+}
+.icon.s22.text {
+  padding: 10px 0px 0px 25px;
+  width: 200px;
+}
+.icon.s48 {
+  width: 48px;
+  height: 48px;
+}
+.icon.s48.notify {
+  background-image: url("../../../../images/icons/48/notify_off.png");
+}
+.icon.s48.gear {
+  background-image: url("../../../../images/icons/48/gear.png");
+}
+.icon.s48.add {
+  background-image: url("../../../../images/icons/48/add.png");
+}
+.icon.s48.delete {
+  background-image: url("../../../../images/icons/48/delete.png");
+}
+.icon.s48.edit {
+  background-image: url("../../../../images/icons/48/edit.png");
+}
+.icon.s48.star {
+  background-image: url("../../../../images/star_dummy.png");
+}
+.icon.s48.menu {
+  background-image: url("../../../../images/icons/48/menu.png");
+}
+.icon.s48.link {
+  background-image: url("../../../../images/icons/48/link.png");
+}
+.icon.s48.lock {
+  background-image: url("../../../../images/icons/48/lock.png");
+}
+.icon.s48.unlock {
+  background-image: url("../../../../images/icons/48/unlock.png");
+}
+
+#contact-edit-links ul {
+  list-style: none;
+  list-style-type: none;
+}
+
+.hide-comments-outer {
+  margin-left: 80px;
+  margin-bottom: 1px;
+  width: 484px;
+  border-bottom: 1px solid #BDCDD4;
+  background-color: #fff;
+  padding: 8px;
+}
+
+/* global */
+body {
+  font-family: 'Lato', "Helvetica Neue", Helvetica, Arial, sans-serif;
+  font-size: 12.5px;
+  background-color: #ffffff;
+  color: #2d2d2d;
+  margin: 50px auto auto;
+  display: table;
+}
+
+h4 {
+  font-size: 1.1em;
+}
+
+a {
+	color: #333333;
+	/* color: #3e3e8c; */
+	text-decoration: none;
+}
+a:hover {
+	/* color: blue; */
+	text-decoration: underline
+}
+
+.wall-item-name-link {
+/*  float: left;*/
+}
+
+.wall-item-photo {
+  width: 48px;
+  height: 48px;
+  overflow: hidden;
+  display: block;
+}
+
+.left {
+  float: left;
+}
+.right {
+  float: right;
+}
+.hidden {
+  display: none;
+}
+.clear {
+  clear: both;
+}
+.fakelink {
+  color: #1872A2;
+  /* color: #3e3e8c; */
+  text-decoration: none;
+  cursor: pointer;
+}
+.fakelink:hover {
+  /* color: blue; */
+  /*color: #005c94; */
+  text-decoration: underline;
+}
+code {
+  font-family: Courier, monospace;
+  white-space: pre;
+  display: block;
+  overflow: auto;
+  border: 1px solid #444;
+  background: #EEE;
+  color: #444;
+  padding: 10px;
+  margin-top: 20px;
+}
+#panel {
+  position: absolute;
+  width: 12em;
+  background: #ffffff;
+  color: #2d2d2d;
+  margin: 0px;
+  padding: 1em;
+  list-style: none;
+  border: 3px solid #364e59;
+  z-index: 100000;
+  -webkit-box-shadow: 0px 5px 10px rgba(0, 0, 0, 0.7);
+  -moz-box-shadow: 0px 5px 10px rgba(0, 0, 0, 0.7);
+  box-shadow: 0px 5px 10px rgba(0, 0, 0, 0.7);
+}
+/* tool */
+.tool {
+  height: auto;
+  overflow: auto;
+  padding: 3px;
+}
+#saved-search-ul .tool:hover,
+#nets-sidebar .tool:hover,
+#sidebar-group-list .tool:hover,
+#fileas-sidebar .tool:hover {
+	background: #308DBF;
+}
+.tool .label {
+  float: left;
+}
+.tool .action {
+  float: right;
+}
+.tool a {
+  color: ##3F8FBA;
+}
+.tool a:hover {
+  text-decoration: none;
+}
+/* popup notifications */
+div.jGrowl div.notice {
+  background: #511919 url("../../../../images/icons/48/notice.png") no-repeat 5px center;
+  color: #ffffff;
+  padding-left: 58px;
+}
+div.jGrowl div.info {
+  background: #364e59 url("../../../../images/icons/48/info.png") no-repeat 5px center;
+  color: #ffffff;
+  padding-left: 58px;
+}
+/* header */
+header {
+  position: fixed;
+  left: 0%;
+  right: 80%;
+  top: 0px;
+  margin: 0px;
+  padding: 0px;
+  width: 22%;
+  height: 32px;
+  background: #1872a2;
+  background-color: #1872a2;
+  z-index: 100;
+  border-bottom: 1px;
+  border-bottom-color: black;
+  border-bottom-style: inset;
+}
+header #site-location {
+  display: none;
+}
+header #banner {
+  overflow: hidden;
+  text-align: left;
+  width: 82%%;
+  margin-left: 25%;
+}
+header #banner a,
+header #banner a:active,
+header #banner a:visited,
+header #banner a:link,
+header #banner a:hover {
+  color: #ffffff;
+  text-decoration: none;
+  outline: none;
+  vertical-align: middle;
+ font-weight: bolder;
+  margin-left: 3px;
+}
+header #banner #logo-img {
+  height: 25px;
+  margin-top: 3px;
+}
+header #banner #logo-text {
+  font-size: 20px;
+  position: absolute;
+  top: 10%;
+}
+/* nav */
+nav {
+  width: 80%;
+  height: 32px;
+  position: fixed;
+  left: 22%;
+  top: 0px;
+  padding: 0px;
+  background: #1872a2;
+  color: #ffffff;
+  z-index: 99;
+  border-bottom: 1px;
+  border-bottom-color: black;
+  border-bottom-style: inset;
+}
+nav a,
+nav a:active,
+nav a:visited,
+nav a:link,
+nav a:hover {
+  color: #ffffff;
+  text-decoration: none;
+  outline: none;
+}
+nav #banner {
+  overflow: hidden;
+  /*text-align: center;*/
+  width: 100%;
+}
+nav #banner a,
+nav #banner a:active,
+nav #banner a:visited,
+nav #banner a:link,
+nav #banner a:hover {
+  color: #ffffff;
+  text-decoration: none;
+  outline: none;
+  vertical-align: bottom;
+}
+nav #banner #logo-img {
+  height: 22px;
+  margin-top: 5px;
+}
+nav #banner #logo-text {
+  font-size: 22px;
+}
+nav #navbar{
+	}
+nav ul {
+  margin: 0px;
+  padding: 0px 20px;
+}
+nav ul li {
+  list-style: none;
+  margin: 0px;
+  /* padding: 1px 1px 3px 1px; */
+  float: left;
+}
+nav ul li .menu-popup {
+  left: 0px;
+  right: auto;
+}
+
+nav #logo-img {
+  height: 25px;
+  margin-top: 4px;
+  margin-left: 30px;
+}
+
+nav #logo-text {
+    font-size: 22px;
+    margin-top: 3px;
+    margin-right: 15px;
+}
+nav .nav-menu-search {
+  position: relative;
+
+  margin: 4px 17px;
+  margin-right: 0px;
+  height: 17px;
+  width: 180px;
+  
+}
+
+nav #search-box #search-text {
+  background-image:  url('icons/lupe.png');
+  background-repeat:no-repeat;
+  padding-left:20px;
+  border-top-left-radius: 15px;
+border-top-right-radius: 15px;
+border-bottom-right-radius: 15px;
+border-bottom-left-radius: 15px;
+	}
+
+
+nav .nav-menu-icon {
+  position: relative;
+  height: 22px;
+  padding: 5px;
+  margin: 0px 5px;
+  -moz-border-radius: 5px 5px 0 0;
+  -webkit-border-radius: 5px 5px 0 0;
+  border-radius: 5px 5px 0 0;
+}
+nav .nav-menu-icon:hover {
+  background-color: #308dbf;  
+  position: relative;
+  height: 22px;
+  padding: 5px;
+  margin: 0px 5px;
+  -moz-border-radius: 5px 5px 0 0;
+  -webkit-border-radius: 5px 5px 0 0;
+  border-radius: 5px 5px 0 0;
+}
+
+nav .nav-menu-icon.selected {
+  background-color: #fff;
+}
+nav .nav-menu-icon img {
+  width: 22px;
+  height: 22px;
+}
+nav .nav-menu-icon .nav-notify {
+  top: 3px;
+}
+nav .nav-menu {
+  position: relative;
+  height: 16px;
+  padding: 5px;
+  margin: 3px 15px 0px;
+  font-size: 13px;
+  /*border-bottom: 3px solid #364A84;*/
+}
+nav .nav-menu.selected {
+  /*border-bottom: 3px solid #9eabb0;*/
+}
+nav .nav-notify {
+  display: none;
+  position: absolute;
+  background-color: #ff0000;
+  /* background-color: #19aeff; */
+  -moz-border-radius: 5px 5px 5px 5px;
+  -webkit-border-radius: 5px 5px 5px 5px;
+  border-radius: 5px 5px 5px 5px;
+  font-size: 10px;
+  font-weight: 900;
+  padding: 1px 4px;
+  top: 0px;
+  right: -6px;
+  min-width: 10px;
+  text-align: center;
+}
+nav .nav-notify.show {
+  display: block;
+}
+nav #nav-help-link,
+nav #nav-search-link,
+nav #nav-directory-link,
+nav #nav-apps-link,
+nav #nav-site-linkmenu, 
+nav #nav-home-link,
+nav #nav-user-linkmenu
+{
+  float: right;
+}
+nav #nav-user-linkmenu{
+	margin-right: 0px;
+	}
+nav #nav-home-link, #nav-directory-link, #nav-apps-link{
+	margin-left: 0px;
+	margin-right: 0px;
+	font-weight: bold;
+	margin: 3px 5px;
+	}
+nav #nav-directory-link{
+  margin-right: 0px;	
+	}
+nav #nav-home-link{
+  margin-left: 0px;	
+	}
+nav #nav-help-link .menu-popup,
+nav #nav-search-link .menu-popup,
+nav #nav-directory-link .menu-popup,
+nav #nav-apps-link .menu-popup,
+nav #nav-site-linkmenu .menu-popup {
+  right: 0px;
+  left: auto;
+}
+
+nav #nav-messages-linkmenu.on .icon.messages, nav #nav-messages-linkmenu.selected .icon.messages{
+	background-image: url("../diabook-blue/icons/messages2.png");
+	}
+	
+/*nav #nav-notifications-linkmenu.on .icon.notify,*/ nav #nav-notifications-linkmenu.selected .icon.notify{
+	background-image: url("../diabook-blue/icons/notify2.png");
+	}
+	
+nav #nav-contacts-linkmenu.on .icon.contacts, nav #nav-contacts-linkmenu.selected .icon.contacts{
+	background-image: url("../diabook-blue/icons/contacts2.png");
+	}
+	
+nav #nav-apps-link.selected {
+  background-color: #364e59;
+}
+
+#nav-notifications-mark-all {
+	/* padding: 1px 1px 2px 26px; */
+	/* border-bottom: 1px solid #364E59; */
+	/* margin: 0px 0px 2px 0px;
+	padding: 5px 10px; */
+}
+
+#nav-notifications-see-all {
+	/* padding: 1px 1px 2px 26px; */
+	/* border-bottom: 1px solid #364E59; */
+	/* margin: 0px 0px 2px 0px;
+	padding: 5px 10px; */
+}
+
+.notify-seen {
+	background: none repeat scroll 0 0 #DDDDDD;
+	}
+
+ul.menu-popup {
+  position: absolute;
+  display: none;
+  width: 11em;
+  background: #ffffff;
+  color: #2d2d2d;
+  margin: 0px;
+  padding: 0px;
+  list-style: none;
+  z-index: 100000;
+  -webkit-box-shadow: 0px 5px 10px rgba(0, 0, 0, 0.7);
+  -moz-box-shadow: 0px 5px 10px rgba(0, 0, 0, 0.7);
+  box-shadow: 0px 5px 10px rgba(0, 0, 0, 0.7);
+}
+ul.menu-popup a {
+  display: block;
+  color: #2d2d2d;
+  padding: 5px 10px;
+  text-decoration: none;
+}
+ul.menu-popup a:hover {
+  background-color: #308DBF; /*bdcdd4;*/
+  color: #fff;
+}
+ul.menu-popup .menu-sep {
+  border-top: 1px solid #9eabb0;
+}
+ul.menu-popup li {
+  float: none;
+  overflow: auto;
+  height: auto;
+  display: block;
+}
+ul.menu-popup li img {
+  float: left;
+  width: 16px;
+  height: 16px;
+  padding-right: 5px;
+}
+ul.menu-popup .empty {
+  padding: 5px;
+  text-align: center;
+  color: #9eabb0;
+}
+/* autocomplete popup */
+.acpopup {
+  max-height: 150px;
+  background-color: #ffffff;
+  color: #2d2d2d;
+  border: 1px solid #MenuBorder;
+  overflow: auto;
+  z-index: 100000;
+  -webkit-box-shadow: 0px 5px 10px rgba(0, 0, 0, 0.7);
+  -moz-box-shadow: 0px 5px 10px rgba(0, 0, 0, 0.7);
+  box-shadow: 0px 5px 10px rgba(0, 0, 0, 0.7);
+}
+.acpopupitem {
+  color: #2d2d2d;
+  padding: 4px;
+  clear: left;
+}
+.acpopupitem img {
+  float: left;
+  margin-right: 4px;
+}
+.acpopupitem.selected {
+  background-color: #bdcdd4;
+}
+#nav-notifications-menu {
+  width: 400px;
+  max-height: 550px;
+  overflow: auto;
+}
+/* #nav-notifications-menu a {
+	display: inline;
+	padding: 5px 0px;
+	margin: 0px 0px 2px 0px;
+}
+#nav-notifications-menu li:hover {
+  background-color: #bdcdd4;
+}*/
+
+#nav-notifications-menu img {
+  float: left;
+  margin-right: 5px;
+}
+#nav-notifications-menu .contactname {
+  font-weight: bold;
+}
+#nav-notifications-menu .notif-when {
+  font-size: 10px;
+  color: #9eabb0;
+  display: block;
+}
+
+.notif-image {
+        width: 32px;
+        height: 32px;
+        padding: 7px 7px 0px 0px;
+}
+
+/*profile_side*/
+#profile_side {
+  margin-bottom: 30px;
+}
+#ps-usericon{
+	height: 25px	
+	}
+#ps-username{
+  font-size: 1.17em;
+  font-weight: bold;
+  vertical-align: top;
+  position: absolute;
+  padding-top: 4px;
+  padding-left: 5px;	
+  word-wrap: break-word;
+  width: 130px;
+	}
+#ps-username:hover{
+  text-decoration: none;	
+	}
+.menu-profile-side{
+  list-style: none;	
+  padding-left: 0px;
+  min-height: 0px;
+	}
+.menu-profile-list{
+  height: auto;
+  overflow: auto;
+  min-height: 16px;
+  list-style: none;
+	}
+.menu-profile-list:hover{
+	background: #308DBF;
+	}
+.menu-profile-list-item{
+	padding-left: 5px;
+	vertical-align: middle;
+	}	
+.menu-profile-list-item:hover{	
+	text-decoration: none;
+	
+   }
+/*http://prothemedesign.com/circular-icons/*/
+.menu-profile-icon.home{
+	background: url("../diabook-blue/icons/home.png") no-repeat;
+	float: left;
+	height: 22px;
+   width: 22px;
+	}
+.menu-profile-icon.photos{
+	background: url("../diabook-blue/icons/mess_side.png") no-repeat;
+	float: left;
+	height: 22px;
+   width: 22px;}
+.menu-profile-icon.events{
+	background: url("../diabook-blue/icons/events.png") no-repeat;
+	float: left;
+	height: 22px;
+   width: 22px;}
+.menu-profile-icon.notes{
+	background: url("../diabook-blue/icons/notes.png") no-repeat;
+	float: left;
+	height: 22px;
+   width: 22px;}
+.menu-profile-icon.foren{
+	background: url("../diabook-blue/icons/pubgroups.png") no-repeat;
+	float: left;
+	height: 22px;
+   width: 22px;}
+.menu-profile-icon.com_side{
+	background: url("../diabook-blue/icons/com_side.png") no-repeat;
+	float: left;
+	height: 22px;
+   width: 22px;}
+.menu-profile-icon.pscontacts{
+	background: url("../diabook-blue/icons/pscontacts.png") no-repeat;
+	float: left;
+	height: 22px;
+   width: 22px;}
+/* aside */
+aside {
+  display: table-cell;
+  vertical-align: top;
+  width: 160px;
+  padding: 0px 10px 0px 10px;
+  border-right: 1px solid #D2D2D2;
+  float: left;
+  /* background: #F1F1F1; */
+}
+aside #page-sidebar{display: none;}
+aside .vcard .fn {
+  font-size: 18px;
+  font-weight: bold;
+  margin-bottom: 5px;
+}
+aside .vcard .title {
+  margin-bottom: 5px;
+}
+aside .vcard dl {
+  height: auto;
+  overflow: auto;
+}
+aside .vcard dt {
+  float: left;
+  margin-left: 0px;
+  /*width: 35%;*/
+  text-align: right;
+  color: #999999;
+}
+aside .vcard dd {
+  float: left;
+  margin-left: 5px;
+  /*width: 60%;*/
+}
+aside #profile-extra-links ul {
+  padding: 0px;
+  margin: 0px;
+}
+aside #profile-extra-links li {
+  padding: 0px;
+  margin: 0px;
+  list-style: none;
+}
+aside #dfrn-request-link {
+  display: block;
+  -moz-border-radius: 5px 5px 5px 5px;
+  -webkit-border-radius: 5px 5px 5px 5px;
+  border-radius: 5px 5px 5px 5px;
+  color: #ffffff;
+  background: #005c94 url('../../../../images/connect-bg.png') no-repeat left center;
+  font-weight: bold;
+  text-transform: uppercase;
+  padding: 4px 2px 2px 35px;
+}
+aside #dfrn-request-link:hover {
+  text-decoration: none;
+  background-color: #36c;
+  /* background-color: #19aeff; */
+}
+aside #profiles-menu {
+  width: 20em;
+}
+aside #search-text {
+	width: 150px;
+		height: 17px;
+		padding-left: 10px;
+	border-top-left-radius: 15px;
+border-top-right-radius: 15px;
+border-bottom-right-radius: 15px;
+border-bottom-left-radius: 15px;
+-moz-border-bottom-colors: #dbdbdb;
+  -moz-border-top-colors: #999;
+  -moz-border-left-colors: #999;
+  -moz-border-right-colors: #dbdbdb;
+}
+aside #side-follow-url {
+	width: 150px;
+	}
+aside #side-peoplefind-url {
+	width: 150px;
+	}
+#contact-block {
+  overflow: auto;
+  height: auto;
+}
+#contact-block .contact-block-h4 {
+  float: left;
+  margin: 5px 0px;
+}
+#contact-block .allcontact-link {
+  float: right;
+  margin: 5px 0px;
+}
+#contact-block .contact-block-content {
+  clear: both;
+  overflow: auto;
+  height: auto;
+}
+#contact-block .contact-block-link {
+  float: left;
+  margin: 0px 2px 2px 0px;
+}
+#contact-block .contact-block-link img {
+  widht: 55px;
+  height: 55px;
+}
+#lost-password-link {
+  float: left;
+  margin-right: 20px;	
+	}
+/* widget */
+.widget {
+  margin-bottom: 2em;
+  /*.action .s10 { width: 10px; overflow: hidden; padding: 0px;}
+	.action .s16 { width: 16px; overflow: hidden; padding: 0px;}*/
+/*  font-size: 12px; */
+}
+.widget h3 {
+  padding: 0px;
+  margin: 2px;
+}
+.widget .action {
+  opacity: 0.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;
+}
+.widget input.action {
+  opacity: 0.5;
+  -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;
+}
+.widget:hover .title .action {
+  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;
+}
+.widget .tool:hover .action {
+  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;
+}
+.widget .tool:hover .action.ticked {
+  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;
+}
+.widget ul {
+  padding: 0px;
+}
+.widget ul li {
+  padding-left: 16px;
+  min-height: 16px;
+  list-style: none;
+}
+#side-bar-photos-albums li{
+list-style-type: disc;
+}
+#side-bar-photos-albums ul li{
+  margin-left: 30px;
+  padding-left: 0px;
+	}
+#side-bar-photos-albums ul li a{
+  color: #1872A2;
+}
+.widget .tool.selected {
+  background: url("../diabook-blue/icons/selected.png") no-repeat left center;
+}
+/* widget: search */
+span.sbox_l  {
+	background: white url('../diabook/icons/srch_l.gif') no-repeat top left;
+	float: left;
+	width: 19px; height: 19px;
+	margin-left: 10px;
+	margin-top: 5px;
+	
+}
+
+span.sbox_r  {
+	background: white url('../diabook/icons/srch_r.gif') no-repeat top left;
+	float: left;
+	width: 19px; height: 19px;
+	margin-top: 5px;
+}
+
+span.sbox input {
+	background: white url('../diabook/icons/srch_bg.gif') repeat-x top left;
+	float: left;
+	margin-top: 5px;
+	border: 0;
+	height: 13px; width: 100px;
+	padding: 3px;
+	font: 11px/13px arial;
+	color: #000;
+}
+#add-search-popup {
+  width: 200px;
+  top: 18px;
+}
+/* section */
+section {
+  display: table-cell;
+  vertical-align: top;
+  width: auto;
+  padding: 0px 0px 0px 12px;
+}
+
+body .pageheader{
+  text-align: center;
+  font-size: 20px;
+  margin-bottom: 20px;
+  margin-top: 0px;
+  max-width: 575px;
+	}
+.qcomment{
+  max-width: 122px;	
+	}
+#id_username {
+  width: 173px;	
+	}
+#id_password {
+  width: 173px;		
+	}
+#id_openid_url {
+  width: 173px;	
+	}
+#contact-edit-end {
+	}
+.pager {
+   padding: 10px;
+	text-align: center;
+	font-size: 1.0em;
+	clear: both;
+	display: block;
+}	
+
+.tabs {
+    
+    background-position: 0 -20px;
+    background-repeat: repeat-x;
+    height: 27px;
+    padding: 0;
+ }
+.tab.button {
+    margin-left: 5px;	
+    /*background: none repeat scroll 0 0 #F8F8F8;*/
+    border: 1px solid #CCCCCC;
+    border-radius: 3px 3px 3px 3px;
+    font-weight: normal;
+    padding: 3px;
+    color:  #333333;
+	}
+	
+#birthday-notice, #event-notice, #birthday-wrapper, #event-wrapper{
+	margin-bottom: 10px;
+	}
+
+right_aside {
+  display: table-cell;
+  vertical-align: top;
+  width: 170px;
+  
+  /*border-left: 1px solid #D2D2D2;*/
+  
+  /* background: #F1F1F1; */
+}
+right_aside a{color: #1872A2;}
+right_aside h3 {border-bottom: 1px solid #D2D2D2; padding-top: 5px; padding-bottom: 0px; padding-left: 9px; margin-bottom: 0px; 
+margin-top:30px;}
+right_aside .directory-item {	width: 50px; height: 50px; vertical-align: center; text-align: center; }
+right_aside .directory-photo { margin: 0px; }
+right_aside .directory-photo-img { max-width: 45px; max-height: 45px; }
+right_aside #likes { margin: 0px; padding: 0px; list-style: none; }
+right_aside .items-wrapper{ overflow: auto;	width: 100%; }
+right_aside #lastusers-wrapper { padding-left: 6px; padding-top: 3px; overflow: auto;	width: 100%; }
+right_aside #ra-photos-wrapper { padding-left: 5px; padding-top: 3px; overflow: auto;	width: 100%; }
+#page-sidebar-right_aside{margin-top: 0px; margin-bottom: 30px;}
+#page-sidebar-right_aside ul {margin-top: 0px;}
+#page-sidebar-right_aside .label {max-width: 128px;}
+right_aside .icon {width: 10px; height: 10px;}
+.close_box		{ 
+		background-image: url("../diabook-blue/icons/close_box.png");
+		float: right;
+		cursor: pointer;
+		opacity: 0.1;
+		}
+.close_box:hover	{ 
+		background-image: url("../diabook-blue/icons/close_box.png");
+		float: right;
+		cursor: pointer;
+		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;
+		}
+		
+/* wall item */
+.tread-wrapper {
+  border-bottom: 1px solid #D2D2D2;
+  position: relative;
+  padding: 5px;
+  margin-bottom: 0px;
+  width: 575px;
+  padding-top: 10px;
+}
+.tread-wrapper a{
+  color: #1872A2;
+}
+
+.wall-item-decor {
+  position: absolute;
+  left: 790px;
+  top: -10px;
+  width: 16px;
+}
+
+.wall-item-container {
+  display: table;
+  width: 580px;
+}
+
+
+.wall-item-container .wall-item-item, .wall-item-container .wall-item-bottom {
+  display: table-row;
+}
+
+.wall-item-bottom {
+  font-size: 13px;
+}
+.wall-item-container .wall-item-bottom {
+/*  opacity: 0.5;
+  -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; */
+}
+.wall-item-container:hover .wall-item-bottom {
+/*  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; */
+}
+.wall-item-container .wall-item-info {
+  display: table-cell;
+  vertical-align: top;
+  text-align: left;
+  width: 80px;
+}
+.wall-item-container .wall-item-location {
+  padding-right: 40px;
+  display: table-cell;
+}
+.wall-item-container .wall-item-ago {
+  word-wrap: break-word;
+  width: 50px;
+  margin-left: 10px;
+  color: #999;
+}
+.wall-item-location {
+  
+  clear: both;
+  overflow: hidden;
+  
+  margin-bottom: 5px;
+}
+
+.wall-item-container .wall-item-content {
+
+  max-width: 420px;
+  word-wrap: break-word;
+
+
+}
+
+.wall-item-container .wall-item-content img {
+  max-width: 400px; 
+
+}
+.wall-item-container .wall-item-links, .wall-item-container .wall-item-actions {
+  display: table-cell;
+  vertical-align: middle;
+}
+.wall-item-container .wall-item-links .icon, .wall-item-container .wall-item-actions .icon {
+  opacity: 0.5;
+  -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;
+}
+.wall-item-container .wall-item-links .icon:hover, .wall-item-container .wall-item-actions .icon: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;
+}
+.wall-item-container .wall-item-name {
+  font-weight: bold;
+}
+.wall-item-container .wall-item-actions-author {
+  width: 100%;
+  margin-bottom: 0.3em;
+}
+.wall-item-container .wall-item-actions-social {
+  float: left;
+  margin-bottom: 1px;
+  display: table-cell;
+}
+.wall-item-container .wall-item-actions-social a {
+  margin-right: 1em;
+}
+.wall-item-actions-social a {
+  float: left;
+}
+.wall-item-container .wall-item-actions-tools {
+  float: right;
+  width: 80px;
+  display: table-cell;
+}
+.wall-item-container .wall-item-actions-tools a {
+  float: right;
+}
+.wall-item-container .wall-item-actions-tools input {
+  float: right;
+}
+.wall-item-container.comment {
+  margin-top: 5px;
+  margin-bottom: 5px;
+  margin-left: 80px;
+  width: 500px;
+  border-bottom: 1px solid hsl(198, 21%, 79%);
+}
+.wall-item-container.comment .contact-photo {
+  width: 32px;
+  height: 32px;
+  margin-left: 16px;
+  /*background: url(../../../../images/icons/22/user.png) no-repeat center center;*/
+
+}
+.wall-item-container.comment {
+  top: 15px !important;
+  left: 15px !important;
+}
+.wall-item-container.comment .wall-item-links {
+  padding-left: 12px;
+}
+
+.wall-item-comment-wrapper {
+  margin: 1px 5px 5px 80px;
+  background-color: #fff;
+  width: 500px;
+}
+.wall-item-comment-wrapper .comment-edit-photo {
+  display: none;
+}
+.wall-item-comment-wrapper textarea {
+  height: 2.0em;
+  width: 100%;
+  font-size: 10px;
+  color: #999999;
+  border: 1px solid #DDD;
+  padding: 0.3em;
+  font-size: 14px;
+}
+.wall-item-comment-wrapper .comment-edit-text-full {
+  font-size: 14px;
+  height: 4em;
+  color: #2d2d2d;
+  border: 1px solid #2d2d2d;
+}
+.comment-edit-preview {
+  width: 500px;
+  margin-top: 10px;
+  background-color:  #fff797;
+}
+.comment-edit-preview .contact-photo {
+  width: 32px;
+  height: 32px;
+  margin-left: 16px;
+  /*background: url(../../../../images/icons/22/user.png) no-repeat center center;*/
+
+}
+.comment-edit-preview {
+  top: 15px !important;
+  left: 15px !important;
+}
+.comment-edit-preview .wall-item-links {
+  padding-left: 12px;
+}
+.comment-edit-preview .wall-item-container {
+  width: 700px;
+}
+.comment-edit-preview .tread-wrapper {
+  width: 700px;
+  padding: 0;
+  margin: 10px 0;
+}
+
+.shiny {
+  /* border-right: 10px solid #fce94f; */
+	border-right: 1px solid #A7C7F7;
+	padding-right: 12px;
+}
+
+#jot-preview-content{
+	margin-top: 30px;}
+	
+#jot-preview-content .tread-wrapper {
+  background-color: #fff797;
+}
+
+.wall-item-tags {
+  padding-top: 1px;
+  padding-bottom: 2px;
+}
+.tag {
+  /*background: url("../../../../images/tag_b.png") repeat-x center left;*/
+  color: #999;
+  padding-left: 3px;
+  font-size: 12px;
+}
+.tag a {
+  padding-right: 5px;
+  /*background: url("../../../../images/tag.png") no-repeat center right;*/
+  color: #999;
+}
+.wwto {
+  position: absolute !important;
+  width: 25px;
+  height: 25px;
+  background: #FFFFFF;
+  border: 2px solid #364e59;
+  height: 25px;
+  width: 25px;
+  overflow: hidden;
+  padding: 1px;
+  position: absolute !important;
+  top: 40px;
+  left: 30px;
+  -webkit-box-shadow: 0px 0px 10px rgba(0, 0, 0, 0.7);
+  -moz-box-shadow: 0px 0px 10px rgba(0, 0, 0, 0.7);
+  box-shadow: 0px 0px 10px rgba(0, 0, 0, 0.7);
+}
+.wwto .contact-photo {
+  width: auto;
+  height: 25px;
+}
+/* contacts menu */
+.contact-photo-wrapper {
+  position: relative;
+  width: 80px;
+}
+
+.contact-photo-wrapper.wwto {
+  width: 25px;
+}
+
+.contact-photo {
+  width: 48px;
+  height: 48px;
+  overflow: hidden;
+  display: block;
+}
+.contact-photo img {
+  width: 48px;
+  height: 48px;
+}
+
+.contact-wrapper {
+  float: left;
+  width: 90px;
+  height: 90px;
+  margin-bottom: 15px;
+}
+.contact-wrapper .contact-photo {
+  width: 80px;
+  height: 80px;
+}
+.contact-wrapper .contact-photo img {
+  width: 80px;
+  height: 80px;
+}
+.contact-wrapper {
+  left: 0px;
+  top: 63px;
+}
+.contact-photo {
+  width: 48px;
+  height: 48px;
+}
+.contact-photo img {
+  width: 48px;
+  height: 48px;
+}
+.contact-name {
+  /* text-align: center; */
+  /*font-weight: bold;*/
+  font-size: 12px;
+}
+.contact-details {
+  color: #999999;
+}
+/* editor */
+.jothidden {
+  display: none;
+}
+#jot {
+  width: 585px;
+  margin: 0px 2em 20px 0px;
+}
+#profile-jot-form #profile-jot-text {
+  height: 2.0em;
+  width: 99%;
+  font-size: 15px;
+  color: #999999;
+  border: 1px solid #DDD;
+  padding: 0.3em;
+  margin-bottom: 10px;
+}
+.grey
+{
+  display: inline;
+  float: right;	
+	}
+#jot #jot-tools {
+  margin: 0px;
+  padding: 0px;
+  height: 40px;
+  overflow: none;
+  width: 583px;
+  background-color: #fff;
+  border-bottom: 2px solid #9eabb0;
+}
+
+#jot #jot-tools li {
+  list-style: none;
+  float: left;
+  width: 80px;
+  height: 40px;
+  border-bottom: 2px solid #9eabb0;
+}
+#jot #jot-tools li a {
+  display: block;
+  color: #cccccc;
+  width: 100%;
+  height: 40px;
+  text-align: center;
+  line-height: 40px;
+  overflow: hidden;
+}
+#jot #jot-tools li:hover {
+  background-color: #364e59;
+  border-bottom: 2px solid #bdcdd4;
+}
+#jot #jot-tools li.perms {
+  float: right;
+  width: 40px;
+}
+#jot #jot-tools li.perms a.unlock {
+  width: 30px;
+  border-left: 10px solid #cccccc;
+  background-color: #cccccc;
+  background-position: left center;
+}
+#jot #jot-tools li.perms a.lock {
+  width: 30px;
+  border-left: 10px solid #666666;
+  background-color: #666666;
+}
+#jot #jot-tools li.submit {
+  float: right;
+  background-color: #cccccc;
+  border-bottom: 2px solid #cccccc;
+  border-right: 1px solid #666666;
+  border-left: 1px solid #666666;
+}
+#jot #jot-tools li.submit input {
+  border: 0px;
+  margin: 0px;
+  padding: 0px;
+  background-color: #cccccc;
+  color: #666666;
+  width: 80px;
+  height: 40px;
+  line-height: 40px;
+}
+#jot #jot-tools li.submit input:hover {
+  background-color: #bdcdd4;
+  color: #666666;
+}
+#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;
+}
+#profile-jot-form #jot-title {
+    
+  	 border-radius: 5px 5px 5px 5px;
+    font-weight: bold;
+    height: 20px;
+    margin: 0 0 5px;
+    width: 60%;
+    border: 1px solid #d2d2d2;
+}
+#profile-jot-form #jot-title:-webkit-input-placeholder {
+  font-weight: normal;
+}
+#profile-jot-form #jot-title:-moz-placeholder {
+  font-weight: normal;
+}
+#profile-jot-form #profile-jot-text_parent #profile-jot-text_tbl{
+	width: 585px;
+	height: 100px;
+	}
+#jot #jot-title:hover {
+  border: 1px solid #999999;
+}
+#jot #jot-title:focus {
+  border: 1px solid #999999;
+}
+#jot #character-counter {
+  width: 80px;
+  float: right;
+  text-align: right;
+  height: 20px;
+  line-height: 20px;
+  padding-right: 20px;
+}
+#jot-perms-icon, 
+#profile-location,
+#profile-nolocation,
+#profile-youtube, 
+#profile-video, 
+#profile-audio,
+#profile-link,
+#profile-title, 
+#wall-image-upload,
+#wall-file-upload,
+#wall-image-upload-div,
+#wall-file-upload-div,
+.hover, .focus {
+	cursor: pointer;
+	margin-top: 2px;
+}
+#profile-jot-wrapper{
+	margin: 0 2em 20px 0;
+   width: 585px;
+	}
+
+#profile-jot-submit-wrapper {
+	margin-bottom: 50px;
+	width: 585px;
+}
+
+#profile-jot-submit {
+	float: right;
+	margin-top: 2px;
+	font-size: 14px;
+}
+#profile-upload-wrapper {
+	float: left;
+	margin-top: 2px;
+	margin-left: 10px;
+	
+}
+#profile-attach-wrapper {
+	float: left;
+	margin-left: 15px;
+	margin-top: 2px;
+}
+#profile-rotator {
+	float: left;
+	margin-left: 30px;
+	margin-top: 2px;
+}
+#profile-link-wrapper {
+	float: left;
+	margin-left: 15px;
+	margin-top: 2px;
+}
+#profile-youtube-wrapper {
+	float: left;
+	margin-left: 15px;
+	margin-top: 2px;
+}
+#profile-video-wrapper {
+	float: left;
+	margin-left: 15px;
+	margin-top: 2px;
+}
+#profile-audio-wrapper {
+	float: left;
+	margin-left: 15px;
+	margin-top: 2px;
+}
+#profile-location-wrapper {
+	float: left;
+	margin-left: 15px;
+	margin-top: 2px;
+}
+#profile-jot-perms {
+	float: left;
+	margin-left: 45px;
+	margin-top: 2px;
+}
+#jot-preview-link {
+	float: right;
+	margin-left: 10px;
+	margin-top: 2px;
+	font-size: 9px;
+	font-weight: bolder;
+	cursor: pointer;
+}
+#profile-jot-perms{
+   float: right;
+	margin-left: 10px;
+	margin-top: 2px;	
+	}
+/** buttons **/
+.button.creation1 {
+    background-color: #fff;
+    border: 1px solid #777777;
+    border-radius: 3px 3px 3px 3px;
+    box-shadow: 0 1px 1px #CFCFCF;
+    cursor: pointer;
+    font-weight: bolder;
+}
+.button.creation2 {
+    background-color: #055580;
+    border: 1px solid #777777;
+    color: white;
+    border-radius: 3px 3px 3px 3px;
+    box-shadow: 0 1px 1px #CFCFCF;
+    margin-left: 5px;
+    cursor: pointer;
+    font-weight: bolder;
+}
+/*input[type="submit"] {
+	border: 0px;
+    background-color: @ButtonBackgroundColor;
+    color: @ButtonColor;
+    padding: 0px 10px;
+	.rounded(5px);
+    height: 18px;
+}*/
+/** acl **/
+#photo-edit-perms-select, #photos-upload-permissions-wrapper, #profile-jot-acl-wrapper {
+  display: block!important;
+}
+#acl-wrapper {
+  width: 690px;
+  float: left;
+}
+#acl-search {
+  float: right;
+  background: #ffffff url("../../../../images/search_18.png") no-repeat right center;
+  padding-right: 20px;
+}
+#acl-showall {
+  float: left;
+  display: block;
+  width: auto;
+  height: 18px;
+  background-color: #cccccc;
+  background-image: url("../../../../images/show_all_off.png");
+  background-position: 7px 7px;
+  background-repeat: no-repeat;
+  padding: 7px 5px 0px 30px;
+  color: #999999;
+  -moz-border-radius: 5px 5px 5px 5px;
+  -webkit-border-radius: 5px 5px 5px 5px;
+  border-radius: 5px 5px 5px 5px;
+}
+#acl-showall.selected {
+  color: #000000;
+  background-color: #ff9900;
+  background-image: url("../../../../images/show_all_on.png");
+}
+#acl-list {
+  height: 210px;
+  border: 1px solid #cccccc;
+  clear: both;
+  margin-top: 30px;
+  overflow: auto;
+}
+.acl-list-item {
+  display: block;
+  width: 150px;
+  height: 30px;
+  border: 1px solid #cccccc;
+  margin: 5px;
+  float: left;
+}
+.acl-list-item img {
+  width: 22px;
+  height: 22px;
+  float: left;
+  margin: 4px;
+}
+.acl-list-item p {
+  height: 12px;
+  font-size: 10px;
+  margin: 0px;
+  padding: 2px 0px 1px;
+  overflow: hidden;
+}
+.acl-list-item a {
+  font-size: 8px;
+  display: block;
+  width: 40px;
+  height: 10px;
+  float: left;
+  color: #999999;
+  background-color: #cccccc;
+  background-position: 3px 3px;
+  background-repeat: no-repeat;
+  margin-right: 5px;
+  -webkit-border-radius: 2px ;
+  -moz-border-radius: 2px;
+  border-radius: 2px;
+  padding-left: 15px;
+}
+#acl-wrapper a:hover {
+  text-decoration: none;
+  color: #000000;
+}
+.acl-button-show {
+  background-image: url("../../../../images/show_off.png");
+}
+.acl-button-hide {
+  background-image: url("../../../../images/hide_off.png");
+}
+.acl-button-show.selected {
+  color: #000000;
+  background-color: #9ade00;
+  background-image: url("../../../../images/show_on.png");
+}
+.acl-button-hide.selected {
+  color: #000000;
+  background-color: #ff4141;
+  background-image: url("../../../../images/hide_on.png");
+}
+.acl-list-item.groupshow {
+  border-color: #9ade00;
+}
+.acl-list-item.grouphide {
+  border-color: #ff4141;
+}
+/** /acl **/
+/** tab buttons 14618a**/
+ul.tabs {
+  list-style-type: none;
+  padding-bottom: 10px;
+  font-size: 13px;
+}
+ul.tabs li {
+  float: left;
+  margin-left: 5px;
+}
+ul.tabs li .active {
+    background-color: #055580;
+    border: 1px solid #777777;
+    color: white;
+    border-radius: 3px 3px 3px 3px;
+    box-shadow: 0 1px 1px #CFCFCF;
+    margin-left: 5px;
+}
+/**
+ * Form fields
+ */
+.field {
+  margin-bottom: 10px;
+  padding-bottom: 10px;
+  overflow: auto;
+  width: 100%;
+}
+.field label {
+  float: left;
+  width: 200px;
+}
+.field input, .field textarea {
+  width: 400px;
+}
+.field textarea {
+  height: 100px;
+}
+.field .field_help {
+  display: block;
+  margin-left: 200px;
+  color: #666666;
+}
+.field .onoff {
+  float: left;
+  width: 80px;
+}
+.field .onoff a {
+  display: block;
+  border: 1px solid #666666;
+  background-image: url("../../../../images/onoff.jpg");
+  background-repeat: no-repeat;
+  padding: 4px 2px 2px 2px;
+  height: 16px;
+  text-decoration: none;
+}
+.field .onoff .off {
+  border-color: #666666;
+  padding-left: 40px;
+  background-position: left center;
+  background-color: #cccccc;
+  color: #666666;
+  text-align: right;
+}
+.field .onoff .on {
+  border-color: #204A87;
+  padding-right: 40px;
+  background-position: right center;
+  background-color: #D7E3F1;
+  color: #204A87;
+  text-align: left;
+}
+.field .hidden {
+  display: none!important;
+}
+.field.radio .field_help {
+  margin-left: 0px;
+}
+#directory-search-form{
+	margin-bottom: 50px;
+	}
+#profile-edit-links-end {
+        clear: both;
+        margin-bottom: 15px;
+}
+
+#profile-edit-links ul { margin: 20px; padding-bottom: 20px; list-style: none; }
+
+#profile-edit-links li {
+  float: left;
+  list-style: none;
+  margin-left: 10px;
+}
+
+.profile-edit-side-div {
+  display: none;
+}
+
+#register-form label,
+#profile-edit-form label {
+        width: 300px; float: left;
+}
+
+.required {
+  display: inline;
+  color: #B20202;
+}
+
+/* oauth */
+.oauthapp {
+  height: auto;
+  overflow: auto;
+  border-bottom: 2px solid #cccccc;
+  padding-bottom: 1em;
+  margin-bottom: 1em;
+}
+.oauthapp img {
+  float: left;
+  width: 48px;
+  height: 48px;
+  margin: 10px;
+}
+.oauthapp img.noicon {
+  background-image: url("../../../../images/icons/48/plugin.png");
+  background-position: center center;
+  background-repeat: no-repeat;
+}
+.oauthapp a {
+  float: left;
+}
+/* contacts */
+.contact-entry-wrapper {
+  width: 120px;
+  height: 120px;
+  float: left;
+}
+/* photo */
+.photo {
+box-shadow: 2px 2px 5px 0px #000000;
+margin: 0px;
+border-radius: 10px;
+height: 145px !important;
+width: 145px !important;
+}
+.lframe {
+  float: left;
+  /*margin: 0px 10px 10px 0px;*/
+}
+/* profile match wrapper */
+.profile-match-wrapper {
+  float: left;
+  width: 90px;
+  height: 90px;
+  margin-bottom: 20px;
+}
+.profile-match-wrapper .contact-photo {
+  width: 80px;
+  height: 80px;
+}
+.profile-match-wrapper .contact-photo img {
+  width: 80px;
+  height: 80px;
+}
+.profile-match-wrapper {
+  left: 0px;
+  top: 63px;
+}
+
+.contact-photo-menu-button {
+        position: relative;
+        background-image: url("../../../../images/icons/16/menu.png");
+        background-position: top left; 
+        background-repeat: no-repeat;
+        margin: 0px 0px -16px 0px; 
+	padding: 0px;
+        width: 16px;
+        height: 16px;
+        top: -20px; left:0px;
+        overflow: hidden;
+        text-indent: 40px;
+        display: none;
+        
+}
+.contact-photo-menu {
+        width: 11em;
+        border: 3px solid #364e59;
+	color: #2d2d2d;
+        background: #FFFFFF;
+/*        position: absolute;*/
+        position: relative;
+        left: 0px; top: 0px;
+        display: none;
+        z-index: 10000;
+}
+.contact-photo-menu ul { margin:0px; padding: 0px; list-style: none }
+.contact-photo-menu li a {
+	display: block; 
+	padding: 5px 10px; 
+	color: #2d2d2d;
+	text-decoration: none;
+}
+.contact-photo-menu li a:hover {
+	background-color: #bdcdd4; 
+}
+
+/* page footer */
+footer {
+  height: 100px;
+  display: table-row;
+}
+
+blockquote {
+    border-left: 1px solid #D2D2D2;
+    padding-left: 9px;
+    margin: 0 0 0 .8ex;
+	 color: #777;
+}
+.oembed {
+	
+	font-weight: bold;
+}
+.aprofile dt{
+box-shadow: 1px 1px 5px 0;
+    color: #666666;
+    margin: 15px 0 5px;
+    padding-left: 5px;	
+	}
+/* ================== */
+/* = Contacts Block = */
+/* ================== */
+
+.contact-block-img {
+        width: 55px;
+        height: 55px;
+        padding-right: 3px;
+}
+.contact-block-div {
+        float: left;
+}
+
+.contact-block-textdiv { width: 150px; height: 34px; float: left; }
+#contact-block-end { clear: both; } 
+
+#group-edit-wrapper {
+        margin-bottom: 10px;
+}
+
+#group-members-end {
+        clear: both;
+}
+#group-edit-desc {
+ margin-top: 15px;
+}
+
+/*
+#group-separator,
+#prof-separator { display: none;}
+*/
+#prof-members-end{
+	clear: both;
+	}
+
+#prvmail-to-label, #prvmail-subject-label, #prvmail-message-label {
+	margin-bottom: 10px;
+	margin-top: 20px;
+}
+
+#prvmail-submit {
+	float: right;
+	margin-top: 10px;
+}
+
+#prvmail-subject
+{
+background: none repeat scroll 0 0 #FFFFFF;
+border: 1px solid #CCCCCC;
+border-radius: 5px 5px 5px 5px;
+font-weight: bold;
+height: 20px;
+margin: 0 0 5px;
+vertical-align: middle;
+}
+#prvmail-form{
+ width: 597px;	
+	}
+	
+#prvmail-upload-wrapper,
+#prvmail-link-wrapper,
+#prvmail-rotator-wrapper {
+	float: left;
+	margin-top: 10px;
+	margin-right: 10px;
+	width: 24px;
+}
+
+#prvmail-end {
+	clear: both;
+}
+
+.mail-list-sender,
+.mail-list-detail {
+	float: left;
+}
+.mail-list-detail {
+	margin-left: 20px;
+}
+
+.mail-list-subject {
+	font-size: 1.1em;
+	margin-top: 10px;
+}
+a.mail-list-link {
+    display: block;
+    font-size: 1.3em;
+    padding: 4px 0;
+}
+
+/*
+*a.mail-list-link:hover {
+*	background-color: #15607B;
+*	color: #F5F6FB;
+*}
+*/
+
+.mail-list-outside-wrapper-end {
+	clear: both;
+}
+
+.mail-list-outside-wrapper {
+	margin-top: 30px;
+}
+
+.mail-list-delete-wrapper {
+	float: right;
+	margin-right: 30px;
+	margin-top: 15px;
+}
+
+.mail-list-delete-icon {
+	border: none;
+}
+
+.mail-conv-sender,
+.mail-conv-detail {
+	float: left;
+}
+.mail-conv-detail {
+	margin-left: 20px;
+	width: 500px;
+}
+
+.mail-conv-subject {
+    font-size: 1.4em;
+    margin: 10px 0;
+}
+
+.mail-conv-outside-wrapper-end {
+	clear: both;
+}
+
+.mail-conv-outside-wrapper {
+	margin-top: 30px;
+}
+
+.mail-conv-delete-wrapper {
+	float: right;
+	margin-right: 30px;
+	margin-top: 15px;
+}
+.mail-conv-break {
+	clear: both;
+}
+
+.mail-conv-delete-icon {
+	border: none;
+}
+
+/* ========== */
+/* = Events = */
+/* ========== */
+.eventcal {
+        float: left;
+        font-size: 20px;
+}
+
+.vevent {
+
+}
+.vevent .event-description, .vevent .event-location {
+        margin-left: 10px;
+        margin-right: 10px;
+}
+.vevent .event-start {
+        margin-left: 10px;
+        margin-right: 10px;
+}
+
+#new-event-link {
+        margin-bottom: 10px;
+}
+
+.edit-event-link, .plink-event-link {
+        float: left;
+        margin-top: 4px;
+        margin-right: 4px;
+        margin-bottom: 15px;
+}
+
+.event-description:before {
+        content: url('../../../../images/calendar.png');
+        margin-right: 15px;
+}
+
+.event-start, .event-end {
+        margin-left: 10px;
+        width: 330px;
+        clear: both;
+}
+
+.event-start .dtstart, .event-end .dtend {
+        float: right;
+}
+
+.event-list-date {
+        margin-bottom: 10px;
+}
+
+.prevcal, .nextcal {
+        float: left;
+        margin-left: 32px;
+        margin-right: 32px;
+        margin-top: 64px;
+}
+.event-calendar-end {
+        clear: both;
+}
+
+ 
+.calendar {
+        font-family: Courier, monospace;
+}
+.calendar.eventcal a {
+  color: #1872A2;	
+	}
+.today {
+        font-weight: bold;
+        color: #FF0000;
+}
+
+.settings-block {
+        border: 1px solid #AAA;
+        margin: 10px;
+        padding: 10px;
+}
+
+.app-title {
+        margin: 10px;
+}
+
+#identity-manage-desc {
+        margin-top:15px;
+        margin-bottom: 15px;
+}
+
+#identity-manage-choose {
+        margin-bottom: 15px;
+}
+
+#identity-submit {
+        margin-top: 20px;
+}
+
+#photo-prev-link, #photo-next-link {
+        padding: 10px;
+        float: left;
+}
+.lightbox{
+	float: left;
+	}
+
+#photo-photo {
+        float: left;
+}
+#photo-like-div .wall-item-like-buttons {
+	 float: left;
+    margin-right: 5px;
+    margin-top: 30px;
+	}
+.comment-edit-text-empty {
+    margin: 10px 0 0;
+    width: 85%;
+}
+.comment-edit-photo {
+    margin: 10px 0 0;
+}
+.wall-item-like-buttons .icon.like {
+float: left;
+}
+
+#photo-photo-end {
+        clear: both;
+}
+
+.tabs .comment-wwedit-wrapper {
+	display: block;
+   margin-top: 30px;
+   margin-left: 50px;
+	}
+
+.profile-match-photo {
+        float: left;
+        text-align: center;
+        width: 120px;
+}
+
+.profile-match-name {
+        float: left;
+        text-align: center;
+        width: 120px;
+        overflow: hidden;
+}
+
+.profile-match-break,
+.profile-match-end {
+        clear: both;
+}
+
+.profile-match-connect {
+        text-align: center;
+        font-weight: bold;
+}
+
+.profile-match-wrapper {
+        float: left;
+        padding: 10px;
+        width: 120px;
+        height: 120px;
+        scroll: auto;
+}
+#profile-match-wrapper-end {
+        clear: both;
+}
+
+/* ============= */
+/* = Directory = */
+/* ============= */
+/* contacts menu */
+.contact-photo-wrapper {
+  position: relative;
+}
+.contact-photo {
+  width: 48px;
+  height: 48px;
+  overflow: hidden;
+  display: block;
+}
+.contact-photo img {
+  width: 48px;
+  height: 48px;
+}
+.contact-photo-menu-button {
+  display: none;
+  /* position: absolute; */
+  /* position: absolute; */
+  left: 0px;
+  top: -16px;
+}
+.contact-wrapper {
+  float: left;
+  width: 90px;
+  height: 90px;
+  margin-bottom: 15px;
+}
+.contact-wrapper .contact-photo {
+  width: 80px;
+  height: 80px;
+}
+.contact-wrapper .contact-photo img {
+  width: 80px;
+  height: 80px;
+}
+.contact-wrapper .contact-photo-menu-button {
+  left: 0px;
+  top: 63px;
+}
+.directory-item {
+  float: left;
+  width: 200px;
+  height: 200px;
+}
+.directory-item .contact-photo {
+  width: 175px;
+  height: 175px;
+}
+.directory-item .contact-photo img {
+  width: 175px;
+  height: 175px;
+}
+.contact-name {
+  text-align: left;
+  font-weight: bold;
+  font-size: 12px;
+}
+.contact-details {
+  color: #999999;
+}
+#side-bar-photos-albums li{
+list-style-type: disc;
+}
+#side-bar-photos-albums ul li{
+  margin-left: 30px;
+  padding-left: 0px;
+	}
+#side-bar-photos-albums{
+	margin-top: 15px;	
+	}
+.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-album-image-wrapper, .photo-top-image-wrapper {
+  float: left;
+   -moz-box-shadow: 0 0 5px #888;
+   -webkit-box-shadow: 0 0 5px #888;
+   box-shadow: 0 0 5px #888;
+  background-color: #000;
+   -webkit-border-radius: 5px;
+   -moz-border-radius: 5px;
+  border-radius: 5px;
+  padding-bottom: 20px;
+  position: relative;
+  margin: 0 10px 10px 0;
+  width: 200px; height: 140px;
+  overflow: hidden;  
+}
+.photo-top-album-name {
+        width: 100%;
+        position: absolute; 
+        bottom: 0px; 
+        padding-left: 3px;
+        background-color: #EEE;
+}
+.photo-top-album-link{
+  color: #1872A2;
+	}
+.photo-top-album-img{
+	
+	}
+/*.photo-top-image-wrapper {
+        position: relative;
+        float: left;
+        margin-top: 15px;
+        margin-right: 15px;
+        width: 200px; height: 200px; 
+        overflow: hidden; 
+}
+.photo-top-album-name {
+        width: 100%;
+        min-height: 2em;
+        position: absolute; 
+        bottom: 0px; 
+        padding: 0px 3px;
+        padding-top: 0.5em;
+        background-color: rgb(255, 255, 255);
+}*/
+#photo-top-end {
+        clear: both;
+}
+
+#photo-top-links {
+        margin-bottom: 30px;
+        margin-left: 30px;
+}
+
+#photos-upload-newalbum-div {
+        float: left;
+        width: 175px;
+}
+
diff --git a/view/theme/diabook-blue/style-settings.css b/view/theme/diabook/diabook-blue/style-profile-wide.css
index 197b53d30..ad6b7ca21 100644
--- a/view/theme/diabook-blue/style-settings.css
+++ b/view/theme/diabook/diabook-blue/style-profile-wide.css
@@ -84,61 +84,61 @@
 /* icons */
 
 .icon.contacts {
-  background-image: url("../../../view/theme/diabook-blue/icons/contacts.png");}
+  background-image: url("../diabook-blue/icons/contacts.png");}
 .icon.notifications {
-  background-image: url("../../../view/theme/diabook-blue/icons/notifications.png");}
+  background-image: url("../diabook-blue/icons/notifications.png");}
 .icon.notify {
-  background-image: url("../../../view/theme/diabook-blue/icons/notify.png");}
+  background-image: url("../diabook-blue/icons/notify.png");}
 .icon.messages {
-  background-image: url("../../../view/theme/diabook-blue/icons/messages.png");}
+  background-image: url("../diabook-blue/icons/messages.png");}
 .icon.community {
-  background-image: url("../../../view/theme/diabook-blue/icons/community.png");}
+  background-image: url("../diabook-blue/icons/community.png");}
   
-.icon.drop 	{ background-image: url("../../../view/theme/diabook-blue/icons/drop.png");}
-.icon.drophide 	{ background-image: url("../../../view/theme/diabook-blue/icons/drop.png");}
-.icon.dislike 	{ background-image: url("../../../view/theme/diabook-blue/icons/dislike.png");}
-.icon.like 	{ background-image: url("../../../view/theme/diabook-blue/icons/like.png");}
-.icon.pencil 	{ background-image: url("../../../view/theme/diabook-blue/icons/pencil.png");}
-.icon.recycle 	{ background-image: url("../../../view/theme/diabook-blue/icons/recycle.png");}
-.icon.remote-link { background-image: url("../../../view/theme/diabook-blue/icons/remote.png");}
-.icon.tagged    { background-image: url("../../../view/theme/diabook-blue/icons/tagged.png");}
-.icon.file-as { background-image: url("../../../view/theme/diabook-blue/icons/file_as.png");}
-.star-item.icon.unstarred { background-image: url("../../../view/theme/diabook-blue/icons/unstarred.png");}
-.star-item.icon.starred { background-image: url("../../../view/theme/diabook-blue/icons/starred.png");}
-.icon.link		{ background-image: url("../../../view/theme/diabook-blue/icons/link.png");}
-.icon.lock		{ background-image: url("../../../view/theme/diabook-blue/icons/lock.png");}
-.icon.unlock		{ background-image: url("../../../view/theme/diabook-blue/icons/unlock.png");}
-.icon.language    { background-image: url("../../../view/theme/diabook-blue/icons/language.png");}
-
-
-.camera 	{ background-image: url("../../../view/theme/diabook-blue/icons/camera.png"); 
+.icon.drop 	{ background-image: url("../diabook-blue/icons/drop.png");}
+.icon.drophide 	{ background-image: url("../diabook-blue/icons/drop.png");}
+.icon.dislike 	{ background-image: url("../diabook-blue/icons/dislike.png");}
+.icon.like 	{ background-image: url("../diabook-blue/icons/like.png");}
+.icon.pencil 	{ background-image: url("../diabook-blue/icons/pencil.png");}
+.icon.recycle 	{ background-image: url("../diabook-blue/icons/recycle.png");}
+.icon.remote-link { background-image: url("../diabook-blue/icons/remote.png");}
+.icon.tagged    { background-image: url("../diabook-blue/icons/tagged.png");}
+.icon.file-as { background-image: url("../diabook-blue/icons/file_as.png");}
+.star-item.icon.unstarred { background-image: url("../diabook-blue/icons/unstarred.png");}
+.star-item.icon.starred { background-image: url("../diabook-blue/icons/starred.png");}
+.icon.link		{ background-image: url("../diabook-blue/icons/link.png");}
+.icon.lock		{ background-image: url("../diabook-blue/icons/lock.png");}
+.icon.unlock		{ background-image: url("../diabook-blue/icons/unlock.png");}
+.icon.language    { background-image: url("../diabook-blue/icons/language.png");}
+
+
+.camera 	{ background-image: url("../diabook-blue/icons/camera.png"); 
 			  display: block; width: 28px; height: 28px; background-repeat: no-repeat;
 			  }
-.attach 	{ background-image: url("../../../view/theme/diabook-blue/icons/attach.png"); 
+.attach 	{ background-image: url("../diabook-blue/icons/attach.png"); 
 			  display: block; width: 28px; height: 28px; background-repeat: no-repeat;
 			  }
-.video2 	{ background-image: url("../../../view/theme/diabook-blue/icons/video.png"); 
+.video2 	{ background-image: url("../diabook-blue/icons/video.png"); 
 			  display: block; width: 28px; height: 28px; background-repeat: no-repeat;
 			  }	
-.video 	{ background-image: url("../../../view/theme/diabook-blue/icons/video.png"); 
-			  display: block; width: 100%; height: 28px; background-repeat: no-repeat;
+.video 	{ background-image: url("../diabook-blue/icons/video.png"); 
+			  display: block; width: 100%; height: 140px; background-repeat: no-repeat;
 			  }
-.audio2 	{ background-image: url("../../../view/theme/diabook-blue/icons/audio.png"); 
+.audio2 	{ background-image: url("../diabook-blue/icons/audio.png"); 
 			  display: block; width: 28px; height: 28px; background-repeat: no-repeat;
 			  }
-.audio 	{ background-image: url("../../../view/theme/diabook-blue/icons/audio.png"); 
+.audio 	{ background-image: url("../diabook-blue/icons/audio.png"); 
 			  display: block; width: 28px; height: 28px; background-repeat: no-repeat;
 			  }
-.weblink 	{ background-image: url("../../../view/theme/diabook-blue/icons/weblink.png"); 
+.weblink 	{ background-image: url("../diabook-blue/icons/weblink.png"); 
 			  display: block; width: 28px; height: 28px; background-repeat: no-repeat;
 			  }
-.globe 	{ background-image: url("../../../view/theme/diabook-blue/icons/globe.png"); 
+.globe 	{ background-image: url("../diabook-blue/icons/globe.png"); 
 			  display: block; width: 28px; height: 28px; background-repeat: no-repeat;
 			  }
-.unglobe 	{ background-image: url("../../../view/theme/diabook-blue/icons/unglobe.png"); 
+.unglobe 	{ background-image: url("../diabook-blue/icons/unglobe.png"); 
 			  display: block; width: 28px; height: 28px; background-repeat: no-repeat;
 			  }
-.edit    {background-image: url("../../../view/theme/diabook-blue/icons/pencil2.png"); 
+.edit    {background-image: url("../diabook-blue/icons/pencil2.png"); 
 			  display: block; width: 28px; height: 28px; background-repeat: no-repeat;}
 			  
 			  
@@ -176,15 +176,15 @@
 /*.language       { background-position: -210px -40px;}*/
 
 
-.icon.on             { background-image: url("../../../view/theme/diabook-blue/icons/toogle_on.png"); background-repeat: no-repeat;}
-.icon.off            { background-image: url("../../../view/theme/diabook-blue/icons/toogle_off.png"); background-repeat: no-repeat;}
+.icon.on             { background-image: url("../diabook-blue/icons/toogle_on.png"); background-repeat: no-repeat;}
+.icon.off            { background-image: url("../diabook-blue/icons/toogle_off.png"); background-repeat: no-repeat;}
 .prev           { background-position: -90px  -60px;}
 .next           { background-position: -110px -60px;}
 /*.tagged     { background-position: -130px -60px;}*/
 
 .attachtype {
         display: block; width: 20px; height: 23px;
-        background-image: url('../../../images/content-types.png');
+        background-image: url('../../../../images/content-types.png');
 }
 
 .type-video { background-position: 0px 0px; }
@@ -215,12 +215,12 @@
 }
 
 .icon.border.camera{
-  background-image: url("../../../view/theme/diabook-blue/icons/camera.png"); 
+  background-image: url("../diabook-blue/icons/camera.png"); 
   display: block; width: 28px; height: 28px; background-repeat: no-repeat;
 	}
 	
 .icon.border.link{
-  background-image: url("../../../view/theme/diabook-blue/icons/weblink.png"); 
+  background-image: url("../diabook-blue/icons/weblink.png"); 
   display: block; width: 28px; height: 28px; background-repeat: no-repeat;
   margin-left: 10px;
 	}
@@ -233,34 +233,34 @@
   height: 10px;
 }
 .icon.s10.notify {
-  background-image: url("../../../images/icons/10/notify_off.png");
+  background-image: url("../../../../images/icons/10/notify_off.png");
 }
 .icon.s10.gear {
-  background-image: url("../../../images/icons/10/gear.png");
+  background-image: url("../../../../images/icons/10/gear.png");
 }
 .icon.s10.add {
-  background-image: url("../../../images/icons/10/add.png");
+  background-image: url("../../../../images/icons/10/add.png");
 }
 .icon.s10.delete {
-  background-image: url("../../../images/icons/10/delete.png");
+  background-image: url("../../../../images/icons/10/delete.png");
 }
 .icon.s10.edit {
-  background-image: url("../../../images/icons/10/edit.png");
+  background-image: url("../../../../images/icons/10/edit.png");
 }
 .icon.s10.star {
-  background-image: url("../../../images/star_dummy.png");
+  background-image: url("../../../../images/star_dummy.png");
 }
 .icon.s10.menu {
-  background-image: url("../../../images/icons/10/menu.png");
+  background-image: url("../../../../images/icons/10/menu.png");
 }
 .icon.s10.link {
-  background-image: url("../../../images/icons/10/link.png");
+  background-image: url("../../../../images/icons/10/link.png");
 }
 .icon.s10.lock {
-  background-image: url("../../../images/icons/10/lock.png");
+  background-image: url("../../../../images/icons/10/lock.png");
 }
 .icon.s10.unlock {
-  background-image: url("../../../images/icons/10/unlock.png");
+  background-image: url("../../../../images/icons/10/unlock.png");
 }
 .icon.s10.text {
   padding: 2px 0px 0px 15px;
@@ -271,34 +271,34 @@
   height: 16px;
 }
 .icon.s16.notify {
-  background-image: url("../../../images/icons/16/notify_off.png");
+  background-image: url("../../../../images/icons/16/notify_off.png");
 }
 .icon.s16.gear {
-  background-image: url("../../../images/icons/16/gear.png");
+  background-image: url("../../../../images/icons/16/gear.png");
 }
 .icon.s16.add {
-  background-image: url("../../../images/icons/16/add.png");
+  background-image: url("../../../../images/icons/16/add.png");
 }
 .icon.s16.delete {
-  background-image: url("../../../images/icons/16/delete.png");
+  background-image: url("../../../../images/icons/16/delete.png");
 }
 /*.icon.s16.edit {
-  background-image: url("../../../images/icons/16/edit.png");
+  background-image: url("../../../../images/icons/16/edit.png");
 }*/
 .icon.s16.star {
-  background-image: url("../../../images/star_dummy.png");
+  background-image: url("../../../../images/star_dummy.png");
 }
 .icon.s16.menu {
-  background-image: url("../../../images/icons/16/menu.png");
+  background-image: url("../../../../images/icons/16/menu.png");
 }
 /*.icon.s16.link {
-  background-image: url("../../../images/icons/16/link.png");
+  background-image: url("../../../../images/icons/16/link.png");
 }*/
 .icon.s16.lock {
-  background-image: url("../../../images/icons/16/lock.png");
+  background-image: url("../../../../images/icons/16/lock.png");
 }
 .icon.s16.unlock {
-  background-image: url("../../../images/icons/16/unlock.png");
+  background-image: url("../../../../images/icons/16/unlock.png");
 }
 .icon.s16.text {
   padding: 4px 0px 0px 20px;
@@ -309,34 +309,34 @@
   height: 22px;
 }
 .icon.s22.notify {
-  background-image: url("../../../images/icons/22/notify_off.png");
+  background-image: url("../../../../images/icons/22/notify_off.png");
 }
 .icon.s22.gear {
-  background-image: url("../../../images/icons/22/gear.png");
+  background-image: url("../../../../images/icons/22/gear.png");
 }
 .icon.s22.add {
-  background-image: url("../../../images/icons/22/add.png");
+  background-image: url("../../../../images/icons/22/add.png");
 }
 .icon.s22.delete {
-  background-image: url("../../../images/icons/22/delete.png");
+  background-image: url("../../../../images/icons/22/delete.png");
 }
 .icon.s22.edit {
-  background-image: url("../../../images/icons/22/edit.png");
+  background-image: url("../../../../images/icons/22/edit.png");
 }
 .icon.s22.star {
-  background-image: url("../../../images/star_dummy.png");
+  background-image: url("../../../../images/star_dummy.png");
 }
 .icon.s22.menu {
-  background-image: url("../../../images/icons/22/menu.png");
+  background-image: url("../../../../images/icons/22/menu.png");
 }
 .icon.s22.link {
-  background-image: url("../../../images/icons/22/link.png");
+  background-image: url("../../../../images/icons/22/link.png");
 }
 .icon.s22.lock {
-  background-image: url("../../../images/icons/22/lock.png");
+  background-image: url("../../../../images/icons/22/lock.png");
 }
 .icon.s22.unlock {
-  background-image: url("../../../images/icons/22/unlock.png");
+  background-image: url("../../../../images/icons/22/unlock.png");
 }
 .icon.s22.text {
   padding: 10px 0px 0px 25px;
@@ -347,34 +347,34 @@
   height: 48px;
 }
 .icon.s48.notify {
-  background-image: url("../../../images/icons/48/notify_off.png");
+  background-image: url("../../../../images/icons/48/notify_off.png");
 }
 .icon.s48.gear {
-  background-image: url("../../../images/icons/48/gear.png");
+  background-image: url("../../../../images/icons/48/gear.png");
 }
 .icon.s48.add {
-  background-image: url("../../../images/icons/48/add.png");
+  background-image: url("../../../../images/icons/48/add.png");
 }
 .icon.s48.delete {
-  background-image: url("../../../images/icons/48/delete.png");
+  background-image: url("../../../../images/icons/48/delete.png");
 }
 .icon.s48.edit {
-  background-image: url("../../../images/icons/48/edit.png");
+  background-image: url("../../../../images/icons/48/edit.png");
 }
 .icon.s48.star {
-  background-image: url("../../../images/star_dummy.png");
+  background-image: url("../../../../images/star_dummy.png");
 }
 .icon.s48.menu {
-  background-image: url("../../../images/icons/48/menu.png");
+  background-image: url("../../../../images/icons/48/menu.png");
 }
 .icon.s48.link {
-  background-image: url("../../../images/icons/48/link.png");
+  background-image: url("../../../../images/icons/48/link.png");
 }
 .icon.s48.lock {
-  background-image: url("../../../images/icons/48/lock.png");
+  background-image: url("../../../../images/icons/48/lock.png");
 }
 .icon.s48.unlock {
-  background-image: url("../../../images/icons/48/unlock.png");
+  background-image: url("../../../../images/icons/48/unlock.png");
 }
 
 #contact-edit-links ul {
@@ -385,7 +385,7 @@
 .hide-comments-outer {
   margin-left: 80px;
   margin-bottom: 5px;
-  width: 484px;
+  width: 675px;
   border-bottom: 1px solid #BDCDD4;
   border-top: 1px solid #BDCDD4;
 
@@ -395,7 +395,7 @@
 /* global */
 body {
   font-family: 'Lato', "Helvetica Neue", Helvetica, Arial, sans-serif;
-  font-size: 12.5px;
+  font-size: 13px;
   background-color: #ffffff;
   color: #2d2d2d;
   margin: 50px auto auto;
@@ -500,12 +500,12 @@ code {
 }
 /* popup notifications */
 div.jGrowl div.notice {
-  background: #511919 url("../../../images/icons/48/notice.png") no-repeat 5px center;
+  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;
+  background: #364e59 url("../../../../images/icons/48/info.png") no-repeat 5px center;
   color: #ffffff;
   padding-left: 58px;
 }
@@ -544,15 +544,17 @@ header #banner a:hover {
   text-decoration: none;
   outline: none;
   vertical-align: middle;
+ font-weight: bolder;
+  margin-left: 3px;
 }
 header #banner #logo-img {
   height: 25px;
-  margin-top: 5px;
+  margin-top: 3px;
 }
 header #banner #logo-text {
-  font-size: 22px;
+  font-size: 20px;
   position: absolute;
-  top: 15%;
+  top: 10%;
 }
 /* nav */
 nav {
@@ -631,7 +633,7 @@ nav #logo-text {
 nav .nav-menu-search {
   position: relative;
 
-  margin: 3px 17px;
+  margin: 4px 17px;
   margin-right: 0px;
   height: 17px;
   width: 180px;
@@ -679,12 +681,13 @@ nav .nav-menu-icon img {
 nav .nav-menu-icon .nav-notify {
   top: 3px;
 }
+/*marker*/
 nav .nav-menu {
   position: relative;
   height: 16px;
   padding: 5px;
   margin: 3px 15px 0px;
-  font-size: 13px;
+  font-size: 15px;
   /*border-bottom: 3px solid #364A84;*/
 }
 nav .nav-menu.selected {
@@ -744,15 +747,15 @@ nav #nav-site-linkmenu .menu-popup {
 }
 
 nav #nav-messages-linkmenu.on .icon.messages, nav #nav-messages-linkmenu.selected .icon.messages{
-	background-image: url("../../../view/theme/diabook-blue/icons/messages2.png");
+	background-image: url("../diabook-blue/icons/messages2.png");
 	}
 	
 /*nav #nav-notifications-linkmenu.on .icon.notify,*/ nav #nav-notifications-linkmenu.selected .icon.notify{
-	background-image: url("../../../view/theme/diabook-blue/icons/notify2.png");
+	background-image: url("../diabook-blue/icons/notify2.png");
 	}
 	
 nav #nav-contacts-linkmenu.on .icon.contacts, nav #nav-contacts-linkmenu.selected .icon.contacts{
-	background-image: url("../../../view/theme/diabook-blue/icons/contacts2.png");
+	background-image: url("../diabook-blue/icons/contacts2.png");
 	}
 	
 nav #nav-apps-link.selected {
@@ -923,37 +926,40 @@ ul.menu-popup .empty {
    }
 /*http://prothemedesign.com/circular-icons/*/
 .menu-profile-list.home{
-	background: url("../../../view/theme/diabook-blue/icons/home.png") no-repeat;
+	background: url("../diabook-blue/icons/home.png") no-repeat;
 	}
 .menu-profile-list.photos{
-	background: url("../../../view/theme/diabook-blue/icons/mess_side.png") no-repeat;
+	background: url("../diabook-blue/icons/mess_side.png") no-repeat;
 	}
 .menu-profile-list.events{
-	background: url("../../../view/theme/diabook-blue/icons/events.png") no-repeat;
+	background: url("../diabook-blue/icons/events.png") no-repeat;
 	}
 .menu-profile-list.notes{
-	background: url("../../../view/theme/diabook-blue/icons/notes.png") no-repeat;
+	background: url("../diabook-blue/icons/notes.png") no-repeat;
 	}
 .menu-profile-list.foren{
-	background: url("../../../view/theme/diabook-blue/icons/pubgroups.png") no-repeat;
+	background: url("../diabook-blue/icons/pubgroups.png") no-repeat;
 	}
 .menu-profile-list.com_side{
-	background: url("../../../view/theme/diabook-blue/icons/com_side.png") no-repeat;
+	background: url("../diabook-blue/icons/com_side.png") no-repeat;
 	}
 
 /* aside */
+/*marker*/
 aside {
   display: table-cell;
   vertical-align: top;
-  width: 200px;
-  padding: 0px 10px 0px 10px;
+  width: 180px;
+  padding: 0px 5px 0px 0px;
   border-right: 1px solid #D2D2D2;
   float: left;
   /* background: #F1F1F1; */
 }
 
-aside .vcard  {
-  display: none;
+aside .vcard .fn {
+  font-size: 18px;
+  font-weight: bold;
+  margin-bottom: 5px;
 }
 aside .vcard .title {
   margin-bottom: 5px;
@@ -989,7 +995,7 @@ aside #dfrn-request-link {
   -webkit-border-radius: 5px 5px 5px 5px;
   border-radius: 5px 5px 5px 5px;
   color: #ffffff;
-  background: #005c94 url('../../../images/connect-bg.png') no-repeat left center;
+  background: #005c94 url('../../../../images/connect-bg.png') no-repeat left center;
   font-weight: bold;
   text-transform: uppercase;
   padding: 4px 2px 2px 35px;
@@ -1004,6 +1010,8 @@ aside #profiles-menu {
 }
 aside #search-text {
 	width: 150px;
+		height: 17px;
+		padding-left: 10px;
 	border-top-left-radius: 15px;
 border-top-right-radius: 15px;
 border-bottom-right-radius: 15px;
@@ -1016,7 +1024,8 @@ aside #side-peoplefind-url {
 	width: 150px;
 	}
 #contact-block {
-  display: none;
+  overflow: auto;
+  height: auto;
 }
 #contact-block .contact-block-h4 {
   float: left;
@@ -1050,9 +1059,11 @@ aside #side-peoplefind-url {
 	.action .s16 { width: 16px; overflow: hidden; padding: 0px;}*/
 /*  font-size: 12px; */
 }
+/*marker*/
 .widget h3 {
   padding: 0px;
   margin: 2px;
+  font-size: 1.05em;
 }
 .widget .action {
   opacity: 0.1;
@@ -1113,11 +1124,11 @@ list-style-type: disc;
   color: #1872A2;
 }
 .widget .tool.selected {
-  background: url("../../../view/theme/diabook-blue/icons/selected.png") no-repeat left center;
+  background: url("../diabook-blue/icons/selected.png") no-repeat left center;
 }
 /* widget: search */
 span.sbox_l  {
-	background: white url('../../../view/theme/diabook/icons/srch_l.gif') no-repeat top left;
+	background: white url('../diabook/icons/srch_l.gif') no-repeat top left;
 	float: left;
 	width: 19px; height: 19px;
 	margin-left: 10px;
@@ -1126,14 +1137,14 @@ span.sbox_l  {
 }
 
 span.sbox_r  {
-	background: white url('../../../view/theme/diabook/icons/srch_r.gif') no-repeat top left;
+	background: white url('../diabook/icons/srch_r.gif') no-repeat top left;
 	float: left;
 	width: 19px; height: 19px;
 	margin-top: 5px;
 }
 
 span.sbox input {
-	background: white url('../../../view/theme/diabook/icons/srch_bg.gif') repeat-x top left;
+	background: white url('../diabook/icons/srch_bg.gif') repeat-x top left;
 	float: left;
 	margin-top: 5px;
 	border: 0;
@@ -1150,16 +1161,20 @@ span.sbox input {
 section {
   display: table-cell;
   vertical-align: top;
-  width: 650px;
-  padding: 0px 0px 0px 20px;
+  width: 611px;
+  padding: 0px 0px 0px 12px;
 }
 
 body .pageheader{
   text-align: center;
-  margin-top: 25px;
-  font-size: 0px;
+  font-size: 20px;
+  margin-bottom: 20px;
+  margin-top: 0px;
+  max-width: 575px;
+	}
+.qcomment{
+  max-width: 122px;	
 	}
-
 #id_username {
   width: 173px;	
 	}
@@ -1179,40 +1194,39 @@ body .pageheader{
 	display: block;
 }	
 
-.tabs {display: none;}
-.tab.button{display: none;}
-.rs_tabs {
+.tabs {
     
     background-position: 0 -20px;
     background-repeat: repeat-x;
     height: 27px;
     padding: 0;
  }
-.rs_tab.button {	
+.tab.button {
+    margin-left: 5px;	
     /*background: none repeat scroll 0 0 #F8F8F8;*/
     border: 1px solid #CCCCCC;
     border-radius: 3px 3px 3px 3px;
-    font-weight: bolder;
+    font-weight: normal;
     padding: 3px;
     color:  #333333;
-    text-decoration: none;
 	}
 	
 #birthday-notice, #event-notice, #birthday-wrapper, #event-wrapper{
 	margin-bottom: 10px;
 	}
 
+/*marker*/
 right_aside {
   display: table-cell;
   vertical-align: top;
-  width: 170px;
-  /*padding-right: 10px;*/
+  width: 180px;
   /*border-left: 1px solid #D2D2D2;*/
   
   /* background: #F1F1F1; */
 }
 right_aside a{color: #1872A2;}
-right_aside h3 {border-bottom: 1px solid #D2D2D2; padding-top: 5px; padding-bottom: 0px; padding-left: 5px; margin-bottom: 0px; 
+/*marker*/
+right_aside h3 {font-size: 1.05em; border-bottom: 1px solid #D2D2D2; padding-top: 5px; padding-bottom: 0px; padding-left: 9px; margin-bottom: 0px; 
 margin-top:30px;}
 right_aside .directory-item {	width: 50px; height: 50px; vertical-align: center; text-align: center; }
 right_aside .directory-photo { margin: 0px; }
@@ -1226,13 +1240,13 @@ right_aside #ra-photos-wrapper { padding-left: 5px; padding-top: 3px; overflow:
 #page-sidebar-right_aside .label {max-width: 128px;}
 right_aside .icon {width: 10px; height: 10px;}
 .close_box		{ 
-		background-image: url("../../../view/theme/diabook-blue/icons/close_box.png");
+		background-image: url("../diabook-blue/icons/close_box.png");
 		float: right;
 		cursor: pointer;
 		opacity: 0.1;
 		}
 .close_box:hover	{ 
-		background-image: url("../../../view/theme/diabook-blue/icons/close_box.png");
+		background-image: url("../diabook-blue/icons/close_box.png");
 		float: right;
 		cursor: pointer;
 		opacity: 1;
@@ -1243,27 +1257,30 @@ right_aside .icon {width: 10px; height: 10px;}
 transition: all 0.2s ease-in-out;
 		}
 /* wall item */
+/*marker*/
 .tread-wrapper {
   border-bottom: 1px solid #D2D2D2;
   position: relative;
   padding: 5px;
   margin-bottom: 0px;
-  width: 575px;
+  width: 775px;
+  padding-top: 10px;
 }
 .tread-wrapper a{
   color: #1872A2;
 }
 
+/*marker*/
 .wall-item-decor {
   position: absolute;
-  left: 790px;
+  left: 780px;
   top: -10px;
   width: 16px;
 }
-
+/*marker*/
 .wall-item-container {
   display: table;
-  width: 580px;
+  width: 770px;
 }
 
 
@@ -1314,15 +1331,18 @@ transition: all 0.2s ease-in-out;
   margin-bottom: 5px;
 }
 
+/*marker*/
 .wall-item-container .wall-item-content {
-  font-size: 12.5px;
-  max-width: 420px;
+
+  max-width: 690px;
   word-wrap: break-word;
-  line-height: 1.2;
-}
 
+
+}
+/*marker*/
 .wall-item-container .wall-item-content img {
-  max-width: 400px;
+
+
 }
 .wall-item-container .wall-item-links, .wall-item-container .wall-item-actions {
   display: table-cell;
@@ -1373,18 +1393,19 @@ transition: all 0.2s ease-in-out;
 .wall-item-container .wall-item-actions-tools input {
   float: right;
 }
+/*marker*/
 .wall-item-container.comment {
   margin-top: 5px;
   margin-bottom: 5px;
   margin-left: 80px;
-  width: 500px;
+  width: 690px;
   border-bottom: 1px solid hsl(198, 21%, 79%);
 }
 .wall-item-container.comment .contact-photo {
   width: 32px;
   height: 32px;
   margin-left: 16px;
-  /*background: url(../../../images/icons/22/user.png) no-repeat center center;*/
+  /*background: url(../../../../images/icons/22/user.png) no-repeat center center;*/
 
 }
 .wall-item-container.comment {
@@ -1395,7 +1416,7 @@ transition: all 0.2s ease-in-out;
   padding-left: 12px;
 }
 .wall-item-comment-wrapper {
-  margin: 1px 5px 1px 80px;
+  margin: 1px 5px 5px 80px;
 }
 .wall-item-comment-wrapper .comment-edit-photo {
   display: none;
@@ -1416,15 +1437,15 @@ transition: all 0.2s ease-in-out;
   border: 1px solid #2d2d2d;
 }
 .comment-edit-preview {
-  width: 710px;
-  border: 1px solid #2d2d2d;
+  width: 500px;
   margin-top: 10px;
+  background-color:  #fff797;
 }
 .comment-edit-preview .contact-photo {
   width: 32px;
   height: 32px;
   margin-left: 16px;
-  /*background: url(../../../images/icons/22/user.png) no-repeat center center;*/
+  /*background: url(../../../../images/icons/22/user.png) no-repeat center center;*/
 
 }
 .comment-edit-preview {
@@ -1461,14 +1482,14 @@ transition: all 0.2s ease-in-out;
   padding-bottom: 2px;
 }
 .tag {
-  /*background: url("../../../images/tag_b.png") repeat-x center left;*/
+  /*background: url("../../../../images/tag_b.png") repeat-x center left;*/
   color: #999;
   padding-left: 3px;
   font-size: 12px;
 }
 .tag a {
   padding-right: 5px;
-  /*background: url("../../../images/tag.png") no-repeat center right;*/
+  /*background: url("../../../../images/tag.png") no-repeat center right;*/
   color: #999;
 }
 .wwto {
@@ -1564,6 +1585,11 @@ transition: all 0.2s ease-in-out;
   padding: 0.3em;
   margin-bottom: 10px;
 }
+.grey
+{
+  display: inline;
+  float: right;	
+	}
 #jot #jot-tools {
   margin: 0px;
   padding: 0px;
@@ -1649,7 +1675,7 @@ transition: all 0.2s ease-in-out;
     height: 20px;
     margin: 0 0 5px;
     width: 60%;
-    border: 1px solid #ffffff;
+    border: 1px solid #d2d2d2;
 }
 #profile-jot-form #jot-title:-webkit-input-placeholder {
   font-weight: normal;
@@ -1691,14 +1717,15 @@ transition: all 0.2s ease-in-out;
 	cursor: pointer;
 	margin-top: 2px;
 }
+/*marker*/
 #profile-jot-wrapper{
-	margin: 0 2em 20px 0;
-   width: 585px;
+	margin: 0 20px 20px 0;
+   width: 785px;
 	}
-
+/*marker*/
 #profile-jot-submit-wrapper {
 	margin-bottom: 50px;
-	width: 585px;
+	width: 785px;
 }
 
 #profile-jot-submit {
@@ -1710,7 +1737,7 @@ transition: all 0.2s ease-in-out;
 	float: left;
 	margin-top: 2px;
 	margin-left: 10px;
-	
+	font-size: 14px;
 }
 #profile-attach-wrapper {
 	float: left;
@@ -1756,7 +1783,9 @@ transition: all 0.2s ease-in-out;
 	float: right;
 	margin-left: 10px;
 	margin-top: 2px;
-	font-size: 10px;
+	font-size: 9px;
+	font-weight: bolder;
+	cursor: pointer;
 }
 #profile-jot-perms{
    float: right;
@@ -1767,18 +1796,20 @@ transition: all 0.2s ease-in-out;
 .button.creation1 {
     background-color: #fff;
     border: 1px solid #777777;
-    background-image: -moz-linear-gradient(center top , white 0%, #DDDDDD 100%);
     border-radius: 3px 3px 3px 3px;
     box-shadow: 0 1px 1px #CFCFCF;
+    cursor: pointer;
+    font-weight: bolder;
 }
 .button.creation2 {
-    background-color: #1872A2;
-    background-image: -moz-linear-gradient(center top , #66C1FF 0%, #0097FF 100%);
+    background-color: #055580;
     border: 1px solid #777777;
     color: white;
     border-radius: 3px 3px 3px 3px;
     box-shadow: 0 1px 1px #CFCFCF;
     margin-left: 5px;
+    cursor: pointer;
+    font-weight: bolder;
 }
 /*input[type="submit"] {
 	border: 0px;
@@ -1798,7 +1829,7 @@ transition: all 0.2s ease-in-out;
 }
 #acl-search {
   float: right;
-  background: #ffffff url("../../../images/search_18.png") no-repeat right center;
+  background: #ffffff url("../../../../images/search_18.png") no-repeat right center;
   padding-right: 20px;
 }
 #acl-showall {
@@ -1807,7 +1838,7 @@ transition: all 0.2s ease-in-out;
   width: auto;
   height: 18px;
   background-color: #cccccc;
-  background-image: url("../../../images/show_all_off.png");
+  background-image: url("../../../../images/show_all_off.png");
   background-position: 7px 7px;
   background-repeat: no-repeat;
   padding: 7px 5px 0px 30px;
@@ -1819,7 +1850,7 @@ transition: all 0.2s ease-in-out;
 #acl-showall.selected {
   color: #000000;
   background-color: #ff9900;
-  background-image: url("../../../images/show_all_on.png");
+  background-image: url("../../../../images/show_all_on.png");
 }
 #acl-list {
   height: 210px;
@@ -1870,20 +1901,20 @@ transition: all 0.2s ease-in-out;
   color: #000000;
 }
 .acl-button-show {
-  background-image: url("../../../images/show_off.png");
+  background-image: url("../../../../images/show_off.png");
 }
 .acl-button-hide {
-  background-image: url("../../../images/hide_off.png");
+  background-image: url("../../../../images/hide_off.png");
 }
 .acl-button-show.selected {
   color: #000000;
   background-color: #9ade00;
-  background-image: url("../../../images/show_on.png");
+  background-image: url("../../../../images/show_on.png");
 }
 .acl-button-hide.selected {
   color: #000000;
   background-color: #ff4141;
-  background-image: url("../../../images/hide_on.png");
+  background-image: url("../../../../images/hide_on.png");
 }
 .acl-list-item.groupshow {
   border-color: #9ade00;
@@ -1893,23 +1924,24 @@ transition: all 0.2s ease-in-out;
 }
 /** /acl **/
 /** tab buttons 14618a**/
-ul.rs_tabs {
+/*marker*/
+ul.tabs {
   list-style-type: none;
-
-  font-size: 11px;
+  padding-bottom: 10px;
+  font-size: 13px;
+  width: 805px;
 }
-ul.rs_tabs li {
+ul.tabs li {
   float: left;
-  margin-bottom: 30px;
-  clear: both;
+  margin-left: 5px;
 }
-ul.rs_tabs li .active {
+ul.tabs li .active {
     background-color: #055580;
     border: 1px solid #777777;
     color: white;
     border-radius: 3px 3px 3px 3px;
-    box-shadow: 2px 2px 2px #CFCFCF;
-    font-size: 13px;
+    box-shadow: 0 1px 1px #CFCFCF;
+    margin-left: 5px;
 }
 /**
  * Form fields
@@ -1942,7 +1974,7 @@ ul.rs_tabs li .active {
 .field .onoff a {
   display: block;
   border: 1px solid #666666;
-  background-image: url("../../../images/onoff.jpg");
+  background-image: url("../../../../images/onoff.jpg");
   background-repeat: no-repeat;
   padding: 4px 2px 2px 2px;
   height: 16px;
@@ -2015,7 +2047,7 @@ ul.rs_tabs li .active {
   margin: 10px;
 }
 .oauthapp img.noicon {
-  background-image: url("../../../images/icons/48/plugin.png");
+  background-image: url("../../../../images/icons/48/plugin.png");
   background-position: center center;
   background-repeat: no-repeat;
 }
@@ -2031,9 +2063,10 @@ ul.rs_tabs li .active {
 /* photo */
 .photo {
 box-shadow: 2px 2px 5px 0px #000000;
-margin: 2px 5px 2px 5px;
-max-height: 85%;
-max-width: 85%;
+margin: 0px;
+border-radius: 10px;
+height: 145px !important;
+width: 145px !important;
 }
 .lframe {
   float: left;
@@ -2061,7 +2094,7 @@ max-width: 85%;
 
 .contact-photo-menu-button {
         position: relative;
-        background-image: url("../../../images/icons/16/menu.png");
+        background-image: url("../../../../images/icons/16/menu.png");
         background-position: top left; 
         background-repeat: no-repeat;
         margin: 0px 0px -16px 0px; 
@@ -2106,6 +2139,11 @@ blockquote {
     border-left: 1px solid #D2D2D2;
     padding-left: 9px;
     margin: 0 0 0 .8ex;
+	 color: #777;
+}
+.oembed {
+	
+	font-weight: bold;
 }
 .aprofile dt{
 box-shadow: 1px 1px 5px 0;
@@ -2144,6 +2182,9 @@ box-shadow: 1px 1px 5px 0;
 #group-separator,
 #prof-separator { display: none;}
 */
+#prof-members-end{
+	clear: both;
+	}
 
 #prvmail-to-label, #prvmail-subject-label, #prvmail-message-label {
 	margin-bottom: 10px;
@@ -2269,7 +2310,7 @@ a.mail-list-link {
 }
 
 .vevent {
-        border: 1px solid #CCCCCC;
+
 }
 .vevent .event-description, .vevent .event-location {
         margin-left: 10px;
@@ -2292,7 +2333,7 @@ a.mail-list-link {
 }
 
 .event-description:before {
-        content: url('../../../images/calendar.png');
+        content: url('../../../../images/calendar.png');
         margin-right: 15px;
 }
 
@@ -2447,8 +2488,8 @@ float: left;
   display: none;
   /* position: absolute; */
   /* position: absolute; */
-  left: -2px;
-  top: -20px;
+  left: 0px;
+  top: -16px;
 }
 .contact-wrapper {
   float: left;
diff --git a/view/theme/diabook-blue/style-profile.css b/view/theme/diabook/diabook-blue/style-profile.css
index 528327ac3..50fb980d6 100644
--- a/view/theme/diabook-blue/style-profile.css
+++ b/view/theme/diabook/diabook-blue/style-profile.css
@@ -84,61 +84,61 @@
 /* icons */
 
 .icon.contacts {
-  background-image: url("../../../view/theme/diabook-blue/icons/contacts.png");}
+  background-image: url("../diabook-blue/icons/contacts.png");}
 .icon.notifications {
-  background-image: url("../../../view/theme/diabook-blue/icons/notifications.png");}
+  background-image: url("../diabook-blue/icons/notifications.png");}
 .icon.notify {
-  background-image: url("../../../view/theme/diabook-blue/icons/notify.png");}
+  background-image: url("../diabook-blue/icons/notify.png");}
 .icon.messages {
-  background-image: url("../../../view/theme/diabook-blue/icons/messages.png");}
+  background-image: url("../diabook-blue/icons/messages.png");}
 .icon.community {
-  background-image: url("../../../view/theme/diabook-blue/icons/community.png");}
+  background-image: url("../diabook-blue/icons/community.png");}
   
-.icon.drop 	{ background-image: url("../../../view/theme/diabook-blue/icons/drop.png");}
-.icon.drophide 	{ background-image: url("../../../view/theme/diabook-blue/icons/drop.png");}
-.icon.dislike 	{ background-image: url("../../../view/theme/diabook-blue/icons/dislike.png");}
-.icon.like 	{ background-image: url("../../../view/theme/diabook-blue/icons/like.png");}
-.icon.pencil 	{ background-image: url("../../../view/theme/diabook-blue/icons/pencil.png");}
-.icon.recycle 	{ background-image: url("../../../view/theme/diabook-blue/icons/recycle.png");}
-.icon.remote-link { background-image: url("../../../view/theme/diabook-blue/icons/remote.png");}
-.icon.tagged    { background-image: url("../../../view/theme/diabook-blue/icons/tagged.png");}
-.icon.file-as { background-image: url("../../../view/theme/diabook-blue/icons/file_as.png");}
-.star-item.icon.unstarred { background-image: url("../../../view/theme/diabook-blue/icons/unstarred.png");}
-.star-item.icon.starred { background-image: url("../../../view/theme/diabook-blue/icons/starred.png");}
-.icon.link		{ background-image: url("../../../view/theme/diabook-blue/icons/link.png");}
-.icon.lock		{ background-image: url("../../../view/theme/diabook-blue/icons/lock.png");}
-.icon.unlock		{ background-image: url("../../../view/theme/diabook-blue/icons/unlock.png");}
-.icon.language    { background-image: url("../../../view/theme/diabook-blue/icons/language.png");}
-
-
-.camera 	{ background-image: url("../../../view/theme/diabook-blue/icons/camera.png"); 
+.icon.drop 	{ background-image: url("../diabook-blue/icons/drop.png");}
+.icon.drophide 	{ background-image: url("../diabook-blue/icons/drop.png");}
+.icon.dislike 	{ background-image: url("../diabook-blue/icons/dislike.png");}
+.icon.like 	{ background-image: url("../diabook-blue/icons/like.png");}
+.icon.pencil 	{ background-image: url("../diabook-blue/icons/pencil.png");}
+.icon.recycle 	{ background-image: url("../diabook-blue/icons/recycle.png");}
+.icon.remote-link { background-image: url("../diabook-blue/icons/remote.png");}
+.icon.tagged    { background-image: url("../diabook-blue/icons/tagged.png");}
+.icon.file-as { background-image: url("../diabook-blue/icons/file_as.png");}
+.star-item.icon.unstarred { background-image: url("../diabook-blue/icons/unstarred.png");}
+.star-item.icon.starred { background-image: url("../diabook-blue/icons/starred.png");}
+.icon.link		{ background-image: url("../diabook-blue/icons/link.png");}
+.icon.lock		{ background-image: url("../diabook-blue/icons/lock.png");}
+.icon.unlock		{ background-image: url("../diabook-blue/icons/unlock.png");}
+.icon.language    { background-image: url("../diabook-blue/icons/language.png");}
+
+
+.camera 	{ background-image: url("../diabook-blue/icons/camera.png"); 
 			  display: block; width: 28px; height: 28px; background-repeat: no-repeat;
 			  }
-.attach 	{ background-image: url("../../../view/theme/diabook-blue/icons/attach.png"); 
+.attach 	{ background-image: url("../diabook-blue/icons/attach.png"); 
 			  display: block; width: 28px; height: 28px; background-repeat: no-repeat;
 			  }
-.video2 	{ background-image: url("../../../view/theme/diabook-blue/icons/video.png"); 
+.video2 	{ background-image: url("../diabook-blue/icons/video.png"); 
 			  display: block; width: 28px; height: 28px; background-repeat: no-repeat;
 			  }	
-.video 	{ background-image: url("../../../view/theme/diabook-blue/icons/video.png"); 
-			  display: block; width: 100%; height: 28px; background-repeat: no-repeat;
+.video 	{ background-image: url("../diabook-blue/icons/video.png"); 
+			  display: block; width: 100%; height: 140px; background-repeat: no-repeat;
 			  }
-.audio2 	{ background-image: url("../../../view/theme/diabook-blue/icons/audio.png"); 
+.audio2 	{ background-image: url("../diabook-blue/icons/audio.png"); 
 			  display: block; width: 28px; height: 28px; background-repeat: no-repeat;
 			  }
-.audio 	{ background-image: url("../../../view/theme/diabook-blue/icons/audio.png"); 
+.audio 	{ background-image: url("../diabook-blue/icons/audio.png"); 
 			  display: block; width: 28px; height: 28px; background-repeat: no-repeat;
 			  }
-.weblink 	{ background-image: url("../../../view/theme/diabook-blue/icons/weblink.png"); 
+.weblink 	{ background-image: url("../diabook-blue/icons/weblink.png"); 
 			  display: block; width: 28px; height: 28px; background-repeat: no-repeat;
 			  }
-.globe 	{ background-image: url("../../../view/theme/diabook-blue/icons/globe.png"); 
+.globe 	{ background-image: url("../diabook-blue/icons/globe.png"); 
 			  display: block; width: 28px; height: 28px; background-repeat: no-repeat;
 			  }
-.unglobe 	{ background-image: url("../../../view/theme/diabook-blue/icons/unglobe.png"); 
+.unglobe 	{ background-image: url("../diabook-blue/icons/unglobe.png"); 
 			  display: block; width: 28px; height: 28px; background-repeat: no-repeat;
 			  }
-.edit    {background-image: url("../../../view/theme/diabook-blue/icons/pencil2.png"); 
+.edit    {background-image: url("../diabook-blue/icons/pencil2.png"); 
 			  display: block; width: 28px; height: 28px; background-repeat: no-repeat;}
 			  
 			  
@@ -176,15 +176,15 @@
 /*.language       { background-position: -210px -40px;}*/
 
 
-.icon.on             { background-image: url("../../../view/theme/diabook-blue/icons/toogle_on.png"); background-repeat: no-repeat;}
-.icon.off            { background-image: url("../../../view/theme/diabook-blue/icons/toogle_off.png"); background-repeat: no-repeat;}
+.icon.on             { background-image: url("../diabook-blue/icons/toogle_on.png"); background-repeat: no-repeat;}
+.icon.off            { background-image: url("../diabook-blue/icons/toogle_off.png"); background-repeat: no-repeat;}
 .prev           { background-position: -90px  -60px;}
 .next           { background-position: -110px -60px;}
 /*.tagged     { background-position: -130px -60px;}*/
 
 .attachtype {
         display: block; width: 20px; height: 23px;
-        background-image: url('../../../images/content-types.png');
+        background-image: url('../../../../images/content-types.png');
 }
 
 .type-video { background-position: 0px 0px; }
@@ -215,12 +215,12 @@
 }
 
 .icon.border.camera{
-  background-image: url("../../../view/theme/diabook-blue/icons/camera.png"); 
+  background-image: url("../diabook-blue/icons/camera.png"); 
   display: block; width: 28px; height: 28px; background-repeat: no-repeat;
 	}
 	
 .icon.border.link{
-  background-image: url("../../../view/theme/diabook-blue/icons/weblink.png"); 
+  background-image: url("../diabook-blue/icons/weblink.png"); 
   display: block; width: 28px; height: 28px; background-repeat: no-repeat;
   margin-left: 10px;
 	}
@@ -233,34 +233,34 @@
   height: 10px;
 }
 .icon.s10.notify {
-  background-image: url("../../../images/icons/10/notify_off.png");
+  background-image: url("../../../../images/icons/10/notify_off.png");
 }
 .icon.s10.gear {
-  background-image: url("../../../images/icons/10/gear.png");
+  background-image: url("../../../../images/icons/10/gear.png");
 }
 .icon.s10.add {
-  background-image: url("../../../images/icons/10/add.png");
+  background-image: url("../../../../images/icons/10/add.png");
 }
 .icon.s10.delete {
-  background-image: url("../../../images/icons/10/delete.png");
+  background-image: url("../../../../images/icons/10/delete.png");
 }
 .icon.s10.edit {
-  background-image: url("../../../images/icons/10/edit.png");
+  background-image: url("../../../../images/icons/10/edit.png");
 }
 .icon.s10.star {
-  background-image: url("../../../images/star_dummy.png");
+  background-image: url("../../../../images/star_dummy.png");
 }
 .icon.s10.menu {
-  background-image: url("../../../images/icons/10/menu.png");
+  background-image: url("../../../../images/icons/10/menu.png");
 }
 .icon.s10.link {
-  background-image: url("../../../images/icons/10/link.png");
+  background-image: url("../../../../images/icons/10/link.png");
 }
 .icon.s10.lock {
-  background-image: url("../../../images/icons/10/lock.png");
+  background-image: url("../../../../images/icons/10/lock.png");
 }
 .icon.s10.unlock {
-  background-image: url("../../../images/icons/10/unlock.png");
+  background-image: url("../../../../images/icons/10/unlock.png");
 }
 .icon.s10.text {
   padding: 2px 0px 0px 15px;
@@ -271,34 +271,34 @@
   height: 16px;
 }
 .icon.s16.notify {
-  background-image: url("../../../images/icons/16/notify_off.png");
+  background-image: url("../../../../images/icons/16/notify_off.png");
 }
 .icon.s16.gear {
-  background-image: url("../../../images/icons/16/gear.png");
+  background-image: url("../../../../images/icons/16/gear.png");
 }
 .icon.s16.add {
-  background-image: url("../../../images/icons/16/add.png");
+  background-image: url("../../../../images/icons/16/add.png");
 }
 .icon.s16.delete {
-  background-image: url("../../../images/icons/16/delete.png");
+  background-image: url("../../../../images/icons/16/delete.png");
 }
 /*.icon.s16.edit {
-  background-image: url("../../../images/icons/16/edit.png");
+  background-image: url("../../../../images/icons/16/edit.png");
 }*/
 .icon.s16.star {
-  background-image: url("../../../images/star_dummy.png");
+  background-image: url("../../../../images/star_dummy.png");
 }
 .icon.s16.menu {
-  background-image: url("../../../images/icons/16/menu.png");
+  background-image: url("../../../../images/icons/16/menu.png");
 }
 /*.icon.s16.link {
-  background-image: url("../../../images/icons/16/link.png");
+  background-image: url("../../../../images/icons/16/link.png");
 }*/
 .icon.s16.lock {
-  background-image: url("../../../images/icons/16/lock.png");
+  background-image: url("../../../../images/icons/16/lock.png");
 }
 .icon.s16.unlock {
-  background-image: url("../../../images/icons/16/unlock.png");
+  background-image: url("../../../../images/icons/16/unlock.png");
 }
 .icon.s16.text {
   padding: 4px 0px 0px 20px;
@@ -309,34 +309,34 @@
   height: 22px;
 }
 .icon.s22.notify {
-  background-image: url("../../../images/icons/22/notify_off.png");
+  background-image: url("../../../../images/icons/22/notify_off.png");
 }
 .icon.s22.gear {
-  background-image: url("../../../images/icons/22/gear.png");
+  background-image: url("../../../../images/icons/22/gear.png");
 }
 .icon.s22.add {
-  background-image: url("../../../images/icons/22/add.png");
+  background-image: url("../../../../images/icons/22/add.png");
 }
 .icon.s22.delete {
-  background-image: url("../../../images/icons/22/delete.png");
+  background-image: url("../../../../images/icons/22/delete.png");
 }
 .icon.s22.edit {
-  background-image: url("../../../images/icons/22/edit.png");
+  background-image: url("../../../../images/icons/22/edit.png");
 }
 .icon.s22.star {
-  background-image: url("../../../images/star_dummy.png");
+  background-image: url("../../../../images/star_dummy.png");
 }
 .icon.s22.menu {
-  background-image: url("../../../images/icons/22/menu.png");
+  background-image: url("../../../../images/icons/22/menu.png");
 }
 .icon.s22.link {
-  background-image: url("../../../images/icons/22/link.png");
+  background-image: url("../../../../images/icons/22/link.png");
 }
 .icon.s22.lock {
-  background-image: url("../../../images/icons/22/lock.png");
+  background-image: url("../../../../images/icons/22/lock.png");
 }
 .icon.s22.unlock {
-  background-image: url("../../../images/icons/22/unlock.png");
+  background-image: url("../../../../images/icons/22/unlock.png");
 }
 .icon.s22.text {
   padding: 10px 0px 0px 25px;
@@ -347,34 +347,34 @@
   height: 48px;
 }
 .icon.s48.notify {
-  background-image: url("../../../images/icons/48/notify_off.png");
+  background-image: url("../../../../images/icons/48/notify_off.png");
 }
 .icon.s48.gear {
-  background-image: url("../../../images/icons/48/gear.png");
+  background-image: url("../../../../images/icons/48/gear.png");
 }
 .icon.s48.add {
-  background-image: url("../../../images/icons/48/add.png");
+  background-image: url("../../../../images/icons/48/add.png");
 }
 .icon.s48.delete {
-  background-image: url("../../../images/icons/48/delete.png");
+  background-image: url("../../../../images/icons/48/delete.png");
 }
 .icon.s48.edit {
-  background-image: url("../../../images/icons/48/edit.png");
+  background-image: url("../../../../images/icons/48/edit.png");
 }
 .icon.s48.star {
-  background-image: url("../../../images/star_dummy.png");
+  background-image: url("../../../../images/star_dummy.png");
 }
 .icon.s48.menu {
-  background-image: url("../../../images/icons/48/menu.png");
+  background-image: url("../../../../images/icons/48/menu.png");
 }
 .icon.s48.link {
-  background-image: url("../../../images/icons/48/link.png");
+  background-image: url("../../../../images/icons/48/link.png");
 }
 .icon.s48.lock {
-  background-image: url("../../../images/icons/48/lock.png");
+  background-image: url("../../../../images/icons/48/lock.png");
 }
 .icon.s48.unlock {
-  background-image: url("../../../images/icons/48/unlock.png");
+  background-image: url("../../../../images/icons/48/unlock.png");
 }
 
 #contact-edit-links ul {
@@ -500,12 +500,12 @@ code {
 }
 /* popup notifications */
 div.jGrowl div.notice {
-  background: #511919 url("../../../images/icons/48/notice.png") no-repeat 5px center;
+  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;
+  background: #364e59 url("../../../../images/icons/48/info.png") no-repeat 5px center;
   color: #ffffff;
   padding-left: 58px;
 }
@@ -544,15 +544,17 @@ header #banner a:hover {
   text-decoration: none;
   outline: none;
   vertical-align: middle;
+ font-weight: bolder;
+  margin-left: 3px;
 }
 header #banner #logo-img {
   height: 25px;
-  margin-top: 5px;
+  margin-top: 3px;
 }
 header #banner #logo-text {
-  font-size: 22px;
+  font-size: 20px;
   position: absolute;
-  top: 15%;
+  top: 10%;
 }
 /* nav */
 nav {
@@ -631,7 +633,7 @@ nav #logo-text {
 nav .nav-menu-search {
   position: relative;
 
-  margin: 3px 17px;
+  margin: 4px 17px;
   margin-right: 0px;
   height: 17px;
   width: 180px;
@@ -744,15 +746,15 @@ nav #nav-site-linkmenu .menu-popup {
 }
 
 nav #nav-messages-linkmenu.on .icon.messages, nav #nav-messages-linkmenu.selected .icon.messages{
-	background-image: url("../../../view/theme/diabook-blue/icons/messages2.png");
+	background-image: url("../diabook-blue/icons/messages2.png");
 	}
 	
 /*nav #nav-notifications-linkmenu.on .icon.notify,*/ nav #nav-notifications-linkmenu.selected .icon.notify{
-	background-image: url("../../../view/theme/diabook-blue/icons/notify2.png");
+	background-image: url("../diabook-blue/icons/notify2.png");
 	}
 	
 nav #nav-contacts-linkmenu.on .icon.contacts, nav #nav-contacts-linkmenu.selected .icon.contacts{
-	background-image: url("../../../view/theme/diabook-blue/icons/contacts2.png");
+	background-image: url("../diabook-blue/icons/contacts2.png");
 	}
 	
 nav #nav-apps-link.selected {
@@ -923,22 +925,22 @@ ul.menu-popup .empty {
    }
 /*http://prothemedesign.com/circular-icons/*/
 .menu-profile-list.home{
-	background: url("../../../view/theme/diabook-blue/icons/home.png") no-repeat;
+	background: url("../diabook-blue/icons/home.png") no-repeat;
 	}
 .menu-profile-list.photos{
-	background: url("../../../view/theme/diabook-blue/icons/mess_side.png") no-repeat;
+	background: url("../diabook-blue/icons/mess_side.png") no-repeat;
 	}
 .menu-profile-list.events{
-	background: url("../../../view/theme/diabook-blue/icons/events.png") no-repeat;
+	background: url("../diabook-blue/icons/events.png") no-repeat;
 	}
 .menu-profile-list.notes{
-	background: url("../../../view/theme/diabook-blue/icons/notes.png") no-repeat;
+	background: url("../diabook-blue/icons/notes.png") no-repeat;
 	}
 .menu-profile-list.foren{
-	background: url("../../../view/theme/diabook-blue/icons/pubgroups.png") no-repeat;
+	background: url("../diabook-blue/icons/pubgroups.png") no-repeat;
 	}
 .menu-profile-list.com_side{
-	background: url("../../../view/theme/diabook-blue/icons/com_side.png") no-repeat;
+	background: url("../diabook-blue/icons/com_side.png") no-repeat;
 	}
 
 /* aside */
@@ -991,7 +993,7 @@ aside #dfrn-request-link {
   -webkit-border-radius: 5px 5px 5px 5px;
   border-radius: 5px 5px 5px 5px;
   color: #ffffff;
-  background: #005c94 url('../../../images/connect-bg.png') no-repeat left center;
+  background: #005c94 url('../../../../images/connect-bg.png') no-repeat left center;
   font-weight: bold;
   text-transform: uppercase;
   padding: 4px 2px 2px 35px;
@@ -1006,6 +1008,8 @@ aside #profiles-menu {
 }
 aside #search-text {
 	width: 150px;
+		height: 17px;
+		padding-left: 10px;
 	border-top-left-radius: 15px;
 border-top-right-radius: 15px;
 border-bottom-right-radius: 15px;
@@ -1116,11 +1120,11 @@ list-style-type: disc;
   color: #1872A2;
 }
 .widget .tool.selected {
-  background: url("../../../view/theme/diabook-blue/icons/selected.png") no-repeat left center;
+  background: url("../diabook-blue/icons/selected.png") no-repeat left center;
 }
 /* widget: search */
 span.sbox_l  {
-	background: white url('../../../view/theme/diabook/icons/srch_l.gif') no-repeat top left;
+	background: white url('../diabook/icons/srch_l.gif') no-repeat top left;
 	float: left;
 	width: 19px; height: 19px;
 	margin-left: 10px;
@@ -1129,14 +1133,14 @@ span.sbox_l  {
 }
 
 span.sbox_r  {
-	background: white url('../../../view/theme/diabook/icons/srch_r.gif') no-repeat top left;
+	background: white url('../diabook/icons/srch_r.gif') no-repeat top left;
 	float: left;
 	width: 19px; height: 19px;
 	margin-top: 5px;
 }
 
 span.sbox input {
-	background: white url('../../../view/theme/diabook/icons/srch_bg.gif') repeat-x top left;
+	background: white url('../diabook/icons/srch_bg.gif') repeat-x top left;
 	float: left;
 	margin-top: 5px;
 	border: 0;
@@ -1159,10 +1163,14 @@ section {
 
 body .pageheader{
   text-align: center;
-  margin-top: 25px;
-  font-size: 0px;
+  font-size: 20px;
+  margin-bottom: 20px;
+  margin-top: 0px;
+  max-width: 575px;
+	}
+.qcomment{
+  max-width: 122px;	
 	}
-
 #id_username {
   width: 173px;	
 	}
@@ -1190,7 +1198,6 @@ body .pageheader{
     padding: 0;
  }
 .tab.button {
-    margin-right: 5px; 
     margin-left: 5px;	
     /*background: none repeat scroll 0 0 #F8F8F8;*/
     border: 1px solid #CCCCCC;
@@ -1214,7 +1221,7 @@ right_aside {
   /* background: #F1F1F1; */
 }
 right_aside a{color: #1872A2;}
-right_aside h3 {border-bottom: 1px solid #D2D2D2; padding-top: 5px; padding-bottom: 0px; padding-left: 5px; margin-bottom: 0px; 
+right_aside h3 {border-bottom: 1px solid #D2D2D2; padding-top: 5px; padding-bottom: 0px; padding-left: 9px; margin-bottom: 0px; 
 margin-top:30px;}
 right_aside .directory-item {	width: 50px; height: 50px; vertical-align: center; text-align: center; }
 right_aside .directory-photo { margin: 0px; }
@@ -1228,13 +1235,13 @@ right_aside #ra-photos-wrapper { padding-left: 5px; padding-top: 3px; overflow:
 #page-sidebar-right_aside .label {max-width: 128px;}
 right_aside .icon {width: 10px; height: 10px;}
 .close_box		{ 
-		background-image: url("../../../view/theme/diabook-blue/icons/close_box.png");
+		background-image: url("../diabook-blue/icons/close_box.png");
 		float: right;
 		cursor: pointer;
 		opacity: 0.1;
 		}
 .close_box:hover	{ 
-		background-image: url("../../../view/theme/diabook-blue/icons/close_box.png");
+		background-image: url("../diabook-blue/icons/close_box.png");
 		float: right;
 		cursor: pointer;
 		opacity: 1;
@@ -1251,6 +1258,7 @@ transition: all 0.2s ease-in-out;
   padding: 5px;
   margin-bottom: 0px;
   width: 575px;
+  padding-top: 10px;
 }
 .tread-wrapper a{
   color: #1872A2;
@@ -1317,14 +1325,16 @@ transition: all 0.2s ease-in-out;
 }
 
 .wall-item-container .wall-item-content {
-  font-size: 12.5px;
+
   max-width: 420px;
   word-wrap: break-word;
-  line-height: 1.2;
+
+
 }
 
 .wall-item-container .wall-item-content img {
   max-width: 400px;
+
 }
 .wall-item-container .wall-item-links, .wall-item-container .wall-item-actions {
   display: table-cell;
@@ -1386,7 +1396,7 @@ transition: all 0.2s ease-in-out;
   width: 32px;
   height: 32px;
   margin-left: 16px;
-  /*background: url(../../../images/icons/22/user.png) no-repeat center center;*/
+  /*background: url(../../../../images/icons/22/user.png) no-repeat center center;*/
 
 }
 .wall-item-container.comment {
@@ -1397,7 +1407,7 @@ transition: all 0.2s ease-in-out;
   padding-left: 12px;
 }
 .wall-item-comment-wrapper {
-  margin: 1px 5px 1px 80px;
+  margin: 1px 5px 5px 80px;
 }
 .wall-item-comment-wrapper .comment-edit-photo {
   display: none;
@@ -1418,15 +1428,15 @@ transition: all 0.2s ease-in-out;
   border: 1px solid #2d2d2d;
 }
 .comment-edit-preview {
-  width: 710px;
-  border: 1px solid #2d2d2d;
+  width: 500px;
   margin-top: 10px;
+  background-color:  #fff797;
 }
 .comment-edit-preview .contact-photo {
   width: 32px;
   height: 32px;
   margin-left: 16px;
-  /*background: url(../../../images/icons/22/user.png) no-repeat center center;*/
+  /*background: url(../../../../images/icons/22/user.png) no-repeat center center;*/
 
 }
 .comment-edit-preview {
@@ -1463,14 +1473,14 @@ transition: all 0.2s ease-in-out;
   padding-bottom: 2px;
 }
 .tag {
-  /*background: url("../../../images/tag_b.png") repeat-x center left;*/
+  /*background: url("../../../../images/tag_b.png") repeat-x center left;*/
   color: #999;
   padding-left: 3px;
   font-size: 12px;
 }
 .tag a {
   padding-right: 5px;
-  /*background: url("../../../images/tag.png") no-repeat center right;*/
+  /*background: url("../../../../images/tag.png") no-repeat center right;*/
   color: #999;
 }
 .wwto {
@@ -1566,6 +1576,11 @@ transition: all 0.2s ease-in-out;
   padding: 0.3em;
   margin-bottom: 10px;
 }
+.grey
+{
+  display: inline;
+  float: right;	
+	}
 #jot #jot-tools {
   margin: 0px;
   padding: 0px;
@@ -1651,7 +1666,7 @@ transition: all 0.2s ease-in-out;
     height: 20px;
     margin: 0 0 5px;
     width: 60%;
-    border: 1px solid #ffffff;
+    border: 1px solid #d2d2d2;
 }
 #profile-jot-form #jot-title:-webkit-input-placeholder {
   font-weight: normal;
@@ -1712,7 +1727,7 @@ transition: all 0.2s ease-in-out;
 	float: left;
 	margin-top: 2px;
 	margin-left: 10px;
-	
+	font-size: 14px;
 }
 #profile-attach-wrapper {
 	float: left;
@@ -1758,7 +1773,9 @@ transition: all 0.2s ease-in-out;
 	float: right;
 	margin-left: 10px;
 	margin-top: 2px;
-	font-size: 10px;
+	font-size: 9px;
+	font-weight: bolder;
+	cursor: pointer;
 }
 #profile-jot-perms{
    float: right;
@@ -1769,18 +1786,20 @@ transition: all 0.2s ease-in-out;
 .button.creation1 {
     background-color: #fff;
     border: 1px solid #777777;
-    background-image: -moz-linear-gradient(center top , white 0%, #DDDDDD 100%);
     border-radius: 3px 3px 3px 3px;
     box-shadow: 0 1px 1px #CFCFCF;
+    cursor: pointer;
+    font-weight: bolder;
 }
 .button.creation2 {
-    background-color: #1872A2;
-    background-image: -moz-linear-gradient(center top , #66C1FF 0%, #0097FF 100%);
+    background-color: #055580;
     border: 1px solid #777777;
     color: white;
     border-radius: 3px 3px 3px 3px;
     box-shadow: 0 1px 1px #CFCFCF;
     margin-left: 5px;
+    cursor: pointer;
+    font-weight: bolder;
 }
 /*input[type="submit"] {
 	border: 0px;
@@ -1800,7 +1819,7 @@ transition: all 0.2s ease-in-out;
 }
 #acl-search {
   float: right;
-  background: #ffffff url("../../../images/search_18.png") no-repeat right center;
+  background: #ffffff url("../../../../images/search_18.png") no-repeat right center;
   padding-right: 20px;
 }
 #acl-showall {
@@ -1809,7 +1828,7 @@ transition: all 0.2s ease-in-out;
   width: auto;
   height: 18px;
   background-color: #cccccc;
-  background-image: url("../../../images/show_all_off.png");
+  background-image: url("../../../../images/show_all_off.png");
   background-position: 7px 7px;
   background-repeat: no-repeat;
   padding: 7px 5px 0px 30px;
@@ -1821,7 +1840,7 @@ transition: all 0.2s ease-in-out;
 #acl-showall.selected {
   color: #000000;
   background-color: #ff9900;
-  background-image: url("../../../images/show_all_on.png");
+  background-image: url("../../../../images/show_all_on.png");
 }
 #acl-list {
   height: 210px;
@@ -1872,20 +1891,20 @@ transition: all 0.2s ease-in-out;
   color: #000000;
 }
 .acl-button-show {
-  background-image: url("../../../images/show_off.png");
+  background-image: url("../../../../images/show_off.png");
 }
 .acl-button-hide {
-  background-image: url("../../../images/hide_off.png");
+  background-image: url("../../../../images/hide_off.png");
 }
 .acl-button-show.selected {
   color: #000000;
   background-color: #9ade00;
-  background-image: url("../../../images/show_on.png");
+  background-image: url("../../../../images/show_on.png");
 }
 .acl-button-hide.selected {
   color: #000000;
   background-color: #ff4141;
-  background-image: url("../../../images/hide_on.png");
+  background-image: url("../../../../images/hide_on.png");
 }
 .acl-list-item.groupshow {
   border-color: #9ade00;
@@ -1943,7 +1962,7 @@ ul.tabs li .active {
 .field .onoff a {
   display: block;
   border: 1px solid #666666;
-  background-image: url("../../../images/onoff.jpg");
+  background-image: url("../../../../images/onoff.jpg");
   background-repeat: no-repeat;
   padding: 4px 2px 2px 2px;
   height: 16px;
@@ -2016,7 +2035,7 @@ ul.tabs li .active {
   margin: 10px;
 }
 .oauthapp img.noicon {
-  background-image: url("../../../images/icons/48/plugin.png");
+  background-image: url("../../../../images/icons/48/plugin.png");
   background-position: center center;
   background-repeat: no-repeat;
 }
@@ -2032,9 +2051,10 @@ ul.tabs li .active {
 /* photo */
 .photo {
 box-shadow: 2px 2px 5px 0px #000000;
-margin: 2px 5px 2px 5px;
-max-height: 85%;
-max-width: 85%;
+margin: 0px;
+border-radius: 10px;
+height: 145px !important;
+width: 145px !important;
 }
 .lframe {
   float: left;
@@ -2062,7 +2082,7 @@ max-width: 85%;
 
 .contact-photo-menu-button {
         position: relative;
-        background-image: url("../../../images/icons/16/menu.png");
+        background-image: url("../../../../images/icons/16/menu.png");
         background-position: top left; 
         background-repeat: no-repeat;
         margin: 0px 0px -16px 0px; 
@@ -2107,6 +2127,11 @@ blockquote {
     border-left: 1px solid #D2D2D2;
     padding-left: 9px;
     margin: 0 0 0 .8ex;
+	 color: #777;
+}
+.oembed {
+	
+	font-weight: bold;
 }
 .aprofile dt{
 box-shadow: 1px 1px 5px 0;
@@ -2145,6 +2170,9 @@ box-shadow: 1px 1px 5px 0;
 #group-separator,
 #prof-separator { display: none;}
 */
+#prof-members-end{
+	clear: both;
+	}
 
 #prvmail-to-label, #prvmail-subject-label, #prvmail-message-label {
 	margin-bottom: 10px;
@@ -2270,7 +2298,7 @@ a.mail-list-link {
 }
 
 .vevent {
-        border: 1px solid #CCCCCC;
+
 }
 .vevent .event-description, .vevent .event-location {
         margin-left: 10px;
@@ -2293,7 +2321,7 @@ a.mail-list-link {
 }
 
 .event-description:before {
-        content: url('../../../images/calendar.png');
+        content: url('../../../../images/calendar.png');
         margin-right: 15px;
 }
 
diff --git a/view/theme/diabook/diabook-blue/style-wide.css b/view/theme/diabook/diabook-blue/style-wide.css
new file mode 100644
index 000000000..7745e7e2d
--- /dev/null
+++ b/view/theme/diabook/diabook-blue/style-wide.css
@@ -0,0 +1,2899 @@
+/**
+ * Fabio Comuni <http://kirgroup.com/profile/fabrixxm>
+ * Additional Changes: Michael Vogel <icarus@dabo.de>
+ **/
+
+/* ========= */
+/* = Admin = */
+/* ========= */
+
+#adminpage {
+/*        width: 80%;*/
+}
+
+#pending-update {
+        float:right;
+        color: #ffffff;
+        font-weight: bold;
+        background-color: #FF0000;
+        padding: 0em 0.3em;
+}
+
+.admin.linklist {
+        border: 0px; padding: 0px;
+}
+
+.admin.link {
+        list-style-position: inside;
+        font-size: 1em;
+        padding: 5px;
+        width: 100px;
+        margin: 5px;
+}
+
+#adminpage dl {
+        clear: left;
+        margin-bottom: 2px;
+        padding-bottom: 2px;
+        border-bottom: 1px solid black;
+}
+
+#adminpage dt {
+        width: 200px;
+        float: left;
+        font-weight: bold;
+}
+
+#adminpage dd {
+        margin-left: 200px;
+}
+#adminpage h3 {
+        border-bottom: 1px solid #898989;
+        margin-bottom: 5px;
+        margin-top: 10px;
+}
+
+#adminpage .submit {
+        clear:left;
+}
+
+#adminpage #pluginslist {
+        margin: 0px; padding: 0px;
+}
+
+#adminpage .plugin {
+        list-style: none;
+        display: block;
+	/* border: 1px solid #888888; */
+        padding: 1em;
+        margin-bottom: 5px;
+        clear: left;
+}
+
+#adminpage .toggleplugin {
+        float:left;
+        margin-right: 1em;
+}
+
+#adminpage table {width:100%; border-bottom: 1p solid #000000; margin: 5px 0px;}
+#adminpage table th { text-align: left;}
+#adminpage td .icon { float: left;}
+#adminpage table#users img { width: 16px; height: 16px; }
+#adminpage table tr:hover { background-color: #eeeeee; }
+#adminpage .selectall { text-align: right; }
+/* icons */
+.icon.bb-url{
+  background-image: url("../../../view/theme/diabook/diabook-blue/icons/bb-url.png");
+  float: right;
+  margin-top: 2px;}
+.icon.quote{
+  background-image: url("../../../view/theme/diabook/diabook-blue/icons/quote.png");
+  float: right;
+  margin-top: 2px;}
+.icon.bold{
+  background-image: url("../../../view/theme/diabook/diabook-blue/icons/bold.png");
+  float: right;
+  margin-top: 2px;}
+.icon.underline{
+  background-image: url("../../../view/theme/diabook/diabook-blue/icons/underline.png");
+  float: right;
+  margin-top: 2px;}
+.icon.italic{
+  background-image: url("../../../view/theme/diabook/diabook-blue/icons/italic.png");
+  float: right;
+  margin-top: 2px;}
+.icon.bb-image{
+  background-image: url("../../../view/theme/diabook/diabook-blue/icons/bb-image.png");
+  float: right;
+  margin-top: 2px;}
+.icon.bb-video{
+  background-image: url("../../../view/theme/diabook/diabook-blue/icons/bb-video.png");
+  float: right;
+  margin-top: 2px;}
+  
+.icon.contacts {
+  background-image: url("../../../view/theme/diabook/diabook-blue/icons/contacts.png");}
+.icon.notifications {
+  background-image: url("../../../view/theme/diabook/diabook-blue/icons/notifications.png");}
+.icon.notify {
+  background-image: url("../../../view/theme/diabook/diabook-blue/icons/notify.png");}
+.icon.messages {
+  background-image: url("../../../view/theme/diabook/diabook-blue/icons/messages.png");}
+.icon.community {
+  background-image: url("../../../view/theme/diabook/diabook-blue/icons/community.png");}
+  
+.icon.drop 	{ background-image: url("../../../view/theme/diabook/diabook-blue/icons/drop.png");}
+.icon.drophide 	{ background-image: url("../../../view/theme/diabook/diabook-blue/icons/drop.png");}
+.icon.dislike 	{ background-image: url("../../../view/theme/diabook/diabook-blue/icons/dislike.png");}
+.icon.like 	{ background-image: url("../../../view/theme/diabook/diabook-blue/icons/like.png");}
+.icon.pencil 	{ background-image: url("../../../view/theme/diabook/diabook-blue/icons/pencil.png");}
+.icon.recycle 	{ background-image: url("../../../view/theme/diabook/diabook-blue/icons/recycle.png");}
+.icon.remote-link { background-image: url("../../../view/theme/diabook/diabook-blue/icons/remote.png");}
+.icon.tagged    { background-image: url("../../../view/theme/diabook/diabook-blue/icons/tagged.png");}
+.icon.file-as { background-image: url("../../../view/theme/diabook/diabook-blue/icons/file_as.png");}
+.star-item.icon.unstarred { background-image: url("../../../view/theme/diabook/diabook-blue/icons/unstarred.png");}
+.star-item.icon.starred { background-image: url("../../../view/theme/diabook/diabook-blue/icons/starred.png");}
+.icon.link		{ background-image: url("../../../view/theme/diabook/diabook-blue/icons/link.png");}
+.icon.lock		{ background-image: url("../../../view/theme/diabook/diabook-blue/icons/lock.png");}
+.icon.unlock		{ background-image: url("../../../view/theme/diabook/diabook-blue/icons/unlock.png");}
+.icon.language    { background-image: url("../../../view/theme/diabook/diabook-blue/icons/language.png");}
+
+
+.camera 	{ background-image: url("../../../view/theme/diabook/diabook-blue/icons/camera.png"); 
+			  display: block; width: 28px; height: 28px; background-repeat: no-repeat;
+			  }
+.attach 	{ background-image: url("../../../view/theme/diabook/diabook-blue/icons/attach.png"); 
+			  display: block; width: 28px; height: 28px; background-repeat: no-repeat;
+			  }
+.video2 	{ background-image: url("../../../view/theme/diabook/diabook-blue/icons/video.png"); 
+			  display: block; width: 28px; height: 28px; background-repeat: no-repeat;
+			  }	
+.video 	{ background-image: url("../../../view/theme/diabook/diabook-blue/icons/video.png"); 
+			  display: block; width: 100%; height: 140px; background-repeat: no-repeat;
+			  }
+.audio2 	{ background-image: url("../../../view/theme/diabook/diabook-blue/icons/audio.png"); 
+			  display: block; width: 28px; height: 28px; background-repeat: no-repeat;
+			  }
+.audio 	{ background-image: url("../../../view/theme/diabook/diabook-blue/icons/audio.png"); 
+			  display: block; width: 28px; height: 28px; background-repeat: no-repeat;
+			  }
+.weblink 	{ background-image: url("../../../view/theme/diabook/diabook-blue/icons/weblink.png"); 
+			  display: block; width: 28px; height: 28px; background-repeat: no-repeat;
+			  }
+.globe 	{ background-image: url("../../../view/theme/diabook/diabook-blue/icons/globe.png"); 
+			  display: block; width: 28px; height: 28px; background-repeat: no-repeat;
+			  }
+.unglobe 	{ background-image: url("../../../view/theme/diabook/diabook-blue/icons/unglobe.png"); 
+			  display: block; width: 28px; height: 28px; background-repeat: no-repeat;
+			  }
+.edit    {background-image: url("../../../view/theme/diabook/diabook-blue/icons/pencil2.png"); 
+			  display: block; width: 28px; height: 28px; background-repeat: no-repeat;}
+.icon.block   {background-image: url("../../../view/theme/diabook/icons/block.png"); 
+			  display: block; width: 16px; height: 16px; background-repeat: no-repeat;}
+.icon.block.dim  {background-image: url("../../../view/theme/diabook/icons/block.png"); 
+			  display: block; width: 16px; height: 16px; background-repeat: no-repeat; opacity: 0.3;}
+.icon.ad_drop 	{ background-image: url("../../../view/theme/diabook/icons/drop.png");
+			  display: block; margin-left:5px; width: 16px; height: 16px; background-repeat: no-repeat;}			  
+			  
+
+
+.article	{ background-position: -50px  0px;}
+/*.audio 		{ background-position: -70px  0px;}*/
+/*.drop 		{ background-position: -110px 0px;}*/
+/*.drophide 	{ background-position: -130px 0px;}*/
+/*.edit 		{ background-position: -150px 0px;}*/
+/*.camera 	{ background-position: -170px 0px;}*/
+/*.dislike 	{ background-position: -190px 0px;}*/
+/*.like 		{ background-position: -210px 0px;}*/
+/*.link 		{ background-position: -230px 0px;}*/
+
+/*.globe 		{ background-position: -50px  -20px;}*/
+/*.noglobe 	{ background-position: -70px  -20px;}*/
+.no 		{ background-position: -90px  -20px;}
+.pause 		{ background-position: -110px -20px;}
+.play 		{ background-position: -130px -20px;}
+/*.pencil 	{ background-position: -150px -20px;}*/
+.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;}*/
+
+/*.video          { background-position: -110px -40px;}*/
+.youtube        { background-position: -130px -40px;}
+
+/*.attach         { background-position: -190px -40px;}*/
+/*.language       { background-position: -210px -40px;}*/
+
+
+.icon.on             { background-image: url("../../../view/theme/diabook/diabook-blue/icons/toogle_on.png"); background-repeat: no-repeat;}
+.icon.off            { background-image: url("../../../view/theme/diabook/diabook-blue/icons/toogle_off.png"); background-repeat: no-repeat;}
+.icon.prev           { background-image: url("../../../view/theme/diabook/diabook-blue/icons/prev.png"); background-repeat: no-repeat;}
+.icon.next           { background-image: url("../../../view/theme/diabook/diabook-blue/icons/next.png"); background-repeat: no-repeat;}
+/*.tagged     { background-position: -130px -60px;}*/
+
+.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 0px; }
+.type-audio { background-position: -40px 0px; }
+.type-text  { background-position: -60px 0px; }
+.type-unkn  { background-position: -80px 0px; }
+
+.icon.drop, .icon.drophide {
+ float: left;
+}
+
+.icon {
+  display: block;
+  width: 20px;
+  height: 20px;
+  /*background-image: url('icons.png');*/
+}
+
+.icon {
+  background-color: transparent ;
+  background-repeat: no-repeat;
+  /* background-position: left center; */
+  display: block;
+  overflow: hidden;
+  text-indent: -9999px;
+  padding: 1px;
+}
+
+.icon.border.camera{
+  background-image: url("../../../view/theme/diabook/diabook-blue/icons/camera.png"); 
+  display: block; width: 28px; height: 28px; background-repeat: no-repeat;
+	}
+	
+.icon.border.link{
+  background-image: url("../../../view/theme/diabook/diabook-blue/icons/weblink.png"); 
+  display: block; width: 28px; height: 28px; background-repeat: no-repeat;
+  margin-left: 10px;
+	}
+
+.icon.text {
+  text-indent: 0px;
+}
+.icon.s10 {
+  min-width: 10px;
+  height: 10px;
+}
+.icon.s10.notify {
+  background-image: url("../../../images/icons/10/notify_off.png");
+}
+.icon.s10.gear {
+  background-image: url("../../../images/icons/10/gear.png");
+}
+.icon.s10.add {
+  background-image: url("../../../images/icons/10/add.png");
+}
+.icon.s10.delete {
+  background-image: url("../../../images/icons/10/delete.png");
+}
+.icon.s10.edit {
+  background-image: url("../../../images/icons/10/edit.png");
+}
+.icon.s10.star {
+  background-image: url("../../../images/star_dummy.png");
+}
+.icon.s10.menu {
+  background-image: url("../../../images/icons/10/menu.png");
+}
+.icon.s10.link {
+  background-image: url("../../../images/icons/10/link.png");
+}
+.icon.s10.lock {
+  background-image: url("../../../images/icons/10/lock.png");
+}
+.icon.s10.unlock {
+  background-image: url("../../../images/icons/10/unlock.png");
+}
+.icon.s10.text {
+  padding: 2px 0px 0px 15px;
+  font-size: 10px;
+}
+.icon.s16 {
+  min-width: 16px;
+  height: 16px;
+}
+.icon.s16.notify {
+  background-image: url("../../../images/icons/16/notify_off.png");
+}
+.icon.s16.gear {
+  background-image: url("../../../images/icons/16/gear.png");
+}
+.icon.s16.add {
+  background-image: url("../../../images/icons/16/add.png");
+}
+.icon.s16.delete {
+  background-image: url("../../../images/icons/16/delete.png");
+}
+/*.icon.s16.edit {
+  background-image: url("../../../images/icons/16/edit.png");
+}*/
+.icon.s16.star {
+  background-image: url("../../../images/star_dummy.png");
+}
+.icon.s16.menu {
+  background-image: url("../../../images/icons/16/menu.png");
+}
+/*.icon.s16.link {
+  background-image: url("../../../images/icons/16/link.png");
+}*/
+.icon.s16.lock {
+  background-image: url("../../../images/icons/16/lock.png");
+}
+.icon.s16.unlock {
+  background-image: url("../../../images/icons/16/unlock.png");
+}
+.icon.s16.text {
+  padding: 4px 0px 0px 20px;
+  font-size: 10px;
+}
+.icon.s22 {
+  min-width: 22px;
+  height: 22px;
+}
+.icon.s22.notify {
+  background-image: url("../../../images/icons/22/notify_off.png");
+}
+.icon.s22.gear {
+  background-image: url("../../../images/icons/22/gear.png");
+}
+.icon.s22.add {
+  background-image: url("../../../images/icons/22/add.png");
+}
+.icon.s22.delete {
+  background-image: url("../../../images/icons/22/delete.png");
+}
+.icon.s22.edit {
+  background-image: url("../../../images/icons/22/edit.png");
+}
+.icon.s22.star {
+  background-image: url("../../../images/star_dummy.png");
+}
+.icon.s22.menu {
+  background-image: url("../../../images/icons/22/menu.png");
+}
+.icon.s22.link {
+  background-image: url("../../../images/icons/22/link.png");
+}
+.icon.s22.lock {
+  background-image: url("../../../images/icons/22/lock.png");
+}
+.icon.s22.unlock {
+  background-image: url("../../../images/icons/22/unlock.png");
+}
+.icon.s22.text {
+  padding: 10px 0px 0px 25px;
+  width: 200px;
+}
+.icon.s48 {
+  width: 48px;
+  height: 48px;
+}
+.icon.s48.notify {
+  background-image: url("../../../images/icons/48/notify_off.png");
+}
+.icon.s48.gear {
+  background-image: url("../../../images/icons/48/gear.png");
+}
+.icon.s48.add {
+  background-image: url("../../../images/icons/48/add.png");
+}
+.icon.s48.delete {
+  background-image: url("../../../images/icons/48/delete.png");
+}
+.icon.s48.edit {
+  background-image: url("../../../images/icons/48/edit.png");
+}
+.icon.s48.star {
+  background-image: url("../../../images/star_dummy.png");
+}
+.icon.s48.menu {
+  background-image: url("../../../images/icons/48/menu.png");
+}
+.icon.s48.link {
+  background-image: url("../../../images/icons/48/link.png");
+}
+.icon.s48.lock {
+  background-image: url("../../../images/icons/48/lock.png");
+}
+.icon.s48.unlock {
+  background-image: url("../../../images/icons/48/unlock.png");
+}
+
+#contact-edit-links ul {
+  list-style: none;
+  list-style-type: none;
+}
+
+.hide-comments-outer {
+  margin-left: 80px;
+  margin-bottom: 5px;
+  width: 675px;
+  border-bottom: 1px solid #BDCDD4;
+  padding: 8px;
+}
+
+/* global */
+body {
+  font-family: 'Lato', "Helvetica Neue", Helvetica, Arial, sans-serif;
+  font-size: 13px;
+  background-color: #ffffff;
+  color: #2d2d2d;
+  margin: 50px auto auto;
+  display: table;
+}
+
+#jappix_mini {
+right: 45px !important;
+}
+
+
+h4 {
+  font-size: 1.1em;
+}
+
+a {
+	color: #333333;
+	/* color: #3e3e8c; */
+	text-decoration: none;
+}
+a:hover {
+	/* color: blue; */
+	text-decoration: underline
+}
+
+.wall-item-name-link {
+/*  float: left;*/
+}
+
+.wall-item-photo {
+  width: 48px;
+  height: 48px;
+  overflow: hidden;
+  display: block;
+}
+
+.left {
+  float: left;
+}
+.right {
+  float: right;
+}
+.hidden {
+  display: none;
+}
+.clear {
+  clear: both;
+}
+.fakelink {
+  color: #1872A2;
+  /* color: #3e3e8c; */
+  text-decoration: none;
+  cursor: pointer;
+}
+.fakelink:hover {
+  /* color: blue; */
+  /*color: #005c94; */
+  text-decoration: underline;
+}
+.intro-end {
+	border-bottom: 1px solid black;
+   clear: both;
+   margin-bottom: 25px;
+   padding-bottom: 25px;
+   width: 75%;
+	}
+.intro-form-end {
+	clear: both;
+	}
+.intro-fullname {
+	padding-bottom: 5px;
+   padding-top: 5px;
+	}
+.intro-wrapper-end {
+	clear: both;
+   padding-bottom: 5px;
+	}
+code {
+  font-family: Courier, monospace;
+  white-space: pre;
+  display: block;
+  overflow: auto;
+  border: 1px solid #444;
+  background: #EEE;
+  color: #444;
+  padding: 10px;
+  margin-top: 20px;
+}
+#panel {
+  position: absolute;
+  width: 12em;
+  background: #ffffff;
+  color: #2d2d2d;
+  margin: 0px;
+  padding: 1em;
+  list-style: none;
+  border: 3px solid #364e59;
+  z-index: 100000;
+  -webkit-box-shadow: 0px 5px 10px rgba(0, 0, 0, 0.7);
+  -moz-box-shadow: 0px 5px 10px rgba(0, 0, 0, 0.7);
+  box-shadow: 0px 5px 10px rgba(0, 0, 0, 0.7);
+}
+/* tool */
+.tool {
+  height: auto;
+  overflow: auto;
+  padding: 3px;
+}
+#saved-search-ul .tool:hover,
+#nets-sidebar .tool:hover,
+#sidebar-group-list .tool:hover,
+#fileas-sidebar .tool:hover {
+	background: #308DBF;
+}
+.tool .label {
+  float: left;
+}
+.tool .action {
+  float: right;
+}
+.tool a {
+  color: ##3F8FBA;
+}
+.tool a:hover {
+  text-decoration: none;
+}
+/* popup notifications */
+div.jGrowl div.notice {
+  background: #511919 url("../../../images/icons/48/notice.png") no-repeat 5px center;
+  color: #ffffff;
+  padding-left: 58px;
+}
+div.jGrowl div.info {
+  background: #364e59 url("../../../images/icons/48/info.png") no-repeat 5px center;
+  color: #ffffff;
+  padding-left: 58px;
+}
+/* header */
+header {
+  position: fixed;
+  left: 0%;
+  right: 80%;
+  top: 0px;
+  margin: 0px;
+  padding: 0px;
+  width: 22%;
+  height: 32px;
+  background: #1872a2;
+  background-color: #1872a2;
+  z-index: 100;
+  border-bottom: 1px;
+  border-bottom-color: black;
+  border-bottom-style: inset;
+}
+header #site-location {
+  display: none;
+}
+header #banner {
+  overflow: hidden;
+  text-align: banner;
+  width: 82%;
+  margin-left: 25%;
+}
+header #banner a,
+header #banner a:active,
+header #banner a:visited,
+header #banner a:link,
+header #banner a:hover {
+  color: #ffffff;
+  text-decoration: none;
+  outline: none;
+  vertical-align: middle;
+ font-weight: bolder;
+  margin-left: 3px;
+}
+header #banner #logo-img {
+  height: 25px;
+  margin-top: 3px;
+}
+header #banner #logo-text {
+  font-size: 20px;
+  position: absolute;
+  top: 10%;
+}
+/* messages */
+#message-new {
+  background: #055580;
+  border: 1px solid #333;
+  width: 150px;
+}
+#message-new a {
+  color: #ffffff;
+  text-align: center;
+  display: block;
+  font-weight: bold;
+  padding: 1em 0px;
+    text-decoration: none;
+}
+.mail-list-wrapper {
+  background-color: #f6f7f8;
+  margin-bottom: 5px;
+  width: 100%;
+  height: auto;
+  overflow: hidden;
+}
+.mail-list-wrapper span {
+  display: block;
+  float: left;
+  width: 20%;
+  overflow: hidden;
+}
+.mail-list-wrapper .mail-subject {
+  width: 30%;
+  padding: 4px 0px 0px 4px;
+}
+.mail-list-wrapper .mail-subject a {
+  display: block;
+}
+.mail-list-wrapper .mail-subject.unseen a {
+  font-weight: bold;
+}
+.mail-list-wrapper .mail-date {
+  padding: 4px 4px 0px 4px;
+}
+.mail-list-wrapper .mail-from {
+  padding: 4px 4px 0px 4px;
+}
+.mail-list-wrapper .mail-count {
+  padding: 4px 4px 0px 4px;
+  text-align: right;
+}
+.mail-list-wrapper .mail-delete {
+  float: right;
+}
+#mail-display-subject {
+  background-color: #f6f7f8;
+  color: #2d2d2d;
+  margin-bottom: 10px;
+  width: 100%;
+  height: auto;
+  overflow: hidden;
+}
+#mail-display-subject span {
+  float: left;
+  overflow: hidden;
+  padding: 4px 0px 0px 10px;
+}
+#mail-display-subject .mail-delete {
+  float: right;
+  opacity: 0.5;
+  -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;
+}
+#mail-display-subject:hover .mail-delete {
+  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;
+}
+/* nav */
+nav {
+  width: 80%;
+  height: 32px;
+  position: fixed;
+  left: 22%;
+  top: 0px;
+  padding: 0px;
+  background: #1872a2;
+  color: #ffffff;
+  z-index: 99;
+  border-bottom: 1px;
+  border-bottom-color: black;
+  border-bottom-style: inset;
+}
+nav a,
+nav a:active,
+nav a:visited,
+nav a:link,
+nav a:hover {
+  color: #ffffff;
+  text-decoration: none;
+  outline: none;
+}
+nav #banner {
+  overflow: hidden;
+  /*text-align: center;*/
+  width: 100%;
+}
+nav #banner a,
+nav #banner a:active,
+nav #banner a:visited,
+nav #banner a:link,
+nav #banner a:hover {
+  color: #ffffff;
+  text-decoration: none;
+  outline: none;
+  vertical-align: bottom;
+}
+nav #banner #logo-img {
+  height: 22px;
+  margin-top: 5px;
+}
+nav #banner #logo-text {
+  font-size: 22px;
+}
+nav #navbar{
+	}
+nav ul {
+  margin: 0px;
+  padding: 0px 20px;
+}
+nav ul li {
+  list-style: none;
+  margin: 0px;
+  /* padding: 1px 1px 3px 1px; */
+  float: left;
+}
+nav ul li .menu-popup {
+  left: 0px;
+  right: auto;
+}
+
+nav #logo-img {
+  height: 25px;
+  margin-top: 4px;
+  margin-left: 30px;
+}
+
+nav #logo-text {
+    font-size: 22px;
+    margin-top: 3px;
+    margin-right: 15px;
+}
+nav .nav-menu-search {
+  position: relative;
+
+  margin: 4px 17px;
+  margin-right: 0px;
+  height: 17px;
+  width: 180px;
+  
+}
+
+nav #search-box #search-text {
+  background-image:  url('icons/lupe.png');
+  background-repeat:no-repeat;
+  padding-left:20px;
+  border-top-left-radius: 15px;
+border-top-right-radius: 15px;
+border-bottom-right-radius: 15px;
+border-bottom-left-radius: 15px;
+	}
+
+
+nav .nav-menu-icon {
+  position: relative;
+  height: 22px;
+  padding: 5px;
+  margin: 0px 5px;
+  -moz-border-radius: 5px 5px 0 0;
+  -webkit-border-radius: 5px 5px 0 0;
+  border-radius: 5px 5px 0 0;
+}
+nav .nav-menu-icon:hover {
+  background-color: #308dbf;  
+  position: relative;
+  height: 22px;
+  padding: 5px;
+  margin: 0px 5px;
+  -moz-border-radius: 5px 5px 0 0;
+  -webkit-border-radius: 5px 5px 0 0;
+  border-radius: 5px 5px 0 0;
+}
+
+nav .nav-menu-icon.selected {
+  background-color: #fff;
+}
+nav .nav-menu-icon img {
+  width: 22px;
+  height: 22px;
+}
+nav .nav-menu-icon .nav-notify {
+  top: 3px;
+}
+/*marker*/
+nav .nav-menu {
+  position: relative;
+  height: 16px;
+  padding: 5px;
+  margin: 3px 15px 0px;
+  font-size: 15px;
+  /*border-bottom: 3px solid #364A84;*/
+}
+nav .nav-menu.selected {
+  /*border-bottom: 3px solid #9eabb0;*/
+}
+nav .nav-notify {
+  display: none;
+  position: absolute;
+  background-color: #ff0000;
+  /* background-color: #19aeff; */
+  -moz-border-radius: 5px 5px 5px 5px;
+  -webkit-border-radius: 5px 5px 5px 5px;
+  border-radius: 5px 5px 5px 5px;
+  font-size: 10px;
+  font-weight: 900;
+  padding: 1px 4px;
+  top: 0px;
+  right: -6px;
+  min-width: 10px;
+  text-align: center;
+}
+nav .nav-notify.show {
+  display: block;
+}
+nav #nav-help-link,
+nav #nav-search-link,
+nav #nav-directory-link,
+nav #nav-apps-link,
+nav #nav-site-linkmenu, 
+nav #nav-home-link,
+nav #nav-user-linkmenu
+{
+  float: right;
+}
+nav #nav-user-linkmenu{
+	margin-right: 0px;
+	}
+nav #nav-home-link, #nav-directory-link, #nav-apps-link{
+	margin-left: 0px;
+	margin-right: 0px;
+	font-weight: bold;
+	margin: 3px 5px;
+	}
+nav #nav-directory-link{
+  margin-right: 0px;	
+	}
+nav #nav-home-link{
+  margin-left: 0px;	
+	}
+nav #nav-help-link .menu-popup,
+nav #nav-search-link .menu-popup,
+nav #nav-directory-link .menu-popup,
+nav #nav-apps-link .menu-popup,
+nav #nav-site-linkmenu .menu-popup {
+  right: 0px;
+  left: auto;
+}
+
+nav #nav-messages-linkmenu.on .icon.messages, nav #nav-messages-linkmenu.selected .icon.messages{
+	background-image: url("../../../view/theme/diabook/diabook-blue/icons/messages2.png");
+	}
+	
+/*nav #nav-notifications-linkmenu.on .icon.notify,*/ nav #nav-notifications-linkmenu.selected .icon.notify{
+	background-image: url("../../../view/theme/diabook/diabook-blue/icons/notify2.png");
+	}
+	
+nav #nav-contacts-linkmenu.on .icon.contacts, nav #nav-contacts-linkmenu.selected .icon.contacts{
+	background-image: url("../../../view/theme/diabook/diabook-blue/icons/contacts2.png");
+	}
+	
+nav #nav-apps-link.selected {
+  background-color: #364e59;
+}
+
+#nav-notifications-mark-all {
+	/* padding: 1px 1px 2px 26px; */
+	/* border-bottom: 1px solid #364E59; */
+	/* margin: 0px 0px 2px 0px;
+	padding: 5px 10px; */
+}
+
+#nav-notifications-see-all {
+	/* padding: 1px 1px 2px 26px; */
+	/* border-bottom: 1px solid #364E59; */
+	/* margin: 0px 0px 2px 0px;
+	padding: 5px 10px; */
+}
+
+.notify-seen {
+	background: none repeat scroll 0 0 #DDDDDD;
+	}
+
+ul.menu-popup {
+  position: absolute;
+  display: none;
+  width: 11em;
+  background: #ffffff;
+  color: #2d2d2d;
+  margin: 0px;
+  padding: 0px;
+  list-style: none;
+  z-index: 100000;
+  -webkit-box-shadow: 0px 5px 10px rgba(0, 0, 0, 0.7);
+  -moz-box-shadow: 0px 5px 10px rgba(0, 0, 0, 0.7);
+  box-shadow: 0px 5px 10px rgba(0, 0, 0, 0.7);
+}
+ul.menu-popup a {
+  display: block;
+  color: #2d2d2d;
+  padding: 5px 10px;
+  text-decoration: none;
+}
+ul.menu-popup a:hover {
+  background-color: #308DBF; /*bdcdd4;*/
+  color: #fff;
+}
+ul.menu-popup .menu-sep {
+  border-top: 1px solid #9eabb0;
+}
+ul.menu-popup li {
+  float: none;
+  overflow: auto;
+  height: auto;
+  display: block;
+}
+ul.menu-popup li img {
+  float: left;
+  width: 16px;
+  height: 16px;
+  padding-right: 5px;
+}
+ul.menu-popup .empty {
+  padding: 5px;
+  text-align: center;
+  color: #9eabb0;
+}
+/* autocomplete popup */
+.acpopup {
+  max-height: 150px;
+  background-color: #ffffff;
+  color: #2d2d2d;
+  border: 1px solid #MenuBorder;
+  overflow: auto;
+  z-index: 100000;
+  -webkit-box-shadow: 0px 5px 10px rgba(0, 0, 0, 0.7);
+  -moz-box-shadow: 0px 5px 10px rgba(0, 0, 0, 0.7);
+  box-shadow: 0px 5px 10px rgba(0, 0, 0, 0.7);
+}
+.acpopupitem {
+  color: #2d2d2d;
+  padding: 4px;
+  clear: left;
+}
+.acpopupitem img {
+  float: left;
+  margin-right: 4px;
+}
+.acpopupitem.selected {
+  background-color: #bdcdd4;
+}
+#nav-notifications-menu {
+  width: 400px;
+  max-height: 550px;
+  overflow: auto;
+}
+/* #nav-notifications-menu a {
+	display: inline;
+	padding: 5px 0px;
+	margin: 0px 0px 2px 0px;
+}
+#nav-notifications-menu li:hover {
+  background-color: #bdcdd4;
+}*/
+
+#nav-notifications-menu img {
+  float: left;
+  margin-right: 5px;
+}
+#nav-notifications-menu .contactname {
+  font-weight: bold;
+}
+#nav-notifications-menu .notif-when {
+  font-size: 10px;
+  color: #9eabb0;
+  display: block;
+}
+
+.notif-image {
+        width: 32px;
+        height: 32px;
+        padding: 7px 7px 0px 0px;
+}
+
+/*profile_side*/
+#profile_side {
+  margin-bottom: 30px;
+}
+#ps-usericon{
+	height: 25px	
+	}
+#ps-username{
+  font-size: 1.17em;
+  font-weight: bold;
+  vertical-align: top;
+  position: absolute;
+  padding-top: 4px;
+  padding-left: 5px;	
+  word-wrap: break-word;
+  width: 130px;
+	}
+#ps-username:hover{
+  text-decoration: none;	
+	}
+.menu-profile-side{
+  list-style: none;	
+  padding-left: 0px;
+  min-height: 0px;
+	}
+.menu-profile-list{
+  height: auto;
+  overflow: auto;
+  min-height: 16px;
+  list-style: none;
+	}
+.menu-profile-list:hover{
+	background: #308DBF;
+	}
+.menu-profile-list-item{
+	padding-left: 5px;
+	vertical-align: middle;
+	}	
+.menu-profile-list-item:hover{	
+	text-decoration: none;
+	
+   }
+/*http://prothemedesign.com/circular-icons/*/
+.menu-profile-icon.home{
+	background: url("../../../view/theme/diabook/diabook-blue/icons/home.png") no-repeat;
+	float: left;
+	height: 22px;
+   width: 22px;
+	}
+.menu-profile-icon.photos{
+	background: url("../../../view/theme/diabook/diabook-blue/icons/mess_side.png") no-repeat;
+	float: left;
+	height: 22px;
+   width: 22px;}
+.menu-profile-icon.events{
+	background: url("../../../view/theme/diabook/diabook-blue/icons/events.png") no-repeat;
+	float: left;
+	height: 22px;
+   width: 22px;}
+.menu-profile-icon.notes{
+	background: url("../../../view/theme/diabook/diabook-blue/icons/notes.png") no-repeat;
+	float: left;
+	height: 22px;
+   width: 22px;}
+.menu-profile-icon.foren{
+	background: url("../../../view/theme/diabook/diabook-blue/icons/pubgroups.png") no-repeat;
+	float: left;
+	height: 22px;
+   width: 22px;}
+.menu-profile-icon.com_side{
+	background: url("../../../view/theme/diabook/diabook-blue/icons/com_side.png") no-repeat;
+	float: left;
+	height: 22px;
+   width: 22px;}
+.menu-profile-icon.pscontacts{
+	background: url("../../../view/theme/diabook/diabook-blue/icons/pscontacts.png") no-repeat;
+	float: left;
+	height: 22px;
+   width: 22px;}
+/* aside */
+/*marker*/
+aside {
+  display: table-cell;
+  vertical-align: top;
+  width: 180px;
+  padding: 0px 5px 0px 0px;
+  border-right: 1px solid #D2D2D2;
+  float: left;
+  /* background: #F1F1F1; */
+}
+aside #page-sidebar{display: none;}
+aside .vcard .fn {
+  font-size: 18px;
+  font-weight: bold;
+  margin-bottom: 5px;
+}
+aside .vcard .title {
+  margin-bottom: 5px;
+}
+aside .vcard dl {
+  height: auto;
+  overflow: auto;
+}
+aside .vcard dt {
+  float: left;
+  margin-left: 0px;
+  /*width: 35%;*/
+  text-align: right;
+  color: #999999;
+}
+aside .vcard dd {
+  float: left;
+  margin-left: 5px;
+  /*width: 60%;*/
+}
+aside #profile-extra-links ul {
+  padding: 0px;
+  margin: 0px;
+}
+aside #profile-extra-links li {
+  padding: 0px;
+  margin: 0px;
+  list-style: none;
+}
+aside #dfrn-request-link {
+  display: block;
+  -moz-border-radius: 5px 5px 5px 5px;
+  -webkit-border-radius: 5px 5px 5px 5px;
+  border-radius: 5px 5px 5px 5px;
+  color: #ffffff;
+  background: #005c94 url('../../../images/connect-bg.png') no-repeat left center;
+  font-weight: bold;
+  text-transform: uppercase;
+  padding: 4px 2px 2px 35px;
+}
+aside #dfrn-request-link:hover {
+  text-decoration: none;
+  background-color: #36c;
+  /* background-color: #19aeff; */
+}
+aside #profiles-menu {
+  width: 20em;
+}
+aside #search-text {
+	width: 173px;
+	height: 17px;
+   padding-left: 10px;
+	border-top-left-radius: 15px;
+border-top-right-radius: 15px;
+border-bottom-right-radius: 15px;
+border-bottom-left-radius: 15px;
+}
+aside #side-follow-url {
+	width: 173px;
+	}
+aside #side-peoplefind-url {
+	width: 173px;
+	}
+#contact-block {
+  overflow: auto;
+  height: auto;
+}
+#contact-block .contact-block-h4 {
+  float: left;
+  margin: 5px 0px;
+}
+#contact-block .allcontact-link {
+  float: right;
+  margin: 5px 0px;
+}
+#contact-block .contact-block-content {
+  clear: both;
+  overflow: auto;
+  height: auto;
+}
+#contact-block .contact-block-link {
+  float: left;
+  margin: 0px 2px 2px 0px;
+}
+#contact-block .contact-block-link img {
+  widht: 55px;
+  height: 55px;
+}
+#lost-password-link {
+  float: left;
+  margin-right: 20px;		
+	}
+#login-submit-wrapper{
+margin-bottom: 15px;
+	}
+.group_selected {
+  background: url("../../../view/theme/diabook/icons/selected.png") no-repeat left center;
+  float: left;
+  height: 22px;
+  width: 22px;
+}
+.group_unselected {
+  background: url("../../../view/theme/diabook/icons/unselected.png") no-repeat left center;
+  float: left;
+  height: 22px;
+  width: 22px;
+}
+.icon.text_add		{ 
+		background-image: url("../../../images/icons/16/add.png");
+		float: right;
+		opacity: 0.2;
+		margin-right: 14px;
+		}
+.icon.text_add:hover	{ 
+		background-image: url("../../../images/icons/16/add.png");
+		float: right;
+		cursor: pointer;
+		margin-right: 14px;
+		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;
+		}
+.icon.text_edit {
+  background-image: url("../../../images/icons/10/edit.png");
+  opacity: 0.2;
+  margin-top: 6px;
+  float: right;
+  height: 10px;
+}
+.icon.text_edit:hover {
+  background-image: url("../../../images/icons/10/edit.png");
+  opacity: 1;
+  margin-top: 6px;
+  float: right;
+  height: 10px;
+}
+/* widget */
+.widget {
+  margin-bottom: 2em;
+  /*.action .s10 { width: 10px; overflow: hidden; padding: 0px;}
+	.action .s16 { width: 16px; overflow: hidden; padding: 0px;}*/
+/*  font-size: 12px; */
+}
+/*marker*/
+.widget h3 {
+  padding: 0px;
+  margin: 2px;
+  font-size: 1.05em;
+}
+.widget .action {
+  opacity: 0.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;
+}
+.widget input.action {
+  opacity: 0.5;
+  -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;
+}
+.widget:hover .title .action {
+  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;
+}
+.widget .tool:hover .action {
+  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;
+}
+.widget .tool:hover .action.ticked {
+  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;
+}
+.widget ul {
+  padding: 0px;
+}
+.widget ul li {
+  padding-left: 16px;
+  min-height: 16px;
+  list-style: none;
+}
+#side-bar-photos-albums li{
+list-style-type: disc;
+}
+#side-bar-photos-albums ul li{
+  margin-left: 30px;
+  padding-left: 0px;
+	}
+#side-bar-photos-albums ul li a{
+  color: #1872A2;
+}
+.widget .tool.selected {
+  background: url("../../../view/theme/diabook/diabook-blue/icons/selected.png") no-repeat left center;
+}
+/* widget: search */
+#add-search-popup {
+  width: 200px;
+  top: 18px;
+}
+/* section */
+section {
+  display: table-cell;
+  vertical-align: top;
+  width: 800px;
+  padding: 0px 0px 0px 12px;
+}
+body .pageheader{
+  text-align: center;
+  font-size: 20px;
+  margin-bottom: 20px;
+  margin-top: 0px;
+  max-width: 775px;
+	}
+.qcomment{
+  max-width: 122px;	
+	}
+#id_username {
+  width: 173px;	
+	}
+#id_password {
+  width: 173px;		
+	}
+#id_openid_url {
+  width: 173px;	
+	}
+#contact-edit-end {
+	}
+.pager {
+   padding: 10px;
+	text-align: center;
+	font-size: 1.0em;
+	clear: both;
+	display: block;
+}	
+
+.tabs {
+    
+    background-position: 0 -20px;
+    background-repeat: repeat-x;
+    height: 27px;
+    padding: 0;
+ }
+.tab.button {
+    margin-left: 5px;	
+    /*background: none repeat scroll 0 0 #F8F8F8;*/
+    border: 1px solid #CCCCCC;
+    border-radius: 3px 3px 3px 3px;
+    font-weight: normal;
+    padding: 3px;
+    color:  #333333;
+	}
+	
+#birthday-notice, #event-notice, #birthday-wrapper, #event-wrapper{
+	margin-bottom: 10px;
+	}
+/* wall item */
+.tread-wrapper {
+  border-bottom: 1px solid #D2D2D2;
+  position: relative;
+  padding: 5px;
+  margin-bottom: 0px;
+  width: 775px;
+  padding-top: 10px;
+}
+.tread-wrapper a{
+  color: #1872A2;
+}
+
+/*marker*/
+.wall-item-decor {
+  position: absolute;
+  left: 780px;
+  top: -10px;
+  width: 16px;
+}
+/*marker*/
+.wall-item-container {
+  display: table;
+  width: 770px;
+}
+.wall-item-photo-container .wall-item-item, .wall-item-container .wall-item-bottom {
+  display: table-row;
+}
+.wall-item-photo-container .wall-item-info {
+  display: table-cell;
+  vertical-align: top;
+  text-align: left;
+  width: 80px;
+}
+.wall-item-photo-container .wall-item-location {
+  padding-right: 40px;
+  display: table-cell;
+}
+.wall-item-photo-container .wall-item-ago {
+  word-wrap: break-word;
+  width: 50px;
+  margin-left: 10px;
+  color: #999;
+}
+/*marker*/
+.wall-item-photo-container .wall-item-content {
+
+  max-width: 690px;
+  word-wrap: break-word;
+  
+  margin-bottom: 14px;
+}
+.wall-item-photo-container .wall-item-content img {
+  max-width: 700px;
+}
+.wall-item-photo-container .wall-item-links, .wall-item-photo-container .wall-item-actions {
+  display: table-cell;
+  vertical-align: middle;
+}
+.wall-item-photo-container .wall-item-links .icon, .wall-item-photo-container .wall-item-actions .icon {
+  opacity: 0.5;
+  -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;
+}
+.wall-item-photo-container .wall-item-links .icon:hover, .wall-item-photo-container .wall-item-actions .icon: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;
+}
+.wall-item-photo-container .wall-item-name {
+  font-weight: bold;
+}
+.wall-item-photo-container .wall-item-actions-author {
+  width: 100%;
+  margin-bottom: 0.3em;
+}
+.wall-item-photo-container .wall-item-actions-social {
+  float: left;
+  margin-bottom: 1px;
+  display: table-cell;
+}
+.wall-item-photo-container .wall-item-actions-social a {
+  margin-right: 1em;
+}
+.wall-item-photo-container .wall-item-actions-tools {
+  float: right;
+  width: 80px;
+  display: table-cell;
+}
+.wall-item-photo-container .wall-item-actions-tools a {
+  float: right;
+}
+.wall-item-photo-container .wall-item-actions-tools input {
+  float: right;
+}
+.wall-item-photo-container.comment {
+  margin-top: 5px;
+  margin-bottom: 5px;
+  margin-left: 40px;
+  width: 650px;
+  border-bottom: 1px solid #D2D2D2;
+}
+.wall-item-photo-container.comment {
+  top: 15px !important;
+  left: 15px !important;
+}
+.wall-item-photo-container {
+  display: table;
+  width: 780px;
+}
+.my-comment-photo {
+  width: 48px;
+  margin-left: 40px;
+  margin-right: 32px;
+	}
+.comment-edit-preview {
+  width: 500px;
+  margin-top: 10px;
+}
+.comment-edit-text-empty {
+    width: 500px;
+    border: 1px solid #D2D2D2;
+    height: 3.2em;
+    color: #2d2d2d;
+}
+.comment-edit-text-full {
+  font-size: 12.5px;
+  height: 3.3em;
+  
+  border: 1px solid #D2D2D2;
+  width: 500px;
+}
+.comment-edit-photo {
+    margin: 10px 0 0;
+    display: table-cell;
+}
+
+
+
+.wall-item-container .wall-item-item, .wall-item-container .wall-item-bottom {
+  display: table-row;
+}
+.wall-item-bottom {
+  font-size: 13px;
+}
+.wall-item-container .wall-item-bottom {
+/*  opacity: 0.5;
+  -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; */
+}
+.wall-item-container:hover .wall-item-bottom {
+/*  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; */
+}
+.wall-item-container .wall-item-info {
+  display: table-cell;
+  vertical-align: top;
+  text-align: left;
+  width: 80px;
+}
+.wall-item-container .wall-item-location {
+  padding-right: 40px;
+  display: table-cell;
+}
+.wall-item-container .wall-item-ago {
+  word-wrap: break-word;
+  width: 50px;
+  margin-left: 10px;
+  color: #999;
+}
+.wall-item-location {
+  
+  clear: both;
+  overflow: hidden;
+  
+  margin-bottom: 5px;
+}
+
+/*marker*/
+.wall-item-container .wall-item-content {
+
+  max-width: 690px;
+  word-wrap: break-word;
+
+
+}
+
+.wall-item-container .wall-item-content img {
+  max-width: 700px;
+}
+.wall-item-container .wall-item-links, .wall-item-container .wall-item-actions {
+  display: table-cell;
+  vertical-align: middle;
+}
+.wall-item-container .wall-item-links .icon, .wall-item-container .wall-item-actions .icon {
+  opacity: 0.5;
+  -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;
+}
+.wall-item-container .wall-item-links .icon:hover, .wall-item-container .wall-item-actions .icon: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;
+}
+.wall-item-container .wall-item-name {
+  font-weight: bold;
+}
+.wall-item-container .wall-item-actions-author {
+  width: 100%;
+  margin-bottom: 0.3em;
+}
+.wall-item-container .wall-item-actions-social {
+  float: left;
+  margin-bottom: 1px;
+  display: table-cell;
+}
+.wall-item-container .wall-item-actions-social a {
+  margin-right: 1em;
+}
+.wall-item-actions-social a {
+  float: left;
+}
+.wall-item-container .wall-item-actions-tools {
+  float: right;
+  width: 80px;
+  display: table-cell;done
+}
+.wall-item-container .wall-item-actions-tools a {
+  float: right;
+}
+.wall-item-container .wall-item-actions-tools input {
+  float: right;
+}
+/*marker*/
+.wall-item-container.comment {
+  margin-top: 5px;
+  margin-bottom: 5px;
+  margin-left: 80px;
+  width: 690px;
+  border-bottom: 1px solid hsl(198, 21%, 79%);
+}
+.wall-item-container.comment .contact-photo {
+  width: 32px;
+  height: 32px;
+  margin-left: 16px;
+  /*background: url(../../../images/icons/22/user.png) no-repeat center center;*/
+
+}
+.wall-item-container.comment {
+  top: 15px !important;
+  left: 15px !important;
+}
+.wall-item-container.comment .wall-item-links {
+  padding-left: 12px;
+}
+.wall-item-comment-wrapper {
+  margin: 1px 5px 5px 80px;
+}
+.wall-item-comment-wrapper .comment-edit-photo {
+  display: none;
+}
+.wall-item-comment-wrapper textarea {
+  height: 2.0em;
+  width: 100%;
+  font-size: 10px;
+  color: #999999;
+  border: 1px solid #DDD;
+  padding: 0.3em;
+  font-size: 14px;
+}
+.wall-item-comment-wrapper .comment-edit-text-full {
+  font-size: 14px;
+  height: 4em;
+  color: #2d2d2d;
+  border: 1px solid #2d2d2d;
+}
+.comment-edit-preview {
+  width: 500px;
+  margin-top: 10px;
+  background-color:  #fff797;
+}
+.comment-edit-preview .contact-photo {
+  width: 32px;
+  height: 32px;
+  margin-left: 16px;
+  /*background: url(../../../images/icons/22/user.png) no-repeat center center;*/
+
+}
+.comment-edit-preview {
+  top: 15px !important;
+  left: 15px !important;
+}
+.comment-edit-preview .wall-item-links {
+  padding-left: 12px;
+}
+.comment-edit-preview .wall-item-container {
+  width: 700px;
+}
+.comment-edit-preview .tread-wrapper {
+  width: 700px;
+  padding: 0;
+  margin: 10px 0;
+}
+
+.shiny {
+  /* border-right: 10px solid #fce94f; */
+	border-right: 1px solid #A7C7F7;
+	padding-right: 12px;
+}
+
+#jot-preview-content{
+	margin-top: 30px;}
+	
+#jot-preview-content .tread-wrapper {
+  background-color: #fff797;
+}
+
+.wall-item-tags {
+  padding-top: 1px;
+  padding-bottom: 2px;
+}
+.tag {
+  /*background: url("../../../images/tag_b.png") repeat-x center left;*/
+  color: #999;
+  padding-left: 3px;
+  font-size: 12px;
+}
+.tag a {
+  padding-right: 5px;
+  /*background: url("../../../images/tag.png") no-repeat center right;*/
+  color: #999;
+}
+.wwto {
+  position: absolute !important;
+  width: 25px;
+  height: 25px;
+  background: #FFFFFF;
+  border: 2px solid #364e59;
+  height: 25px;
+  width: 25px;
+  overflow: hidden;
+  padding: 1px;
+  position: absolute !important;
+  top: 40px;
+  left: 30px;
+  -webkit-box-shadow: 0px 0px 10px rgba(0, 0, 0, 0.7);
+  -moz-box-shadow: 0px 0px 10px rgba(0, 0, 0, 0.7);
+  box-shadow: 0px 0px 10px rgba(0, 0, 0, 0.7);
+}
+.wwto .contact-photo {
+  width: auto;
+  height: 25px;
+}
+/* contacts menu */
+.contact-photo-wrapper {
+  position: relative;
+  width: 80px;
+}
+
+.contact-photo-wrapper.wwto {
+  width: 25px;
+}
+
+.contact-photo {
+  width: 48px;
+  height: 48px;
+  overflow: hidden;
+  display: block;
+}
+.contact-photo img {
+  width: 48px;
+  height: 48px;
+}
+
+.contact-wrapper {
+  float: left;
+  width: 90px;
+  height: 90px;
+  margin-bottom: 15px;
+}
+.contact-wrapper .contact-photo {
+  width: 80px;
+  height: 80px;
+}
+.contact-wrapper .contact-photo img {
+  width: 80px;
+  height: 80px;
+}
+.contact-wrapper {
+  left: 0px;
+  top: 63px;
+}
+.contact-photo {
+  width: 48px;
+  height: 48px;
+}
+.contact-photo img {
+  width: 48px;
+  height: 48px;
+}
+.contact-name {
+  /* text-align: center; */
+  /*font-weight: bold;*/
+  font-size: 12px;
+}
+.contact-details {
+  color: #999999;
+}
+/* editor */
+.jothidden {
+  display: none;
+}
+#jot {
+  width: 785px;
+  margin: 0px 2em 20px 0px;
+}
+#profile-jot-form #profile-jot-text {
+  height: 2.0em;
+  width: 99%;
+  font-size: 15px;
+  color: #999999;
+  border: 1px solid #DDD;
+  padding: 0.3em;
+  margin-bottom: 10px;
+}
+.grey
+{
+  display: inline;
+  float: right;	
+	}
+#jot #jot-tools {
+  margin: 0px;
+  padding: 0px;
+  height: 40px;
+  overflow: none;
+  width: 783px;
+  background-color: #fff;
+  border-bottom: 2px solid #9eabb0;
+}
+
+#jot #jot-tools li {
+  list-style: none;
+  float: left;
+  width: 80px;
+  height: 40px;
+  border-bottom: 2px solid #9eabb0;
+}
+#jot #jot-tools li a {
+  display: block;
+  color: #cccccc;
+  width: 100%;
+  height: 40px;
+  text-align: center;
+  line-height: 40px;
+  overflow: hidden;
+}
+#jot #jot-tools li:hover {
+  background-color: #364e59;
+  border-bottom: 2px solid #bdcdd4;
+}
+#jot #jot-tools li.perms {
+  float: right;
+  width: 40px;
+}
+#jot #jot-tools li.perms a.unlock {
+  width: 30px;
+  border-left: 10px solid #cccccc;
+  background-color: #cccccc;
+  background-position: left center;
+}
+#jot #jot-tools li.perms a.lock {
+  width: 30px;
+  border-left: 10px solid #666666;
+  background-color: #666666;
+}
+#jot #jot-tools li.submit {
+  float: right;
+  background-color: #cccccc;
+  border-bottom: 2px solid #cccccc;
+  border-right: 1px solid #666666;
+  border-left: 1px solid #666666;
+}
+#jot #jot-tools li.submit input {
+  border: 0px;
+  margin: 0px;
+  padding: 0px;
+  background-color: #cccccc;
+  color: #666666;
+  width: 80px;
+  height: 40px;
+  line-height: 40px;
+}
+#jot #jot-tools li.submit input:hover {
+  background-color: #bdcdd4;
+  color: #666666;
+}
+#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;
+}
+#profile-jot-form #jot-title, #profile-jot-form #jot-category {
+    
+  	 border-radius: 5px 5px 5px 5px;
+    font-weight: bold;
+    height: 20px;
+    margin: 0 0 5px;
+    width: 60%;
+    border: 1px solid #d2d2d2;
+}
+#profile-jot-form #jot-title:-webkit-input-placeholder {
+  font-weight: normal;
+}
+#profile-jot-form #jot-title:-moz-placeholder {
+  font-weight: normal;
+}
+#profile-jot-form #profile-jot-text_parent #profile-jot-text_tbl{
+	width: 785px;
+	height: 100px;
+	}
+#jot #jot-title:hover {
+  border: 1px solid #999999;
+}
+#jot #jot-title:focus {
+  border: 1px solid #999999;
+}
+#jot #character-counter {
+  width: 80px;
+  float: right;
+  text-align: right;
+  height: 20px;
+  line-height: 20px;
+  padding-right: 20px;
+}
+#jot-perms-icon, 
+#profile-location,
+#profile-nolocation,
+#profile-youtube, 
+#profile-video, 
+#profile-audio,
+#profile-link,
+#profile-title, 
+#wall-image-upload,
+#wall-file-upload,
+#wall-image-upload-div,
+#wall-file-upload-div,
+.hover, .focus {
+	cursor: pointer;
+	margin-top: 2px;
+}
+/*marker*/
+#profile-jot-wrapper{
+	margin: 0 20px 20px 0;
+   width: 785px;
+	}
+/*marker*/
+#profile-jot-submit-wrapper {
+	margin-bottom: 50px;
+	width: 785px;
+}
+
+#profile-jot-submit {
+	float: right;
+	margin-top: 2px;
+	font-size: 14px;
+}
+#profile-upload-wrapper {
+	float: left;
+	margin-top: 2px;
+	margin-left: 10px;
+	
+}
+#profile-attach-wrapper {
+	float: left;
+	margin-left: 15px;
+	margin-top: 2px;
+}
+#profile-rotator {
+	float: left;
+	margin-left: 30px;
+	margin-top: 2px;
+}
+#profile-link-wrapper {
+	float: left;
+	margin-left: 15px;
+	margin-top: 2px;
+}
+#profile-youtube-wrapper {
+	float: left;
+	margin-left: 15px;
+	margin-top: 2px;
+}
+#profile-video-wrapper {
+	float: left;
+	margin-left: 15px;
+	margin-top: 2px;
+}
+#profile-audio-wrapper {
+	float: left;
+	margin-left: 15px;
+	margin-top: 2px;
+}
+#profile-location-wrapper {
+	float: left;
+	margin-left: 15px;
+	margin-top: 2px;
+}
+#profile-jot-perms {
+	float: left;
+	margin-left: 45px;
+	margin-top: 2px;
+}
+#jot-preview-link {
+	float: right;
+	margin-left: 10px;
+	margin-top: 2px;
+	font-size: 9px;
+	font-weight: bolder;
+	cursor: pointer;
+}
+#profile-jot-perms{
+   float: right;
+	margin-left: 10px;
+	margin-top: 2px;	
+	}
+/** buttons **/
+.button.creation1 {
+    background-color: #fff;
+    border: 1px solid #777777;
+    border-radius: 3px 3px 3px 3px;
+    box-shadow: 0 1px 1px #CFCFCF;
+    cursor: pointer;
+    font-weight: bolder;
+}
+.button.creation2 {
+    background-color: #055580;
+    border: 1px solid #777777;
+    color: white;
+    border-radius: 3px 3px 3px 3px;
+    box-shadow: 0 1px 1px #CFCFCF;
+    margin-left: 5px;
+    cursor: pointer;
+    font-weight: bolder;
+}
+/*input[type="submit"] {
+	border: 0px;
+    background-color: @ButtonBackgroundColor;
+    color: @ButtonColor;
+    padding: 0px 10px;
+	.rounded(5px);
+    height: 18px;
+}*/
+/** acl **/
+#photo-edit-perms-select, #photos-upload-permissions-wrapper, #profile-jot-acl-wrapper {
+  display: block!important;
+}
+#acl-wrapper {
+  width: 690px;
+  float: left;
+}
+#acl-search {
+  float: right;
+  background: #ffffff url("../../../images/search_18.png") no-repeat right center;
+  padding-right: 20px;
+}
+#acl-showall {
+  float: left;
+  display: block;
+  width: auto;
+  height: 18px;
+  background-color: #cccccc;
+  background-image: url("../../../images/show_all_off.png");
+  background-position: 7px 7px;
+  background-repeat: no-repeat;
+  padding: 7px 5px 0px 30px;
+  color: #999999;
+  -moz-border-radius: 5px 5px 5px 5px;
+  -webkit-border-radius: 5px 5px 5px 5px;
+  border-radius: 5px 5px 5px 5px;
+}
+#acl-showall.selected {
+  color: #000000;
+  background-color: #ff9900;
+  background-image: url("../../../images/show_all_on.png");
+}
+#acl-list {
+  height: 210px;
+  border: 1px solid #cccccc;
+  clear: both;
+  margin-top: 30px;
+  overflow: auto;
+}
+.acl-list-item {
+  display: block;
+  width: 150px;
+  height: 30px;
+  border: 1px solid #cccccc;
+  margin: 5px;
+  float: left;
+}
+.acl-list-item img {
+  width: 22px;
+  height: 22px;
+  float: left;
+  margin: 4px;
+}
+.acl-list-item p {
+  height: 12px;
+  font-size: 10px;
+  margin: 0px;
+  padding: 2px 0px 1px;
+  overflow: hidden;
+}
+.acl-list-item a {
+  font-size: 8px;
+  display: block;
+  width: 40px;
+  height: 10px;
+  float: left;
+  color: #999999;
+  background-color: #cccccc;
+  background-position: 3px 3px;
+  background-repeat: no-repeat;
+  margin-right: 5px;
+  -webkit-border-radius: 2px ;
+  -moz-border-radius: 2px;
+  border-radius: 2px;
+  padding-left: 15px;
+}
+#acl-wrapper a:hover {
+  text-decoration: none;
+  color: #000000;
+}
+.acl-button-show {
+  background-image: url("../../../images/show_off.png");
+}
+.acl-button-hide {
+  background-image: url("../../../images/hide_off.png");
+}
+.acl-button-show.selected {
+  color: #000000;
+  background-color: #9ade00;
+  background-image: url("../../../images/show_on.png");
+}
+.acl-button-hide.selected {
+  color: #000000;
+  background-color: #ff4141;
+  background-image: url("../../../images/hide_on.png");
+}
+.acl-list-item.groupshow {
+  border-color: #9ade00;
+}
+.acl-list-item.grouphide {
+  border-color: #ff4141;
+}
+/** /acl **/
+/** tab buttons 14618a**/
+/*marker*/
+ul.tabs {
+  list-style-type: none;
+  padding-bottom: 10px;
+  font-size: 13px;
+  width: 805px;
+}
+ul.tabs li {
+  float: left;
+  margin-left: 5px;
+}
+ul.tabs li .active {
+    background-color: #055580;
+    border: 1px solid #777777;
+    color: white;
+    border-radius: 3px 3px 3px 3px;
+    box-shadow: 0 1px 1px #CFCFCF;
+    margin-left: 5px;
+}
+//settings tabs
+ul.rs_tabs {
+  list-style-type: none;
+  font-size: 11px;
+}
+ul.rs_tabs li {
+  float: left;
+  margin-bottom: 30px;
+  clear: both;
+}
+ul.rs_tabs li .selected {
+    background-color: #055580;
+    border: 1px solid #777777;
+    color: white;
+    border-radius: 3px 3px 3px 3px;
+    box-shadow: 2px 2px 2px #CFCFCF;
+    font-size: 13px;
+}
+.rs_tabs {
+    list-style-type: none;
+    font-size: 11px;
+    background-position: 0 -20px;
+    background-repeat: repeat-x;
+    height: 27px;
+    padding: 0;
+ }
+.rs_tab.button {	
+    /*background: none repeat scroll 0 0 #F8F8F8;*/
+    border: 1px solid #CCCCCC;
+    border-radius: 3px 3px 3px 3px;
+    font-weight: bolder;
+    padding: 3px;
+    color:  #333333;
+    text-decoration: none;
+	}
+/**
+ * Form fields
+ */
+.field {
+  margin-bottom: 10px;
+  padding-bottom: 10px;
+  overflow: auto;
+  width: 100%;
+}
+.field label {
+  float: left;
+  width: 200px;
+}
+.field input, .field textarea {
+  width: 400px;
+}
+.field textarea {
+  height: 100px;
+}
+.field .field_help {
+  display: block;
+  margin-left: 200px;
+  color: #666666;
+}
+.field .onoff {
+  float: left;
+  width: 80px;
+}
+.field .onoff a {
+  display: block;
+  border: 1px solid #666666;
+  background-image: url("../../../images/onoff.jpg");
+  background-repeat: no-repeat;
+  padding: 4px 2px 2px 2px;
+  height: 16px;
+  text-decoration: none;
+}
+.field .onoff .off {
+  border-color: #666666;
+  padding-left: 40px;
+  background-position: left center;
+  background-color: #cccccc;
+  color: #666666;
+  text-align: right;
+}
+.field .onoff .on {
+  border-color: #204A87;
+  padding-right: 40px;
+  background-position: right center;
+  background-color: #D7E3F1;
+  color: #204A87;
+  text-align: left;
+}
+.field .hidden {
+  display: none!important;
+}
+.field.radio .field_help {
+  margin-left: 0px;
+}
+.suggest-select {
+width: 500px;
+height: 350px;	
+	}
+.message-to-select {
+	width: 400px;
+   height: 150px;
+	}
+#directory-search-form{
+	margin-bottom: 50px;
+	}
+#profile-edit-links-end {
+        clear: both;
+        margin-bottom: 15px;
+}
+
+#profile-edit-links ul { margin: 20px; padding-bottom: 20px; list-style: none; }
+
+#profile-edit-links li {
+  float: left;
+  list-style: none;
+  margin-left: 10px;
+}
+
+.profile-edit-side-div {
+  display: none;
+}
+
+#register-form label,
+#profile-edit-form label {
+        width: 300px; float: left;
+}
+
+.required {
+  display: inline;
+  color: #B20202;
+}
+
+/* oauth */
+.oauthapp {
+  height: auto;
+  overflow: auto;
+  border-bottom: 2px solid #cccccc;
+  padding-bottom: 1em;
+  margin-bottom: 1em;
+}
+.oauthapp img {
+  float: left;
+  width: 48px;
+  height: 48px;
+  margin: 10px;
+}
+.oauthapp img.noicon {
+  background-image: url("../../../images/icons/48/plugin.png");
+  background-position: center center;
+  background-repeat: no-repeat;
+}
+.oauthapp a {
+  float: left;
+}
+/* contacts */
+.contact-entry-wrapper {
+  width: 120px;
+  height: 120px;
+  float: left;
+}
+/* photo */
+.photo {
+box-shadow: 2px 2px 5px 0px #000000;
+margin: 0px;
+border-radius: 10px;
+height: 145px !important;
+width: 145px !important;
+}
+.lframe {
+  float: left;
+  /*margin: 0px 10px 10px 0px;*/
+}
+/* profile match wrapper */
+.profile-match-wrapper {
+  float: left;
+  width: 90px;
+  height: 90px;
+  margin-bottom: 20px;
+}
+.profile-match-wrapper .contact-photo {
+  width: 80px;
+  height: 80px;
+}
+.profile-match-wrapper .contact-photo img {
+  width: 80px;
+  height: 80px;
+}
+.profile-match-wrapper {
+  left: 0px;
+  top: 63px;
+}
+
+.contact-photo-menu-button {
+        position: relative;
+        background-image: url("../../../images/icons/16/menu.png");
+        background-position: top left; 
+        background-repeat: no-repeat;
+        margin: 0px 0px -16px 0px; 
+	padding: 0px;
+        width: 16px;
+        height: 16px;
+        top: -20px; left:0px;
+        overflow: hidden;
+        text-indent: 40px;
+        display: none;
+        
+}
+.contact-photo-menu {
+        width: 11em;
+        border: 3px solid #364e59;
+	color: #2d2d2d;
+        background: #FFFFFF;
+/*        position: absolute;*/
+        position: relative;
+        left: 0px; top: 0px;
+        display: none;
+        z-index: 10000;
+}
+.contact-photo-menu ul { margin:0px; padding: 0px; list-style: none }
+.contact-photo-menu li a {
+	display: block; 
+	padding: 5px 10px; 
+	color: #2d2d2d;
+	text-decoration: none;
+}
+.contact-photo-menu li a:hover {
+	background-color: #bdcdd4; 
+}
+
+/* page footer */
+footer {
+  height: 100px;
+  display: table-row;
+}
+
+blockquote {
+    border-left: 1px solid #D2D2D2;
+    padding-left: 9px;
+    margin: 0 0 0 .8ex;
+	 color: #777;
+}
+.oembed {
+	
+	font-weight: bold;
+}
+.aprofile dt{
+box-shadow: 1px 1px 5px 0;
+    color: #666666;
+    margin: 15px 0 5px;
+    padding-left: 5px;	
+	}
+/* ================== */
+/* = Contacts Block = */
+/* ================== */
+
+.contact-block-img {
+        width: 55px;
+        height: 55px;
+        padding-right: 3px;
+}
+.contact-block-div {
+        float: left;
+}
+
+.contact-block-textdiv { width: 150px; height: 34px; float: left; }
+#contact-block-end { clear: both; } 
+
+#group-edit-wrapper {
+        margin-bottom: 10px;
+}
+
+#group-members-end {
+        clear: both;
+}
+#group-edit-desc {
+ margin-top: 15px;
+}
+
+/*
+#group-separator,
+#prof-separator { display: none;}
+*/
+#prof-members-end{
+	clear: both;
+	}
+
+#prvmail-to-label, #prvmail-subject-label, #prvmail-message-label {
+	margin-bottom: 10px;
+	margin-top: 20px;
+}
+
+#prvmail-submit {
+	float: right;
+	margin-top: 10px;
+}
+
+#prvmail-subject
+{
+background: none repeat scroll 0 0 #FFFFFF;
+border: 1px solid #CCCCCC;
+border-radius: 5px 5px 5px 5px;
+font-weight: bold;
+height: 20px;
+margin: 0 0 5px;
+vertical-align: middle;
+}
+#prvmail-form{
+ width: 597px;	
+	}
+	
+#prvmail-upload-wrapper,
+#prvmail-link-wrapper,
+#prvmail-rotator-wrapper {
+	float: left;
+	margin-top: 10px;
+	margin-right: 10px;
+	width: 24px;
+}
+
+#prvmail-end {
+	clear: both;
+}
+
+.mail-list-sender,
+.mail-list-detail {
+	float: left;
+}
+.mail-list-detail {
+	margin-left: 20px;
+}
+
+.mail-list-subject {
+	font-size: 1.1em;
+	margin-top: 10px;
+}
+a.mail-list-link {
+    display: block;
+    font-size: 1.3em;
+    padding: 4px 0;
+}
+
+/*
+*a.mail-list-link:hover {
+*	background-color: #15607B;
+*	color: #F5F6FB;
+*}
+*/
+
+.mail-list-outside-wrapper-end {
+	clear: both;
+}
+
+.mail-list-outside-wrapper {
+	margin-top: 30px;
+}
+
+.mail-list-delete-wrapper {
+	float: right;
+	margin-right: 30px;
+	margin-top: 15px;
+}
+
+.mail-list-delete-icon {
+	border: none;
+}
+
+.mail-conv-sender,
+.mail-conv-detail {
+	float: left;
+}
+.mail-conv-detail {
+	margin-left: 20px;
+	width: 500px;
+}
+
+.mail-conv-subject {
+    font-size: 1.4em;
+    margin: 10px 0;
+}
+
+.mail-conv-outside-wrapper-end {
+	clear: both;
+}
+
+.mail-conv-outside-wrapper {
+	margin-top: 30px;
+}
+
+.mail-conv-delete-wrapper {
+	float: right;
+	margin-right: 30px;
+	margin-top: 15px;
+}
+.mail-conv-break {
+	clear: both;
+}
+
+.mail-conv-delete-icon {
+	border: none;
+}
+
+/* ========== */
+/* = Events = */
+/* ========== */
+.eventcal {
+        float: left;
+        font-size: 20px;
+}
+
+.vevent {
+position: relative;
+width: 400px;
+padding: 20px;
+padding-top: 10px;
+margin: 0 0px;
+margin-bottom: 10px;
+background-color: white;
+-webkit-box-shadow: 0 0 4px rgba(0, 0, 0, 0.2), inset 0 0 50px rgba(0, 0, 0, 0.1);
+-moz-box-shadow: 0 0 4px rgba(0, 0, 0, 0.2), inset 0 0 50px rgba(0, 0, 0, 0.1);
+box-shadow: 0 0 5px rgba(0, 0, 0, 0.2), inset 0 0 50px rgba(0, 0, 0, 0.1);
+}
+.vevent .event-location {
+        margin-left: 10px;
+        margin-right: 10px;
+}
+.vevent .event-description {
+margin-left: 10px;
+margin-right: 10px;
+font-size: 1.1em;
+font-weight: bolder;
+}
+.vevent .event-start, .vevent .event-end {
+
+margin-right: 20px;
+margin-bottom: 2px;
+margin-top: 2px;
+font-size: 0.9em;
+text-align: left;
+}
+.event-start .dtstart, .event-end .dtend {
+float: right;
+}
+
+
+#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("../../../view/theme/diabook/icons/events2.png") !important;
+        margin-right: 15px;
+}
+
+.event-start, .event-end {
+        margin-left: 10px;
+        width: 330px;
+        clear: both;
+}
+
+.event-start .dtstart, .event-end .dtend {
+        float: right;
+}
+
+.event-list-date {
+        margin-bottom: 10px;
+}
+
+.prevcal, .nextcal {
+        float: left;
+        margin-left: 32px;
+        margin-right: 32px;
+        margin-top: 64px;
+}
+.event-calendar-end {
+        clear: both;
+}
+
+ 
+.calendar {
+        font-family: Courier, monospace;
+}
+.calendar.eventcal a {
+  color: #1872A2;	
+	}
+.today {
+        font-weight: bold;
+        color: #FF0000;
+}
+
+.settings-block {
+        border: 1px solid #AAA;
+        margin: 10px;
+        padding: 10px;
+}
+
+.app-title {
+        margin: 10px;
+}
+
+#identity-manage-desc {
+        margin-top:15px;
+        margin-bottom: 15px;
+}
+
+#identity-manage-choose {
+        margin-bottom: 15px;
+}
+
+#identity-submit {
+        margin-top: 20px;
+}
+
+#photo-prev-link, #photo-next-link {
+        padding: 10px;
+        float: left;
+}
+.lightbox{
+	float: left;
+	}
+#photo-photo {
+        float: left;
+}
+#photo-like-div .wall-item-like-buttons {
+	float: left;
+   margin-right: 10px;
+	}
+.wall-item-like-buttons .icon.like {
+float: left;
+}
+
+#photo-photo-end {
+        clear: both;
+}
+
+.tabs .comment-wwedit-wrapper {
+	display: block;
+   margin-top: 30px;
+   margin-left: 50px;
+	}
+
+.profile-match-photo {
+        float: left;
+        text-align: center;
+        width: 120px;
+}
+
+.profile-match-name {
+        float: left;
+        text-align: center;
+        width: 120px;
+        overflow: hidden;
+}
+
+.profile-match-break,
+.profile-match-end {
+        clear: both;
+}
+
+.profile-match-connect {
+        text-align: center;
+        font-weight: bold;
+}
+
+.profile-match-wrapper {
+        float: left;
+        padding: 10px;
+        width: 120px;
+        height: 120px;
+        scroll: auto;
+}
+#profile-match-wrapper-end {
+        clear: both;
+}
+
+/* ============= */
+/* = Directory = */
+/* ============= */
+/* contacts menu */
+.contact-photo-wrapper {
+  position: relative;
+}
+.contact-photo {
+  width: 48px;
+  height: 48px;
+  overflow: hidden;
+  display: block;
+}
+.contact-photo img {
+  width: 48px;
+  height: 48px;
+}
+.contact-photo-menu-button {
+  display: none;
+  /* position: absolute; */
+  /* position: absolute; */
+  left: 0px;
+  top: -16px;
+}
+.contact-wrapper {
+  float: left;
+  width: 90px;
+  height: 90px;
+  margin-bottom: 15px;
+}
+.contact-wrapper .contact-photo {
+  width: 80px;
+  height: 80px;
+}
+.contact-wrapper .contact-photo img {
+  width: 80px;
+  height: 80px;
+}
+.contact-wrapper .contact-photo-menu-button {
+  left: 0px;
+  top: 63px;
+}
+.directory-item {
+  float: left;
+  width: 200px;
+  height: 200px;
+}
+.directory-item .contact-photo {
+  width: 175px;
+  height: 175px;
+}
+.directory-item .contact-photo img {
+  width: 175px;
+  height: 175px;
+}
+.contact-name {
+  text-align: left;
+  font-weight: bold;
+  font-size: 12px;
+}
+.contact-details {
+  color: #999999;
+}
+#side-bar-photos-albums{
+	margin-top: 15px;	
+	}
+.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-album-image-wrapper, .photo-top-image-wrapper {
+  float: left;
+   -moz-box-shadow: 0 0 5px #888;
+   -webkit-box-shadow: 0 0 5px #888;
+   box-shadow: 0 0 5px #888;
+  background-color: #000;
+   -webkit-border-radius: 5px;
+   -moz-border-radius: 5px;
+  border-radius: 5px;
+  padding-bottom: 20px;
+  position: relative;
+  margin: 0 10px 10px 0;
+  width: 200px; height: 140px;
+  overflow: hidden;  
+}
+.photo-top-album-name {
+        width: 100%;
+        position: absolute; 
+        bottom: 0px; 
+        padding-left: 3px;
+        background-color: #EEE;
+}
+.photo-top-album-link{
+  color: #1872A2;
+	}
+.photo-top-album-img{
+	
+	}
+/*.photo-top-image-wrapper {
+        position: relative;
+        float: left;
+        margin-top: 15px;
+        margin-right: 15px;
+        width: 200px; height: 200px; 
+        overflow: hidden; 
+}
+.photo-top-album-name {
+        width: 100%;
+        min-height: 2em;
+        position: absolute; 
+        bottom: 0px; 
+        padding: 0px 3px;
+        padding-top: 0.5em;
+        background-color: rgb(255, 255, 255);
+}*/
+#photo-top-end {
+        clear: both;
+}
+
+#photo-top-links {
+        margin-bottom: 30px;
+        margin-left: 30px;
+}
+
+#photos-upload-newalbum-div {
+        float: left;
+        width: 175px;
+}
+
diff --git a/view/theme/diabook-blue/style.css b/view/theme/diabook/diabook-blue/style.css
index b4289dc0f..12648bffb 100644
--- a/view/theme/diabook-blue/style.css
+++ b/view/theme/diabook/diabook-blue/style.css
@@ -82,71 +82,103 @@
 #adminpage table tr:hover { background-color: #eeeeee; }
 #adminpage .selectall { text-align: right; }
 /* icons */
-
+.icon.bb-url{
+  background-image: url("../../../view/theme/diabook/diabook-blue/icons/bb-url.png");
+  float: right;
+  margin-top: 2px;}
+.icon.quote{
+  background-image: url("../../../view/theme/diabook/diabook-blue/icons/quote.png");
+  float: right;
+  margin-top: 2px;}
+.icon.bold{
+  background-image: url("../../../view/theme/diabook/diabook-blue/icons/bold.png");
+  float: right;
+  margin-top: 2px;}
+.icon.underline{
+  background-image: url("../../../view/theme/diabook/diabook-blue/icons/underline.png");
+  float: right;
+  margin-top: 2px;}
+.icon.italic{
+  background-image: url("../../../view/theme/diabook/diabook-blue/icons/italic.png");
+  float: right;
+  margin-top: 2px;}
+.icon.bb-image{
+  background-image: url("../../../view/theme/diabook/diabook-blue/icons/bb-image.png");
+  float: right;
+  margin-top: 2px;}
+.icon.bb-video{
+  background-image: url("../../../view/theme/diabook/diabook-blue/icons/bb-video.png");
+  float: right;
+  margin-top: 2px;}
+  
 .icon.contacts {
-  background-image: url("../../../view/theme/diabook-blue/icons/contacts.png");}
+  background-image: url("../../../view/theme/diabook/diabook-blue/icons/contacts.png");}
 .icon.notifications {
-  background-image: url("../../../view/theme/diabook-blue/icons/notifications.png");}
+  background-image: url("../../../view/theme/diabook/diabook-blue/icons/notifications.png");}
 .icon.notify {
-  background-image: url("../../../view/theme/diabook-blue/icons/notify.png");}
+  background-image: url("../../../view/theme/diabook/diabook-blue/icons/notify.png");}
 .icon.messages {
-  background-image: url("../../../view/theme/diabook-blue/icons/messages.png");}
+  background-image: url("../../../view/theme/diabook/diabook-blue/icons/messages.png");}
 .icon.community {
-  background-image: url("../../../view/theme/diabook-blue/icons/community.png");}
+  background-image: url("../../../view/theme/diabook/diabook-blue/icons/community.png");}
   
-.icon.drop 	{ background-image: url("../../../view/theme/diabook-blue/icons/drop.png");}
-.icon.drophide 	{ background-image: url("../../../view/theme/diabook-blue/icons/drop.png");}
-.icon.dislike 	{ background-image: url("../../../view/theme/diabook-blue/icons/dislike.png");}
-.icon.like 	{ background-image: url("../../../view/theme/diabook-blue/icons/like.png");}
-.icon.pencil 	{ background-image: url("../../../view/theme/diabook-blue/icons/pencil.png");}
-.icon.recycle 	{ background-image: url("../../../view/theme/diabook-blue/icons/recycle.png");}
-.icon.remote-link { background-image: url("../../../view/theme/diabook-blue/icons/remote.png");}
-.icon.tagged    { background-image: url("../../../view/theme/diabook-blue/icons/tagged.png");}
-.icon.file-as { background-image: url("../../../view/theme/diabook-blue/icons/file_as.png");}
-.star-item.icon.unstarred { background-image: url("../../../view/theme/diabook-blue/icons/unstarred.png");}
-.star-item.icon.starred { background-image: url("../../../view/theme/diabook-blue/icons/starred.png");}
-.icon.link		{ background-image: url("../../../view/theme/diabook-blue/icons/link.png");}
-.icon.lock		{ background-image: url("../../../view/theme/diabook-blue/icons/lock.png");}
-.icon.unlock		{ background-image: url("../../../view/theme/diabook-blue/icons/unlock.png");}
-.icon.language    { background-image: url("../../../view/theme/diabook-blue/icons/language.png");}
-
-
-.camera 	{ background-image: url("../../../view/theme/diabook-blue/icons/camera.png"); 
+.icon.drop 	{ background-image: url("../../../view/theme/diabook/diabook-blue/icons/drop.png");}
+.icon.drophide 	{ background-image: url("../../../view/theme/diabook/diabook-blue/icons/drop.png");}
+.icon.dislike 	{ background-image: url("../../../view/theme/diabook/diabook-blue/icons/dislike.png");}
+.icon.like 	{ background-image: url("../../../view/theme/diabook/diabook-blue/icons/like.png");}
+.icon.pencil 	{ background-image: url("../../../view/theme/diabook/diabook-blue/icons/pencil.png");}
+.icon.recycle 	{ background-image: url("../../../view/theme/diabook/diabook-blue/icons/recycle.png");}
+.icon.remote-link { background-image: url("../../../view/theme/diabook/diabook-blue/icons/remote.png");}
+.icon.tagged    { background-image: url("../../../view/theme/diabook/diabook-blue/icons/tagged.png");}
+.icon.file-as { background-image: url("../../../view/theme/diabook/diabook-blue/icons/file_as.png");}
+.star-item.icon.unstarred { background-image: url("../../../view/theme/diabook/diabook-blue/icons/unstarred.png");}
+.star-item.icon.starred { background-image: url("../../../view/theme/diabook/diabook-blue/icons/starred.png");}
+.icon.link		{ background-image: url("../../../view/theme/diabook/diabook-blue/icons/link.png");}
+.icon.lock		{ background-image: url("../../../view/theme/diabook/diabook-blue/icons/lock.png");}
+.icon.unlock		{ background-image: url("../../../view/theme/diabook/diabook-blue/icons/unlock.png");}
+.icon.language    { background-image: url("../../../view/theme/diabook/diabook-blue/icons/language.png");}
+
+
+.camera 	{ background-image: url("../../../view/theme/diabook/diabook-blue/icons/camera.png"); 
 			  display: block; width: 28px; height: 28px; background-repeat: no-repeat;
 			  }
-.attach 	{ background-image: url("../../../view/theme/diabook-blue/icons/attach.png"); 
+.attach 	{ background-image: url("../../../view/theme/diabook/diabook-blue/icons/attach.png"); 
 			  display: block; width: 28px; height: 28px; background-repeat: no-repeat;
 			  }
-.video2 	{ background-image: url("../../../view/theme/diabook-blue/icons/video.png"); 
+.video2 	{ background-image: url("../../../view/theme/diabook/diabook-blue/icons/video.png"); 
 			  display: block; width: 28px; height: 28px; background-repeat: no-repeat;
 			  }	
-.video 	{ background-image: url("../../../view/theme/diabook-blue/icons/video.png"); 
-			  display: block; width: 100%; height: 28px; background-repeat: no-repeat;
+.video 	{ background-image: url("../../../view/theme/diabook/diabook-blue/icons/video.png"); 
+			  display: block; width: 100%; height: 140px; background-repeat: no-repeat;
 			  }
-.audio2 	{ background-image: url("../../../view/theme/diabook-blue/icons/audio.png"); 
+.audio2 	{ background-image: url("../../../view/theme/diabook/diabook-blue/icons/audio.png"); 
 			  display: block; width: 28px; height: 28px; background-repeat: no-repeat;
 			  }
-.audio 	{ background-image: url("../../../view/theme/diabook-blue/icons/audio.png"); 
+.audio 	{ background-image: url("../../../view/theme/diabook/diabook-blue/icons/audio.png"); 
 			  display: block; width: 28px; height: 28px; background-repeat: no-repeat;
 			  }
-.weblink 	{ background-image: url("../../../view/theme/diabook-blue/icons/weblink.png"); 
+.weblink 	{ background-image: url("../../../view/theme/diabook/diabook-blue/icons/weblink.png"); 
 			  display: block; width: 28px; height: 28px; background-repeat: no-repeat;
 			  }
-.globe 	{ background-image: url("../../../view/theme/diabook-blue/icons/globe.png"); 
+.globe 	{ background-image: url("../../../view/theme/diabook/diabook-blue/icons/globe.png"); 
 			  display: block; width: 28px; height: 28px; background-repeat: no-repeat;
 			  }
-.unglobe 	{ background-image: url("../../../view/theme/diabook-blue/icons/unglobe.png"); 
+.unglobe 	{ background-image: url("../../../view/theme/diabook/diabook-blue/icons/unglobe.png"); 
 			  display: block; width: 28px; height: 28px; background-repeat: no-repeat;
 			  }
-.edit    {background-image: url("../../../view/theme/diabook-blue/icons/pencil2.png"); 
+.edit    {background-image: url("../../../view/theme/diabook/diabook-blue/icons/pencil2.png"); 
 			  display: block; width: 28px; height: 28px; background-repeat: no-repeat;}
-			  
+.icon.block   {background-image: url("../../../view/theme/diabook/icons/block.png"); 
+			  display: block; width: 16px; height: 16px; background-repeat: no-repeat;}
+.icon.block.dim  {background-image: url("../../../view/theme/diabook/icons/block.png"); 
+			  display: block; width: 16px; height: 16px; background-repeat: no-repeat; opacity: 0.3;}
+.icon.ad_drop 	{ background-image: url("../../../view/theme/diabook/icons/drop.png");
+			  display: block; margin-left:5px; width: 16px; height: 16px; background-repeat: no-repeat;}			  
 			  
 
 
 .article	{ background-position: -50px  0px;}
 /*.audio 		{ background-position: -70px  0px;}*/
-.block 		{ background-position: -90px  0px;}
 /*.drop 		{ background-position: -110px 0px;}*/
 /*.drophide 	{ background-position: -130px 0px;}*/
 /*.edit 		{ background-position: -150px 0px;}*/
@@ -176,10 +208,10 @@
 /*.language       { background-position: -210px -40px;}*/
 
 
-.icon.on             { background-image: url("../../../view/theme/diabook-blue/icons/toogle_on.png"); background-repeat: no-repeat;}
-.icon.off            { background-image: url("../../../view/theme/diabook-blue/icons/toogle_off.png"); background-repeat: no-repeat;}
-.icon.prev           { background-image: url("../../../view/theme/diabook-blue/icons/prev.png"); background-repeat: no-repeat;}
-.icon.next           { background-image: url("../../../view/theme/diabook-blue/icons/next.png"); background-repeat: no-repeat;}
+.icon.on             { background-image: url("../../../view/theme/diabook/diabook-blue/icons/toogle_on.png"); background-repeat: no-repeat;}
+.icon.off            { background-image: url("../../../view/theme/diabook/diabook-blue/icons/toogle_off.png"); background-repeat: no-repeat;}
+.icon.prev           { background-image: url("../../../view/theme/diabook/diabook-blue/icons/prev.png"); background-repeat: no-repeat;}
+.icon.next           { background-image: url("../../../view/theme/diabook/diabook-blue/icons/next.png"); background-repeat: no-repeat;}
 /*.tagged     { background-position: -130px -60px;}*/
 
 .attachtype {
@@ -215,12 +247,12 @@
 }
 
 .icon.border.camera{
-  background-image: url("../../../view/theme/diabook-blue/icons/camera.png"); 
+  background-image: url("../../../view/theme/diabook/diabook-blue/icons/camera.png"); 
   display: block; width: 28px; height: 28px; background-repeat: no-repeat;
 	}
 	
 .icon.border.link{
-  background-image: url("../../../view/theme/diabook-blue/icons/weblink.png"); 
+  background-image: url("../../../view/theme/diabook/diabook-blue/icons/weblink.png"); 
   display: block; width: 28px; height: 28px; background-repeat: no-repeat;
   margin-left: 10px;
 	}
@@ -399,6 +431,12 @@ body {
   margin: 50px auto auto;
   display: table;
 }
+
+#jappix_mini {
+right: 45px !important;
+}
+
+
 h4 {
   font-size: 1.1em;
 }
@@ -447,6 +485,24 @@ a:hover {
   /*color: #005c94; */
   text-decoration: underline;
 }
+.intro-end {
+	border-bottom: 1px solid black;
+   clear: both;
+   margin-bottom: 25px;
+   padding-bottom: 25px;
+   width: 75%;
+	}
+.intro-form-end {
+	clear: both;
+	}
+.intro-fullname {
+	padding-bottom: 5px;
+   padding-top: 5px;
+	}
+.intro-wrapper-end {
+	clear: both;
+   padding-bottom: 5px;
+	}
 code {
   font-family: Courier, monospace;
   white-space: pre;
@@ -480,8 +536,9 @@ code {
 }
 #saved-search-ul .tool:hover,
 #nets-sidebar .tool:hover,
-#sidebar-group-list .tool:hover {
-	background: #EEE;
+#sidebar-group-list .tool:hover,
+#fileas-sidebar .tool:hover {
+	background: #308DBF;
 }
 .tool .label {
   float: left;
@@ -541,15 +598,17 @@ header #banner a:hover {
   text-decoration: none;
   outline: none;
   vertical-align: middle;
+ font-weight: bolder;
+  margin-left: 3px;
 }
 header #banner #logo-img {
   height: 25px;
-  margin-top: 5px;
+  margin-top: 3px;
 }
 header #banner #logo-text {
-  font-size: 22px;
+  font-size: 20px;
   position: absolute;
-  top: 15%;
+  top: 10%;
 }
 /* messages */
 #message-new {
@@ -708,7 +767,7 @@ nav #logo-text {
 nav .nav-menu-search {
   position: relative;
 
-  margin: 3px 17px;
+  margin: 4px 17px;
   margin-right: 0px;
   height: 17px;
   width: 180px;
@@ -821,15 +880,15 @@ nav #nav-site-linkmenu .menu-popup {
 }
 
 nav #nav-messages-linkmenu.on .icon.messages, nav #nav-messages-linkmenu.selected .icon.messages{
-	background-image: url("../../../view/theme/diabook-blue/icons/messages2.png");
+	background-image: url("../../../view/theme/diabook/diabook-blue/icons/messages2.png");
 	}
 	
 /*nav #nav-notifications-linkmenu.on .icon.notify,*/ nav #nav-notifications-linkmenu.selected .icon.notify{
-	background-image: url("../../../view/theme/diabook-blue/icons/notify2.png");
+	background-image: url("../../../view/theme/diabook/diabook-blue/icons/notify2.png");
 	}
 	
 nav #nav-contacts-linkmenu.on .icon.contacts, nav #nav-contacts-linkmenu.selected .icon.contacts{
-	background-image: url("../../../view/theme/diabook-blue/icons/contacts2.png");
+	background-image: url("../../../view/theme/diabook/diabook-blue/icons/contacts2.png");
 	}
 	
 nav #nav-apps-link.selected {
@@ -983,43 +1042,57 @@ ul.menu-popup .empty {
 .menu-profile-list{
   height: auto;
   overflow: auto;
-  padding-top: 3px;
-  padding-bottom: 3px;
-  padding-left: 16px;
   min-height: 16px;
   list-style: none;
 	}
 .menu-profile-list:hover{
-	background: #EEE;
+	background: #308DBF;
 	}
 .menu-profile-list-item{
 	padding-left: 5px;
+	vertical-align: middle;
 	}	
 .menu-profile-list-item:hover{	
 	text-decoration: none;
+	
    }
 /*http://prothemedesign.com/circular-icons/*/
-.menu-profile-list.home{
-	background: url("../../../view/theme/diabook-blue/icons/home.png") no-repeat;
-	}
-.menu-profile-list.photos{
-	background: url("../../../view/theme/diabook-blue/icons/mess_side.png") no-repeat;
-	}
-.menu-profile-list.events{
-	background: url("../../../view/theme/diabook-blue/icons/events.png") no-repeat;
-	}
-.menu-profile-list.notes{
-	background: url("../../../view/theme/diabook-blue/icons/notes.png") no-repeat;
-	}
-.menu-profile-list.foren{
-	background: url("../../../view/theme/diabook-blue/icons/pubgroups.png") no-repeat;
-	}
-.menu-profile-list.com_side{
-	background: url("../../../view/theme/diabook-blue/icons/com_side.png") no-repeat;
-	}
-.menu-profile-list.pscontacts{
-	background: url("../../../view/theme/diabook-blue/icons/pscontacts.png") no-repeat;
+.menu-profile-icon.home{
+	background: url("../../../view/theme/diabook/diabook-blue/icons/home.png") no-repeat;
+	float: left;
+	height: 22px;
+   width: 22px;
 	}
+.menu-profile-icon.photos{
+	background: url("../../../view/theme/diabook/diabook-blue/icons/mess_side.png") no-repeat;
+	float: left;
+	height: 22px;
+   width: 22px;}
+.menu-profile-icon.events{
+	background: url("../../../view/theme/diabook/diabook-blue/icons/events.png") no-repeat;
+	float: left;
+	height: 22px;
+   width: 22px;}
+.menu-profile-icon.notes{
+	background: url("../../../view/theme/diabook/diabook-blue/icons/notes.png") no-repeat;
+	float: left;
+	height: 22px;
+   width: 22px;}
+.menu-profile-icon.foren{
+	background: url("../../../view/theme/diabook/diabook-blue/icons/pubgroups.png") no-repeat;
+	float: left;
+	height: 22px;
+   width: 22px;}
+.menu-profile-icon.com_side{
+	background: url("../../../view/theme/diabook/diabook-blue/icons/com_side.png") no-repeat;
+	float: left;
+	height: 22px;
+   width: 22px;}
+.menu-profile-icon.pscontacts{
+	background: url("../../../view/theme/diabook/diabook-blue/icons/pscontacts.png") no-repeat;
+	float: left;
+	height: 22px;
+   width: 22px;}
 /* aside */
 aside {
   display: table-cell;
@@ -1030,6 +1103,7 @@ aside {
   float: left;
   /* background: #F1F1F1; */
 }
+aside #page-sidebar{display: none;}
 aside .vcard .fn {
   font-size: 18px;
   font-weight: bold;
@@ -1084,6 +1158,8 @@ aside #profiles-menu {
 }
 aside #search-text {
 	width: 173px;
+	height: 17px;
+   padding-left: 10px;
 	border-top-left-radius: 15px;
 border-top-right-radius: 15px;
 border-bottom-right-radius: 15px;
@@ -1124,6 +1200,53 @@ aside #side-peoplefind-url {
   float: left;
   margin-right: 20px;		
 	}
+#login-submit-wrapper{
+margin-bottom: 15px;
+	}
+.group_selected {
+  background: url("../../../view/theme/diabook/icons/selected.png") no-repeat left center;
+  float: left;
+  height: 22px;
+  width: 22px;
+}
+.group_unselected {
+  background: url("../../../view/theme/diabook/icons/unselected.png") no-repeat left center;
+  float: left;
+  height: 22px;
+  width: 22px;
+}
+.icon.text_add		{ 
+		background-image: url("../../../images/icons/16/add.png");
+		float: right;
+		opacity: 0.2;
+		margin-right: 14px;
+		}
+.icon.text_add:hover	{ 
+		background-image: url("../../../images/icons/16/add.png");
+		float: right;
+		cursor: pointer;
+		margin-right: 14px;
+		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;
+		}
+.icon.text_edit {
+  background-image: url("../../../images/icons/10/edit.png");
+  opacity: 0.2;
+  margin-top: 6px;
+  float: right;
+  height: 10px;
+}
+.icon.text_edit:hover {
+  background-image: url("../../../images/icons/10/edit.png");
+  opacity: 1;
+  margin-top: 6px;
+  float: right;
+  height: 10px;
+}
 /* widget */
 .widget {
   margin-bottom: 2em;
@@ -1194,7 +1317,7 @@ list-style-type: disc;
   color: #1872A2;
 }
 .widget .tool.selected {
-  background: url("../../../view/theme/diabook-blue/icons/selected.png") no-repeat left center;
+  background: url("../../../view/theme/diabook/diabook-blue/icons/selected.png") no-repeat left center;
 }
 /* widget: search */
 #add-search-popup {
@@ -1210,10 +1333,14 @@ section {
 }
 body .pageheader{
   text-align: center;
-  margin-top: 25px;
-  font-size: 0px;
+  font-size: 20px;
+  margin-bottom: 20px;
+  margin-top: 0px;
+  max-width: 775px;
+	}
+.qcomment{
+  max-width: 122px;	
 	}
-
 #id_username {
   width: 173px;	
 	}
@@ -1241,7 +1368,6 @@ body .pageheader{
     padding: 0;
  }
 .tab.button {
-    margin-right: 5px; 
     margin-left: 5px;	
     /*background: none repeat scroll 0 0 #F8F8F8;*/
     border: 1px solid #CCCCCC;
@@ -1261,6 +1387,7 @@ body .pageheader{
   padding: 5px;
   margin-bottom: 0px;
   width: 775px;
+  padding-top: 10px;
 }
 .tread-wrapper a{
   color: #1872A2;
@@ -1277,6 +1404,123 @@ body .pageheader{
   display: table;
   width: 780px;
 }
+.wall-item-photo-container .wall-item-item, .wall-item-container .wall-item-bottom {
+  display: table-row;
+}
+.wall-item-photo-container .wall-item-info {
+  display: table-cell;
+  vertical-align: top;
+  text-align: left;
+  width: 80px;
+}
+.wall-item-photo-container .wall-item-location {
+  padding-right: 40px;
+  display: table-cell;
+}
+.wall-item-photo-container .wall-item-ago {
+  word-wrap: break-word;
+  width: 50px;
+  margin-left: 10px;
+  color: #999;
+}
+.wall-item-photo-container .wall-item-content {
+
+  max-width: 720px;
+  word-wrap: break-word;
+
+  margin-bottom: 14px;
+}
+.wall-item-photo-container .wall-item-content img {
+  max-width: 700px;
+}
+.wall-item-photo-container .wall-item-links, .wall-item-photo-container .wall-item-actions {
+  display: table-cell;
+  vertical-align: middle;
+}
+.wall-item-photo-container .wall-item-links .icon, .wall-item-photo-container .wall-item-actions .icon {
+  opacity: 0.5;
+  -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;
+}
+.wall-item-photo-container .wall-item-links .icon:hover, .wall-item-photo-container .wall-item-actions .icon: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;
+}
+.wall-item-photo-container .wall-item-name {
+  font-weight: bold;
+}
+.wall-item-photo-container .wall-item-actions-author {
+  width: 100%;
+  margin-bottom: 0.3em;
+}
+.wall-item-photo-container .wall-item-actions-social {
+  float: left;
+  margin-bottom: 1px;
+  display: table-cell;
+}
+.wall-item-photo-container .wall-item-actions-social a {
+  margin-right: 1em;
+}
+.wall-item-photo-container .wall-item-actions-tools {
+  float: right;
+  width: 80px;
+  display: table-cell;
+}
+.wall-item-photo-container .wall-item-actions-tools a {
+  float: right;
+}
+.wall-item-photo-container .wall-item-actions-tools input {
+  float: right;
+}
+.wall-item-photo-container.comment {
+  margin-top: 5px;
+  margin-bottom: 5px;
+  margin-left: 40px;
+  width: 650px;
+  border-bottom: 1px solid #D2D2D2;
+}
+.wall-item-photo-container.comment {
+  top: 15px !important;
+  left: 15px !important;
+}
+.wall-item-photo-container {
+  display: table;
+  width: 780px;
+}
+.my-comment-photo {
+  width: 48px;
+  margin-left: 40px;
+  margin-right: 32px;
+	}
+.comment-edit-preview {
+  width: 500px;
+  margin-top: 10px;
+}
+.comment-edit-text-empty {
+    width: 500px;
+    border: 1px solid #D2D2D2;
+    height: 3.2em;
+    color: #2d2d2d;
+}
+.comment-edit-text-full {
+  font-size: 12.5px;
+  height: 3.3em;
+  
+  border: 1px solid #D2D2D2;
+  width: 500px;
+}
+.comment-edit-photo {
+    margin: 10px 0 0;
+    display: table-cell;
+}
+
 
 
 .wall-item-container .wall-item-item, .wall-item-container .wall-item-bottom {
@@ -1326,10 +1570,11 @@ body .pageheader{
 }
 
 .wall-item-container .wall-item-content {
-  font-size: 12.5px;
+
   max-width: 720px;
   word-wrap: break-word;
-  line-height: 1.2;
+
+
 }
 
 .wall-item-container .wall-item-content img {
@@ -1406,7 +1651,7 @@ body .pageheader{
   padding-left: 12px;
 }
 .wall-item-comment-wrapper {
-  margin: 1px 5px 1px 80px;
+  margin: 1px 5px 5px 80px;
 }
 .wall-item-comment-wrapper .comment-edit-photo {
   display: none;
@@ -1427,9 +1672,9 @@ body .pageheader{
   border: 1px solid #2d2d2d;
 }
 .comment-edit-preview {
-  width: 710px;
-  border: 1px solid #2d2d2d;
+  width: 500px;
   margin-top: 10px;
+  background-color:  #fff797;
 }
 .comment-edit-preview .contact-photo {
   width: 32px;
@@ -1575,6 +1820,11 @@ body .pageheader{
   padding: 0.3em;
   margin-bottom: 10px;
 }
+.grey
+{
+  display: inline;
+  float: right;	
+	}
 #jot #jot-tools {
   margin: 0px;
   padding: 0px;
@@ -1653,14 +1903,14 @@ body .pageheader{
 #jot #jot-tools li.loading img {
   margin-top: 10px;
 }
-#profile-jot-form #jot-title {
+#profile-jot-form #jot-title, #profile-jot-form #jot-category {
     
   	 border-radius: 5px 5px 5px 5px;
     font-weight: bold;
     height: 20px;
     margin: 0 0 5px;
     width: 60%;
-    border: 1px solid #ffffff;
+    border: 1px solid #d2d2d2;
 }
 #profile-jot-form #jot-title:-webkit-input-placeholder {
   font-weight: normal;
@@ -1715,7 +1965,7 @@ body .pageheader{
 #profile-jot-submit {
 	float: right;
 	margin-top: 2px;
-	
+	font-size: 14px;
 }
 #profile-upload-wrapper {
 	float: left;
@@ -1767,7 +2017,9 @@ body .pageheader{
 	float: right;
 	margin-left: 10px;
 	margin-top: 2px;
-	font-size: 10px;
+	font-size: 9px;
+	font-weight: bolder;
+	cursor: pointer;
 }
 #profile-jot-perms{
    float: right;
@@ -1778,18 +2030,20 @@ body .pageheader{
 .button.creation1 {
     background-color: #fff;
     border: 1px solid #777777;
-    background-image: -moz-linear-gradient(center top , white 0%, #DDDDDD 100%);
     border-radius: 3px 3px 3px 3px;
     box-shadow: 0 1px 1px #CFCFCF;
+    cursor: pointer;
+    font-weight: bolder;
 }
 .button.creation2 {
-    background-color: #1872A2;
-    background-image: -moz-linear-gradient(center top , #66C1FF 0%, #0097FF 100%);
+    background-color: #055580;
     border: 1px solid #777777;
     color: white;
     border-radius: 3px 3px 3px 3px;
     box-shadow: 0 1px 1px #CFCFCF;
     margin-left: 5px;
+    cursor: pointer;
+    font-weight: bolder;
 }
 /*input[type="submit"] {
 	border: 0px;
@@ -1921,6 +2175,41 @@ ul.tabs li .active {
     box-shadow: 0 1px 1px #CFCFCF;
     margin-left: 5px;
 }
+//settings tabs
+ul.rs_tabs {
+  list-style-type: none;
+  font-size: 11px;
+}
+ul.rs_tabs li {
+  float: left;
+  margin-bottom: 30px;
+  clear: both;
+}
+ul.rs_tabs li .selected {
+    background-color: #055580;
+    border: 1px solid #777777;
+    color: white;
+    border-radius: 3px 3px 3px 3px;
+    box-shadow: 2px 2px 2px #CFCFCF;
+    font-size: 13px;
+}
+.rs_tabs {
+    list-style-type: none;
+    font-size: 11px;
+    background-position: 0 -20px;
+    background-repeat: repeat-x;
+    height: 27px;
+    padding: 0;
+ }
+.rs_tab.button {	
+    /*background: none repeat scroll 0 0 #F8F8F8;*/
+    border: 1px solid #CCCCCC;
+    border-radius: 3px 3px 3px 3px;
+    font-weight: bolder;
+    padding: 3px;
+    color:  #333333;
+    text-decoration: none;
+	}
 /**
  * Form fields
  */
@@ -1980,6 +2269,14 @@ ul.tabs li .active {
 .field.radio .field_help {
   margin-left: 0px;
 }
+.suggest-select {
+width: 500px;
+height: 350px;	
+	}
+.message-to-select {
+	width: 400px;
+   height: 150px;
+	}
 #directory-search-form{
 	margin-bottom: 50px;
 	}
@@ -2041,9 +2338,10 @@ ul.tabs li .active {
 /* photo */
 .photo {
 box-shadow: 2px 2px 5px 0px #000000;
-margin: 2px 5px 2px 5px;
-max-height: 85%;
-max-width: 85%;
+margin: 0px;
+border-radius: 10px;
+height: 145px !important;
+width: 145px !important;
 }
 .lframe {
   float: left;
@@ -2116,6 +2414,11 @@ blockquote {
     border-left: 1px solid #D2D2D2;
     padding-left: 9px;
     margin: 0 0 0 .8ex;
+	 color: #777;
+}
+.oembed {
+	
+	font-weight: bold;
 }
 .aprofile dt{
 box-shadow: 1px 1px 5px 0;
@@ -2154,6 +2457,9 @@ box-shadow: 1px 1px 5px 0;
 #group-separator,
 #prof-separator { display: none;}
 */
+#prof-members-end{
+	clear: both;
+	}
 
 #prvmail-to-label, #prvmail-subject-label, #prvmail-message-label {
 	margin-bottom: 10px;
@@ -2279,16 +2585,39 @@ a.mail-list-link {
 }
 
 .vevent {
-        border: 1px solid #CCCCCC;
-}
-.vevent .event-description, .vevent .event-location {
+position: relative;
+width: 400px;
+padding: 20px;
+padding-top: 10px;
+margin: 0 0px;
+margin-bottom: 10px;
+background-color: white;
+-webkit-box-shadow: 0 0 4px rgba(0, 0, 0, 0.2), inset 0 0 50px rgba(0, 0, 0, 0.1);
+-moz-box-shadow: 0 0 4px rgba(0, 0, 0, 0.2), inset 0 0 50px rgba(0, 0, 0, 0.1);
+box-shadow: 0 0 5px rgba(0, 0, 0, 0.2), inset 0 0 50px rgba(0, 0, 0, 0.1);
+}
+.vevent .event-location {
         margin-left: 10px;
         margin-right: 10px;
 }
-.vevent .event-start {
-        margin-left: 10px;
-        margin-right: 10px;
+.vevent .event-description {
+margin-left: 10px;
+margin-right: 10px;
+font-size: 1.1em;
+font-weight: bolder;
 }
+.vevent .event-start, .vevent .event-end {
+
+margin-right: 20px;
+margin-bottom: 2px;
+margin-top: 2px;
+font-size: 0.9em;
+text-align: left;
+}
+.event-start .dtstart, .event-end .dtend {
+float: right;
+}
+
 
 #new-event-link {
         margin-bottom: 10px;
@@ -2302,7 +2631,7 @@ a.mail-list-link {
 }
 
 .event-description:before {
-        content: url('../../../images/calendar.png');
+        content:   url("../../../view/theme/diabook/icons/events2.png") !important;
         margin-right: 15px;
 }
 
diff --git a/view/theme/diabook-red/icons/StatusNet.png b/view/theme/diabook/diabook-dark/icons/StatusNet.png
index 398bca716..398bca716 100644
--- a/view/theme/diabook-red/icons/StatusNet.png
+++ b/view/theme/diabook/diabook-dark/icons/StatusNet.png
diff --git a/view/theme/diabook-red/icons/attach.png b/view/theme/diabook/diabook-dark/icons/attach.png
index 1958041cf..1958041cf 100755..100644
--- a/view/theme/diabook-red/icons/attach.png
+++ b/view/theme/diabook/diabook-dark/icons/attach.png
diff --git a/view/theme/diabook-red/icons/audio.png b/view/theme/diabook/diabook-dark/icons/audio.png
index 8d779a409..8d779a409 100755..100644
--- a/view/theme/diabook-red/icons/audio.png
+++ b/view/theme/diabook/diabook-dark/icons/audio.png
diff --git a/view/theme/diabook/diabook-dark/icons/bb-image.png b/view/theme/diabook/diabook-dark/icons/bb-image.png
new file mode 100644
index 000000000..9a1b32113
--- /dev/null
+++ b/view/theme/diabook/diabook-dark/icons/bb-image.png
diff --git a/view/theme/diabook/diabook-dark/icons/bb-url.png b/view/theme/diabook/diabook-dark/icons/bb-url.png
new file mode 100644
index 000000000..071fc1865
--- /dev/null
+++ b/view/theme/diabook/diabook-dark/icons/bb-url.png
diff --git a/view/theme/diabook/diabook-dark/icons/bb-video.png b/view/theme/diabook/diabook-dark/icons/bb-video.png
new file mode 100644
index 000000000..bd323531e
--- /dev/null
+++ b/view/theme/diabook/diabook-dark/icons/bb-video.png
diff --git a/view/theme/diabook/diabook-dark/icons/block.png b/view/theme/diabook/diabook-dark/icons/block.png
new file mode 100755
index 000000000..a0b1dffe9
--- /dev/null
+++ b/view/theme/diabook/diabook-dark/icons/block.png
diff --git a/view/theme/diabook-red/icons/bluebug.png b/view/theme/diabook/diabook-dark/icons/bluebug.png
index 3979e7d8e..3979e7d8e 100644
--- a/view/theme/diabook-red/icons/bluebug.png
+++ b/view/theme/diabook/diabook-dark/icons/bluebug.png
diff --git a/view/theme/diabook/diabook-dark/icons/bold.png b/view/theme/diabook/diabook-dark/icons/bold.png
new file mode 100644
index 000000000..8fab2a10f
--- /dev/null
+++ b/view/theme/diabook/diabook-dark/icons/bold.png
diff --git a/view/theme/diabook-red/icons/camera.png b/view/theme/diabook/diabook-dark/icons/camera.png
index a5c7f1236..a5c7f1236 100755..100644
--- a/view/theme/diabook-red/icons/camera.png
+++ b/view/theme/diabook/diabook-dark/icons/camera.png
diff --git a/view/theme/diabook-red/icons/close_box.png b/view/theme/diabook/diabook-dark/icons/close_box.png
index 28e2675b8..28e2675b8 100755..100644
--- a/view/theme/diabook-red/icons/close_box.png
+++ b/view/theme/diabook/diabook-dark/icons/close_box.png
diff --git a/view/theme/diabook/diabook-dark/icons/com_side.png b/view/theme/diabook/diabook-dark/icons/com_side.png
new file mode 100644
index 000000000..00186ba05
--- /dev/null
+++ b/view/theme/diabook/diabook-dark/icons/com_side.png
diff --git a/view/theme/diabook-red/icons/community.png b/view/theme/diabook/diabook-dark/icons/community.png
index 7c91e8b75..7c91e8b75 100644
--- a/view/theme/diabook-red/icons/community.png
+++ b/view/theme/diabook/diabook-dark/icons/community.png
diff --git a/view/theme/diabook/diabook-dark/icons/contacts.png b/view/theme/diabook/diabook-dark/icons/contacts.png
new file mode 100644
index 000000000..79f6d497c
--- /dev/null
+++ b/view/theme/diabook/diabook-dark/icons/contacts.png
diff --git a/view/theme/diabook/diabook-dark/icons/contacts2.png b/view/theme/diabook/diabook-dark/icons/contacts2.png
new file mode 100644
index 000000000..cd0e289a7
--- /dev/null
+++ b/view/theme/diabook/diabook-dark/icons/contacts2.png
diff --git a/view/theme/diabook/diabook-dark/icons/contacts3.png b/view/theme/diabook/diabook-dark/icons/contacts3.png
new file mode 100644
index 000000000..cd0e289a7
--- /dev/null
+++ b/view/theme/diabook/diabook-dark/icons/contacts3.png
diff --git a/view/theme/diabook-red/icons/dislike.png b/view/theme/diabook/diabook-dark/icons/dislike.png
index 23de426c5..23de426c5 100644
--- a/view/theme/diabook-red/icons/dislike.png
+++ b/view/theme/diabook/diabook-dark/icons/dislike.png
diff --git a/view/theme/diabook-red/icons/drop.png b/view/theme/diabook/diabook-dark/icons/drop.png
index 2abb82ef2..2abb82ef2 100755..100644
--- a/view/theme/diabook-red/icons/drop.png
+++ b/view/theme/diabook/diabook-dark/icons/drop.png
diff --git a/view/theme/diabook-red/icons/email.png b/view/theme/diabook/diabook-dark/icons/email.png
index 240cef2c3..240cef2c3 100644
--- a/view/theme/diabook-red/icons/email.png
+++ b/view/theme/diabook/diabook-dark/icons/email.png
diff --git a/view/theme/diabook/diabook-dark/icons/events.png b/view/theme/diabook/diabook-dark/icons/events.png
new file mode 100644
index 000000000..cf195fbb6
--- /dev/null
+++ b/view/theme/diabook/diabook-dark/icons/events.png
diff --git a/view/theme/diabook-red/icons/facebook.png b/view/theme/diabook/diabook-dark/icons/facebook.png
index 3e5dd39c3..3e5dd39c3 100644
--- a/view/theme/diabook-red/icons/facebook.png
+++ b/view/theme/diabook/diabook-dark/icons/facebook.png
diff --git a/view/theme/diabook-red/icons/file_as.png b/view/theme/diabook/diabook-dark/icons/file_as.png
index 16713fa53..16713fa53 100755..100644
--- a/view/theme/diabook-red/icons/file_as.png
+++ b/view/theme/diabook/diabook-dark/icons/file_as.png
diff --git a/view/theme/diabook-red/icons/ftdevs.gif b/view/theme/diabook/diabook-dark/icons/ftdevs.gif
index e0fc25743..e0fc25743 100644
--- a/view/theme/diabook-red/icons/ftdevs.gif
+++ b/view/theme/diabook/diabook-dark/icons/ftdevs.gif
diff --git a/view/theme/diabook-red/icons/globe.png b/view/theme/diabook/diabook-dark/icons/globe.png
index 6bb9bc09d..6bb9bc09d 100644
--- a/view/theme/diabook-red/icons/globe.png
+++ b/view/theme/diabook/diabook-dark/icons/globe.png
diff --git a/view/theme/diabook/diabook-dark/icons/home.png b/view/theme/diabook/diabook-dark/icons/home.png
new file mode 100644
index 000000000..5c610805f
--- /dev/null
+++ b/view/theme/diabook/diabook-dark/icons/home.png
diff --git a/view/theme/diabook/diabook-dark/icons/italic.png b/view/theme/diabook/diabook-dark/icons/italic.png
new file mode 100644
index 000000000..bf4b2b81d
--- /dev/null
+++ b/view/theme/diabook/diabook-dark/icons/italic.png
diff --git a/view/theme/diabook-red/icons/language.png b/view/theme/diabook/diabook-dark/icons/language.png
index 8029c0155..8029c0155 100644
--- a/view/theme/diabook-red/icons/language.png
+++ b/view/theme/diabook/diabook-dark/icons/language.png
diff --git a/view/theme/diabook-red/icons/like.png b/view/theme/diabook/diabook-dark/icons/like.png
index b65edccc0..b65edccc0 100644
--- a/view/theme/diabook-red/icons/like.png
+++ b/view/theme/diabook/diabook-dark/icons/like.png
diff --git a/view/theme/diabook-red/icons/link.png b/view/theme/diabook/diabook-dark/icons/link.png
index 0ef666a67..0ef666a67 100755..100644
--- a/view/theme/diabook-red/icons/link.png
+++ b/view/theme/diabook/diabook-dark/icons/link.png
diff --git a/view/theme/diabook-red/icons/livejournal.png b/view/theme/diabook/diabook-dark/icons/livejournal.png
index 6d27d265e..6d27d265e 100644
--- a/view/theme/diabook-red/icons/livejournal.png
+++ b/view/theme/diabook/diabook-dark/icons/livejournal.png
diff --git a/view/theme/diabook-red/icons/lock.png b/view/theme/diabook/diabook-dark/icons/lock.png
index 7e34bf279..7e34bf279 100755..100644
--- a/view/theme/diabook-red/icons/lock.png
+++ b/view/theme/diabook/diabook-dark/icons/lock.png
diff --git a/view/theme/diabook-red/icons/lupe.png b/view/theme/diabook/diabook-dark/icons/lupe.png
index f8b228347..f8b228347 100755..100644
--- a/view/theme/diabook-red/icons/lupe.png
+++ b/view/theme/diabook/diabook-dark/icons/lupe.png
diff --git a/view/theme/diabook/diabook-dark/icons/mess_side.png b/view/theme/diabook/diabook-dark/icons/mess_side.png
new file mode 100644
index 000000000..5295e2e74
--- /dev/null
+++ b/view/theme/diabook/diabook-dark/icons/mess_side.png
diff --git a/view/theme/diabook/diabook-dark/icons/messages.png b/view/theme/diabook/diabook-dark/icons/messages.png
new file mode 100644
index 000000000..c83ba186a
--- /dev/null
+++ b/view/theme/diabook/diabook-dark/icons/messages.png
diff --git a/view/theme/diabook/diabook-dark/icons/messages2.png b/view/theme/diabook/diabook-dark/icons/messages2.png
new file mode 100644
index 000000000..e2bf7d24d
--- /dev/null
+++ b/view/theme/diabook/diabook-dark/icons/messages2.png
diff --git a/view/theme/diabook/diabook-dark/icons/messages3.png b/view/theme/diabook/diabook-dark/icons/messages3.png
new file mode 100644
index 000000000..e2bf7d24d
--- /dev/null
+++ b/view/theme/diabook/diabook-dark/icons/messages3.png
diff --git a/view/theme/diabook-red/icons/next.png b/view/theme/diabook/diabook-dark/icons/next.png
index 7b5e25b90..7b5e25b90 100755..100644
--- a/view/theme/diabook-red/icons/next.png
+++ b/view/theme/diabook/diabook-dark/icons/next.png
diff --git a/view/theme/diabook/diabook-dark/icons/notes.png b/view/theme/diabook/diabook-dark/icons/notes.png
new file mode 100644
index 000000000..28dca30a3
--- /dev/null
+++ b/view/theme/diabook/diabook-dark/icons/notes.png
diff --git a/view/theme/diabook/diabook-dark/icons/notifications.png b/view/theme/diabook/diabook-dark/icons/notifications.png
new file mode 100644
index 000000000..2bcd74927
--- /dev/null
+++ b/view/theme/diabook/diabook-dark/icons/notifications.png
diff --git a/view/theme/diabook/diabook-dark/icons/notifications3.png b/view/theme/diabook/diabook-dark/icons/notifications3.png
new file mode 100644
index 000000000..2b4fbb818
--- /dev/null
+++ b/view/theme/diabook/diabook-dark/icons/notifications3.png
diff --git a/view/theme/diabook/diabook-dark/icons/notify.png b/view/theme/diabook/diabook-dark/icons/notify.png
new file mode 100644
index 000000000..159cd2c59
--- /dev/null
+++ b/view/theme/diabook/diabook-dark/icons/notify.png
diff --git a/view/theme/diabook/diabook-dark/icons/notify2.png b/view/theme/diabook/diabook-dark/icons/notify2.png
new file mode 100644
index 000000000..9765bfd53
--- /dev/null
+++ b/view/theme/diabook/diabook-dark/icons/notify2.png
diff --git a/view/theme/diabook/diabook-dark/icons/notify3.png b/view/theme/diabook/diabook-dark/icons/notify3.png
new file mode 100644
index 000000000..9765bfd53
--- /dev/null
+++ b/view/theme/diabook/diabook-dark/icons/notify3.png
diff --git a/view/theme/diabook-red/icons/pencil.png b/view/theme/diabook/diabook-dark/icons/pencil.png
index 772e49b17..772e49b17 100755..100644
--- a/view/theme/diabook-red/icons/pencil.png
+++ b/view/theme/diabook/diabook-dark/icons/pencil.png
diff --git a/view/theme/diabook-red/icons/pencil2.png b/view/theme/diabook/diabook-dark/icons/pencil2.png
index 3b47d1864..3b47d1864 100644
--- a/view/theme/diabook-red/icons/pencil2.png
+++ b/view/theme/diabook/diabook-dark/icons/pencil2.png
diff --git a/view/theme/diabook-red/icons/photo-menu.jpg b/view/theme/diabook/diabook-dark/icons/photo-menu.jpg
index fde5eb535..fde5eb535 100755..100644
--- a/view/theme/diabook-red/icons/photo-menu.jpg
+++ b/view/theme/diabook/diabook-dark/icons/photo-menu.jpg
diff --git a/view/theme/diabook-red/icons/posterous.png b/view/theme/diabook/diabook-dark/icons/posterous.png
index c8e86078e..c8e86078e 100644
--- a/view/theme/diabook-red/icons/posterous.png
+++ b/view/theme/diabook/diabook-dark/icons/posterous.png
diff --git a/view/theme/diabook-red/icons/prev.png b/view/theme/diabook/diabook-dark/icons/prev.png
index 55c1464ba..55c1464ba 100755..100644
--- a/view/theme/diabook-red/icons/prev.png
+++ b/view/theme/diabook/diabook-dark/icons/prev.png
diff --git a/view/theme/diabook/diabook-dark/icons/pscontacts.png b/view/theme/diabook/diabook-dark/icons/pscontacts.png
new file mode 100644
index 000000000..23a78bcac
--- /dev/null
+++ b/view/theme/diabook/diabook-dark/icons/pscontacts.png
diff --git a/view/theme/diabook/diabook-dark/icons/pubgroups.png b/view/theme/diabook/diabook-dark/icons/pubgroups.png
new file mode 100644
index 000000000..ae04194b1
--- /dev/null
+++ b/view/theme/diabook/diabook-dark/icons/pubgroups.png
diff --git a/view/theme/diabook/diabook-dark/icons/quote.png b/view/theme/diabook/diabook-dark/icons/quote.png
new file mode 100644
index 000000000..a464f2859
--- /dev/null
+++ b/view/theme/diabook/diabook-dark/icons/quote.png
diff --git a/view/theme/diabook-red/icons/recycle.png b/view/theme/diabook/diabook-dark/icons/recycle.png
index c3b8d2bf4..c3b8d2bf4 100755..100644
--- a/view/theme/diabook-red/icons/recycle.png
+++ b/view/theme/diabook/diabook-dark/icons/recycle.png
diff --git a/view/theme/diabook-red/icons/remote.png b/view/theme/diabook/diabook-dark/icons/remote.png
index a560cc55e..a560cc55e 100755..100644
--- a/view/theme/diabook-red/icons/remote.png
+++ b/view/theme/diabook/diabook-dark/icons/remote.png
diff --git a/view/theme/diabook-red/icons/scroll_top.png b/view/theme/diabook/diabook-dark/icons/scroll_top.png
index 0e7f7ae6a..0e7f7ae6a 100755..100644
--- a/view/theme/diabook-red/icons/scroll_top.png
+++ b/view/theme/diabook/diabook-dark/icons/scroll_top.png
diff --git a/view/theme/diabook/diabook-dark/icons/selected.png b/view/theme/diabook/diabook-dark/icons/selected.png
new file mode 100644
index 000000000..3fcb95c29
--- /dev/null
+++ b/view/theme/diabook/diabook-dark/icons/selected.png
diff --git a/view/theme/diabook-red/icons/srch_bg.gif b/view/theme/diabook/diabook-dark/icons/srch_bg.gif
index 6a523ba8f..6a523ba8f 100644
--- a/view/theme/diabook-red/icons/srch_bg.gif
+++ b/view/theme/diabook/diabook-dark/icons/srch_bg.gif
diff --git a/view/theme/diabook-red/icons/srch_l.gif b/view/theme/diabook/diabook-dark/icons/srch_l.gif
index 6d95bf35d..6d95bf35d 100644
--- a/view/theme/diabook-red/icons/srch_l.gif
+++ b/view/theme/diabook/diabook-dark/icons/srch_l.gif
diff --git a/view/theme/diabook-red/icons/srch_r.gif b/view/theme/diabook/diabook-dark/icons/srch_r.gif
index 89833a316..89833a316 100644
--- a/view/theme/diabook-red/icons/srch_r.gif
+++ b/view/theme/diabook/diabook-dark/icons/srch_r.gif
diff --git a/view/theme/diabook-red/icons/srch_r_f2.gif b/view/theme/diabook/diabook-dark/icons/srch_r_f2.gif
index 6df457bed..6df457bed 100644
--- a/view/theme/diabook-red/icons/srch_r_f2.gif
+++ b/view/theme/diabook/diabook-dark/icons/srch_r_f2.gif
diff --git a/view/theme/diabook-red/icons/star.png b/view/theme/diabook/diabook-dark/icons/star.png
index 0b00cb189..0b00cb189 100755..100644
--- a/view/theme/diabook-red/icons/star.png
+++ b/view/theme/diabook/diabook-dark/icons/star.png
diff --git a/view/theme/diabook-red/icons/star_dummy.png b/view/theme/diabook/diabook-dark/icons/star_dummy.png
index ce11f30d4..ce11f30d4 100644
--- a/view/theme/diabook-red/icons/star_dummy.png
+++ b/view/theme/diabook/diabook-dark/icons/star_dummy.png
diff --git a/view/theme/diabook-red/icons/starred.png b/view/theme/diabook/diabook-dark/icons/starred.png
index 2b82dfca3..2b82dfca3 100755..100644
--- a/view/theme/diabook-red/icons/starred.png
+++ b/view/theme/diabook/diabook-dark/icons/starred.png
diff --git a/view/theme/diabook-red/icons/tagged.png b/view/theme/diabook/diabook-dark/icons/tagged.png
index 144649ef8..144649ef8 100755..100644
--- a/view/theme/diabook-red/icons/tagged.png
+++ b/view/theme/diabook/diabook-dark/icons/tagged.png
diff --git a/view/theme/diabook-red/icons/toogle_off.png b/view/theme/diabook/diabook-dark/icons/toogle_off.png
index 0fcce4d5a..0fcce4d5a 100644
--- a/view/theme/diabook-red/icons/toogle_off.png
+++ b/view/theme/diabook/diabook-dark/icons/toogle_off.png
diff --git a/view/theme/diabook-red/icons/toogle_on.png b/view/theme/diabook/diabook-dark/icons/toogle_on.png
index 79ce07f0e..79ce07f0e 100644
--- a/view/theme/diabook-red/icons/toogle_on.png
+++ b/view/theme/diabook/diabook-dark/icons/toogle_on.png
diff --git a/view/theme/diabook-red/icons/tumblr.png b/view/theme/diabook/diabook-dark/icons/tumblr.png
index 1dc7fa072..1dc7fa072 100644
--- a/view/theme/diabook-red/icons/tumblr.png
+++ b/view/theme/diabook/diabook-dark/icons/tumblr.png
diff --git a/view/theme/diabook-red/icons/twitter.png b/view/theme/diabook/diabook-dark/icons/twitter.png
index b7a687b9f..b7a687b9f 100644
--- a/view/theme/diabook-red/icons/twitter.png
+++ b/view/theme/diabook/diabook-dark/icons/twitter.png
diff --git a/view/theme/diabook/diabook-dark/icons/underline.png b/view/theme/diabook/diabook-dark/icons/underline.png
new file mode 100644
index 000000000..b1b4d3574
--- /dev/null
+++ b/view/theme/diabook/diabook-dark/icons/underline.png
diff --git a/view/theme/diabook-red/icons/unlock.png b/view/theme/diabook/diabook-dark/icons/unlock.png
index a0cda0ae5..a0cda0ae5 100755..100644
--- a/view/theme/diabook-red/icons/unlock.png
+++ b/view/theme/diabook/diabook-dark/icons/unlock.png
diff --git a/view/theme/diabook/diabook-dark/icons/unselected.png b/view/theme/diabook/diabook-dark/icons/unselected.png
new file mode 100644
index 000000000..9e9cead4b
--- /dev/null
+++ b/view/theme/diabook/diabook-dark/icons/unselected.png
diff --git a/view/theme/diabook-red/icons/unstarred.png b/view/theme/diabook/diabook-dark/icons/unstarred.png
index ba3183f5c..ba3183f5c 100755..100644
--- a/view/theme/diabook-red/icons/unstarred.png
+++ b/view/theme/diabook/diabook-dark/icons/unstarred.png
diff --git a/view/theme/diabook-red/icons/video.png b/view/theme/diabook/diabook-dark/icons/video.png
index a03d1d818..a03d1d818 100755..100644
--- a/view/theme/diabook-red/icons/video.png
+++ b/view/theme/diabook/diabook-dark/icons/video.png
diff --git a/view/theme/diabook-red/icons/weblink.png b/view/theme/diabook/diabook-dark/icons/weblink.png
index 216e78344..216e78344 100755..100644
--- a/view/theme/diabook-red/icons/weblink.png
+++ b/view/theme/diabook/diabook-dark/icons/weblink.png
diff --git a/view/theme/diabook-red/icons/wordpress.png b/view/theme/diabook/diabook-dark/icons/wordpress.png
index f564c4300..f564c4300 100644
--- a/view/theme/diabook-red/icons/wordpress.png
+++ b/view/theme/diabook/diabook-dark/icons/wordpress.png
diff --git a/view/theme/diabook/diabook-dark/style-network-wide.css b/view/theme/diabook/diabook-dark/style-network-wide.css
new file mode 100644
index 000000000..23118a2cd
--- /dev/null
+++ b/view/theme/diabook/diabook-dark/style-network-wide.css
@@ -0,0 +1,2645 @@
+/**
+ * Fabio Comuni <http://kirgroup.com/profile/fabrixxm>
+ * Additional Changes: Michael Vogel <icarus@dabo.de>
+ **/
+
+/* ========= */
+/* = Admin = */
+/* ========= */
+
+#adminpage {
+/*        width: 80%;*/
+}
+
+#pending-update {
+        float:right;
+        color: #ffffff;
+        font-weight: bold;
+        background-color: #FF0000;
+        padding: 0em 0.3em;
+}
+
+.admin.linklist {
+        border: 0px; padding: 0px;
+}
+
+.admin.link {
+        list-style-position: inside;
+        font-size: 1em;
+        padding: 5px;
+        width: 100px;
+        margin: 5px;
+}
+
+#adminpage dl {
+        clear: left;
+        margin-bottom: 2px;
+        padding-bottom: 2px;
+        border-bottom: 1px solid black;
+}
+
+#adminpage dt {
+        width: 200px;
+        float: left;
+        font-weight: bold;
+}
+
+#adminpage dd {
+        margin-left: 200px;
+}
+#adminpage h3 {
+        border-bottom: 1px solid #2e2f2e;
+        margin-bottom: 5px;
+        margin-top: 10px;
+}
+
+#adminpage .submit {
+        clear:left;
+}
+
+#adminpage #pluginslist {
+        margin: 0px; padding: 0px;
+}
+
+#adminpage .plugin {
+        list-style: none;
+        display: block;
+	/* border: 1px solid #888888; */
+        padding: 1em;
+        margin-bottom: 5px;
+        clear: left;
+}
+
+#adminpage .toggleplugin {
+        float:left;
+        margin-right: 1em;
+}
+
+#adminpage table {width:100%; border-bottom: 1p solid #000000; margin: 5px 0px;}
+#adminpage table th { text-align: left;}
+#adminpage td .icon { float: left;}
+#adminpage table#users img { width: 16px; height: 16px; }
+#adminpage table tr:hover { background-color: #eeeeee; }
+#adminpage .selectall { text-align: right; }
+/* icons */
+
+.icon.contacts {
+  background-image: url("../diabook-dark/icons/contacts.png");}
+.icon.notifications {
+  background-image: url("../diabook-dark/icons/notifications.png");}
+.icon.notify {
+  background-image: url("../diabook-dark/icons/notify.png");}
+.icon.messages {
+  background-image: url("../diabook-dark/icons/messages.png");}
+.icon.community {
+  background-image: url("../diabook-dark/icons/community.png");}
+  
+.icon.drop 	{ background-image: url("../diabook-dark/icons/drop.png");}
+.icon.drophide 	{ background-image: url("../diabook-dark/icons/drop.png");}
+.icon.dislike 	{ background-image: url("../diabook-dark/icons/dislike.png");}
+.icon.like 	{ background-image: url("../diabook-dark/icons/like.png");}
+.icon.pencil 	{ background-image: url("../diabook-dark/icons/pencil.png");}
+.icon.recycle 	{ background-image: url("../diabook-dark/icons/recycle.png");}
+.icon.remote-link { background-image: url("../diabook-dark/icons/remote.png");}
+.icon.tagged    { background-image: url("../diabook-dark/icons/tagged.png");}
+.icon.file-as { background-image: url("../diabook-dark/icons/file_as.png");}
+.star-item.icon.unstarred { background-image: url("../diabook-dark/icons/unstarred.png");}
+.star-item.icon.starred { background-image: url("../diabook-dark/icons/starred.png");}
+.icon.link		{ background-image: url("../diabook-dark/icons/link.png");}
+.icon.lock		{ background-image: url("../diabook-dark/icons/lock.png");}
+.icon.unlock		{ background-image: url("../diabook-dark/icons/unlock.png");}
+.icon.language    { background-image: url("../diabook-dark/icons/language.png");}
+
+
+.camera 	{ background-image: url("../diabook-dark/icons/camera.png"); 
+			  display: block; width: 28px; height: 28px; background-repeat: no-repeat;
+			  }
+.attach 	{ background-image: url("../diabook-dark/icons/attach.png"); 
+			  display: block; width: 28px; height: 28px; background-repeat: no-repeat;
+			  }
+.video2 	{ background-image: url("../diabook-dark/icons/video.png"); 
+			  display: block; width: 28px; height: 28px; background-repeat: no-repeat;
+			  }	
+.video 	{ background-image: url("../diabook-dark/icons/video.png"); 
+			  display: block; width: 100%; height: 140px; background-repeat: no-repeat;
+			  }
+.audio2 	{ background-image: url("../diabook-dark/icons/audio.png"); 
+			  display: block; width: 28px; height: 28px; background-repeat: no-repeat;
+			  }
+.audio 	{ background-image: url("../diabook-dark/icons/audio.png"); 
+			  display: block; width: 28px; height: 28px; background-repeat: no-repeat;
+			  }
+.weblink 	{ background-image: url("../diabook-dark/icons/weblink.png"); 
+			  display: block; width: 28px; height: 28px; background-repeat: no-repeat;
+			  }
+.globe 	{ background-image: url("../diabook-dark/icons/globe.png"); 
+			  display: block; width: 28px; height: 28px; background-repeat: no-repeat;
+			  }
+.unglobe 	{ background-image: url("../diabook-dark/icons/unglobe.png"); 
+			  display: block; width: 28px; height: 28px; background-repeat: no-repeat;
+			  }
+.edit    {background-image: url("../diabook-dark/icons/pencil2.png"); 
+			  display: block; width: 28px; height: 28px; background-repeat: no-repeat;}
+			  
+			  
+
+
+.article	{ background-position: -50px  0px;}
+/*.audio 		{ background-position: -70px  0px;}*/
+.block 		{ background-position: -90px  0px;}
+/*.drop 		{ background-position: -110px 0px;}*/
+/*.drophide 	{ background-position: -130px 0px;}*/
+/*.edit 		{ background-position: -150px 0px;}*/
+/*.camera 	{ background-position: -170px 0px;}*/
+/*.dislike 	{ background-position: -190px 0px;}*/
+/*.like 		{ background-position: -210px 0px;}*/
+/*.link 		{ background-position: -230px 0px;}*/
+
+/*.globe 		{ background-position: -50px  -20px;}*/
+/*.noglobe 	{ background-position: -70px  -20px;}*/
+.no 		{ background-position: -90px  -20px;}
+.pause 		{ background-position: -110px -20px;}
+.play 		{ background-position: -130px -20px;}
+/*.pencil 	{ background-position: -150px -20px;}*/
+.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;}*/
+
+/*.video          { background-position: -110px -40px;}*/
+.youtube        { background-position: -130px -40px;}
+
+/*.attach         { background-position: -190px -40px;}*/
+/*.language       { background-position: -210px -40px;}*/
+
+
+.icon.on             { background-image: url("../diabook-dark/icons/toogle_on.png"); background-repeat: no-repeat;}
+.icon.off            { background-image: url("../diabook-dark/icons/toogle_off.png"); background-repeat: no-repeat;}
+.prev           { background-position: -90px  -60px;}
+.next           { background-position: -110px -60px;}
+/*.tagged     { background-position: -130px -60px;}*/
+
+.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 0px; }
+.type-audio { background-position: -40px 0px; }
+.type-text  { background-position: -60px 0px; }
+.type-unkn  { background-position: -80px 0px; }
+
+.icon.drop, .icon.drophide {
+ float: left;
+}
+
+.icon {
+  display: block;
+  width: 20px;
+  height: 20px;
+  /*background-image: url('icons.png');*/
+}
+
+.icon {
+  background-color: transparent ;
+  background-repeat: no-repeat;
+  /* background-position: left center; */
+  display: block;
+  overflow: hidden;
+  text-indent: -9999px;
+  padding: 1px;
+}
+
+.icon.border.camera{
+  background-image: url("../diabook-dark/icons/camera.png"); 
+  display: block; width: 28px; height: 28px; background-repeat: no-repeat;
+	}
+	
+.icon.border.link{
+  background-image: url("../diabook-dark/icons/weblink.png"); 
+  display: block; width: 28px; height: 28px; background-repeat: no-repeat;
+  margin-left: 10px;
+	}
+
+.icon.text {
+  text-indent: 0px;
+}
+.icon.s10 {
+  min-width: 10px;
+  height: 10px;
+}
+.icon.s10.notify {
+  background-image: url("../../../../images/icons/10/notify_off.png");
+}
+.icon.s10.gear {
+  background-image: url("../../../../images/icons/10/gear.png");
+}
+.icon.s10.add {
+  background-image: url("../../../../images/icons/10/add.png");
+}
+.icon.s10.delete {
+  background-image: url("../../../../images/icons/10/delete.png");
+}
+.icon.s10.edit {
+  background-image: url("../../../../images/icons/10/edit.png");
+}
+.icon.s10.star {
+  background-image: url("../../../../images/star_dummy.png");
+}
+.icon.s10.menu {
+  background-image: url("../../../../images/icons/10/menu.png");
+}
+.icon.s10.link {
+  background-image: url("../../../../images/icons/10/link.png");
+}
+.icon.s10.lock {
+  background-image: url("../../../../images/icons/10/lock.png");
+}
+.icon.s10.unlock {
+  background-image: url("../../../../images/icons/10/unlock.png");
+}
+.icon.s10.text {
+  padding: 2px 0px 0px 15px;
+  font-size: 10px;
+}
+.icon.s16 {
+  min-width: 16px;
+  height: 16px;
+}
+.icon.s16.notify {
+  background-image: url("../../../../images/icons/16/notify_off.png");
+}
+.icon.s16.gear {
+  background-image: url("../../../../images/icons/16/gear.png");
+}
+.icon.s16.add {
+  background-image: url("../../../../images/icons/16/add.png");
+}
+.icon.s16.delete {
+  background-image: url("../../../../images/icons/16/delete.png");
+}
+/*.icon.s16.edit {
+  background-image: url("../../../../images/icons/16/edit.png");
+}*/
+.icon.s16.star {
+  background-image: url("../../../../images/star_dummy.png");
+}
+.icon.s16.menu {
+  background-image: url("../../../../images/icons/16/menu.png");
+}
+/*.icon.s16.link {
+  background-image: url("../../../../images/icons/16/link.png");
+}*/
+.icon.s16.lock {
+  background-image: url("../../../../images/icons/16/lock.png");
+}
+.icon.s16.unlock {
+  background-image: url("../../../../images/icons/16/unlock.png");
+}
+.icon.s16.text {
+  padding: 4px 0px 0px 20px;
+  font-size: 10px;
+}
+.icon.s22 {
+  min-width: 22px;
+  height: 22px;
+}
+.icon.s22.notify {
+  background-image: url("../../../../images/icons/22/notify_off.png");
+}
+.icon.s22.gear {
+  background-image: url("../../../../images/icons/22/gear.png");
+}
+.icon.s22.add {
+  background-image: url("../../../../images/icons/22/add.png");
+}
+.icon.s22.delete {
+  background-image: url("../../../../images/icons/22/delete.png");
+}
+.icon.s22.edit {
+  background-image: url("../../../../images/icons/22/edit.png");
+}
+.icon.s22.star {
+  background-image: url("../../../../images/star_dummy.png");
+}
+.icon.s22.menu {
+  background-image: url("../../../../images/icons/22/menu.png");
+}
+.icon.s22.link {
+  background-image: url("../../../../images/icons/22/link.png");
+}
+.icon.s22.lock {
+  background-image: url("../../../../images/icons/22/lock.png");
+}
+.icon.s22.unlock {
+  background-image: url("../../../../images/icons/22/unlock.png");
+}
+.icon.s22.text {
+  padding: 10px 0px 0px 25px;
+  width: 200px;
+}
+.icon.s48 {
+  width: 48px;
+  height: 48px;
+}
+.icon.s48.notify {
+  background-image: url("../../../../images/icons/48/notify_off.png");
+}
+.icon.s48.gear {
+  background-image: url("../../../../images/icons/48/gear.png");
+}
+.icon.s48.add {
+  background-image: url("../../../../images/icons/48/add.png");
+}
+.icon.s48.delete {
+  background-image: url("../../../../images/icons/48/delete.png");
+}
+.icon.s48.edit {
+  background-image: url("../../../../images/icons/48/edit.png");
+}
+.icon.s48.star {
+  background-image: url("../../../../images/star_dummy.png");
+}
+.icon.s48.menu {
+  background-image: url("../../../../images/icons/48/menu.png");
+}
+.icon.s48.link {
+  background-image: url("../../../../images/icons/48/link.png");
+}
+.icon.s48.lock {
+  background-image: url("../../../../images/icons/48/lock.png");
+}
+.icon.s48.unlock {
+  background-image: url("../../../../images/icons/48/unlock.png");
+}
+
+#contact-edit-links ul {
+  list-style: none;
+  list-style-type: none;
+}
+
+.hide-comments-outer {
+  margin-left: 80px;
+  margin-bottom: 1px;
+  width: 675px;
+  border-bottom: 1px solid #BDCDD4;
+  background-color: #fff;
+  padding: 8px;
+}
+
+/* global */
+body {
+  font-family: 'Lato', "Helvetica Neue", Helvetica, Arial, sans-serif;
+  font-size: 13px;
+  background-color: #2e2f2e;
+  color: #eec;
+  margin: 50px auto auto;
+  display: table;
+}
+
+h4 {
+  font-size: 1.1em;
+}
+
+a {
+	color: #88a9d2;
+	/* color: #3e3e8c; */
+	text-decoration: none;
+}
+a:hover {
+	/* color: blue; */
+	text-decoration: underline
+}
+
+.wall-item-name-link {
+/*  float: left;*/
+}
+
+.wall-item-photo {
+  width: 48px;
+  height: 48px;
+  overflow: hidden;
+  display: block;
+}
+
+.left {
+  float: left;
+}
+.right {
+  float: right;
+}
+.hidden {
+  display: none;
+}
+.clear {
+  clear: both;
+}
+.fakelink {
+  color: #729fcf;
+  /* color: #3e3e8c; */
+  text-decoration: none;
+  cursor: pointer;
+}
+.fakelink:hover {
+  /* color: blue; */
+  /*color: #005c94; */
+  text-decoration: underline;
+}
+code {
+  font-family: Courier, monospace;
+  white-space: pre;
+  display: block;
+  overflow: auto;
+  border: 1px solid #ccc;
+  background: #EEE;
+  color: #2e2f2e;
+  padding: 10px;
+  margin-top: 20px;
+}
+#panel {
+  position: absolute;
+  width: 12em;
+  background: #2e302e;
+  color: #eeeeec;
+  margin: 0px;
+  padding: 1em;
+  list-style: none;
+  border: 3px solid #fff;
+  z-index: 100000;
+  -webkit-box-shadow: 0px 5px 10px rgba(0, 0, 0, 0.7);
+  -moz-box-shadow: 0px 5px 10px rgba(0, 0, 0, 0.7);
+  box-shadow: 0px 5px 10px rgba(0, 0, 0, 0.7);
+}
+/* tool */
+.tool {
+  height: auto;
+  overflow: auto;
+  padding: 3px;
+}
+#saved-search-ul .tool:hover,
+#nets-sidebar .tool:hover,
+#sidebar-group-list .tool:hover ,
+#fileas-sidebar .tool:hover {
+	background: aliceBlue;
+}
+.tool .label {
+  float: left;
+}
+.tool .action {
+  float: right;
+}
+.tool a {
+  color: #3465A4;
+}
+.tool a:hover {
+  text-decoration: none;
+}
+/* popup notifications */
+div.jGrowl div.notice {
+  background: #511919 url("../../../../images/icons/48/notice.png") no-repeat 5px center;
+  color: #ffffff;
+  padding-left: 58px;
+}
+div.jGrowl div.info {
+  background: #364e59 url("../../../../images/icons/48/info.png") no-repeat 5px center;
+  color: #ffffff;
+  padding-left: 58px;
+}
+/* header */
+header {
+  position: fixed;
+  left: 0%;
+  right: 80%;
+  top: 0px;
+  margin: 0px;
+  padding: 0px;
+  width: 22%;
+  height: 32px;
+  background: #1d1f1d;
+  background-color: #1d1f1d;
+  color: #eeeeec;
+  z-index: 100;
+  -webkit-box-shadow: -10px 0px 10px rgba(0, 0, 0, 0.7);
+  -moz-box-shadow: -10px 0px 10px rgba(0, 0, 0, 0.7);
+  box-shadow: -10px 0px 10px rgba(0, 0, 0, 0.7);
+  
+}
+header #site-location {
+  display: none;
+}
+header #banner {
+  overflow: hidden;
+  text-align: left;
+  width: 82%%;
+  margin-left: 25%;
+}
+header #banner a,
+header #banner a:active,
+header #banner a:visited,
+header #banner a:link,
+header #banner a:hover {
+  color: black;
+  text-decoration: none;
+  outline: none;
+  vertical-align: middle;
+  font-weight: bolder;
+  margin-left: 3px;
+}
+header #banner #logo-img {
+  height: 25px;
+  margin-top: 3px;
+}
+header #banner #logo-text {
+  font-size: 20px;
+  position: absolute;
+  top: 10%;
+}
+/* nav */
+nav {
+  width: 80%;
+  height: 32px;
+  position: fixed;
+  left: 22%;
+  top: 0px;
+  padding: 0px;
+  background: #1d1f1d;
+  color: #eeeeec;
+  z-index: 99;
+  -webkit-box-shadow: -10px 0px 10px rgba(0, 0, 0, 0.7);
+  -moz-box-shadow: -10px 0px 10px rgba(0, 0, 0, 0.7);
+  box-shadow: -10px 0px 10px rgba(0, 0, 0, 0.7);
+}
+nav a,
+nav a:active,
+nav a:visited,
+nav a:link,
+nav a:hover {
+  /*color: #1f1f1f;*/
+  text-decoration: none;
+  outline: none;
+}
+nav #banner {
+  overflow: hidden;
+  /*text-align: center;*/
+  width: 100%;
+}
+nav #banner a,
+nav #banner a:active,
+nav #banner a:visited,
+nav #banner a:link,
+nav #banner a:hover {
+  color: #ffffff;
+  text-decoration: none;
+  outline: none;
+  vertical-align: bottom;
+}
+nav #banner #logo-img {
+  height: 22px;
+  margin-top: 5px;
+}
+nav #banner #logo-text {
+  font-size: 22px;
+}
+nav #navbar{
+	}
+nav ul {
+  margin: 0px;
+  padding: 0px 20px;
+}
+nav ul li {
+  list-style: none;
+  margin: 0px;
+  /* padding: 1px 1px 3px 1px; */
+  float: left;
+}
+nav ul li .menu-popup {
+  left: 0px;
+  right: auto;
+}
+
+nav #logo-img {
+  height: 25px;
+  margin-top: 4px;
+  margin-left: 30px;
+}
+
+nav #logo-text {
+    font-size: 22px;
+    margin-top: 3px;
+    margin-right: 15px;
+}
+nav .nav-menu-search {
+  position: relative;
+
+  margin: 4px 17px;
+  margin-right: 0px;
+  height: 17px;
+  width: 180px;
+  
+}
+
+nav #search-box #search-text {
+  background-image:  url('icons/lupe.png');
+  background-repeat:no-repeat;
+  padding-left:20px;
+  border-top-left-radius: 15px;
+border-top-right-radius: 15px;
+border-bottom-right-radius: 15px;
+border-bottom-left-radius: 15px;
+	}
+
+
+nav .nav-menu-icon {
+  position: relative;
+  height: 22px;
+  padding: 5px;
+  margin: 0px 5px;
+  -moz-border-radius: 5px 5px 0 0;
+  -webkit-border-radius: 5px 5px 0 0;
+  border-radius: 5px 5px 0 0;
+}
+nav .nav-menu-icon:hover {
+  position: relative;
+  height: 22px;
+  padding: 5px;
+  margin: 0px 5px;
+  -moz-border-radius: 5px 5px 0 0;
+  -webkit-border-radius: 5px 5px 0 0;
+  border-radius: 5px 5px 0 0;
+}
+
+/*color*/
+nav .nav-menu-icon.selected {
+  background-color: #fff;
+}
+nav .nav-menu-icon img {
+  width: 22px;
+  height: 22px;
+}
+nav .nav-menu-icon .nav-notify {
+  top: 3px;
+}
+/*marker*/
+nav .nav-menu {
+  position: relative;
+  height: 16px;
+  padding: 5px;
+  margin: 3px 15px 0px;
+  font-size: 15px;
+  /*border: 3px solid #364A84;*/
+}
+nav .nav-menu.selected {
+  /*border-bottom: 3px solid #9eabb0;*/
+}
+nav .nav-notify {
+  display: none;
+  position: absolute;
+  background-color: #fff;
+  /* background-color: #19aeff; */
+  -moz-border-radius: 5px 5px 5px 5px;
+  -webkit-border-radius: 5px 5px 5px 5px;
+  border-radius: 5px 5px 5px 5px;
+  font-size: 10px;
+  font-weight: 900;
+  padding: 1px 4px;
+  top: 0px;
+  right: -6px;
+  min-width: 10px;
+  text-align: center;
+  border: 1px solid black;
+}
+nav .nav-notify.show {
+  display: block;
+}
+nav #nav-help-link,
+nav #nav-search-link,
+nav #nav-directory-link,
+nav #nav-apps-link,
+nav #nav-site-linkmenu, 
+nav #nav-home-link,
+nav #nav-user-linkmenu
+{
+  float: right;
+}
+nav #nav-user-linkmenu{
+	margin-right: 0px;
+	}
+nav #nav-home-link, #nav-directory-link, #nav-apps-link{
+	margin-left: 0px;
+	margin-right: 0px;
+	font-weight: bold;
+	margin: 3px 5px;
+	font-size: 14px;
+	}
+nav #nav-directory-link{
+  margin-right: 0px;	
+	}
+nav #nav-home-link{
+  margin-left: 0px;	
+	}
+nav #nav-help-link .menu-popup,
+nav #nav-search-link .menu-popup,
+nav #nav-directory-link .menu-popup,
+nav #nav-apps-link .menu-popup,
+nav #nav-site-linkmenu .menu-popup {
+  right: 0px;
+  left: auto;
+}
+
+nav #nav-messages-linkmenu.on .icon.messages, nav #nav-messages-linkmenu.selected .icon.messages{
+	background-image: url("../diabook-dark/icons/messages.png");
+	}
+	
+/*nav #nav-notifications-linkmenu.on .icon.notify,*/ nav #nav-notifications-linkmenu.selected .icon.notify{
+	background-image: url("../diabook-dark/icons/notify.png");
+	}
+	
+nav #nav-contacts-linkmenu.on .icon.contacts, nav #nav-contacts-linkmenu.selected .icon.contacts{
+	background-image: url("../diabook-dark/icons/contacts.png");
+	}
+	
+nav #nav-apps-link.selected {
+  background-color: #fff;
+  moz-border-radius: 5px 5px 0 0;
+-webkit-border-radius: 5px 5px 0 0;
+border-radius: 5px 5px 0 0;
+}
+
+#nav-notifications-mark-all {
+	/* padding: 1px 1px 2px 26px; */
+	/* border-bottom: 1px solid #364E59; */
+	/* margin: 0px 0px 2px 0px;
+	padding: 5px 10px; */
+}
+
+#nav-notifications-see-all {
+	/* padding: 1px 1px 2px 26px; */
+	/* border-bottom: 1px solid #364E59; */
+	/* margin: 0px 0px 2px 0px;
+	padding: 5px 10px; */
+}
+
+.notify-seen {
+	background: none repeat scroll 0 0 #DDDDDD;
+	}
+
+ul.menu-popup {
+  position: absolute;
+  display: none;
+  width: 11em;
+  background: #F5FCF5;
+  color: #2d2d2d;
+  margin: 0px;
+  padding: 0px;
+  list-style: none;
+  z-index: 100000;
+  -webkit-box-shadow: 0px 5px 10px rgba(0, 0, 0, 0.7);
+  -moz-box-shadow: 0px 5px 10px rgba(0, 0, 0, 0.7);
+  box-shadow: 0px 5px 10px rgba(0, 0, 0, 0.7);
+}
+ul.menu-popup a {
+  display: block;
+  color: #2d2d2d;
+  padding: 5px 10px;
+  text-decoration: none;
+}
+ul.menu-popup a:hover {
+  background-color: #B8EDB8; /*bdcdd4;*/
+  color: #000;
+}
+ul.menu-popup .menu-sep {
+  border-top: 1px solid #9eabb0;
+}
+ul.menu-popup li {
+  float: none;
+  overflow: auto;
+  height: auto;
+  display: block;
+}
+ul.menu-popup li img {
+  float: left;
+  width: 16px;
+  height: 16px;
+  padding-right: 5px;
+}
+ul.menu-popup .empty {
+  padding: 5px;
+  text-align: center;
+  color: #9eabb0;
+}
+/* autocomplete popup */
+.acpopup {
+  max-height: 150px;
+  background-color: #555753;
+  color: #fff;
+  border: 1px solid #MenuBorder;
+  overflow: auto;
+  z-index: 100000;
+  -webkit-box-shadow: 0px 5px 10px rgba(0, 0, 0, 0.7);
+  -moz-box-shadow: 0px 5px 10px rgba(0, 0, 0, 0.7);
+  box-shadow: 0px 5px 10px rgba(0, 0, 0, 0.7);
+}
+.acpopupitem {
+  color: #555753;
+  padding: 4px;
+  clear: left;
+}
+.acpopupitem img {
+  float: left;
+  margin-right: 4px;
+}
+.acpopupitem.selected {
+  background-color: #eeeeec;
+}
+#nav-notifications-menu {
+  width: 400px;
+  max-height: 550px;
+  overflow: auto;
+}
+/* #nav-notifications-menu a {
+	display: inline;
+	padding: 5px 0px;
+	margin: 0px 0px 2px 0px;
+}
+#nav-notifications-menu li:hover {
+  background-color: #bdcdd4;
+}*/
+
+#nav-notifications-menu img {
+  float: left;
+  margin-right: 5px;
+}
+#nav-notifications-menu .contactname {
+  font-weight: bold;
+}
+#nav-notifications-menu .notif-when {
+  font-size: 10px;
+  color: #9eabb0;
+  display: block;
+}
+
+.notif-image {
+        width: 32px;
+        height: 32px;
+        padding: 7px 7px 0px 0px;
+}
+
+/*profile_side*/
+#profile_side {
+  margin-bottom: 30px;
+ 
+}
+#profile_side a{
+  color: #333;
+}
+#ps-usericon{
+	height: 25px	
+	}
+#ps-username{
+  font-size: 1.17em;
+  font-weight: bold;
+  vertical-align: top;
+  position: absolute;
+  padding-top: 4px;
+  padding-left: 5px;	
+  word-wrap: break-word;
+  width: 130px;
+	}
+#ps-username:hover{
+  text-decoration: none;	
+	}
+.menu-profile-side{
+  list-style: none;	
+  padding-left: 0px;
+  min-height: 0px;
+	}
+.menu-profile-list{
+  height: auto;
+  overflow: auto;  
+  min-height: 16px;
+  list-style: none;
+	}
+.menu-profile-list:hover{
+	background: #B8EDB8; 
+	}
+.menu-profile-list-item{
+	padding-left: 5px;
+	vertical-align: middle;
+	}	
+.menu-profile-list-item:hover{	
+	text-decoration: none;
+   }
+/*http://prothemedesign.com/circular-icons/*/
+.menu-profile-icon.home{
+	background: url("../diabook-dark/icons/home.png") no-repeat;
+	float: left;
+	height: 22px;
+	width: 22px;
+	}
+.menu-profile-icon.photos{
+	background: url("../diabook-dark/icons/mess_side.png") no-repeat;
+	float: left;
+	height: 22px;
+   width: 22px;}
+.menu-profile-icon.events{
+	background: url("../diabook-dark/icons/events.png") no-repeat;
+	float: left;
+	height: 22px;
+   width: 22px;}
+.menu-profile-icon.notes{
+	background: url("../diabook-dark/icons/notes.png") no-repeat;
+	float: left;
+	height: 22px;
+   width: 22px;}
+.menu-profile-icon.foren{
+	background: url("../diabook-dark/icons/pubgroups.png") no-repeat;
+	float: left;
+	height: 22px;
+   width: 22px;}
+.menu-profile-icon.com_side{
+	background: url("../diabook-dark/icons/com_side.png") no-repeat;
+	float: left;
+	height: 22px;
+   width: 22px;}
+.menu-profile-icon.pscontacts{
+	background: url("../diabook-dark/icons/pscontacts.png") no-repeat;
+	float: left;
+	height: 22px;
+   width: 22px;}
+
+/* aside */
+/*marker*/
+aside {
+  display: table-cell;
+  vertical-align: top;
+  width: 180px;
+  padding: 0px 5px 0px 0px;
+  border-right: 1px solid #729fcf;
+  float: left;
+  /* background: #F1F1F1; */
+}
+aside #page-sidebar{display: none;}
+aside .vcard .fn {
+  font-size: 18px;
+  font-weight: bold;
+  margin-bottom: 5px;
+}
+aside .vcard .title {
+  margin-bottom: 5px;
+}
+aside .vcard dl {
+  height: auto;
+  overflow: auto;
+}
+aside .vcard dt {
+  float: left;
+  margin-left: 0px;
+  /*width: 35%;*/
+  text-align: right;
+  color: #729fcf;
+}
+aside .vcard dd {
+  float: left;
+  margin-left: 5px;
+  /*width: 60%;*/
+}
+aside #profile-extra-links ul {
+  padding: 0px;
+  margin: 0px;
+}
+aside #profile-extra-links li {
+  padding: 0px;
+  margin: 0px;
+  list-style: none;
+}
+aside #dfrn-request-link {
+  display: block;
+  -moz-border-radius: 5px 5px 5px 5px;
+  -webkit-border-radius: 5px 5px 5px 5px;
+  border-radius: 5px 5px 5px 5px;
+  color: #eec;
+  background: #3465a4 url('../../../../images/connect-bg.png') no-repeat left center;
+  font-weight: bold;
+  text-transform: uppercase;
+  padding: 4px 2px 2px 35px;
+}
+aside #dfrn-request-link:hover {
+  text-decoration: none;
+  background-color: #36c;
+  /* background-color: #19aeff; */
+}
+aside #profiles-menu {
+  width: 20em;
+}
+aside #search-text {
+	width: 150px;
+	height: 17px;
+	padding-left: 10px;
+	border-top-left-radius: 15px;
+border-top-right-radius: 15px;
+border-bottom-right-radius: 15px;
+border-bottom-left-radius: 15px;
+-moz-border-bottom-colors: #dbdbdb;
+  -moz-border-top-colors: #999;
+  -moz-border-left-colors: #999;
+  -moz-border-right-colors: #dbdbdb;
+}
+aside #side-follow-url {
+	width: 150px;
+	}
+aside #side-peoplefind-url {
+	width: 150px;
+	}
+#contact-block {
+  overflow: auto;
+  height: auto;
+}
+#contact-block .contact-block-h4 {
+  float: left;
+  margin: 5px 0px;
+}
+#contact-block .allcontact-link {
+  float: right;
+  margin: 5px 0px;
+}
+#contact-block .contact-block-content {
+  clear: both;
+  overflow: auto;
+  height: auto;
+}
+#contact-block .contact-block-link {
+  float: left;
+  margin: 0px 2px 2px 0px;
+}
+#contact-block .contact-block-link img {
+  widht: 55px;
+  height: 55px;
+}
+#lost-password-link {
+  float: left;
+  margin-right: 20px;	
+	}
+/* widget */
+.widget {
+  margin-bottom: 2em;
+  /*.action .s10 { width: 10px; overflow: hidden; padding: 0px;}
+	.action .s16 { width: 16px; overflow: hidden; padding: 0px;}*/
+/*  font-size: 12px; */
+}
+/*marker*/
+.widget h3 {
+  padding: 0px;
+  margin: 2px;
+  font-size: 1.05em;
+}
+.widget .action {
+  opacity: 0.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;
+}
+.widget input.action {
+  opacity: 0.5;
+  -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;
+}
+.widget:hover .title .action {
+  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;
+}
+.widget .tool:hover .action {
+  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;
+}
+.widget .tool:hover .action.ticked {
+  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;
+}
+.widget ul {
+  padding: 0px;
+}
+.widget ul li {
+  padding-left: 16px;
+  min-height: 16px;
+  list-style: none;
+}
+#side-bar-photos-albums li{
+list-style-type: disc;
+}
+#side-bar-photos-albums ul li{
+  margin-left: 30px;
+  padding-left: 0px;
+	}
+#side-bar-photos-albums ul li a{
+  color: #3465A4;
+}
+.widget .tool.selected {
+  background: url("../diabook-dark/icons/selected.png") no-repeat left center;
+}
+/* widget: search */
+span.sbox_l  {
+	background: white url('../diabook/icons/srch_l.gif') no-repeat top left;
+	float: left;
+	width: 19px; height: 19px;
+	margin-left: 10px;
+	margin-top: 5px;
+	
+}
+
+span.sbox_r  {
+	background: white url('../diabook/icons/srch_r.gif') no-repeat top left;
+	float: left;
+	width: 19px; height: 19px;
+	margin-top: 5px;
+}
+
+span.sbox input {
+	background: white url('../diabook/icons/srch_bg.gif') repeat-x top left;
+	float: left;
+	margin-top: 5px;
+	border: 0;
+	height: 13px; width: 100px;
+	padding: 3px;
+	font: 11px/13px arial;
+	color: #000;
+}
+#add-search-popup {
+  width: 200px;
+  top: 18px;
+}
+/* section */
+section {
+  display: table-cell;
+  vertical-align: top;
+  width: auto;
+  padding: 0px 0px 0px 12px;
+}
+
+body .pageheader{
+  text-align: center;
+  font-size: 20px;
+  margin-bottom: 20px;
+  margin-top: 0px;
+  max-width: 575px;
+	}
+.qcomment{
+  max-width: 122px;	
+	}
+#id_username {
+  width: 173px;	
+	}
+#id_password {
+  width: 173px;		
+	}
+#id_openid_url {
+  width: 173px;	
+	}
+#contact-edit-end {
+	}
+.pager {
+   padding: 10px;
+	text-align: center;
+	font-size: 1.0em;
+	clear: both;
+	display: block;
+}	
+
+.tabs {
+    
+    background-position: 0 -20px;
+    background-repeat: repeat-x;
+    height: 27px;
+    padding: 0;
+ }
+.tab.button {
+    margin-left: 5px;	
+    /*background: none repeat scroll 0 0 #F8F8F8;*/
+    border: 1px solid #729fcf;
+    border-radius: 3px 3px 3px 3px;
+    font-weight: normal;
+    padding: 3px;
+    color:  #2e2f2e;
+	}
+	
+#birthday-notice, #event-notice, #birthday-wrapper, #event-wrapper{
+	margin-bottom: 10px;
+	}
+#birthday-wrapper a {
+	color: #3465A4;
+	}
+
+/*marker*/
+right_aside {
+  display: table-cell;
+  vertical-align: top;
+  width: 180px;
+  /*border-left: 1px solid #D2D2D2;*/
+  
+  /* background: #F1F1F1; */
+}
+right_aside a{color: #3465A4;}
+/*marker*/
+right_aside h3 {font-size: 1.05em; border-bottom: 1px solid #D2D2D2; padding-top: 5px; padding-bottom: 0px; padding-left: 9px; margin-bottom: 0px; 
+margin-top:30px;}
+right_aside .directory-item {	width: 50px; height: 50px; vertical-align: center; text-align: center; }
+right_aside .directory-photo { margin: 0px; }
+right_aside .directory-photo-img { max-width: 45px; max-height: 45px; }
+right_aside #likes { margin: 0px; padding: 0px; list-style: none; }
+right_aside .items-wrapper{ overflow: auto;	width: 100%; }
+right_aside #lastusers-wrapper { padding-left: 6px; padding-top: 3px; overflow: auto;	width: 100%; }
+right_aside #ra-photos-wrapper { padding-left: 5px; padding-top: 3px; overflow: auto;	width: 100%; }
+#page-sidebar-right_aside{margin-top: 0px; margin-bottom: 30px;}
+#page-sidebar-right_aside ul {margin-top: 0px;}
+#page-sidebar-right_aside .label {max-width: 128px;}
+right_aside .icon {width: 10px; height: 10px;}
+.close_box		{ 
+		background-image: url("../diabook-dark/icons/close_box.png");
+		float: right;
+		cursor: pointer;
+		opacity: 0.1;
+		}
+.close_box:hover	{ 
+		background-image: url("../diabook-dark/icons/close_box.png");
+		float: right;
+		cursor: pointer;
+		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;
+		}
+
+
+/* wall item */
+.tread-wrapper {
+  border-bottom: 1px solid #D2D2D2;
+  position: relative;
+  padding: 5px;
+  margin-bottom: 0px;
+  width: 775px;
+  padding-top: 10px;
+}
+.tread-wrapper a{
+  color: #194719;
+}
+
+/*marker*/
+.wall-item-decor {
+  position: absolute;
+  left: 780px;
+  top: -10px;
+  width: 16px;
+}
+/*marker*/
+.wall-item-container {
+  display: table;
+  width: 770px;
+}
+
+
+.wall-item-container .wall-item-item, .wall-item-container .wall-item-bottom {
+  display: table-row;
+}
+
+.wall-item-bottom {
+  font-size: 13px;
+}
+.wall-item-container .wall-item-bottom {
+/*  opacity: 0.5;
+  -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; */
+}
+.wall-item-container:hover .wall-item-bottom {
+/*  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; */
+}
+.wall-item-container .wall-item-info {
+  display: table-cell;
+  vertical-align: top;
+  text-align: left;
+  width: 80px;
+}
+.wall-item-container .wall-item-location {
+  padding-right: 40px;
+  display: table-cell;
+}
+.wall-item-container .wall-item-ago {
+  word-wrap: break-word;
+  width: 50px;
+  margin-left: 10px;
+  
+}
+.wall-item-location {
+  
+  clear: both;
+  overflow: hidden;
+  
+  margin-bottom: 5px;
+}
+
+/*marker*/
+.wall-item-container .wall-item-content {
+
+  max-width: 690px;
+  word-wrap: break-word;
+
+
+}
+/*marker*/
+.wall-item-container .wall-item-content img {
+
+
+}
+.wall-item-container .wall-item-links, .wall-item-container .wall-item-actions {
+  display: table-cell;
+  vertical-align: middle;
+}
+.wall-item-container .wall-item-links .icon, .wall-item-container .wall-item-actions .icon {
+  opacity: 0.5;
+  -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;
+}
+.wall-item-container .wall-item-links .icon:hover, .wall-item-container .wall-item-actions .icon: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;
+}
+.wall-item-container .wall-item-name {
+  font-weight: bold;
+}
+.wall-item-container .wall-item-actions-author {
+  width: 100%;
+  margin-bottom: 0.3em;
+}
+.wall-item-container .wall-item-actions-social {
+  float: left;
+  margin-bottom: 1px;
+  display: table-cell;
+}
+.wall-item-container .wall-item-actions-social a {
+  margin-right: 1em;
+}
+.wall-item-actions-social a {
+  float: left;
+}
+.wall-item-container .wall-item-actions-tools {
+  float: right;
+  width: 80px;
+  display: table-cell;
+}
+.wall-item-container .wall-item-actions-tools a {
+  float: right;
+}
+.wall-item-container .wall-item-actions-tools input {
+  float: right;
+}
+/*marker*/
+.wall-item-container.comment {
+  margin-top: 5px;
+  margin-bottom: 5px;
+  margin-left: 80px;
+  width: 690px;
+  border-bottom: 1px solid hsl(198, 21%, 79%);
+}
+.wall-item-container.comment .contact-photo {
+  width: 32px;
+  height: 32px;
+  margin-left: 16px;
+  /*background: url(../../../../images/icons/22/user.png) no-repeat center center;*/
+
+}
+.wall-item-container.comment {
+  top: 15px !important;
+  left: 15px !important;
+}
+.wall-item-container.comment .wall-item-links {
+  padding-left: 12px;
+}
+
+.wall-item-comment-wrapper {
+  margin: 1px 5px 5px 80px;
+/*  background-color: #fff; */
+  width: 500px;
+}
+.wall-item-comment-wrapper .comment-edit-photo {
+  display: none;
+}
+.wall-item-comment-wrapper textarea {
+  height: 2.0em;
+  width: 100%;
+  font-size: 10px;
+/*  color: #999999;
+  border: 1px solid #DDD; */
+  padding: 0.3em;
+  font-size: 14px;
+}
+.wall-item-comment-wrapper .comment-edit-text-full {
+  font-size: 14px;
+  height: 4em;
+ /* color: #2d2d2d;
+  border: 1px solid #2d2d2d; */
+}
+.comment-edit-preview {
+  width: 500px;
+  margin-top: 10px;
+  background-color:  #c8bebe;
+}
+.comment-edit-preview .contact-photo {
+  width: 32px;
+  height: 32px;
+  margin-left: 16px;
+  /*background: url(../../../../images/icons/22/user.png) no-repeat center center;*/
+
+}
+.comment-edit-preview {
+  top: 15px !important;
+  left: 15px !important;
+}
+.comment-edit-preview .wall-item-links {
+  padding-left: 12px;
+}
+.comment-edit-preview .wall-item-container {
+  width: 700px;
+}
+.comment-edit-preview .tread-wrapper {
+  width: 700px;
+  padding: 0;
+  margin: 10px 0;
+}
+
+.shiny {
+  /* border-right: 10px solid #fce94f; */
+	border-right: 1px solid #3e3f3e;
+	padding-right: 12px;
+}
+
+#jot-preview-content{
+	margin-top: 30px;}
+	
+#jot-preview-content .tread-wrapper {
+  background-color: #3e3f3e;
+}
+
+.wall-item-tags {
+  padding-top: 1px;
+  padding-bottom: 2px;
+}
+.tag {
+  /*background: url("../../../../images/tag_b.png") repeat-x center left;*/
+  color: #999;
+  padding-left: 3px;
+  font-size: 12px;
+}
+.tag a {
+  padding-right: 5px;
+  /*background: url("../../../../images/tag.png") no-repeat center right;*/
+  color: #999;
+}
+.wwto {
+  position: absolute !important;
+  width: 25px;
+  height: 25px;
+/*  background: #FFFFFF; 
+  border: 2px solid #364e59; */
+  height: 25px;
+  width: 25px;
+  overflow: hidden;
+  padding: 1px;
+  position: absolute !important;
+  top: 40px;
+  left: 30px;
+  -webkit-box-shadow: 0px 0px 10px rgba(0, 0, 0, 0.7);
+  -moz-box-shadow: 0px 0px 10px rgba(0, 0, 0, 0.7);
+  box-shadow: 0px 0px 10px rgba(0, 0, 0, 0.7);
+}
+.wwto .contact-photo {
+  width: auto;
+  height: 25px;
+}
+/* contacts menu */
+.contact-photo-wrapper {
+  position: relative;
+  width: 80px;
+}
+
+.contact-photo-wrapper.wwto {
+  width: 25px;
+}
+
+.contact-photo {
+  width: 48px;
+  height: 48px;
+  overflow: hidden;
+  display: block;
+}
+.contact-photo img {
+  width: 48px;
+  height: 48px;
+}
+
+.contact-wrapper {
+  float: left;
+  width: 90px;
+  height: 90px;
+  margin-bottom: 15px;
+}
+.contact-wrapper .contact-photo {
+  width: 80px;
+  height: 80px;
+}
+.contact-wrapper .contact-photo img {
+  width: 80px;
+  height: 80px;
+}
+.contact-wrapper {
+  left: 0px;
+  top: 63px;
+}
+.contact-photo {
+  width: 48px;
+  height: 48px;
+}
+.contact-photo img {
+  width: 48px;
+  height: 48px;
+}
+.contact-name {
+  /* text-align: center; */
+  /*font-weight: bold;*/
+  font-size: 12px;
+}
+.contact-details {
+  color: #999999;
+}
+/* editor */
+.jothidden {
+  display: none;
+}
+#jot {
+  width: 585px;
+  margin: 0px 2em 20px 0px;
+}
+#profile-jot-form #profile-jot-text {
+  height: 2.0em;
+  width: 99%;
+  font-size: 15px;
+  color: #999999;
+  border: 1px solid #DDD;
+  padding: 0.3em;
+  margin-bottom: 10px;
+}
+.grey
+{
+  display: inline;
+  float: right;	
+	}
+#jot #jot-tools {
+  margin: 0px;
+  padding: 0px;
+  height: 40px;
+  overflow: none;
+  width: 583px;
+  background-color: #0e232e;
+  border-bottom: 2px solid #9eabb0;
+}
+
+#jot #jot-tools li {
+  list-style: none;
+  float: left;
+  width: 80px;
+  height: 40px;
+  border-bottom: 2px solid #9eabb0;
+}
+#jot #jot-tools li a {
+  display: block;
+  color: #cccccc;
+  width: 100%;
+  height: 40px;
+  text-align: center;
+  line-height: 40px;
+  overflow: hidden;
+}
+#jot #jot-tools li:hover {
+  background-color: #364e59;
+  border-bottom: 2px solid #bdcdd4;
+}
+#jot #jot-tools li.perms {
+  float: right;
+  width: 40px;
+}
+#jot #jot-tools li.perms a.unlock {
+  width: 30px;
+  border-left: 10px solid #cccccc;
+  background-color: #cccccc;
+  background-position: left center;
+}
+#jot #jot-tools li.perms a.lock {
+  width: 30px;
+  border-left: 10px solid #666666;
+  background-color: #666666;
+}
+#jot #jot-tools li.submit {
+  float: right;
+  background-color: #cccccc;
+  border-bottom: 2px solid #cccccc;
+  border-right: 1px solid #666666;
+  border-left: 1px solid #666666;
+}
+#jot #jot-tools li.submit input {
+  border: 0px;
+  margin: 0px;
+  padding: 0px;
+  background-color: #cccccc;
+  color: #666666;
+  width: 80px;
+  height: 40px;
+  line-height: 40px;
+}
+#jot #jot-tools li.submit input:hover {
+  background-color: #bdcdd4;
+  color: #666666;
+}
+#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;
+}
+#profile-jot-form #jot-title {
+    
+  	 border-radius: 5px 5px 5px 5px;
+    font-weight: bold;
+    height: 20px;
+    margin: 0 0 5px;
+    width: 60%;
+    border: 1px solid #d2d2d2;
+}
+#profile-jot-form #jot-title:-webkit-input-placeholder {
+  font-weight: normal;
+}
+#profile-jot-form #jot-title:-moz-placeholder {
+  font-weight: normal;
+}
+#profile-jot-form #profile-jot-text_parent #profile-jot-text_tbl{
+	width: 585px;
+	height: 100px;
+	}
+#jot #jot-title:hover {
+  border: 1px solid #999999;
+}
+#jot #jot-title:focus {
+  border: 1px solid #999999;
+}
+#jot #character-counter {
+  width: 80px;
+  float: right;
+  text-align: right;
+  height: 20px;
+  line-height: 20px;
+  padding-right: 20px;
+}
+#jot-perms-icon, 
+#profile-location,
+#profile-nolocation,
+#profile-youtube, 
+#profile-video, 
+#profile-audio,
+#profile-link,
+#profile-title, 
+#wall-image-upload,
+#wall-file-upload,
+#wall-image-upload-div,
+#wall-file-upload-div,
+.hover, .focus {
+	cursor: pointer;
+	margin-top: 2px;
+}
+/*marker*/
+#profile-jot-wrapper{
+	margin: 0 20px 20px 0;
+   width: 785px;
+	}
+/*marker*/
+#profile-jot-submit-wrapper {
+	margin-bottom: 50px;
+	width: 785px;
+}
+
+#profile-jot-submit {
+	float: right;
+	margin-top: 2px;
+	font-size: 14px;
+	
+}
+#profile-upload-wrapper {
+	float: left;
+	margin-top: 2px;
+	margin-left: 10px;
+	
+}
+#profile-attach-wrapper {
+	float: left;
+	margin-left: 15px;
+	margin-top: 2px;
+}
+#profile-rotator {
+	float: left;
+	margin-left: 30px;
+	margin-top: 2px;
+}
+#profile-link-wrapper {
+	float: left;
+	margin-left: 15px;
+	margin-top: 2px;
+}
+#profile-youtube-wrapper {
+	float: left;
+	margin-left: 15px;
+	margin-top: 2px;
+}
+#profile-video-wrapper {
+	float: left;
+	margin-left: 15px;
+	margin-top: 2px;
+}
+#profile-audio-wrapper {
+	float: left;
+	margin-left: 15px;
+	margin-top: 2px;
+}
+#profile-location-wrapper {
+	float: left;
+	margin-left: 15px;
+	margin-top: 2px;
+}
+#profile-jot-perms {
+	float: left;
+	margin-left: 45px;
+	margin-top: 2px;
+}
+#jot-preview-link {
+	float: right;
+	margin-left: 10px;
+	margin-top: 2px;
+	font-size: 9px;
+	font-weight: bolder;
+	cursor: pointer;
+}
+#profile-jot-perms{
+   float: right;
+	margin-left: 10px;
+	margin-top: 2px;	
+	}
+/** buttons **/
+.button.creation1 {
+    background-color: #fff;
+    border: 1px solid #777777;
+    border-radius: 3px 3px 3px 3px;
+    box-shadow: 0 1px 1px #CFCFCF;
+    cursor: pointer;
+    font-weight: bolder;
+}
+.button.creation2 {
+    background-color: #194719;
+    border: 1px solid #777777;
+    color: white;
+    border-radius: 3px 3px 3px 3px;
+    box-shadow: 0 1px 1px #CFCFCF;
+    margin-left: 5px;
+    cursor: pointer;
+    font-weight: bolder;
+}
+/*input[type="submit"] {
+	border: 0px;
+    background-color: @ButtonBackgroundColor;
+    color: @ButtonColor;
+    padding: 0px 10px;
+	.rounded(5px);
+    height: 18px;
+}*/
+/** acl **/
+#photo-edit-perms-select, #photos-upload-permissions-wrapper, #profile-jot-acl-wrapper {
+  display: block!important;
+}
+#acl-wrapper {
+  width: 690px;
+  float: left;
+}
+#acl-search {
+  float: right;
+  background: #ffffff url("../../../../images/search_18.png") no-repeat right center;
+  padding-right: 20px;
+}
+#acl-showall {
+  float: left;
+  display: block;
+  width: auto;
+  height: 18px;
+  background-color: #cccccc;
+  background-image: url("../../../../images/show_all_off.png");
+  background-position: 7px 7px;
+  background-repeat: no-repeat;
+  padding: 7px 5px 0px 30px;
+  color: #999999;
+  -moz-border-radius: 5px 5px 5px 5px;
+  -webkit-border-radius: 5px 5px 5px 5px;
+  border-radius: 5px 5px 5px 5px;
+}
+#acl-showall.selected {
+  color: #000000;
+  background-color: #ff9900;
+  background-image: url("../../../../images/show_all_on.png");
+}
+#acl-list {
+  height: 210px;
+  border: 1px solid #cccccc;
+  clear: both;
+  margin-top: 30px;
+  overflow: auto;
+}
+.acl-list-item {
+  display: block;
+  width: 150px;
+  height: 30px;
+  border: 1px solid #cccccc;
+  margin: 5px;
+  float: left;
+}
+.acl-list-item img {
+  width: 22px;
+  height: 22px;
+  float: left;
+  margin: 4px;
+}
+.acl-list-item p {
+  height: 12px;
+  font-size: 10px;
+  margin: 0px;
+  padding: 2px 0px 1px;
+  overflow: hidden;
+}
+.acl-list-item a {
+  font-size: 8px;
+  display: block;
+  width: 40px;
+  height: 10px;
+  float: left;
+  color: #999999;
+  background-color: #cccccc;
+  background-position: 3px 3px;
+  background-repeat: no-repeat;
+  margin-right: 5px;
+  -webkit-border-radius: 2px ;
+  -moz-border-radius: 2px;
+  border-radius: 2px;
+  padding-left: 15px;
+}
+#acl-wrapper a:hover {
+  text-decoration: none;
+  color: #000000;
+}
+.acl-button-show {
+  background-image: url("../../../../images/show_off.png");
+}
+.acl-button-hide {
+  background-image: url("../../../../images/hide_off.png");
+}
+.acl-button-show.selected {
+  color: #000000;
+  background-color: #9ade00;
+  background-image: url("../../../../images/show_on.png");
+}
+.acl-button-hide.selected {
+  color: #000000;
+  background-color: #ff4141;
+  background-image: url("../../../../images/hide_on.png");
+}
+.acl-list-item.groupshow {
+  border-color: #9ade00;
+}
+.acl-list-item.grouphide {
+  border-color: #ff4141;
+}
+/** /acl **/
+/** tab buttons 14618a**/
+/*marker*/
+ul.tabs {
+  list-style-type: none;
+  padding-bottom: 10px;
+  font-size: 13px;
+  width: 805px;
+}
+ul.tabs li {
+  float: left;
+  margin-left: 5px;
+}
+ul.tabs li .active {
+    background-color: #3465A4;
+    border: 1px solid #777777;
+    color: white;
+    border-radius: 3px 3px 3px 3px;
+    box-shadow: 2px 2px 2px #CFCFCF;
+    margin-left: 5px;
+}
+/**
+ * Form fields
+ */
+.field {
+  margin-bottom: 10px;
+  padding-bottom: 10px;
+  overflow: auto;
+  width: 100%;
+}
+.field label {
+  float: left;
+  width: 200px;
+}
+.field input, .field textarea {
+  width: 400px;
+}
+.field textarea {
+  height: 100px;
+}
+.field .field_help {
+  display: block;
+  margin-left: 200px;
+  color: #666666;
+}
+.field .onoff {
+  float: left;
+  width: 80px;
+}
+.field .onoff a {
+  display: block;
+  border: 1px solid #666666;
+  background-image: url("../../../../images/onoff.jpg");
+  background-repeat: no-repeat;
+  padding: 4px 2px 2px 2px;
+  height: 16px;
+  text-decoration: none;
+}
+.field .onoff .off {
+  border-color: #666666;
+  padding-left: 40px;
+  background-position: left center;
+  background-color: #cccccc;
+  color: #666666;
+  text-align: right;
+}
+.field .onoff .on {
+  border-color: #204A87;
+  padding-right: 40px;
+  background-position: right center;
+  background-color: #D7E3F1;
+  color: #204A87;
+  text-align: left;
+}
+.field .hidden {
+  display: none!important;
+}
+.field.radio .field_help {
+  margin-left: 0px;
+}
+#directory-search-form{
+	margin-bottom: 50px;
+	}
+#profile-edit-links-end {
+        clear: both;
+        margin-bottom: 15px;
+}
+
+#profile-edit-links ul { margin: 20px; padding-bottom: 20px; list-style: none; }
+
+#profile-edit-links li {
+  float: left;
+  list-style: none;
+  margin-left: 10px;
+}
+
+.profile-edit-side-div {
+  display: none;
+}
+
+#register-form label,
+#profile-edit-form label {
+        width: 300px; float: left;
+}
+
+.required {
+  display: inline;
+  color: #B20202;
+}
+
+/* oauth */
+.oauthapp {
+  height: auto;
+  overflow: auto;
+  border-bottom: 2px solid #cccccc;
+  padding-bottom: 1em;
+  margin-bottom: 1em;
+}
+.oauthapp img {
+  float: left;
+  width: 48px;
+  height: 48px;
+  margin: 10px;
+}
+.oauthapp img.noicon {
+  background-image: url("../../../../images/icons/48/plugin.png");
+  background-position: center center;
+  background-repeat: no-repeat;
+}
+.oauthapp a {
+  float: left;
+}
+/* contacts */
+.contact-entry-wrapper {
+  width: 120px;
+  height: 120px;
+  float: left;
+}
+/* photo */
+.photo {
+box-shadow: 2px 2px 5px 0px #000000;
+margin: 0px;
+border-radius: 10px;
+height: 145px !important;
+width: 145px !important;
+}
+.lframe {
+  float: left;
+  /*margin: 0px 10px 10px 0px;*/
+}
+/* profile match wrapper */
+.profile-match-wrapper {
+  float: left;
+  width: 90px;
+  height: 90px;
+  margin-bottom: 20px;
+}
+.profile-match-wrapper .contact-photo {
+  width: 80px;
+  height: 80px;
+}
+.profile-match-wrapper .contact-photo img {
+  width: 80px;
+  height: 80px;
+}
+.profile-match-wrapper {
+  left: 0px;
+  top: 63px;
+}
+
+.contact-photo-menu-button {
+        position: relative;
+        background-image: url("../../../../images/icons/16/menu.png");
+        background-position: top left; 
+        background-repeat: no-repeat;
+        margin: 0px 0px -16px 0px; 
+	padding: 0px;
+        width: 16px;
+        height: 16px;
+        top: -16px; left:0px;
+        overflow: hidden;
+        text-indent: 40px;
+        display: none;
+        
+}
+.contact-photo-menu {
+        width: 11em;
+        border: 3px solid #364e59;
+	color: #2d2d2d;
+        background: #FFFFFF;
+/*        position: absolute;*/
+        position: relative;
+        left: 0px; top: 0px;
+        display: none;
+        z-index: 10000;
+}
+.contact-photo-menu ul { margin:0px; padding: 0px; list-style: none }
+.contact-photo-menu li a {
+	display: block; 
+	padding: 5px 10px; 
+	color: #2d2d2d;
+	text-decoration: none;
+}
+.contact-photo-menu li a:hover {
+	background-color: #bdcdd4; 
+}
+
+/* page footer */
+footer {
+  height: 100px;
+  display: table-row;
+}
+
+blockquote {
+    border-left: 1px solid #D2D2D2;
+    padding-left: 9px;
+    margin: 0 0 0 .8ex;
+	 color: #777;
+}
+.oembed {
+	
+	font-weight: bold;
+}
+.aprofile dt{
+box-shadow: 1px 1px 5px 0;
+    color: #666666;
+    margin: 15px 0 5px;
+    padding-left: 5px;	
+	}
+/* ================== */
+/* = Contacts Block = */
+/* ================== */
+
+.contact-block-img {
+        width: 55px;
+        height: 55px;
+        padding-right: 3px;
+}
+.contact-block-div {
+        float: left;
+}
+
+.contact-block-textdiv { width: 150px; height: 34px; float: left; }
+#contact-block-end { clear: both; } 
+
+#group-edit-wrapper {
+        margin-bottom: 10px;
+}
+
+#group-members-end {
+        clear: both;
+}
+#group-edit-desc {
+ margin-top: 15px;
+}
+
+/*
+#group-separator,
+#prof-separator { display: none;}
+*/
+#prof-members-end{
+	clear: both;
+	}
+
+#prvmail-to-label, #prvmail-subject-label, #prvmail-message-label {
+	margin-bottom: 10px;
+	margin-top: 20px;
+}
+
+#prvmail-submit {
+	float: right;
+	margin-top: 10px;
+}
+
+#prvmail-subject
+{
+background: none repeat scroll 0 0 #FFFFFF;
+border: 1px solid #CCCCCC;
+border-radius: 5px 5px 5px 5px;
+font-weight: bold;
+height: 20px;
+margin: 0 0 5px;
+vertical-align: middle;
+}
+#prvmail-form{
+ width: 597px;	
+	}
+	
+#prvmail-upload-wrapper,
+#prvmail-link-wrapper,
+#prvmail-rotator-wrapper {
+	float: left;
+	margin-top: 10px;
+	margin-right: 10px;
+	width: 24px;
+}
+
+#prvmail-end {
+	clear: both;
+}
+
+.mail-list-sender,
+.mail-list-detail {
+	float: left;
+}
+.mail-list-detail {
+	margin-left: 20px;
+}
+
+.mail-list-subject {
+	font-size: 1.1em;
+	margin-top: 10px;
+}
+a.mail-list-link {
+    display: block;
+    font-size: 1.3em;
+    padding: 4px 0;
+}
+
+/*
+*a.mail-list-link:hover {
+*	background-color: #15607B;
+*	color: #F5F6FB;
+*}
+*/
+
+.mail-list-outside-wrapper-end {
+	clear: both;
+}
+
+.mail-list-outside-wrapper {
+	margin-top: 30px;
+}
+
+.mail-list-delete-wrapper {
+	float: right;
+	margin-right: 30px;
+	margin-top: 15px;
+}
+
+.mail-list-delete-icon {
+	border: none;
+}
+
+.mail-conv-sender,
+.mail-conv-detail {
+	float: left;
+}
+.mail-conv-detail {
+	margin-left: 20px;
+	width: 500px;
+}
+
+.mail-conv-subject {
+    font-size: 1.4em;
+    margin: 10px 0;
+}
+
+.mail-conv-outside-wrapper-end {
+	clear: both;
+}
+
+.mail-conv-outside-wrapper {
+	margin-top: 30px;
+}
+
+.mail-conv-delete-wrapper {
+	float: right;
+	margin-right: 30px;
+	margin-top: 15px;
+}
+.mail-conv-break {
+	clear: both;
+}
+
+.mail-conv-delete-icon {
+	border: none;
+}
+
+/* ========== */
+/* = Events = */
+/* ========== */
+.eventcal {
+        float: left;
+        font-size: 20px;
+}
+
+.vevent {
+
+}
+.vevent .event-description, .vevent .event-location {
+        margin-left: 10px;
+        margin-right: 10px;
+}
+.vevent .event-start {
+        margin-left: 10px;
+        margin-right: 10px;
+}
+
+#new-event-link {
+        margin-bottom: 10px;
+}
+
+.edit-event-link, .plink-event-link {
+        float: left;
+        margin-top: 4px;
+        margin-right: 4px;
+        margin-bottom: 15px;
+}
+
+.event-description:before {
+        content: url('../../../../images/calendar.png');
+        margin-right: 15px;
+}
+
+.event-start, .event-end {
+        margin-left: 10px;
+        width: 330px;
+        clear: both;
+}
+
+.event-start .dtstart, .event-end .dtend {
+        float: right;
+}
+
+.event-list-date {
+        margin-bottom: 10px;
+}
+
+.prevcal, .nextcal {
+        float: left;
+        margin-left: 32px;
+        margin-right: 32px;
+        margin-top: 64px;
+}
+.event-calendar-end {
+        clear: both;
+}
+
+ 
+.calendar {
+        font-family: Courier, monospace;
+}
+.calendar.eventcal a {
+  color: #3465A4;	
+	}
+.today {
+        font-weight: bold;
+        color: #FF0000;
+}
+
+.settings-block {
+        border: 1px solid #AAA;
+        margin: 10px;
+        padding: 10px;
+}
+
+.app-title {
+        margin: 10px;
+}
+
+#identity-manage-desc {
+        margin-top:15px;
+        margin-bottom: 15px;
+}
+
+#identity-manage-choose {
+        margin-bottom: 15px;
+}
+
+#identity-submit {
+        margin-top: 20px;
+}
+
+#photo-prev-link, #photo-next-link {
+        padding: 10px;
+        float: left;
+}
+.lightbox{
+	float: left;
+	}
+
+#photo-photo {
+        float: left;
+}
+#photo-like-div .wall-item-like-buttons {
+	 float: left;
+    margin-right: 5px;
+    margin-top: 30px;
+	}
+.comment-edit-text-empty {
+    margin: 10px 0 0;
+    width: 85%;
+}
+.comment-edit-photo {
+    margin: 10px 0 0;
+}
+.wall-item-like-buttons .icon.like {
+float: left;
+}
+
+#photo-photo-end {
+        clear: both;
+}
+
+.tabs .comment-wwedit-wrapper {
+	display: block;
+   margin-top: 30px;
+   margin-left: 50px;
+	}
+
+.profile-match-photo {
+        float: left;
+        text-align: center;
+        width: 120px;
+}
+
+.profile-match-name {
+        float: left;
+        text-align: center;
+        width: 120px;
+        overflow: hidden;
+}
+
+.profile-match-break,
+.profile-match-end {
+        clear: both;
+}
+
+.profile-match-connect {
+        text-align: center;
+        font-weight: bold;
+}
+
+.profile-match-wrapper {
+        float: left;
+        padding: 10px;
+        width: 120px;
+        height: 120px;
+        scroll: auto;
+}
+#profile-match-wrapper-end {
+        clear: both;
+}
+
+/* ============= */
+/* = Directory = */
+/* ============= */
+/* contacts menu */
+.contact-photo-wrapper {
+  position: relative;
+}
+.contact-photo {
+  width: 48px;
+  height: 48px;
+  overflow: hidden;
+  display: block;
+}
+.contact-photo img {
+  width: 48px;
+  height: 48px;
+}
+.contact-photo-menu-button {
+  display: none;
+  /* position: absolute; */
+  /* position: absolute; */
+  left: 0px;
+  top: -16px;
+}
+.contact-wrapper {
+  float: left;
+  width: 90px;
+  height: 90px;
+  margin-bottom: 15px;
+}
+.contact-wrapper .contact-photo {
+  width: 80px;
+  height: 80px;
+}
+.contact-wrapper .contact-photo img {
+  width: 80px;
+  height: 80px;
+}
+.contact-wrapper .contact-photo-menu-button {
+  left: 0px;
+  top: 63px;
+}
+.directory-item {
+  float: left;
+  width: 200px;
+  height: 200px;
+}
+.directory-item .contact-photo {
+  width: 175px;
+  height: 175px;
+}
+.directory-item .contact-photo img {
+  width: 175px;
+  height: 175px;
+}
+.contact-name {
+  text-align: left;
+  font-weight: bold;
+  font-size: 12px;
+}
+.contact-details {
+  color: #999999;
+}
+#side-bar-photos-albums li{
+list-style-type: disc;
+}
+#side-bar-photos-albums ul li{
+  margin-left: 30px;
+  padding-left: 0px;
+	}
+#side-bar-photos-albums{
+	margin-top: 15px;	
+	}
+.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-album-image-wrapper, .photo-top-image-wrapper {
+  float: left;
+   -moz-box-shadow: 0 0 5px #888;
+   -webkit-box-shadow: 0 0 5px #888;
+   box-shadow: 0 0 5px #888;
+  background-color: #000;
+   -webkit-border-radius: 5px;
+   -moz-border-radius: 5px;
+  border-radius: 5px;
+  padding-bottom: 20px;
+  position: relative;
+  margin: 0 10px 10px 0;
+  width: 200px; height: 140px;
+  overflow: hidden;  
+}
+.photo-top-album-name {
+        width: 100%;
+        position: absolute; 
+        bottom: 0px; 
+        padding-left: 3px;
+        background-color: #EEE;
+}
+.photo-top-album-link{
+  color: #3465A4;
+	}
+.photo-top-album-img{
+	
+	}
+/*.photo-top-image-wrapper {
+        position: relative;
+        float: left;
+        margin-top: 15px;
+        margin-right: 15px;
+        width: 200px; height: 200px; 
+        overflow: hidden; 
+}
+.photo-top-album-name {
+        width: 100%;
+        min-height: 2em;
+        position: absolute; 
+        bottom: 0px; 
+        padding: 0px 3px;
+        padding-top: 0.5em;
+        background-color: rgb(255, 255, 255);
+}*/
+#photo-top-end {
+        clear: both;
+}
+
+#photo-top-links {
+        margin-bottom: 30px;
+        margin-left: 30px;
+}
+
+#photos-upload-newalbum-div {
+        float: left;
+        width: 175px;
+}
+
diff --git a/view/theme/diabook/diabook-dark/style-network.css b/view/theme/diabook/diabook-dark/style-network.css
new file mode 100644
index 000000000..5639bde29
--- /dev/null
+++ b/view/theme/diabook/diabook-dark/style-network.css
@@ -0,0 +1,2619 @@
+/**
+ * Fabio Comuni <http://kirgroup.com/profile/fabrixxm>
+ * Additional Changes: Michael Vogel <icarus@dabo.de>
+ **/
+
+/* ========= */
+/* = Admin = */
+/* ========= */
+
+#adminpage {
+/*        width: 80%;*/
+}
+
+#pending-update {
+        float:right;
+        color: #2e2f2e;
+        font-weight: bold;
+        background-color: #FF0000;
+        padding: 0em 0.3em;
+}
+
+.admin.linklist {
+        border: 0px; padding: 0px;
+}
+
+.admin.link {
+        list-style-position: inside;
+        font-size: 1em;
+        padding: 5px;
+        width: 100px;
+        margin: 5px;
+}
+
+#adminpage dl {
+        clear: left;
+        margin-bottom: 2px;
+        padding-bottom: 2px;
+        border-bottom: 1px solid black;
+}
+
+#adminpage dt {
+        width: 200px;
+        float: left;
+        font-weight: bold;
+}
+
+#adminpage dd {
+        margin-left: 200px;
+}
+#adminpage h3 {
+        border-bottom: 1px solid #2e2f2e;
+        margin-bottom: 5px;
+        margin-top: 10px;
+}
+
+#adminpage .submit {
+        clear:left;
+}
+
+#adminpage #pluginslist {
+        margin: 0px; padding: 0px;
+}
+
+#adminpage .plugin {
+        list-style: none;
+        display: block;
+	/* border: 1px solid #888888; */
+        padding: 1em;
+        margin-bottom: 5px;
+        clear: left;
+}
+
+#adminpage .toggleplugin {
+        float:left;
+        margin-right: 1em;
+}
+
+#adminpage table {width:100%; border-bottom: 1p solid #000000; margin: 5px 0px;}
+#adminpage table th { text-align: left;}
+#adminpage td .icon { float: left;}
+#adminpage table#users img { width: 16px; height: 16px; }
+#adminpage table tr:hover { background-color: #eeeeee; }
+#adminpage .selectall { text-align: right; }
+/* icons */
+
+.icon.contacts {
+  background-image: url("../diabook-dark/icons/contacts.png");}
+.icon.notifications {
+  background-image: url("../diabook-dark/icons/notifications.png");}
+.icon.notify {
+  background-image: url("../diabook-dark/icons/notify.png");}
+.icon.messages {
+  background-image: url("../diabook-dark/icons/messages.png");}
+.icon.community {
+  background-image: url("../diabook-dark/icons/community.png");}
+  
+.icon.drop 	{ background-image: url("../diabook-dark/icons/drop.png");}
+.icon.drophide 	{ background-image: url("../diabook-dark/icons/drop.png");}
+.icon.dislike 	{ background-image: url("../diabook-dark/icons/dislike.png");}
+.icon.like 	{ background-image: url("../diabook-dark/icons/like.png");}
+.icon.pencil 	{ background-image: url("../diabook-dark/icons/pencil.png");}
+.icon.recycle 	{ background-image: url("../diabook-dark/icons/recycle.png");}
+.icon.remote-link { background-image: url("../diabook-dark/icons/remote.png");}
+.icon.tagged    { background-image: url("../diabook-dark/icons/tagged.png");}
+.icon.file-as { background-image: url("../diabook-dark/icons/file_as.png");}
+.star-item.icon.unstarred { background-image: url("../diabook-dark/icons/unstarred.png");}
+.star-item.icon.starred { background-image: url("../diabook-dark/icons/starred.png");}
+.icon.link		{ background-image: url("../diabook-dark/icons/link.png");}
+.icon.lock		{ background-image: url("../diabook-dark/icons/lock.png");}
+.icon.unlock		{ background-image: url("../diabook-dark/icons/unlock.png");}
+.icon.language    { background-image: url("../diabook-dark/icons/language.png");}
+
+
+.camera 	{ background-image: url("../diabook-dark/icons/camera.png"); 
+			  display: block; width: 28px; height: 28px; background-repeat: no-repeat;
+			  }
+.attach 	{ background-image: url("../diabook-dark/icons/attach.png"); 
+			  display: block; width: 28px; height: 28px; background-repeat: no-repeat;
+			  }
+.video2 	{ background-image: url("../diabook-dark/icons/video.png"); 
+			  display: block; width: 28px; height: 28px; background-repeat: no-repeat;
+			  }	
+.video 	{ background-image: url("../diabook-dark/icons/video.png"); 
+			  display: block; width: 100%; height: 140px; background-repeat: no-repeat;
+			  }
+.audio2 	{ background-image: url("../diabook-dark/icons/audio.png"); 
+			  display: block; width: 28px; height: 28px; background-repeat: no-repeat;
+			  }
+.audio 	{ background-image: url("../diabook-dark/icons/audio.png"); 
+			  display: block; width: 28px; height: 28px; background-repeat: no-repeat;
+			  }
+.weblink 	{ background-image: url("../diabook-dark/icons/weblink.png"); 
+			  display: block; width: 28px; height: 28px; background-repeat: no-repeat;
+			  }
+.globe 	{ background-image: url("../diabook-dark/icons/globe.png"); 
+			  display: block; width: 28px; height: 28px; background-repeat: no-repeat;
+			  }
+.unglobe 	{ background-image: url("../diabook-dark/icons/unglobe.png"); 
+			  display: block; width: 28px; height: 28px; background-repeat: no-repeat;
+			  }
+.edit    {background-image: url("../diabook-dark/icons/pencil2.png"); 
+			  display: block; width: 28px; height: 28px; background-repeat: no-repeat;}
+			  
+			  
+
+
+.article	{ background-position: -50px  0px;}
+/*.audio 		{ background-position: -70px  0px;}*/
+.block 		{ background-position: -90px  0px;}
+/*.drop 		{ background-position: -110px 0px;}*/
+/*.drophide 	{ background-position: -130px 0px;}*/
+/*.edit 		{ background-position: -150px 0px;}*/
+/*.camera 	{ background-position: -170px 0px;}*/
+/*.dislike 	{ background-position: -190px 0px;}*/
+/*.like 		{ background-position: -210px 0px;}*/
+/*.link 		{ background-position: -230px 0px;}*/
+
+/*.globe 		{ background-position: -50px  -20px;}*/
+/*.noglobe 	{ background-position: -70px  -20px;}*/
+.no 		{ background-position: -90px  -20px;}
+.pause 		{ background-position: -110px -20px;}
+.play 		{ background-position: -130px -20px;}
+/*.pencil 	{ background-position: -150px -20px;}*/
+.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;}*/
+
+/*.video          { background-position: -110px -40px;}*/
+.youtube        { background-position: -130px -40px;}
+
+/*.attach         { background-position: -190px -40px;}*/
+/*.language       { background-position: -210px -40px;}*/
+
+
+.icon.on             { background-image: url("../diabook-dark/icons/toogle_on.png"); background-repeat: no-repeat;}
+.icon.off            { background-image: url("../diabook-dark/icons/toogle_off.png"); background-repeat: no-repeat;}
+.prev           { background-position: -90px  -60px;}
+.next           { background-position: -110px -60px;}
+/*.tagged     { background-position: -130px -60px;}*/
+
+.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 0px; }
+.type-audio { background-position: -40px 0px; }
+.type-text  { background-position: -60px 0px; }
+.type-unkn  { background-position: -80px 0px; }
+
+.icon.drop, .icon.drophide {
+ float: left;
+}
+
+.icon {
+  display: block;
+  width: 20px;
+  height: 20px;
+  /*background-image: url('icons.png');*/
+}
+
+.icon {
+  background-color: transparent ;
+  background-repeat: no-repeat;
+  /* background-position: left center; */
+  display: block;
+  overflow: hidden;
+  text-indent: -9999px;
+  padding: 1px;
+}
+
+.icon.border.camera{
+  background-image: url("../diabook-dark/icons/camera.png"); 
+  display: block; width: 28px; height: 28px; background-repeat: no-repeat;
+	}
+	
+.icon.border.link{
+  background-image: url("../diabook-dark/icons/weblink.png"); 
+  display: block; width: 28px; height: 28px; background-repeat: no-repeat;
+  margin-left: 10px;
+	}
+
+.icon.text {
+  text-indent: 0px;
+}
+.icon.s10 {
+  min-width: 10px;
+  height: 10px;
+}
+.icon.s10.notify {
+  background-image: url("../../../../images/icons/10/notify_off.png");
+}
+.icon.s10.gear {
+  background-image: url("../../../../images/icons/10/gear.png");
+}
+.icon.s10.add {
+  background-image: url("../../../../images/icons/10/add.png");
+}
+.icon.s10.delete {
+  background-image: url("../../../../images/icons/10/delete.png");
+}
+.icon.s10.edit {
+  background-image: url("../../../../images/icons/10/edit.png");
+}
+.icon.s10.star {
+  background-image: url("../../../../images/star_dummy.png");
+}
+.icon.s10.menu {
+  background-image: url("../../../../images/icons/10/menu.png");
+}
+.icon.s10.link {
+  background-image: url("../../../../images/icons/10/link.png");
+}
+.icon.s10.lock {
+  background-image: url("../../../../images/icons/10/lock.png");
+}
+.icon.s10.unlock {
+  background-image: url("../../../../images/icons/10/unlock.png");
+}
+.icon.s10.text {
+  padding: 2px 0px 0px 15px;
+  font-size: 10px;
+}
+.icon.s16 {
+  min-width: 16px;
+  height: 16px;
+}
+.icon.s16.notify {
+  background-image: url("../../../../images/icons/16/notify_off.png");
+}
+.icon.s16.gear {
+  background-image: url("../../../../images/icons/16/gear.png");
+}
+.icon.s16.add {
+  background-image: url("../../../../images/icons/16/add.png");
+}
+.icon.s16.delete {
+  background-image: url("../../../../images/icons/16/delete.png");
+}
+/*.icon.s16.edit {
+  background-image: url("../../../../images/icons/16/edit.png");
+}*/
+.icon.s16.star {
+  background-image: url("../../../../images/star_dummy.png");
+}
+.icon.s16.menu {
+  background-image: url("../../../../images/icons/16/menu.png");
+}
+/*.icon.s16.link {
+  background-image: url("../../../../images/icons/16/link.png");
+}*/
+.icon.s16.lock {
+  background-image: url("../../../../images/icons/16/lock.png");
+}
+.icon.s16.unlock {
+  background-image: url("../../../../images/icons/16/unlock.png");
+}
+.icon.s16.text {
+  padding: 4px 0px 0px 20px;
+  font-size: 10px;
+}
+.icon.s22 {
+  min-width: 22px;
+  height: 22px;
+}
+.icon.s22.notify {
+  background-image: url("../../../../images/icons/22/notify_off.png");
+}
+.icon.s22.gear {
+  background-image: url("../../../../images/icons/22/gear.png");
+}
+.icon.s22.add {
+  background-image: url("../../../../images/icons/22/add.png");
+}
+.icon.s22.delete {
+  background-image: url("../../../../images/icons/22/delete.png");
+}
+.icon.s22.edit {
+  background-image: url("../../../../images/icons/22/edit.png");
+}
+.icon.s22.star {
+  background-image: url("../../../../images/star_dummy.png");
+}
+.icon.s22.menu {
+  background-image: url("../../../../images/icons/22/menu.png");
+}
+.icon.s22.link {
+  background-image: url("../../../../images/icons/22/link.png");
+}
+.icon.s22.lock {
+  background-image: url("../../../../images/icons/22/lock.png");
+}
+.icon.s22.unlock {
+  background-image: url("../../../../images/icons/22/unlock.png");
+}
+.icon.s22.text {
+  padding: 10px 0px 0px 25px;
+  width: 200px;
+}
+.icon.s48 {
+  width: 48px;
+  height: 48px;
+}
+.icon.s48.notify {
+  background-image: url("../../../../images/icons/48/notify_off.png");
+}
+.icon.s48.gear {
+  background-image: url("../../../../images/icons/48/gear.png");
+}
+.icon.s48.add {
+  background-image: url("../../../../images/icons/48/add.png");
+}
+.icon.s48.delete {
+  background-image: url("../../../../images/icons/48/delete.png");
+}
+.icon.s48.edit {
+  background-image: url("../../../../images/icons/48/edit.png");
+}
+.icon.s48.star {
+  background-image: url("../../../../images/star_dummy.png");
+}
+.icon.s48.menu {
+  background-image: url("../../../../images/icons/48/menu.png");
+}
+.icon.s48.link {
+  background-image: url("../../../../images/icons/48/link.png");
+}
+.icon.s48.lock {
+  background-image: url("../../../../images/icons/48/lock.png");
+}
+.icon.s48.unlock {
+  background-image: url("../../../../images/icons/48/unlock.png");
+}
+
+#contact-edit-links ul {
+  list-style: none;
+  list-style-type: none;
+}
+
+.hide-comments-outer {
+  margin-left: 80px;
+  margin-bottom: 1px;
+  width: 484px;
+  border-bottom: 1px solid #BDCDD4;
+  background-color: #fff;
+  padding: 8px;
+}
+
+/* global */
+body {
+  font-family: 'Lato', "Helvetica Neue", Helvetica, Arial, sans-serif;
+  font-size: 12.5px;
+  background-color: #2e2f2e;
+  color: #eec;
+  margin: 50px auto auto;
+  display: table;
+}
+
+h4 {
+  font-size: 1.1em;
+}
+
+a {
+	color: #88a9d2;
+	/* color: #3e3e8c; */
+	text-decoration: none;
+}
+a:hover {
+	/* color: blue; */
+	text-decoration: underline
+}
+
+.wall-item-name-link {
+/*  float: left;*/
+}
+
+.wall-item-photo {
+  width: 48px;
+  height: 48px;
+  overflow: hidden;
+  display: block;
+}
+
+.left {
+  float: left;
+}
+.right {
+  float: right;
+}
+.hidden {
+  display: none;
+}
+.clear {
+  clear: both;
+}
+.fakelink {
+  color: #1872A2;
+  /* color: #3e3e8c; */
+  text-decoration: none;
+  cursor: pointer;
+}
+.fakelink:hover {
+  /* color: blue; */
+  /*color: #005c94; */
+  text-decoration: underline;
+}
+code {
+  font-family: Courier, monospace;
+  white-space: pre;
+  display: block;
+  overflow: auto;
+  border: 1px solid #2e2f2e;
+  background: #EEE;
+  color: #2e2f2e;
+  padding: 10px;
+  margin-top: 20px;
+}
+#panel {
+  position: absolute;
+  width: 12em;
+  background: #2e2f2e;
+  color: #2e2f2e;
+  margin: 0px;
+  padding: 1em;
+  list-style: none;
+  border: 3px solid #364e59;
+  z-index: 100000;
+  -webkit-box-shadow: 0px 5px 10px rgba(0, 0, 0, 0.7);
+  -moz-box-shadow: 0px 5px 10px rgba(0, 0, 0, 0.7);
+  box-shadow: 0px 5px 10px rgba(0, 0, 0, 0.7);
+}
+/* tool */
+.tool {
+  height: auto;
+  overflow: auto;
+  padding: 3px;
+}
+#saved-search-ul .tool:hover,
+#nets-sidebar .tool:hover,
+#sidebar-group-list .tool:hover,
+#fileas-sidebar .tool:hover {
+	background: #308DBF;
+}
+.tool .label {
+  float: left;
+}
+.tool .action {
+  float: right;
+}
+.tool a {
+  color: ##3F8FBA;
+}
+.tool a:hover {
+  text-decoration: none;
+}
+/* popup notifications */
+div.jGrowl div.notice {
+  background: #511919 url("../../../../images/icons/48/notice.png") no-repeat 5px center;
+  color: #2e2f2e;
+  padding-left: 58px;
+}
+div.jGrowl div.info {
+  background: #364e59 url("../../../../images/icons/48/info.png") no-repeat 5px center;
+  color: #2e2f2e;
+  padding-left: 58px;
+}
+/* header */
+header {
+  position: fixed;
+  left: 0%;
+  right: 80%;
+  top: 0px;
+  margin: 0px;
+  padding: 0px;
+  width: 22%;
+  height: 32px;
+  background: #1d1f1d;
+  background-color: #1d1f1d;
+  z-index: 100;
+  border-bottom: 1px;
+  border-bottom-color: black;
+  border-bottom-style: inset;
+}
+header #site-location {
+  display: none;
+}
+header #banner {
+  overflow: hidden;
+  text-align: left;
+  width: 82%%;
+  margin-left: 25%;
+}
+header #banner a,
+header #banner a:active,
+header #banner a:visited,
+header #banner a:link,
+header #banner a:hover {
+  color: #2e2f2e;
+  text-decoration: none;
+  outline: none;
+  vertical-align: middle;
+ font-weight: bolder;
+  margin-left: 3px;
+}
+header #banner #logo-img {
+  height: 25px;
+  margin-top: 3px;
+}
+header #banner #logo-text {
+  font-size: 20px;
+  position: absolute;
+  top: 10%;
+}
+/* nav */
+nav {
+  width: 80%;
+  height: 32px;
+  position: fixed;
+  left: 22%;
+  top: 0px;
+  padding: 0px;
+  background: #1d1f1d;
+  color: #2e2f2e;
+  z-index: 99;
+  border-bottom: 1px;
+  border-bottom-color: black;
+  border-bottom-style: inset;
+}
+nav a,
+nav a:active,
+nav a:visited,
+nav a:link,
+nav a:hover {
+  color: #eec;
+  text-decoration: none;
+  outline: none;
+}
+nav #banner {
+  overflow: hidden;
+  /*text-align: center;*/
+  width: 100%;
+}
+nav #banner a,
+nav #banner a:active,
+nav #banner a:visited,
+nav #banner a:link,
+nav #banner a:hover {
+  color: #2e2f2e;
+  text-decoration: none;
+  outline: none;
+  vertical-align: bottom;
+}
+nav #banner #logo-img {
+  height: 22px;
+  margin-top: 5px;
+}
+nav #banner #logo-text {
+  font-size: 22px;
+}
+nav #navbar{
+	}
+nav ul {
+  margin: 0px;
+  padding: 0px 20px;
+}
+nav ul li {
+  list-style: none;
+  margin: 0px;
+  /* padding: 1px 1px 3px 1px; */
+  float: left;
+}
+nav ul li .menu-popup {
+  left: 0px;
+  right: auto;
+}
+
+nav #logo-img {
+  height: 25px;
+  margin-top: 4px;
+  margin-left: 30px;
+}
+
+nav #logo-text {
+    font-size: 22px;
+    margin-top: 3px;
+    margin-right: 15px;
+}
+nav .nav-menu-search {
+  position: relative;
+
+  margin: 4px 17px;
+  margin-right: 0px;
+  height: 17px;
+  width: 180px;
+  
+}
+
+nav #search-box #search-text {
+  background-image:  url('icons/lupe.png');
+  background-repeat:no-repeat;
+  padding-left:20px;
+  border-top-left-radius: 15px;
+border-top-right-radius: 15px;
+border-bottom-right-radius: 15px;
+border-bottom-left-radius: 15px;
+	}
+
+
+nav .nav-menu-icon {
+  position: relative;
+  height: 22px;
+  padding: 5px;
+  margin: 0px 5px;
+  -moz-border-radius: 5px 5px 0 0;
+  -webkit-border-radius: 5px 5px 0 0;
+  border-radius: 5px 5px 0 0;
+}
+nav .nav-menu-icon:hover {
+  background-color: #308dbf;  
+  position: relative;
+  height: 22px;
+  padding: 5px;
+  margin: 0px 5px;
+  -moz-border-radius: 5px 5px 0 0;
+  -webkit-border-radius: 5px 5px 0 0;
+  border-radius: 5px 5px 0 0;
+}
+
+nav .nav-menu-icon.selected {
+  background-color: #fff;
+}
+nav .nav-menu-icon img {
+  width: 22px;
+  height: 22px;
+}
+nav .nav-menu-icon .nav-notify {
+  top: 3px;
+}
+nav .nav-menu {
+  position: relative;
+  height: 16px;
+  padding: 5px;
+  margin: 3px 15px 0px;
+  font-size: 13px;
+  /*border-bottom: 3px solid #364A84;*/
+}
+nav .nav-menu.selected {
+  /*border-bottom: 3px solid #9eabb0;*/
+}
+nav .nav-notify {
+  display: none;
+  position: absolute;
+  background-color: #ff0000;
+  /* background-color: #19aeff; */
+  -moz-border-radius: 5px 5px 5px 5px;
+  -webkit-border-radius: 5px 5px 5px 5px;
+  border-radius: 5px 5px 5px 5px;
+  font-size: 10px;
+  font-weight: 900;
+  padding: 1px 4px;
+  top: 0px;
+  right: -6px;
+  min-width: 10px;
+  text-align: center;
+}
+nav .nav-notify.show {
+  display: block;
+}
+nav #nav-help-link,
+nav #nav-search-link,
+nav #nav-directory-link,
+nav #nav-apps-link,
+nav #nav-site-linkmenu, 
+nav #nav-home-link,
+nav #nav-user-linkmenu
+{
+  float: right;
+}
+nav #nav-user-linkmenu{
+	margin-right: 0px;
+	}
+nav #nav-home-link, #nav-directory-link, #nav-apps-link{
+	margin-left: 0px;
+	margin-right: 0px;
+	font-weight: bold;
+	margin: 3px 5px;
+	}
+nav #nav-directory-link{
+  margin-right: 0px;	
+	}
+nav #nav-home-link{
+  margin-left: 0px;	
+	}
+nav #nav-help-link .menu-popup,
+nav #nav-search-link .menu-popup,
+nav #nav-directory-link .menu-popup,
+nav #nav-apps-link .menu-popup,
+nav #nav-site-linkmenu .menu-popup {
+  right: 0px;
+  left: auto;
+}
+
+nav #nav-messages-linkmenu.on .icon.messages, nav #nav-messages-linkmenu.selected .icon.messages{
+	background-image: url("../diabook-dark/icons/messages2.png");
+	}
+	
+/*nav #nav-notifications-linkmenu.on .icon.notify,*/ nav #nav-notifications-linkmenu.selected .icon.notify{
+	background-image: url("../diabook-dark/icons/notify2.png");
+	}
+	
+nav #nav-contacts-linkmenu.on .icon.contacts, nav #nav-contacts-linkmenu.selected .icon.contacts{
+	background-image: url("../diabook-dark/icons/contacts2.png");
+	}
+	
+nav #nav-apps-link.selected {
+  background-color: #eec;
+}
+
+#nav-notifications-mark-all {
+	/* padding: 1px 1px 2px 26px; */
+	/* border-bottom: 1px solid #364E59; */
+	/* margin: 0px 0px 2px 0px;
+	padding: 5px 10px; */
+}
+
+#nav-notifications-see-all {
+	/* padding: 1px 1px 2px 26px; */
+	/* border-bottom: 1px solid #364E59; */
+	/* margin: 0px 0px 2px 0px;
+	padding: 5px 10px; */
+}
+
+.notify-seen {
+	background: none repeat scroll 0 0 #DDDDDD;
+	}
+
+ul.menu-popup {
+  position: absolute;
+  display: none;
+  width: 11em;
+  background: #2e2f2e;
+  color: #2e2f2e;
+  margin: 0px;
+  padding: 0px;
+  list-style: none;
+  z-index: 100000;
+  -webkit-box-shadow: 0px 5px 10px rgba(0, 0, 0, 0.7);
+  -moz-box-shadow: 0px 5px 10px rgba(0, 0, 0, 0.7);
+  box-shadow: 0px 5px 10px rgba(0, 0, 0, 0.7);
+}
+ul.menu-popup a {
+  display: block;
+  color: #eec;
+  padding: 5px 10px;
+  text-decoration: none;
+}
+ul.menu-popup a:hover {
+  background-color: #308DBF; /*bdcdd4;*/
+  color: #fff;
+}
+ul.menu-popup .menu-sep {
+  border-top: 1px solid #9eabb0;
+}
+ul.menu-popup li {
+  float: none;
+  overflow: auto;
+  height: auto;
+  display: block;
+}
+ul.menu-popup li img {
+  float: left;
+  width: 16px;
+  height: 16px;
+  padding-right: 5px;
+}
+ul.menu-popup .empty {
+  padding: 5px;
+  text-align: center;
+  color: #9eabb0;
+}
+/* autocomplete popup */
+.acpopup {
+  max-height: 150px;
+  background-color: #2e2f2e;
+  color: #2e2f2e;
+  border: 1px solid #MenuBorder;
+  overflow: auto;
+  z-index: 100000;
+  -webkit-box-shadow: 0px 5px 10px rgba(0, 0, 0, 0.7);
+  -moz-box-shadow: 0px 5px 10px rgba(0, 0, 0, 0.7);
+  box-shadow: 0px 5px 10px rgba(0, 0, 0, 0.7);
+}
+.acpopupitem {
+  color: #2e2f2e;
+  padding: 4px;
+  clear: left;
+}
+.acpopupitem img {
+  float: left;
+  margin-right: 4px;
+}
+.acpopupitem.selected {
+  background-color: #bdcdd4;
+}
+#nav-notifications-menu {
+  width: 400px;
+  max-height: 550px;
+  overflow: auto;
+}
+/* #nav-notifications-menu a {
+	display: inline;
+	padding: 5px 0px;
+	margin: 0px 0px 2px 0px;
+}
+#nav-notifications-menu li:hover {
+  background-color: #bdcdd4;
+}*/
+
+#nav-notifications-menu img {
+  float: left;
+  margin-right: 5px;
+}
+#nav-notifications-menu .contactname {
+  font-weight: bold;
+}
+#nav-notifications-menu .notif-when {
+  font-size: 10px;
+  color: #9eabb0;
+  display: block;
+}
+
+.notif-image {
+        width: 32px;
+        height: 32px;
+        padding: 7px 7px 0px 0px;
+}
+
+/*profile_side*/
+#profile_side {
+  margin-bottom: 30px;
+}
+#ps-usericon{
+	height: 25px	
+	}
+#ps-username{
+  font-size: 1.17em;
+  font-weight: bold;
+  color: #eec;
+  vertical-align: top;
+  position: absolute;
+  padding-top: 4px;
+  padding-left: 5px;	
+  word-wrap: break-word;
+  width: 130px;
+	}
+#ps-username:hover{
+  text-decoration: none;	
+	}
+.menu-profile-side{
+  list-style: none;	
+  padding-left: 0px;
+  min-height: 0px;
+	}
+.menu-profile-list{
+  height: auto;
+  overflow: auto;
+  min-height: 16px;
+  list-style: none;
+	}
+.menu-profile-list:hover{
+	background: #308DBF;
+	}
+.menu-profile-list-item{
+	padding-left: 5px;
+	vertical-align: middle;
+	}	
+.menu-profile-list-item:hover{	
+	text-decoration: none;
+	
+   }
+/*http://prothemedesign.com/circular-icons/*/
+.menu-profile-icon.home{
+	background: url("../diabook-dark/icons/home.png") no-repeat;
+	float: left;
+	height: 22px;
+   width: 22px;
+	}
+.menu-profile-icon.photos{
+	background: url("../diabook-dark/icons/mess_side.png") no-repeat;
+	float: left;
+	height: 22px;
+   width: 22px;}
+.menu-profile-icon.events{
+	background: url("../diabook-dark/icons/events.png") no-repeat;
+	float: left;
+	height: 22px;
+   width: 22px;}
+.menu-profile-icon.notes{
+	background: url("../diabook-dark/icons/notes.png") no-repeat;
+	float: left;
+	height: 22px;
+   width: 22px;}
+.menu-profile-icon.foren{
+	background: url("../diabook-dark/icons/pubgroups.png") no-repeat;
+	float: left;
+	height: 22px;
+   width: 22px;}
+.menu-profile-icon.com_side{
+	background: url("../diabook-dark/icons/com_side.png") no-repeat;
+	float: left;
+	height: 22px;
+   width: 22px;}
+.menu-profile-icon.pscontacts{
+	background: url("../diabook-dark/icons/pscontacts.png") no-repeat;
+	float: left;
+	height: 22px;
+   width: 22px;}
+/* aside */
+aside {
+  display: table-cell;
+  vertical-align: top;
+  width: 160px;
+  padding: 0px 10px 0px 10px;
+  border-right: 1px solid #D2D2D2;
+  float: left;
+  /* background: #F1F1F1; */
+}
+aside #page-sidebar{display: none;}
+aside .vcard .fn {
+  font-size: 18px;
+  font-weight: bold;
+  margin-bottom: 5px;
+}
+aside .vcard .title {
+  margin-bottom: 5px;
+}
+aside .vcard dl {
+  height: auto;
+  overflow: auto;
+}
+aside .vcard dt {
+  float: left;
+  margin-left: 0px;
+  /*width: 35%;*/
+  text-align: right;
+  color: #999999;
+}
+aside .vcard dd {
+  float: left;
+  margin-left: 5px;
+  /*width: 60%;*/
+}
+aside #profile-extra-links ul {
+  padding: 0px;
+  margin: 0px;
+}
+aside #profile-extra-links li {
+  padding: 0px;
+  margin: 0px;
+  list-style: none;
+}
+aside #dfrn-request-link {
+  display: block;
+  -moz-border-radius: 5px 5px 5px 5px;
+  -webkit-border-radius: 5px 5px 5px 5px;
+  border-radius: 5px 5px 5px 5px;
+  color: #2e2f2e;
+  background: #005c94 url('../../../../images/connect-bg.png') no-repeat left center;
+  font-weight: bold;
+  text-transform: uppercase;
+  padding: 4px 2px 2px 35px;
+}
+aside #dfrn-request-link:hover {
+  text-decoration: none;
+  background-color: #36c;
+  /* background-color: #19aeff; */
+}
+aside #profiles-menu {
+  width: 20em;
+}
+aside #search-text {
+	width: 150px;
+		height: 17px;
+		padding-left: 10px;
+	border-top-left-radius: 15px;
+border-top-right-radius: 15px;
+border-bottom-right-radius: 15px;
+border-bottom-left-radius: 15px;
+-moz-border-bottom-colors: #dbdbdb;
+  -moz-border-top-colors: #999;
+  -moz-border-left-colors: #999;
+  -moz-border-right-colors: #dbdbdb;
+}
+aside #side-follow-url {
+	width: 150px;
+	}
+aside #side-peoplefind-url {
+	width: 150px;
+	}
+#contact-block {
+  overflow: auto;
+  height: auto;
+}
+#contact-block .contact-block-h4 {
+  float: left;
+  margin: 5px 0px;
+}
+#contact-block .allcontact-link {
+  float: right;
+  margin: 5px 0px;
+}
+#contact-block .contact-block-content {
+  clear: both;
+  overflow: auto;
+  height: auto;
+}
+#contact-block .contact-block-link {
+  float: left;
+  margin: 0px 2px 2px 0px;
+}
+#contact-block .contact-block-link img {
+  widht: 55px;
+  height: 55px;
+}
+#lost-password-link {
+  float: left;
+  margin-right: 20px;	
+	}
+/* widget */
+.widget {
+  margin-bottom: 2em;
+  /*.action .s10 { width: 10px; overflow: hidden; padding: 0px;}
+	.action .s16 { width: 16px; overflow: hidden; padding: 0px;}*/
+/*  font-size: 12px; */
+}
+.widget h3 {
+  padding: 0px;
+  margin: 2px;
+}
+.widget .action {
+  opacity: 0.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;
+}
+.widget input.action {
+  opacity: 0.5;
+  -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;
+}
+.widget:hover .title .action {
+  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;
+}
+.widget .tool:hover .action {
+  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;
+}
+.widget .tool:hover .action.ticked {
+  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;
+}
+.widget ul {
+  padding: 0px;
+}
+.widget ul li {
+  padding-left: 16px;
+  min-height: 16px;
+  list-style: none;
+}
+#side-bar-photos-albums li{
+list-style-type: disc;
+}
+#side-bar-photos-albums ul li{
+  margin-left: 30px;
+  padding-left: 0px;
+	}
+#side-bar-photos-albums ul li a{
+  color: #1872A2;
+}
+.widget .tool.selected {
+  background: url("../diabook-dark/icons/selected.png") no-repeat left center;
+}
+/* widget: search */
+span.sbox_l  {
+	background: white url('../diabook/icons/srch_l.gif') no-repeat top left;
+	float: left;
+	width: 19px; height: 19px;
+	margin-left: 10px;
+	margin-top: 5px;
+	
+}
+
+span.sbox_r  {
+	background: white url('../diabook/icons/srch_r.gif') no-repeat top left;
+	float: left;
+	width: 19px; height: 19px;
+	margin-top: 5px;
+}
+
+span.sbox input {
+	background: white url('../diabook/icons/srch_bg.gif') repeat-x top left;
+	float: left;
+	margin-top: 5px;
+	border: 0;
+	height: 13px; width: 100px;
+	padding: 3px;
+	font: 11px/13px arial;
+	color: #000;
+}
+#add-search-popup {
+  width: 200px;
+  top: 18px;
+}
+/* section */
+section {
+  display: table-cell;
+  vertical-align: top;
+  width: auto;
+  padding: 0px 0px 0px 12px;
+}
+
+body .pageheader{
+  text-align: center;
+  font-size: 20px;
+  margin-bottom: 20px;
+  margin-top: 0px;
+  max-width: 575px;
+	}
+.qcomment{
+  max-width: 122px;	
+	}
+#id_username {
+  width: 173px;	
+	}
+#id_password {
+  width: 173px;		
+	}
+#id_openid_url {
+  width: 173px;	
+	}
+#contact-edit-end {
+	}
+.pager {
+   padding: 10px;
+	text-align: center;
+	font-size: 1.0em;
+	clear: both;
+	display: block;
+}	
+
+.tabs {
+    
+    background-position: 0 -20px;
+    background-repeat: repeat-x;
+    height: 27px;
+    padding: 0;
+ }
+.tab.button {
+    margin-left: 5px;	
+    /*background: none repeat scroll 0 0 #F8F8F8;*/
+    border: 1px solid #CCCCCC;
+    border-radius: 3px 3px 3px 3px;
+    font-weight: normal;
+    padding: 3px;
+    color:  #88a9d2;
+	}
+	
+#birthday-notice, #event-notice, #birthday-wrapper, #event-wrapper{
+	margin-bottom: 10px;
+	}
+
+right_aside {
+  display: table-cell;
+  vertical-align: top;
+  width: 170px;
+  
+  /*border-left: 1px solid #D2D2D2;*/
+  
+  /* background: #F1F1F1; */
+}
+right_aside a{color: #1872A2;}
+right_aside h3 {border-bottom: 1px solid #D2D2D2; padding-top: 5px; padding-bottom: 0px; padding-left: 9px; margin-bottom: 0px; 
+margin-top:30px;}
+right_aside .directory-item {	width: 50px; height: 50px; vertical-align: center; text-align: center; }
+right_aside .directory-photo { margin: 0px; }
+right_aside .directory-photo-img { max-width: 45px; max-height: 45px; }
+right_aside #likes { margin: 0px; padding: 0px; list-style: none; }
+right_aside .items-wrapper{ overflow: auto;	width: 100%; }
+right_aside #lastusers-wrapper { padding-left: 6px; padding-top: 3px; overflow: auto;	width: 100%; }
+right_aside #ra-photos-wrapper { padding-left: 5px; padding-top: 3px; overflow: auto;	width: 100%; }
+#page-sidebar-right_aside{margin-top: 0px; margin-bottom: 30px;}
+#page-sidebar-right_aside ul {margin-top: 0px;}
+#page-sidebar-right_aside .label {max-width: 128px;}
+right_aside .icon {width: 10px; height: 10px;}
+.close_box		{ 
+		background-image: url("../diabook-dark/icons/close_box.png");
+		float: right;
+		cursor: pointer;
+		opacity: 0.1;
+		}
+.close_box:hover	{ 
+		background-image: url("../diabook-dark/icons/close_box.png");
+		float: right;
+		cursor: pointer;
+		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;
+		}
+		
+/* wall item */
+.tread-wrapper {
+  border-bottom: 1px solid #D2D2D2;
+  position: relative;
+  padding: 5px;
+  margin-bottom: 0px;
+  width: 575px;
+  padding-top: 10px;
+}
+.tread-wrapper a{
+  color: #1872A2;
+}
+
+.wall-item-decor {
+  position: absolute;
+  left: 790px;
+  top: -10px;
+  width: 16px;
+}
+
+.wall-item-container {
+  display: table;
+  width: 580px;
+}
+
+
+.wall-item-container .wall-item-item, .wall-item-container .wall-item-bottom {
+  display: table-row;
+}
+
+.wall-item-bottom {
+  font-size: 13px;
+}
+.wall-item-container .wall-item-bottom {
+/*  opacity: 0.5;
+  -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; */
+}
+.wall-item-container:hover .wall-item-bottom {
+/*  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; */
+}
+.wall-item-container .wall-item-info {
+  display: table-cell;
+  vertical-align: top;
+  text-align: left;
+  width: 80px;
+}
+.wall-item-container .wall-item-location {
+  padding-right: 40px;
+  display: table-cell;
+}
+.wall-item-container .wall-item-ago {
+  word-wrap: break-word;
+  width: 50px;
+  margin-left: 10px;
+  color: #999;
+}
+.wall-item-location {
+  
+  clear: both;
+  overflow: hidden;
+  
+  margin-bottom: 5px;
+}
+
+.wall-item-container .wall-item-content {
+
+  max-width: 420px;
+  word-wrap: break-word;
+
+
+}
+
+.wall-item-container .wall-item-content img {
+  max-width: 400px; 
+
+}
+.wall-item-container .wall-item-links, .wall-item-container .wall-item-actions {
+  display: table-cell;
+  vertical-align: middle;
+}
+.wall-item-container .wall-item-links .icon, .wall-item-container .wall-item-actions .icon {
+  opacity: 0.5;
+  -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;
+}
+.wall-item-container .wall-item-links .icon:hover, .wall-item-container .wall-item-actions .icon: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;
+}
+.wall-item-container .wall-item-name {
+  font-weight: bold;
+}
+.wall-item-container .wall-item-actions-author {
+  width: 100%;
+  margin-bottom: 0.3em;
+}
+.wall-item-container .wall-item-actions-social {
+  float: left;
+  margin-bottom: 1px;
+  display: table-cell;
+}
+.wall-item-container .wall-item-actions-social a {
+  margin-right: 1em;
+}
+.wall-item-actions-social a {
+  float: left;
+}
+.wall-item-container .wall-item-actions-tools {
+  float: right;
+  width: 80px;
+  display: table-cell;
+}
+.wall-item-container .wall-item-actions-tools a {
+  float: right;
+}
+.wall-item-container .wall-item-actions-tools input {
+  float: right;
+}
+.wall-item-container.comment {
+  margin-top: 5px;
+  margin-bottom: 5px;
+  margin-left: 80px;
+  width: 500px;
+  border-bottom: 1px solid hsl(198, 21%, 79%);
+}
+.wall-item-container.comment .contact-photo {
+  width: 32px;
+  height: 32px;
+  margin-left: 16px;
+  /*background: url(../../../../images/icons/22/user.png) no-repeat center center;*/
+
+}
+.wall-item-container.comment {
+  top: 15px !important;
+  left: 15px !important;
+}
+.wall-item-container.comment .wall-item-links {
+  padding-left: 12px;
+}
+
+.wall-item-comment-wrapper {
+  margin: 1px 5px 5px 80px;
+  background-color: #fff;
+  width: 500px;
+}
+.wall-item-comment-wrapper .comment-edit-photo {
+  display: none;
+}
+.wall-item-comment-wrapper textarea {
+  height: 2.0em;
+  width: 100%;
+  font-size: 10px;
+  color: #999999;
+  border: 1px solid #DDD;
+  padding: 0.3em;
+  font-size: 14px;
+}
+.wall-item-comment-wrapper .comment-edit-text-full {
+  font-size: 14px;
+  height: 4em;
+  color: #2e2f2e;
+  border: 1px solid #2e2f2e;
+}
+.comment-edit-preview {
+  width: 500px;
+  margin-top: 10px;
+  background-color:  #fff797;
+}
+.comment-edit-preview .contact-photo {
+  width: 32px;
+  height: 32px;
+  margin-left: 16px;
+  /*background: url(../../../../images/icons/22/user.png) no-repeat center center;*/
+
+}
+.comment-edit-preview {
+  top: 15px !important;
+  left: 15px !important;
+}
+.comment-edit-preview .wall-item-links {
+  padding-left: 12px;
+}
+.comment-edit-preview .wall-item-container {
+  width: 700px;
+}
+.comment-edit-preview .tread-wrapper {
+  width: 700px;
+  padding: 0;
+  margin: 10px 0;
+}
+
+.shiny {
+  /* border-right: 10px solid #fce94f; */
+	border-right: 1px solid #A7C7F7;
+	padding-right: 12px;
+}
+
+#jot-preview-content{
+	margin-top: 30px;}
+	
+#jot-preview-content .tread-wrapper {
+  background-color: #fff797;
+}
+
+.wall-item-tags {
+  padding-top: 1px;
+  padding-bottom: 2px;
+}
+.tag {
+  /*background: url("../../../../images/tag_b.png") repeat-x center left;*/
+  color: #999;
+  padding-left: 3px;
+  font-size: 12px;
+}
+.tag a {
+  padding-right: 5px;
+  /*background: url("../../../../images/tag.png") no-repeat center right;*/
+  color: #999;
+}
+.wwto {
+  position: absolute !important;
+  width: 25px;
+  height: 25px;
+  background: #FFFFFF;
+  border: 2px solid #364e59;
+  height: 25px;
+  width: 25px;
+  overflow: hidden;
+  padding: 1px;
+  position: absolute !important;
+  top: 40px;
+  left: 30px;
+  -webkit-box-shadow: 0px 0px 10px rgba(0, 0, 0, 0.7);
+  -moz-box-shadow: 0px 0px 10px rgba(0, 0, 0, 0.7);
+  box-shadow: 0px 0px 10px rgba(0, 0, 0, 0.7);
+}
+.wwto .contact-photo {
+  width: auto;
+  height: 25px;
+}
+/* contacts menu */
+.contact-photo-wrapper {
+  position: relative;
+  width: 80px;
+}
+
+.contact-photo-wrapper.wwto {
+  width: 25px;
+}
+
+.contact-photo {
+  width: 48px;
+  height: 48px;
+  overflow: hidden;
+  display: block;
+}
+.contact-photo img {
+  width: 48px;
+  height: 48px;
+}
+
+.contact-wrapper {
+  float: left;
+  width: 90px;
+  height: 90px;
+  margin-bottom: 15px;
+}
+.contact-wrapper .contact-photo {
+  width: 80px;
+  height: 80px;
+}
+.contact-wrapper .contact-photo img {
+  width: 80px;
+  height: 80px;
+}
+.contact-wrapper {
+  left: 0px;
+  top: 63px;
+}
+.contact-photo {
+  width: 48px;
+  height: 48px;
+}
+.contact-photo img {
+  width: 48px;
+  height: 48px;
+}
+.contact-name {
+  /* text-align: center; */
+  /*font-weight: bold;*/
+  font-size: 12px;
+}
+.contact-details {
+  color: #999999;
+}
+/* editor */
+.jothidden {
+  display: none;
+}
+#jot {
+  width: 585px;
+  margin: 0px 2em 20px 0px;
+}
+#profile-jot-form #profile-jot-text {
+  height: 2.0em;
+  width: 99%;
+  font-size: 15px;
+  color: #999999;
+  border: 1px solid #DDD;
+  padding: 0.3em;
+  margin-bottom: 10px;
+}
+.grey
+{
+  display: inline;
+  float: right;	
+	}
+#jot #jot-tools {
+  margin: 0px;
+  padding: 0px;
+  height: 40px;
+  overflow: none;
+  width: 583px;
+  background-color: #fff;
+  border-bottom: 2px solid #9eabb0;
+}
+
+#jot #jot-tools li {
+  list-style: none;
+  float: left;
+  width: 80px;
+  height: 40px;
+  border-bottom: 2px solid #9eabb0;
+}
+#jot #jot-tools li a {
+  display: block;
+  color: #cccccc;
+  width: 100%;
+  height: 40px;
+  text-align: center;
+  line-height: 40px;
+  overflow: hidden;
+}
+#jot #jot-tools li:hover {
+  background-color: #364e59;
+  border-bottom: 2px solid #bdcdd4;
+}
+#jot #jot-tools li.perms {
+  float: right;
+  width: 40px;
+}
+#jot #jot-tools li.perms a.unlock {
+  width: 30px;
+  border-left: 10px solid #cccccc;
+  background-color: #cccccc;
+  background-position: left center;
+}
+#jot #jot-tools li.perms a.lock {
+  width: 30px;
+  border-left: 10px solid #666666;
+  background-color: #666666;
+}
+#jot #jot-tools li.submit {
+  float: right;
+  background-color: #cccccc;
+  border-bottom: 2px solid #cccccc;
+  border-right: 1px solid #666666;
+  border-left: 1px solid #666666;
+}
+#jot #jot-tools li.submit input {
+  border: 0px;
+  margin: 0px;
+  padding: 0px;
+  background-color: #cccccc;
+  color: #666666;
+  width: 80px;
+  height: 40px;
+  line-height: 40px;
+}
+#jot #jot-tools li.submit input:hover {
+  background-color: #bdcdd4;
+  color: #666666;
+}
+#jot #jot-tools li.loading {
+  float: right;
+  background-color: #2e2f2e;
+  width: 20px;
+  vertical-align: center;
+  text-align: center;
+  border-top: 2px solid #9eabb0;
+  height: 38px;
+}
+#jot #jot-tools li.loading img {
+  margin-top: 10px;
+}
+#profile-jot-form #jot-title {
+    
+  	 border-radius: 5px 5px 5px 5px;
+    font-weight: bold;
+    height: 20px;
+    margin: 0 0 5px;
+    width: 60%;
+    border: 1px solid #d2d2d2;
+}
+#profile-jot-form #jot-title:-webkit-input-placeholder {
+  font-weight: normal;
+}
+#profile-jot-form #jot-title:-moz-placeholder {
+  font-weight: normal;
+}
+#profile-jot-form #profile-jot-text_parent #profile-jot-text_tbl{
+	width: 585px;
+	height: 100px;
+	}
+#jot #jot-title:hover {
+  border: 1px solid #999999;
+}
+#jot #jot-title:focus {
+  border: 1px solid #999999;
+}
+#jot #character-counter {
+  width: 80px;
+  float: right;
+  text-align: right;
+  height: 20px;
+  line-height: 20px;
+  padding-right: 20px;
+}
+#jot-perms-icon, 
+#profile-location,
+#profile-nolocation,
+#profile-youtube, 
+#profile-video, 
+#profile-audio,
+#profile-link,
+#profile-title, 
+#wall-image-upload,
+#wall-file-upload,
+#wall-image-upload-div,
+#wall-file-upload-div,
+.hover, .focus {
+	cursor: pointer;
+	margin-top: 2px;
+}
+#profile-jot-wrapper{
+	margin: 0 2em 20px 0;
+   width: 585px;
+	}
+
+#profile-jot-submit-wrapper {
+	margin-bottom: 50px;
+	width: 585px;
+}
+
+#profile-jot-submit {
+	float: right;
+	margin-top: 2px;
+	font-size: 14px;
+}
+#profile-upload-wrapper {
+	float: left;
+	margin-top: 2px;
+	margin-left: 10px;
+	
+}
+#profile-attach-wrapper {
+	float: left;
+	margin-left: 15px;
+	margin-top: 2px;
+}
+#profile-rotator {
+	float: left;
+	margin-left: 30px;
+	margin-top: 2px;
+}
+#profile-link-wrapper {
+	float: left;
+	margin-left: 15px;
+	margin-top: 2px;
+}
+#profile-youtube-wrapper {
+	float: left;
+	margin-left: 15px;
+	margin-top: 2px;
+}
+#profile-video-wrapper {
+	float: left;
+	margin-left: 15px;
+	margin-top: 2px;
+}
+#profile-audio-wrapper {
+	float: left;
+	margin-left: 15px;
+	margin-top: 2px;
+}
+#profile-location-wrapper {
+	float: left;
+	margin-left: 15px;
+	margin-top: 2px;
+}
+#profile-jot-perms {
+	float: left;
+	margin-left: 45px;
+	margin-top: 2px;
+}
+#jot-preview-link {
+	float: right;
+	margin-left: 10px;
+	margin-top: 2px;
+	font-size: 9px;
+	font-weight: bolder;
+	cursor: pointer;
+}
+#profile-jot-perms{
+   float: right;
+	margin-left: 10px;
+	margin-top: 2px;	
+	}
+/** buttons **/
+.button.creation1 {
+    background-color: #fff;
+    border: 1px solid #777777;
+    border-radius: 3px 3px 3px 3px;
+    box-shadow: 0 1px 1px #CFCFCF;
+    cursor: pointer;
+    font-weight: bolder;
+}
+.button.creation2 {
+    background-color: #055580;
+    border: 1px solid #777777;
+    color: white;
+    border-radius: 3px 3px 3px 3px;
+    box-shadow: 0 1px 1px #CFCFCF;
+    margin-left: 5px;
+    cursor: pointer;
+    font-weight: bolder;
+}
+/*input[type="submit"] {
+	border: 0px;
+    background-color: @ButtonBackgroundColor;
+    color: @ButtonColor;
+    padding: 0px 10px;
+	.rounded(5px);
+    height: 18px;
+}*/
+/** acl **/
+#photo-edit-perms-select, #photos-upload-permissions-wrapper, #profile-jot-acl-wrapper {
+  display: block!important;
+}
+#acl-wrapper {
+  width: 690px;
+  float: left;
+}
+#acl-search {
+  float: right;
+  background: #2e2f2e url("../../../../images/search_18.png") no-repeat right center;
+  padding-right: 20px;
+}
+#acl-showall {
+  float: left;
+  display: block;
+  width: auto;
+  height: 18px;
+  background-color: #cccccc;
+  background-image: url("../../../../images/show_all_off.png");
+  background-position: 7px 7px;
+  background-repeat: no-repeat;
+  padding: 7px 5px 0px 30px;
+  color: #999999;
+  -moz-border-radius: 5px 5px 5px 5px;
+  -webkit-border-radius: 5px 5px 5px 5px;
+  border-radius: 5px 5px 5px 5px;
+}
+#acl-showall.selected {
+  color: #000000;
+  background-color: #ff9900;
+  background-image: url("../../../../images/show_all_on.png");
+}
+#acl-list {
+  height: 210px;
+  border: 1px solid #cccccc;
+  clear: both;
+  margin-top: 30px;
+  overflow: auto;
+}
+.acl-list-item {
+  display: block;
+  width: 150px;
+  height: 30px;
+  border: 1px solid #cccccc;
+  margin: 5px;
+  float: left;
+}
+.acl-list-item img {
+  width: 22px;
+  height: 22px;
+  float: left;
+  margin: 4px;
+}
+.acl-list-item p {
+  height: 12px;
+  font-size: 10px;
+  margin: 0px;
+  padding: 2px 0px 1px;
+  overflow: hidden;
+}
+.acl-list-item a {
+  font-size: 8px;
+  display: block;
+  width: 40px;
+  height: 10px;
+  float: left;
+  color: #999999;
+  background-color: #cccccc;
+  background-position: 3px 3px;
+  background-repeat: no-repeat;
+  margin-right: 5px;
+  -webkit-border-radius: 2px ;
+  -moz-border-radius: 2px;
+  border-radius: 2px;
+  padding-left: 15px;
+}
+#acl-wrapper a:hover {
+  text-decoration: none;
+  color: #000000;
+}
+.acl-button-show {
+  background-image: url("../../../../images/show_off.png");
+}
+.acl-button-hide {
+  background-image: url("../../../../images/hide_off.png");
+}
+.acl-button-show.selected {
+  color: #000000;
+  background-color: #9ade00;
+  background-image: url("../../../../images/show_on.png");
+}
+.acl-button-hide.selected {
+  color: #000000;
+  background-color: #ff4141;
+  background-image: url("../../../../images/hide_on.png");
+}
+.acl-list-item.groupshow {
+  border-color: #9ade00;
+}
+.acl-list-item.grouphide {
+  border-color: #ff4141;
+}
+/** /acl **/
+/** tab buttons 14618a**/
+ul.tabs {
+  list-style-type: none;
+  padding-bottom: 10px;
+  font-size: 13px;
+}
+ul.tabs li {
+  float: left;
+  margin-left: 5px;
+}
+ul.tabs li .active {
+    background-color: #055580;
+    border: 1px solid #777777;
+    color: white;
+    border-radius: 3px 3px 3px 3px;
+    box-shadow: 0 1px 1px #CFCFCF;
+    margin-left: 5px;
+}
+/**
+ * Form fields
+ */
+.field {
+  margin-bottom: 10px;
+  padding-bottom: 10px;
+  overflow: auto;
+  width: 100%;
+}
+.field label {
+  float: left;
+  width: 200px;
+}
+.field input, .field textarea {
+  width: 400px;
+}
+.field textarea {
+  height: 100px;
+}
+.field .field_help {
+  display: block;
+  margin-left: 200px;
+  color: #666666;
+}
+.field .onoff {
+  float: left;
+  width: 80px;
+}
+.field .onoff a {
+  display: block;
+  border: 1px solid #666666;
+  background-image: url("../../../../images/onoff.jpg");
+  background-repeat: no-repeat;
+  padding: 4px 2px 2px 2px;
+  height: 16px;
+  text-decoration: none;
+}
+.field .onoff .off {
+  border-color: #666666;
+  padding-left: 40px;
+  background-position: left center;
+  background-color: #cccccc;
+  color: #666666;
+  text-align: right;
+}
+.field .onoff .on {
+  border-color: #204A87;
+  padding-right: 40px;
+  background-position: right center;
+  background-color: #D7E3F1;
+  color: #204A87;
+  text-align: left;
+}
+.field .hidden {
+  display: none!important;
+}
+.field.radio .field_help {
+  margin-left: 0px;
+}
+#directory-search-form{
+	margin-bottom: 50px;
+	}
+#profile-edit-links-end {
+        clear: both;
+        margin-bottom: 15px;
+}
+
+#profile-edit-links ul { margin: 20px; padding-bottom: 20px; list-style: none; }
+
+#profile-edit-links li {
+  float: left;
+  list-style: none;
+  margin-left: 10px;
+}
+
+.profile-edit-side-div {
+  display: none;
+}
+
+#register-form label,
+#profile-edit-form label {
+        width: 300px; float: left;
+}
+
+.required {
+  display: inline;
+  color: #B20202;
+}
+
+/* oauth */
+.oauthapp {
+  height: auto;
+  overflow: auto;
+  border-bottom: 2px solid #cccccc;
+  padding-bottom: 1em;
+  margin-bottom: 1em;
+}
+.oauthapp img {
+  float: left;
+  width: 48px;
+  height: 48px;
+  margin: 10px;
+}
+.oauthapp img.noicon {
+  background-image: url("../../../../images/icons/48/plugin.png");
+  background-position: center center;
+  background-repeat: no-repeat;
+}
+.oauthapp a {
+  float: left;
+}
+/* contacts */
+.contact-entry-wrapper {
+  width: 120px;
+  height: 120px;
+  float: left;
+}
+/* photo */
+.photo {
+box-shadow: 2px 2px 5px 0px #000000;
+margin: 0px;
+border-radius: 10px;
+height: 145px !important;
+width: 145px !important;
+}
+.lframe {
+  float: left;
+  /*margin: 0px 10px 10px 0px;*/
+}
+/* profile match wrapper */
+.profile-match-wrapper {
+  float: left;
+  width: 90px;
+  height: 90px;
+  margin-bottom: 20px;
+}
+.profile-match-wrapper .contact-photo {
+  width: 80px;
+  height: 80px;
+}
+.profile-match-wrapper .contact-photo img {
+  width: 80px;
+  height: 80px;
+}
+.profile-match-wrapper {
+  left: 0px;
+  top: 63px;
+}
+
+.contact-photo-menu-button {
+        position: relative;
+        background-image: url("../../../../images/icons/16/menu.png");
+        background-position: top left; 
+        background-repeat: no-repeat;
+        margin: 0px 0px -16px 0px; 
+	padding: 0px;
+        width: 16px;
+        height: 16px;
+        top: -20px; left:0px;
+        overflow: hidden;
+        text-indent: 40px;
+        display: none;
+        
+}
+.contact-photo-menu {
+        width: 11em;
+        border: 3px solid #364e59;
+	color: #2e2f2e;
+        background: #FFFFFF;
+/*        position: absolute;*/
+        position: relative;
+        left: 0px; top: 0px;
+        display: none;
+        z-index: 10000;
+}
+.contact-photo-menu ul { margin:0px; padding: 0px; list-style: none }
+.contact-photo-menu li a {
+	display: block; 
+	padding: 5px 10px; 
+	color: #2e2f2e;
+	text-decoration: none;
+}
+.contact-photo-menu li a:hover {
+	background-color: #bdcdd4; 
+}
+
+/* page footer */
+footer {
+  height: 100px;
+  display: table-row;
+}
+
+blockquote {
+    border-left: 1px solid #D2D2D2;
+    padding-left: 9px;
+    margin: 0 0 0 .8ex;
+	 color: #777;
+}
+.oembed {
+	
+	font-weight: bold;
+}
+.aprofile dt{
+box-shadow: 1px 1px 5px 0;
+    color: #666666;
+    margin: 15px 0 5px;
+    padding-left: 5px;	
+	}
+/* ================== */
+/* = Contacts Block = */
+/* ================== */
+
+.contact-block-img {
+        width: 55px;
+        height: 55px;
+        padding-right: 3px;
+}
+.contact-block-div {
+        float: left;
+}
+
+.contact-block-textdiv { width: 150px; height: 34px; float: left; }
+#contact-block-end { clear: both; } 
+
+#group-edit-wrapper {
+        margin-bottom: 10px;
+}
+
+#group-members-end {
+        clear: both;
+}
+#group-edit-desc {
+ margin-top: 15px;
+}
+
+/*
+#group-separator,
+#prof-separator { display: none;}
+*/
+#prof-members-end{
+	clear: both;
+	}
+
+#prvmail-to-label, #prvmail-subject-label, #prvmail-message-label {
+	margin-bottom: 10px;
+	margin-top: 20px;
+}
+
+#prvmail-submit {
+	float: right;
+	margin-top: 10px;
+}
+
+#prvmail-subject
+{
+background: none repeat scroll 0 0 #FFFFFF;
+border: 1px solid #CCCCCC;
+border-radius: 5px 5px 5px 5px;
+font-weight: bold;
+height: 20px;
+margin: 0 0 5px;
+vertical-align: middle;
+}
+#prvmail-form{
+ width: 597px;	
+	}
+	
+#prvmail-upload-wrapper,
+#prvmail-link-wrapper,
+#prvmail-rotator-wrapper {
+	float: left;
+	margin-top: 10px;
+	margin-right: 10px;
+	width: 24px;
+}
+
+#prvmail-end {
+	clear: both;
+}
+
+.mail-list-sender,
+.mail-list-detail {
+	float: left;
+}
+.mail-list-detail {
+	margin-left: 20px;
+}
+
+.mail-list-subject {
+	font-size: 1.1em;
+	margin-top: 10px;
+}
+a.mail-list-link {
+    display: block;
+    font-size: 1.3em;
+    padding: 4px 0;
+}
+
+/*
+*a.mail-list-link:hover {
+*	background-color: #15607B;
+*	color: #F5F6FB;
+*}
+*/
+
+.mail-list-outside-wrapper-end {
+	clear: both;
+}
+
+.mail-list-outside-wrapper {
+	margin-top: 30px;
+}
+
+.mail-list-delete-wrapper {
+	float: right;
+	margin-right: 30px;
+	margin-top: 15px;
+}
+
+.mail-list-delete-icon {
+	border: none;
+}
+
+.mail-conv-sender,
+.mail-conv-detail {
+	float: left;
+}
+.mail-conv-detail {
+	margin-left: 20px;
+	width: 500px;
+}
+
+.mail-conv-subject {
+    font-size: 1.4em;
+    margin: 10px 0;
+}
+
+.mail-conv-outside-wrapper-end {
+	clear: both;
+}
+
+.mail-conv-outside-wrapper {
+	margin-top: 30px;
+}
+
+.mail-conv-delete-wrapper {
+	float: right;
+	margin-right: 30px;
+	margin-top: 15px;
+}
+.mail-conv-break {
+	clear: both;
+}
+
+.mail-conv-delete-icon {
+	border: none;
+}
+
+/* ========== */
+/* = Events = */
+/* ========== */
+.eventcal {
+        float: left;
+        font-size: 20px;
+}
+
+.vevent {
+
+}
+.vevent .event-description, .vevent .event-location {
+        margin-left: 10px;
+        margin-right: 10px;
+}
+.vevent .event-start {
+        margin-left: 10px;
+        margin-right: 10px;
+}
+
+#new-event-link {
+        margin-bottom: 10px;
+}
+
+.edit-event-link, .plink-event-link {
+        float: left;
+        margin-top: 4px;
+        margin-right: 4px;
+        margin-bottom: 15px;
+}
+
+.event-description:before {
+        content: url('../../../../images/calendar.png');
+        margin-right: 15px;
+}
+
+.event-start, .event-end {
+        margin-left: 10px;
+        width: 330px;
+        clear: both;
+}
+
+.event-start .dtstart, .event-end .dtend {
+        float: right;
+}
+
+.event-list-date {
+        margin-bottom: 10px;
+}
+
+.prevcal, .nextcal {
+        float: left;
+        margin-left: 32px;
+        margin-right: 32px;
+        margin-top: 64px;
+}
+.event-calendar-end {
+        clear: both;
+}
+
+ 
+.calendar {
+        font-family: Courier, monospace;
+}
+.calendar.eventcal a {
+  color: #1872A2;	
+	}
+.today {
+        font-weight: bold;
+        color: #FF0000;
+}
+
+.settings-block {
+        border: 1px solid #AAA;
+        margin: 10px;
+        padding: 10px;
+}
+
+.app-title {
+        margin: 10px;
+}
+
+#identity-manage-desc {
+        margin-top:15px;
+        margin-bottom: 15px;
+}
+
+#identity-manage-choose {
+        margin-bottom: 15px;
+}
+
+#identity-submit {
+        margin-top: 20px;
+}
+
+#photo-prev-link, #photo-next-link {
+        padding: 10px;
+        float: left;
+}
+.lightbox{
+	float: left;
+	}
+
+#photo-photo {
+        float: left;
+}
+#photo-like-div .wall-item-like-buttons {
+	 float: left;
+    margin-right: 5px;
+    margin-top: 30px;
+	}
+.comment-edit-text-empty {
+    margin: 10px 0 0;
+    width: 85%;
+}
+.comment-edit-photo {
+    margin: 10px 0 0;
+}
+.wall-item-like-buttons .icon.like {
+float: left;
+}
+
+#photo-photo-end {
+        clear: both;
+}
+
+.tabs .comment-wwedit-wrapper {
+	display: block;
+   margin-top: 30px;
+   margin-left: 50px;
+	}
+
+.profile-match-photo {
+        float: left;
+        text-align: center;
+        width: 120px;
+}
+
+.profile-match-name {
+        float: left;
+        text-align: center;
+        width: 120px;
+        overflow: hidden;
+}
+
+.profile-match-break,
+.profile-match-end {
+        clear: both;
+}
+
+.profile-match-connect {
+        text-align: center;
+        font-weight: bold;
+}
+
+.profile-match-wrapper {
+        float: left;
+        padding: 10px;
+        width: 120px;
+        height: 120px;
+        scroll: auto;
+}
+#profile-match-wrapper-end {
+        clear: both;
+}
+
+/* ============= */
+/* = Directory = */
+/* ============= */
+/* contacts menu */
+.contact-photo-wrapper {
+  position: relative;
+}
+.contact-photo {
+  width: 48px;
+  height: 48px;
+  overflow: hidden;
+  display: block;
+}
+.contact-photo img {
+  width: 48px;
+  height: 48px;
+}
+.contact-photo-menu-button {
+  display: none;
+  /* position: absolute; */
+  /* position: absolute; */
+  left: 0px;
+  top: -16px;
+}
+.contact-wrapper {
+  float: left;
+  width: 90px;
+  height: 90px;
+  margin-bottom: 15px;
+}
+.contact-wrapper .contact-photo {
+  width: 80px;
+  height: 80px;
+}
+.contact-wrapper .contact-photo img {
+  width: 80px;
+  height: 80px;
+}
+.contact-wrapper .contact-photo-menu-button {
+  left: 0px;
+  top: 63px;
+}
+.directory-item {
+  float: left;
+  width: 200px;
+  height: 200px;
+}
+.directory-item .contact-photo {
+  width: 175px;
+  height: 175px;
+}
+.directory-item .contact-photo img {
+  width: 175px;
+  height: 175px;
+}
+.contact-name {
+  text-align: left;
+  font-weight: bold;
+  font-size: 12px;
+}
+.contact-details {
+  color: #999999;
+}
+#side-bar-photos-albums li{
+list-style-type: disc;
+}
+#side-bar-photos-albums ul li{
+  margin-left: 30px;
+  padding-left: 0px;
+	}
+#side-bar-photos-albums{
+	margin-top: 15px;	
+	}
+.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-album-image-wrapper, .photo-top-image-wrapper {
+  float: left;
+   -moz-box-shadow: 0 0 5px #888;
+   -webkit-box-shadow: 0 0 5px #888;
+   box-shadow: 0 0 5px #888;
+  background-color: #000;
+   -webkit-border-radius: 5px;
+   -moz-border-radius: 5px;
+  border-radius: 5px;
+  padding-bottom: 20px;
+  position: relative;
+  margin: 0 10px 10px 0;
+  width: 200px; height: 140px;
+  overflow: hidden;  
+}
+.photo-top-album-name {
+        width: 100%;
+        position: absolute; 
+        bottom: 0px; 
+        padding-left: 3px;
+        background-color: #EEE;
+}
+.photo-top-album-link{
+  color: #1872A2;
+	}
+.photo-top-album-img{
+	
+	}
+/*.photo-top-image-wrapper {
+        position: relative;
+        float: left;
+        margin-top: 15px;
+        margin-right: 15px;
+        width: 200px; height: 200px; 
+        overflow: hidden; 
+}
+.photo-top-album-name {
+        width: 100%;
+        min-height: 2em;
+        position: absolute; 
+        bottom: 0px; 
+        padding: 0px 3px;
+        padding-top: 0.5em;
+        background-color: rgb(255, 255, 255);
+}*/
+#photo-top-end {
+        clear: both;
+}
+
+#photo-top-links {
+        margin-bottom: 30px;
+        margin-left: 30px;
+}
+
+#photos-upload-newalbum-div {
+        float: left;
+        width: 175px;
+}
+
diff --git a/view/theme/diabook/diabook-dark/style-profile-wide.css b/view/theme/diabook/diabook-dark/style-profile-wide.css
new file mode 100644
index 000000000..ad6b7ca21
--- /dev/null
+++ b/view/theme/diabook/diabook-dark/style-profile-wide.css
@@ -0,0 +1,2606 @@
+/**
+ * Fabio Comuni <http://kirgroup.com/profile/fabrixxm>
+ * Additional Changes: Michael Vogel <icarus@dabo.de>
+ **/
+
+/* ========= */
+/* = Admin = */
+/* ========= */
+
+#adminpage {
+/*        width: 80%;*/
+}
+
+#pending-update {
+        float:right;
+        color: #ffffff;
+        font-weight: bold;
+        background-color: #FF0000;
+        padding: 0em 0.3em;
+}
+
+.admin.linklist {
+        border: 0px; padding: 0px;
+}
+
+.admin.link {
+        list-style-position: inside;
+        font-size: 1em;
+        padding: 5px;
+        width: 100px;
+        margin: 5px;
+}
+
+#adminpage dl {
+        clear: left;
+        margin-bottom: 2px;
+        padding-bottom: 2px;
+        border-bottom: 1px solid black;
+}
+
+#adminpage dt {
+        width: 200px;
+        float: left;
+        font-weight: bold;
+}
+
+#adminpage dd {
+        margin-left: 200px;
+}
+#adminpage h3 {
+        border-bottom: 1px solid #898989;
+        margin-bottom: 5px;
+        margin-top: 10px;
+}
+
+#adminpage .submit {
+        clear:left;
+}
+
+#adminpage #pluginslist {
+        margin: 0px; padding: 0px;
+}
+
+#adminpage .plugin {
+        list-style: none;
+        display: block;
+	/* border: 1px solid #888888; */
+        padding: 1em;
+        margin-bottom: 5px;
+        clear: left;
+}
+
+#adminpage .toggleplugin {
+        float:left;
+        margin-right: 1em;
+}
+
+#adminpage table {width:100%; border-bottom: 1p solid #000000; margin: 5px 0px;}
+#adminpage table th { text-align: left;}
+#adminpage td .icon { float: left;}
+#adminpage table#users img { width: 16px; height: 16px; }
+#adminpage table tr:hover { background-color: #eeeeee; }
+#adminpage .selectall { text-align: right; }
+/* icons */
+
+.icon.contacts {
+  background-image: url("../diabook-blue/icons/contacts.png");}
+.icon.notifications {
+  background-image: url("../diabook-blue/icons/notifications.png");}
+.icon.notify {
+  background-image: url("../diabook-blue/icons/notify.png");}
+.icon.messages {
+  background-image: url("../diabook-blue/icons/messages.png");}
+.icon.community {
+  background-image: url("../diabook-blue/icons/community.png");}
+  
+.icon.drop 	{ background-image: url("../diabook-blue/icons/drop.png");}
+.icon.drophide 	{ background-image: url("../diabook-blue/icons/drop.png");}
+.icon.dislike 	{ background-image: url("../diabook-blue/icons/dislike.png");}
+.icon.like 	{ background-image: url("../diabook-blue/icons/like.png");}
+.icon.pencil 	{ background-image: url("../diabook-blue/icons/pencil.png");}
+.icon.recycle 	{ background-image: url("../diabook-blue/icons/recycle.png");}
+.icon.remote-link { background-image: url("../diabook-blue/icons/remote.png");}
+.icon.tagged    { background-image: url("../diabook-blue/icons/tagged.png");}
+.icon.file-as { background-image: url("../diabook-blue/icons/file_as.png");}
+.star-item.icon.unstarred { background-image: url("../diabook-blue/icons/unstarred.png");}
+.star-item.icon.starred { background-image: url("../diabook-blue/icons/starred.png");}
+.icon.link		{ background-image: url("../diabook-blue/icons/link.png");}
+.icon.lock		{ background-image: url("../diabook-blue/icons/lock.png");}
+.icon.unlock		{ background-image: url("../diabook-blue/icons/unlock.png");}
+.icon.language    { background-image: url("../diabook-blue/icons/language.png");}
+
+
+.camera 	{ background-image: url("../diabook-blue/icons/camera.png"); 
+			  display: block; width: 28px; height: 28px; background-repeat: no-repeat;
+			  }
+.attach 	{ background-image: url("../diabook-blue/icons/attach.png"); 
+			  display: block; width: 28px; height: 28px; background-repeat: no-repeat;
+			  }
+.video2 	{ background-image: url("../diabook-blue/icons/video.png"); 
+			  display: block; width: 28px; height: 28px; background-repeat: no-repeat;
+			  }	
+.video 	{ background-image: url("../diabook-blue/icons/video.png"); 
+			  display: block; width: 100%; height: 140px; background-repeat: no-repeat;
+			  }
+.audio2 	{ background-image: url("../diabook-blue/icons/audio.png"); 
+			  display: block; width: 28px; height: 28px; background-repeat: no-repeat;
+			  }
+.audio 	{ background-image: url("../diabook-blue/icons/audio.png"); 
+			  display: block; width: 28px; height: 28px; background-repeat: no-repeat;
+			  }
+.weblink 	{ background-image: url("../diabook-blue/icons/weblink.png"); 
+			  display: block; width: 28px; height: 28px; background-repeat: no-repeat;
+			  }
+.globe 	{ background-image: url("../diabook-blue/icons/globe.png"); 
+			  display: block; width: 28px; height: 28px; background-repeat: no-repeat;
+			  }
+.unglobe 	{ background-image: url("../diabook-blue/icons/unglobe.png"); 
+			  display: block; width: 28px; height: 28px; background-repeat: no-repeat;
+			  }
+.edit    {background-image: url("../diabook-blue/icons/pencil2.png"); 
+			  display: block; width: 28px; height: 28px; background-repeat: no-repeat;}
+			  
+			  
+
+
+.article	{ background-position: -50px  0px;}
+/*.audio 		{ background-position: -70px  0px;}*/
+.block 		{ background-position: -90px  0px;}
+/*.drop 		{ background-position: -110px 0px;}*/
+/*.drophide 	{ background-position: -130px 0px;}*/
+/*.edit 		{ background-position: -150px 0px;}*/
+/*.camera 	{ background-position: -170px 0px;}*/
+/*.dislike 	{ background-position: -190px 0px;}*/
+/*.like 		{ background-position: -210px 0px;}*/
+/*.link 		{ background-position: -230px 0px;}*/
+
+/*.globe 		{ background-position: -50px  -20px;}*/
+/*.noglobe 	{ background-position: -70px  -20px;}*/
+.no 		{ background-position: -90px  -20px;}
+.pause 		{ background-position: -110px -20px;}
+.play 		{ background-position: -130px -20px;}
+/*.pencil 	{ background-position: -150px -20px;}*/
+.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;}*/
+
+/*.video          { background-position: -110px -40px;}*/
+.youtube        { background-position: -130px -40px;}
+
+/*.attach         { background-position: -190px -40px;}*/
+/*.language       { background-position: -210px -40px;}*/
+
+
+.icon.on             { background-image: url("../diabook-blue/icons/toogle_on.png"); background-repeat: no-repeat;}
+.icon.off            { background-image: url("../diabook-blue/icons/toogle_off.png"); background-repeat: no-repeat;}
+.prev           { background-position: -90px  -60px;}
+.next           { background-position: -110px -60px;}
+/*.tagged     { background-position: -130px -60px;}*/
+
+.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 0px; }
+.type-audio { background-position: -40px 0px; }
+.type-text  { background-position: -60px 0px; }
+.type-unkn  { background-position: -80px 0px; }
+
+.icon.drop, .icon.drophide {
+ float: left;
+}
+
+.icon {
+  display: block;
+  width: 20px;
+  height: 20px;
+  /*background-image: url('icons.png');*/
+}
+
+.icon {
+  background-color: transparent ;
+  background-repeat: no-repeat;
+  /* background-position: left center; */
+  display: block;
+  overflow: hidden;
+  text-indent: -9999px;
+  padding: 1px;
+}
+
+.icon.border.camera{
+  background-image: url("../diabook-blue/icons/camera.png"); 
+  display: block; width: 28px; height: 28px; background-repeat: no-repeat;
+	}
+	
+.icon.border.link{
+  background-image: url("../diabook-blue/icons/weblink.png"); 
+  display: block; width: 28px; height: 28px; background-repeat: no-repeat;
+  margin-left: 10px;
+	}
+
+.icon.text {
+  text-indent: 0px;
+}
+.icon.s10 {
+  min-width: 10px;
+  height: 10px;
+}
+.icon.s10.notify {
+  background-image: url("../../../../images/icons/10/notify_off.png");
+}
+.icon.s10.gear {
+  background-image: url("../../../../images/icons/10/gear.png");
+}
+.icon.s10.add {
+  background-image: url("../../../../images/icons/10/add.png");
+}
+.icon.s10.delete {
+  background-image: url("../../../../images/icons/10/delete.png");
+}
+.icon.s10.edit {
+  background-image: url("../../../../images/icons/10/edit.png");
+}
+.icon.s10.star {
+  background-image: url("../../../../images/star_dummy.png");
+}
+.icon.s10.menu {
+  background-image: url("../../../../images/icons/10/menu.png");
+}
+.icon.s10.link {
+  background-image: url("../../../../images/icons/10/link.png");
+}
+.icon.s10.lock {
+  background-image: url("../../../../images/icons/10/lock.png");
+}
+.icon.s10.unlock {
+  background-image: url("../../../../images/icons/10/unlock.png");
+}
+.icon.s10.text {
+  padding: 2px 0px 0px 15px;
+  font-size: 10px;
+}
+.icon.s16 {
+  min-width: 16px;
+  height: 16px;
+}
+.icon.s16.notify {
+  background-image: url("../../../../images/icons/16/notify_off.png");
+}
+.icon.s16.gear {
+  background-image: url("../../../../images/icons/16/gear.png");
+}
+.icon.s16.add {
+  background-image: url("../../../../images/icons/16/add.png");
+}
+.icon.s16.delete {
+  background-image: url("../../../../images/icons/16/delete.png");
+}
+/*.icon.s16.edit {
+  background-image: url("../../../../images/icons/16/edit.png");
+}*/
+.icon.s16.star {
+  background-image: url("../../../../images/star_dummy.png");
+}
+.icon.s16.menu {
+  background-image: url("../../../../images/icons/16/menu.png");
+}
+/*.icon.s16.link {
+  background-image: url("../../../../images/icons/16/link.png");
+}*/
+.icon.s16.lock {
+  background-image: url("../../../../images/icons/16/lock.png");
+}
+.icon.s16.unlock {
+  background-image: url("../../../../images/icons/16/unlock.png");
+}
+.icon.s16.text {
+  padding: 4px 0px 0px 20px;
+  font-size: 10px;
+}
+.icon.s22 {
+  min-width: 22px;
+  height: 22px;
+}
+.icon.s22.notify {
+  background-image: url("../../../../images/icons/22/notify_off.png");
+}
+.icon.s22.gear {
+  background-image: url("../../../../images/icons/22/gear.png");
+}
+.icon.s22.add {
+  background-image: url("../../../../images/icons/22/add.png");
+}
+.icon.s22.delete {
+  background-image: url("../../../../images/icons/22/delete.png");
+}
+.icon.s22.edit {
+  background-image: url("../../../../images/icons/22/edit.png");
+}
+.icon.s22.star {
+  background-image: url("../../../../images/star_dummy.png");
+}
+.icon.s22.menu {
+  background-image: url("../../../../images/icons/22/menu.png");
+}
+.icon.s22.link {
+  background-image: url("../../../../images/icons/22/link.png");
+}
+.icon.s22.lock {
+  background-image: url("../../../../images/icons/22/lock.png");
+}
+.icon.s22.unlock {
+  background-image: url("../../../../images/icons/22/unlock.png");
+}
+.icon.s22.text {
+  padding: 10px 0px 0px 25px;
+  width: 200px;
+}
+.icon.s48 {
+  width: 48px;
+  height: 48px;
+}
+.icon.s48.notify {
+  background-image: url("../../../../images/icons/48/notify_off.png");
+}
+.icon.s48.gear {
+  background-image: url("../../../../images/icons/48/gear.png");
+}
+.icon.s48.add {
+  background-image: url("../../../../images/icons/48/add.png");
+}
+.icon.s48.delete {
+  background-image: url("../../../../images/icons/48/delete.png");
+}
+.icon.s48.edit {
+  background-image: url("../../../../images/icons/48/edit.png");
+}
+.icon.s48.star {
+  background-image: url("../../../../images/star_dummy.png");
+}
+.icon.s48.menu {
+  background-image: url("../../../../images/icons/48/menu.png");
+}
+.icon.s48.link {
+  background-image: url("../../../../images/icons/48/link.png");
+}
+.icon.s48.lock {
+  background-image: url("../../../../images/icons/48/lock.png");
+}
+.icon.s48.unlock {
+  background-image: url("../../../../images/icons/48/unlock.png");
+}
+
+#contact-edit-links ul {
+  list-style: none;
+  list-style-type: none;
+}
+
+.hide-comments-outer {
+  margin-left: 80px;
+  margin-bottom: 5px;
+  width: 675px;
+  border-bottom: 1px solid #BDCDD4;
+  border-top: 1px solid #BDCDD4;
+
+  padding: 8px;
+}
+
+/* global */
+body {
+  font-family: 'Lato', "Helvetica Neue", Helvetica, Arial, sans-serif;
+  font-size: 13px;
+  background-color: #ffffff;
+  color: #2d2d2d;
+  margin: 50px auto auto;
+  display: table;
+}
+
+h4 {
+  font-size: 1.1em;
+}
+
+a {
+	color: #333333;
+	/* color: #3e3e8c; */
+	text-decoration: none;
+}
+a:hover {
+	/* color: blue; */
+	text-decoration: underline
+}
+
+.wall-item-name-link {
+/*  float: left;*/
+}
+
+.wall-item-photo {
+  width: 48px;
+  height: 48px;
+  overflow: hidden;
+  display: block;
+}
+
+.left {
+  float: left;
+}
+.right {
+  float: right;
+}
+.hidden {
+  display: none;
+}
+.clear {
+  clear: both;
+}
+.fakelink {
+  color: #1872A2;
+  /* color: #3e3e8c; */
+  text-decoration: none;
+  cursor: pointer;
+}
+.fakelink:hover {
+  /* color: blue; */
+  /*color: #005c94; */
+  text-decoration: underline;
+}
+code {
+  font-family: Courier, monospace;
+  white-space: pre;
+  display: block;
+  overflow: auto;
+  border: 1px solid #444;
+  background: #EEE;
+  color: #444;
+  padding: 10px;
+  margin-top: 20px;
+}
+#panel {
+  position: absolute;
+  width: 12em;
+  background: #ffffff;
+  color: #2d2d2d;
+  margin: 0px;
+  padding: 1em;
+  list-style: none;
+  border: 3px solid #364e59;
+  z-index: 100000;
+  -webkit-box-shadow: 0px 5px 10px rgba(0, 0, 0, 0.7);
+  -moz-box-shadow: 0px 5px 10px rgba(0, 0, 0, 0.7);
+  box-shadow: 0px 5px 10px rgba(0, 0, 0, 0.7);
+}
+/* tool */
+.tool {
+  height: auto;
+  overflow: auto;
+  padding: 3px;
+}
+#saved-search-ul .tool:hover,
+#nets-sidebar .tool:hover,
+#sidebar-group-list .tool:hover {
+	background: #EEE;
+}
+.tool .label {
+  float: left;
+}
+.tool .action {
+  float: right;
+}
+.tool a {
+  color: ##3F8FBA;
+}
+.tool a:hover {
+  text-decoration: none;
+}
+/* popup notifications */
+div.jGrowl div.notice {
+  background: #511919 url("../../../../images/icons/48/notice.png") no-repeat 5px center;
+  color: #ffffff;
+  padding-left: 58px;
+}
+div.jGrowl div.info {
+  background: #364e59 url("../../../../images/icons/48/info.png") no-repeat 5px center;
+  color: #ffffff;
+  padding-left: 58px;
+}
+/* header */
+header {
+  position: fixed;
+  left: 0%;
+  right: 80%;
+  top: 0px;
+  margin: 0px;
+  padding: 0px;
+  width: 22%;
+  height: 32px;
+  background: #1872a2;
+  background-color: #1872a2;
+  z-index: 100;
+  border-bottom: 1px;
+  border-bottom-color: black;
+  border-bottom-style: inset;
+}
+header #site-location {
+  display: none;
+}
+header #banner {
+  overflow: hidden;
+  text-align: left;
+  width: 82%%;
+  margin-left: 25%;
+}
+header #banner a,
+header #banner a:active,
+header #banner a:visited,
+header #banner a:link,
+header #banner a:hover {
+  color: #ffffff;
+  text-decoration: none;
+  outline: none;
+  vertical-align: middle;
+ font-weight: bolder;
+  margin-left: 3px;
+}
+header #banner #logo-img {
+  height: 25px;
+  margin-top: 3px;
+}
+header #banner #logo-text {
+  font-size: 20px;
+  position: absolute;
+  top: 10%;
+}
+/* nav */
+nav {
+  width: 80%;
+  height: 32px;
+  position: fixed;
+  left: 22%;
+  top: 0px;
+  padding: 0px;
+  background: #1872a2;
+  color: #ffffff;
+  z-index: 99;
+  border-bottom: 1px;
+  border-bottom-color: black;
+  border-bottom-style: inset;
+}
+nav a,
+nav a:active,
+nav a:visited,
+nav a:link,
+nav a:hover {
+  color: #ffffff;
+  text-decoration: none;
+  outline: none;
+}
+nav #banner {
+  overflow: hidden;
+  /*text-align: center;*/
+  width: 100%;
+}
+nav #banner a,
+nav #banner a:active,
+nav #banner a:visited,
+nav #banner a:link,
+nav #banner a:hover {
+  color: #ffffff;
+  text-decoration: none;
+  outline: none;
+  vertical-align: bottom;
+}
+nav #banner #logo-img {
+  height: 22px;
+  margin-top: 5px;
+}
+nav #banner #logo-text {
+  font-size: 22px;
+}
+nav #navbar{
+	}
+nav ul {
+  margin: 0px;
+  padding: 0px 20px;
+}
+nav ul li {
+  list-style: none;
+  margin: 0px;
+  /* padding: 1px 1px 3px 1px; */
+  float: left;
+}
+nav ul li .menu-popup {
+  left: 0px;
+  right: auto;
+}
+
+nav #logo-img {
+  height: 25px;
+  margin-top: 4px;
+  margin-left: 30px;
+}
+
+nav #logo-text {
+    font-size: 22px;
+    margin-top: 3px;
+    margin-right: 15px;
+}
+nav .nav-menu-search {
+  position: relative;
+
+  margin: 4px 17px;
+  margin-right: 0px;
+  height: 17px;
+  width: 180px;
+  
+}
+
+nav #search-box #search-text {
+  background-image:  url('icons/lupe.png');
+  background-repeat:no-repeat;
+  padding-left:20px;
+  border-top-left-radius: 15px;
+border-top-right-radius: 15px;
+border-bottom-right-radius: 15px;
+border-bottom-left-radius: 15px;
+	}
+
+
+nav .nav-menu-icon {
+  position: relative;
+  height: 22px;
+  padding: 5px;
+  margin: 0px 5px;
+  -moz-border-radius: 5px 5px 0 0;
+  -webkit-border-radius: 5px 5px 0 0;
+  border-radius: 5px 5px 0 0;
+}
+nav .nav-menu-icon:hover {
+  background-color: #308dbf;  
+  position: relative;
+  height: 22px;
+  padding: 5px;
+  margin: 0px 5px;
+  -moz-border-radius: 5px 5px 0 0;
+  -webkit-border-radius: 5px 5px 0 0;
+  border-radius: 5px 5px 0 0;
+}
+
+nav .nav-menu-icon.selected {
+  background-color: #fff;
+}
+nav .nav-menu-icon img {
+  width: 22px;
+  height: 22px;
+}
+nav .nav-menu-icon .nav-notify {
+  top: 3px;
+}
+/*marker*/
+nav .nav-menu {
+  position: relative;
+  height: 16px;
+  padding: 5px;
+  margin: 3px 15px 0px;
+  font-size: 15px;
+  /*border-bottom: 3px solid #364A84;*/
+}
+nav .nav-menu.selected {
+  /*border-bottom: 3px solid #9eabb0;*/
+}
+nav .nav-notify {
+  display: none;
+  position: absolute;
+  background-color: #ff0000;
+  /* background-color: #19aeff; */
+  -moz-border-radius: 5px 5px 5px 5px;
+  -webkit-border-radius: 5px 5px 5px 5px;
+  border-radius: 5px 5px 5px 5px;
+  font-size: 10px;
+  font-weight: 900;
+  padding: 1px 4px;
+  top: 0px;
+  right: -6px;
+  min-width: 10px;
+  text-align: center;
+}
+nav .nav-notify.show {
+  display: block;
+}
+nav #nav-help-link,
+nav #nav-search-link,
+nav #nav-directory-link,
+nav #nav-apps-link,
+nav #nav-site-linkmenu, 
+nav #nav-home-link,
+nav #nav-user-linkmenu
+{
+  float: right;
+}
+nav #nav-user-linkmenu{
+	margin-right: 0px;
+	}
+nav #nav-home-link, #nav-directory-link, #nav-apps-link{
+	margin-left: 0px;
+	margin-right: 0px;
+	font-weight: bold;
+	margin: 3px 5px;
+	}
+nav #nav-directory-link{
+  margin-right: 0px;	
+	}
+nav #nav-home-link{
+  margin-left: 0px;	
+	}
+nav #nav-help-link .menu-popup,
+nav #nav-search-link .menu-popup,
+nav #nav-directory-link .menu-popup,
+nav #nav-apps-link .menu-popup,
+nav #nav-site-linkmenu .menu-popup {
+  right: 0px;
+  left: auto;
+}
+
+nav #nav-messages-linkmenu.on .icon.messages, nav #nav-messages-linkmenu.selected .icon.messages{
+	background-image: url("../diabook-blue/icons/messages2.png");
+	}
+	
+/*nav #nav-notifications-linkmenu.on .icon.notify,*/ nav #nav-notifications-linkmenu.selected .icon.notify{
+	background-image: url("../diabook-blue/icons/notify2.png");
+	}
+	
+nav #nav-contacts-linkmenu.on .icon.contacts, nav #nav-contacts-linkmenu.selected .icon.contacts{
+	background-image: url("../diabook-blue/icons/contacts2.png");
+	}
+	
+nav #nav-apps-link.selected {
+  background-color: #364e59;
+}
+
+#nav-notifications-mark-all {
+	/* padding: 1px 1px 2px 26px; */
+	/* border-bottom: 1px solid #364E59; */
+	/* margin: 0px 0px 2px 0px;
+	padding: 5px 10px; */
+}
+
+#nav-notifications-see-all {
+	/* padding: 1px 1px 2px 26px; */
+	/* border-bottom: 1px solid #364E59; */
+	/* margin: 0px 0px 2px 0px;
+	padding: 5px 10px; */
+}
+
+.notify-seen {
+	background: none repeat scroll 0 0 #DDDDDD;
+	}
+
+ul.menu-popup {
+  position: absolute;
+  display: none;
+  width: 11em;
+  background: #ffffff;
+  color: #2d2d2d;
+  margin: 0px;
+  padding: 0px;
+  list-style: none;
+  z-index: 100000;
+  -webkit-box-shadow: 0px 5px 10px rgba(0, 0, 0, 0.7);
+  -moz-box-shadow: 0px 5px 10px rgba(0, 0, 0, 0.7);
+  box-shadow: 0px 5px 10px rgba(0, 0, 0, 0.7);
+}
+ul.menu-popup a {
+  display: block;
+  color: #2d2d2d;
+  padding: 5px 10px;
+  text-decoration: none;
+}
+ul.menu-popup a:hover {
+  background-color: #308DBF; /*bdcdd4;*/
+  color: #fff;
+}
+ul.menu-popup .menu-sep {
+  border-top: 1px solid #9eabb0;
+}
+ul.menu-popup li {
+  float: none;
+  overflow: auto;
+  height: auto;
+  display: block;
+}
+ul.menu-popup li img {
+  float: left;
+  width: 16px;
+  height: 16px;
+  padding-right: 5px;
+}
+ul.menu-popup .empty {
+  padding: 5px;
+  text-align: center;
+  color: #9eabb0;
+}
+/* autocomplete popup */
+.acpopup {
+  max-height: 150px;
+  background-color: #ffffff;
+  color: #2d2d2d;
+  border: 1px solid #MenuBorder;
+  overflow: auto;
+  z-index: 100000;
+  -webkit-box-shadow: 0px 5px 10px rgba(0, 0, 0, 0.7);
+  -moz-box-shadow: 0px 5px 10px rgba(0, 0, 0, 0.7);
+  box-shadow: 0px 5px 10px rgba(0, 0, 0, 0.7);
+}
+.acpopupitem {
+  color: #2d2d2d;
+  padding: 4px;
+  clear: left;
+}
+.acpopupitem img {
+  float: left;
+  margin-right: 4px;
+}
+.acpopupitem.selected {
+  background-color: #bdcdd4;
+}
+#nav-notifications-menu {
+  width: 400px;
+  max-height: 550px;
+  overflow: auto;
+}
+/* #nav-notifications-menu a {
+	display: inline;
+	padding: 5px 0px;
+	margin: 0px 0px 2px 0px;
+}
+#nav-notifications-menu li:hover {
+  background-color: #bdcdd4;
+}*/
+
+#nav-notifications-menu img {
+  float: left;
+  margin-right: 5px;
+}
+#nav-notifications-menu .contactname {
+  font-weight: bold;
+}
+#nav-notifications-menu .notif-when {
+  font-size: 10px;
+  color: #9eabb0;
+  display: block;
+}
+
+.notif-image {
+        width: 32px;
+        height: 32px;
+        padding: 7px 7px 0px 0px;
+}
+
+/*profile_side*/
+#profile_side {
+  margin-bottom: 30px;
+}
+#ps-usericon{
+	height: 25px	
+	}
+#ps-username{
+  font-size: 1.17em;
+  font-weight: bold;
+  vertical-align: top;
+  position: absolute;
+  padding-top: 4px;
+  padding-left: 5px;	
+  word-wrap: break-word;
+  width: 130px;
+	}
+#ps-username:hover{
+  text-decoration: none;	
+	}
+.menu-profile-side{
+  list-style: none;	
+  padding-left: 0px;
+  min-height: 0px;
+	}
+.menu-profile-list{
+  height: auto;
+  overflow: auto;
+  padding-top: 3px;
+  padding-bottom: 3px;
+  padding-left: 16px;
+  min-height: 16px;
+  list-style: none;
+	}
+.menu-profile-list:hover{
+	background: #EEE;
+	}
+.menu-profile-list-item{
+	padding-left: 5px;
+	}	
+.menu-profile-list-item:hover{	
+	text-decoration: none;
+   }
+/*http://prothemedesign.com/circular-icons/*/
+.menu-profile-list.home{
+	background: url("../diabook-blue/icons/home.png") no-repeat;
+	}
+.menu-profile-list.photos{
+	background: url("../diabook-blue/icons/mess_side.png") no-repeat;
+	}
+.menu-profile-list.events{
+	background: url("../diabook-blue/icons/events.png") no-repeat;
+	}
+.menu-profile-list.notes{
+	background: url("../diabook-blue/icons/notes.png") no-repeat;
+	}
+.menu-profile-list.foren{
+	background: url("../diabook-blue/icons/pubgroups.png") no-repeat;
+	}
+.menu-profile-list.com_side{
+	background: url("../diabook-blue/icons/com_side.png") no-repeat;
+	}
+
+/* aside */
+/*marker*/
+aside {
+  display: table-cell;
+  vertical-align: top;
+  width: 180px;
+  padding: 0px 5px 0px 0px;
+  border-right: 1px solid #D2D2D2;
+  float: left;
+  /* background: #F1F1F1; */
+}
+
+aside .vcard .fn {
+  font-size: 18px;
+  font-weight: bold;
+  margin-bottom: 5px;
+}
+aside .vcard .title {
+  margin-bottom: 5px;
+}
+aside .vcard dl {
+  height: auto;
+  overflow: auto;
+}
+aside .vcard dt {
+  float: left;
+  margin-left: 0px;
+  /*width: 35%;*/
+  text-align: right;
+  color: #999999;
+}
+aside .vcard dd {
+  float: left;
+  margin-left: 5px;
+  /*width: 60%;*/
+}
+aside #profile-extra-links ul {
+  padding: 0px;
+  margin: 0px;
+}
+aside #profile-extra-links li {
+  padding: 0px;
+  margin: 0px;
+  list-style: none;
+}
+aside #dfrn-request-link {
+  display: block;
+  -moz-border-radius: 5px 5px 5px 5px;
+  -webkit-border-radius: 5px 5px 5px 5px;
+  border-radius: 5px 5px 5px 5px;
+  color: #ffffff;
+  background: #005c94 url('../../../../images/connect-bg.png') no-repeat left center;
+  font-weight: bold;
+  text-transform: uppercase;
+  padding: 4px 2px 2px 35px;
+}
+aside #dfrn-request-link:hover {
+  text-decoration: none;
+  background-color: #36c;
+  /* background-color: #19aeff; */
+}
+aside #profiles-menu {
+  width: 20em;
+}
+aside #search-text {
+	width: 150px;
+		height: 17px;
+		padding-left: 10px;
+	border-top-left-radius: 15px;
+border-top-right-radius: 15px;
+border-bottom-right-radius: 15px;
+border-bottom-left-radius: 15px;
+}
+aside #side-follow-url {
+	width: 150px;
+	}
+aside #side-peoplefind-url {
+	width: 150px;
+	}
+#contact-block {
+  overflow: auto;
+  height: auto;
+}
+#contact-block .contact-block-h4 {
+  float: left;
+  margin: 5px 0px;
+}
+#contact-block .allcontact-link {
+  float: right;
+  margin: 5px 0px;
+}
+#contact-block .contact-block-content {
+  clear: both;
+  overflow: auto;
+  height: auto;
+}
+#contact-block .contact-block-link {
+  float: left;
+  margin: 0px 2px 2px 0px;
+}
+#contact-block .contact-block-link img {
+  widht: 48px;
+  height: 48px;
+}
+#lost-password-link {
+  float: left;
+  margin-right: 20px;	
+	}
+/* widget */
+.widget {
+  margin-bottom: 2em;
+  /*.action .s10 { width: 10px; overflow: hidden; padding: 0px;}
+	.action .s16 { width: 16px; overflow: hidden; padding: 0px;}*/
+/*  font-size: 12px; */
+}
+/*marker*/
+.widget h3 {
+  padding: 0px;
+  margin: 2px;
+  font-size: 1.05em;
+}
+.widget .action {
+  opacity: 0.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;
+}
+.widget input.action {
+  opacity: 0.5;
+  -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;
+}
+.widget:hover .title .action {
+  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;
+}
+.widget .tool:hover .action {
+  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;
+}
+.widget .tool:hover .action.ticked {
+  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;
+}
+.widget ul {
+  padding: 0px;
+}
+.widget ul li {
+  padding-left: 16px;
+  min-height: 16px;
+  list-style: none;
+}
+#side-bar-photos-albums li{
+list-style-type: disc;
+}
+#side-bar-photos-albums ul li{
+  margin-left: 30px;
+  padding-left: 0px;
+	}
+#side-bar-photos-albums ul li a{
+  color: #1872A2;
+}
+.widget .tool.selected {
+  background: url("../diabook-blue/icons/selected.png") no-repeat left center;
+}
+/* widget: search */
+span.sbox_l  {
+	background: white url('../diabook/icons/srch_l.gif') no-repeat top left;
+	float: left;
+	width: 19px; height: 19px;
+	margin-left: 10px;
+	margin-top: 5px;
+	
+}
+
+span.sbox_r  {
+	background: white url('../diabook/icons/srch_r.gif') no-repeat top left;
+	float: left;
+	width: 19px; height: 19px;
+	margin-top: 5px;
+}
+
+span.sbox input {
+	background: white url('../diabook/icons/srch_bg.gif') repeat-x top left;
+	float: left;
+	margin-top: 5px;
+	border: 0;
+	height: 13px; width: 100px;
+	padding: 3px;
+	font: 11px/13px arial;
+	color: #000;
+}
+#add-search-popup {
+  width: 200px;
+  top: 18px;
+}
+/* section */
+section {
+  display: table-cell;
+  vertical-align: top;
+  width: 611px;
+  padding: 0px 0px 0px 12px;
+}
+
+body .pageheader{
+  text-align: center;
+  font-size: 20px;
+  margin-bottom: 20px;
+  margin-top: 0px;
+  max-width: 575px;
+	}
+.qcomment{
+  max-width: 122px;	
+	}
+#id_username {
+  width: 173px;	
+	}
+#id_password {
+  width: 173px;		
+	}
+#id_openid_url {
+  width: 173px;	
+	}
+#contact-edit-end {
+	}
+.pager {
+   padding: 10px;
+	text-align: center;
+	font-size: 1.0em;
+	clear: both;
+	display: block;
+}	
+
+.tabs {
+    
+    background-position: 0 -20px;
+    background-repeat: repeat-x;
+    height: 27px;
+    padding: 0;
+ }
+.tab.button {
+    margin-left: 5px;	
+    /*background: none repeat scroll 0 0 #F8F8F8;*/
+    border: 1px solid #CCCCCC;
+    border-radius: 3px 3px 3px 3px;
+    font-weight: normal;
+    padding: 3px;
+    color:  #333333;
+	}
+	
+#birthday-notice, #event-notice, #birthday-wrapper, #event-wrapper{
+	margin-bottom: 10px;
+	}
+
+/*marker*/
+right_aside {
+  display: table-cell;
+  vertical-align: top;
+  width: 180px;
+  /*border-left: 1px solid #D2D2D2;*/
+  
+  /* background: #F1F1F1; */
+}
+right_aside a{color: #1872A2;}
+/*marker*/
+right_aside h3 {font-size: 1.05em; border-bottom: 1px solid #D2D2D2; padding-top: 5px; padding-bottom: 0px; padding-left: 9px; margin-bottom: 0px; 
+margin-top:30px;}
+right_aside .directory-item {	width: 50px; height: 50px; vertical-align: center; text-align: center; }
+right_aside .directory-photo { margin: 0px; }
+right_aside .directory-photo-img { max-width: 45px; max-height: 45px; }
+right_aside #likes { margin: 0px; padding: 0px; list-style: none; }
+right_aside .items-wrapper{ overflow: auto;	width: 100%; }
+right_aside #lastusers-wrapper { padding-left: 6px; padding-top: 3px; overflow: auto;	width: 100%; }
+right_aside #ra-photos-wrapper { padding-left: 5px; padding-top: 3px; overflow: auto;	width: 100%; }
+#page-sidebar-right_aside{margin-top: 0px; margin-bottom: 30px;}
+#page-sidebar-right_aside ul {margin-top: 0px;}
+#page-sidebar-right_aside .label {max-width: 128px;}
+right_aside .icon {width: 10px; height: 10px;}
+.close_box		{ 
+		background-image: url("../diabook-blue/icons/close_box.png");
+		float: right;
+		cursor: pointer;
+		opacity: 0.1;
+		}
+.close_box:hover	{ 
+		background-image: url("../diabook-blue/icons/close_box.png");
+		float: right;
+		cursor: pointer;
+		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;
+		}
+/* wall item */
+/*marker*/
+.tread-wrapper {
+  border-bottom: 1px solid #D2D2D2;
+  position: relative;
+  padding: 5px;
+  margin-bottom: 0px;
+  width: 775px;
+  padding-top: 10px;
+}
+.tread-wrapper a{
+  color: #1872A2;
+}
+
+/*marker*/
+.wall-item-decor {
+  position: absolute;
+  left: 780px;
+  top: -10px;
+  width: 16px;
+}
+/*marker*/
+.wall-item-container {
+  display: table;
+  width: 770px;
+}
+
+
+.wall-item-container .wall-item-item, .wall-item-container .wall-item-bottom {
+  display: table-row;
+}
+
+.wall-item-bottom {
+  font-size: 13px;
+}
+.wall-item-container .wall-item-bottom {
+/*  opacity: 0.5;
+  -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; */
+}
+.wall-item-container:hover .wall-item-bottom {
+/*  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; */
+}
+.wall-item-container .wall-item-info {
+  display: table-cell;
+  vertical-align: top;
+  text-align: left;
+  width: 80px;
+}
+.wall-item-container .wall-item-location {
+  padding-right: 40px;
+  display: table-cell;
+}
+.wall-item-container .wall-item-ago {
+  word-wrap: break-word;
+  width: 50px;
+  margin-left: 10px;
+  color: #999;
+}
+.wall-item-location {
+  
+  clear: both;
+  overflow: hidden;
+  
+  margin-bottom: 5px;
+}
+
+/*marker*/
+.wall-item-container .wall-item-content {
+
+  max-width: 690px;
+  word-wrap: break-word;
+
+
+}
+/*marker*/
+.wall-item-container .wall-item-content img {
+
+
+}
+.wall-item-container .wall-item-links, .wall-item-container .wall-item-actions {
+  display: table-cell;
+  vertical-align: middle;
+}
+.wall-item-container .wall-item-links .icon, .wall-item-container .wall-item-actions .icon {
+  opacity: 0.5;
+  -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;
+}
+.wall-item-container .wall-item-links .icon:hover, .wall-item-container .wall-item-actions .icon: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;
+}
+.wall-item-container .wall-item-name {
+  font-weight: bold;
+}
+.wall-item-container .wall-item-actions-author {
+  width: 100%;
+  margin-bottom: 0.3em;
+}
+.wall-item-container .wall-item-actions-social {
+  float: left;
+  margin-bottom: 1px;
+  display: table-cell;
+}
+.wall-item-container .wall-item-actions-social a {
+  margin-right: 1em;
+}
+.wall-item-actions-social a {
+  float: left;
+}
+.wall-item-container .wall-item-actions-tools {
+  float: right;
+  width: 80px;
+  display: table-cell;
+}
+.wall-item-container .wall-item-actions-tools a {
+  float: right;
+}
+.wall-item-container .wall-item-actions-tools input {
+  float: right;
+}
+/*marker*/
+.wall-item-container.comment {
+  margin-top: 5px;
+  margin-bottom: 5px;
+  margin-left: 80px;
+  width: 690px;
+  border-bottom: 1px solid hsl(198, 21%, 79%);
+}
+.wall-item-container.comment .contact-photo {
+  width: 32px;
+  height: 32px;
+  margin-left: 16px;
+  /*background: url(../../../../images/icons/22/user.png) no-repeat center center;*/
+
+}
+.wall-item-container.comment {
+  top: 15px !important;
+  left: 15px !important;
+}
+.wall-item-container.comment .wall-item-links {
+  padding-left: 12px;
+}
+.wall-item-comment-wrapper {
+  margin: 1px 5px 5px 80px;
+}
+.wall-item-comment-wrapper .comment-edit-photo {
+  display: none;
+}
+.wall-item-comment-wrapper textarea {
+  height: 2.0em;
+  width: 100%;
+  font-size: 10px;
+  color: #999999;
+  border: 1px solid #DDD;
+  padding: 0.3em;
+  font-size: 14px;
+}
+.wall-item-comment-wrapper .comment-edit-text-full {
+  font-size: 14px;
+  height: 4em;
+  color: #2d2d2d;
+  border: 1px solid #2d2d2d;
+}
+.comment-edit-preview {
+  width: 500px;
+  margin-top: 10px;
+  background-color:  #fff797;
+}
+.comment-edit-preview .contact-photo {
+  width: 32px;
+  height: 32px;
+  margin-left: 16px;
+  /*background: url(../../../../images/icons/22/user.png) no-repeat center center;*/
+
+}
+.comment-edit-preview {
+  top: 15px !important;
+  left: 15px !important;
+}
+.comment-edit-preview .wall-item-links {
+  padding-left: 12px;
+}
+.comment-edit-preview .wall-item-container {
+  width: 700px;
+}
+.comment-edit-preview .tread-wrapper {
+  width: 700px;
+  padding: 0;
+  margin: 10px 0;
+}
+
+.shiny {
+  /* border-right: 10px solid #fce94f; */
+	border-right: 1px solid #A7C7F7;
+	padding-right: 12px;
+}
+
+#jot-preview-content{
+	margin-top: 30px;}
+	
+#jot-preview-content .tread-wrapper {
+  background-color: #fff797;
+}
+
+.wall-item-tags {
+  padding-top: 1px;
+  padding-bottom: 2px;
+}
+.tag {
+  /*background: url("../../../../images/tag_b.png") repeat-x center left;*/
+  color: #999;
+  padding-left: 3px;
+  font-size: 12px;
+}
+.tag a {
+  padding-right: 5px;
+  /*background: url("../../../../images/tag.png") no-repeat center right;*/
+  color: #999;
+}
+.wwto {
+  position: absolute !important;
+  width: 25px;
+  height: 25px;
+  background: #FFFFFF;
+  border: 2px solid #364e59;
+  height: 25px;
+  width: 25px;
+  overflow: hidden;
+  padding: 1px;
+  position: absolute !important;
+  top: 40px;
+  left: 30px;
+  -webkit-box-shadow: 0px 0px 10px rgba(0, 0, 0, 0.7);
+  -moz-box-shadow: 0px 0px 10px rgba(0, 0, 0, 0.7);
+  box-shadow: 0px 0px 10px rgba(0, 0, 0, 0.7);
+}
+.wwto .contact-photo {
+  width: auto;
+  height: 25px;
+}
+/* contacts menu */
+.contact-photo-wrapper {
+  position: relative;
+  width: 80px;
+}
+
+.contact-photo-wrapper.wwto {
+  width: 25px;
+}
+
+.contact-photo {
+  width: 48px;
+  height: 48px;
+  overflow: hidden;
+  display: block;
+}
+.contact-photo img {
+  width: 48px;
+  height: 48px;
+}
+
+.contact-wrapper {
+  float: left;
+  width: 90px;
+  height: 90px;
+  margin-bottom: 15px;
+}
+.contact-wrapper .contact-photo {
+  width: 80px;
+  height: 80px;
+}
+.contact-wrapper .contact-photo img {
+  width: 80px;
+  height: 80px;
+}
+.contact-wrapper {
+  left: 0px;
+  top: 63px;
+}
+.contact-photo {
+  width: 48px;
+  height: 48px;
+}
+.contact-photo img {
+  width: 48px;
+  height: 48px;
+}
+.contact-name {
+  /* text-align: center; */
+  /*font-weight: bold;*/
+  font-size: 12px;
+}
+.contact-details {
+  color: #999999;
+}
+/* editor */
+.jothidden {
+  display: none;
+}
+#jot {
+  width: 585px;
+  margin: 0px 2em 20px 0px;
+}
+#profile-jot-form #profile-jot-text {
+  height: 2.0em;
+  width: 99%;
+  font-size: 15px;
+  color: #999999;
+  border: 1px solid #DDD;
+  padding: 0.3em;
+  margin-bottom: 10px;
+}
+.grey
+{
+  display: inline;
+  float: right;	
+	}
+#jot #jot-tools {
+  margin: 0px;
+  padding: 0px;
+  height: 40px;
+  overflow: none;
+  width: 583px;
+  background-color: #fff;
+  border-bottom: 2px solid #9eabb0;
+}
+
+#jot #jot-tools li {
+  list-style: none;
+  float: left;
+  width: 80px;
+  height: 40px;
+  border-bottom: 2px solid #9eabb0;
+}
+#jot #jot-tools li a {
+  display: block;
+  color: #cccccc;
+  width: 100%;
+  height: 40px;
+  text-align: center;
+  line-height: 40px;
+  overflow: hidden;
+}
+#jot #jot-tools li:hover {
+  background-color: #364e59;
+  border-bottom: 2px solid #bdcdd4;
+}
+#jot #jot-tools li.perms {
+  float: right;
+  width: 40px;
+}
+#jot #jot-tools li.perms a.unlock {
+  width: 30px;
+  border-left: 10px solid #cccccc;
+  background-color: #cccccc;
+  background-position: left center;
+}
+#jot #jot-tools li.perms a.lock {
+  width: 30px;
+  border-left: 10px solid #666666;
+  background-color: #666666;
+}
+#jot #jot-tools li.submit {
+  float: right;
+  background-color: #cccccc;
+  border-bottom: 2px solid #cccccc;
+  border-right: 1px solid #666666;
+  border-left: 1px solid #666666;
+}
+#jot #jot-tools li.submit input {
+  border: 0px;
+  margin: 0px;
+  padding: 0px;
+  background-color: #cccccc;
+  color: #666666;
+  width: 80px;
+  height: 40px;
+  line-height: 40px;
+}
+#jot #jot-tools li.submit input:hover {
+  background-color: #bdcdd4;
+  color: #666666;
+}
+#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;
+}
+#profile-jot-form #jot-title {
+    
+  	 border-radius: 5px 5px 5px 5px;
+    font-weight: bold;
+    height: 20px;
+    margin: 0 0 5px;
+    width: 60%;
+    border: 1px solid #d2d2d2;
+}
+#profile-jot-form #jot-title:-webkit-input-placeholder {
+  font-weight: normal;
+}
+#profile-jot-form #jot-title:-moz-placeholder {
+  font-weight: normal;
+}
+#profile-jot-form #profile-jot-text_parent #profile-jot-text_tbl{
+	width: 585px;
+	height: 100px;
+	}
+#jot #jot-title:hover {
+  border: 1px solid #999999;
+}
+#jot #jot-title:focus {
+  border: 1px solid #999999;
+}
+#jot #character-counter {
+  width: 80px;
+  float: right;
+  text-align: right;
+  height: 20px;
+  line-height: 20px;
+  padding-right: 20px;
+}
+#jot-perms-icon, 
+#profile-location,
+#profile-nolocation,
+#profile-youtube, 
+#profile-video, 
+#profile-audio,
+#profile-link,
+#profile-title, 
+#wall-image-upload,
+#wall-file-upload,
+#wall-image-upload-div,
+#wall-file-upload-div,
+.hover, .focus {
+	cursor: pointer;
+	margin-top: 2px;
+}
+/*marker*/
+#profile-jot-wrapper{
+	margin: 0 20px 20px 0;
+   width: 785px;
+	}
+/*marker*/
+#profile-jot-submit-wrapper {
+	margin-bottom: 50px;
+	width: 785px;
+}
+
+#profile-jot-submit {
+	float: right;
+	margin-top: 2px;
+	
+}
+#profile-upload-wrapper {
+	float: left;
+	margin-top: 2px;
+	margin-left: 10px;
+	font-size: 14px;
+}
+#profile-attach-wrapper {
+	float: left;
+	margin-left: 15px;
+	margin-top: 2px;
+}
+#profile-rotator {
+	float: left;
+	margin-left: 30px;
+	margin-top: 2px;
+}
+#profile-link-wrapper {
+	float: left;
+	margin-left: 15px;
+	margin-top: 2px;
+}
+#profile-youtube-wrapper {
+	float: left;
+	margin-left: 15px;
+	margin-top: 2px;
+}
+#profile-video-wrapper {
+	float: left;
+	margin-left: 15px;
+	margin-top: 2px;
+}
+#profile-audio-wrapper {
+	float: left;
+	margin-left: 15px;
+	margin-top: 2px;
+}
+#profile-location-wrapper {
+	float: left;
+	margin-left: 15px;
+	margin-top: 2px;
+}
+#profile-jot-perms {
+	float: left;
+	margin-left: 45px;
+	margin-top: 2px;
+}
+#jot-preview-link {
+	float: right;
+	margin-left: 10px;
+	margin-top: 2px;
+	font-size: 9px;
+	font-weight: bolder;
+	cursor: pointer;
+}
+#profile-jot-perms{
+   float: right;
+	margin-left: 10px;
+	margin-top: 2px;	
+	}
+/** buttons **/
+.button.creation1 {
+    background-color: #fff;
+    border: 1px solid #777777;
+    border-radius: 3px 3px 3px 3px;
+    box-shadow: 0 1px 1px #CFCFCF;
+    cursor: pointer;
+    font-weight: bolder;
+}
+.button.creation2 {
+    background-color: #055580;
+    border: 1px solid #777777;
+    color: white;
+    border-radius: 3px 3px 3px 3px;
+    box-shadow: 0 1px 1px #CFCFCF;
+    margin-left: 5px;
+    cursor: pointer;
+    font-weight: bolder;
+}
+/*input[type="submit"] {
+	border: 0px;
+    background-color: @ButtonBackgroundColor;
+    color: @ButtonColor;
+    padding: 0px 10px;
+	.rounded(5px);
+    height: 18px;
+}*/
+/** acl **/
+#photo-edit-perms-select, #photos-upload-permissions-wrapper, #profile-jot-acl-wrapper {
+  display: block!important;
+}
+#acl-wrapper {
+  width: 690px;
+  float: left;
+}
+#acl-search {
+  float: right;
+  background: #ffffff url("../../../../images/search_18.png") no-repeat right center;
+  padding-right: 20px;
+}
+#acl-showall {
+  float: left;
+  display: block;
+  width: auto;
+  height: 18px;
+  background-color: #cccccc;
+  background-image: url("../../../../images/show_all_off.png");
+  background-position: 7px 7px;
+  background-repeat: no-repeat;
+  padding: 7px 5px 0px 30px;
+  color: #999999;
+  -moz-border-radius: 5px 5px 5px 5px;
+  -webkit-border-radius: 5px 5px 5px 5px;
+  border-radius: 5px 5px 5px 5px;
+}
+#acl-showall.selected {
+  color: #000000;
+  background-color: #ff9900;
+  background-image: url("../../../../images/show_all_on.png");
+}
+#acl-list {
+  height: 210px;
+  border: 1px solid #cccccc;
+  clear: both;
+  margin-top: 30px;
+  overflow: auto;
+}
+.acl-list-item {
+  display: block;
+  width: 150px;
+  height: 30px;
+  border: 1px solid #cccccc;
+  margin: 5px;
+  float: left;
+}
+.acl-list-item img {
+  width: 22px;
+  height: 22px;
+  float: left;
+  margin: 4px;
+}
+.acl-list-item p {
+  height: 12px;
+  font-size: 10px;
+  margin: 0px;
+  padding: 2px 0px 1px;
+  overflow: hidden;
+}
+.acl-list-item a {
+  font-size: 8px;
+  display: block;
+  width: 40px;
+  height: 10px;
+  float: left;
+  color: #999999;
+  background-color: #cccccc;
+  background-position: 3px 3px;
+  background-repeat: no-repeat;
+  margin-right: 5px;
+  -webkit-border-radius: 2px ;
+  -moz-border-radius: 2px;
+  border-radius: 2px;
+  padding-left: 15px;
+}
+#acl-wrapper a:hover {
+  text-decoration: none;
+  color: #000000;
+}
+.acl-button-show {
+  background-image: url("../../../../images/show_off.png");
+}
+.acl-button-hide {
+  background-image: url("../../../../images/hide_off.png");
+}
+.acl-button-show.selected {
+  color: #000000;
+  background-color: #9ade00;
+  background-image: url("../../../../images/show_on.png");
+}
+.acl-button-hide.selected {
+  color: #000000;
+  background-color: #ff4141;
+  background-image: url("../../../../images/hide_on.png");
+}
+.acl-list-item.groupshow {
+  border-color: #9ade00;
+}
+.acl-list-item.grouphide {
+  border-color: #ff4141;
+}
+/** /acl **/
+/** tab buttons 14618a**/
+/*marker*/
+ul.tabs {
+  list-style-type: none;
+  padding-bottom: 10px;
+  font-size: 13px;
+  width: 805px;
+}
+ul.tabs li {
+  float: left;
+  margin-left: 5px;
+}
+ul.tabs li .active {
+    background-color: #055580;
+    border: 1px solid #777777;
+    color: white;
+    border-radius: 3px 3px 3px 3px;
+    box-shadow: 0 1px 1px #CFCFCF;
+    margin-left: 5px;
+}
+/**
+ * Form fields
+ */
+.field {
+  margin-bottom: 10px;
+  padding-bottom: 10px;
+  overflow: auto;
+  width: 100%;
+}
+.field label {
+  float: left;
+  width: 200px;
+}
+.field input, .field textarea {
+  width: 400px;
+}
+.field textarea {
+  height: 100px;
+}
+.field .field_help {
+  display: block;
+  margin-left: 200px;
+  color: #666666;
+}
+.field .onoff {
+  float: left;
+  width: 80px;
+}
+.field .onoff a {
+  display: block;
+  border: 1px solid #666666;
+  background-image: url("../../../../images/onoff.jpg");
+  background-repeat: no-repeat;
+  padding: 4px 2px 2px 2px;
+  height: 16px;
+  text-decoration: none;
+}
+.field .onoff .off {
+  border-color: #666666;
+  padding-left: 40px;
+  background-position: left center;
+  background-color: #cccccc;
+  color: #666666;
+  text-align: right;
+}
+.field .onoff .on {
+  border-color: #204A87;
+  padding-right: 40px;
+  background-position: right center;
+  background-color: #D7E3F1;
+  color: #204A87;
+  text-align: left;
+}
+.field .hidden {
+  display: none!important;
+}
+.field.radio .field_help {
+  margin-left: 0px;
+}
+#directory-search-form{
+	margin-bottom: 50px;
+	}
+#profile-edit-links-end {
+        clear: both;
+        margin-bottom: 15px;
+}
+
+#profile-edit-links ul { margin: 20px; padding-bottom: 20px; list-style: none; }
+
+#profile-edit-links li {
+  float: left;
+  list-style: none;
+  margin-left: 10px;
+}
+
+.profile-edit-side-div {
+  display: none;
+}
+
+#register-form label,
+#profile-edit-form label {
+        width: 300px; float: left;
+}
+
+.required {
+  display: inline;
+  color: #B20202;
+}
+
+/* oauth */
+.oauthapp {
+  height: auto;
+  overflow: auto;
+  border-bottom: 2px solid #cccccc;
+  padding-bottom: 1em;
+  margin-bottom: 1em;
+}
+.oauthapp img {
+  float: left;
+  width: 48px;
+  height: 48px;
+  margin: 10px;
+}
+.oauthapp img.noicon {
+  background-image: url("../../../../images/icons/48/plugin.png");
+  background-position: center center;
+  background-repeat: no-repeat;
+}
+.oauthapp a {
+  float: left;
+}
+/* contacts */
+.contact-entry-wrapper {
+  width: 120px;
+  height: 120px;
+  float: left;
+}
+/* photo */
+.photo {
+box-shadow: 2px 2px 5px 0px #000000;
+margin: 0px;
+border-radius: 10px;
+height: 145px !important;
+width: 145px !important;
+}
+.lframe {
+  float: left;
+  /*margin: 0px 10px 10px 0px;*/
+}
+/* profile match wrapper */
+.profile-match-wrapper {
+  float: left;
+  width: 90px;
+  height: 90px;
+  margin-bottom: 20px;
+}
+.profile-match-wrapper .contact-photo {
+  width: 80px;
+  height: 80px;
+}
+.profile-match-wrapper .contact-photo img {
+  width: 80px;
+  height: 80px;
+}
+.profile-match-wrapper {
+  left: 0px;
+  top: 63px;
+}
+
+.contact-photo-menu-button {
+        position: relative;
+        background-image: url("../../../../images/icons/16/menu.png");
+        background-position: top left; 
+        background-repeat: no-repeat;
+        margin: 0px 0px -16px 0px; 
+	padding: 0px;
+        width: 16px;
+        height: 16px;
+        top: -20px; left:0px;
+        overflow: hidden;
+        text-indent: 40px;
+        display: none;
+        
+}
+.contact-photo-menu {
+        width: 11em;
+        border: 3px solid #364e59;
+	color: #2d2d2d;
+        background: #FFFFFF;
+/*        position: absolute;*/
+        position: relative;
+        left: 0px; top: 0px;
+        display: none;
+        z-index: 10000;
+}
+.contact-photo-menu ul { margin:0px; padding: 0px; list-style: none }
+.contact-photo-menu li a {
+	display: block; 
+	padding: 5px 10px; 
+	color: #2d2d2d;
+	text-decoration: none;
+}
+.contact-photo-menu li a:hover {
+	background-color: #bdcdd4; 
+}
+
+/* page footer */
+footer {
+  height: 100px;
+  display: table-row;
+}
+
+blockquote {
+    border-left: 1px solid #D2D2D2;
+    padding-left: 9px;
+    margin: 0 0 0 .8ex;
+	 color: #777;
+}
+.oembed {
+	
+	font-weight: bold;
+}
+.aprofile dt{
+box-shadow: 1px 1px 5px 0;
+    color: #666666;
+    margin: 15px 0 5px;
+    padding-left: 5px;	
+	}
+/* ================== */
+/* = Contacts Block = */
+/* ================== */
+
+.contact-block-img {
+        width: 48px;
+        height: 48px;
+        padding-right: 3px;
+}
+.contact-block-div {
+        float: left;
+}
+
+.contact-block-textdiv { width: 150px; height: 34px; float: left; }
+#contact-block-end { clear: both; } 
+
+#group-edit-wrapper {
+        margin-bottom: 10px;
+}
+
+#group-members-end {
+        clear: both;
+}
+#group-edit-desc {
+ margin-top: 15px;
+}
+
+/*
+#group-separator,
+#prof-separator { display: none;}
+*/
+#prof-members-end{
+	clear: both;
+	}
+
+#prvmail-to-label, #prvmail-subject-label, #prvmail-message-label {
+	margin-bottom: 10px;
+	margin-top: 20px;
+}
+
+#prvmail-submit {
+	float: right;
+	margin-top: 10px;
+}
+
+#prvmail-subject
+{
+background: none repeat scroll 0 0 #FFFFFF;
+border: 1px solid #CCCCCC;
+border-radius: 5px 5px 5px 5px;
+font-weight: bold;
+height: 20px;
+margin: 0 0 5px;
+vertical-align: middle;
+}
+#prvmail-form{
+ width: 597px;	
+	}
+	
+#prvmail-upload-wrapper,
+#prvmail-link-wrapper,
+#prvmail-rotator-wrapper {
+	float: left;
+	margin-top: 10px;
+	margin-right: 10px;
+	width: 24px;
+}
+
+#prvmail-end {
+	clear: both;
+}
+
+.mail-list-sender,
+.mail-list-detail {
+	float: left;
+}
+.mail-list-detail {
+	margin-left: 20px;
+}
+
+.mail-list-subject {
+	font-size: 1.1em;
+	margin-top: 10px;
+}
+a.mail-list-link {
+    display: block;
+    font-size: 1.3em;
+    padding: 4px 0;
+}
+
+/*
+*a.mail-list-link:hover {
+*	background-color: #15607B;
+*	color: #F5F6FB;
+*}
+*/
+
+.mail-list-outside-wrapper-end {
+	clear: both;
+}
+
+.mail-list-outside-wrapper {
+	margin-top: 30px;
+}
+
+.mail-list-delete-wrapper {
+	float: right;
+	margin-right: 30px;
+	margin-top: 15px;
+}
+
+.mail-list-delete-icon {
+	border: none;
+}
+
+.mail-conv-sender,
+.mail-conv-detail {
+	float: left;
+}
+.mail-conv-detail {
+	margin-left: 20px;
+	width: 500px;
+}
+
+.mail-conv-subject {
+    font-size: 1.4em;
+    margin: 10px 0;
+}
+
+.mail-conv-outside-wrapper-end {
+	clear: both;
+}
+
+.mail-conv-outside-wrapper {
+	margin-top: 30px;
+}
+
+.mail-conv-delete-wrapper {
+	float: right;
+	margin-right: 30px;
+	margin-top: 15px;
+}
+.mail-conv-break {
+	clear: both;
+}
+
+.mail-conv-delete-icon {
+	border: none;
+}
+
+/* ========== */
+/* = Events = */
+/* ========== */
+.eventcal {
+        float: left;
+        font-size: 20px;
+}
+
+.vevent {
+
+}
+.vevent .event-description, .vevent .event-location {
+        margin-left: 10px;
+        margin-right: 10px;
+}
+.vevent .event-start {
+        margin-left: 10px;
+        margin-right: 10px;
+}
+
+#new-event-link {
+        margin-bottom: 10px;
+}
+
+.edit-event-link, .plink-event-link {
+        float: left;
+        margin-top: 4px;
+        margin-right: 4px;
+        margin-bottom: 15px;
+}
+
+.event-description:before {
+        content: url('../../../../images/calendar.png');
+        margin-right: 15px;
+}
+
+.event-start, .event-end {
+        margin-left: 10px;
+        width: 330px;
+        clear: both;
+}
+
+.event-start .dtstart, .event-end .dtend {
+        float: right;
+}
+
+.event-list-date {
+        margin-bottom: 10px;
+}
+
+.prevcal, .nextcal {
+        float: left;
+        margin-left: 32px;
+        margin-right: 32px;
+        margin-top: 64px;
+}
+.event-calendar-end {
+        clear: both;
+}
+
+ 
+.calendar {
+        font-family: Courier, monospace;
+}
+.calendar.eventcal a {
+  color: #1872A2;	
+	}
+.today {
+        font-weight: bold;
+        color: #FF0000;
+}
+
+.settings-block {
+        border: 1px solid #AAA;
+        margin: 10px;
+        padding: 10px;
+}
+
+.app-title {
+        margin: 10px;
+}
+
+#identity-manage-desc {
+        margin-top:15px;
+        margin-bottom: 15px;
+}
+
+#identity-manage-choose {
+        margin-bottom: 15px;
+}
+
+#identity-submit {
+        margin-top: 20px;
+}
+
+#photo-prev-link, #photo-next-link {
+        padding: 10px;
+        float: left;
+}
+.lightbox{
+	float: left;
+	}
+
+#photo-photo {
+        float: left;
+}
+#photo-like-div .wall-item-like-buttons {
+	 float: left;
+    margin-right: 5px;
+    margin-top: 30px;
+	}
+.comment-edit-text-empty {
+    margin: 10px 0 0;
+    width: 85%;
+}
+.comment-edit-photo {
+    margin: 10px 0 0;
+}
+.wall-item-like-buttons .icon.like {
+float: left;
+}
+
+#photo-photo-end {
+        clear: both;
+}
+
+.tabs .comment-wwedit-wrapper {
+	display: block;
+   margin-top: 30px;
+   margin-left: 50px;
+	}
+
+.profile-match-photo {
+        float: left;
+        text-align: center;
+        width: 120px;
+}
+
+.profile-match-name {
+        float: left;
+        text-align: center;
+        width: 120px;
+        overflow: hidden;
+}
+
+.profile-match-break,
+.profile-match-end {
+        clear: both;
+}
+
+.profile-match-connect {
+        text-align: center;
+        font-weight: bold;
+}
+
+.profile-match-wrapper {
+        float: left;
+        padding: 10px;
+        width: 120px;
+        height: 120px;
+        scroll: auto;
+}
+#profile-match-wrapper-end {
+        clear: both;
+}
+
+/* ============= */
+/* = Directory = */
+/* ============= */
+/* contacts menu */
+.contact-photo-wrapper {
+  position: relative;
+}
+.contact-photo {
+  width: 48px;
+  height: 48px;
+  overflow: hidden;
+  display: block;
+}
+.contact-photo img {
+  width: 48px;
+  height: 48px;
+}
+.contact-photo-menu-button {
+  display: none;
+  /* position: absolute; */
+  /* position: absolute; */
+  left: 0px;
+  top: -16px;
+}
+.contact-wrapper {
+  float: left;
+  width: 90px;
+  height: 90px;
+  margin-bottom: 15px;
+}
+.contact-wrapper .contact-photo {
+  width: 80px;
+  height: 80px;
+}
+.contact-wrapper .contact-photo img {
+  width: 80px;
+  height: 80px;
+}
+.contact-wrapper .contact-photo-menu-button {
+  left: 0px;
+  top: 63px;
+}
+.directory-item {
+  float: left;
+  width: 200px;
+  height: 200px;
+}
+.directory-item .contact-photo {
+  width: 175px;
+  height: 175px;
+}
+.directory-item .contact-photo img {
+  width: 175px;
+  height: 175px;
+}
+.contact-name {
+  text-align: left;
+  font-weight: bold;
+  font-size: 12px;
+}
+.contact-details {
+  color: #999999;
+}
+#side-bar-photos-albums li{
+list-style-type: disc;
+}
+#side-bar-photos-albums ul li{
+  margin-left: 30px;
+  padding-left: 0px;
+	}
+#side-bar-photos-albums{
+	margin-top: 15px;	
+	}
+.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-album-image-wrapper, .photo-top-image-wrapper {
+  float: left;
+   -moz-box-shadow: 0 0 5px #888;
+   -webkit-box-shadow: 0 0 5px #888;
+   box-shadow: 0 0 5px #888;
+  background-color: #000;
+   -webkit-border-radius: 5px;
+   -moz-border-radius: 5px;
+  border-radius: 5px;
+  padding-bottom: 20px;
+  position: relative;
+  margin: 0 10px 10px 0;
+  width: 200px; height: 140px;
+  overflow: hidden;  
+}
+.photo-top-album-name {
+        width: 100%;
+        position: absolute; 
+        bottom: 0px; 
+        padding-left: 3px;
+        background-color: #EEE;
+}
+.photo-top-album-link{
+  color: #1872A2;
+	}
+.photo-top-album-img{
+	
+	}
+/*.photo-top-image-wrapper {
+        position: relative;
+        float: left;
+        margin-top: 15px;
+        margin-right: 15px;
+        width: 200px; height: 200px; 
+        overflow: hidden; 
+}
+.photo-top-album-name {
+        width: 100%;
+        min-height: 2em;
+        position: absolute; 
+        bottom: 0px; 
+        padding: 0px 3px;
+        padding-top: 0.5em;
+        background-color: rgb(255, 255, 255);
+}*/
+#photo-top-end {
+        clear: both;
+}
+
+#photo-top-links {
+        margin-bottom: 30px;
+        margin-left: 30px;
+}
+
+#photos-upload-newalbum-div {
+        float: left;
+        width: 175px;
+}
+
diff --git a/view/theme/diabook/diabook-dark/style-profile.css b/view/theme/diabook/diabook-dark/style-profile.css
new file mode 100644
index 000000000..8824d18fe
--- /dev/null
+++ b/view/theme/diabook/diabook-dark/style-profile.css
@@ -0,0 +1,2594 @@
+/**
+ * Fabio Comuni <http://kirgroup.com/profile/fabrixxm>
+ * Additional Changes: Michael Vogel <icarus@dabo.de>
+ **/
+
+/* ========= */
+/* = Admin = */
+/* ========= */
+
+#adminpage {
+/*        width: 80%;*/
+}
+
+#pending-update {
+        float:right;
+        color: #2e2f2e;
+        font-weight: bold;
+        background-color: #FF0000;
+        padding: 0em 0.3em;
+}
+
+.admin.linklist {
+        border: 0px; padding: 0px;
+}
+
+.admin.link {
+        list-style-position: inside;
+        font-size: 1em;
+        padding: 5px;
+        width: 100px;
+        margin: 5px;
+}
+
+#adminpage dl {
+        clear: left;
+        margin-bottom: 2px;
+        padding-bottom: 2px;
+        border-bottom: 1px solid black;
+}
+
+#adminpage dt {
+        width: 200px;
+        float: left;
+        font-weight: bold;
+}
+
+#adminpage dd {
+        margin-left: 200px;
+}
+#adminpage h3 {
+        border-bottom: 1px solid #2e2f2e;
+        margin-bottom: 5px;
+        margin-top: 10px;
+}
+
+#adminpage .submit {
+        clear:left;
+}
+
+#adminpage #pluginslist {
+        margin: 0px; padding: 0px;
+}
+
+#adminpage .plugin {
+        list-style: none;
+        display: block;
+	/* border: 1px solid #888888; */
+        padding: 1em;
+        margin-bottom: 5px;
+        clear: left;
+}
+
+#adminpage .toggleplugin {
+        float:left;
+        margin-right: 1em;
+}
+
+#adminpage table {width:100%; border-bottom: 1p solid #000000; margin: 5px 0px;}
+#adminpage table th { text-align: left;}
+#adminpage td .icon { float: left;}
+#adminpage table#users img { width: 16px; height: 16px; }
+#adminpage table tr:hover { background-color: #eeeeee; }
+#adminpage .selectall { text-align: right; }
+/* icons */
+
+.icon.contacts {
+  background-image: url("../diabook-dark/icons/contacts.png");}
+.icon.notifications {
+  background-image: url("../diabook-dark/icons/notifications.png");}
+.icon.notify {
+  background-image: url("../diabook-dark/icons/notify.png");}
+.icon.messages {
+  background-image: url("../diabook-dark/icons/messages.png");}
+.icon.community {
+  background-image: url("../diabook-dark/icons/community.png");}
+  
+.icon.drop 	{ background-image: url("../diabook-dark/icons/drop.png");}
+.icon.drophide 	{ background-image: url("../diabook-dark/icons/drop.png");}
+.icon.dislike 	{ background-image: url("../diabook-dark/icons/dislike.png");}
+.icon.like 	{ background-image: url("../diabook-dark/icons/like.png");}
+.icon.pencil 	{ background-image: url("../diabook-dark/icons/pencil.png");}
+.icon.recycle 	{ background-image: url("../diabook-dark/icons/recycle.png");}
+.icon.remote-link { background-image: url("../diabook-dark/icons/remote.png");}
+.icon.tagged    { background-image: url("../diabook-dark/icons/tagged.png");}
+.icon.file-as { background-image: url("../diabook-dark/icons/file_as.png");}
+.star-item.icon.unstarred { background-image: url("../diabook-dark/icons/unstarred.png");}
+.star-item.icon.starred { background-image: url("../diabook-dark/icons/starred.png");}
+.icon.link		{ background-image: url("../diabook-dark/icons/link.png");}
+.icon.lock		{ background-image: url("../diabook-dark/icons/lock.png");}
+.icon.unlock		{ background-image: url("../diabook-dark/icons/unlock.png");}
+.icon.language    { background-image: url("../diabook-dark/icons/language.png");}
+
+
+.camera 	{ background-image: url("../diabook-dark/icons/camera.png"); 
+			  display: block; width: 28px; height: 28px; background-repeat: no-repeat;
+			  }
+.attach 	{ background-image: url("../diabook-dark/icons/attach.png"); 
+			  display: block; width: 28px; height: 28px; background-repeat: no-repeat;
+			  }
+.video2 	{ background-image: url("../diabook-dark/icons/video.png"); 
+			  display: block; width: 28px; height: 28px; background-repeat: no-repeat;
+			  }	
+.video 	{ background-image: url("../diabook-dark/icons/video.png"); 
+			  display: block; width: 100%; height: 140px; background-repeat: no-repeat;
+			  }
+.audio2 	{ background-image: url("../diabook-dark/icons/audio.png"); 
+			  display: block; width: 28px; height: 28px; background-repeat: no-repeat;
+			  }
+.audio 	{ background-image: url("../diabook-dark/icons/audio.png"); 
+			  display: block; width: 28px; height: 28px; background-repeat: no-repeat;
+			  }
+.weblink 	{ background-image: url("../diabook-dark/icons/weblink.png"); 
+			  display: block; width: 28px; height: 28px; background-repeat: no-repeat;
+			  }
+.globe 	{ background-image: url("../diabook-dark/icons/globe.png"); 
+			  display: block; width: 28px; height: 28px; background-repeat: no-repeat;
+			  }
+.unglobe 	{ background-image: url("../diabook-dark/icons/unglobe.png"); 
+			  display: block; width: 28px; height: 28px; background-repeat: no-repeat;
+			  }
+.edit    {background-image: url("../diabook-dark/icons/pencil2.png"); 
+			  display: block; width: 28px; height: 28px; background-repeat: no-repeat;}
+			  
+			  
+
+
+.article	{ background-position: -50px  0px;}
+/*.audio 		{ background-position: -70px  0px;}*/
+.block 		{ background-position: -90px  0px;}
+/*.drop 		{ background-position: -110px 0px;}*/
+/*.drophide 	{ background-position: -130px 0px;}*/
+/*.edit 		{ background-position: -150px 0px;}*/
+/*.camera 	{ background-position: -170px 0px;}*/
+/*.dislike 	{ background-position: -190px 0px;}*/
+/*.like 		{ background-position: -210px 0px;}*/
+/*.link 		{ background-position: -230px 0px;}*/
+
+/*.globe 		{ background-position: -50px  -20px;}*/
+/*.noglobe 	{ background-position: -70px  -20px;}*/
+.no 		{ background-position: -90px  -20px;}
+.pause 		{ background-position: -110px -20px;}
+.play 		{ background-position: -130px -20px;}
+/*.pencil 	{ background-position: -150px -20px;}*/
+.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;}*/
+
+/*.video          { background-position: -110px -40px;}*/
+.youtube        { background-position: -130px -40px;}
+
+/*.attach         { background-position: -190px -40px;}*/
+/*.language       { background-position: -210px -40px;}*/
+
+
+.icon.on             { background-image: url("../diabook-dark/icons/toogle_on.png"); background-repeat: no-repeat;}
+.icon.off            { background-image: url("../diabook-dark/icons/toogle_off.png"); background-repeat: no-repeat;}
+.prev           { background-position: -90px  -60px;}
+.next           { background-position: -110px -60px;}
+/*.tagged     { background-position: -130px -60px;}*/
+
+.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 0px; }
+.type-audio { background-position: -40px 0px; }
+.type-text  { background-position: -60px 0px; }
+.type-unkn  { background-position: -80px 0px; }
+
+.icon.drop, .icon.drophide {
+ float: left;
+}
+
+.icon {
+  display: block;
+  width: 20px;
+  height: 20px;
+  /*background-image: url('icons.png');*/
+}
+
+.icon {
+  background-color: transparent ;
+  background-repeat: no-repeat;
+  /* background-position: left center; */
+  display: block;
+  overflow: hidden;
+  text-indent: -9999px;
+  padding: 1px;
+}
+
+.icon.border.camera{
+  background-image: url("../diabook-dark/icons/camera.png"); 
+  display: block; width: 28px; height: 28px; background-repeat: no-repeat;
+	}
+	
+.icon.border.link{
+  background-image: url("../diabook-dark/icons/weblink.png"); 
+  display: block; width: 28px; height: 28px; background-repeat: no-repeat;
+  margin-left: 10px;
+	}
+
+.icon.text {
+  text-indent: 0px;
+}
+.icon.s10 {
+  min-width: 10px;
+  height: 10px;
+}
+.icon.s10.notify {
+  background-image: url("../../../../images/icons/10/notify_off.png");
+}
+.icon.s10.gear {
+  background-image: url("../../../../images/icons/10/gear.png");
+}
+.icon.s10.add {
+  background-image: url("../../../../images/icons/10/add.png");
+}
+.icon.s10.delete {
+  background-image: url("../../../../images/icons/10/delete.png");
+}
+.icon.s10.edit {
+  background-image: url("../../../../images/icons/10/edit.png");
+}
+.icon.s10.star {
+  background-image: url("../../../../images/star_dummy.png");
+}
+.icon.s10.menu {
+  background-image: url("../../../../images/icons/10/menu.png");
+}
+.icon.s10.link {
+  background-image: url("../../../../images/icons/10/link.png");
+}
+.icon.s10.lock {
+  background-image: url("../../../../images/icons/10/lock.png");
+}
+.icon.s10.unlock {
+  background-image: url("../../../../images/icons/10/unlock.png");
+}
+.icon.s10.text {
+  padding: 2px 0px 0px 15px;
+  font-size: 10px;
+}
+.icon.s16 {
+  min-width: 16px;
+  height: 16px;
+}
+.icon.s16.notify {
+  background-image: url("../../../../images/icons/16/notify_off.png");
+}
+.icon.s16.gear {
+  background-image: url("../../../../images/icons/16/gear.png");
+}
+.icon.s16.add {
+  background-image: url("../../../../images/icons/16/add.png");
+}
+.icon.s16.delete {
+  background-image: url("../../../../images/icons/16/delete.png");
+}
+/*.icon.s16.edit {
+  background-image: url("../../../../images/icons/16/edit.png");
+}*/
+.icon.s16.star {
+  background-image: url("../../../../images/star_dummy.png");
+}
+.icon.s16.menu {
+  background-image: url("../../../../images/icons/16/menu.png");
+}
+/*.icon.s16.link {
+  background-image: url("../../../../images/icons/16/link.png");
+}*/
+.icon.s16.lock {
+  background-image: url("../../../../images/icons/16/lock.png");
+}
+.icon.s16.unlock {
+  background-image: url("../../../../images/icons/16/unlock.png");
+}
+.icon.s16.text {
+  padding: 4px 0px 0px 20px;
+  font-size: 10px;
+}
+.icon.s22 {
+  min-width: 22px;
+  height: 22px;
+}
+.icon.s22.notify {
+  background-image: url("../../../../images/icons/22/notify_off.png");
+}
+.icon.s22.gear {
+  background-image: url("../../../../images/icons/22/gear.png");
+}
+.icon.s22.add {
+  background-image: url("../../../../images/icons/22/add.png");
+}
+.icon.s22.delete {
+  background-image: url("../../../../images/icons/22/delete.png");
+}
+.icon.s22.edit {
+  background-image: url("../../../../images/icons/22/edit.png");
+}
+.icon.s22.star {
+  background-image: url("../../../../images/star_dummy.png");
+}
+.icon.s22.menu {
+  background-image: url("../../../../images/icons/22/menu.png");
+}
+.icon.s22.link {
+  background-image: url("../../../../images/icons/22/link.png");
+}
+.icon.s22.lock {
+  background-image: url("../../../../images/icons/22/lock.png");
+}
+.icon.s22.unlock {
+  background-image: url("../../../../images/icons/22/unlock.png");
+}
+.icon.s22.text {
+  padding: 10px 0px 0px 25px;
+  width: 200px;
+}
+.icon.s48 {
+  width: 48px;
+  height: 48px;
+}
+.icon.s48.notify {
+  background-image: url("../../../../images/icons/48/notify_off.png");
+}
+.icon.s48.gear {
+  background-image: url("../../../../images/icons/48/gear.png");
+}
+.icon.s48.add {
+  background-image: url("../../../../images/icons/48/add.png");
+}
+.icon.s48.delete {
+  background-image: url("../../../../images/icons/48/delete.png");
+}
+.icon.s48.edit {
+  background-image: url("../../../../images/icons/48/edit.png");
+}
+.icon.s48.star {
+  background-image: url("../../../../images/star_dummy.png");
+}
+.icon.s48.menu {
+  background-image: url("../../../../images/icons/48/menu.png");
+}
+.icon.s48.link {
+  background-image: url("../../../../images/icons/48/link.png");
+}
+.icon.s48.lock {
+  background-image: url("../../../../images/icons/48/lock.png");
+}
+.icon.s48.unlock {
+  background-image: url("../../../../images/icons/48/unlock.png");
+}
+
+#contact-edit-links ul {
+  list-style: none;
+  list-style-type: none;
+}
+
+.hide-comments-outer {
+  margin-left: 80px;
+  margin-bottom: 5px;
+  width: 484px;
+  border-bottom: 1px solid #BDCDD4;
+  border-top: 1px solid #BDCDD4;
+
+  padding: 8px;
+}
+
+/* global */
+body {
+  font-family: 'Lato', "Helvetica Neue", Helvetica, Arial, sans-serif;
+  font-size: 12.5px;
+  background-color: #2e2f2e;
+  color: #2e302;
+  margin: 50px auto auto;
+  display: table;
+}
+
+h4 {
+  font-size: 1.1em;
+}
+
+a {
+	color: #88a9d2;
+	/* color: #3e3e8c; */
+	text-decoration: none;
+}
+a:hover {
+	/* color: blue; */
+	text-decoration: underline
+}
+
+.wall-item-name-link {
+/*  float: left;*/
+}
+
+.wall-item-photo {
+  width: 48px;
+  height: 48px;
+  overflow: hidden;
+  display: block;
+}
+
+.left {
+  float: left;
+}
+.right {
+  float: right;
+}
+.hidden {
+  display: none;
+}
+.clear {
+  clear: both;
+}
+.fakelink {
+  color: #1872A2;
+  /* color: #3e3e8c; */
+  text-decoration: none;
+  cursor: pointer;
+}
+.fakelink:hover {
+  /* color: blue; */
+  /*color: #005c94; */
+  text-decoration: underline;
+}
+code {
+  font-family: Courier, monospace;
+  white-space: pre;
+  display: block;
+  overflow: auto;
+  border: 1px solid #444;
+  background: #EEE;
+  color: #444;
+  padding: 10px;
+  margin-top: 20px;
+}
+#panel {
+  position: absolute;
+  width: 12em;
+  background: #2e2f2e;
+  color: #2e302;
+  margin: 0px;
+  padding: 1em;
+  list-style: none;
+  border: 3px solid #364e59;
+  z-index: 100000;
+  -webkit-box-shadow: 0px 5px 10px rgba(0, 0, 0, 0.7);
+  -moz-box-shadow: 0px 5px 10px rgba(0, 0, 0, 0.7);
+  box-shadow: 0px 5px 10px rgba(0, 0, 0, 0.7);
+}
+/* tool */
+.tool {
+  height: auto;
+  overflow: auto;
+  padding: 3px;
+}
+#saved-search-ul .tool:hover,
+#nets-sidebar .tool:hover,
+#sidebar-group-list .tool:hover {
+	background: #EEE;
+}
+.tool .label {
+  float: left;
+}
+.tool .action {
+  float: right;
+}
+.tool a {
+  color: ##3F8FBA;
+}
+.tool a:hover {
+  text-decoration: none;
+}
+/* popup notifications */
+div.jGrowl div.notice {
+  background: #511919 url("../../../../images/icons/48/notice.png") no-repeat 5px center;
+  color: #2e2f2e;
+  padding-left: 58px;
+}
+div.jGrowl div.info {
+  background: #364e59 url("../../../../images/icons/48/info.png") no-repeat 5px center;
+  color: #2e2f2e;
+  padding-left: 58px;
+}
+/* header */
+header {
+  position: fixed;
+  left: 0%;
+  right: 80%;
+  top: 0px;
+  margin: 0px;
+  padding: 0px;
+  width: 22%;
+  height: 32px;
+  background: #1d1f1d;
+  background-color: #1d1f1d;
+  z-index: 100;
+  border-bottom: 1px;
+  border-bottom-color: black;
+  border-bottom-style: inset;
+}
+header #site-location {
+  display: none;
+}
+header #banner {
+  overflow: hidden;
+  text-align: left;
+  width: 82%%;
+  margin-left: 25%;
+}
+header #banner a,
+header #banner a:active,
+header #banner a:visited,
+header #banner a:link,
+header #banner a:hover {
+  color: #2e2f2e;
+  text-decoration: none;
+  outline: none;
+  vertical-align: middle;
+ font-weight: bolder;
+  margin-left: 3px;
+}
+header #banner #logo-img {
+  height: 25px;
+  margin-top: 3px;
+}
+header #banner #logo-text {
+  font-size: 20px;
+  position: absolute;
+  top: 10%;
+}
+/* nav */
+nav {
+  width: 80%;
+  height: 32px;
+  position: fixed;
+  left: 22%;
+  top: 0px;
+  padding: 0px;
+  background: #1d1f1d;
+  color: #2e2f2e;
+  z-index: 99;
+  border-bottom: 1px;
+  border-bottom-color: black;
+  border-bottom-style: inset;
+}
+nav a,
+nav a:active,
+nav a:visited,
+nav a:link,
+nav a:hover {
+  color: #eec;
+  text-decoration: none;
+  outline: none;
+}
+nav #banner {
+  overflow: hidden;
+  /*text-align: center;*/
+  width: 100%;
+}
+nav #banner a,
+nav #banner a:active,
+nav #banner a:visited,
+nav #banner a:link,
+nav #banner a:hover {
+  color: #2e2f2e;
+  text-decoration: none;
+  outline: none;
+  vertical-align: bottom;
+}
+nav #banner #logo-img {
+  height: 22px;
+  margin-top: 5px;
+}
+nav #banner #logo-text {
+  font-size: 22px;
+}
+nav #navbar{
+	}
+nav ul {
+  margin: 0px;
+  padding: 0px 20px;
+}
+nav ul li {
+  list-style: none;
+  margin: 0px;
+  /* padding: 1px 1px 3px 1px; */
+  float: left;
+}
+nav ul li .menu-popup {
+  left: 0px;
+  right: auto;
+}
+
+nav #logo-img {
+  height: 25px;
+  margin-top: 4px;
+  margin-left: 30px;
+}
+
+nav #logo-text {
+    font-size: 22px;
+    margin-top: 3px;
+    margin-right: 15px;
+}
+nav .nav-menu-search {
+  position: relative;
+
+  margin: 4px 17px;
+  margin-right: 0px;
+  height: 17px;
+  width: 180px;
+  
+}
+
+nav #search-box #search-text {
+  background-image:  url('icons/lupe.png');
+  background-repeat:no-repeat;
+  padding-left:20px;
+  border-top-left-radius: 15px;
+border-top-right-radius: 15px;
+border-bottom-right-radius: 15px;
+border-bottom-left-radius: 15px;
+	}
+
+
+nav .nav-menu-icon {
+  position: relative;
+  height: 22px;
+  padding: 5px;
+  margin: 0px 5px;
+  -moz-border-radius: 5px 5px 0 0;
+  -webkit-border-radius: 5px 5px 0 0;
+  border-radius: 5px 5px 0 0;
+}
+nav .nav-menu-icon:hover {
+  background-color: #eec;  
+  position: relative;
+  height: 22px;
+  padding: 5px;
+  margin: 0px 5px;
+  -moz-border-radius: 5px 5px 0 0;
+  -webkit-border-radius: 5px 5px 0 0;
+  border-radius: 5px 5px 0 0;
+}
+
+nav .nav-menu-icon.selected {
+  background-color: #fff;
+}
+nav .nav-menu-icon img {
+  width: 22px;
+  height: 22px;
+}
+nav .nav-menu-icon .nav-notify {
+  top: 3px;
+}
+nav .nav-menu {
+  position: relative;
+  height: 16px;
+  padding: 5px;
+  margin: 3px 15px 0px;
+  font-size: 13px;
+  /*border-bottom: 3px solid #364A84;*/
+}
+nav .nav-menu.selected {
+  /*border-bottom: 3px solid #9eabb0;*/
+}
+nav .nav-notify {
+  display: none;
+  position: absolute;
+  background-color: #ff0000;
+  /* background-color: #19aeff; */
+  -moz-border-radius: 5px 5px 5px 5px;
+  -webkit-border-radius: 5px 5px 5px 5px;
+  border-radius: 5px 5px 5px 5px;
+  font-size: 10px;
+  font-weight: 900;
+  padding: 1px 4px;
+  top: 0px;
+  right: -6px;
+  min-width: 10px;
+  text-align: center;
+}
+nav .nav-notify.show {
+  display: block;
+}
+nav #nav-help-link,
+nav #nav-search-link,
+nav #nav-directory-link,
+nav #nav-apps-link,
+nav #nav-site-linkmenu, 
+nav #nav-home-link,
+nav #nav-user-linkmenu
+{
+  float: right;
+}
+nav #nav-user-linkmenu{
+	margin-right: 0px;
+	}
+nav #nav-home-link, #nav-directory-link, #nav-apps-link{
+	margin-left: 0px;
+	margin-right: 0px;
+	font-weight: bold;
+	margin: 3px 5px;
+	}
+nav #nav-directory-link{
+  margin-right: 0px;	
+	}
+nav #nav-home-link{
+  margin-left: 0px;	
+	}
+nav #nav-help-link .menu-popup,
+nav #nav-search-link .menu-popup,
+nav #nav-directory-link .menu-popup,
+nav #nav-apps-link .menu-popup,
+nav #nav-site-linkmenu .menu-popup {
+  right: 0px;
+  left: auto;
+}
+
+nav #nav-messages-linkmenu.on .icon.messages, nav #nav-messages-linkmenu.selected .icon.messages{
+	background-image: url("../diabook-dark/icons/messages2.png");
+	}
+	
+/*nav #nav-notifications-linkmenu.on .icon.notify,*/ nav #nav-notifications-linkmenu.selected .icon.notify{
+	background-image: url("../diabook-dark/icons/notify2.png");
+	}
+	
+nav #nav-contacts-linkmenu.on .icon.contacts, nav #nav-contacts-linkmenu.selected .icon.contacts{
+	background-image: url("../diabook-dark/icons/contacts2.png");
+	}
+	
+nav #nav-apps-link.selected {
+  background-color: #fff;
+}
+
+#nav-notifications-mark-all {
+	/* padding: 1px 1px 2px 26px; */
+	/* border-bottom: 1px solid #364E59; */
+	/* margin: 0px 0px 2px 0px;
+	padding: 5px 10px; */
+}
+
+#nav-notifications-see-all {
+	/* padding: 1px 1px 2px 26px; */
+	/* border-bottom: 1px solid #364E59; */
+	/* margin: 0px 0px 2px 0px;
+	padding: 5px 10px; */
+}
+
+.notify-seen {
+	background: none repeat scroll 0 0 #DDDDDD;
+	}
+
+ul.menu-popup {
+  position: absolute;
+  display: none;
+  width: 11em;
+  background: #2e2f2e;
+  color: #2e302;
+  margin: 0px;
+  padding: 0px;
+  list-style: none;
+  z-index: 100000;
+  -webkit-box-shadow: 0px 5px 10px rgba(0, 0, 0, 0.7);
+  -moz-box-shadow: 0px 5px 10px rgba(0, 0, 0, 0.7);
+  box-shadow: 0px 5px 10px rgba(0, 0, 0, 0.7);
+}
+ul.menu-popup a {
+  display: block;
+  color: #2e302;
+  padding: 5px 10px;
+  text-decoration: none;
+}
+ul.menu-popup a:hover {
+  background-color: #308DBF; /*2e2f2e;*/
+  color: #fff;
+}
+ul.menu-popup .menu-sep {
+  border-top: 1px solid #9eabb0;
+}
+ul.menu-popup li {
+  float: none;
+  overflow: auto;
+  height: auto;
+  display: block;
+}
+ul.menu-popup li img {
+  float: left;
+  width: 16px;
+  height: 16px;
+  padding-right: 5px;
+}
+ul.menu-popup .empty {
+  padding: 5px;
+  text-align: center;
+  color: #9eabb0;
+}
+/* autocomplete popup */
+.acpopup {
+  max-height: 150px;
+  background-color: #2e2f2e;
+  color: #2e302;
+  border: 1px solid #MenuBorder;
+  overflow: auto;
+  z-index: 100000;
+  -webkit-box-shadow: 0px 5px 10px rgba(0, 0, 0, 0.7);
+  -moz-box-shadow: 0px 5px 10px rgba(0, 0, 0, 0.7);
+  box-shadow: 0px 5px 10px rgba(0, 0, 0, 0.7);
+}
+.acpopupitem {
+  color: #2e2f2e;
+  padding: 4px;
+  clear: left;
+}
+.acpopupitem img {
+  float: left;
+  margin-right: 4px;
+}
+.acpopupitem.selected {
+  background-color: #2e2f2e;
+}
+#nav-notifications-menu {
+  width: 400px;
+  max-height: 550px;
+  overflow: auto;
+}
+/* #nav-notifications-menu a {
+	display: inline;
+	padding: 5px 0px;
+	margin: 0px 0px 2px 0px;
+}
+#nav-notifications-menu li:hover {
+  background-color: #2e2f2e;
+}*/
+
+#nav-notifications-menu img {
+  float: left;
+  margin-right: 5px;
+}
+#nav-notifications-menu .contactname {
+  font-weight: bold;
+}
+#nav-notifications-menu .notif-when {
+  font-size: 10px;
+  color: #9eabb0;
+  display: block;
+}
+
+.notif-image {
+        width: 32px;
+        height: 32px;
+        padding: 7px 7px 0px 0px;
+}
+
+/*profile_side*/
+#profile_side {
+  margin-bottom: 30px;
+}
+#ps-usericon{
+	height: 25px	
+	}
+#ps-username{
+  font-size: 1.17em;
+  font-weight: bold;
+  vertical-align: top;
+  position: absolute;
+  padding-top: 4px;
+  padding-left: 5px;	
+  word-wrap: break-word;
+  width: 130px;
+	}
+#ps-username:hover{
+  text-decoration: none;	
+	}
+.menu-profile-side{
+  list-style: none;	
+  padding-left: 0px;
+  min-height: 0px;
+	}
+.menu-profile-list{
+  height: auto;
+  overflow: auto;
+  padding-top: 3px;
+  padding-bottom: 3px;
+  padding-left: 16px;
+  min-height: 16px;
+  list-style: none;
+	}
+.menu-profile-list:hover{
+	background: #EEE;
+	}
+.menu-profile-list-item{
+	padding-left: 5px;
+	}	
+.menu-profile-list-item:hover{	
+	text-decoration: none;
+   }
+/*http://prothemedesign.com/circular-icons/*/
+.menu-profile-list.home{
+	background: url("../diabook-dark/icons/home.png") no-repeat;
+	}
+.menu-profile-list.photos{
+	background: url("../diabook-dark/icons/mess_side.png") no-repeat;
+	}
+.menu-profile-list.events{
+	background: url("../diabook-dark/icons/events.png") no-repeat;
+	}
+.menu-profile-list.notes{
+	background: url("../diabook-dark/icons/notes.png") no-repeat;
+	}
+.menu-profile-list.foren{
+	background: url("../diabook-dark/icons/pubgroups.png") no-repeat;
+	}
+.menu-profile-list.com_side{
+	background: url("../diabook-dark/icons/com_side.png") no-repeat;
+	}
+
+/* aside */
+aside {
+  display: table-cell;
+  vertical-align: top;
+  width: 160px;
+  padding: 0px 10px 0px 10px;
+  border-right: 1px solid #D2D2D2;
+  float: left;
+  /* background: #F1F1F1; */
+}
+
+aside .vcard .fn {
+  font-size: 18px;
+  font-weight: bold;
+  margin-bottom: 5px;
+}
+aside .vcard .title {
+  margin-bottom: 5px;
+}
+aside .vcard dl {
+  height: auto;
+  overflow: auto;
+}
+aside .vcard dt {
+  float: left;
+  margin-left: 0px;
+  /*width: 35%;*/
+  text-align: right;
+  color: #999999;
+}
+aside .vcard dd {
+  float: left;
+  margin-left: 5px;
+  /*width: 60%;*/
+}
+aside #profile-extra-links ul {
+  padding: 0px;
+  margin: 0px;
+}
+aside #profile-extra-links li {
+  padding: 0px;
+  margin: 0px;
+  list-style: none;
+}
+aside #dfrn-request-link {
+  display: block;
+  -moz-border-radius: 5px 5px 5px 5px;
+  -webkit-border-radius: 5px 5px 5px 5px;
+  border-radius: 5px 5px 5px 5px;
+  color: #2e2f2e;
+  background: #005c94 url('../../../../images/connect-bg.png') no-repeat left center;
+  font-weight: bold;
+  text-transform: uppercase;
+  padding: 4px 2px 2px 35px;
+}
+aside #dfrn-request-link:hover {
+  text-decoration: none;
+  background-color: #36c;
+  /* background-color: #19aeff; */
+}
+aside #profiles-menu {
+  width: 20em;
+}
+aside #search-text {
+	width: 150px;
+		height: 17px;
+		padding-left: 10px;
+	border-top-left-radius: 15px;
+border-top-right-radius: 15px;
+border-bottom-right-radius: 15px;
+border-bottom-left-radius: 15px;
+}
+aside #side-follow-url {
+	width: 150px;
+	}
+aside #side-peoplefind-url {
+	width: 150px;
+	}
+#contact-block {
+  overflow: auto;
+  height: auto;
+}
+#contact-block .contact-block-h4 {
+  float: left;
+  margin: 5px 0px;
+}
+#contact-block .allcontact-link {
+  float: right;
+  margin: 5px 0px;
+}
+#contact-block .contact-block-content {
+  clear: both;
+  overflow: auto;
+  height: auto;
+}
+#contact-block .contact-block-link {
+  float: left;
+  margin: 0px 2px 2px 0px;
+}
+#contact-block .contact-block-link img {
+  widht: 48px;
+  height: 48px;
+}
+#lost-password-link {
+  float: left;
+  margin-right: 20px;	
+	}
+/* widget */
+.widget {
+  margin-bottom: 2em;
+  /*.action .s10 { width: 10px; overflow: hidden; padding: 0px;}
+	.action .s16 { width: 16px; overflow: hidden; padding: 0px;}*/
+/*  font-size: 12px; */
+}
+.widget h3 {
+  padding: 0px;
+  margin: 2px;
+}
+.widget .action {
+  opacity: 0.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;
+}
+.widget input.action {
+  opacity: 0.5;
+  -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;
+}
+.widget:hover .title .action {
+  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;
+}
+.widget .tool:hover .action {
+  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;
+}
+.widget .tool:hover .action.ticked {
+  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;
+}
+.widget ul {
+  padding: 0px;
+}
+.widget ul li {
+  padding-left: 16px;
+  min-height: 16px;
+  list-style: none;
+}
+#side-bar-photos-albums li{
+list-style-type: disc;
+}
+#side-bar-photos-albums ul li{
+  margin-left: 30px;
+  padding-left: 0px;
+	}
+#side-bar-photos-albums ul li a{
+  color: #1872A2;
+}
+.widget .tool.selected {
+  background: url("../diabook-dark/icons/selected.png") no-repeat left center;
+}
+/* widget: search */
+span.sbox_l  {
+	background: white url('../diabook/icons/srch_l.gif') no-repeat top left;
+	float: left;
+	width: 19px; height: 19px;
+	margin-left: 10px;
+	margin-top: 5px;
+	
+}
+
+span.sbox_r  {
+	background: white url('../diabook/icons/srch_r.gif') no-repeat top left;
+	float: left;
+	width: 19px; height: 19px;
+	margin-top: 5px;
+}
+
+span.sbox input {
+	background: white url('../diabook/icons/srch_bg.gif') repeat-x top left;
+	float: left;
+	margin-top: 5px;
+	border: 0;
+	height: 13px; width: 100px;
+	padding: 3px;
+	font: 11px/13px arial;
+	color: #000;
+}
+#add-search-popup {
+  width: 200px;
+  top: 18px;
+}
+/* section */
+section {
+  display: table-cell;
+  vertical-align: top;
+  width: 611px;
+  padding: 0px 0px 0px 12px;
+}
+
+body .pageheader{
+  text-align: center;
+  font-size: 20px;
+  margin-bottom: 20px;
+  margin-top: 0px;
+  max-width: 575px;
+	}
+.qcomment{
+  max-width: 122px;	
+	}
+#id_username {
+  width: 173px;	
+	}
+#id_password {
+  width: 173px;		
+	}
+#id_openid_url {
+  width: 173px;	
+	}
+#contact-edit-end {
+	}
+.pager {
+   padding: 10px;
+	text-align: center;
+	font-size: 1.0em;
+	clear: both;
+	display: block;
+}	
+
+.tabs {
+    
+    background-position: 0 -20px;
+    background-repeat: repeat-x;
+    height: 27px;
+    padding: 0;
+ }
+.tab.button {
+    margin-left: 5px;	
+    /*background: none repeat scroll 0 0 #F8F8F8;*/
+    border: 1px solid #CCCCCC;
+    border-radius: 3px 3px 3px 3px;
+    font-weight: normal;
+    padding: 3px;
+    color:  #88a9d2;
+	}
+	
+#birthday-notice, #event-notice, #birthday-wrapper, #event-wrapper{
+	margin-bottom: 10px;
+	}
+
+right_aside {
+  display: table-cell;
+  vertical-align: top;
+  width: 170px;
+  /*padding-right: 10px;*/
+  /*border-left: 1px solid #D2D2D2;*/
+  
+  /* background: #F1F1F1; */
+}
+right_aside a{color: #1872A2;}
+right_aside h3 {border-bottom: 1px solid #D2D2D2; padding-top: 5px; padding-bottom: 0px; padding-left: 9px; margin-bottom: 0px; 
+margin-top:30px;}
+right_aside .directory-item {	width: 50px; height: 50px; vertical-align: center; text-align: center; }
+right_aside .directory-photo { margin: 0px; }
+right_aside .directory-photo-img { max-width: 45px; max-height: 45px; }
+right_aside #likes { margin: 0px; padding: 0px; list-style: none; }
+right_aside .items-wrapper{ overflow: auto;	width: 100%; }
+right_aside #lastusers-wrapper { padding-left: 6px; padding-top: 3px; overflow: auto;	width: 100%; }
+right_aside #ra-photos-wrapper { padding-left: 5px; padding-top: 3px; overflow: auto;	width: 100%; }
+#page-sidebar-right_aside{margin-top: 0px; margin-bottom: 30px;}
+#page-sidebar-right_aside ul {margin-top: 0px;}
+#page-sidebar-right_aside .label {max-width: 128px;}
+right_aside .icon {width: 10px; height: 10px;}
+.close_box		{ 
+		background-image: url("../diabook-dark/icons/close_box.png");
+		float: right;
+		cursor: pointer;
+		opacity: 0.1;
+		}
+.close_box:hover	{ 
+		background-image: url("../diabook-dark/icons/close_box.png");
+		float: right;
+		cursor: pointer;
+		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;
+		}
+/* wall item */
+.tread-wrapper {
+  border-bottom: 1px solid #D2D2D2;
+  position: relative;
+  padding: 5px;
+  margin-bottom: 0px;
+  width: 575px;
+  padding-top: 10px;
+}
+.tread-wrapper a{
+  color: #1872A2;
+}
+
+.wall-item-decor {
+  position: absolute;
+  left: 790px;
+  top: -10px;
+  width: 16px;
+}
+
+.wall-item-container {
+  display: table;
+  width: 580px;
+}
+
+
+.wall-item-container .wall-item-item, .wall-item-container .wall-item-bottom {
+  display: table-row;
+}
+
+.wall-item-bottom {
+  font-size: 13px;
+}
+.wall-item-container .wall-item-bottom {
+/*  opacity: 0.5;
+  -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; */
+}
+.wall-item-container:hover .wall-item-bottom {
+/*  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; */
+}
+.wall-item-container .wall-item-info {
+  display: table-cell;
+  vertical-align: top;
+  text-align: left;
+  width: 80px;
+}
+.wall-item-container .wall-item-location {
+  padding-right: 40px;
+  display: table-cell;
+}
+.wall-item-container .wall-item-ago {
+  word-wrap: break-word;
+  width: 50px;
+  margin-left: 10px;
+  color: #999;
+}
+.wall-item-location {
+  
+  clear: both;
+  overflow: hidden;
+  
+  margin-bottom: 5px;
+}
+
+.wall-item-container .wall-item-content {
+
+  max-width: 420px;
+  word-wrap: break-word;
+
+
+}
+
+.wall-item-container .wall-item-content img {
+  max-width: 400px;
+
+}
+.wall-item-container .wall-item-links, .wall-item-container .wall-item-actions {
+  display: table-cell;
+  vertical-align: middle;
+}
+.wall-item-container .wall-item-links .icon, .wall-item-container .wall-item-actions .icon {
+  opacity: 0.5;
+  -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;
+}
+.wall-item-container .wall-item-links .icon:hover, .wall-item-container .wall-item-actions .icon: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;
+}
+.wall-item-container .wall-item-name {
+  font-weight: bold;
+}
+.wall-item-container .wall-item-actions-author {
+  width: 100%;
+  margin-bottom: 0.3em;
+}
+.wall-item-container .wall-item-actions-social {
+  float: left;
+  margin-bottom: 1px;
+  display: table-cell;
+}
+.wall-item-container .wall-item-actions-social a {
+  margin-right: 1em;
+}
+.wall-item-actions-social a {
+  float: left;
+}
+.wall-item-container .wall-item-actions-tools {
+  float: right;
+  width: 80px;
+  display: table-cell;
+}
+.wall-item-container .wall-item-actions-tools a {
+  float: right;
+}
+.wall-item-container .wall-item-actions-tools input {
+  float: right;
+}
+.wall-item-container.comment {
+  margin-top: 5px;
+  margin-bottom: 5px;
+  margin-left: 80px;
+  width: 500px;
+  border-bottom: 1px solid hsl(198, 21%, 79%);
+}
+.wall-item-container.comment .contact-photo {
+  width: 32px;
+  height: 32px;
+  margin-left: 16px;
+  /*background: url(../../../../images/icons/22/user.png) no-repeat center center;*/
+
+}
+.wall-item-container.comment {
+  top: 15px !important;
+  left: 15px !important;
+}
+.wall-item-container.comment .wall-item-links {
+  padding-left: 12px;
+}
+.wall-item-comment-wrapper {
+  margin: 1px 5px 5px 80px;
+}
+.wall-item-comment-wrapper .comment-edit-photo {
+  display: none;
+}
+.wall-item-comment-wrapper textarea {
+  height: 2.0em;
+  width: 100%;
+  font-size: 10px;
+  color: #999999;
+  border: 1px solid #DDD;
+  padding: 0.3em;
+  font-size: 14px;
+}
+.wall-item-comment-wrapper .comment-edit-text-full {
+  font-size: 14px;
+  height: 4em;
+  color: #2e302;
+  border: 1px solid #2e302;
+}
+.comment-edit-preview {
+  width: 500px;
+  margin-top: 10px;
+  background-color:  #fff797;
+}
+.comment-edit-preview .contact-photo {
+  width: 32px;
+  height: 32px;
+  margin-left: 16px;
+  /*background: url(../../../../images/icons/22/user.png) no-repeat center center;*/
+
+}
+.comment-edit-preview {
+  top: 15px !important;
+  left: 15px !important;
+}
+.comment-edit-preview .wall-item-links {
+  padding-left: 12px;
+}
+.comment-edit-preview .wall-item-container {
+  width: 700px;
+}
+.comment-edit-preview .tread-wrapper {
+  width: 700px;
+  padding: 0;
+  margin: 10px 0;
+}
+
+.shiny {
+  /* border-right: 10px solid #fce94f; */
+	border-right: 1px solid #A7C7F7;
+	padding-right: 12px;
+}
+
+#jot-preview-content{
+	margin-top: 30px;}
+	
+#jot-preview-content .tread-wrapper {
+  background-color: #fff797;
+}
+
+.wall-item-tags {
+  padding-top: 1px;
+  padding-bottom: 2px;
+}
+.tag {
+  /*background: url("../../../../images/tag_b.png") repeat-x center left;*/
+  color: #999;
+  padding-left: 3px;
+  font-size: 12px;
+}
+.tag a {
+  padding-right: 5px;
+  /*background: url("../../../../images/tag.png") no-repeat center right;*/
+  color: #999;
+}
+.wwto {
+  position: absolute !important;
+  width: 25px;
+  height: 25px;
+  background: #FFFFFF;
+  border: 2px solid #364e59;
+  height: 25px;
+  width: 25px;
+  overflow: hidden;
+  padding: 1px;
+  position: absolute !important;
+  top: 40px;
+  left: 30px;
+  -webkit-box-shadow: 0px 0px 10px rgba(0, 0, 0, 0.7);
+  -moz-box-shadow: 0px 0px 10px rgba(0, 0, 0, 0.7);
+  box-shadow: 0px 0px 10px rgba(0, 0, 0, 0.7);
+}
+.wwto .contact-photo {
+  width: auto;
+  height: 25px;
+}
+/* contacts menu */
+.contact-photo-wrapper {
+  position: relative;
+  width: 80px;
+}
+
+.contact-photo-wrapper.wwto {
+  width: 25px;
+}
+
+.contact-photo {
+  width: 48px;
+  height: 48px;
+  overflow: hidden;
+  display: block;
+}
+.contact-photo img {
+  width: 48px;
+  height: 48px;
+}
+
+.contact-wrapper {
+  float: left;
+  width: 90px;
+  height: 90px;
+  margin-bottom: 15px;
+}
+.contact-wrapper .contact-photo {
+  width: 80px;
+  height: 80px;
+}
+.contact-wrapper .contact-photo img {
+  width: 80px;
+  height: 80px;
+}
+.contact-wrapper {
+  left: 0px;
+  top: 63px;
+}
+.contact-photo {
+  width: 48px;
+  height: 48px;
+}
+.contact-photo img {
+  width: 48px;
+  height: 48px;
+}
+.contact-name {
+  /* text-align: center; */
+  /*font-weight: bold;*/
+  font-size: 12px;
+}
+.contact-details {
+  color: #999999;
+}
+/* editor */
+.jothidden {
+  display: none;
+}
+#jot {
+  width: 585px;
+  margin: 0px 2em 20px 0px;
+}
+#profile-jot-form #profile-jot-text {
+  height: 2.0em;
+  width: 99%;
+  font-size: 15px;
+  color: #999999;
+  border: 1px solid #DDD;
+  padding: 0.3em;
+  margin-bottom: 10px;
+}
+.grey
+{
+  display: inline;
+  float: right;	
+	}
+#jot #jot-tools {
+  margin: 0px;
+  padding: 0px;
+  height: 40px;
+  overflow: none;
+  width: 583px;
+  background-color: #fff;
+  border-bottom: 2px solid #9eabb0;
+}
+
+#jot #jot-tools li {
+  list-style: none;
+  float: left;
+  width: 80px;
+  height: 40px;
+  border-bottom: 2px solid #9eabb0;
+}
+#jot #jot-tools li a {
+  display: block;
+  color: #cccccc;
+  width: 100%;
+  height: 40px;
+  text-align: center;
+  line-height: 40px;
+  overflow: hidden;
+}
+#jot #jot-tools li:hover {
+  background-color: #364e59;
+  border-bottom: 2px solid #2e2f2e;
+}
+#jot #jot-tools li.perms {
+  float: right;
+  width: 40px;
+}
+#jot #jot-tools li.perms a.unlock {
+  width: 30px;
+  border-left: 10px solid #cccccc;
+  background-color: #cccccc;
+  background-position: left center;
+}
+#jot #jot-tools li.perms a.lock {
+  width: 30px;
+  border-left: 10px solid #666666;
+  background-color: #666666;
+}
+#jot #jot-tools li.submit {
+  float: right;
+  background-color: #cccccc;
+  border-bottom: 2px solid #cccccc;
+  border-right: 1px solid #666666;
+  border-left: 1px solid #666666;
+}
+#jot #jot-tools li.submit input {
+  border: 0px;
+  margin: 0px;
+  padding: 0px;
+  background-color: #cccccc;
+  color: #666666;
+  width: 80px;
+  height: 40px;
+  line-height: 40px;
+}
+#jot #jot-tools li.submit input:hover {
+  background-color: #2e2f2e;
+  color: #666666;
+}
+#jot #jot-tools li.loading {
+  float: right;
+  background-color: #2e2f2e;
+  width: 20px;
+  vertical-align: center;
+  text-align: center;
+  border-top: 2px solid #9eabb0;
+  height: 38px;
+}
+#jot #jot-tools li.loading img {
+  margin-top: 10px;
+}
+#profile-jot-form #jot-title {
+    
+  	 border-radius: 5px 5px 5px 5px;
+    font-weight: bold;
+    height: 20px;
+    margin: 0 0 5px;
+    width: 60%;
+    border: 1px solid #d2d2d2;
+}
+#profile-jot-form #jot-title:-webkit-input-placeholder {
+  font-weight: normal;
+}
+#profile-jot-form #jot-title:-moz-placeholder {
+  font-weight: normal;
+}
+#profile-jot-form #profile-jot-text_parent #profile-jot-text_tbl{
+	width: 585px;
+	height: 100px;
+	}
+#jot #jot-title:hover {
+  border: 1px solid #999999;
+}
+#jot #jot-title:focus {
+  border: 1px solid #999999;
+}
+#jot #character-counter {
+  width: 80px;
+  float: right;
+  text-align: right;
+  height: 20px;
+  line-height: 20px;
+  padding-right: 20px;
+}
+#jot-perms-icon, 
+#profile-location,
+#profile-nolocation,
+#profile-youtube, 
+#profile-video, 
+#profile-audio,
+#profile-link,
+#profile-title, 
+#wall-image-upload,
+#wall-file-upload,
+#wall-image-upload-div,
+#wall-file-upload-div,
+.hover, .focus {
+	cursor: pointer;
+	margin-top: 2px;
+}
+#profile-jot-wrapper{
+	margin: 0 2em 20px 0;
+   width: 585px;
+	}
+
+#profile-jot-submit-wrapper {
+	margin-bottom: 50px;
+	width: 585px;
+}
+
+#profile-jot-submit {
+	float: right;
+	margin-top: 2px;
+	
+}
+#profile-upload-wrapper {
+	float: left;
+	margin-top: 2px;
+	margin-left: 10px;
+	font-size: 14px;
+}
+#profile-attach-wrapper {
+	float: left;
+	margin-left: 15px;
+	margin-top: 2px;
+}
+#profile-rotator {
+	float: left;
+	margin-left: 30px;
+	margin-top: 2px;
+}
+#profile-link-wrapper {
+	float: left;
+	margin-left: 15px;
+	margin-top: 2px;
+}
+#profile-youtube-wrapper {
+	float: left;
+	margin-left: 15px;
+	margin-top: 2px;
+}
+#profile-video-wrapper {
+	float: left;
+	margin-left: 15px;
+	margin-top: 2px;
+}
+#profile-audio-wrapper {
+	float: left;
+	margin-left: 15px;
+	margin-top: 2px;
+}
+#profile-location-wrapper {
+	float: left;
+	margin-left: 15px;
+	margin-top: 2px;
+}
+#profile-jot-perms {
+	float: left;
+	margin-left: 45px;
+	margin-top: 2px;
+}
+#jot-preview-link {
+	float: right;
+	margin-left: 10px;
+	margin-top: 2px;
+	font-size: 9px;
+	font-weight: bolder;
+	cursor: pointer;
+}
+#profile-jot-perms{
+   float: right;
+	margin-left: 10px;
+	margin-top: 2px;	
+	}
+/** buttons **/
+.button.creation1 {
+    background-color: #fff;
+    border: 1px solid #777777;
+    border-radius: 3px 3px 3px 3px;
+    box-shadow: 0 1px 1px #CFCFCF;
+    cursor: pointer;
+    font-weight: bolder;
+}
+.button.creation2 {
+    background-color: #055580;
+    border: 1px solid #777777;
+    color: white;
+    border-radius: 3px 3px 3px 3px;
+    box-shadow: 0 1px 1px #CFCFCF;
+    margin-left: 5px;
+    cursor: pointer;
+    font-weight: bolder;
+}
+/*input[type="submit"] {
+	border: 0px;
+    background-color: @ButtonBackgroundColor;
+    color: @ButtonColor;
+    padding: 0px 10px;
+	.rounded(5px);
+    height: 18px;
+}*/
+/** acl **/
+#photo-edit-perms-select, #photos-upload-permissions-wrapper, #profile-jot-acl-wrapper {
+  display: block!important;
+}
+#acl-wrapper {
+  width: 690px;
+  float: left;
+}
+#acl-search {
+  float: right;
+  background: #2e2f2e url("../../../../images/search_18.png") no-repeat right center;
+  padding-right: 20px;
+}
+#acl-showall {
+  float: left;
+  display: block;
+  width: auto;
+  height: 18px;
+  background-color: #cccccc;
+  background-image: url("../../../../images/show_all_off.png");
+  background-position: 7px 7px;
+  background-repeat: no-repeat;
+  padding: 7px 5px 0px 30px;
+  color: #999999;
+  -moz-border-radius: 5px 5px 5px 5px;
+  -webkit-border-radius: 5px 5px 5px 5px;
+  border-radius: 5px 5px 5px 5px;
+}
+#acl-showall.selected {
+  color: #000000;
+  background-color: #ff9900;
+  background-image: url("../../../../images/show_all_on.png");
+}
+#acl-list {
+  height: 210px;
+  border: 1px solid #cccccc;
+  clear: both;
+  margin-top: 30px;
+  overflow: auto;
+}
+.acl-list-item {
+  display: block;
+  width: 150px;
+  height: 30px;
+  border: 1px solid #cccccc;
+  margin: 5px;
+  float: left;
+}
+.acl-list-item img {
+  width: 22px;
+  height: 22px;
+  float: left;
+  margin: 4px;
+}
+.acl-list-item p {
+  height: 12px;
+  font-size: 10px;
+  margin: 0px;
+  padding: 2px 0px 1px;
+  overflow: hidden;
+}
+.acl-list-item a {
+  font-size: 8px;
+  display: block;
+  width: 40px;
+  height: 10px;
+  float: left;
+  color: #999999;
+  background-color: #cccccc;
+  background-position: 3px 3px;
+  background-repeat: no-repeat;
+  margin-right: 5px;
+  -webkit-border-radius: 2px ;
+  -moz-border-radius: 2px;
+  border-radius: 2px;
+  padding-left: 15px;
+}
+#acl-wrapper a:hover {
+  text-decoration: none;
+  color: #000000;
+}
+.acl-button-show {
+  background-image: url("../../../../images/show_off.png");
+}
+.acl-button-hide {
+  background-image: url("../../../../images/hide_off.png");
+}
+.acl-button-show.selected {
+  color: #000000;
+  background-color: #9ade00;
+  background-image: url("../../../../images/show_on.png");
+}
+.acl-button-hide.selected {
+  color: #000000;
+  background-color: #ff4141;
+  background-image: url("../../../../images/hide_on.png");
+}
+.acl-list-item.groupshow {
+  border-color: #9ade00;
+}
+.acl-list-item.grouphide {
+  border-color: #ff4141;
+}
+/** /acl **/
+/** tab buttons 14618a**/
+ul.tabs {
+  list-style-type: none;
+  padding-bottom: 10px;
+  font-size: 13px;
+}
+ul.tabs li {
+  float: left;
+  margin-left: 5px;
+}
+ul.tabs li .active {
+    background-color: #055580;
+    border: 1px solid #777777;
+    color: white;
+    border-radius: 3px 3px 3px 3px;
+    box-shadow: 0 1px 1px #CFCFCF;
+    margin-left: 5px;
+}
+/**
+ * Form fields
+ */
+.field {
+  margin-bottom: 10px;
+  padding-bottom: 10px;
+  overflow: auto;
+  width: 100%;
+}
+.field label {
+  float: left;
+  width: 200px;
+}
+.field input, .field textarea {
+  width: 400px;
+}
+.field textarea {
+  height: 100px;
+}
+.field .field_help {
+  display: block;
+  margin-left: 200px;
+  color: #666666;
+}
+.field .onoff {
+  float: left;
+  width: 80px;
+}
+.field .onoff a {
+  display: block;
+  border: 1px solid #666666;
+  background-image: url("../../../../images/onoff.jpg");
+  background-repeat: no-repeat;
+  padding: 4px 2px 2px 2px;
+  height: 16px;
+  text-decoration: none;
+}
+.field .onoff .off {
+  border-color: #666666;
+  padding-left: 40px;
+  background-position: left center;
+  background-color: #cccccc;
+  color: #666666;
+  text-align: right;
+}
+.field .onoff .on {
+  border-color: #204A87;
+  padding-right: 40px;
+  background-position: right center;
+  background-color: #D7E3F1;
+  color: #204A87;
+  text-align: left;
+}
+.field .hidden {
+  display: none!important;
+}
+.field.radio .field_help {
+  margin-left: 0px;
+}
+#directory-search-form{
+	margin-bottom: 50px;
+	}
+#profile-edit-links-end {
+        clear: both;
+        margin-bottom: 15px;
+}
+
+#profile-edit-links ul { margin: 20px; padding-bottom: 20px; list-style: none; }
+
+#profile-edit-links li {
+  float: left;
+  list-style: none;
+  margin-left: 10px;
+}
+
+.profile-edit-side-div {
+  display: none;
+}
+
+#register-form label,
+#profile-edit-form label {
+        width: 300px; float: left;
+}
+
+.required {
+  display: inline;
+  color: #B20202;
+}
+
+/* oauth */
+.oauthapp {
+  height: auto;
+  overflow: auto;
+  border-bottom: 2px solid #cccccc;
+  padding-bottom: 1em;
+  margin-bottom: 1em;
+}
+.oauthapp img {
+  float: left;
+  width: 48px;
+  height: 48px;
+  margin: 10px;
+}
+.oauthapp img.noicon {
+  background-image: url("../../../../images/icons/48/plugin.png");
+  background-position: center center;
+  background-repeat: no-repeat;
+}
+.oauthapp a {
+  float: left;
+}
+/* contacts */
+.contact-entry-wrapper {
+  width: 120px;
+  height: 120px;
+  float: left;
+}
+/* photo */
+.photo {
+box-shadow: 2px 2px 5px 0px #000000;
+margin: 0px;
+border-radius: 10px;
+height: 145px !important;
+width: 145px !important;
+}
+.lframe {
+  float: left;
+  /*margin: 0px 10px 10px 0px;*/
+}
+/* profile match wrapper */
+.profile-match-wrapper {
+  float: left;
+  width: 90px;
+  height: 90px;
+  margin-bottom: 20px;
+}
+.profile-match-wrapper .contact-photo {
+  width: 80px;
+  height: 80px;
+}
+.profile-match-wrapper .contact-photo img {
+  width: 80px;
+  height: 80px;
+}
+.profile-match-wrapper {
+  left: 0px;
+  top: 63px;
+}
+
+.contact-photo-menu-button {
+        position: relative;
+        background-image: url("../../../../images/icons/16/menu.png");
+        background-position: top left; 
+        background-repeat: no-repeat;
+        margin: 0px 0px -16px 0px; 
+	padding: 0px;
+        width: 16px;
+        height: 16px;
+        top: -20px; left:0px;
+        overflow: hidden;
+        text-indent: 40px;
+        display: none;
+        
+}
+.contact-photo-menu {
+        width: 11em;
+        border: 3px solid #364e59;
+	color: #2e302;
+        background: #FFFFFF;
+/*        position: absolute;*/
+        position: relative;
+        left: 0px; top: 0px;
+        display: none;
+        z-index: 10000;
+}
+.contact-photo-menu ul { margin:0px; padding: 0px; list-style: none }
+.contact-photo-menu li a {
+	display: block; 
+	padding: 5px 10px; 
+	color: #2e302;
+	text-decoration: none;
+}
+.contact-photo-menu li a:hover {
+	background-color: #2e2f2e; 
+}
+
+/* page footer */
+footer {
+  height: 100px;
+  display: table-row;
+}
+
+blockquote {
+    border-left: 1px solid #D2D2D2;
+    padding-left: 9px;
+    margin: 0 0 0 .8ex;
+	 color: #777;
+}
+.oembed {
+	
+	font-weight: bold;
+}
+.aprofile dt{
+box-shadow: 1px 1px 5px 0;
+    color: #666666;
+    margin: 15px 0 5px;
+    padding-left: 5px;	
+	}
+/* ================== */
+/* = Contacts Block = */
+/* ================== */
+
+.contact-block-img {
+        width: 48px;
+        height: 48px;
+        padding-right: 3px;
+}
+.contact-block-div {
+        float: left;
+}
+
+.contact-block-textdiv { width: 150px; height: 34px; float: left; }
+#contact-block-end { clear: both; } 
+
+#group-edit-wrapper {
+        margin-bottom: 10px;
+}
+
+#group-members-end {
+        clear: both;
+}
+#group-edit-desc {
+ margin-top: 15px;
+}
+
+/*
+#group-separator,
+#prof-separator { display: none;}
+*/
+#prof-members-end{
+	clear: both;
+	}
+
+#prvmail-to-label, #prvmail-subject-label, #prvmail-message-label {
+	margin-bottom: 10px;
+	margin-top: 20px;
+}
+
+#prvmail-submit {
+	float: right;
+	margin-top: 10px;
+}
+
+#prvmail-subject
+{
+background: none repeat scroll 0 0 #FFFFFF;
+border: 1px solid #CCCCCC;
+border-radius: 5px 5px 5px 5px;
+font-weight: bold;
+height: 20px;
+margin: 0 0 5px;
+vertical-align: middle;
+}
+#prvmail-form{
+ width: 597px;	
+	}
+	
+#prvmail-upload-wrapper,
+#prvmail-link-wrapper,
+#prvmail-rotator-wrapper {
+	float: left;
+	margin-top: 10px;
+	margin-right: 10px;
+	width: 24px;
+}
+
+#prvmail-end {
+	clear: both;
+}
+
+.mail-list-sender,
+.mail-list-detail {
+	float: left;
+}
+.mail-list-detail {
+	margin-left: 20px;
+}
+
+.mail-list-subject {
+	font-size: 1.1em;
+	margin-top: 10px;
+}
+a.mail-list-link {
+    display: block;
+    font-size: 1.3em;
+    padding: 4px 0;
+}
+
+/*
+*a.mail-list-link:hover {
+*	background-color: #15607B;
+*	color: #F5F6FB;
+*}
+*/
+
+.mail-list-outside-wrapper-end {
+	clear: both;
+}
+
+.mail-list-outside-wrapper {
+	margin-top: 30px;
+}
+
+.mail-list-delete-wrapper {
+	float: right;
+	margin-right: 30px;
+	margin-top: 15px;
+}
+
+.mail-list-delete-icon {
+	border: none;
+}
+
+.mail-conv-sender,
+.mail-conv-detail {
+	float: left;
+}
+.mail-conv-detail {
+	margin-left: 20px;
+	width: 500px;
+}
+
+.mail-conv-subject {
+    font-size: 1.4em;
+    margin: 10px 0;
+}
+
+.mail-conv-outside-wrapper-end {
+	clear: both;
+}
+
+.mail-conv-outside-wrapper {
+	margin-top: 30px;
+}
+
+.mail-conv-delete-wrapper {
+	float: right;
+	margin-right: 30px;
+	margin-top: 15px;
+}
+.mail-conv-break {
+	clear: both;
+}
+
+.mail-conv-delete-icon {
+	border: none;
+}
+
+/* ========== */
+/* = Events = */
+/* ========== */
+.eventcal {
+        float: left;
+        font-size: 20px;
+}
+
+.vevent {
+
+}
+.vevent .event-description, .vevent .event-location {
+        margin-left: 10px;
+        margin-right: 10px;
+}
+.vevent .event-start {
+        margin-left: 10px;
+        margin-right: 10px;
+}
+
+#new-event-link {
+        margin-bottom: 10px;
+}
+
+.edit-event-link, .plink-event-link {
+        float: left;
+        margin-top: 4px;
+        margin-right: 4px;
+        margin-bottom: 15px;
+}
+
+.event-description:before {
+        content: url('../../../../images/calendar.png');
+        margin-right: 15px;
+}
+
+.event-start, .event-end {
+        margin-left: 10px;
+        width: 330px;
+        clear: both;
+}
+
+.event-start .dtstart, .event-end .dtend {
+        float: right;
+}
+
+.event-list-date {
+        margin-bottom: 10px;
+}
+
+.prevcal, .nextcal {
+        float: left;
+        margin-left: 32px;
+        margin-right: 32px;
+        margin-top: 64px;
+}
+.event-calendar-end {
+        clear: both;
+}
+
+ 
+.calendar {
+        font-family: Courier, monospace;
+}
+.calendar.eventcal a {
+  color: #1872A2;	
+	}
+.today {
+        font-weight: bold;
+        color: #FF0000;
+}
+
+.settings-block {
+        border: 1px solid #AAA;
+        margin: 10px;
+        padding: 10px;
+}
+
+.app-title {
+        margin: 10px;
+}
+
+#identity-manage-desc {
+        margin-top:15px;
+        margin-bottom: 15px;
+}
+
+#identity-manage-choose {
+        margin-bottom: 15px;
+}
+
+#identity-submit {
+        margin-top: 20px;
+}
+
+#photo-prev-link, #photo-next-link {
+        padding: 10px;
+        float: left;
+}
+.lightbox{
+	float: left;
+	}
+
+#photo-photo {
+        float: left;
+}
+#photo-like-div .wall-item-like-buttons {
+	 float: left;
+    margin-right: 5px;
+    margin-top: 30px;
+	}
+.comment-edit-text-empty {
+    margin: 10px 0 0;
+    width: 85%;
+}
+.comment-edit-photo {
+    margin: 10px 0 0;
+}
+.wall-item-like-buttons .icon.like {
+float: left;
+}
+
+#photo-photo-end {
+        clear: both;
+}
+
+.tabs .comment-wwedit-wrapper {
+	display: block;
+   margin-top: 30px;
+   margin-left: 50px;
+	}
+
+.profile-match-photo {
+        float: left;
+        text-align: center;
+        width: 120px;
+}
+
+.profile-match-name {
+        float: left;
+        text-align: center;
+        width: 120px;
+        overflow: hidden;
+}
+
+.profile-match-break,
+.profile-match-end {
+        clear: both;
+}
+
+.profile-match-connect {
+        text-align: center;
+        font-weight: bold;
+}
+
+.profile-match-wrapper {
+        float: left;
+        padding: 10px;
+        width: 120px;
+        height: 120px;
+        scroll: auto;
+}
+#profile-match-wrapper-end {
+        clear: both;
+}
+
+/* ============= */
+/* = Directory = */
+/* ============= */
+/* contacts menu */
+.contact-photo-wrapper {
+  position: relative;
+}
+.contact-photo {
+  width: 48px;
+  height: 48px;
+  overflow: hidden;
+  display: block;
+}
+.contact-photo img {
+  width: 48px;
+  height: 48px;
+}
+.contact-photo-menu-button {
+  display: none;
+  /* position: absolute; */
+  /* position: absolute; */
+  left: 0px;
+  top: -16px;
+}
+.contact-wrapper {
+  float: left;
+  width: 90px;
+  height: 90px;
+  margin-bottom: 15px;
+}
+.contact-wrapper .contact-photo {
+  width: 80px;
+  height: 80px;
+}
+.contact-wrapper .contact-photo img {
+  width: 80px;
+  height: 80px;
+}
+.contact-wrapper .contact-photo-menu-button {
+  left: 0px;
+  top: 63px;
+}
+.directory-item {
+  float: left;
+  width: 200px;
+  height: 200px;
+}
+.directory-item .contact-photo {
+  width: 175px;
+  height: 175px;
+}
+.directory-item .contact-photo img {
+  width: 175px;
+  height: 175px;
+}
+.contact-name {
+  text-align: left;
+  font-weight: bold;
+  font-size: 12px;
+}
+.contact-details {
+  color: #999999;
+}
+#side-bar-photos-albums li{
+list-style-type: disc;
+}
+#side-bar-photos-albums ul li{
+  margin-left: 30px;
+  padding-left: 0px;
+	}
+#side-bar-photos-albums{
+	margin-top: 15px;	
+	}
+.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-album-image-wrapper, .photo-top-image-wrapper {
+  float: left;
+   -moz-box-shadow: 0 0 5px #888;
+   -webkit-box-shadow: 0 0 5px #888;
+   box-shadow: 0 0 5px #888;
+  background-color: #000;
+   -webkit-border-radius: 5px;
+   -moz-border-radius: 5px;
+  border-radius: 5px;
+  padding-bottom: 20px;
+  position: relative;
+  margin: 0 10px 10px 0;
+  width: 200px; height: 140px;
+  overflow: hidden;  
+}
+.photo-top-album-name {
+        width: 100%;
+        position: absolute; 
+        bottom: 0px; 
+        padding-left: 3px;
+        background-color: #EEE;
+}
+.photo-top-album-link{
+  color: #1872A2;
+	}
+.photo-top-album-img{
+	
+	}
+/*.photo-top-image-wrapper {
+        position: relative;
+        float: left;
+        margin-top: 15px;
+        margin-right: 15px;
+        width: 200px; height: 200px; 
+        overflow: hidden; 
+}
+.photo-top-album-name {
+        width: 100%;
+        min-height: 2em;
+        position: absolute; 
+        bottom: 0px; 
+        padding: 0px 3px;
+        padding-top: 0.5em;
+        background-color: rgb(255, 255, 255);
+}*/
+#photo-top-end {
+        clear: both;
+}
+
+#photo-top-links {
+        margin-bottom: 30px;
+        margin-left: 30px;
+}
+
+#photos-upload-newalbum-div {
+        float: left;
+        width: 175px;
+}
+
diff --git a/view/theme/diabook/diabook-dark/style-wide.css b/view/theme/diabook/diabook-dark/style-wide.css
new file mode 100644
index 000000000..73d0e4c0f
--- /dev/null
+++ b/view/theme/diabook/diabook-dark/style-wide.css
@@ -0,0 +1,2899 @@
+/**
+ * Fabio Comuni <http://kirgroup.com/profile/fabrixxm>
+ * Additional Changes: Michael Vogel <icarus@dabo.de>
+ **/
+
+/* ========= */
+/* = Admin = */
+/* ========= */
+
+#adminpage {
+/*        width: 80%;*/
+}
+
+#pending-update {
+        float:right;
+        color: #ffffff;
+        font-weight: bold;
+        background-color: #FF0000;
+        padding: 0em 0.3em;
+}
+
+.admin.linklist {
+        border: 0px; padding: 0px;
+}
+
+.admin.link {
+        list-style-position: inside;
+        font-size: 1em;
+        padding: 5px;
+        width: 100px;
+        margin: 5px;
+}
+
+#adminpage dl {
+        clear: left;
+        margin-bottom: 2px;
+        padding-bottom: 2px;
+        border-bottom: 1px solid black;
+}
+
+#adminpage dt {
+        width: 200px;
+        float: left;
+        font-weight: bold;
+}
+
+#adminpage dd {
+        margin-left: 200px;
+}
+#adminpage h3 {
+        border-bottom: 1px solid #898989;
+        margin-bottom: 5px;
+        margin-top: 10px;
+}
+
+#adminpage .submit {
+        clear:left;
+}
+
+#adminpage #pluginslist {
+        margin: 0px; padding: 0px;
+}
+
+#adminpage .plugin {
+        list-style: none;
+        display: block;
+	/* border: 1px solid #888888; */
+        padding: 1em;
+        margin-bottom: 5px;
+        clear: left;
+}
+
+#adminpage .toggleplugin {
+        float:left;
+        margin-right: 1em;
+}
+
+#adminpage table {width:100%; border-bottom: 1p solid #000000; margin: 5px 0px;}
+#adminpage table th { text-align: left;}
+#adminpage td .icon { float: left;}
+#adminpage table#users img { width: 16px; height: 16px; }
+#adminpage table tr:hover { background-color: #eeeeee; }
+#adminpage .selectall { text-align: right; }
+/* icons */
+.icon.bb-url{
+  background-image: url("../../../view/theme/diabook/diabook-blue/icons/bb-url.png");
+  float: right;
+  margin-top: 2px;}
+.icon.quote{
+  background-image: url("../../../view/theme/diabook/diabook-blue/icons/quote.png");
+  float: right;
+  margin-top: 2px;}
+.icon.bold{
+  background-image: url("../../../view/theme/diabook/diabook-blue/icons/bold.png");
+  float: right;
+  margin-top: 2px;}
+.icon.underline{
+  background-image: url("../../../view/theme/diabook/diabook-blue/icons/underline.png");
+  float: right;
+  margin-top: 2px;}
+.icon.italic{
+  background-image: url("../../../view/theme/diabook/diabook-blue/icons/italic.png");
+  float: right;
+  margin-top: 2px;}
+.icon.bb-image{
+  background-image: url("../../../view/theme/diabook/diabook-blue/icons/bb-image.png");
+  float: right;
+  margin-top: 2px;}
+.icon.bb-video{
+  background-image: url("../../../view/theme/diabook/diabook-blue/icons/bb-video.png");
+  float: right;
+  margin-top: 2px;}
+  
+.icon.contacts {
+  background-image: url("../../../view/theme/diabook/diabook-blue/icons/contacts.png");}
+.icon.notifications {
+  background-image: url("../../../view/theme/diabook/diabook-blue/icons/notifications.png");}
+.icon.notify {
+  background-image: url("../../../view/theme/diabook/diabook-blue/icons/notify.png");}
+.icon.messages {
+  background-image: url("../../../view/theme/diabook/diabook-blue/icons/messages.png");}
+.icon.community {
+  background-image: url("../../../view/theme/diabook/diabook-blue/icons/community.png");}
+  
+.icon.drop 	{ background-image: url("../../../view/theme/diabook/diabook-blue/icons/drop.png");}
+.icon.drophide 	{ background-image: url("../../../view/theme/diabook/diabook-blue/icons/drop.png");}
+.icon.dislike 	{ background-image: url("../../../view/theme/diabook/diabook-blue/icons/dislike.png");}
+.icon.like 	{ background-image: url("../../../view/theme/diabook/diabook-blue/icons/like.png");}
+.icon.pencil 	{ background-image: url("../../../view/theme/diabook/diabook-blue/icons/pencil.png");}
+.icon.recycle 	{ background-image: url("../../../view/theme/diabook/diabook-blue/icons/recycle.png");}
+.icon.remote-link { background-image: url("../../../view/theme/diabook/diabook-blue/icons/remote.png");}
+.icon.tagged    { background-image: url("../../../view/theme/diabook/diabook-blue/icons/tagged.png");}
+.icon.file-as { background-image: url("../../../view/theme/diabook/diabook-blue/icons/file_as.png");}
+.star-item.icon.unstarred { background-image: url("../../../view/theme/diabook/diabook-blue/icons/unstarred.png");}
+.star-item.icon.starred { background-image: url("../../../view/theme/diabook/diabook-blue/icons/starred.png");}
+.icon.link		{ background-image: url("../../../view/theme/diabook/diabook-blue/icons/link.png");}
+.icon.lock		{ background-image: url("../../../view/theme/diabook/diabook-blue/icons/lock.png");}
+.icon.unlock		{ background-image: url("../../../view/theme/diabook/diabook-blue/icons/unlock.png");}
+.icon.language    { background-image: url("../../../view/theme/diabook/diabook-blue/icons/language.png");}
+
+
+.camera 	{ background-image: url("../../../view/theme/diabook/diabook-blue/icons/camera.png"); 
+			  display: block; width: 28px; height: 28px; background-repeat: no-repeat;
+			  }
+.attach 	{ background-image: url("../../../view/theme/diabook/diabook-blue/icons/attach.png"); 
+			  display: block; width: 28px; height: 28px; background-repeat: no-repeat;
+			  }
+.video2 	{ background-image: url("../../../view/theme/diabook/diabook-blue/icons/video.png"); 
+			  display: block; width: 28px; height: 28px; background-repeat: no-repeat;
+			  }	
+.video 	{ background-image: url("../../../view/theme/diabook/diabook-blue/icons/video.png"); 
+			  display: block; width: 100%; height: 140px; background-repeat: no-repeat;
+			  }
+.audio2 	{ background-image: url("../../../view/theme/diabook/diabook-blue/icons/audio.png"); 
+			  display: block; width: 28px; height: 28px; background-repeat: no-repeat;
+			  }
+.audio 	{ background-image: url("../../../view/theme/diabook/diabook-blue/icons/audio.png"); 
+			  display: block; width: 28px; height: 28px; background-repeat: no-repeat;
+			  }
+.weblink 	{ background-image: url("../../../view/theme/diabook/diabook-blue/icons/weblink.png"); 
+			  display: block; width: 28px; height: 28px; background-repeat: no-repeat;
+			  }
+.globe 	{ background-image: url("../../../view/theme/diabook/diabook-blue/icons/globe.png"); 
+			  display: block; width: 28px; height: 28px; background-repeat: no-repeat;
+			  }
+.unglobe 	{ background-image: url("../../../view/theme/diabook/diabook-blue/icons/unglobe.png"); 
+			  display: block; width: 28px; height: 28px; background-repeat: no-repeat;
+			  }
+.edit    {background-image: url("../../../view/theme/diabook/diabook-blue/icons/pencil2.png"); 
+			  display: block; width: 28px; height: 28px; background-repeat: no-repeat;}
+.icon.block   {background-image: url("../../../view/theme/diabook/icons/block.png"); 
+			  display: block; width: 16px; height: 16px; background-repeat: no-repeat;}
+.icon.block.dim  {background-image: url("../../../view/theme/diabook/icons/block.png"); 
+			  display: block; width: 16px; height: 16px; background-repeat: no-repeat; opacity: 0.3;}
+.icon.ad_drop 	{ background-image: url("../../../view/theme/diabook/icons/drop.png");
+			  display: block; margin-left:5px; width: 16px; height: 16px; background-repeat: no-repeat;}			  
+			  
+
+
+.article	{ background-position: -50px  0px;}
+/*.audio 		{ background-position: -70px  0px;}*/
+/*.drop 		{ background-position: -110px 0px;}*/
+/*.drophide 	{ background-position: -130px 0px;}*/
+/*.edit 		{ background-position: -150px 0px;}*/
+/*.camera 	{ background-position: -170px 0px;}*/
+/*.dislike 	{ background-position: -190px 0px;}*/
+/*.like 		{ background-position: -210px 0px;}*/
+/*.link 		{ background-position: -230px 0px;}*/
+
+/*.globe 		{ background-position: -50px  -20px;}*/
+/*.noglobe 	{ background-position: -70px  -20px;}*/
+.no 		{ background-position: -90px  -20px;}
+.pause 		{ background-position: -110px -20px;}
+.play 		{ background-position: -130px -20px;}
+/*.pencil 	{ background-position: -150px -20px;}*/
+.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;}*/
+
+/*.video          { background-position: -110px -40px;}*/
+.youtube        { background-position: -130px -40px;}
+
+/*.attach         { background-position: -190px -40px;}*/
+/*.language       { background-position: -210px -40px;}*/
+
+
+.icon.on             { background-image: url("../../../view/theme/diabook/diabook-blue/icons/toogle_on.png"); background-repeat: no-repeat;}
+.icon.off            { background-image: url("../../../view/theme/diabook/diabook-blue/icons/toogle_off.png"); background-repeat: no-repeat;}
+.icon.prev           { background-image: url("../../../view/theme/diabook/diabook-blue/icons/prev.png"); background-repeat: no-repeat;}
+.icon.next           { background-image: url("../../../view/theme/diabook/diabook-blue/icons/next.png"); background-repeat: no-repeat;}
+/*.tagged     { background-position: -130px -60px;}*/
+
+.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 0px; }
+.type-audio { background-position: -40px 0px; }
+.type-text  { background-position: -60px 0px; }
+.type-unkn  { background-position: -80px 0px; }
+
+.icon.drop, .icon.drophide {
+ float: left;
+}
+
+.icon {
+  display: block;
+  width: 20px;
+  height: 20px;
+  /*background-image: url('icons.png');*/
+}
+
+.icon {
+  background-color: transparent ;
+  background-repeat: no-repeat;
+  /* background-position: left center; */
+  display: block;
+  overflow: hidden;
+  text-indent: -9999px;
+  padding: 1px;
+}
+
+.icon.border.camera{
+  background-image: url("../../../view/theme/diabook/diabook-blue/icons/camera.png"); 
+  display: block; width: 28px; height: 28px; background-repeat: no-repeat;
+	}
+	
+.icon.border.link{
+  background-image: url("../../../view/theme/diabook/diabook-blue/icons/weblink.png"); 
+  display: block; width: 28px; height: 28px; background-repeat: no-repeat;
+  margin-left: 10px;
+	}
+
+.icon.text {
+  text-indent: 0px;
+}
+.icon.s10 {
+  min-width: 10px;
+  height: 10px;
+}
+.icon.s10.notify {
+  background-image: url("../../../images/icons/10/notify_off.png");
+}
+.icon.s10.gear {
+  background-image: url("../../../images/icons/10/gear.png");
+}
+.icon.s10.add {
+  background-image: url("../../../images/icons/10/add.png");
+}
+.icon.s10.delete {
+  background-image: url("../../../images/icons/10/delete.png");
+}
+.icon.s10.edit {
+  background-image: url("../../../images/icons/10/edit.png");
+}
+.icon.s10.star {
+  background-image: url("../../../images/star_dummy.png");
+}
+.icon.s10.menu {
+  background-image: url("../../../images/icons/10/menu.png");
+}
+.icon.s10.link {
+  background-image: url("../../../images/icons/10/link.png");
+}
+.icon.s10.lock {
+  background-image: url("../../../images/icons/10/lock.png");
+}
+.icon.s10.unlock {
+  background-image: url("../../../images/icons/10/unlock.png");
+}
+.icon.s10.text {
+  padding: 2px 0px 0px 15px;
+  font-size: 10px;
+}
+.icon.s16 {
+  min-width: 16px;
+  height: 16px;
+}
+.icon.s16.notify {
+  background-image: url("../../../images/icons/16/notify_off.png");
+}
+.icon.s16.gear {
+  background-image: url("../../../images/icons/16/gear.png");
+}
+.icon.s16.add {
+  background-image: url("../../../images/icons/16/add.png");
+}
+.icon.s16.delete {
+  background-image: url("../../../images/icons/16/delete.png");
+}
+/*.icon.s16.edit {
+  background-image: url("../../../images/icons/16/edit.png");
+}*/
+.icon.s16.star {
+  background-image: url("../../../images/star_dummy.png");
+}
+.icon.s16.menu {
+  background-image: url("../../../images/icons/16/menu.png");
+}
+/*.icon.s16.link {
+  background-image: url("../../../images/icons/16/link.png");
+}*/
+.icon.s16.lock {
+  background-image: url("../../../images/icons/16/lock.png");
+}
+.icon.s16.unlock {
+  background-image: url("../../../images/icons/16/unlock.png");
+}
+.icon.s16.text {
+  padding: 4px 0px 0px 20px;
+  font-size: 10px;
+}
+.icon.s22 {
+  min-width: 22px;
+  height: 22px;
+}
+.icon.s22.notify {
+  background-image: url("../../../images/icons/22/notify_off.png");
+}
+.icon.s22.gear {
+  background-image: url("../../../images/icons/22/gear.png");
+}
+.icon.s22.add {
+  background-image: url("../../../images/icons/22/add.png");
+}
+.icon.s22.delete {
+  background-image: url("../../../images/icons/22/delete.png");
+}
+.icon.s22.edit {
+  background-image: url("../../../images/icons/22/edit.png");
+}
+.icon.s22.star {
+  background-image: url("../../../images/star_dummy.png");
+}
+.icon.s22.menu {
+  background-image: url("../../../images/icons/22/menu.png");
+}
+.icon.s22.link {
+  background-image: url("../../../images/icons/22/link.png");
+}
+.icon.s22.lock {
+  background-image: url("../../../images/icons/22/lock.png");
+}
+.icon.s22.unlock {
+  background-image: url("../../../images/icons/22/unlock.png");
+}
+.icon.s22.text {
+  padding: 10px 0px 0px 25px;
+  width: 200px;
+}
+.icon.s48 {
+  width: 48px;
+  height: 48px;
+}
+.icon.s48.notify {
+  background-image: url("../../../images/icons/48/notify_off.png");
+}
+.icon.s48.gear {
+  background-image: url("../../../images/icons/48/gear.png");
+}
+.icon.s48.add {
+  background-image: url("../../../images/icons/48/add.png");
+}
+.icon.s48.delete {
+  background-image: url("../../../images/icons/48/delete.png");
+}
+.icon.s48.edit {
+  background-image: url("../../../images/icons/48/edit.png");
+}
+.icon.s48.star {
+  background-image: url("../../../images/star_dummy.png");
+}
+.icon.s48.menu {
+  background-image: url("../../../images/icons/48/menu.png");
+}
+.icon.s48.link {
+  background-image: url("../../../images/icons/48/link.png");
+}
+.icon.s48.lock {
+  background-image: url("../../../images/icons/48/lock.png");
+}
+.icon.s48.unlock {
+  background-image: url("../../../images/icons/48/unlock.png");
+}
+
+#contact-edit-links ul {
+  list-style: none;
+  list-style-type: none;
+}
+
+.hide-comments-outer {
+  margin-left: 80px;
+  margin-bottom: 5px;
+  width: 675px;
+  border-bottom: 1px solid #BDCDD4;
+  padding: 8px;
+}
+
+/* global */
+body {
+  font-family: 'Lato', "Helvetica Neue", Helvetica, Arial, sans-serif;
+  font-size: 13px;
+  background-color: #ffffff;
+  color: #2d2d2d;
+  margin: 50px auto auto;
+  display: table;
+}
+
+#jappix_mini {
+right: 45px !important;
+}
+
+
+h4 {
+  font-size: 1.1em;
+}
+
+a {
+	color: #333333;
+	/* color: #3e3e8c; */
+	text-decoration: none;
+}
+a:hover {
+	/* color: blue; */
+	text-decoration: underline
+}
+
+.wall-item-name-link {
+/*  float: left;*/
+}
+
+.wall-item-photo {
+  width: 48px;
+  height: 48px;
+  overflow: hidden;
+  display: block;
+}
+
+.left {
+  float: left;
+}
+.right {
+  float: right;
+}
+.hidden {
+  display: none;
+}
+.clear {
+  clear: both;
+}
+.fakelink {
+  color: #1872A2;
+  /* color: #3e3e8c; */
+  text-decoration: none;
+  cursor: pointer;
+}
+.fakelink:hover {
+  /* color: blue; */
+  /*color: #005c94; */
+  text-decoration: underline;
+}
+.intro-end {
+	border-bottom: 1px solid black;
+   clear: both;
+   margin-bottom: 25px;
+   padding-bottom: 25px;
+   width: 75%;
+	}
+.intro-form-end {
+	clear: both;
+	}
+.intro-fullname {
+	padding-bottom: 5px;
+   padding-top: 5px;
+	}
+.intro-wrapper-end {
+	clear: both;
+   padding-bottom: 5px;
+	}
+code {
+  font-family: Courier, monospace;
+  white-space: pre;
+  display: block;
+  overflow: auto;
+  border: 1px solid #444;
+  background: #EEE;
+  color: #444;
+  padding: 10px;
+  margin-top: 20px;
+}
+#panel {
+  position: absolute;
+  width: 12em;
+  background: #ffffff;
+  color: #2d2d2d;
+  margin: 0px;
+  padding: 1em;
+  list-style: none;
+  border: 3px solid #364e59;
+  z-index: 100000;
+  -webkit-box-shadow: 0px 5px 10px rgba(0, 0, 0, 0.7);
+  -moz-box-shadow: 0px 5px 10px rgba(0, 0, 0, 0.7);
+  box-shadow: 0px 5px 10px rgba(0, 0, 0, 0.7);
+}
+/* tool */
+.tool {
+  height: auto;
+  overflow: auto;
+  padding: 3px;
+}
+#saved-search-ul .tool:hover,
+#nets-sidebar .tool:hover,
+#sidebar-group-list .tool:hover,
+#fileas-sidebar .tool:hover {
+	background: #308DBF;
+}
+.tool .label {
+  float: left;
+}
+.tool .action {
+  float: right;
+}
+.tool a {
+  color: ##3F8FBA;
+}
+.tool a:hover {
+  text-decoration: none;
+}
+/* popup notifications */
+div.jGrowl div.notice {
+  background: #511919 url("../../../images/icons/48/notice.png") no-repeat 5px center;
+  color: #ffffff;
+  padding-left: 58px;
+}
+div.jGrowl div.info {
+  background: #364e59 url("../../../images/icons/48/info.png") no-repeat 5px center;
+  color: #ffffff;
+  padding-left: 58px;
+}
+/* header */
+header {
+  position: fixed;
+  left: 0%;
+  right: 80%;
+  top: 0px;
+  margin: 0px;
+  padding: 0px;
+  width: 22%;
+  height: 32px;
+  background: #1872a2;
+  background-color: #1872a2;
+  z-index: 100;
+  border-bottom: 1px;
+  border-bottom-color: black;
+  border-bottom-style: inset;
+}
+header #site-location {
+  display: none;
+}
+header #banner {
+  overflow: hidden;
+  text-align: banner;
+  width: 82%;
+  margin-left: 25%;
+}
+header #banner a,
+header #banner a:active,
+header #banner a:visited,
+header #banner a:link,
+header #banner a:hover {
+  color: #ffffff;
+  text-decoration: none;
+  outline: none;
+  vertical-align: middle;
+ font-weight: bolder;
+  margin-left: 3px;
+}
+header #banner #logo-img {
+  height: 25px;
+  margin-top: 3px;
+}
+header #banner #logo-text {
+  font-size: 20px;
+  position: absolute;
+  top: 10%;
+}
+/* messages */
+#message-new {
+  background: #055580;
+  border: 1px solid #333;
+  width: 150px;
+}
+#message-new a {
+  color: #ffffff;
+  text-align: center;
+  display: block;
+  font-weight: bold;
+  padding: 1em 0px;
+    text-decoration: none;
+}
+.mail-list-wrapper {
+  background-color: #f6f7f8;
+  margin-bottom: 5px;
+  width: 100%;
+  height: auto;
+  overflow: hidden;
+}
+.mail-list-wrapper span {
+  display: block;
+  float: left;
+  width: 20%;
+  overflow: hidden;
+}
+.mail-list-wrapper .mail-subject {
+  width: 30%;
+  padding: 4px 0px 0px 4px;
+}
+.mail-list-wrapper .mail-subject a {
+  display: block;
+}
+.mail-list-wrapper .mail-subject.unseen a {
+  font-weight: bold;
+}
+.mail-list-wrapper .mail-date {
+  padding: 4px 4px 0px 4px;
+}
+.mail-list-wrapper .mail-from {
+  padding: 4px 4px 0px 4px;
+}
+.mail-list-wrapper .mail-count {
+  padding: 4px 4px 0px 4px;
+  text-align: right;
+}
+.mail-list-wrapper .mail-delete {
+  float: right;
+}
+#mail-display-subject {
+  background-color: #f6f7f8;
+  color: #2d2d2d;
+  margin-bottom: 10px;
+  width: 100%;
+  height: auto;
+  overflow: hidden;
+}
+#mail-display-subject span {
+  float: left;
+  overflow: hidden;
+  padding: 4px 0px 0px 10px;
+}
+#mail-display-subject .mail-delete {
+  float: right;
+  opacity: 0.5;
+  -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;
+}
+#mail-display-subject:hover .mail-delete {
+  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;
+}
+/* nav */
+nav {
+  width: 80%;
+  height: 32px;
+  position: fixed;
+  left: 22%;
+  top: 0px;
+  padding: 0px;
+  background: #1872a2;
+  color: #ffffff;
+  z-index: 99;
+  border-bottom: 1px;
+  border-bottom-color: black;
+  border-bottom-style: inset;
+}
+nav a,
+nav a:active,
+nav a:visited,
+nav a:link,
+nav a:hover {
+  color: #ffffff;
+  text-decoration: none;
+  outline: none;
+}
+nav #banner {
+  overflow: hidden;
+  /*text-align: center;*/
+  width: 100%;
+}
+nav #banner a,
+nav #banner a:active,
+nav #banner a:visited,
+nav #banner a:link,
+nav #banner a:hover {
+  color: #ffffff;
+  text-decoration: none;
+  outline: none;
+  vertical-align: bottom;
+}
+nav #banner #logo-img {
+  height: 22px;
+  margin-top: 5px;
+}
+nav #banner #logo-text {
+  font-size: 22px;
+}
+nav #navbar{
+	}
+nav ul {
+  margin: 0px;
+  padding: 0px 20px;
+}
+nav ul li {
+  list-style: none;
+  margin: 0px;
+  /* padding: 1px 1px 3px 1px; */
+  float: left;
+}
+nav ul li .menu-popup {
+  left: 0px;
+  right: auto;
+}
+
+nav #logo-img {
+  height: 25px;
+  margin-top: 4px;
+  margin-left: 30px;
+}
+
+nav #logo-text {
+    font-size: 22px;
+    margin-top: 3px;
+    margin-right: 15px;
+}
+nav .nav-menu-search {
+  position: relative;
+
+  margin: 4px 17px;
+  margin-right: 0px;
+  height: 17px;
+  width: 180px;
+  
+}
+
+nav #search-box #search-text {
+  background-image:  url('icons/lupe.png');
+  background-repeat:no-repeat;
+  padding-left:20px;
+  border-top-left-radius: 15px;
+border-top-right-radius: 15px;
+border-bottom-right-radius: 15px;
+border-bottom-left-radius: 15px;
+	}
+
+
+nav .nav-menu-icon {
+  position: relative;
+  height: 22px;
+  padding: 5px;
+  margin: 0px 5px;
+  -moz-border-radius: 5px 5px 0 0;
+  -webkit-border-radius: 5px 5px 0 0;
+  border-radius: 5px 5px 0 0;
+}
+nav .nav-menu-icon:hover {
+  background-color: #308dbf;  
+  position: relative;
+  height: 22px;
+  padding: 5px;
+  margin: 0px 5px;
+  -moz-border-radius: 5px 5px 0 0;
+  -webkit-border-radius: 5px 5px 0 0;
+  border-radius: 5px 5px 0 0;
+}
+
+nav .nav-menu-icon.selected {
+  background-color: #fff;
+}
+nav .nav-menu-icon img {
+  width: 22px;
+  height: 22px;
+}
+nav .nav-menu-icon .nav-notify {
+  top: 3px;
+}
+/*marker*/
+nav .nav-menu {
+  position: relative;
+  height: 16px;
+  padding: 5px;
+  margin: 3px 15px 0px;
+  font-size: 15px;
+  /*border-bottom: 3px solid #364A84;*/
+}
+nav .nav-menu.selected {
+  /*border-bottom: 3px solid #9eabb0;*/
+}
+nav .nav-notify {
+  display: none;
+  position: absolute;
+  background-color: #ff0000;
+  /* background-color: #19aeff; */
+  -moz-border-radius: 5px 5px 5px 5px;
+  -webkit-border-radius: 5px 5px 5px 5px;
+  border-radius: 5px 5px 5px 5px;
+  font-size: 10px;
+  font-weight: 900;
+  padding: 1px 4px;
+  top: 0px;
+  right: -6px;
+  min-width: 10px;
+  text-align: center;
+}
+nav .nav-notify.show {
+  display: block;
+}
+nav #nav-help-link,
+nav #nav-search-link,
+nav #nav-directory-link,
+nav #nav-apps-link,
+nav #nav-site-linkmenu, 
+nav #nav-home-link,
+nav #nav-user-linkmenu
+{
+  float: right;
+}
+nav #nav-user-linkmenu{
+	margin-right: 0px;
+	}
+nav #nav-home-link, #nav-directory-link, #nav-apps-link{
+	margin-left: 0px;
+	margin-right: 0px;
+	font-weight: bold;
+	margin: 3px 5px;
+	}
+nav #nav-directory-link{
+  margin-right: 0px;	
+	}
+nav #nav-home-link{
+  margin-left: 0px;	
+	}
+nav #nav-help-link .menu-popup,
+nav #nav-search-link .menu-popup,
+nav #nav-directory-link .menu-popup,
+nav #nav-apps-link .menu-popup,
+nav #nav-site-linkmenu .menu-popup {
+  right: 0px;
+  left: auto;
+}
+
+nav #nav-messages-linkmenu.on .icon.messages, nav #nav-messages-linkmenu.selected .icon.messages{
+	background-image: url("../../../view/theme/diabook/diabook-blue/icons/messages2.png");
+	}
+	
+/*nav #nav-notifications-linkmenu.on .icon.notify,*/ nav #nav-notifications-linkmenu.selected .icon.notify{
+	background-image: url("../../../view/theme/diabook/diabook-blue/icons/notify2.png");
+	}
+	
+nav #nav-contacts-linkmenu.on .icon.contacts, nav #nav-contacts-linkmenu.selected .icon.contacts{
+	background-image: url("../../../view/theme/diabook/diabook-blue/icons/contacts2.png");
+	}
+	
+nav #nav-apps-link.selected {
+  background-color: #364e59;
+}
+
+#nav-notifications-mark-all {
+	/* padding: 1px 1px 2px 26px; */
+	/* border-bottom: 1px solid #364E59; */
+	/* margin: 0px 0px 2px 0px;
+	padding: 5px 10px; */
+}
+
+#nav-notifications-see-all {
+	/* padding: 1px 1px 2px 26px; */
+	/* border-bottom: 1px solid #364E59; */
+	/* margin: 0px 0px 2px 0px;
+	padding: 5px 10px; */
+}
+
+.notify-seen {
+	background: none repeat scroll 0 0 #DDDDDD;
+	}
+
+ul.menu-popup {
+  position: absolute;
+  display: none;
+  width: 11em;
+  background: #ffffff;
+  color: #2d2d2d;
+  margin: 0px;
+  padding: 0px;
+  list-style: none;
+  z-index: 100000;
+  -webkit-box-shadow: 0px 5px 10px rgba(0, 0, 0, 0.7);
+  -moz-box-shadow: 0px 5px 10px rgba(0, 0, 0, 0.7);
+  box-shadow: 0px 5px 10px rgba(0, 0, 0, 0.7);
+}
+ul.menu-popup a {
+  display: block;
+  color: #2d2d2d;
+  padding: 5px 10px;
+  text-decoration: none;
+}
+ul.menu-popup a:hover {
+  background-color: #308DBF; /*bdcdd4;*/
+  color: #fff;
+}
+ul.menu-popup .menu-sep {
+  border-top: 1px solid #9eabb0;
+}
+ul.menu-popup li {
+  float: none;
+  overflow: auto;
+  height: auto;
+  display: block;
+}
+ul.menu-popup li img {
+  float: left;
+  width: 16px;
+  height: 16px;
+  padding-right: 5px;
+}
+ul.menu-popup .empty {
+  padding: 5px;
+  text-align: center;
+  color: #9eabb0;
+}
+/* autocomplete popup */
+.acpopup {
+  max-height: 150px;
+  background-color: #ffffff;
+  color: #2d2d2d;
+  border: 1px solid #MenuBorder;
+  overflow: auto;
+  z-index: 100000;
+  -webkit-box-shadow: 0px 5px 10px rgba(0, 0, 0, 0.7);
+  -moz-box-shadow: 0px 5px 10px rgba(0, 0, 0, 0.7);
+  box-shadow: 0px 5px 10px rgba(0, 0, 0, 0.7);
+}
+.acpopupitem {
+  color: #2d2d2d;
+  padding: 4px;
+  clear: left;
+}
+.acpopupitem img {
+  float: left;
+  margin-right: 4px;
+}
+.acpopupitem.selected {
+  background-color: #bdcdd4;
+}
+#nav-notifications-menu {
+  width: 400px;
+  max-height: 550px;
+  overflow: auto;
+}
+/* #nav-notifications-menu a {
+	display: inline;
+	padding: 5px 0px;
+	margin: 0px 0px 2px 0px;
+}
+#nav-notifications-menu li:hover {
+  background-color: #bdcdd4;
+}*/
+
+#nav-notifications-menu img {
+  float: left;
+  margin-right: 5px;
+}
+#nav-notifications-menu .contactname {
+  font-weight: bold;
+}
+#nav-notifications-menu .notif-when {
+  font-size: 10px;
+  color: #9eabb0;
+  display: block;
+}
+
+.notif-image {
+        width: 32px;
+        height: 32px;
+        padding: 7px 7px 0px 0px;
+}
+
+/*profile_side*/
+#profile_side {
+  margin-bottom: 30px;
+}
+#ps-usericon{
+	height: 25px	
+	}
+#ps-username{
+  font-size: 1.17em;
+  font-weight: bold;
+  vertical-align: top;
+  position: absolute;
+  padding-top: 4px;
+  padding-left: 5px;	
+  word-wrap: break-word;
+  width: 130px;
+	}
+#ps-username:hover{
+  text-decoration: none;	
+	}
+.menu-profile-side{
+  list-style: none;	
+  padding-left: 0px;
+  min-height: 0px;
+	}
+.menu-profile-list{
+  height: auto;
+  overflow: auto;
+  min-height: 16px;
+  list-style: none;
+	}
+.menu-profile-list:hover{
+	background: #308DBF;
+	}
+.menu-profile-list-item{
+	padding-left: 5px;
+	vertical-align: middle;
+	}	
+.menu-profile-list-item:hover{	
+	text-decoration: none;
+	
+   }
+/*http://prothemedesign.com/circular-icons/*/
+.menu-profile-icon.home{
+	background: url("../../../view/theme/diabook/diabook-blue/icons/home.png") no-repeat;
+	float: left;
+	height: 22px;
+   width: 22px;
+	}
+.menu-profile-icon.photos{
+	background: url("../../../view/theme/diabook/diabook-blue/icons/mess_side.png") no-repeat;
+	float: left;
+	height: 22px;
+   width: 22px;}
+.menu-profile-icon.events{
+	background: url("../../../view/theme/diabook/diabook-blue/icons/events.png") no-repeat;
+	float: left;
+	height: 22px;
+   width: 22px;}
+.menu-profile-icon.notes{
+	background: url("../../../view/theme/diabook/diabook-blue/icons/notes.png") no-repeat;
+	float: left;
+	height: 22px;
+   width: 22px;}
+.menu-profile-icon.foren{
+	background: url("../../../view/theme/diabook/diabook-blue/icons/pubgroups.png") no-repeat;
+	float: left;
+	height: 22px;
+   width: 22px;}
+.menu-profile-icon.com_side{
+	background: url("../../../view/theme/diabook/diabook-blue/icons/com_side.png") no-repeat;
+	float: left;
+	height: 22px;
+   width: 22px;}
+.menu-profile-icon.pscontacts{
+	background: url("../../../view/theme/diabook/diabook-blue/icons/pscontacts.png") no-repeat;
+	float: left;
+	height: 22px;
+   width: 22px;}
+/* aside */
+/*marker*/
+aside {
+  display: table-cell;
+  vertical-align: top;
+  width: 180px;
+  padding: 0px 5px 0px 0px;
+  border-right: 1px solid #D2D2D2;
+  float: left;
+  /* background: #F1F1F1; */
+}
+aside #page-sidebar{display: none;}
+aside .vcard .fn {
+  font-size: 18px;
+  font-weight: bold;
+  margin-bottom: 5px;
+}
+aside .vcard .title {
+  margin-bottom: 5px;
+}
+aside .vcard dl {
+  height: auto;
+  overflow: auto;
+}
+aside .vcard dt {
+  float: left;
+  margin-left: 0px;
+  /*width: 35%;*/
+  text-align: right;
+  color: #999999;
+}
+aside .vcard dd {
+  float: left;
+  margin-left: 5px;
+  /*width: 60%;*/
+}
+aside #profile-extra-links ul {
+  padding: 0px;
+  margin: 0px;
+}
+aside #profile-extra-links li {
+  padding: 0px;
+  margin: 0px;
+  list-style: none;
+}
+aside #dfrn-request-link {
+  display: block;
+  -moz-border-radius: 5px 5px 5px 5px;
+  -webkit-border-radius: 5px 5px 5px 5px;
+  border-radius: 5px 5px 5px 5px;
+  color: #ffffff;
+  background: #005c94 url('../../../images/connect-bg.png') no-repeat left center;
+  font-weight: bold;
+  text-transform: uppercase;
+  padding: 4px 2px 2px 35px;
+}
+aside #dfrn-request-link:hover {
+  text-decoration: none;
+  background-color: #36c;
+  /* background-color: #19aeff; */
+}
+aside #profiles-menu {
+  width: 20em;
+}
+aside #search-text {
+	width: 173px;
+	height: 17px;
+   padding-left: 10px;
+	border-top-left-radius: 15px;
+border-top-right-radius: 15px;
+border-bottom-right-radius: 15px;
+border-bottom-left-radius: 15px;
+}
+aside #side-follow-url {
+	width: 173px;
+	}
+aside #side-peoplefind-url {
+	width: 173px;
+	}
+#contact-block {
+  overflow: auto;
+  height: auto;
+}
+#contact-block .contact-block-h4 {
+  float: left;
+  margin: 5px 0px;
+}
+#contact-block .allcontact-link {
+  float: right;
+  margin: 5px 0px;
+}
+#contact-block .contact-block-content {
+  clear: both;
+  overflow: auto;
+  height: auto;
+}
+#contact-block .contact-block-link {
+  float: left;
+  margin: 0px 2px 2px 0px;
+}
+#contact-block .contact-block-link img {
+  widht: 55px;
+  height: 55px;
+}
+#lost-password-link {
+  float: left;
+  margin-right: 20px;		
+	}
+#login-submit-wrapper{
+margin-bottom: 15px;
+	}
+.group_selected {
+  background: url("../../../view/theme/diabook/icons/selected.png") no-repeat left center;
+  float: left;
+  height: 22px;
+  width: 22px;
+}
+.group_unselected {
+  background: url("../../../view/theme/diabook/icons/unselected.png") no-repeat left center;
+  float: left;
+  height: 22px;
+  width: 22px;
+}
+.icon.text_add		{ 
+		background-image: url("../../../images/icons/16/add.png");
+		float: right;
+		opacity: 0.2;
+		margin-right: 14px;
+		}
+.icon.text_add:hover	{ 
+		background-image: url("../../../images/icons/16/add.png");
+		float: right;
+		cursor: pointer;
+		margin-right: 14px;
+		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;
+		}
+.icon.text_edit {
+  background-image: url("../../../images/icons/10/edit.png");
+  opacity: 0.2;
+  margin-top: 6px;
+  float: right;
+  height: 10px;
+}
+.icon.text_edit:hover {
+  background-image: url("../../../images/icons/10/edit.png");
+  opacity: 1;
+  margin-top: 6px;
+  float: right;
+  height: 10px;
+}
+/* widget */
+.widget {
+  margin-bottom: 2em;
+  /*.action .s10 { width: 10px; overflow: hidden; padding: 0px;}
+	.action .s16 { width: 16px; overflow: hidden; padding: 0px;}*/
+/*  font-size: 12px; */
+}
+/*marker*/
+.widget h3 {
+  padding: 0px;
+  margin: 2px;
+  font-size: 1.05em;
+}
+.widget .action {
+  opacity: 0.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;
+}
+.widget input.action {
+  opacity: 0.5;
+  -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;
+}
+.widget:hover .title .action {
+  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;
+}
+.widget .tool:hover .action {
+  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;
+}
+.widget .tool:hover .action.ticked {
+  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;
+}
+.widget ul {
+  padding: 0px;
+}
+.widget ul li {
+  padding-left: 16px;
+  min-height: 16px;
+  list-style: none;
+}
+#side-bar-photos-albums li{
+list-style-type: disc;
+}
+#side-bar-photos-albums ul li{
+  margin-left: 30px;
+  padding-left: 0px;
+	}
+#side-bar-photos-albums ul li a{
+  color: #1872A2;
+}
+.widget .tool.selected {
+  background: url("../../../view/theme/diabook/diabook-blue/icons/selected.png") no-repeat left center;
+}
+/* widget: search */
+#add-search-popup {
+  width: 200px;
+  top: 18px;
+}
+/* section */
+section {
+  display: table-cell;
+  vertical-align: top;
+  width: 800px;
+  padding: 0px 0px 0px 12px;
+}
+body .pageheader{
+  text-align: center;
+  font-size: 20px;
+  margin-bottom: 20px;
+  margin-top: 0px;
+  max-width: 775px;
+	}
+.qcomment{
+  max-width: 122px;	
+	}
+#id_username {
+  width: 173px;	
+	}
+#id_password {
+  width: 173px;		
+	}
+#id_openid_url {
+  width: 173px;	
+	}
+#contact-edit-end {
+	}
+.pager {
+   padding: 10px;
+	text-align: center;
+	font-size: 1.0em;
+	clear: both;
+	display: block;
+}	
+
+.tabs {
+    
+    background-position: 0 -20px;
+    background-repeat: repeat-x;
+    height: 27px;
+    padding: 0;
+ }
+.tab.button {
+    margin-left: 5px;	
+    /*background: none repeat scroll 0 0 #F8F8F8;*/
+    border: 1px solid #CCCCCC;
+    border-radius: 3px 3px 3px 3px;
+    font-weight: normal;
+    padding: 3px;
+    color:  #333333;
+	}
+	
+#birthday-notice, #event-notice, #birthday-wrapper, #event-wrapper{
+	margin-bottom: 10px;
+	}
+/* wall item */
+.tread-wrapper {
+  border-bottom: 1px solid #D2D2D2;
+  position: relative;
+  padding: 5px;
+  margin-bottom: 0px;
+  width: 775px;
+  padding-top: 10px;
+}
+.tread-wrapper a{
+  color: #1872A2;
+}
+
+/*marker*/
+.wall-item-decor {
+  position: absolute;
+  left: 780px;
+  top: -10px;
+  width: 16px;
+}
+/*marker*/
+.wall-item-container {
+  display: table;
+  width: 770px;
+}
+.wall-item-photo-container .wall-item-item, .wall-item-container .wall-item-bottom {
+  display: table-row;
+}
+.wall-item-photo-container .wall-item-info {
+  display: table-cell;
+  vertical-align: top;
+  text-align: left;
+  width: 80px;
+}
+.wall-item-photo-container .wall-item-location {
+  padding-right: 40px;
+  display: table-cell;
+}
+.wall-item-photo-container .wall-item-ago {
+  word-wrap: break-word;
+  width: 50px;
+  margin-left: 10px;
+  color: #999;
+}
+/*marker*/
+.wall-item-photo-container .wall-item-content {
+
+  max-width: 690px;
+  word-wrap: break-word;
+  
+  margin-bottom: 14px;
+}
+.wall-item-photo-container .wall-item-content img {
+  max-width: 700px;
+}
+.wall-item-photo-container .wall-item-links, .wall-item-photo-container .wall-item-actions {
+  display: table-cell;
+  vertical-align: middle;
+}
+.wall-item-photo-container .wall-item-links .icon, .wall-item-photo-container .wall-item-actions .icon {
+  opacity: 0.5;
+  -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;
+}
+.wall-item-photo-container .wall-item-links .icon:hover, .wall-item-photo-container .wall-item-actions .icon: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;
+}
+.wall-item-photo-container .wall-item-name {
+  font-weight: bold;
+}
+.wall-item-photo-container .wall-item-actions-author {
+  width: 100%;
+  margin-bottom: 0.3em;
+}
+.wall-item-photo-container .wall-item-actions-social {
+  float: left;
+  margin-bottom: 1px;
+  display: table-cell;
+}
+.wall-item-photo-container .wall-item-actions-social a {
+  margin-right: 1em;
+}
+.wall-item-photo-container .wall-item-actions-tools {
+  float: right;
+  width: 80px;
+  display: table-cell;
+}
+.wall-item-photo-container .wall-item-actions-tools a {
+  float: right;
+}
+.wall-item-photo-container .wall-item-actions-tools input {
+  float: right;
+}
+.wall-item-photo-container.comment {
+  margin-top: 5px;
+  margin-bottom: 5px;
+  margin-left: 40px;
+  width: 650px;
+  border-bottom: 1px solid #D2D2D2;
+}
+.wall-item-photo-container.comment {
+  top: 15px !important;
+  left: 15px !important;
+}
+.wall-item-photo-container {
+  display: table;
+  width: 780px;
+}
+.my-comment-photo {
+  width: 48px;
+  margin-left: 40px;
+  margin-right: 32px;
+	}
+.comment-edit-preview {
+  width: 500px;
+  margin-top: 10px;
+}
+.comment-edit-text-empty {
+    width: 500px;
+    border: 1px solid #D2D2D2;
+    height: 3.2em;
+    color: #2d2d2d;
+}
+.comment-edit-text-full {
+  font-size: 12.5px;
+  height: 3.3em;
+  
+  border: 1px solid #D2D2D2;
+  width: 500px;
+}
+.comment-edit-photo {
+    margin: 10px 0 0;
+    display: table-cell;
+}
+
+
+
+.wall-item-container .wall-item-item, .wall-item-container .wall-item-bottom {
+  display: table-row;
+}
+.wall-item-bottom {
+  font-size: 13px;
+}
+.wall-item-container .wall-item-bottom {
+/*  opacity: 0.5;
+  -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; */
+}
+.wall-item-container:hover .wall-item-bottom {
+/*  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; */
+}
+.wall-item-container .wall-item-info {
+  display: table-cell;
+  vertical-align: top;
+  text-align: left;
+  width: 80px;
+}
+.wall-item-container .wall-item-location {
+  padding-right: 40px;
+  display: table-cell;
+}
+.wall-item-container .wall-item-ago {
+  word-wrap: break-word;
+  width: 50px;
+  margin-left: 10px;
+  color: #999;
+}
+.wall-item-location {
+  
+  clear: both;
+  overflow: hidden;
+  
+  margin-bottom: 5px;
+}
+
+/*marker*/
+.wall-item-container .wall-item-content {
+
+  max-width: 690px;
+  word-wrap: break-word;
+
+
+}
+
+.wall-item-container .wall-item-content img {
+  max-width: 700px;
+}
+.wall-item-container .wall-item-links, .wall-item-container .wall-item-actions {
+  display: table-cell;
+  vertical-align: middle;
+}
+.wall-item-container .wall-item-links .icon, .wall-item-container .wall-item-actions .icon {
+  opacity: 0.5;
+  -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;
+}
+.wall-item-container .wall-item-links .icon:hover, .wall-item-container .wall-item-actions .icon: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;
+}
+.wall-item-container .wall-item-name {
+  font-weight: bold;
+}
+.wall-item-container .wall-item-actions-author {
+  width: 100%;
+  margin-bottom: 0.3em;
+}
+.wall-item-container .wall-item-actions-social {
+  float: left;
+  margin-bottom: 1px;
+  display: table-cell;
+}
+.wall-item-container .wall-item-actions-social a {
+  margin-right: 1em;
+}
+.wall-item-actions-social a {
+  float: left;
+}
+.wall-item-container .wall-item-actions-tools {
+  float: right;
+  width: 80px;
+  display: table-cell;done
+}
+.wall-item-container .wall-item-actions-tools a {
+  float: right;
+}
+.wall-item-container .wall-item-actions-tools input {
+  float: right;
+}
+/*marker*/
+.wall-item-container.comment {
+  margin-top: 5px;
+  margin-bottom: 5px;
+  margin-left: 80px;
+  width: 690px;
+  border-bottom: 1px solid hsl(198, 21%, 79%);
+}
+.wall-item-container.comment .contact-photo {
+  width: 32px;
+  height: 32px;
+  margin-left: 16px;
+  /*background: url(../../../images/icons/22/user.png) no-repeat center center;*/
+
+}
+.wall-item-container.comment {
+  top: 15px !important;
+  left: 15px !important;
+}
+.wall-item-container.comment .wall-item-links {
+  padding-left: 12px;
+}
+.wall-item-comment-wrapper {
+  margin: 1px 5px 5px 80px;
+}
+.wall-item-comment-wrapper .comment-edit-photo {
+  display: none;
+}
+.wall-item-comment-wrapper textarea {
+  height: 2.0em;
+  width: 100%;
+  font-size: 10px;
+  color: #999999;
+  border: 1px solid #DDD;
+  padding: 0.3em;
+  font-size: 14px;
+}
+.wall-item-comment-wrapper .comment-edit-text-full {
+  font-size: 14px;
+  height: 4em;
+  color: #2d2d2d;
+  border: 1px solid #2d2d2d;
+}
+.comment-edit-preview {
+  width: 500px;
+  margin-top: 10px;
+  background-color:  #fff797;
+}
+.comment-edit-preview .contact-photo {
+  width: 32px;
+  height: 32px;
+  margin-left: 16px;
+  /*background: url(../../../images/icons/22/user.png) no-repeat center center;*/
+
+}
+.comment-edit-preview {
+  top: 15px !important;
+  left: 15px !important;
+}
+.comment-edit-preview .wall-item-links {
+  padding-left: 12px;
+}
+.comment-edit-preview .wall-item-container {
+  width: 700px;
+}
+.comment-edit-preview .tread-wrapper {
+  width: 700px;
+  padding: 0;
+  margin: 10px 0;
+}
+
+.shiny {
+  /* border-right: 10px solid #fce94f; */
+	border-right: 1px solid #A7C7F7;
+	padding-right: 12px;
+}
+
+#jot-preview-content{
+	margin-top: 30px;}
+	
+#jot-preview-content .tread-wrapper {
+  background-color: #fff797;
+}
+
+.wall-item-tags {
+  padding-top: 1px;
+  padding-bottom: 2px;
+}
+.tag {
+  /*background: url("../../../images/tag_b.png") repeat-x center left;*/
+  color: #999;
+  padding-left: 3px;
+  font-size: 12px;
+}
+.tag a {
+  padding-right: 5px;
+  /*background: url("../../../images/tag.png") no-repeat center right;*/
+  color: #999;
+}
+.wwto {
+  position: absolute !important;
+  width: 25px;
+  height: 25px;
+  background: #FFFFFF;
+  border: 2px solid #364e59;
+  height: 25px;
+  width: 25px;
+  overflow: hidden;
+  padding: 1px;
+  position: absolute !important;
+  top: 40px;
+  left: 30px;
+  -webkit-box-shadow: 0px 0px 10px rgba(0, 0, 0, 0.7);
+  -moz-box-shadow: 0px 0px 10px rgba(0, 0, 0, 0.7);
+  box-shadow: 0px 0px 10px rgba(0, 0, 0, 0.7);
+}
+.wwto .contact-photo {
+  width: auto;
+  height: 25px;
+}
+/* contacts menu */
+.contact-photo-wrapper {
+  position: relative;
+  width: 80px;
+}
+
+.contact-photo-wrapper.wwto {
+  width: 25px;
+}
+
+.contact-photo {
+  width: 48px;
+  height: 48px;
+  overflow: hidden;
+  display: block;
+}
+.contact-photo img {
+  width: 48px;
+  height: 48px;
+}
+
+.contact-wrapper {
+  float: left;
+  width: 90px;
+  height: 90px;
+  margin-bottom: 15px;
+}
+.contact-wrapper .contact-photo {
+  width: 80px;
+  height: 80px;
+}
+.contact-wrapper .contact-photo img {
+  width: 80px;
+  height: 80px;
+}
+.contact-wrapper {
+  left: 0px;
+  top: 63px;
+}
+.contact-photo {
+  width: 48px;
+  height: 48px;
+}
+.contact-photo img {
+  width: 48px;
+  height: 48px;
+}
+.contact-name {
+  /* text-align: center; */
+  /*font-weight: bold;*/
+  font-size: 12px;
+}
+.contact-details {
+  color: #999999;
+}
+/* editor */
+.jothidden {
+  display: none;
+}
+#jot {
+  width: 785px;
+  margin: 0px 2em 20px 0px;
+}
+#profile-jot-form #profile-jot-text {
+  height: 2.0em;
+  width: 99%;
+  font-size: 15px;
+  color: #999999;
+  border: 1px solid #DDD;
+  padding: 0.3em;
+  margin-bottom: 10px;
+}
+.grey
+{
+  display: inline;
+  float: right;	
+	}
+#jot #jot-tools {
+  margin: 0px;
+  padding: 0px;
+  height: 40px;
+  overflow: none;
+  width: 783px;
+  background-color: #fff;
+  border-bottom: 2px solid #9eabb0;
+}
+
+#jot #jot-tools li {
+  list-style: none;
+  float: left;
+  width: 80px;
+  height: 40px;
+  border-bottom: 2px solid #9eabb0;
+}
+#jot #jot-tools li a {
+  display: block;
+  color: #cccccc;
+  width: 100%;
+  height: 40px;
+  text-align: center;
+  line-height: 40px;
+  overflow: hidden;
+}
+#jot #jot-tools li:hover {
+  background-color: #364e59;
+  border-bottom: 2px solid #bdcdd4;
+}
+#jot #jot-tools li.perms {
+  float: right;
+  width: 40px;
+}
+#jot #jot-tools li.perms a.unlock {
+  width: 30px;
+  border-left: 10px solid #cccccc;
+  background-color: #cccccc;
+  background-position: left center;
+}
+#jot #jot-tools li.perms a.lock {
+  width: 30px;
+  border-left: 10px solid #666666;
+  background-color: #666666;
+}
+#jot #jot-tools li.submit {
+  float: right;
+  background-color: #cccccc;
+  border-bottom: 2px solid #cccccc;
+  border-right: 1px solid #666666;
+  border-left: 1px solid #666666;
+}
+#jot #jot-tools li.submit input {
+  border: 0px;
+  margin: 0px;
+  padding: 0px;
+  background-color: #cccccc;
+  color: #666666;
+  width: 80px;
+  height: 40px;
+  line-height: 40px;
+}
+#jot #jot-tools li.submit input:hover {
+  background-color: #bdcdd4;
+  color: #666666;
+}
+#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;
+}
+#profile-jot-form #jot-title, #profile-jot-form #jot-category {
+    
+  	 border-radius: 5px 5px 5px 5px;
+    font-weight: bold;
+    height: 20px;
+    margin: 0 0 5px;
+    width: 60%;
+    border: 1px solid #d2d2d2;
+}
+#profile-jot-form #jot-title:-webkit-input-placeholder {
+  font-weight: normal;
+}
+#profile-jot-form #jot-title:-moz-placeholder {
+  font-weight: normal;
+}
+#profile-jot-form #profile-jot-text_parent #profile-jot-text_tbl{
+	width: 785px;
+	height: 100px;
+	}
+#jot #jot-title:hover {
+  border: 1px solid #999999;
+}
+#jot #jot-title:focus {
+  border: 1px solid #999999;
+}
+#jot #character-counter {
+  width: 80px;
+  float: right;
+  text-align: right;
+  height: 20px;
+  line-height: 20px;
+  padding-right: 20px;
+}
+#jot-perms-icon, 
+#profile-location,
+#profile-nolocation,
+#profile-youtube, 
+#profile-video, 
+#profile-audio,
+#profile-link,
+#profile-title, 
+#wall-image-upload,
+#wall-file-upload,
+#wall-image-upload-div,
+#wall-file-upload-div,
+.hover, .focus {
+	cursor: pointer;
+	margin-top: 2px;
+}
+/*marker*/
+#profile-jot-wrapper{
+	margin: 0 20px 20px 0;
+   width: 785px;
+	}
+/*marker*/
+#profile-jot-submit-wrapper {
+	margin-bottom: 50px;
+	width: 785px;
+}
+
+#profile-jot-submit {
+	float: right;
+	margin-top: 2px;
+	font-size: 14px;
+}
+#profile-upload-wrapper {
+	float: left;
+	margin-top: 2px;
+	margin-left: 10px;
+	
+}
+#profile-attach-wrapper {
+	float: left;
+	margin-left: 15px;
+	margin-top: 2px;
+}
+#profile-rotator {
+	float: left;
+	margin-left: 30px;
+	margin-top: 2px;
+}
+#profile-link-wrapper {
+	float: left;
+	margin-left: 15px;
+	margin-top: 2px;
+}
+#profile-youtube-wrapper {
+	float: left;
+	margin-left: 15px;
+	margin-top: 2px;
+}
+#profile-video-wrapper {
+	float: left;
+	margin-left: 15px;
+	margin-top: 2px;
+}
+#profile-audio-wrapper {
+	float: left;
+	margin-left: 15px;
+	margin-top: 2px;
+}
+#profile-location-wrapper {
+	float: left;
+	margin-left: 15px;
+	margin-top: 2px;
+}
+#profile-jot-perms {
+	float: left;
+	margin-left: 45px;
+	margin-top: 2px;
+}
+#jot-preview-link {
+	float: right;
+	margin-left: 10px;
+	margin-top: 2px;
+	font-size: 9px;
+	font-weight: bolder;
+	cursor: pointer;
+}
+#profile-jot-perms{
+   float: right;
+	margin-left: 10px;
+	margin-top: 2px;	
+	}
+/** buttons **/
+.button.creation1 {
+    background-color: #fff;
+    border: 1px solid #777777;
+    border-radius: 3px 3px 3px 3px;
+    box-shadow: 0 1px 1px #CFCFCF;
+    cursor: pointer;
+    font-weight: bolder;
+}
+.button.creation2 {
+    background-color: #055580;
+    border: 1px solid #777777;
+    color: white;
+    border-radius: 3px 3px 3px 3px;
+    box-shadow: 0 1px 1px #CFCFCF;
+    margin-left: 5px;
+    cursor: pointer;
+    font-weight: bolder;
+}
+/*input[type="submit"] {
+	border: 0px;
+    background-color: @ButtonBackgroundColor;
+    color: @ButtonColor;
+    padding: 0px 10px;
+	.rounded(5px);
+    height: 18px;
+}*/
+/** acl **/
+#photo-edit-perms-select, #photos-upload-permissions-wrapper, #profile-jot-acl-wrapper {
+  display: block!important;
+}
+#acl-wrapper {
+  width: 690px;
+  float: left;
+}
+#acl-search {
+  float: right;
+  background: #ffffff url("../../../images/search_18.png") no-repeat right center;
+  padding-right: 20px;
+}
+#acl-showall {
+  float: left;
+  display: block;
+  width: auto;
+  height: 18px;
+  background-color: #cccccc;
+  background-image: url("../../../images/show_all_off.png");
+  background-position: 7px 7px;
+  background-repeat: no-repeat;
+  padding: 7px 5px 0px 30px;
+  color: #999999;
+  -moz-border-radius: 5px 5px 5px 5px;
+  -webkit-border-radius: 5px 5px 5px 5px;
+  border-radius: 5px 5px 5px 5px;
+}
+#acl-showall.selected {
+  color: #000000;
+  background-color: #ff9900;
+  background-image: url("../../../images/show_all_on.png");
+}
+#acl-list {
+  height: 210px;
+  border: 1px solid #cccccc;
+  clear: both;
+  margin-top: 30px;
+  overflow: auto;
+}
+.acl-list-item {
+  display: block;
+  width: 150px;
+  height: 30px;
+  border: 1px solid #cccccc;
+  margin: 5px;
+  float: left;
+}
+.acl-list-item img {
+  width: 22px;
+  height: 22px;
+  float: left;
+  margin: 4px;
+}
+.acl-list-item p {
+  height: 12px;
+  font-size: 10px;
+  margin: 0px;
+  padding: 2px 0px 1px;
+  overflow: hidden;
+}
+.acl-list-item a {
+  font-size: 8px;
+  display: block;
+  width: 40px;
+  height: 10px;
+  float: left;
+  color: #999999;
+  background-color: #cccccc;
+  background-position: 3px 3px;
+  background-repeat: no-repeat;
+  margin-right: 5px;
+  -webkit-border-radius: 2px ;
+  -moz-border-radius: 2px;
+  border-radius: 2px;
+  padding-left: 15px;
+}
+#acl-wrapper a:hover {
+  text-decoration: none;
+  color: #000000;
+}
+.acl-button-show {
+  background-image: url("../../../images/show_off.png");
+}
+.acl-button-hide {
+  background-image: url("../../../images/hide_off.png");
+}
+.acl-button-show.selected {
+  color: #000000;
+  background-color: #9ade00;
+  background-image: url("../../../images/show_on.png");
+}
+.acl-button-hide.selected {
+  color: #000000;
+  background-color: #ff4141;
+  background-image: url("../../../images/hide_on.png");
+}
+.acl-list-item.groupshow {
+  border-color: #9ade00;
+}
+.acl-list-item.grouphide {
+  border-color: #ff4141;
+}
+/** /acl **/
+/** tab buttons 14618a**/
+/*marker*/
+ul.tabs {
+  list-style-type: none;
+  padding-bottom: 10px;
+  font-size: 13px;
+  width: 805px;
+}
+ul.tabs li {
+  float: left;
+  margin-left: 5px;
+}
+ul.tabs li .active {
+    background-color: #055580;
+    border: 1px solid #777777;
+    color: white;
+    border-radius: 3px 3px 3px 3px;
+    box-shadow: 0 1px 1px #CFCFCF;
+    margin-left: 5px;
+}
+//settings tabs
+ul.rs_tabs {
+  list-style-type: none;
+  font-size: 11px;
+}
+ul.rs_tabs li {
+  float: left;
+  margin-bottom: 30px;
+  clear: both;
+}
+ul.rs_tabs li .selected {
+    background-color: #055580;
+    border: 1px solid #777777;
+    color: white;
+    border-radius: 3px 3px 3px 3px;
+    box-shadow: 2px 2px 2px #CFCFCF;
+    font-size: 13px;
+}
+.rs_tabs {
+    list-style-type: none;
+    font-size: 11px;
+    background-position: 0 -20px;
+    background-repeat: repeat-x;
+    height: 27px;
+    padding: 0;
+ }
+.rs_tab.button {	
+    /*background: none repeat scroll 0 0 #F8F8F8;*/
+    border: 1px solid #CCCCCC;
+    border-radius: 3px 3px 3px 3px;
+    font-weight: bolder;
+    padding: 3px;
+    color:  #333333;
+    text-decoration: none;
+	}
+/**
+ * Form fields
+ */
+.field {
+  margin-bottom: 10px;
+  padding-bottom: 10px;
+  overflow: auto;
+  width: 100%;
+}
+.field label {
+  float: left;
+  width: 200px;
+}
+.field input, .field textarea {
+  width: 400px;
+}
+.field textarea {
+  height: 100px;
+}
+.field .field_help {
+  display: block;
+  margin-left: 200px;
+  color: #666666;
+}
+.field .onoff {
+  float: left;
+  width: 80px;
+}
+.field .onoff a {
+  display: block;
+  border: 1px solid #666666;
+  background-image: url("../../../images/onoff.jpg");
+  background-repeat: no-repeat;
+  padding: 4px 2px 2px 2px;
+  height: 16px;
+  text-decoration: none;
+}
+.field .onoff .off {
+  border-color: #666666;
+  padding-left: 40px;
+  background-position: left center;
+  background-color: #cccccc;
+  color: #666666;
+  text-align: right;
+}
+.field .onoff .on {
+  border-color: #204A87;
+  padding-right: 40px;
+  background-position: right center;
+  background-color: #D7E3F1;
+  color: #204A87;
+  text-align: left;
+}
+.field .hidden {
+  display: none!important;
+}
+.field.radio .field_help {
+  margin-left: 0px;
+}
+.suggest-select {
+width: 500px;
+height: 350px;	
+	}
+.message-to-select {
+	width: 400px;
+   height: 150px;
+	}
+#directory-search-form{
+	margin-bottom: 50px;
+	}
+#profile-edit-links-end {
+        clear: both;
+        margin-bottom: 15px;
+}
+
+#profile-edit-links ul { margin: 20px; padding-bottom: 20px; list-style: none; }
+
+#profile-edit-links li {
+  float: left;
+  list-style: none;
+  margin-left: 10px;
+}
+
+.profile-edit-side-div {
+  display: none;
+}
+
+#register-form label,
+#profile-edit-form label {
+        width: 300px; float: left;
+}
+
+.required {
+  display: inline;
+  color: #B20202;
+}
+
+/* oauth */
+.oauthapp {
+  height: auto;
+  overflow: auto;
+  border-bottom: 2px solid #cccccc;
+  padding-bottom: 1em;
+  margin-bottom: 1em;
+}
+.oauthapp img {
+  float: left;
+  width: 48px;
+  height: 48px;
+  margin: 10px;
+}
+.oauthapp img.noicon {
+  background-image: url("../../../images/icons/48/plugin.png");
+  background-position: center center;
+  background-repeat: no-repeat;
+}
+.oauthapp a {
+  float: left;
+}
+/* contacts */
+.contact-entry-wrapper {
+  width: 120px;
+  height: 120px;
+  float: left;
+}
+/* photo */
+.photo {
+box-shadow: 2px 2px 5px 0px #000000;
+margin: 0px;
+border-radius: 10px;
+height: 145px !important;
+width: 145px !important;
+}
+.lframe {
+  float: left;
+  /*margin: 0px 10px 10px 0px;*/
+}
+/* profile match wrapper */
+.profile-match-wrapper {
+  float: left;
+  width: 90px;
+  height: 90px;
+  margin-bottom: 20px;
+}
+.profile-match-wrapper .contact-photo {
+  width: 80px;
+  height: 80px;
+}
+.profile-match-wrapper .contact-photo img {
+  width: 80px;
+  height: 80px;
+}
+.profile-match-wrapper {
+  left: 0px;
+  top: 63px;
+}
+
+.contact-photo-menu-button {
+        position: relative;
+        background-image: url("../../../images/icons/16/menu.png");
+        background-position: top left; 
+        background-repeat: no-repeat;
+        margin: 0px 0px -16px 0px; 
+	padding: 0px;
+        width: 16px;
+        height: 16px;
+        top: -20px; left:0px;
+        overflow: hidden;
+        text-indent: 40px;
+        display: none;
+        
+}
+.contact-photo-menu {
+        width: 11em;
+        border: 3px solid #364e59;
+	color: #2d2d2d;
+        background: #FFFFFF;
+/*        position: absolute;*/
+        position: relative;
+        left: 0px; top: 0px;
+        display: none;
+        z-index: 10000;
+}
+.contact-photo-menu ul { margin:0px; padding: 0px; list-style: none }
+.contact-photo-menu li a {
+	display: block; 
+	padding: 5px 10px; 
+	color: #2d2d2d;
+	text-decoration: none;
+}
+.contact-photo-menu li a:hover {
+	background-color: #bdcdd4; 
+}
+
+/* page footer */
+footer {
+  height: 100px;
+  display: table-row;
+}
+
+blockquote {
+    border-left: 1px solid #D2D2D2;
+    padding-left: 9px;
+    margin: 0 0 0 .8ex;
+	 color: #777;
+}
+.oembed {
+	
+	font-weight: bold;
+}
+.aprofile dt{
+box-shadow: 1px 1px 5px 0;
+    color: #666666;
+    margin: 15px 0 5px;
+    padding-left: 5px;	
+	}
+/* ================== */
+/* = Contacts Block = */
+/* ================== */
+
+.contact-block-img {
+        width: 55px;
+        height: 55px;
+        padding-right: 3px;
+}
+.contact-block-div {
+        float: left;
+}
+
+.contact-block-textdiv { width: 150px; height: 34px; float: left; }
+#contact-block-end { clear: both; } 
+
+#group-edit-wrapper {
+        margin-bottom: 10px;
+}
+
+#group-members-end {
+        clear: both;
+}
+#group-edit-desc {
+ margin-top: 15px;
+}
+
+/*
+#group-separator,
+#prof-separator { display: none;}
+*/
+#prof-members-end{
+	clear: both;
+	}
+
+#prvmail-to-label, #prvmail-subject-label, #prvmail-message-label {
+	margin-bottom: 10px;
+	margin-top: 20px;
+}
+
+#prvmail-submit {
+	float: right;
+	margin-top: 10px;
+}
+
+#prvmail-subject
+{
+background: none repeat scroll 0 0 #FFFFFF;
+border: 1px solid #CCCCCC;
+border-radius: 5px 5px 5px 5px;
+font-weight: bold;
+height: 20px;
+margin: 0 0 5px;
+vertical-align: middle;
+}
+#prvmail-form{
+ width: 597px;	
+	}
+	
+#prvmail-upload-wrapper,
+#prvmail-link-wrapper,
+#prvmail-rotator-wrapper {
+	float: left;
+	margin-top: 10px;
+	margin-right: 10px;
+	width: 24px;
+}
+
+#prvmail-end {
+	clear: both;
+}
+
+.mail-list-sender,
+.mail-list-detail {
+	float: left;
+}
+.mail-list-detail {
+	margin-left: 20px;
+}
+
+.mail-list-subject {
+	font-size: 1.1em;
+	margin-top: 10px;
+}
+a.mail-list-link {
+    display: block;
+    font-size: 1.3em;
+    padding: 4px 0;
+}
+
+/*
+*a.mail-list-link:hover {
+*	background-color: #15607B;
+*	color: #F5F6FB;
+*}
+*/
+
+.mail-list-outside-wrapper-end {
+	clear: both;
+}
+
+.mail-list-outside-wrapper {
+	margin-top: 30px;
+}
+
+.mail-list-delete-wrapper {
+	float: right;
+	margin-right: 30px;
+	margin-top: 15px;
+}
+
+.mail-list-delete-icon {
+	border: none;
+}
+
+.mail-conv-sender,
+.mail-conv-detail {
+	float: left;
+}
+.mail-conv-detail {
+	margin-left: 20px;
+	width: 500px;
+}
+
+.mail-conv-subject {
+    font-size: 1.4em;
+    margin: 10px 0;
+}
+
+.mail-conv-outside-wrapper-end {
+	clear: both;
+}
+
+.mail-conv-outside-wrapper {
+	margin-top: 30px;
+}
+
+.mail-conv-delete-wrapper {
+	float: right;
+	margin-right: 30px;
+	margin-top: 15px;
+}
+.mail-conv-break {
+	clear: both;
+}
+
+.mail-conv-delete-icon {
+	border: none;
+}
+
+/* ========== */
+/* = Events = */
+/* ========== */
+.eventcal {
+        float: left;
+        font-size: 20px;
+}
+
+.vevent {
+position: relative;
+width: 400px;
+padding: 20px;
+padding-top: 10px;
+margin: 0 0px;
+margin-bottom: 10px;
+background-color: #2E2F2E;
+-webkit-box-shadow: 0 0 4px rgba(0, 0, 0, 0.2), inset 0 0 50px rgba(0, 0, 0, 0.1);
+-moz-box-shadow: 0 0 4px rgba(0, 0, 0, 0.2), inset 0 0 50px rgba(0, 0, 0, 0.1);
+box-shadow: 0 0 5px rgba(0, 0, 0, 0.2), inset 0 0 50px rgba(0, 0, 0, 0.1);
+}
+.vevent .event-location {
+        margin-left: 10px;
+        margin-right: 10px;
+}
+.vevent .event-description {
+margin-left: 10px;
+margin-right: 10px;
+font-size: 1.1em;
+font-weight: bolder;
+}
+.vevent .event-start, .vevent .event-end {
+
+margin-right: 20px;
+margin-bottom: 2px;
+margin-top: 2px;
+font-size: 0.9em;
+text-align: left;
+}
+.event-start .dtstart, .event-end .dtend {
+float: right;
+}
+
+
+#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("../../../view/theme/diabook/icons/events2.png") !important;
+        margin-right: 15px;
+}
+
+.event-start, .event-end {
+        margin-left: 10px;
+        width: 330px;
+        clear: both;
+}
+
+.event-start .dtstart, .event-end .dtend {
+        float: right;
+}
+
+.event-list-date {
+        margin-bottom: 10px;
+}
+
+.prevcal, .nextcal {
+        float: left;
+        margin-left: 32px;
+        margin-right: 32px;
+        margin-top: 64px;
+}
+.event-calendar-end {
+        clear: both;
+}
+
+ 
+.calendar {
+        font-family: Courier, monospace;
+}
+.calendar.eventcal a {
+  color: #1872A2;	
+	}
+.today {
+        font-weight: bold;
+        color: #FF0000;
+}
+
+.settings-block {
+        border: 1px solid #AAA;
+        margin: 10px;
+        padding: 10px;
+}
+
+.app-title {
+        margin: 10px;
+}
+
+#identity-manage-desc {
+        margin-top:15px;
+        margin-bottom: 15px;
+}
+
+#identity-manage-choose {
+        margin-bottom: 15px;
+}
+
+#identity-submit {
+        margin-top: 20px;
+}
+
+#photo-prev-link, #photo-next-link {
+        padding: 10px;
+        float: left;
+}
+.lightbox{
+	float: left;
+	}
+#photo-photo {
+        float: left;
+}
+#photo-like-div .wall-item-like-buttons {
+	float: left;
+   margin-right: 10px;
+	}
+.wall-item-like-buttons .icon.like {
+float: left;
+}
+
+#photo-photo-end {
+        clear: both;
+}
+
+.tabs .comment-wwedit-wrapper {
+	display: block;
+   margin-top: 30px;
+   margin-left: 50px;
+	}
+
+.profile-match-photo {
+        float: left;
+        text-align: center;
+        width: 120px;
+}
+
+.profile-match-name {
+        float: left;
+        text-align: center;
+        width: 120px;
+        overflow: hidden;
+}
+
+.profile-match-break,
+.profile-match-end {
+        clear: both;
+}
+
+.profile-match-connect {
+        text-align: center;
+        font-weight: bold;
+}
+
+.profile-match-wrapper {
+        float: left;
+        padding: 10px;
+        width: 120px;
+        height: 120px;
+        scroll: auto;
+}
+#profile-match-wrapper-end {
+        clear: both;
+}
+
+/* ============= */
+/* = Directory = */
+/* ============= */
+/* contacts menu */
+.contact-photo-wrapper {
+  position: relative;
+}
+.contact-photo {
+  width: 48px;
+  height: 48px;
+  overflow: hidden;
+  display: block;
+}
+.contact-photo img {
+  width: 48px;
+  height: 48px;
+}
+.contact-photo-menu-button {
+  display: none;
+  /* position: absolute; */
+  /* position: absolute; */
+  left: 0px;
+  top: -16px;
+}
+.contact-wrapper {
+  float: left;
+  width: 90px;
+  height: 90px;
+  margin-bottom: 15px;
+}
+.contact-wrapper .contact-photo {
+  width: 80px;
+  height: 80px;
+}
+.contact-wrapper .contact-photo img {
+  width: 80px;
+  height: 80px;
+}
+.contact-wrapper .contact-photo-menu-button {
+  left: 0px;
+  top: 63px;
+}
+.directory-item {
+  float: left;
+  width: 200px;
+  height: 200px;
+}
+.directory-item .contact-photo {
+  width: 175px;
+  height: 175px;
+}
+.directory-item .contact-photo img {
+  width: 175px;
+  height: 175px;
+}
+.contact-name {
+  text-align: left;
+  font-weight: bold;
+  font-size: 12px;
+}
+.contact-details {
+  color: #999999;
+}
+#side-bar-photos-albums{
+	margin-top: 15px;	
+	}
+.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-album-image-wrapper, .photo-top-image-wrapper {
+  float: left;
+   -moz-box-shadow: 0 0 5px #888;
+   -webkit-box-shadow: 0 0 5px #888;
+   box-shadow: 0 0 5px #888;
+  background-color: #000;
+   -webkit-border-radius: 5px;
+   -moz-border-radius: 5px;
+  border-radius: 5px;
+  padding-bottom: 20px;
+  position: relative;
+  margin: 0 10px 10px 0;
+  width: 200px; height: 140px;
+  overflow: hidden;  
+}
+.photo-top-album-name {
+        width: 100%;
+        position: absolute; 
+        bottom: 0px; 
+        padding-left: 3px;
+        background-color: #EEE;
+}
+.photo-top-album-link{
+  color: #1872A2;
+	}
+.photo-top-album-img{
+	
+	}
+/*.photo-top-image-wrapper {
+        position: relative;
+        float: left;
+        margin-top: 15px;
+        margin-right: 15px;
+        width: 200px; height: 200px; 
+        overflow: hidden; 
+}
+.photo-top-album-name {
+        width: 100%;
+        min-height: 2em;
+        position: absolute; 
+        bottom: 0px; 
+        padding: 0px 3px;
+        padding-top: 0.5em;
+        background-color: rgb(255, 255, 255);
+}*/
+#photo-top-end {
+        clear: both;
+}
+
+#photo-top-links {
+        margin-bottom: 30px;
+        margin-left: 30px;
+}
+
+#photos-upload-newalbum-div {
+        float: left;
+        width: 175px;
+}
+
diff --git a/view/theme/diabook/diabook-dark/style.css b/view/theme/diabook/diabook-dark/style.css
new file mode 100644
index 000000000..24de9f262
--- /dev/null
+++ b/view/theme/diabook/diabook-dark/style.css
@@ -0,0 +1,2888 @@
+/**
+ * Fabio Comuni <http://kirgroup.com/profile/fabrixxm>
+ * Additional Changes: Michael Vogel <icarus@dabo.de>
+ **/
+
+/* ========= */
+/* = Admin = */
+/* ========= */
+
+#adminpage {
+/*        width: 80%;*/
+}
+
+#pending-update {
+        float:right;
+        color: #2e2f2e;
+        font-weight: bold;
+        background-color: #FF0000;
+        padding: 0em 0.3em;
+}
+
+.admin.linklist {
+        border: 0px; padding: 0px;
+}
+
+.admin.link {
+        list-style-position: inside;
+        font-size: 1em;
+        padding: 5px;
+        width: 100px;
+        margin: 5px;
+}
+
+#adminpage dl {
+        clear: left;
+        margin-bottom: 2px;
+        padding-bottom: 2px;
+        border-bottom: 1px solid black;
+}
+
+#adminpage dt {
+        width: 200px;
+        float: left;
+        font-weight: bold;
+}
+
+#adminpage dd {
+        margin-left: 200px;
+}
+#adminpage h3 {
+        border-bottom: 1px solid #2e2f2e;
+        margin-bottom: 5px;
+        margin-top: 10px;
+}
+
+#adminpage .submit {
+        clear:left;
+}
+
+#adminpage #pluginslist {
+        margin: 0px; padding: 0px;
+}
+
+#adminpage .plugin {
+        list-style: none;
+        display: block;
+	/* border: 1px solid #888888; */
+        padding: 1em;
+        margin-bottom: 5px;
+        clear: left;
+}
+
+#adminpage .toggleplugin {
+        float:left;
+        margin-right: 1em;
+}
+
+#adminpage table {width:100%; border-bottom: 1p solid #000000; margin: 5px 0px;}
+#adminpage table th { text-align: left;}
+#adminpage td .icon { float: left;}
+#adminpage table#users img { width: 16px; height: 16px; }
+#adminpage table tr:hover { background-color: #eeeeee; }
+#adminpage .selectall { text-align: right; }
+/* icons */
+.icon.bb-url{
+  background-image: url("../../../view/theme/diabook/diabook-dark/icons/bb-url.png");
+  float: right;
+  margin-top: 2px;}
+.icon.quote{
+  background-image: url("../../../view/theme/diabook/diabook-dark/icons/quote.png");
+  float: right;
+  margin-top: 2px;}
+.icon.bold{
+  background-image: url("../../../view/theme/diabook/diabook-dark/icons/bold.png");
+  float: right;
+  margin-top: 2px;}
+.icon.underline{
+  background-image: url("../../../view/theme/diabook/diabook-dark/icons/underline.png");
+  float: right;
+  margin-top: 2px;}
+.icon.italic{
+  background-image: url("../../../view/theme/diabook/diabook-dark/icons/italic.png");
+  float: right;
+  margin-top: 2px;}
+.icon.bb-image{
+  background-image: url("../../../view/theme/diabook/diabook-dark/icons/bb-image.png");
+  float: right;
+  margin-top: 2px;}
+.icon.bb-video{
+  background-image: url("../../../view/theme/diabook/diabook-dark/icons/bb-video.png");
+  float: right;
+  margin-top: 2px;}
+  
+.icon.contacts {
+  background-image: url("../../../view/theme/diabook/diabook-dark/icons/contacts.png");}
+.icon.notifications {
+  background-image: url("../../../view/theme/diabook/diabook-dark/icons/notifications.png");}
+.icon.notify {
+  background-image: url("../../../view/theme/diabook/diabook-dark/icons/notify.png");}
+.icon.messages {
+  background-image: url("../../../view/theme/diabook/diabook-dark/icons/messages.png");}
+.icon.community {
+  background-image: url("../../../view/theme/diabook/diabook-dark/icons/community.png");}
+  
+.icon.drop 	{ background-image: url("../../../view/theme/diabook/diabook-dark/icons/drop.png");}
+.icon.drophide 	{ background-image: url("../../../view/theme/diabook/diabook-dark/icons/drop.png");}
+.icon.dislike 	{ background-image: url("../../../view/theme/diabook/diabook-dark/icons/dislike.png");}
+.icon.like 	{ background-image: url("../../../view/theme/diabook/diabook-dark/icons/like.png");}
+.icon.pencil 	{ background-image: url("../../../view/theme/diabook/diabook-dark/icons/pencil.png");}
+.icon.recycle 	{ background-image: url("../../../view/theme/diabook/diabook-dark/icons/recycle.png");}
+.icon.remote-link { background-image: url("../../../view/theme/diabook/diabook-dark/icons/remote.png");}
+.icon.tagged    { background-image: url("../../../view/theme/diabook/diabook-dark/icons/tagged.png");}
+.icon.file-as { background-image: url("../../../view/theme/diabook/diabook-dark/icons/file_as.png");}
+.star-item.icon.unstarred { background-image: url("../../../view/theme/diabook/diabook-dark/icons/unstarred.png");}
+.star-item.icon.starred { background-image: url("../../../view/theme/diabook/diabook-dark/icons/starred.png");}
+.icon.link		{ background-image: url("../../../view/theme/diabook/diabook-dark/icons/link.png");}
+.icon.lock		{ background-image: url("../../../view/theme/diabook/diabook-dark/icons/lock.png");}
+.icon.unlock		{ background-image: url("../../../view/theme/diabook/diabook-dark/icons/unlock.png");}
+.icon.language    { background-image: url("../../../view/theme/diabook/diabook-dark/icons/language.png");}
+
+
+.camera 	{ background-image: url("../../../view/theme/diabook/diabook-dark/icons/camera.png"); 
+			  display: block; width: 28px; height: 28px; background-repeat: no-repeat;
+			  }
+.attach 	{ background-image: url("../../../view/theme/diabook/diabook-dark/icons/attach.png"); 
+			  display: block; width: 28px; height: 28px; background-repeat: no-repeat;
+			  }
+.video2 	{ background-image: url("../../../view/theme/diabook/diabook-dark/icons/video.png"); 
+			  display: block; width: 28px; height: 28px; background-repeat: no-repeat;
+			  }	
+.video 	{ background-image: url("../../../view/theme/diabook/diabook-dark/icons/video.png"); 
+			  display: block; width: 100%; height: 140px; background-repeat: no-repeat;
+			  }
+.audio2 	{ background-image: url("../../../view/theme/diabook/diabook-dark/icons/audio.png"); 
+			  display: block; width: 28px; height: 28px; background-repeat: no-repeat;
+			  }
+.audio 	{ background-image: url("../../../view/theme/diabook/diabook-dark/icons/audio.png"); 
+			  display: block; width: 28px; height: 28px; background-repeat: no-repeat;
+			  }
+.weblink 	{ background-image: url("../../../view/theme/diabook/diabook-dark/icons/weblink.png"); 
+			  display: block; width: 28px; height: 28px; background-repeat: no-repeat;
+			  }
+.globe 	{ background-image: url("../../../view/theme/diabook/diabook-dark/icons/globe.png"); 
+			  display: block; width: 28px; height: 28px; background-repeat: no-repeat;
+			  }
+.unglobe 	{ background-image: url("../../../view/theme/diabook/diabook-dark/icons/unglobe.png"); 
+			  display: block; width: 28px; height: 28px; background-repeat: no-repeat;
+			  }
+.edit    {background-image: url("../../../view/theme/diabook/diabook-dark/icons/pencil2.png"); 
+			  display: block; width: 28px; height: 28px; background-repeat: no-repeat;}
+.icon.block   {background-image: url("../../../view/theme/diabook/icons/block.png"); 
+			  display: block; width: 16px; height: 16px; background-repeat: no-repeat;}
+.icon.block.dim  {background-image: url("../../../view/theme/diabook/icons/block.png"); 
+			  display: block; width: 16px; height: 16px; background-repeat: no-repeat; opacity: 0.3;}
+.icon.ad_drop 	{ background-image: url("../../../view/theme/diabook/icons/drop.png");
+			  display: block; margin-left:5px; width: 16px; height: 16px; background-repeat: no-repeat;}			  
+			  
+
+
+.article	{ background-position: -50px  0px;}
+/*.audio 		{ background-position: -70px  0px;}*/
+/*.drop 		{ background-position: -110px 0px;}*/
+/*.drophide 	{ background-position: -130px 0px;}*/
+/*.edit 		{ background-position: -150px 0px;}*/
+/*.camera 	{ background-position: -170px 0px;}*/
+/*.dislike 	{ background-position: -190px 0px;}*/
+/*.like 		{ background-position: -210px 0px;}*/
+/*.link 		{ background-position: -230px 0px;}*/
+
+/*.globe 		{ background-position: -50px  -20px;}*/
+/*.noglobe 	{ background-position: -70px  -20px;}*/
+.no 		{ background-position: -90px  -20px;}
+.pause 		{ background-position: -110px -20px;}
+.play 		{ background-position: -130px -20px;}
+/*.pencil 	{ background-position: -150px -20px;}*/
+.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;}*/
+
+/*.video          { background-position: -110px -40px;}*/
+.youtube        { background-position: -130px -40px;}
+
+/*.attach         { background-position: -190px -40px;}*/
+/*.language       { background-position: -210px -40px;}*/
+
+
+.icon.on             { background-image: url("../../../view/theme/diabook/diabook-dark/icons/toogle_on.png"); background-repeat: no-repeat;}
+.icon.off            { background-image: url("../../../view/theme/diabook/diabook-dark/icons/toogle_off.png"); background-repeat: no-repeat;}
+.icon.prev           { background-image: url("../../../view/theme/diabook/diabook-dark/icons/prev.png"); background-repeat: no-repeat;}
+.icon.next           { background-image: url("../../../view/theme/diabook/diabook-dark/icons/next.png"); background-repeat: no-repeat;}
+/*.tagged     { background-position: -130px -60px;}*/
+
+.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 0px; }
+.type-audio { background-position: -40px 0px; }
+.type-text  { background-position: -60px 0px; }
+.type-unkn  { background-position: -80px 0px; }
+
+.icon.drop, .icon.drophide {
+ float: left;
+}
+
+.icon {
+  display: block;
+  width: 20px;
+  height: 20px;
+  /*background-image: url('icons.png');*/
+}
+
+.icon {
+  background-color: transparent ;
+  background-repeat: no-repeat;
+  /* background-position: left center; */
+  display: block;
+  overflow: hidden;
+  text-indent: -9999px;
+  padding: 1px;
+}
+
+.icon.border.camera{
+  background-image: url("../../../view/theme/diabook/diabook-dark/icons/camera.png"); 
+  display: block; width: 28px; height: 28px; background-repeat: no-repeat;
+	}
+	
+.icon.border.link{
+  background-image: url("../../../view/theme/diabook/diabook-dark/icons/weblink.png"); 
+  display: block; width: 28px; height: 28px; background-repeat: no-repeat;
+  margin-left: 10px;
+	}
+
+.icon.text {
+  text-indent: 0px;
+}
+.icon.s10 {
+  min-width: 10px;
+  height: 10px;
+}
+.icon.s10.notify {
+  background-image: url("../../../images/icons/10/notify_off.png");
+}
+.icon.s10.gear {
+  background-image: url("../../../images/icons/10/gear.png");
+}
+.icon.s10.add {
+  background-image: url("../../../images/icons/10/add.png");
+}
+.icon.s10.delete {
+  background-image: url("../../../images/icons/10/delete.png");
+}
+.icon.s10.edit {
+  background-image: url("../../../images/icons/10/edit.png");
+}
+.icon.s10.star {
+  background-image: url("../../../images/star_dummy.png");
+}
+.icon.s10.menu {
+  background-image: url("../../../images/icons/10/menu.png");
+}
+.icon.s10.link {
+  background-image: url("../../../images/icons/10/link.png");
+}
+.icon.s10.lock {
+  background-image: url("../../../images/icons/10/lock.png");
+}
+.icon.s10.unlock {
+  background-image: url("../../../images/icons/10/unlock.png");
+}
+.icon.s10.text {
+  padding: 2px 0px 0px 15px;
+  font-size: 10px;
+}
+.icon.s16 {
+  min-width: 16px;
+  height: 16px;
+}
+.icon.s16.notify {
+  background-image: url("../../../images/icons/16/notify_off.png");
+}
+.icon.s16.gear {
+  background-image: url("../../../images/icons/16/gear.png");
+}
+.icon.s16.add {
+  background-image: url("../../../images/icons/16/add.png");
+}
+.icon.s16.delete {
+  background-image: url("../../../images/icons/16/delete.png");
+}
+/*.icon.s16.edit {
+  background-image: url("../../../images/icons/16/edit.png");
+}*/
+.icon.s16.star {
+  background-image: url("../../../images/star_dummy.png");
+}
+.icon.s16.menu {
+  background-image: url("../../../images/icons/16/menu.png");
+}
+/*.icon.s16.link {
+  background-image: url("../../../images/icons/16/link.png");
+}*/
+.icon.s16.lock {
+  background-image: url("../../../images/icons/16/lock.png");
+}
+.icon.s16.unlock {
+  background-image: url("../../../images/icons/16/unlock.png");
+}
+.icon.s16.text {
+  padding: 4px 0px 0px 20px;
+  font-size: 10px;
+}
+.icon.s22 {
+  min-width: 22px;
+  height: 22px;
+}
+.icon.s22.notify {
+  background-image: url("../../../images/icons/22/notify_off.png");
+}
+.icon.s22.gear {
+  background-image: url("../../../images/icons/22/gear.png");
+}
+.icon.s22.add {
+  background-image: url("../../../images/icons/22/add.png");
+}
+.icon.s22.delete {
+  background-image: url("../../../images/icons/22/delete.png");
+}
+.icon.s22.edit {
+  background-image: url("../../../images/icons/22/edit.png");
+}
+.icon.s22.star {
+  background-image: url("../../../images/star_dummy.png");
+}
+.icon.s22.menu {
+  background-image: url("../../../images/icons/22/menu.png");
+}
+.icon.s22.link {
+  background-image: url("../../../images/icons/22/link.png");
+}
+.icon.s22.lock {
+  background-image: url("../../../images/icons/22/lock.png");
+}
+.icon.s22.unlock {
+  background-image: url("../../../images/icons/22/unlock.png");
+}
+.icon.s22.text {
+  padding: 10px 0px 0px 25px;
+  width: 200px;
+}
+.icon.s48 {
+  width: 48px;
+  height: 48px;
+}
+.icon.s48.notify {
+  background-image: url("../../../images/icons/48/notify_off.png");
+}
+.icon.s48.gear {
+  background-image: url("../../../images/icons/48/gear.png");
+}
+.icon.s48.add {
+  background-image: url("../../../images/icons/48/add.png");
+}
+.icon.s48.delete {
+  background-image: url("../../../images/icons/48/delete.png");
+}
+.icon.s48.edit {
+  background-image: url("../../../images/icons/48/edit.png");
+}
+.icon.s48.star {
+  background-image: url("../../../images/star_dummy.png");
+}
+.icon.s48.menu {
+  background-image: url("../../../images/icons/48/menu.png");
+}
+.icon.s48.link {
+  background-image: url("../../../images/icons/48/link.png");
+}
+.icon.s48.lock {
+  background-image: url("../../../images/icons/48/lock.png");
+}
+.icon.s48.unlock {
+  background-image: url("../../../images/icons/48/unlock.png");
+}
+
+#contact-edit-links ul {
+  list-style: none;
+  list-style-type: none;
+}
+
+.hide-comments-outer {
+  margin-left: 80px;
+  margin-bottom: 5px;
+  width: 684px;
+  border-bottom: 1px solid #BDCDD4;
+  padding: 8px;
+}
+
+/* global */
+body {
+  font-family: 'Lato', "Helvetica Neue", Helvetica, Arial, sans-serif;
+  font-size: 12.5px;
+  background-color: #2e2f2e;
+  color: #eec;
+  margin: 50px auto auto;
+  display: table;
+}
+
+#jappix_mini {
+right: 45px !important;
+}
+
+
+h4 {
+  font-size: 1.1em;
+}
+
+a {
+	color: #88a9d2;
+	/* color: #3e3e8c; */
+	text-decoration: none;
+}
+a:hover {
+	/* color: blue; */
+	text-decoration: underline
+}
+
+.wall-item-name-link {
+/*  float: left;*/
+}
+
+.wall-item-photo {
+  width: 48px;
+  height: 48px;
+  overflow: hidden;
+  display: block;
+}
+
+.left {
+  float: left;
+}
+.right {
+  float: right;
+}
+.hidden {
+  display: none;
+}
+.clear {
+  clear: both;
+}
+.fakelink {
+  color: #1872A2;
+  /* color: #3e3e8c; */
+  text-decoration: none;
+  cursor: pointer;
+}
+.fakelink:hover {
+  /* color: blue; */
+  /*color: #005c94; */
+  text-decoration: underline;
+}
+.intro-end {
+	border-bottom: 1px solid black;
+   clear: both;
+   margin-bottom: 25px;
+   padding-bottom: 25px;
+   width: 75%;
+	}
+.intro-form-end {
+	clear: both;
+	}
+.intro-fullname {
+	padding-bottom: 5px;
+   padding-top: 5px;
+	}
+.intro-wrapper-end {
+	clear: both;
+   padding-bottom: 5px;
+	}
+code {
+  font-family: Courier, monospace;
+  white-space: pre;
+  display: block;
+  overflow: auto;
+  border: 1px solid #2e2f2e;
+  background: #EEE;
+  color: #2e2f2e;
+  padding: 10px;
+  margin-top: 20px;
+}
+#panel {
+  position: absolute;
+  width: 12em;
+  background: #2e2f2e;
+  color: #2e302e;
+  margin: 0px;
+  padding: 1em;
+  list-style: none;
+  border: 3px solid #364e59;
+  z-index: 100000;
+  -webkit-box-shadow: 0px 5px 10px rgba(0, 0, 0, 0.7);
+  -moz-box-shadow: 0px 5px 10px rgba(0, 0, 0, 0.7);
+  box-shadow: 0px 5px 10px rgba(0, 0, 0, 0.7);
+}
+/* tool */
+.tool {
+  height: auto;
+  overflow: auto;
+  padding: 3px;
+}
+#saved-search-ul .tool:hover,
+#nets-sidebar .tool:hover,
+#sidebar-group-list .tool:hover,
+#fileas-sidebar .tool:hover {
+	background: aliceBlue;
+}
+.tool .label {
+  float: left;
+}
+.tool .action {
+  float: right;
+}
+.tool a {
+  color: #3465a4;
+}
+.tool a:hover {
+  text-decoration: none;
+}
+/* popup notifications */
+div.jGrowl div.notice {
+  background: #511919 url("../../../images/icons/48/notice.png") no-repeat 5px center;
+  color: #2e2f2e;
+  padding-left: 58px;
+}
+div.jGrowl div.info {
+  background: #364e59 url("../../../images/icons/48/info.png") no-repeat 5px center;
+  color: #2e2f2e;
+  padding-left: 58px;
+}
+/* header */
+header {
+  position: fixed;
+  left: 0%;
+  right: 80%;
+  top: 0px;
+  margin: 0px;
+  padding: 0px;
+  width: 22%;
+  height: 32px;
+  background: #0c0e0c;
+  background-color: #1d1f1d;
+  z-index: 100;
+  border-bottom: 1px;
+  border-bottom-color: black;
+  border-bottom-style: inset;
+}
+header #site-location {
+  display: none;
+}
+header #banner {
+  overflow: hidden;
+  text-align: banner;
+  width: 82%;
+  margin-left: 25%;
+}
+header #banner a,
+header #banner a:active,
+header #banner a:visited,
+header #banner a:link,
+header #banner a:hover {
+  color: #2e2f2e;
+  text-decoration: none;
+  outline: none;
+  vertical-align: middle;
+ font-weight: bolder;
+  margin-left: 3px;
+}
+header #banner #logo-img {
+  height: 25px;
+  margin-top: 3px;
+}
+header #banner #logo-text {
+  font-size: 20px;
+  position: absolute;
+  top: 10%;
+}
+/* messages */
+#message-new {
+  background: #2e2f2e;
+  border: 1px solid #333;
+  width: 150px;
+}
+#message-new a {
+  color: #2e2f2e;
+  text-align: center;
+  display: block;
+  font-weight: bold;
+  padding: 1em 0px;
+    text-decoration: none;
+}
+.mail-list-wrapper {
+  background-color: #eec;
+  margin-bottom: 5px;
+  width: 100%;
+  height: auto;
+  overflow: hidden;
+}
+.mail-list-wrapper span {
+  display: block;
+  float: left;
+  width: 20%;
+  overflow: hidden;
+}
+.mail-list-wrapper .mail-subject {
+  width: 30%;
+  padding: 4px 0px 0px 4px;
+}
+.mail-list-wrapper .mail-subject a {
+  display: block;
+}
+.mail-list-wrapper .mail-subject.unseen a {
+  font-weight: bold;
+}
+.mail-list-wrapper .mail-date {
+  padding: 4px 4px 0px 4px;
+}
+.mail-list-wrapper .mail-from {
+  padding: 4px 4px 0px 4px;
+}
+.mail-list-wrapper .mail-count {
+  padding: 4px 4px 0px 4px;
+  text-align: right;
+}
+.mail-list-wrapper .mail-delete {
+  float: right;
+}
+#mail-display-subject {
+  background-color: #f6f7f8;
+  color: #2e302e;
+  margin-bottom: 10px;
+  width: 100%;
+  height: auto;
+  overflow: hidden;
+}
+#mail-display-subject span {
+  float: left;
+  overflow: hidden;
+  padding: 4px 0px 0px 10px;
+}
+#mail-display-subject .mail-delete {
+  float: right;
+  opacity: 0.5;
+  -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;
+}
+#mail-display-subject:hover .mail-delete {
+  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;
+}
+/* nav */
+nav {
+  width: 80%;
+  height: 32px;
+  position: fixed;
+  left: 22%;
+  top: 0px;
+  padding: 0px;
+  background: #1d1f1d;
+  color: #2e2f2e;
+  z-index: 99;
+  border-bottom: 1px;
+  border-bottom-color: black;
+  border-bottom-style: inset;
+}
+nav a,
+nav a:active,
+nav a:visited,
+nav a:link,
+nav a:hover {
+  color: #eec;
+  text-decoration: none;
+  outline: none;
+}
+nav #banner {
+  overflow: hidden;
+  /*text-align: center;*/
+  width: 100%;
+}
+nav #banner a,
+nav #banner a:active,
+nav #banner a:visited,
+nav #banner a:link,
+nav #banner a:hover {
+  color: #eec;
+  text-decoration: none;
+  outline: none;
+  vertical-align: bottom;
+}
+nav #banner #logo-img {
+  height: 22px;
+  margin-top: 5px;
+}
+nav #banner #logo-text {
+  font-size: 22px;
+}
+nav #navbar{
+	}
+nav ul {
+  margin: 0px;
+  padding: 0px 20px;
+}
+nav ul li {
+  list-style: none;
+  margin: 0px;
+  /* padding: 1px 1px 3px 1px; */
+  float: left;
+}
+nav ul li .menu-popup {
+  left: 0px;
+  right: auto;
+}
+
+nav #logo-img {
+  height: 25px;
+  margin-top: 4px;
+  margin-left: 30px;
+}
+
+nav #logo-text {
+    font-size: 22px;
+    margin-top: 3px;
+    margin-right: 15px;
+}
+nav .nav-menu-search {
+  position: relative;
+
+  margin: 4px 17px;
+  margin-right: 0px;
+  height: 17px;
+  width: 180px;
+  
+}
+
+nav #search-box #search-text {
+  background-image:  url('icons/lupe.png');
+  background-repeat:no-repeat;
+  padding-left:20px;
+  border-top-left-radius: 15px;
+border-top-right-radius: 15px;
+border-bottom-right-radius: 15px;
+border-bottom-left-radius: 15px;
+	}
+
+
+nav .nav-menu-icon {
+  position: relative;
+  height: 22px;
+  padding: 5px;
+  margin: 0px 5px;
+  -moz-border-radius: 5px 5px 0 0;
+  -webkit-border-radius: 5px 5px 0 0;
+  border-radius: 5px 5px 0 0;
+}
+nav .nav-menu-icon:hover {
+  background-color: #308dbf;  
+  position: relative;
+  height: 22px;
+  padding: 5px;
+  margin: 0px 5px;
+  -moz-border-radius: 5px 5px 0 0;
+  -webkit-border-radius: 5px 5px 0 0;
+  border-radius: 5px 5px 0 0;
+}
+
+nav .nav-menu-icon.selected {
+  background-color: #fff;
+}
+nav .nav-menu-icon img {
+  width: 22px;
+  height: 22px;
+}
+nav .nav-menu-icon .nav-notify {
+  top: 3px;
+}
+nav .nav-menu {
+  position: relative;
+  height: 16px;
+  padding: 5px;
+  margin: 3px 15px 0px;
+  font-size: 13px;
+  /*border-bottom: 3px solid #364A84;*/
+}
+nav .nav-menu.selected {
+  /*border-bottom: 3px solid #9eabb0;*/
+}
+nav .nav-notify {
+  display: none;
+  position: absolute;
+  background-color: #ff0000;
+  /* background-color: #19aeff; */
+  -moz-border-radius: 5px 5px 5px 5px;
+  -webkit-border-radius: 5px 5px 5px 5px;
+  border-radius: 5px 5px 5px 5px;
+  font-size: 10px;
+  font-weight: 900;
+  padding: 1px 4px;
+  top: 0px;
+  right: -6px;
+  min-width: 10px;
+  text-align: center;
+}
+nav .nav-notify.show {
+  display: block;
+}
+nav #nav-help-link,
+nav #nav-search-link,
+nav #nav-directory-link,
+nav #nav-apps-link,
+nav #nav-site-linkmenu, 
+nav #nav-home-link,
+nav #nav-user-linkmenu
+{
+  float: right;
+}
+nav #nav-user-linkmenu{
+	margin-right: 0px;
+	}
+nav #nav-home-link, #nav-directory-link, #nav-apps-link{
+	margin-left: 0px;
+	margin-right: 0px;
+	font-weight: bold;
+	margin: 3px 5px;
+	}
+nav #nav-directory-link{
+  margin-right: 0px;	
+	}
+nav #nav-home-link{
+  margin-left: 0px;	
+	}
+nav #nav-help-link .menu-popup,
+nav #nav-search-link .menu-popup,
+nav #nav-directory-link .menu-popup,
+nav #nav-apps-link .menu-popup,
+nav #nav-site-linkmenu .menu-popup {
+  right: 0px;
+  left: auto;
+}
+
+nav #nav-messages-linkmenu.on .icon.messages, nav #nav-messages-linkmenu.selected .icon.messages{
+	background-image: url("../../../view/theme/diabook/diabook-dark/icons/messages2.png");
+	}
+	
+/*nav #nav-notifications-linkmenu.on .icon.notify,*/ nav #nav-notifications-linkmenu.selected .icon.notify{
+	background-image: url("../../../view/theme/diabook/diabook-dark/icons/notify2.png");
+	}
+	
+nav #nav-contacts-linkmenu.on .icon.contacts, nav #nav-contacts-linkmenu.selected .icon.contacts{
+	background-image: url("../../../view/theme/diabook/diabook-dark/icons/contacts2.png");
+	}
+	
+nav #nav-apps-link.selected {
+  background-color: #fff;
+}
+
+#nav-notifications-mark-all {
+	/* padding: 1px 1px 2px 26px; */
+	/* border-bottom: 1px solid #364E59; */
+	/* margin: 0px 0px 2px 0px;
+	padding: 5px 10px; */
+}
+
+#nav-notifications-see-all {
+	/* padding: 1px 1px 2px 26px; */
+	/* border-bottom: 1px solid #364E59; */
+	/* margin: 0px 0px 2px 0px;
+	padding: 5px 10px; */
+}
+
+.notify-seen {
+	background: none repeat scroll 0 0 #DDDDDD;
+	}
+
+ul.menu-popup {
+  position: absolute;
+  display: none;
+  width: 11em;
+  background: #2e2f2e;
+  color: #2e302e;
+  margin: 0px;
+  padding: 0px;
+  list-style: none;
+  z-index: 100000;
+  -webkit-box-shadow: 0px 5px 10px rgba(0, 0, 0, 0.7);
+  -moz-box-shadow: 0px 5px 10px rgba(0, 0, 0, 0.7);
+  box-shadow: 0px 5px 10px rgba(0, 0, 0, 0.7);
+}
+ul.menu-popup a {
+  display: block;
+  color: #2e302e;
+  padding: 5px 10px;
+  text-decoration: none;
+}
+ul.menu-popup a:hover {
+  background-color: #308DBF; /*bdcdd4;*/
+  color: #fff;
+}
+ul.menu-popup .menu-sep {
+  border-top: 1px solid #9eabb0;
+}
+ul.menu-popup li {
+  float: none;
+  overflow: auto;
+  height: auto;
+  display: block;
+}
+ul.menu-popup li img {
+  float: left;
+  width: 16px;
+  height: 16px;
+  padding-right: 5px;
+}
+ul.menu-popup .empty {
+  padding: 5px;
+  text-align: center;
+  color: #9eabb0;
+}
+/* autocomplete popup */
+.acpopup {
+  max-height: 150px;
+  background-color: #2e2f2e;
+  color: #2e302e;
+  border: 1px solid #MenuBorder;
+  overflow: auto;
+  z-index: 100000;
+  -webkit-box-shadow: 0px 5px 10px rgba(0, 0, 0, 0.7);
+  -moz-box-shadow: 0px 5px 10px rgba(0, 0, 0, 0.7);
+  box-shadow: 0px 5px 10px rgba(0, 0, 0, 0.7);
+}
+.acpopupitem {
+  color: #2e302e;
+  padding: 4px;
+  clear: left;
+}
+.acpopupitem img {
+  float: left;
+  margin-right: 4px;
+}
+.acpopupitem.selected {
+  background-color: #bdcdd4;
+}
+#nav-notifications-menu {
+  width: 400px;
+  max-height: 550px;
+  overflow: auto;
+}
+/* #nav-notifications-menu a {
+	display: inline;
+	padding: 5px 0px;
+	margin: 0px 0px 2px 0px;
+}
+#nav-notifications-menu li:hover {
+  background-color: #bdcdd4;
+}*/
+
+#nav-notifications-menu img {
+  float: left;
+  margin-right: 5px;
+}
+#nav-notifications-menu .contactname {
+  font-weight: bold;
+}
+#nav-notifications-menu .notif-when {
+  font-size: 10px;
+  color: #9eabb0;
+  display: block;
+}
+
+.notif-image {
+        width: 32px;
+        height: 32px;
+        padding: 7px 7px 0px 0px;
+}
+
+/*profile_side*/
+#profile_side {
+  margin-bottom: 30px;
+}
+#ps-usericon{
+	height: 25px	
+	}
+#ps-username{
+  font-size: 1.17em;
+  font-weight: bold;
+  vertical-align: top;
+  position: absolute;
+  padding-top: 4px;
+  padding-left: 5px;	
+  word-wrap: break-word;
+  width: 130px;
+	}
+#ps-username:hover{
+  text-decoration: none;	
+	}
+.menu-profile-side{
+  list-style: none;	
+  padding-left: 0px;
+  min-height: 0px;
+	}
+.menu-profile-list{
+  height: auto;
+  overflow: auto;
+  min-height: 16px;
+  list-style: none;
+	}
+.menu-profile-list:hover{
+	background: #308DBF;
+	}
+.menu-profile-list-item{
+	padding-left: 5px;
+	vertical-align: middle;
+	}	
+.menu-profile-list-item:hover{	
+	text-decoration: none;
+	
+   }
+/*http://prothemedesign.com/circular-icons/*/
+.menu-profile-icon.home{
+	background: url("../../../view/theme/diabook/diabook-dark/icons/home.png") no-repeat;
+	float: left;
+	height: 22px;
+   width: 22px;
+	}
+.menu-profile-icon.photos{
+	background: url("../../../view/theme/diabook/diabook-dark/icons/mess_side.png") no-repeat;
+	float: left;
+	height: 22px;
+   width: 22px;}
+.menu-profile-icon.events{
+	background: url("../../../view/theme/diabook/diabook-dark/icons/events.png") no-repeat;
+	float: left;
+	height: 22px;
+   width: 22px;}
+.menu-profile-icon.notes{
+	background: url("../../../view/theme/diabook/diabook-dark/icons/notes.png") no-repeat;
+	float: left;
+	height: 22px;
+   width: 22px;}
+.menu-profile-icon.foren{
+	background: url("../../../view/theme/diabook/diabook-dark/icons/pubgroups.png") no-repeat;
+	float: left;
+	height: 22px;
+   width: 22px;}
+.menu-profile-icon.com_side{
+	background: url("../../../view/theme/diabook/diabook-dark/icons/com_side.png") no-repeat;
+	float: left;
+	height: 22px;
+   width: 22px;}
+.menu-profile-icon.pscontacts{
+	background: url("../../../view/theme/diabook/diabook-dark/icons/pscontacts.png") no-repeat;
+	float: left;
+	height: 22px;
+   width: 22px;}
+/* aside */
+aside {
+  display: table-cell;
+  vertical-align: top;
+  width: 180px;
+  padding: 0px 10px 0px 20px;
+  border-right: 1px solid #D2D2D2;
+  float: left;
+  /* background: #F1F1F1; */
+}
+aside #page-sidebar{display: none;}
+aside .vcard .fn {
+  font-size: 18px;
+  font-weight: bold;
+  margin-bottom: 5px;
+}
+aside .vcard .title {
+  margin-bottom: 5px;
+}
+aside .vcard dl {
+  height: auto;
+  overflow: auto;
+}
+aside .vcard dt {
+  float: left;
+  margin-left: 0px;
+  /*width: 35%;*/
+  text-align: right;
+  color: #999999;
+}
+aside .vcard dd {
+  float: left;
+  margin-left: 5px;
+  /*width: 60%;*/
+}
+aside #profile-extra-links ul {
+  padding: 0px;
+  margin: 0px;
+}
+aside #profile-extra-links li {
+  padding: 0px;
+  margin: 0px;
+  list-style: none;
+}
+aside #dfrn-request-link {
+  display: block;
+  -moz-border-radius: 5px 5px 5px 5px;
+  -webkit-border-radius: 5px 5px 5px 5px;
+  border-radius: 5px 5px 5px 5px;
+  color: #2e2f2e;
+  background: #005c94 url('../../../images/connect-bg.png') no-repeat left center;
+  font-weight: bold;
+  text-transform: uppercase;
+  padding: 4px 2px 2px 35px;
+}
+aside #dfrn-request-link:hover {
+  text-decoration: none;
+  background-color: #36c;
+  /* background-color: #19aeff; */
+}
+aside #profiles-menu {
+  width: 20em;
+}
+aside #search-text {
+	width: 173px;
+	height: 17px;
+   padding-left: 10px;
+	border-top-left-radius: 15px;
+border-top-right-radius: 15px;
+border-bottom-right-radius: 15px;
+border-bottom-left-radius: 15px;
+}
+aside #side-follow-url {
+	width: 173px;
+	}
+aside #side-peoplefind-url {
+	width: 173px;
+	}
+#contact-block {
+  overflow: auto;
+  height: auto;
+}
+#contact-block .contact-block-h4 {
+  float: left;
+  margin: 5px 0px;
+}
+#contact-block .allcontact-link {
+  float: right;
+  margin: 5px 0px;
+}
+#contact-block .contact-block-content {
+  clear: both;
+  overflow: auto;
+  height: auto;
+}
+#contact-block .contact-block-link {
+  float: left;
+  margin: 0px 2px 2px 0px;
+}
+#contact-block .contact-block-link img {
+  widht: 55px;
+  height: 55px;
+}
+#lost-password-link {
+  float: left;
+  margin-right: 20px;		
+	}
+#login-submit-wrapper{
+margin-bottom: 15px;
+	}
+.group_selected {
+  background: url("../../../view/theme/diabook/icons/selected.png") no-repeat left center;
+  float: left;
+  height: 22px;
+  width: 22px;
+}
+.group_unselected {
+  background: url("../../../view/theme/diabook/icons/unselected.png") no-repeat left center;
+  float: left;
+  height: 22px;
+  width: 22px;
+}
+.icon.text_add		{ 
+		background-image: url("../../../images/icons/16/add.png");
+		float: right;
+		opacity: 0.2;
+		margin-right: 14px;
+		}
+.icon.text_add:hover	{ 
+		background-image: url("../../../images/icons/16/add.png");
+		float: right;
+		cursor: pointer;
+		margin-right: 14px;
+		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;
+		}
+.icon.text_edit {
+  background-image: url("../../../images/icons/10/edit.png");
+  opacity: 0.2;
+  margin-top: 6px;
+  float: right;
+  height: 10px;
+}
+.icon.text_edit:hover {
+  background-image: url("../../../images/icons/10/edit.png");
+  opacity: 1;
+  margin-top: 6px;
+  float: right;
+  height: 10px;
+}
+/* widget */
+.widget {
+  margin-bottom: 2em;
+  /*.action .s10 { width: 10px; overflow: hidden; padding: 0px;}
+	.action .s16 { width: 16px; overflow: hidden; padding: 0px;}*/
+/*  font-size: 12px; */
+}
+.widget h3 {
+  padding: 0px;
+  margin: 2px;
+}
+.widget .action {
+  opacity: 0.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;
+}
+.widget input.action {
+  opacity: 0.5;
+  -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;
+}
+.widget:hover .title .action {
+  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;
+}
+.widget .tool:hover .action {
+  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;
+}
+.widget .tool:hover .action.ticked {
+  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;
+}
+.widget ul {
+  padding: 0px;
+}
+.widget ul li {
+  padding-left: 16px;
+  min-height: 16px;
+  list-style: none;
+}
+#side-bar-photos-albums li{
+list-style-type: disc;
+}
+#side-bar-photos-albums ul li{
+  margin-left: 30px;
+  padding-left: 0px;
+	}
+#side-bar-photos-albums ul li a{
+  color: #1872A2;
+}
+.widget .tool.selected {
+  background: url("../../../view/theme/diabook/diabook-dark/icons/selected.png") no-repeat left center;
+}
+/* widget: search */
+#add-search-popup {
+  width: 200px;
+  top: 18px;
+}
+/* section */
+section {
+  display: table-cell;
+  vertical-align: top;
+  width: 800px;
+  padding: 0px 0px 0px 12px;
+}
+body .pageheader{
+  text-align: center;
+  font-size: 20px;
+  margin-bottom: 20px;
+  margin-top: 0px;
+  max-width: 775px;
+	}
+.qcomment{
+  max-width: 122px;	
+	}
+#id_username {
+  width: 173px;	
+	}
+#id_password {
+  width: 173px;		
+	}
+#id_openid_url {
+  width: 173px;	
+	}
+#contact-edit-end {
+	}
+.pager {
+   padding: 10px;
+	text-align: center;
+	font-size: 1.0em;
+	clear: both;
+	display: block;
+}	
+
+.tabs {
+    
+    background-position: 0 -20px;
+    background-repeat: repeat-x;
+    height: 27px;
+    padding: 0;
+ }
+.tab.button {
+    margin-left: 5px;	
+    /*background: none repeat scroll 0 0 #F8F8F8;*/
+    border: 1px solid #CCCCCC;
+    border-radius: 3px 3px 3px 3px;
+    font-weight: normal;
+    padding: 3px;
+    color:  #88a9d2;
+	}
+	
+#birthday-notice, #event-notice, #birthday-wrapper, #event-wrapper{
+	margin-bottom: 10px;
+	}
+/* wall item */
+.tread-wrapper {
+  border-bottom: 1px solid #D2D2D2;
+  position: relative;
+  padding: 5px;
+  margin-bottom: 0px;
+  width: 775px;
+  padding-top: 10px;
+}
+.tread-wrapper a{
+  color: #1872A2;
+}
+
+.wall-item-decor {
+  position: absolute;
+  left: 790px;
+  top: -10px;
+  width: 16px;
+}
+
+.wall-item-container {
+  display: table;
+  width: 780px;
+}
+.wall-item-photo-container .wall-item-item, .wall-item-container .wall-item-bottom {
+  display: table-row;
+}
+.wall-item-photo-container .wall-item-info {
+  display: table-cell;
+  vertical-align: top;
+  text-align: left;
+  width: 80px;
+}
+.wall-item-photo-container .wall-item-location {
+  padding-right: 40px;
+  display: table-cell;
+}
+.wall-item-photo-container .wall-item-ago {
+  word-wrap: break-word;
+  width: 50px;
+  margin-left: 10px;
+  color: #999;
+}
+.wall-item-photo-container .wall-item-content {
+
+  max-width: 720px;
+  word-wrap: break-word;
+
+  margin-bottom: 14px;
+}
+.wall-item-photo-container .wall-item-content img {
+  max-width: 700px;
+}
+.wall-item-photo-container .wall-item-links, .wall-item-photo-container .wall-item-actions {
+  display: table-cell;
+  vertical-align: middle;
+}
+.wall-item-photo-container .wall-item-links .icon, .wall-item-photo-container .wall-item-actions .icon {
+  opacity: 0.5;
+  -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;
+}
+.wall-item-photo-container .wall-item-links .icon:hover, .wall-item-photo-container .wall-item-actions .icon: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;
+}
+.wall-item-photo-container .wall-item-name {
+  font-weight: bold;
+}
+.wall-item-photo-container .wall-item-actions-author {
+  width: 100%;
+  margin-bottom: 0.3em;
+}
+.wall-item-photo-container .wall-item-actions-social {
+  float: left;
+  margin-bottom: 1px;
+  display: table-cell;
+}
+.wall-item-photo-container .wall-item-actions-social a {
+  margin-right: 1em;
+}
+.wall-item-photo-container .wall-item-actions-tools {
+  float: right;
+  width: 80px;
+  display: table-cell;
+}
+.wall-item-photo-container .wall-item-actions-tools a {
+  float: right;
+}
+.wall-item-photo-container .wall-item-actions-tools input {
+  float: right;
+}
+.wall-item-photo-container.comment {
+  margin-top: 5px;
+  margin-bottom: 5px;
+  margin-left: 40px;
+  width: 650px;
+  border-bottom: 1px solid #D2D2D2;
+}
+.wall-item-photo-container.comment {
+  top: 15px !important;
+  left: 15px !important;
+}
+.wall-item-photo-container {
+  display: table;
+  width: 780px;
+}
+.my-comment-photo {
+  width: 48px;
+  margin-left: 40px;
+  margin-right: 32px;
+	}
+.comment-edit-preview {
+  width: 500px;
+  margin-top: 10px;
+}
+.comment-edit-text-empty {
+    width: 500px;
+    border: 1px solid #D2D2D2;
+    height: 3.2em;
+    color: #2e302e;
+}
+.comment-edit-text-full {
+  font-size: 12.5px;
+  height: 3.3em;
+  
+  border: 1px solid #D2D2D2;
+  width: 500px;
+}
+.comment-edit-photo {
+    margin: 10px 0 0;
+    display: table-cell;
+}
+
+
+
+.wall-item-container .wall-item-item, .wall-item-container .wall-item-bottom {
+  display: table-row;
+}
+.wall-item-bottom {
+  font-size: 13px;
+}
+.wall-item-container .wall-item-bottom {
+/*  opacity: 0.5;
+  -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; */
+}
+.wall-item-container:hover .wall-item-bottom {
+/*  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; */
+}
+.wall-item-container .wall-item-info {
+  display: table-cell;
+  vertical-align: top;
+  text-align: left;
+  width: 80px;
+}
+.wall-item-container .wall-item-location {
+  padding-right: 40px;
+  display: table-cell;
+}
+.wall-item-container .wall-item-ago {
+  word-wrap: break-word;
+  width: 50px;
+  margin-left: 10px;
+  color: #999;
+}
+.wall-item-location {
+  
+  clear: both;
+  overflow: hidden;
+  
+  margin-bottom: 5px;
+}
+
+.wall-item-container .wall-item-content {
+
+  max-width: 720px;
+  word-wrap: break-word;
+
+
+}
+
+.wall-item-container .wall-item-content img {
+  max-width: 700px;
+}
+.wall-item-container .wall-item-links, .wall-item-container .wall-item-actions {
+  display: table-cell;
+  vertical-align: middle;
+}
+.wall-item-container .wall-item-links .icon, .wall-item-container .wall-item-actions .icon {
+  opacity: 0.5;
+  -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;
+}
+.wall-item-container .wall-item-links .icon:hover, .wall-item-container .wall-item-actions .icon: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;
+}
+.wall-item-container .wall-item-name {
+  font-weight: bold;
+}
+.wall-item-container .wall-item-actions-author {
+  width: 100%;
+  margin-bottom: 0.3em;
+}
+.wall-item-container .wall-item-actions-social {
+  float: left;
+  margin-bottom: 1px;
+  display: table-cell;
+}
+.wall-item-container .wall-item-actions-social a {
+  margin-right: 1em;
+}
+.wall-item-actions-social a {
+  float: left;
+}
+.wall-item-container .wall-item-actions-tools {
+  float: right;
+  width: 80px;
+  display: table-cell;done
+}
+.wall-item-container .wall-item-actions-tools a {
+  float: right;
+}
+.wall-item-container .wall-item-actions-tools input {
+  float: right;
+}
+.wall-item-container.comment {
+  margin-top: 5px;
+  margin-bottom: 5px;
+  margin-left: 80px;
+  width: 700px;
+  border-bottom: 1px solid hsl(198, 21%, 79%);
+}
+.wall-item-container.comment .contact-photo {
+  width: 32px;
+  height: 32px;
+  margin-left: 16px;
+  /*background: url(../../../images/icons/22/user.png) no-repeat center center;*/
+
+}
+.wall-item-container.comment {
+  top: 15px !important;
+  left: 15px !important;
+}
+.wall-item-container.comment .wall-item-links {
+  padding-left: 12px;
+}
+.wall-item-comment-wrapper {
+  margin: 1px 5px 5px 80px;
+}
+.wall-item-comment-wrapper .comment-edit-photo {
+  display: none;
+}
+.wall-item-comment-wrapper textarea {
+  height: 2.0em;
+  width: 100%;
+  font-size: 10px;
+  color: #999999;
+  border: 1px solid #DDD;
+  padding: 0.3em;
+  font-size: 14px;
+}
+.wall-item-comment-wrapper .comment-edit-text-full {
+  font-size: 14px;
+  height: 4em;
+  color: #2e302e;
+  border: 1px solid #2e302e;
+}
+.comment-edit-preview {
+  width: 500px;
+  margin-top: 10px;
+  background-color:  #fff797;
+}
+.comment-edit-preview .contact-photo {
+  width: 32px;
+  height: 32px;
+  margin-left: 16px;
+  /*background: url(../../../images/icons/22/user.png) no-repeat center center;*/
+
+}
+.comment-edit-preview {
+  top: 15px !important;
+  left: 15px !important;
+}
+.comment-edit-preview .wall-item-links {
+  padding-left: 12px;
+}
+.comment-edit-preview .wall-item-container {
+  width: 700px;
+}
+.comment-edit-preview .tread-wrapper {
+  width: 700px;
+  padding: 0;
+  margin: 10px 0;
+}
+
+.shiny {
+  /* border-right: 10px solid #fce94f; */
+	border-right: 1px solid #A7C7F7;
+	padding-right: 12px;
+}
+
+#jot-preview-content{
+	margin-top: 30px;}
+	
+#jot-preview-content .tread-wrapper {
+  background-color: #fff797;
+}
+
+.wall-item-tags {
+  padding-top: 1px;
+  padding-bottom: 2px;
+}
+.tag {
+  /*background: url("../../../images/tag_b.png") repeat-x center left;*/
+  color: #999;
+  padding-left: 3px;
+  font-size: 12px;
+}
+.tag a {
+  padding-right: 5px;
+  /*background: url("../../../images/tag.png") no-repeat center right;*/
+  color: #999;
+}
+.wwto {
+  position: absolute !important;
+  width: 25px;
+  height: 25px;
+  background: #FFFFFF;
+  border: 2px solid #364e59;
+  height: 25px;
+  width: 25px;
+  overflow: hidden;
+  padding: 1px;
+  position: absolute !important;
+  top: 40px;
+  left: 30px;
+  -webkit-box-shadow: 0px 0px 10px rgba(0, 0, 0, 0.7);
+  -moz-box-shadow: 0px 0px 10px rgba(0, 0, 0, 0.7);
+  box-shadow: 0px 0px 10px rgba(0, 0, 0, 0.7);
+}
+.wwto .contact-photo {
+  width: auto;
+  height: 25px;
+}
+/* contacts menu */
+.contact-photo-wrapper {
+  position: relative;
+  width: 80px;
+}
+
+.contact-photo-wrapper.wwto {
+  width: 25px;
+}
+
+.contact-photo {
+  width: 48px;
+  height: 48px;
+  overflow: hidden;
+  display: block;
+}
+.contact-photo img {
+  width: 48px;
+  height: 48px;
+}
+
+.contact-wrapper {
+  float: left;
+  width: 90px;
+  height: 90px;
+  margin-bottom: 15px;
+}
+.contact-wrapper .contact-photo {
+  width: 80px;
+  height: 80px;
+}
+.contact-wrapper .contact-photo img {
+  width: 80px;
+  height: 80px;
+}
+.contact-wrapper {
+  left: 0px;
+  top: 63px;
+}
+.contact-photo {
+  width: 48px;
+  height: 48px;
+}
+.contact-photo img {
+  width: 48px;
+  height: 48px;
+}
+.contact-name {
+  /* text-align: center; */
+  /*font-weight: bold;*/
+  font-size: 12px;
+}
+.contact-details {
+  color: #999999;
+}
+/* editor */
+.jothidden {
+  display: none;
+}
+#jot {
+  width: 785px;
+  margin: 0px 2em 20px 0px;
+}
+#profile-jot-form #profile-jot-text {
+  height: 2.0em;
+  width: 99%;
+  font-size: 15px;
+  color: #999999;
+  border: 1px solid #DDD;
+  padding: 0.3em;
+  margin-bottom: 10px;
+}
+.grey
+{
+  display: inline;
+  float: right;	
+	}
+#jot #jot-tools {
+  margin: 0px;
+  padding: 0px;
+  height: 40px;
+  overflow: none;
+  width: 783px;
+  background-color: #fff;
+  border-bottom: 2px solid #9eabb0;
+}
+
+#jot #jot-tools li {
+  list-style: none;
+  float: left;
+  width: 80px;
+  height: 40px;
+  border-bottom: 2px solid #9eabb0;
+}
+#jot #jot-tools li a {
+  display: block;
+  color: #cccccc;
+  width: 100%;
+  height: 40px;
+  text-align: center;
+  line-height: 40px;
+  overflow: hidden;
+}
+#jot #jot-tools li:hover {
+  background-color: #364e59;
+  border-bottom: 2px solid #bdcdd4;
+}
+#jot #jot-tools li.perms {
+  float: right;
+  width: 40px;
+}
+#jot #jot-tools li.perms a.unlock {
+  width: 30px;
+  border-left: 10px solid #cccccc;
+  background-color: #cccccc;
+  background-position: left center;
+}
+#jot #jot-tools li.perms a.lock {
+  width: 30px;
+  border-left: 10px solid #666666;
+  background-color: #666666;
+}
+#jot #jot-tools li.submit {
+  float: right;
+  background-color: #cccccc;
+  border-bottom: 2px solid #cccccc;
+  border-right: 1px solid #666666;
+  border-left: 1px solid #666666;
+}
+#jot #jot-tools li.submit input {
+  border: 0px;
+  margin: 0px;
+  padding: 0px;
+  background-color: #cccccc;
+  color: #666666;
+  width: 80px;
+  height: 40px;
+  line-height: 40px;
+}
+#jot #jot-tools li.submit input:hover {
+  background-color: #bdcdd4;
+  color: #666666;
+}
+#jot #jot-tools li.loading {
+  float: right;
+  background-color: #2e2f2e;
+  width: 20px;
+  vertical-align: center;
+  text-align: center;
+  border-top: 2px solid #9eabb0;
+  height: 38px;
+}
+#jot #jot-tools li.loading img {
+  margin-top: 10px;
+}
+#profile-jot-form #jot-title, #profile-jot-form #jot-category {
+    
+  	 border-radius: 5px 5px 5px 5px;
+    font-weight: bold;
+    height: 20px;
+    margin: 0 0 5px;
+    width: 60%;
+    border: 1px solid #d2d2d2;
+}
+#profile-jot-form #jot-title:-webkit-input-placeholder {
+  font-weight: normal;
+}
+#profile-jot-form #jot-title:-moz-placeholder {
+  font-weight: normal;
+}
+#profile-jot-form #profile-jot-text_parent #profile-jot-text_tbl{
+	width: 785px;
+	height: 100px;
+	}
+#jot #jot-title:hover {
+  border: 1px solid #999999;
+}
+#jot #jot-title:focus {
+  border: 1px solid #999999;
+}
+#jot #character-counter {
+  width: 80px;
+  float: right;
+  text-align: right;
+  height: 20px;
+  line-height: 20px;
+  padding-right: 20px;
+}
+#jot-perms-icon, 
+#profile-location,
+#profile-nolocation,
+#profile-youtube, 
+#profile-video, 
+#profile-audio,
+#profile-link,
+#profile-title, 
+#wall-image-upload,
+#wall-file-upload,
+#wall-image-upload-div,
+#wall-file-upload-div,
+.hover, .focus {
+	cursor: pointer;
+	margin-top: 2px;
+}
+#profile-jot-wrapper{
+	margin: 0 2em 20px 0;
+   width: 785px;
+	}
+
+#profile-jot-submit-wrapper {
+	margin-bottom: 50px;
+	width: 785px;
+}
+
+#profile-jot-submit {
+	float: right;
+	margin-top: 2px;
+	font-size: 14px;
+}
+#profile-upload-wrapper {
+	float: left;
+	margin-top: 2px;
+	margin-left: 10px;
+	
+}
+#profile-attach-wrapper {
+	float: left;
+	margin-left: 15px;
+	margin-top: 2px;
+}
+#profile-rotator {
+	float: left;
+	margin-left: 30px;
+	margin-top: 2px;
+}
+#profile-link-wrapper {
+	float: left;
+	margin-left: 15px;
+	margin-top: 2px;
+}
+#profile-youtube-wrapper {
+	float: left;
+	margin-left: 15px;
+	margin-top: 2px;
+}
+#profile-video-wrapper {
+	float: left;
+	margin-left: 15px;
+	margin-top: 2px;
+}
+#profile-audio-wrapper {
+	float: left;
+	margin-left: 15px;
+	margin-top: 2px;
+}
+#profile-location-wrapper {
+	float: left;
+	margin-left: 15px;
+	margin-top: 2px;
+}
+#profile-jot-perms {
+	float: left;
+	margin-left: 45px;
+	margin-top: 2px;
+}
+#jot-preview-link {
+	float: right;
+	margin-left: 10px;
+	margin-top: 2px;
+	font-size: 9px;
+	font-weight: bolder;
+	cursor: pointer;
+}
+#profile-jot-perms{
+   float: right;
+	margin-left: 10px;
+	margin-top: 2px;	
+	}
+/** buttons **/
+.button.creation1 {
+    background-color: #fff;
+    border: 1px solid #777777;
+    border-radius: 3px 3px 3px 3px;
+    box-shadow: 0 1px 1px #CFCFCF;
+    cursor: pointer;
+    font-weight: bolder;
+}
+.button.creation2 {
+    background-color: #055580;
+    border: 1px solid #777777;
+    color: white;
+    border-radius: 3px 3px 3px 3px;
+    box-shadow: 0 1px 1px #CFCFCF;
+    margin-left: 5px;
+    cursor: pointer;
+    font-weight: bolder;
+}
+/*input[type="submit"] {
+	border: 0px;
+    background-color: @ButtonBackgroundColor;
+    color: @ButtonColor;
+    padding: 0px 10px;
+	.rounded(5px);
+    height: 18px;
+}*/
+/** acl **/
+#photo-edit-perms-select, #photos-upload-permissions-wrapper, #profile-jot-acl-wrapper {
+  display: block!important;
+}
+#acl-wrapper {
+  width: 690px;
+  float: left;
+}
+#acl-search {
+  float: right;
+  background: #2e2f2e url("../../../images/search_18.png") no-repeat right center;
+  padding-right: 20px;
+}
+#acl-showall {
+  float: left;
+  display: block;
+  width: auto;
+  height: 18px;
+  background-color: #cccccc;
+  background-image: url("../../../images/show_all_off.png");
+  background-position: 7px 7px;
+  background-repeat: no-repeat;
+  padding: 7px 5px 0px 30px;
+  color: #999999;
+  -moz-border-radius: 5px 5px 5px 5px;
+  -webkit-border-radius: 5px 5px 5px 5px;
+  border-radius: 5px 5px 5px 5px;
+}
+#acl-showall.selected {
+  color: #000000;
+  background-color: #ff9900;
+  background-image: url("../../../images/show_all_on.png");
+}
+#acl-list {
+  height: 210px;
+  border: 1px solid #cccccc;
+  clear: both;
+  margin-top: 30px;
+  overflow: auto;
+}
+.acl-list-item {
+  display: block;
+  width: 150px;
+  height: 30px;
+  border: 1px solid #cccccc;
+  margin: 5px;
+  float: left;
+}
+.acl-list-item img {
+  width: 22px;
+  height: 22px;
+  float: left;
+  margin: 4px;
+}
+.acl-list-item p {
+  height: 12px;
+  font-size: 10px;
+  margin: 0px;
+  padding: 2px 0px 1px;
+  overflow: hidden;
+}
+.acl-list-item a {
+  font-size: 8px;
+  display: block;
+  width: 40px;
+  height: 10px;
+  float: left;
+  color: #999999;
+  background-color: #cccccc;
+  background-position: 3px 3px;
+  background-repeat: no-repeat;
+  margin-right: 5px;
+  -webkit-border-radius: 2px ;
+  -moz-border-radius: 2px;
+  border-radius: 2px;
+  padding-left: 15px;
+}
+#acl-wrapper a:hover {
+  text-decoration: none;
+  color: #000000;
+}
+.acl-button-show {
+  background-image: url("../../../images/show_off.png");
+}
+.acl-button-hide {
+  background-image: url("../../../images/hide_off.png");
+}
+.acl-button-show.selected {
+  color: #000000;
+  background-color: #9ade00;
+  background-image: url("../../../images/show_on.png");
+}
+.acl-button-hide.selected {
+  color: #000000;
+  background-color: #ff4141;
+  background-image: url("../../../images/hide_on.png");
+}
+.acl-list-item.groupshow {
+  border-color: #9ade00;
+}
+.acl-list-item.grouphide {
+  border-color: #ff4141;
+}
+/** /acl **/
+/** tab buttons 14618a**/
+ul.tabs {
+  list-style-type: none;
+  padding-bottom: 10px;
+  font-size: 13px;
+}
+ul.tabs li {
+  float: left;
+  margin-left: 5px;
+}
+ul.tabs li .active {
+    background-color: #055580;
+    border: 1px solid #777777;
+    color: white;
+    border-radius: 3px 3px 3px 3px;
+    box-shadow: 0 1px 1px #CFCFCF;
+    margin-left: 5px;
+}
+//settings tabs
+ul.rs_tabs {
+  list-style-type: none;
+  font-size: 11px;
+}
+ul.rs_tabs li {
+  float: left;
+  margin-bottom: 30px;
+  clear: both;
+}
+ul.rs_tabs li .selected {
+    background-color: #055580;
+    border: 1px solid #777777;
+    color: white;
+    border-radius: 3px 3px 3px 3px;
+    box-shadow: 2px 2px 2px #CFCFCF;
+    font-size: 13px;
+}
+.rs_tabs {
+    list-style-type: none;
+    font-size: 11px;
+    background-position: 0 -20px;
+    background-repeat: repeat-x;
+    height: 27px;
+    padding: 0;
+ }
+.rs_tab.button {	
+    /*background: none repeat scroll 0 0 #F8F8F8;*/
+    border: 1px solid #CCCCCC;
+    border-radius: 3px 3px 3px 3px;
+    font-weight: bolder;
+    padding: 3px;
+    color:  #88a9d2;
+    text-decoration: none;
+	}
+/**
+ * Form fields
+ */
+.field {
+  margin-bottom: 10px;
+  padding-bottom: 10px;
+  overflow: auto;
+  width: 100%;
+}
+.field label {
+  float: left;
+  width: 200px;
+}
+.field input, .field textarea {
+  width: 400px;
+}
+.field textarea {
+  height: 100px;
+}
+.field .field_help {
+  display: block;
+  margin-left: 200px;
+  color: #666666;
+}
+.field .onoff {
+  float: left;
+  width: 80px;
+}
+.field .onoff a {
+  display: block;
+  border: 1px solid #666666;
+  background-image: url("../../../images/onoff.jpg");
+  background-repeat: no-repeat;
+  padding: 4px 2px 2px 2px;
+  height: 16px;
+  text-decoration: none;
+}
+.field .onoff .off {
+  border-color: #666666;
+  padding-left: 40px;
+  background-position: left center;
+  background-color: #cccccc;
+  color: #666666;
+  text-align: right;
+}
+.field .onoff .on {
+  border-color: #204A87;
+  padding-right: 40px;
+  background-position: right center;
+  background-color: #D7E3F1;
+  color: #204A87;
+  text-align: left;
+}
+.field .hidden {
+  display: none!important;
+}
+.field.radio .field_help {
+  margin-left: 0px;
+}
+.suggest-select {
+width: 500px;
+height: 350px;	
+	}
+.message-to-select {
+	width: 400px;
+   height: 150px;
+	}
+#directory-search-form{
+	margin-bottom: 50px;
+	}
+#profile-edit-links-end {
+        clear: both;
+        margin-bottom: 15px;
+}
+
+#profile-edit-links ul { margin: 20px; padding-bottom: 20px; list-style: none; }
+
+#profile-edit-links li {
+  float: left;
+  list-style: none;
+  margin-left: 10px;
+}
+
+.profile-edit-side-div {
+  display: none;
+}
+
+#register-form label,
+#profile-edit-form label {
+        width: 300px; float: left;
+}
+
+.required {
+  display: inline;
+  color: #B20202;
+}
+
+/* oauth */
+.oauthapp {
+  height: auto;
+  overflow: auto;
+  border-bottom: 2px solid #cccccc;
+  padding-bottom: 1em;
+  margin-bottom: 1em;
+}
+.oauthapp img {
+  float: left;
+  width: 48px;
+  height: 48px;
+  margin: 10px;
+}
+.oauthapp img.noicon {
+  background-image: url("../../../images/icons/48/plugin.png");
+  background-position: center center;
+  background-repeat: no-repeat;
+}
+.oauthapp a {
+  float: left;
+}
+/* contacts */
+.contact-entry-wrapper {
+  width: 120px;
+  height: 120px;
+  float: left;
+}
+/* photo */
+.photo {
+box-shadow: 2px 2px 5px 0px #000000;
+margin: 0px;
+border-radius: 10px;
+height: 145px !important;
+width: 145px !important;
+}
+.lframe {
+  float: left;
+  /*margin: 0px 10px 10px 0px;*/
+}
+/* profile match wrapper */
+.profile-match-wrapper {
+  float: left;
+  width: 90px;
+  height: 90px;
+  margin-bottom: 20px;
+}
+.profile-match-wrapper .contact-photo {
+  width: 80px;
+  height: 80px;
+}
+.profile-match-wrapper .contact-photo img {
+  width: 80px;
+  height: 80px;
+}
+.profile-match-wrapper {
+  left: 0px;
+  top: 63px;
+}
+
+.contact-photo-menu-button {
+        position: relative;
+        background-image: url("../../../images/icons/16/menu.png");
+        background-position: top left; 
+        background-repeat: no-repeat;
+        margin: 0px 0px -16px 0px; 
+	padding: 0px;
+        width: 16px;
+        height: 16px;
+        top: -20px; left:0px;
+        overflow: hidden;
+        text-indent: 40px;
+        display: none;
+        
+}
+.contact-photo-menu {
+        width: 11em;
+        border: 3px solid #364e59;
+	color: #2e302e;
+        background: #FFFFFF;
+/*        position: absolute;*/
+        position: relative;
+        left: 0px; top: 0px;
+        display: none;
+        z-index: 10000;
+}
+.contact-photo-menu ul { margin:0px; padding: 0px; list-style: none }
+.contact-photo-menu li a {
+	display: block; 
+	padding: 5px 10px; 
+	color: #2e302e;
+	text-decoration: none;
+}
+.contact-photo-menu li a:hover {
+	background-color: #bdcdd4; 
+}
+
+/* page footer */
+footer {
+  height: 100px;
+  display: table-row;
+}
+
+blockquote {
+    border-left: 1px solid #D2D2D2;
+    padding-left: 9px;
+    margin: 0 0 0 .8ex;
+	 color: #777;
+}
+.oembed {
+	
+	font-weight: bold;
+}
+.aprofile dt{
+box-shadow: 1px 1px 5px 0;
+    color: #666666;
+    margin: 15px 0 5px;
+    padding-left: 5px;	
+	}
+/* ================== */
+/* = Contacts Block = */
+/* ================== */
+
+.contact-block-img {
+        width: 55px;
+        height: 55px;
+        padding-right: 3px;
+}
+.contact-block-div {
+        float: left;
+}
+
+.contact-block-textdiv { width: 150px; height: 34px; float: left; }
+#contact-block-end { clear: both; } 
+
+#group-edit-wrapper {
+        margin-bottom: 10px;
+}
+
+#group-members-end {
+        clear: both;
+}
+#group-edit-desc {
+ margin-top: 15px;
+}
+
+/*
+#group-separator,
+#prof-separator { display: none;}
+*/
+#prof-members-end{
+	clear: both;
+	}
+
+#prvmail-to-label, #prvmail-subject-label, #prvmail-message-label {
+	margin-bottom: 10px;
+	margin-top: 20px;
+}
+
+#prvmail-submit {
+	float: right;
+	margin-top: 10px;
+}
+
+#prvmail-subject
+{
+background: none repeat scroll 0 0 #FFFFFF;
+border: 1px solid #CCCCCC;
+border-radius: 5px 5px 5px 5px;
+font-weight: bold;
+height: 20px;
+margin: 0 0 5px;
+vertical-align: middle;
+}
+#prvmail-form{
+ width: 597px;	
+	}
+	
+#prvmail-upload-wrapper,
+#prvmail-link-wrapper,
+#prvmail-rotator-wrapper {
+	float: left;
+	margin-top: 10px;
+	margin-right: 10px;
+	width: 24px;
+}
+
+#prvmail-end {
+	clear: both;
+}
+
+.mail-list-sender,
+.mail-list-detail {
+	float: left;
+}
+.mail-list-detail {
+	margin-left: 20px;
+}
+
+.mail-list-subject {
+	font-size: 1.1em;
+	margin-top: 10px;
+}
+a.mail-list-link {
+    display: block;
+    font-size: 1.3em;
+    padding: 4px 0;
+}
+
+/*
+*a.mail-list-link:hover {
+*	background-color: #15607B;
+*	color: #F5F6FB;
+*}
+*/
+
+.mail-list-outside-wrapper-end {
+	clear: both;
+}
+
+.mail-list-outside-wrapper {
+	margin-top: 30px;
+}
+
+.mail-list-delete-wrapper {
+	float: right;
+	margin-right: 30px;
+	margin-top: 15px;
+}
+
+.mail-list-delete-icon {
+	border: none;
+}
+
+.mail-conv-sender,
+.mail-conv-detail {
+	float: left;
+}
+.mail-conv-detail {
+	margin-left: 20px;
+	width: 500px;
+}
+
+.mail-conv-subject {
+    font-size: 1.4em;
+    margin: 10px 0;
+}
+
+.mail-conv-outside-wrapper-end {
+	clear: both;
+}
+
+.mail-conv-outside-wrapper {
+	margin-top: 30px;
+}
+
+.mail-conv-delete-wrapper {
+	float: right;
+	margin-right: 30px;
+	margin-top: 15px;
+}
+.mail-conv-break {
+	clear: both;
+}
+
+.mail-conv-delete-icon {
+	border: none;
+}
+
+/* ========== */
+/* = Events = */
+/* ========== */
+.eventcal {
+        float: left;
+        font-size: 20px;
+}
+
+.vevent {
+position: relative;
+width: 400px;
+padding: 20px;
+padding-top: 10px;
+margin: 0 0px;
+margin-bottom: 10px;
+background-color: #2E2F2E;
+-webkit-box-shadow: 0 0 4px rgba(0, 0, 0, 0.2), inset 0 0 50px rgba(0, 0, 0, 0.1);
+-moz-box-shadow: 0 0 4px rgba(0, 0, 0, 0.2), inset 0 0 50px rgba(0, 0, 0, 0.1);
+box-shadow: 0 0 5px rgba(0, 0, 0, 0.2), inset 0 0 50px rgba(0, 0, 0, 0.1);
+}
+.vevent .event-location {
+        margin-left: 10px;
+        margin-right: 10px;
+}
+.vevent .event-description {
+margin-left: 10px;
+margin-right: 10px;
+font-size: 1.1em;
+font-weight: bolder;
+}
+.vevent .event-start, .vevent .event-end {
+
+margin-right: 20px;
+margin-bottom: 2px;
+margin-top: 2px;
+font-size: 0.9em;
+text-align: left;
+}
+.event-start .dtstart, .event-end .dtend {
+float: right;
+}
+
+
+#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("../../../view/theme/diabook/icons/events2.png") !important;
+        margin-right: 15px;
+}
+
+.event-start, .event-end {
+        margin-left: 10px;
+        width: 330px;
+        clear: both;
+}
+
+.event-start .dtstart, .event-end .dtend {
+        float: right;
+}
+
+.event-list-date {
+        margin-bottom: 10px;
+}
+
+.prevcal, .nextcal {
+        float: left;
+        margin-left: 32px;
+        margin-right: 32px;
+        margin-top: 64px;
+}
+.event-calendar-end {
+        clear: both;
+}
+
+ 
+.calendar {
+        font-family: Courier, monospace;
+}
+.calendar.eventcal a {
+  color: #1872A2;	
+	}
+.today {
+        font-weight: bold;
+        color: #FF0000;
+}
+
+.settings-block {
+        border: 1px solid #AAA;
+        margin: 10px;
+        padding: 10px;
+}
+
+.app-title {
+        margin: 10px;
+}
+
+#identity-manage-desc {
+        margin-top:15px;
+        margin-bottom: 15px;
+}
+
+#identity-manage-choose {
+        margin-bottom: 15px;
+}
+
+#identity-submit {
+        margin-top: 20px;
+}
+
+#photo-prev-link, #photo-next-link {
+        padding: 10px;
+        float: left;
+}
+.lightbox{
+	float: left;
+	}
+#photo-photo {
+        float: left;
+}
+#photo-like-div .wall-item-like-buttons {
+	float: left;
+   margin-right: 10px;
+	}
+.wall-item-like-buttons .icon.like {
+float: left;
+}
+
+#photo-photo-end {
+        clear: both;
+}
+
+.tabs .comment-wwedit-wrapper {
+	display: block;
+   margin-top: 30px;
+   margin-left: 50px;
+	}
+
+.profile-match-photo {
+        float: left;
+        text-align: center;
+        width: 120px;
+}
+
+.profile-match-name {
+        float: left;
+        text-align: center;
+        width: 120px;
+        overflow: hidden;
+}
+
+.profile-match-break,
+.profile-match-end {
+        clear: both;
+}
+
+.profile-match-connect {
+        text-align: center;
+        font-weight: bold;
+}
+
+.profile-match-wrapper {
+        float: left;
+        padding: 10px;
+        width: 120px;
+        height: 120px;
+        scroll: auto;
+}
+#profile-match-wrapper-end {
+        clear: both;
+}
+
+/* ============= */
+/* = Directory = */
+/* ============= */
+/* contacts menu */
+.contact-photo-wrapper {
+  position: relative;
+}
+.contact-photo {
+  width: 48px;
+  height: 48px;
+  overflow: hidden;
+  display: block;
+}
+.contact-photo img {
+  width: 48px;
+  height: 48px;
+}
+.contact-photo-menu-button {
+  display: none;
+  /* position: absolute; */
+  /* position: absolute; */
+  left: 0px;
+  top: -16px;
+}
+.contact-wrapper {
+  float: left;
+  width: 90px;
+  height: 90px;
+  margin-bottom: 15px;
+}
+.contact-wrapper .contact-photo {
+  width: 80px;
+  height: 80px;
+}
+.contact-wrapper .contact-photo img {
+  width: 80px;
+  height: 80px;
+}
+.contact-wrapper .contact-photo-menu-button {
+  left: 0px;
+  top: 63px;
+}
+.directory-item {
+  float: left;
+  width: 200px;
+  height: 200px;
+}
+.directory-item .contact-photo {
+  width: 175px;
+  height: 175px;
+}
+.directory-item .contact-photo img {
+  width: 175px;
+  height: 175px;
+}
+.contact-name {
+  text-align: left;
+  font-weight: bold;
+  font-size: 12px;
+}
+.contact-details {
+  color: #999999;
+}
+#side-bar-photos-albums{
+	margin-top: 15px;	
+	}
+.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-album-image-wrapper, .photo-top-image-wrapper {
+  float: left;
+   -moz-box-shadow: 0 0 5px #888;
+   -webkit-box-shadow: 0 0 5px #888;
+   box-shadow: 0 0 5px #888;
+  background-color: #000;
+   -webkit-border-radius: 5px;
+   -moz-border-radius: 5px;
+  border-radius: 5px;
+  padding-bottom: 20px;
+  position: relative;
+  margin: 0 10px 10px 0;
+  width: 200px; height: 140px;
+  overflow: hidden;  
+}
+.photo-top-album-name {
+        width: 100%;
+        position: absolute; 
+        bottom: 0px; 
+        padding-left: 3px;
+        background-color: #EEE;
+}
+.photo-top-album-link{
+  color: #1872A2;
+	}
+.photo-top-album-img{
+	
+	}
+/*.photo-top-image-wrapper {
+        position: relative;
+        float: left;
+        margin-top: 15px;
+        margin-right: 15px;
+        width: 200px; height: 200px; 
+        overflow: hidden; 
+}
+.photo-top-album-name {
+        width: 100%;
+        min-height: 2em;
+        position: absolute; 
+        bottom: 0px; 
+        padding: 0px 3px;
+        padding-top: 0.5em;
+        background-color: rgb(255, 255, 255);
+}*/
+#photo-top-end {
+        clear: both;
+}
+
+#photo-top-links {
+        margin-bottom: 30px;
+        margin-left: 30px;
+}
+
+#photos-upload-newalbum-div {
+        float: left;
+        width: 175px;
+}
+
diff --git a/view/theme/diabook/diabook-green/icons/StatusNet.png b/view/theme/diabook/diabook-green/icons/StatusNet.png
new file mode 100644
index 000000000..398bca716
--- /dev/null
+++ b/view/theme/diabook/diabook-green/icons/StatusNet.png
diff --git a/view/theme/diabook/diabook-green/icons/attach.png b/view/theme/diabook/diabook-green/icons/attach.png
new file mode 100644
index 000000000..1958041cf
--- /dev/null
+++ b/view/theme/diabook/diabook-green/icons/attach.png
diff --git a/view/theme/diabook/diabook-green/icons/audio.png b/view/theme/diabook/diabook-green/icons/audio.png
new file mode 100644
index 000000000..8d779a409
--- /dev/null
+++ b/view/theme/diabook/diabook-green/icons/audio.png
diff --git a/view/theme/diabook/diabook-green/icons/bb-image.png b/view/theme/diabook/diabook-green/icons/bb-image.png
new file mode 100644
index 000000000..9a1b32113
--- /dev/null
+++ b/view/theme/diabook/diabook-green/icons/bb-image.png
diff --git a/view/theme/diabook/diabook-green/icons/bb-url.png b/view/theme/diabook/diabook-green/icons/bb-url.png
new file mode 100644
index 000000000..071fc1865
--- /dev/null
+++ b/view/theme/diabook/diabook-green/icons/bb-url.png
diff --git a/view/theme/diabook/diabook-green/icons/bb-video.png b/view/theme/diabook/diabook-green/icons/bb-video.png
new file mode 100644
index 000000000..bd323531e
--- /dev/null
+++ b/view/theme/diabook/diabook-green/icons/bb-video.png
diff --git a/view/theme/diabook/diabook-green/icons/block.png b/view/theme/diabook/diabook-green/icons/block.png
new file mode 100755
index 000000000..a0b1dffe9
--- /dev/null
+++ b/view/theme/diabook/diabook-green/icons/block.png
diff --git a/view/theme/diabook/diabook-green/icons/bluebug.png b/view/theme/diabook/diabook-green/icons/bluebug.png
new file mode 100644
index 000000000..3979e7d8e
--- /dev/null
+++ b/view/theme/diabook/diabook-green/icons/bluebug.png
diff --git a/view/theme/diabook/diabook-green/icons/bold.png b/view/theme/diabook/diabook-green/icons/bold.png
new file mode 100644
index 000000000..8fab2a10f
--- /dev/null
+++ b/view/theme/diabook/diabook-green/icons/bold.png
diff --git a/view/theme/diabook/diabook-green/icons/camera.png b/view/theme/diabook/diabook-green/icons/camera.png
new file mode 100644
index 000000000..a5c7f1236
--- /dev/null
+++ b/view/theme/diabook/diabook-green/icons/camera.png
diff --git a/view/theme/diabook/diabook-green/icons/close_box.png b/view/theme/diabook/diabook-green/icons/close_box.png
new file mode 100644
index 000000000..28e2675b8
--- /dev/null
+++ b/view/theme/diabook/diabook-green/icons/close_box.png
diff --git a/view/theme/diabook/diabook-green/icons/com_side.png b/view/theme/diabook/diabook-green/icons/com_side.png
new file mode 100644
index 000000000..00186ba05
--- /dev/null
+++ b/view/theme/diabook/diabook-green/icons/com_side.png
diff --git a/view/theme/diabook/diabook-green/icons/community.png b/view/theme/diabook/diabook-green/icons/community.png
new file mode 100644
index 000000000..7c91e8b75
--- /dev/null
+++ b/view/theme/diabook/diabook-green/icons/community.png
diff --git a/view/theme/diabook/diabook-green/icons/contacts.png b/view/theme/diabook/diabook-green/icons/contacts.png
new file mode 100644
index 000000000..581790647
--- /dev/null
+++ b/view/theme/diabook/diabook-green/icons/contacts.png
diff --git a/view/theme/diabook/diabook-green/icons/contacts2.png b/view/theme/diabook/diabook-green/icons/contacts2.png
new file mode 100644
index 000000000..cd0e289a7
--- /dev/null
+++ b/view/theme/diabook/diabook-green/icons/contacts2.png
diff --git a/view/theme/diabook/diabook-green/icons/contacts3.png b/view/theme/diabook/diabook-green/icons/contacts3.png
new file mode 100644
index 000000000..8a3e69ec1
--- /dev/null
+++ b/view/theme/diabook/diabook-green/icons/contacts3.png
diff --git a/view/theme/diabook/diabook-green/icons/dislike.png b/view/theme/diabook/diabook-green/icons/dislike.png
new file mode 100644
index 000000000..23de426c5
--- /dev/null
+++ b/view/theme/diabook/diabook-green/icons/dislike.png
diff --git a/view/theme/diabook/diabook-green/icons/drop.png b/view/theme/diabook/diabook-green/icons/drop.png
new file mode 100644
index 000000000..2abb82ef2
--- /dev/null
+++ b/view/theme/diabook/diabook-green/icons/drop.png
diff --git a/view/theme/diabook/diabook-green/icons/email.png b/view/theme/diabook/diabook-green/icons/email.png
new file mode 100644
index 000000000..240cef2c3
--- /dev/null
+++ b/view/theme/diabook/diabook-green/icons/email.png
diff --git a/view/theme/diabook/diabook-green/icons/events.png b/view/theme/diabook/diabook-green/icons/events.png
new file mode 100644
index 000000000..cf195fbb6
--- /dev/null
+++ b/view/theme/diabook/diabook-green/icons/events.png
diff --git a/view/theme/diabook/diabook-green/icons/facebook.png b/view/theme/diabook/diabook-green/icons/facebook.png
new file mode 100644
index 000000000..3e5dd39c3
--- /dev/null
+++ b/view/theme/diabook/diabook-green/icons/facebook.png
diff --git a/view/theme/diabook/diabook-green/icons/file_as.png b/view/theme/diabook/diabook-green/icons/file_as.png
new file mode 100644
index 000000000..16713fa53
--- /dev/null
+++ b/view/theme/diabook/diabook-green/icons/file_as.png
diff --git a/view/theme/diabook/diabook-green/icons/ftdevs.gif b/view/theme/diabook/diabook-green/icons/ftdevs.gif
new file mode 100644
index 000000000..e0fc25743
--- /dev/null
+++ b/view/theme/diabook/diabook-green/icons/ftdevs.gif
diff --git a/view/theme/diabook/diabook-green/icons/globe.png b/view/theme/diabook/diabook-green/icons/globe.png
new file mode 100644
index 000000000..6bb9bc09d
--- /dev/null
+++ b/view/theme/diabook/diabook-green/icons/globe.png
diff --git a/view/theme/diabook/diabook-green/icons/home.png b/view/theme/diabook/diabook-green/icons/home.png
new file mode 100644
index 000000000..5c610805f
--- /dev/null
+++ b/view/theme/diabook/diabook-green/icons/home.png
diff --git a/view/theme/diabook/diabook-green/icons/italic.png b/view/theme/diabook/diabook-green/icons/italic.png
new file mode 100644
index 000000000..bf4b2b81d
--- /dev/null
+++ b/view/theme/diabook/diabook-green/icons/italic.png
diff --git a/view/theme/diabook/diabook-green/icons/language.png b/view/theme/diabook/diabook-green/icons/language.png
new file mode 100644
index 000000000..8029c0155
--- /dev/null
+++ b/view/theme/diabook/diabook-green/icons/language.png
diff --git a/view/theme/diabook/diabook-green/icons/like.png b/view/theme/diabook/diabook-green/icons/like.png
new file mode 100644
index 000000000..b65edccc0
--- /dev/null
+++ b/view/theme/diabook/diabook-green/icons/like.png
diff --git a/view/theme/diabook/diabook-green/icons/link.png b/view/theme/diabook/diabook-green/icons/link.png
new file mode 100644
index 000000000..0ef666a67
--- /dev/null
+++ b/view/theme/diabook/diabook-green/icons/link.png
diff --git a/view/theme/diabook/diabook-green/icons/livejournal.png b/view/theme/diabook/diabook-green/icons/livejournal.png
new file mode 100644
index 000000000..6d27d265e
--- /dev/null
+++ b/view/theme/diabook/diabook-green/icons/livejournal.png
diff --git a/view/theme/diabook/diabook-green/icons/lock.png b/view/theme/diabook/diabook-green/icons/lock.png
new file mode 100644
index 000000000..7e34bf279
--- /dev/null
+++ b/view/theme/diabook/diabook-green/icons/lock.png
diff --git a/view/theme/diabook/diabook-green/icons/lupe.png b/view/theme/diabook/diabook-green/icons/lupe.png
new file mode 100644
index 000000000..f8b228347
--- /dev/null
+++ b/view/theme/diabook/diabook-green/icons/lupe.png
diff --git a/view/theme/diabook/diabook-green/icons/mess_side.png b/view/theme/diabook/diabook-green/icons/mess_side.png
new file mode 100644
index 000000000..5295e2e74
--- /dev/null
+++ b/view/theme/diabook/diabook-green/icons/mess_side.png
diff --git a/view/theme/diabook/diabook-green/icons/messages.png b/view/theme/diabook/diabook-green/icons/messages.png
new file mode 100644
index 000000000..44d609a5e
--- /dev/null
+++ b/view/theme/diabook/diabook-green/icons/messages.png
diff --git a/view/theme/diabook/diabook-green/icons/next.png b/view/theme/diabook/diabook-green/icons/next.png
new file mode 100644
index 000000000..7b5e25b90
--- /dev/null
+++ b/view/theme/diabook/diabook-green/icons/next.png
diff --git a/view/theme/diabook/diabook-green/icons/notes.png b/view/theme/diabook/diabook-green/icons/notes.png
new file mode 100644
index 000000000..28dca30a3
--- /dev/null
+++ b/view/theme/diabook/diabook-green/icons/notes.png
diff --git a/view/theme/diabook/diabook-green/icons/notifications.png b/view/theme/diabook/diabook-green/icons/notifications.png
new file mode 100644
index 000000000..b7f4df93e
--- /dev/null
+++ b/view/theme/diabook/diabook-green/icons/notifications.png
diff --git a/view/theme/diabook/diabook-green/icons/notifications3.png b/view/theme/diabook/diabook-green/icons/notifications3.png
new file mode 100755
index 000000000..2c9c791c0
--- /dev/null
+++ b/view/theme/diabook/diabook-green/icons/notifications3.png
diff --git a/view/theme/diabook/diabook-green/icons/notify.png b/view/theme/diabook/diabook-green/icons/notify.png
new file mode 100644
index 000000000..004008a8f
--- /dev/null
+++ b/view/theme/diabook/diabook-green/icons/notify.png
diff --git a/view/theme/diabook/diabook-green/icons/notify3.png b/view/theme/diabook/diabook-green/icons/notify3.png
new file mode 100755
index 000000000..9b852d05b
--- /dev/null
+++ b/view/theme/diabook/diabook-green/icons/notify3.png
diff --git a/view/theme/diabook/diabook-green/icons/pencil.png b/view/theme/diabook/diabook-green/icons/pencil.png
new file mode 100644
index 000000000..772e49b17
--- /dev/null
+++ b/view/theme/diabook/diabook-green/icons/pencil.png
diff --git a/view/theme/diabook/diabook-green/icons/pencil2.png b/view/theme/diabook/diabook-green/icons/pencil2.png
new file mode 100644
index 000000000..3b47d1864
--- /dev/null
+++ b/view/theme/diabook/diabook-green/icons/pencil2.png
diff --git a/view/theme/diabook/photo-menu.jpg b/view/theme/diabook/diabook-green/icons/photo-menu.jpg
index fde5eb535..fde5eb535 100755..100644
--- a/view/theme/diabook/photo-menu.jpg
+++ b/view/theme/diabook/diabook-green/icons/photo-menu.jpg
diff --git a/view/theme/diabook/diabook-green/icons/posterous.png b/view/theme/diabook/diabook-green/icons/posterous.png
new file mode 100644
index 000000000..c8e86078e
--- /dev/null
+++ b/view/theme/diabook/diabook-green/icons/posterous.png
diff --git a/view/theme/diabook/diabook-green/icons/prev.png b/view/theme/diabook/diabook-green/icons/prev.png
new file mode 100644
index 000000000..55c1464ba
--- /dev/null
+++ b/view/theme/diabook/diabook-green/icons/prev.png
diff --git a/view/theme/diabook/diabook-green/icons/pscontacts.png b/view/theme/diabook/diabook-green/icons/pscontacts.png
new file mode 100644
index 000000000..23a78bcac
--- /dev/null
+++ b/view/theme/diabook/diabook-green/icons/pscontacts.png
diff --git a/view/theme/diabook/diabook-green/icons/pubgroups.png b/view/theme/diabook/diabook-green/icons/pubgroups.png
new file mode 100644
index 000000000..ae04194b1
--- /dev/null
+++ b/view/theme/diabook/diabook-green/icons/pubgroups.png
diff --git a/view/theme/diabook/diabook-green/icons/quote.png b/view/theme/diabook/diabook-green/icons/quote.png
new file mode 100644
index 000000000..a464f2859
--- /dev/null
+++ b/view/theme/diabook/diabook-green/icons/quote.png
diff --git a/view/theme/diabook/diabook-green/icons/recycle.png b/view/theme/diabook/diabook-green/icons/recycle.png
new file mode 100644
index 000000000..c3b8d2bf4
--- /dev/null
+++ b/view/theme/diabook/diabook-green/icons/recycle.png
diff --git a/view/theme/diabook/diabook-green/icons/remote.png b/view/theme/diabook/diabook-green/icons/remote.png
new file mode 100644
index 000000000..a560cc55e
--- /dev/null
+++ b/view/theme/diabook/diabook-green/icons/remote.png
diff --git a/view/theme/diabook/diabook-green/icons/scroll_top.png b/view/theme/diabook/diabook-green/icons/scroll_top.png
new file mode 100644
index 000000000..0e7f7ae6a
--- /dev/null
+++ b/view/theme/diabook/diabook-green/icons/scroll_top.png
diff --git a/view/theme/diabook/diabook-green/icons/selected.png b/view/theme/diabook/diabook-green/icons/selected.png
new file mode 100644
index 000000000..3fcb95c29
--- /dev/null
+++ b/view/theme/diabook/diabook-green/icons/selected.png
diff --git a/view/theme/diabook/diabook-green/icons/srch_bg.gif b/view/theme/diabook/diabook-green/icons/srch_bg.gif
new file mode 100644
index 000000000..6a523ba8f
--- /dev/null
+++ b/view/theme/diabook/diabook-green/icons/srch_bg.gif
diff --git a/view/theme/diabook/diabook-green/icons/srch_l.gif b/view/theme/diabook/diabook-green/icons/srch_l.gif
new file mode 100644
index 000000000..6d95bf35d
--- /dev/null
+++ b/view/theme/diabook/diabook-green/icons/srch_l.gif
diff --git a/view/theme/diabook/diabook-green/icons/srch_r.gif b/view/theme/diabook/diabook-green/icons/srch_r.gif
new file mode 100644
index 000000000..89833a316
--- /dev/null
+++ b/view/theme/diabook/diabook-green/icons/srch_r.gif
diff --git a/view/theme/diabook/diabook-green/icons/srch_r_f2.gif b/view/theme/diabook/diabook-green/icons/srch_r_f2.gif
new file mode 100644
index 000000000..6df457bed
--- /dev/null
+++ b/view/theme/diabook/diabook-green/icons/srch_r_f2.gif
diff --git a/view/theme/diabook/diabook-green/icons/star.png b/view/theme/diabook/diabook-green/icons/star.png
new file mode 100644
index 000000000..0b00cb189
--- /dev/null
+++ b/view/theme/diabook/diabook-green/icons/star.png
diff --git a/view/theme/diabook/diabook-green/icons/star_dummy.png b/view/theme/diabook/diabook-green/icons/star_dummy.png
new file mode 100644
index 000000000..ce11f30d4
--- /dev/null
+++ b/view/theme/diabook/diabook-green/icons/star_dummy.png
diff --git a/view/theme/diabook/diabook-green/icons/starred.png b/view/theme/diabook/diabook-green/icons/starred.png
new file mode 100644
index 000000000..2b82dfca3
--- /dev/null
+++ b/view/theme/diabook/diabook-green/icons/starred.png
diff --git a/view/theme/diabook/diabook-green/icons/tagged.png b/view/theme/diabook/diabook-green/icons/tagged.png
new file mode 100644
index 000000000..144649ef8
--- /dev/null
+++ b/view/theme/diabook/diabook-green/icons/tagged.png
diff --git a/view/theme/diabook/diabook-green/icons/toogle_off.png b/view/theme/diabook/diabook-green/icons/toogle_off.png
new file mode 100644
index 000000000..0fcce4d5a
--- /dev/null
+++ b/view/theme/diabook/diabook-green/icons/toogle_off.png
diff --git a/view/theme/diabook/diabook-green/icons/toogle_on.png b/view/theme/diabook/diabook-green/icons/toogle_on.png
new file mode 100644
index 000000000..79ce07f0e
--- /dev/null
+++ b/view/theme/diabook/diabook-green/icons/toogle_on.png
diff --git a/view/theme/diabook/diabook-green/icons/tumblr.png b/view/theme/diabook/diabook-green/icons/tumblr.png
new file mode 100644
index 000000000..1dc7fa072
--- /dev/null
+++ b/view/theme/diabook/diabook-green/icons/tumblr.png
diff --git a/view/theme/diabook/diabook-green/icons/twitter.png b/view/theme/diabook/diabook-green/icons/twitter.png
new file mode 100644
index 000000000..b7a687b9f
--- /dev/null
+++ b/view/theme/diabook/diabook-green/icons/twitter.png
diff --git a/view/theme/diabook/diabook-green/icons/underline.png b/view/theme/diabook/diabook-green/icons/underline.png
new file mode 100644
index 000000000..b1b4d3574
--- /dev/null
+++ b/view/theme/diabook/diabook-green/icons/underline.png
diff --git a/view/theme/diabook/diabook-green/icons/unlock.png b/view/theme/diabook/diabook-green/icons/unlock.png
new file mode 100644
index 000000000..a0cda0ae5
--- /dev/null
+++ b/view/theme/diabook/diabook-green/icons/unlock.png
diff --git a/view/theme/diabook/diabook-green/icons/unselected.png b/view/theme/diabook/diabook-green/icons/unselected.png
new file mode 100644
index 000000000..9e9cead4b
--- /dev/null
+++ b/view/theme/diabook/diabook-green/icons/unselected.png
diff --git a/view/theme/diabook/diabook-green/icons/unstarred.png b/view/theme/diabook/diabook-green/icons/unstarred.png
new file mode 100644
index 000000000..ba3183f5c
--- /dev/null
+++ b/view/theme/diabook/diabook-green/icons/unstarred.png
diff --git a/view/theme/diabook/diabook-green/icons/video.png b/view/theme/diabook/diabook-green/icons/video.png
new file mode 100644
index 000000000..a03d1d818
--- /dev/null
+++ b/view/theme/diabook/diabook-green/icons/video.png
diff --git a/view/theme/diabook/diabook-green/icons/weblink.png b/view/theme/diabook/diabook-green/icons/weblink.png
new file mode 100644
index 000000000..216e78344
--- /dev/null
+++ b/view/theme/diabook/diabook-green/icons/weblink.png
diff --git a/view/theme/diabook/diabook-green/icons/wordpress.png b/view/theme/diabook/diabook-green/icons/wordpress.png
new file mode 100644
index 000000000..f564c4300
--- /dev/null
+++ b/view/theme/diabook/diabook-green/icons/wordpress.png
diff --git a/view/theme/diabook/diabook-green/style-network-wide.css b/view/theme/diabook/diabook-green/style-network-wide.css
new file mode 100644
index 000000000..cc598b9fe
--- /dev/null
+++ b/view/theme/diabook/diabook-green/style-network-wide.css
@@ -0,0 +1,2644 @@
+/**
+ * Fabio Comuni <http://kirgroup.com/profile/fabrixxm>
+ * Additional Changes: Michael Vogel <icarus@dabo.de>
+ **/
+
+/* ========= */
+/* = Admin = */
+/* ========= */
+
+#adminpage {
+/*        width: 80%;*/
+}
+
+#pending-update {
+        float:right;
+        color: #ffffff;
+        font-weight: bold;
+        background-color: #FF0000;
+        padding: 0em 0.3em;
+}
+
+.admin.linklist {
+        border: 0px; padding: 0px;
+}
+
+.admin.link {
+        list-style-position: inside;
+        font-size: 1em;
+        padding: 5px;
+        width: 100px;
+        margin: 5px;
+}
+
+#adminpage dl {
+        clear: left;
+        margin-bottom: 2px;
+        padding-bottom: 2px;
+        border-bottom: 1px solid black;
+}
+
+#adminpage dt {
+        width: 200px;
+        float: left;
+        font-weight: bold;
+}
+
+#adminpage dd {
+        margin-left: 200px;
+}
+#adminpage h3 {
+        border-bottom: 1px solid #898989;
+        margin-bottom: 5px;
+        margin-top: 10px;
+}
+
+#adminpage .submit {
+        clear:left;
+}
+
+#adminpage #pluginslist {
+        margin: 0px; padding: 0px;
+}
+
+#adminpage .plugin {
+        list-style: none;
+        display: block;
+	/* border: 1px solid #888888; */
+        padding: 1em;
+        margin-bottom: 5px;
+        clear: left;
+}
+
+#adminpage .toggleplugin {
+        float:left;
+        margin-right: 1em;
+}
+
+#adminpage table {width:100%; border-bottom: 1p solid #000000; margin: 5px 0px;}
+#adminpage table th { text-align: left;}
+#adminpage td .icon { float: left;}
+#adminpage table#users img { width: 16px; height: 16px; }
+#adminpage table tr:hover { background-color: #eeeeee; }
+#adminpage .selectall { text-align: right; }
+/* icons */
+
+.icon.contacts {
+  background-image: url("../diabook-green/icons/contacts.png");}
+.icon.notifications {
+  background-image: url("../diabook-green/icons/notifications.png");}
+.icon.notify {
+  background-image: url("../diabook-green/icons/notify.png");}
+.icon.messages {
+  background-image: url("../diabook-green/icons/messages.png");}
+.icon.community {
+  background-image: url("../diabook-green/icons/community.png");}
+  
+.icon.drop 	{ background-image: url("../diabook-green/icons/drop.png");}
+.icon.drophide 	{ background-image: url("../diabook-green/icons/drop.png");}
+.icon.dislike 	{ background-image: url("../diabook-green/icons/dislike.png");}
+.icon.like 	{ background-image: url("../diabook-green/icons/like.png");}
+.icon.pencil 	{ background-image: url("../diabook-green/icons/pencil.png");}
+.icon.recycle 	{ background-image: url("../diabook-green/icons/recycle.png");}
+.icon.remote-link { background-image: url("../diabook-green/icons/remote.png");}
+.icon.tagged    { background-image: url("../diabook-green/icons/tagged.png");}
+.icon.file-as { background-image: url("../diabook-green/icons/file_as.png");}
+.star-item.icon.unstarred { background-image: url("../diabook-green/icons/unstarred.png");}
+.star-item.icon.starred { background-image: url("../diabook-green/icons/starred.png");}
+.icon.link		{ background-image: url("../diabook-green/icons/link.png");}
+.icon.lock		{ background-image: url("../diabook-green/icons/lock.png");}
+.icon.unlock		{ background-image: url("../diabook-green/icons/unlock.png");}
+.icon.language    { background-image: url("../diabook-green/icons/language.png");}
+
+
+.camera 	{ background-image: url("../diabook-green/icons/camera.png"); 
+			  display: block; width: 28px; height: 28px; background-repeat: no-repeat;
+			  }
+.attach 	{ background-image: url("../diabook-green/icons/attach.png"); 
+			  display: block; width: 28px; height: 28px; background-repeat: no-repeat;
+			  }
+.video2 	{ background-image: url("../diabook-green/icons/video.png"); 
+			  display: block; width: 28px; height: 28px; background-repeat: no-repeat;
+			  }	
+.video 	{ background-image: url("../diabook-green/icons/video.png"); 
+			  display: block; width: 100%; height: 140px; background-repeat: no-repeat;
+			  }
+.audio2 	{ background-image: url("../diabook-green/icons/audio.png"); 
+			  display: block; width: 28px; height: 28px; background-repeat: no-repeat;
+			  }
+.audio 	{ background-image: url("../diabook-green/icons/audio.png"); 
+			  display: block; width: 28px; height: 28px; background-repeat: no-repeat;
+			  }
+.weblink 	{ background-image: url("../diabook-green/icons/weblink.png"); 
+			  display: block; width: 28px; height: 28px; background-repeat: no-repeat;
+			  }
+.globe 	{ background-image: url("../diabook-green/icons/globe.png"); 
+			  display: block; width: 28px; height: 28px; background-repeat: no-repeat;
+			  }
+.unglobe 	{ background-image: url("../diabook-green/icons/unglobe.png"); 
+			  display: block; width: 28px; height: 28px; background-repeat: no-repeat;
+			  }
+.edit    {background-image: url("../diabook-green/icons/pencil2.png"); 
+			  display: block; width: 28px; height: 28px; background-repeat: no-repeat;}
+			  
+			  
+
+
+.article	{ background-position: -50px  0px;}
+/*.audio 		{ background-position: -70px  0px;}*/
+.block 		{ background-position: -90px  0px;}
+/*.drop 		{ background-position: -110px 0px;}*/
+/*.drophide 	{ background-position: -130px 0px;}*/
+/*.edit 		{ background-position: -150px 0px;}*/
+/*.camera 	{ background-position: -170px 0px;}*/
+/*.dislike 	{ background-position: -190px 0px;}*/
+/*.like 		{ background-position: -210px 0px;}*/
+/*.link 		{ background-position: -230px 0px;}*/
+
+/*.globe 		{ background-position: -50px  -20px;}*/
+/*.noglobe 	{ background-position: -70px  -20px;}*/
+.no 		{ background-position: -90px  -20px;}
+.pause 		{ background-position: -110px -20px;}
+.play 		{ background-position: -130px -20px;}
+/*.pencil 	{ background-position: -150px -20px;}*/
+.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;}*/
+
+/*.video          { background-position: -110px -40px;}*/
+.youtube        { background-position: -130px -40px;}
+
+/*.attach         { background-position: -190px -40px;}*/
+/*.language       { background-position: -210px -40px;}*/
+
+
+.icon.on             { background-image: url("../diabook-green/icons/toogle_on.png"); background-repeat: no-repeat;}
+.icon.off            { background-image: url("../diabook-green/icons/toogle_off.png"); background-repeat: no-repeat;}
+.prev           { background-position: -90px  -60px;}
+.next           { background-position: -110px -60px;}
+/*.tagged     { background-position: -130px -60px;}*/
+
+.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 0px; }
+.type-audio { background-position: -40px 0px; }
+.type-text  { background-position: -60px 0px; }
+.type-unkn  { background-position: -80px 0px; }
+
+.icon.drop, .icon.drophide {
+ float: left;
+}
+
+.icon {
+  display: block;
+  width: 20px;
+  height: 20px;
+  /*background-image: url('icons.png');*/
+}
+
+.icon {
+  background-color: transparent ;
+  background-repeat: no-repeat;
+  /* background-position: left center; */
+  display: block;
+  overflow: hidden;
+  text-indent: -9999px;
+  padding: 1px;
+}
+
+.icon.border.camera{
+  background-image: url("../diabook-green/icons/camera.png"); 
+  display: block; width: 28px; height: 28px; background-repeat: no-repeat;
+	}
+	
+.icon.border.link{
+  background-image: url("../diabook-green/icons/weblink.png"); 
+  display: block; width: 28px; height: 28px; background-repeat: no-repeat;
+  margin-left: 10px;
+	}
+
+.icon.text {
+  text-indent: 0px;
+}
+.icon.s10 {
+  min-width: 10px;
+  height: 10px;
+}
+.icon.s10.notify {
+  background-image: url("../../../../images/icons/10/notify_off.png");
+}
+.icon.s10.gear {
+  background-image: url("../../../../images/icons/10/gear.png");
+}
+.icon.s10.add {
+  background-image: url("../../../../images/icons/10/add.png");
+}
+.icon.s10.delete {
+  background-image: url("../../../../images/icons/10/delete.png");
+}
+.icon.s10.edit {
+  background-image: url("../../../../images/icons/10/edit.png");
+}
+.icon.s10.star {
+  background-image: url("../../../../images/star_dummy.png");
+}
+.icon.s10.menu {
+  background-image: url("../../../../images/icons/10/menu.png");
+}
+.icon.s10.link {
+  background-image: url("../../../../images/icons/10/link.png");
+}
+.icon.s10.lock {
+  background-image: url("../../../../images/icons/10/lock.png");
+}
+.icon.s10.unlock {
+  background-image: url("../../../../images/icons/10/unlock.png");
+}
+.icon.s10.text {
+  padding: 2px 0px 0px 15px;
+  font-size: 10px;
+}
+.icon.s16 {
+  min-width: 16px;
+  height: 16px;
+}
+.icon.s16.notify {
+  background-image: url("../../../../images/icons/16/notify_off.png");
+}
+.icon.s16.gear {
+  background-image: url("../../../../images/icons/16/gear.png");
+}
+.icon.s16.add {
+  background-image: url("../../../../images/icons/16/add.png");
+}
+.icon.s16.delete {
+  background-image: url("../../../../images/icons/16/delete.png");
+}
+/*.icon.s16.edit {
+  background-image: url("../../../../images/icons/16/edit.png");
+}*/
+.icon.s16.star {
+  background-image: url("../../../../images/star_dummy.png");
+}
+.icon.s16.menu {
+  background-image: url("../../../../images/icons/16/menu.png");
+}
+/*.icon.s16.link {
+  background-image: url("../../../../images/icons/16/link.png");
+}*/
+.icon.s16.lock {
+  background-image: url("../../../../images/icons/16/lock.png");
+}
+.icon.s16.unlock {
+  background-image: url("../../../../images/icons/16/unlock.png");
+}
+.icon.s16.text {
+  padding: 4px 0px 0px 20px;
+  font-size: 10px;
+}
+.icon.s22 {
+  min-width: 22px;
+  height: 22px;
+}
+.icon.s22.notify {
+  background-image: url("../../../../images/icons/22/notify_off.png");
+}
+.icon.s22.gear {
+  background-image: url("../../../../images/icons/22/gear.png");
+}
+.icon.s22.add {
+  background-image: url("../../../../images/icons/22/add.png");
+}
+.icon.s22.delete {
+  background-image: url("../../../../images/icons/22/delete.png");
+}
+.icon.s22.edit {
+  background-image: url("../../../../images/icons/22/edit.png");
+}
+.icon.s22.star {
+  background-image: url("../../../../images/star_dummy.png");
+}
+.icon.s22.menu {
+  background-image: url("../../../../images/icons/22/menu.png");
+}
+.icon.s22.link {
+  background-image: url("../../../../images/icons/22/link.png");
+}
+.icon.s22.lock {
+  background-image: url("../../../../images/icons/22/lock.png");
+}
+.icon.s22.unlock {
+  background-image: url("../../../../images/icons/22/unlock.png");
+}
+.icon.s22.text {
+  padding: 10px 0px 0px 25px;
+  width: 200px;
+}
+.icon.s48 {
+  width: 48px;
+  height: 48px;
+}
+.icon.s48.notify {
+  background-image: url("../../../../images/icons/48/notify_off.png");
+}
+.icon.s48.gear {
+  background-image: url("../../../../images/icons/48/gear.png");
+}
+.icon.s48.add {
+  background-image: url("../../../../images/icons/48/add.png");
+}
+.icon.s48.delete {
+  background-image: url("../../../../images/icons/48/delete.png");
+}
+.icon.s48.edit {
+  background-image: url("../../../../images/icons/48/edit.png");
+}
+.icon.s48.star {
+  background-image: url("../../../../images/star_dummy.png");
+}
+.icon.s48.menu {
+  background-image: url("../../../../images/icons/48/menu.png");
+}
+.icon.s48.link {
+  background-image: url("../../../../images/icons/48/link.png");
+}
+.icon.s48.lock {
+  background-image: url("../../../../images/icons/48/lock.png");
+}
+.icon.s48.unlock {
+  background-image: url("../../../../images/icons/48/unlock.png");
+}
+
+#contact-edit-links ul {
+  list-style: none;
+  list-style-type: none;
+}
+
+.hide-comments-outer {
+  margin-left: 80px;
+  margin-bottom: 1px;
+  width: 675px;
+  border-bottom: 1px solid #BDCDD4;
+  background-color: #fff;
+  padding: 8px;
+}
+
+/* global */
+body {
+  font-family: 'Lato', "Helvetica Neue", Helvetica, Arial, sans-serif;
+  font-size: 13px;
+  background-color: #ffffff;
+  color: #2d2d2d;
+  margin: 50px auto auto;
+  display: table;
+}
+
+h4 {
+  font-size: 1.1em;
+}
+
+a {
+	color: #333333;
+	/* color: #3e3e8c; */
+	text-decoration: none;
+}
+a:hover {
+	/* color: blue; */
+	text-decoration: underline
+}
+
+.wall-item-name-link {
+/*  float: left;*/
+}
+
+.wall-item-photo {
+  width: 48px;
+  height: 48px;
+  overflow: hidden;
+  display: block;
+}
+
+.left {
+  float: left;
+}
+.right {
+  float: right;
+}
+.hidden {
+  display: none;
+}
+.clear {
+  clear: both;
+}
+.fakelink {
+  color: #194719;
+  /* color: #3e3e8c; */
+  text-decoration: none;
+  cursor: pointer;
+}
+.fakelink:hover {
+  /* color: blue; */
+  /*color: #005c94; */
+  text-decoration: underline;
+}
+code {
+  font-family: Courier, monospace;
+  white-space: pre;
+  display: block;
+  overflow: auto;
+  border: 1px solid #444;
+  background: #EEE;
+  color: #444;
+  padding: 10px;
+  margin-top: 20px;
+}
+#panel {
+  position: absolute;
+  width: 12em;
+  background: #ffffff;
+  color: #2d2d2d;
+  margin: 0px;
+  padding: 1em;
+  list-style: none;
+  border: 3px solid #364e59;
+  z-index: 100000;
+  -webkit-box-shadow: 0px 5px 10px rgba(0, 0, 0, 0.7);
+  -moz-box-shadow: 0px 5px 10px rgba(0, 0, 0, 0.7);
+  box-shadow: 0px 5px 10px rgba(0, 0, 0, 0.7);
+}
+/* tool */
+.tool {
+  height: auto;
+  overflow: auto;
+  padding: 3px;
+}
+#saved-search-ul .tool:hover,
+#nets-sidebar .tool:hover,
+#sidebar-group-list .tool:hover ,
+#fileas-sidebar .tool:hover {
+	background: aliceBlue;
+}
+.tool .label {
+  float: left;
+}
+.tool .action {
+  float: right;
+}
+.tool a {
+  color: #3465A4;
+}
+.tool a:hover {
+  text-decoration: none;
+}
+/* popup notifications */
+div.jGrowl div.notice {
+  background: #511919 url("../../../../images/icons/48/notice.png") no-repeat 5px center;
+  color: #ffffff;
+  padding-left: 58px;
+}
+div.jGrowl div.info {
+  background: #364e59 url("../../../../images/icons/48/info.png") no-repeat 5px center;
+  color: #ffffff;
+  padding-left: 58px;
+}
+/* header */
+header {
+  position: fixed;
+  left: 0%;
+  right: 80%;
+  top: 0px;
+  margin: 0px;
+  padding: 0px;
+  width: 22%;
+  height: 32px;
+  background: #5CD65C;
+  background-color: #5CD65C;
+  z-index: 100;
+  -webkit-box-shadow: -10px 0px 10px rgba(0, 0, 0, 0.7);
+  -moz-box-shadow: -10px 0px 10px rgba(0, 0, 0, 0.7);
+  box-shadow: -10px 0px 10px rgba(0, 0, 0, 0.7);
+  
+}
+header #site-location {
+  display: none;
+}
+header #banner {
+  overflow: hidden;
+  text-align: left;
+  width: 82%%;
+  margin-left: 25%;
+}
+header #banner a,
+header #banner a:active,
+header #banner a:visited,
+header #banner a:link,
+header #banner a:hover {
+  color: black;
+  text-decoration: none;
+  outline: none;
+  vertical-align: middle;
+  font-weight: bolder;
+  margin-left: 3px;
+}
+header #banner #logo-img {
+  height: 25px;
+  margin-top: 3px;
+}
+header #banner #logo-text {
+  font-size: 20px;
+  position: absolute;
+  top: 10%;
+}
+/* nav */
+nav {
+  width: 80%;
+  height: 32px;
+  position: fixed;
+  left: 22%;
+  top: 0px;
+  padding: 0px;
+  background: #5CD65C;
+  color: #000;
+  z-index: 99;
+  -webkit-box-shadow: -10px 0px 10px rgba(0, 0, 0, 0.7);
+  -moz-box-shadow: -10px 0px 10px rgba(0, 0, 0, 0.7);
+  box-shadow: -10px 0px 10px rgba(0, 0, 0, 0.7);
+}
+nav a,
+nav a:active,
+nav a:visited,
+nav a:link,
+nav a:hover {
+  /*color: #1f1f1f;*/
+  text-decoration: none;
+  outline: none;
+}
+nav #banner {
+  overflow: hidden;
+  /*text-align: center;*/
+  width: 100%;
+}
+nav #banner a,
+nav #banner a:active,
+nav #banner a:visited,
+nav #banner a:link,
+nav #banner a:hover {
+  color: #ffffff;
+  text-decoration: none;
+  outline: none;
+  vertical-align: bottom;
+}
+nav #banner #logo-img {
+  height: 22px;
+  margin-top: 5px;
+}
+nav #banner #logo-text {
+  font-size: 22px;
+}
+nav #navbar{
+	}
+nav ul {
+  margin: 0px;
+  padding: 0px 20px;
+}
+nav ul li {
+  list-style: none;
+  margin: 0px;
+  /* padding: 1px 1px 3px 1px; */
+  float: left;
+}
+nav ul li .menu-popup {
+  left: 0px;
+  right: auto;
+}
+
+nav #logo-img {
+  height: 25px;
+  margin-top: 4px;
+  margin-left: 30px;
+}
+
+nav #logo-text {
+    font-size: 22px;
+    margin-top: 3px;
+    margin-right: 15px;
+}
+nav .nav-menu-search {
+  position: relative;
+
+  margin: 4px 17px;
+  margin-right: 0px;
+  height: 17px;
+  width: 180px;
+  
+}
+
+nav #search-box #search-text {
+  background-image:  url('icons/lupe.png');
+  background-repeat:no-repeat;
+  padding-left:20px;
+  border-top-left-radius: 15px;
+border-top-right-radius: 15px;
+border-bottom-right-radius: 15px;
+border-bottom-left-radius: 15px;
+	}
+
+
+nav .nav-menu-icon {
+  position: relative;
+  height: 22px;
+  padding: 5px;
+  margin: 0px 5px;
+  -moz-border-radius: 5px 5px 0 0;
+  -webkit-border-radius: 5px 5px 0 0;
+  border-radius: 5px 5px 0 0;
+}
+nav .nav-menu-icon:hover {
+  position: relative;
+  height: 22px;
+  padding: 5px;
+  margin: 0px 5px;
+  -moz-border-radius: 5px 5px 0 0;
+  -webkit-border-radius: 5px 5px 0 0;
+  border-radius: 5px 5px 0 0;
+}
+
+/*color*/
+nav .nav-menu-icon.selected {
+  background-color: #fff;
+}
+nav .nav-menu-icon img {
+  width: 22px;
+  height: 22px;
+}
+nav .nav-menu-icon .nav-notify {
+  top: 3px;
+}
+/*marker*/
+nav .nav-menu {
+  position: relative;
+  height: 16px;
+  padding: 5px;
+  margin: 3px 15px 0px;
+  font-size: 15px;
+  /*border: 3px solid #364A84;*/
+}
+nav .nav-menu.selected {
+  /*border-bottom: 3px solid #9eabb0;*/
+}
+nav .nav-notify {
+  display: none;
+  position: absolute;
+  background-color: #fff;
+  /* background-color: #19aeff; */
+  -moz-border-radius: 5px 5px 5px 5px;
+  -webkit-border-radius: 5px 5px 5px 5px;
+  border-radius: 5px 5px 5px 5px;
+  font-size: 10px;
+  font-weight: 900;
+  padding: 1px 4px;
+  top: 0px;
+  right: -6px;
+  min-width: 10px;
+  text-align: center;
+  border: 1px solid black;
+}
+nav .nav-notify.show {
+  display: block;
+}
+nav #nav-help-link,
+nav #nav-search-link,
+nav #nav-directory-link,
+nav #nav-apps-link,
+nav #nav-site-linkmenu, 
+nav #nav-home-link,
+nav #nav-user-linkmenu
+{
+  float: right;
+}
+nav #nav-user-linkmenu{
+	margin-right: 0px;
+	}
+nav #nav-home-link, #nav-directory-link, #nav-apps-link{
+	margin-left: 0px;
+	margin-right: 0px;
+	font-weight: bold;
+	margin: 3px 5px;
+	font-size: 14px;
+	}
+nav #nav-directory-link{
+  margin-right: 0px;	
+	}
+nav #nav-home-link{
+  margin-left: 0px;	
+	}
+nav #nav-help-link .menu-popup,
+nav #nav-search-link .menu-popup,
+nav #nav-directory-link .menu-popup,
+nav #nav-apps-link .menu-popup,
+nav #nav-site-linkmenu .menu-popup {
+  right: 0px;
+  left: auto;
+}
+
+nav #nav-messages-linkmenu.on .icon.messages, nav #nav-messages-linkmenu.selected .icon.messages{
+	background-image: url("../diabook-green/icons/messages.png");
+	}
+	
+/*nav #nav-notifications-linkmenu.on .icon.notify,*/ nav #nav-notifications-linkmenu.selected .icon.notify{
+	background-image: url("../diabook-green/icons/notify.png");
+	}
+	
+nav #nav-contacts-linkmenu.on .icon.contacts, nav #nav-contacts-linkmenu.selected .icon.contacts{
+	background-image: url("../diabook-green/icons/contacts.png");
+	}
+	
+nav #nav-apps-link.selected {
+  background-color: #fff;
+  moz-border-radius: 5px 5px 0 0;
+-webkit-border-radius: 5px 5px 0 0;
+border-radius: 5px 5px 0 0;
+}
+
+#nav-notifications-mark-all {
+	/* padding: 1px 1px 2px 26px; */
+	/* border-bottom: 1px solid #364E59; */
+	/* margin: 0px 0px 2px 0px;
+	padding: 5px 10px; */
+}
+
+#nav-notifications-see-all {
+	/* padding: 1px 1px 2px 26px; */
+	/* border-bottom: 1px solid #364E59; */
+	/* margin: 0px 0px 2px 0px;
+	padding: 5px 10px; */
+}
+
+.notify-seen {
+	background: none repeat scroll 0 0 #DDDDDD;
+	}
+
+ul.menu-popup {
+  position: absolute;
+  display: none;
+  width: 11em;
+  background: #F5FCF5;
+  color: #2d2d2d;
+  margin: 0px;
+  padding: 0px;
+  list-style: none;
+  z-index: 100000;
+  -webkit-box-shadow: 0px 5px 10px rgba(0, 0, 0, 0.7);
+  -moz-box-shadow: 0px 5px 10px rgba(0, 0, 0, 0.7);
+  box-shadow: 0px 5px 10px rgba(0, 0, 0, 0.7);
+}
+ul.menu-popup a {
+  display: block;
+  color: #2d2d2d;
+  padding: 5px 10px;
+  text-decoration: none;
+}
+ul.menu-popup a:hover {
+  background-color: #B8EDB8; /*bdcdd4;*/
+  color: #000;
+}
+ul.menu-popup .menu-sep {
+  border-top: 1px solid #9eabb0;
+}
+ul.menu-popup li {
+  float: none;
+  overflow: auto;
+  height: auto;
+  display: block;
+}
+ul.menu-popup li img {
+  float: left;
+  width: 16px;
+  height: 16px;
+  padding-right: 5px;
+}
+ul.menu-popup .empty {
+  padding: 5px;
+  text-align: center;
+  color: #9eabb0;
+}
+/* autocomplete popup */
+.acpopup {
+  max-height: 150px;
+  background-color: #ffffff;
+  color: #2d2d2d;
+  border: 1px solid #MenuBorder;
+  overflow: auto;
+  z-index: 100000;
+  -webkit-box-shadow: 0px 5px 10px rgba(0, 0, 0, 0.7);
+  -moz-box-shadow: 0px 5px 10px rgba(0, 0, 0, 0.7);
+  box-shadow: 0px 5px 10px rgba(0, 0, 0, 0.7);
+}
+.acpopupitem {
+  color: #2d2d2d;
+  padding: 4px;
+  clear: left;
+}
+.acpopupitem img {
+  float: left;
+  margin-right: 4px;
+}
+.acpopupitem.selected {
+  background-color: #bdcdd4;
+}
+#nav-notifications-menu {
+  width: 400px;
+  max-height: 550px;
+  overflow: auto;
+}
+/* #nav-notifications-menu a {
+	display: inline;
+	padding: 5px 0px;
+	margin: 0px 0px 2px 0px;
+}
+#nav-notifications-menu li:hover {
+  background-color: #bdcdd4;
+}*/
+
+#nav-notifications-menu img {
+  float: left;
+  margin-right: 5px;
+}
+#nav-notifications-menu .contactname {
+  font-weight: bold;
+}
+#nav-notifications-menu .notif-when {
+  font-size: 10px;
+  color: #9eabb0;
+  display: block;
+}
+
+.notif-image {
+        width: 32px;
+        height: 32px;
+        padding: 7px 7px 0px 0px;
+}
+
+/*profile_side*/
+#profile_side {
+  margin-bottom: 30px;
+ 
+}
+#profile_side a{
+  color: #333;
+}
+#ps-usericon{
+	height: 25px	
+	}
+#ps-username{
+  font-size: 1.17em;
+  font-weight: bold;
+  vertical-align: top;
+  position: absolute;
+  padding-top: 4px;
+  padding-left: 5px;	
+  word-wrap: break-word;
+  width: 130px;
+	}
+#ps-username:hover{
+  text-decoration: none;	
+	}
+.menu-profile-side{
+  list-style: none;	
+  padding-left: 0px;
+  min-height: 0px;
+	}
+.menu-profile-list{
+  height: auto;
+  overflow: auto;  
+  min-height: 16px;
+  list-style: none;
+	}
+.menu-profile-list:hover{
+	background: #B8EDB8; 
+	}
+.menu-profile-list-item{
+	padding-left: 5px;
+	vertical-align: middle;
+	}	
+.menu-profile-list-item:hover{	
+	text-decoration: none;
+   }
+/*http://prothemedesign.com/circular-icons/*/
+.menu-profile-icon.home{
+	background: url("../diabook-green/icons/home.png") no-repeat;
+	float: left;
+	height: 22px;
+	width: 22px;
+	}
+.menu-profile-icon.photos{
+	background: url("../diabook-green/icons/mess_side.png") no-repeat;
+	float: left;
+	height: 22px;
+   width: 22px;}
+.menu-profile-icon.events{
+	background: url("../diabook-green/icons/events.png") no-repeat;
+	float: left;
+	height: 22px;
+   width: 22px;}
+.menu-profile-icon.notes{
+	background: url("../diabook-green/icons/notes.png") no-repeat;
+	float: left;
+	height: 22px;
+   width: 22px;}
+.menu-profile-icon.foren{
+	background: url("../diabook-green/icons/pubgroups.png") no-repeat;
+	float: left;
+	height: 22px;
+   width: 22px;}
+.menu-profile-icon.com_side{
+	background: url("../diabook-green/icons/com_side.png") no-repeat;
+	float: left;
+	height: 22px;
+   width: 22px;}
+.menu-profile-icon.pscontacts{
+	background: url("../diabook-green/icons/pscontacts.png") no-repeat;
+	float: left;
+	height: 22px;
+   width: 22px;}
+
+/* aside */
+/*marker*/
+aside {
+  display: table-cell;
+  vertical-align: top;
+  width: 180px;
+  padding: 0px 5px 0px 0px;
+  border-right: 1px solid #D2D2D2;
+  float: left;
+  /* background: #F1F1F1; */
+}
+aside #page-sidebar{display: none;}
+aside .vcard .fn {
+  font-size: 18px;
+  font-weight: bold;
+  margin-bottom: 5px;
+}
+aside .vcard .title {
+  margin-bottom: 5px;
+}
+aside .vcard dl {
+  height: auto;
+  overflow: auto;
+}
+aside .vcard dt {
+  float: left;
+  margin-left: 0px;
+  /*width: 35%;*/
+  text-align: right;
+  color: #999999;
+}
+aside .vcard dd {
+  float: left;
+  margin-left: 5px;
+  /*width: 60%;*/
+}
+aside #profile-extra-links ul {
+  padding: 0px;
+  margin: 0px;
+}
+aside #profile-extra-links li {
+  padding: 0px;
+  margin: 0px;
+  list-style: none;
+}
+aside #dfrn-request-link {
+  display: block;
+  -moz-border-radius: 5px 5px 5px 5px;
+  -webkit-border-radius: 5px 5px 5px 5px;
+  border-radius: 5px 5px 5px 5px;
+  color: #ffffff;
+  background: #005c94 url('../../../../images/connect-bg.png') no-repeat left center;
+  font-weight: bold;
+  text-transform: uppercase;
+  padding: 4px 2px 2px 35px;
+}
+aside #dfrn-request-link:hover {
+  text-decoration: none;
+  background-color: #36c;
+  /* background-color: #19aeff; */
+}
+aside #profiles-menu {
+  width: 20em;
+}
+aside #search-text {
+	width: 150px;
+	height: 17px;
+	padding-left: 10px;
+	border-top-left-radius: 15px;
+border-top-right-radius: 15px;
+border-bottom-right-radius: 15px;
+border-bottom-left-radius: 15px;
+-moz-border-bottom-colors: #dbdbdb;
+  -moz-border-top-colors: #999;
+  -moz-border-left-colors: #999;
+  -moz-border-right-colors: #dbdbdb;
+}
+aside #side-follow-url {
+	width: 150px;
+	}
+aside #side-peoplefind-url {
+	width: 150px;
+	}
+#contact-block {
+  overflow: auto;
+  height: auto;
+}
+#contact-block .contact-block-h4 {
+  float: left;
+  margin: 5px 0px;
+}
+#contact-block .allcontact-link {
+  float: right;
+  margin: 5px 0px;
+}
+#contact-block .contact-block-content {
+  clear: both;
+  overflow: auto;
+  height: auto;
+}
+#contact-block .contact-block-link {
+  float: left;
+  margin: 0px 2px 2px 0px;
+}
+#contact-block .contact-block-link img {
+  widht: 55px;
+  height: 55px;
+}
+#lost-password-link {
+  float: left;
+  margin-right: 20px;	
+	}
+/* widget */
+.widget {
+  margin-bottom: 2em;
+  /*.action .s10 { width: 10px; overflow: hidden; padding: 0px;}
+	.action .s16 { width: 16px; overflow: hidden; padding: 0px;}*/
+/*  font-size: 12px; */
+}
+/*marker*/
+.widget h3 {
+  padding: 0px;
+  margin: 2px;
+  font-size: 1.05em;
+}
+.widget .action {
+  opacity: 0.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;
+}
+.widget input.action {
+  opacity: 0.5;
+  -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;
+}
+.widget:hover .title .action {
+  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;
+}
+.widget .tool:hover .action {
+  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;
+}
+.widget .tool:hover .action.ticked {
+  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;
+}
+.widget ul {
+  padding: 0px;
+}
+.widget ul li {
+  padding-left: 16px;
+  min-height: 16px;
+  list-style: none;
+}
+#side-bar-photos-albums li{
+list-style-type: disc;
+}
+#side-bar-photos-albums ul li{
+  margin-left: 30px;
+  padding-left: 0px;
+	}
+#side-bar-photos-albums ul li a{
+  color: #3465A4;
+}
+.widget .tool.selected {
+  background: url("../diabook-green/icons/selected.png") no-repeat left center;
+}
+/* widget: search */
+span.sbox_l  {
+	background: white url('../diabook/icons/srch_l.gif') no-repeat top left;
+	float: left;
+	width: 19px; height: 19px;
+	margin-left: 10px;
+	margin-top: 5px;
+	
+}
+
+span.sbox_r  {
+	background: white url('../diabook/icons/srch_r.gif') no-repeat top left;
+	float: left;
+	width: 19px; height: 19px;
+	margin-top: 5px;
+}
+
+span.sbox input {
+	background: white url('../diabook/icons/srch_bg.gif') repeat-x top left;
+	float: left;
+	margin-top: 5px;
+	border: 0;
+	height: 13px; width: 100px;
+	padding: 3px;
+	font: 11px/13px arial;
+	color: #000;
+}
+#add-search-popup {
+  width: 200px;
+  top: 18px;
+}
+/* section */
+section {
+  display: table-cell;
+  vertical-align: top;
+  width: auto;
+  padding: 0px 0px 0px 12px;
+}
+
+body .pageheader{
+  text-align: center;
+  font-size: 20px;
+  margin-bottom: 20px;
+  margin-top: 0px;
+  max-width: 575px;
+	}
+.qcomment{
+  max-width: 122px;	
+	}
+#id_username {
+  width: 173px;	
+	}
+#id_password {
+  width: 173px;		
+	}
+#id_openid_url {
+  width: 173px;	
+	}
+#contact-edit-end {
+	}
+.pager {
+   padding: 10px;
+	text-align: center;
+	font-size: 1.0em;
+	clear: both;
+	display: block;
+}	
+
+.tabs {
+    
+    background-position: 0 -20px;
+    background-repeat: repeat-x;
+    height: 27px;
+    padding: 0;
+ }
+.tab.button {
+    margin-left: 5px;	
+    /*background: none repeat scroll 0 0 #F8F8F8;*/
+    border: 1px solid #CCCCCC;
+    border-radius: 3px 3px 3px 3px;
+    font-weight: normal;
+    padding: 3px;
+    color:  #333333;
+	}
+	
+#birthday-notice, #event-notice, #birthday-wrapper, #event-wrapper{
+	margin-bottom: 10px;
+	}
+#birthday-wrapper a {
+	color: #3465A4;
+	}
+
+/*marker*/
+right_aside {
+  display: table-cell;
+  vertical-align: top;
+  width: 180px;
+  /*border-left: 1px solid #D2D2D2;*/
+  
+  /* background: #F1F1F1; */
+}
+right_aside a{color: #3465A4;}
+/*marker*/
+right_aside h3 {font-size: 1.05em; border-bottom: 1px solid #D2D2D2; padding-top: 5px; padding-bottom: 0px; padding-left: 9px; margin-bottom: 0px; 
+margin-top:30px;}
+right_aside .directory-item {	width: 50px; height: 50px; vertical-align: center; text-align: center; }
+right_aside .directory-photo { margin: 0px; }
+right_aside .directory-photo-img { max-width: 45px; max-height: 45px; }
+right_aside #likes { margin: 0px; padding: 0px; list-style: none; }
+right_aside .items-wrapper{ overflow: auto;	width: 100%; }
+right_aside #lastusers-wrapper { padding-left: 6px; padding-top: 3px; overflow: auto;	width: 100%; }
+right_aside #ra-photos-wrapper { padding-left: 5px; padding-top: 3px; overflow: auto;	width: 100%; }
+#page-sidebar-right_aside{margin-top: 0px; margin-bottom: 30px;}
+#page-sidebar-right_aside ul {margin-top: 0px;}
+#page-sidebar-right_aside .label {max-width: 128px;}
+right_aside .icon {width: 10px; height: 10px;}
+.close_box		{ 
+		background-image: url("../diabook-green/icons/close_box.png");
+		float: right;
+		cursor: pointer;
+		opacity: 0.1;
+		}
+.close_box:hover	{ 
+		background-image: url("../diabook-green/icons/close_box.png");
+		float: right;
+		cursor: pointer;
+		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;
+		}
+
+
+/* wall item */
+.tread-wrapper {
+  border-bottom: 1px solid #D2D2D2;
+  position: relative;
+  padding: 5px;
+  margin-bottom: 0px;
+  width: 775px;
+  padding-top: 10px;
+}
+.tread-wrapper a{
+  color: #194719;
+}
+
+/*marker*/
+.wall-item-decor {
+  position: absolute;
+  left: 780px;
+  top: -10px;
+  width: 16px;
+}
+/*marker*/
+.wall-item-container {
+  display: table;
+  width: 770px;
+}
+
+
+.wall-item-container .wall-item-item, .wall-item-container .wall-item-bottom {
+  display: table-row;
+}
+
+.wall-item-bottom {
+  font-size: 13px;
+}
+.wall-item-container .wall-item-bottom {
+/*  opacity: 0.5;
+  -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; */
+}
+.wall-item-container:hover .wall-item-bottom {
+/*  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; */
+}
+.wall-item-container .wall-item-info {
+  display: table-cell;
+  vertical-align: top;
+  text-align: left;
+  width: 80px;
+}
+.wall-item-container .wall-item-location {
+  padding-right: 40px;
+  display: table-cell;
+}
+.wall-item-container .wall-item-ago {
+  word-wrap: break-word;
+  width: 50px;
+  margin-left: 10px;
+  color: #999;
+}
+.wall-item-location {
+  
+  clear: both;
+  overflow: hidden;
+  
+  margin-bottom: 5px;
+}
+
+/*marker*/
+.wall-item-container .wall-item-content {
+
+  max-width: 690px;
+  word-wrap: break-word;
+
+
+}
+/*marker*/
+.wall-item-container .wall-item-content img {
+
+
+}
+.wall-item-container .wall-item-links, .wall-item-container .wall-item-actions {
+  display: table-cell;
+  vertical-align: middle;
+}
+.wall-item-container .wall-item-links .icon, .wall-item-container .wall-item-actions .icon {
+  opacity: 0.5;
+  -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;
+}
+.wall-item-container .wall-item-links .icon:hover, .wall-item-container .wall-item-actions .icon: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;
+}
+.wall-item-container .wall-item-name {
+  font-weight: bold;
+}
+.wall-item-container .wall-item-actions-author {
+  width: 100%;
+  margin-bottom: 0.3em;
+}
+.wall-item-container .wall-item-actions-social {
+  float: left;
+  margin-bottom: 1px;
+  display: table-cell;
+}
+.wall-item-container .wall-item-actions-social a {
+  margin-right: 1em;
+}
+.wall-item-actions-social a {
+  float: left;
+}
+.wall-item-container .wall-item-actions-tools {
+  float: right;
+  width: 80px;
+  display: table-cell;
+}
+.wall-item-container .wall-item-actions-tools a {
+  float: right;
+}
+.wall-item-container .wall-item-actions-tools input {
+  float: right;
+}
+/*marker*/
+.wall-item-container.comment {
+  margin-top: 5px;
+  margin-bottom: 5px;
+  margin-left: 80px;
+  width: 690px;
+  border-bottom: 1px solid hsl(198, 21%, 79%);
+}
+.wall-item-container.comment .contact-photo {
+  width: 32px;
+  height: 32px;
+  margin-left: 16px;
+  /*background: url(../../../../images/icons/22/user.png) no-repeat center center;*/
+
+}
+.wall-item-container.comment {
+  top: 15px !important;
+  left: 15px !important;
+}
+.wall-item-container.comment .wall-item-links {
+  padding-left: 12px;
+}
+
+.wall-item-comment-wrapper {
+  margin: 1px 5px 5px 80px;
+  background-color: #fff;
+  width: 500px;
+}
+.wall-item-comment-wrapper .comment-edit-photo {
+  display: none;
+}
+.wall-item-comment-wrapper textarea {
+  height: 2.0em;
+  width: 100%;
+  font-size: 10px;
+  color: #999999;
+  border: 1px solid #DDD;
+  padding: 0.3em;
+  font-size: 14px;
+}
+.wall-item-comment-wrapper .comment-edit-text-full {
+  font-size: 14px;
+  height: 4em;
+  color: #2d2d2d;
+  border: 1px solid #2d2d2d;
+}
+.comment-edit-preview {
+  width: 500px;
+  margin-top: 10px;
+  background-color:  #fff797;
+}
+.comment-edit-preview .contact-photo {
+  width: 32px;
+  height: 32px;
+  margin-left: 16px;
+  /*background: url(../../../../images/icons/22/user.png) no-repeat center center;*/
+
+}
+.comment-edit-preview {
+  top: 15px !important;
+  left: 15px !important;
+}
+.comment-edit-preview .wall-item-links {
+  padding-left: 12px;
+}
+.comment-edit-preview .wall-item-container {
+  width: 700px;
+}
+.comment-edit-preview .tread-wrapper {
+  width: 700px;
+  padding: 0;
+  margin: 10px 0;
+}
+
+.shiny {
+  /* border-right: 10px solid #fce94f; */
+	border-right: 1px solid #A7C7F7;
+	padding-right: 12px;
+}
+
+#jot-preview-content{
+	margin-top: 30px;}
+	
+#jot-preview-content .tread-wrapper {
+  background-color: #fff797;
+}
+
+.wall-item-tags {
+  padding-top: 1px;
+  padding-bottom: 2px;
+}
+.tag {
+  /*background: url("../../../../images/tag_b.png") repeat-x center left;*/
+  color: #999;
+  padding-left: 3px;
+  font-size: 12px;
+}
+.tag a {
+  padding-right: 5px;
+  /*background: url("../../../../images/tag.png") no-repeat center right;*/
+  color: #999;
+}
+.wwto {
+  position: absolute !important;
+  width: 25px;
+  height: 25px;
+  background: #FFFFFF;
+  border: 2px solid #364e59;
+  height: 25px;
+  width: 25px;
+  overflow: hidden;
+  padding: 1px;
+  position: absolute !important;
+  top: 40px;
+  left: 30px;
+  -webkit-box-shadow: 0px 0px 10px rgba(0, 0, 0, 0.7);
+  -moz-box-shadow: 0px 0px 10px rgba(0, 0, 0, 0.7);
+  box-shadow: 0px 0px 10px rgba(0, 0, 0, 0.7);
+}
+.wwto .contact-photo {
+  width: auto;
+  height: 25px;
+}
+/* contacts menu */
+.contact-photo-wrapper {
+  position: relative;
+  width: 80px;
+}
+
+.contact-photo-wrapper.wwto {
+  width: 25px;
+}
+
+.contact-photo {
+  width: 48px;
+  height: 48px;
+  overflow: hidden;
+  display: block;
+}
+.contact-photo img {
+  width: 48px;
+  height: 48px;
+}
+
+.contact-wrapper {
+  float: left;
+  width: 90px;
+  height: 90px;
+  margin-bottom: 15px;
+}
+.contact-wrapper .contact-photo {
+  width: 80px;
+  height: 80px;
+}
+.contact-wrapper .contact-photo img {
+  width: 80px;
+  height: 80px;
+}
+.contact-wrapper {
+  left: 0px;
+  top: 63px;
+}
+.contact-photo {
+  width: 48px;
+  height: 48px;
+}
+.contact-photo img {
+  width: 48px;
+  height: 48px;
+}
+.contact-name {
+  /* text-align: center; */
+  /*font-weight: bold;*/
+  font-size: 12px;
+}
+.contact-details {
+  color: #999999;
+}
+/* editor */
+.jothidden {
+  display: none;
+}
+#jot {
+  width: 585px;
+  margin: 0px 2em 20px 0px;
+}
+#profile-jot-form #profile-jot-text {
+  height: 2.0em;
+  width: 99%;
+  font-size: 15px;
+  color: #999999;
+  border: 1px solid #DDD;
+  padding: 0.3em;
+  margin-bottom: 10px;
+}
+.grey
+{
+  display: inline;
+  float: right;	
+	}
+#jot #jot-tools {
+  margin: 0px;
+  padding: 0px;
+  height: 40px;
+  overflow: none;
+  width: 583px;
+  background-color: #fff;
+  border-bottom: 2px solid #9eabb0;
+}
+
+#jot #jot-tools li {
+  list-style: none;
+  float: left;
+  width: 80px;
+  height: 40px;
+  border-bottom: 2px solid #9eabb0;
+}
+#jot #jot-tools li a {
+  display: block;
+  color: #cccccc;
+  width: 100%;
+  height: 40px;
+  text-align: center;
+  line-height: 40px;
+  overflow: hidden;
+}
+#jot #jot-tools li:hover {
+  background-color: #364e59;
+  border-bottom: 2px solid #bdcdd4;
+}
+#jot #jot-tools li.perms {
+  float: right;
+  width: 40px;
+}
+#jot #jot-tools li.perms a.unlock {
+  width: 30px;
+  border-left: 10px solid #cccccc;
+  background-color: #cccccc;
+  background-position: left center;
+}
+#jot #jot-tools li.perms a.lock {
+  width: 30px;
+  border-left: 10px solid #666666;
+  background-color: #666666;
+}
+#jot #jot-tools li.submit {
+  float: right;
+  background-color: #cccccc;
+  border-bottom: 2px solid #cccccc;
+  border-right: 1px solid #666666;
+  border-left: 1px solid #666666;
+}
+#jot #jot-tools li.submit input {
+  border: 0px;
+  margin: 0px;
+  padding: 0px;
+  background-color: #cccccc;
+  color: #666666;
+  width: 80px;
+  height: 40px;
+  line-height: 40px;
+}
+#jot #jot-tools li.submit input:hover {
+  background-color: #bdcdd4;
+  color: #666666;
+}
+#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;
+}
+#profile-jot-form #jot-title {
+    
+  	 border-radius: 5px 5px 5px 5px;
+    font-weight: bold;
+    height: 20px;
+    margin: 0 0 5px;
+    width: 60%;
+    border: 1px solid #d2d2d2;
+}
+#profile-jot-form #jot-title:-webkit-input-placeholder {
+  font-weight: normal;
+}
+#profile-jot-form #jot-title:-moz-placeholder {
+  font-weight: normal;
+}
+#profile-jot-form #profile-jot-text_parent #profile-jot-text_tbl{
+	width: 585px;
+	height: 100px;
+	}
+#jot #jot-title:hover {
+  border: 1px solid #999999;
+}
+#jot #jot-title:focus {
+  border: 1px solid #999999;
+}
+#jot #character-counter {
+  width: 80px;
+  float: right;
+  text-align: right;
+  height: 20px;
+  line-height: 20px;
+  padding-right: 20px;
+}
+#jot-perms-icon, 
+#profile-location,
+#profile-nolocation,
+#profile-youtube, 
+#profile-video, 
+#profile-audio,
+#profile-link,
+#profile-title, 
+#wall-image-upload,
+#wall-file-upload,
+#wall-image-upload-div,
+#wall-file-upload-div,
+.hover, .focus {
+	cursor: pointer;
+	margin-top: 2px;
+}
+/*marker*/
+#profile-jot-wrapper{
+	margin: 0 20px 20px 0;
+   width: 785px;
+	}
+/*marker*/
+#profile-jot-submit-wrapper {
+	margin-bottom: 50px;
+	width: 785px;
+}
+
+#profile-jot-submit {
+	float: right;
+	margin-top: 2px;
+	font-size: 14px;
+	
+}
+#profile-upload-wrapper {
+	float: left;
+	margin-top: 2px;
+	margin-left: 10px;
+	
+}
+#profile-attach-wrapper {
+	float: left;
+	margin-left: 15px;
+	margin-top: 2px;
+}
+#profile-rotator {
+	float: left;
+	margin-left: 30px;
+	margin-top: 2px;
+}
+#profile-link-wrapper {
+	float: left;
+	margin-left: 15px;
+	margin-top: 2px;
+}
+#profile-youtube-wrapper {
+	float: left;
+	margin-left: 15px;
+	margin-top: 2px;
+}
+#profile-video-wrapper {
+	float: left;
+	margin-left: 15px;
+	margin-top: 2px;
+}
+#profile-audio-wrapper {
+	float: left;
+	margin-left: 15px;
+	margin-top: 2px;
+}
+#profile-location-wrapper {
+	float: left;
+	margin-left: 15px;
+	margin-top: 2px;
+}
+#profile-jot-perms {
+	float: left;
+	margin-left: 45px;
+	margin-top: 2px;
+}
+#jot-preview-link {
+	float: right;
+	margin-left: 10px;
+	margin-top: 2px;
+	font-size: 9px;
+	font-weight: bolder;
+	cursor: pointer;
+}
+#profile-jot-perms{
+   float: right;
+	margin-left: 10px;
+	margin-top: 2px;	
+	}
+/** buttons **/
+.button.creation1 {
+    background-color: #fff;
+    border: 1px solid #777777;
+    border-radius: 3px 3px 3px 3px;
+    box-shadow: 0 1px 1px #CFCFCF;
+    cursor: pointer;
+    font-weight: bolder;
+}
+.button.creation2 {
+    background-color: #194719;
+    border: 1px solid #777777;
+    color: white;
+    border-radius: 3px 3px 3px 3px;
+    box-shadow: 0 1px 1px #CFCFCF;
+    margin-left: 5px;
+    cursor: pointer;
+    font-weight: bolder;
+}
+/*input[type="submit"] {
+	border: 0px;
+    background-color: @ButtonBackgroundColor;
+    color: @ButtonColor;
+    padding: 0px 10px;
+	.rounded(5px);
+    height: 18px;
+}*/
+/** acl **/
+#photo-edit-perms-select, #photos-upload-permissions-wrapper, #profile-jot-acl-wrapper {
+  display: block!important;
+}
+#acl-wrapper {
+  width: 690px;
+  float: left;
+}
+#acl-search {
+  float: right;
+  background: #ffffff url("../../../../images/search_18.png") no-repeat right center;
+  padding-right: 20px;
+}
+#acl-showall {
+  float: left;
+  display: block;
+  width: auto;
+  height: 18px;
+  background-color: #cccccc;
+  background-image: url("../../../../images/show_all_off.png");
+  background-position: 7px 7px;
+  background-repeat: no-repeat;
+  padding: 7px 5px 0px 30px;
+  color: #999999;
+  -moz-border-radius: 5px 5px 5px 5px;
+  -webkit-border-radius: 5px 5px 5px 5px;
+  border-radius: 5px 5px 5px 5px;
+}
+#acl-showall.selected {
+  color: #000000;
+  background-color: #ff9900;
+  background-image: url("../../../../images/show_all_on.png");
+}
+#acl-list {
+  height: 210px;
+  border: 1px solid #cccccc;
+  clear: both;
+  margin-top: 30px;
+  overflow: auto;
+}
+.acl-list-item {
+  display: block;
+  width: 150px;
+  height: 30px;
+  border: 1px solid #cccccc;
+  margin: 5px;
+  float: left;
+}
+.acl-list-item img {
+  width: 22px;
+  height: 22px;
+  float: left;
+  margin: 4px;
+}
+.acl-list-item p {
+  height: 12px;
+  font-size: 10px;
+  margin: 0px;
+  padding: 2px 0px 1px;
+  overflow: hidden;
+}
+.acl-list-item a {
+  font-size: 8px;
+  display: block;
+  width: 40px;
+  height: 10px;
+  float: left;
+  color: #999999;
+  background-color: #cccccc;
+  background-position: 3px 3px;
+  background-repeat: no-repeat;
+  margin-right: 5px;
+  -webkit-border-radius: 2px ;
+  -moz-border-radius: 2px;
+  border-radius: 2px;
+  padding-left: 15px;
+}
+#acl-wrapper a:hover {
+  text-decoration: none;
+  color: #000000;
+}
+.acl-button-show {
+  background-image: url("../../../../images/show_off.png");
+}
+.acl-button-hide {
+  background-image: url("../../../../images/hide_off.png");
+}
+.acl-button-show.selected {
+  color: #000000;
+  background-color: #9ade00;
+  background-image: url("../../../../images/show_on.png");
+}
+.acl-button-hide.selected {
+  color: #000000;
+  background-color: #ff4141;
+  background-image: url("../../../../images/hide_on.png");
+}
+.acl-list-item.groupshow {
+  border-color: #9ade00;
+}
+.acl-list-item.grouphide {
+  border-color: #ff4141;
+}
+/** /acl **/
+/** tab buttons 14618a**/
+/*marker*/
+ul.tabs {
+  list-style-type: none;
+  padding-bottom: 10px;
+  font-size: 13px;
+  width: 805px;
+}
+ul.tabs li {
+  float: left;
+  margin-left: 5px;
+}
+ul.tabs li .active {
+    background-color: #3465A4;
+    border: 1px solid #777777;
+    color: white;
+    border-radius: 3px 3px 3px 3px;
+    box-shadow: 2px 2px 2px #CFCFCF;
+    margin-left: 5px;
+}
+/**
+ * Form fields
+ */
+.field {
+  margin-bottom: 10px;
+  padding-bottom: 10px;
+  overflow: auto;
+  width: 100%;
+}
+.field label {
+  float: left;
+  width: 200px;
+}
+.field input, .field textarea {
+  width: 400px;
+}
+.field textarea {
+  height: 100px;
+}
+.field .field_help {
+  display: block;
+  margin-left: 200px;
+  color: #666666;
+}
+.field .onoff {
+  float: left;
+  width: 80px;
+}
+.field .onoff a {
+  display: block;
+  border: 1px solid #666666;
+  background-image: url("../../../../images/onoff.jpg");
+  background-repeat: no-repeat;
+  padding: 4px 2px 2px 2px;
+  height: 16px;
+  text-decoration: none;
+}
+.field .onoff .off {
+  border-color: #666666;
+  padding-left: 40px;
+  background-position: left center;
+  background-color: #cccccc;
+  color: #666666;
+  text-align: right;
+}
+.field .onoff .on {
+  border-color: #204A87;
+  padding-right: 40px;
+  background-position: right center;
+  background-color: #D7E3F1;
+  color: #204A87;
+  text-align: left;
+}
+.field .hidden {
+  display: none!important;
+}
+.field.radio .field_help {
+  margin-left: 0px;
+}
+#directory-search-form{
+	margin-bottom: 50px;
+	}
+#profile-edit-links-end {
+        clear: both;
+        margin-bottom: 15px;
+}
+
+#profile-edit-links ul { margin: 20px; padding-bottom: 20px; list-style: none; }
+
+#profile-edit-links li {
+  float: left;
+  list-style: none;
+  margin-left: 10px;
+}
+
+.profile-edit-side-div {
+  display: none;
+}
+
+#register-form label,
+#profile-edit-form label {
+        width: 300px; float: left;
+}
+
+.required {
+  display: inline;
+  color: #B20202;
+}
+
+/* oauth */
+.oauthapp {
+  height: auto;
+  overflow: auto;
+  border-bottom: 2px solid #cccccc;
+  padding-bottom: 1em;
+  margin-bottom: 1em;
+}
+.oauthapp img {
+  float: left;
+  width: 48px;
+  height: 48px;
+  margin: 10px;
+}
+.oauthapp img.noicon {
+  background-image: url("../../../../images/icons/48/plugin.png");
+  background-position: center center;
+  background-repeat: no-repeat;
+}
+.oauthapp a {
+  float: left;
+}
+/* contacts */
+.contact-entry-wrapper {
+  width: 120px;
+  height: 120px;
+  float: left;
+}
+/* photo */
+.photo {
+box-shadow: 2px 2px 5px 0px #000000;
+margin: 0px;
+border-radius: 10px;
+height: 145px !important;
+width: 145px !important;
+}
+.lframe {
+  float: left;
+  /*margin: 0px 10px 10px 0px;*/
+}
+/* profile match wrapper */
+.profile-match-wrapper {
+  float: left;
+  width: 90px;
+  height: 90px;
+  margin-bottom: 20px;
+}
+.profile-match-wrapper .contact-photo {
+  width: 80px;
+  height: 80px;
+}
+.profile-match-wrapper .contact-photo img {
+  width: 80px;
+  height: 80px;
+}
+.profile-match-wrapper {
+  left: 0px;
+  top: 63px;
+}
+
+.contact-photo-menu-button {
+        position: relative;
+        background-image: url("../../../../images/icons/16/menu.png");
+        background-position: top left; 
+        background-repeat: no-repeat;
+        margin: 0px 0px -16px 0px; 
+	padding: 0px;
+        width: 16px;
+        height: 16px;
+        top: -16px; left:0px;
+        overflow: hidden;
+        text-indent: 40px;
+        display: none;
+        
+}
+.contact-photo-menu {
+        width: 11em;
+        border: 3px solid #364e59;
+	color: #2d2d2d;
+        background: #FFFFFF;
+/*        position: absolute;*/
+        position: relative;
+        left: 0px; top: 0px;
+        display: none;
+        z-index: 10000;
+}
+.contact-photo-menu ul { margin:0px; padding: 0px; list-style: none }
+.contact-photo-menu li a {
+	display: block; 
+	padding: 5px 10px; 
+	color: #2d2d2d;
+	text-decoration: none;
+}
+.contact-photo-menu li a:hover {
+	background-color: #bdcdd4; 
+}
+
+/* page footer */
+footer {
+  height: 100px;
+  display: table-row;
+}
+
+blockquote {
+    border-left: 1px solid #D2D2D2;
+    padding-left: 9px;
+    margin: 0 0 0 .8ex;
+	 color: #777;
+}
+.oembed {
+	
+	font-weight: bold;
+}
+.aprofile dt{
+box-shadow: 1px 1px 5px 0;
+    color: #666666;
+    margin: 15px 0 5px;
+    padding-left: 5px;	
+	}
+/* ================== */
+/* = Contacts Block = */
+/* ================== */
+
+.contact-block-img {
+        width: 55px;
+        height: 55px;
+        padding-right: 3px;
+}
+.contact-block-div {
+        float: left;
+}
+
+.contact-block-textdiv { width: 150px; height: 34px; float: left; }
+#contact-block-end { clear: both; } 
+
+#group-edit-wrapper {
+        margin-bottom: 10px;
+}
+
+#group-members-end {
+        clear: both;
+}
+#group-edit-desc {
+ margin-top: 15px;
+}
+
+/*
+#group-separator,
+#prof-separator { display: none;}
+*/
+#prof-members-end{
+	clear: both;
+	}
+
+#prvmail-to-label, #prvmail-subject-label, #prvmail-message-label {
+	margin-bottom: 10px;
+	margin-top: 20px;
+}
+
+#prvmail-submit {
+	float: right;
+	margin-top: 10px;
+}
+
+#prvmail-subject
+{
+background: none repeat scroll 0 0 #FFFFFF;
+border: 1px solid #CCCCCC;
+border-radius: 5px 5px 5px 5px;
+font-weight: bold;
+height: 20px;
+margin: 0 0 5px;
+vertical-align: middle;
+}
+#prvmail-form{
+ width: 597px;	
+	}
+	
+#prvmail-upload-wrapper,
+#prvmail-link-wrapper,
+#prvmail-rotator-wrapper {
+	float: left;
+	margin-top: 10px;
+	margin-right: 10px;
+	width: 24px;
+}
+
+#prvmail-end {
+	clear: both;
+}
+
+.mail-list-sender,
+.mail-list-detail {
+	float: left;
+}
+.mail-list-detail {
+	margin-left: 20px;
+}
+
+.mail-list-subject {
+	font-size: 1.1em;
+	margin-top: 10px;
+}
+a.mail-list-link {
+    display: block;
+    font-size: 1.3em;
+    padding: 4px 0;
+}
+
+/*
+*a.mail-list-link:hover {
+*	background-color: #15607B;
+*	color: #F5F6FB;
+*}
+*/
+
+.mail-list-outside-wrapper-end {
+	clear: both;
+}
+
+.mail-list-outside-wrapper {
+	margin-top: 30px;
+}
+
+.mail-list-delete-wrapper {
+	float: right;
+	margin-right: 30px;
+	margin-top: 15px;
+}
+
+.mail-list-delete-icon {
+	border: none;
+}
+
+.mail-conv-sender,
+.mail-conv-detail {
+	float: left;
+}
+.mail-conv-detail {
+	margin-left: 20px;
+	width: 500px;
+}
+
+.mail-conv-subject {
+    font-size: 1.4em;
+    margin: 10px 0;
+}
+
+.mail-conv-outside-wrapper-end {
+	clear: both;
+}
+
+.mail-conv-outside-wrapper {
+	margin-top: 30px;
+}
+
+.mail-conv-delete-wrapper {
+	float: right;
+	margin-right: 30px;
+	margin-top: 15px;
+}
+.mail-conv-break {
+	clear: both;
+}
+
+.mail-conv-delete-icon {
+	border: none;
+}
+
+/* ========== */
+/* = Events = */
+/* ========== */
+.eventcal {
+        float: left;
+        font-size: 20px;
+}
+
+.vevent {
+
+}
+.vevent .event-description, .vevent .event-location {
+        margin-left: 10px;
+        margin-right: 10px;
+}
+.vevent .event-start {
+        margin-left: 10px;
+        margin-right: 10px;
+}
+
+#new-event-link {
+        margin-bottom: 10px;
+}
+
+.edit-event-link, .plink-event-link {
+        float: left;
+        margin-top: 4px;
+        margin-right: 4px;
+        margin-bottom: 15px;
+}
+
+.event-description:before {
+        content: url('../../../../images/calendar.png');
+        margin-right: 15px;
+}
+
+.event-start, .event-end {
+        margin-left: 10px;
+        width: 330px;
+        clear: both;
+}
+
+.event-start .dtstart, .event-end .dtend {
+        float: right;
+}
+
+.event-list-date {
+        margin-bottom: 10px;
+}
+
+.prevcal, .nextcal {
+        float: left;
+        margin-left: 32px;
+        margin-right: 32px;
+        margin-top: 64px;
+}
+.event-calendar-end {
+        clear: both;
+}
+
+ 
+.calendar {
+        font-family: Courier, monospace;
+}
+.calendar.eventcal a {
+  color: #3465A4;	
+	}
+.today {
+        font-weight: bold;
+        color: #FF0000;
+}
+
+.settings-block {
+        border: 1px solid #AAA;
+        margin: 10px;
+        padding: 10px;
+}
+
+.app-title {
+        margin: 10px;
+}
+
+#identity-manage-desc {
+        margin-top:15px;
+        margin-bottom: 15px;
+}
+
+#identity-manage-choose {
+        margin-bottom: 15px;
+}
+
+#identity-submit {
+        margin-top: 20px;
+}
+
+#photo-prev-link, #photo-next-link {
+        padding: 10px;
+        float: left;
+}
+.lightbox{
+	float: left;
+	}
+
+#photo-photo {
+        float: left;
+}
+#photo-like-div .wall-item-like-buttons {
+	 float: left;
+    margin-right: 5px;
+    margin-top: 30px;
+	}
+.comment-edit-text-empty {
+    margin: 10px 0 0;
+    width: 85%;
+}
+.comment-edit-photo {
+    margin: 10px 0 0;
+}
+.wall-item-like-buttons .icon.like {
+float: left;
+}
+
+#photo-photo-end {
+        clear: both;
+}
+
+.tabs .comment-wwedit-wrapper {
+	display: block;
+   margin-top: 30px;
+   margin-left: 50px;
+	}
+
+.profile-match-photo {
+        float: left;
+        text-align: center;
+        width: 120px;
+}
+
+.profile-match-name {
+        float: left;
+        text-align: center;
+        width: 120px;
+        overflow: hidden;
+}
+
+.profile-match-break,
+.profile-match-end {
+        clear: both;
+}
+
+.profile-match-connect {
+        text-align: center;
+        font-weight: bold;
+}
+
+.profile-match-wrapper {
+        float: left;
+        padding: 10px;
+        width: 120px;
+        height: 120px;
+        scroll: auto;
+}
+#profile-match-wrapper-end {
+        clear: both;
+}
+
+/* ============= */
+/* = Directory = */
+/* ============= */
+/* contacts menu */
+.contact-photo-wrapper {
+  position: relative;
+}
+.contact-photo {
+  width: 48px;
+  height: 48px;
+  overflow: hidden;
+  display: block;
+}
+.contact-photo img {
+  width: 48px;
+  height: 48px;
+}
+.contact-photo-menu-button {
+  display: none;
+  /* position: absolute; */
+  /* position: absolute; */
+  left: 0px;
+  top: -16px;
+}
+.contact-wrapper {
+  float: left;
+  width: 90px;
+  height: 90px;
+  margin-bottom: 15px;
+}
+.contact-wrapper .contact-photo {
+  width: 80px;
+  height: 80px;
+}
+.contact-wrapper .contact-photo img {
+  width: 80px;
+  height: 80px;
+}
+.contact-wrapper .contact-photo-menu-button {
+  left: 0px;
+  top: 63px;
+}
+.directory-item {
+  float: left;
+  width: 200px;
+  height: 200px;
+}
+.directory-item .contact-photo {
+  width: 175px;
+  height: 175px;
+}
+.directory-item .contact-photo img {
+  width: 175px;
+  height: 175px;
+}
+.contact-name {
+  text-align: left;
+  font-weight: bold;
+  font-size: 12px;
+}
+.contact-details {
+  color: #999999;
+}
+#side-bar-photos-albums li{
+list-style-type: disc;
+}
+#side-bar-photos-albums ul li{
+  margin-left: 30px;
+  padding-left: 0px;
+	}
+#side-bar-photos-albums{
+	margin-top: 15px;	
+	}
+.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-album-image-wrapper, .photo-top-image-wrapper {
+  float: left;
+   -moz-box-shadow: 0 0 5px #888;
+   -webkit-box-shadow: 0 0 5px #888;
+   box-shadow: 0 0 5px #888;
+  background-color: #000;
+   -webkit-border-radius: 5px;
+   -moz-border-radius: 5px;
+  border-radius: 5px;
+  padding-bottom: 20px;
+  position: relative;
+  margin: 0 10px 10px 0;
+  width: 200px; height: 140px;
+  overflow: hidden;  
+}
+.photo-top-album-name {
+        width: 100%;
+        position: absolute; 
+        bottom: 0px; 
+        padding-left: 3px;
+        background-color: #EEE;
+}
+.photo-top-album-link{
+  color: #3465A4;
+	}
+.photo-top-album-img{
+	
+	}
+/*.photo-top-image-wrapper {
+        position: relative;
+        float: left;
+        margin-top: 15px;
+        margin-right: 15px;
+        width: 200px; height: 200px; 
+        overflow: hidden; 
+}
+.photo-top-album-name {
+        width: 100%;
+        min-height: 2em;
+        position: absolute; 
+        bottom: 0px; 
+        padding: 0px 3px;
+        padding-top: 0.5em;
+        background-color: rgb(255, 255, 255);
+}*/
+#photo-top-end {
+        clear: both;
+}
+
+#photo-top-links {
+        margin-bottom: 30px;
+        margin-left: 30px;
+}
+
+#photos-upload-newalbum-div {
+        float: left;
+        width: 175px;
+}
+
diff --git a/view/theme/diabook/diabook-green/style-network.css b/view/theme/diabook/diabook-green/style-network.css
new file mode 100644
index 000000000..786547711
--- /dev/null
+++ b/view/theme/diabook/diabook-green/style-network.css
@@ -0,0 +1,2634 @@
+/**
+ * Fabio Comuni <http://kirgroup.com/profile/fabrixxm>
+ * Additional Changes: Michael Vogel <icarus@dabo.de>
+ **/
+
+/* ========= */
+/* = Admin = */
+/* ========= */
+
+#adminpage {
+/*        width: 80%;*/
+}
+
+#pending-update {
+        float:right;
+        color: #ffffff;
+        font-weight: bold;
+        background-color: #FF0000;
+        padding: 0em 0.3em;
+}
+
+.admin.linklist {
+        border: 0px; padding: 0px;
+}
+
+.admin.link {
+        list-style-position: inside;
+        font-size: 1em;
+        padding: 5px;
+        width: 100px;
+        margin: 5px;
+}
+
+#adminpage dl {
+        clear: left;
+        margin-bottom: 2px;
+        padding-bottom: 2px;
+        border-bottom: 1px solid black;
+}
+
+#adminpage dt {
+        width: 200px;
+        float: left;
+        font-weight: bold;
+}
+
+#adminpage dd {
+        margin-left: 200px;
+}
+#adminpage h3 {
+        border-bottom: 1px solid #898989;
+        margin-bottom: 5px;
+        margin-top: 10px;
+}
+
+#adminpage .submit {
+        clear:left;
+}
+
+#adminpage #pluginslist {
+        margin: 0px; padding: 0px;
+}
+
+#adminpage .plugin {
+        list-style: none;
+        display: block;
+	/* border: 1px solid #888888; */
+        padding: 1em;
+        margin-bottom: 5px;
+        clear: left;
+}
+
+#adminpage .toggleplugin {
+        float:left;
+        margin-right: 1em;
+}
+
+#adminpage table {width:100%; border-bottom: 1p solid #000000; margin: 5px 0px;}
+#adminpage table th { text-align: left;}
+#adminpage td .icon { float: left;}
+#adminpage table#users img { width: 16px; height: 16px; }
+#adminpage table tr:hover { background-color: #eeeeee; }
+#adminpage .selectall { text-align: right; }
+/* icons */
+
+.icon.contacts {
+  background-image: url("../diabook-green/icons/contacts.png");}
+.icon.notifications {
+  background-image: url("../diabook-green/icons/notifications.png");}
+.icon.notify {
+  background-image: url("../diabook-green/icons/notify.png");}
+.icon.messages {
+  background-image: url("../diabook-green/icons/messages.png");}
+.icon.community {
+  background-image: url("../diabook-green/icons/community.png");}
+  
+.icon.drop 	{ background-image: url("../diabook-green/icons/drop.png");}
+.icon.drophide 	{ background-image: url("../diabook-green/icons/drop.png");}
+.icon.dislike 	{ background-image: url("../diabook-green/icons/dislike.png");}
+.icon.like 	{ background-image: url("../diabook-green/icons/like.png");}
+.icon.pencil 	{ background-image: url("../diabook-green/icons/pencil.png");}
+.icon.recycle 	{ background-image: url("../diabook-green/icons/recycle.png");}
+.icon.remote-link { background-image: url("../diabook-green/icons/remote.png");}
+.icon.tagged    { background-image: url("../diabook-green/icons/tagged.png");}
+.icon.file-as { background-image: url("../diabook-green/icons/file_as.png");}
+.star-item.icon.unstarred { background-image: url("../diabook-green/icons/unstarred.png");}
+.star-item.icon.starred { background-image: url("../diabook-green/icons/starred.png");}
+.icon.link		{ background-image: url("../diabook-green/icons/link.png");}
+.icon.lock		{ background-image: url("../diabook-green/icons/lock.png");}
+.icon.unlock		{ background-image: url("../diabook-green/icons/unlock.png");}
+.icon.language    { background-image: url("../diabook-green/icons/language.png");}
+
+
+.camera 	{ background-image: url("../diabook-green/icons/camera.png"); 
+			  display: block; width: 28px; height: 28px; background-repeat: no-repeat;
+			  }
+.attach 	{ background-image: url("../diabook-green/icons/attach.png"); 
+			  display: block; width: 28px; height: 28px; background-repeat: no-repeat;
+			  }
+.video2 	{ background-image: url("../diabook-green/icons/video.png"); 
+			  display: block; width: 28px; height: 28px; background-repeat: no-repeat;
+			  }	
+.video 	{ background-image: url("../diabook-green/icons/video.png"); 
+			  display: block; width: 100%; height: 140px; background-repeat: no-repeat;
+			  }
+.audio2 	{ background-image: url("../diabook-green/icons/audio.png"); 
+			  display: block; width: 28px; height: 28px; background-repeat: no-repeat;
+			  }
+.audio 	{ background-image: url("../diabook-green/icons/audio.png"); 
+			  display: block; width: 28px; height: 28px; background-repeat: no-repeat;
+			  }
+.weblink 	{ background-image: url("../diabook-green/icons/weblink.png"); 
+			  display: block; width: 28px; height: 28px; background-repeat: no-repeat;
+			  }
+.globe 	{ background-image: url("../diabook-green/icons/globe.png"); 
+			  display: block; width: 28px; height: 28px; background-repeat: no-repeat;
+			  }
+.unglobe 	{ background-image: url("../diabook-green/icons/unglobe.png"); 
+			  display: block; width: 28px; height: 28px; background-repeat: no-repeat;
+			  }
+.edit    {background-image: url("../diabook-green/icons/pencil2.png"); 
+			  display: block; width: 28px; height: 28px; background-repeat: no-repeat;}
+			  
+			  
+
+
+.article	{ background-position: -50px  0px;}
+/*.audio 		{ background-position: -70px  0px;}*/
+.block 		{ background-position: -90px  0px;}
+/*.drop 		{ background-position: -110px 0px;}*/
+/*.drophide 	{ background-position: -130px 0px;}*/
+/*.edit 		{ background-position: -150px 0px;}*/
+/*.camera 	{ background-position: -170px 0px;}*/
+/*.dislike 	{ background-position: -190px 0px;}*/
+/*.like 		{ background-position: -210px 0px;}*/
+/*.link 		{ background-position: -230px 0px;}*/
+
+/*.globe 		{ background-position: -50px  -20px;}*/
+/*.noglobe 	{ background-position: -70px  -20px;}*/
+.no 		{ background-position: -90px  -20px;}
+.pause 		{ background-position: -110px -20px;}
+.play 		{ background-position: -130px -20px;}
+/*.pencil 	{ background-position: -150px -20px;}*/
+.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;}*/
+
+/*.video          { background-position: -110px -40px;}*/
+.youtube        { background-position: -130px -40px;}
+
+/*.attach         { background-position: -190px -40px;}*/
+/*.language       { background-position: -210px -40px;}*/
+
+
+.icon.on             { background-image: url("../diabook-green/icons/toogle_on.png"); background-repeat: no-repeat;}
+.icon.off            { background-image: url("../diabook-green/icons/toogle_off.png"); background-repeat: no-repeat;}
+.prev           { background-position: -90px  -60px;}
+.next           { background-position: -110px -60px;}
+/*.tagged     { background-position: -130px -60px;}*/
+
+.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 0px; }
+.type-audio { background-position: -40px 0px; }
+.type-text  { background-position: -60px 0px; }
+.type-unkn  { background-position: -80px 0px; }
+
+.icon.drop, .icon.drophide {
+ float: left;
+}
+
+.icon {
+  display: block;
+  width: 20px;
+  height: 20px;
+  /*background-image: url('icons.png');*/
+}
+
+.icon {
+  background-color: transparent ;
+  background-repeat: no-repeat;
+  /* background-position: left center; */
+  display: block;
+  overflow: hidden;
+  text-indent: -9999px;
+  padding: 1px;
+}
+
+.icon.border.camera{
+  background-image: url("../diabook-green/icons/camera.png"); 
+  display: block; width: 28px; height: 28px; background-repeat: no-repeat;
+	}
+	
+.icon.border.link{
+  background-image: url("../diabook-green/icons/weblink.png"); 
+  display: block; width: 28px; height: 28px; background-repeat: no-repeat;
+  margin-left: 10px;
+	}
+
+.icon.text {
+  text-indent: 0px;
+}
+.icon.s10 {
+  min-width: 10px;
+  height: 10px;
+}
+.icon.s10.notify {
+  background-image: url("../../../../images/icons/10/notify_off.png");
+}
+.icon.s10.gear {
+  background-image: url("../../../../images/icons/10/gear.png");
+}
+.icon.s10.add {
+  background-image: url("../../../../images/icons/10/add.png");
+}
+.icon.s10.delete {
+  background-image: url("../../../../images/icons/10/delete.png");
+}
+.icon.s10.edit {
+  background-image: url("../../../../images/icons/10/edit.png");
+}
+.icon.s10.star {
+  background-image: url("../../../../images/star_dummy.png");
+}
+.icon.s10.menu {
+  background-image: url("../../../../images/icons/10/menu.png");
+}
+.icon.s10.link {
+  background-image: url("../../../../images/icons/10/link.png");
+}
+.icon.s10.lock {
+  background-image: url("../../../../images/icons/10/lock.png");
+}
+.icon.s10.unlock {
+  background-image: url("../../../../images/icons/10/unlock.png");
+}
+.icon.s10.text {
+  padding: 2px 0px 0px 15px;
+  font-size: 10px;
+}
+.icon.s16 {
+  min-width: 16px;
+  height: 16px;
+}
+.icon.s16.notify {
+  background-image: url("../../../../images/icons/16/notify_off.png");
+}
+.icon.s16.gear {
+  background-image: url("../../../../images/icons/16/gear.png");
+}
+.icon.s16.add {
+  background-image: url("../../../../images/icons/16/add.png");
+}
+.icon.s16.delete {
+  background-image: url("../../../../images/icons/16/delete.png");
+}
+/*.icon.s16.edit {
+  background-image: url("../../../../images/icons/16/edit.png");
+}*/
+.icon.s16.star {
+  background-image: url("../../../../images/star_dummy.png");
+}
+.icon.s16.menu {
+  background-image: url("../../../../images/icons/16/menu.png");
+}
+/*.icon.s16.link {
+  background-image: url("../../../../images/icons/16/link.png");
+}*/
+.icon.s16.lock {
+  background-image: url("../../../../images/icons/16/lock.png");
+}
+.icon.s16.unlock {
+  background-image: url("../../../../images/icons/16/unlock.png");
+}
+.icon.s16.text {
+  padding: 4px 0px 0px 20px;
+  font-size: 10px;
+}
+.icon.s22 {
+  min-width: 22px;
+  height: 22px;
+}
+.icon.s22.notify {
+  background-image: url("../../../../images/icons/22/notify_off.png");
+}
+.icon.s22.gear {
+  background-image: url("../../../../images/icons/22/gear.png");
+}
+.icon.s22.add {
+  background-image: url("../../../../images/icons/22/add.png");
+}
+.icon.s22.delete {
+  background-image: url("../../../../images/icons/22/delete.png");
+}
+.icon.s22.edit {
+  background-image: url("../../../../images/icons/22/edit.png");
+}
+.icon.s22.star {
+  background-image: url("../../../../images/star_dummy.png");
+}
+.icon.s22.menu {
+  background-image: url("../../../../images/icons/22/menu.png");
+}
+.icon.s22.link {
+  background-image: url("../../../../images/icons/22/link.png");
+}
+.icon.s22.lock {
+  background-image: url("../../../../images/icons/22/lock.png");
+}
+.icon.s22.unlock {
+  background-image: url("../../../../images/icons/22/unlock.png");
+}
+.icon.s22.text {
+  padding: 10px 0px 0px 25px;
+  width: 200px;
+}
+.icon.s48 {
+  width: 48px;
+  height: 48px;
+}
+.icon.s48.notify {
+  background-image: url("../../../../images/icons/48/notify_off.png");
+}
+.icon.s48.gear {
+  background-image: url("../../../../images/icons/48/gear.png");
+}
+.icon.s48.add {
+  background-image: url("../../../../images/icons/48/add.png");
+}
+.icon.s48.delete {
+  background-image: url("../../../../images/icons/48/delete.png");
+}
+.icon.s48.edit {
+  background-image: url("../../../../images/icons/48/edit.png");
+}
+.icon.s48.star {
+  background-image: url("../../../../images/star_dummy.png");
+}
+.icon.s48.menu {
+  background-image: url("../../../../images/icons/48/menu.png");
+}
+.icon.s48.link {
+  background-image: url("../../../../images/icons/48/link.png");
+}
+.icon.s48.lock {
+  background-image: url("../../../../images/icons/48/lock.png");
+}
+.icon.s48.unlock {
+  background-image: url("../../../../images/icons/48/unlock.png");
+}
+
+#contact-edit-links ul {
+  list-style: none;
+  list-style-type: none;
+}
+
+.hide-comments-outer {
+  margin-left: 80px;
+  margin-bottom: 1px;
+  width: 484px;
+  border-bottom: 1px solid #BDCDD4;
+  background-color: #fff;
+  padding: 8px;
+}
+
+/* global */
+body {
+  font-family: 'Lato', "Helvetica Neue", Helvetica, Arial, sans-serif;
+  font-size: 12.5px;
+  background-color: #ffffff;
+  color: #2d2d2d;
+  margin: 50px auto auto;
+  display: table;
+}
+
+h4 {
+  font-size: 1.1em;
+}
+
+a {
+	color: #333333;
+	/* color: #3e3e8c; */
+	text-decoration: none;
+}
+a:hover {
+	/* color: blue; */
+	text-decoration: underline
+}
+
+.wall-item-name-link {
+/*  float: left;*/
+}
+
+.wall-item-photo {
+  width: 48px;
+  height: 48px;
+  overflow: hidden;
+  display: block;
+}
+
+.left {
+  float: left;
+}
+.right {
+  float: right;
+}
+.hidden {
+  display: none;
+}
+.clear {
+  clear: both;
+}
+.fakelink {
+  color: #194719;
+  /* color: #3e3e8c; */
+  text-decoration: none;
+  cursor: pointer;
+}
+.fakelink:hover {
+  /* color: blue; */
+  /*color: #005c94; */
+  text-decoration: underline;
+}
+code {
+  font-family: Courier, monospace;
+  white-space: pre;
+  display: block;
+  overflow: auto;
+  border: 1px solid #444;
+  background: #EEE;
+  color: #444;
+  padding: 10px;
+  margin-top: 20px;
+}
+#panel {
+  position: absolute;
+  width: 12em;
+  background: #ffffff;
+  color: #2d2d2d;
+  margin: 0px;
+  padding: 1em;
+  list-style: none;
+  border: 3px solid #364e59;
+  z-index: 100000;
+  -webkit-box-shadow: 0px 5px 10px rgba(0, 0, 0, 0.7);
+  -moz-box-shadow: 0px 5px 10px rgba(0, 0, 0, 0.7);
+  box-shadow: 0px 5px 10px rgba(0, 0, 0, 0.7);
+}
+/* tool */
+.tool {
+  height: auto;
+  overflow: auto;
+  padding: 3px;
+}
+#saved-search-ul .tool:hover,
+#nets-sidebar .tool:hover,
+#sidebar-group-list .tool:hover ,
+#fileas-sidebar .tool:hover {
+	background: aliceBlue;
+}
+.tool .label {
+  float: left;
+}
+.tool .action {
+  float: right;
+}
+.tool a {
+  color: #194719;
+}
+.tool a:hover {
+  text-decoration: none;
+}
+/* popup notifications */
+div.jGrowl div.notice {
+  background: #511919 url("../../../../images/icons/48/notice.png") no-repeat 5px center;
+  color: #ffffff;
+  padding-left: 58px;
+}
+div.jGrowl div.info {
+  background: #364e59 url("../../../../images/icons/48/info.png") no-repeat 5px center;
+  color: #ffffff;
+  padding-left: 58px;
+}
+/* header */
+header {
+  position: fixed;
+  left: 0%;
+  right: 80%;
+  top: 0px;
+  margin: 0px;
+  padding: 0px;
+  width: 22%;
+  height: 32px;
+  background: #5CD65C;
+  background-color: #5CD65C;
+  z-index: 100;
+  -webkit-box-shadow: -10px 0px 10px rgba(0, 0, 0, 0.7);
+  -moz-box-shadow: -10px 0px 10px rgba(0, 0, 0, 0.7);
+  box-shadow: -10px 0px 10px rgba(0, 0, 0, 0.7);
+
+}
+header #site-location {
+  display: none;
+}
+header #banner {
+  overflow: hidden;
+  text-align: left;
+  width: 82%%;
+  margin-left: 25%;
+}
+header #banner a,
+header #banner a:active,
+header #banner a:visited,
+header #banner a:link,
+header #banner a:hover {
+  color: black;
+  text-decoration: none;
+  outline: none;
+  vertical-align: middle;
+  font-weight: bolder;
+  margin-left: 3px;
+}
+header #banner #logo-img {
+  height: 25px;
+  margin-top: 3px;
+}
+header #banner #logo-text {
+  font-size: 20px;
+  position: absolute;
+  top: 10%;
+}
+/* nav */
+nav {
+  width: 80%;
+  height: 32px;
+  position: fixed;
+  left: 22%;
+  top: 0px;
+  padding: 0px;
+  background: #5CD65C;
+  color: #000;
+  z-index: 99;
+  -webkit-box-shadow: -10px 0px 10px rgba(0, 0, 0, 0.7);
+  -moz-box-shadow: -10px 0px 10px rgba(0, 0, 0, 0.7);
+  box-shadow: -10px 0px 10px rgba(0, 0, 0, 0.7);
+  
+}
+nav a,
+nav a:active,
+nav a:visited,
+nav a:link,
+nav a:hover {
+  /*color: #1f1f1f;*/
+  text-decoration: none;
+  outline: none;
+}
+nav #banner {
+  overflow: hidden;
+  /*text-align: center;*/
+  width: 100%;
+}
+nav #banner a,
+nav #banner a:active,
+nav #banner a:visited,
+nav #banner a:link,
+nav #banner a:hover {
+  color: #ffffff;
+  text-decoration: none;
+  outline: none;
+  vertical-align: bottom;
+}
+nav #banner #logo-img {
+  height: 22px;
+  margin-top: 5px;
+}
+nav #banner #logo-text {
+  font-size: 22px;
+}
+nav #navbar{
+	}
+nav ul {
+  margin: 0px;
+  padding: 0px 20px;
+}
+nav ul li {
+  list-style: none;
+  margin: 0px;
+  /* padding: 1px 1px 3px 1px; */
+  float: left;
+}
+nav ul li .menu-popup {
+  left: 0px;
+  right: auto;
+}
+
+nav #logo-img {
+  height: 25px;
+  margin-top: 4px;
+  margin-left: 30px;
+}
+
+nav #logo-text {
+    font-size: 22px;
+    margin-top: 3px;
+    margin-right: 15px;
+}
+nav .nav-menu-search {
+  position: relative;
+
+  margin: 4px 17px;
+  margin-right: 0px;
+  height: 17px;
+  width: 180px;
+  
+}
+
+nav #search-box #search-text {
+  background-image:  url('icons/lupe.png');
+  background-repeat:no-repeat;
+  padding-left:20px;
+  border-top-left-radius: 15px;
+border-top-right-radius: 15px;
+border-bottom-right-radius: 15px;
+border-bottom-left-radius: 15px;
+	}
+
+
+nav .nav-menu-icon {
+  position: relative;
+  height: 22px;
+  padding: 5px;
+  margin: 0px 5px;
+  -moz-border-radius: 5px 5px 0 0;
+  -webkit-border-radius: 5px 5px 0 0;
+  border-radius: 5px 5px 0 0;
+}
+nav .nav-menu-icon:hover {
+  position: relative;
+  height: 22px;
+  padding: 5px;
+  margin: 0px 5px;
+  -moz-border-radius: 5px 5px 0 0;
+  -webkit-border-radius: 5px 5px 0 0;
+  border-radius: 5px 5px 0 0;
+}
+
+/*color*/
+nav .nav-menu-icon.selected {
+  background-color: #fff;
+}
+nav .nav-menu-icon img {
+  width: 22px;
+  height: 22px;
+}
+nav .nav-menu-icon .nav-notify {
+  top: 3px;
+}
+nav .nav-menu {
+  position: relative;
+  height: 16px;
+  padding: 5px;
+  margin: 3px 15px 0px;
+  font-size: 13px;
+  /*border: 3px solid #364A84;*/
+}
+nav .nav-menu.selected {
+  /*border-bottom: 3px solid #9eabb0;*/
+}
+nav .nav-notify {
+  display: none;
+  position: absolute;
+  background-color: #fff;
+  /* background-color: #19aeff; */
+  -moz-border-radius: 5px 5px 5px 5px;
+  -webkit-border-radius: 5px 5px 5px 5px;
+  border-radius: 5px 5px 5px 5px;
+  font-size: 10px;
+  font-weight: 900;
+  padding: 1px 4px;
+  top: 0px;
+  right: -6px;
+  min-width: 10px;
+  text-align: center;
+  border: 1px solid black;
+}
+nav .nav-notify.show {
+  display: block;
+}
+nav #nav-help-link,
+nav #nav-search-link,
+nav #nav-directory-link,
+nav #nav-apps-link,
+nav #nav-site-linkmenu, 
+nav #nav-home-link,
+nav #nav-user-linkmenu
+{
+  float: right;
+}
+nav #nav-user-linkmenu{
+	margin-right: 0px;
+	}
+nav #nav-home-link, #nav-directory-link, #nav-apps-link{
+	margin-left: 0px;
+	margin-right: 0px;
+	font-weight: bold;
+	margin: 3px 5px;
+	font-size: 14px;
+	}
+nav #nav-directory-link{
+  margin-right: 0px;	
+	}
+nav #nav-home-link{
+  margin-left: 0px;	
+	}
+nav #nav-help-link .menu-popup,
+nav #nav-search-link .menu-popup,
+nav #nav-directory-link .menu-popup,
+nav #nav-apps-link .menu-popup,
+nav #nav-site-linkmenu .menu-popup {
+  right: 0px;
+  left: auto;
+}
+
+nav #nav-messages-linkmenu.on .icon.messages, nav #nav-messages-linkmenu.selected .icon.messages{
+	background-image: url("../diabook-green/icons/messages.png");
+	}
+	
+/*nav #nav-notifications-linkmenu.on .icon.notify,*/ nav #nav-notifications-linkmenu.selected .icon.notify{
+	background-image: url("../diabook-green/icons/notify.png");
+	}
+	
+nav #nav-contacts-linkmenu.on .icon.contacts, nav #nav-contacts-linkmenu.selected .icon.contacts{
+	background-image: url("../diabook-green/icons/contacts.png");
+	}
+	
+nav #nav-apps-link.selected {
+  background-color: #fff;
+  moz-border-radius: 5px 5px 0 0;
+-webkit-border-radius: 5px 5px 0 0;
+border-radius: 5px 5px 0 0;
+}
+
+#nav-notifications-mark-all {
+	/* padding: 1px 1px 2px 26px; */
+	/* border-bottom: 1px solid #364E59; */
+	/* margin: 0px 0px 2px 0px;
+	padding: 5px 10px; */
+}
+
+#nav-notifications-see-all {
+	/* padding: 1px 1px 2px 26px; */
+	/* border-bottom: 1px solid #364E59; */
+	/* margin: 0px 0px 2px 0px;
+	padding: 5px 10px; */
+}
+
+.notify-seen {
+	background: none repeat scroll 0 0 #DDDDDD;
+	}
+
+ul.menu-popup {
+  position: absolute;
+  display: none;
+  width: 11em;
+  background: #F5FCF5;
+  color: #2d2d2d;
+  margin: 0px;
+  padding: 0px;
+  list-style: none;
+  z-index: 100000;
+  -webkit-box-shadow: 0px 5px 10px rgba(0, 0, 0, 0.7);
+  -moz-box-shadow: 0px 5px 10px rgba(0, 0, 0, 0.7);
+  box-shadow: 0px 5px 10px rgba(0, 0, 0, 0.7);
+}
+ul.menu-popup a {
+  display: block;
+  color: #2d2d2d;
+  padding: 5px 10px;
+  text-decoration: none;
+}
+ul.menu-popup a:hover {
+  background-color: #B8EDB8; /*bdcdd4;*/
+  color: #000;
+}
+ul.menu-popup .menu-sep {
+  border-top: 1px solid #9eabb0;
+}
+ul.menu-popup li {
+  float: none;
+  overflow: auto;
+  height: auto;
+  display: block;
+}
+ul.menu-popup li img {
+  float: left;
+  width: 16px;
+  height: 16px;
+  padding-right: 5px;
+}
+ul.menu-popup .empty {
+  padding: 5px;
+  text-align: center;
+  color: #9eabb0;
+}
+/* autocomplete popup */
+.acpopup {
+  max-height: 150px;
+  background-color: #ffffff;
+  color: #2d2d2d;
+  border: 1px solid #MenuBorder;
+  overflow: auto;
+  z-index: 100000;
+  -webkit-box-shadow: 0px 5px 10px rgba(0, 0, 0, 0.7);
+  -moz-box-shadow: 0px 5px 10px rgba(0, 0, 0, 0.7);
+  box-shadow: 0px 5px 10px rgba(0, 0, 0, 0.7);
+}
+.acpopupitem {
+  color: #2d2d2d;
+  padding: 4px;
+  clear: left;
+}
+.acpopupitem img {
+  float: left;
+  margin-right: 4px;
+}
+.acpopupitem.selected {
+  background-color: #bdcdd4;
+}
+#nav-notifications-menu {
+  width: 400px;
+  max-height: 550px;
+  overflow: auto;
+}
+/* #nav-notifications-menu a {
+	display: inline;
+	padding: 5px 0px;
+	margin: 0px 0px 2px 0px;
+}
+#nav-notifications-menu li:hover {
+  background-color: #bdcdd4;
+}*/
+
+#nav-notifications-menu img {
+  float: left;
+  margin-right: 5px;
+}
+#nav-notifications-menu .contactname {
+  font-weight: bold;
+}
+#nav-notifications-menu .notif-when {
+  font-size: 10px;
+  color: #9eabb0;
+  display: block;
+}
+
+.notif-image {
+        width: 32px;
+        height: 32px;
+        padding: 7px 7px 0px 0px;
+}
+
+/*profile_side*/
+#profile_side {
+  margin-bottom: 30px;
+ 
+}
+#profile_side a{
+  color: #333;
+}
+#ps-usericon{
+	height: 25px	
+	}
+#ps-username{
+  font-size: 1.17em;
+  font-weight: bold;
+  vertical-align: top;
+  position: absolute;
+  padding-top: 4px;
+  padding-left: 5px;	
+  word-wrap: break-word;
+  width: 130px;
+	}
+#ps-username:hover{
+  text-decoration: none;	
+	}
+.menu-profile-side{
+  list-style: none;	
+  padding-left: 0px;
+  min-height: 0px;
+	}
+.menu-profile-list{
+  height: auto;
+  overflow: auto;  
+  min-height: 16px;
+  list-style: none;
+	}
+.menu-profile-list:hover{
+	background: #B8EDB8; 
+	}
+.menu-profile-list-item{
+	padding-left: 5px;
+	vertical-align: middle;
+	}	
+.menu-profile-list-item:hover{	
+	text-decoration: none;
+   }
+/*http://prothemedesign.com/circular-icons/*/
+.menu-profile-icon.home{
+	background: url("../diabook-green/icons/home.png") no-repeat;
+	float: left;
+	height: 22px;
+	width: 22px;
+	}
+.menu-profile-icon.photos{
+	background: url("../diabook-green/icons/mess_side.png") no-repeat;
+	float: left;
+	height: 22px;
+   width: 22px;}
+.menu-profile-icon.events{
+	background: url("../diabook-green/icons/events.png") no-repeat;
+	float: left;
+	height: 22px;
+   width: 22px;}
+.menu-profile-icon.notes{
+	background: url("../diabook-green/icons/notes.png") no-repeat;
+	float: left;
+	height: 22px;
+   width: 22px;}
+.menu-profile-icon.foren{
+	background: url("../diabook-green/icons/pubgroups.png") no-repeat;
+	float: left;
+	height: 22px;
+   width: 22px;}
+.menu-profile-icon.com_side{
+	background: url("../diabook-green/icons/com_side.png") no-repeat;
+	float: left;
+	height: 22px;
+   width: 22px;}
+.menu-profile-icon.pscontacts{
+	background: url("../diabook-green/icons/pscontacts.png") no-repeat;
+	float: left;
+	height: 22px;
+   width: 22px;}
+
+/* aside */
+aside {
+  display: table-cell;
+  vertical-align: top;
+  width: 160px;
+  padding: 0px 10px 0px 10px;
+  border-right: 1px solid #D2D2D2;
+  float: left;
+  /* background: #F1F1F1; */
+}
+aside #page-sidebar{display: none;}
+aside .vcard .fn {
+  font-size: 18px;
+  font-weight: bold;
+  margin-bottom: 5px;
+}
+aside .vcard .title {
+  margin-bottom: 5px;
+}
+aside .vcard dl {
+  height: auto;
+  overflow: auto;
+}
+aside .vcard dt {
+  float: left;
+  margin-left: 0px;
+  /*width: 35%;*/
+  text-align: right;
+  color: #999999;
+}
+aside .vcard dd {
+  float: left;
+  margin-left: 5px;
+  /*width: 60%;*/
+}
+aside #profile-extra-links ul {
+  padding: 0px;
+  margin: 0px;
+}
+aside #profile-extra-links li {
+  padding: 0px;
+  margin: 0px;
+  list-style: none;
+}
+aside #dfrn-request-link {
+  display: block;
+  -moz-border-radius: 5px 5px 5px 5px;
+  -webkit-border-radius: 5px 5px 5px 5px;
+  border-radius: 5px 5px 5px 5px;
+  color: #ffffff;
+  background: #005c94 url('../../../../images/connect-bg.png') no-repeat left center;
+  font-weight: bold;
+  text-transform: uppercase;
+  padding: 4px 2px 2px 35px;
+}
+aside #dfrn-request-link:hover {
+  text-decoration: none;
+  background-color: #36c;
+  /* background-color: #19aeff; */
+}
+aside #profiles-menu {
+  width: 20em;
+}
+aside #search-text {
+	width: 150px;
+	height: 17px;
+	padding-left: 10px;
+	border-top-left-radius: 15px;
+border-top-right-radius: 15px;
+border-bottom-right-radius: 15px;
+border-bottom-left-radius: 15px;
+-moz-border-bottom-colors: #dbdbdb;
+  -moz-border-top-colors: #999;
+  -moz-border-left-colors: #999;
+  -moz-border-right-colors: #dbdbdb;
+}
+aside #side-follow-url {
+	width: 150px;
+	}
+aside #side-peoplefind-url {
+	width: 150px;
+	}
+#contact-block {
+  overflow: auto;
+  height: auto;
+}
+#contact-block .contact-block-h4 {
+  float: left;
+  margin: 5px 0px;
+}
+#contact-block .allcontact-link {
+  float: right;
+  margin: 5px 0px;
+}
+#contact-block .contact-block-content {
+  clear: both;
+  overflow: auto;
+  height: auto;
+}
+#contact-block .contact-block-link {
+  float: left;
+  margin: 0px 2px 2px 0px;
+}
+#contact-block .contact-block-link img {
+  widht: 55px;
+  height: 55px;
+}
+#lost-password-link {
+  float: left;
+  margin-right: 20px;	
+	}
+/* widget */
+.widget {
+  margin-bottom: 2em;
+  /*.action .s10 { width: 10px; overflow: hidden; padding: 0px;}
+	.action .s16 { width: 16px; overflow: hidden; padding: 0px;}*/
+/*  font-size: 12px; */
+}
+.widget h3 {
+  padding: 0px;
+  margin: 2px;
+}
+.widget .action {
+  opacity: 0.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;
+}
+.widget input.action {
+  opacity: 0.5;
+  -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;
+}
+.widget:hover .title .action {
+  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;
+}
+.widget .tool:hover .action {
+  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;
+}
+.widget .tool:hover .action.ticked {
+  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;
+}
+.widget ul {
+  padding: 0px;
+}
+.widget ul li {
+  padding-left: 16px;
+  min-height: 16px;
+  list-style: none;
+}
+#side-bar-photos-albums li{
+list-style-type: disc;
+}
+#side-bar-photos-albums ul li{
+  margin-left: 30px;
+  padding-left: 0px;
+	}
+#side-bar-photos-albums ul li a{
+  color: #3465A4;
+}
+.widget .tool.selected {
+  background: url("../diabook-green/icons/selected.png") no-repeat left center;
+}
+/* widget: search */
+span.sbox_l  {
+	background: white url('../diabook/icons/srch_l.gif') no-repeat top left;
+	float: left;
+	width: 19px; height: 19px;
+	margin-left: 10px;
+	margin-top: 5px;
+	
+}
+
+span.sbox_r  {
+	background: white url('../diabook/icons/srch_r.gif') no-repeat top left;
+	float: left;
+	width: 19px; height: 19px;
+	margin-top: 5px;
+}
+
+span.sbox input {
+	background: white url('../diabook/icons/srch_bg.gif') repeat-x top left;
+	float: left;
+	margin-top: 5px;
+	border: 0;
+	height: 13px; width: 100px;
+	padding: 3px;
+	font: 11px/13px arial;
+	color: #000;
+}
+#add-search-popup {
+  width: 200px;
+  top: 18px;
+}
+/* section */
+section {
+  display: table-cell;
+  vertical-align: top;
+  width: auto;
+  padding: 0px 0px 0px 12px;
+}
+
+body .pageheader{
+  text-align: center;
+  font-size: 20px;
+  margin-bottom: 20px;
+  margin-top: 0px;
+  max-width: 575px;
+	}
+.qcomment{
+  max-width: 122px;	
+	}
+#id_username {
+  width: 173px;	
+	}
+#id_password {
+  width: 173px;		
+	}
+#id_openid_url {
+  width: 173px;	
+	}
+#contact-edit-end {
+	}
+.pager {
+   padding: 10px;
+	text-align: center;
+	font-size: 1.0em;
+	clear: both;
+	display: block;
+}	
+
+.tabs {
+    
+    background-position: 0 -20px;
+    background-repeat: repeat-x;
+    height: 27px;
+    padding: 0;
+ }
+.tab.button {
+    margin-left: 5px;	
+    /*background: none repeat scroll 0 0 #F8F8F8;*/
+    border: 1px solid #CCCCCC;
+    border-radius: 3px 3px 3px 3px;
+    font-weight: normal;
+    padding: 3px;
+    color:  #333333;
+	}
+	
+#birthday-notice, #event-notice, #birthday-wrapper, #event-wrapper{
+	margin-bottom: 10px;
+	}
+#birthday-wrapper a {
+	color: #3465A4;
+	}
+
+right_aside {
+  display: table-cell;
+  vertical-align: top;
+  width: 170px;
+  
+  /*border-left: 1px solid #D2D2D2;*/
+  
+  /* background: #F1F1F1; */
+}
+right_aside a{color: #3465A4;}
+right_aside h3 {border-bottom: 1px solid #D2D2D2; padding-top: 5px; padding-bottom: 0px; padding-left: 9px; margin-bottom: 0px; 
+margin-top:30px;}
+right_aside .directory-item {	width: 50px; height: 50px; vertical-align: center; text-align: center; }
+right_aside .directory-photo { margin: 0px; }
+right_aside .directory-photo-img { max-width: 45px; max-height: 45px; }
+right_aside #likes { margin: 0px; padding: 0px; list-style: none; }
+right_aside .items-wrapper{ overflow: auto;	width: 100%; }
+right_aside #lastusers-wrapper { padding-left: 6px; padding-top: 3px; overflow: auto;	width: 100%; }
+right_aside #ra-photos-wrapper { padding-left: 5px; padding-top: 3px; overflow: auto;	width: 100%; }
+#page-sidebar-right_aside{margin-top: 0px; margin-bottom: 30px;}
+#page-sidebar-right_aside ul {margin-top: 0px;}
+#page-sidebar-right_aside .label {max-width: 128px;}
+right_aside .icon {width: 10px; height: 10px;}
+.close_box		{ 
+		background-image: url("../diabook-green/icons/close_box.png");
+		float: right;
+		cursor: pointer;
+		opacity: 0.1;
+		}
+.close_box:hover	{ 
+		background-image: url("../diabook-green/icons/close_box.png");
+		float: right;
+		cursor: pointer;
+		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;
+		}
+
+
+/* wall item */
+.tread-wrapper {
+  border-bottom: 1px solid #D2D2D2;
+  position: relative;
+  padding: 5px;
+  margin-bottom: 0px;
+  width: 575px;
+  padding-top: 10px;
+}
+.tread-wrapper a{
+  color: #194719;
+}
+
+.wall-item-decor {
+  position: absolute;
+  left: 790px;
+  top: -10px;
+  width: 16px;
+}
+
+.wall-item-container {
+  display: table;
+  width: 580px;
+}
+
+
+.wall-item-container .wall-item-item, .wall-item-container .wall-item-bottom {
+  display: table-row;
+}
+
+.wall-item-bottom {
+  font-size: 13px;
+}
+.wall-item-container .wall-item-bottom {
+/*  opacity: 0.5;
+  -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; */
+}
+.wall-item-container:hover .wall-item-bottom {
+/*  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; */
+}
+.wall-item-container .wall-item-info {
+  display: table-cell;
+  vertical-align: top;
+  text-align: left;
+  width: 80px;
+}
+.wall-item-container .wall-item-location {
+  padding-right: 40px;
+  display: table-cell;
+}
+.wall-item-container .wall-item-ago {
+  word-wrap: break-word;
+  width: 50px;
+  margin-left: 10px;
+  color: #999;
+}
+.wall-item-location {
+  
+  clear: both;
+  overflow: hidden;
+  
+  margin-bottom: 5px;
+}
+
+.wall-item-container .wall-item-content {
+
+  max-width: 420px;
+  word-wrap: break-word;
+
+
+}
+
+.wall-item-container .wall-item-content img {
+  max-width: 400px; 
+
+}
+.wall-item-container .wall-item-links, .wall-item-container .wall-item-actions {
+  display: table-cell;
+  vertical-align: middle;
+}
+.wall-item-container .wall-item-links .icon, .wall-item-container .wall-item-actions .icon {
+  opacity: 0.5;
+  -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;
+}
+.wall-item-container .wall-item-links .icon:hover, .wall-item-container .wall-item-actions .icon: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;
+}
+.wall-item-container .wall-item-name {
+  font-weight: bold;
+}
+.wall-item-container .wall-item-actions-author {
+  width: 100%;
+  margin-bottom: 0.3em;
+}
+.wall-item-container .wall-item-actions-social {
+  float: left;
+  margin-bottom: 1px;
+  display: table-cell;
+}
+.wall-item-container .wall-item-actions-social a {
+  margin-right: 1em;
+}
+.wall-item-actions-social a {
+  float: left;
+}
+.wall-item-container .wall-item-actions-tools {
+  float: right;
+  width: 80px;
+  display: table-cell;
+}
+.wall-item-container .wall-item-actions-tools a {
+  float: right;
+}
+.wall-item-container .wall-item-actions-tools input {
+  float: right;
+}
+.wall-item-container.comment {
+  margin-top: 5px;
+  margin-bottom: 5px;
+  margin-left: 80px;
+  width: 500px;
+  border-bottom: 1px solid hsl(198, 21%, 79%);
+}
+.wall-item-container.comment .contact-photo {
+  width: 32px;
+  height: 32px;
+  margin-left: 16px;
+  /*background: url(../../../../images/icons/22/user.png) no-repeat center center;*/
+
+}
+.wall-item-container.comment {
+  top: 15px !important;
+  left: 15px !important;
+}
+.wall-item-container.comment .wall-item-links {
+  padding-left: 12px;
+}
+
+.wall-item-comment-wrapper {
+  margin: 1px 5px 5px 80px;
+  background-color: #fff;
+  width: 500px;
+}
+.wall-item-comment-wrapper .comment-edit-photo {
+  display: none;
+}
+.wall-item-comment-wrapper textarea {
+  height: 2.0em;
+  width: 100%;
+  font-size: 10px;
+  color: #999999;
+  border: 1px solid #DDD;
+  padding: 0.3em;
+  font-size: 14px;
+}
+.wall-item-comment-wrapper .comment-edit-text-full {
+  font-size: 14px;
+  height: 4em;
+  color: #2d2d2d;
+  border: 1px solid #2d2d2d;
+}
+.comment-edit-preview {
+  width: 500px;
+  margin-top: 10px;
+  background-color:  #fff797;
+}
+.comment-edit-preview .contact-photo {
+  width: 32px;
+  height: 32px;
+  margin-left: 16px;
+  /*background: url(../../../../images/icons/22/user.png) no-repeat center center;*/
+
+}
+.comment-edit-preview {
+  top: 15px !important;
+  left: 15px !important;
+}
+.comment-edit-preview .wall-item-links {
+  padding-left: 12px;
+}
+.comment-edit-preview .wall-item-container {
+  width: 700px;
+}
+.comment-edit-preview .tread-wrapper {
+  width: 700px;
+  padding: 0;
+  margin: 10px 0;
+}
+
+.shiny {
+  /* border-right: 10px solid #fce94f; */
+	border-right: 1px solid #A7C7F7;
+	padding-right: 12px;
+}
+
+#jot-preview-content{
+	margin-top: 30px;}
+	
+#jot-preview-content .tread-wrapper {
+  background-color: #fff797;
+}
+
+.wall-item-tags {
+  padding-top: 1px;
+  padding-bottom: 2px;
+}
+.tag {
+  /*background: url("../../../../images/tag_b.png") repeat-x center left;*/
+  color: #999;
+  padding-left: 3px;
+  font-size: 12px;
+}
+.tag a {
+  padding-right: 5px;
+  /*background: url("../../../../images/tag.png") no-repeat center right;*/
+  color: #999;
+}
+.wwto {
+  position: absolute !important;
+  width: 25px;
+  height: 25px;
+  background: #FFFFFF;
+  border: 2px solid #364e59;
+  height: 25px;
+  width: 25px;
+  overflow: hidden;
+  padding: 1px;
+  position: absolute !important;
+  top: 40px;
+  left: 30px;
+  -webkit-box-shadow: 0px 0px 10px rgba(0, 0, 0, 0.7);
+  -moz-box-shadow: 0px 0px 10px rgba(0, 0, 0, 0.7);
+  box-shadow: 0px 0px 10px rgba(0, 0, 0, 0.7);
+}
+.wwto .contact-photo {
+  width: auto;
+  height: 25px;
+}
+/* contacts menu */
+.contact-photo-wrapper {
+  position: relative;
+  width: 80px;
+}
+
+.contact-photo-wrapper.wwto {
+  width: 25px;
+}
+
+.contact-photo {
+  width: 48px;
+  height: 48px;
+  overflow: hidden;
+  display: block;
+}
+.contact-photo img {
+  width: 48px;
+  height: 48px;
+}
+
+.contact-wrapper {
+  float: left;
+  width: 90px;
+  height: 90px;
+  margin-bottom: 15px;
+}
+.contact-wrapper .contact-photo {
+  width: 80px;
+  height: 80px;
+}
+.contact-wrapper .contact-photo img {
+  width: 80px;
+  height: 80px;
+}
+.contact-wrapper {
+  left: 0px;
+  top: 63px;
+}
+.contact-photo {
+  width: 48px;
+  height: 48px;
+}
+.contact-photo img {
+  width: 48px;
+  height: 48px;
+}
+.contact-name {
+  /* text-align: center; */
+  /*font-weight: bold;*/
+  font-size: 12px;
+}
+.contact-details {
+  color: #999999;
+}
+/* editor */
+.jothidden {
+  display: none;
+}
+#jot {
+  width: 585px;
+  margin: 0px 2em 20px 0px;
+}
+#profile-jot-form #profile-jot-text {
+  height: 2.0em;
+  width: 99%;
+  font-size: 15px;
+  color: #999999;
+  border: 1px solid #DDD;
+  padding: 0.3em;
+  margin-bottom: 10px;
+}
+.grey
+{
+  display: inline;
+  float: right;	
+	}
+#jot #jot-tools {
+  margin: 0px;
+  padding: 0px;
+  height: 40px;
+  overflow: none;
+  width: 583px;
+  background-color: #fff;
+  border-bottom: 2px solid #9eabb0;
+}
+
+#jot #jot-tools li {
+  list-style: none;
+  float: left;
+  width: 80px;
+  height: 40px;
+  border-bottom: 2px solid #9eabb0;
+}
+#jot #jot-tools li a {
+  display: block;
+  color: #cccccc;
+  width: 100%;
+  height: 40px;
+  text-align: center;
+  line-height: 40px;
+  overflow: hidden;
+}
+#jot #jot-tools li:hover {
+  background-color: #364e59;
+  border-bottom: 2px solid #bdcdd4;
+}
+#jot #jot-tools li.perms {
+  float: right;
+  width: 40px;
+}
+#jot #jot-tools li.perms a.unlock {
+  width: 30px;
+  border-left: 10px solid #cccccc;
+  background-color: #cccccc;
+  background-position: left center;
+}
+#jot #jot-tools li.perms a.lock {
+  width: 30px;
+  border-left: 10px solid #666666;
+  background-color: #666666;
+}
+#jot #jot-tools li.submit {
+  float: right;
+  background-color: #cccccc;
+  border-bottom: 2px solid #cccccc;
+  border-right: 1px solid #666666;
+  border-left: 1px solid #666666;
+}
+#jot #jot-tools li.submit input {
+  border: 0px;
+  margin: 0px;
+  padding: 0px;
+  background-color: #cccccc;
+  color: #666666;
+  width: 80px;
+  height: 40px;
+  line-height: 40px;
+}
+#jot #jot-tools li.submit input:hover {
+  background-color: #bdcdd4;
+  color: #666666;
+}
+#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;
+}
+#profile-jot-form #jot-title {
+    
+  	 border-radius: 5px 5px 5px 5px;
+    font-weight: bold;
+    height: 20px;
+    margin: 0 0 5px;
+    width: 60%;
+    border: 1px solid #d2d2d2;
+}
+#profile-jot-form #jot-title:-webkit-input-placeholder {
+  font-weight: normal;
+}
+#profile-jot-form #jot-title:-moz-placeholder {
+  font-weight: normal;
+}
+#profile-jot-form #profile-jot-text_parent #profile-jot-text_tbl{
+	width: 585px;
+	height: 100px;
+	}
+#jot #jot-title:hover {
+  border: 1px solid #999999;
+}
+#jot #jot-title:focus {
+  border: 1px solid #999999;
+}
+#jot #character-counter {
+  width: 80px;
+  float: right;
+  text-align: right;
+  height: 20px;
+  line-height: 20px;
+  padding-right: 20px;
+}
+#jot-perms-icon, 
+#profile-location,
+#profile-nolocation,
+#profile-youtube, 
+#profile-video, 
+#profile-audio,
+#profile-link,
+#profile-title, 
+#wall-image-upload,
+#wall-file-upload,
+#wall-image-upload-div,
+#wall-file-upload-div,
+.hover, .focus {
+	cursor: pointer;
+	margin-top: 2px;
+}
+#profile-jot-wrapper{
+	margin: 0 2em 20px 0;
+   width: 585px;
+	}
+
+#profile-jot-submit-wrapper {
+	margin-bottom: 50px;
+	width: 585px;
+}
+
+#profile-jot-submit {
+	float: right;
+	margin-top: 2px;
+	font-size: 14px;
+	
+}
+#profile-upload-wrapper {
+	float: left;
+	margin-top: 2px;
+	margin-left: 10px;
+	
+}
+#profile-attach-wrapper {
+	float: left;
+	margin-left: 15px;
+	margin-top: 2px;
+}
+#profile-rotator {
+	float: left;
+	margin-left: 30px;
+	margin-top: 2px;
+}
+#profile-link-wrapper {
+	float: left;
+	margin-left: 15px;
+	margin-top: 2px;
+}
+#profile-youtube-wrapper {
+	float: left;
+	margin-left: 15px;
+	margin-top: 2px;
+}
+#profile-video-wrapper {
+	float: left;
+	margin-left: 15px;
+	margin-top: 2px;
+}
+#profile-audio-wrapper {
+	float: left;
+	margin-left: 15px;
+	margin-top: 2px;
+}
+#profile-location-wrapper {
+	float: left;
+	margin-left: 15px;
+	margin-top: 2px;
+}
+#profile-jot-perms {
+	float: left;
+	margin-left: 45px;
+	margin-top: 2px;
+}
+#jot-preview-link {
+	float: right;
+	margin-left: 10px;
+	margin-top: 2px;
+	font-size: 9px;
+	font-weight: bolder;
+	cursor: pointer;
+}
+#profile-jot-perms{
+   float: right;
+	margin-left: 10px;
+	margin-top: 2px;	
+	}
+/** buttons **/
+.button.creation1 {
+    background-color: #fff;
+    border: 1px solid #777777;
+    border-radius: 3px 3px 3px 3px;
+    box-shadow: 0 1px 1px #CFCFCF;
+    cursor: pointer;
+    font-weight: bolder;
+}
+.button.creation2 {
+    background-color: #194719;
+    border: 1px solid #777777;
+    color: white;
+    border-radius: 3px 3px 3px 3px;
+    box-shadow: 0 1px 1px #CFCFCF;
+    margin-left: 5px;
+    cursor: pointer;
+    font-weight: bolder;
+}
+/*input[type="submit"] {
+	border: 0px;
+    background-color: @ButtonBackgroundColor;
+    color: @ButtonColor;
+    padding: 0px 10px;
+	.rounded(5px);
+    height: 18px;
+}*/
+/** acl **/
+#photo-edit-perms-select, #photos-upload-permissions-wrapper, #profile-jot-acl-wrapper {
+  display: block!important;
+}
+#acl-wrapper {
+  width: 690px;
+  float: left;
+}
+#acl-search {
+  float: right;
+  background: #ffffff url("../../../../images/search_18.png") no-repeat right center;
+  padding-right: 20px;
+}
+#acl-showall {
+  float: left;
+  display: block;
+  width: auto;
+  height: 18px;
+  background-color: #cccccc;
+  background-image: url("../../../../images/show_all_off.png");
+  background-position: 7px 7px;
+  background-repeat: no-repeat;
+  padding: 7px 5px 0px 30px;
+  color: #999999;
+  -moz-border-radius: 5px 5px 5px 5px;
+  -webkit-border-radius: 5px 5px 5px 5px;
+  border-radius: 5px 5px 5px 5px;
+}
+#acl-showall.selected {
+  color: #000000;
+  background-color: #ff9900;
+  background-image: url("../../../../images/show_all_on.png");
+}
+#acl-list {
+  height: 210px;
+  border: 1px solid #cccccc;
+  clear: both;
+  margin-top: 30px;
+  overflow: auto;
+}
+.acl-list-item {
+  display: block;
+  width: 150px;
+  height: 30px;
+  border: 1px solid #cccccc;
+  margin: 5px;
+  float: left;
+}
+.acl-list-item img {
+  width: 22px;
+  height: 22px;
+  float: left;
+  margin: 4px;
+}
+.acl-list-item p {
+  height: 12px;
+  font-size: 10px;
+  margin: 0px;
+  padding: 2px 0px 1px;
+  overflow: hidden;
+}
+.acl-list-item a {
+  font-size: 8px;
+  display: block;
+  width: 40px;
+  height: 10px;
+  float: left;
+  color: #999999;
+  background-color: #cccccc;
+  background-position: 3px 3px;
+  background-repeat: no-repeat;
+  margin-right: 5px;
+  -webkit-border-radius: 2px ;
+  -moz-border-radius: 2px;
+  border-radius: 2px;
+  padding-left: 15px;
+}
+#acl-wrapper a:hover {
+  text-decoration: none;
+  color: #000000;
+}
+.acl-button-show {
+  background-image: url("../../../../images/show_off.png");
+}
+.acl-button-hide {
+  background-image: url("../../../../images/hide_off.png");
+}
+.acl-button-show.selected {
+  color: #000000;
+  background-color: #9ade00;
+  background-image: url("../../../../images/show_on.png");
+}
+.acl-button-hide.selected {
+  color: #000000;
+  background-color: #ff4141;
+  background-image: url("../../../../images/hide_on.png");
+}
+.acl-list-item.groupshow {
+  border-color: #9ade00;
+}
+.acl-list-item.grouphide {
+  border-color: #ff4141;
+}
+/** /acl **/
+/** tab buttons 14618a**/
+ul.tabs {
+  list-style-type: none;
+  padding-bottom: 10px;
+  font-size: 13px;
+}
+ul.tabs li {
+  float: left;
+  margin-left: 5px;
+}
+ul.tabs li .active {
+    background-color: #194719;
+    border: 1px solid #777777;
+    color: white;
+    border-radius: 3px 3px 3px 3px;
+    box-shadow: 2px 2px 2px #CFCFCF;
+    margin-left: 5px;
+}
+/**
+ * Form fields
+ */
+.field {
+  margin-bottom: 10px;
+  padding-bottom: 10px;
+  overflow: auto;
+  width: 100%;
+}
+.field label {
+  float: left;
+  width: 200px;
+}
+.field input, .field textarea {
+  width: 400px;
+}
+.field textarea {
+  height: 100px;
+}
+.field .field_help {
+  display: block;
+  margin-left: 200px;
+  color: #666666;
+}
+.field .onoff {
+  float: left;
+  width: 80px;
+}
+.field .onoff a {
+  display: block;
+  border: 1px solid #666666;
+  background-image: url("../../../../images/onoff.jpg");
+  background-repeat: no-repeat;
+  padding: 4px 2px 2px 2px;
+  height: 16px;
+  text-decoration: none;
+}
+.field .onoff .off {
+  border-color: #666666;
+  padding-left: 40px;
+  background-position: left center;
+  background-color: #cccccc;
+  color: #666666;
+  text-align: right;
+}
+.field .onoff .on {
+  border-color: #204A87;
+  padding-right: 40px;
+  background-position: right center;
+  background-color: #D7E3F1;
+  color: #204A87;
+  text-align: left;
+}
+.field .hidden {
+  display: none!important;
+}
+.field.radio .field_help {
+  margin-left: 0px;
+}
+#directory-search-form{
+	margin-bottom: 50px;
+	}
+#profile-edit-links-end {
+        clear: both;
+        margin-bottom: 15px;
+}
+
+#profile-edit-links ul { margin: 20px; padding-bottom: 20px; list-style: none; }
+
+#profile-edit-links li {
+  float: left;
+  list-style: none;
+  margin-left: 10px;
+}
+
+.profile-edit-side-div {
+  display: none;
+}
+
+#register-form label,
+#profile-edit-form label {
+        width: 300px; float: left;
+}
+
+.required {
+  display: inline;
+  color: #B20202;
+}
+
+/* oauth */
+.oauthapp {
+  height: auto;
+  overflow: auto;
+  border-bottom: 2px solid #cccccc;
+  padding-bottom: 1em;
+  margin-bottom: 1em;
+}
+.oauthapp img {
+  float: left;
+  width: 48px;
+  height: 48px;
+  margin: 10px;
+}
+.oauthapp img.noicon {
+  background-image: url("../../../../images/icons/48/plugin.png");
+  background-position: center center;
+  background-repeat: no-repeat;
+}
+.oauthapp a {
+  float: left;
+}
+/* contacts */
+.contact-entry-wrapper {
+  width: 120px;
+  height: 120px;
+  float: left;
+}
+/* photo */
+.photo {
+box-shadow: 2px 2px 5px 0px #000000;
+margin: 0px;
+border-radius: 10px;
+height: 145px !important;
+width: 145px !important;
+}
+.lframe {
+  float: left;
+  /*margin: 0px 10px 10px 0px;*/
+}
+/* profile match wrapper */
+.profile-match-wrapper {
+  float: left;
+  width: 90px;
+  height: 90px;
+  margin-bottom: 20px;
+}
+.profile-match-wrapper .contact-photo {
+  width: 80px;
+  height: 80px;
+}
+.profile-match-wrapper .contact-photo img {
+  width: 80px;
+  height: 80px;
+}
+.profile-match-wrapper {
+  left: 0px;
+  top: 63px;
+}
+
+.contact-photo-menu-button {
+        position: relative;
+        background-image: url("../../../../images/icons/16/menu.png");
+        background-position: top left; 
+        background-repeat: no-repeat;
+        margin: 0px 0px -16px 0px; 
+	padding: 0px;
+        width: 16px;
+        height: 16px;
+        top: -16px; left:0px;
+        overflow: hidden;
+        text-indent: 40px;
+        display: none;
+        
+}
+.contact-photo-menu {
+        width: 11em;
+        border: 3px solid #364e59;
+	color: #2d2d2d;
+        background: #FFFFFF;
+/*        position: absolute;*/
+        position: relative;
+        left: 0px; top: 0px;
+        display: none;
+        z-index: 10000;
+}
+.contact-photo-menu ul { margin:0px; padding: 0px; list-style: none }
+.contact-photo-menu li a {
+	display: block; 
+	padding: 5px 10px; 
+	color: #2d2d2d;
+	text-decoration: none;
+}
+.contact-photo-menu li a:hover {
+	background-color: #bdcdd4; 
+}
+
+/* page footer */
+footer {
+  height: 100px;
+  display: table-row;
+}
+
+blockquote {
+    border-left: 1px solid #D2D2D2;
+    padding-left: 9px;
+    margin: 0 0 0 .8ex;
+	 color: #777;
+}
+.oembed {
+	
+	font-weight: bold;
+}
+.aprofile dt{
+box-shadow: 1px 1px 5px 0;
+    color: #666666;
+    margin: 15px 0 5px;
+    padding-left: 5px;	
+	}
+/* ================== */
+/* = Contacts Block = */
+/* ================== */
+
+.contact-block-img {
+        width: 55px;
+        height: 55px;
+        padding-right: 3px;
+}
+.contact-block-div {
+        float: left;
+}
+
+.contact-block-textdiv { width: 150px; height: 34px; float: left; }
+#contact-block-end { clear: both; } 
+
+#group-edit-wrapper {
+        margin-bottom: 10px;
+}
+
+#group-members-end {
+        clear: both;
+}
+#group-edit-desc {
+ margin-top: 15px;
+}
+
+/*
+#group-separator,
+#prof-separator { display: none;}
+*/
+#prof-members-end{
+	clear: both;
+	}
+
+#prvmail-to-label, #prvmail-subject-label, #prvmail-message-label {
+	margin-bottom: 10px;
+	margin-top: 20px;
+}
+
+#prvmail-submit {
+	float: right;
+	margin-top: 10px;
+}
+
+#prvmail-subject
+{
+background: none repeat scroll 0 0 #FFFFFF;
+border: 1px solid #CCCCCC;
+border-radius: 5px 5px 5px 5px;
+font-weight: bold;
+height: 20px;
+margin: 0 0 5px;
+vertical-align: middle;
+}
+#prvmail-form{
+ width: 597px;	
+	}
+	
+#prvmail-upload-wrapper,
+#prvmail-link-wrapper,
+#prvmail-rotator-wrapper {
+	float: left;
+	margin-top: 10px;
+	margin-right: 10px;
+	width: 24px;
+}
+
+#prvmail-end {
+	clear: both;
+}
+
+.mail-list-sender,
+.mail-list-detail {
+	float: left;
+}
+.mail-list-detail {
+	margin-left: 20px;
+}
+
+.mail-list-subject {
+	font-size: 1.1em;
+	margin-top: 10px;
+}
+a.mail-list-link {
+    display: block;
+    font-size: 1.3em;
+    padding: 4px 0;
+}
+
+/*
+*a.mail-list-link:hover {
+*	background-color: #15607B;
+*	color: #F5F6FB;
+*}
+*/
+
+.mail-list-outside-wrapper-end {
+	clear: both;
+}
+
+.mail-list-outside-wrapper {
+	margin-top: 30px;
+}
+
+.mail-list-delete-wrapper {
+	float: right;
+	margin-right: 30px;
+	margin-top: 15px;
+}
+
+.mail-list-delete-icon {
+	border: none;
+}
+
+.mail-conv-sender,
+.mail-conv-detail {
+	float: left;
+}
+.mail-conv-detail {
+	margin-left: 20px;
+	width: 500px;
+}
+
+.mail-conv-subject {
+    font-size: 1.4em;
+    margin: 10px 0;
+}
+
+.mail-conv-outside-wrapper-end {
+	clear: both;
+}
+
+.mail-conv-outside-wrapper {
+	margin-top: 30px;
+}
+
+.mail-conv-delete-wrapper {
+	float: right;
+	margin-right: 30px;
+	margin-top: 15px;
+}
+.mail-conv-break {
+	clear: both;
+}
+
+.mail-conv-delete-icon {
+	border: none;
+}
+
+/* ========== */
+/* = Events = */
+/* ========== */
+.eventcal {
+        float: left;
+        font-size: 20px;
+}
+
+.vevent {
+
+}
+.vevent .event-description, .vevent .event-location {
+        margin-left: 10px;
+        margin-right: 10px;
+}
+.vevent .event-start {
+        margin-left: 10px;
+        margin-right: 10px;
+}
+
+#new-event-link {
+        margin-bottom: 10px;
+}
+
+.edit-event-link, .plink-event-link {
+        float: left;
+        margin-top: 4px;
+        margin-right: 4px;
+        margin-bottom: 15px;
+}
+
+.event-description:before {
+        content: url('../../../../images/calendar.png');
+        margin-right: 15px;
+}
+
+.event-start, .event-end {
+        margin-left: 10px;
+        width: 330px;
+        clear: both;
+}
+
+.event-start .dtstart, .event-end .dtend {
+        float: right;
+}
+
+.event-list-date {
+        margin-bottom: 10px;
+}
+
+.prevcal, .nextcal {
+        float: left;
+        margin-left: 32px;
+        margin-right: 32px;
+        margin-top: 64px;
+}
+.event-calendar-end {
+        clear: both;
+}
+
+ 
+.calendar {
+        font-family: Courier, monospace;
+}
+.calendar.eventcal a {
+  color: #3465A4;	
+	}
+.today {
+        font-weight: bold;
+        color: #FF0000;
+}
+
+.settings-block {
+        border: 1px solid #AAA;
+        margin: 10px;
+        padding: 10px;
+}
+
+.app-title {
+        margin: 10px;
+}
+
+#identity-manage-desc {
+        margin-top:15px;
+        margin-bottom: 15px;
+}
+
+#identity-manage-choose {
+        margin-bottom: 15px;
+}
+
+#identity-submit {
+        margin-top: 20px;
+}
+
+#photo-prev-link, #photo-next-link {
+        padding: 10px;
+        float: left;
+}
+.lightbox{
+	float: left;
+	}
+
+#photo-photo {
+        float: left;
+}
+#photo-like-div .wall-item-like-buttons {
+	 float: left;
+    margin-right: 5px;
+    margin-top: 30px;
+	}
+.comment-edit-text-empty {
+    margin: 10px 0 0;
+    width: 85%;
+}
+.comment-edit-photo {
+    margin: 10px 0 0;
+}
+.wall-item-like-buttons .icon.like {
+float: left;
+}
+
+#photo-photo-end {
+        clear: both;
+}
+
+.tabs .comment-wwedit-wrapper {
+	display: block;
+   margin-top: 30px;
+   margin-left: 50px;
+	}
+
+.profile-match-photo {
+        float: left;
+        text-align: center;
+        width: 120px;
+}
+
+.profile-match-name {
+        float: left;
+        text-align: center;
+        width: 120px;
+        overflow: hidden;
+}
+
+.profile-match-break,
+.profile-match-end {
+        clear: both;
+}
+
+.profile-match-connect {
+        text-align: center;
+        font-weight: bold;
+}
+
+.profile-match-wrapper {
+        float: left;
+        padding: 10px;
+        width: 120px;
+        height: 120px;
+        scroll: auto;
+}
+#profile-match-wrapper-end {
+        clear: both;
+}
+
+/* ============= */
+/* = Directory = */
+/* ============= */
+/* contacts menu */
+.contact-photo-wrapper {
+  position: relative;
+}
+.contact-photo {
+  width: 48px;
+  height: 48px;
+  overflow: hidden;
+  display: block;
+}
+.contact-photo img {
+  width: 48px;
+  height: 48px;
+}
+.contact-photo-menu-button {
+  display: none;
+  /* position: absolute; */
+  /* position: absolute; */
+  left: 0px;
+  top: -16px;
+}
+.contact-wrapper {
+  float: left;
+  width: 90px;
+  height: 90px;
+  margin-bottom: 15px;
+}
+.contact-wrapper .contact-photo {
+  width: 80px;
+  height: 80px;
+}
+.contact-wrapper .contact-photo img {
+  width: 80px;
+  height: 80px;
+}
+.contact-wrapper .contact-photo-menu-button {
+  left: 0px;
+  top: 63px;
+}
+.directory-item {
+  float: left;
+  width: 200px;
+  height: 200px;
+}
+.directory-item .contact-photo {
+  width: 175px;
+  height: 175px;
+}
+.directory-item .contact-photo img {
+  width: 175px;
+  height: 175px;
+}
+.contact-name {
+  text-align: left;
+  font-weight: bold;
+  font-size: 12px;
+}
+.contact-details {
+  color: #999999;
+}
+#side-bar-photos-albums li{
+list-style-type: disc;
+}
+#side-bar-photos-albums ul li{
+  margin-left: 30px;
+  padding-left: 0px;
+	}
+#side-bar-photos-albums{
+	margin-top: 15px;	
+	}
+.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-album-image-wrapper, .photo-top-image-wrapper {
+  float: left;
+   -moz-box-shadow: 0 0 5px #888;
+   -webkit-box-shadow: 0 0 5px #888;
+   box-shadow: 0 0 5px #888;
+  background-color: #000;
+   -webkit-border-radius: 5px;
+   -moz-border-radius: 5px;
+  border-radius: 5px;
+  padding-bottom: 20px;
+  position: relative;
+  margin: 0 10px 10px 0;
+  width: 200px; height: 140px;
+  overflow: hidden;  
+}
+.photo-top-album-name {
+        width: 100%;
+        position: absolute; 
+        bottom: 0px; 
+        padding-left: 3px;
+        background-color: #EEE;
+}
+.photo-top-album-link{
+  color: #3465A4;
+	}
+.photo-top-album-img{
+	
+	}
+/*.photo-top-image-wrapper {
+        position: relative;
+        float: left;
+        margin-top: 15px;
+        margin-right: 15px;
+        width: 200px; height: 200px; 
+        overflow: hidden; 
+}
+.photo-top-album-name {
+        width: 100%;
+        min-height: 2em;
+        position: absolute; 
+        bottom: 0px; 
+        padding: 0px 3px;
+        padding-top: 0.5em;
+        background-color: rgb(255, 255, 255);
+}*/
+#photo-top-end {
+        clear: both;
+}
+
+#photo-top-links {
+        margin-bottom: 30px;
+        margin-left: 30px;
+}
+
+#photos-upload-newalbum-div {
+        float: left;
+        width: 175px;
+}
+
diff --git a/view/theme/diabook/diabook-green/style-profile-wide.css b/view/theme/diabook/diabook-green/style-profile-wide.css
new file mode 100644
index 000000000..65b7f2ba3
--- /dev/null
+++ b/view/theme/diabook/diabook-green/style-profile-wide.css
@@ -0,0 +1,2615 @@
+/**
+ * Fabio Comuni <http://kirgroup.com/profile/fabrixxm>
+ * Additional Changes: Michael Vogel <icarus@dabo.de>
+ **/
+
+/* ========= */
+/* = Admin = */
+/* ========= */
+
+#adminpage {
+/*        width: 80%;*/
+}
+
+#pending-update {
+        float:right;
+        color: #ffffff;
+        font-weight: bold;
+        background-color: #FF0000;
+        padding: 0em 0.3em;
+}
+
+.admin.linklist {
+        border: 0px; padding: 0px;
+}
+
+.admin.link {
+        list-style-position: inside;
+        font-size: 1em;
+        padding: 5px;
+        width: 100px;
+        margin: 5px;
+}
+
+#adminpage dl {
+        clear: left;
+        margin-bottom: 2px;
+        padding-bottom: 2px;
+        border-bottom: 1px solid black;
+}
+
+#adminpage dt {
+        width: 200px;
+        float: left;
+        font-weight: bold;
+}
+
+#adminpage dd {
+        margin-left: 200px;
+}
+#adminpage h3 {
+        border-bottom: 1px solid #898989;
+        margin-bottom: 5px;
+        margin-top: 10px;
+}
+
+#adminpage .submit {
+        clear:left;
+}
+
+#adminpage #pluginslist {
+        margin: 0px; padding: 0px;
+}
+
+#adminpage .plugin {
+        list-style: none;
+        display: block;
+	/* border: 1px solid #888888; */
+        padding: 1em;
+        margin-bottom: 5px;
+        clear: left;
+}
+
+#adminpage .toggleplugin {
+        float:left;
+        margin-right: 1em;
+}
+
+#adminpage table {width:100%; border-bottom: 1p solid #000000; margin: 5px 0px;}
+#adminpage table th { text-align: left;}
+#adminpage td .icon { float: left;}
+#adminpage table#users img { width: 16px; height: 16px; }
+#adminpage table tr:hover { background-color: #eeeeee; }
+#adminpage .selectall { text-align: right; }
+/* icons */
+
+.icon.contacts {
+  background-image: url("../diabook-green/icons/contacts.png");}
+.icon.notifications {
+  background-image: url("../diabook-green/icons/notifications.png");}
+.icon.notify {
+  background-image: url("../diabook-green/icons/notify.png");}
+.icon.messages {
+  background-image: url("../diabook-green/icons/messages.png");}
+.icon.community {
+  background-image: url("../diabook-green/icons/community.png");}
+  
+.icon.drop 	{ background-image: url("../diabook-green/icons/drop.png");}
+.icon.drophide 	{ background-image: url("../diabook-green/icons/drop.png");}
+.icon.dislike 	{ background-image: url("../diabook-green/icons/dislike.png");}
+.icon.like 	{ background-image: url("../diabook-green/icons/like.png");}
+.icon.pencil 	{ background-image: url("../diabook-green/icons/pencil.png");}
+.icon.recycle 	{ background-image: url("../diabook-green/icons/recycle.png");}
+.icon.remote-link { background-image: url("../diabook-green/icons/remote.png");}
+.icon.tagged    { background-image: url("../diabook-green/icons/tagged.png");}
+.icon.file-as { background-image: url("../diabook-green/icons/file_as.png");}
+.star-item.icon.unstarred { background-image: url("../diabook-green/icons/unstarred.png");}
+.star-item.icon.starred { background-image: url("../diabook-green/icons/starred.png");}
+.icon.link		{ background-image: url("../diabook-green/icons/link.png");}
+.icon.lock		{ background-image: url("../diabook-green/icons/lock.png");}
+.icon.unlock		{ background-image: url("../diabook-green/icons/unlock.png");}
+.icon.language    { background-image: url("../diabook-green/icons/language.png");}
+
+
+.camera 	{ background-image: url("../diabook-green/icons/camera.png"); 
+			  display: block; width: 28px; height: 28px; background-repeat: no-repeat;
+			  }
+.attach 	{ background-image: url("../diabook-green/icons/attach.png"); 
+			  display: block; width: 28px; height: 28px; background-repeat: no-repeat;
+			  }
+.video2 	{ background-image: url("../diabook-green/icons/video.png"); 
+			  display: block; width: 28px; height: 28px; background-repeat: no-repeat;
+			  }	
+.video 	{ background-image: url("../diabook-green/icons/video.png"); 
+			  display: block; width: 100%; height: 140px; background-repeat: no-repeat;
+			  }
+.audio2 	{ background-image: url("../diabook-green/icons/audio.png"); 
+			  display: block; width: 28px; height: 28px; background-repeat: no-repeat;
+			  }
+.audio 	{ background-image: url("../diabook-green/icons/audio.png"); 
+			  display: block; width: 28px; height: 28px; background-repeat: no-repeat;
+			  }
+.weblink 	{ background-image: url("../diabook-green/icons/weblink.png"); 
+			  display: block; width: 28px; height: 28px; background-repeat: no-repeat;
+			  }
+.globe 	{ background-image: url("../diabook-green/icons/globe.png"); 
+			  display: block; width: 28px; height: 28px; background-repeat: no-repeat;
+			  }
+.unglobe 	{ background-image: url("../diabook-green/icons/unglobe.png"); 
+			  display: block; width: 28px; height: 28px; background-repeat: no-repeat;
+			  }
+.edit    {background-image: url("../diabook-green/icons/pencil2.png"); 
+			  display: block; width: 28px; height: 28px; background-repeat: no-repeat;}
+			  
+			  
+
+
+.article	{ background-position: -50px  0px;}
+/*.audio 		{ background-position: -70px  0px;}*/
+.block 		{ background-position: -90px  0px;}
+/*.drop 		{ background-position: -110px 0px;}*/
+/*.drophide 	{ background-position: -130px 0px;}*/
+/*.edit 		{ background-position: -150px 0px;}*/
+/*.camera 	{ background-position: -170px 0px;}*/
+/*.dislike 	{ background-position: -190px 0px;}*/
+/*.like 		{ background-position: -210px 0px;}*/
+/*.link 		{ background-position: -230px 0px;}*/
+
+/*.globe 		{ background-position: -50px  -20px;}*/
+/*.noglobe 	{ background-position: -70px  -20px;}*/
+.no 		{ background-position: -90px  -20px;}
+.pause 		{ background-position: -110px -20px;}
+.play 		{ background-position: -130px -20px;}
+/*.pencil 	{ background-position: -150px -20px;}*/
+.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;}*/
+
+/*.video          { background-position: -110px -40px;}*/
+.youtube        { background-position: -130px -40px;}
+
+/*.attach         { background-position: -190px -40px;}*/
+/*.language       { background-position: -210px -40px;}*/
+
+
+.icon.on             { background-image: url("../diabook-green/icons/toogle_on.png"); background-repeat: no-repeat;}
+.icon.off            { background-image: url("../diabook-green/icons/toogle_off.png"); background-repeat: no-repeat;}
+.prev           { background-position: -90px  -60px;}
+.next           { background-position: -110px -60px;}
+/*.tagged     { background-position: -130px -60px;}*/
+
+.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 0px; }
+.type-audio { background-position: -40px 0px; }
+.type-text  { background-position: -60px 0px; }
+.type-unkn  { background-position: -80px 0px; }
+
+.icon.drop, .icon.drophide {
+ float: left;
+}
+
+.icon {
+  display: block;
+  width: 20px;
+  height: 20px;
+  /*background-image: url('icons.png');*/
+}
+
+.icon {
+  background-color: transparent ;
+  background-repeat: no-repeat;
+  /* background-position: left center; */
+  display: block;
+  overflow: hidden;
+  text-indent: -9999px;
+  padding: 1px;
+}
+
+.icon.border.camera{
+  background-image: url("../diabook-green/icons/camera.png"); 
+  display: block; width: 28px; height: 28px; background-repeat: no-repeat;
+	}
+	
+.icon.border.link{
+  background-image: url("../diabook-green/icons/weblink.png"); 
+  display: block; width: 28px; height: 28px; background-repeat: no-repeat;
+  margin-left: 10px;
+	}
+
+.icon.text {
+  text-indent: 0px;
+}
+.icon.s10 {
+  min-width: 10px;
+  height: 10px;
+}
+.icon.s10.notify {
+  background-image: url("../../../../images/icons/10/notify_off.png");
+}
+.icon.s10.gear {
+  background-image: url("../../../../images/icons/10/gear.png");
+}
+.icon.s10.add {
+  background-image: url("../../../../images/icons/10/add.png");
+}
+.icon.s10.delete {
+  background-image: url("../../../../images/icons/10/delete.png");
+}
+.icon.s10.edit {
+  background-image: url("../../../../images/icons/10/edit.png");
+}
+.icon.s10.star {
+  background-image: url("../../../../images/star_dummy.png");
+}
+.icon.s10.menu {
+  background-image: url("../../../../images/icons/10/menu.png");
+}
+.icon.s10.link {
+  background-image: url("../../../../images/icons/10/link.png");
+}
+.icon.s10.lock {
+  background-image: url("../../../../images/icons/10/lock.png");
+}
+.icon.s10.unlock {
+  background-image: url("../../../../images/icons/10/unlock.png");
+}
+.icon.s10.text {
+  padding: 2px 0px 0px 15px;
+  font-size: 10px;
+}
+.icon.s16 {
+  min-width: 16px;
+  height: 16px;
+}
+.icon.s16.notify {
+  background-image: url("../../../../images/icons/16/notify_off.png");
+}
+.icon.s16.gear {
+  background-image: url("../../../../images/icons/16/gear.png");
+}
+.icon.s16.add {
+  background-image: url("../../../../images/icons/16/add.png");
+}
+.icon.s16.delete {
+  background-image: url("../../../../images/icons/16/delete.png");
+}
+/*.icon.s16.edit {
+  background-image: url("../../../../images/icons/16/edit.png");
+}*/
+.icon.s16.star {
+  background-image: url("../../../../images/star_dummy.png");
+}
+.icon.s16.menu {
+  background-image: url("../../../../images/icons/16/menu.png");
+}
+/*.icon.s16.link {
+  background-image: url("../../../../images/icons/16/link.png");
+}*/
+.icon.s16.lock {
+  background-image: url("../../../../images/icons/16/lock.png");
+}
+.icon.s16.unlock {
+  background-image: url("../../../../images/icons/16/unlock.png");
+}
+.icon.s16.text {
+  padding: 4px 0px 0px 20px;
+  font-size: 10px;
+}
+.icon.s22 {
+  min-width: 22px;
+  height: 22px;
+}
+.icon.s22.notify {
+  background-image: url("../../../../images/icons/22/notify_off.png");
+}
+.icon.s22.gear {
+  background-image: url("../../../../images/icons/22/gear.png");
+}
+.icon.s22.add {
+  background-image: url("../../../../images/icons/22/add.png");
+}
+.icon.s22.delete {
+  background-image: url("../../../../images/icons/22/delete.png");
+}
+.icon.s22.edit {
+  background-image: url("../../../../images/icons/22/edit.png");
+}
+.icon.s22.star {
+  background-image: url("../../../../images/star_dummy.png");
+}
+.icon.s22.menu {
+  background-image: url("../../../../images/icons/22/menu.png");
+}
+.icon.s22.link {
+  background-image: url("../../../../images/icons/22/link.png");
+}
+.icon.s22.lock {
+  background-image: url("../../../../images/icons/22/lock.png");
+}
+.icon.s22.unlock {
+  background-image: url("../../../../images/icons/22/unlock.png");
+}
+.icon.s22.text {
+  padding: 10px 0px 0px 25px;
+  width: 200px;
+}
+.icon.s48 {
+  width: 48px;
+  height: 48px;
+}
+.icon.s48.notify {
+  background-image: url("../../../../images/icons/48/notify_off.png");
+}
+.icon.s48.gear {
+  background-image: url("../../../../images/icons/48/gear.png");
+}
+.icon.s48.add {
+  background-image: url("../../../../images/icons/48/add.png");
+}
+.icon.s48.delete {
+  background-image: url("../../../../images/icons/48/delete.png");
+}
+.icon.s48.edit {
+  background-image: url("../../../../images/icons/48/edit.png");
+}
+.icon.s48.star {
+  background-image: url("../../../../images/star_dummy.png");
+}
+.icon.s48.menu {
+  background-image: url("../../../../images/icons/48/menu.png");
+}
+.icon.s48.link {
+  background-image: url("../../../../images/icons/48/link.png");
+}
+.icon.s48.lock {
+  background-image: url("../../../../images/icons/48/lock.png");
+}
+.icon.s48.unlock {
+  background-image: url("../../../../images/icons/48/unlock.png");
+}
+
+#contact-edit-links ul {
+  list-style: none;
+  list-style-type: none;
+}
+
+.hide-comments-outer {
+  margin-left: 80px;
+  margin-bottom: 5px;
+  width: 675px;
+  border-bottom: 1px solid #BDCDD4;
+  border-top: 1px solid #BDCDD4;
+
+  padding: 8px;
+}
+
+/* global */
+body {
+  font-family: 'Lato', "Helvetica Neue", Helvetica, Arial, sans-serif;
+  font-size: 13px;
+  background-color: #ffffff;
+  color: #2d2d2d;
+  margin: 50px auto auto;
+  display: table;
+}
+
+h4 {
+  font-size: 1.1em;
+}
+
+a {
+	color: #333333;
+	/* color: #3e3e8c; */
+	text-decoration: none;
+}
+a:hover {
+	/* color: blue; */
+	text-decoration: underline
+}
+
+.wall-item-name-link {
+/*  float: left;*/
+}
+
+.wall-item-photo {
+  width: 48px;
+  height: 48px;
+  overflow: hidden;
+  display: block;
+}
+
+.left {
+  float: left;
+}
+.right {
+  float: right;
+}
+.hidden {
+  display: none;
+}
+.clear {
+  clear: both;
+}
+.fakelink {
+  color: #194719;
+  /* color: #3e3e8c; */
+  text-decoration: none;
+  cursor: pointer;
+}
+.fakelink:hover {
+  /* color: blue; */
+  /*color: #005c94; */
+  text-decoration: underline;
+}
+code {
+  font-family: Courier, monospace;
+  white-space: pre;
+  display: block;
+  overflow: auto;
+  border: 1px solid #444;
+  background: #EEE;
+  color: #444;
+  padding: 10px;
+  margin-top: 20px;
+}
+#panel {
+  position: absolute;
+  width: 12em;
+  background: #ffffff;
+  color: #2d2d2d;
+  margin: 0px;
+  padding: 1em;
+  list-style: none;
+  border: 3px solid #364e59;
+  z-index: 100000;
+  -webkit-box-shadow: 0px 5px 10px rgba(0, 0, 0, 0.7);
+  -moz-box-shadow: 0px 5px 10px rgba(0, 0, 0, 0.7);
+  box-shadow: 0px 5px 10px rgba(0, 0, 0, 0.7);
+}
+/* tool */
+.tool {
+  height: auto;
+  overflow: auto;
+  padding: 3px;
+}
+#saved-search-ul .tool:hover,
+#nets-sidebar .tool:hover,
+#sidebar-group-list .tool:hover {
+	background: #EEE;
+}
+.tool .label {
+  float: left;
+}
+.tool .action {
+  float: right;
+}
+.tool a {
+  color: ##3F8FBA;
+}
+.tool a:hover {
+  text-decoration: none;
+}
+/* popup notifications */
+div.jGrowl div.notice {
+  background: #511919 url("../../../../images/icons/48/notice.png") no-repeat 5px center;
+  color: #ffffff;
+  padding-left: 58px;
+}
+div.jGrowl div.info {
+  background: #364e59 url("../../../../images/icons/48/info.png") no-repeat 5px center;
+  color: #ffffff;
+  padding-left: 58px;
+}
+/* header */
+header {
+  position: fixed;
+  left: 0%;
+  right: 80%;
+  top: 0px;
+  margin: 0px;
+  padding: 0px;
+  width: 22%;
+  height: 32px;
+  background: #5CD65C;
+  background-color: #5CD65C;
+  z-index: 100;
+  -webkit-box-shadow: -10px 0px 10px rgba(0, 0, 0, 0.7);
+  -moz-box-shadow: -10px 0px 10px rgba(0, 0, 0, 0.7);
+  box-shadow: -10px 0px 10px rgba(0, 0, 0, 0.7);
+   
+}
+header #site-location {
+  display: none;
+}
+header #banner {
+  overflow: hidden;
+  text-align: left;
+  width: 82%%;
+  margin-left: 25%;
+}
+header #banner a,
+header #banner a:active,
+header #banner a:visited,
+header #banner a:link,
+header #banner a:hover {
+  color: #1f1f1f;
+  text-decoration: none;
+  outline: none;
+  vertical-align: middle;
+  font-weight: bolder;
+  margin-left: 3px;
+}
+header #banner #logo-img {
+  height: 25px;
+  margin-top: 3px;
+}
+header #banner #logo-text {
+  font-size: 20px;
+  position: absolute;
+  top: 10%;
+}
+/* nav */
+nav {
+  width: 80%;
+  height: 32px;
+  position: fixed;
+  left: 22%;
+  top: 0px;
+  padding: 0px;
+  background: #5CD65C;
+  color: #1f1f1f;
+  z-index: 99;
+  -webkit-box-shadow: -10px 0px 10px rgba(0, 0, 0, 0.7);
+  -moz-box-shadow: -10px 0px 10px rgba(0, 0, 0, 0.7);
+  box-shadow: -10px 0px 10px rgba(0, 0, 0, 0.7);
+}
+nav a,
+nav a:active,
+nav a:visited,
+nav a:link,
+nav a:hover {
+  color: #1f1f1f;
+  text-decoration: none;
+  outline: none;
+}
+nav #banner {
+  overflow: hidden;
+  /*text-align: center;*/
+  width: 100%;
+}
+nav #banner a,
+nav #banner a:active,
+nav #banner a:visited,
+nav #banner a:link,
+nav #banner a:hover {
+  color: #1f1f1f;
+  text-decoration: none;
+  outline: none;
+  vertical-align: bottom;
+}
+nav #banner #logo-img {
+  height: 22px;
+  margin-top: 5px;
+}
+nav #banner #logo-text {
+  font-size: 22px;
+}
+nav #navbar{
+	}
+nav ul {
+  margin: 0px;
+  padding: 0px 20px;
+}
+nav ul li {
+  list-style: none;
+  margin: 0px;
+  /* padding: 1px 1px 3px 1px; */
+  float: left;
+}
+nav ul li .menu-popup {
+  left: 0px;
+  right: auto;
+}
+
+nav #logo-img {
+  height: 25px;
+  margin-top: 4px;
+  margin-left: 30px;
+}
+
+nav #logo-text {
+    font-size: 22px;
+    margin-top: 3px;
+    margin-right: 15px;
+}
+nav .nav-menu-search {
+  position: relative;
+
+  margin: 4px 17px;
+  margin-right: 0px;
+  height: 17px;
+  width: 180px;
+  
+}
+
+nav #search-box #search-text {
+  background-image:  url('icons/lupe.png');
+  background-repeat:no-repeat;
+  padding-left:20px;
+  border-top-left-radius: 15px;
+border-top-right-radius: 15px;
+border-bottom-right-radius: 15px;
+border-bottom-left-radius: 15px;
+	}
+
+
+nav .nav-menu-icon {
+  position: relative;
+  height: 22px;
+  padding: 5px;
+  margin: 0px 5px;
+  -moz-border-radius: 5px 5px 0 0;
+  -webkit-border-radius: 5px 5px 0 0;
+  border-radius: 5px 5px 0 0;
+}
+nav .nav-menu-icon:hover {
+  position: relative;
+  height: 22px;
+  padding: 5px;
+  margin: 0px 5px;
+  -moz-border-radius: 5px 5px 0 0;
+  -webkit-border-radius: 5px 5px 0 0;
+  border-radius: 5px 5px 0 0;
+}
+
+/*color*/
+nav .nav-menu-icon.selected {
+  background-color: #fff;
+}
+nav .nav-menu-icon img {
+  width: 22px;
+  height: 22px;
+}
+nav .nav-menu-icon .nav-notify {
+  top: 3px;
+}
+/*marker*/
+nav .nav-menu {
+  position: relative;
+  height: 16px;
+  padding: 5px;
+  margin: 3px 15px 0px;
+  font-size: 15px;
+  /*border-bottom: 3px solid #364A84;*/
+}
+nav .nav-menu.selected {
+  /*border-bottom: 3px solid #9eabb0;*/
+}
+nav .nav-notify {
+  display: none;
+  position: absolute;
+  background-color: #fff;
+  /* background-color: #19aeff; */
+  -moz-border-radius: 5px 5px 5px 5px;
+  -webkit-border-radius: 5px 5px 5px 5px;
+  border-radius: 5px 5px 5px 5px;
+  font-size: 10px;
+  font-weight: 900;
+  padding: 1px 4px;
+  top: 0px;
+  right: -6px;
+  min-width: 10px;
+  text-align: center;
+  border: 1px solid black;
+}
+nav .nav-notify.show {
+  display: block;
+}
+nav #nav-help-link,
+nav #nav-search-link,
+nav #nav-directory-link,
+nav #nav-apps-link,
+nav #nav-site-linkmenu, 
+nav #nav-home-link,
+nav #nav-user-linkmenu
+{
+  float: right;
+}
+nav #nav-user-linkmenu{
+	margin-right: 0px;
+	}
+nav #nav-home-link, #nav-directory-link, #nav-apps-link{
+	margin-left: 0px;
+	margin-right: 0px;
+	font-weight: bold;
+	margin: 3px 5px;
+	font-size: 14px;
+	}
+nav #nav-directory-link{
+  margin-right: 0px;	
+	}
+nav #nav-home-link{
+  margin-left: 0px;	
+	}
+nav #nav-help-link .menu-popup,
+nav #nav-search-link .menu-popup,
+nav #nav-directory-link .menu-popup,
+nav #nav-apps-link .menu-popup,
+nav #nav-site-linkmenu .menu-popup {
+  right: 0px;
+  left: auto;
+}
+
+nav #nav-messages-linkmenu.on .icon.messages, nav #nav-messages-linkmenu.selected .icon.messages{
+	background-image: url("../diabook-green/icons/messages.png");
+	}
+	
+/*nav #nav-notifications-linkmenu.on .icon.notify,*/ nav #nav-notifications-linkmenu.selected .icon.notify{
+	background-image: url("../diabook-green/icons/notify.png");
+	}
+	
+nav #nav-contacts-linkmenu.on .icon.contacts, nav #nav-contacts-linkmenu.selected .icon.contacts{
+	background-image: url("../diabook-green/icons/contacts.png");
+	}
+	
+nav #nav-apps-link.selected {
+ background-color: #fff;
+  moz-border-radius: 5px 5px 0 0;
+-webkit-border-radius: 5px 5px 0 0;
+border-radius: 5px 5px 0 0;
+}
+
+#nav-notifications-mark-all {
+	/* padding: 1px 1px 2px 26px; */
+	/* border-bottom: 1px solid #364E59; */
+	/* margin: 0px 0px 2px 0px;
+	padding: 5px 10px; */
+}
+
+#nav-notifications-see-all {
+	/* padding: 1px 1px 2px 26px; */
+	/* border-bottom: 1px solid #364E59; */
+	/* margin: 0px 0px 2px 0px;
+	padding: 5px 10px; */
+}
+
+.notify-seen {
+	background: none repeat scroll 0 0 #DDDDDD;
+	}
+
+ul.menu-popup {
+  position: absolute;
+  display: none;
+  width: 11em;
+  background: #F5FCF5;
+  color: #2d2d2d;
+  margin: 0px;
+  padding: 0px;
+  list-style: none;
+  z-index: 100000;
+  -webkit-box-shadow: 0px 5px 10px rgba(0, 0, 0, 0.7);
+  -moz-box-shadow: 0px 5px 10px rgba(0, 0, 0, 0.7);
+  box-shadow: 0px 5px 10px rgba(0, 0, 0, 0.7);
+}
+ul.menu-popup a {
+  display: block;
+  color: #2d2d2d;
+  padding: 5px 10px;
+  text-decoration: none;
+}
+ul.menu-popup a:hover {
+  background-color: #B8EDB8; /*bdcdd4;*/
+  color: #000;
+}
+ul.menu-popup .menu-sep {
+  border-top: 1px solid #9eabb0;
+}
+ul.menu-popup li {
+  float: none;
+  overflow: auto;
+  height: auto;
+  display: block;
+}
+ul.menu-popup li img {
+  float: left;
+  width: 16px;
+  height: 16px;
+  padding-right: 5px;
+}
+ul.menu-popup .empty {
+  padding: 5px;
+  text-align: center;
+  color: #9eabb0;
+}
+/* autocomplete popup */
+.acpopup {
+  max-height: 150px;
+  background-color: #ffffff;
+  color: #2d2d2d;
+  border: 1px solid #MenuBorder;
+  overflow: auto;
+  z-index: 100000;
+  -webkit-box-shadow: 0px 5px 10px rgba(0, 0, 0, 0.7);
+  -moz-box-shadow: 0px 5px 10px rgba(0, 0, 0, 0.7);
+  box-shadow: 0px 5px 10px rgba(0, 0, 0, 0.7);
+}
+.acpopupitem {
+  color: #2d2d2d;
+  padding: 4px;
+  clear: left;
+}
+.acpopupitem img {
+  float: left;
+  margin-right: 4px;
+}
+.acpopupitem.selected {
+  background-color: #bdcdd4;
+}
+#nav-notifications-menu {
+  width: 400px;
+  max-height: 550px;
+  overflow: auto;
+}
+/* #nav-notifications-menu a {
+	display: inline;
+	padding: 5px 0px;
+	margin: 0px 0px 2px 0px;
+}
+#nav-notifications-menu li:hover {
+  background-color: #bdcdd4;
+}*/
+
+#nav-notifications-menu img {
+  float: left;
+  margin-right: 5px;
+}
+#nav-notifications-menu .contactname {
+  font-weight: bold;
+}
+#nav-notifications-menu .notif-when {
+  font-size: 10px;
+  color: #9eabb0;
+  display: block;
+}
+
+.notif-image {
+        width: 32px;
+        height: 32px;
+        padding: 7px 7px 0px 0px;
+}
+
+/*profile_side*/
+#profile_side {
+  margin-bottom: 30px;
+}
+#ps-usericon{
+	height: 25px	
+	}
+#ps-username{
+  font-size: 1.17em;
+  font-weight: bold;
+  vertical-align: top;
+  position: absolute;
+  padding-top: 4px;
+  padding-left: 5px;	
+  word-wrap: break-word;
+  width: 130px;
+	}
+#ps-username:hover{
+  text-decoration: none;	
+	}
+.menu-profile-side{
+  list-style: none;	
+  padding-left: 0px;
+  min-height: 0px;
+	}
+.menu-profile-list{
+  height: auto;
+  overflow: auto;
+  padding-top: 3px;
+  padding-bottom: 3px;
+  padding-left: 16px;
+  min-height: 16px;
+  list-style: none;
+	}
+.menu-profile-list:hover{
+	background: #B8EDB8;
+	}
+.menu-profile-list-item{
+	padding-left: 5px;
+	}	
+.menu-profile-list-item:hover{	
+	text-decoration: none;
+   }
+/*http://prothemedesign.com/circular-icons/*/
+.menu-profile-list.home{
+	background: url("../diabook-green/icons/home.png") no-repeat;
+	}
+.menu-profile-list.photos{
+	background: url("../diabook-green/icons/mess_side.png") no-repeat;
+	}
+.menu-profile-list.events{
+	background: url("../diabook-green/icons/events.png") no-repeat;
+	}
+.menu-profile-list.notes{
+	background: url("../diabook-green/icons/notes.png") no-repeat;
+	}
+.menu-profile-list.foren{
+	background: url("../diabook-green/icons/pubgroups.png") no-repeat;
+	}
+.menu-profile-list.com_side{
+	background: url("../diabook-green/icons/com_side.png") no-repeat;
+	}
+
+/* aside */
+/*marker*/
+aside {
+  display: table-cell;
+  vertical-align: top;
+  width: 180px;
+  padding: 0px 5px 0px 0px;
+  border-right: 1px solid #D2D2D2;
+  float: left;
+  /* background: #F1F1F1; */
+}
+
+aside .vcard .fn {
+  font-size: 18px;
+  font-weight: bold;
+  margin-bottom: 5px;
+}
+aside .vcard .title {
+  margin-bottom: 5px;
+}
+aside .vcard dl {
+  height: auto;
+  overflow: auto;
+}
+aside .vcard dt {
+  float: left;
+  margin-left: 0px;
+  /*width: 35%;*/
+  text-align: right;
+  color: #999999;
+}
+aside .vcard dd {
+  float: left;
+  margin-left: 5px;
+  /*width: 60%;*/
+}
+aside #profile-extra-links ul {
+  padding: 0px;
+  margin: 0px;
+}
+aside #profile-extra-links li {
+  padding: 0px;
+  margin: 0px;
+  list-style: none;
+}
+aside #dfrn-request-link {
+  display: block;
+  -moz-border-radius: 5px 5px 5px 5px;
+  -webkit-border-radius: 5px 5px 5px 5px;
+  border-radius: 5px 5px 5px 5px;
+  color: #ffffff;
+  background: #005c94 url('../../../../images/connect-bg.png') no-repeat left center;
+  font-weight: bold;
+  text-transform: uppercase;
+  padding: 4px 2px 2px 35px;
+}
+aside #dfrn-request-link:hover {
+  text-decoration: none;
+  background-color: #36c;
+  /* background-color: #19aeff; */
+}
+aside #profiles-menu {
+  width: 20em;
+}
+aside #search-text {
+	width: 150px;
+	height: 17px;
+	padding-left: 10px;
+	border-top-left-radius: 15px;
+border-top-right-radius: 15px;
+border-bottom-right-radius: 15px;
+border-bottom-left-radius: 15px;
+}
+aside #side-follow-url {
+	width: 150px;
+	}
+aside #side-peoplefind-url {
+	width: 150px;
+	}
+#contact-block {
+  overflow: auto;
+  height: auto;
+}
+#contact-block .contact-block-h4 {
+  float: left;
+  margin: 5px 0px;
+}
+#contact-block .allcontact-link {
+  float: right;
+  margin: 5px 0px;
+}
+#contact-block .contact-block-content {
+  clear: both;
+  overflow: auto;
+  height: auto;
+}
+#contact-block .contact-block-link {
+  float: left;
+  margin: 0px 2px 2px 0px;
+}
+#contact-block .contact-block-link img {
+  widht: 48px;
+  height: 48px;
+}
+#lost-password-link {
+  float: left;
+  margin-right: 20px;	
+	}
+/* widget */
+.widget {
+  margin-bottom: 2em;
+  /*.action .s10 { width: 10px; overflow: hidden; padding: 0px;}
+	.action .s16 { width: 16px; overflow: hidden; padding: 0px;}*/
+/*  font-size: 12px; */
+}
+/*marker*/
+.widget h3 {
+  padding: 0px;
+  margin: 2px;
+  font-size: 1.05em;
+}
+.widget .action {
+  opacity: 0.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;
+}
+.widget input.action {
+  opacity: 0.5;
+  -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;
+}
+.widget:hover .title .action {
+  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;
+}
+.widget .tool:hover .action {
+  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;
+}
+.widget .tool:hover .action.ticked {
+  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;
+}
+.widget ul {
+  padding: 0px;
+}
+.widget ul li {
+  padding-left: 16px;
+  min-height: 16px;
+  list-style: none;
+}
+#side-bar-photos-albums li{
+list-style-type: disc;
+}
+#side-bar-photos-albums ul li{
+  margin-left: 30px;
+  padding-left: 0px;
+	}
+#side-bar-photos-albums ul li a{
+  color: #3465A4;
+}
+.widget .tool.selected {
+  background: url("../diabook-green/icons/selected.png") no-repeat left center;
+}
+/* widget: search */
+span.sbox_l  {
+	background: white url('../diabook/icons/srch_l.gif') no-repeat top left;
+	float: left;
+	width: 19px; height: 19px;
+	margin-left: 10px;
+	margin-top: 5px;
+	
+}
+
+span.sbox_r  {
+	background: white url('../diabook/icons/srch_r.gif') no-repeat top left;
+	float: left;
+	width: 19px; height: 19px;
+	margin-top: 5px;
+}
+
+span.sbox input {
+	background: white url('../diabook/icons/srch_bg.gif') repeat-x top left;
+	float: left;
+	margin-top: 5px;
+	border: 0;
+	height: 13px; width: 100px;
+	padding: 3px;
+	font: 11px/13px arial;
+	color: #000;
+}
+#add-search-popup {
+  width: 200px;
+  top: 18px;
+}
+/* section */
+section {
+  display: table-cell;
+  vertical-align: top;
+  width: 611px;
+  padding: 0px 0px 0px 12px;
+}
+
+body .pageheader{
+  text-align: center;
+  font-size: 20px;
+  margin-bottom: 20px;
+  margin-top: 0px;
+  max-width: 575px;
+	}
+.qcomment{
+  max-width: 122px;	
+	}
+#id_username {
+  width: 173px;	
+	}
+#id_password {
+  width: 173px;		
+	}
+#id_openid_url {
+  width: 173px;	
+	}
+#contact-edit-end {
+	}
+.pager {
+   padding: 10px;
+	text-align: center;
+	font-size: 1.0em;
+	clear: both;
+	display: block;
+}	
+
+.tabs {
+    
+    background-position: 0 -20px;
+    background-repeat: repeat-x;
+    height: 27px;
+    padding: 0;
+ }
+.tab.button {
+    margin-left: 5px;	
+    /*background: none repeat scroll 0 0 #F8F8F8;*/
+    border: 1px solid #CCCCCC;
+    border-radius: 3px 3px 3px 3px;
+    font-weight: normal;
+    padding: 3px;
+    color:  #333333;
+	}
+	
+#birthday-notice, #event-notice, #birthday-wrapper, #event-wrapper{
+	margin-bottom: 10px;
+	}
+#birthday-wrapper a {
+	color: #3465A4;
+	}
+
+/*marker*/
+right_aside {
+  display: table-cell;
+  vertical-align: top;
+  width: 180px;
+  /*border-left: 1px solid #D2D2D2;*/
+  
+  /* background: #F1F1F1; */
+}
+right_aside a{color: #3465A4;}
+/*marker*/
+right_aside h3 {font-size: 1.05em; border-bottom: 1px solid #D2D2D2; padding-top: 5px; padding-bottom: 0px; padding-left: 9px; margin-bottom: 0px; 
+margin-top:30px;}
+right_aside .directory-item {	width: 50px; height: 50px; vertical-align: center; text-align: center; }
+right_aside .directory-photo { margin: 0px; }
+right_aside .directory-photo-img { max-width: 45px; max-height: 45px; }
+right_aside #likes { margin: 0px; padding: 0px; list-style: none; }
+right_aside .items-wrapper{ overflow: auto;	width: 100%; }
+right_aside #lastusers-wrapper { padding-left: 6px; padding-top: 3px; overflow: auto;	width: 100%; }
+right_aside #ra-photos-wrapper { padding-left: 5px; padding-top: 3px; overflow: auto;	width: 100%; }
+#page-sidebar-right_aside{margin-top: 0px; margin-bottom: 30px;}
+#page-sidebar-right_aside ul {margin-top: 0px;}
+#page-sidebar-right_aside .label {max-width: 128px;}
+right_aside .icon {width: 10px; height: 10px;}
+.close_box		{ 
+		background-image: url("../diabook-green/icons/close_box.png");
+		float: right;
+		cursor: pointer;
+		opacity: 0.1;
+		}
+.close_box:hover	{ 
+		background-image: url("../diabook-green/icons/close_box.png");
+		float: right;
+		cursor: pointer;
+		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;
+		}
+/* wall item */
+/*marker*/
+.tread-wrapper {
+  border-bottom: 1px solid #D2D2D2;
+  position: relative;
+  padding: 5px;
+  margin-bottom: 0px;
+  width: 775px;
+  padding-top: 10px;
+}
+.tread-wrapper a{
+  color: #194719;
+}
+
+/*marker*/
+.wall-item-decor {
+  position: absolute;
+  left: 780px;
+  top: -10px;
+  width: 16px;
+}
+/*marker*/
+.wall-item-container {
+  display: table;
+  width: 770px;
+}
+
+
+.wall-item-container .wall-item-item, .wall-item-container .wall-item-bottom {
+  display: table-row;
+}
+
+.wall-item-bottom {
+  font-size: 13px;
+}
+.wall-item-container .wall-item-bottom {
+/*  opacity: 0.5;
+  -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; */
+}
+.wall-item-container:hover .wall-item-bottom {
+/*  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; */
+}
+.wall-item-container .wall-item-info {
+  display: table-cell;
+  vertical-align: top;
+  text-align: left;
+  width: 80px;
+}
+.wall-item-container .wall-item-location {
+  padding-right: 40px;
+  display: table-cell;
+}
+.wall-item-container .wall-item-ago {
+  word-wrap: break-word;
+  width: 50px;
+  margin-left: 10px;
+  color: #999;
+}
+.wall-item-location {
+  
+  clear: both;
+  overflow: hidden;
+  
+  margin-bottom: 5px;
+}
+
+/*marker*/
+.wall-item-container .wall-item-content {
+
+  max-width: 690px;
+  word-wrap: break-word;
+
+
+}
+/*marker*/
+.wall-item-container .wall-item-content img {
+
+
+}
+.wall-item-container .wall-item-links, .wall-item-container .wall-item-actions {
+  display: table-cell;
+  vertical-align: middle;
+}
+.wall-item-container .wall-item-links .icon, .wall-item-container .wall-item-actions .icon {
+  opacity: 0.5;
+  -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;
+}
+.wall-item-container .wall-item-links .icon:hover, .wall-item-container .wall-item-actions .icon: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;
+}
+.wall-item-container .wall-item-name {
+  font-weight: bold;
+}
+.wall-item-container .wall-item-actions-author {
+  width: 100%;
+  margin-bottom: 0.3em;
+}
+.wall-item-container .wall-item-actions-social {
+  float: left;
+  margin-bottom: 1px;
+  display: table-cell;
+}
+.wall-item-container .wall-item-actions-social a {
+  margin-right: 1em;
+}
+.wall-item-actions-social a {
+  float: left;
+}
+.wall-item-container .wall-item-actions-tools {
+  float: right;
+  width: 80px;
+  display: table-cell;
+}
+.wall-item-container .wall-item-actions-tools a {
+  float: right;
+}
+.wall-item-container .wall-item-actions-tools input {
+  float: right;
+}
+/*marker*/
+.wall-item-container.comment {
+  margin-top: 5px;
+  margin-bottom: 5px;
+  margin-left: 80px;
+  width: 690px;
+  border-bottom: 1px solid hsl(198, 21%, 79%);
+}
+.wall-item-container.comment .contact-photo {
+  width: 32px;
+  height: 32px;
+  margin-left: 16px;
+  /*background: url(../../../../images/icons/22/user.png) no-repeat center center;*/
+
+}
+.wall-item-container.comment {
+  top: 15px !important;
+  left: 15px !important;
+}
+.wall-item-container.comment .wall-item-links {
+  padding-left: 12px;
+}
+.wall-item-comment-wrapper {
+  margin: 1px 5px 5px 80px;
+}
+.wall-item-comment-wrapper .comment-edit-photo {
+  display: none;
+}
+.wall-item-comment-wrapper textarea {
+  height: 2.0em;
+  width: 100%;
+  font-size: 10px;
+  color: #999999;
+  border: 1px solid #DDD;
+  padding: 0.3em;
+  font-size: 14px;
+}
+.wall-item-comment-wrapper .comment-edit-text-full {
+  font-size: 14px;
+  height: 4em;
+  color: #2d2d2d;
+  border: 1px solid #2d2d2d;
+}
+.comment-edit-preview {
+  width: 500px;
+  margin-top: 10px;
+  background-color:  #fff797;
+}
+.comment-edit-preview .contact-photo {
+  width: 32px;
+  height: 32px;
+  margin-left: 16px;
+  /*background: url(../../../../images/icons/22/user.png) no-repeat center center;*/
+
+}
+.comment-edit-preview {
+  top: 15px !important;
+  left: 15px !important;
+}
+.comment-edit-preview .wall-item-links {
+  padding-left: 12px;
+}
+.comment-edit-preview .wall-item-container {
+  width: 700px;
+}
+.comment-edit-preview .tread-wrapper {
+  width: 700px;
+  padding: 0;
+  margin: 10px 0;
+}
+
+.shiny {
+  /* border-right: 10px solid #fce94f; */
+	border-right: 1px solid #A7C7F7;
+	padding-right: 12px;
+}
+
+#jot-preview-content{
+	margin-top: 30px;}
+	
+#jot-preview-content .tread-wrapper {
+  background-color: #fff797;
+}
+
+.wall-item-tags {
+  padding-top: 1px;
+  padding-bottom: 2px;
+}
+.tag {
+  /*background: url("../../../../images/tag_b.png") repeat-x center left;*/
+  color: #999;
+  padding-left: 3px;
+  font-size: 12px;
+}
+.tag a {
+  padding-right: 5px;
+  /*background: url("../../../../images/tag.png") no-repeat center right;*/
+  color: #999;
+}
+.wwto {
+  position: absolute !important;
+  width: 25px;
+  height: 25px;
+  background: #FFFFFF;
+  border: 2px solid #364e59;
+  height: 25px;
+  width: 25px;
+  overflow: hidden;
+  padding: 1px;
+  position: absolute !important;
+  top: 40px;
+  left: 30px;
+  -webkit-box-shadow: 0px 0px 10px rgba(0, 0, 0, 0.7);
+  -moz-box-shadow: 0px 0px 10px rgba(0, 0, 0, 0.7);
+  box-shadow: 0px 0px 10px rgba(0, 0, 0, 0.7);
+}
+.wwto .contact-photo {
+  width: auto;
+  height: 25px;
+}
+/* contacts menu */
+.contact-photo-wrapper {
+  position: relative;
+  width: 80px;
+}
+
+.contact-photo-wrapper.wwto {
+  width: 25px;
+}
+
+.contact-photo {
+  width: 48px;
+  height: 48px;
+  overflow: hidden;
+  display: block;
+}
+.contact-photo img {
+  width: 48px;
+  height: 48px;
+}
+
+.contact-wrapper {
+  float: left;
+  width: 90px;
+  height: 90px;
+  margin-bottom: 15px;
+}
+.contact-wrapper .contact-photo {
+  width: 80px;
+  height: 80px;
+}
+.contact-wrapper .contact-photo img {
+  width: 80px;
+  height: 80px;
+}
+.contact-wrapper {
+  left: 0px;
+  top: 63px;
+}
+.contact-photo {
+  width: 48px;
+  height: 48px;
+}
+.contact-photo img {
+  width: 48px;
+  height: 48px;
+}
+.contact-name {
+  /* text-align: center; */
+  /*font-weight: bold;*/
+  font-size: 12px;
+}
+.contact-details {
+  color: #999999;
+}
+/* editor */
+.jothidden {
+  display: none;
+}
+#jot {
+  width: 585px;
+  margin: 0px 2em 20px 0px;
+}
+#profile-jot-form #profile-jot-text {
+  height: 2.0em;
+  width: 99%;
+  font-size: 15px;
+  color: #999999;
+  border: 1px solid #DDD;
+  padding: 0.3em;
+  margin-bottom: 10px;
+}
+.grey
+{
+  display: inline;
+  float: right;	
+	}
+#jot #jot-tools {
+  margin: 0px;
+  padding: 0px;
+  height: 40px;
+  overflow: none;
+  width: 583px;
+  background-color: #fff;
+  border-bottom: 2px solid #9eabb0;
+}
+
+#jot #jot-tools li {
+  list-style: none;
+  float: left;
+  width: 80px;
+  height: 40px;
+  border-bottom: 2px solid #9eabb0;
+}
+#jot #jot-tools li a {
+  display: block;
+  color: #cccccc;
+  width: 100%;
+  height: 40px;
+  text-align: center;
+  line-height: 40px;
+  overflow: hidden;
+}
+#jot #jot-tools li:hover {
+  background-color: #364e59;
+  border-bottom: 2px solid #bdcdd4;
+}
+#jot #jot-tools li.perms {
+  float: right;
+  width: 40px;
+}
+#jot #jot-tools li.perms a.unlock {
+  width: 30px;
+  border-left: 10px solid #cccccc;
+  background-color: #cccccc;
+  background-position: left center;
+}
+#jot #jot-tools li.perms a.lock {
+  width: 30px;
+  border-left: 10px solid #666666;
+  background-color: #666666;
+}
+#jot #jot-tools li.submit {
+  float: right;
+  background-color: #cccccc;
+  border-bottom: 2px solid #cccccc;
+  border-right: 1px solid #666666;
+  border-left: 1px solid #666666;
+}
+#jot #jot-tools li.submit input {
+  border: 0px;
+  margin: 0px;
+  padding: 0px;
+  background-color: #cccccc;
+  color: #666666;
+  width: 80px;
+  height: 40px;
+  line-height: 40px;
+}
+#jot #jot-tools li.submit input:hover {
+  background-color: #bdcdd4;
+  color: #666666;
+}
+#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;
+}
+#profile-jot-form #jot-title {
+    
+  	 border-radius: 5px 5px 5px 5px;
+    font-weight: bold;
+    height: 20px;
+    margin: 0 0 5px;
+    width: 60%;
+    border: 1px solid #d2d2d2;
+}
+#profile-jot-form #jot-title:-webkit-input-placeholder {
+  font-weight: normal;
+}
+#profile-jot-form #jot-title:-moz-placeholder {
+  font-weight: normal;
+}
+#profile-jot-form #profile-jot-text_parent #profile-jot-text_tbl{
+	width: 585px;
+	height: 100px;
+	}
+#jot #jot-title:hover {
+  border: 1px solid #999999;
+}
+#jot #jot-title:focus {
+  border: 1px solid #999999;
+}
+#jot #character-counter {
+  width: 80px;
+  float: right;
+  text-align: right;
+  height: 20px;
+  line-height: 20px;
+  padding-right: 20px;
+}
+#jot-perms-icon, 
+#profile-location,
+#profile-nolocation,
+#profile-youtube, 
+#profile-video, 
+#profile-audio,
+#profile-link,
+#profile-title, 
+#wall-image-upload,
+#wall-file-upload,
+#wall-image-upload-div,
+#wall-file-upload-div,
+.hover, .focus {
+	cursor: pointer;
+	margin-top: 2px;
+}
+/*marker*/
+#profile-jot-wrapper{
+	margin: 0 20px 20px 0;
+   width: 785px;
+	}
+/*marker*/
+#profile-jot-submit-wrapper {
+	margin-bottom: 50px;
+	width: 785px;
+}
+
+#profile-jot-submit {
+	float: right;
+	margin-top: 2px;
+	font-size: 14px;
+}
+#profile-upload-wrapper {
+	float: left;
+	margin-top: 2px;
+	margin-left: 10px;
+	
+}
+#profile-attach-wrapper {
+	float: left;
+	margin-left: 15px;
+	margin-top: 2px;
+}
+#profile-rotator {
+	float: left;
+	margin-left: 30px;
+	margin-top: 2px;
+}
+#profile-link-wrapper {
+	float: left;
+	margin-left: 15px;
+	margin-top: 2px;
+}
+#profile-youtube-wrapper {
+	float: left;
+	margin-left: 15px;
+	margin-top: 2px;
+}
+#profile-video-wrapper {
+	float: left;
+	margin-left: 15px;
+	margin-top: 2px;
+}
+#profile-audio-wrapper {
+	float: left;
+	margin-left: 15px;
+	margin-top: 2px;
+}
+#profile-location-wrapper {
+	float: left;
+	margin-left: 15px;
+	margin-top: 2px;
+}
+#profile-jot-perms {
+	float: left;
+	margin-left: 45px;
+	margin-top: 2px;
+}
+#jot-preview-link {
+	float: right;
+	margin-left: 10px;
+	margin-top: 2px;
+	font-size: 9px;
+	font-weight: bolder;
+	cursor: pointer;
+}
+#profile-jot-perms{
+   float: right;
+	margin-left: 10px;
+	margin-top: 2px;	
+	}
+/** buttons **/
+.button.creation1 {
+    background-color: #fff;
+    border: 1px solid #777777;
+    border-radius: 3px 3px 3px 3px;
+    box-shadow: 0 1px 1px #CFCFCF;
+ 	 font-weight: bolder;
+	 cursor: pointer;
+}
+.button.creation2 {
+    background-color: #194719;
+    border: 1px solid #777777;
+    color: white;
+    border-radius: 3px 3px 3px 3px;
+    box-shadow: 0 1px 1px #CFCFCF;
+    margin-left: 5px;
+    font-weight: bolder;
+	 cursor: pointer;
+}
+/*input[type="submit"] {
+	border: 0px;
+    background-color: @ButtonBackgroundColor;
+    color: @ButtonColor;
+    padding: 0px 10px;
+	.rounded(5px);
+    height: 18px;
+}*/
+/** acl **/
+#photo-edit-perms-select, #photos-upload-permissions-wrapper, #profile-jot-acl-wrapper {
+  display: block!important;
+}
+#acl-wrapper {
+  width: 690px;
+  float: left;
+}
+#acl-search {
+  float: right;
+  background: #ffffff url("../../../../images/search_18.png") no-repeat right center;
+  padding-right: 20px;
+}
+#acl-showall {
+  float: left;
+  display: block;
+  width: auto;
+  height: 18px;
+  background-color: #cccccc;
+  background-image: url("../../../../images/show_all_off.png");
+  background-position: 7px 7px;
+  background-repeat: no-repeat;
+  padding: 7px 5px 0px 30px;
+  color: #999999;
+  -moz-border-radius: 5px 5px 5px 5px;
+  -webkit-border-radius: 5px 5px 5px 5px;
+  border-radius: 5px 5px 5px 5px;
+}
+#acl-showall.selected {
+  color: #000000;
+  background-color: #ff9900;
+  background-image: url("../../../../images/show_all_on.png");
+}
+#acl-list {
+  height: 210px;
+  border: 1px solid #cccccc;
+  clear: both;
+  margin-top: 30px;
+  overflow: auto;
+}
+.acl-list-item {
+  display: block;
+  width: 150px;
+  height: 30px;
+  border: 1px solid #cccccc;
+  margin: 5px;
+  float: left;
+}
+.acl-list-item img {
+  width: 22px;
+  height: 22px;
+  float: left;
+  margin: 4px;
+}
+.acl-list-item p {
+  height: 12px;
+  font-size: 10px;
+  margin: 0px;
+  padding: 2px 0px 1px;
+  overflow: hidden;
+}
+.acl-list-item a {
+  font-size: 8px;
+  display: block;
+  width: 40px;
+  height: 10px;
+  float: left;
+  color: #999999;
+  background-color: #cccccc;
+  background-position: 3px 3px;
+  background-repeat: no-repeat;
+  margin-right: 5px;
+  -webkit-border-radius: 2px ;
+  -moz-border-radius: 2px;
+  border-radius: 2px;
+  padding-left: 15px;
+}
+#acl-wrapper a:hover {
+  text-decoration: none;
+  color: #000000;
+}
+.acl-button-show {
+  background-image: url("../../../../images/show_off.png");
+}
+.acl-button-hide {
+  background-image: url("../../../../images/hide_off.png");
+}
+.acl-button-show.selected {
+  color: #000000;
+  background-color: #9ade00;
+  background-image: url("../../../../images/show_on.png");
+}
+.acl-button-hide.selected {
+  color: #000000;
+  background-color: #ff4141;
+  background-image: url("../../../../images/hide_on.png");
+}
+.acl-list-item.groupshow {
+  border-color: #9ade00;
+}
+.acl-list-item.grouphide {
+  border-color: #ff4141;
+}
+/** /acl **/
+/** tab buttons 14618a**/
+/*marker*/
+ul.tabs {
+  list-style-type: none;
+  padding-bottom: 10px;
+  font-size: 13px;
+  width: 805px;
+}
+ul.tabs li {
+  float: left;
+  margin-left: 5px;
+}
+ul.tabs li .active {
+    background-color: #194719;
+    border: 1px solid #777777;
+    color: white;
+    border-radius: 3px 3px 3px 3px;
+    box-shadow: 2px 2px 2px #CFCFCF;
+    margin-left: 5px;
+}
+/**
+ * Form fields
+ */
+.field {
+  margin-bottom: 10px;
+  padding-bottom: 10px;
+  overflow: auto;
+  width: 100%;
+}
+.field label {
+  float: left;
+  width: 200px;
+}
+.field input, .field textarea {
+  width: 400px;
+}
+.field textarea {
+  height: 100px;
+}
+.field .field_help {
+  display: block;
+  margin-left: 200px;
+  color: #666666;
+}
+.field .onoff {
+  float: left;
+  width: 80px;
+}
+.field .onoff a {
+  display: block;
+  border: 1px solid #666666;
+  background-image: url("../../../../images/onoff.jpg");
+  background-repeat: no-repeat;
+  padding: 4px 2px 2px 2px;
+  height: 16px;
+  text-decoration: none;
+}
+.field .onoff .off {
+  border-color: #666666;
+  padding-left: 40px;
+  background-position: left center;
+  background-color: #cccccc;
+  color: #666666;
+  text-align: right;
+}
+.field .onoff .on {
+  border-color: #204A87;
+  padding-right: 40px;
+  background-position: right center;
+  background-color: #D7E3F1;
+  color: #204A87;
+  text-align: left;
+}
+.field .hidden {
+  display: none!important;
+}
+.field.radio .field_help {
+  margin-left: 0px;
+}
+#directory-search-form{
+	margin-bottom: 50px;
+	}
+#profile-edit-links-end {
+        clear: both;
+        margin-bottom: 15px;
+}
+
+#profile-edit-links ul { margin: 20px; padding-bottom: 20px; list-style: none; }
+
+#profile-edit-links li {
+  float: left;
+  list-style: none;
+  margin-left: 10px;
+}
+
+.profile-edit-side-div {
+  display: none;
+}
+
+#register-form label,
+#profile-edit-form label {
+        width: 300px; float: left;
+}
+
+.required {
+  display: inline;
+  color: #B20202;
+}
+
+/* oauth */
+.oauthapp {
+  height: auto;
+  overflow: auto;
+  border-bottom: 2px solid #cccccc;
+  padding-bottom: 1em;
+  margin-bottom: 1em;
+}
+.oauthapp img {
+  float: left;
+  width: 48px;
+  height: 48px;
+  margin: 10px;
+}
+.oauthapp img.noicon {
+  background-image: url("../../../../images/icons/48/plugin.png");
+  background-position: center center;
+  background-repeat: no-repeat;
+}
+.oauthapp a {
+  float: left;
+}
+/* contacts */
+.contact-entry-wrapper {
+  width: 120px;
+  height: 120px;
+  float: left;
+}
+/* photo */
+.photo {
+box-shadow: 2px 2px 5px 0px #000000;
+margin: 0px;
+border-radius: 10px;
+height: 145px !important;
+width: 145px !important;
+}
+.lframe {
+  float: left;
+  /*margin: 0px 10px 10px 0px;*/
+}
+/* profile match wrapper */
+.profile-match-wrapper {
+  float: left;
+  width: 90px;
+  height: 90px;
+  margin-bottom: 20px;
+}
+.profile-match-wrapper .contact-photo {
+  width: 80px;
+  height: 80px;
+}
+.profile-match-wrapper .contact-photo img {
+  width: 80px;
+  height: 80px;
+}
+.profile-match-wrapper {
+  left: 0px;
+  top: 63px;
+}
+
+.contact-photo-menu-button {
+        position: relative;
+        background-image: url("../../../../images/icons/16/menu.png");
+        background-position: top left; 
+        background-repeat: no-repeat;
+        margin: 0px 0px -16px 0px; 
+	padding: 0px;
+        width: 16px;
+        height: 16px;
+        top: -16px; left:0px;
+        overflow: hidden;
+        text-indent: 40px;
+        display: none;
+        
+}
+.contact-photo-menu {
+        width: 11em;
+        border: 3px solid #364e59;
+	color: #2d2d2d;
+        background: #FFFFFF;
+/*        position: absolute;*/
+        position: relative;
+        left: 0px; top: 0px;
+        display: none;
+        z-index: 10000;
+}
+.contact-photo-menu ul { margin:0px; padding: 0px; list-style: none }
+.contact-photo-menu li a {
+	display: block; 
+	padding: 5px 10px; 
+	color: #2d2d2d;
+	text-decoration: none;
+}
+.contact-photo-menu li a:hover {
+	background-color: #bdcdd4; 
+}
+
+/* page footer */
+footer {
+  height: 100px;
+  display: table-row;
+}
+
+blockquote {
+    border-left: 1px solid #D2D2D2;
+    padding-left: 9px;
+    margin: 0 0 0 .8ex;
+	 color: #777;
+}
+.oembed {
+	
+	font-weight: bold;
+}
+.aprofile dt{
+box-shadow: 1px 1px 5px 0;
+    color: #666666;
+    margin: 15px 0 5px;
+    padding-left: 5px;	
+	}
+/* ================== */
+/* = Contacts Block = */
+/* ================== */
+
+.contact-block-img {
+        width: 48px;
+        height: 48px;
+        padding-right: 3px;
+}
+.contact-block-div {
+        float: left;
+}
+
+.contact-block-textdiv { width: 150px; height: 34px; float: left; }
+#contact-block-end { clear: both; } 
+
+#group-edit-wrapper {
+        margin-bottom: 10px;
+}
+
+#group-members-end {
+        clear: both;
+}
+#group-edit-desc {
+ margin-top: 15px;
+}
+
+/*
+#group-separator,
+#prof-separator { display: none;}
+*/
+#prof-members-end{
+	clear: both;
+	}
+
+#prvmail-to-label, #prvmail-subject-label, #prvmail-message-label {
+	margin-bottom: 10px;
+	margin-top: 20px;
+}
+
+#prvmail-submit {
+	float: right;
+	margin-top: 10px;
+}
+
+#prvmail-subject
+{
+background: none repeat scroll 0 0 #FFFFFF;
+border: 1px solid #CCCCCC;
+border-radius: 5px 5px 5px 5px;
+font-weight: bold;
+height: 20px;
+margin: 0 0 5px;
+vertical-align: middle;
+}
+#prvmail-form{
+ width: 597px;	
+	}
+	
+#prvmail-upload-wrapper,
+#prvmail-link-wrapper,
+#prvmail-rotator-wrapper {
+	float: left;
+	margin-top: 10px;
+	margin-right: 10px;
+	width: 24px;
+}
+
+#prvmail-end {
+	clear: both;
+}
+
+.mail-list-sender,
+.mail-list-detail {
+	float: left;
+}
+.mail-list-detail {
+	margin-left: 20px;
+}
+
+.mail-list-subject {
+	font-size: 1.1em;
+	margin-top: 10px;
+}
+a.mail-list-link {
+    display: block;
+    font-size: 1.3em;
+    padding: 4px 0;
+}
+
+/*
+*a.mail-list-link:hover {
+*	background-color: #15607B;
+*	color: #F5F6FB;
+*}
+*/
+
+.mail-list-outside-wrapper-end {
+	clear: both;
+}
+
+.mail-list-outside-wrapper {
+	margin-top: 30px;
+}
+
+.mail-list-delete-wrapper {
+	float: right;
+	margin-right: 30px;
+	margin-top: 15px;
+}
+
+.mail-list-delete-icon {
+	border: none;
+}
+
+.mail-conv-sender,
+.mail-conv-detail {
+	float: left;
+}
+.mail-conv-detail {
+	margin-left: 20px;
+	width: 500px;
+}
+
+.mail-conv-subject {
+    font-size: 1.4em;
+    margin: 10px 0;
+}
+
+.mail-conv-outside-wrapper-end {
+	clear: both;
+}
+
+.mail-conv-outside-wrapper {
+	margin-top: 30px;
+}
+
+.mail-conv-delete-wrapper {
+	float: right;
+	margin-right: 30px;
+	margin-top: 15px;
+}
+.mail-conv-break {
+	clear: both;
+}
+
+.mail-conv-delete-icon {
+	border: none;
+}
+
+/* ========== */
+/* = Events = */
+/* ========== */
+.eventcal {
+        float: left;
+        font-size: 20px;
+}
+
+.vevent {
+
+}
+.vevent .event-description, .vevent .event-location {
+        margin-left: 10px;
+        margin-right: 10px;
+}
+.vevent .event-start {
+        margin-left: 10px;
+        margin-right: 10px;
+}
+
+#new-event-link {
+        margin-bottom: 10px;
+}
+
+.edit-event-link, .plink-event-link {
+        float: left;
+        margin-top: 4px;
+        margin-right: 4px;
+        margin-bottom: 15px;
+}
+
+.event-description:before {
+        content: url('../../../../images/calendar.png');
+        margin-right: 15px;
+}
+
+.event-start, .event-end {
+        margin-left: 10px;
+        width: 330px;
+        clear: both;
+}
+
+.event-start .dtstart, .event-end .dtend {
+        float: right;
+}
+
+.event-list-date {
+        margin-bottom: 10px;
+}
+
+.prevcal, .nextcal {
+        float: left;
+        margin-left: 32px;
+        margin-right: 32px;
+        margin-top: 64px;
+}
+.event-calendar-end {
+        clear: both;
+}
+
+ 
+.calendar {
+        font-family: Courier, monospace;
+}
+.calendar.eventcal a {
+  color: #3465A4;	
+	}
+.today {
+        font-weight: bold;
+        color: #FF0000;
+}
+
+.settings-block {
+        border: 1px solid #AAA;
+        margin: 10px;
+        padding: 10px;
+}
+
+.app-title {
+        margin: 10px;
+}
+
+#identity-manage-desc {
+        margin-top:15px;
+        margin-bottom: 15px;
+}
+
+#identity-manage-choose {
+        margin-bottom: 15px;
+}
+
+#identity-submit {
+        margin-top: 20px;
+}
+
+#photo-prev-link, #photo-next-link {
+        padding: 10px;
+        float: left;
+}
+.lightbox{
+	float: left;
+	}
+
+#photo-photo {
+        float: left;
+}
+#photo-like-div .wall-item-like-buttons {
+	 float: left;
+    margin-right: 5px;
+    margin-top: 30px;
+	}
+.comment-edit-text-empty {
+    margin: 10px 0 0;
+    width: 85%;
+}
+.comment-edit-photo {
+    margin: 10px 0 0;
+}
+.wall-item-like-buttons .icon.like {
+float: left;
+}
+
+#photo-photo-end {
+        clear: both;
+}
+
+.tabs .comment-wwedit-wrapper {
+	display: block;
+   margin-top: 30px;
+   margin-left: 50px;
+	}
+
+.profile-match-photo {
+        float: left;
+        text-align: center;
+        width: 120px;
+}
+
+.profile-match-name {
+        float: left;
+        text-align: center;
+        width: 120px;
+        overflow: hidden;
+}
+
+.profile-match-break,
+.profile-match-end {
+        clear: both;
+}
+
+.profile-match-connect {
+        text-align: center;
+        font-weight: bold;
+}
+
+.profile-match-wrapper {
+        float: left;
+        padding: 10px;
+        width: 120px;
+        height: 120px;
+        scroll: auto;
+}
+#profile-match-wrapper-end {
+        clear: both;
+}
+
+/* ============= */
+/* = Directory = */
+/* ============= */
+/* contacts menu */
+.contact-photo-wrapper {
+  position: relative;
+}
+.contact-photo {
+  width: 48px;
+  height: 48px;
+  overflow: hidden;
+  display: block;
+}
+.contact-photo img {
+  width: 48px;
+  height: 48px;
+}
+.contact-photo-menu-button {
+  display: none;
+  /* position: absolute; */
+  /* position: absolute; */
+  left: 0px;
+  top: -16px;
+}
+.contact-wrapper {
+  float: left;
+  width: 90px;
+  height: 90px;
+  margin-bottom: 15px;
+}
+.contact-wrapper .contact-photo {
+  width: 80px;
+  height: 80px;
+}
+.contact-wrapper .contact-photo img {
+  width: 80px;
+  height: 80px;
+}
+.contact-wrapper .contact-photo-menu-button {
+  left: 0px;
+  top: 63px;
+}
+.directory-item {
+  float: left;
+  width: 200px;
+  height: 200px;
+}
+.directory-item .contact-photo {
+  width: 175px;
+  height: 175px;
+}
+.directory-item .contact-photo img {
+  width: 175px;
+  height: 175px;
+}
+.contact-name {
+  text-align: left;
+  font-weight: bold;
+  font-size: 12px;
+}
+.contact-details {
+  color: #999999;
+}
+#side-bar-photos-albums li{
+list-style-type: disc;
+}
+#side-bar-photos-albums ul li{
+  margin-left: 30px;
+  padding-left: 0px;
+	}
+#side-bar-photos-albums{
+	margin-top: 15px;	
+	}
+.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-album-image-wrapper, .photo-top-image-wrapper {
+  float: left;
+   -moz-box-shadow: 0 0 5px #888;
+   -webkit-box-shadow: 0 0 5px #888;
+   box-shadow: 0 0 5px #888;
+  background-color: #000;
+   -webkit-border-radius: 5px;
+   -moz-border-radius: 5px;
+  border-radius: 5px;
+  padding-bottom: 20px;
+  position: relative;
+  margin: 0 10px 10px 0;
+  width: 200px; height: 140px;
+  overflow: hidden;  
+}
+.photo-top-album-name {
+        width: 100%;
+        position: absolute; 
+        bottom: 0px; 
+        padding-left: 3px;
+        background-color: #EEE;
+}
+.photo-top-album-link{
+  color: #3465A4;
+	}
+.photo-top-album-img{
+	
+	}
+/*.photo-top-image-wrapper {
+        position: relative;
+        float: left;
+        margin-top: 15px;
+        margin-right: 15px;
+        width: 200px; height: 200px; 
+        overflow: hidden; 
+}
+.photo-top-album-name {
+        width: 100%;
+        min-height: 2em;
+        position: absolute; 
+        bottom: 0px; 
+        padding: 0px 3px;
+        padding-top: 0.5em;
+        background-color: rgb(255, 255, 255);
+}*/
+#photo-top-end {
+        clear: both;
+}
+
+#photo-top-links {
+        margin-bottom: 30px;
+        margin-left: 30px;
+}
+
+#photos-upload-newalbum-div {
+        float: left;
+        width: 175px;
+}
+
diff --git a/view/theme/diabook/diabook-green/style-profile.css b/view/theme/diabook/diabook-green/style-profile.css
new file mode 100644
index 000000000..dcc7b373a
--- /dev/null
+++ b/view/theme/diabook/diabook-green/style-profile.css
@@ -0,0 +1,2603 @@
+/**
+ * Fabio Comuni <http://kirgroup.com/profile/fabrixxm>
+ * Additional Changes: Michael Vogel <icarus@dabo.de>
+ **/
+
+/* ========= */
+/* = Admin = */
+/* ========= */
+
+#adminpage {
+/*        width: 80%;*/
+}
+
+#pending-update {
+        float:right;
+        color: #ffffff;
+        font-weight: bold;
+        background-color: #FF0000;
+        padding: 0em 0.3em;
+}
+
+.admin.linklist {
+        border: 0px; padding: 0px;
+}
+
+.admin.link {
+        list-style-position: inside;
+        font-size: 1em;
+        padding: 5px;
+        width: 100px;
+        margin: 5px;
+}
+
+#adminpage dl {
+        clear: left;
+        margin-bottom: 2px;
+        padding-bottom: 2px;
+        border-bottom: 1px solid black;
+}
+
+#adminpage dt {
+        width: 200px;
+        float: left;
+        font-weight: bold;
+}
+
+#adminpage dd {
+        margin-left: 200px;
+}
+#adminpage h3 {
+        border-bottom: 1px solid #898989;
+        margin-bottom: 5px;
+        margin-top: 10px;
+}
+
+#adminpage .submit {
+        clear:left;
+}
+
+#adminpage #pluginslist {
+        margin: 0px; padding: 0px;
+}
+
+#adminpage .plugin {
+        list-style: none;
+        display: block;
+	/* border: 1px solid #888888; */
+        padding: 1em;
+        margin-bottom: 5px;
+        clear: left;
+}
+
+#adminpage .toggleplugin {
+        float:left;
+        margin-right: 1em;
+}
+
+#adminpage table {width:100%; border-bottom: 1p solid #000000; margin: 5px 0px;}
+#adminpage table th { text-align: left;}
+#adminpage td .icon { float: left;}
+#adminpage table#users img { width: 16px; height: 16px; }
+#adminpage table tr:hover { background-color: #eeeeee; }
+#adminpage .selectall { text-align: right; }
+/* icons */
+
+.icon.contacts {
+  background-image: url("../diabook-green/icons/contacts.png");}
+.icon.notifications {
+  background-image: url("../diabook-green/icons/notifications.png");}
+.icon.notify {
+  background-image: url("../diabook-green/icons/notify.png");}
+.icon.messages {
+  background-image: url("../diabook-green/icons/messages.png");}
+.icon.community {
+  background-image: url("../diabook-green/icons/community.png");}
+  
+.icon.drop 	{ background-image: url("../diabook-green/icons/drop.png");}
+.icon.drophide 	{ background-image: url("../diabook-green/icons/drop.png");}
+.icon.dislike 	{ background-image: url("../diabook-green/icons/dislike.png");}
+.icon.like 	{ background-image: url("../diabook-green/icons/like.png");}
+.icon.pencil 	{ background-image: url("../diabook-green/icons/pencil.png");}
+.icon.recycle 	{ background-image: url("../diabook-green/icons/recycle.png");}
+.icon.remote-link { background-image: url("../diabook-green/icons/remote.png");}
+.icon.tagged    { background-image: url("../diabook-green/icons/tagged.png");}
+.icon.file-as { background-image: url("../diabook-green/icons/file_as.png");}
+.star-item.icon.unstarred { background-image: url("../diabook-green/icons/unstarred.png");}
+.star-item.icon.starred { background-image: url("../diabook-green/icons/starred.png");}
+.icon.link		{ background-image: url("../diabook-green/icons/link.png");}
+.icon.lock		{ background-image: url("../diabook-green/icons/lock.png");}
+.icon.unlock		{ background-image: url("../diabook-green/icons/unlock.png");}
+.icon.language    { background-image: url("../diabook-green/icons/language.png");}
+
+
+.camera 	{ background-image: url("../diabook-green/icons/camera.png"); 
+			  display: block; width: 28px; height: 28px; background-repeat: no-repeat;
+			  }
+.attach 	{ background-image: url("../diabook-green/icons/attach.png"); 
+			  display: block; width: 28px; height: 28px; background-repeat: no-repeat;
+			  }
+.video2 	{ background-image: url("../diabook-green/icons/video.png"); 
+			  display: block; width: 28px; height: 28px; background-repeat: no-repeat;
+			  }	
+.video 	{ background-image: url("../diabook-green/icons/video.png"); 
+			  display: block; width: 100%; height: 140px; background-repeat: no-repeat;
+			  }
+.audio2 	{ background-image: url("../diabook-green/icons/audio.png"); 
+			  display: block; width: 28px; height: 28px; background-repeat: no-repeat;
+			  }
+.audio 	{ background-image: url("../diabook-green/icons/audio.png"); 
+			  display: block; width: 28px; height: 28px; background-repeat: no-repeat;
+			  }
+.weblink 	{ background-image: url("../diabook-green/icons/weblink.png"); 
+			  display: block; width: 28px; height: 28px; background-repeat: no-repeat;
+			  }
+.globe 	{ background-image: url("../diabook-green/icons/globe.png"); 
+			  display: block; width: 28px; height: 28px; background-repeat: no-repeat;
+			  }
+.unglobe 	{ background-image: url("../diabook-green/icons/unglobe.png"); 
+			  display: block; width: 28px; height: 28px; background-repeat: no-repeat;
+			  }
+.edit    {background-image: url("../diabook-green/icons/pencil2.png"); 
+			  display: block; width: 28px; height: 28px; background-repeat: no-repeat;}
+			  
+			  
+
+
+.article	{ background-position: -50px  0px;}
+/*.audio 		{ background-position: -70px  0px;}*/
+.block 		{ background-position: -90px  0px;}
+/*.drop 		{ background-position: -110px 0px;}*/
+/*.drophide 	{ background-position: -130px 0px;}*/
+/*.edit 		{ background-position: -150px 0px;}*/
+/*.camera 	{ background-position: -170px 0px;}*/
+/*.dislike 	{ background-position: -190px 0px;}*/
+/*.like 		{ background-position: -210px 0px;}*/
+/*.link 		{ background-position: -230px 0px;}*/
+
+/*.globe 		{ background-position: -50px  -20px;}*/
+/*.noglobe 	{ background-position: -70px  -20px;}*/
+.no 		{ background-position: -90px  -20px;}
+.pause 		{ background-position: -110px -20px;}
+.play 		{ background-position: -130px -20px;}
+/*.pencil 	{ background-position: -150px -20px;}*/
+.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;}*/
+
+/*.video          { background-position: -110px -40px;}*/
+.youtube        { background-position: -130px -40px;}
+
+/*.attach         { background-position: -190px -40px;}*/
+/*.language       { background-position: -210px -40px;}*/
+
+
+.icon.on             { background-image: url("../diabook-green/icons/toogle_on.png"); background-repeat: no-repeat;}
+.icon.off            { background-image: url("../diabook-green/icons/toogle_off.png"); background-repeat: no-repeat;}
+.prev           { background-position: -90px  -60px;}
+.next           { background-position: -110px -60px;}
+/*.tagged     { background-position: -130px -60px;}*/
+
+.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 0px; }
+.type-audio { background-position: -40px 0px; }
+.type-text  { background-position: -60px 0px; }
+.type-unkn  { background-position: -80px 0px; }
+
+.icon.drop, .icon.drophide {
+ float: left;
+}
+
+.icon {
+  display: block;
+  width: 20px;
+  height: 20px;
+  /*background-image: url('icons.png');*/
+}
+
+.icon {
+  background-color: transparent ;
+  background-repeat: no-repeat;
+  /* background-position: left center; */
+  display: block;
+  overflow: hidden;
+  text-indent: -9999px;
+  padding: 1px;
+}
+
+.icon.border.camera{
+  background-image: url("../diabook-green/icons/camera.png"); 
+  display: block; width: 28px; height: 28px; background-repeat: no-repeat;
+	}
+	
+.icon.border.link{
+  background-image: url("../diabook-green/icons/weblink.png"); 
+  display: block; width: 28px; height: 28px; background-repeat: no-repeat;
+  margin-left: 10px;
+	}
+
+.icon.text {
+  text-indent: 0px;
+}
+.icon.s10 {
+  min-width: 10px;
+  height: 10px;
+}
+.icon.s10.notify {
+  background-image: url("../../../../images/icons/10/notify_off.png");
+}
+.icon.s10.gear {
+  background-image: url("../../../../images/icons/10/gear.png");
+}
+.icon.s10.add {
+  background-image: url("../../../../images/icons/10/add.png");
+}
+.icon.s10.delete {
+  background-image: url("../../../../images/icons/10/delete.png");
+}
+.icon.s10.edit {
+  background-image: url("../../../../images/icons/10/edit.png");
+}
+.icon.s10.star {
+  background-image: url("../../../../images/star_dummy.png");
+}
+.icon.s10.menu {
+  background-image: url("../../../../images/icons/10/menu.png");
+}
+.icon.s10.link {
+  background-image: url("../../../../images/icons/10/link.png");
+}
+.icon.s10.lock {
+  background-image: url("../../../../images/icons/10/lock.png");
+}
+.icon.s10.unlock {
+  background-image: url("../../../../images/icons/10/unlock.png");
+}
+.icon.s10.text {
+  padding: 2px 0px 0px 15px;
+  font-size: 10px;
+}
+.icon.s16 {
+  min-width: 16px;
+  height: 16px;
+}
+.icon.s16.notify {
+  background-image: url("../../../../images/icons/16/notify_off.png");
+}
+.icon.s16.gear {
+  background-image: url("../../../../images/icons/16/gear.png");
+}
+.icon.s16.add {
+  background-image: url("../../../../images/icons/16/add.png");
+}
+.icon.s16.delete {
+  background-image: url("../../../../images/icons/16/delete.png");
+}
+/*.icon.s16.edit {
+  background-image: url("../../../../images/icons/16/edit.png");
+}*/
+.icon.s16.star {
+  background-image: url("../../../../images/star_dummy.png");
+}
+.icon.s16.menu {
+  background-image: url("../../../../images/icons/16/menu.png");
+}
+/*.icon.s16.link {
+  background-image: url("../../../../images/icons/16/link.png");
+}*/
+.icon.s16.lock {
+  background-image: url("../../../../images/icons/16/lock.png");
+}
+.icon.s16.unlock {
+  background-image: url("../../../../images/icons/16/unlock.png");
+}
+.icon.s16.text {
+  padding: 4px 0px 0px 20px;
+  font-size: 10px;
+}
+.icon.s22 {
+  min-width: 22px;
+  height: 22px;
+}
+.icon.s22.notify {
+  background-image: url("../../../../images/icons/22/notify_off.png");
+}
+.icon.s22.gear {
+  background-image: url("../../../../images/icons/22/gear.png");
+}
+.icon.s22.add {
+  background-image: url("../../../../images/icons/22/add.png");
+}
+.icon.s22.delete {
+  background-image: url("../../../../images/icons/22/delete.png");
+}
+.icon.s22.edit {
+  background-image: url("../../../../images/icons/22/edit.png");
+}
+.icon.s22.star {
+  background-image: url("../../../../images/star_dummy.png");
+}
+.icon.s22.menu {
+  background-image: url("../../../../images/icons/22/menu.png");
+}
+.icon.s22.link {
+  background-image: url("../../../../images/icons/22/link.png");
+}
+.icon.s22.lock {
+  background-image: url("../../../../images/icons/22/lock.png");
+}
+.icon.s22.unlock {
+  background-image: url("../../../../images/icons/22/unlock.png");
+}
+.icon.s22.text {
+  padding: 10px 0px 0px 25px;
+  width: 200px;
+}
+.icon.s48 {
+  width: 48px;
+  height: 48px;
+}
+.icon.s48.notify {
+  background-image: url("../../../../images/icons/48/notify_off.png");
+}
+.icon.s48.gear {
+  background-image: url("../../../../images/icons/48/gear.png");
+}
+.icon.s48.add {
+  background-image: url("../../../../images/icons/48/add.png");
+}
+.icon.s48.delete {
+  background-image: url("../../../../images/icons/48/delete.png");
+}
+.icon.s48.edit {
+  background-image: url("../../../../images/icons/48/edit.png");
+}
+.icon.s48.star {
+  background-image: url("../../../../images/star_dummy.png");
+}
+.icon.s48.menu {
+  background-image: url("../../../../images/icons/48/menu.png");
+}
+.icon.s48.link {
+  background-image: url("../../../../images/icons/48/link.png");
+}
+.icon.s48.lock {
+  background-image: url("../../../../images/icons/48/lock.png");
+}
+.icon.s48.unlock {
+  background-image: url("../../../../images/icons/48/unlock.png");
+}
+
+#contact-edit-links ul {
+  list-style: none;
+  list-style-type: none;
+}
+
+.hide-comments-outer {
+  margin-left: 80px;
+  margin-bottom: 5px;
+  width: 484px;
+  border-bottom: 1px solid #BDCDD4;
+  border-top: 1px solid #BDCDD4;
+
+  padding: 8px;
+}
+
+/* global */
+body {
+  font-family: 'Lato', "Helvetica Neue", Helvetica, Arial, sans-serif;
+  font-size: 12.5px;
+  background-color: #ffffff;
+  color: #2d2d2d;
+  margin: 50px auto auto;
+  display: table;
+}
+
+h4 {
+  font-size: 1.1em;
+}
+
+a {
+	color: #333333;
+	/* color: #3e3e8c; */
+	text-decoration: none;
+}
+a:hover {
+	/* color: blue; */
+	text-decoration: underline
+}
+
+.wall-item-name-link {
+/*  float: left;*/
+}
+
+.wall-item-photo {
+  width: 48px;
+  height: 48px;
+  overflow: hidden;
+  display: block;
+}
+
+.left {
+  float: left;
+}
+.right {
+  float: right;
+}
+.hidden {
+  display: none;
+}
+.clear {
+  clear: both;
+}
+.fakelink {
+  color: #194719;
+  /* color: #3e3e8c; */
+  text-decoration: none;
+  cursor: pointer;
+}
+.fakelink:hover {
+  /* color: blue; */
+  /*color: #005c94; */
+  text-decoration: underline;
+}
+code {
+  font-family: Courier, monospace;
+  white-space: pre;
+  display: block;
+  overflow: auto;
+  border: 1px solid #444;
+  background: #EEE;
+  color: #444;
+  padding: 10px;
+  margin-top: 20px;
+}
+#panel {
+  position: absolute;
+  width: 12em;
+  background: #ffffff;
+  color: #2d2d2d;
+  margin: 0px;
+  padding: 1em;
+  list-style: none;
+  border: 3px solid #364e59;
+  z-index: 100000;
+  -webkit-box-shadow: 0px 5px 10px rgba(0, 0, 0, 0.7);
+  -moz-box-shadow: 0px 5px 10px rgba(0, 0, 0, 0.7);
+  box-shadow: 0px 5px 10px rgba(0, 0, 0, 0.7);
+}
+/* tool */
+.tool {
+  height: auto;
+  overflow: auto;
+  padding: 3px;
+}
+#saved-search-ul .tool:hover,
+#nets-sidebar .tool:hover,
+#sidebar-group-list .tool:hover {
+	background: #EEE;
+}
+.tool .label {
+  float: left;
+}
+.tool .action {
+  float: right;
+}
+.tool a {
+  color: ##3F8FBA;
+}
+.tool a:hover {
+  text-decoration: none;
+}
+/* popup notifications */
+div.jGrowl div.notice {
+  background: #511919 url("../../../../images/icons/48/notice.png") no-repeat 5px center;
+  color: #ffffff;
+  padding-left: 58px;
+}
+div.jGrowl div.info {
+  background: #364e59 url("../../../../images/icons/48/info.png") no-repeat 5px center;
+  color: #ffffff;
+  padding-left: 58px;
+}
+/* header */
+header {
+  position: fixed;
+  left: 0%;
+  right: 80%;
+  top: 0px;
+  margin: 0px;
+  padding: 0px;
+  width: 22%;
+  height: 32px;
+  background: #5CD65C;
+  background-color: #5CD65C;
+  z-index: 100;
+-webkit-box-shadow: -10px 0px 10px rgba(0, 0, 0, 0.7);
+  -moz-box-shadow: -10px 0px 10px rgba(0, 0, 0, 0.7);
+  box-shadow: -10px 0px 10px rgba(0, 0, 0, 0.7);
+   
+}
+header #site-location {
+  display: none;
+}
+header #banner {
+  overflow: hidden;
+  text-align: left;
+  width: 82%%;
+  margin-left: 25%;
+}
+header #banner a,
+header #banner a:active,
+header #banner a:visited,
+header #banner a:link,
+header #banner a:hover {
+  color: #1f1f1f;
+  text-decoration: none;
+  outline: none;
+  vertical-align: middle;
+  font-weight: bolder;
+  margin-left: 3px;
+}
+header #banner #logo-img {
+  height: 25px;
+  margin-top: 3px;
+}
+header #banner #logo-text {
+  font-size: 20px;
+  position: absolute;
+  top: 10%;
+}
+/* nav */
+nav {
+  width: 80%;
+  height: 32px;
+  position: fixed;
+  left: 22%;
+  top: 0px;
+  padding: 0px;
+  background: #5CD65C;
+  color: #1f1f1f;
+  z-index: 99;
+  -webkit-box-shadow: -10px 0px 10px rgba(0, 0, 0, 0.7);
+  -moz-box-shadow: -10px 0px 10px rgba(0, 0, 0, 0.7);
+  box-shadow: -10px 0px 10px rgba(0, 0, 0, 0.7);
+}
+nav a,
+nav a:active,
+nav a:visited,
+nav a:link,
+nav a:hover {
+  color: #1f1f1f;
+  text-decoration: none;
+  outline: none;
+}
+nav #banner {
+  overflow: hidden;
+  /*text-align: center;*/
+  width: 100%;
+}
+nav #banner a,
+nav #banner a:active,
+nav #banner a:visited,
+nav #banner a:link,
+nav #banner a:hover {
+  color: #1f1f1f;
+  text-decoration: none;
+  outline: none;
+  vertical-align: bottom;
+}
+nav #banner #logo-img {
+  height: 22px;
+  margin-top: 5px;
+}
+nav #banner #logo-text {
+  font-size: 22px;
+}
+nav #navbar{
+	}
+nav ul {
+  margin: 0px;
+  padding: 0px 20px;
+}
+nav ul li {
+  list-style: none;
+  margin: 0px;
+  /* padding: 1px 1px 3px 1px; */
+  float: left;
+}
+nav ul li .menu-popup {
+  left: 0px;
+  right: auto;
+}
+
+nav #logo-img {
+  height: 25px;
+  margin-top: 4px;
+  margin-left: 30px;
+}
+
+nav #logo-text {
+    font-size: 22px;
+    margin-top: 3px;
+    margin-right: 15px;
+}
+nav .nav-menu-search {
+  position: relative;
+
+  margin: 4px 17px;
+  margin-right: 0px;
+  height: 17px;
+  width: 180px;
+  
+}
+
+nav #search-box #search-text {
+  background-image:  url('icons/lupe.png');
+  background-repeat:no-repeat;
+  padding-left:20px;
+  border-top-left-radius: 15px;
+border-top-right-radius: 15px;
+border-bottom-right-radius: 15px;
+border-bottom-left-radius: 15px;
+	}
+
+
+nav .nav-menu-icon {
+  position: relative;
+  height: 22px;
+  padding: 5px;
+  margin: 0px 5px;
+  -moz-border-radius: 5px 5px 0 0;
+  -webkit-border-radius: 5px 5px 0 0;
+  border-radius: 5px 5px 0 0;
+}
+nav .nav-menu-icon:hover {
+  position: relative;
+  height: 22px;
+  padding: 5px;
+  margin: 0px 5px;
+  -moz-border-radius: 5px 5px 0 0;
+  -webkit-border-radius: 5px 5px 0 0;
+  border-radius: 5px 5px 0 0;
+}
+
+/*color*/
+nav .nav-menu-icon.selected {
+  background-color: #fff;
+}
+nav .nav-menu-icon img {
+  width: 22px;
+  height: 22px;
+}
+nav .nav-menu-icon .nav-notify {
+  top: 3px;
+}
+nav .nav-menu {
+  position: relative;
+  height: 16px;
+  padding: 5px;
+  margin: 3px 15px 0px;
+  font-size: 13px;
+  /*border-bottom: 3px solid #364A84;*/
+}
+nav .nav-menu.selected {
+  /*border-bottom: 3px solid #9eabb0;*/
+}
+nav .nav-notify {
+  display: none;
+  position: absolute;
+  background-color: #fff;
+  /* background-color: #19aeff; */
+  -moz-border-radius: 5px 5px 5px 5px;
+  -webkit-border-radius: 5px 5px 5px 5px;
+  border-radius: 5px 5px 5px 5px;
+  font-size: 10px;
+  font-weight: 900;
+  padding: 1px 4px;
+  top: 0px;
+  right: -6px;
+  min-width: 10px;
+  text-align: center;
+  border: 1px solid black;
+}
+nav .nav-notify.show {
+  display: block;
+}
+nav #nav-help-link,
+nav #nav-search-link,
+nav #nav-directory-link,
+nav #nav-apps-link,
+nav #nav-site-linkmenu, 
+nav #nav-home-link,
+nav #nav-user-linkmenu
+{
+  float: right;
+}
+nav #nav-user-linkmenu{
+	margin-right: 0px;
+	}
+nav #nav-home-link, #nav-directory-link, #nav-apps-link{
+	margin-left: 0px;
+	margin-right: 0px;
+	font-weight: bold;
+	margin: 3px 5px;
+	font-size: 14px;
+	}
+nav #nav-directory-link{
+  margin-right: 0px;	
+	}
+nav #nav-home-link{
+  margin-left: 0px;	
+	}
+nav #nav-help-link .menu-popup,
+nav #nav-search-link .menu-popup,
+nav #nav-directory-link .menu-popup,
+nav #nav-apps-link .menu-popup,
+nav #nav-site-linkmenu .menu-popup {
+  right: 0px;
+  left: auto;
+}
+
+nav #nav-messages-linkmenu.on .icon.messages, nav #nav-messages-linkmenu.selected .icon.messages{
+	background-image: url("../diabook-green/icons/messages.png");
+	}
+	
+/*nav #nav-notifications-linkmenu.on .icon.notify,*/ nav #nav-notifications-linkmenu.selected .icon.notify{
+	background-image: url("../diabook-green/icons/notify.png");
+	}
+	
+nav #nav-contacts-linkmenu.on .icon.contacts, nav #nav-contacts-linkmenu.selected .icon.contacts{
+	background-image: url("../diabook-green/icons/contacts.png");
+	}
+	
+nav #nav-apps-link.selected {
+ background-color: #fff;
+  moz-border-radius: 5px 5px 0 0;
+-webkit-border-radius: 5px 5px 0 0;
+border-radius: 5px 5px 0 0;
+}
+
+#nav-notifications-mark-all {
+	/* padding: 1px 1px 2px 26px; */
+	/* border-bottom: 1px solid #364E59; */
+	/* margin: 0px 0px 2px 0px;
+	padding: 5px 10px; */
+}
+
+#nav-notifications-see-all {
+	/* padding: 1px 1px 2px 26px; */
+	/* border-bottom: 1px solid #364E59; */
+	/* margin: 0px 0px 2px 0px;
+	padding: 5px 10px; */
+}
+
+.notify-seen {
+	background: none repeat scroll 0 0 #DDDDDD;
+	}
+
+ul.menu-popup {
+  position: absolute;
+  display: none;
+  width: 11em;
+  background: #F5FCF5;
+  color: #2d2d2d;
+  margin: 0px;
+  padding: 0px;
+  list-style: none;
+  z-index: 100000;
+  -webkit-box-shadow: 0px 5px 10px rgba(0, 0, 0, 0.7);
+  -moz-box-shadow: 0px 5px 10px rgba(0, 0, 0, 0.7);
+  box-shadow: 0px 5px 10px rgba(0, 0, 0, 0.7);
+}
+ul.menu-popup a {
+  display: block;
+  color: #2d2d2d;
+  padding: 5px 10px;
+  text-decoration: none;
+}
+ul.menu-popup a:hover {
+  background-color: #B8EDB8; /*bdcdd4;*/
+  color: #000;
+}
+ul.menu-popup .menu-sep {
+  border-top: 1px solid #9eabb0;
+}
+ul.menu-popup li {
+  float: none;
+  overflow: auto;
+  height: auto;
+  display: block;
+}
+ul.menu-popup li img {
+  float: left;
+  width: 16px;
+  height: 16px;
+  padding-right: 5px;
+}
+ul.menu-popup .empty {
+  padding: 5px;
+  text-align: center;
+  color: #9eabb0;
+}
+/* autocomplete popup */
+.acpopup {
+  max-height: 150px;
+  background-color: #ffffff;
+  color: #2d2d2d;
+  border: 1px solid #MenuBorder;
+  overflow: auto;
+  z-index: 100000;
+  -webkit-box-shadow: 0px 5px 10px rgba(0, 0, 0, 0.7);
+  -moz-box-shadow: 0px 5px 10px rgba(0, 0, 0, 0.7);
+  box-shadow: 0px 5px 10px rgba(0, 0, 0, 0.7);
+}
+.acpopupitem {
+  color: #2d2d2d;
+  padding: 4px;
+  clear: left;
+}
+.acpopupitem img {
+  float: left;
+  margin-right: 4px;
+}
+.acpopupitem.selected {
+  background-color: #bdcdd4;
+}
+#nav-notifications-menu {
+  width: 400px;
+  max-height: 550px;
+  overflow: auto;
+}
+/* #nav-notifications-menu a {
+	display: inline;
+	padding: 5px 0px;
+	margin: 0px 0px 2px 0px;
+}
+#nav-notifications-menu li:hover {
+  background-color: #bdcdd4;
+}*/
+
+#nav-notifications-menu img {
+  float: left;
+  margin-right: 5px;
+}
+#nav-notifications-menu .contactname {
+  font-weight: bold;
+}
+#nav-notifications-menu .notif-when {
+  font-size: 10px;
+  color: #9eabb0;
+  display: block;
+}
+
+.notif-image {
+        width: 32px;
+        height: 32px;
+        padding: 7px 7px 0px 0px;
+}
+
+/*profile_side*/
+#profile_side {
+  margin-bottom: 30px;
+}
+#ps-usericon{
+	height: 25px	
+	}
+#ps-username{
+  font-size: 1.17em;
+  font-weight: bold;
+  vertical-align: top;
+  position: absolute;
+  padding-top: 4px;
+  padding-left: 5px;	
+  word-wrap: break-word;
+  width: 130px;
+	}
+#ps-username:hover{
+  text-decoration: none;	
+	}
+.menu-profile-side{
+  list-style: none;	
+  padding-left: 0px;
+  min-height: 0px;
+	}
+.menu-profile-list{
+  height: auto;
+  overflow: auto;
+  padding-top: 3px;
+  padding-bottom: 3px;
+  padding-left: 16px;
+  min-height: 16px;
+  list-style: none;
+	}
+.menu-profile-list:hover{
+	background: #B8EDB8;
+	}
+.menu-profile-list-item{
+	padding-left: 5px;
+	}	
+.menu-profile-list-item:hover{	
+	text-decoration: none;
+   }
+/*http://prothemedesign.com/circular-icons/*/
+.menu-profile-list.home{
+	background: url("../diabook-green/icons/home.png") no-repeat;
+	}
+.menu-profile-list.photos{
+	background: url("../diabook-green/icons/mess_side.png") no-repeat;
+	}
+.menu-profile-list.events{
+	background: url("../diabook-green/icons/events.png") no-repeat;
+	}
+.menu-profile-list.notes{
+	background: url("../diabook-green/icons/notes.png") no-repeat;
+	}
+.menu-profile-list.foren{
+	background: url("../diabook-green/icons/pubgroups.png") no-repeat;
+	}
+.menu-profile-list.com_side{
+	background: url("../diabook-green/icons/com_side.png") no-repeat;
+	}
+
+/* aside */
+aside {
+  display: table-cell;
+  vertical-align: top;
+  width: 160px;
+  padding: 0px 10px 0px 10px;
+  border-right: 1px solid #D2D2D2;
+  float: left;
+  /* background: #F1F1F1; */
+}
+
+aside .vcard .fn {
+  font-size: 18px;
+  font-weight: bold;
+  margin-bottom: 5px;
+}
+aside .vcard .title {
+  margin-bottom: 5px;
+}
+aside .vcard dl {
+  height: auto;
+  overflow: auto;
+}
+aside .vcard dt {
+  float: left;
+  margin-left: 0px;
+  /*width: 35%;*/
+  text-align: right;
+  color: #999999;
+}
+aside .vcard dd {
+  float: left;
+  margin-left: 5px;
+  /*width: 60%;*/
+}
+aside #profile-extra-links ul {
+  padding: 0px;
+  margin: 0px;
+}
+aside #profile-extra-links li {
+  padding: 0px;
+  margin: 0px;
+  list-style: none;
+}
+aside #dfrn-request-link {
+  display: block;
+  -moz-border-radius: 5px 5px 5px 5px;
+  -webkit-border-radius: 5px 5px 5px 5px;
+  border-radius: 5px 5px 5px 5px;
+  color: #ffffff;
+  background: #005c94 url('../../../../images/connect-bg.png') no-repeat left center;
+  font-weight: bold;
+  text-transform: uppercase;
+  padding: 4px 2px 2px 35px;
+}
+aside #dfrn-request-link:hover {
+  text-decoration: none;
+  background-color: #36c;
+  /* background-color: #19aeff; */
+}
+aside #profiles-menu {
+  width: 20em;
+}
+aside #search-text {
+	width: 150px;
+	height: 17px;
+	padding-left: 10px;
+	border-top-left-radius: 15px;
+border-top-right-radius: 15px;
+border-bottom-right-radius: 15px;
+border-bottom-left-radius: 15px;
+}
+aside #side-follow-url {
+	width: 150px;
+	}
+aside #side-peoplefind-url {
+	width: 150px;
+	}
+#contact-block {
+  overflow: auto;
+  height: auto;
+}
+#contact-block .contact-block-h4 {
+  float: left;
+  margin: 5px 0px;
+}
+#contact-block .allcontact-link {
+  float: right;
+  margin: 5px 0px;
+}
+#contact-block .contact-block-content {
+  clear: both;
+  overflow: auto;
+  height: auto;
+}
+#contact-block .contact-block-link {
+  float: left;
+  margin: 0px 2px 2px 0px;
+}
+#contact-block .contact-block-link img {
+  widht: 48px;
+  height: 48px;
+}
+#lost-password-link {
+  float: left;
+  margin-right: 20px;	
+	}
+/* widget */
+.widget {
+  margin-bottom: 2em;
+  /*.action .s10 { width: 10px; overflow: hidden; padding: 0px;}
+	.action .s16 { width: 16px; overflow: hidden; padding: 0px;}*/
+/*  font-size: 12px; */
+}
+.widget h3 {
+  padding: 0px;
+  margin: 2px;
+}
+.widget .action {
+  opacity: 0.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;
+}
+.widget input.action {
+  opacity: 0.5;
+  -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;
+}
+.widget:hover .title .action {
+  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;
+}
+.widget .tool:hover .action {
+  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;
+}
+.widget .tool:hover .action.ticked {
+  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;
+}
+.widget ul {
+  padding: 0px;
+}
+.widget ul li {
+  padding-left: 16px;
+  min-height: 16px;
+  list-style: none;
+}
+#side-bar-photos-albums li{
+list-style-type: disc;
+}
+#side-bar-photos-albums ul li{
+  margin-left: 30px;
+  padding-left: 0px;
+	}
+#side-bar-photos-albums ul li a{
+  color: #3465A4;
+}
+.widget .tool.selected {
+  background: url("../diabook-green/icons/selected.png") no-repeat left center;
+}
+/* widget: search */
+span.sbox_l  {
+	background: white url('../diabook/icons/srch_l.gif') no-repeat top left;
+	float: left;
+	width: 19px; height: 19px;
+	margin-left: 10px;
+	margin-top: 5px;
+	
+}
+
+span.sbox_r  {
+	background: white url('../diabook/icons/srch_r.gif') no-repeat top left;
+	float: left;
+	width: 19px; height: 19px;
+	margin-top: 5px;
+}
+
+span.sbox input {
+	background: white url('../diabook/icons/srch_bg.gif') repeat-x top left;
+	float: left;
+	margin-top: 5px;
+	border: 0;
+	height: 13px; width: 100px;
+	padding: 3px;
+	font: 11px/13px arial;
+	color: #000;
+}
+#add-search-popup {
+  width: 200px;
+  top: 18px;
+}
+/* section */
+section {
+  display: table-cell;
+  vertical-align: top;
+  width: 611px;
+  padding: 0px 0px 0px 12px;
+}
+
+body .pageheader{
+  text-align: center;
+  font-size: 20px;
+  margin-bottom: 20px;
+  margin-top: 0px;
+  max-width: 575px;
+	}
+.qcomment{
+  max-width: 122px;	
+	}
+#id_username {
+  width: 173px;	
+	}
+#id_password {
+  width: 173px;		
+	}
+#id_openid_url {
+  width: 173px;	
+	}
+#contact-edit-end {
+	}
+.pager {
+   padding: 10px;
+	text-align: center;
+	font-size: 1.0em;
+	clear: both;
+	display: block;
+}	
+
+.tabs {
+    
+    background-position: 0 -20px;
+    background-repeat: repeat-x;
+    height: 27px;
+    padding: 0;
+ }
+.tab.button {
+    margin-left: 5px;	
+    /*background: none repeat scroll 0 0 #F8F8F8;*/
+    border: 1px solid #CCCCCC;
+    border-radius: 3px 3px 3px 3px;
+    font-weight: normal;
+    padding: 3px;
+    color:  #333333;
+	}
+	
+#birthday-notice, #event-notice, #birthday-wrapper, #event-wrapper{
+	margin-bottom: 10px;
+	}
+#birthday-wrapper a {
+	color: #3465A4;
+	}
+
+right_aside {
+  display: table-cell;
+  vertical-align: top;
+  width: 170px;
+  /*padding-right: 10px;*/
+  /*border-left: 1px solid #D2D2D2;*/
+  
+  /* background: #F1F1F1; */
+}
+right_aside a{color: #3465A4;}
+right_aside h3 {border-bottom: 1px solid #D2D2D2; padding-top: 5px; padding-bottom: 0px; padding-left: 9px; margin-bottom: 0px; 
+margin-top:30px;}
+right_aside .directory-item {	width: 50px; height: 50px; vertical-align: center; text-align: center; }
+right_aside .directory-photo { margin: 0px; }
+right_aside .directory-photo-img { max-width: 45px; max-height: 45px; }
+right_aside #likes { margin: 0px; padding: 0px; list-style: none; }
+right_aside .items-wrapper{ overflow: auto;	width: 100%; }
+right_aside #lastusers-wrapper { padding-left: 6px; padding-top: 3px; overflow: auto;	width: 100%; }
+right_aside #ra-photos-wrapper { padding-left: 5px; padding-top: 3px; overflow: auto;	width: 100%; }
+#page-sidebar-right_aside{margin-top: 0px; margin-bottom: 30px;}
+#page-sidebar-right_aside ul {margin-top: 0px;}
+#page-sidebar-right_aside .label {max-width: 128px;}
+right_aside .icon {width: 10px; height: 10px;}
+.close_box		{ 
+		background-image: url("../diabook-green/icons/close_box.png");
+		float: right;
+		cursor: pointer;
+		opacity: 0.1;
+		}
+.close_box:hover	{ 
+		background-image: url("../diabook-green/icons/close_box.png");
+		float: right;
+		cursor: pointer;
+		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;
+		}
+/* wall item */
+.tread-wrapper {
+  border-bottom: 1px solid #D2D2D2;
+  position: relative;
+  padding: 5px;
+  margin-bottom: 0px;
+  width: 575px;
+  padding-top: 10px;
+}
+.tread-wrapper a{
+  color: #194719;
+}
+
+.wall-item-decor {
+  position: absolute;
+  left: 790px;
+  top: -10px;
+  width: 16px;
+}
+
+.wall-item-container {
+  display: table;
+  width: 580px;
+}
+
+
+.wall-item-container .wall-item-item, .wall-item-container .wall-item-bottom {
+  display: table-row;
+}
+
+.wall-item-bottom {
+  font-size: 13px;
+}
+.wall-item-container .wall-item-bottom {
+/*  opacity: 0.5;
+  -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; */
+}
+.wall-item-container:hover .wall-item-bottom {
+/*  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; */
+}
+.wall-item-container .wall-item-info {
+  display: table-cell;
+  vertical-align: top;
+  text-align: left;
+  width: 80px;
+}
+.wall-item-container .wall-item-location {
+  padding-right: 40px;
+  display: table-cell;
+}
+.wall-item-container .wall-item-ago {
+  word-wrap: break-word;
+  width: 50px;
+  margin-left: 10px;
+  color: #999;
+}
+.wall-item-location {
+  
+  clear: both;
+  overflow: hidden;
+  
+  margin-bottom: 5px;
+}
+
+.wall-item-container .wall-item-content {
+
+  max-width: 420px;
+  word-wrap: break-word;
+
+
+}
+
+.wall-item-container .wall-item-content img {
+  max-width: 400px;
+
+}
+.wall-item-container .wall-item-links, .wall-item-container .wall-item-actions {
+  display: table-cell;
+  vertical-align: middle;
+}
+.wall-item-container .wall-item-links .icon, .wall-item-container .wall-item-actions .icon {
+  opacity: 0.5;
+  -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;
+}
+.wall-item-container .wall-item-links .icon:hover, .wall-item-container .wall-item-actions .icon: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;
+}
+.wall-item-container .wall-item-name {
+  font-weight: bold;
+}
+.wall-item-container .wall-item-actions-author {
+  width: 100%;
+  margin-bottom: 0.3em;
+}
+.wall-item-container .wall-item-actions-social {
+  float: left;
+  margin-bottom: 1px;
+  display: table-cell;
+}
+.wall-item-container .wall-item-actions-social a {
+  margin-right: 1em;
+}
+.wall-item-actions-social a {
+  float: left;
+}
+.wall-item-container .wall-item-actions-tools {
+  float: right;
+  width: 80px;
+  display: table-cell;
+}
+.wall-item-container .wall-item-actions-tools a {
+  float: right;
+}
+.wall-item-container .wall-item-actions-tools input {
+  float: right;
+}
+.wall-item-container.comment {
+  margin-top: 5px;
+  margin-bottom: 5px;
+  margin-left: 80px;
+  width: 500px;
+  border-bottom: 1px solid hsl(198, 21%, 79%);
+}
+.wall-item-container.comment .contact-photo {
+  width: 32px;
+  height: 32px;
+  margin-left: 16px;
+  /*background: url(../../../../images/icons/22/user.png) no-repeat center center;*/
+
+}
+.wall-item-container.comment {
+  top: 15px !important;
+  left: 15px !important;
+}
+.wall-item-container.comment .wall-item-links {
+  padding-left: 12px;
+}
+.wall-item-comment-wrapper {
+  margin: 1px 5px 5px 80px;
+}
+.wall-item-comment-wrapper .comment-edit-photo {
+  display: none;
+}
+.wall-item-comment-wrapper textarea {
+  height: 2.0em;
+  width: 100%;
+  font-size: 10px;
+  color: #999999;
+  border: 1px solid #DDD;
+  padding: 0.3em;
+  font-size: 14px;
+}
+.wall-item-comment-wrapper .comment-edit-text-full {
+  font-size: 14px;
+  height: 4em;
+  color: #2d2d2d;
+  border: 1px solid #2d2d2d;
+}
+.comment-edit-preview {
+  width: 500px;
+  margin-top: 10px;
+  background-color:  #fff797;
+}
+.comment-edit-preview .contact-photo {
+  width: 32px;
+  height: 32px;
+  margin-left: 16px;
+  /*background: url(../../../../images/icons/22/user.png) no-repeat center center;*/
+
+}
+.comment-edit-preview {
+  top: 15px !important;
+  left: 15px !important;
+}
+.comment-edit-preview .wall-item-links {
+  padding-left: 12px;
+}
+.comment-edit-preview .wall-item-container {
+  width: 700px;
+}
+.comment-edit-preview .tread-wrapper {
+  width: 700px;
+  padding: 0;
+  margin: 10px 0;
+}
+
+.shiny {
+  /* border-right: 10px solid #fce94f; */
+	border-right: 1px solid #A7C7F7;
+	padding-right: 12px;
+}
+
+#jot-preview-content{
+	margin-top: 30px;}
+	
+#jot-preview-content .tread-wrapper {
+  background-color: #fff797;
+}
+
+.wall-item-tags {
+  padding-top: 1px;
+  padding-bottom: 2px;
+}
+.tag {
+  /*background: url("../../../../images/tag_b.png") repeat-x center left;*/
+  color: #999;
+  padding-left: 3px;
+  font-size: 12px;
+}
+.tag a {
+  padding-right: 5px;
+  /*background: url("../../../../images/tag.png") no-repeat center right;*/
+  color: #999;
+}
+.wwto {
+  position: absolute !important;
+  width: 25px;
+  height: 25px;
+  background: #FFFFFF;
+  border: 2px solid #364e59;
+  height: 25px;
+  width: 25px;
+  overflow: hidden;
+  padding: 1px;
+  position: absolute !important;
+  top: 40px;
+  left: 30px;
+  -webkit-box-shadow: 0px 0px 10px rgba(0, 0, 0, 0.7);
+  -moz-box-shadow: 0px 0px 10px rgba(0, 0, 0, 0.7);
+  box-shadow: 0px 0px 10px rgba(0, 0, 0, 0.7);
+}
+.wwto .contact-photo {
+  width: auto;
+  height: 25px;
+}
+/* contacts menu */
+.contact-photo-wrapper {
+  position: relative;
+  width: 80px;
+}
+
+.contact-photo-wrapper.wwto {
+  width: 25px;
+}
+
+.contact-photo {
+  width: 48px;
+  height: 48px;
+  overflow: hidden;
+  display: block;
+}
+.contact-photo img {
+  width: 48px;
+  height: 48px;
+}
+
+.contact-wrapper {
+  float: left;
+  width: 90px;
+  height: 90px;
+  margin-bottom: 15px;
+}
+.contact-wrapper .contact-photo {
+  width: 80px;
+  height: 80px;
+}
+.contact-wrapper .contact-photo img {
+  width: 80px;
+  height: 80px;
+}
+.contact-wrapper {
+  left: 0px;
+  top: 63px;
+}
+.contact-photo {
+  width: 48px;
+  height: 48px;
+}
+.contact-photo img {
+  width: 48px;
+  height: 48px;
+}
+.contact-name {
+  /* text-align: center; */
+  /*font-weight: bold;*/
+  font-size: 12px;
+}
+.contact-details {
+  color: #999999;
+}
+/* editor */
+.jothidden {
+  display: none;
+}
+#jot {
+  width: 585px;
+  margin: 0px 2em 20px 0px;
+}
+#profile-jot-form #profile-jot-text {
+  height: 2.0em;
+  width: 99%;
+  font-size: 15px;
+  color: #999999;
+  border: 1px solid #DDD;
+  padding: 0.3em;
+  margin-bottom: 10px;
+}
+.grey
+{
+  display: inline;
+  float: right;	
+	}
+#jot #jot-tools {
+  margin: 0px;
+  padding: 0px;
+  height: 40px;
+  overflow: none;
+  width: 583px;
+  background-color: #fff;
+  border-bottom: 2px solid #9eabb0;
+}
+
+#jot #jot-tools li {
+  list-style: none;
+  float: left;
+  width: 80px;
+  height: 40px;
+  border-bottom: 2px solid #9eabb0;
+}
+#jot #jot-tools li a {
+  display: block;
+  color: #cccccc;
+  width: 100%;
+  height: 40px;
+  text-align: center;
+  line-height: 40px;
+  overflow: hidden;
+}
+#jot #jot-tools li:hover {
+  background-color: #364e59;
+  border-bottom: 2px solid #bdcdd4;
+}
+#jot #jot-tools li.perms {
+  float: right;
+  width: 40px;
+}
+#jot #jot-tools li.perms a.unlock {
+  width: 30px;
+  border-left: 10px solid #cccccc;
+  background-color: #cccccc;
+  background-position: left center;
+}
+#jot #jot-tools li.perms a.lock {
+  width: 30px;
+  border-left: 10px solid #666666;
+  background-color: #666666;
+}
+#jot #jot-tools li.submit {
+  float: right;
+  background-color: #cccccc;
+  border-bottom: 2px solid #cccccc;
+  border-right: 1px solid #666666;
+  border-left: 1px solid #666666;
+}
+#jot #jot-tools li.submit input {
+  border: 0px;
+  margin: 0px;
+  padding: 0px;
+  background-color: #cccccc;
+  color: #666666;
+  width: 80px;
+  height: 40px;
+  line-height: 40px;
+}
+#jot #jot-tools li.submit input:hover {
+  background-color: #bdcdd4;
+  color: #666666;
+}
+#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;
+}
+#profile-jot-form #jot-title {
+    
+  	 border-radius: 5px 5px 5px 5px;
+    font-weight: bold;
+    height: 20px;
+    margin: 0 0 5px;
+    width: 60%;
+    border: 1px solid #d2d2d2;
+}
+#profile-jot-form #jot-title:-webkit-input-placeholder {
+  font-weight: normal;
+}
+#profile-jot-form #jot-title:-moz-placeholder {
+  font-weight: normal;
+}
+#profile-jot-form #profile-jot-text_parent #profile-jot-text_tbl{
+	width: 585px;
+	height: 100px;
+	}
+#jot #jot-title:hover {
+  border: 1px solid #999999;
+}
+#jot #jot-title:focus {
+  border: 1px solid #999999;
+}
+#jot #character-counter {
+  width: 80px;
+  float: right;
+  text-align: right;
+  height: 20px;
+  line-height: 20px;
+  padding-right: 20px;
+}
+#jot-perms-icon, 
+#profile-location,
+#profile-nolocation,
+#profile-youtube, 
+#profile-video, 
+#profile-audio,
+#profile-link,
+#profile-title, 
+#wall-image-upload,
+#wall-file-upload,
+#wall-image-upload-div,
+#wall-file-upload-div,
+.hover, .focus {
+	cursor: pointer;
+	margin-top: 2px;
+}
+#profile-jot-wrapper{
+	margin: 0 2em 20px 0;
+   width: 585px;
+	}
+
+#profile-jot-submit-wrapper {
+	margin-bottom: 50px;
+	width: 585px;
+}
+
+#profile-jot-submit {
+	float: right;
+	margin-top: 2px;
+	font-size: 14px;
+}
+#profile-upload-wrapper {
+	float: left;
+	margin-top: 2px;
+	margin-left: 10px;
+	
+}
+#profile-attach-wrapper {
+	float: left;
+	margin-left: 15px;
+	margin-top: 2px;
+}
+#profile-rotator {
+	float: left;
+	margin-left: 30px;
+	margin-top: 2px;
+}
+#profile-link-wrapper {
+	float: left;
+	margin-left: 15px;
+	margin-top: 2px;
+}
+#profile-youtube-wrapper {
+	float: left;
+	margin-left: 15px;
+	margin-top: 2px;
+}
+#profile-video-wrapper {
+	float: left;
+	margin-left: 15px;
+	margin-top: 2px;
+}
+#profile-audio-wrapper {
+	float: left;
+	margin-left: 15px;
+	margin-top: 2px;
+}
+#profile-location-wrapper {
+	float: left;
+	margin-left: 15px;
+	margin-top: 2px;
+}
+#profile-jot-perms {
+	float: left;
+	margin-left: 45px;
+	margin-top: 2px;
+}
+#jot-preview-link {
+	float: right;
+	margin-left: 10px;
+	margin-top: 2px;
+	font-size: 9px;
+	font-weight: bolder;
+	cursor: pointer;
+}
+#profile-jot-perms{
+   float: right;
+	margin-left: 10px;
+	margin-top: 2px;	
+	}
+/** buttons **/
+.button.creation1 {
+    background-color: #fff;
+    border: 1px solid #777777;
+    border-radius: 3px 3px 3px 3px;
+    box-shadow: 0 1px 1px #CFCFCF;
+ 	 font-weight: bolder;
+	 cursor: pointer;
+}
+.button.creation2 {
+    background-color: #194719;
+    border: 1px solid #777777;
+    color: white;
+    border-radius: 3px 3px 3px 3px;
+    box-shadow: 0 1px 1px #CFCFCF;
+    margin-left: 5px;
+    font-weight: bolder;
+	 cursor: pointer;
+}
+/*input[type="submit"] {
+	border: 0px;
+    background-color: @ButtonBackgroundColor;
+    color: @ButtonColor;
+    padding: 0px 10px;
+	.rounded(5px);
+    height: 18px;
+}*/
+/** acl **/
+#photo-edit-perms-select, #photos-upload-permissions-wrapper, #profile-jot-acl-wrapper {
+  display: block!important;
+}
+#acl-wrapper {
+  width: 690px;
+  float: left;
+}
+#acl-search {
+  float: right;
+  background: #ffffff url("../../../../images/search_18.png") no-repeat right center;
+  padding-right: 20px;
+}
+#acl-showall {
+  float: left;
+  display: block;
+  width: auto;
+  height: 18px;
+  background-color: #cccccc;
+  background-image: url("../../../../images/show_all_off.png");
+  background-position: 7px 7px;
+  background-repeat: no-repeat;
+  padding: 7px 5px 0px 30px;
+  color: #999999;
+  -moz-border-radius: 5px 5px 5px 5px;
+  -webkit-border-radius: 5px 5px 5px 5px;
+  border-radius: 5px 5px 5px 5px;
+}
+#acl-showall.selected {
+  color: #000000;
+  background-color: #ff9900;
+  background-image: url("../../../../images/show_all_on.png");
+}
+#acl-list {
+  height: 210px;
+  border: 1px solid #cccccc;
+  clear: both;
+  margin-top: 30px;
+  overflow: auto;
+}
+.acl-list-item {
+  display: block;
+  width: 150px;
+  height: 30px;
+  border: 1px solid #cccccc;
+  margin: 5px;
+  float: left;
+}
+.acl-list-item img {
+  width: 22px;
+  height: 22px;
+  float: left;
+  margin: 4px;
+}
+.acl-list-item p {
+  height: 12px;
+  font-size: 10px;
+  margin: 0px;
+  padding: 2px 0px 1px;
+  overflow: hidden;
+}
+.acl-list-item a {
+  font-size: 8px;
+  display: block;
+  width: 40px;
+  height: 10px;
+  float: left;
+  color: #999999;
+  background-color: #cccccc;
+  background-position: 3px 3px;
+  background-repeat: no-repeat;
+  margin-right: 5px;
+  -webkit-border-radius: 2px ;
+  -moz-border-radius: 2px;
+  border-radius: 2px;
+  padding-left: 15px;
+}
+#acl-wrapper a:hover {
+  text-decoration: none;
+  color: #000000;
+}
+.acl-button-show {
+  background-image: url("../../../../images/show_off.png");
+}
+.acl-button-hide {
+  background-image: url("../../../../images/hide_off.png");
+}
+.acl-button-show.selected {
+  color: #000000;
+  background-color: #9ade00;
+  background-image: url("../../../../images/show_on.png");
+}
+.acl-button-hide.selected {
+  color: #000000;
+  background-color: #ff4141;
+  background-image: url("../../../../images/hide_on.png");
+}
+.acl-list-item.groupshow {
+  border-color: #9ade00;
+}
+.acl-list-item.grouphide {
+  border-color: #ff4141;
+}
+/** /acl **/
+/** tab buttons 14618a**/
+ul.tabs {
+  list-style-type: none;
+  padding-bottom: 10px;
+  font-size: 13px;
+}
+ul.tabs li {
+  float: left;
+  margin-left: 5px;
+}
+ul.tabs li .active {
+    background-color: #194719;
+    border: 1px solid #777777;
+    color: white;
+    border-radius: 3px 3px 3px 3px;
+    box-shadow: 2px 2px 2px #CFCFCF;
+    margin-left: 5px;
+}
+/**
+ * Form fields
+ */
+.field {
+  margin-bottom: 10px;
+  padding-bottom: 10px;
+  overflow: auto;
+  width: 100%;
+}
+.field label {
+  float: left;
+  width: 200px;
+}
+.field input, .field textarea {
+  width: 400px;
+}
+.field textarea {
+  height: 100px;
+}
+.field .field_help {
+  display: block;
+  margin-left: 200px;
+  color: #666666;
+}
+.field .onoff {
+  float: left;
+  width: 80px;
+}
+.field .onoff a {
+  display: block;
+  border: 1px solid #666666;
+  background-image: url("../../../../images/onoff.jpg");
+  background-repeat: no-repeat;
+  padding: 4px 2px 2px 2px;
+  height: 16px;
+  text-decoration: none;
+}
+.field .onoff .off {
+  border-color: #666666;
+  padding-left: 40px;
+  background-position: left center;
+  background-color: #cccccc;
+  color: #666666;
+  text-align: right;
+}
+.field .onoff .on {
+  border-color: #204A87;
+  padding-right: 40px;
+  background-position: right center;
+  background-color: #D7E3F1;
+  color: #204A87;
+  text-align: left;
+}
+.field .hidden {
+  display: none!important;
+}
+.field.radio .field_help {
+  margin-left: 0px;
+}
+#directory-search-form{
+	margin-bottom: 50px;
+	}
+#profile-edit-links-end {
+        clear: both;
+        margin-bottom: 15px;
+}
+
+#profile-edit-links ul { margin: 20px; padding-bottom: 20px; list-style: none; }
+
+#profile-edit-links li {
+  float: left;
+  list-style: none;
+  margin-left: 10px;
+}
+
+.profile-edit-side-div {
+  display: none;
+}
+
+#register-form label,
+#profile-edit-form label {
+        width: 300px; float: left;
+}
+
+.required {
+  display: inline;
+  color: #B20202;
+}
+
+/* oauth */
+.oauthapp {
+  height: auto;
+  overflow: auto;
+  border-bottom: 2px solid #cccccc;
+  padding-bottom: 1em;
+  margin-bottom: 1em;
+}
+.oauthapp img {
+  float: left;
+  width: 48px;
+  height: 48px;
+  margin: 10px;
+}
+.oauthapp img.noicon {
+  background-image: url("../../../../images/icons/48/plugin.png");
+  background-position: center center;
+  background-repeat: no-repeat;
+}
+.oauthapp a {
+  float: left;
+}
+/* contacts */
+.contact-entry-wrapper {
+  width: 120px;
+  height: 120px;
+  float: left;
+}
+/* photo */
+.photo {
+box-shadow: 2px 2px 5px 0px #000000;
+margin: 0px;
+border-radius: 10px;
+height: 145px !important;
+width: 145px !important;
+}
+.lframe {
+  float: left;
+  /*margin: 0px 10px 10px 0px;*/
+}
+/* profile match wrapper */
+.profile-match-wrapper {
+  float: left;
+  width: 90px;
+  height: 90px;
+  margin-bottom: 20px;
+}
+.profile-match-wrapper .contact-photo {
+  width: 80px;
+  height: 80px;
+}
+.profile-match-wrapper .contact-photo img {
+  width: 80px;
+  height: 80px;
+}
+.profile-match-wrapper {
+  left: 0px;
+  top: 63px;
+}
+
+.contact-photo-menu-button {
+        position: relative;
+        background-image: url("../../../../images/icons/16/menu.png");
+        background-position: top left; 
+        background-repeat: no-repeat;
+        margin: 0px 0px -16px 0px; 
+	padding: 0px;
+        width: 16px;
+        height: 16px;
+        top: -16px; left:0px;
+        overflow: hidden;
+        text-indent: 40px;
+        display: none;
+        
+}
+.contact-photo-menu {
+        width: 11em;
+        border: 3px solid #364e59;
+	color: #2d2d2d;
+        background: #FFFFFF;
+/*        position: absolute;*/
+        position: relative;
+        left: 0px; top: 0px;
+        display: none;
+        z-index: 10000;
+}
+.contact-photo-menu ul { margin:0px; padding: 0px; list-style: none }
+.contact-photo-menu li a {
+	display: block; 
+	padding: 5px 10px; 
+	color: #2d2d2d;
+	text-decoration: none;
+}
+.contact-photo-menu li a:hover {
+	background-color: #bdcdd4; 
+}
+
+/* page footer */
+footer {
+  height: 100px;
+  display: table-row;
+}
+
+blockquote {
+    border-left: 1px solid #D2D2D2;
+    padding-left: 9px;
+    margin: 0 0 0 .8ex;
+	 color: #777;
+}
+.oembed {
+	
+	font-weight: bold;
+}
+.aprofile dt{
+box-shadow: 1px 1px 5px 0;
+    color: #666666;
+    margin: 15px 0 5px;
+    padding-left: 5px;	
+	}
+/* ================== */
+/* = Contacts Block = */
+/* ================== */
+
+.contact-block-img {
+        width: 48px;
+        height: 48px;
+        padding-right: 3px;
+}
+.contact-block-div {
+        float: left;
+}
+
+.contact-block-textdiv { width: 150px; height: 34px; float: left; }
+#contact-block-end { clear: both; } 
+
+#group-edit-wrapper {
+        margin-bottom: 10px;
+}
+
+#group-members-end {
+        clear: both;
+}
+#group-edit-desc {
+ margin-top: 15px;
+}
+
+/*
+#group-separator,
+#prof-separator { display: none;}
+*/
+#prof-members-end{
+	clear: both;
+	}
+
+#prvmail-to-label, #prvmail-subject-label, #prvmail-message-label {
+	margin-bottom: 10px;
+	margin-top: 20px;
+}
+
+#prvmail-submit {
+	float: right;
+	margin-top: 10px;
+}
+
+#prvmail-subject
+{
+background: none repeat scroll 0 0 #FFFFFF;
+border: 1px solid #CCCCCC;
+border-radius: 5px 5px 5px 5px;
+font-weight: bold;
+height: 20px;
+margin: 0 0 5px;
+vertical-align: middle;
+}
+#prvmail-form{
+ width: 597px;	
+	}
+	
+#prvmail-upload-wrapper,
+#prvmail-link-wrapper,
+#prvmail-rotator-wrapper {
+	float: left;
+	margin-top: 10px;
+	margin-right: 10px;
+	width: 24px;
+}
+
+#prvmail-end {
+	clear: both;
+}
+
+.mail-list-sender,
+.mail-list-detail {
+	float: left;
+}
+.mail-list-detail {
+	margin-left: 20px;
+}
+
+.mail-list-subject {
+	font-size: 1.1em;
+	margin-top: 10px;
+}
+a.mail-list-link {
+    display: block;
+    font-size: 1.3em;
+    padding: 4px 0;
+}
+
+/*
+*a.mail-list-link:hover {
+*	background-color: #15607B;
+*	color: #F5F6FB;
+*}
+*/
+
+.mail-list-outside-wrapper-end {
+	clear: both;
+}
+
+.mail-list-outside-wrapper {
+	margin-top: 30px;
+}
+
+.mail-list-delete-wrapper {
+	float: right;
+	margin-right: 30px;
+	margin-top: 15px;
+}
+
+.mail-list-delete-icon {
+	border: none;
+}
+
+.mail-conv-sender,
+.mail-conv-detail {
+	float: left;
+}
+.mail-conv-detail {
+	margin-left: 20px;
+	width: 500px;
+}
+
+.mail-conv-subject {
+    font-size: 1.4em;
+    margin: 10px 0;
+}
+
+.mail-conv-outside-wrapper-end {
+	clear: both;
+}
+
+.mail-conv-outside-wrapper {
+	margin-top: 30px;
+}
+
+.mail-conv-delete-wrapper {
+	float: right;
+	margin-right: 30px;
+	margin-top: 15px;
+}
+.mail-conv-break {
+	clear: both;
+}
+
+.mail-conv-delete-icon {
+	border: none;
+}
+
+/* ========== */
+/* = Events = */
+/* ========== */
+.eventcal {
+        float: left;
+        font-size: 20px;
+}
+
+.vevent {
+
+}
+.vevent .event-description, .vevent .event-location {
+        margin-left: 10px;
+        margin-right: 10px;
+}
+.vevent .event-start {
+        margin-left: 10px;
+        margin-right: 10px;
+}
+
+#new-event-link {
+        margin-bottom: 10px;
+}
+
+.edit-event-link, .plink-event-link {
+        float: left;
+        margin-top: 4px;
+        margin-right: 4px;
+        margin-bottom: 15px;
+}
+
+.event-description:before {
+        content: url('../../../../images/calendar.png');
+        margin-right: 15px;
+}
+
+.event-start, .event-end {
+        margin-left: 10px;
+        width: 330px;
+        clear: both;
+}
+
+.event-start .dtstart, .event-end .dtend {
+        float: right;
+}
+
+.event-list-date {
+        margin-bottom: 10px;
+}
+
+.prevcal, .nextcal {
+        float: left;
+        margin-left: 32px;
+        margin-right: 32px;
+        margin-top: 64px;
+}
+.event-calendar-end {
+        clear: both;
+}
+
+ 
+.calendar {
+        font-family: Courier, monospace;
+}
+.calendar.eventcal a {
+  color: #3465A4;	
+	}
+.today {
+        font-weight: bold;
+        color: #FF0000;
+}
+
+.settings-block {
+        border: 1px solid #AAA;
+        margin: 10px;
+        padding: 10px;
+}
+
+.app-title {
+        margin: 10px;
+}
+
+#identity-manage-desc {
+        margin-top:15px;
+        margin-bottom: 15px;
+}
+
+#identity-manage-choose {
+        margin-bottom: 15px;
+}
+
+#identity-submit {
+        margin-top: 20px;
+}
+
+#photo-prev-link, #photo-next-link {
+        padding: 10px;
+        float: left;
+}
+.lightbox{
+	float: left;
+	}
+
+#photo-photo {
+        float: left;
+}
+#photo-like-div .wall-item-like-buttons {
+	 float: left;
+    margin-right: 5px;
+    margin-top: 30px;
+	}
+.comment-edit-text-empty {
+    margin: 10px 0 0;
+    width: 85%;
+}
+.comment-edit-photo {
+    margin: 10px 0 0;
+}
+.wall-item-like-buttons .icon.like {
+float: left;
+}
+
+#photo-photo-end {
+        clear: both;
+}
+
+.tabs .comment-wwedit-wrapper {
+	display: block;
+   margin-top: 30px;
+   margin-left: 50px;
+	}
+
+.profile-match-photo {
+        float: left;
+        text-align: center;
+        width: 120px;
+}
+
+.profile-match-name {
+        float: left;
+        text-align: center;
+        width: 120px;
+        overflow: hidden;
+}
+
+.profile-match-break,
+.profile-match-end {
+        clear: both;
+}
+
+.profile-match-connect {
+        text-align: center;
+        font-weight: bold;
+}
+
+.profile-match-wrapper {
+        float: left;
+        padding: 10px;
+        width: 120px;
+        height: 120px;
+        scroll: auto;
+}
+#profile-match-wrapper-end {
+        clear: both;
+}
+
+/* ============= */
+/* = Directory = */
+/* ============= */
+/* contacts menu */
+.contact-photo-wrapper {
+  position: relative;
+}
+.contact-photo {
+  width: 48px;
+  height: 48px;
+  overflow: hidden;
+  display: block;
+}
+.contact-photo img {
+  width: 48px;
+  height: 48px;
+}
+.contact-photo-menu-button {
+  display: none;
+  /* position: absolute; */
+  /* position: absolute; */
+  left: 0px;
+  top: -16px;
+}
+.contact-wrapper {
+  float: left;
+  width: 90px;
+  height: 90px;
+  margin-bottom: 15px;
+}
+.contact-wrapper .contact-photo {
+  width: 80px;
+  height: 80px;
+}
+.contact-wrapper .contact-photo img {
+  width: 80px;
+  height: 80px;
+}
+.contact-wrapper .contact-photo-menu-button {
+  left: 0px;
+  top: 63px;
+}
+.directory-item {
+  float: left;
+  width: 200px;
+  height: 200px;
+}
+.directory-item .contact-photo {
+  width: 175px;
+  height: 175px;
+}
+.directory-item .contact-photo img {
+  width: 175px;
+  height: 175px;
+}
+.contact-name {
+  text-align: left;
+  font-weight: bold;
+  font-size: 12px;
+}
+.contact-details {
+  color: #999999;
+}
+#side-bar-photos-albums li{
+list-style-type: disc;
+}
+#side-bar-photos-albums ul li{
+  margin-left: 30px;
+  padding-left: 0px;
+	}
+#side-bar-photos-albums{
+	margin-top: 15px;	
+	}
+.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-album-image-wrapper, .photo-top-image-wrapper {
+  float: left;
+   -moz-box-shadow: 0 0 5px #888;
+   -webkit-box-shadow: 0 0 5px #888;
+   box-shadow: 0 0 5px #888;
+  background-color: #000;
+   -webkit-border-radius: 5px;
+   -moz-border-radius: 5px;
+  border-radius: 5px;
+  padding-bottom: 20px;
+  position: relative;
+  margin: 0 10px 10px 0;
+  width: 200px; height: 140px;
+  overflow: hidden;  
+}
+.photo-top-album-name {
+        width: 100%;
+        position: absolute; 
+        bottom: 0px; 
+        padding-left: 3px;
+        background-color: #EEE;
+}
+.photo-top-album-link{
+  color: #3465A4;
+	}
+.photo-top-album-img{
+	
+	}
+/*.photo-top-image-wrapper {
+        position: relative;
+        float: left;
+        margin-top: 15px;
+        margin-right: 15px;
+        width: 200px; height: 200px; 
+        overflow: hidden; 
+}
+.photo-top-album-name {
+        width: 100%;
+        min-height: 2em;
+        position: absolute; 
+        bottom: 0px; 
+        padding: 0px 3px;
+        padding-top: 0.5em;
+        background-color: rgb(255, 255, 255);
+}*/
+#photo-top-end {
+        clear: both;
+}
+
+#photo-top-links {
+        margin-bottom: 30px;
+        margin-left: 30px;
+}
+
+#photos-upload-newalbum-div {
+        float: left;
+        width: 175px;
+}
+
diff --git a/view/theme/diabook/diabook-green/style-wide.css b/view/theme/diabook/diabook-green/style-wide.css
new file mode 100644
index 000000000..e07af7c69
--- /dev/null
+++ b/view/theme/diabook/diabook-green/style-wide.css
@@ -0,0 +1,2920 @@
+/**
+ * Fabio Comuni <http://kirgroup.com/profile/fabrixxm>
+ * Additional Changes: Michael Vogel <icarus@dabo.de>
+ **/
+
+/* ========= */
+/* = Admin = */
+/* ========= */
+
+#adminpage {
+/*        width: 80%;*/
+}
+
+#pending-update {
+        float:right;
+        color: #ffffff;
+        font-weight: bold;
+        background-color: #FF0000;
+        padding: 0em 0.3em;
+}
+
+.admin.linklist {
+        border: 0px; padding: 0px;
+}
+
+.admin.link {
+        list-style-position: inside;
+        font-size: 1em;
+        padding: 5px;
+        width: 100px;
+        margin: 5px;
+}
+
+#adminpage dl {
+        clear: left;
+        margin-bottom: 2px;
+        padding-bottom: 2px;
+        border-bottom: 1px solid black;
+}
+
+#adminpage dt {
+        width: 200px;
+        float: left;
+        font-weight: bold;
+}
+
+#adminpage dd {
+        margin-left: 200px;
+}
+#adminpage h3 {
+        border-bottom: 1px solid #898989;
+        margin-bottom: 5px;
+        margin-top: 10px;
+}
+
+#adminpage .submit {
+        clear:left;
+}
+
+#adminpage #pluginslist {
+        margin: 0px; padding: 0px;
+}
+
+#adminpage .plugin {
+        list-style: none;
+        display: block;
+	/* border: 1px solid #888888; */
+        padding: 1em;
+        margin-bottom: 5px;
+        clear: left;
+}
+
+#adminpage .toggleplugin {
+        float:left;
+        margin-right: 1em;
+}
+
+#adminpage table {width:100%; border-bottom: 1p solid #000000; margin: 5px 0px;}
+#adminpage table th { text-align: left;}
+#adminpage td .icon { float: left;}
+#adminpage table#users img { width: 16px; height: 16px; }
+#adminpage table tr:hover { background-color: #eeeeee; }
+#adminpage .selectall { text-align: right; }
+/* icons */
+
+.icon.bb-url{
+  background-image: url("../../../view/theme/diabook/diabook-green/icons/bb-url.png");
+  float: right;
+  margin-top: 2px;}
+.icon.quote{
+  background-image: url("../../../view/theme/diabook/diabook-green/icons/quote.png");
+  float: right;
+  margin-top: 2px;}
+.icon.bold{
+  background-image: url("../../../view/theme/diabook/diabook-green/icons/bold.png");
+  float: right;
+  margin-top: 2px;}
+.icon.underline{
+  background-image: url("../../../view/theme/diabook/diabook-green/icons/underline.png");
+  float: right;
+  margin-top: 2px;}
+.icon.italic{
+  background-image: url("../../../view/theme/diabook/diabook-green/icons/italic.png");
+  float: right;
+  margin-top: 2px;}
+.icon.bb-image{
+  background-image: url("../../../view/theme/diabook/diabook-green/icons/bb-image.png");
+  float: right;
+  margin-top: 2px;}
+.icon.bb-video{
+  background-image: url("../../../view/theme/diabook/diabook-green/icons/bb-video.png");
+  float: right;
+  margin-top: 2px;}
+  
+.icon.contacts {
+  background-image: url("../../../view/theme/diabook/diabook-green/icons/contacts.png");}
+.icon.notifications {
+  background-image: url("../../../view/theme/diabook/diabook-green/icons/notifications.png");}
+.icon.notify {
+  background-image: url("../../../view/theme/diabook/diabook-green/icons/notify.png");}
+.icon.messages {
+  background-image: url("../../../view/theme/diabook/diabook-green/icons/messages.png");}
+.icon.community {
+  background-image: url("../../../view/theme/diabook/diabook-green/icons/community.png");}
+  
+.icon.drop 	{ background-image: url("../../../view/theme/diabook/diabook-green/icons/drop.png");}
+.icon.drophide 	{ background-image: url("../../../view/theme/diabook/diabook-green/icons/drop.png");}
+.icon.dislike 	{ background-image: url("../../../view/theme/diabook/diabook-green/icons/dislike.png");}
+.icon.like 	{ background-image: url("../../../view/theme/diabook/diabook-green/icons/like.png");}
+.icon.pencil 	{ background-image: url("../../../view/theme/diabook/diabook-green/icons/pencil.png");}
+.icon.recycle 	{ background-image: url("../../../view/theme/diabook/diabook-green/icons/recycle.png");}
+.icon.remote-link { background-image: url("../../../view/theme/diabook/diabook-green/icons/remote.png");}
+.icon.tagged    { background-image: url("../../../view/theme/diabook/diabook-green/icons/tagged.png");}
+.icon.file-as { background-image: url("../../../view/theme/diabook/diabook-green/icons/file_as.png");}
+.star-item.icon.unstarred { background-image: url("../../../view/theme/diabook/diabook-green/icons/unstarred.png");}
+.star-item.icon.starred { background-image: url("../../../view/theme/diabook/diabook-green/icons/starred.png");}
+.icon.link		{ background-image: url("../../../view/theme/diabook/diabook-green/icons/link.png");}
+.icon.lock		{ background-image: url("../../../view/theme/diabook/diabook-green/icons/lock.png");}
+.icon.unlock		{ background-image: url("../../../view/theme/diabook/diabook-green/icons/unlock.png");}
+.icon.language    { background-image: url("../../../view/theme/diabook/diabook-green/icons/language.png");}
+
+
+.camera 	{ background-image: url("../../../view/theme/diabook/diabook-green/icons/camera.png"); 
+			  display: block; width: 28px; height: 28px; background-repeat: no-repeat;
+			  }
+.attach 	{ background-image: url("../../../view/theme/diabook/diabook-green/icons/attach.png"); 
+			  display: block; width: 28px; height: 28px; background-repeat: no-repeat;
+			  }
+.video2 	{ background-image: url("../../../view/theme/diabook/diabook-green/icons/video.png"); 
+			  display: block; width: 28px; height: 28px; background-repeat: no-repeat;
+			  }	
+.video 	{ background-image: url("../../../view/theme/diabook/diabook-green/icons/video.png"); 
+			  display: block; width: 100%; height: 140px; background-repeat: no-repeat;
+			  }
+.audio2 	{ background-image: url("../../../view/theme/diabook/diabook-green/icons/audio.png"); 
+			  display: block; width: 28px; height: 28px; background-repeat: no-repeat;
+			  }
+.audio 	{ background-image: url("../../../view/theme/diabook/diabook-green/icons/audio.png"); 
+			  display: block; width: 28px; height: 28px; background-repeat: no-repeat;
+			  }
+.weblink 	{ background-image: url("../../../view/theme/diabook/diabook-green/icons/weblink.png"); 
+			  display: block; width: 28px; height: 28px; background-repeat: no-repeat;
+			  }
+.globe 	{ background-image: url("../../../view/theme/diabook/diabook-green/icons/globe.png"); 
+			  display: block; width: 28px; height: 28px; background-repeat: no-repeat;
+			  }
+.unglobe 	{ background-image: url("../../../view/theme/diabook/diabook-green/icons/unglobe.png"); 
+			  display: block; width: 28px; height: 28px; background-repeat: no-repeat;
+			  }
+.edit    {background-image: url("../../../view/theme/diabook/diabook-green/icons/pencil2.png"); 
+			  display: block; width: 28px; height: 28px; background-repeat: no-repeat;}
+.icon.block   {background-image: url("../diabook/icons/block.png"); 
+			  display: block; width: 16px; height: 16px; background-repeat: no-repeat;}
+.icon.block.dim  {background-image: url("../diabook/icons/block.png"); 
+			  display: block; width: 16px; height: 16px; background-repeat: no-repeat; opacity: 0.3;}
+.icon.ad_drop 	{ background-image: url("../diabook/icons/drop.png");
+			  display: block; margin-left:5px; width: 16px; height: 16px; background-repeat: no-repeat;}			  
+			  
+
+
+.article	{ background-position: -50px  0px;}
+/*.audio 		{ background-position: -70px  0px;}*/
+/*.drop 		{ background-position: -110px 0px;}*/
+/*.drophide 	{ background-position: -130px 0px;}*/
+/*.edit 		{ background-position: -150px 0px;}*/
+/*.camera 	{ background-position: -170px 0px;}*/
+/*.dislike 	{ background-position: -190px 0px;}*/
+/*.like 		{ background-position: -210px 0px;}*/
+/*.link 		{ background-position: -230px 0px;}*/
+
+/*.globe 		{ background-position: -50px  -20px;}*/
+/*.noglobe 	{ background-position: -70px  -20px;}*/
+.no 		{ background-position: -90px  -20px;}
+.pause 		{ background-position: -110px -20px;}
+.play 		{ background-position: -130px -20px;}
+/*.pencil 	{ background-position: -150px -20px;}*/
+.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;}*/
+
+/*.video          { background-position: -110px -40px;}*/
+.youtube        { background-position: -130px -40px;}
+
+/*.attach         { background-position: -190px -40px;}*/
+/*.language       { background-position: -210px -40px;}*/
+
+
+.icon.on             { background-image: url("../../../view/theme/diabook/diabook-green/icons/toogle_on.png"); background-repeat: no-repeat;}
+.icon.off            { background-image: url("../../../view/theme/diabook/diabook-green/icons/toogle_off.png"); background-repeat: no-repeat;}
+.icon.prev           { background-image: url("../../../view/theme/diabook/diabook-green/icons/prev.png"); background-repeat: no-repeat;}
+.icon.next           { background-image: url("../../../view/theme/diabook/diabook-green/icons/next.png"); background-repeat: no-repeat;}
+/*.tagged     { background-position: -130px -60px;}*/
+
+.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 0px; }
+.type-audio { background-position: -40px 0px; }
+.type-text  { background-position: -60px 0px; }
+.type-unkn  { background-position: -80px 0px; }
+
+.icon.drop, .icon.drophide {
+ float: left;
+}
+
+.icon {
+  display: block;
+  width: 20px;
+  height: 20px;
+  /*background-image: url('icons.png');*/
+}
+
+.icon {
+  background-color: transparent ;
+  background-repeat: no-repeat;
+  /* background-position: left center; */
+  display: block;
+  overflow: hidden;
+  text-indent: -9999px;
+  padding: 1px;
+}
+
+.icon.border.camera{
+  background-image: url("../../../view/theme/diabook/diabook-green/icons/camera.png"); 
+  display: block; width: 28px; height: 28px; background-repeat: no-repeat;
+	}
+	
+.icon.border.link{
+  background-image: url("../../../view/theme/diabook/diabook-green/icons/weblink.png"); 
+  display: block; width: 28px; height: 28px; background-repeat: no-repeat;
+  margin-left: 10px;
+	}
+
+.icon.text {
+  text-indent: 0px;
+}
+.icon.s10 {
+  min-width: 10px;
+  height: 10px;
+}
+.icon.s10.notify {
+  background-image: url("../../../images/icons/10/notify_off.png");
+}
+.icon.s10.gear {
+  background-image: url("../../../images/icons/10/gear.png");
+}
+.icon.s10.add {
+  background-image: url("../../../images/icons/10/add.png");
+}
+.icon.s10.delete {
+  background-image: url("../../../images/icons/10/delete.png");
+}
+.icon.s10.edit {
+  background-image: url("../../../images/icons/10/edit.png");
+}
+.icon.s10.star {
+  background-image: url("../../../images/star_dummy.png");
+}
+.icon.s10.menu {
+  background-image: url("../../../images/icons/10/menu.png");
+}
+.icon.s10.link {
+  background-image: url("../../../images/icons/10/link.png");
+}
+.icon.s10.lock {
+  background-image: url("../../../images/icons/10/lock.png");
+}
+.icon.s10.unlock {
+  background-image: url("../../../images/icons/10/unlock.png");
+}
+.icon.s10.text {
+  padding: 2px 0px 0px 15px;
+  font-size: 10px;
+}
+.icon.s16 {
+  min-width: 16px;
+  height: 16px;
+}
+.icon.s16.notify {
+  background-image: url("../../../images/icons/16/notify_off.png");
+}
+.icon.s16.gear {
+  background-image: url("../../../images/icons/16/gear.png");
+}
+.icon.s16.add {
+  background-image: url("../../../images/icons/16/add.png");
+}
+.icon.s16.delete {
+  background-image: url("../../../images/icons/16/delete.png");
+}
+/*.icon.s16.edit {
+  background-image: url("../../../images/icons/16/edit.png");
+}*/
+.icon.s16.star {
+  background-image: url("../../../images/star_dummy.png");
+}
+.icon.s16.menu {
+  background-image: url("../../../images/icons/16/menu.png");
+}
+/*.icon.s16.link {
+  background-image: url("../../../images/icons/16/link.png");
+}*/
+.icon.s16.lock {
+  background-image: url("../../../images/icons/16/lock.png");
+}
+.icon.s16.unlock {
+  background-image: url("../../../images/icons/16/unlock.png");
+}
+.icon.s16.text {
+  padding: 4px 0px 0px 20px;
+  font-size: 10px;
+}
+.icon.s22 {
+  min-width: 22px;
+  height: 22px;
+}
+.icon.s22.notify {
+  background-image: url("../../../images/icons/22/notify_off.png");
+}
+.icon.s22.gear {
+  background-image: url("../../../images/icons/22/gear.png");
+}
+.icon.s22.add {
+  background-image: url("../../../images/icons/22/add.png");
+}
+.icon.s22.delete {
+  background-image: url("../../../images/icons/22/delete.png");
+}
+.icon.s22.edit {
+  background-image: url("../../../images/icons/22/edit.png");
+}
+.icon.s22.star {
+  background-image: url("../../../images/star_dummy.png");
+}
+.icon.s22.menu {
+  background-image: url("../../../images/icons/22/menu.png");
+}
+.icon.s22.link {
+  background-image: url("../../../images/icons/22/link.png");
+}
+.icon.s22.lock {
+  background-image: url("../../../images/icons/22/lock.png");
+}
+.icon.s22.unlock {
+  background-image: url("../../../images/icons/22/unlock.png");
+}
+.icon.s22.text {
+  padding: 10px 0px 0px 25px;
+  width: 200px;
+}
+.icon.s48 {
+  width: 48px;
+  height: 48px;
+}
+.icon.s48.notify {
+  background-image: url("../../../images/icons/48/notify_off.png");
+}
+.icon.s48.gear {
+  background-image: url("../../../images/icons/48/gear.png");
+}
+.icon.s48.add {
+  background-image: url("../../../images/icons/48/add.png");
+}
+.icon.s48.delete {
+  background-image: url("../../../images/icons/48/delete.png");
+}
+.icon.s48.edit {
+  background-image: url("../../../images/icons/48/edit.png");
+}
+.icon.s48.star {
+  background-image: url("../../../images/star_dummy.png");
+}
+.icon.s48.menu {
+  background-image: url("../../../images/icons/48/menu.png");
+}
+.icon.s48.link {
+  background-image: url("../../../images/icons/48/link.png");
+}
+.icon.s48.lock {
+  background-image: url("../../../images/icons/48/lock.png");
+}
+.icon.s48.unlock {
+  background-image: url("../../../images/icons/48/unlock.png");
+}
+
+#contact-edit-links ul {
+  list-style: none;
+  list-style-type: none;
+}
+
+.hide-comments-outer {
+  margin-left: 80px;
+  margin-bottom: 5px;
+  width: 675px;
+  border-bottom: 1px solid #BDCDD4;
+  padding: 8px;
+}
+
+/* global */
+body {
+  font-family: 'Lato', "Helvetica Neue", Helvetica, Arial, sans-serif;
+  font-size: 13px;
+  background-color: #ffffff;
+  color: #2d2d2d;
+  margin: 50px auto auto;
+  display: table;
+}
+
+#jappix_mini {
+right: 45px !important;
+}
+
+
+h4 {
+  font-size: 1.1em;
+}
+
+a {
+	color: #333333;
+	/* color: #3e3e8c; */
+	text-decoration: none;
+}
+a:hover {
+	/* color: blue; */
+	text-decoration: underline
+}
+
+.wall-item-name-link {
+/*  float: left;*/
+}
+
+.wall-item-photo {
+  width: 48px;
+  height: 48px;
+  overflow: hidden;
+  display: block;
+}
+
+.left {
+  float: left;
+}
+.right {
+  float: right;
+}
+.hidden {
+  display: none;
+}
+.clear {
+  clear: both;
+}
+.fakelink {
+  color: #194719;
+  /* color: #3e3e8c; */
+  text-decoration: none;
+  cursor: pointer;
+}
+.fakelink:hover {
+  /* color: blue; */
+  /*color: #005c94; */
+  text-decoration: underline;
+}
+.intro-end {
+	border-bottom: 1px solid black;
+   clear: both;
+   margin-bottom: 25px;
+   padding-bottom: 25px;
+   width: 75%;
+	}
+.intro-form-end {
+	clear: both;
+	}
+.intro-fullname {
+	padding-bottom: 5px;
+   padding-top: 5px;
+	}
+.intro-wrapper-end {
+	clear: both;
+   padding-bottom: 5px;
+	}
+code {
+  font-family: Courier, monospace;
+  white-space: pre;
+  display: block;
+  overflow: auto;
+  border: 1px solid #444;
+  background: #EEE;
+  color: #444;
+  padding: 10px;
+  margin-top: 20px;
+}
+#panel {
+  position: absolute;
+  width: 12em;
+  background: #ffffff;
+  color: #2d2d2d;
+  margin: 0px;
+  padding: 1em;
+  list-style: none;
+  border: 3px solid #364e59;
+  z-index: 100000;
+  -webkit-box-shadow: 0px 5px 10px rgba(0, 0, 0, 0.7);
+  -moz-box-shadow: 0px 5px 10px rgba(0, 0, 0, 0.7);
+  box-shadow: 0px 5px 10px rgba(0, 0, 0, 0.7);
+}
+/* tool */
+.tool {
+  height: auto;
+  overflow: auto;
+  padding: 3px;
+}
+#saved-search-ul .tool:hover,
+#nets-sidebar .tool:hover,
+#sidebar-group-list .tool:hover,
+#fileas-sidebar .tool:hover  {
+	background: aliceBlue;
+}
+.tool .label {
+  float: left;
+}
+.tool .action {
+  float: right;
+}
+.tool a {
+  color: ##3F8FBA;
+}
+.tool a:hover {
+  text-decoration: none;
+}
+/* popup notifications */
+div.jGrowl div.notice {
+  background: #511919 url("../../../images/icons/48/notice.png") no-repeat 5px center;
+  color: #ffffff;
+  padding-left: 58px;
+}
+div.jGrowl div.info {
+  background: #364e59 url("../../../images/icons/48/info.png") no-repeat 5px center;
+  color: #ffffff;
+  padding-left: 58px;
+}
+/* header */
+header {
+  position: fixed;
+  left: 0%;
+  right: 80%;
+  top: 0px;
+  margin: 0px;
+  padding: 0px;
+  width: 22%;
+  height: 32px;
+  background: #5CD65C;
+  background-color: #5CD65C;
+  z-index: 100;
+  -webkit-box-shadow: -10px 0px 10px rgba(0, 0, 0, 0.7);
+  -moz-box-shadow: -10px 0px 10px rgba(0, 0, 0, 0.7);
+  box-shadow: -10px 0px 10px rgba(0, 0, 0, 0.7);
+  
+}
+header #site-location {
+  display: none;
+}
+header #banner {
+  overflow: hidden;
+  text-align: banner;
+  width: 82%;
+  margin-left: 25%;
+}
+header #banner a,
+header #banner a:active,
+header #banner a:visited,
+header #banner a:link,
+header #banner a:hover {
+  color: #1f1f1f;
+  text-decoration: none;
+  outline: none;
+  vertical-align: middle;
+  font-weight: bolder;
+  margin-left: 3px;
+}
+header #banner #logo-img {
+  height: 25px;
+  margin-top: 3px;
+}
+header #banner #logo-text {
+  font-size: 20px;
+  position: absolute;
+  top: 10%;
+}
+/* messages */
+#message-new {
+  background: #194719;
+  border: 1px solid #333;
+  width: 150px;
+}
+#message-new a {
+  color: #ffffff;
+  text-align: center;
+  display: block;
+  font-weight: bold;
+  padding: 1em 0px;
+    text-decoration: none;
+}
+.mail-list-wrapper {
+  background-color: #f6f7f8;
+  margin-bottom: 5px;
+  width: 100%;
+  height: auto;
+  overflow: hidden;
+}
+.mail-list-wrapper span {
+  display: block;
+  float: left;
+  width: 20%;
+  overflow: hidden;
+}
+.mail-list-wrapper .mail-subject {
+  width: 30%;
+  padding: 4px 0px 0px 4px;
+}
+.mail-list-wrapper .mail-subject a {
+  display: block;
+}
+.mail-list-wrapper .mail-subject.unseen a {
+  font-weight: bold;
+}
+.mail-list-wrapper .mail-date {
+  padding: 4px 4px 0px 4px;
+}
+.mail-list-wrapper .mail-from {
+  padding: 4px 4px 0px 4px;
+}
+.mail-list-wrapper .mail-count {
+  padding: 4px 4px 0px 4px;
+  text-align: right;
+}
+.mail-list-wrapper .mail-delete {
+  float: right;
+}
+#mail-display-subject {
+  background-color: #f6f7f8;
+  color: #2d2d2d;
+  margin-bottom: 10px;
+  width: 100%;
+  height: auto;
+  overflow: hidden;
+}
+#mail-display-subject span {
+  float: left;
+  overflow: hidden;
+  padding: 4px 0px 0px 10px;
+}
+#mail-display-subject .mail-delete {
+  float: right;
+  opacity: 0.5;
+  -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;
+}
+#mail-display-subject:hover .mail-delete {
+  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;
+}
+/* nav */
+nav {
+  width: 80%;
+  height: 32px;
+  position: fixed;
+  left: 22%;
+  top: 0px;
+  padding: 0px;
+  background: #5CD65C;
+  color: #1f1f1f;
+  z-index: 99;
+  -webkit-box-shadow: -10px 0px 10px rgba(0, 0, 0, 0.7);
+  -moz-box-shadow: -10px 0px 10px rgba(0, 0, 0, 0.7);
+  box-shadow: -10px 0px 10px rgba(0, 0, 0, 0.7);
+  
+}
+nav a,
+nav a:active,
+nav a:visited,
+nav a:link,
+nav a:hover {
+  color: #1f1f1f;
+  text-decoration: none;
+  outline: none;
+}
+nav #banner {
+  overflow: hidden;
+  /*text-align: center;*/
+  width: 100%;
+}
+nav #banner a,
+nav #banner a:active,
+nav #banner a:visited,
+nav #banner a:link,
+nav #banner a:hover {
+  color: #ffffff;
+  text-decoration: none;
+  outline: none;
+  vertical-align: bottom;
+}
+nav #banner #logo-img {
+  height: 22px;
+  margin-top: 5px;
+}
+nav #banner #logo-text {
+  font-size: 22px;
+}
+nav #navbar{
+	}
+nav ul {
+  margin: 0px;
+  padding: 0px 20px;
+}
+nav ul li {
+  list-style: none;
+  margin: 0px;
+  /* padding: 1px 1px 3px 1px; */
+  float: left;
+}
+nav ul li .menu-popup {
+  left: 0px;
+  right: auto;
+}
+
+nav #logo-img {
+  height: 25px;
+  margin-top: 4px;
+  margin-left: 30px;
+}
+
+nav #logo-text {
+    font-size: 22px;
+    margin-top: 3px;
+    margin-right: 15px;
+}
+nav .nav-menu-search {
+  position: relative;
+
+  margin: 4px 17px;
+  margin-right: 0px;
+  height: 17px;
+  width: 180px;
+  
+}
+
+nav #search-box #search-text {
+  background-image:  url('icons/lupe.png');
+  background-repeat:no-repeat;
+  padding-left:20px;
+  border-top-left-radius: 15px;
+border-top-right-radius: 15px;
+border-bottom-right-radius: 15px;
+border-bottom-left-radius: 15px;
+	}
+
+
+nav .nav-menu-icon {
+  position: relative;
+  height: 22px;
+  padding: 5px;
+  margin: 0px 5px;
+  -moz-border-radius: 5px 5px 0 0;
+  -webkit-border-radius: 5px 5px 0 0;
+  border-radius: 5px 5px 0 0;
+}
+nav .nav-menu-icon:hover {
+  position: relative;
+  height: 22px;
+  padding: 5px;
+  margin: 0px 5px;
+  -moz-border-radius: 5px 5px 0 0;
+  -webkit-border-radius: 5px 5px 0 0;
+  border-radius: 5px 5px 0 0;
+}
+
+/*color*/
+nav .nav-menu-icon.selected {
+  background-color: #fff;
+}
+nav .nav-menu-icon img {
+  width: 22px;
+  height: 22px;
+}
+nav .nav-menu-icon .nav-notify {
+  top: 3px;
+}
+/*marker*/
+nav .nav-menu {
+  position: relative;
+  height: 16px;
+  padding: 5px;
+  margin: 3px 15px 0px;
+  font-size: 15px;
+  /*border-bottom: 3px solid #364A84;*/
+}
+nav .nav-menu.selected {
+  /*border-bottom: 3px solid #9eabb0;*/
+}
+nav .nav-notify {
+  display: none;
+  position: absolute;
+  background-color: #fff;
+  /* background-color: #19aeff; */
+  -moz-border-radius: 5px 5px 5px 5px;
+  -webkit-border-radius: 5px 5px 5px 5px;
+  border-radius: 5px 5px 5px 5px;
+  font-size: 10px;
+  font-weight: 900;
+  padding: 1px 4px;
+  top: 0px;
+  right: -6px;
+  min-width: 10px;
+  text-align: center;
+  border: 1px solid black;
+}
+nav .nav-notify.show {
+  display: block;
+}
+nav #nav-help-link,
+nav #nav-search-link,
+nav #nav-directory-link,
+nav #nav-apps-link,
+nav #nav-site-linkmenu, 
+nav #nav-home-link,
+nav #nav-user-linkmenu
+{
+  float: right;
+}
+nav #nav-user-linkmenu{
+	margin-right: 0px;
+	}
+nav #nav-home-link, #nav-directory-link, #nav-apps-link{
+	margin-left: 0px;
+	margin-right: 0px;
+	font-weight: bold;
+	margin: 3px 5px;
+	font-size: 14px;
+	}
+nav #nav-directory-link{
+  margin-right: 0px;	
+	}
+nav #nav-home-link{
+  margin-left: 0px;	
+	}
+nav #nav-help-link .menu-popup,
+nav #nav-search-link .menu-popup,
+nav #nav-directory-link .menu-popup,
+nav #nav-apps-link .menu-popup,
+nav #nav-site-linkmenu .menu-popup {
+  right: 0px;
+  left: auto;
+}
+
+nav #nav-messages-linkmenu.on .icon.messages, nav #nav-messages-linkmenu.selected .icon.messages{
+	background-image: url("../../../view/theme/diabook/diabook-green/icons/messages.png");
+	}
+	
+/*nav #nav-notifications-linkmenu.on .icon.notify,*/ nav #nav-notifications-linkmenu.selected .icon.notify{
+	background-image: url("../../../view/theme/diabook/diabook-green/icons/notify.png");
+	}
+	
+nav #nav-contacts-linkmenu.on .icon.contacts, nav #nav-contacts-linkmenu.selected .icon.contacts{
+	background-image: url("../../../view/theme/diabook/diabook-green/icons/contacts.png");
+	}
+	
+nav #nav-apps-link.selected {
+ background-color: #fff;
+  moz-border-radius: 5px 5px 0 0;
+-webkit-border-radius: 5px 5px 0 0;
+border-radius: 5px 5px 0 0;
+}
+
+#nav-notifications-mark-all {
+	/* padding: 1px 1px 2px 26px; */
+	/* border-bottom: 1px solid #364E59; */
+	/* margin: 0px 0px 2px 0px;
+	padding: 5px 10px; */
+}
+
+#nav-notifications-see-all {
+	/* padding: 1px 1px 2px 26px; */
+	/* border-bottom: 1px solid #364E59; */
+	/* margin: 0px 0px 2px 0px;
+	padding: 5px 10px; */
+}
+
+.notify-seen {
+	background: none repeat scroll 0 0 #DDDDDD;
+	}
+
+ul.menu-popup {
+  position: absolute;
+  display: none;
+  width: 11em;
+  background: #F5FCF5;
+  color: #2d2d2d;
+  margin: 0px;
+  padding: 0px;
+  list-style: none;
+  z-index: 100000;
+  -webkit-box-shadow: 0px 5px 10px rgba(0, 0, 0, 0.7);
+  -moz-box-shadow: 0px 5px 10px rgba(0, 0, 0, 0.7);
+  box-shadow: 0px 5px 10px rgba(0, 0, 0, 0.7);
+}
+ul.menu-popup a {
+  display: block;
+  color: #2d2d2d;
+  padding: 5px 10px;
+  text-decoration: none;
+}
+ul.menu-popup a:hover {
+  background-color: #B8EDB8; /*bdcdd4;*/
+  color: #000;
+}
+ul.menu-popup .menu-sep {
+  border-top: 1px solid #9eabb0;
+}
+ul.menu-popup li {
+  float: none;
+  overflow: auto;
+  height: auto;
+  display: block;
+}
+ul.menu-popup li img {
+  float: left;
+  width: 16px;
+  height: 16px;
+  padding-right: 5px;
+}
+ul.menu-popup .empty {
+  padding: 5px;
+  text-align: center;
+  color: #9eabb0;
+}
+/* autocomplete popup */
+.acpopup {
+  max-height: 150px;
+  background-color: #ffffff;
+  color: #2d2d2d;
+  border: 1px solid #MenuBorder;
+  overflow: auto;
+  z-index: 100000;
+  -webkit-box-shadow: 0px 5px 10px rgba(0, 0, 0, 0.7);
+  -moz-box-shadow: 0px 5px 10px rgba(0, 0, 0, 0.7);
+  box-shadow: 0px 5px 10px rgba(0, 0, 0, 0.7);
+}
+.acpopupitem {
+  color: #2d2d2d;
+  padding: 4px;
+  clear: left;
+}
+.acpopupitem img {
+  float: left;
+  margin-right: 4px;
+}
+.acpopupitem.selected {
+  background-color: #bdcdd4;
+}
+#nav-notifications-menu {
+  width: 400px;
+  max-height: 550px;
+  overflow: auto;
+}
+/* #nav-notifications-menu a {
+	display: inline;
+	padding: 5px 0px;
+	margin: 0px 0px 2px 0px;
+}
+#nav-notifications-menu li:hover {
+  background-color: #bdcdd4;
+}*/
+
+#nav-notifications-menu img {
+  float: left;
+  margin-right: 5px;
+}
+#nav-notifications-menu .contactname {
+  font-weight: bold;
+}
+#nav-notifications-menu .notif-when {
+  font-size: 10px;
+  color: #9eabb0;
+  display: block;
+}
+
+.notif-image {
+        width: 32px;
+        height: 32px;
+        padding: 7px 7px 0px 0px;
+}
+
+/*profile_side*/
+#profile_side {
+  margin-bottom: 30px;
+}
+#ps-usericon{
+	height: 25px	
+	}
+#ps-username{
+  font-size: 1.17em;
+  font-weight: bold;
+  vertical-align: top;
+  position: absolute;
+  padding-top: 4px;
+  padding-left: 5px;	
+  word-wrap: break-word;
+  width: 130px;
+	}
+#ps-username:hover{
+  text-decoration: none;	
+	}
+.menu-profile-side{
+  list-style: none;	
+  padding-left: 0px;
+  min-height: 0px;
+	}
+.menu-profile-list{
+  height: auto;
+  overflow: auto;  
+  min-height: 16px;
+  list-style: none;
+	}
+.menu-profile-list:hover{
+	background: #B8EDB8; 
+	}
+.menu-profile-list-item{
+	padding-left: 5px;
+	vertical-align: middle;
+	}	
+.menu-profile-list-item:hover{	
+	text-decoration: none;
+   }
+/*http://prothemedesign.com/circular-icons/*/
+.menu-profile-icon.home{
+	background: url("../../../view/theme/diabook/diabook-green/icons/home.png") no-repeat;
+	float: left;
+	height: 22px;
+	width: 22px;
+	}
+.menu-profile-icon.photos{
+	background: url("../../../view/theme/diabook/diabook-green/icons/mess_side.png") no-repeat;
+	float: left;
+	height: 22px;
+   width: 22px;}
+.menu-profile-icon.events{
+	background: url("../../../view/theme/diabook/diabook-green/icons/events.png") no-repeat;
+	float: left;
+	height: 22px;
+   width: 22px;}
+.menu-profile-icon.notes{
+	background: url("../../../view/theme/diabook/diabook-green/icons/notes.png") no-repeat;
+	float: left;
+	height: 22px;
+   width: 22px;}
+.menu-profile-icon.foren{
+	background: url("../../../view/theme/diabook/diabook-green/icons/pubgroups.png") no-repeat;
+	float: left;
+	height: 22px;
+   width: 22px;}
+.menu-profile-icon.com_side{
+	background: url("../../../view/theme/diabook/diabook-green/icons/com_side.png") no-repeat;
+	float: left;
+	height: 22px;
+   width: 22px;}
+.menu-profile-icon.pscontacts{
+	background: url("../../../view/theme/diabook/diabook-green/icons/pscontacts.png") no-repeat;
+	float: left;
+	height: 22px;
+   width: 22px;}
+/* aside */
+/*marker*/
+aside {
+  display: table-cell;
+  vertical-align: top;
+  width: 180px;
+  padding: 0px 5px 0px 0px;
+  border-right: 1px solid #D2D2D2;
+  float: left;
+  /* background: #F1F1F1; */
+}
+aside #page-sidebar{display: none;}
+aside .vcard .fn {
+  font-size: 18px;
+  font-weight: bold;
+  margin-bottom: 5px;
+}
+aside .vcard .title {
+  margin-bottom: 5px;
+}
+aside .vcard dl {
+  height: auto;
+  overflow: auto;
+}
+aside .vcard dt {
+  float: left;
+  margin-left: 0px;
+  /*width: 35%;*/
+  text-align: right;
+  color: #999999;
+}
+aside .vcard dd {
+  float: left;
+  margin-left: 5px;
+  /*width: 60%;*/
+}
+aside #profile-extra-links ul {
+  padding: 0px;
+  margin: 0px;
+}
+aside #profile-extra-links li {
+  padding: 0px;
+  margin: 0px;
+  list-style: none;
+}
+aside #dfrn-request-link {
+  display: block;
+  -moz-border-radius: 5px 5px 5px 5px;
+  -webkit-border-radius: 5px 5px 5px 5px;
+  border-radius: 5px 5px 5px 5px;
+  color: #ffffff;
+  background: #005c94 url('../../../images/connect-bg.png') no-repeat left center;
+  font-weight: bold;
+  text-transform: uppercase;
+  padding: 4px 2px 2px 35px;
+}
+aside #dfrn-request-link:hover {
+  text-decoration: none;
+  background-color: #36c;
+  /* background-color: #19aeff; */
+}
+aside #profiles-menu {
+  width: 20em;
+}
+aside #search-text {
+	width: 173px;
+	height: 17px;
+	padding-left: 10px;
+	border-top-left-radius: 15px;
+border-top-right-radius: 15px;
+border-bottom-right-radius: 15px;
+border-bottom-left-radius: 15px;
+}
+aside #side-follow-url {
+	width: 173px;
+	}
+aside #side-peoplefind-url {
+	width: 173px;
+	}
+#contact-block {
+  overflow: auto;
+  height: auto;
+}
+aside #likes a, a:visited, a:link {
+		color: #194719;
+		text-decoration: none;
+		cursor: pointer;
+		
+}
+aside #likes a:hover{
+	text-decoration: underline;
+	}
+
+#contact-block .contact-block-h4 {
+  float: left;
+  margin: 5px 0px;
+}
+#contact-block .allcontact-link {
+  float: right;
+  margin: 5px 0px;
+}
+#contact-block .contact-block-content {
+  clear: both;
+  overflow: auto;
+  height: auto;
+}
+#contact-block .contact-block-link {
+  float: left;
+  margin: 0px 2px 2px 0px;
+}
+#contact-block .contact-block-link img {
+  widht: 55px;
+  height: 55px;
+}
+#lost-password-link {
+  float: left;
+  margin-right: 20px;		
+	}
+#login-submit-wrapper{
+margin-bottom: 15px;
+	}
+.group_selected {
+  background: url("../diabook/icons/selected.png") no-repeat left center;
+  float: left;
+  height: 22px;
+  width: 22px;
+}
+.group_unselected {
+  background: url("../diabook/icons/unselected.png") no-repeat left center;
+  float: left;
+  height: 22px;
+  width: 22px;
+}
+.icon.text_add		{ 
+		background-image: url("../../../images/icons/16/add.png");
+		float: right;
+		opacity: 0.2;
+		margin-right: 14px;
+		}
+.icon.text_add:hover	{ 
+		background-image: url("../../../images/icons/16/add.png");
+		float: right;
+		cursor: pointer;
+		margin-right: 14px;
+		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;
+		}
+.icon.text_edit {
+  background-image: url("../../../images/icons/10/edit.png");
+  opacity: 0.2;
+  margin-top: 6px;
+  float: right;
+  height: 10px;
+}
+.icon.text_edit:hover {
+  background-image: url("../../../images/icons/10/edit.png");
+  opacity: 1;
+  margin-top: 6px;
+  float: right;
+  height: 10px;
+}
+/* widget */
+.widget {
+  margin-bottom: 2em;
+  /*.action .s10 { width: 10px; overflow: hidden; padding: 0px;}
+	.action .s16 { width: 16px; overflow: hidden; padding: 0px;}*/
+/*  font-size: 12px; */
+}
+/*marker*/
+.widget h3 {
+  padding: 0px;
+  margin: 2px;
+  font-size: 1.05em;
+}
+.widget .action {
+  opacity: 0.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;
+}
+.widget input.action {
+  opacity: 0.5;
+  -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;
+}
+.widget:hover .title .action {
+  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;
+}
+.widget .tool:hover .action {
+  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;
+}
+.widget .tool:hover .action.ticked {
+  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;
+}
+.widget ul {
+  padding: 0px;
+}
+.widget ul li {
+  padding-left: 16px;
+  min-height: 16px;
+  list-style: none;
+}
+#side-bar-photos-albums li{
+list-style-type: disc;
+}
+#side-bar-photos-albums ul li{
+  margin-left: 30px;
+  padding-left: 0px;
+	}
+#side-bar-photos-albums ul li a{
+  color: #3465A4;
+}
+.widget .tool.selected {
+  background: url("../../../view/theme/diabook/diabook-green/icons/selected.png") no-repeat left center;
+}
+/* widget: search */
+#add-search-popup {
+  width: 200px;
+  top: 18px;
+}
+/* section */
+section {
+  display: table-cell;
+  vertical-align: top;
+  width: 800px;
+  padding: 0px 0px 0px 12px;
+}
+body .pageheader{
+  text-align: center;
+  font-size: 20px;
+  margin-bottom: 20px;
+  margin-top: 0px;
+  max-width: 775px;
+	}
+.qcomment{
+  max-width: 122px;	
+	}
+#id_username {
+  width: 173px;	
+	}
+#id_password {
+  width: 173px;		
+	}
+#id_openid_url {
+  width: 173px;	
+	}
+#contact-edit-end {
+	}
+.pager {
+   padding: 10px;
+	text-align: center;
+	font-size: 1.0em;
+	clear: both;
+	display: block;
+}	
+
+.tabs {
+    
+    background-position: 0 -20px;
+    background-repeat: repeat-x;
+    height: 27px;
+    padding: 0;
+ }
+.tab.button {
+    margin-left: 5px;	
+    /*background: none repeat scroll 0 0 #F8F8F8;*/
+    border: 1px solid #CCCCCC;
+    border-radius: 3px 3px 3px 3px;
+    font-weight: normal;
+    padding: 3px;
+    color:  #333333;
+	}
+	
+#birthday-notice, #event-notice, #birthday-wrapper, #event-wrapper{
+	margin-bottom: 10px;
+	}
+
+#birthday-wrapper a {
+	color: #3465A4;
+	}
+/* wall item */
+.tread-wrapper {
+  border-bottom: 1px solid #D2D2D2;
+  position: relative;
+  padding: 5px;
+  margin-bottom: 0px;
+  width: 775px;
+  padding-top: 10px;
+}
+.tread-wrapper a{
+  color: #194719;
+}
+
+/*marker*/
+.wall-item-decor {
+  position: absolute;
+  left: 780px;
+  top: -10px;
+  width: 16px;
+}
+/*marker*/
+.wall-item-container {
+  display: table;
+  width: 770px;
+}
+.wall-item-photo-container .wall-item-item, .wall-item-container .wall-item-bottom {
+  display: table-row;
+}
+.wall-item-photo-container .wall-item-info {
+  display: table-cell;
+  vertical-align: top;
+  text-align: left;
+  width: 80px;
+}
+.wall-item-photo-container .wall-item-location {
+  padding-right: 40px;
+  display: table-cell;
+}
+.wall-item-photo-container .wall-item-ago {
+  word-wrap: break-word;
+  width: 50px;
+  margin-left: 10px;
+  color: #999;
+}
+/*marker*/
+.wall-item-photo-container .wall-item-content {
+
+  max-width: 690px;
+  word-wrap: break-word;
+  
+  margin-bottom: 14px;
+}
+.wall-item-photo-container .wall-item-content img {
+  max-width: 700px;
+}
+.wall-item-photo-container .wall-item-links, .wall-item-photo-container .wall-item-actions {
+  display: table-cell;
+  vertical-align: middle;
+}
+.wall-item-photo-container .wall-item-links .icon, .wall-item-photo-container .wall-item-actions .icon {
+  opacity: 0.5;
+  -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;
+}
+.wall-item-photo-container .wall-item-links .icon:hover, .wall-item-photo-container .wall-item-actions .icon: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;
+}
+.wall-item-photo-container .wall-item-name {
+  font-weight: bold;
+}
+.wall-item-photo-container .wall-item-actions-author {
+  width: 100%;
+  margin-bottom: 0.3em;
+}
+.wall-item-photo-container .wall-item-actions-social {
+  float: left;
+  margin-bottom: 1px;
+  display: table-cell;
+}
+.wall-item-photo-container .wall-item-actions-social a {
+  margin-right: 1em;
+}
+.wall-item-photo-container .wall-item-actions-tools {
+  float: right;
+  width: 80px;
+  display: table-cell;
+}
+.wall-item-photo-container .wall-item-actions-tools a {
+  float: right;
+}
+.wall-item-photo-container .wall-item-actions-tools input {
+  float: right;
+}
+.wall-item-photo-container.comment {
+  margin-top: 5px;
+  margin-bottom: 5px;
+  margin-left: 40px;
+  width: 650px;
+  border-bottom: 1px solid #D2D2D2;
+}
+.wall-item-photo-container.comment {
+  top: 15px !important;
+  left: 15px !important;
+}
+.wall-item-photo-container {
+  display: table;
+  width: 780px;
+}
+.my-comment-photo {
+  width: 48px;
+  margin-left: 40px;
+  margin-right: 32px;
+	}
+.comment-edit-preview {
+  width: 500px;
+  margin-top: 10px;
+}
+.comment-edit-text-empty {
+    width: 500px;
+    border: 1px solid #D2D2D2;
+    height: 3.2em;
+    color: #2d2d2d;
+}
+.comment-edit-text-full {
+  font-size: 12.5px;
+  height: 3.3em;
+  
+  border: 1px solid #D2D2D2;
+  width: 500px;
+}
+.comment-edit-photo {
+    margin: 10px 0 0;
+    display: table-cell;
+}
+
+
+.wall-item-container .wall-item-item, .wall-item-container .wall-item-bottom {
+  display: table-row;
+}
+.wall-item-bottom {
+  font-size: 13px;
+}
+.wall-item-container .wall-item-bottom {
+/*  opacity: 0.5;
+  -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; */
+}
+.wall-item-container:hover .wall-item-bottom {
+/*  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; */
+}
+.wall-item-container .wall-item-info {
+  display: table-cell;
+  vertical-align: top;
+  text-align: left;
+  width: 80px;
+}
+.wall-item-container .wall-item-location {
+  padding-right: 40px;
+  display: table-cell;
+}
+.wall-item-container .wall-item-ago {
+  word-wrap: break-word;
+  width: 50px;
+  margin-left: 10px;
+  color: #999;
+}
+.wall-item-location {
+  
+  clear: both;
+  overflow: hidden;
+  
+  margin-bottom: 5px;
+}
+
+/*marker*/
+.wall-item-container .wall-item-content {
+
+  max-width: 690px;
+  word-wrap: break-word;
+
+
+}
+
+.wall-item-container .wall-item-content img {
+  max-width: 700px;
+}
+.wall-item-container .wall-item-links, .wall-item-container .wall-item-actions {
+  display: table-cell;
+  vertical-align: middle;
+}
+.wall-item-container .wall-item-links .icon, .wall-item-container .wall-item-actions .icon {
+  opacity: 0.5;
+  -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;
+}
+.wall-item-container .wall-item-links .icon:hover, .wall-item-container .wall-item-actions .icon: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;
+}
+.wall-item-container .wall-item-name {
+  font-weight: bold;
+}
+.wall-item-container .wall-item-actions-author {
+  width: 100%;
+  margin-bottom: 0.3em;
+}
+.wall-item-container .wall-item-actions-social {
+  float: left;
+  margin-bottom: 1px;
+  display: table-cell;
+}
+.wall-item-container .wall-item-actions-social a {
+  margin-right: 1em;
+}
+.wall-item-actions-social a {
+  float: left;
+}
+.wall-item-container .wall-item-actions-tools {
+  float: right;
+  width: 80px;
+  display: table-cell;done
+}
+.wall-item-container .wall-item-actions-tools a {
+  float: right;
+}
+.wall-item-container .wall-item-actions-tools input {
+  float: right;
+}
+/*marker*/
+.wall-item-container.comment {
+  margin-top: 5px;
+  margin-bottom: 5px;
+  margin-left: 80px;
+  width: 690px;
+  border-bottom: 1px solid hsl(198, 21%, 79%);
+}
+.wall-item-container.comment .contact-photo {
+  width: 32px;
+  height: 32px;
+  margin-left: 16px;
+  /*background: url(../../../images/icons/22/user.png) no-repeat center center;*/
+
+}
+.wall-item-container.comment {
+  top: 15px !important;
+  left: 15px !important;
+}
+.wall-item-container.comment .wall-item-links {
+  padding-left: 12px;
+}
+.wall-item-comment-wrapper {
+  margin: 1px 5px 5px 80px;
+}
+.wall-item-comment-wrapper .comment-edit-photo {
+  display: none;
+}
+.wall-item-comment-wrapper textarea {
+  height: 2.0em;
+  width: 100%;
+  font-size: 10px;
+  color: #999999;
+  border: 1px solid #DDD;
+  padding: 0.3em;
+  font-size: 14px;
+}
+.wall-item-comment-wrapper .comment-edit-text-full {
+  font-size: 14px;
+  height: 4em;
+  color: #2d2d2d;
+  border: 1px solid #2d2d2d;
+}
+.comment-edit-preview {
+  width: 500px;
+  margin-top: 10px;
+  background-color:  #fff797;
+}
+.comment-edit-preview .contact-photo {
+  width: 32px;
+  height: 32px;
+  margin-left: 16px;
+  /*background: url(../../../images/icons/22/user.png) no-repeat center center;*/
+
+}
+.comment-edit-preview {
+  top: 15px !important;
+  left: 15px !important;
+}
+.comment-edit-preview .wall-item-links {
+  padding-left: 12px;
+}
+.comment-edit-preview .wall-item-container {
+  width: 700px;
+}
+.comment-edit-preview .tread-wrapper {
+  width: 700px;
+  padding: 0;
+  margin: 10px 0;
+}
+
+.shiny {
+  /* border-right: 10px solid #fce94f; */
+	border-right: 1px solid #A7C7F7;
+	padding-right: 12px;
+}
+
+#jot-preview-content{
+	margin-top: 30px;}
+	
+#jot-preview-content .tread-wrapper {
+  background-color: #fff797;
+}
+
+.wall-item-tags {
+  padding-top: 1px;
+  padding-bottom: 2px;
+}
+.tag {
+  /*background: url("../../../images/tag_b.png") repeat-x center left;*/
+  color: #999;
+  padding-left: 3px;
+  font-size: 12px;
+}
+.tag a {
+  padding-right: 5px;
+  /*background: url("../../../images/tag.png") no-repeat center right;*/
+  color: #999;
+}
+.wwto {
+  position: absolute !important;
+  width: 25px;
+  height: 25px;
+  background: #FFFFFF;
+  border: 2px solid #364e59;
+  height: 25px;
+  width: 25px;
+  overflow: hidden;
+  padding: 1px;
+  position: absolute !important;
+  top: 40px;
+  left: 30px;
+  -webkit-box-shadow: 0px 0px 10px rgba(0, 0, 0, 0.7);
+  -moz-box-shadow: 0px 0px 10px rgba(0, 0, 0, 0.7);
+  box-shadow: 0px 0px 10px rgba(0, 0, 0, 0.7);
+}
+.wwto .contact-photo {
+  width: auto;
+  height: 25px;
+}
+/* contacts menu */
+.contact-photo-wrapper {
+  position: relative;
+  width: 80px;
+}
+
+.contact-photo-wrapper.wwto {
+  width: 25px;
+}
+
+.contact-photo {
+  width: 48px;
+  height: 48px;
+  overflow: hidden;
+  display: block;
+}
+.contact-photo img {
+  width: 48px;
+  height: 48px;
+}
+
+.contact-wrapper {
+  float: left;
+  width: 90px;
+  height: 90px;
+  margin-bottom: 15px;
+}
+.contact-wrapper .contact-photo {
+  width: 80px;
+  height: 80px;
+}
+.contact-wrapper .contact-photo img {
+  width: 80px;
+  height: 80px;
+}
+.contact-wrapper {
+  left: 0px;
+  top: 63px;
+}
+.contact-photo {
+  width: 48px;
+  height: 48px;
+}
+.contact-photo img {
+  width: 48px;
+  height: 48px;
+}
+.contact-name {
+  /* text-align: center; */
+  /*font-weight: bold;*/
+  font-size: 12px;
+}
+.contact-details {
+  color: #999999;
+}
+/* editor */
+.jothidden {
+  display: none;
+}
+#jot {
+  width: 785px;
+  margin: 0px 2em 20px 0px;
+}
+#profile-jot-form #profile-jot-text {
+  height: 2.0em;
+  width: 99%;
+  font-size: 15px;
+  color: #999999;
+  border: 1px solid #DDD;
+  padding: 0.3em;
+  margin-bottom: 10px;
+}
+.grey
+{
+  display: inline;
+  float: right;	
+	}
+#jot #jot-tools {
+  margin: 0px;
+  padding: 0px;
+  height: 40px;
+  overflow: none;
+  width: 783px;
+  background-color: #fff;
+  border-bottom: 2px solid #9eabb0;
+}
+
+#jot #jot-tools li {
+  list-style: none;
+  float: left;
+  width: 80px;
+  height: 40px;
+  border-bottom: 2px solid #9eabb0;
+}
+#jot #jot-tools li a {
+  display: block;
+  color: #cccccc;
+  width: 100%;
+  height: 40px;
+  text-align: center;
+  line-height: 40px;
+  overflow: hidden;
+}
+#jot #jot-tools li:hover {
+  background-color: #364e59;
+  border-bottom: 2px solid #bdcdd4;
+}
+#jot #jot-tools li.perms {
+  float: right;
+  width: 40px;
+}
+#jot #jot-tools li.perms a.unlock {
+  width: 30px;
+  border-left: 10px solid #cccccc;
+  background-color: #cccccc;
+  background-position: left center;
+}
+#jot #jot-tools li.perms a.lock {
+  width: 30px;
+  border-left: 10px solid #666666;
+  background-color: #666666;
+}
+#jot #jot-tools li.submit {
+  float: right;
+  background-color: #cccccc;
+  border-bottom: 2px solid #cccccc;
+  border-right: 1px solid #666666;
+  border-left: 1px solid #666666;
+}
+#jot #jot-tools li.submit input {
+  border: 0px;
+  margin: 0px;
+  padding: 0px;
+  background-color: #cccccc;
+  color: #666666;
+  width: 80px;
+  height: 40px;
+  line-height: 40px;
+}
+#jot #jot-tools li.submit input:hover {
+  background-color: #bdcdd4;
+  color: #666666;
+}
+#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;
+}
+#profile-jot-form #jot-title, #profile-jot-form #jot-category {
+    
+  	 border-radius: 5px 5px 5px 5px;
+    font-weight: bold;
+    height: 20px;
+    margin: 0 0 5px;
+    width: 60%;
+    border: 1px solid #d2d2d2;
+}
+#profile-jot-form #jot-title:-webkit-input-placeholder {
+  font-weight: normal;
+}
+#profile-jot-form #jot-title:-moz-placeholder {
+  font-weight: normal;
+}
+#profile-jot-form #profile-jot-text_parent #profile-jot-text_tbl{
+	width: 785px;
+	height: 100px;
+	}
+#jot #jot-title:hover {
+  border: 1px solid #999999;
+}
+#jot #jot-title:focus {
+  border: 1px solid #999999;
+}
+#jot #character-counter {
+  width: 80px;
+  float: right;
+  text-align: right;
+  height: 20px;
+  line-height: 20px;
+  padding-right: 20px;
+}
+#jot-perms-icon, 
+#profile-location,
+#profile-nolocation,
+#profile-youtube, 
+#profile-video, 
+#profile-audio,
+#profile-link,
+#profile-title, 
+#wall-image-upload,
+#wall-file-upload,
+#wall-image-upload-div,
+#wall-file-upload-div,
+.hover, .focus {
+	cursor: pointer;
+	margin-top: 2px;
+}
+/*marker*/
+#profile-jot-wrapper{
+	margin: 0 20px 20px 0;
+   width: 785px;
+	}
+/*marker*/
+#profile-jot-submit-wrapper {
+	margin-bottom: 50px;
+	width: 785px;
+}
+
+#profile-jot-submit {
+	float: right;
+	margin-top: 2px;
+	font-size: 14px;
+	
+}
+#profile-upload-wrapper {
+	float: left;
+	margin-top: 2px;
+	margin-left: 10px;
+	
+}
+#profile-attach-wrapper {
+	float: left;
+	margin-left: 15px;
+	margin-top: 2px;
+}
+#profile-rotator {
+	float: left;
+	margin-left: 30px;
+	margin-top: 2px;
+}
+#profile-link-wrapper {
+	float: left;
+	margin-left: 15px;
+	margin-top: 2px;
+}
+#profile-youtube-wrapper {
+	float: left;
+	margin-left: 15px;
+	margin-top: 2px;
+}
+#profile-video-wrapper {
+	float: left;
+	margin-left: 15px;
+	margin-top: 2px;
+}
+#profile-audio-wrapper {
+	float: left;
+	margin-left: 15px;
+	margin-top: 2px;
+}
+#profile-location-wrapper {
+	float: left;
+	margin-left: 15px;
+	margin-top: 2px;
+}
+#profile-jot-perms {
+	float: left;
+	margin-left: 45px;
+	margin-top: 2px;
+}
+#jot-preview-link {
+	float: right;
+	margin-left: 10px;
+	margin-top: 2px;
+	font-size: 9px;
+	font-weight: bolder;
+	cursor: pointer;
+}
+#profile-jot-perms{
+   float: right;
+	margin-left: 10px;
+	margin-top: 2px;	
+	}
+/** buttons **/
+.button.creation1 {
+    background-color: #fff;
+    border: 1px solid #777777;
+    border-radius: 3px 3px 3px 3px;
+    box-shadow: 0 1px 1px #CFCFCF;
+    font-weight: bolder;
+	 cursor: pointer;
+}
+.button.creation2 {
+    background-color: #194719;
+    border: 1px solid #777777;
+    color: white;
+    border-radius: 3px 3px 3px 3px;
+    box-shadow: 0 1px 1px #CFCFCF;
+    margin-left: 5px;
+    font-weight: bolder;
+	 cursor: pointer;
+}
+/*input[type="submit"] {
+	border: 0px;
+    background-color: @ButtonBackgroundColor;
+    color: @ButtonColor;
+    padding: 0px 10px;
+	.rounded(5px);
+    height: 18px;
+}*/
+/** acl **/
+#photo-edit-perms-select, #photos-upload-permissions-wrapper, #profile-jot-acl-wrapper {
+  display: block!important;
+}
+#acl-wrapper {
+  width: 690px;
+  float: left;
+}
+#acl-search {
+  float: right;
+  background: #ffffff url("../../../images/search_18.png") no-repeat right center;
+  padding-right: 20px;
+}
+#acl-showall {
+  float: left;
+  display: block;
+  width: auto;
+  height: 18px;
+  background-color: #cccccc;
+  background-image: url("../../../images/show_all_off.png");
+  background-position: 7px 7px;
+  background-repeat: no-repeat;
+  padding: 7px 5px 0px 30px;
+  color: #999999;
+  -moz-border-radius: 5px 5px 5px 5px;
+  -webkit-border-radius: 5px 5px 5px 5px;
+  border-radius: 5px 5px 5px 5px;
+}
+#acl-showall.selected {
+  color: #000000;
+  background-color: #ff9900;
+  background-image: url("../../../images/show_all_on.png");
+}
+#acl-list {
+  height: 210px;
+  border: 1px solid #cccccc;
+  clear: both;
+  margin-top: 30px;
+  overflow: auto;
+}
+.acl-list-item {
+  display: block;
+  width: 150px;
+  height: 30px;
+  border: 1px solid #cccccc;
+  margin: 5px;
+  float: left;
+}
+.acl-list-item img {
+  width: 22px;
+  height: 22px;
+  float: left;
+  margin: 4px;
+}
+.acl-list-item p {
+  height: 12px;
+  font-size: 10px;
+  margin: 0px;
+  padding: 2px 0px 1px;
+  overflow: hidden;
+}
+.acl-list-item a {
+  font-size: 8px;
+  display: block;
+  width: 40px;
+  height: 10px;
+  float: left;
+  color: #999999;
+  background-color: #cccccc;
+  background-position: 3px 3px;
+  background-repeat: no-repeat;
+  margin-right: 5px;
+  -webkit-border-radius: 2px ;
+  -moz-border-radius: 2px;
+  border-radius: 2px;
+  padding-left: 15px;
+}
+#acl-wrapper a:hover {
+  text-decoration: none;
+  color: #000000;
+}
+.acl-button-show {
+  background-image: url("../../../images/show_off.png");
+}
+.acl-button-hide {
+  background-image: url("../../../images/hide_off.png");
+}
+.acl-button-show.selected {
+  color: #000000;
+  background-color: #9ade00;
+  background-image: url("../../../images/show_on.png");
+}
+.acl-button-hide.selected {
+  color: #000000;
+  background-color: #ff4141;
+  background-image: url("../../../images/hide_on.png");
+}
+.acl-list-item.groupshow {
+  border-color: #9ade00;
+}
+.acl-list-item.grouphide {
+  border-color: #ff4141;
+}
+/** /acl **/
+/** tab buttons 14618a**/
+/*marker*/
+ul.tabs {
+  list-style-type: none;
+  padding-bottom: 10px;
+  font-size: 13px;
+  width: 805px;
+}
+ul.tabs li {
+  float: left;
+  margin-left: 5px;
+}
+ul.tabs li .active {
+    background-color: #194719;
+    border: 1px solid #777777;
+    color: white;
+    border-radius: 3px 3px 3px 3px;
+    box-shadow: 2px 2px 2px #CFCFCF;
+    margin-left: 5px;
+}
+//settings tabs
+ul.rs_tabs {
+  list-style-type: none;
+  font-size: 11px;
+}
+ul.rs_tabs li {
+  float: left;
+  margin-bottom: 30px;
+  clear: both;
+}
+ul.rs_tabs li .selected {
+    background-color: #194719;
+    border: 1px solid #777777;
+    color: white;
+    border-radius: 3px 3px 3px 3px;
+    box-shadow: 2px 2px 2px #CFCFCF;
+    font-size: 13px;
+}
+.rs_tabs {
+    list-style-type: none;
+    font-size: 11px;
+    background-position: 0 -20px;
+    background-repeat: repeat-x;
+    height: 27px;
+    padding: 0;
+ }
+.rs_tab.button {	
+    /*background: none repeat scroll 0 0 #F8F8F8;*/
+    border: 1px solid #CCCCCC;
+    border-radius: 3px 3px 3px 3px;
+    font-weight: bolder;
+    padding: 3px;
+    color:  #333333;
+    text-decoration: none;
+	}
+/**
+ * Form fields
+ */
+.field {
+  margin-bottom: 10px;
+  padding-bottom: 10px;
+  overflow: auto;
+  width: 100%;
+}
+.field label {
+  float: left;
+  width: 200px;
+}
+.field input, .field textarea {
+  width: 400px;
+}
+.field textarea {
+  height: 100px;
+}
+.field .field_help {
+  display: block;
+  margin-left: 200px;
+  color: #666666;
+}
+.field .onoff {
+  float: left;
+  width: 80px;
+}
+.field .onoff a {
+  display: block;
+  border: 1px solid #666666;
+  background-image: url("../../../images/onoff.jpg");
+  background-repeat: no-repeat;
+  padding: 4px 2px 2px 2px;
+  height: 16px;
+  text-decoration: none;
+}
+.field .onoff .off {
+  border-color: #666666;
+  padding-left: 40px;
+  background-position: left center;
+  background-color: #cccccc;
+  color: #666666;
+  text-align: right;
+}
+.field .onoff .on {
+  border-color: #204A87;
+  padding-right: 40px;
+  background-position: right center;
+  background-color: #D7E3F1;
+  color: #204A87;
+  text-align: left;
+}
+.field .hidden {
+  display: none!important;
+}
+.field.radio .field_help {
+  margin-left: 0px;
+}
+.suggest-select {
+width: 500px;
+height: 350px;	
+	}
+.message-to-select {
+	width: 400px;
+   height: 150px;
+	}
+#directory-search-form{
+	margin-bottom: 50px;
+	}
+#profile-edit-links-end {
+        clear: both;
+        margin-bottom: 15px;
+}
+
+#profile-edit-links ul { margin: 20px; padding-bottom: 20px; list-style: none; }
+
+#profile-edit-links li {
+  float: left;
+  list-style: none;
+  margin-left: 10px;
+}
+
+.profile-edit-side-div {
+  display: none;
+}
+
+#register-form label,
+#profile-edit-form label {
+        width: 300px; float: left;
+}
+
+.required {
+  display: inline;
+  color: #B20202;
+}
+
+/* oauth */
+.oauthapp {
+  height: auto;
+  overflow: auto;
+  border-bottom: 2px solid #cccccc;
+  padding-bottom: 1em;
+  margin-bottom: 1em;
+}
+.oauthapp img {
+  float: left;
+  width: 48px;
+  height: 48px;
+  margin: 10px;
+}
+.oauthapp img.noicon {
+  background-image: url("../../../images/icons/48/plugin.png");
+  background-position: center center;
+  background-repeat: no-repeat;
+}
+.oauthapp a {
+  float: left;
+}
+/* contacts */
+.contact-entry-wrapper {
+  width: 120px;
+  height: 120px;
+  float: left;
+}
+/* photo */
+.photo {
+box-shadow: 2px 2px 5px 0px #000000;
+margin: 0px;
+border-radius: 10px;
+height: 145px !important;
+width: 145px !important;
+}
+.lframe {
+  float: left;
+  /*margin: 0px 10px 10px 0px;*/
+}
+/* profile match wrapper */
+.profile-match-wrapper {
+  float: left;
+  width: 90px;
+  height: 90px;
+  margin-bottom: 20px;
+}
+.profile-match-wrapper .contact-photo {
+  width: 80px;
+  height: 80px;
+}
+.profile-match-wrapper .contact-photo img {
+  width: 80px;
+  height: 80px;
+}
+.profile-match-wrapper {
+  left: 0px;
+  top: 63px;
+}
+
+.contact-photo-menu-button {
+        position: relative;
+        background-image: url("../../../images/icons/16/menu.png");
+        background-position: top left; 
+        background-repeat: no-repeat;
+        margin: 0px 0px -16px 0px; 
+	padding: 0px;
+        width: 16px;
+        height: 16px;
+        top: -16px; left:0px;
+        overflow: hidden;
+        text-indent: 40px;
+        display: none;
+        
+}
+.contact-photo-menu {
+        width: 11em;
+        border: 3px solid #364e59;
+	color: #2d2d2d;
+        background: #FFFFFF;
+/*        position: absolute;*/
+        position: relative;
+        left: 0px; top: 0px;
+        display: none;
+        z-index: 10000;
+}
+.contact-photo-menu ul { margin:0px; padding: 0px; list-style: none }
+.contact-photo-menu li a {
+	display: block; 
+	padding: 5px 10px; 
+	color: #2d2d2d;
+	text-decoration: none;
+}
+.contact-photo-menu li a:hover {
+	background-color: #bdcdd4; 
+}
+
+/* page footer */
+footer {
+  height: 100px;
+  display: table-row;
+}
+
+blockquote {
+    border-left: 1px solid #D2D2D2;
+    padding-left: 9px;
+    margin: 0 0 0 .8ex;
+    color: #777;
+}
+.oembed {
+	
+	font-weight: bold;
+}
+.aprofile dt{
+box-shadow: 1px 1px 5px 0;
+    color: #666666;
+    margin: 15px 0 5px;
+    padding-left: 5px;	
+	}
+/* ================== */
+/* = Contacts Block = */
+/* ================== */
+
+.contact-block-img {
+        width: 55px;
+        height: 55px;
+        padding-right: 3px;
+}
+.contact-block-div {
+        float: left;
+}
+
+.contact-block-textdiv { width: 150px; height: 34px; float: left; }
+#contact-block-end { clear: both; } 
+
+#group-edit-wrapper {
+        margin-bottom: 10px;
+}
+
+#group-members-end {
+        clear: both;
+}
+#group-edit-desc {
+ margin-top: 15px;
+}
+
+/*
+#group-separator,
+#prof-separator { display: none;}
+*/
+#prof-members-end{
+	clear: both;
+	}
+
+#prvmail-to-label, #prvmail-subject-label, #prvmail-message-label {
+	margin-bottom: 10px;
+	margin-top: 20px;
+}
+
+#prvmail-submit {
+	float: right;
+	margin-top: 10px;
+}
+
+#prvmail-subject
+{
+background: none repeat scroll 0 0 #FFFFFF;
+border: 1px solid #CCCCCC;
+border-radius: 5px 5px 5px 5px;
+font-weight: bold;
+height: 20px;
+margin: 0 0 5px;
+vertical-align: middle;
+}
+#prvmail-form{
+ width: 597px;	
+	}
+	
+#prvmail-upload-wrapper,
+#prvmail-link-wrapper,
+#prvmail-rotator-wrapper {
+	float: left;
+	margin-top: 10px;
+	margin-right: 10px;
+	width: 24px;
+}
+
+#prvmail-end {
+	clear: both;
+}
+
+.mail-list-sender,
+.mail-list-detail {
+	float: left;
+}
+.mail-list-detail {
+	margin-left: 20px;
+}
+
+.mail-list-subject {
+	font-size: 1.1em;
+	margin-top: 10px;
+}
+a.mail-list-link {
+    display: block;
+    font-size: 1.3em;
+    padding: 4px 0;
+}
+
+/*
+*a.mail-list-link:hover {
+*	background-color: #15607B;
+*	color: #F5F6FB;
+*}
+*/
+
+.mail-list-outside-wrapper-end {
+	clear: both;
+}
+
+.mail-list-outside-wrapper {
+	margin-top: 30px;
+}
+
+.mail-list-delete-wrapper {
+	float: right;
+	margin-right: 30px;
+	margin-top: 15px;
+}
+
+.mail-list-delete-icon {
+	border: none;
+}
+
+.mail-conv-sender,
+.mail-conv-detail {
+	float: left;
+}
+.mail-conv-detail {
+	margin-left: 20px;
+	width: 500px;
+}
+
+.mail-conv-subject {
+    font-size: 1.4em;
+    margin: 10px 0;
+}
+
+.mail-conv-outside-wrapper-end {
+	clear: both;
+}
+
+.mail-conv-outside-wrapper {
+	margin-top: 30px;
+}
+
+.mail-conv-delete-wrapper {
+	float: right;
+	margin-right: 30px;
+	margin-top: 15px;
+}
+.mail-conv-break {
+	clear: both;
+}
+
+.mail-conv-delete-icon {
+	border: none;
+}
+
+/* ========== */
+/* = Events = */
+/* ========== */
+.eventcal {
+        float: left;
+        font-size: 20px;
+}
+
+.vevent {
+position: relative;
+width: 400px;
+padding: 20px;
+padding-top: 10px;
+margin: 0 0px;
+margin-bottom: 10px;
+background-color: white;
+-webkit-box-shadow: 0 0 4px rgba(0, 0, 0, 0.2), inset 0 0 50px rgba(0, 0, 0, 0.1);
+-moz-box-shadow: 0 0 4px rgba(0, 0, 0, 0.2), inset 0 0 50px rgba(0, 0, 0, 0.1);
+box-shadow: 0 0 5px rgba(0, 0, 0, 0.2), inset 0 0 50px rgba(0, 0, 0, 0.1);
+}
+.vevent .event-location {
+        margin-left: 10px;
+        margin-right: 10px;
+}
+.vevent .event-description {
+margin-left: 10px;
+margin-right: 10px;
+font-size: 1.1em;
+font-weight: bolder;
+}
+.vevent .event-start, .vevent .event-end {
+
+margin-right: 20px;
+margin-bottom: 2px;
+margin-top: 2px;
+font-size: 0.9em;
+text-align: left;
+}
+.event-start .dtstart, .event-end .dtend {
+float: right;
+}
+
+
+#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("../diabook/icons/events2.png") !important;
+        margin-right: 15px;
+}
+
+.event-start, .event-end {
+        margin-left: 10px;
+        width: 330px;
+        clear: both;
+}
+
+.event-start .dtstart, .event-end .dtend {
+        float: right;
+}
+
+.event-list-date {
+        margin-bottom: 10px;
+}
+
+.prevcal, .nextcal {
+        float: left;
+        margin-left: 32px;
+        margin-right: 32px;
+        margin-top: 64px;
+}
+.event-calendar-end {
+        clear: both;
+}
+
+ 
+.calendar {
+        font-family: Courier, monospace;
+}
+.calendar.eventcal a {
+  color: #3465A4;	
+	}
+.today {
+        font-weight: bold;
+        color: #FF0000;
+}
+
+.settings-block {
+        border: 1px solid #AAA;
+        margin: 10px;
+        padding: 10px;
+}
+
+.app-title {
+        margin: 10px;
+}
+
+#identity-manage-desc {
+        margin-top:15px;
+        margin-bottom: 15px;
+}
+
+#identity-manage-choose {
+        margin-bottom: 15px;
+}
+
+#identity-submit {
+        margin-top: 20px;
+}
+
+#photo-prev-link, #photo-next-link {
+        padding: 10px;
+        float: left;
+}
+.lightbox{
+	float: left;
+	}
+#photo-photo {
+        float: left;
+}
+#photo-like-div .wall-item-like-buttons {
+	float: left;
+   margin-right: 10px;
+	}
+.wall-item-like-buttons .icon.like {
+float: left;
+}
+
+#photo-photo-end {
+        clear: both;
+}
+
+.tabs .comment-wwedit-wrapper {
+	display: block;
+   margin-top: 30px;
+   margin-left: 50px;
+	}
+
+.profile-match-photo {
+        float: left;
+        text-align: center;
+        width: 120px;
+}
+
+.profile-match-name {
+        float: left;
+        text-align: center;
+        width: 120px;
+        overflow: hidden;
+}
+
+.profile-match-break,
+.profile-match-end {
+        clear: both;
+}
+
+.profile-match-connect {
+        text-align: center;
+        font-weight: bold;
+}
+
+.profile-match-wrapper {
+        float: left;
+        padding: 10px;
+        width: 120px;
+        height: 120px;
+        scroll: auto;
+}
+#profile-match-wrapper-end {
+        clear: both;
+}
+
+/* ============= */
+/* = Directory = */
+/* ============= */
+/* contacts menu */
+.contact-photo-wrapper {
+  position: relative;
+}
+.contact-photo {
+  width: 48px;
+  height: 48px;
+  overflow: hidden;
+  display: block;
+}
+.contact-photo img {
+  width: 48px;
+  height: 48px;
+}
+.contact-photo-menu-button {
+  display: none;
+  /* position: absolute; */
+  /* position: absolute; */
+  left: 0px;
+  top: -16px;
+}
+.contact-wrapper {
+  float: left;
+  width: 90px;
+  height: 90px;
+  margin-bottom: 15px;
+}
+.contact-wrapper .contact-photo {
+  width: 80px;
+  height: 80px;
+}
+.contact-wrapper .contact-photo img {
+  width: 80px;
+  height: 80px;
+}
+.contact-wrapper .contact-photo-menu-button {
+  left: 0px;
+  top: 63px;
+}
+.directory-item {
+  float: left;
+  width: 200px;
+  height: 200px;
+}
+.directory-item .contact-photo {
+  width: 175px;
+  height: 175px;
+}
+.directory-item .contact-photo img {
+  width: 175px;
+  height: 175px;
+}
+.contact-name {
+  text-align: left;
+  font-weight: bold;
+  font-size: 12px;
+}
+.contact-details {
+  color: #999999;
+}
+#side-bar-photos-albums{
+	margin-top: 15px;	
+	}
+.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-album-image-wrapper, .photo-top-image-wrapper {
+  float: left;
+   -moz-box-shadow: 0 0 5px #888;
+   -webkit-box-shadow: 0 0 5px #888;
+   box-shadow: 0 0 5px #888;
+  background-color: #000;
+   -webkit-border-radius: 5px;
+   -moz-border-radius: 5px;
+  border-radius: 5px;
+  padding-bottom: 20px;
+  position: relative;
+  margin: 0 10px 10px 0;
+  width: 200px; height: 140px;
+  overflow: hidden;  
+}
+.photo-top-album-name {
+        width: 100%;
+        position: absolute; 
+        bottom: 0px; 
+        padding-left: 3px;
+        background-color: #EEE;
+}
+.photo-top-album-link{
+  color: #3465A4;
+	}
+.photo-top-album-img{
+	
+	}
+/*.photo-top-image-wrapper {
+        position: relative;
+        float: left;
+        margin-top: 15px;
+        margin-right: 15px;
+        width: 200px; height: 200px; 
+        overflow: hidden; 
+}
+.photo-top-album-name {
+        width: 100%;
+        min-height: 2em;
+        position: absolute; 
+        bottom: 0px; 
+        padding: 0px 3px;
+        padding-top: 0.5em;
+        background-color: rgb(255, 255, 255);
+}*/
+#photo-top-end {
+        clear: both;
+}
+
+#photo-top-links {
+        margin-bottom: 30px;
+        margin-left: 30px;
+}
+
+#photos-upload-newalbum-div {
+        float: left;
+        width: 175px;
+}
+
diff --git a/view/theme/diabook/diabook-green/style.css b/view/theme/diabook/diabook-green/style.css
new file mode 100644
index 000000000..d4e2052a7
--- /dev/null
+++ b/view/theme/diabook/diabook-green/style.css
@@ -0,0 +1,2917 @@
+/**
+ * Fabio Comuni <http://kirgroup.com/profile/fabrixxm>
+ * Additional Changes: Michael Vogel <icarus@dabo.de>
+ **/
+
+/* ========= */
+/* = Admin = */
+/* ========= */
+
+#adminpage {
+/*        width: 80%;*/
+}
+
+#pending-update {
+        float:right;
+        color: #ffffff;
+        font-weight: bold;
+        background-color: #FF0000;
+        padding: 0em 0.3em;
+}
+
+.admin.linklist {
+        border: 0px; padding: 0px;
+}
+
+.admin.link {
+        list-style-position: inside;
+        font-size: 1em;
+        padding: 5px;
+        width: 100px;
+        margin: 5px;
+}
+
+#adminpage dl {
+        clear: left;
+        margin-bottom: 2px;
+        padding-bottom: 2px;
+        border-bottom: 1px solid black;
+}
+
+#adminpage dt {
+        width: 200px;
+        float: left;
+        font-weight: bold;
+}
+
+#adminpage dd {
+        margin-left: 200px;
+}
+#adminpage h3 {
+        border-bottom: 1px solid #898989;
+        margin-bottom: 5px;
+        margin-top: 10px;
+}
+
+#adminpage .submit {
+        clear:left;
+}
+
+#adminpage #pluginslist {
+        margin: 0px; padding: 0px;
+}
+
+#adminpage .plugin {
+        list-style: none;
+        display: block;
+	/* border: 1px solid #888888; */
+        padding: 1em;
+        margin-bottom: 5px;
+        clear: left;
+}
+
+#adminpage .toggleplugin {
+        float:left;
+        margin-right: 1em;
+}
+
+#adminpage table {width:100%; border-bottom: 1p solid #000000; margin: 5px 0px;}
+#adminpage table th { text-align: left;}
+#adminpage td .icon { float: left;}
+#adminpage table#users img { width: 16px; height: 16px; }
+#adminpage table tr:hover { background-color: #eeeeee; }
+#adminpage .selectall { text-align: right; }
+/* icons */
+
+.icon.bb-url{
+  background-image: url("../../../view/theme/diabook/diabook-green/icons/bb-url.png");
+  float: right;
+  margin-top: 2px;}
+.icon.quote{
+  background-image: url("../../../view/theme/diabook/diabook-green/icons/quote.png");
+  float: right;
+  margin-top: 2px;}
+.icon.bold{
+  background-image: url("../../../view/theme/diabook/diabook-green/icons/bold.png");
+  float: right;
+  margin-top: 2px;}
+.icon.underline{
+  background-image: url("../../../view/theme/diabook/diabook-green/icons/underline.png");
+  float: right;
+  margin-top: 2px;}
+.icon.italic{
+  background-image: url("../../../view/theme/diabook/diabook-green/icons/italic.png");
+  float: right;
+  margin-top: 2px;}
+.icon.bb-image{
+  background-image: url("../../../view/theme/diabook/diabook-green/icons/bb-image.png");
+  float: right;
+  margin-top: 2px;}
+.icon.bb-video{
+  background-image: url("../../../view/theme/diabook/diabook-green/icons/bb-video.png");
+  float: right;
+  margin-top: 2px;}
+  
+.icon.contacts {
+  background-image: url("../../../view/theme/diabook/diabook-green/icons/contacts.png");}
+.icon.notifications {
+  background-image: url("../../../view/theme/diabook/diabook-green/icons/notifications.png");}
+.icon.notify {
+  background-image: url("../../../view/theme/diabook/diabook-green/icons/notify.png");}
+.icon.messages {
+  background-image: url("../../../view/theme/diabook/diabook-green/icons/messages.png");}
+.icon.community {
+  background-image: url("../../../view/theme/diabook/diabook-green/icons/community.png");}
+  
+.icon.drop 	{ background-image: url("../../../view/theme/diabook/diabook-green/icons/drop.png");}
+.icon.drophide 	{ background-image: url("../../../view/theme/diabook/diabook-green/icons/drop.png");}
+.icon.dislike 	{ background-image: url("../../../view/theme/diabook/diabook-green/icons/dislike.png");}
+.icon.like 	{ background-image: url("../../../view/theme/diabook/diabook-green/icons/like.png");}
+.icon.pencil 	{ background-image: url("../../../view/theme/diabook/diabook-green/icons/pencil.png");}
+.icon.recycle 	{ background-image: url("../../../view/theme/diabook/diabook-green/icons/recycle.png");}
+.icon.remote-link { background-image: url("../../../view/theme/diabook/diabook-green/icons/remote.png");}
+.icon.tagged    { background-image: url("../../../view/theme/diabook/diabook-green/icons/tagged.png");}
+.icon.file-as { background-image: url("../../../view/theme/diabook/diabook-green/icons/file_as.png");}
+.star-item.icon.unstarred { background-image: url("../../../view/theme/diabook/diabook-green/icons/unstarred.png");}
+.star-item.icon.starred { background-image: url("../../../view/theme/diabook/diabook-green/icons/starred.png");}
+.icon.link		{ background-image: url("../../../view/theme/diabook/diabook-green/icons/link.png");}
+.icon.lock		{ background-image: url("../../../view/theme/diabook/diabook-green/icons/lock.png");}
+.icon.unlock		{ background-image: url("../../../view/theme/diabook/diabook-green/icons/unlock.png");}
+.icon.language    { background-image: url("../../../view/theme/diabook/diabook-green/icons/language.png");}
+
+
+.camera 	{ background-image: url("../../../view/theme/diabook/diabook-green/icons/camera.png"); 
+			  display: block; width: 28px; height: 28px; background-repeat: no-repeat;
+			  }
+.attach 	{ background-image: url("../../../view/theme/diabook/diabook-green/icons/attach.png"); 
+			  display: block; width: 28px; height: 28px; background-repeat: no-repeat;
+			  }
+.video2 	{ background-image: url("../../../view/theme/diabook/diabook-green/icons/video.png"); 
+			  display: block; width: 28px; height: 28px; background-repeat: no-repeat;
+			  }	
+.video 	{ background-image: url("../../../view/theme/diabook/diabook-green/icons/video.png"); 
+			  display: block; width: 100%; height: 140px; background-repeat: no-repeat;
+			  }
+.audio2 	{ background-image: url("../../../view/theme/diabook/diabook-green/icons/audio.png"); 
+			  display: block; width: 28px; height: 28px; background-repeat: no-repeat;
+			  }
+.audio 	{ background-image: url("../../../view/theme/diabook/diabook-green/icons/audio.png"); 
+			  display: block; width: 28px; height: 28px; background-repeat: no-repeat;
+			  }
+.weblink 	{ background-image: url("../../../view/theme/diabook/diabook-green/icons/weblink.png"); 
+			  display: block; width: 28px; height: 28px; background-repeat: no-repeat;
+			  }
+.globe 	{ background-image: url("../../../view/theme/diabook/diabook-green/icons/globe.png"); 
+			  display: block; width: 28px; height: 28px; background-repeat: no-repeat;
+			  }
+.unglobe 	{ background-image: url("../../../view/theme/diabook/diabook-green/icons/unglobe.png"); 
+			  display: block; width: 28px; height: 28px; background-repeat: no-repeat;
+			  }
+.edit    {background-image: url("../../../view/theme/diabook/diabook-green/icons/pencil2.png"); 
+			  display: block; width: 28px; height: 28px; background-repeat: no-repeat;}
+.icon.block   {background-image: url("../diabook/icons/block.png"); 
+			  display: block; width: 16px; height: 16px; background-repeat: no-repeat;}
+.icon.block.dim  {background-image: url("../diabook/icons/block.png"); 
+			  display: block; width: 16px; height: 16px; background-repeat: no-repeat; opacity: 0.3;}
+.icon.ad_drop 	{ background-image: url("../diabook/icons/drop.png");
+			  display: block; margin-left:5px; width: 16px; height: 16px; background-repeat: no-repeat;}			  
+			  
+
+
+.article	{ background-position: -50px  0px;}
+/*.audio 		{ background-position: -70px  0px;}*/
+/*.drop 		{ background-position: -110px 0px;}*/
+/*.drophide 	{ background-position: -130px 0px;}*/
+/*.edit 		{ background-position: -150px 0px;}*/
+/*.camera 	{ background-position: -170px 0px;}*/
+/*.dislike 	{ background-position: -190px 0px;}*/
+/*.like 		{ background-position: -210px 0px;}*/
+/*.link 		{ background-position: -230px 0px;}*/
+
+/*.globe 		{ background-position: -50px  -20px;}*/
+/*.noglobe 	{ background-position: -70px  -20px;}*/
+.no 		{ background-position: -90px  -20px;}
+.pause 		{ background-position: -110px -20px;}
+.play 		{ background-position: -130px -20px;}
+/*.pencil 	{ background-position: -150px -20px;}*/
+.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;}*/
+
+/*.video          { background-position: -110px -40px;}*/
+.youtube        { background-position: -130px -40px;}
+
+/*.attach         { background-position: -190px -40px;}*/
+/*.language       { background-position: -210px -40px;}*/
+
+
+.icon.on             { background-image: url("../../../view/theme/diabook/diabook-green/icons/toogle_on.png"); background-repeat: no-repeat;}
+.icon.off            { background-image: url("../../../view/theme/diabook/diabook-green/icons/toogle_off.png"); background-repeat: no-repeat;}
+.icon.prev           { background-image: url("../../../view/theme/diabook/diabook-green/icons/prev.png"); background-repeat: no-repeat;}
+.icon.next           { background-image: url("../../../view/theme/diabook/diabook-green/icons/next.png"); background-repeat: no-repeat;}
+/*.tagged     { background-position: -130px -60px;}*/
+
+.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 0px; }
+.type-audio { background-position: -40px 0px; }
+.type-text  { background-position: -60px 0px; }
+.type-unkn  { background-position: -80px 0px; }
+
+.icon.drop, .icon.drophide {
+ float: left;
+}
+
+.icon {
+  display: block;
+  width: 20px;
+  height: 20px;
+  /*background-image: url('icons.png');*/
+}
+
+.icon {
+  background-color: transparent ;
+  background-repeat: no-repeat;
+  /* background-position: left center; */
+  display: block;
+  overflow: hidden;
+  text-indent: -9999px;
+  padding: 1px;
+}
+
+.icon.border.camera{
+  background-image: url("../../../view/theme/diabook/diabook-green/icons/camera.png"); 
+  display: block; width: 28px; height: 28px; background-repeat: no-repeat;
+	}
+	
+.icon.border.link{
+  background-image: url("../../../view/theme/diabook/diabook-green/icons/weblink.png"); 
+  display: block; width: 28px; height: 28px; background-repeat: no-repeat;
+  margin-left: 10px;
+	}
+
+.icon.text {
+  text-indent: 0px;
+}
+.icon.s10 {
+  min-width: 10px;
+  height: 10px;
+}
+.icon.s10.notify {
+  background-image: url("../../../images/icons/10/notify_off.png");
+}
+.icon.s10.gear {
+  background-image: url("../../../images/icons/10/gear.png");
+}
+.icon.s10.add {
+  background-image: url("../../../images/icons/10/add.png");
+}
+.icon.s10.delete {
+  background-image: url("../../../images/icons/10/delete.png");
+}
+.icon.s10.edit {
+  background-image: url("../../../images/icons/10/edit.png");
+}
+.icon.s10.star {
+  background-image: url("../../../images/star_dummy.png");
+}
+.icon.s10.menu {
+  background-image: url("../../../images/icons/10/menu.png");
+}
+.icon.s10.link {
+  background-image: url("../../../images/icons/10/link.png");
+}
+.icon.s10.lock {
+  background-image: url("../../../images/icons/10/lock.png");
+}
+.icon.s10.unlock {
+  background-image: url("../../../images/icons/10/unlock.png");
+}
+.icon.s10.text {
+  padding: 2px 0px 0px 15px;
+  font-size: 10px;
+}
+.icon.s16 {
+  min-width: 16px;
+  height: 16px;
+}
+.icon.s16.notify {
+  background-image: url("../../../images/icons/16/notify_off.png");
+}
+.icon.s16.gear {
+  background-image: url("../../../images/icons/16/gear.png");
+}
+.icon.s16.add {
+  background-image: url("../../../images/icons/16/add.png");
+}
+.icon.s16.delete {
+  background-image: url("../../../images/icons/16/delete.png");
+}
+/*.icon.s16.edit {
+  background-image: url("../../../images/icons/16/edit.png");
+}*/
+.icon.s16.star {
+  background-image: url("../../../images/star_dummy.png");
+}
+.icon.s16.menu {
+  background-image: url("../../../images/icons/16/menu.png");
+}
+/*.icon.s16.link {
+  background-image: url("../../../images/icons/16/link.png");
+}*/
+.icon.s16.lock {
+  background-image: url("../../../images/icons/16/lock.png");
+}
+.icon.s16.unlock {
+  background-image: url("../../../images/icons/16/unlock.png");
+}
+.icon.s16.text {
+  padding: 4px 0px 0px 20px;
+  font-size: 10px;
+}
+.icon.s22 {
+  min-width: 22px;
+  height: 22px;
+}
+.icon.s22.notify {
+  background-image: url("../../../images/icons/22/notify_off.png");
+}
+.icon.s22.gear {
+  background-image: url("../../../images/icons/22/gear.png");
+}
+.icon.s22.add {
+  background-image: url("../../../images/icons/22/add.png");
+}
+.icon.s22.delete {
+  background-image: url("../../../images/icons/22/delete.png");
+}
+.icon.s22.edit {
+  background-image: url("../../../images/icons/22/edit.png");
+}
+.icon.s22.star {
+  background-image: url("../../../images/star_dummy.png");
+}
+.icon.s22.menu {
+  background-image: url("../../../images/icons/22/menu.png");
+}
+.icon.s22.link {
+  background-image: url("../../../images/icons/22/link.png");
+}
+.icon.s22.lock {
+  background-image: url("../../../images/icons/22/lock.png");
+}
+.icon.s22.unlock {
+  background-image: url("../../../images/icons/22/unlock.png");
+}
+.icon.s22.text {
+  padding: 10px 0px 0px 25px;
+  width: 200px;
+}
+.icon.s48 {
+  width: 48px;
+  height: 48px;
+}
+.icon.s48.notify {
+  background-image: url("../../../images/icons/48/notify_off.png");
+}
+.icon.s48.gear {
+  background-image: url("../../../images/icons/48/gear.png");
+}
+.icon.s48.add {
+  background-image: url("../../../images/icons/48/add.png");
+}
+.icon.s48.delete {
+  background-image: url("../../../images/icons/48/delete.png");
+}
+.icon.s48.edit {
+  background-image: url("../../../images/icons/48/edit.png");
+}
+.icon.s48.star {
+  background-image: url("../../../images/star_dummy.png");
+}
+.icon.s48.menu {
+  background-image: url("../../../images/icons/48/menu.png");
+}
+.icon.s48.link {
+  background-image: url("../../../images/icons/48/link.png");
+}
+.icon.s48.lock {
+  background-image: url("../../../images/icons/48/lock.png");
+}
+.icon.s48.unlock {
+  background-image: url("../../../images/icons/48/unlock.png");
+}
+
+#contact-edit-links ul {
+  list-style: none;
+  list-style-type: none;
+}
+
+.hide-comments-outer {
+  margin-left: 80px;
+  margin-bottom: 5px;
+  width: 684px;
+  border-bottom: 1px solid #BDCDD4;
+  padding: 8px;
+}
+
+/* global */
+body {
+  font-family: 'Lato', "Helvetica Neue", Helvetica, Arial, sans-serif;
+  font-size: 12.5px;
+  background-color: #ffffff;
+  color: #2d2d2d;
+  margin: 50px auto auto;
+  display: table;
+}
+
+#jappix_mini {
+right: 45px !important;
+}
+
+
+h4 {
+  font-size: 1.1em;
+}
+
+a {
+	color: #333333;
+	/* color: #3e3e8c; */
+	text-decoration: none;
+}
+a:hover {
+	/* color: blue; */
+	text-decoration: underline
+}
+
+.wall-item-name-link {
+/*  float: left;*/
+}
+
+.wall-item-photo {
+  width: 48px;
+  height: 48px;
+  overflow: hidden;
+  display: block;
+}
+
+.left {
+  float: left;
+}
+.right {
+  float: right;
+}
+.hidden {
+  display: none;
+}
+.clear {
+  clear: both;
+}
+/*color*/
+.fakelink {
+  color: #194719;
+  /* color: #3e3e8c; */
+  text-decoration: none;
+  cursor: pointer;
+}
+.fakelink:hover {
+  /* color: blue; */
+  /*color: #005c94; */
+  text-decoration: underline;
+}
+.intro-end {
+	border-bottom: 1px solid black;
+   clear: both;
+   margin-bottom: 25px;
+   padding-bottom: 25px;
+   width: 75%;
+	}
+.intro-form-end {
+	clear: both;
+	}
+.intro-fullname {
+	padding-bottom: 5px;
+   padding-top: 5px;
+	}
+.intro-wrapper-end {
+	clear: both;
+   padding-bottom: 5px;
+	}
+code {
+  font-family: Courier, monospace;
+  white-space: pre;
+  display: block;
+  overflow: auto;
+  border: 1px solid #444;
+  background: #EEE;
+  color: #444;
+  padding: 10px;
+  margin-top: 20px;
+}
+#panel {
+  position: absolute;
+  width: 12em;
+  background: #ffffff;
+  color: #2d2d2d;
+  margin: 0px;
+  padding: 1em;
+  list-style: none;
+  border: 3px solid #364e59;
+  z-index: 100000;
+  -webkit-box-shadow: 0px 5px 10px rgba(0, 0, 0, 0.7);
+  -moz-box-shadow: 0px 5px 10px rgba(0, 0, 0, 0.7);
+  box-shadow: 0px 5px 10px rgba(0, 0, 0, 0.7);
+}
+/* tool */
+.tool {
+  height: auto;
+  overflow: auto;
+  padding: 3px;
+}
+#saved-search-ul .tool:hover,
+#nets-sidebar .tool:hover,
+#sidebar-group-list .tool:hover,
+#fileas-sidebar .tool:hover  {
+	background: aliceBlue;
+}
+.tool .label {
+  float: left;
+}
+.tool .action {
+  float: right;
+}
+/*color*/
+.tool a {
+  color: #194719;
+}
+.tool a:hover {
+  text-decoration: none;
+}
+/* popup notifications */
+div.jGrowl div.notice {
+  background: #511919 url("../../../images/icons/48/notice.png") no-repeat 5px center;
+  color: #ffffff;
+  padding-left: 58px;
+}
+div.jGrowl div.info {
+  background: #364e59 url("../../../images/icons/48/info.png") no-repeat 5px center;
+  color: #ffffff;
+  padding-left: 58px;
+}
+/*color*/
+/* header */
+header {
+  position: fixed;
+  left: 0%;
+  right: 80%;
+  top: 0px;
+  margin: 0px;
+  padding: 0px;
+  width: 22%;
+  height: 32px;
+  background: #5CD65C;
+  background-color: #5CD65C;
+  z-index: 100;
+-webkit-box-shadow: -10px 0px 10px rgba(0, 0, 0, 0.7);
+  -moz-box-shadow: -10px 0px 10px rgba(0, 0, 0, 0.7);
+  box-shadow: -10px 0px 10px rgba(0, 0, 0, 0.7);
+}
+header #site-location {
+  display: none;
+}
+header #banner {
+  overflow: hidden;
+  text-align: banner;
+  width: 82%;
+  margin-left: 25%;
+}
+header #banner a,
+header #banner a:active,
+header #banner a:visited,
+header #banner a:link,
+header #banner a:hover {
+  color: #1f1f1f;
+  text-decoration: none;
+  outline: none;
+  vertical-align: middle;
+  font-weight: bolder;
+  margin-left: 3px;
+}
+header #banner #logo-img {
+  height: 25px;
+  margin-top: 3px;
+}
+header #banner #logo-text {
+  font-size: 20px;
+  position: absolute;
+  top: 10%;
+}
+/*color*/
+/* messages */
+#message-new {
+  background: #194719;
+  border: 1px solid #333;
+  width: 150px;
+}
+#message-new a {
+  color: #ffffff;
+  text-align: center;
+  display: block;
+  font-weight: bold;
+  padding: 1em 0px;
+    text-decoration: none;
+}
+.mail-list-wrapper {
+  background-color: #f6f7f8;
+  margin-bottom: 5px;
+  width: 100%;
+  height: auto;
+  overflow: hidden;
+}
+.mail-list-wrapper span {
+  display: block;
+  float: left;
+  width: 20%;
+  overflow: hidden;
+}
+.mail-list-wrapper .mail-subject {
+  width: 30%;
+  padding: 4px 0px 0px 4px;
+}
+.mail-list-wrapper .mail-subject a {
+  display: block;
+}
+.mail-list-wrapper .mail-subject.unseen a {
+  font-weight: bold;
+}
+.mail-list-wrapper .mail-date {
+  padding: 4px 4px 0px 4px;
+}
+.mail-list-wrapper .mail-from {
+  padding: 4px 4px 0px 4px;
+}
+.mail-list-wrapper .mail-count {
+  padding: 4px 4px 0px 4px;
+  text-align: right;
+}
+.mail-list-wrapper .mail-delete {
+  float: right;
+}
+#mail-display-subject {
+  background-color: #f6f7f8;
+  color: #2d2d2d;
+  margin-bottom: 10px;
+  width: 100%;
+  height: auto;
+  overflow: hidden;
+}
+#mail-display-subject span {
+  float: left;
+  overflow: hidden;
+  padding: 4px 0px 0px 10px;
+}
+#mail-display-subject .mail-delete {
+  float: right;
+  opacity: 0.5;
+  -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;
+}
+#mail-display-subject:hover .mail-delete {
+  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;
+}
+/*color*/
+/* nav */
+nav {
+  width: 80%;
+  height: 32px;
+  position: fixed;
+  left: 22%;
+  top: 0px;
+  padding: 0px;
+  background: #5CD65C;
+  color: #1f1f1f;
+  z-index: 99;
+  -webkit-box-shadow: -10px 0px 10px rgba(0, 0, 0, 0.7);
+  -moz-box-shadow: -10px 0px 10px rgba(0, 0, 0, 0.7);
+  box-shadow: -10px 0px 10px rgba(0, 0, 0, 0.7);
+  
+}
+nav a,
+nav a:active,
+nav a:visited,
+nav a:link,
+nav a:hover {
+  color: #1f1f1f;
+  text-decoration: none;
+  outline: none;
+}
+nav #banner {
+  overflow: hidden;
+  /*text-align: center;*/
+  width: 100%;
+}
+nav #banner a,
+nav #banner a:active,
+nav #banner a:visited,
+nav #banner a:link,
+nav #banner a:hover {
+  color: #ffffff;
+  text-decoration: none;
+  outline: none;
+  vertical-align: bottom;
+}
+nav #banner #logo-img {
+  height: 22px;
+  margin-top: 5px;
+}
+nav #banner #logo-text {
+  font-size: 22px;
+}
+nav #navbar{
+	}
+nav ul {
+  margin: 0px;
+  padding: 0px 20px;
+}
+nav ul li {
+  list-style: none;
+  margin: 0px;
+  /* padding: 1px 1px 3px 1px; */
+  float: left;
+}
+nav ul li .menu-popup {
+  left: 0px;
+  right: auto;
+}
+
+nav #logo-img {
+  height: 25px;
+  margin-top: 4px;
+  margin-left: 30px;
+}
+
+nav #logo-text {
+    font-size: 22px;
+    margin-top: 3px;
+    margin-right: 15px;
+}
+nav .nav-menu-search {
+  position: relative;
+
+  margin: 4px 17px;
+  margin-right: 0px;
+  height: 17px;
+  width: 180px;
+  
+}
+
+nav #search-box #search-text {
+  background-image:  url('icons/lupe.png');
+  background-repeat:no-repeat;
+  padding-left:20px;
+  border-top-left-radius: 15px;
+border-top-right-radius: 15px;
+border-bottom-right-radius: 15px;
+border-bottom-left-radius: 15px;
+	}
+
+
+nav .nav-menu-icon {
+  position: relative;
+  height: 22px;
+  padding: 5px;
+  margin: 0px 5px;
+  -moz-border-radius: 5px 5px 0 0;
+  -webkit-border-radius: 5px 5px 0 0;
+  border-radius: 5px 5px 0 0;
+}
+nav .nav-menu-icon:hover {
+  position: relative;
+  height: 22px;
+  padding: 5px;
+  margin: 0px 5px;
+  -moz-border-radius: 5px 5px 0 0;
+  -webkit-border-radius: 5px 5px 0 0;
+  border-radius: 5px 5px 0 0;
+}
+/*color*/
+nav .nav-menu-icon.selected {
+  background-color: #fff;
+}
+nav .nav-menu-icon img {
+  width: 22px;
+  height: 22px;
+}
+nav .nav-menu-icon .nav-notify {
+  top: 3px;
+}
+nav .nav-menu {
+  position: relative;
+  height: 16px;
+  padding: 5px;
+  margin: 3px 15px 0px;
+  font-size: 13px;
+  /*border-bottom: 3px solid #364A84;*/
+}
+nav .nav-menu.selected {
+  /*border-bottom: 3px solid #9eabb0;*/
+}
+nav .nav-notify {
+  display: none;
+  position: absolute;
+  background-color: #fff;
+  /* background-color: #19aeff; */
+  -moz-border-radius: 5px 5px 5px 5px;
+  -webkit-border-radius: 5px 5px 5px 5px;
+  border-radius: 5px 5px 5px 5px;
+  font-size: 10px;
+  font-weight: 900;
+  padding: 1px 4px;
+  top: 0px;
+  right: -6px;
+  min-width: 10px;
+  text-align: center;
+  border: 1px solid black;
+}
+nav .nav-notify.show {
+  display: block;
+}
+nav #nav-help-link,
+nav #nav-search-link,
+nav #nav-directory-link,
+nav #nav-apps-link,
+nav #nav-site-linkmenu, 
+nav #nav-home-link,
+nav #nav-user-linkmenu
+{
+  float: right;
+}
+nav #nav-user-linkmenu{
+	margin-right: 0px;
+	}
+nav #nav-home-link, #nav-directory-link, #nav-apps-link{
+	margin-left: 0px;
+	margin-right: 0px;
+	font-weight: bold;
+	margin: 3px 5px;
+	font-size: 14px;
+	}
+nav #nav-directory-link{
+  margin-right: 0px;	
+	}
+nav #nav-home-link{
+  margin-left: 0px;	
+	}
+nav #nav-help-link .menu-popup,
+nav #nav-search-link .menu-popup,
+nav #nav-directory-link .menu-popup,
+nav #nav-apps-link .menu-popup,
+nav #nav-site-linkmenu .menu-popup {
+  right: 0px;
+  left: auto;
+}
+
+nav #nav-messages-linkmenu.on .icon.messages, nav #nav-messages-linkmenu.selected .icon.messages{
+	background-image: url("../../../view/theme/diabook/diabook-green/icons/messages.png");
+	}
+	
+/*nav #nav-notifications-linkmenu.on .icon.notify,*/ nav #nav-notifications-linkmenu.selected .icon.notify{
+	background-image: url("../../../view/theme/diabook/diabook-green/icons/notify.png");
+	}
+	
+nav #nav-contacts-linkmenu.on .icon.contacts, nav #nav-contacts-linkmenu.selected .icon.contacts{
+	background-image: url("../../../view/theme/diabook/diabook-green/icons/contacts.png");
+	}
+	
+nav #nav-apps-link.selected {
+ background-color: #fff;
+  moz-border-radius: 5px 5px 0 0;
+-webkit-border-radius: 5px 5px 0 0;
+border-radius: 5px 5px 0 0;
+}
+
+#nav-notifications-mark-all {
+	/* padding: 1px 1px 2px 26px; */
+	/* border-bottom: 1px solid #364E59; */
+	/* margin: 0px 0px 2px 0px;
+	padding: 5px 10px; */
+}
+
+#nav-notifications-see-all {
+	/* padding: 1px 1px 2px 26px; */
+	/* border-bottom: 1px solid #364E59; */
+	/* margin: 0px 0px 2px 0px;
+	padding: 5px 10px; */
+}
+
+.notify-seen {
+	background: none repeat scroll 0 0 #DDDDDD;
+	}
+/*color*/
+ul.menu-popup {
+  position: absolute;
+  display: none;
+  width: 11em;
+  background: #F5FCF5;
+  color: #2d2d2d;
+  margin: 0px;
+  padding: 0px;
+  list-style: none;
+  z-index: 100000;
+  -webkit-box-shadow: 0px 5px 10px rgba(0, 0, 0, 0.7);
+  -moz-box-shadow: 0px 5px 10px rgba(0, 0, 0, 0.7);
+  box-shadow: 0px 5px 10px rgba(0, 0, 0, 0.7);
+}
+ul.menu-popup a {
+  display: block;
+  color: #2d2d2d;
+  padding: 5px 10px;
+  text-decoration: none;
+}
+/*color*/
+ul.menu-popup a:hover {
+  background-color: #B8EDB8; /*bdcdd4;*/
+  color: #000;
+}
+ul.menu-popup .menu-sep {
+  border-top: 1px solid #9eabb0;
+}
+ul.menu-popup li {
+  float: none;
+  overflow: auto;
+  height: auto;
+  display: block;
+}
+ul.menu-popup li img {
+  float: left;
+  width: 16px;
+  height: 16px;
+  padding-right: 5px;
+}
+ul.menu-popup .empty {
+  padding: 5px;
+  text-align: center;
+  color: #9eabb0;
+}
+/* autocomplete popup */
+.acpopup {
+  max-height: 150px;
+  background-color: #ffffff;
+  color: #2d2d2d;
+  border: 1px solid #MenuBorder;
+  overflow: auto;
+  z-index: 100000;
+  -webkit-box-shadow: 0px 5px 10px rgba(0, 0, 0, 0.7);
+  -moz-box-shadow: 0px 5px 10px rgba(0, 0, 0, 0.7);
+  box-shadow: 0px 5px 10px rgba(0, 0, 0, 0.7);
+}
+.acpopupitem {
+  color: #2d2d2d;
+  padding: 4px;
+  clear: left;
+}
+.acpopupitem img {
+  float: left;
+  margin-right: 4px;
+}
+.acpopupitem.selected {
+  background-color: #bdcdd4;
+}
+#nav-notifications-menu {
+  width: 400px;
+  max-height: 550px;
+  overflow: auto;
+}
+/* #nav-notifications-menu a {
+	display: inline;
+	padding: 5px 0px;
+	margin: 0px 0px 2px 0px;
+}
+#nav-notifications-menu li:hover {
+  background-color: #bdcdd4;
+}*/
+
+#nav-notifications-menu img {
+  float: left;
+  margin-right: 5px;
+}
+#nav-notifications-menu .contactname {
+  font-weight: bold;
+}
+#nav-notifications-menu .notif-when {
+  font-size: 10px;
+  color: #9eabb0;
+  display: block;
+}
+
+.notif-image {
+        width: 32px;
+        height: 32px;
+        padding: 7px 7px 0px 0px;
+}
+
+/*profile_side*/
+#profile_side {
+  margin-bottom: 30px;
+}
+#ps-usericon{
+	height: 25px	
+	}
+#ps-username{
+  font-size: 1.17em;
+  font-weight: bold;
+  vertical-align: top;
+  position: absolute;
+  padding-top: 4px;
+  padding-left: 5px;	
+  word-wrap: break-word;
+  width: 130px;
+	}
+#ps-username:hover{
+  text-decoration: none;	
+	}
+.menu-profile-side{
+  list-style: none;	
+  padding-left: 0px;
+  min-height: 0px;
+	}
+.menu-profile-list{
+  height: auto;
+  overflow: auto;  
+  min-height: 16px;
+  list-style: none;
+	}
+	/*color*/
+.menu-profile-list:hover{
+	background: #B8EDB8; 
+	}
+.menu-profile-list-item{
+	padding-left: 5px;
+	vertical-align: middle;
+	}	
+.menu-profile-list-item:hover{	
+	text-decoration: none;
+   }
+/*http://prothemedesign.com/circular-icons/*/
+.menu-profile-icon.home{
+	background: url("../../../view/theme/diabook/diabook-green/icons/home.png") no-repeat;
+	float: left;
+	height: 22px;
+	width: 22px;
+	}
+.menu-profile-icon.photos{
+	background: url("../../../view/theme/diabook/diabook-green/icons/mess_side.png") no-repeat;
+	float: left;
+	height: 22px;
+   width: 22px;}
+.menu-profile-icon.events{
+	background: url("../../../view/theme/diabook/diabook-green/icons/events.png") no-repeat;
+	float: left;
+	height: 22px;
+   width: 22px;}
+.menu-profile-icon.notes{
+	background: url("../../../view/theme/diabook/diabook-green/icons/notes.png") no-repeat;
+	float: left;
+	height: 22px;
+   width: 22px;}
+.menu-profile-icon.foren{
+	background: url("../../../view/theme/diabook/diabook-green/icons/pubgroups.png") no-repeat;
+	float: left;
+	height: 22px;
+   width: 22px;}
+.menu-profile-icon.com_side{
+	background: url("../../../view/theme/diabook/diabook-green/icons/com_side.png") no-repeat;
+	float: left;
+	height: 22px;
+   width: 22px;}
+.menu-profile-icon.pscontacts{
+	background: url("../../../view/theme/diabook/diabook-green/icons/pscontacts.png") no-repeat;
+	float: left;
+	height: 22px;
+   width: 22px;}
+/* aside */
+aside {
+  display: table-cell;
+  vertical-align: top;
+  width: 180px;
+  padding: 0px 10px 0px 20px;
+  border-right: 1px solid #D2D2D2;
+  float: left;
+  /* background: #F1F1F1; */
+}
+aside #page-sidebar{display: none;}
+aside .vcard .fn {
+  font-size: 18px;
+  font-weight: bold;
+  margin-bottom: 5px;
+}
+aside .vcard .title {
+  margin-bottom: 5px;
+}
+aside .vcard dl {
+  height: auto;
+  overflow: auto;
+}
+aside .vcard dt {
+  float: left;
+  margin-left: 0px;
+  /*width: 35%;*/
+  text-align: right;
+  color: #999999;
+}
+aside .vcard dd {
+  float: left;
+  margin-left: 5px;
+  /*width: 60%;*/
+}
+aside #profile-extra-links ul {
+  padding: 0px;
+  margin: 0px;
+}
+aside #profile-extra-links li {
+  padding: 0px;
+  margin: 0px;
+  list-style: none;
+}
+aside #dfrn-request-link {
+  display: block;
+  -moz-border-radius: 5px 5px 5px 5px;
+  -webkit-border-radius: 5px 5px 5px 5px;
+  border-radius: 5px 5px 5px 5px;
+  color: #ffffff;
+  background: #005c94 url('../../../images/connect-bg.png') no-repeat left center;
+  font-weight: bold;
+  text-transform: uppercase;
+  padding: 4px 2px 2px 35px;
+}
+aside #dfrn-request-link:hover {
+  text-decoration: none;
+  background-color: #36c;
+  /* background-color: #19aeff; */
+}
+aside #profiles-menu {
+  width: 20em;
+}
+aside #search-text {
+	width: 173px;
+	height: 17px;
+	padding-left: 10px;
+	border-top-left-radius: 15px;
+border-top-right-radius: 15px;
+border-bottom-right-radius: 15px;
+border-bottom-left-radius: 15px;
+}
+aside #side-follow-url {
+	width: 173px;
+	}
+aside #side-peoplefind-url {
+	width: 173px;
+	}
+#contact-block {
+  overflow: auto;
+  height: auto;
+}
+/*color*/
+aside #likes a, a:visited, a:link {
+		color: #194719;
+		text-decoration: none;
+		cursor: pointer;
+		
+}
+aside #likes a:hover{
+	text-decoration: underline;
+	}
+
+#contact-block .contact-block-h4 {
+  float: left;
+  margin: 5px 0px;
+}
+#contact-block .allcontact-link {
+  float: right;
+  margin: 5px 0px;
+}
+#contact-block .contact-block-content {
+  clear: both;
+  overflow: auto;
+  height: auto;
+}
+#contact-block .contact-block-link {
+  float: left;
+  margin: 0px 2px 2px 0px;
+}
+#contact-block .contact-block-link img {
+  widht: 55px;
+  height: 55px;
+}
+#lost-password-link {
+  float: left;
+  margin-right: 20px;		
+	}
+#login-submit-wrapper{
+margin-bottom: 15px;
+	}
+.group_selected {
+  background: url("../diabook/icons/selected.png") no-repeat left center;
+  float: left;
+  height: 22px;
+  width: 22px;
+}
+.group_unselected {
+  background: url("../diabook/icons/unselected.png") no-repeat left center;
+  float: left;
+  height: 22px;
+  width: 22px;
+}
+.icon.text_add		{ 
+		background-image: url("../../../images/icons/16/add.png");
+		float: right;
+		opacity: 0.2;
+		margin-right: 14px;
+		}
+.icon.text_add:hover	{ 
+		background-image: url("../../../images/icons/16/add.png");
+		float: right;
+		cursor: pointer;
+		margin-right: 14px;
+		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;
+		}
+.icon.text_edit {
+  background-image: url("../../../images/icons/10/edit.png");
+  opacity: 0.2;
+  margin-top: 6px;
+  float: right;
+  height: 10px;
+}
+.icon.text_edit:hover {
+  background-image: url("../../../images/icons/10/edit.png");
+  opacity: 1;
+  margin-top: 6px;
+  float: right;
+  height: 10px;
+}
+/* widget */
+.widget {
+  margin-bottom: 2em;
+  /*.action .s10 { width: 10px; overflow: hidden; padding: 0px;}
+	.action .s16 { width: 16px; overflow: hidden; padding: 0px;}*/
+/*  font-size: 12px; */
+}
+.widget h3 {
+  padding: 0px;
+  margin: 2px;
+}
+.widget .action {
+  opacity: 0.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;
+}
+.widget input.action {
+  opacity: 0.5;
+  -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;
+}
+.widget:hover .title .action {
+  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;
+}
+.widget .tool:hover .action {
+  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;
+}
+.widget .tool:hover .action.ticked {
+  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;
+}
+.widget ul {
+  padding: 0px;
+}
+.widget ul li {
+  padding-left: 16px;
+  min-height: 16px;
+  list-style: none;
+}
+#side-bar-photos-albums li{
+list-style-type: disc;
+}
+#side-bar-photos-albums ul li{
+  margin-left: 30px;
+  padding-left: 0px;
+	}
+#side-bar-photos-albums ul li a{
+  color: #3465A4;
+}
+.widget .tool.selected {
+  background: url("../../../view/theme/diabook/diabook-green/icons/selected.png") no-repeat left center;
+}
+/* widget: search */
+#add-search-popup {
+  width: 200px;
+  top: 18px;
+}
+/* section */
+section {
+  display: table-cell;
+  vertical-align: top;
+  width: 800px;
+  padding: 0px 0px 0px 12px;
+}
+body .pageheader{
+  text-align: center;
+  font-size: 20px;
+  margin-bottom: 20px;
+  margin-top: 0px;
+  max-width: 775px;
+	}
+.qcomment{
+  max-width: 122px;	
+	}
+#id_username {
+  width: 173px;	
+	}
+#id_password {
+  width: 173px;		
+	}
+#id_openid_url {
+  width: 173px;	
+	}
+#contact-edit-end {
+	}
+.pager {
+   padding: 10px;
+	text-align: center;
+	font-size: 1.0em;
+	clear: both;
+	display: block;
+}	
+
+.tabs {
+    
+    background-position: 0 -20px;
+    background-repeat: repeat-x;
+    height: 27px;
+    padding: 0;
+ }
+.tab.button {
+    margin-left: 5px;	
+    /*background: none repeat scroll 0 0 #F8F8F8;*/
+    border: 1px solid #CCCCCC;
+    border-radius: 3px 3px 3px 3px;
+    font-weight: normal;
+    padding: 3px;
+    color:  #333333;
+	}
+	
+#birthday-notice, #event-notice, #birthday-wrapper, #event-wrapper{
+	margin-bottom: 10px;
+	}
+
+#birthday-wrapper a {
+	color: #3465A4;
+	}
+/* wall item */
+.tread-wrapper {
+  border-bottom: 1px solid #D2D2D2;
+  position: relative;
+  padding: 5px;
+  margin-bottom: 0px;
+  width: 775px;
+  padding-top: 10px;
+}
+/*color*/
+.tread-wrapper a{
+  color: #194719;
+}
+.wall-item-decor {
+  position: absolute;
+  left: 790px;
+  top: -10px;
+  width: 16px;
+}
+
+.wall-item-container {
+  display: table;
+  width: 780px;
+}
+.wall-item-photo-container .wall-item-item, .wall-item-container .wall-item-bottom {
+  display: table-row;
+}
+.wall-item-photo-container .wall-item-info {
+  display: table-cell;
+  vertical-align: top;
+  text-align: left;
+  width: 80px;
+}
+.wall-item-photo-container .wall-item-location {
+  padding-right: 40px;
+  display: table-cell;
+}
+.wall-item-photo-container .wall-item-ago {
+  word-wrap: break-word;
+  width: 50px;
+  margin-left: 10px;
+  color: #999;
+}
+.wall-item-photo-container .wall-item-content {
+
+  max-width: 720px;
+  word-wrap: break-word;
+
+  margin-bottom: 14px;
+}
+.wall-item-photo-container .wall-item-content img {
+  max-width: 700px;
+}
+.wall-item-photo-container .wall-item-links, .wall-item-photo-container .wall-item-actions {
+  display: table-cell;
+  vertical-align: middle;
+}
+.wall-item-photo-container .wall-item-links .icon, .wall-item-photo-container .wall-item-actions .icon {
+  opacity: 0.5;
+  -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;
+}
+.wall-item-photo-container .wall-item-links .icon:hover, .wall-item-photo-container .wall-item-actions .icon: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;
+}
+.wall-item-photo-container .wall-item-name {
+  font-weight: bold;
+}
+.wall-item-photo-container .wall-item-actions-author {
+  width: 100%;
+  margin-bottom: 0.3em;
+}
+.wall-item-photo-container .wall-item-actions-social {
+  float: left;
+  margin-bottom: 1px;
+  display: table-cell;
+}
+.wall-item-photo-container .wall-item-actions-social a {
+  margin-right: 1em;
+}
+.wall-item-photo-container .wall-item-actions-tools {
+  float: right;
+  width: 80px;
+  display: table-cell;
+}
+.wall-item-photo-container .wall-item-actions-tools a {
+  float: right;
+}
+.wall-item-photo-container .wall-item-actions-tools input {
+  float: right;
+}
+.wall-item-photo-container.comment {
+  margin-top: 5px;
+  margin-bottom: 5px;
+  margin-left: 40px;
+  width: 650px;
+  border-bottom: 1px solid #D2D2D2;
+}
+.wall-item-photo-container.comment {
+  top: 15px !important;
+  left: 15px !important;
+}
+.wall-item-photo-container {
+  display: table;
+  width: 780px;
+}
+.my-comment-photo {
+  width: 48px;
+  margin-left: 40px;
+  margin-right: 32px;
+	}
+.comment-edit-preview {
+  width: 500px;
+  margin-top: 10px;
+}
+.comment-edit-text-empty {
+    width: 500px;
+    border: 1px solid #D2D2D2;
+    height: 3.2em;
+    color: #2d2d2d;
+}
+.comment-edit-text-full {
+  font-size: 12.5px;
+  height: 3.3em;
+  
+  border: 1px solid #D2D2D2;
+  width: 500px;
+}
+.comment-edit-photo {
+    margin: 10px 0 0;
+    display: table-cell;
+}
+
+
+.wall-item-container .wall-item-item, .wall-item-container .wall-item-bottom {
+  display: table-row;
+}
+.wall-item-bottom {
+  font-size: 13px;
+}
+.wall-item-container .wall-item-bottom {
+/*  opacity: 0.5;
+  -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; */
+}
+.wall-item-container:hover .wall-item-bottom {
+/*  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; */
+}
+.wall-item-container .wall-item-info {
+  display: table-cell;
+  vertical-align: top;
+  text-align: left;
+  width: 80px;
+}
+.wall-item-container .wall-item-location {
+  padding-right: 40px;
+  display: table-cell;
+}
+.wall-item-container .wall-item-ago {
+  word-wrap: break-word;
+  width: 50px;
+  margin-left: 10px;
+  color: #999;
+}
+.wall-item-location {
+  
+  clear: both;
+  overflow: hidden;
+  
+  margin-bottom: 5px;
+}
+
+.wall-item-container .wall-item-content {
+
+  max-width: 720px;
+  word-wrap: break-word;
+
+
+}
+
+.wall-item-container .wall-item-content img {
+  max-width: 700px;
+}
+.wall-item-container .wall-item-links, .wall-item-container .wall-item-actions {
+  display: table-cell;
+  vertical-align: middle;
+}
+.wall-item-container .wall-item-links .icon, .wall-item-container .wall-item-actions .icon {
+  opacity: 0.5;
+  -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;
+}
+.wall-item-container .wall-item-links .icon:hover, .wall-item-container .wall-item-actions .icon: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;
+}
+.wall-item-container .wall-item-name {
+  font-weight: bold;
+}
+.wall-item-container .wall-item-actions-author {
+  width: 100%;
+  margin-bottom: 0.3em;
+}
+.wall-item-container .wall-item-actions-social {
+  float: left;
+  margin-bottom: 1px;
+  display: table-cell;
+}
+.wall-item-container .wall-item-actions-social a {
+  margin-right: 1em;
+}
+.wall-item-actions-social a {
+  float: left;
+}
+.wall-item-container .wall-item-actions-tools {
+  float: right;
+  width: 80px;
+  display: table-cell;done
+}
+.wall-item-container .wall-item-actions-tools a {
+  float: right;
+}
+.wall-item-container .wall-item-actions-tools input {
+  float: right;
+}
+.wall-item-container.comment {
+  margin-top: 5px;
+  margin-bottom: 5px;
+  margin-left: 80px;
+  width: 700px;
+  border-bottom: 1px solid hsl(198, 21%, 79%);
+}
+.wall-item-container.comment .contact-photo {
+  width: 32px;
+  height: 32px;
+  margin-left: 16px;
+  /*background: url(../../../images/icons/22/user.png) no-repeat center center;*/
+
+}
+.wall-item-container.comment {
+  top: 15px !important;
+  left: 15px !important;
+}
+.wall-item-container.comment .wall-item-links {
+  padding-left: 12px;
+}
+.wall-item-comment-wrapper {
+  margin: 1px 5px 5px 80px;
+}
+.wall-item-comment-wrapper .comment-edit-photo {
+  display: none;
+}
+.wall-item-comment-wrapper textarea {
+  height: 2.0em;
+  width: 100%;
+  font-size: 10px;
+  color: #999999;
+  border: 1px solid #DDD;
+  padding: 0.3em;
+  font-size: 14px;
+}
+.wall-item-comment-wrapper .comment-edit-text-full {
+  font-size: 14px;
+  height: 4em;
+  color: #2d2d2d;
+  border: 1px solid #2d2d2d;
+}
+.comment-edit-preview {
+  width: 500px;
+  margin-top: 10px;
+  background-color:  #fff797;
+}
+.comment-edit-preview .contact-photo {
+  width: 32px;
+  height: 32px;
+  margin-left: 16px;
+  /*background: url(../../../images/icons/22/user.png) no-repeat center center;*/
+
+}
+.comment-edit-preview {
+  top: 15px !important;
+  left: 15px !important;
+}
+.comment-edit-preview .wall-item-links {
+  padding-left: 12px;
+}
+.comment-edit-preview .wall-item-container {
+  width: 700px;
+}
+.comment-edit-preview .tread-wrapper {
+  width: 700px;
+  padding: 0;
+  margin: 10px 0;
+}
+
+.shiny {
+  /* border-right: 10px solid #fce94f; */
+	border-right: 1px solid #A7C7F7;
+	padding-right: 12px;
+}
+
+#jot-preview-content{
+	margin-top: 30px;}
+	
+#jot-preview-content .tread-wrapper {
+  background-color: #fff797;
+}
+
+.wall-item-tags {
+  padding-top: 1px;
+  padding-bottom: 2px;
+}
+.tag {
+  /*background: url("../../../images/tag_b.png") repeat-x center left;*/
+  color: #999;
+  padding-left: 3px;
+  font-size: 12px;
+}
+.tag a {
+  padding-right: 5px;
+  /*background: url("../../../images/tag.png") no-repeat center right;*/
+  color: #999;
+}
+.wwto {
+  position: absolute !important;
+  width: 25px;
+  height: 25px;
+  background: #FFFFFF;
+  border: 2px solid #364e59;
+  height: 25px;
+  width: 25px;
+  overflow: hidden;
+  padding: 1px;
+  position: absolute !important;
+  top: 40px;
+  left: 30px;
+  -webkit-box-shadow: 0px 0px 10px rgba(0, 0, 0, 0.7);
+  -moz-box-shadow: 0px 0px 10px rgba(0, 0, 0, 0.7);
+  box-shadow: 0px 0px 10px rgba(0, 0, 0, 0.7);
+}
+.wwto .contact-photo {
+  width: auto;
+  height: 25px;
+}
+/* contacts menu */
+.contact-photo-wrapper {
+  position: relative;
+  width: 80px;
+}
+
+.contact-photo-wrapper.wwto {
+  width: 25px;
+}
+
+.contact-photo {
+  width: 48px;
+  height: 48px;
+  overflow: hidden;
+  display: block;
+}
+.contact-photo img {
+  width: 48px;
+  height: 48px;
+}
+
+.contact-wrapper {
+  float: left;
+  width: 90px;
+  height: 90px;
+  margin-bottom: 15px;
+}
+.contact-wrapper .contact-photo {
+  width: 80px;
+  height: 80px;
+}
+.contact-wrapper .contact-photo img {
+  width: 80px;
+  height: 80px;
+}
+.contact-wrapper {
+  left: 0px;
+  top: 63px;
+}
+.contact-photo {
+  width: 48px;
+  height: 48px;
+}
+.contact-photo img {
+  width: 48px;
+  height: 48px;
+}
+.contact-name {
+  /* text-align: center; */
+  /*font-weight: bold;*/
+  font-size: 12px;
+}
+.contact-details {
+  color: #999999;
+}
+/* editor */
+.jothidden {
+  display: none;
+}
+#jot {
+  width: 785px;
+  margin: 0px 2em 20px 0px;
+}
+#profile-jot-form #profile-jot-text {
+  height: 2.0em;
+  width: 99%;
+  font-size: 15px;
+  color: #999999;
+  border: 1px solid #DDD;
+  padding: 0.3em;
+  margin-bottom: 10px;
+}
+.grey
+{
+  display: inline;
+  float: right;	
+	}
+#jot #jot-tools {
+  margin: 0px;
+  padding: 0px;
+  height: 40px;
+  overflow: none;
+  width: 783px;
+  background-color: #fff;
+  border-bottom: 2px solid #9eabb0;
+}
+
+#jot #jot-tools li {
+  list-style: none;
+  float: left;
+  width: 80px;
+  height: 40px;
+  border-bottom: 2px solid #9eabb0;
+}
+#jot #jot-tools li a {
+  display: block;
+  color: #cccccc;
+  width: 100%;
+  height: 40px;
+  text-align: center;
+  line-height: 40px;
+  overflow: hidden;
+}
+#jot #jot-tools li:hover {
+  background-color: #364e59;
+  border-bottom: 2px solid #bdcdd4;
+}
+#jot #jot-tools li.perms {
+  float: right;
+  width: 40px;
+}
+#jot #jot-tools li.perms a.unlock {
+  width: 30px;
+  border-left: 10px solid #cccccc;
+  background-color: #cccccc;
+  background-position: left center;
+}
+#jot #jot-tools li.perms a.lock {
+  width: 30px;
+  border-left: 10px solid #666666;
+  background-color: #666666;
+}
+#jot #jot-tools li.submit {
+  float: right;
+  background-color: #cccccc;
+  border-bottom: 2px solid #cccccc;
+  border-right: 1px solid #666666;
+  border-left: 1px solid #666666;
+}
+#jot #jot-tools li.submit input {
+  border: 0px;
+  margin: 0px;
+  padding: 0px;
+  background-color: #cccccc;
+  color: #666666;
+  width: 80px;
+  height: 40px;
+  line-height: 40px;
+}
+#jot #jot-tools li.submit input:hover {
+  background-color: #bdcdd4;
+  color: #666666;
+}
+#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;
+}
+#profile-jot-form #jot-title, #profile-jot-form #jot-category {
+    
+  	 border-radius: 5px 5px 5px 5px;
+    font-weight: bold;
+    height: 20px;
+    margin: 0 0 5px;
+    width: 60%;
+    border: 1px solid #d2d2d2;
+}
+#profile-jot-form #jot-title:-webkit-input-placeholder {
+  font-weight: normal;
+}
+#profile-jot-form #jot-title:-moz-placeholder {
+  font-weight: normal;
+}
+#profile-jot-form #profile-jot-text_parent #profile-jot-text_tbl{
+	width: 785px;
+	height: 100px;
+	}
+#jot #jot-title:hover {
+  border: 1px solid #999999;
+}
+#jot #jot-title:focus {
+  border: 1px solid #999999;
+}
+#jot #character-counter {
+  width: 80px;
+  float: right;
+  text-align: right;
+  height: 20px;
+  line-height: 20px;
+  padding-right: 20px;
+}
+#jot-perms-icon, 
+#profile-location,
+#profile-nolocation,
+#profile-youtube, 
+#profile-video, 
+#profile-audio,
+#profile-link,
+#profile-title, 
+#wall-image-upload,
+#wall-file-upload,
+#wall-image-upload-div,
+#wall-file-upload-div,
+.hover, .focus {
+	cursor: pointer;
+	margin-top: 2px;
+}
+#profile-jot-wrapper{
+	margin: 0 2em 20px 0;
+   width: 785px;
+	}
+
+#profile-jot-submit-wrapper {
+	margin-bottom: 50px;
+	width: 785px;
+}
+
+#profile-jot-submit {
+	float: right;
+	margin-top: 2px;
+	font-size: 14px;
+	
+}
+#profile-upload-wrapper {
+	float: left;
+	margin-top: 2px;
+	margin-left: 10px;
+	
+}
+#profile-attach-wrapper {
+	float: left;
+	margin-left: 15px;
+	margin-top: 2px;
+}
+#profile-rotator {
+	float: left;
+	margin-left: 30px;
+	margin-top: 2px;
+}
+#profile-link-wrapper {
+	float: left;
+	margin-left: 15px;
+	margin-top: 2px;
+}
+#profile-youtube-wrapper {
+	float: left;
+	margin-left: 15px;
+	margin-top: 2px;
+}
+#profile-video-wrapper {
+	float: left;
+	margin-left: 15px;
+	margin-top: 2px;
+}
+#profile-audio-wrapper {
+	float: left;
+	margin-left: 15px;
+	margin-top: 2px;
+}
+#profile-location-wrapper {
+	float: left;
+	margin-left: 15px;
+	margin-top: 2px;
+}
+#profile-jot-perms {
+	float: left;
+	margin-left: 45px;
+	margin-top: 2px;
+}
+#jot-preview-link {
+	float: right;
+	margin-left: 10px;
+	margin-top: 2px;
+	font-size: 9px;
+	font-weight: bolder;
+	cursor: pointer;
+}
+#profile-jot-perms{
+   float: right;
+	margin-left: 10px;
+	margin-top: 2px;	
+	}
+/** buttons **/
+.button.creation1 {
+    background-color: #fff;
+    border: 1px solid #777777;
+    border-radius: 3px 3px 3px 3px;
+    box-shadow: 0 1px 1px #CFCFCF;
+    font-weight: bolder;
+	 cursor: pointer;
+}
+/*color*/
+.button.creation2 {
+    background-color: #194719;
+    border: 1px solid #777777;
+    color: white;
+    border-radius: 3px 3px 3px 3px;
+    box-shadow: 0 1px 1px #CFCFCF;
+    margin-left: 5px;
+    font-weight: bolder;
+	 cursor: pointer;
+}
+/*input[type="submit"] {
+	border: 0px;
+    background-color: @ButtonBackgroundColor;
+    color: @ButtonColor;
+    padding: 0px 10px;
+	.rounded(5px);
+    height: 18px;
+}*/
+/** acl **/
+#photo-edit-perms-select, #photos-upload-permissions-wrapper, #profile-jot-acl-wrapper {
+  display: block!important;
+}
+#acl-wrapper {
+  width: 690px;
+  float: left;
+}
+#acl-search {
+  float: right;
+  background: #ffffff url("../../../images/search_18.png") no-repeat right center;
+  padding-right: 20px;
+}
+#acl-showall {
+  float: left;
+  display: block;
+  width: auto;
+  height: 18px;
+  background-color: #cccccc;
+  background-image: url("../../../images/show_all_off.png");
+  background-position: 7px 7px;
+  background-repeat: no-repeat;
+  padding: 7px 5px 0px 30px;
+  color: #999999;
+  -moz-border-radius: 5px 5px 5px 5px;
+  -webkit-border-radius: 5px 5px 5px 5px;
+  border-radius: 5px 5px 5px 5px;
+}
+#acl-showall.selected {
+  color: #000000;
+  background-color: #ff9900;
+  background-image: url("../../../images/show_all_on.png");
+}
+#acl-list {
+  height: 210px;
+  border: 1px solid #cccccc;
+  clear: both;
+  margin-top: 30px;
+  overflow: auto;
+}
+.acl-list-item {
+  display: block;
+  width: 150px;
+  height: 30px;
+  border: 1px solid #cccccc;
+  margin: 5px;
+  float: left;
+}
+.acl-list-item img {
+  width: 22px;
+  height: 22px;
+  float: left;
+  margin: 4px;
+}
+.acl-list-item p {
+  height: 12px;
+  font-size: 10px;
+  margin: 0px;
+  padding: 2px 0px 1px;
+  overflow: hidden;
+}
+.acl-list-item a {
+  font-size: 8px;
+  display: block;
+  width: 40px;
+  height: 10px;
+  float: left;
+  color: #999999;
+  background-color: #cccccc;
+  background-position: 3px 3px;
+  background-repeat: no-repeat;
+  margin-right: 5px;
+  -webkit-border-radius: 2px ;
+  -moz-border-radius: 2px;
+  border-radius: 2px;
+  padding-left: 15px;
+}
+#acl-wrapper a:hover {
+  text-decoration: none;
+  color: #000000;
+}
+.acl-button-show {
+  background-image: url("../../../images/show_off.png");
+}
+.acl-button-hide {
+  background-image: url("../../../images/hide_off.png");
+}
+.acl-button-show.selected {
+  color: #000000;
+  background-color: #9ade00;
+  background-image: url("../../../images/show_on.png");
+}
+.acl-button-hide.selected {
+  color: #000000;
+  background-color: #ff4141;
+  background-image: url("../../../images/hide_on.png");
+}
+.acl-list-item.groupshow {
+  border-color: #9ade00;
+}
+.acl-list-item.grouphide {
+  border-color: #ff4141;
+}
+/** /acl **/
+/** tab buttons 14618a**/
+ul.tabs {
+  list-style-type: none;
+  padding-bottom: 10px;
+  font-size: 13px;
+}
+ul.tabs li {
+  float: left;
+  margin-left: 5px;
+}
+/*color*/
+ul.tabs li .active {
+    background-color: #194719;
+    border: 1px solid #777777;
+    color: white;
+    border-radius: 3px 3px 3px 3px;
+    box-shadow: 2px 2px 2px #CFCFCF;
+    margin-left: 5px;
+}
+//settings tabs
+ul.rs_tabs {
+  list-style-type: none;
+  font-size: 11px;
+}
+ul.rs_tabs li {
+  float: left;
+  margin-bottom: 30px;
+  clear: both;
+}
+/*color*/
+ul.rs_tabs li .selected {
+    background-color: #194719;
+    border: 1px solid #777777;
+    color: white;
+    border-radius: 3px 3px 3px 3px;
+    box-shadow: 2px 2px 2px #CFCFCF;
+    font-size: 13px;
+}
+.rs_tabs {
+    list-style-type: none;
+    font-size: 11px;
+    background-position: 0 -20px;
+    background-repeat: repeat-x;
+    height: 27px;
+    padding: 0;
+ }
+.rs_tab.button {	
+    /*background: none repeat scroll 0 0 #F8F8F8;*/
+    border: 1px solid #CCCCCC;
+    border-radius: 3px 3px 3px 3px;
+    font-weight: bolder;
+    padding: 3px;
+    color:  #333333;
+    text-decoration: none;
+	}
+/**
+ * Form fields
+ */
+.field {
+  margin-bottom: 10px;
+  padding-bottom: 10px;
+  overflow: auto;
+  width: 100%;
+}
+.field label {
+  float: left;
+  width: 200px;
+}
+.field input, .field textarea {
+  width: 400px;
+}
+.field textarea {
+  height: 100px;
+}
+.field .field_help {
+  display: block;
+  margin-left: 200px;
+  color: #666666;
+}
+.field .onoff {
+  float: left;
+  width: 80px;
+}
+.field .onoff a {
+  display: block;
+  border: 1px solid #666666;
+  background-image: url("../../../images/onoff.jpg");
+  background-repeat: no-repeat;
+  padding: 4px 2px 2px 2px;
+  height: 16px;
+  text-decoration: none;
+}
+.field .onoff .off {
+  border-color: #666666;
+  padding-left: 40px;
+  background-position: left center;
+  background-color: #cccccc;
+  color: #666666;
+  text-align: right;
+}
+.field .onoff .on {
+  border-color: #204A87;
+  padding-right: 40px;
+  background-position: right center;
+  background-color: #D7E3F1;
+  color: #204A87;
+  text-align: left;
+}
+.field .hidden {
+  display: none!important;
+}
+.field.radio .field_help {
+  margin-left: 0px;
+}
+.suggest-select {
+width: 500px;
+height: 350px;	
+	}
+.message-to-select {
+	width: 400px;
+   height: 150px;
+	}
+#directory-search-form{
+	margin-bottom: 50px;
+	}
+#profile-edit-links-end {
+        clear: both;
+        margin-bottom: 15px;
+}
+
+#profile-edit-links ul { margin: 20px; padding-bottom: 20px; list-style: none; }
+
+#profile-edit-links li {
+  float: left;
+  list-style: none;
+  margin-left: 10px;
+}
+
+.profile-edit-side-div {
+  display: none;
+}
+
+#register-form label,
+#profile-edit-form label {
+        width: 300px; float: left;
+}
+
+.required {
+  display: inline;
+  color: #B20202;
+}
+
+/* oauth */
+.oauthapp {
+  height: auto;
+  overflow: auto;
+  border-bottom: 2px solid #cccccc;
+  padding-bottom: 1em;
+  margin-bottom: 1em;
+}
+.oauthapp img {
+  float: left;
+  width: 48px;
+  height: 48px;
+  margin: 10px;
+}
+.oauthapp img.noicon {
+  background-image: url("../../../images/icons/48/plugin.png");
+  background-position: center center;
+  background-repeat: no-repeat;
+}
+.oauthapp a {
+  float: left;
+}
+/* contacts */
+.contact-entry-wrapper {
+  width: 120px;
+  height: 120px;
+  float: left;
+}
+/* photo */
+.photo {
+box-shadow: 2px 2px 5px 0px #000000;
+margin: 0px;
+border-radius: 10px;
+height: 145px !important;
+width: 145px !important;
+}
+.lframe {
+  float: left;
+  /*margin: 0px 10px 10px 0px;*/
+}
+/* profile match wrapper */
+.profile-match-wrapper {
+  float: left;
+  width: 90px;
+  height: 90px;
+  margin-bottom: 20px;
+}
+.profile-match-wrapper .contact-photo {
+  width: 80px;
+  height: 80px;
+}
+.profile-match-wrapper .contact-photo img {
+  width: 80px;
+  height: 80px;
+}
+.profile-match-wrapper {
+  left: 0px;
+  top: 63px;
+}
+
+.contact-photo-menu-button {
+        position: relative;
+        background-image: url("../../../images/icons/16/menu.png");
+        background-position: top left; 
+        background-repeat: no-repeat;
+        margin: 0px 0px -16px 0px; 
+	padding: 0px;
+        width: 16px;
+        height: 16px;
+        top: -16px; left:0px;
+        overflow: hidden;
+        text-indent: 40px;
+        display: none;
+        
+}
+.contact-photo-menu {
+        width: 11em;
+        border: 3px solid #364e59;
+	color: #2d2d2d;
+        background: #FFFFFF;
+/*        position: absolute;*/
+        position: relative;
+        left: 0px; top: 0px;
+        display: none;
+        z-index: 10000;
+}
+.contact-photo-menu ul { margin:0px; padding: 0px; list-style: none }
+.contact-photo-menu li a {
+	display: block; 
+	padding: 5px 10px; 
+	color: #2d2d2d;
+	text-decoration: none;
+}
+.contact-photo-menu li a:hover {
+	background-color: #bdcdd4; 
+}
+
+/* page footer */
+footer {
+  height: 100px;
+  display: table-row;
+}
+
+blockquote {
+    border-left: 1px solid #D2D2D2;
+    padding-left: 9px;
+    margin: 0 0 0 .8ex;
+    color: #777;
+}
+.oembed {
+	
+	font-weight: bold;
+}
+.aprofile dt{
+box-shadow: 1px 1px 5px 0;
+    color: #666666;
+    margin: 15px 0 5px;
+    padding-left: 5px;	
+	}
+/* ================== */
+/* = Contacts Block = */
+/* ================== */
+
+.contact-block-img {
+        width: 55px;
+        height: 55px;
+        padding-right: 3px;
+}
+.contact-block-div {
+        float: left;
+}
+
+.contact-block-textdiv { width: 150px; height: 34px; float: left; }
+#contact-block-end { clear: both; } 
+
+#group-edit-wrapper {
+        margin-bottom: 10px;
+}
+
+#group-members-end {
+        clear: both;
+}
+#group-edit-desc {
+ margin-top: 15px;
+}
+
+/*
+#group-separator,
+#prof-separator { display: none;}
+*/
+#prof-members-end{
+	clear: both;
+	}
+
+#prvmail-to-label, #prvmail-subject-label, #prvmail-message-label {
+	margin-bottom: 10px;
+	margin-top: 20px;
+}
+
+#prvmail-submit {
+	float: right;
+	margin-top: 10px;
+}
+
+#prvmail-subject
+{
+background: none repeat scroll 0 0 #FFFFFF;
+border: 1px solid #CCCCCC;
+border-radius: 5px 5px 5px 5px;
+font-weight: bold;
+height: 20px;
+margin: 0 0 5px;
+vertical-align: middle;
+}
+#prvmail-form{
+ width: 597px;	
+	}
+	
+#prvmail-upload-wrapper,
+#prvmail-link-wrapper,
+#prvmail-rotator-wrapper {
+	float: left;
+	margin-top: 10px;
+	margin-right: 10px;
+	width: 24px;
+}
+
+#prvmail-end {
+	clear: both;
+}
+
+.mail-list-sender,
+.mail-list-detail {
+	float: left;
+}
+.mail-list-detail {
+	margin-left: 20px;
+}
+
+.mail-list-subject {
+	font-size: 1.1em;
+	margin-top: 10px;
+}
+a.mail-list-link {
+    display: block;
+    font-size: 1.3em;
+    padding: 4px 0;
+}
+
+/*
+*a.mail-list-link:hover {
+*	background-color: #15607B;
+*	color: #F5F6FB;
+*}
+*/
+
+.mail-list-outside-wrapper-end {
+	clear: both;
+}
+
+.mail-list-outside-wrapper {
+	margin-top: 30px;
+}
+
+.mail-list-delete-wrapper {
+	float: right;
+	margin-right: 30px;
+	margin-top: 15px;
+}
+
+.mail-list-delete-icon {
+	border: none;
+}
+
+.mail-conv-sender,
+.mail-conv-detail {
+	float: left;
+}
+.mail-conv-detail {
+	margin-left: 20px;
+	width: 500px;
+}
+
+.mail-conv-subject {
+    font-size: 1.4em;
+    margin: 10px 0;
+}
+
+.mail-conv-outside-wrapper-end {
+	clear: both;
+}
+
+.mail-conv-outside-wrapper {
+	margin-top: 30px;
+}
+
+.mail-conv-delete-wrapper {
+	float: right;
+	margin-right: 30px;
+	margin-top: 15px;
+}
+.mail-conv-break {
+	clear: both;
+}
+
+.mail-conv-delete-icon {
+	border: none;
+}
+
+/* ========== */
+/* = Events = */
+/* ========== */
+.eventcal {
+        float: left;
+        font-size: 20px;
+}
+
+.vevent {
+position: relative;
+width: 400px;
+padding: 20px;
+padding-top: 10px;
+margin: 0 0px;
+margin-bottom: 10px;
+background-color: white;
+-webkit-box-shadow: 0 0 4px rgba(0, 0, 0, 0.2), inset 0 0 50px rgba(0, 0, 0, 0.1);
+-moz-box-shadow: 0 0 4px rgba(0, 0, 0, 0.2), inset 0 0 50px rgba(0, 0, 0, 0.1);
+box-shadow: 0 0 5px rgba(0, 0, 0, 0.2), inset 0 0 50px rgba(0, 0, 0, 0.1);
+}
+.vevent .event-location {
+        margin-left: 10px;
+        margin-right: 10px;
+}
+.vevent .event-description {
+margin-left: 10px;
+margin-right: 10px;
+font-size: 1.1em;
+font-weight: bolder;
+}
+.vevent .event-start, .vevent .event-end {
+
+margin-right: 20px;
+margin-bottom: 2px;
+margin-top: 2px;
+font-size: 0.9em;
+text-align: left;
+}
+.event-start .dtstart, .event-end .dtend {
+float: right;
+}
+
+
+#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("../diabook/icons/events2.png") !important;
+        margin-right: 15px;
+}
+
+.event-start, .event-end {
+        margin-left: 10px;
+        width: 330px;
+        clear: both;
+}
+
+.event-start .dtstart, .event-end .dtend {
+        float: right;
+}
+.event-list-date {
+        margin-bottom: 10px;
+}
+
+.prevcal, .nextcal {
+        float: left;
+        margin-left: 32px;
+        margin-right: 32px;
+        margin-top: 64px;
+}
+.event-calendar-end {
+        clear: both;
+}
+
+ 
+.calendar {
+        font-family: Courier, monospace;
+}
+.calendar.eventcal a {
+  color: #3465A4;	
+	}
+.today {
+        font-weight: bold;
+        color: #FF0000;
+}
+
+.settings-block {
+        border: 1px solid #AAA;
+        margin: 10px;
+        padding: 10px;
+}
+
+.app-title {
+        margin: 10px;
+}
+
+#identity-manage-desc {
+        margin-top:15px;
+        margin-bottom: 15px;
+}
+
+#identity-manage-choose {
+        margin-bottom: 15px;
+}
+
+#identity-submit {
+        margin-top: 20px;
+}
+
+#photo-prev-link, #photo-next-link {
+        padding: 10px;
+        float: left;
+}
+.lightbox{
+	float: left;
+	}
+#photo-photo {
+        float: left;
+}
+#photo-like-div .wall-item-like-buttons {
+	float: left;
+   margin-right: 10px;
+	}
+.wall-item-like-buttons .icon.like {
+float: left;
+}
+
+#photo-photo-end {
+        clear: both;
+}
+
+.tabs .comment-wwedit-wrapper {
+	display: block;
+   margin-top: 30px;
+   margin-left: 50px;
+	}
+
+.profile-match-photo {
+        float: left;
+        text-align: center;
+        width: 120px;
+}
+
+.profile-match-name {
+        float: left;
+        text-align: center;
+        width: 120px;
+        overflow: hidden;
+}
+
+.profile-match-break,
+.profile-match-end {
+        clear: both;
+}
+
+.profile-match-connect {
+        text-align: center;
+        font-weight: bold;
+}
+
+.profile-match-wrapper {
+        float: left;
+        padding: 10px;
+        width: 120px;
+        height: 120px;
+        scroll: auto;
+}
+#profile-match-wrapper-end {
+        clear: both;
+}
+
+/* ============= */
+/* = Directory = */
+/* ============= */
+/* contacts menu */
+.contact-photo-wrapper {
+  position: relative;
+}
+.contact-photo {
+  width: 48px;
+  height: 48px;
+  overflow: hidden;
+  display: block;
+}
+.contact-photo img {
+  width: 48px;
+  height: 48px;
+}
+.contact-photo-menu-button {
+  display: none;
+  /* position: absolute; */
+  /* position: absolute; */
+  left: 0px;
+  top: -16px;
+}
+.contact-wrapper {
+  float: left;
+  width: 90px;
+  height: 90px;
+  margin-bottom: 15px;
+}
+.contact-wrapper .contact-photo {
+  width: 80px;
+  height: 80px;
+}
+.contact-wrapper .contact-photo img {
+  width: 80px;
+  height: 80px;
+}
+.contact-wrapper .contact-photo-menu-button {
+  left: 0px;
+  top: 63px;
+}
+.directory-item {
+  float: left;
+  width: 200px;
+  height: 200px;
+}
+.directory-item .contact-photo {
+  width: 175px;
+  height: 175px;
+}
+.directory-item .contact-photo img {
+  width: 175px;
+  height: 175px;
+}
+.contact-name {
+  text-align: left;
+  font-weight: bold;
+  font-size: 12px;
+}
+.contact-details {
+  color: #999999;
+}
+#side-bar-photos-albums{
+	margin-top: 15px;	
+	}
+.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-album-image-wrapper, .photo-top-image-wrapper {
+  float: left;
+   -moz-box-shadow: 0 0 5px #888;
+   -webkit-box-shadow: 0 0 5px #888;
+   box-shadow: 0 0 5px #888;
+  background-color: #000;
+   -webkit-border-radius: 5px;
+   -moz-border-radius: 5px;
+  border-radius: 5px;
+  padding-bottom: 20px;
+  position: relative;
+  margin: 0 10px 10px 0;
+  width: 200px; height: 140px;
+  overflow: hidden;  
+}
+.photo-top-album-name {
+        width: 100%;
+        position: absolute; 
+        bottom: 0px; 
+        padding-left: 3px;
+        background-color: #EEE;
+}
+.photo-top-album-link{
+  color: #3465A4;
+	}
+.photo-top-album-img{
+	
+	}
+/*.photo-top-image-wrapper {
+        position: relative;
+        float: left;
+        margin-top: 15px;
+        margin-right: 15px;
+        width: 200px; height: 200px; 
+        overflow: hidden; 
+}
+.photo-top-album-name {
+        width: 100%;
+        min-height: 2em;
+        position: absolute; 
+        bottom: 0px; 
+        padding: 0px 3px;
+        padding-top: 0.5em;
+        background-color: rgb(255, 255, 255);
+}*/
+#photo-top-end {
+        clear: both;
+}
+
+#photo-top-links {
+        margin-bottom: 30px;
+        margin-left: 30px;
+}
+
+#photos-upload-newalbum-div {
+        float: left;
+        width: 175px;
+}
+
diff --git a/view/theme/diabook/diabook-pink/icons/StatusNet.png b/view/theme/diabook/diabook-pink/icons/StatusNet.png
new file mode 100644
index 000000000..398bca716
--- /dev/null
+++ b/view/theme/diabook/diabook-pink/icons/StatusNet.png
diff --git a/view/theme/diabook/diabook-pink/icons/attach.png b/view/theme/diabook/diabook-pink/icons/attach.png
new file mode 100644
index 000000000..1958041cf
--- /dev/null
+++ b/view/theme/diabook/diabook-pink/icons/attach.png
diff --git a/view/theme/diabook/diabook-pink/icons/audio.png b/view/theme/diabook/diabook-pink/icons/audio.png
new file mode 100644
index 000000000..8d779a409
--- /dev/null
+++ b/view/theme/diabook/diabook-pink/icons/audio.png
diff --git a/view/theme/diabook/diabook-pink/icons/bb-image.png b/view/theme/diabook/diabook-pink/icons/bb-image.png
new file mode 100644
index 000000000..9a1b32113
--- /dev/null
+++ b/view/theme/diabook/diabook-pink/icons/bb-image.png
diff --git a/view/theme/diabook/diabook-pink/icons/bb-url.png b/view/theme/diabook/diabook-pink/icons/bb-url.png
new file mode 100644
index 000000000..071fc1865
--- /dev/null
+++ b/view/theme/diabook/diabook-pink/icons/bb-url.png
diff --git a/view/theme/diabook/diabook-pink/icons/bb-video.png b/view/theme/diabook/diabook-pink/icons/bb-video.png
new file mode 100644
index 000000000..bd323531e
--- /dev/null
+++ b/view/theme/diabook/diabook-pink/icons/bb-video.png
diff --git a/view/theme/diabook/diabook-pink/icons/block.png b/view/theme/diabook/diabook-pink/icons/block.png
new file mode 100755
index 000000000..a0b1dffe9
--- /dev/null
+++ b/view/theme/diabook/diabook-pink/icons/block.png
diff --git a/view/theme/diabook/diabook-pink/icons/bluebug.png b/view/theme/diabook/diabook-pink/icons/bluebug.png
new file mode 100644
index 000000000..3979e7d8e
--- /dev/null
+++ b/view/theme/diabook/diabook-pink/icons/bluebug.png
diff --git a/view/theme/diabook/diabook-pink/icons/bold.png b/view/theme/diabook/diabook-pink/icons/bold.png
new file mode 100644
index 000000000..8fab2a10f
--- /dev/null
+++ b/view/theme/diabook/diabook-pink/icons/bold.png
diff --git a/view/theme/diabook/diabook-pink/icons/camera.png b/view/theme/diabook/diabook-pink/icons/camera.png
new file mode 100644
index 000000000..a5c7f1236
--- /dev/null
+++ b/view/theme/diabook/diabook-pink/icons/camera.png
diff --git a/view/theme/diabook/diabook-pink/icons/close_box.png b/view/theme/diabook/diabook-pink/icons/close_box.png
new file mode 100644
index 000000000..28e2675b8
--- /dev/null
+++ b/view/theme/diabook/diabook-pink/icons/close_box.png
diff --git a/view/theme/diabook/diabook-pink/icons/com_side.png b/view/theme/diabook/diabook-pink/icons/com_side.png
new file mode 100644
index 000000000..00186ba05
--- /dev/null
+++ b/view/theme/diabook/diabook-pink/icons/com_side.png
diff --git a/view/theme/diabook/diabook-pink/icons/community.png b/view/theme/diabook/diabook-pink/icons/community.png
new file mode 100644
index 000000000..7c91e8b75
--- /dev/null
+++ b/view/theme/diabook/diabook-pink/icons/community.png
diff --git a/view/theme/diabook/diabook-pink/icons/contacts.png b/view/theme/diabook/diabook-pink/icons/contacts.png
new file mode 100644
index 000000000..5a1c5ed58
--- /dev/null
+++ b/view/theme/diabook/diabook-pink/icons/contacts.png
diff --git a/view/theme/diabook/diabook-pink/icons/contacts2.png b/view/theme/diabook/diabook-pink/icons/contacts2.png
new file mode 100644
index 000000000..cd0e289a7
--- /dev/null
+++ b/view/theme/diabook/diabook-pink/icons/contacts2.png
diff --git a/view/theme/diabook/diabook-pink/icons/contacts3.png b/view/theme/diabook/diabook-pink/icons/contacts3.png
new file mode 100644
index 000000000..8a3e69ec1
--- /dev/null
+++ b/view/theme/diabook/diabook-pink/icons/contacts3.png
diff --git a/view/theme/diabook/diabook-pink/icons/dislike.png b/view/theme/diabook/diabook-pink/icons/dislike.png
new file mode 100644
index 000000000..23de426c5
--- /dev/null
+++ b/view/theme/diabook/diabook-pink/icons/dislike.png
diff --git a/view/theme/diabook/diabook-pink/icons/drop.png b/view/theme/diabook/diabook-pink/icons/drop.png
new file mode 100644
index 000000000..2abb82ef2
--- /dev/null
+++ b/view/theme/diabook/diabook-pink/icons/drop.png
diff --git a/view/theme/diabook/diabook-pink/icons/email.png b/view/theme/diabook/diabook-pink/icons/email.png
new file mode 100644
index 000000000..240cef2c3
--- /dev/null
+++ b/view/theme/diabook/diabook-pink/icons/email.png
diff --git a/view/theme/diabook/diabook-pink/icons/events.png b/view/theme/diabook/diabook-pink/icons/events.png
new file mode 100644
index 000000000..cf195fbb6
--- /dev/null
+++ b/view/theme/diabook/diabook-pink/icons/events.png
diff --git a/view/theme/diabook/diabook-pink/icons/facebook.png b/view/theme/diabook/diabook-pink/icons/facebook.png
new file mode 100644
index 000000000..3e5dd39c3
--- /dev/null
+++ b/view/theme/diabook/diabook-pink/icons/facebook.png
diff --git a/view/theme/diabook/diabook-pink/icons/file_as.png b/view/theme/diabook/diabook-pink/icons/file_as.png
new file mode 100644
index 000000000..16713fa53
--- /dev/null
+++ b/view/theme/diabook/diabook-pink/icons/file_as.png
diff --git a/view/theme/diabook/diabook-pink/icons/ftdevs.gif b/view/theme/diabook/diabook-pink/icons/ftdevs.gif
new file mode 100644
index 000000000..e0fc25743
--- /dev/null
+++ b/view/theme/diabook/diabook-pink/icons/ftdevs.gif
diff --git a/view/theme/diabook/diabook-pink/icons/globe.png b/view/theme/diabook/diabook-pink/icons/globe.png
new file mode 100644
index 000000000..6bb9bc09d
--- /dev/null
+++ b/view/theme/diabook/diabook-pink/icons/globe.png
diff --git a/view/theme/diabook/diabook-pink/icons/home.png b/view/theme/diabook/diabook-pink/icons/home.png
new file mode 100644
index 000000000..5c610805f
--- /dev/null
+++ b/view/theme/diabook/diabook-pink/icons/home.png
diff --git a/view/theme/diabook/diabook-pink/icons/italic.png b/view/theme/diabook/diabook-pink/icons/italic.png
new file mode 100644
index 000000000..bf4b2b81d
--- /dev/null
+++ b/view/theme/diabook/diabook-pink/icons/italic.png
diff --git a/view/theme/diabook/diabook-pink/icons/language.png b/view/theme/diabook/diabook-pink/icons/language.png
new file mode 100644
index 000000000..8029c0155
--- /dev/null
+++ b/view/theme/diabook/diabook-pink/icons/language.png
diff --git a/view/theme/diabook/diabook-pink/icons/like.png b/view/theme/diabook/diabook-pink/icons/like.png
new file mode 100644
index 000000000..b65edccc0
--- /dev/null
+++ b/view/theme/diabook/diabook-pink/icons/like.png
diff --git a/view/theme/diabook/diabook-pink/icons/link.png b/view/theme/diabook/diabook-pink/icons/link.png
new file mode 100644
index 000000000..0ef666a67
--- /dev/null
+++ b/view/theme/diabook/diabook-pink/icons/link.png
diff --git a/view/theme/diabook/diabook-pink/icons/livejournal.png b/view/theme/diabook/diabook-pink/icons/livejournal.png
new file mode 100644
index 000000000..6d27d265e
--- /dev/null
+++ b/view/theme/diabook/diabook-pink/icons/livejournal.png
diff --git a/view/theme/diabook/diabook-pink/icons/lock.png b/view/theme/diabook/diabook-pink/icons/lock.png
new file mode 100644
index 000000000..7e34bf279
--- /dev/null
+++ b/view/theme/diabook/diabook-pink/icons/lock.png
diff --git a/view/theme/diabook/diabook-pink/icons/lupe.png b/view/theme/diabook/diabook-pink/icons/lupe.png
new file mode 100644
index 000000000..f8b228347
--- /dev/null
+++ b/view/theme/diabook/diabook-pink/icons/lupe.png
diff --git a/view/theme/diabook/diabook-pink/icons/mess_side.png b/view/theme/diabook/diabook-pink/icons/mess_side.png
new file mode 100644
index 000000000..5295e2e74
--- /dev/null
+++ b/view/theme/diabook/diabook-pink/icons/mess_side.png
diff --git a/view/theme/diabook/diabook-pink/icons/messages.png b/view/theme/diabook/diabook-pink/icons/messages.png
new file mode 100644
index 000000000..2a527e7a0
--- /dev/null
+++ b/view/theme/diabook/diabook-pink/icons/messages.png
diff --git a/view/theme/diabook/diabook-pink/icons/messages2.png b/view/theme/diabook/diabook-pink/icons/messages2.png
new file mode 100644
index 000000000..e2bf7d24d
--- /dev/null
+++ b/view/theme/diabook/diabook-pink/icons/messages2.png
diff --git a/view/theme/diabook/diabook-pink/icons/messages3.png b/view/theme/diabook/diabook-pink/icons/messages3.png
new file mode 100644
index 000000000..4f3ce3693
--- /dev/null
+++ b/view/theme/diabook/diabook-pink/icons/messages3.png
diff --git a/view/theme/diabook/diabook-pink/icons/next.png b/view/theme/diabook/diabook-pink/icons/next.png
new file mode 100644
index 000000000..7b5e25b90
--- /dev/null
+++ b/view/theme/diabook/diabook-pink/icons/next.png
diff --git a/view/theme/diabook/diabook-pink/icons/notes.png b/view/theme/diabook/diabook-pink/icons/notes.png
new file mode 100644
index 000000000..28dca30a3
--- /dev/null
+++ b/view/theme/diabook/diabook-pink/icons/notes.png
diff --git a/view/theme/diabook/diabook-pink/icons/notifications.png b/view/theme/diabook/diabook-pink/icons/notifications.png
new file mode 100644
index 000000000..8ba1e0a19
--- /dev/null
+++ b/view/theme/diabook/diabook-pink/icons/notifications.png
diff --git a/view/theme/diabook/diabook-pink/icons/notifications3.png b/view/theme/diabook/diabook-pink/icons/notifications3.png
new file mode 100755
index 000000000..2c9c791c0
--- /dev/null
+++ b/view/theme/diabook/diabook-pink/icons/notifications3.png
diff --git a/view/theme/diabook/diabook-pink/icons/notify.png b/view/theme/diabook/diabook-pink/icons/notify.png
new file mode 100644
index 000000000..5e5aae87e
--- /dev/null
+++ b/view/theme/diabook/diabook-pink/icons/notify.png
diff --git a/view/theme/diabook/diabook-pink/icons/notify2.png b/view/theme/diabook/diabook-pink/icons/notify2.png
new file mode 100644
index 000000000..9765bfd53
--- /dev/null
+++ b/view/theme/diabook/diabook-pink/icons/notify2.png
diff --git a/view/theme/diabook/diabook-pink/icons/notify3.png b/view/theme/diabook/diabook-pink/icons/notify3.png
new file mode 100755
index 000000000..9b852d05b
--- /dev/null
+++ b/view/theme/diabook/diabook-pink/icons/notify3.png
diff --git a/view/theme/diabook/diabook-pink/icons/pencil.png b/view/theme/diabook/diabook-pink/icons/pencil.png
new file mode 100644
index 000000000..772e49b17
--- /dev/null
+++ b/view/theme/diabook/diabook-pink/icons/pencil.png
diff --git a/view/theme/diabook/diabook-pink/icons/pencil2.png b/view/theme/diabook/diabook-pink/icons/pencil2.png
new file mode 100644
index 000000000..3b47d1864
--- /dev/null
+++ b/view/theme/diabook/diabook-pink/icons/pencil2.png
diff --git a/view/theme/diabook/diabook-pink/icons/photo-menu.jpg b/view/theme/diabook/diabook-pink/icons/photo-menu.jpg
new file mode 100644
index 000000000..fde5eb535
--- /dev/null
+++ b/view/theme/diabook/diabook-pink/icons/photo-menu.jpg
diff --git a/view/theme/diabook/diabook-pink/icons/posterous.png b/view/theme/diabook/diabook-pink/icons/posterous.png
new file mode 100644
index 000000000..c8e86078e
--- /dev/null
+++ b/view/theme/diabook/diabook-pink/icons/posterous.png
diff --git a/view/theme/diabook/diabook-pink/icons/prev.png b/view/theme/diabook/diabook-pink/icons/prev.png
new file mode 100644
index 000000000..55c1464ba
--- /dev/null
+++ b/view/theme/diabook/diabook-pink/icons/prev.png
diff --git a/view/theme/diabook/diabook-pink/icons/pscontacts.png b/view/theme/diabook/diabook-pink/icons/pscontacts.png
new file mode 100644
index 000000000..23a78bcac
--- /dev/null
+++ b/view/theme/diabook/diabook-pink/icons/pscontacts.png
diff --git a/view/theme/diabook/diabook-pink/icons/pubgroups.png b/view/theme/diabook/diabook-pink/icons/pubgroups.png
new file mode 100644
index 000000000..ae04194b1
--- /dev/null
+++ b/view/theme/diabook/diabook-pink/icons/pubgroups.png
diff --git a/view/theme/diabook/diabook-pink/icons/quote.png b/view/theme/diabook/diabook-pink/icons/quote.png
new file mode 100644
index 000000000..a464f2859
--- /dev/null
+++ b/view/theme/diabook/diabook-pink/icons/quote.png
diff --git a/view/theme/diabook/diabook-pink/icons/recycle.png b/view/theme/diabook/diabook-pink/icons/recycle.png
new file mode 100644
index 000000000..c3b8d2bf4
--- /dev/null
+++ b/view/theme/diabook/diabook-pink/icons/recycle.png
diff --git a/view/theme/diabook/diabook-pink/icons/remote.png b/view/theme/diabook/diabook-pink/icons/remote.png
new file mode 100644
index 000000000..a560cc55e
--- /dev/null
+++ b/view/theme/diabook/diabook-pink/icons/remote.png
diff --git a/view/theme/diabook/diabook-pink/icons/scroll_top.png b/view/theme/diabook/diabook-pink/icons/scroll_top.png
new file mode 100644
index 000000000..0e7f7ae6a
--- /dev/null
+++ b/view/theme/diabook/diabook-pink/icons/scroll_top.png
diff --git a/view/theme/diabook/diabook-pink/icons/selected.png b/view/theme/diabook/diabook-pink/icons/selected.png
new file mode 100644
index 000000000..3fcb95c29
--- /dev/null
+++ b/view/theme/diabook/diabook-pink/icons/selected.png
diff --git a/view/theme/diabook/diabook-pink/icons/srch_bg.gif b/view/theme/diabook/diabook-pink/icons/srch_bg.gif
new file mode 100644
index 000000000..6a523ba8f
--- /dev/null
+++ b/view/theme/diabook/diabook-pink/icons/srch_bg.gif
diff --git a/view/theme/diabook/diabook-pink/icons/srch_l.gif b/view/theme/diabook/diabook-pink/icons/srch_l.gif
new file mode 100644
index 000000000..6d95bf35d
--- /dev/null
+++ b/view/theme/diabook/diabook-pink/icons/srch_l.gif
diff --git a/view/theme/diabook/diabook-pink/icons/srch_r.gif b/view/theme/diabook/diabook-pink/icons/srch_r.gif
new file mode 100644
index 000000000..89833a316
--- /dev/null
+++ b/view/theme/diabook/diabook-pink/icons/srch_r.gif
diff --git a/view/theme/diabook/diabook-pink/icons/srch_r_f2.gif b/view/theme/diabook/diabook-pink/icons/srch_r_f2.gif
new file mode 100644
index 000000000..6df457bed
--- /dev/null
+++ b/view/theme/diabook/diabook-pink/icons/srch_r_f2.gif
diff --git a/view/theme/diabook/diabook-pink/icons/star.png b/view/theme/diabook/diabook-pink/icons/star.png
new file mode 100644
index 000000000..0b00cb189
--- /dev/null
+++ b/view/theme/diabook/diabook-pink/icons/star.png
diff --git a/view/theme/diabook/diabook-pink/icons/star_dummy.png b/view/theme/diabook/diabook-pink/icons/star_dummy.png
new file mode 100644
index 000000000..ce11f30d4
--- /dev/null
+++ b/view/theme/diabook/diabook-pink/icons/star_dummy.png
diff --git a/view/theme/diabook/diabook-pink/icons/starred.png b/view/theme/diabook/diabook-pink/icons/starred.png
new file mode 100644
index 000000000..2b82dfca3
--- /dev/null
+++ b/view/theme/diabook/diabook-pink/icons/starred.png
diff --git a/view/theme/diabook/diabook-pink/icons/tagged.png b/view/theme/diabook/diabook-pink/icons/tagged.png
new file mode 100644
index 000000000..144649ef8
--- /dev/null
+++ b/view/theme/diabook/diabook-pink/icons/tagged.png
diff --git a/view/theme/diabook/diabook-pink/icons/toogle_off.png b/view/theme/diabook/diabook-pink/icons/toogle_off.png
new file mode 100644
index 000000000..0fcce4d5a
--- /dev/null
+++ b/view/theme/diabook/diabook-pink/icons/toogle_off.png
diff --git a/view/theme/diabook/diabook-pink/icons/toogle_on.png b/view/theme/diabook/diabook-pink/icons/toogle_on.png
new file mode 100644
index 000000000..79ce07f0e
--- /dev/null
+++ b/view/theme/diabook/diabook-pink/icons/toogle_on.png
diff --git a/view/theme/diabook/diabook-pink/icons/tumblr.png b/view/theme/diabook/diabook-pink/icons/tumblr.png
new file mode 100644
index 000000000..1dc7fa072
--- /dev/null
+++ b/view/theme/diabook/diabook-pink/icons/tumblr.png
diff --git a/view/theme/diabook/diabook-pink/icons/twitter.png b/view/theme/diabook/diabook-pink/icons/twitter.png
new file mode 100644
index 000000000..b7a687b9f
--- /dev/null
+++ b/view/theme/diabook/diabook-pink/icons/twitter.png
diff --git a/view/theme/diabook/diabook-pink/icons/underline.png b/view/theme/diabook/diabook-pink/icons/underline.png
new file mode 100644
index 000000000..b1b4d3574
--- /dev/null
+++ b/view/theme/diabook/diabook-pink/icons/underline.png
diff --git a/view/theme/diabook/diabook-pink/icons/unlock.png b/view/theme/diabook/diabook-pink/icons/unlock.png
new file mode 100644
index 000000000..a0cda0ae5
--- /dev/null
+++ b/view/theme/diabook/diabook-pink/icons/unlock.png
diff --git a/view/theme/diabook/diabook-pink/icons/unselected.png b/view/theme/diabook/diabook-pink/icons/unselected.png
new file mode 100644
index 000000000..9e9cead4b
--- /dev/null
+++ b/view/theme/diabook/diabook-pink/icons/unselected.png
diff --git a/view/theme/diabook/diabook-pink/icons/unstarred.png b/view/theme/diabook/diabook-pink/icons/unstarred.png
new file mode 100644
index 000000000..ba3183f5c
--- /dev/null
+++ b/view/theme/diabook/diabook-pink/icons/unstarred.png
diff --git a/view/theme/diabook/diabook-pink/icons/video.png b/view/theme/diabook/diabook-pink/icons/video.png
new file mode 100644
index 000000000..a03d1d818
--- /dev/null
+++ b/view/theme/diabook/diabook-pink/icons/video.png
diff --git a/view/theme/diabook/diabook-pink/icons/weblink.png b/view/theme/diabook/diabook-pink/icons/weblink.png
new file mode 100644
index 000000000..216e78344
--- /dev/null
+++ b/view/theme/diabook/diabook-pink/icons/weblink.png
diff --git a/view/theme/diabook/diabook-pink/icons/wordpress.png b/view/theme/diabook/diabook-pink/icons/wordpress.png
new file mode 100644
index 000000000..f564c4300
--- /dev/null
+++ b/view/theme/diabook/diabook-pink/icons/wordpress.png
diff --git a/view/theme/diabook/diabook-pink/style-network-wide.css b/view/theme/diabook/diabook-pink/style-network-wide.css
new file mode 100644
index 000000000..0a83955df
--- /dev/null
+++ b/view/theme/diabook/diabook-pink/style-network-wide.css
@@ -0,0 +1,2644 @@
+/**
+ * Fabio Comuni <http://kirgroup.com/profile/fabrixxm>
+ * Additional Changes: Michael Vogel <icarus@dabo.de>
+ **/
+
+/* ========= */
+/* = Admin = */
+/* ========= */
+
+#adminpage {
+/*        width: 80%;*/
+}
+
+#pending-update {
+        float:right;
+        color: #ffffff;
+        font-weight: bold;
+        background-color: #FF0000;
+        padding: 0em 0.3em;
+}
+
+.admin.linklist {
+        border: 0px; padding: 0px;
+}
+
+.admin.link {
+        list-style-position: inside;
+        font-size: 1em;
+        padding: 5px;
+        width: 100px;
+        margin: 5px;
+}
+
+#adminpage dl {
+        clear: left;
+        margin-bottom: 2px;
+        padding-bottom: 2px;
+        border-bottom: 1px solid black;
+}
+
+#adminpage dt {
+        width: 200px;
+        float: left;
+        font-weight: bold;
+}
+
+#adminpage dd {
+        margin-left: 200px;
+}
+#adminpage h3 {
+        border-bottom: 1px solid #898989;
+        margin-bottom: 5px;
+        margin-top: 10px;
+}
+
+#adminpage .submit {
+        clear:left;
+}
+
+#adminpage #pluginslist {
+        margin: 0px; padding: 0px;
+}
+
+#adminpage .plugin {
+        list-style: none;
+        display: block;
+	/* border: 1px solid #888888; */
+        padding: 1em;
+        margin-bottom: 5px;
+        clear: left;
+}
+
+#adminpage .toggleplugin {
+        float:left;
+        margin-right: 1em;
+}
+
+#adminpage table {width:100%; border-bottom: 1p solid #000000; margin: 5px 0px;}
+#adminpage table th { text-align: left;}
+#adminpage td .icon { float: left;}
+#adminpage table#users img { width: 16px; height: 16px; }
+#adminpage table tr:hover { background-color: #eeeeee; }
+#adminpage .selectall { text-align: right; }
+/* icons */
+
+.icon.contacts {
+  background-image: url("../diabook-pink/icons/contacts.png");}
+.icon.notifications {
+  background-image: url("../diabook-pink/icons/notifications.png");}
+.icon.notify {
+  background-image: url("../diabook-pink/icons/notify.png");}
+.icon.messages {
+  background-image: url("../diabook-pink/icons/messages.png");}
+.icon.community {
+  background-image: url("../diabook-pink/icons/community.png");}
+  
+.icon.drop 	{ background-image: url("../diabook-pink/icons/drop.png");}
+.icon.drophide 	{ background-image: url("../diabook-pink/icons/drop.png");}
+.icon.dislike 	{ background-image: url("../diabook-pink/icons/dislike.png");}
+.icon.like 	{ background-image: url("../diabook-pink/icons/like.png");}
+.icon.pencil 	{ background-image: url("../diabook-pink/icons/pencil.png");}
+.icon.recycle 	{ background-image: url("../diabook-pink/icons/recycle.png");}
+.icon.remote-link { background-image: url("../diabook-pink/icons/remote.png");}
+.icon.tagged    { background-image: url("../diabook-pink/icons/tagged.png");}
+.icon.file-as { background-image: url("../diabook-pink/icons/file_as.png");}
+.star-item.icon.unstarred { background-image: url("../diabook-pink/icons/unstarred.png");}
+.star-item.icon.starred { background-image: url("../diabook-pink/icons/starred.png");}
+.icon.link		{ background-image: url("../diabook-pink/icons/link.png");}
+.icon.lock		{ background-image: url("../diabook-pink/icons/lock.png");}
+.icon.unlock		{ background-image: url("../diabook-pink/icons/unlock.png");}
+.icon.language    { background-image: url("../diabook-pink/icons/language.png");}
+
+
+.camera 	{ background-image: url("../diabook-pink/icons/camera.png"); 
+			  display: block; width: 28px; height: 28px; background-repeat: no-repeat;
+			  }
+.attach 	{ background-image: url("../diabook-pink/icons/attach.png"); 
+			  display: block; width: 28px; height: 28px; background-repeat: no-repeat;
+			  }
+.video2 	{ background-image: url("../diabook-pink/icons/video.png"); 
+			  display: block; width: 28px; height: 28px; background-repeat: no-repeat;
+			  }	
+.video 	{ background-image: url("../diabook-pink/icons/video.png"); 
+			  display: block; width: 100%; height: 140px; background-repeat: no-repeat;
+			  }
+.audio2 	{ background-image: url("../diabook-pink/icons/audio.png"); 
+			  display: block; width: 28px; height: 28px; background-repeat: no-repeat;
+			  }
+.audio 	{ background-image: url("../diabook-pink/icons/audio.png"); 
+			  display: block; width: 28px; height: 28px; background-repeat: no-repeat;
+			  }
+.weblink 	{ background-image: url("../diabook-pink/icons/weblink.png"); 
+			  display: block; width: 28px; height: 28px; background-repeat: no-repeat;
+			  }
+.globe 	{ background-image: url("../diabook-pink/icons/globe.png"); 
+			  display: block; width: 28px; height: 28px; background-repeat: no-repeat;
+			  }
+.unglobe 	{ background-image: url("../diabook-pink/icons/unglobe.png"); 
+			  display: block; width: 28px; height: 28px; background-repeat: no-repeat;
+			  }
+.edit    {background-image: url("../diabook-pink/icons/pencil2.png"); 
+			  display: block; width: 28px; height: 28px; background-repeat: no-repeat;}
+			  
+			  
+
+
+.article	{ background-position: -50px  0px;}
+/*.audio 		{ background-position: -70px  0px;}*/
+.block 		{ background-position: -90px  0px;}
+/*.drop 		{ background-position: -110px 0px;}*/
+/*.drophide 	{ background-position: -130px 0px;}*/
+/*.edit 		{ background-position: -150px 0px;}*/
+/*.camera 	{ background-position: -170px 0px;}*/
+/*.dislike 	{ background-position: -190px 0px;}*/
+/*.like 		{ background-position: -210px 0px;}*/
+/*.link 		{ background-position: -230px 0px;}*/
+
+/*.globe 		{ background-position: -50px  -20px;}*/
+/*.noglobe 	{ background-position: -70px  -20px;}*/
+.no 		{ background-position: -90px  -20px;}
+.pause 		{ background-position: -110px -20px;}
+.play 		{ background-position: -130px -20px;}
+/*.pencil 	{ background-position: -150px -20px;}*/
+.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;}*/
+
+/*.video          { background-position: -110px -40px;}*/
+.youtube        { background-position: -130px -40px;}
+
+/*.attach         { background-position: -190px -40px;}*/
+/*.language       { background-position: -210px -40px;}*/
+
+
+.icon.on             { background-image: url("../diabook-pink/icons/toogle_on.png"); background-repeat: no-repeat;}
+.icon.off            { background-image: url("../diabook-pink/icons/toogle_off.png"); background-repeat: no-repeat;}
+.prev           { background-position: -90px  -60px;}
+.next           { background-position: -110px -60px;}
+/*.tagged     { background-position: -130px -60px;}*/
+
+.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 0px; }
+.type-audio { background-position: -40px 0px; }
+.type-text  { background-position: -60px 0px; }
+.type-unkn  { background-position: -80px 0px; }
+
+.icon.drop, .icon.drophide {
+ float: left;
+}
+
+.icon {
+  display: block;
+  width: 20px;
+  height: 20px;
+  /*background-image: url('icons.png');*/
+}
+
+.icon {
+  background-color: transparent ;
+  background-repeat: no-repeat;
+  /* background-position: left center; */
+  display: block;
+  overflow: hidden;
+  text-indent: -9999px;
+  padding: 1px;
+}
+
+.icon.border.camera{
+  background-image: url("../diabook-pink/icons/camera.png"); 
+  display: block; width: 28px; height: 28px; background-repeat: no-repeat;
+	}
+	
+.icon.border.link{
+  background-image: url("../diabook-pink/icons/weblink.png"); 
+  display: block; width: 28px; height: 28px; background-repeat: no-repeat;
+  margin-left: 10px;
+	}
+
+.icon.text {
+  text-indent: 0px;
+}
+.icon.s10 {
+  min-width: 10px;
+  height: 10px;
+}
+.icon.s10.notify {
+  background-image: url("../../../../images/icons/10/notify_off.png");
+}
+.icon.s10.gear {
+  background-image: url("../../../../images/icons/10/gear.png");
+}
+.icon.s10.add {
+  background-image: url("../../../../images/icons/10/add.png");
+}
+.icon.s10.delete {
+  background-image: url("../../../../images/icons/10/delete.png");
+}
+.icon.s10.edit {
+  background-image: url("../../../../images/icons/10/edit.png");
+}
+.icon.s10.star {
+  background-image: url("../../../../images/star_dummy.png");
+}
+.icon.s10.menu {
+  background-image: url("../../../../images/icons/10/menu.png");
+}
+.icon.s10.link {
+  background-image: url("../../../../images/icons/10/link.png");
+}
+.icon.s10.lock {
+  background-image: url("../../../../images/icons/10/lock.png");
+}
+.icon.s10.unlock {
+  background-image: url("../../../../images/icons/10/unlock.png");
+}
+.icon.s10.text {
+  padding: 2px 0px 0px 15px;
+  font-size: 10px;
+}
+.icon.s16 {
+  min-width: 16px;
+  height: 16px;
+}
+.icon.s16.notify {
+  background-image: url("../../../../images/icons/16/notify_off.png");
+}
+.icon.s16.gear {
+  background-image: url("../../../../images/icons/16/gear.png");
+}
+.icon.s16.add {
+  background-image: url("../../../../images/icons/16/add.png");
+}
+.icon.s16.delete {
+  background-image: url("../../../../images/icons/16/delete.png");
+}
+/*.icon.s16.edit {
+  background-image: url("../../../../images/icons/16/edit.png");
+}*/
+.icon.s16.star {
+  background-image: url("../../../../images/star_dummy.png");
+}
+.icon.s16.menu {
+  background-image: url("../../../../images/icons/16/menu.png");
+}
+/*.icon.s16.link {
+  background-image: url("../../../../images/icons/16/link.png");
+}*/
+.icon.s16.lock {
+  background-image: url("../../../../images/icons/16/lock.png");
+}
+.icon.s16.unlock {
+  background-image: url("../../../../images/icons/16/unlock.png");
+}
+.icon.s16.text {
+  padding: 4px 0px 0px 20px;
+  font-size: 10px;
+}
+.icon.s22 {
+  min-width: 22px;
+  height: 22px;
+}
+.icon.s22.notify {
+  background-image: url("../../../../images/icons/22/notify_off.png");
+}
+.icon.s22.gear {
+  background-image: url("../../../../images/icons/22/gear.png");
+}
+.icon.s22.add {
+  background-image: url("../../../../images/icons/22/add.png");
+}
+.icon.s22.delete {
+  background-image: url("../../../../images/icons/22/delete.png");
+}
+.icon.s22.edit {
+  background-image: url("../../../../images/icons/22/edit.png");
+}
+.icon.s22.star {
+  background-image: url("../../../../images/star_dummy.png");
+}
+.icon.s22.menu {
+  background-image: url("../../../../images/icons/22/menu.png");
+}
+.icon.s22.link {
+  background-image: url("../../../../images/icons/22/link.png");
+}
+.icon.s22.lock {
+  background-image: url("../../../../images/icons/22/lock.png");
+}
+.icon.s22.unlock {
+  background-image: url("../../../../images/icons/22/unlock.png");
+}
+.icon.s22.text {
+  padding: 10px 0px 0px 25px;
+  width: 200px;
+}
+.icon.s48 {
+  width: 48px;
+  height: 48px;
+}
+.icon.s48.notify {
+  background-image: url("../../../../images/icons/48/notify_off.png");
+}
+.icon.s48.gear {
+  background-image: url("../../../../images/icons/48/gear.png");
+}
+.icon.s48.add {
+  background-image: url("../../../../images/icons/48/add.png");
+}
+.icon.s48.delete {
+  background-image: url("../../../../images/icons/48/delete.png");
+}
+.icon.s48.edit {
+  background-image: url("../../../../images/icons/48/edit.png");
+}
+.icon.s48.star {
+  background-image: url("../../../../images/star_dummy.png");
+}
+.icon.s48.menu {
+  background-image: url("../../../../images/icons/48/menu.png");
+}
+.icon.s48.link {
+  background-image: url("../../../../images/icons/48/link.png");
+}
+.icon.s48.lock {
+  background-image: url("../../../../images/icons/48/lock.png");
+}
+.icon.s48.unlock {
+  background-image: url("../../../../images/icons/48/unlock.png");
+}
+
+#contact-edit-links ul {
+  list-style: none;
+  list-style-type: none;
+}
+
+.hide-comments-outer {
+  margin-left: 80px;
+  margin-bottom: 1px;
+  width: 675px;
+  border-bottom: 1px solid #BDCDD4;
+  background-color: #fff;
+  padding: 8px;
+}
+
+/* global */
+body {
+  font-family: 'Lato', "Helvetica Neue", Helvetica, Arial, sans-serif;
+  font-size: 13px;
+  background-color: #ffffff;
+  color: #2d2d2d;
+  margin: 50px auto auto;
+  display: table;
+}
+
+h4 {
+  font-size: 1.1em;
+}
+
+a {
+	color: #333333;
+	/* color: #3e3e8c; */
+	text-decoration: none;
+}
+a:hover {
+	/* color: blue; */
+	text-decoration: underline
+}
+
+.wall-item-name-link {
+/*  float: left;*/
+}
+
+.wall-item-photo {
+  width: 48px;
+  height: 48px;
+  overflow: hidden;
+  display: block;
+}
+
+.left {
+  float: left;
+}
+.right {
+  float: right;
+}
+.hidden {
+  display: none;
+}
+.clear {
+  clear: both;
+}
+.fakelink {
+  color: #996d73;
+  /* color: #3e3e8c; */
+  text-decoration: none;
+  cursor: pointer;
+}
+.fakelink:hover {
+  /* color: blue; */
+  /*color: #005c94; */
+  text-decoration: underline;
+}
+code {
+  font-family: Courier, monospace;
+  white-space: pre;
+  display: block;
+  overflow: auto;
+  border: 1px solid #444;
+  background: #EEE;
+  color: #444;
+  padding: 10px;
+  margin-top: 20px;
+}
+#panel {
+  position: absolute;
+  width: 12em;
+  background: #ffffff;
+  color: #2d2d2d;
+  margin: 0px;
+  padding: 1em;
+  list-style: none;
+  border: 3px solid #364e59;
+  z-index: 100000;
+  -webkit-box-shadow: 0px 5px 10px rgba(0, 0, 0, 0.7);
+  -moz-box-shadow: 0px 5px 10px rgba(0, 0, 0, 0.7);
+  box-shadow: 0px 5px 10px rgba(0, 0, 0, 0.7);
+}
+/* tool */
+.tool {
+  height: auto;
+  overflow: auto;
+  padding: 3px;
+}
+#saved-search-ul .tool:hover,
+#nets-sidebar .tool:hover,
+#sidebar-group-list .tool:hover ,
+#fileas-sidebar .tool:hover {
+	background: aliceBlue;
+}
+.tool .label {
+  float: left;
+}
+.tool .action {
+  float: right;
+}
+.tool a {
+  color: #3465A4;
+}
+.tool a:hover {
+  text-decoration: none;
+}
+/* popup notifications */
+div.jGrowl div.notice {
+  background: #511919 url("../../../../images/icons/48/notice.png") no-repeat 5px center;
+  color: #ffffff;
+  padding-left: 58px;
+}
+div.jGrowl div.info {
+  background: #364e59 url("../../../../images/icons/48/info.png") no-repeat 5px center;
+  color: #ffffff;
+  padding-left: 58px;
+}
+/* header */
+header {
+  position: fixed;
+  left: 0%;
+  right: 80%;
+  top: 0px;
+  margin: 0px;
+  padding: 0px;
+  width: 22%;
+  height: 32px;
+  background: #FFC1CA;
+  background-color: #FFC1CA;
+  z-index: 100;
+  -webkit-box-shadow: -10px 0px 10px rgba(0, 0, 0, 0.7);
+  -moz-box-shadow: -10px 0px 10px rgba(0, 0, 0, 0.7);
+  box-shadow: -10px 0px 10px rgba(0, 0, 0, 0.7);
+  
+}
+header #site-location {
+  display: none;
+}
+header #banner {
+  overflow: hidden;
+  text-align: left;
+  width: 82%%;
+  margin-left: 25%;
+}
+header #banner a,
+header #banner a:active,
+header #banner a:visited,
+header #banner a:link,
+header #banner a:hover {
+  color: black;
+  text-decoration: none;
+  outline: none;
+  vertical-align: middle;
+  font-weight: bolder;
+  margin-left: 3px;
+}
+header #banner #logo-img {
+  height: 25px;
+  margin-top: 3px;
+}
+header #banner #logo-text {
+  font-size: 20px;
+  position: absolute;
+  top: 10%;
+}
+/* nav */
+nav {
+  width: 80%;
+  height: 32px;
+  position: fixed;
+  left: 22%;
+  top: 0px;
+  padding: 0px;
+  background: #FFC1CA;
+  color: #000;
+  z-index: 99;
+  -webkit-box-shadow: -10px 0px 10px rgba(0, 0, 0, 0.7);
+  -moz-box-shadow: -10px 0px 10px rgba(0, 0, 0, 0.7);
+  box-shadow: -10px 0px 10px rgba(0, 0, 0, 0.7);
+}
+nav a,
+nav a:active,
+nav a:visited,
+nav a:link,
+nav a:hover {
+  /*color: #1f1f1f;*/
+  text-decoration: none;
+  outline: none;
+}
+nav #banner {
+  overflow: hidden;
+  /*text-align: center;*/
+  width: 100%;
+}
+nav #banner a,
+nav #banner a:active,
+nav #banner a:visited,
+nav #banner a:link,
+nav #banner a:hover {
+  color: #ffffff;
+  text-decoration: none;
+  outline: none;
+  vertical-align: bottom;
+}
+nav #banner #logo-img {
+  height: 22px;
+  margin-top: 5px;
+}
+nav #banner #logo-text {
+  font-size: 22px;
+}
+nav #navbar{
+	}
+nav ul {
+  margin: 0px;
+  padding: 0px 20px;
+}
+nav ul li {
+  list-style: none;
+  margin: 0px;
+  /* padding: 1px 1px 3px 1px; */
+  float: left;
+}
+nav ul li .menu-popup {
+  left: 0px;
+  right: auto;
+}
+
+nav #logo-img {
+  height: 25px;
+  margin-top: 4px;
+  margin-left: 30px;
+}
+
+nav #logo-text {
+    font-size: 22px;
+    margin-top: 3px;
+    margin-right: 15px;
+}
+nav .nav-menu-search {
+  position: relative;
+
+  margin: 4px 17px;
+  margin-right: 0px;
+  height: 17px;
+  width: 180px;
+  
+}
+
+nav #search-box #search-text {
+  background-image:  url('icons/lupe.png');
+  background-repeat:no-repeat;
+  padding-left:20px;
+  border-top-left-radius: 15px;
+border-top-right-radius: 15px;
+border-bottom-right-radius: 15px;
+border-bottom-left-radius: 15px;
+	}
+
+
+nav .nav-menu-icon {
+  position: relative;
+  height: 22px;
+  padding: 5px;
+  margin: 0px 5px;
+  -moz-border-radius: 5px 5px 0 0;
+  -webkit-border-radius: 5px 5px 0 0;
+  border-radius: 5px 5px 0 0;
+}
+nav .nav-menu-icon:hover {
+  position: relative;
+  height: 22px;
+  padding: 5px;
+  margin: 0px 5px;
+  -moz-border-radius: 5px 5px 0 0;
+  -webkit-border-radius: 5px 5px 0 0;
+  border-radius: 5px 5px 0 0;
+}
+
+/*color*/
+nav .nav-menu-icon.selected {
+  background-color: #FFE9EC;
+}
+nav .nav-menu-icon img {
+  width: 22px;
+  height: 22px;
+}
+nav .nav-menu-icon .nav-notify {
+  top: 3px;
+}
+/*marker*/
+nav .nav-menu {
+  position: relative;
+  height: 16px;
+  padding: 5px;
+  margin: 3px 15px 0px;
+  font-size: 15px;
+  /*border: 3px solid #364A84;*/
+}
+nav .nav-menu.selected {
+  /*border-bottom: 3px solid #9eabb0;*/
+}
+nav .nav-notify {
+  display: none;
+  position: absolute;
+  background-color: #fff;
+  /* background-color: #19aeff; */
+  -moz-border-radius: 5px 5px 5px 5px;
+  -webkit-border-radius: 5px 5px 5px 5px;
+  border-radius: 5px 5px 5px 5px;
+  font-size: 10px;
+  font-weight: 900;
+  padding: 1px 4px;
+  top: 0px;
+  right: -6px;
+  min-width: 10px;
+  text-align: center;
+  border: 1px solid black;
+}
+nav .nav-notify.show {
+  display: block;
+}
+nav #nav-help-link,
+nav #nav-search-link,
+nav #nav-directory-link,
+nav #nav-apps-link,
+nav #nav-site-linkmenu, 
+nav #nav-home-link,
+nav #nav-user-linkmenu
+{
+  float: right;
+}
+nav #nav-user-linkmenu{
+	margin-right: 0px;
+	}
+nav #nav-home-link, #nav-directory-link, #nav-apps-link{
+	margin-left: 0px;
+	margin-right: 0px;
+	font-weight: bold;
+	margin: 3px 5px;
+	font-size: 14px;
+	}
+nav #nav-directory-link{
+  margin-right: 0px;	
+	}
+nav #nav-home-link{
+  margin-left: 0px;	
+	}
+nav #nav-help-link .menu-popup,
+nav #nav-search-link .menu-popup,
+nav #nav-directory-link .menu-popup,
+nav #nav-apps-link .menu-popup,
+nav #nav-site-linkmenu .menu-popup {
+  right: 0px;
+  left: auto;
+}
+
+nav #nav-messages-linkmenu.on .icon.messages, nav #nav-messages-linkmenu.selected .icon.messages{
+	background-image: url("../diabook-pink/icons/messages.png");
+	}
+	
+/*nav #nav-notifications-linkmenu.on .icon.notify,*/ nav #nav-notifications-linkmenu.selected .icon.notify{
+	background-image: url("../diabook-pink/icons/notify.png");
+	}
+	
+nav #nav-contacts-linkmenu.on .icon.contacts, nav #nav-contacts-linkmenu.selected .icon.contacts{
+	background-image: url("../diabook-pink/icons/contacts.png");
+	}
+	
+nav #nav-apps-link.selected {
+  background-color: #fff;
+  moz-border-radius: 5px 5px 0 0;
+-webkit-border-radius: 5px 5px 0 0;
+border-radius: 5px 5px 0 0;
+}
+
+#nav-notifications-mark-all {
+	/* padding: 1px 1px 2px 26px; */
+	/* border-bottom: 1px solid #364E59; */
+	/* margin: 0px 0px 2px 0px;
+	padding: 5px 10px; */
+}
+
+#nav-notifications-see-all {
+	/* padding: 1px 1px 2px 26px; */
+	/* border-bottom: 1px solid #364E59; */
+	/* margin: 0px 0px 2px 0px;
+	padding: 5px 10px; */
+}
+
+.notify-seen {
+	background: none repeat scroll 0 0 #DDDDDD;
+	}
+
+ul.menu-popup {
+  position: absolute;
+  display: none;
+  width: 11em;
+  background: #fff;
+  color: #2d2d2d;
+  margin: 0px;
+  padding: 0px;
+  list-style: none;
+  z-index: 100000;
+  -webkit-box-shadow: 0px 5px 10px rgba(0, 0, 0, 0.7);
+  -moz-box-shadow: 0px 5px 10px rgba(0, 0, 0, 0.7);
+  box-shadow: 0px 5px 10px rgba(0, 0, 0, 0.7);
+}
+ul.menu-popup a {
+  display: block;
+  color: #2d2d2d;
+  padding: 5px 10px;
+  text-decoration: none;
+}
+ul.menu-popup a:hover {
+  background-color: #996d73; /*bdcdd4;*/
+  color: #fff;
+}
+ul.menu-popup .menu-sep {
+  border-top: 1px solid #9eabb0;
+}
+ul.menu-popup li {
+  float: none;
+  overflow: auto;
+  height: auto;
+  display: block;
+}
+ul.menu-popup li img {
+  float: left;
+  width: 16px;
+  height: 16px;
+  padding-right: 5px;
+}
+ul.menu-popup .empty {
+  padding: 5px;
+  text-align: center;
+  color: #9eabb0;
+}
+/* autocomplete popup */
+.acpopup {
+  max-height: 150px;
+  background-color: #ffffff;
+  color: #2d2d2d;
+  border: 1px solid #MenuBorder;
+  overflow: auto;
+  z-index: 100000;
+  -webkit-box-shadow: 0px 5px 10px rgba(0, 0, 0, 0.7);
+  -moz-box-shadow: 0px 5px 10px rgba(0, 0, 0, 0.7);
+  box-shadow: 0px 5px 10px rgba(0, 0, 0, 0.7);
+}
+.acpopupitem {
+  color: #2d2d2d;
+  padding: 4px;
+  clear: left;
+}
+.acpopupitem img {
+  float: left;
+  margin-right: 4px;
+}
+.acpopupitem.selected {
+  background-color: #bdcdd4;
+}
+#nav-notifications-menu {
+  width: 400px;
+  max-height: 550px;
+  overflow: auto;
+}
+/* #nav-notifications-menu a {
+	display: inline;
+	padding: 5px 0px;
+	margin: 0px 0px 2px 0px;
+}
+#nav-notifications-menu li:hover {
+  background-color: #bdcdd4;
+}*/
+
+#nav-notifications-menu img {
+  float: left;
+  margin-right: 5px;
+}
+#nav-notifications-menu .contactname {
+  font-weight: bold;
+}
+#nav-notifications-menu .notif-when {
+  font-size: 10px;
+  color: #9eabb0;
+  display: block;
+}
+
+.notif-image {
+        width: 32px;
+        height: 32px;
+        padding: 7px 7px 0px 0px;
+}
+
+/*profile_side*/
+#profile_side {
+  margin-bottom: 30px;
+ 
+}
+#profile_side a{
+  color: #333;
+}
+#ps-usericon{
+	height: 25px	
+	}
+#ps-username{
+  font-size: 1.17em;
+  font-weight: bold;
+  vertical-align: top;
+  position: absolute;
+  padding-top: 4px;
+  padding-left: 5px;	
+  word-wrap: break-word;
+  width: 130px;
+	}
+#ps-username:hover{
+  text-decoration: none;	
+	}
+.menu-profile-side{
+  list-style: none;	
+  padding-left: 0px;
+  min-height: 0px;
+	}
+.menu-profile-list{
+  height: auto;
+  overflow: auto;  
+  min-height: 16px;
+  list-style: none;
+	}
+.menu-profile-list:hover{
+	background: #FFF4F6; 
+	}
+.menu-profile-list-item{
+	padding-left: 5px;
+	vertical-align: middle;
+	}	
+.menu-profile-list-item:hover{	
+	text-decoration: none;
+   }
+/*http://prothemedesign.com/circular-icons/*/
+.menu-profile-icon.home{
+	background: url("../diabook-pink/icons/home.png") no-repeat;
+	float: left;
+	height: 22px;
+	width: 22px;
+	}
+.menu-profile-icon.photos{
+	background: url("../diabook-pink/icons/mess_side.png") no-repeat;
+	float: left;
+	height: 22px;
+   width: 22px;}
+.menu-profile-icon.events{
+	background: url("../diabook-pink/icons/events.png") no-repeat;
+	float: left;
+	height: 22px;
+   width: 22px;}
+.menu-profile-icon.notes{
+	background: url("../diabook-pink/icons/notes.png") no-repeat;
+	float: left;
+	height: 22px;
+   width: 22px;}
+.menu-profile-icon.foren{
+	background: url("../diabook-pink/icons/pubgroups.png") no-repeat;
+	float: left;
+	height: 22px;
+   width: 22px;}
+.menu-profile-icon.com_side{
+	background: url("../diabook-pink/icons/com_side.png") no-repeat;
+	float: left;
+	height: 22px;
+   width: 22px;}
+.menu-profile-icon.pscontacts{
+	background: url("../diabook-pink/icons/pscontacts.png") no-repeat;
+	float: left;
+	height: 22px;
+   width: 22px;}
+
+/* aside */
+/*marker*/
+aside {
+  display: table-cell;
+  vertical-align: top;
+  width: 180px;
+  padding: 0px 5px 0px 0px;
+  border-right: 1px solid #D2D2D2;
+  float: left;
+  /* background: #F1F1F1; */
+}
+aside #page-sidebar{display: none;}
+aside .vcard .fn {
+  font-size: 18px;
+  font-weight: bold;
+  margin-bottom: 5px;
+}
+aside .vcard .title {
+  margin-bottom: 5px;
+}
+aside .vcard dl {
+  height: auto;
+  overflow: auto;
+}
+aside .vcard dt {
+  float: left;
+  margin-left: 0px;
+  /*width: 35%;*/
+  text-align: right;
+  color: #999999;
+}
+aside .vcard dd {
+  float: left;
+  margin-left: 5px;
+  /*width: 60%;*/
+}
+aside #profile-extra-links ul {
+  padding: 0px;
+  margin: 0px;
+}
+aside #profile-extra-links li {
+  padding: 0px;
+  margin: 0px;
+  list-style: none;
+}
+aside #dfrn-request-link {
+  display: block;
+  -moz-border-radius: 5px 5px 5px 5px;
+  -webkit-border-radius: 5px 5px 5px 5px;
+  border-radius: 5px 5px 5px 5px;
+  color: #ffffff;
+  background: #005c94 url('../../../../images/connect-bg.png') no-repeat left center;
+  font-weight: bold;
+  text-transform: uppercase;
+  padding: 4px 2px 2px 35px;
+}
+aside #dfrn-request-link:hover {
+  text-decoration: none;
+  background-color: #36c;
+  /* background-color: #19aeff; */
+}
+aside #profiles-menu {
+  width: 20em;
+}
+aside #search-text {
+	width: 150px;
+	height: 17px;
+	padding-left: 10px;
+	border-top-left-radius: 15px;
+border-top-right-radius: 15px;
+border-bottom-right-radius: 15px;
+border-bottom-left-radius: 15px;
+-moz-border-bottom-colors: #dbdbdb;
+  -moz-border-top-colors: #999;
+  -moz-border-left-colors: #999;
+  -moz-border-right-colors: #dbdbdb;
+}
+aside #side-follow-url {
+	width: 150px;
+	}
+aside #side-peoplefind-url {
+	width: 150px;
+	}
+#contact-block {
+  overflow: auto;
+  height: auto;
+}
+#contact-block .contact-block-h4 {
+  float: left;
+  margin: 5px 0px;
+}
+#contact-block .allcontact-link {
+  float: right;
+  margin: 5px 0px;
+}
+#contact-block .contact-block-content {
+  clear: both;
+  overflow: auto;
+  height: auto;
+}
+#contact-block .contact-block-link {
+  float: left;
+  margin: 0px 2px 2px 0px;
+}
+#contact-block .contact-block-link img {
+  widht: 55px;
+  height: 55px;
+}
+#lost-password-link {
+  float: left;
+  margin-right: 20px;	
+	}
+/* widget */
+.widget {
+  margin-bottom: 2em;
+  /*.action .s10 { width: 10px; overflow: hidden; padding: 0px;}
+	.action .s16 { width: 16px; overflow: hidden; padding: 0px;}*/
+/*  font-size: 12px; */
+}
+/*marker*/
+.widget h3 {
+  padding: 0px;
+  margin: 2px;
+  font-size: 1.05em;
+}
+.widget .action {
+  opacity: 0.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;
+}
+.widget input.action {
+  opacity: 0.5;
+  -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;
+}
+.widget:hover .title .action {
+  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;
+}
+.widget .tool:hover .action {
+  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;
+}
+.widget .tool:hover .action.ticked {
+  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;
+}
+.widget ul {
+  padding: 0px;
+}
+.widget ul li {
+  padding-left: 16px;
+  min-height: 16px;
+  list-style: none;
+}
+#side-bar-photos-albums li{
+list-style-type: disc;
+}
+#side-bar-photos-albums ul li{
+  margin-left: 30px;
+  padding-left: 0px;
+	}
+#side-bar-photos-albums ul li a{
+  color: #3465A4;
+}
+.widget .tool.selected {
+  background: url("../diabook-pink/icons/selected.png") no-repeat left center;
+}
+/* widget: search */
+span.sbox_l  {
+	background: white url('../diabook/icons/srch_l.gif') no-repeat top left;
+	float: left;
+	width: 19px; height: 19px;
+	margin-left: 10px;
+	margin-top: 5px;
+	
+}
+
+span.sbox_r  {
+	background: white url('../diabook/icons/srch_r.gif') no-repeat top left;
+	float: left;
+	width: 19px; height: 19px;
+	margin-top: 5px;
+}
+
+span.sbox input {
+	background: white url('../diabook/icons/srch_bg.gif') repeat-x top left;
+	float: left;
+	margin-top: 5px;
+	border: 0;
+	height: 13px; width: 100px;
+	padding: 3px;
+	font: 11px/13px arial;
+	color: #000;
+}
+#add-search-popup {
+  width: 200px;
+  top: 18px;
+}
+/* section */
+section {
+  display: table-cell;
+  vertical-align: top;
+  width: auto;
+  padding: 0px 0px 0px 12px;
+}
+
+body .pageheader{
+  text-align: center;
+  font-size: 20px;
+  margin-bottom: 20px;
+  margin-top: 0px;
+  max-width: 575px;
+	}
+.qcomment{
+  max-width: 122px;	
+	}
+#id_username {
+  width: 173px;	
+	}
+#id_password {
+  width: 173px;		
+	}
+#id_openid_url {
+  width: 173px;	
+	}
+#contact-edit-end {
+	}
+.pager {
+   padding: 10px;
+	text-align: center;
+	font-size: 1.0em;
+	clear: both;
+	display: block;
+}	
+
+.tabs {
+    
+    background-position: 0 -20px;
+    background-repeat: repeat-x;
+    height: 27px;
+    padding: 0;
+ }
+.tab.button {
+    margin-left: 5px;	
+    /*background: none repeat scroll 0 0 #F8F8F8;*/
+    border: 1px solid #CCCCCC;
+    border-radius: 3px 3px 3px 3px;
+    font-weight: normal;
+    padding: 3px;
+    color:  #333333;
+	}
+	
+#birthday-notice, #event-notice, #birthday-wrapper, #event-wrapper{
+	margin-bottom: 10px;
+	}
+#birthday-wrapper a {
+	color: #3465A4;
+	}
+
+/*marker*/
+right_aside {
+  display: table-cell;
+  vertical-align: top;
+  width: 180px;
+  /*border-left: 1px solid #D2D2D2;*/
+  
+  /* background: #F1F1F1; */
+}
+right_aside a{color: #3465A4;}
+/*marker*/
+right_aside h3 {font-size: 1.05em; border-bottom: 1px solid #D2D2D2; padding-top: 5px; padding-bottom: 0px; padding-left: 9px; margin-bottom: 0px; 
+margin-top:30px;}
+right_aside .directory-item {	width: 50px; height: 50px; vertical-align: center; text-align: center; }
+right_aside .directory-photo { margin: 0px; }
+right_aside .directory-photo-img { max-width: 45px; max-height: 45px; }
+right_aside #likes { margin: 0px; padding: 0px; list-style: none; }
+right_aside .items-wrapper{ overflow: auto;	width: 100%; }
+right_aside #lastusers-wrapper { padding-left: 6px; padding-top: 3px; overflow: auto;	width: 100%; }
+right_aside #ra-photos-wrapper { padding-left: 5px; padding-top: 3px; overflow: auto;	width: 100%; }
+#page-sidebar-right_aside{margin-top: 0px; margin-bottom: 30px;}
+#page-sidebar-right_aside ul {margin-top: 0px;}
+#page-sidebar-right_aside .label {max-width: 128px;}
+right_aside .icon {width: 10px; height: 10px;}
+.close_box		{ 
+		background-image: url("../diabook-pink/icons/close_box.png");
+		float: right;
+		cursor: pointer;
+		opacity: 0.1;
+		}
+.close_box:hover	{ 
+		background-image: url("../diabook-pink/icons/close_box.png");
+		float: right;
+		cursor: pointer;
+		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;
+		}
+
+
+/* wall item */
+.tread-wrapper {
+  border-bottom: 1px solid #D2D2D2;
+  position: relative;
+  padding: 5px;
+  margin-bottom: 0px;
+  width: 775px;
+  padding-top: 10px;
+}
+.tread-wrapper a{
+  color: #996d73;
+}
+
+/*marker*/
+.wall-item-decor {
+  position: absolute;
+  left: 780px;
+  top: -10px;
+  width: 16px;
+}
+/*marker*/
+.wall-item-container {
+  display: table;
+  width: 770px;
+}
+
+
+.wall-item-container .wall-item-item, .wall-item-container .wall-item-bottom {
+  display: table-row;
+}
+
+.wall-item-bottom {
+  font-size: 13px;
+}
+.wall-item-container .wall-item-bottom {
+/*  opacity: 0.5;
+  -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; */
+}
+.wall-item-container:hover .wall-item-bottom {
+/*  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; */
+}
+.wall-item-container .wall-item-info {
+  display: table-cell;
+  vertical-align: top;
+  text-align: left;
+  width: 80px;
+}
+.wall-item-container .wall-item-location {
+  padding-right: 40px;
+  display: table-cell;
+}
+.wall-item-container .wall-item-ago {
+  word-wrap: break-word;
+  width: 50px;
+  margin-left: 10px;
+  color: #999;
+}
+.wall-item-location {
+  
+  clear: both;
+  overflow: hidden;
+  
+  margin-bottom: 5px;
+}
+
+/*marker*/
+.wall-item-container .wall-item-content {
+
+  max-width: 690px;
+  word-wrap: break-word;
+
+
+}
+/*marker*/
+.wall-item-container .wall-item-content img {
+
+
+}
+.wall-item-container .wall-item-links, .wall-item-container .wall-item-actions {
+  display: table-cell;
+  vertical-align: middle;
+}
+.wall-item-container .wall-item-links .icon, .wall-item-container .wall-item-actions .icon {
+  opacity: 0.5;
+  -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;
+}
+.wall-item-container .wall-item-links .icon:hover, .wall-item-container .wall-item-actions .icon: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;
+}
+.wall-item-container .wall-item-name {
+  font-weight: bold;
+}
+.wall-item-container .wall-item-actions-author {
+  width: 100%;
+  margin-bottom: 0.3em;
+}
+.wall-item-container .wall-item-actions-social {
+  float: left;
+  margin-bottom: 1px;
+  display: table-cell;
+}
+.wall-item-container .wall-item-actions-social a {
+  margin-right: 1em;
+}
+.wall-item-actions-social a {
+  float: left;
+}
+.wall-item-container .wall-item-actions-tools {
+  float: right;
+  width: 80px;
+  display: table-cell;
+}
+.wall-item-container .wall-item-actions-tools a {
+  float: right;
+}
+.wall-item-container .wall-item-actions-tools input {
+  float: right;
+}
+/*marker*/
+.wall-item-container.comment {
+  margin-top: 5px;
+  margin-bottom: 5px;
+  margin-left: 80px;
+  width: 690px;
+  border-bottom: 1px solid hsl(198, 21%, 79%);
+}
+.wall-item-container.comment .contact-photo {
+  width: 32px;
+  height: 32px;
+  margin-left: 16px;
+  /*background: url(../../../../images/icons/22/user.png) no-repeat center center;*/
+
+}
+.wall-item-container.comment {
+  top: 15px !important;
+  left: 15px !important;
+}
+.wall-item-container.comment .wall-item-links {
+  padding-left: 12px;
+}
+
+.wall-item-comment-wrapper {
+  margin: 1px 5px 5px 80px;
+  background-color: #fff;
+  width: 500px;
+}
+.wall-item-comment-wrapper .comment-edit-photo {
+  display: none;
+}
+.wall-item-comment-wrapper textarea {
+  height: 2.0em;
+  width: 100%;
+  font-size: 10px;
+  color: #999999;
+  border: 1px solid #DDD;
+  padding: 0.3em;
+  font-size: 14px;
+}
+.wall-item-comment-wrapper .comment-edit-text-full {
+  font-size: 14px;
+  height: 4em;
+  color: #2d2d2d;
+  border: 1px solid #2d2d2d;
+}
+.comment-edit-preview {
+  width: 500px;
+  margin-top: 10px;
+  background-color:  #fff797;
+}
+.comment-edit-preview .contact-photo {
+  width: 32px;
+  height: 32px;
+  margin-left: 16px;
+  /*background: url(../../../../images/icons/22/user.png) no-repeat center center;*/
+
+}
+.comment-edit-preview {
+  top: 15px !important;
+  left: 15px !important;
+}
+.comment-edit-preview .wall-item-links {
+  padding-left: 12px;
+}
+.comment-edit-preview .wall-item-container {
+  width: 700px;
+}
+.comment-edit-preview .tread-wrapper {
+  width: 700px;
+  padding: 0;
+  margin: 10px 0;
+}
+
+.shiny {
+  /* border-right: 10px solid #fce94f; */
+	border-right: 1px solid #A7C7F7;
+	padding-right: 12px;
+}
+
+#jot-preview-content{
+	margin-top: 30px;}
+	
+#jot-preview-content .tread-wrapper {
+  background-color: #fff797;
+}
+
+.wall-item-tags {
+  padding-top: 1px;
+  padding-bottom: 2px;
+}
+.tag {
+  /*background: url("../../../../images/tag_b.png") repeat-x center left;*/
+  color: #999;
+  padding-left: 3px;
+  font-size: 12px;
+}
+.tag a {
+  padding-right: 5px;
+  /*background: url("../../../../images/tag.png") no-repeat center right;*/
+  color: #999;
+}
+.wwto {
+  position: absolute !important;
+  width: 25px;
+  height: 25px;
+  background: #FFFFFF;
+  border: 2px solid #364e59;
+  height: 25px;
+  width: 25px;
+  overflow: hidden;
+  padding: 1px;
+  position: absolute !important;
+  top: 40px;
+  left: 30px;
+  -webkit-box-shadow: 0px 0px 10px rgba(0, 0, 0, 0.7);
+  -moz-box-shadow: 0px 0px 10px rgba(0, 0, 0, 0.7);
+  box-shadow: 0px 0px 10px rgba(0, 0, 0, 0.7);
+}
+.wwto .contact-photo {
+  width: auto;
+  height: 25px;
+}
+/* contacts menu */
+.contact-photo-wrapper {
+  position: relative;
+  width: 80px;
+}
+
+.contact-photo-wrapper.wwto {
+  width: 25px;
+}
+
+.contact-photo {
+  width: 48px;
+  height: 48px;
+  overflow: hidden;
+  display: block;
+}
+.contact-photo img {
+  width: 48px;
+  height: 48px;
+}
+
+.contact-wrapper {
+  float: left;
+  width: 90px;
+  height: 90px;
+  margin-bottom: 15px;
+}
+.contact-wrapper .contact-photo {
+  width: 80px;
+  height: 80px;
+}
+.contact-wrapper .contact-photo img {
+  width: 80px;
+  height: 80px;
+}
+.contact-wrapper {
+  left: 0px;
+  top: 63px;
+}
+.contact-photo {
+  width: 48px;
+  height: 48px;
+}
+.contact-photo img {
+  width: 48px;
+  height: 48px;
+}
+.contact-name {
+  /* text-align: center; */
+  /*font-weight: bold;*/
+  font-size: 12px;
+}
+.contact-details {
+  color: #999999;
+}
+/* editor */
+.jothidden {
+  display: none;
+}
+#jot {
+  width: 585px;
+  margin: 0px 2em 20px 0px;
+}
+#profile-jot-form #profile-jot-text {
+  height: 2.0em;
+  width: 99%;
+  font-size: 15px;
+  color: #999999;
+  border: 1px solid #DDD;
+  padding: 0.3em;
+  margin-bottom: 10px;
+}
+.grey
+{
+  display: inline;
+  float: right;	
+	}
+#jot #jot-tools {
+  margin: 0px;
+  padding: 0px;
+  height: 40px;
+  overflow: none;
+  width: 583px;
+  background-color: #fff;
+  border-bottom: 2px solid #9eabb0;
+}
+
+#jot #jot-tools li {
+  list-style: none;
+  float: left;
+  width: 80px;
+  height: 40px;
+  border-bottom: 2px solid #9eabb0;
+}
+#jot #jot-tools li a {
+  display: block;
+  color: #cccccc;
+  width: 100%;
+  height: 40px;
+  text-align: center;
+  line-height: 40px;
+  overflow: hidden;
+}
+#jot #jot-tools li:hover {
+  background-color: #364e59;
+  border-bottom: 2px solid #bdcdd4;
+}
+#jot #jot-tools li.perms {
+  float: right;
+  width: 40px;
+}
+#jot #jot-tools li.perms a.unlock {
+  width: 30px;
+  border-left: 10px solid #cccccc;
+  background-color: #cccccc;
+  background-position: left center;
+}
+#jot #jot-tools li.perms a.lock {
+  width: 30px;
+  border-left: 10px solid #666666;
+  background-color: #666666;
+}
+#jot #jot-tools li.submit {
+  float: right;
+  background-color: #cccccc;
+  border-bottom: 2px solid #cccccc;
+  border-right: 1px solid #666666;
+  border-left: 1px solid #666666;
+}
+#jot #jot-tools li.submit input {
+  border: 0px;
+  margin: 0px;
+  padding: 0px;
+  background-color: #cccccc;
+  color: #666666;
+  width: 80px;
+  height: 40px;
+  line-height: 40px;
+}
+#jot #jot-tools li.submit input:hover {
+  background-color: #bdcdd4;
+  color: #666666;
+}
+#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;
+}
+#profile-jot-form #jot-title {
+    
+  	 border-radius: 5px 5px 5px 5px;
+    font-weight: bold;
+    height: 20px;
+    margin: 0 0 5px;
+    width: 60%;
+    border: 1px solid #d2d2d2;
+}
+#profile-jot-form #jot-title:-webkit-input-placeholder {
+  font-weight: normal;
+}
+#profile-jot-form #jot-title:-moz-placeholder {
+  font-weight: normal;
+}
+#profile-jot-form #profile-jot-text_parent #profile-jot-text_tbl{
+	width: 585px;
+	height: 100px;
+	}
+#jot #jot-title:hover {
+  border: 1px solid #999999;
+}
+#jot #jot-title:focus {
+  border: 1px solid #999999;
+}
+#jot #character-counter {
+  width: 80px;
+  float: right;
+  text-align: right;
+  height: 20px;
+  line-height: 20px;
+  padding-right: 20px;
+}
+#jot-perms-icon, 
+#profile-location,
+#profile-nolocation,
+#profile-youtube, 
+#profile-video, 
+#profile-audio,
+#profile-link,
+#profile-title, 
+#wall-image-upload,
+#wall-file-upload,
+#wall-image-upload-div,
+#wall-file-upload-div,
+.hover, .focus {
+	cursor: pointer;
+	margin-top: 2px;
+}
+/*marker*/
+#profile-jot-wrapper{
+	margin: 0 20px 20px 0;
+   width: 785px;
+	}
+/*marker*/
+#profile-jot-submit-wrapper {
+	margin-bottom: 50px;
+	width: 785px;
+}
+
+#profile-jot-submit {
+	float: right;
+	margin-top: 2px;
+	font-size: 14px;
+	
+}
+#profile-upload-wrapper {
+	float: left;
+	margin-top: 2px;
+	margin-left: 10px;
+	
+}
+#profile-attach-wrapper {
+	float: left;
+	margin-left: 15px;
+	margin-top: 2px;
+}
+#profile-rotator {
+	float: left;
+	margin-left: 30px;
+	margin-top: 2px;
+}
+#profile-link-wrapper {
+	float: left;
+	margin-left: 15px;
+	margin-top: 2px;
+}
+#profile-youtube-wrapper {
+	float: left;
+	margin-left: 15px;
+	margin-top: 2px;
+}
+#profile-video-wrapper {
+	float: left;
+	margin-left: 15px;
+	margin-top: 2px;
+}
+#profile-audio-wrapper {
+	float: left;
+	margin-left: 15px;
+	margin-top: 2px;
+}
+#profile-location-wrapper {
+	float: left;
+	margin-left: 15px;
+	margin-top: 2px;
+}
+#profile-jot-perms {
+	float: left;
+	margin-left: 45px;
+	margin-top: 2px;
+}
+#jot-preview-link {
+	float: right;
+	margin-left: 10px;
+	margin-top: 2px;
+	font-size: 9px;
+	font-weight: bolder;
+	cursor: pointer;
+}
+#profile-jot-perms{
+   float: right;
+	margin-left: 10px;
+	margin-top: 2px;	
+	}
+/** buttons **/
+.button.creation1 {
+    background-color: #fff;
+    border: 1px solid #777777;
+    border-radius: 3px 3px 3px 3px;
+    box-shadow: 0 1px 1px #CFCFCF;
+    cursor: pointer;
+    font-weight: bolder;
+}
+.button.creation2 {
+    background-color: #996d73;
+    border: 1px solid #777777;
+    color: white;
+    border-radius: 3px 3px 3px 3px;
+    box-shadow: 0 1px 1px #CFCFCF;
+    margin-left: 5px;
+    cursor: pointer;
+    font-weight: bolder;
+}
+/*input[type="submit"] {
+	border: 0px;
+    background-color: @ButtonBackgroundColor;
+    color: @ButtonColor;
+    padding: 0px 10px;
+	.rounded(5px);
+    height: 18px;
+}*/
+/** acl **/
+#photo-edit-perms-select, #photos-upload-permissions-wrapper, #profile-jot-acl-wrapper {
+  display: block!important;
+}
+#acl-wrapper {
+  width: 690px;
+  float: left;
+}
+#acl-search {
+  float: right;
+  background: #ffffff url("../../../../images/search_18.png") no-repeat right center;
+  padding-right: 20px;
+}
+#acl-showall {
+  float: left;
+  display: block;
+  width: auto;
+  height: 18px;
+  background-color: #cccccc;
+  background-image: url("../../../../images/show_all_off.png");
+  background-position: 7px 7px;
+  background-repeat: no-repeat;
+  padding: 7px 5px 0px 30px;
+  color: #999999;
+  -moz-border-radius: 5px 5px 5px 5px;
+  -webkit-border-radius: 5px 5px 5px 5px;
+  border-radius: 5px 5px 5px 5px;
+}
+#acl-showall.selected {
+  color: #000000;
+  background-color: #ff9900;
+  background-image: url("../../../../images/show_all_on.png");
+}
+#acl-list {
+  height: 210px;
+  border: 1px solid #cccccc;
+  clear: both;
+  margin-top: 30px;
+  overflow: auto;
+}
+.acl-list-item {
+  display: block;
+  width: 150px;
+  height: 30px;
+  border: 1px solid #cccccc;
+  margin: 5px;
+  float: left;
+}
+.acl-list-item img {
+  width: 22px;
+  height: 22px;
+  float: left;
+  margin: 4px;
+}
+.acl-list-item p {
+  height: 12px;
+  font-size: 10px;
+  margin: 0px;
+  padding: 2px 0px 1px;
+  overflow: hidden;
+}
+.acl-list-item a {
+  font-size: 8px;
+  display: block;
+  width: 40px;
+  height: 10px;
+  float: left;
+  color: #999999;
+  background-color: #cccccc;
+  background-position: 3px 3px;
+  background-repeat: no-repeat;
+  margin-right: 5px;
+  -webkit-border-radius: 2px ;
+  -moz-border-radius: 2px;
+  border-radius: 2px;
+  padding-left: 15px;
+}
+#acl-wrapper a:hover {
+  text-decoration: none;
+  color: #000000;
+}
+.acl-button-show {
+  background-image: url("../../../../images/show_off.png");
+}
+.acl-button-hide {
+  background-image: url("../../../../images/hide_off.png");
+}
+.acl-button-show.selected {
+  color: #000000;
+  background-color: #9ade00;
+  background-image: url("../../../../images/show_on.png");
+}
+.acl-button-hide.selected {
+  color: #000000;
+  background-color: #ff4141;
+  background-image: url("../../../../images/hide_on.png");
+}
+.acl-list-item.groupshow {
+  border-color: #9ade00;
+}
+.acl-list-item.grouphide {
+  border-color: #ff4141;
+}
+/** /acl **/
+/** tab buttons 14618a**/
+/*marker*/
+ul.tabs {
+  list-style-type: none;
+  padding-bottom: 10px;
+  font-size: 13px;
+  width: 805px;
+}
+ul.tabs li {
+  float: left;
+  margin-left: 5px;
+}
+ul.tabs li .active {
+    background-color: #3465A4;
+    border: 1px solid #777777;
+    color: white;
+    border-radius: 3px 3px 3px 3px;
+    box-shadow: 2px 2px 2px #CFCFCF;
+    margin-left: 5px;
+}
+/**
+ * Form fields
+ */
+.field {
+  margin-bottom: 10px;
+  padding-bottom: 10px;
+  overflow: auto;
+  width: 100%;
+}
+.field label {
+  float: left;
+  width: 200px;
+}
+.field input, .field textarea {
+  width: 400px;
+}
+.field textarea {
+  height: 100px;
+}
+.field .field_help {
+  display: block;
+  margin-left: 200px;
+  color: #666666;
+}
+.field .onoff {
+  float: left;
+  width: 80px;
+}
+.field .onoff a {
+  display: block;
+  border: 1px solid #666666;
+  background-image: url("../../../../images/onoff.jpg");
+  background-repeat: no-repeat;
+  padding: 4px 2px 2px 2px;
+  height: 16px;
+  text-decoration: none;
+}
+.field .onoff .off {
+  border-color: #666666;
+  padding-left: 40px;
+  background-position: left center;
+  background-color: #cccccc;
+  color: #666666;
+  text-align: right;
+}
+.field .onoff .on {
+  border-color: #204A87;
+  padding-right: 40px;
+  background-position: right center;
+  background-color: #D7E3F1;
+  color: #204A87;
+  text-align: left;
+}
+.field .hidden {
+  display: none!important;
+}
+.field.radio .field_help {
+  margin-left: 0px;
+}
+#directory-search-form{
+	margin-bottom: 50px;
+	}
+#profile-edit-links-end {
+        clear: both;
+        margin-bottom: 15px;
+}
+
+#profile-edit-links ul { margin: 20px; padding-bottom: 20px; list-style: none; }
+
+#profile-edit-links li {
+  float: left;
+  list-style: none;
+  margin-left: 10px;
+}
+
+.profile-edit-side-div {
+  display: none;
+}
+
+#register-form label,
+#profile-edit-form label {
+        width: 300px; float: left;
+}
+
+.required {
+  display: inline;
+  color: #B20202;
+}
+
+/* oauth */
+.oauthapp {
+  height: auto;
+  overflow: auto;
+  border-bottom: 2px solid #cccccc;
+  padding-bottom: 1em;
+  margin-bottom: 1em;
+}
+.oauthapp img {
+  float: left;
+  width: 48px;
+  height: 48px;
+  margin: 10px;
+}
+.oauthapp img.noicon {
+  background-image: url("../../../../images/icons/48/plugin.png");
+  background-position: center center;
+  background-repeat: no-repeat;
+}
+.oauthapp a {
+  float: left;
+}
+/* contacts */
+.contact-entry-wrapper {
+  width: 120px;
+  height: 120px;
+  float: left;
+}
+/* photo */
+.photo {
+box-shadow: 2px 2px 5px 0px #000000;
+margin: 0px;
+border-radius: 10px;
+height: 145px !important;
+width: 145px !important;
+}
+.lframe {
+  float: left;
+  /*margin: 0px 10px 10px 0px;*/
+}
+/* profile match wrapper */
+.profile-match-wrapper {
+  float: left;
+  width: 90px;
+  height: 90px;
+  margin-bottom: 20px;
+}
+.profile-match-wrapper .contact-photo {
+  width: 80px;
+  height: 80px;
+}
+.profile-match-wrapper .contact-photo img {
+  width: 80px;
+  height: 80px;
+}
+.profile-match-wrapper {
+  left: 0px;
+  top: 63px;
+}
+
+.contact-photo-menu-button {
+        position: relative;
+        background-image: url("../../../../images/icons/16/menu.png");
+        background-position: top left; 
+        background-repeat: no-repeat;
+        margin: 0px 0px -16px 0px; 
+	padding: 0px;
+        width: 16px;
+        height: 16px;
+        top: -16px; left:0px;
+        overflow: hidden;
+        text-indent: 40px;
+        display: none;
+        
+}
+.contact-photo-menu {
+        width: 11em;
+        border: 3px solid #364e59;
+	color: #2d2d2d;
+        background: #FFFFFF;
+/*        position: absolute;*/
+        position: relative;
+        left: 0px; top: 0px;
+        display: none;
+        z-index: 10000;
+}
+.contact-photo-menu ul { margin:0px; padding: 0px; list-style: none }
+.contact-photo-menu li a {
+	display: block; 
+	padding: 5px 10px; 
+	color: #2d2d2d;
+	text-decoration: none;
+}
+.contact-photo-menu li a:hover {
+	background-color: #bdcdd4; 
+}
+
+/* page footer */
+footer {
+  height: 100px;
+  display: table-row;
+}
+
+blockquote {
+    border-left: 1px solid #D2D2D2;
+    padding-left: 9px;
+    margin: 0 0 0 .8ex;
+	 color: #777;
+}
+.oembed {
+	
+	font-weight: bold;
+}
+.aprofile dt{
+box-shadow: 1px 1px 5px 0;
+    color: #666666;
+    margin: 15px 0 5px;
+    padding-left: 5px;	
+	}
+/* ================== */
+/* = Contacts Block = */
+/* ================== */
+
+.contact-block-img {
+        width: 55px;
+        height: 55px;
+        padding-right: 3px;
+}
+.contact-block-div {
+        float: left;
+}
+
+.contact-block-textdiv { width: 150px; height: 34px; float: left; }
+#contact-block-end { clear: both; } 
+
+#group-edit-wrapper {
+        margin-bottom: 10px;
+}
+
+#group-members-end {
+        clear: both;
+}
+#group-edit-desc {
+ margin-top: 15px;
+}
+
+/*
+#group-separator,
+#prof-separator { display: none;}
+*/
+#prof-members-end{
+	clear: both;
+	}
+
+#prvmail-to-label, #prvmail-subject-label, #prvmail-message-label {
+	margin-bottom: 10px;
+	margin-top: 20px;
+}
+
+#prvmail-submit {
+	float: right;
+	margin-top: 10px;
+}
+
+#prvmail-subject
+{
+background: none repeat scroll 0 0 #FFFFFF;
+border: 1px solid #CCCCCC;
+border-radius: 5px 5px 5px 5px;
+font-weight: bold;
+height: 20px;
+margin: 0 0 5px;
+vertical-align: middle;
+}
+#prvmail-form{
+ width: 597px;	
+	}
+	
+#prvmail-upload-wrapper,
+#prvmail-link-wrapper,
+#prvmail-rotator-wrapper {
+	float: left;
+	margin-top: 10px;
+	margin-right: 10px;
+	width: 24px;
+}
+
+#prvmail-end {
+	clear: both;
+}
+
+.mail-list-sender,
+.mail-list-detail {
+	float: left;
+}
+.mail-list-detail {
+	margin-left: 20px;
+}
+
+.mail-list-subject {
+	font-size: 1.1em;
+	margin-top: 10px;
+}
+a.mail-list-link {
+    display: block;
+    font-size: 1.3em;
+    padding: 4px 0;
+}
+
+/*
+*a.mail-list-link:hover {
+*	background-color: #15607B;
+*	color: #F5F6FB;
+*}
+*/
+
+.mail-list-outside-wrapper-end {
+	clear: both;
+}
+
+.mail-list-outside-wrapper {
+	margin-top: 30px;
+}
+
+.mail-list-delete-wrapper {
+	float: right;
+	margin-right: 30px;
+	margin-top: 15px;
+}
+
+.mail-list-delete-icon {
+	border: none;
+}
+
+.mail-conv-sender,
+.mail-conv-detail {
+	float: left;
+}
+.mail-conv-detail {
+	margin-left: 20px;
+	width: 500px;
+}
+
+.mail-conv-subject {
+    font-size: 1.4em;
+    margin: 10px 0;
+}
+
+.mail-conv-outside-wrapper-end {
+	clear: both;
+}
+
+.mail-conv-outside-wrapper {
+	margin-top: 30px;
+}
+
+.mail-conv-delete-wrapper {
+	float: right;
+	margin-right: 30px;
+	margin-top: 15px;
+}
+.mail-conv-break {
+	clear: both;
+}
+
+.mail-conv-delete-icon {
+	border: none;
+}
+
+/* ========== */
+/* = Events = */
+/* ========== */
+.eventcal {
+        float: left;
+        font-size: 20px;
+}
+
+.vevent {
+
+}
+.vevent .event-description, .vevent .event-location {
+        margin-left: 10px;
+        margin-right: 10px;
+}
+.vevent .event-start {
+        margin-left: 10px;
+        margin-right: 10px;
+}
+
+#new-event-link {
+        margin-bottom: 10px;
+}
+
+.edit-event-link, .plink-event-link {
+        float: left;
+        margin-top: 4px;
+        margin-right: 4px;
+        margin-bottom: 15px;
+}
+
+.event-description:before {
+        content: url('../../../../images/calendar.png');
+        margin-right: 15px;
+}
+
+.event-start, .event-end {
+        margin-left: 10px;
+        width: 330px;
+        clear: both;
+}
+
+.event-start .dtstart, .event-end .dtend {
+        float: right;
+}
+
+.event-list-date {
+        margin-bottom: 10px;
+}
+
+.prevcal, .nextcal {
+        float: left;
+        margin-left: 32px;
+        margin-right: 32px;
+        margin-top: 64px;
+}
+.event-calendar-end {
+        clear: both;
+}
+
+ 
+.calendar {
+        font-family: Courier, monospace;
+}
+.calendar.eventcal a {
+  color: #3465A4;	
+	}
+.today {
+        font-weight: bold;
+        color: #FF0000;
+}
+
+.settings-block {
+        border: 1px solid #AAA;
+        margin: 10px;
+        padding: 10px;
+}
+
+.app-title {
+        margin: 10px;
+}
+
+#identity-manage-desc {
+        margin-top:15px;
+        margin-bottom: 15px;
+}
+
+#identity-manage-choose {
+        margin-bottom: 15px;
+}
+
+#identity-submit {
+        margin-top: 20px;
+}
+
+#photo-prev-link, #photo-next-link {
+        padding: 10px;
+        float: left;
+}
+.lightbox{
+	float: left;
+	}
+
+#photo-photo {
+        float: left;
+}
+#photo-like-div .wall-item-like-buttons {
+	 float: left;
+    margin-right: 5px;
+    margin-top: 30px;
+	}
+.comment-edit-text-empty {
+    margin: 10px 0 0;
+    width: 85%;
+}
+.comment-edit-photo {
+    margin: 10px 0 0;
+}
+.wall-item-like-buttons .icon.like {
+float: left;
+}
+
+#photo-photo-end {
+        clear: both;
+}
+
+.tabs .comment-wwedit-wrapper {
+	display: block;
+   margin-top: 30px;
+   margin-left: 50px;
+	}
+
+.profile-match-photo {
+        float: left;
+        text-align: center;
+        width: 120px;
+}
+
+.profile-match-name {
+        float: left;
+        text-align: center;
+        width: 120px;
+        overflow: hidden;
+}
+
+.profile-match-break,
+.profile-match-end {
+        clear: both;
+}
+
+.profile-match-connect {
+        text-align: center;
+        font-weight: bold;
+}
+
+.profile-match-wrapper {
+        float: left;
+        padding: 10px;
+        width: 120px;
+        height: 120px;
+        scroll: auto;
+}
+#profile-match-wrapper-end {
+        clear: both;
+}
+
+/* ============= */
+/* = Directory = */
+/* ============= */
+/* contacts menu */
+.contact-photo-wrapper {
+  position: relative;
+}
+.contact-photo {
+  width: 48px;
+  height: 48px;
+  overflow: hidden;
+  display: block;
+}
+.contact-photo img {
+  width: 48px;
+  height: 48px;
+}
+.contact-photo-menu-button {
+  display: none;
+  /* position: absolute; */
+  /* position: absolute; */
+  left: 0px;
+  top: -16px;
+}
+.contact-wrapper {
+  float: left;
+  width: 90px;
+  height: 90px;
+  margin-bottom: 15px;
+}
+.contact-wrapper .contact-photo {
+  width: 80px;
+  height: 80px;
+}
+.contact-wrapper .contact-photo img {
+  width: 80px;
+  height: 80px;
+}
+.contact-wrapper .contact-photo-menu-button {
+  left: 0px;
+  top: 63px;
+}
+.directory-item {
+  float: left;
+  width: 200px;
+  height: 200px;
+}
+.directory-item .contact-photo {
+  width: 175px;
+  height: 175px;
+}
+.directory-item .contact-photo img {
+  width: 175px;
+  height: 175px;
+}
+.contact-name {
+  text-align: left;
+  font-weight: bold;
+  font-size: 12px;
+}
+.contact-details {
+  color: #999999;
+}
+#side-bar-photos-albums li{
+list-style-type: disc;
+}
+#side-bar-photos-albums ul li{
+  margin-left: 30px;
+  padding-left: 0px;
+	}
+#side-bar-photos-albums{
+	margin-top: 15px;	
+	}
+.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-album-image-wrapper, .photo-top-image-wrapper {
+  float: left;
+   -moz-box-shadow: 0 0 5px #888;
+   -webkit-box-shadow: 0 0 5px #888;
+   box-shadow: 0 0 5px #888;
+  background-color: #000;
+   -webkit-border-radius: 5px;
+   -moz-border-radius: 5px;
+  border-radius: 5px;
+  padding-bottom: 20px;
+  position: relative;
+  margin: 0 10px 10px 0;
+  width: 200px; height: 140px;
+  overflow: hidden;  
+}
+.photo-top-album-name {
+        width: 100%;
+        position: absolute; 
+        bottom: 0px; 
+        padding-left: 3px;
+        background-color: #EEE;
+}
+.photo-top-album-link{
+  color: #3465A4;
+	}
+.photo-top-album-img{
+	
+	}
+/*.photo-top-image-wrapper {
+        position: relative;
+        float: left;
+        margin-top: 15px;
+        margin-right: 15px;
+        width: 200px; height: 200px; 
+        overflow: hidden; 
+}
+.photo-top-album-name {
+        width: 100%;
+        min-height: 2em;
+        position: absolute; 
+        bottom: 0px; 
+        padding: 0px 3px;
+        padding-top: 0.5em;
+        background-color: rgb(255, 255, 255);
+}*/
+#photo-top-end {
+        clear: both;
+}
+
+#photo-top-links {
+        margin-bottom: 30px;
+        margin-left: 30px;
+}
+
+#photos-upload-newalbum-div {
+        float: left;
+        width: 175px;
+}
+
diff --git a/view/theme/diabook/diabook-pink/style-network.css b/view/theme/diabook/diabook-pink/style-network.css
new file mode 100644
index 000000000..3a4f49877
--- /dev/null
+++ b/view/theme/diabook/diabook-pink/style-network.css
@@ -0,0 +1,2634 @@
+/**
+ * Fabio Comuni <http://kirgroup.com/profile/fabrixxm>
+ * Additional Changes: Michael Vogel <icarus@dabo.de>
+ **/
+
+/* ========= */
+/* = Admin = */
+/* ========= */
+
+#adminpage {
+/*        width: 80%;*/
+}
+
+#pending-update {
+        float:right;
+        color: #ffffff;
+        font-weight: bold;
+        background-color: #FF0000;
+        padding: 0em 0.3em;
+}
+
+.admin.linklist {
+        border: 0px; padding: 0px;
+}
+
+.admin.link {
+        list-style-position: inside;
+        font-size: 1em;
+        padding: 5px;
+        width: 100px;
+        margin: 5px;
+}
+
+#adminpage dl {
+        clear: left;
+        margin-bottom: 2px;
+        padding-bottom: 2px;
+        border-bottom: 1px solid black;
+}
+
+#adminpage dt {
+        width: 200px;
+        float: left;
+        font-weight: bold;
+}
+
+#adminpage dd {
+        margin-left: 200px;
+}
+#adminpage h3 {
+        border-bottom: 1px solid #898989;
+        margin-bottom: 5px;
+        margin-top: 10px;
+}
+
+#adminpage .submit {
+        clear:left;
+}
+
+#adminpage #pluginslist {
+        margin: 0px; padding: 0px;
+}
+
+#adminpage .plugin {
+        list-style: none;
+        display: block;
+	/* border: 1px solid #888888; */
+        padding: 1em;
+        margin-bottom: 5px;
+        clear: left;
+}
+
+#adminpage .toggleplugin {
+        float:left;
+        margin-right: 1em;
+}
+
+#adminpage table {width:100%; border-bottom: 1p solid #000000; margin: 5px 0px;}
+#adminpage table th { text-align: left;}
+#adminpage td .icon { float: left;}
+#adminpage table#users img { width: 16px; height: 16px; }
+#adminpage table tr:hover { background-color: #eeeeee; }
+#adminpage .selectall { text-align: right; }
+/* icons */
+
+.icon.contacts {
+  background-image: url("../diabook-pink/icons/contacts.png");}
+.icon.notifications {
+  background-image: url("../diabook-pink/icons/notifications.png");}
+.icon.notify {
+  background-image: url("../diabook-pink/icons/notify.png");}
+.icon.messages {
+  background-image: url("../diabook-pink/icons/messages.png");}
+.icon.community {
+  background-image: url("../diabook-pink/icons/community.png");}
+  
+.icon.drop 	{ background-image: url("../diabook-pink/icons/drop.png");}
+.icon.drophide 	{ background-image: url("../diabook-pink/icons/drop.png");}
+.icon.dislike 	{ background-image: url("../diabook-pink/icons/dislike.png");}
+.icon.like 	{ background-image: url("../diabook-pink/icons/like.png");}
+.icon.pencil 	{ background-image: url("../diabook-pink/icons/pencil.png");}
+.icon.recycle 	{ background-image: url("../diabook-pink/icons/recycle.png");}
+.icon.remote-link { background-image: url("../diabook-pink/icons/remote.png");}
+.icon.tagged    { background-image: url("../diabook-pink/icons/tagged.png");}
+.icon.file-as { background-image: url("../diabook-pink/icons/file_as.png");}
+.star-item.icon.unstarred { background-image: url("../diabook-pink/icons/unstarred.png");}
+.star-item.icon.starred { background-image: url("../diabook-pink/icons/starred.png");}
+.icon.link		{ background-image: url("../diabook-pink/icons/link.png");}
+.icon.lock		{ background-image: url("../diabook-pink/icons/lock.png");}
+.icon.unlock		{ background-image: url("../diabook-pink/icons/unlock.png");}
+.icon.language    { background-image: url("../diabook-pink/icons/language.png");}
+
+
+.camera 	{ background-image: url("../diabook-pink/icons/camera.png"); 
+			  display: block; width: 28px; height: 28px; background-repeat: no-repeat;
+			  }
+.attach 	{ background-image: url("../diabook-pink/icons/attach.png"); 
+			  display: block; width: 28px; height: 28px; background-repeat: no-repeat;
+			  }
+.video2 	{ background-image: url("../diabook-pink/icons/video.png"); 
+			  display: block; width: 28px; height: 28px; background-repeat: no-repeat;
+			  }	
+.video 	{ background-image: url("../diabook-pink/icons/video.png"); 
+			  display: block; width: 100%; height: 140px; background-repeat: no-repeat;
+			  }
+.audio2 	{ background-image: url("../diabook-pink/icons/audio.png"); 
+			  display: block; width: 28px; height: 28px; background-repeat: no-repeat;
+			  }
+.audio 	{ background-image: url("../diabook-pink/icons/audio.png"); 
+			  display: block; width: 28px; height: 28px; background-repeat: no-repeat;
+			  }
+.weblink 	{ background-image: url("../diabook-pink/icons/weblink.png"); 
+			  display: block; width: 28px; height: 28px; background-repeat: no-repeat;
+			  }
+.globe 	{ background-image: url("../diabook-pink/icons/globe.png"); 
+			  display: block; width: 28px; height: 28px; background-repeat: no-repeat;
+			  }
+.unglobe 	{ background-image: url("../diabook-pink/icons/unglobe.png"); 
+			  display: block; width: 28px; height: 28px; background-repeat: no-repeat;
+			  }
+.edit    {background-image: url("../diabook-pink/icons/pencil2.png"); 
+			  display: block; width: 28px; height: 28px; background-repeat: no-repeat;}
+			  
+			  
+
+
+.article	{ background-position: -50px  0px;}
+/*.audio 		{ background-position: -70px  0px;}*/
+.block 		{ background-position: -90px  0px;}
+/*.drop 		{ background-position: -110px 0px;}*/
+/*.drophide 	{ background-position: -130px 0px;}*/
+/*.edit 		{ background-position: -150px 0px;}*/
+/*.camera 	{ background-position: -170px 0px;}*/
+/*.dislike 	{ background-position: -190px 0px;}*/
+/*.like 		{ background-position: -210px 0px;}*/
+/*.link 		{ background-position: -230px 0px;}*/
+
+/*.globe 		{ background-position: -50px  -20px;}*/
+/*.noglobe 	{ background-position: -70px  -20px;}*/
+.no 		{ background-position: -90px  -20px;}
+.pause 		{ background-position: -110px -20px;}
+.play 		{ background-position: -130px -20px;}
+/*.pencil 	{ background-position: -150px -20px;}*/
+.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;}*/
+
+/*.video          { background-position: -110px -40px;}*/
+.youtube        { background-position: -130px -40px;}
+
+/*.attach         { background-position: -190px -40px;}*/
+/*.language       { background-position: -210px -40px;}*/
+
+
+.icon.on             { background-image: url("../diabook-pink/icons/toogle_on.png"); background-repeat: no-repeat;}
+.icon.off            { background-image: url("../diabook-pink/icons/toogle_off.png"); background-repeat: no-repeat;}
+.prev           { background-position: -90px  -60px;}
+.next           { background-position: -110px -60px;}
+/*.tagged     { background-position: -130px -60px;}*/
+
+.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 0px; }
+.type-audio { background-position: -40px 0px; }
+.type-text  { background-position: -60px 0px; }
+.type-unkn  { background-position: -80px 0px; }
+
+.icon.drop, .icon.drophide {
+ float: left;
+}
+
+.icon {
+  display: block;
+  width: 20px;
+  height: 20px;
+  /*background-image: url('icons.png');*/
+}
+
+.icon {
+  background-color: transparent ;
+  background-repeat: no-repeat;
+  /* background-position: left center; */
+  display: block;
+  overflow: hidden;
+  text-indent: -9999px;
+  padding: 1px;
+}
+
+.icon.border.camera{
+  background-image: url("../diabook-pink/icons/camera.png"); 
+  display: block; width: 28px; height: 28px; background-repeat: no-repeat;
+	}
+	
+.icon.border.link{
+  background-image: url("../diabook-pink/icons/weblink.png"); 
+  display: block; width: 28px; height: 28px; background-repeat: no-repeat;
+  margin-left: 10px;
+	}
+
+.icon.text {
+  text-indent: 0px;
+}
+.icon.s10 {
+  min-width: 10px;
+  height: 10px;
+}
+.icon.s10.notify {
+  background-image: url("../../../../images/icons/10/notify_off.png");
+}
+.icon.s10.gear {
+  background-image: url("../../../../images/icons/10/gear.png");
+}
+.icon.s10.add {
+  background-image: url("../../../../images/icons/10/add.png");
+}
+.icon.s10.delete {
+  background-image: url("../../../../images/icons/10/delete.png");
+}
+.icon.s10.edit {
+  background-image: url("../../../../images/icons/10/edit.png");
+}
+.icon.s10.star {
+  background-image: url("../../../../images/star_dummy.png");
+}
+.icon.s10.menu {
+  background-image: url("../../../../images/icons/10/menu.png");
+}
+.icon.s10.link {
+  background-image: url("../../../../images/icons/10/link.png");
+}
+.icon.s10.lock {
+  background-image: url("../../../../images/icons/10/lock.png");
+}
+.icon.s10.unlock {
+  background-image: url("../../../../images/icons/10/unlock.png");
+}
+.icon.s10.text {
+  padding: 2px 0px 0px 15px;
+  font-size: 10px;
+}
+.icon.s16 {
+  min-width: 16px;
+  height: 16px;
+}
+.icon.s16.notify {
+  background-image: url("../../../../images/icons/16/notify_off.png");
+}
+.icon.s16.gear {
+  background-image: url("../../../../images/icons/16/gear.png");
+}
+.icon.s16.add {
+  background-image: url("../../../../images/icons/16/add.png");
+}
+.icon.s16.delete {
+  background-image: url("../../../../images/icons/16/delete.png");
+}
+/*.icon.s16.edit {
+  background-image: url("../../../../images/icons/16/edit.png");
+}*/
+.icon.s16.star {
+  background-image: url("../../../../images/star_dummy.png");
+}
+.icon.s16.menu {
+  background-image: url("../../../../images/icons/16/menu.png");
+}
+/*.icon.s16.link {
+  background-image: url("../../../../images/icons/16/link.png");
+}*/
+.icon.s16.lock {
+  background-image: url("../../../../images/icons/16/lock.png");
+}
+.icon.s16.unlock {
+  background-image: url("../../../../images/icons/16/unlock.png");
+}
+.icon.s16.text {
+  padding: 4px 0px 0px 20px;
+  font-size: 10px;
+}
+.icon.s22 {
+  min-width: 22px;
+  height: 22px;
+}
+.icon.s22.notify {
+  background-image: url("../../../../images/icons/22/notify_off.png");
+}
+.icon.s22.gear {
+  background-image: url("../../../../images/icons/22/gear.png");
+}
+.icon.s22.add {
+  background-image: url("../../../../images/icons/22/add.png");
+}
+.icon.s22.delete {
+  background-image: url("../../../../images/icons/22/delete.png");
+}
+.icon.s22.edit {
+  background-image: url("../../../../images/icons/22/edit.png");
+}
+.icon.s22.star {
+  background-image: url("../../../../images/star_dummy.png");
+}
+.icon.s22.menu {
+  background-image: url("../../../../images/icons/22/menu.png");
+}
+.icon.s22.link {
+  background-image: url("../../../../images/icons/22/link.png");
+}
+.icon.s22.lock {
+  background-image: url("../../../../images/icons/22/lock.png");
+}
+.icon.s22.unlock {
+  background-image: url("../../../../images/icons/22/unlock.png");
+}
+.icon.s22.text {
+  padding: 10px 0px 0px 25px;
+  width: 200px;
+}
+.icon.s48 {
+  width: 48px;
+  height: 48px;
+}
+.icon.s48.notify {
+  background-image: url("../../../../images/icons/48/notify_off.png");
+}
+.icon.s48.gear {
+  background-image: url("../../../../images/icons/48/gear.png");
+}
+.icon.s48.add {
+  background-image: url("../../../../images/icons/48/add.png");
+}
+.icon.s48.delete {
+  background-image: url("../../../../images/icons/48/delete.png");
+}
+.icon.s48.edit {
+  background-image: url("../../../../images/icons/48/edit.png");
+}
+.icon.s48.star {
+  background-image: url("../../../../images/star_dummy.png");
+}
+.icon.s48.menu {
+  background-image: url("../../../../images/icons/48/menu.png");
+}
+.icon.s48.link {
+  background-image: url("../../../../images/icons/48/link.png");
+}
+.icon.s48.lock {
+  background-image: url("../../../../images/icons/48/lock.png");
+}
+.icon.s48.unlock {
+  background-image: url("../../../../images/icons/48/unlock.png");
+}
+
+#contact-edit-links ul {
+  list-style: none;
+  list-style-type: none;
+}
+
+.hide-comments-outer {
+  margin-left: 80px;
+  margin-bottom: 1px;
+  width: 484px;
+  border-bottom: 1px solid #BDCDD4;
+  background-color: #fff;
+  padding: 8px;
+}
+
+/* global */
+body {
+  font-family: 'Lato', "Helvetica Neue", Helvetica, Arial, sans-serif;
+  font-size: 12.5px;
+  background-color: #ffffff;
+  color: #2d2d2d;
+  margin: 50px auto auto;
+  display: table;
+}
+
+h4 {
+  font-size: 1.1em;
+}
+
+a {
+	color: #333333;
+	/* color: #3e3e8c; */
+	text-decoration: none;
+}
+a:hover {
+	/* color: blue; */
+	text-decoration: underline
+}
+
+.wall-item-name-link {
+/*  float: left;*/
+}
+
+.wall-item-photo {
+  width: 48px;
+  height: 48px;
+  overflow: hidden;
+  display: block;
+}
+
+.left {
+  float: left;
+}
+.right {
+  float: right;
+}
+.hidden {
+  display: none;
+}
+.clear {
+  clear: both;
+}
+.fakelink {
+  color: #996d73;
+  /* color: #3e3e8c; */
+  text-decoration: none;
+  cursor: pointer;
+}
+.fakelink:hover {
+  /* color: blue; */
+  /*color: #005c94; */
+  text-decoration: underline;
+}
+code {
+  font-family: Courier, monospace;
+  white-space: pre;
+  display: block;
+  overflow: auto;
+  border: 1px solid #444;
+  background: #EEE;
+  color: #444;
+  padding: 10px;
+  margin-top: 20px;
+}
+#panel {
+  position: absolute;
+  width: 12em;
+  background: #ffffff;
+  color: #2d2d2d;
+  margin: 0px;
+  padding: 1em;
+  list-style: none;
+  border: 3px solid #364e59;
+  z-index: 100000;
+  -webkit-box-shadow: 0px 5px 10px rgba(0, 0, 0, 0.7);
+  -moz-box-shadow: 0px 5px 10px rgba(0, 0, 0, 0.7);
+  box-shadow: 0px 5px 10px rgba(0, 0, 0, 0.7);
+}
+/* tool */
+.tool {
+  height: auto;
+  overflow: auto;
+  padding: 3px;
+}
+#saved-search-ul .tool:hover,
+#nets-sidebar .tool:hover,
+#sidebar-group-list .tool:hover ,
+#fileas-sidebar .tool:hover {
+	background: aliceBlue;
+}
+.tool .label {
+  float: left;
+}
+.tool .action {
+  float: right;
+}
+.tool a {
+  color: #996d73;
+}
+.tool a:hover {
+  text-decoration: none;
+}
+/* popup notifications */
+div.jGrowl div.notice {
+  background: #511919 url("../../../../images/icons/48/notice.png") no-repeat 5px center;
+  color: #ffffff;
+  padding-left: 58px;
+}
+div.jGrowl div.info {
+  background: #364e59 url("../../../../images/icons/48/info.png") no-repeat 5px center;
+  color: #ffffff;
+  padding-left: 58px;
+}
+/* header */
+header {
+  position: fixed;
+  left: 0%;
+  right: 80%;
+  top: 0px;
+  margin: 0px;
+  padding: 0px;
+  width: 22%;
+  height: 32px;
+  background: #FFC1CA;
+  background-color: #FFC1CA;
+  z-index: 100;
+  -webkit-box-shadow: -10px 0px 10px rgba(0, 0, 0, 0.7);
+  -moz-box-shadow: -10px 0px 10px rgba(0, 0, 0, 0.7);
+  box-shadow: -10px 0px 10px rgba(0, 0, 0, 0.7);
+
+}
+header #site-location {
+  display: none;
+}
+header #banner {
+  overflow: hidden;
+  text-align: left;
+  width: 82%%;
+  margin-left: 25%;
+}
+header #banner a,
+header #banner a:active,
+header #banner a:visited,
+header #banner a:link,
+header #banner a:hover {
+  color: black;
+  text-decoration: none;
+  outline: none;
+  vertical-align: middle;
+  font-weight: bolder;
+  margin-left: 3px;
+}
+header #banner #logo-img {
+  height: 25px;
+  margin-top: 3px;
+}
+header #banner #logo-text {
+  font-size: 20px;
+  position: absolute;
+  top: 10%;
+}
+/* nav */
+nav {
+  width: 80%;
+  height: 32px;
+  position: fixed;
+  left: 22%;
+  top: 0px;
+  padding: 0px;
+  background: #FFC1CA;
+  color: #000;
+  z-index: 99;
+  -webkit-box-shadow: -10px 0px 10px rgba(0, 0, 0, 0.7);
+  -moz-box-shadow: -10px 0px 10px rgba(0, 0, 0, 0.7);
+  box-shadow: -10px 0px 10px rgba(0, 0, 0, 0.7);
+  
+}
+nav a,
+nav a:active,
+nav a:visited,
+nav a:link,
+nav a:hover {
+  /*color: #1f1f1f;*/
+  text-decoration: none;
+  outline: none;
+}
+nav #banner {
+  overflow: hidden;
+  /*text-align: center;*/
+  width: 100%;
+}
+nav #banner a,
+nav #banner a:active,
+nav #banner a:visited,
+nav #banner a:link,
+nav #banner a:hover {
+  color: #ffffff;
+  text-decoration: none;
+  outline: none;
+  vertical-align: bottom;
+}
+nav #banner #logo-img {
+  height: 22px;
+  margin-top: 5px;
+}
+nav #banner #logo-text {
+  font-size: 22px;
+}
+nav #navbar{
+	}
+nav ul {
+  margin: 0px;
+  padding: 0px 20px;
+}
+nav ul li {
+  list-style: none;
+  margin: 0px;
+  /* padding: 1px 1px 3px 1px; */
+  float: left;
+}
+nav ul li .menu-popup {
+  left: 0px;
+  right: auto;
+}
+
+nav #logo-img {
+  height: 25px;
+  margin-top: 4px;
+  margin-left: 30px;
+}
+
+nav #logo-text {
+    font-size: 22px;
+    margin-top: 3px;
+    margin-right: 15px;
+}
+nav .nav-menu-search {
+  position: relative;
+
+  margin: 4px 17px;
+  margin-right: 0px;
+  height: 17px;
+  width: 180px;
+  
+}
+
+nav #search-box #search-text {
+  background-image:  url('icons/lupe.png');
+  background-repeat:no-repeat;
+  padding-left:20px;
+  border-top-left-radius: 15px;
+border-top-right-radius: 15px;
+border-bottom-right-radius: 15px;
+border-bottom-left-radius: 15px;
+	}
+
+
+nav .nav-menu-icon {
+  position: relative;
+  height: 22px;
+  padding: 5px;
+  margin: 0px 5px;
+  -moz-border-radius: 5px 5px 0 0;
+  -webkit-border-radius: 5px 5px 0 0;
+  border-radius: 5px 5px 0 0;
+}
+nav .nav-menu-icon:hover {
+  position: relative;
+  height: 22px;
+  padding: 5px;
+  margin: 0px 5px;
+  -moz-border-radius: 5px 5px 0 0;
+  -webkit-border-radius: 5px 5px 0 0;
+  border-radius: 5px 5px 0 0;
+}
+
+/*color*/
+nav .nav-menu-icon.selected {
+  background-color: #FFE9EC;
+}
+nav .nav-menu-icon img {
+  width: 22px;
+  height: 22px;
+}
+nav .nav-menu-icon .nav-notify {
+  top: 3px;
+}
+nav .nav-menu {
+  position: relative;
+  height: 16px;
+  padding: 5px;
+  margin: 3px 15px 0px;
+  font-size: 13px;
+  /*border: 3px solid #364A84;*/
+}
+nav .nav-menu.selected {
+  /*border-bottom: 3px solid #9eabb0;*/
+}
+nav .nav-notify {
+  display: none;
+  position: absolute;
+  background-color: #fff;
+  /* background-color: #19aeff; */
+  -moz-border-radius: 5px 5px 5px 5px;
+  -webkit-border-radius: 5px 5px 5px 5px;
+  border-radius: 5px 5px 5px 5px;
+  font-size: 10px;
+  font-weight: 900;
+  padding: 1px 4px;
+  top: 0px;
+  right: -6px;
+  min-width: 10px;
+  text-align: center;
+  border: 1px solid black;
+}
+nav .nav-notify.show {
+  display: block;
+}
+nav #nav-help-link,
+nav #nav-search-link,
+nav #nav-directory-link,
+nav #nav-apps-link,
+nav #nav-site-linkmenu, 
+nav #nav-home-link,
+nav #nav-user-linkmenu
+{
+  float: right;
+}
+nav #nav-user-linkmenu{
+	margin-right: 0px;
+	}
+nav #nav-home-link, #nav-directory-link, #nav-apps-link{
+	margin-left: 0px;
+	margin-right: 0px;
+	font-weight: bold;
+	margin: 3px 5px;
+	font-size: 14px;
+	}
+nav #nav-directory-link{
+  margin-right: 0px;	
+	}
+nav #nav-home-link{
+  margin-left: 0px;	
+	}
+nav #nav-help-link .menu-popup,
+nav #nav-search-link .menu-popup,
+nav #nav-directory-link .menu-popup,
+nav #nav-apps-link .menu-popup,
+nav #nav-site-linkmenu .menu-popup {
+  right: 0px;
+  left: auto;
+}
+
+nav #nav-messages-linkmenu.on .icon.messages, nav #nav-messages-linkmenu.selected .icon.messages{
+	background-image: url("../diabook-pink/icons/messages.png");
+	}
+	
+/*nav #nav-notifications-linkmenu.on .icon.notify,*/ nav #nav-notifications-linkmenu.selected .icon.notify{
+	background-image: url("../diabook-pink/icons/notify.png");
+	}
+	
+nav #nav-contacts-linkmenu.on .icon.contacts, nav #nav-contacts-linkmenu.selected .icon.contacts{
+	background-image: url("../diabook-pink/icons/contacts.png");
+	}
+	
+nav #nav-apps-link.selected {
+  background-color: #fff;
+  moz-border-radius: 5px 5px 0 0;
+-webkit-border-radius: 5px 5px 0 0;
+border-radius: 5px 5px 0 0;
+}
+
+#nav-notifications-mark-all {
+	/* padding: 1px 1px 2px 26px; */
+	/* border-bottom: 1px solid #364E59; */
+	/* margin: 0px 0px 2px 0px;
+	padding: 5px 10px; */
+}
+
+#nav-notifications-see-all {
+	/* padding: 1px 1px 2px 26px; */
+	/* border-bottom: 1px solid #364E59; */
+	/* margin: 0px 0px 2px 0px;
+	padding: 5px 10px; */
+}
+
+.notify-seen {
+	background: none repeat scroll 0 0 #DDDDDD;
+	}
+
+ul.menu-popup {
+  position: absolute;
+  display: none;
+  width: 11em;
+  background: #FFE9EC;
+  color: #2d2d2d;
+  margin: 0px;
+  padding: 0px;
+  list-style: none;
+  z-index: 100000;
+  -webkit-box-shadow: 0px 5px 10px rgba(0, 0, 0, 0.7);
+  -moz-box-shadow: 0px 5px 10px rgba(0, 0, 0, 0.7);
+  box-shadow: 0px 5px 10px rgba(0, 0, 0, 0.7);
+}
+ul.menu-popup a {
+  display: block;
+  color: #2d2d2d;
+  padding: 5px 10px;
+  text-decoration: none;
+}
+ul.menu-popup a:hover {
+  background-color: #996d73; /*bdcdd4;*/
+  color: #fff;
+}
+ul.menu-popup .menu-sep {
+  border-top: 1px solid #9eabb0;
+}
+ul.menu-popup li {
+  float: none;
+  overflow: auto;
+  height: auto;
+  display: block;
+}
+ul.menu-popup li img {
+  float: left;
+  width: 16px;
+  height: 16px;
+  padding-right: 5px;
+}
+ul.menu-popup .empty {
+  padding: 5px;
+  text-align: center;
+  color: #9eabb0;
+}
+/* autocomplete popup */
+.acpopup {
+  max-height: 150px;
+  background-color: #ffffff;
+  color: #2d2d2d;
+  border: 1px solid #MenuBorder;
+  overflow: auto;
+  z-index: 100000;
+  -webkit-box-shadow: 0px 5px 10px rgba(0, 0, 0, 0.7);
+  -moz-box-shadow: 0px 5px 10px rgba(0, 0, 0, 0.7);
+  box-shadow: 0px 5px 10px rgba(0, 0, 0, 0.7);
+}
+.acpopupitem {
+  color: #2d2d2d;
+  padding: 4px;
+  clear: left;
+}
+.acpopupitem img {
+  float: left;
+  margin-right: 4px;
+}
+.acpopupitem.selected {
+  background-color: #bdcdd4;
+}
+#nav-notifications-menu {
+  width: 400px;
+  max-height: 550px;
+  overflow: auto;
+}
+/* #nav-notifications-menu a {
+	display: inline;
+	padding: 5px 0px;
+	margin: 0px 0px 2px 0px;
+}
+#nav-notifications-menu li:hover {
+  background-color: #bdcdd4;
+}*/
+
+#nav-notifications-menu img {
+  float: left;
+  margin-right: 5px;
+}
+#nav-notifications-menu .contactname {
+  font-weight: bold;
+}
+#nav-notifications-menu .notif-when {
+  font-size: 10px;
+  color: #9eabb0;
+  display: block;
+}
+
+.notif-image {
+        width: 32px;
+        height: 32px;
+        padding: 7px 7px 0px 0px;
+}
+
+/*profile_side*/
+#profile_side {
+  margin-bottom: 30px;
+ 
+}
+#profile_side a{
+  color: #333;
+}
+#ps-usericon{
+	height: 25px	
+	}
+#ps-username{
+  font-size: 1.17em;
+  font-weight: bold;
+  vertical-align: top;
+  position: absolute;
+  padding-top: 4px;
+  padding-left: 5px;	
+  word-wrap: break-word;
+  width: 130px;
+	}
+#ps-username:hover{
+  text-decoration: none;	
+	}
+.menu-profile-side{
+  list-style: none;	
+  padding-left: 0px;
+  min-height: 0px;
+	}
+.menu-profile-list{
+  height: auto;
+  overflow: auto;  
+  min-height: 16px;
+  list-style: none;
+	}
+.menu-profile-list:hover{
+	background: #FFF4F6; 
+	}
+.menu-profile-list-item{
+	padding-left: 5px;
+	vertical-align: middle;
+	}	
+.menu-profile-list-item:hover{	
+	text-decoration: none;
+   }
+/*http://prothemedesign.com/circular-icons/*/
+.menu-profile-icon.home{
+	background: url("../diabook-pink/icons/home.png") no-repeat;
+	float: left;
+	height: 22px;
+	width: 22px;
+	}
+.menu-profile-icon.photos{
+	background: url("../diabook-pink/icons/mess_side.png") no-repeat;
+	float: left;
+	height: 22px;
+   width: 22px;}
+.menu-profile-icon.events{
+	background: url("../diabook-pink/icons/events.png") no-repeat;
+	float: left;
+	height: 22px;
+   width: 22px;}
+.menu-profile-icon.notes{
+	background: url("../diabook-pink/icons/notes.png") no-repeat;
+	float: left;
+	height: 22px;
+   width: 22px;}
+.menu-profile-icon.foren{
+	background: url("../diabook-pink/icons/pubgroups.png") no-repeat;
+	float: left;
+	height: 22px;
+   width: 22px;}
+.menu-profile-icon.com_side{
+	background: url("../diabook-pink/icons/com_side.png") no-repeat;
+	float: left;
+	height: 22px;
+   width: 22px;}
+.menu-profile-icon.pscontacts{
+	background: url("../diabook-pink/icons/pscontacts.png") no-repeat;
+	float: left;
+	height: 22px;
+   width: 22px;}
+
+/* aside */
+aside {
+  display: table-cell;
+  vertical-align: top;
+  width: 160px;
+  padding: 0px 10px 0px 10px;
+  border-right: 1px solid #D2D2D2;
+  float: left;
+  /* background: #F1F1F1; */
+}
+aside #page-sidebar{display: none;}
+aside .vcard .fn {
+  font-size: 18px;
+  font-weight: bold;
+  margin-bottom: 5px;
+}
+aside .vcard .title {
+  margin-bottom: 5px;
+}
+aside .vcard dl {
+  height: auto;
+  overflow: auto;
+}
+aside .vcard dt {
+  float: left;
+  margin-left: 0px;
+  /*width: 35%;*/
+  text-align: right;
+  color: #999999;
+}
+aside .vcard dd {
+  float: left;
+  margin-left: 5px;
+  /*width: 60%;*/
+}
+aside #profile-extra-links ul {
+  padding: 0px;
+  margin: 0px;
+}
+aside #profile-extra-links li {
+  padding: 0px;
+  margin: 0px;
+  list-style: none;
+}
+aside #dfrn-request-link {
+  display: block;
+  -moz-border-radius: 5px 5px 5px 5px;
+  -webkit-border-radius: 5px 5px 5px 5px;
+  border-radius: 5px 5px 5px 5px;
+  color: #ffffff;
+  background: #005c94 url('../../../../images/connect-bg.png') no-repeat left center;
+  font-weight: bold;
+  text-transform: uppercase;
+  padding: 4px 2px 2px 35px;
+}
+aside #dfrn-request-link:hover {
+  text-decoration: none;
+  background-color: #36c;
+  /* background-color: #19aeff; */
+}
+aside #profiles-menu {
+  width: 20em;
+}
+aside #search-text {
+	width: 150px;
+	height: 17px;
+	padding-left: 10px;
+	border-top-left-radius: 15px;
+border-top-right-radius: 15px;
+border-bottom-right-radius: 15px;
+border-bottom-left-radius: 15px;
+-moz-border-bottom-colors: #dbdbdb;
+  -moz-border-top-colors: #999;
+  -moz-border-left-colors: #999;
+  -moz-border-right-colors: #dbdbdb;
+}
+aside #side-follow-url {
+	width: 150px;
+	}
+aside #side-peoplefind-url {
+	width: 150px;
+	}
+#contact-block {
+  overflow: auto;
+  height: auto;
+}
+#contact-block .contact-block-h4 {
+  float: left;
+  margin: 5px 0px;
+}
+#contact-block .allcontact-link {
+  float: right;
+  margin: 5px 0px;
+}
+#contact-block .contact-block-content {
+  clear: both;
+  overflow: auto;
+  height: auto;
+}
+#contact-block .contact-block-link {
+  float: left;
+  margin: 0px 2px 2px 0px;
+}
+#contact-block .contact-block-link img {
+  widht: 55px;
+  height: 55px;
+}
+#lost-password-link {
+  float: left;
+  margin-right: 20px;	
+	}
+/* widget */
+.widget {
+  margin-bottom: 2em;
+  /*.action .s10 { width: 10px; overflow: hidden; padding: 0px;}
+	.action .s16 { width: 16px; overflow: hidden; padding: 0px;}*/
+/*  font-size: 12px; */
+}
+.widget h3 {
+  padding: 0px;
+  margin: 2px;
+}
+.widget .action {
+  opacity: 0.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;
+}
+.widget input.action {
+  opacity: 0.5;
+  -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;
+}
+.widget:hover .title .action {
+  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;
+}
+.widget .tool:hover .action {
+  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;
+}
+.widget .tool:hover .action.ticked {
+  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;
+}
+.widget ul {
+  padding: 0px;
+}
+.widget ul li {
+  padding-left: 16px;
+  min-height: 16px;
+  list-style: none;
+}
+#side-bar-photos-albums li{
+list-style-type: disc;
+}
+#side-bar-photos-albums ul li{
+  margin-left: 30px;
+  padding-left: 0px;
+	}
+#side-bar-photos-albums ul li a{
+  color: #3465A4;
+}
+.widget .tool.selected {
+  background: url("../diabook-pink/icons/selected.png") no-repeat left center;
+}
+/* widget: search */
+span.sbox_l  {
+	background: white url('../diabook/icons/srch_l.gif') no-repeat top left;
+	float: left;
+	width: 19px; height: 19px;
+	margin-left: 10px;
+	margin-top: 5px;
+	
+}
+
+span.sbox_r  {
+	background: white url('../diabook/icons/srch_r.gif') no-repeat top left;
+	float: left;
+	width: 19px; height: 19px;
+	margin-top: 5px;
+}
+
+span.sbox input {
+	background: white url('../diabook/icons/srch_bg.gif') repeat-x top left;
+	float: left;
+	margin-top: 5px;
+	border: 0;
+	height: 13px; width: 100px;
+	padding: 3px;
+	font: 11px/13px arial;
+	color: #000;
+}
+#add-search-popup {
+  width: 200px;
+  top: 18px;
+}
+/* section */
+section {
+  display: table-cell;
+  vertical-align: top;
+  width: auto;
+  padding: 0px 0px 0px 12px;
+}
+
+body .pageheader{
+  text-align: center;
+  font-size: 20px;
+  margin-bottom: 20px;
+  margin-top: 0px;
+  max-width: 575px;
+	}
+.qcomment{
+  max-width: 122px;	
+	}
+#id_username {
+  width: 173px;	
+	}
+#id_password {
+  width: 173px;		
+	}
+#id_openid_url {
+  width: 173px;	
+	}
+#contact-edit-end {
+	}
+.pager {
+   padding: 10px;
+	text-align: center;
+	font-size: 1.0em;
+	clear: both;
+	display: block;
+}	
+
+.tabs {
+    
+    background-position: 0 -20px;
+    background-repeat: repeat-x;
+    height: 27px;
+    padding: 0;
+ }
+.tab.button {
+    margin-left: 5px;	
+    /*background: none repeat scroll 0 0 #F8F8F8;*/
+    border: 1px solid #CCCCCC;
+    border-radius: 3px 3px 3px 3px;
+    font-weight: normal;
+    padding: 3px;
+    color:  #333333;
+	}
+	
+#birthday-notice, #event-notice, #birthday-wrapper, #event-wrapper{
+	margin-bottom: 10px;
+	}
+#birthday-wrapper a {
+	color: #3465A4;
+	}
+
+right_aside {
+  display: table-cell;
+  vertical-align: top;
+  width: 170px;
+  
+  /*border-left: 1px solid #D2D2D2;*/
+  
+  /* background: #F1F1F1; */
+}
+right_aside a{color: #3465A4;}
+right_aside h3 {border-bottom: 1px solid #D2D2D2; padding-top: 5px; padding-bottom: 0px; padding-left: 9px; margin-bottom: 0px; 
+margin-top:30px;}
+right_aside .directory-item {	width: 50px; height: 50px; vertical-align: center; text-align: center; }
+right_aside .directory-photo { margin: 0px; }
+right_aside .directory-photo-img { max-width: 45px; max-height: 45px; }
+right_aside #likes { margin: 0px; padding: 0px; list-style: none; }
+right_aside .items-wrapper{ overflow: auto;	width: 100%; }
+right_aside #lastusers-wrapper { padding-left: 6px; padding-top: 3px; overflow: auto;	width: 100%; }
+right_aside #ra-photos-wrapper { padding-left: 5px; padding-top: 3px; overflow: auto;	width: 100%; }
+#page-sidebar-right_aside{margin-top: 0px; margin-bottom: 30px;}
+#page-sidebar-right_aside ul {margin-top: 0px;}
+#page-sidebar-right_aside .label {max-width: 128px;}
+right_aside .icon {width: 10px; height: 10px;}
+.close_box		{ 
+		background-image: url("../diabook-pink/icons/close_box.png");
+		float: right;
+		cursor: pointer;
+		opacity: 0.1;
+		}
+.close_box:hover	{ 
+		background-image: url("../diabook-pink/icons/close_box.png");
+		float: right;
+		cursor: pointer;
+		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;
+		}
+
+
+/* wall item */
+.tread-wrapper {
+  border-bottom: 1px solid #D2D2D2;
+  position: relative;
+  padding: 5px;
+  margin-bottom: 0px;
+  width: 575px;
+  padding-top: 10px;
+}
+.tread-wrapper a{
+  color: #996d73;
+}
+
+.wall-item-decor {
+  position: absolute;
+  left: 790px;
+  top: -10px;
+  width: 16px;
+}
+
+.wall-item-container {
+  display: table;
+  width: 580px;
+}
+
+
+.wall-item-container .wall-item-item, .wall-item-container .wall-item-bottom {
+  display: table-row;
+}
+
+.wall-item-bottom {
+  font-size: 13px;
+}
+.wall-item-container .wall-item-bottom {
+/*  opacity: 0.5;
+  -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; */
+}
+.wall-item-container:hover .wall-item-bottom {
+/*  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; */
+}
+.wall-item-container .wall-item-info {
+  display: table-cell;
+  vertical-align: top;
+  text-align: left;
+  width: 80px;
+}
+.wall-item-container .wall-item-location {
+  padding-right: 40px;
+  display: table-cell;
+}
+.wall-item-container .wall-item-ago {
+  word-wrap: break-word;
+  width: 50px;
+  margin-left: 10px;
+  color: #999;
+}
+.wall-item-location {
+  
+  clear: both;
+  overflow: hidden;
+  
+  margin-bottom: 5px;
+}
+
+.wall-item-container .wall-item-content {
+
+  max-width: 420px;
+  word-wrap: break-word;
+
+
+}
+
+.wall-item-container .wall-item-content img {
+  max-width: 400px; 
+
+}
+.wall-item-container .wall-item-links, .wall-item-container .wall-item-actions {
+  display: table-cell;
+  vertical-align: middle;
+}
+.wall-item-container .wall-item-links .icon, .wall-item-container .wall-item-actions .icon {
+  opacity: 0.5;
+  -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;
+}
+.wall-item-container .wall-item-links .icon:hover, .wall-item-container .wall-item-actions .icon: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;
+}
+.wall-item-container .wall-item-name {
+  font-weight: bold;
+}
+.wall-item-container .wall-item-actions-author {
+  width: 100%;
+  margin-bottom: 0.3em;
+}
+.wall-item-container .wall-item-actions-social {
+  float: left;
+  margin-bottom: 1px;
+  display: table-cell;
+}
+.wall-item-container .wall-item-actions-social a {
+  margin-right: 1em;
+}
+.wall-item-actions-social a {
+  float: left;
+}
+.wall-item-container .wall-item-actions-tools {
+  float: right;
+  width: 80px;
+  display: table-cell;
+}
+.wall-item-container .wall-item-actions-tools a {
+  float: right;
+}
+.wall-item-container .wall-item-actions-tools input {
+  float: right;
+}
+.wall-item-container.comment {
+  margin-top: 5px;
+  margin-bottom: 5px;
+  margin-left: 80px;
+  width: 500px;
+  border-bottom: 1px solid hsl(198, 21%, 79%);
+}
+.wall-item-container.comment .contact-photo {
+  width: 32px;
+  height: 32px;
+  margin-left: 16px;
+  /*background: url(../../../../images/icons/22/user.png) no-repeat center center;*/
+
+}
+.wall-item-container.comment {
+  top: 15px !important;
+  left: 15px !important;
+}
+.wall-item-container.comment .wall-item-links {
+  padding-left: 12px;
+}
+
+.wall-item-comment-wrapper {
+  margin: 1px 5px 5px 80px;
+  background-color: #fff;
+  width: 500px;
+}
+.wall-item-comment-wrapper .comment-edit-photo {
+  display: none;
+}
+.wall-item-comment-wrapper textarea {
+  height: 2.0em;
+  width: 100%;
+  font-size: 10px;
+  color: #999999;
+  border: 1px solid #DDD;
+  padding: 0.3em;
+  font-size: 14px;
+}
+.wall-item-comment-wrapper .comment-edit-text-full {
+  font-size: 14px;
+  height: 4em;
+  color: #2d2d2d;
+  border: 1px solid #2d2d2d;
+}
+.comment-edit-preview {
+  width: 500px;
+  margin-top: 10px;
+  background-color:  #fff797;
+}
+.comment-edit-preview .contact-photo {
+  width: 32px;
+  height: 32px;
+  margin-left: 16px;
+  /*background: url(../../../../images/icons/22/user.png) no-repeat center center;*/
+
+}
+.comment-edit-preview {
+  top: 15px !important;
+  left: 15px !important;
+}
+.comment-edit-preview .wall-item-links {
+  padding-left: 12px;
+}
+.comment-edit-preview .wall-item-container {
+  width: 700px;
+}
+.comment-edit-preview .tread-wrapper {
+  width: 700px;
+  padding: 0;
+  margin: 10px 0;
+}
+
+.shiny {
+  /* border-right: 10px solid #fce94f; */
+	border-right: 1px solid #A7C7F7;
+	padding-right: 12px;
+}
+
+#jot-preview-content{
+	margin-top: 30px;}
+	
+#jot-preview-content .tread-wrapper {
+  background-color: #fff797;
+}
+
+.wall-item-tags {
+  padding-top: 1px;
+  padding-bottom: 2px;
+}
+.tag {
+  /*background: url("../../../../images/tag_b.png") repeat-x center left;*/
+  color: #999;
+  padding-left: 3px;
+  font-size: 12px;
+}
+.tag a {
+  padding-right: 5px;
+  /*background: url("../../../../images/tag.png") no-repeat center right;*/
+  color: #999;
+}
+.wwto {
+  position: absolute !important;
+  width: 25px;
+  height: 25px;
+  background: #FFFFFF;
+  border: 2px solid #364e59;
+  height: 25px;
+  width: 25px;
+  overflow: hidden;
+  padding: 1px;
+  position: absolute !important;
+  top: 40px;
+  left: 30px;
+  -webkit-box-shadow: 0px 0px 10px rgba(0, 0, 0, 0.7);
+  -moz-box-shadow: 0px 0px 10px rgba(0, 0, 0, 0.7);
+  box-shadow: 0px 0px 10px rgba(0, 0, 0, 0.7);
+}
+.wwto .contact-photo {
+  width: auto;
+  height: 25px;
+}
+/* contacts menu */
+.contact-photo-wrapper {
+  position: relative;
+  width: 80px;
+}
+
+.contact-photo-wrapper.wwto {
+  width: 25px;
+}
+
+.contact-photo {
+  width: 48px;
+  height: 48px;
+  overflow: hidden;
+  display: block;
+}
+.contact-photo img {
+  width: 48px;
+  height: 48px;
+}
+
+.contact-wrapper {
+  float: left;
+  width: 90px;
+  height: 90px;
+  margin-bottom: 15px;
+}
+.contact-wrapper .contact-photo {
+  width: 80px;
+  height: 80px;
+}
+.contact-wrapper .contact-photo img {
+  width: 80px;
+  height: 80px;
+}
+.contact-wrapper {
+  left: 0px;
+  top: 63px;
+}
+.contact-photo {
+  width: 48px;
+  height: 48px;
+}
+.contact-photo img {
+  width: 48px;
+  height: 48px;
+}
+.contact-name {
+  /* text-align: center; */
+  /*font-weight: bold;*/
+  font-size: 12px;
+}
+.contact-details {
+  color: #999999;
+}
+/* editor */
+.jothidden {
+  display: none;
+}
+#jot {
+  width: 585px;
+  margin: 0px 2em 20px 0px;
+}
+#profile-jot-form #profile-jot-text {
+  height: 2.0em;
+  width: 99%;
+  font-size: 15px;
+  color: #999999;
+  border: 1px solid #DDD;
+  padding: 0.3em;
+  margin-bottom: 10px;
+}
+.grey
+{
+  display: inline;
+  float: right;	
+	}
+#jot #jot-tools {
+  margin: 0px;
+  padding: 0px;
+  height: 40px;
+  overflow: none;
+  width: 583px;
+  background-color: #fff;
+  border-bottom: 2px solid #9eabb0;
+}
+
+#jot #jot-tools li {
+  list-style: none;
+  float: left;
+  width: 80px;
+  height: 40px;
+  border-bottom: 2px solid #9eabb0;
+}
+#jot #jot-tools li a {
+  display: block;
+  color: #cccccc;
+  width: 100%;
+  height: 40px;
+  text-align: center;
+  line-height: 40px;
+  overflow: hidden;
+}
+#jot #jot-tools li:hover {
+  background-color: #364e59;
+  border-bottom: 2px solid #bdcdd4;
+}
+#jot #jot-tools li.perms {
+  float: right;
+  width: 40px;
+}
+#jot #jot-tools li.perms a.unlock {
+  width: 30px;
+  border-left: 10px solid #cccccc;
+  background-color: #cccccc;
+  background-position: left center;
+}
+#jot #jot-tools li.perms a.lock {
+  width: 30px;
+  border-left: 10px solid #666666;
+  background-color: #666666;
+}
+#jot #jot-tools li.submit {
+  float: right;
+  background-color: #cccccc;
+  border-bottom: 2px solid #cccccc;
+  border-right: 1px solid #666666;
+  border-left: 1px solid #666666;
+}
+#jot #jot-tools li.submit input {
+  border: 0px;
+  margin: 0px;
+  padding: 0px;
+  background-color: #cccccc;
+  color: #666666;
+  width: 80px;
+  height: 40px;
+  line-height: 40px;
+}
+#jot #jot-tools li.submit input:hover {
+  background-color: #bdcdd4;
+  color: #666666;
+}
+#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;
+}
+#profile-jot-form #jot-title {
+    
+  	 border-radius: 5px 5px 5px 5px;
+    font-weight: bold;
+    height: 20px;
+    margin: 0 0 5px;
+    width: 60%;
+    border: 1px solid #d2d2d2;
+}
+#profile-jot-form #jot-title:-webkit-input-placeholder {
+  font-weight: normal;
+}
+#profile-jot-form #jot-title:-moz-placeholder {
+  font-weight: normal;
+}
+#profile-jot-form #profile-jot-text_parent #profile-jot-text_tbl{
+	width: 585px;
+	height: 100px;
+	}
+#jot #jot-title:hover {
+  border: 1px solid #999999;
+}
+#jot #jot-title:focus {
+  border: 1px solid #999999;
+}
+#jot #character-counter {
+  width: 80px;
+  float: right;
+  text-align: right;
+  height: 20px;
+  line-height: 20px;
+  padding-right: 20px;
+}
+#jot-perms-icon, 
+#profile-location,
+#profile-nolocation,
+#profile-youtube, 
+#profile-video, 
+#profile-audio,
+#profile-link,
+#profile-title, 
+#wall-image-upload,
+#wall-file-upload,
+#wall-image-upload-div,
+#wall-file-upload-div,
+.hover, .focus {
+	cursor: pointer;
+	margin-top: 2px;
+}
+#profile-jot-wrapper{
+	margin: 0 2em 20px 0;
+   width: 585px;
+	}
+
+#profile-jot-submit-wrapper {
+	margin-bottom: 50px;
+	width: 585px;
+}
+
+#profile-jot-submit {
+	float: right;
+	margin-top: 2px;
+	font-size: 14px;
+	
+}
+#profile-upload-wrapper {
+	float: left;
+	margin-top: 2px;
+	margin-left: 10px;
+	
+}
+#profile-attach-wrapper {
+	float: left;
+	margin-left: 15px;
+	margin-top: 2px;
+}
+#profile-rotator {
+	float: left;
+	margin-left: 30px;
+	margin-top: 2px;
+}
+#profile-link-wrapper {
+	float: left;
+	margin-left: 15px;
+	margin-top: 2px;
+}
+#profile-youtube-wrapper {
+	float: left;
+	margin-left: 15px;
+	margin-top: 2px;
+}
+#profile-video-wrapper {
+	float: left;
+	margin-left: 15px;
+	margin-top: 2px;
+}
+#profile-audio-wrapper {
+	float: left;
+	margin-left: 15px;
+	margin-top: 2px;
+}
+#profile-location-wrapper {
+	float: left;
+	margin-left: 15px;
+	margin-top: 2px;
+}
+#profile-jot-perms {
+	float: left;
+	margin-left: 45px;
+	margin-top: 2px;
+}
+#jot-preview-link {
+	float: right;
+	margin-left: 10px;
+	margin-top: 2px;
+	font-size: 9px;
+	font-weight: bolder;
+	cursor: pointer;
+}
+#profile-jot-perms{
+   float: right;
+	margin-left: 10px;
+	margin-top: 2px;	
+	}
+/** buttons **/
+.button.creation1 {
+    background-color: #fff;
+    border: 1px solid #777777;
+    border-radius: 3px 3px 3px 3px;
+    box-shadow: 0 1px 1px #CFCFCF;
+    cursor: pointer;
+    font-weight: bolder;
+}
+.button.creation2 {
+    background-color: #996d73;
+    border: 1px solid #777777;
+    color: white;
+    border-radius: 3px 3px 3px 3px;
+    box-shadow: 0 1px 1px #CFCFCF;
+    margin-left: 5px;
+    cursor: pointer;
+    font-weight: bolder;
+}
+/*input[type="submit"] {
+	border: 0px;
+    background-color: @ButtonBackgroundColor;
+    color: @ButtonColor;
+    padding: 0px 10px;
+	.rounded(5px);
+    height: 18px;
+}*/
+/** acl **/
+#photo-edit-perms-select, #photos-upload-permissions-wrapper, #profile-jot-acl-wrapper {
+  display: block!important;
+}
+#acl-wrapper {
+  width: 690px;
+  float: left;
+}
+#acl-search {
+  float: right;
+  background: #ffffff url("../../../../images/search_18.png") no-repeat right center;
+  padding-right: 20px;
+}
+#acl-showall {
+  float: left;
+  display: block;
+  width: auto;
+  height: 18px;
+  background-color: #cccccc;
+  background-image: url("../../../../images/show_all_off.png");
+  background-position: 7px 7px;
+  background-repeat: no-repeat;
+  padding: 7px 5px 0px 30px;
+  color: #999999;
+  -moz-border-radius: 5px 5px 5px 5px;
+  -webkit-border-radius: 5px 5px 5px 5px;
+  border-radius: 5px 5px 5px 5px;
+}
+#acl-showall.selected {
+  color: #000000;
+  background-color: #ff9900;
+  background-image: url("../../../../images/show_all_on.png");
+}
+#acl-list {
+  height: 210px;
+  border: 1px solid #cccccc;
+  clear: both;
+  margin-top: 30px;
+  overflow: auto;
+}
+.acl-list-item {
+  display: block;
+  width: 150px;
+  height: 30px;
+  border: 1px solid #cccccc;
+  margin: 5px;
+  float: left;
+}
+.acl-list-item img {
+  width: 22px;
+  height: 22px;
+  float: left;
+  margin: 4px;
+}
+.acl-list-item p {
+  height: 12px;
+  font-size: 10px;
+  margin: 0px;
+  padding: 2px 0px 1px;
+  overflow: hidden;
+}
+.acl-list-item a {
+  font-size: 8px;
+  display: block;
+  width: 40px;
+  height: 10px;
+  float: left;
+  color: #999999;
+  background-color: #cccccc;
+  background-position: 3px 3px;
+  background-repeat: no-repeat;
+  margin-right: 5px;
+  -webkit-border-radius: 2px ;
+  -moz-border-radius: 2px;
+  border-radius: 2px;
+  padding-left: 15px;
+}
+#acl-wrapper a:hover {
+  text-decoration: none;
+  color: #000000;
+}
+.acl-button-show {
+  background-image: url("../../../../images/show_off.png");
+}
+.acl-button-hide {
+  background-image: url("../../../../images/hide_off.png");
+}
+.acl-button-show.selected {
+  color: #000000;
+  background-color: #9ade00;
+  background-image: url("../../../../images/show_on.png");
+}
+.acl-button-hide.selected {
+  color: #000000;
+  background-color: #ff4141;
+  background-image: url("../../../../images/hide_on.png");
+}
+.acl-list-item.groupshow {
+  border-color: #9ade00;
+}
+.acl-list-item.grouphide {
+  border-color: #ff4141;
+}
+/** /acl **/
+/** tab buttons 14618a**/
+ul.tabs {
+  list-style-type: none;
+  padding-bottom: 10px;
+  font-size: 13px;
+}
+ul.tabs li {
+  float: left;
+  margin-left: 5px;
+}
+ul.tabs li .active {
+    background-color: #996d73;
+    border: 1px solid #777777;
+    color: white;
+    border-radius: 3px 3px 3px 3px;
+    box-shadow: 2px 2px 2px #CFCFCF;
+    margin-left: 5px;
+}
+/**
+ * Form fields
+ */
+.field {
+  margin-bottom: 10px;
+  padding-bottom: 10px;
+  overflow: auto;
+  width: 100%;
+}
+.field label {
+  float: left;
+  width: 200px;
+}
+.field input, .field textarea {
+  width: 400px;
+}
+.field textarea {
+  height: 100px;
+}
+.field .field_help {
+  display: block;
+  margin-left: 200px;
+  color: #666666;
+}
+.field .onoff {
+  float: left;
+  width: 80px;
+}
+.field .onoff a {
+  display: block;
+  border: 1px solid #666666;
+  background-image: url("../../../../images/onoff.jpg");
+  background-repeat: no-repeat;
+  padding: 4px 2px 2px 2px;
+  height: 16px;
+  text-decoration: none;
+}
+.field .onoff .off {
+  border-color: #666666;
+  padding-left: 40px;
+  background-position: left center;
+  background-color: #cccccc;
+  color: #666666;
+  text-align: right;
+}
+.field .onoff .on {
+  border-color: #204A87;
+  padding-right: 40px;
+  background-position: right center;
+  background-color: #D7E3F1;
+  color: #204A87;
+  text-align: left;
+}
+.field .hidden {
+  display: none!important;
+}
+.field.radio .field_help {
+  margin-left: 0px;
+}
+#directory-search-form{
+	margin-bottom: 50px;
+	}
+#profile-edit-links-end {
+        clear: both;
+        margin-bottom: 15px;
+}
+
+#profile-edit-links ul { margin: 20px; padding-bottom: 20px; list-style: none; }
+
+#profile-edit-links li {
+  float: left;
+  list-style: none;
+  margin-left: 10px;
+}
+
+.profile-edit-side-div {
+  display: none;
+}
+
+#register-form label,
+#profile-edit-form label {
+        width: 300px; float: left;
+}
+
+.required {
+  display: inline;
+  color: #B20202;
+}
+
+/* oauth */
+.oauthapp {
+  height: auto;
+  overflow: auto;
+  border-bottom: 2px solid #cccccc;
+  padding-bottom: 1em;
+  margin-bottom: 1em;
+}
+.oauthapp img {
+  float: left;
+  width: 48px;
+  height: 48px;
+  margin: 10px;
+}
+.oauthapp img.noicon {
+  background-image: url("../../../../images/icons/48/plugin.png");
+  background-position: center center;
+  background-repeat: no-repeat;
+}
+.oauthapp a {
+  float: left;
+}
+/* contacts */
+.contact-entry-wrapper {
+  width: 120px;
+  height: 120px;
+  float: left;
+}
+/* photo */
+.photo {
+box-shadow: 2px 2px 5px 0px #000000;
+margin: 0px;
+border-radius: 10px;
+height: 145px !important;
+width: 145px !important;
+}
+.lframe {
+  float: left;
+  /*margin: 0px 10px 10px 0px;*/
+}
+/* profile match wrapper */
+.profile-match-wrapper {
+  float: left;
+  width: 90px;
+  height: 90px;
+  margin-bottom: 20px;
+}
+.profile-match-wrapper .contact-photo {
+  width: 80px;
+  height: 80px;
+}
+.profile-match-wrapper .contact-photo img {
+  width: 80px;
+  height: 80px;
+}
+.profile-match-wrapper {
+  left: 0px;
+  top: 63px;
+}
+
+.contact-photo-menu-button {
+        position: relative;
+        background-image: url("../../../../images/icons/16/menu.png");
+        background-position: top left; 
+        background-repeat: no-repeat;
+        margin: 0px 0px -16px 0px; 
+	padding: 0px;
+        width: 16px;
+        height: 16px;
+        top: -16px; left:0px;
+        overflow: hidden;
+        text-indent: 40px;
+        display: none;
+        
+}
+.contact-photo-menu {
+        width: 11em;
+        border: 3px solid #364e59;
+	color: #2d2d2d;
+        background: #FFFFFF;
+/*        position: absolute;*/
+        position: relative;
+        left: 0px; top: 0px;
+        display: none;
+        z-index: 10000;
+}
+.contact-photo-menu ul { margin:0px; padding: 0px; list-style: none }
+.contact-photo-menu li a {
+	display: block; 
+	padding: 5px 10px; 
+	color: #2d2d2d;
+	text-decoration: none;
+}
+.contact-photo-menu li a:hover {
+	background-color: #bdcdd4; 
+}
+
+/* page footer */
+footer {
+  height: 100px;
+  display: table-row;
+}
+
+blockquote {
+    border-left: 1px solid #D2D2D2;
+    padding-left: 9px;
+    margin: 0 0 0 .8ex;
+	 color: #777;
+}
+.oembed {
+	
+	font-weight: bold;
+}
+.aprofile dt{
+box-shadow: 1px 1px 5px 0;
+    color: #666666;
+    margin: 15px 0 5px;
+    padding-left: 5px;	
+	}
+/* ================== */
+/* = Contacts Block = */
+/* ================== */
+
+.contact-block-img {
+        width: 55px;
+        height: 55px;
+        padding-right: 3px;
+}
+.contact-block-div {
+        float: left;
+}
+
+.contact-block-textdiv { width: 150px; height: 34px; float: left; }
+#contact-block-end { clear: both; } 
+
+#group-edit-wrapper {
+        margin-bottom: 10px;
+}
+
+#group-members-end {
+        clear: both;
+}
+#group-edit-desc {
+ margin-top: 15px;
+}
+
+/*
+#group-separator,
+#prof-separator { display: none;}
+*/
+#prof-members-end{
+	clear: both;
+	}
+
+#prvmail-to-label, #prvmail-subject-label, #prvmail-message-label {
+	margin-bottom: 10px;
+	margin-top: 20px;
+}
+
+#prvmail-submit {
+	float: right;
+	margin-top: 10px;
+}
+
+#prvmail-subject
+{
+background: none repeat scroll 0 0 #FFFFFF;
+border: 1px solid #CCCCCC;
+border-radius: 5px 5px 5px 5px;
+font-weight: bold;
+height: 20px;
+margin: 0 0 5px;
+vertical-align: middle;
+}
+#prvmail-form{
+ width: 597px;	
+	}
+	
+#prvmail-upload-wrapper,
+#prvmail-link-wrapper,
+#prvmail-rotator-wrapper {
+	float: left;
+	margin-top: 10px;
+	margin-right: 10px;
+	width: 24px;
+}
+
+#prvmail-end {
+	clear: both;
+}
+
+.mail-list-sender,
+.mail-list-detail {
+	float: left;
+}
+.mail-list-detail {
+	margin-left: 20px;
+}
+
+.mail-list-subject {
+	font-size: 1.1em;
+	margin-top: 10px;
+}
+a.mail-list-link {
+    display: block;
+    font-size: 1.3em;
+    padding: 4px 0;
+}
+
+/*
+*a.mail-list-link:hover {
+*	background-color: #15607B;
+*	color: #F5F6FB;
+*}
+*/
+
+.mail-list-outside-wrapper-end {
+	clear: both;
+}
+
+.mail-list-outside-wrapper {
+	margin-top: 30px;
+}
+
+.mail-list-delete-wrapper {
+	float: right;
+	margin-right: 30px;
+	margin-top: 15px;
+}
+
+.mail-list-delete-icon {
+	border: none;
+}
+
+.mail-conv-sender,
+.mail-conv-detail {
+	float: left;
+}
+.mail-conv-detail {
+	margin-left: 20px;
+	width: 500px;
+}
+
+.mail-conv-subject {
+    font-size: 1.4em;
+    margin: 10px 0;
+}
+
+.mail-conv-outside-wrapper-end {
+	clear: both;
+}
+
+.mail-conv-outside-wrapper {
+	margin-top: 30px;
+}
+
+.mail-conv-delete-wrapper {
+	float: right;
+	margin-right: 30px;
+	margin-top: 15px;
+}
+.mail-conv-break {
+	clear: both;
+}
+
+.mail-conv-delete-icon {
+	border: none;
+}
+
+/* ========== */
+/* = Events = */
+/* ========== */
+.eventcal {
+        float: left;
+        font-size: 20px;
+}
+
+.vevent {
+
+}
+.vevent .event-description, .vevent .event-location {
+        margin-left: 10px;
+        margin-right: 10px;
+}
+.vevent .event-start {
+        margin-left: 10px;
+        margin-right: 10px;
+}
+
+#new-event-link {
+        margin-bottom: 10px;
+}
+
+.edit-event-link, .plink-event-link {
+        float: left;
+        margin-top: 4px;
+        margin-right: 4px;
+        margin-bottom: 15px;
+}
+
+.event-description:before {
+        content: url('../../../../images/calendar.png');
+        margin-right: 15px;
+}
+
+.event-start, .event-end {
+        margin-left: 10px;
+        width: 330px;
+        clear: both;
+}
+
+.event-start .dtstart, .event-end .dtend {
+        float: right;
+}
+
+.event-list-date {
+        margin-bottom: 10px;
+}
+
+.prevcal, .nextcal {
+        float: left;
+        margin-left: 32px;
+        margin-right: 32px;
+        margin-top: 64px;
+}
+.event-calendar-end {
+        clear: both;
+}
+
+ 
+.calendar {
+        font-family: Courier, monospace;
+}
+.calendar.eventcal a {
+  color: #3465A4;	
+	}
+.today {
+        font-weight: bold;
+        color: #FF0000;
+}
+
+.settings-block {
+        border: 1px solid #AAA;
+        margin: 10px;
+        padding: 10px;
+}
+
+.app-title {
+        margin: 10px;
+}
+
+#identity-manage-desc {
+        margin-top:15px;
+        margin-bottom: 15px;
+}
+
+#identity-manage-choose {
+        margin-bottom: 15px;
+}
+
+#identity-submit {
+        margin-top: 20px;
+}
+
+#photo-prev-link, #photo-next-link {
+        padding: 10px;
+        float: left;
+}
+.lightbox{
+	float: left;
+	}
+
+#photo-photo {
+        float: left;
+}
+#photo-like-div .wall-item-like-buttons {
+	 float: left;
+    margin-right: 5px;
+    margin-top: 30px;
+	}
+.comment-edit-text-empty {
+    margin: 10px 0 0;
+    width: 85%;
+}
+.comment-edit-photo {
+    margin: 10px 0 0;
+}
+.wall-item-like-buttons .icon.like {
+float: left;
+}
+
+#photo-photo-end {
+        clear: both;
+}
+
+.tabs .comment-wwedit-wrapper {
+	display: block;
+   margin-top: 30px;
+   margin-left: 50px;
+	}
+
+.profile-match-photo {
+        float: left;
+        text-align: center;
+        width: 120px;
+}
+
+.profile-match-name {
+        float: left;
+        text-align: center;
+        width: 120px;
+        overflow: hidden;
+}
+
+.profile-match-break,
+.profile-match-end {
+        clear: both;
+}
+
+.profile-match-connect {
+        text-align: center;
+        font-weight: bold;
+}
+
+.profile-match-wrapper {
+        float: left;
+        padding: 10px;
+        width: 120px;
+        height: 120px;
+        scroll: auto;
+}
+#profile-match-wrapper-end {
+        clear: both;
+}
+
+/* ============= */
+/* = Directory = */
+/* ============= */
+/* contacts menu */
+.contact-photo-wrapper {
+  position: relative;
+}
+.contact-photo {
+  width: 48px;
+  height: 48px;
+  overflow: hidden;
+  display: block;
+}
+.contact-photo img {
+  width: 48px;
+  height: 48px;
+}
+.contact-photo-menu-button {
+  display: none;
+  /* position: absolute; */
+  /* position: absolute; */
+  left: 0px;
+  top: -16px;
+}
+.contact-wrapper {
+  float: left;
+  width: 90px;
+  height: 90px;
+  margin-bottom: 15px;
+}
+.contact-wrapper .contact-photo {
+  width: 80px;
+  height: 80px;
+}
+.contact-wrapper .contact-photo img {
+  width: 80px;
+  height: 80px;
+}
+.contact-wrapper .contact-photo-menu-button {
+  left: 0px;
+  top: 63px;
+}
+.directory-item {
+  float: left;
+  width: 200px;
+  height: 200px;
+}
+.directory-item .contact-photo {
+  width: 175px;
+  height: 175px;
+}
+.directory-item .contact-photo img {
+  width: 175px;
+  height: 175px;
+}
+.contact-name {
+  text-align: left;
+  font-weight: bold;
+  font-size: 12px;
+}
+.contact-details {
+  color: #999999;
+}
+#side-bar-photos-albums li{
+list-style-type: disc;
+}
+#side-bar-photos-albums ul li{
+  margin-left: 30px;
+  padding-left: 0px;
+	}
+#side-bar-photos-albums{
+	margin-top: 15px;	
+	}
+.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-album-image-wrapper, .photo-top-image-wrapper {
+  float: left;
+   -moz-box-shadow: 0 0 5px #888;
+   -webkit-box-shadow: 0 0 5px #888;
+   box-shadow: 0 0 5px #888;
+  background-color: #000;
+   -webkit-border-radius: 5px;
+   -moz-border-radius: 5px;
+  border-radius: 5px;
+  padding-bottom: 20px;
+  position: relative;
+  margin: 0 10px 10px 0;
+  width: 200px; height: 140px;
+  overflow: hidden;  
+}
+.photo-top-album-name {
+        width: 100%;
+        position: absolute; 
+        bottom: 0px; 
+        padding-left: 3px;
+        background-color: #EEE;
+}
+.photo-top-album-link{
+  color: #3465A4;
+	}
+.photo-top-album-img{
+	
+	}
+/*.photo-top-image-wrapper {
+        position: relative;
+        float: left;
+        margin-top: 15px;
+        margin-right: 15px;
+        width: 200px; height: 200px; 
+        overflow: hidden; 
+}
+.photo-top-album-name {
+        width: 100%;
+        min-height: 2em;
+        position: absolute; 
+        bottom: 0px; 
+        padding: 0px 3px;
+        padding-top: 0.5em;
+        background-color: rgb(255, 255, 255);
+}*/
+#photo-top-end {
+        clear: both;
+}
+
+#photo-top-links {
+        margin-bottom: 30px;
+        margin-left: 30px;
+}
+
+#photos-upload-newalbum-div {
+        float: left;
+        width: 175px;
+}
+
diff --git a/view/theme/diabook/diabook-pink/style-profile-wide.css b/view/theme/diabook/diabook-pink/style-profile-wide.css
new file mode 100644
index 000000000..080551896
--- /dev/null
+++ b/view/theme/diabook/diabook-pink/style-profile-wide.css
@@ -0,0 +1,2615 @@
+/**
+ * Fabio Comuni <http://kirgroup.com/profile/fabrixxm>
+ * Additional Changes: Michael Vogel <icarus@dabo.de>
+ **/
+
+/* ========= */
+/* = Admin = */
+/* ========= */
+
+#adminpage {
+/*        width: 80%;*/
+}
+
+#pending-update {
+        float:right;
+        color: #ffffff;
+        font-weight: bold;
+        background-color: #FF0000;
+        padding: 0em 0.3em;
+}
+
+.admin.linklist {
+        border: 0px; padding: 0px;
+}
+
+.admin.link {
+        list-style-position: inside;
+        font-size: 1em;
+        padding: 5px;
+        width: 100px;
+        margin: 5px;
+}
+
+#adminpage dl {
+        clear: left;
+        margin-bottom: 2px;
+        padding-bottom: 2px;
+        border-bottom: 1px solid black;
+}
+
+#adminpage dt {
+        width: 200px;
+        float: left;
+        font-weight: bold;
+}
+
+#adminpage dd {
+        margin-left: 200px;
+}
+#adminpage h3 {
+        border-bottom: 1px solid #898989;
+        margin-bottom: 5px;
+        margin-top: 10px;
+}
+
+#adminpage .submit {
+        clear:left;
+}
+
+#adminpage #pluginslist {
+        margin: 0px; padding: 0px;
+}
+
+#adminpage .plugin {
+        list-style: none;
+        display: block;
+	/* border: 1px solid #888888; */
+        padding: 1em;
+        margin-bottom: 5px;
+        clear: left;
+}
+
+#adminpage .toggleplugin {
+        float:left;
+        margin-right: 1em;
+}
+
+#adminpage table {width:100%; border-bottom: 1p solid #000000; margin: 5px 0px;}
+#adminpage table th { text-align: left;}
+#adminpage td .icon { float: left;}
+#adminpage table#users img { width: 16px; height: 16px; }
+#adminpage table tr:hover { background-color: #eeeeee; }
+#adminpage .selectall { text-align: right; }
+/* icons */
+
+.icon.contacts {
+  background-image: url("../diabook-pink/icons/contacts.png");}
+.icon.notifications {
+  background-image: url("../diabook-pink/icons/notifications.png");}
+.icon.notify {
+  background-image: url("../diabook-pink/icons/notify.png");}
+.icon.messages {
+  background-image: url("../diabook-pink/icons/messages.png");}
+.icon.community {
+  background-image: url("../diabook-pink/icons/community.png");}
+  
+.icon.drop 	{ background-image: url("../diabook-pink/icons/drop.png");}
+.icon.drophide 	{ background-image: url("../diabook-pink/icons/drop.png");}
+.icon.dislike 	{ background-image: url("../diabook-pink/icons/dislike.png");}
+.icon.like 	{ background-image: url("../diabook-pink/icons/like.png");}
+.icon.pencil 	{ background-image: url("../diabook-pink/icons/pencil.png");}
+.icon.recycle 	{ background-image: url("../diabook-pink/icons/recycle.png");}
+.icon.remote-link { background-image: url("../diabook-pink/icons/remote.png");}
+.icon.tagged    { background-image: url("../diabook-pink/icons/tagged.png");}
+.icon.file-as { background-image: url("../diabook-pink/icons/file_as.png");}
+.star-item.icon.unstarred { background-image: url("../diabook-pink/icons/unstarred.png");}
+.star-item.icon.starred { background-image: url("../diabook-pink/icons/starred.png");}
+.icon.link		{ background-image: url("../diabook-pink/icons/link.png");}
+.icon.lock		{ background-image: url("../diabook-pink/icons/lock.png");}
+.icon.unlock		{ background-image: url("../diabook-pink/icons/unlock.png");}
+.icon.language    { background-image: url("../diabook-pink/icons/language.png");}
+
+
+.camera 	{ background-image: url("../diabook-pink/icons/camera.png"); 
+			  display: block; width: 28px; height: 28px; background-repeat: no-repeat;
+			  }
+.attach 	{ background-image: url("../diabook-pink/icons/attach.png"); 
+			  display: block; width: 28px; height: 28px; background-repeat: no-repeat;
+			  }
+.video2 	{ background-image: url("../diabook-pink/icons/video.png"); 
+			  display: block; width: 28px; height: 28px; background-repeat: no-repeat;
+			  }	
+.video 	{ background-image: url("../diabook-pink/icons/video.png"); 
+			  display: block; width: 100%; height: 140px; background-repeat: no-repeat;
+			  }
+.audio2 	{ background-image: url("../diabook-pink/icons/audio.png"); 
+			  display: block; width: 28px; height: 28px; background-repeat: no-repeat;
+			  }
+.audio 	{ background-image: url("../diabook-pink/icons/audio.png"); 
+			  display: block; width: 28px; height: 28px; background-repeat: no-repeat;
+			  }
+.weblink 	{ background-image: url("../diabook-pink/icons/weblink.png"); 
+			  display: block; width: 28px; height: 28px; background-repeat: no-repeat;
+			  }
+.globe 	{ background-image: url("../diabook-pink/icons/globe.png"); 
+			  display: block; width: 28px; height: 28px; background-repeat: no-repeat;
+			  }
+.unglobe 	{ background-image: url("../diabook-pink/icons/unglobe.png"); 
+			  display: block; width: 28px; height: 28px; background-repeat: no-repeat;
+			  }
+.edit    {background-image: url("../diabook-pink/icons/pencil2.png"); 
+			  display: block; width: 28px; height: 28px; background-repeat: no-repeat;}
+			  
+			  
+
+
+.article	{ background-position: -50px  0px;}
+/*.audio 		{ background-position: -70px  0px;}*/
+.block 		{ background-position: -90px  0px;}
+/*.drop 		{ background-position: -110px 0px;}*/
+/*.drophide 	{ background-position: -130px 0px;}*/
+/*.edit 		{ background-position: -150px 0px;}*/
+/*.camera 	{ background-position: -170px 0px;}*/
+/*.dislike 	{ background-position: -190px 0px;}*/
+/*.like 		{ background-position: -210px 0px;}*/
+/*.link 		{ background-position: -230px 0px;}*/
+
+/*.globe 		{ background-position: -50px  -20px;}*/
+/*.noglobe 	{ background-position: -70px  -20px;}*/
+.no 		{ background-position: -90px  -20px;}
+.pause 		{ background-position: -110px -20px;}
+.play 		{ background-position: -130px -20px;}
+/*.pencil 	{ background-position: -150px -20px;}*/
+.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;}*/
+
+/*.video          { background-position: -110px -40px;}*/
+.youtube        { background-position: -130px -40px;}
+
+/*.attach         { background-position: -190px -40px;}*/
+/*.language       { background-position: -210px -40px;}*/
+
+
+.icon.on             { background-image: url("../diabook-pink/icons/toogle_on.png"); background-repeat: no-repeat;}
+.icon.off            { background-image: url("../diabook-pink/icons/toogle_off.png"); background-repeat: no-repeat;}
+.prev           { background-position: -90px  -60px;}
+.next           { background-position: -110px -60px;}
+/*.tagged     { background-position: -130px -60px;}*/
+
+.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 0px; }
+.type-audio { background-position: -40px 0px; }
+.type-text  { background-position: -60px 0px; }
+.type-unkn  { background-position: -80px 0px; }
+
+.icon.drop, .icon.drophide {
+ float: left;
+}
+
+.icon {
+  display: block;
+  width: 20px;
+  height: 20px;
+  /*background-image: url('icons.png');*/
+}
+
+.icon {
+  background-color: transparent ;
+  background-repeat: no-repeat;
+  /* background-position: left center; */
+  display: block;
+  overflow: hidden;
+  text-indent: -9999px;
+  padding: 1px;
+}
+
+.icon.border.camera{
+  background-image: url("../diabook-pink/icons/camera.png"); 
+  display: block; width: 28px; height: 28px; background-repeat: no-repeat;
+	}
+	
+.icon.border.link{
+  background-image: url("../diabook-pink/icons/weblink.png"); 
+  display: block; width: 28px; height: 28px; background-repeat: no-repeat;
+  margin-left: 10px;
+	}
+
+.icon.text {
+  text-indent: 0px;
+}
+.icon.s10 {
+  min-width: 10px;
+  height: 10px;
+}
+.icon.s10.notify {
+  background-image: url("../../../../images/icons/10/notify_off.png");
+}
+.icon.s10.gear {
+  background-image: url("../../../../images/icons/10/gear.png");
+}
+.icon.s10.add {
+  background-image: url("../../../../images/icons/10/add.png");
+}
+.icon.s10.delete {
+  background-image: url("../../../../images/icons/10/delete.png");
+}
+.icon.s10.edit {
+  background-image: url("../../../../images/icons/10/edit.png");
+}
+.icon.s10.star {
+  background-image: url("../../../../images/star_dummy.png");
+}
+.icon.s10.menu {
+  background-image: url("../../../../images/icons/10/menu.png");
+}
+.icon.s10.link {
+  background-image: url("../../../../images/icons/10/link.png");
+}
+.icon.s10.lock {
+  background-image: url("../../../../images/icons/10/lock.png");
+}
+.icon.s10.unlock {
+  background-image: url("../../../../images/icons/10/unlock.png");
+}
+.icon.s10.text {
+  padding: 2px 0px 0px 15px;
+  font-size: 10px;
+}
+.icon.s16 {
+  min-width: 16px;
+  height: 16px;
+}
+.icon.s16.notify {
+  background-image: url("../../../../images/icons/16/notify_off.png");
+}
+.icon.s16.gear {
+  background-image: url("../../../../images/icons/16/gear.png");
+}
+.icon.s16.add {
+  background-image: url("../../../../images/icons/16/add.png");
+}
+.icon.s16.delete {
+  background-image: url("../../../../images/icons/16/delete.png");
+}
+/*.icon.s16.edit {
+  background-image: url("../../../../images/icons/16/edit.png");
+}*/
+.icon.s16.star {
+  background-image: url("../../../../images/star_dummy.png");
+}
+.icon.s16.menu {
+  background-image: url("../../../../images/icons/16/menu.png");
+}
+/*.icon.s16.link {
+  background-image: url("../../../../images/icons/16/link.png");
+}*/
+.icon.s16.lock {
+  background-image: url("../../../../images/icons/16/lock.png");
+}
+.icon.s16.unlock {
+  background-image: url("../../../../images/icons/16/unlock.png");
+}
+.icon.s16.text {
+  padding: 4px 0px 0px 20px;
+  font-size: 10px;
+}
+.icon.s22 {
+  min-width: 22px;
+  height: 22px;
+}
+.icon.s22.notify {
+  background-image: url("../../../../images/icons/22/notify_off.png");
+}
+.icon.s22.gear {
+  background-image: url("../../../../images/icons/22/gear.png");
+}
+.icon.s22.add {
+  background-image: url("../../../../images/icons/22/add.png");
+}
+.icon.s22.delete {
+  background-image: url("../../../../images/icons/22/delete.png");
+}
+.icon.s22.edit {
+  background-image: url("../../../../images/icons/22/edit.png");
+}
+.icon.s22.star {
+  background-image: url("../../../../images/star_dummy.png");
+}
+.icon.s22.menu {
+  background-image: url("../../../../images/icons/22/menu.png");
+}
+.icon.s22.link {
+  background-image: url("../../../../images/icons/22/link.png");
+}
+.icon.s22.lock {
+  background-image: url("../../../../images/icons/22/lock.png");
+}
+.icon.s22.unlock {
+  background-image: url("../../../../images/icons/22/unlock.png");
+}
+.icon.s22.text {
+  padding: 10px 0px 0px 25px;
+  width: 200px;
+}
+.icon.s48 {
+  width: 48px;
+  height: 48px;
+}
+.icon.s48.notify {
+  background-image: url("../../../../images/icons/48/notify_off.png");
+}
+.icon.s48.gear {
+  background-image: url("../../../../images/icons/48/gear.png");
+}
+.icon.s48.add {
+  background-image: url("../../../../images/icons/48/add.png");
+}
+.icon.s48.delete {
+  background-image: url("../../../../images/icons/48/delete.png");
+}
+.icon.s48.edit {
+  background-image: url("../../../../images/icons/48/edit.png");
+}
+.icon.s48.star {
+  background-image: url("../../../../images/star_dummy.png");
+}
+.icon.s48.menu {
+  background-image: url("../../../../images/icons/48/menu.png");
+}
+.icon.s48.link {
+  background-image: url("../../../../images/icons/48/link.png");
+}
+.icon.s48.lock {
+  background-image: url("../../../../images/icons/48/lock.png");
+}
+.icon.s48.unlock {
+  background-image: url("../../../../images/icons/48/unlock.png");
+}
+
+#contact-edit-links ul {
+  list-style: none;
+  list-style-type: none;
+}
+
+.hide-comments-outer {
+  margin-left: 80px;
+  margin-bottom: 5px;
+  width: 675px;
+  border-bottom: 1px solid #BDCDD4;
+  border-top: 1px solid #BDCDD4;
+
+  padding: 8px;
+}
+
+/* global */
+body {
+  font-family: 'Lato', "Helvetica Neue", Helvetica, Arial, sans-serif;
+  font-size: 13px;
+  background-color: #ffffff;
+  color: #2d2d2d;
+  margin: 50px auto auto;
+  display: table;
+}
+
+h4 {
+  font-size: 1.1em;
+}
+
+a {
+	color: #333333;
+	/* color: #3e3e8c; */
+	text-decoration: none;
+}
+a:hover {
+	/* color: blue; */
+	text-decoration: underline
+}
+
+.wall-item-name-link {
+/*  float: left;*/
+}
+
+.wall-item-photo {
+  width: 48px;
+  height: 48px;
+  overflow: hidden;
+  display: block;
+}
+
+.left {
+  float: left;
+}
+.right {
+  float: right;
+}
+.hidden {
+  display: none;
+}
+.clear {
+  clear: both;
+}
+.fakelink {
+  color: #996d73;
+  /* color: #3e3e8c; */
+  text-decoration: none;
+  cursor: pointer;
+}
+.fakelink:hover {
+  /* color: blue; */
+  /*color: #005c94; */
+  text-decoration: underline;
+}
+code {
+  font-family: Courier, monospace;
+  white-space: pre;
+  display: block;
+  overflow: auto;
+  border: 1px solid #444;
+  background: #EEE;
+  color: #444;
+  padding: 10px;
+  margin-top: 20px;
+}
+#panel {
+  position: absolute;
+  width: 12em;
+  background: #ffffff;
+  color: #2d2d2d;
+  margin: 0px;
+  padding: 1em;
+  list-style: none;
+  border: 3px solid #364e59;
+  z-index: 100000;
+  -webkit-box-shadow: 0px 5px 10px rgba(0, 0, 0, 0.7);
+  -moz-box-shadow: 0px 5px 10px rgba(0, 0, 0, 0.7);
+  box-shadow: 0px 5px 10px rgba(0, 0, 0, 0.7);
+}
+/* tool */
+.tool {
+  height: auto;
+  overflow: auto;
+  padding: 3px;
+}
+#saved-search-ul .tool:hover,
+#nets-sidebar .tool:hover,
+#sidebar-group-list .tool:hover {
+	background: #EEE;
+}
+.tool .label {
+  float: left;
+}
+.tool .action {
+  float: right;
+}
+.tool a {
+  color: ##3F8FBA;
+}
+.tool a:hover {
+  text-decoration: none;
+}
+/* popup notifications */
+div.jGrowl div.notice {
+  background: #511919 url("../../../../images/icons/48/notice.png") no-repeat 5px center;
+  color: #ffffff;
+  padding-left: 58px;
+}
+div.jGrowl div.info {
+  background: #364e59 url("../../../../images/icons/48/info.png") no-repeat 5px center;
+  color: #ffffff;
+  padding-left: 58px;
+}
+/* header */
+header {
+  position: fixed;
+  left: 0%;
+  right: 80%;
+  top: 0px;
+  margin: 0px;
+  padding: 0px;
+  width: 22%;
+  height: 32px;
+  background: #FFC1CA;
+  background-color: #FFC1CA;
+  z-index: 100;
+  -webkit-box-shadow: -10px 0px 10px rgba(0, 0, 0, 0.7);
+  -moz-box-shadow: -10px 0px 10px rgba(0, 0, 0, 0.7);
+  box-shadow: -10px 0px 10px rgba(0, 0, 0, 0.7);
+   
+}
+header #site-location {
+  display: none;
+}
+header #banner {
+  overflow: hidden;
+  text-align: left;
+  width: 82%%;
+  margin-left: 25%;
+}
+header #banner a,
+header #banner a:active,
+header #banner a:visited,
+header #banner a:link,
+header #banner a:hover {
+  color: #1f1f1f;
+  text-decoration: none;
+  outline: none;
+  vertical-align: middle;
+  font-weight: bolder;
+  margin-left: 3px;
+}
+header #banner #logo-img {
+  height: 25px;
+  margin-top: 3px;
+}
+header #banner #logo-text {
+  font-size: 20px;
+  position: absolute;
+  top: 10%;
+}
+/* nav */
+nav {
+  width: 80%;
+  height: 32px;
+  position: fixed;
+  left: 22%;
+  top: 0px;
+  padding: 0px;
+  background: #FFC1CA;
+  color: #1f1f1f;
+  z-index: 99;
+  -webkit-box-shadow: -10px 0px 10px rgba(0, 0, 0, 0.7);
+  -moz-box-shadow: -10px 0px 10px rgba(0, 0, 0, 0.7);
+  box-shadow: -10px 0px 10px rgba(0, 0, 0, 0.7);
+}
+nav a,
+nav a:active,
+nav a:visited,
+nav a:link,
+nav a:hover {
+  color: #1f1f1f;
+  text-decoration: none;
+  outline: none;
+}
+nav #banner {
+  overflow: hidden;
+  /*text-align: center;*/
+  width: 100%;
+}
+nav #banner a,
+nav #banner a:active,
+nav #banner a:visited,
+nav #banner a:link,
+nav #banner a:hover {
+  color: #1f1f1f;
+  text-decoration: none;
+  outline: none;
+  vertical-align: bottom;
+}
+nav #banner #logo-img {
+  height: 22px;
+  margin-top: 5px;
+}
+nav #banner #logo-text {
+  font-size: 22px;
+}
+nav #navbar{
+	}
+nav ul {
+  margin: 0px;
+  padding: 0px 20px;
+}
+nav ul li {
+  list-style: none;
+  margin: 0px;
+  /* padding: 1px 1px 3px 1px; */
+  float: left;
+}
+nav ul li .menu-popup {
+  left: 0px;
+  right: auto;
+}
+
+nav #logo-img {
+  height: 25px;
+  margin-top: 4px;
+  margin-left: 30px;
+}
+
+nav #logo-text {
+    font-size: 22px;
+    margin-top: 3px;
+    margin-right: 15px;
+}
+nav .nav-menu-search {
+  position: relative;
+
+  margin: 4px 17px;
+  margin-right: 0px;
+  height: 17px;
+  width: 180px;
+  
+}
+
+nav #search-box #search-text {
+  background-image:  url('icons/lupe.png');
+  background-repeat:no-repeat;
+  padding-left:20px;
+  border-top-left-radius: 15px;
+border-top-right-radius: 15px;
+border-bottom-right-radius: 15px;
+border-bottom-left-radius: 15px;
+	}
+
+
+nav .nav-menu-icon {
+  position: relative;
+  height: 22px;
+  padding: 5px;
+  margin: 0px 5px;
+  -moz-border-radius: 5px 5px 0 0;
+  -webkit-border-radius: 5px 5px 0 0;
+  border-radius: 5px 5px 0 0;
+}
+nav .nav-menu-icon:hover {
+  position: relative;
+  height: 22px;
+  padding: 5px;
+  margin: 0px 5px;
+  -moz-border-radius: 5px 5px 0 0;
+  -webkit-border-radius: 5px 5px 0 0;
+  border-radius: 5px 5px 0 0;
+}
+
+/*color*/
+nav .nav-menu-icon.selected {
+  background-color: #FFE9EC;
+}
+nav .nav-menu-icon img {
+  width: 22px;
+  height: 22px;
+}
+nav .nav-menu-icon .nav-notify {
+  top: 3px;
+}
+/*marker*/
+nav .nav-menu {
+  position: relative;
+  height: 16px;
+  padding: 5px;
+  margin: 3px 15px 0px;
+  font-size: 15px;
+  /*border-bottom: 3px solid #364A84;*/
+}
+nav .nav-menu.selected {
+  /*border-bottom: 3px solid #9eabb0;*/
+}
+nav .nav-notify {
+  display: none;
+  position: absolute;
+  background-color: #fff;
+  /* background-color: #19aeff; */
+  -moz-border-radius: 5px 5px 5px 5px;
+  -webkit-border-radius: 5px 5px 5px 5px;
+  border-radius: 5px 5px 5px 5px;
+  font-size: 10px;
+  font-weight: 900;
+  padding: 1px 4px;
+  top: 0px;
+  right: -6px;
+  min-width: 10px;
+  text-align: center;
+  border: 1px solid black;
+}
+nav .nav-notify.show {
+  display: block;
+}
+nav #nav-help-link,
+nav #nav-search-link,
+nav #nav-directory-link,
+nav #nav-apps-link,
+nav #nav-site-linkmenu, 
+nav #nav-home-link,
+nav #nav-user-linkmenu
+{
+  float: right;
+}
+nav #nav-user-linkmenu{
+	margin-right: 0px;
+	}
+nav #nav-home-link, #nav-directory-link, #nav-apps-link{
+	margin-left: 0px;
+	margin-right: 0px;
+	font-weight: bold;
+	margin: 3px 5px;
+	font-size: 14px;
+	}
+nav #nav-directory-link{
+  margin-right: 0px;	
+	}
+nav #nav-home-link{
+  margin-left: 0px;	
+	}
+nav #nav-help-link .menu-popup,
+nav #nav-search-link .menu-popup,
+nav #nav-directory-link .menu-popup,
+nav #nav-apps-link .menu-popup,
+nav #nav-site-linkmenu .menu-popup {
+  right: 0px;
+  left: auto;
+}
+
+nav #nav-messages-linkmenu.on .icon.messages, nav #nav-messages-linkmenu.selected .icon.messages{
+	background-image: url("../diabook-pink/icons/messages.png");
+	}
+	
+/*nav #nav-notifications-linkmenu.on .icon.notify,*/ nav #nav-notifications-linkmenu.selected .icon.notify{
+	background-image: url("../diabook-pink/icons/notify.png");
+	}
+	
+nav #nav-contacts-linkmenu.on .icon.contacts, nav #nav-contacts-linkmenu.selected .icon.contacts{
+	background-image: url("../diabook-pink/icons/contacts.png");
+	}
+	
+nav #nav-apps-link.selected {
+ background-color: #fff;
+  moz-border-radius: 5px 5px 0 0;
+-webkit-border-radius: 5px 5px 0 0;
+border-radius: 5px 5px 0 0;
+}
+
+#nav-notifications-mark-all {
+	/* padding: 1px 1px 2px 26px; */
+	/* border-bottom: 1px solid #364E59; */
+	/* margin: 0px 0px 2px 0px;
+	padding: 5px 10px; */
+}
+
+#nav-notifications-see-all {
+	/* padding: 1px 1px 2px 26px; */
+	/* border-bottom: 1px solid #364E59; */
+	/* margin: 0px 0px 2px 0px;
+	padding: 5px 10px; */
+}
+
+.notify-seen {
+	background: none repeat scroll 0 0 #DDDDDD;
+	}
+
+ul.menu-popup {
+  position: absolute;
+  display: none;
+  width: 11em;
+  background: #fff;
+  color: #2d2d2d;
+  margin: 0px;
+  padding: 0px;
+  list-style: none;
+  z-index: 100000;
+  -webkit-box-shadow: 0px 5px 10px rgba(0, 0, 0, 0.7);
+  -moz-box-shadow: 0px 5px 10px rgba(0, 0, 0, 0.7);
+  box-shadow: 0px 5px 10px rgba(0, 0, 0, 0.7);
+}
+ul.menu-popup a {
+  display: block;
+  color: #2d2d2d;
+  padding: 5px 10px;
+  text-decoration: none;
+}
+ul.menu-popup a:hover {
+  background-color: #996d73; /*bdcdd4;*/
+  color: #fff;
+}
+ul.menu-popup .menu-sep {
+  border-top: 1px solid #9eabb0;
+}
+ul.menu-popup li {
+  float: none;
+  overflow: auto;
+  height: auto;
+  display: block;
+}
+ul.menu-popup li img {
+  float: left;
+  width: 16px;
+  height: 16px;
+  padding-right: 5px;
+}
+ul.menu-popup .empty {
+  padding: 5px;
+  text-align: center;
+  color: #9eabb0;
+}
+/* autocomplete popup */
+.acpopup {
+  max-height: 150px;
+  background-color: #ffffff;
+  color: #2d2d2d;
+  border: 1px solid #MenuBorder;
+  overflow: auto;
+  z-index: 100000;
+  -webkit-box-shadow: 0px 5px 10px rgba(0, 0, 0, 0.7);
+  -moz-box-shadow: 0px 5px 10px rgba(0, 0, 0, 0.7);
+  box-shadow: 0px 5px 10px rgba(0, 0, 0, 0.7);
+}
+.acpopupitem {
+  color: #2d2d2d;
+  padding: 4px;
+  clear: left;
+}
+.acpopupitem img {
+  float: left;
+  margin-right: 4px;
+}
+.acpopupitem.selected {
+  background-color: #bdcdd4;
+}
+#nav-notifications-menu {
+  width: 400px;
+  max-height: 550px;
+  overflow: auto;
+}
+/* #nav-notifications-menu a {
+	display: inline;
+	padding: 5px 0px;
+	margin: 0px 0px 2px 0px;
+}
+#nav-notifications-menu li:hover {
+  background-color: #bdcdd4;
+}*/
+
+#nav-notifications-menu img {
+  float: left;
+  margin-right: 5px;
+}
+#nav-notifications-menu .contactname {
+  font-weight: bold;
+}
+#nav-notifications-menu .notif-when {
+  font-size: 10px;
+  color: #9eabb0;
+  display: block;
+}
+
+.notif-image {
+        width: 32px;
+        height: 32px;
+        padding: 7px 7px 0px 0px;
+}
+
+/*profile_side*/
+#profile_side {
+  margin-bottom: 30px;
+}
+#ps-usericon{
+	height: 25px	
+	}
+#ps-username{
+  font-size: 1.17em;
+  font-weight: bold;
+  vertical-align: top;
+  position: absolute;
+  padding-top: 4px;
+  padding-left: 5px;	
+  word-wrap: break-word;
+  width: 130px;
+	}
+#ps-username:hover{
+  text-decoration: none;	
+	}
+.menu-profile-side{
+  list-style: none;	
+  padding-left: 0px;
+  min-height: 0px;
+	}
+.menu-profile-list{
+  height: auto;
+  overflow: auto;
+  padding-top: 3px;
+  padding-bottom: 3px;
+  padding-left: 16px;
+  min-height: 16px;
+  list-style: none;
+	}
+.menu-profile-list:hover{
+	background: #FFF4F6;
+	}
+.menu-profile-list-item{
+	padding-left: 5px;
+	}	
+.menu-profile-list-item:hover{	
+	text-decoration: none;
+   }
+/*http://prothemedesign.com/circular-icons/*/
+.menu-profile-list.home{
+	background: url("../diabook-pink/icons/home.png") no-repeat;
+	}
+.menu-profile-list.photos{
+	background: url("../diabook-pink/icons/mess_side.png") no-repeat;
+	}
+.menu-profile-list.events{
+	background: url("../diabook-pink/icons/events.png") no-repeat;
+	}
+.menu-profile-list.notes{
+	background: url("../diabook-pink/icons/notes.png") no-repeat;
+	}
+.menu-profile-list.foren{
+	background: url("../diabook-pink/icons/pubgroups.png") no-repeat;
+	}
+.menu-profile-list.com_side{
+	background: url("../diabook-pink/icons/com_side.png") no-repeat;
+	}
+
+/* aside */
+/*marker*/
+aside {
+  display: table-cell;
+  vertical-align: top;
+  width: 180px;
+  padding: 0px 5px 0px 0px;
+  border-right: 1px solid #D2D2D2;
+  float: left;
+  /* background: #F1F1F1; */
+}
+
+aside .vcard .fn {
+  font-size: 18px;
+  font-weight: bold;
+  margin-bottom: 5px;
+}
+aside .vcard .title {
+  margin-bottom: 5px;
+}
+aside .vcard dl {
+  height: auto;
+  overflow: auto;
+}
+aside .vcard dt {
+  float: left;
+  margin-left: 0px;
+  /*width: 35%;*/
+  text-align: right;
+  color: #999999;
+}
+aside .vcard dd {
+  float: left;
+  margin-left: 5px;
+  /*width: 60%;*/
+}
+aside #profile-extra-links ul {
+  padding: 0px;
+  margin: 0px;
+}
+aside #profile-extra-links li {
+  padding: 0px;
+  margin: 0px;
+  list-style: none;
+}
+aside #dfrn-request-link {
+  display: block;
+  -moz-border-radius: 5px 5px 5px 5px;
+  -webkit-border-radius: 5px 5px 5px 5px;
+  border-radius: 5px 5px 5px 5px;
+  color: #ffffff;
+  background: #005c94 url('../../../../images/connect-bg.png') no-repeat left center;
+  font-weight: bold;
+  text-transform: uppercase;
+  padding: 4px 2px 2px 35px;
+}
+aside #dfrn-request-link:hover {
+  text-decoration: none;
+  background-color: #36c;
+  /* background-color: #19aeff; */
+}
+aside #profiles-menu {
+  width: 20em;
+}
+aside #search-text {
+	width: 150px;
+	height: 17px;
+	padding-left: 10px;
+	border-top-left-radius: 15px;
+border-top-right-radius: 15px;
+border-bottom-right-radius: 15px;
+border-bottom-left-radius: 15px;
+}
+aside #side-follow-url {
+	width: 150px;
+	}
+aside #side-peoplefind-url {
+	width: 150px;
+	}
+#contact-block {
+  overflow: auto;
+  height: auto;
+}
+#contact-block .contact-block-h4 {
+  float: left;
+  margin: 5px 0px;
+}
+#contact-block .allcontact-link {
+  float: right;
+  margin: 5px 0px;
+}
+#contact-block .contact-block-content {
+  clear: both;
+  overflow: auto;
+  height: auto;
+}
+#contact-block .contact-block-link {
+  float: left;
+  margin: 0px 2px 2px 0px;
+}
+#contact-block .contact-block-link img {
+  widht: 48px;
+  height: 48px;
+}
+#lost-password-link {
+  float: left;
+  margin-right: 20px;	
+	}
+/* widget */
+.widget {
+  margin-bottom: 2em;
+  /*.action .s10 { width: 10px; overflow: hidden; padding: 0px;}
+	.action .s16 { width: 16px; overflow: hidden; padding: 0px;}*/
+/*  font-size: 12px; */
+}
+/*marker*/
+.widget h3 {
+  padding: 0px;
+  margin: 2px;
+  font-size: 1.05em;
+}
+.widget .action {
+  opacity: 0.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;
+}
+.widget input.action {
+  opacity: 0.5;
+  -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;
+}
+.widget:hover .title .action {
+  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;
+}
+.widget .tool:hover .action {
+  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;
+}
+.widget .tool:hover .action.ticked {
+  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;
+}
+.widget ul {
+  padding: 0px;
+}
+.widget ul li {
+  padding-left: 16px;
+  min-height: 16px;
+  list-style: none;
+}
+#side-bar-photos-albums li{
+list-style-type: disc;
+}
+#side-bar-photos-albums ul li{
+  margin-left: 30px;
+  padding-left: 0px;
+	}
+#side-bar-photos-albums ul li a{
+  color: #3465A4;
+}
+.widget .tool.selected {
+  background: url("../diabook-pink/icons/selected.png") no-repeat left center;
+}
+/* widget: search */
+span.sbox_l  {
+	background: white url('../diabook/icons/srch_l.gif') no-repeat top left;
+	float: left;
+	width: 19px; height: 19px;
+	margin-left: 10px;
+	margin-top: 5px;
+	
+}
+
+span.sbox_r  {
+	background: white url('../diabook/icons/srch_r.gif') no-repeat top left;
+	float: left;
+	width: 19px; height: 19px;
+	margin-top: 5px;
+}
+
+span.sbox input {
+	background: white url('../diabook/icons/srch_bg.gif') repeat-x top left;
+	float: left;
+	margin-top: 5px;
+	border: 0;
+	height: 13px; width: 100px;
+	padding: 3px;
+	font: 11px/13px arial;
+	color: #000;
+}
+#add-search-popup {
+  width: 200px;
+  top: 18px;
+}
+/* section */
+section {
+  display: table-cell;
+  vertical-align: top;
+  width: 611px;
+  padding: 0px 0px 0px 12px;
+}
+
+body .pageheader{
+  text-align: center;
+  font-size: 20px;
+  margin-bottom: 20px;
+  margin-top: 0px;
+  max-width: 575px;
+	}
+.qcomment{
+  max-width: 122px;	
+	}
+#id_username {
+  width: 173px;	
+	}
+#id_password {
+  width: 173px;		
+	}
+#id_openid_url {
+  width: 173px;	
+	}
+#contact-edit-end {
+	}
+.pager {
+   padding: 10px;
+	text-align: center;
+	font-size: 1.0em;
+	clear: both;
+	display: block;
+}	
+
+.tabs {
+    
+    background-position: 0 -20px;
+    background-repeat: repeat-x;
+    height: 27px;
+    padding: 0;
+ }
+.tab.button {
+    margin-left: 5px;	
+    /*background: none repeat scroll 0 0 #F8F8F8;*/
+    border: 1px solid #CCCCCC;
+    border-radius: 3px 3px 3px 3px;
+    font-weight: normal;
+    padding: 3px;
+    color:  #333333;
+	}
+	
+#birthday-notice, #event-notice, #birthday-wrapper, #event-wrapper{
+	margin-bottom: 10px;
+	}
+#birthday-wrapper a {
+	color: #3465A4;
+	}
+
+/*marker*/
+right_aside {
+  display: table-cell;
+  vertical-align: top;
+  width: 180px;
+  /*border-left: 1px solid #D2D2D2;*/
+  
+  /* background: #F1F1F1; */
+}
+right_aside a{color: #3465A4;}
+/*marker*/
+right_aside h3 {font-size: 1.05em; border-bottom: 1px solid #D2D2D2; padding-top: 5px; padding-bottom: 0px; padding-left: 9px; margin-bottom: 0px; 
+margin-top:30px;}
+right_aside .directory-item {	width: 50px; height: 50px; vertical-align: center; text-align: center; }
+right_aside .directory-photo { margin: 0px; }
+right_aside .directory-photo-img { max-width: 45px; max-height: 45px; }
+right_aside #likes { margin: 0px; padding: 0px; list-style: none; }
+right_aside .items-wrapper{ overflow: auto;	width: 100%; }
+right_aside #lastusers-wrapper { padding-left: 6px; padding-top: 3px; overflow: auto;	width: 100%; }
+right_aside #ra-photos-wrapper { padding-left: 5px; padding-top: 3px; overflow: auto;	width: 100%; }
+#page-sidebar-right_aside{margin-top: 0px; margin-bottom: 30px;}
+#page-sidebar-right_aside ul {margin-top: 0px;}
+#page-sidebar-right_aside .label {max-width: 128px;}
+right_aside .icon {width: 10px; height: 10px;}
+.close_box		{ 
+		background-image: url("../diabook-pink/icons/close_box.png");
+		float: right;
+		cursor: pointer;
+		opacity: 0.1;
+		}
+.close_box:hover	{ 
+		background-image: url("../diabook-pink/icons/close_box.png");
+		float: right;
+		cursor: pointer;
+		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;
+		}
+/* wall item */
+/*marker*/
+.tread-wrapper {
+  border-bottom: 1px solid #D2D2D2;
+  position: relative;
+  padding: 5px;
+  margin-bottom: 0px;
+  width: 775px;
+  padding-top: 10px;
+}
+.tread-wrapper a{
+  color: #996d73;
+}
+
+/*marker*/
+.wall-item-decor {
+  position: absolute;
+  left: 780px;
+  top: -10px;
+  width: 16px;
+}
+/*marker*/
+.wall-item-container {
+  display: table;
+  width: 770px;
+}
+
+
+.wall-item-container .wall-item-item, .wall-item-container .wall-item-bottom {
+  display: table-row;
+}
+
+.wall-item-bottom {
+  font-size: 13px;
+}
+.wall-item-container .wall-item-bottom {
+/*  opacity: 0.5;
+  -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; */
+}
+.wall-item-container:hover .wall-item-bottom {
+/*  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; */
+}
+.wall-item-container .wall-item-info {
+  display: table-cell;
+  vertical-align: top;
+  text-align: left;
+  width: 80px;
+}
+.wall-item-container .wall-item-location {
+  padding-right: 40px;
+  display: table-cell;
+}
+.wall-item-container .wall-item-ago {
+  word-wrap: break-word;
+  width: 50px;
+  margin-left: 10px;
+  color: #999;
+}
+.wall-item-location {
+  
+  clear: both;
+  overflow: hidden;
+  
+  margin-bottom: 5px;
+}
+
+/*marker*/
+.wall-item-container .wall-item-content {
+
+  max-width: 690px;
+  word-wrap: break-word;
+
+
+}
+/*marker*/
+.wall-item-container .wall-item-content img {
+
+
+}
+.wall-item-container .wall-item-links, .wall-item-container .wall-item-actions {
+  display: table-cell;
+  vertical-align: middle;
+}
+.wall-item-container .wall-item-links .icon, .wall-item-container .wall-item-actions .icon {
+  opacity: 0.5;
+  -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;
+}
+.wall-item-container .wall-item-links .icon:hover, .wall-item-container .wall-item-actions .icon: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;
+}
+.wall-item-container .wall-item-name {
+  font-weight: bold;
+}
+.wall-item-container .wall-item-actions-author {
+  width: 100%;
+  margin-bottom: 0.3em;
+}
+.wall-item-container .wall-item-actions-social {
+  float: left;
+  margin-bottom: 1px;
+  display: table-cell;
+}
+.wall-item-container .wall-item-actions-social a {
+  margin-right: 1em;
+}
+.wall-item-actions-social a {
+  float: left;
+}
+.wall-item-container .wall-item-actions-tools {
+  float: right;
+  width: 80px;
+  display: table-cell;
+}
+.wall-item-container .wall-item-actions-tools a {
+  float: right;
+}
+.wall-item-container .wall-item-actions-tools input {
+  float: right;
+}
+/*marker*/
+.wall-item-container.comment {
+  margin-top: 5px;
+  margin-bottom: 5px;
+  margin-left: 80px;
+  width: 690px;
+  border-bottom: 1px solid hsl(198, 21%, 79%);
+}
+.wall-item-container.comment .contact-photo {
+  width: 32px;
+  height: 32px;
+  margin-left: 16px;
+  /*background: url(../../../../images/icons/22/user.png) no-repeat center center;*/
+
+}
+.wall-item-container.comment {
+  top: 15px !important;
+  left: 15px !important;
+}
+.wall-item-container.comment .wall-item-links {
+  padding-left: 12px;
+}
+.wall-item-comment-wrapper {
+  margin: 1px 5px 5px 80px;
+}
+.wall-item-comment-wrapper .comment-edit-photo {
+  display: none;
+}
+.wall-item-comment-wrapper textarea {
+  height: 2.0em;
+  width: 100%;
+  font-size: 10px;
+  color: #999999;
+  border: 1px solid #DDD;
+  padding: 0.3em;
+  font-size: 14px;
+}
+.wall-item-comment-wrapper .comment-edit-text-full {
+  font-size: 14px;
+  height: 4em;
+  color: #2d2d2d;
+  border: 1px solid #2d2d2d;
+}
+.comment-edit-preview {
+  width: 500px;
+  margin-top: 10px;
+  background-color:  #fff797;
+}
+.comment-edit-preview .contact-photo {
+  width: 32px;
+  height: 32px;
+  margin-left: 16px;
+  /*background: url(../../../../images/icons/22/user.png) no-repeat center center;*/
+
+}
+.comment-edit-preview {
+  top: 15px !important;
+  left: 15px !important;
+}
+.comment-edit-preview .wall-item-links {
+  padding-left: 12px;
+}
+.comment-edit-preview .wall-item-container {
+  width: 700px;
+}
+.comment-edit-preview .tread-wrapper {
+  width: 700px;
+  padding: 0;
+  margin: 10px 0;
+}
+
+.shiny {
+  /* border-right: 10px solid #fce94f; */
+	border-right: 1px solid #A7C7F7;
+	padding-right: 12px;
+}
+
+#jot-preview-content{
+	margin-top: 30px;}
+	
+#jot-preview-content .tread-wrapper {
+  background-color: #fff797;
+}
+
+.wall-item-tags {
+  padding-top: 1px;
+  padding-bottom: 2px;
+}
+.tag {
+  /*background: url("../../../../images/tag_b.png") repeat-x center left;*/
+  color: #999;
+  padding-left: 3px;
+  font-size: 12px;
+}
+.tag a {
+  padding-right: 5px;
+  /*background: url("../../../../images/tag.png") no-repeat center right;*/
+  color: #999;
+}
+.wwto {
+  position: absolute !important;
+  width: 25px;
+  height: 25px;
+  background: #FFFFFF;
+  border: 2px solid #364e59;
+  height: 25px;
+  width: 25px;
+  overflow: hidden;
+  padding: 1px;
+  position: absolute !important;
+  top: 40px;
+  left: 30px;
+  -webkit-box-shadow: 0px 0px 10px rgba(0, 0, 0, 0.7);
+  -moz-box-shadow: 0px 0px 10px rgba(0, 0, 0, 0.7);
+  box-shadow: 0px 0px 10px rgba(0, 0, 0, 0.7);
+}
+.wwto .contact-photo {
+  width: auto;
+  height: 25px;
+}
+/* contacts menu */
+.contact-photo-wrapper {
+  position: relative;
+  width: 80px;
+}
+
+.contact-photo-wrapper.wwto {
+  width: 25px;
+}
+
+.contact-photo {
+  width: 48px;
+  height: 48px;
+  overflow: hidden;
+  display: block;
+}
+.contact-photo img {
+  width: 48px;
+  height: 48px;
+}
+
+.contact-wrapper {
+  float: left;
+  width: 90px;
+  height: 90px;
+  margin-bottom: 15px;
+}
+.contact-wrapper .contact-photo {
+  width: 80px;
+  height: 80px;
+}
+.contact-wrapper .contact-photo img {
+  width: 80px;
+  height: 80px;
+}
+.contact-wrapper {
+  left: 0px;
+  top: 63px;
+}
+.contact-photo {
+  width: 48px;
+  height: 48px;
+}
+.contact-photo img {
+  width: 48px;
+  height: 48px;
+}
+.contact-name {
+  /* text-align: center; */
+  /*font-weight: bold;*/
+  font-size: 12px;
+}
+.contact-details {
+  color: #999999;
+}
+/* editor */
+.jothidden {
+  display: none;
+}
+#jot {
+  width: 585px;
+  margin: 0px 2em 20px 0px;
+}
+#profile-jot-form #profile-jot-text {
+  height: 2.0em;
+  width: 99%;
+  font-size: 15px;
+  color: #999999;
+  border: 1px solid #DDD;
+  padding: 0.3em;
+  margin-bottom: 10px;
+}
+.grey
+{
+  display: inline;
+  float: right;	
+	}
+#jot #jot-tools {
+  margin: 0px;
+  padding: 0px;
+  height: 40px;
+  overflow: none;
+  width: 583px;
+  background-color: #fff;
+  border-bottom: 2px solid #9eabb0;
+}
+
+#jot #jot-tools li {
+  list-style: none;
+  float: left;
+  width: 80px;
+  height: 40px;
+  border-bottom: 2px solid #9eabb0;
+}
+#jot #jot-tools li a {
+  display: block;
+  color: #cccccc;
+  width: 100%;
+  height: 40px;
+  text-align: center;
+  line-height: 40px;
+  overflow: hidden;
+}
+#jot #jot-tools li:hover {
+  background-color: #364e59;
+  border-bottom: 2px solid #bdcdd4;
+}
+#jot #jot-tools li.perms {
+  float: right;
+  width: 40px;
+}
+#jot #jot-tools li.perms a.unlock {
+  width: 30px;
+  border-left: 10px solid #cccccc;
+  background-color: #cccccc;
+  background-position: left center;
+}
+#jot #jot-tools li.perms a.lock {
+  width: 30px;
+  border-left: 10px solid #666666;
+  background-color: #666666;
+}
+#jot #jot-tools li.submit {
+  float: right;
+  background-color: #cccccc;
+  border-bottom: 2px solid #cccccc;
+  border-right: 1px solid #666666;
+  border-left: 1px solid #666666;
+}
+#jot #jot-tools li.submit input {
+  border: 0px;
+  margin: 0px;
+  padding: 0px;
+  background-color: #cccccc;
+  color: #666666;
+  width: 80px;
+  height: 40px;
+  line-height: 40px;
+}
+#jot #jot-tools li.submit input:hover {
+  background-color: #bdcdd4;
+  color: #666666;
+}
+#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;
+}
+#profile-jot-form #jot-title {
+    
+  	 border-radius: 5px 5px 5px 5px;
+    font-weight: bold;
+    height: 20px;
+    margin: 0 0 5px;
+    width: 60%;
+    border: 1px solid #d2d2d2;
+}
+#profile-jot-form #jot-title:-webkit-input-placeholder {
+  font-weight: normal;
+}
+#profile-jot-form #jot-title:-moz-placeholder {
+  font-weight: normal;
+}
+#profile-jot-form #profile-jot-text_parent #profile-jot-text_tbl{
+	width: 585px;
+	height: 100px;
+	}
+#jot #jot-title:hover {
+  border: 1px solid #999999;
+}
+#jot #jot-title:focus {
+  border: 1px solid #999999;
+}
+#jot #character-counter {
+  width: 80px;
+  float: right;
+  text-align: right;
+  height: 20px;
+  line-height: 20px;
+  padding-right: 20px;
+}
+#jot-perms-icon, 
+#profile-location,
+#profile-nolocation,
+#profile-youtube, 
+#profile-video, 
+#profile-audio,
+#profile-link,
+#profile-title, 
+#wall-image-upload,
+#wall-file-upload,
+#wall-image-upload-div,
+#wall-file-upload-div,
+.hover, .focus {
+	cursor: pointer;
+	margin-top: 2px;
+}
+/*marker*/
+#profile-jot-wrapper{
+	margin: 0 20px 20px 0;
+   width: 785px;
+	}
+/*marker*/
+#profile-jot-submit-wrapper {
+	margin-bottom: 50px;
+	width: 785px;
+}
+
+#profile-jot-submit {
+	float: right;
+	margin-top: 2px;
+	font-size: 14px;
+}
+#profile-upload-wrapper {
+	float: left;
+	margin-top: 2px;
+	margin-left: 10px;
+	
+}
+#profile-attach-wrapper {
+	float: left;
+	margin-left: 15px;
+	margin-top: 2px;
+}
+#profile-rotator {
+	float: left;
+	margin-left: 30px;
+	margin-top: 2px;
+}
+#profile-link-wrapper {
+	float: left;
+	margin-left: 15px;
+	margin-top: 2px;
+}
+#profile-youtube-wrapper {
+	float: left;
+	margin-left: 15px;
+	margin-top: 2px;
+}
+#profile-video-wrapper {
+	float: left;
+	margin-left: 15px;
+	margin-top: 2px;
+}
+#profile-audio-wrapper {
+	float: left;
+	margin-left: 15px;
+	margin-top: 2px;
+}
+#profile-location-wrapper {
+	float: left;
+	margin-left: 15px;
+	margin-top: 2px;
+}
+#profile-jot-perms {
+	float: left;
+	margin-left: 45px;
+	margin-top: 2px;
+}
+#jot-preview-link {
+	float: right;
+	margin-left: 10px;
+	margin-top: 2px;
+	font-size: 9px;
+	font-weight: bolder;
+	cursor: pointer;
+}
+#profile-jot-perms{
+   float: right;
+	margin-left: 10px;
+	margin-top: 2px;	
+	}
+/** buttons **/
+.button.creation1 {
+    background-color: #fff;
+    border: 1px solid #777777;
+    border-radius: 3px 3px 3px 3px;
+    box-shadow: 0 1px 1px #CFCFCF;
+ 	 font-weight: bolder;
+	 cursor: pointer;
+}
+.button.creation2 {
+    background-color: #996d73;
+    border: 1px solid #777777;
+    color: white;
+    border-radius: 3px 3px 3px 3px;
+    box-shadow: 0 1px 1px #CFCFCF;
+    margin-left: 5px;
+    font-weight: bolder;
+	 cursor: pointer;
+}
+/*input[type="submit"] {
+	border: 0px;
+    background-color: @ButtonBackgroundColor;
+    color: @ButtonColor;
+    padding: 0px 10px;
+	.rounded(5px);
+    height: 18px;
+}*/
+/** acl **/
+#photo-edit-perms-select, #photos-upload-permissions-wrapper, #profile-jot-acl-wrapper {
+  display: block!important;
+}
+#acl-wrapper {
+  width: 690px;
+  float: left;
+}
+#acl-search {
+  float: right;
+  background: #ffffff url("../../../../images/search_18.png") no-repeat right center;
+  padding-right: 20px;
+}
+#acl-showall {
+  float: left;
+  display: block;
+  width: auto;
+  height: 18px;
+  background-color: #cccccc;
+  background-image: url("../../../../images/show_all_off.png");
+  background-position: 7px 7px;
+  background-repeat: no-repeat;
+  padding: 7px 5px 0px 30px;
+  color: #999999;
+  -moz-border-radius: 5px 5px 5px 5px;
+  -webkit-border-radius: 5px 5px 5px 5px;
+  border-radius: 5px 5px 5px 5px;
+}
+#acl-showall.selected {
+  color: #000000;
+  background-color: #ff9900;
+  background-image: url("../../../../images/show_all_on.png");
+}
+#acl-list {
+  height: 210px;
+  border: 1px solid #cccccc;
+  clear: both;
+  margin-top: 30px;
+  overflow: auto;
+}
+.acl-list-item {
+  display: block;
+  width: 150px;
+  height: 30px;
+  border: 1px solid #cccccc;
+  margin: 5px;
+  float: left;
+}
+.acl-list-item img {
+  width: 22px;
+  height: 22px;
+  float: left;
+  margin: 4px;
+}
+.acl-list-item p {
+  height: 12px;
+  font-size: 10px;
+  margin: 0px;
+  padding: 2px 0px 1px;
+  overflow: hidden;
+}
+.acl-list-item a {
+  font-size: 8px;
+  display: block;
+  width: 40px;
+  height: 10px;
+  float: left;
+  color: #999999;
+  background-color: #cccccc;
+  background-position: 3px 3px;
+  background-repeat: no-repeat;
+  margin-right: 5px;
+  -webkit-border-radius: 2px ;
+  -moz-border-radius: 2px;
+  border-radius: 2px;
+  padding-left: 15px;
+}
+#acl-wrapper a:hover {
+  text-decoration: none;
+  color: #000000;
+}
+.acl-button-show {
+  background-image: url("../../../../images/show_off.png");
+}
+.acl-button-hide {
+  background-image: url("../../../../images/hide_off.png");
+}
+.acl-button-show.selected {
+  color: #000000;
+  background-color: #9ade00;
+  background-image: url("../../../../images/show_on.png");
+}
+.acl-button-hide.selected {
+  color: #000000;
+  background-color: #ff4141;
+  background-image: url("../../../../images/hide_on.png");
+}
+.acl-list-item.groupshow {
+  border-color: #9ade00;
+}
+.acl-list-item.grouphide {
+  border-color: #ff4141;
+}
+/** /acl **/
+/** tab buttons 14618a**/
+/*marker*/
+ul.tabs {
+  list-style-type: none;
+  padding-bottom: 10px;
+  font-size: 13px;
+  width: 805px;
+}
+ul.tabs li {
+  float: left;
+  margin-left: 5px;
+}
+ul.tabs li .active {
+    background-color: #996d73;
+    border: 1px solid #777777;
+    color: white;
+    border-radius: 3px 3px 3px 3px;
+    box-shadow: 2px 2px 2px #CFCFCF;
+    margin-left: 5px;
+}
+/**
+ * Form fields
+ */
+.field {
+  margin-bottom: 10px;
+  padding-bottom: 10px;
+  overflow: auto;
+  width: 100%;
+}
+.field label {
+  float: left;
+  width: 200px;
+}
+.field input, .field textarea {
+  width: 400px;
+}
+.field textarea {
+  height: 100px;
+}
+.field .field_help {
+  display: block;
+  margin-left: 200px;
+  color: #666666;
+}
+.field .onoff {
+  float: left;
+  width: 80px;
+}
+.field .onoff a {
+  display: block;
+  border: 1px solid #666666;
+  background-image: url("../../../../images/onoff.jpg");
+  background-repeat: no-repeat;
+  padding: 4px 2px 2px 2px;
+  height: 16px;
+  text-decoration: none;
+}
+.field .onoff .off {
+  border-color: #666666;
+  padding-left: 40px;
+  background-position: left center;
+  background-color: #cccccc;
+  color: #666666;
+  text-align: right;
+}
+.field .onoff .on {
+  border-color: #204A87;
+  padding-right: 40px;
+  background-position: right center;
+  background-color: #D7E3F1;
+  color: #204A87;
+  text-align: left;
+}
+.field .hidden {
+  display: none!important;
+}
+.field.radio .field_help {
+  margin-left: 0px;
+}
+#directory-search-form{
+	margin-bottom: 50px;
+	}
+#profile-edit-links-end {
+        clear: both;
+        margin-bottom: 15px;
+}
+
+#profile-edit-links ul { margin: 20px; padding-bottom: 20px; list-style: none; }
+
+#profile-edit-links li {
+  float: left;
+  list-style: none;
+  margin-left: 10px;
+}
+
+.profile-edit-side-div {
+  display: none;
+}
+
+#register-form label,
+#profile-edit-form label {
+        width: 300px; float: left;
+}
+
+.required {
+  display: inline;
+  color: #B20202;
+}
+
+/* oauth */
+.oauthapp {
+  height: auto;
+  overflow: auto;
+  border-bottom: 2px solid #cccccc;
+  padding-bottom: 1em;
+  margin-bottom: 1em;
+}
+.oauthapp img {
+  float: left;
+  width: 48px;
+  height: 48px;
+  margin: 10px;
+}
+.oauthapp img.noicon {
+  background-image: url("../../../../images/icons/48/plugin.png");
+  background-position: center center;
+  background-repeat: no-repeat;
+}
+.oauthapp a {
+  float: left;
+}
+/* contacts */
+.contact-entry-wrapper {
+  width: 120px;
+  height: 120px;
+  float: left;
+}
+/* photo */
+.photo {
+box-shadow: 2px 2px 5px 0px #000000;
+margin: 0px;
+border-radius: 10px;
+height: 145px !important;
+width: 145px !important;
+}
+.lframe {
+  float: left;
+  /*margin: 0px 10px 10px 0px;*/
+}
+/* profile match wrapper */
+.profile-match-wrapper {
+  float: left;
+  width: 90px;
+  height: 90px;
+  margin-bottom: 20px;
+}
+.profile-match-wrapper .contact-photo {
+  width: 80px;
+  height: 80px;
+}
+.profile-match-wrapper .contact-photo img {
+  width: 80px;
+  height: 80px;
+}
+.profile-match-wrapper {
+  left: 0px;
+  top: 63px;
+}
+
+.contact-photo-menu-button {
+        position: relative;
+        background-image: url("../../../../images/icons/16/menu.png");
+        background-position: top left; 
+        background-repeat: no-repeat;
+        margin: 0px 0px -16px 0px; 
+	padding: 0px;
+        width: 16px;
+        height: 16px;
+        top: -16px; left:0px;
+        overflow: hidden;
+        text-indent: 40px;
+        display: none;
+        
+}
+.contact-photo-menu {
+        width: 11em;
+        border: 3px solid #364e59;
+	color: #2d2d2d;
+        background: #FFFFFF;
+/*        position: absolute;*/
+        position: relative;
+        left: 0px; top: 0px;
+        display: none;
+        z-index: 10000;
+}
+.contact-photo-menu ul { margin:0px; padding: 0px; list-style: none }
+.contact-photo-menu li a {
+	display: block; 
+	padding: 5px 10px; 
+	color: #2d2d2d;
+	text-decoration: none;
+}
+.contact-photo-menu li a:hover {
+	background-color: #bdcdd4; 
+}
+
+/* page footer */
+footer {
+  height: 100px;
+  display: table-row;
+}
+
+blockquote {
+    border-left: 1px solid #D2D2D2;
+    padding-left: 9px;
+    margin: 0 0 0 .8ex;
+	 color: #777;
+}
+.oembed {
+	
+	font-weight: bold;
+}
+.aprofile dt{
+box-shadow: 1px 1px 5px 0;
+    color: #666666;
+    margin: 15px 0 5px;
+    padding-left: 5px;	
+	}
+/* ================== */
+/* = Contacts Block = */
+/* ================== */
+
+.contact-block-img {
+        width: 48px;
+        height: 48px;
+        padding-right: 3px;
+}
+.contact-block-div {
+        float: left;
+}
+
+.contact-block-textdiv { width: 150px; height: 34px; float: left; }
+#contact-block-end { clear: both; } 
+
+#group-edit-wrapper {
+        margin-bottom: 10px;
+}
+
+#group-members-end {
+        clear: both;
+}
+#group-edit-desc {
+ margin-top: 15px;
+}
+
+/*
+#group-separator,
+#prof-separator { display: none;}
+*/
+#prof-members-end{
+	clear: both;
+	}
+
+#prvmail-to-label, #prvmail-subject-label, #prvmail-message-label {
+	margin-bottom: 10px;
+	margin-top: 20px;
+}
+
+#prvmail-submit {
+	float: right;
+	margin-top: 10px;
+}
+
+#prvmail-subject
+{
+background: none repeat scroll 0 0 #FFFFFF;
+border: 1px solid #CCCCCC;
+border-radius: 5px 5px 5px 5px;
+font-weight: bold;
+height: 20px;
+margin: 0 0 5px;
+vertical-align: middle;
+}
+#prvmail-form{
+ width: 597px;	
+	}
+	
+#prvmail-upload-wrapper,
+#prvmail-link-wrapper,
+#prvmail-rotator-wrapper {
+	float: left;
+	margin-top: 10px;
+	margin-right: 10px;
+	width: 24px;
+}
+
+#prvmail-end {
+	clear: both;
+}
+
+.mail-list-sender,
+.mail-list-detail {
+	float: left;
+}
+.mail-list-detail {
+	margin-left: 20px;
+}
+
+.mail-list-subject {
+	font-size: 1.1em;
+	margin-top: 10px;
+}
+a.mail-list-link {
+    display: block;
+    font-size: 1.3em;
+    padding: 4px 0;
+}
+
+/*
+*a.mail-list-link:hover {
+*	background-color: #15607B;
+*	color: #F5F6FB;
+*}
+*/
+
+.mail-list-outside-wrapper-end {
+	clear: both;
+}
+
+.mail-list-outside-wrapper {
+	margin-top: 30px;
+}
+
+.mail-list-delete-wrapper {
+	float: right;
+	margin-right: 30px;
+	margin-top: 15px;
+}
+
+.mail-list-delete-icon {
+	border: none;
+}
+
+.mail-conv-sender,
+.mail-conv-detail {
+	float: left;
+}
+.mail-conv-detail {
+	margin-left: 20px;
+	width: 500px;
+}
+
+.mail-conv-subject {
+    font-size: 1.4em;
+    margin: 10px 0;
+}
+
+.mail-conv-outside-wrapper-end {
+	clear: both;
+}
+
+.mail-conv-outside-wrapper {
+	margin-top: 30px;
+}
+
+.mail-conv-delete-wrapper {
+	float: right;
+	margin-right: 30px;
+	margin-top: 15px;
+}
+.mail-conv-break {
+	clear: both;
+}
+
+.mail-conv-delete-icon {
+	border: none;
+}
+
+/* ========== */
+/* = Events = */
+/* ========== */
+.eventcal {
+        float: left;
+        font-size: 20px;
+}
+
+.vevent {
+
+}
+.vevent .event-description, .vevent .event-location {
+        margin-left: 10px;
+        margin-right: 10px;
+}
+.vevent .event-start {
+        margin-left: 10px;
+        margin-right: 10px;
+}
+
+#new-event-link {
+        margin-bottom: 10px;
+}
+
+.edit-event-link, .plink-event-link {
+        float: left;
+        margin-top: 4px;
+        margin-right: 4px;
+        margin-bottom: 15px;
+}
+
+.event-description:before {
+        content: url('../../../../images/calendar.png');
+        margin-right: 15px;
+}
+
+.event-start, .event-end {
+        margin-left: 10px;
+        width: 330px;
+        clear: both;
+}
+
+.event-start .dtstart, .event-end .dtend {
+        float: right;
+}
+
+.event-list-date {
+        margin-bottom: 10px;
+}
+
+.prevcal, .nextcal {
+        float: left;
+        margin-left: 32px;
+        margin-right: 32px;
+        margin-top: 64px;
+}
+.event-calendar-end {
+        clear: both;
+}
+
+ 
+.calendar {
+        font-family: Courier, monospace;
+}
+.calendar.eventcal a {
+  color: #3465A4;	
+	}
+.today {
+        font-weight: bold;
+        color: #FF0000;
+}
+
+.settings-block {
+        border: 1px solid #AAA;
+        margin: 10px;
+        padding: 10px;
+}
+
+.app-title {
+        margin: 10px;
+}
+
+#identity-manage-desc {
+        margin-top:15px;
+        margin-bottom: 15px;
+}
+
+#identity-manage-choose {
+        margin-bottom: 15px;
+}
+
+#identity-submit {
+        margin-top: 20px;
+}
+
+#photo-prev-link, #photo-next-link {
+        padding: 10px;
+        float: left;
+}
+.lightbox{
+	float: left;
+	}
+
+#photo-photo {
+        float: left;
+}
+#photo-like-div .wall-item-like-buttons {
+	 float: left;
+    margin-right: 5px;
+    margin-top: 30px;
+	}
+.comment-edit-text-empty {
+    margin: 10px 0 0;
+    width: 85%;
+}
+.comment-edit-photo {
+    margin: 10px 0 0;
+}
+.wall-item-like-buttons .icon.like {
+float: left;
+}
+
+#photo-photo-end {
+        clear: both;
+}
+
+.tabs .comment-wwedit-wrapper {
+	display: block;
+   margin-top: 30px;
+   margin-left: 50px;
+	}
+
+.profile-match-photo {
+        float: left;
+        text-align: center;
+        width: 120px;
+}
+
+.profile-match-name {
+        float: left;
+        text-align: center;
+        width: 120px;
+        overflow: hidden;
+}
+
+.profile-match-break,
+.profile-match-end {
+        clear: both;
+}
+
+.profile-match-connect {
+        text-align: center;
+        font-weight: bold;
+}
+
+.profile-match-wrapper {
+        float: left;
+        padding: 10px;
+        width: 120px;
+        height: 120px;
+        scroll: auto;
+}
+#profile-match-wrapper-end {
+        clear: both;
+}
+
+/* ============= */
+/* = Directory = */
+/* ============= */
+/* contacts menu */
+.contact-photo-wrapper {
+  position: relative;
+}
+.contact-photo {
+  width: 48px;
+  height: 48px;
+  overflow: hidden;
+  display: block;
+}
+.contact-photo img {
+  width: 48px;
+  height: 48px;
+}
+.contact-photo-menu-button {
+  display: none;
+  /* position: absolute; */
+  /* position: absolute; */
+  left: 0px;
+  top: -16px;
+}
+.contact-wrapper {
+  float: left;
+  width: 90px;
+  height: 90px;
+  margin-bottom: 15px;
+}
+.contact-wrapper .contact-photo {
+  width: 80px;
+  height: 80px;
+}
+.contact-wrapper .contact-photo img {
+  width: 80px;
+  height: 80px;
+}
+.contact-wrapper .contact-photo-menu-button {
+  left: 0px;
+  top: 63px;
+}
+.directory-item {
+  float: left;
+  width: 200px;
+  height: 200px;
+}
+.directory-item .contact-photo {
+  width: 175px;
+  height: 175px;
+}
+.directory-item .contact-photo img {
+  width: 175px;
+  height: 175px;
+}
+.contact-name {
+  text-align: left;
+  font-weight: bold;
+  font-size: 12px;
+}
+.contact-details {
+  color: #999999;
+}
+#side-bar-photos-albums li{
+list-style-type: disc;
+}
+#side-bar-photos-albums ul li{
+  margin-left: 30px;
+  padding-left: 0px;
+	}
+#side-bar-photos-albums{
+	margin-top: 15px;	
+	}
+.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-album-image-wrapper, .photo-top-image-wrapper {
+  float: left;
+   -moz-box-shadow: 0 0 5px #888;
+   -webkit-box-shadow: 0 0 5px #888;
+   box-shadow: 0 0 5px #888;
+  background-color: #000;
+   -webkit-border-radius: 5px;
+   -moz-border-radius: 5px;
+  border-radius: 5px;
+  padding-bottom: 20px;
+  position: relative;
+  margin: 0 10px 10px 0;
+  width: 200px; height: 140px;
+  overflow: hidden;  
+}
+.photo-top-album-name {
+        width: 100%;
+        position: absolute; 
+        bottom: 0px; 
+        padding-left: 3px;
+        background-color: #EEE;
+}
+.photo-top-album-link{
+  color: #3465A4;
+	}
+.photo-top-album-img{
+	
+	}
+/*.photo-top-image-wrapper {
+        position: relative;
+        float: left;
+        margin-top: 15px;
+        margin-right: 15px;
+        width: 200px; height: 200px; 
+        overflow: hidden; 
+}
+.photo-top-album-name {
+        width: 100%;
+        min-height: 2em;
+        position: absolute; 
+        bottom: 0px; 
+        padding: 0px 3px;
+        padding-top: 0.5em;
+        background-color: rgb(255, 255, 255);
+}*/
+#photo-top-end {
+        clear: both;
+}
+
+#photo-top-links {
+        margin-bottom: 30px;
+        margin-left: 30px;
+}
+
+#photos-upload-newalbum-div {
+        float: left;
+        width: 175px;
+}
+
diff --git a/view/theme/diabook/diabook-pink/style-profile.css b/view/theme/diabook/diabook-pink/style-profile.css
new file mode 100644
index 000000000..8f3753061
--- /dev/null
+++ b/view/theme/diabook/diabook-pink/style-profile.css
@@ -0,0 +1,2603 @@
+/**
+ * Fabio Comuni <http://kirgroup.com/profile/fabrixxm>
+ * Additional Changes: Michael Vogel <icarus@dabo.de>
+ **/
+
+/* ========= */
+/* = Admin = */
+/* ========= */
+
+#adminpage {
+/*        width: 80%;*/
+}
+
+#pending-update {
+        float:right;
+        color: #ffffff;
+        font-weight: bold;
+        background-color: #FF0000;
+        padding: 0em 0.3em;
+}
+
+.admin.linklist {
+        border: 0px; padding: 0px;
+}
+
+.admin.link {
+        list-style-position: inside;
+        font-size: 1em;
+        padding: 5px;
+        width: 100px;
+        margin: 5px;
+}
+
+#adminpage dl {
+        clear: left;
+        margin-bottom: 2px;
+        padding-bottom: 2px;
+        border-bottom: 1px solid black;
+}
+
+#adminpage dt {
+        width: 200px;
+        float: left;
+        font-weight: bold;
+}
+
+#adminpage dd {
+        margin-left: 200px;
+}
+#adminpage h3 {
+        border-bottom: 1px solid #898989;
+        margin-bottom: 5px;
+        margin-top: 10px;
+}
+
+#adminpage .submit {
+        clear:left;
+}
+
+#adminpage #pluginslist {
+        margin: 0px; padding: 0px;
+}
+
+#adminpage .plugin {
+        list-style: none;
+        display: block;
+	/* border: 1px solid #888888; */
+        padding: 1em;
+        margin-bottom: 5px;
+        clear: left;
+}
+
+#adminpage .toggleplugin {
+        float:left;
+        margin-right: 1em;
+}
+
+#adminpage table {width:100%; border-bottom: 1p solid #000000; margin: 5px 0px;}
+#adminpage table th { text-align: left;}
+#adminpage td .icon { float: left;}
+#adminpage table#users img { width: 16px; height: 16px; }
+#adminpage table tr:hover { background-color: #eeeeee; }
+#adminpage .selectall { text-align: right; }
+/* icons */
+
+.icon.contacts {
+  background-image: url("../diabook-pink/icons/contacts.png");}
+.icon.notifications {
+  background-image: url("../diabook-pink/icons/notifications.png");}
+.icon.notify {
+  background-image: url("../diabook-pink/icons/notify.png");}
+.icon.messages {
+  background-image: url("../diabook-pink/icons/messages.png");}
+.icon.community {
+  background-image: url("../diabook-pink/icons/community.png");}
+  
+.icon.drop 	{ background-image: url("../diabook-pink/icons/drop.png");}
+.icon.drophide 	{ background-image: url("../diabook-pink/icons/drop.png");}
+.icon.dislike 	{ background-image: url("../diabook-pink/icons/dislike.png");}
+.icon.like 	{ background-image: url("../diabook-pink/icons/like.png");}
+.icon.pencil 	{ background-image: url("../diabook-pink/icons/pencil.png");}
+.icon.recycle 	{ background-image: url("../diabook-pink/icons/recycle.png");}
+.icon.remote-link { background-image: url("../diabook-pink/icons/remote.png");}
+.icon.tagged    { background-image: url("../diabook-pink/icons/tagged.png");}
+.icon.file-as { background-image: url("../diabook-pink/icons/file_as.png");}
+.star-item.icon.unstarred { background-image: url("../diabook-pink/icons/unstarred.png");}
+.star-item.icon.starred { background-image: url("../diabook-pink/icons/starred.png");}
+.icon.link		{ background-image: url("../diabook-pink/icons/link.png");}
+.icon.lock		{ background-image: url("../diabook-pink/icons/lock.png");}
+.icon.unlock		{ background-image: url("../diabook-pink/icons/unlock.png");}
+.icon.language    { background-image: url("../diabook-pink/icons/language.png");}
+
+
+.camera 	{ background-image: url("../diabook-pink/icons/camera.png"); 
+			  display: block; width: 28px; height: 28px; background-repeat: no-repeat;
+			  }
+.attach 	{ background-image: url("../diabook-pink/icons/attach.png"); 
+			  display: block; width: 28px; height: 28px; background-repeat: no-repeat;
+			  }
+.video2 	{ background-image: url("../diabook-pink/icons/video.png"); 
+			  display: block; width: 28px; height: 28px; background-repeat: no-repeat;
+			  }	
+.video 	{ background-image: url("../diabook-pink/icons/video.png"); 
+			  display: block; width: 100%; height: 140px; background-repeat: no-repeat;
+			  }
+.audio2 	{ background-image: url("../diabook-pink/icons/audio.png"); 
+			  display: block; width: 28px; height: 28px; background-repeat: no-repeat;
+			  }
+.audio 	{ background-image: url("../diabook-pink/icons/audio.png"); 
+			  display: block; width: 28px; height: 28px; background-repeat: no-repeat;
+			  }
+.weblink 	{ background-image: url("../diabook-pink/icons/weblink.png"); 
+			  display: block; width: 28px; height: 28px; background-repeat: no-repeat;
+			  }
+.globe 	{ background-image: url("../diabook-pink/icons/globe.png"); 
+			  display: block; width: 28px; height: 28px; background-repeat: no-repeat;
+			  }
+.unglobe 	{ background-image: url("../diabook-pink/icons/unglobe.png"); 
+			  display: block; width: 28px; height: 28px; background-repeat: no-repeat;
+			  }
+.edit    {background-image: url("../diabook-pink/icons/pencil2.png"); 
+			  display: block; width: 28px; height: 28px; background-repeat: no-repeat;}
+			  
+			  
+
+
+.article	{ background-position: -50px  0px;}
+/*.audio 		{ background-position: -70px  0px;}*/
+.block 		{ background-position: -90px  0px;}
+/*.drop 		{ background-position: -110px 0px;}*/
+/*.drophide 	{ background-position: -130px 0px;}*/
+/*.edit 		{ background-position: -150px 0px;}*/
+/*.camera 	{ background-position: -170px 0px;}*/
+/*.dislike 	{ background-position: -190px 0px;}*/
+/*.like 		{ background-position: -210px 0px;}*/
+/*.link 		{ background-position: -230px 0px;}*/
+
+/*.globe 		{ background-position: -50px  -20px;}*/
+/*.noglobe 	{ background-position: -70px  -20px;}*/
+.no 		{ background-position: -90px  -20px;}
+.pause 		{ background-position: -110px -20px;}
+.play 		{ background-position: -130px -20px;}
+/*.pencil 	{ background-position: -150px -20px;}*/
+.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;}*/
+
+/*.video          { background-position: -110px -40px;}*/
+.youtube        { background-position: -130px -40px;}
+
+/*.attach         { background-position: -190px -40px;}*/
+/*.language       { background-position: -210px -40px;}*/
+
+
+.icon.on             { background-image: url("../diabook-pink/icons/toogle_on.png"); background-repeat: no-repeat;}
+.icon.off            { background-image: url("../diabook-pink/icons/toogle_off.png"); background-repeat: no-repeat;}
+.prev           { background-position: -90px  -60px;}
+.next           { background-position: -110px -60px;}
+/*.tagged     { background-position: -130px -60px;}*/
+
+.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 0px; }
+.type-audio { background-position: -40px 0px; }
+.type-text  { background-position: -60px 0px; }
+.type-unkn  { background-position: -80px 0px; }
+
+.icon.drop, .icon.drophide {
+ float: left;
+}
+
+.icon {
+  display: block;
+  width: 20px;
+  height: 20px;
+  /*background-image: url('icons.png');*/
+}
+
+.icon {
+  background-color: transparent ;
+  background-repeat: no-repeat;
+  /* background-position: left center; */
+  display: block;
+  overflow: hidden;
+  text-indent: -9999px;
+  padding: 1px;
+}
+
+.icon.border.camera{
+  background-image: url("../diabook-pink/icons/camera.png"); 
+  display: block; width: 28px; height: 28px; background-repeat: no-repeat;
+	}
+	
+.icon.border.link{
+  background-image: url("../diabook-pink/icons/weblink.png"); 
+  display: block; width: 28px; height: 28px; background-repeat: no-repeat;
+  margin-left: 10px;
+	}
+
+.icon.text {
+  text-indent: 0px;
+}
+.icon.s10 {
+  min-width: 10px;
+  height: 10px;
+}
+.icon.s10.notify {
+  background-image: url("../../../../images/icons/10/notify_off.png");
+}
+.icon.s10.gear {
+  background-image: url("../../../../images/icons/10/gear.png");
+}
+.icon.s10.add {
+  background-image: url("../../../../images/icons/10/add.png");
+}
+.icon.s10.delete {
+  background-image: url("../../../../images/icons/10/delete.png");
+}
+.icon.s10.edit {
+  background-image: url("../../../../images/icons/10/edit.png");
+}
+.icon.s10.star {
+  background-image: url("../../../../images/star_dummy.png");
+}
+.icon.s10.menu {
+  background-image: url("../../../../images/icons/10/menu.png");
+}
+.icon.s10.link {
+  background-image: url("../../../../images/icons/10/link.png");
+}
+.icon.s10.lock {
+  background-image: url("../../../../images/icons/10/lock.png");
+}
+.icon.s10.unlock {
+  background-image: url("../../../../images/icons/10/unlock.png");
+}
+.icon.s10.text {
+  padding: 2px 0px 0px 15px;
+  font-size: 10px;
+}
+.icon.s16 {
+  min-width: 16px;
+  height: 16px;
+}
+.icon.s16.notify {
+  background-image: url("../../../../images/icons/16/notify_off.png");
+}
+.icon.s16.gear {
+  background-image: url("../../../../images/icons/16/gear.png");
+}
+.icon.s16.add {
+  background-image: url("../../../../images/icons/16/add.png");
+}
+.icon.s16.delete {
+  background-image: url("../../../../images/icons/16/delete.png");
+}
+/*.icon.s16.edit {
+  background-image: url("../../../../images/icons/16/edit.png");
+}*/
+.icon.s16.star {
+  background-image: url("../../../../images/star_dummy.png");
+}
+.icon.s16.menu {
+  background-image: url("../../../../images/icons/16/menu.png");
+}
+/*.icon.s16.link {
+  background-image: url("../../../../images/icons/16/link.png");
+}*/
+.icon.s16.lock {
+  background-image: url("../../../../images/icons/16/lock.png");
+}
+.icon.s16.unlock {
+  background-image: url("../../../../images/icons/16/unlock.png");
+}
+.icon.s16.text {
+  padding: 4px 0px 0px 20px;
+  font-size: 10px;
+}
+.icon.s22 {
+  min-width: 22px;
+  height: 22px;
+}
+.icon.s22.notify {
+  background-image: url("../../../../images/icons/22/notify_off.png");
+}
+.icon.s22.gear {
+  background-image: url("../../../../images/icons/22/gear.png");
+}
+.icon.s22.add {
+  background-image: url("../../../../images/icons/22/add.png");
+}
+.icon.s22.delete {
+  background-image: url("../../../../images/icons/22/delete.png");
+}
+.icon.s22.edit {
+  background-image: url("../../../../images/icons/22/edit.png");
+}
+.icon.s22.star {
+  background-image: url("../../../../images/star_dummy.png");
+}
+.icon.s22.menu {
+  background-image: url("../../../../images/icons/22/menu.png");
+}
+.icon.s22.link {
+  background-image: url("../../../../images/icons/22/link.png");
+}
+.icon.s22.lock {
+  background-image: url("../../../../images/icons/22/lock.png");
+}
+.icon.s22.unlock {
+  background-image: url("../../../../images/icons/22/unlock.png");
+}
+.icon.s22.text {
+  padding: 10px 0px 0px 25px;
+  width: 200px;
+}
+.icon.s48 {
+  width: 48px;
+  height: 48px;
+}
+.icon.s48.notify {
+  background-image: url("../../../../images/icons/48/notify_off.png");
+}
+.icon.s48.gear {
+  background-image: url("../../../../images/icons/48/gear.png");
+}
+.icon.s48.add {
+  background-image: url("../../../../images/icons/48/add.png");
+}
+.icon.s48.delete {
+  background-image: url("../../../../images/icons/48/delete.png");
+}
+.icon.s48.edit {
+  background-image: url("../../../../images/icons/48/edit.png");
+}
+.icon.s48.star {
+  background-image: url("../../../../images/star_dummy.png");
+}
+.icon.s48.menu {
+  background-image: url("../../../../images/icons/48/menu.png");
+}
+.icon.s48.link {
+  background-image: url("../../../../images/icons/48/link.png");
+}
+.icon.s48.lock {
+  background-image: url("../../../../images/icons/48/lock.png");
+}
+.icon.s48.unlock {
+  background-image: url("../../../../images/icons/48/unlock.png");
+}
+
+#contact-edit-links ul {
+  list-style: none;
+  list-style-type: none;
+}
+
+.hide-comments-outer {
+  margin-left: 80px;
+  margin-bottom: 5px;
+  width: 484px;
+  border-bottom: 1px solid #BDCDD4;
+  border-top: 1px solid #BDCDD4;
+
+  padding: 8px;
+}
+
+/* global */
+body {
+  font-family: 'Lato', "Helvetica Neue", Helvetica, Arial, sans-serif;
+  font-size: 12.5px;
+  background-color: #ffffff;
+  color: #2d2d2d;
+  margin: 50px auto auto;
+  display: table;
+}
+
+h4 {
+  font-size: 1.1em;
+}
+
+a {
+	color: #333333;
+	/* color: #3e3e8c; */
+	text-decoration: none;
+}
+a:hover {
+	/* color: blue; */
+	text-decoration: underline
+}
+
+.wall-item-name-link {
+/*  float: left;*/
+}
+
+.wall-item-photo {
+  width: 48px;
+  height: 48px;
+  overflow: hidden;
+  display: block;
+}
+
+.left {
+  float: left;
+}
+.right {
+  float: right;
+}
+.hidden {
+  display: none;
+}
+.clear {
+  clear: both;
+}
+.fakelink {
+  color: #996d73;
+  /* color: #3e3e8c; */
+  text-decoration: none;
+  cursor: pointer;
+}
+.fakelink:hover {
+  /* color: blue; */
+  /*color: #005c94; */
+  text-decoration: underline;
+}
+code {
+  font-family: Courier, monospace;
+  white-space: pre;
+  display: block;
+  overflow: auto;
+  border: 1px solid #444;
+  background: #EEE;
+  color: #444;
+  padding: 10px;
+  margin-top: 20px;
+}
+#panel {
+  position: absolute;
+  width: 12em;
+  background: #ffffff;
+  color: #2d2d2d;
+  margin: 0px;
+  padding: 1em;
+  list-style: none;
+  border: 3px solid #364e59;
+  z-index: 100000;
+  -webkit-box-shadow: 0px 5px 10px rgba(0, 0, 0, 0.7);
+  -moz-box-shadow: 0px 5px 10px rgba(0, 0, 0, 0.7);
+  box-shadow: 0px 5px 10px rgba(0, 0, 0, 0.7);
+}
+/* tool */
+.tool {
+  height: auto;
+  overflow: auto;
+  padding: 3px;
+}
+#saved-search-ul .tool:hover,
+#nets-sidebar .tool:hover,
+#sidebar-group-list .tool:hover {
+	background: #EEE;
+}
+.tool .label {
+  float: left;
+}
+.tool .action {
+  float: right;
+}
+.tool a {
+  color: ##3F8FBA;
+}
+.tool a:hover {
+  text-decoration: none;
+}
+/* popup notifications */
+div.jGrowl div.notice {
+  background: #511919 url("../../../../images/icons/48/notice.png") no-repeat 5px center;
+  color: #ffffff;
+  padding-left: 58px;
+}
+div.jGrowl div.info {
+  background: #364e59 url("../../../../images/icons/48/info.png") no-repeat 5px center;
+  color: #ffffff;
+  padding-left: 58px;
+}
+/* header */
+header {
+  position: fixed;
+  left: 0%;
+  right: 80%;
+  top: 0px;
+  margin: 0px;
+  padding: 0px;
+  width: 22%;
+  height: 32px;
+  background: #FFC1CA;
+  background-color: #FFC1CA;
+  z-index: 100;
+-webkit-box-shadow: -10px 0px 10px rgba(0, 0, 0, 0.7);
+  -moz-box-shadow: -10px 0px 10px rgba(0, 0, 0, 0.7);
+  box-shadow: -10px 0px 10px rgba(0, 0, 0, 0.7);
+   
+}
+header #site-location {
+  display: none;
+}
+header #banner {
+  overflow: hidden;
+  text-align: left;
+  width: 82%%;
+  margin-left: 25%;
+}
+header #banner a,
+header #banner a:active,
+header #banner a:visited,
+header #banner a:link,
+header #banner a:hover {
+  color: #1f1f1f;
+  text-decoration: none;
+  outline: none;
+  vertical-align: middle;
+  font-weight: bolder;
+  margin-left: 3px;
+}
+header #banner #logo-img {
+  height: 25px;
+  margin-top: 3px;
+}
+header #banner #logo-text {
+  font-size: 20px;
+  position: absolute;
+  top: 10%;
+}
+/* nav */
+nav {
+  width: 80%;
+  height: 32px;
+  position: fixed;
+  left: 22%;
+  top: 0px;
+  padding: 0px;
+  background: #FFC1CA;
+  color: #1f1f1f;
+  z-index: 99;
+  -webkit-box-shadow: -10px 0px 10px rgba(0, 0, 0, 0.7);
+  -moz-box-shadow: -10px 0px 10px rgba(0, 0, 0, 0.7);
+  box-shadow: -10px 0px 10px rgba(0, 0, 0, 0.7);
+}
+nav a,
+nav a:active,
+nav a:visited,
+nav a:link,
+nav a:hover {
+  color: #1f1f1f;
+  text-decoration: none;
+  outline: none;
+}
+nav #banner {
+  overflow: hidden;
+  /*text-align: center;*/
+  width: 100%;
+}
+nav #banner a,
+nav #banner a:active,
+nav #banner a:visited,
+nav #banner a:link,
+nav #banner a:hover {
+  color: #1f1f1f;
+  text-decoration: none;
+  outline: none;
+  vertical-align: bottom;
+}
+nav #banner #logo-img {
+  height: 22px;
+  margin-top: 5px;
+}
+nav #banner #logo-text {
+  font-size: 22px;
+}
+nav #navbar{
+	}
+nav ul {
+  margin: 0px;
+  padding: 0px 20px;
+}
+nav ul li {
+  list-style: none;
+  margin: 0px;
+  /* padding: 1px 1px 3px 1px; */
+  float: left;
+}
+nav ul li .menu-popup {
+  left: 0px;
+  right: auto;
+}
+
+nav #logo-img {
+  height: 25px;
+  margin-top: 4px;
+  margin-left: 30px;
+}
+
+nav #logo-text {
+    font-size: 22px;
+    margin-top: 3px;
+    margin-right: 15px;
+}
+nav .nav-menu-search {
+  position: relative;
+
+  margin: 4px 17px;
+  margin-right: 0px;
+  height: 17px;
+  width: 180px;
+  
+}
+
+nav #search-box #search-text {
+  background-image:  url('icons/lupe.png');
+  background-repeat:no-repeat;
+  padding-left:20px;
+  border-top-left-radius: 15px;
+border-top-right-radius: 15px;
+border-bottom-right-radius: 15px;
+border-bottom-left-radius: 15px;
+	}
+
+
+nav .nav-menu-icon {
+  position: relative;
+  height: 22px;
+  padding: 5px;
+  margin: 0px 5px;
+  -moz-border-radius: 5px 5px 0 0;
+  -webkit-border-radius: 5px 5px 0 0;
+  border-radius: 5px 5px 0 0;
+}
+nav .nav-menu-icon:hover {
+  position: relative;
+  height: 22px;
+  padding: 5px;
+  margin: 0px 5px;
+  -moz-border-radius: 5px 5px 0 0;
+  -webkit-border-radius: 5px 5px 0 0;
+  border-radius: 5px 5px 0 0;
+}
+
+/*color*/
+nav .nav-menu-icon.selected {
+  background-color: #FFE9EC;
+}
+nav .nav-menu-icon img {
+  width: 22px;
+  height: 22px;
+}
+nav .nav-menu-icon .nav-notify {
+  top: 3px;
+}
+nav .nav-menu {
+  position: relative;
+  height: 16px;
+  padding: 5px;
+  margin: 3px 15px 0px;
+  font-size: 13px;
+  /*border-bottom: 3px solid #364A84;*/
+}
+nav .nav-menu.selected {
+  /*border-bottom: 3px solid #9eabb0;*/
+}
+nav .nav-notify {
+  display: none;
+  position: absolute;
+  background-color: #fff;
+  /* background-color: #19aeff; */
+  -moz-border-radius: 5px 5px 5px 5px;
+  -webkit-border-radius: 5px 5px 5px 5px;
+  border-radius: 5px 5px 5px 5px;
+  font-size: 10px;
+  font-weight: 900;
+  padding: 1px 4px;
+  top: 0px;
+  right: -6px;
+  min-width: 10px;
+  text-align: center;
+  border: 1px solid black;
+}
+nav .nav-notify.show {
+  display: block;
+}
+nav #nav-help-link,
+nav #nav-search-link,
+nav #nav-directory-link,
+nav #nav-apps-link,
+nav #nav-site-linkmenu, 
+nav #nav-home-link,
+nav #nav-user-linkmenu
+{
+  float: right;
+}
+nav #nav-user-linkmenu{
+	margin-right: 0px;
+	}
+nav #nav-home-link, #nav-directory-link, #nav-apps-link{
+	margin-left: 0px;
+	margin-right: 0px;
+	font-weight: bold;
+	margin: 3px 5px;
+	font-size: 14px;
+	}
+nav #nav-directory-link{
+  margin-right: 0px;	
+	}
+nav #nav-home-link{
+  margin-left: 0px;	
+	}
+nav #nav-help-link .menu-popup,
+nav #nav-search-link .menu-popup,
+nav #nav-directory-link .menu-popup,
+nav #nav-apps-link .menu-popup,
+nav #nav-site-linkmenu .menu-popup {
+  right: 0px;
+  left: auto;
+}
+
+nav #nav-messages-linkmenu.on .icon.messages, nav #nav-messages-linkmenu.selected .icon.messages{
+	background-image: url("../diabook-pink/icons/messages.png");
+	}
+	
+/*nav #nav-notifications-linkmenu.on .icon.notify,*/ nav #nav-notifications-linkmenu.selected .icon.notify{
+	background-image: url("../diabook-pink/icons/notify.png");
+	}
+	
+nav #nav-contacts-linkmenu.on .icon.contacts, nav #nav-contacts-linkmenu.selected .icon.contacts{
+	background-image: url("../diabook-pink/icons/contacts.png");
+	}
+	
+nav #nav-apps-link.selected {
+ background-color: #fff;
+  moz-border-radius: 5px 5px 0 0;
+-webkit-border-radius: 5px 5px 0 0;
+border-radius: 5px 5px 0 0;
+}
+
+#nav-notifications-mark-all {
+	/* padding: 1px 1px 2px 26px; */
+	/* border-bottom: 1px solid #364E59; */
+	/* margin: 0px 0px 2px 0px;
+	padding: 5px 10px; */
+}
+
+#nav-notifications-see-all {
+	/* padding: 1px 1px 2px 26px; */
+	/* border-bottom: 1px solid #364E59; */
+	/* margin: 0px 0px 2px 0px;
+	padding: 5px 10px; */
+}
+
+.notify-seen {
+	background: none repeat scroll 0 0 #DDDDDD;
+	}
+
+ul.menu-popup {
+  position: absolute;
+  display: none;
+  width: 11em;
+  background: #fff;
+  color: #2d2d2d;
+  margin: 0px;
+  padding: 0px;
+  list-style: none;
+  z-index: 100000;
+  -webkit-box-shadow: 0px 5px 10px rgba(0, 0, 0, 0.7);
+  -moz-box-shadow: 0px 5px 10px rgba(0, 0, 0, 0.7);
+  box-shadow: 0px 5px 10px rgba(0, 0, 0, 0.7);
+}
+ul.menu-popup a {
+  display: block;
+  color: #2d2d2d;
+  padding: 5px 10px;
+  text-decoration: none;
+}
+ul.menu-popup a:hover {
+  background-color: #996d73; /*bdcdd4;*/
+  color: #fff;
+}
+ul.menu-popup .menu-sep {
+  border-top: 1px solid #9eabb0;
+}
+ul.menu-popup li {
+  float: none;
+  overflow: auto;
+  height: auto;
+  display: block;
+}
+ul.menu-popup li img {
+  float: left;
+  width: 16px;
+  height: 16px;
+  padding-right: 5px;
+}
+ul.menu-popup .empty {
+  padding: 5px;
+  text-align: center;
+  color: #9eabb0;
+}
+/* autocomplete popup */
+.acpopup {
+  max-height: 150px;
+  background-color: #ffffff;
+  color: #2d2d2d;
+  border: 1px solid #MenuBorder;
+  overflow: auto;
+  z-index: 100000;
+  -webkit-box-shadow: 0px 5px 10px rgba(0, 0, 0, 0.7);
+  -moz-box-shadow: 0px 5px 10px rgba(0, 0, 0, 0.7);
+  box-shadow: 0px 5px 10px rgba(0, 0, 0, 0.7);
+}
+.acpopupitem {
+  color: #2d2d2d;
+  padding: 4px;
+  clear: left;
+}
+.acpopupitem img {
+  float: left;
+  margin-right: 4px;
+}
+.acpopupitem.selected {
+  background-color: #bdcdd4;
+}
+#nav-notifications-menu {
+  width: 400px;
+  max-height: 550px;
+  overflow: auto;
+}
+/* #nav-notifications-menu a {
+	display: inline;
+	padding: 5px 0px;
+	margin: 0px 0px 2px 0px;
+}
+#nav-notifications-menu li:hover {
+  background-color: #bdcdd4;
+}*/
+
+#nav-notifications-menu img {
+  float: left;
+  margin-right: 5px;
+}
+#nav-notifications-menu .contactname {
+  font-weight: bold;
+}
+#nav-notifications-menu .notif-when {
+  font-size: 10px;
+  color: #9eabb0;
+  display: block;
+}
+
+.notif-image {
+        width: 32px;
+        height: 32px;
+        padding: 7px 7px 0px 0px;
+}
+
+/*profile_side*/
+#profile_side {
+  margin-bottom: 30px;
+}
+#ps-usericon{
+	height: 25px	
+	}
+#ps-username{
+  font-size: 1.17em;
+  font-weight: bold;
+  vertical-align: top;
+  position: absolute;
+  padding-top: 4px;
+  padding-left: 5px;	
+  word-wrap: break-word;
+  width: 130px;
+	}
+#ps-username:hover{
+  text-decoration: none;	
+	}
+.menu-profile-side{
+  list-style: none;	
+  padding-left: 0px;
+  min-height: 0px;
+	}
+.menu-profile-list{
+  height: auto;
+  overflow: auto;
+  padding-top: 3px;
+  padding-bottom: 3px;
+  padding-left: 16px;
+  min-height: 16px;
+  list-style: none;
+	}
+.menu-profile-list:hover{
+	background: #FFF4F6;
+	}
+.menu-profile-list-item{
+	padding-left: 5px;
+	}	
+.menu-profile-list-item:hover{	
+	text-decoration: none;
+   }
+/*http://prothemedesign.com/circular-icons/*/
+.menu-profile-list.home{
+	background: url("../diabook-pink/icons/home.png") no-repeat;
+	}
+.menu-profile-list.photos{
+	background: url("../diabook-pink/icons/mess_side.png") no-repeat;
+	}
+.menu-profile-list.events{
+	background: url("../diabook-pink/icons/events.png") no-repeat;
+	}
+.menu-profile-list.notes{
+	background: url("../diabook-pink/icons/notes.png") no-repeat;
+	}
+.menu-profile-list.foren{
+	background: url("../diabook-pink/icons/pubgroups.png") no-repeat;
+	}
+.menu-profile-list.com_side{
+	background: url("../diabook-pink/icons/com_side.png") no-repeat;
+	}
+
+/* aside */
+aside {
+  display: table-cell;
+  vertical-align: top;
+  width: 160px;
+  padding: 0px 10px 0px 10px;
+  border-right: 1px solid #D2D2D2;
+  float: left;
+  /* background: #F1F1F1; */
+}
+
+aside .vcard .fn {
+  font-size: 18px;
+  font-weight: bold;
+  margin-bottom: 5px;
+}
+aside .vcard .title {
+  margin-bottom: 5px;
+}
+aside .vcard dl {
+  height: auto;
+  overflow: auto;
+}
+aside .vcard dt {
+  float: left;
+  margin-left: 0px;
+  /*width: 35%;*/
+  text-align: right;
+  color: #999999;
+}
+aside .vcard dd {
+  float: left;
+  margin-left: 5px;
+  /*width: 60%;*/
+}
+aside #profile-extra-links ul {
+  padding: 0px;
+  margin: 0px;
+}
+aside #profile-extra-links li {
+  padding: 0px;
+  margin: 0px;
+  list-style: none;
+}
+aside #dfrn-request-link {
+  display: block;
+  -moz-border-radius: 5px 5px 5px 5px;
+  -webkit-border-radius: 5px 5px 5px 5px;
+  border-radius: 5px 5px 5px 5px;
+  color: #ffffff;
+  background: #005c94 url('../../../../images/connect-bg.png') no-repeat left center;
+  font-weight: bold;
+  text-transform: uppercase;
+  padding: 4px 2px 2px 35px;
+}
+aside #dfrn-request-link:hover {
+  text-decoration: none;
+  background-color: #36c;
+  /* background-color: #19aeff; */
+}
+aside #profiles-menu {
+  width: 20em;
+}
+aside #search-text {
+	width: 150px;
+	height: 17px;
+	padding-left: 10px;
+	border-top-left-radius: 15px;
+border-top-right-radius: 15px;
+border-bottom-right-radius: 15px;
+border-bottom-left-radius: 15px;
+}
+aside #side-follow-url {
+	width: 150px;
+	}
+aside #side-peoplefind-url {
+	width: 150px;
+	}
+#contact-block {
+  overflow: auto;
+  height: auto;
+}
+#contact-block .contact-block-h4 {
+  float: left;
+  margin: 5px 0px;
+}
+#contact-block .allcontact-link {
+  float: right;
+  margin: 5px 0px;
+}
+#contact-block .contact-block-content {
+  clear: both;
+  overflow: auto;
+  height: auto;
+}
+#contact-block .contact-block-link {
+  float: left;
+  margin: 0px 2px 2px 0px;
+}
+#contact-block .contact-block-link img {
+  widht: 48px;
+  height: 48px;
+}
+#lost-password-link {
+  float: left;
+  margin-right: 20px;	
+	}
+/* widget */
+.widget {
+  margin-bottom: 2em;
+  /*.action .s10 { width: 10px; overflow: hidden; padding: 0px;}
+	.action .s16 { width: 16px; overflow: hidden; padding: 0px;}*/
+/*  font-size: 12px; */
+}
+.widget h3 {
+  padding: 0px;
+  margin: 2px;
+}
+.widget .action {
+  opacity: 0.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;
+}
+.widget input.action {
+  opacity: 0.5;
+  -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;
+}
+.widget:hover .title .action {
+  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;
+}
+.widget .tool:hover .action {
+  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;
+}
+.widget .tool:hover .action.ticked {
+  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;
+}
+.widget ul {
+  padding: 0px;
+}
+.widget ul li {
+  padding-left: 16px;
+  min-height: 16px;
+  list-style: none;
+}
+#side-bar-photos-albums li{
+list-style-type: disc;
+}
+#side-bar-photos-albums ul li{
+  margin-left: 30px;
+  padding-left: 0px;
+	}
+#side-bar-photos-albums ul li a{
+  color: #3465A4;
+}
+.widget .tool.selected {
+  background: url("../diabook-pink/icons/selected.png") no-repeat left center;
+}
+/* widget: search */
+span.sbox_l  {
+	background: white url('../diabook/icons/srch_l.gif') no-repeat top left;
+	float: left;
+	width: 19px; height: 19px;
+	margin-left: 10px;
+	margin-top: 5px;
+	
+}
+
+span.sbox_r  {
+	background: white url('../diabook/icons/srch_r.gif') no-repeat top left;
+	float: left;
+	width: 19px; height: 19px;
+	margin-top: 5px;
+}
+
+span.sbox input {
+	background: white url('../diabook/icons/srch_bg.gif') repeat-x top left;
+	float: left;
+	margin-top: 5px;
+	border: 0;
+	height: 13px; width: 100px;
+	padding: 3px;
+	font: 11px/13px arial;
+	color: #000;
+}
+#add-search-popup {
+  width: 200px;
+  top: 18px;
+}
+/* section */
+section {
+  display: table-cell;
+  vertical-align: top;
+  width: 611px;
+  padding: 0px 0px 0px 12px;
+}
+
+body .pageheader{
+  text-align: center;
+  font-size: 20px;
+  margin-bottom: 20px;
+  margin-top: 0px;
+  max-width: 575px;
+	}
+.qcomment{
+  max-width: 122px;	
+	}
+#id_username {
+  width: 173px;	
+	}
+#id_password {
+  width: 173px;		
+	}
+#id_openid_url {
+  width: 173px;	
+	}
+#contact-edit-end {
+	}
+.pager {
+   padding: 10px;
+	text-align: center;
+	font-size: 1.0em;
+	clear: both;
+	display: block;
+}	
+
+.tabs {
+    
+    background-position: 0 -20px;
+    background-repeat: repeat-x;
+    height: 27px;
+    padding: 0;
+ }
+.tab.button {
+    margin-left: 5px;	
+    /*background: none repeat scroll 0 0 #F8F8F8;*/
+    border: 1px solid #CCCCCC;
+    border-radius: 3px 3px 3px 3px;
+    font-weight: normal;
+    padding: 3px;
+    color:  #333333;
+	}
+	
+#birthday-notice, #event-notice, #birthday-wrapper, #event-wrapper{
+	margin-bottom: 10px;
+	}
+#birthday-wrapper a {
+	color: #3465A4;
+	}
+
+right_aside {
+  display: table-cell;
+  vertical-align: top;
+  width: 170px;
+  /*padding-right: 10px;*/
+  /*border-left: 1px solid #D2D2D2;*/
+  
+  /* background: #F1F1F1; */
+}
+right_aside a{color: #3465A4;}
+right_aside h3 {border-bottom: 1px solid #D2D2D2; padding-top: 5px; padding-bottom: 0px; padding-left: 9px; margin-bottom: 0px; 
+margin-top:30px;}
+right_aside .directory-item {	width: 50px; height: 50px; vertical-align: center; text-align: center; }
+right_aside .directory-photo { margin: 0px; }
+right_aside .directory-photo-img { max-width: 45px; max-height: 45px; }
+right_aside #likes { margin: 0px; padding: 0px; list-style: none; }
+right_aside .items-wrapper{ overflow: auto;	width: 100%; }
+right_aside #lastusers-wrapper { padding-left: 6px; padding-top: 3px; overflow: auto;	width: 100%; }
+right_aside #ra-photos-wrapper { padding-left: 5px; padding-top: 3px; overflow: auto;	width: 100%; }
+#page-sidebar-right_aside{margin-top: 0px; margin-bottom: 30px;}
+#page-sidebar-right_aside ul {margin-top: 0px;}
+#page-sidebar-right_aside .label {max-width: 128px;}
+right_aside .icon {width: 10px; height: 10px;}
+.close_box		{ 
+		background-image: url("../diabook-pink/icons/close_box.png");
+		float: right;
+		cursor: pointer;
+		opacity: 0.1;
+		}
+.close_box:hover	{ 
+		background-image: url("../diabook-pink/icons/close_box.png");
+		float: right;
+		cursor: pointer;
+		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;
+		}
+/* wall item */
+.tread-wrapper {
+  border-bottom: 1px solid #D2D2D2;
+  position: relative;
+  padding: 5px;
+  margin-bottom: 0px;
+  width: 575px;
+  padding-top: 10px;
+}
+.tread-wrapper a{
+  color: #996d73;
+}
+
+.wall-item-decor {
+  position: absolute;
+  left: 790px;
+  top: -10px;
+  width: 16px;
+}
+
+.wall-item-container {
+  display: table;
+  width: 580px;
+}
+
+
+.wall-item-container .wall-item-item, .wall-item-container .wall-item-bottom {
+  display: table-row;
+}
+
+.wall-item-bottom {
+  font-size: 13px;
+}
+.wall-item-container .wall-item-bottom {
+/*  opacity: 0.5;
+  -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; */
+}
+.wall-item-container:hover .wall-item-bottom {
+/*  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; */
+}
+.wall-item-container .wall-item-info {
+  display: table-cell;
+  vertical-align: top;
+  text-align: left;
+  width: 80px;
+}
+.wall-item-container .wall-item-location {
+  padding-right: 40px;
+  display: table-cell;
+}
+.wall-item-container .wall-item-ago {
+  word-wrap: break-word;
+  width: 50px;
+  margin-left: 10px;
+  color: #999;
+}
+.wall-item-location {
+  
+  clear: both;
+  overflow: hidden;
+  
+  margin-bottom: 5px;
+}
+
+.wall-item-container .wall-item-content {
+
+  max-width: 420px;
+  word-wrap: break-word;
+
+
+}
+
+.wall-item-container .wall-item-content img {
+  max-width: 400px;
+
+}
+.wall-item-container .wall-item-links, .wall-item-container .wall-item-actions {
+  display: table-cell;
+  vertical-align: middle;
+}
+.wall-item-container .wall-item-links .icon, .wall-item-container .wall-item-actions .icon {
+  opacity: 0.5;
+  -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;
+}
+.wall-item-container .wall-item-links .icon:hover, .wall-item-container .wall-item-actions .icon: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;
+}
+.wall-item-container .wall-item-name {
+  font-weight: bold;
+}
+.wall-item-container .wall-item-actions-author {
+  width: 100%;
+  margin-bottom: 0.3em;
+}
+.wall-item-container .wall-item-actions-social {
+  float: left;
+  margin-bottom: 1px;
+  display: table-cell;
+}
+.wall-item-container .wall-item-actions-social a {
+  margin-right: 1em;
+}
+.wall-item-actions-social a {
+  float: left;
+}
+.wall-item-container .wall-item-actions-tools {
+  float: right;
+  width: 80px;
+  display: table-cell;
+}
+.wall-item-container .wall-item-actions-tools a {
+  float: right;
+}
+.wall-item-container .wall-item-actions-tools input {
+  float: right;
+}
+.wall-item-container.comment {
+  margin-top: 5px;
+  margin-bottom: 5px;
+  margin-left: 80px;
+  width: 500px;
+  border-bottom: 1px solid hsl(198, 21%, 79%);
+}
+.wall-item-container.comment .contact-photo {
+  width: 32px;
+  height: 32px;
+  margin-left: 16px;
+  /*background: url(../../../../images/icons/22/user.png) no-repeat center center;*/
+
+}
+.wall-item-container.comment {
+  top: 15px !important;
+  left: 15px !important;
+}
+.wall-item-container.comment .wall-item-links {
+  padding-left: 12px;
+}
+.wall-item-comment-wrapper {
+  margin: 1px 5px 5px 80px;
+}
+.wall-item-comment-wrapper .comment-edit-photo {
+  display: none;
+}
+.wall-item-comment-wrapper textarea {
+  height: 2.0em;
+  width: 100%;
+  font-size: 10px;
+  color: #999999;
+  border: 1px solid #DDD;
+  padding: 0.3em;
+  font-size: 14px;
+}
+.wall-item-comment-wrapper .comment-edit-text-full {
+  font-size: 14px;
+  height: 4em;
+  color: #2d2d2d;
+  border: 1px solid #2d2d2d;
+}
+.comment-edit-preview {
+  width: 500px;
+  margin-top: 10px;
+  background-color:  #fff797;
+}
+.comment-edit-preview .contact-photo {
+  width: 32px;
+  height: 32px;
+  margin-left: 16px;
+  /*background: url(../../../../images/icons/22/user.png) no-repeat center center;*/
+
+}
+.comment-edit-preview {
+  top: 15px !important;
+  left: 15px !important;
+}
+.comment-edit-preview .wall-item-links {
+  padding-left: 12px;
+}
+.comment-edit-preview .wall-item-container {
+  width: 700px;
+}
+.comment-edit-preview .tread-wrapper {
+  width: 700px;
+  padding: 0;
+  margin: 10px 0;
+}
+
+.shiny {
+  /* border-right: 10px solid #fce94f; */
+	border-right: 1px solid #A7C7F7;
+	padding-right: 12px;
+}
+
+#jot-preview-content{
+	margin-top: 30px;}
+	
+#jot-preview-content .tread-wrapper {
+  background-color: #fff797;
+}
+
+.wall-item-tags {
+  padding-top: 1px;
+  padding-bottom: 2px;
+}
+.tag {
+  /*background: url("../../../../images/tag_b.png") repeat-x center left;*/
+  color: #999;
+  padding-left: 3px;
+  font-size: 12px;
+}
+.tag a {
+  padding-right: 5px;
+  /*background: url("../../../../images/tag.png") no-repeat center right;*/
+  color: #999;
+}
+.wwto {
+  position: absolute !important;
+  width: 25px;
+  height: 25px;
+  background: #FFFFFF;
+  border: 2px solid #364e59;
+  height: 25px;
+  width: 25px;
+  overflow: hidden;
+  padding: 1px;
+  position: absolute !important;
+  top: 40px;
+  left: 30px;
+  -webkit-box-shadow: 0px 0px 10px rgba(0, 0, 0, 0.7);
+  -moz-box-shadow: 0px 0px 10px rgba(0, 0, 0, 0.7);
+  box-shadow: 0px 0px 10px rgba(0, 0, 0, 0.7);
+}
+.wwto .contact-photo {
+  width: auto;
+  height: 25px;
+}
+/* contacts menu */
+.contact-photo-wrapper {
+  position: relative;
+  width: 80px;
+}
+
+.contact-photo-wrapper.wwto {
+  width: 25px;
+}
+
+.contact-photo {
+  width: 48px;
+  height: 48px;
+  overflow: hidden;
+  display: block;
+}
+.contact-photo img {
+  width: 48px;
+  height: 48px;
+}
+
+.contact-wrapper {
+  float: left;
+  width: 90px;
+  height: 90px;
+  margin-bottom: 15px;
+}
+.contact-wrapper .contact-photo {
+  width: 80px;
+  height: 80px;
+}
+.contact-wrapper .contact-photo img {
+  width: 80px;
+  height: 80px;
+}
+.contact-wrapper {
+  left: 0px;
+  top: 63px;
+}
+.contact-photo {
+  width: 48px;
+  height: 48px;
+}
+.contact-photo img {
+  width: 48px;
+  height: 48px;
+}
+.contact-name {
+  /* text-align: center; */
+  /*font-weight: bold;*/
+  font-size: 12px;
+}
+.contact-details {
+  color: #999999;
+}
+/* editor */
+.jothidden {
+  display: none;
+}
+#jot {
+  width: 585px;
+  margin: 0px 2em 20px 0px;
+}
+#profile-jot-form #profile-jot-text {
+  height: 2.0em;
+  width: 99%;
+  font-size: 15px;
+  color: #999999;
+  border: 1px solid #DDD;
+  padding: 0.3em;
+  margin-bottom: 10px;
+}
+.grey
+{
+  display: inline;
+  float: right;	
+	}
+#jot #jot-tools {
+  margin: 0px;
+  padding: 0px;
+  height: 40px;
+  overflow: none;
+  width: 583px;
+  background-color: #fff;
+  border-bottom: 2px solid #9eabb0;
+}
+
+#jot #jot-tools li {
+  list-style: none;
+  float: left;
+  width: 80px;
+  height: 40px;
+  border-bottom: 2px solid #9eabb0;
+}
+#jot #jot-tools li a {
+  display: block;
+  color: #cccccc;
+  width: 100%;
+  height: 40px;
+  text-align: center;
+  line-height: 40px;
+  overflow: hidden;
+}
+#jot #jot-tools li:hover {
+  background-color: #364e59;
+  border-bottom: 2px solid #bdcdd4;
+}
+#jot #jot-tools li.perms {
+  float: right;
+  width: 40px;
+}
+#jot #jot-tools li.perms a.unlock {
+  width: 30px;
+  border-left: 10px solid #cccccc;
+  background-color: #cccccc;
+  background-position: left center;
+}
+#jot #jot-tools li.perms a.lock {
+  width: 30px;
+  border-left: 10px solid #666666;
+  background-color: #666666;
+}
+#jot #jot-tools li.submit {
+  float: right;
+  background-color: #cccccc;
+  border-bottom: 2px solid #cccccc;
+  border-right: 1px solid #666666;
+  border-left: 1px solid #666666;
+}
+#jot #jot-tools li.submit input {
+  border: 0px;
+  margin: 0px;
+  padding: 0px;
+  background-color: #cccccc;
+  color: #666666;
+  width: 80px;
+  height: 40px;
+  line-height: 40px;
+}
+#jot #jot-tools li.submit input:hover {
+  background-color: #bdcdd4;
+  color: #666666;
+}
+#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;
+}
+#profile-jot-form #jot-title {
+    
+  	 border-radius: 5px 5px 5px 5px;
+    font-weight: bold;
+    height: 20px;
+    margin: 0 0 5px;
+    width: 60%;
+    border: 1px solid #d2d2d2;
+}
+#profile-jot-form #jot-title:-webkit-input-placeholder {
+  font-weight: normal;
+}
+#profile-jot-form #jot-title:-moz-placeholder {
+  font-weight: normal;
+}
+#profile-jot-form #profile-jot-text_parent #profile-jot-text_tbl{
+	width: 585px;
+	height: 100px;
+	}
+#jot #jot-title:hover {
+  border: 1px solid #999999;
+}
+#jot #jot-title:focus {
+  border: 1px solid #999999;
+}
+#jot #character-counter {
+  width: 80px;
+  float: right;
+  text-align: right;
+  height: 20px;
+  line-height: 20px;
+  padding-right: 20px;
+}
+#jot-perms-icon, 
+#profile-location,
+#profile-nolocation,
+#profile-youtube, 
+#profile-video, 
+#profile-audio,
+#profile-link,
+#profile-title, 
+#wall-image-upload,
+#wall-file-upload,
+#wall-image-upload-div,
+#wall-file-upload-div,
+.hover, .focus {
+	cursor: pointer;
+	margin-top: 2px;
+}
+#profile-jot-wrapper{
+	margin: 0 2em 20px 0;
+   width: 585px;
+	}
+
+#profile-jot-submit-wrapper {
+	margin-bottom: 50px;
+	width: 585px;
+}
+
+#profile-jot-submit {
+	float: right;
+	margin-top: 2px;
+	font-size: 14px;
+}
+#profile-upload-wrapper {
+	float: left;
+	margin-top: 2px;
+	margin-left: 10px;
+	
+}
+#profile-attach-wrapper {
+	float: left;
+	margin-left: 15px;
+	margin-top: 2px;
+}
+#profile-rotator {
+	float: left;
+	margin-left: 30px;
+	margin-top: 2px;
+}
+#profile-link-wrapper {
+	float: left;
+	margin-left: 15px;
+	margin-top: 2px;
+}
+#profile-youtube-wrapper {
+	float: left;
+	margin-left: 15px;
+	margin-top: 2px;
+}
+#profile-video-wrapper {
+	float: left;
+	margin-left: 15px;
+	margin-top: 2px;
+}
+#profile-audio-wrapper {
+	float: left;
+	margin-left: 15px;
+	margin-top: 2px;
+}
+#profile-location-wrapper {
+	float: left;
+	margin-left: 15px;
+	margin-top: 2px;
+}
+#profile-jot-perms {
+	float: left;
+	margin-left: 45px;
+	margin-top: 2px;
+}
+#jot-preview-link {
+	float: right;
+	margin-left: 10px;
+	margin-top: 2px;
+	font-size: 9px;
+	font-weight: bolder;
+	cursor: pointer;
+}
+#profile-jot-perms{
+   float: right;
+	margin-left: 10px;
+	margin-top: 2px;	
+	}
+/** buttons **/
+.button.creation1 {
+    background-color: #fff;
+    border: 1px solid #777777;
+    border-radius: 3px 3px 3px 3px;
+    box-shadow: 0 1px 1px #CFCFCF;
+ 	 font-weight: bolder;
+	 cursor: pointer;
+}
+.button.creation2 {
+    background-color: #996d73;
+    border: 1px solid #777777;
+    color: white;
+    border-radius: 3px 3px 3px 3px;
+    box-shadow: 0 1px 1px #CFCFCF;
+    margin-left: 5px;
+    font-weight: bolder;
+	 cursor: pointer;
+}
+/*input[type="submit"] {
+	border: 0px;
+    background-color: @ButtonBackgroundColor;
+    color: @ButtonColor;
+    padding: 0px 10px;
+	.rounded(5px);
+    height: 18px;
+}*/
+/** acl **/
+#photo-edit-perms-select, #photos-upload-permissions-wrapper, #profile-jot-acl-wrapper {
+  display: block!important;
+}
+#acl-wrapper {
+  width: 690px;
+  float: left;
+}
+#acl-search {
+  float: right;
+  background: #ffffff url("../../../../images/search_18.png") no-repeat right center;
+  padding-right: 20px;
+}
+#acl-showall {
+  float: left;
+  display: block;
+  width: auto;
+  height: 18px;
+  background-color: #cccccc;
+  background-image: url("../../../../images/show_all_off.png");
+  background-position: 7px 7px;
+  background-repeat: no-repeat;
+  padding: 7px 5px 0px 30px;
+  color: #999999;
+  -moz-border-radius: 5px 5px 5px 5px;
+  -webkit-border-radius: 5px 5px 5px 5px;
+  border-radius: 5px 5px 5px 5px;
+}
+#acl-showall.selected {
+  color: #000000;
+  background-color: #ff9900;
+  background-image: url("../../../../images/show_all_on.png");
+}
+#acl-list {
+  height: 210px;
+  border: 1px solid #cccccc;
+  clear: both;
+  margin-top: 30px;
+  overflow: auto;
+}
+.acl-list-item {
+  display: block;
+  width: 150px;
+  height: 30px;
+  border: 1px solid #cccccc;
+  margin: 5px;
+  float: left;
+}
+.acl-list-item img {
+  width: 22px;
+  height: 22px;
+  float: left;
+  margin: 4px;
+}
+.acl-list-item p {
+  height: 12px;
+  font-size: 10px;
+  margin: 0px;
+  padding: 2px 0px 1px;
+  overflow: hidden;
+}
+.acl-list-item a {
+  font-size: 8px;
+  display: block;
+  width: 40px;
+  height: 10px;
+  float: left;
+  color: #999999;
+  background-color: #cccccc;
+  background-position: 3px 3px;
+  background-repeat: no-repeat;
+  margin-right: 5px;
+  -webkit-border-radius: 2px ;
+  -moz-border-radius: 2px;
+  border-radius: 2px;
+  padding-left: 15px;
+}
+#acl-wrapper a:hover {
+  text-decoration: none;
+  color: #000000;
+}
+.acl-button-show {
+  background-image: url("../../../../images/show_off.png");
+}
+.acl-button-hide {
+  background-image: url("../../../../images/hide_off.png");
+}
+.acl-button-show.selected {
+  color: #000000;
+  background-color: #9ade00;
+  background-image: url("../../../../images/show_on.png");
+}
+.acl-button-hide.selected {
+  color: #000000;
+  background-color: #ff4141;
+  background-image: url("../../../../images/hide_on.png");
+}
+.acl-list-item.groupshow {
+  border-color: #9ade00;
+}
+.acl-list-item.grouphide {
+  border-color: #ff4141;
+}
+/** /acl **/
+/** tab buttons 14618a**/
+ul.tabs {
+  list-style-type: none;
+  padding-bottom: 10px;
+  font-size: 13px;
+}
+ul.tabs li {
+  float: left;
+  margin-left: 5px;
+}
+ul.tabs li .active {
+    background-color: #996d73;
+    border: 1px solid #777777;
+    color: white;
+    border-radius: 3px 3px 3px 3px;
+    box-shadow: 2px 2px 2px #CFCFCF;
+    margin-left: 5px;
+}
+/**
+ * Form fields
+ */
+.field {
+  margin-bottom: 10px;
+  padding-bottom: 10px;
+  overflow: auto;
+  width: 100%;
+}
+.field label {
+  float: left;
+  width: 200px;
+}
+.field input, .field textarea {
+  width: 400px;
+}
+.field textarea {
+  height: 100px;
+}
+.field .field_help {
+  display: block;
+  margin-left: 200px;
+  color: #666666;
+}
+.field .onoff {
+  float: left;
+  width: 80px;
+}
+.field .onoff a {
+  display: block;
+  border: 1px solid #666666;
+  background-image: url("../../../../images/onoff.jpg");
+  background-repeat: no-repeat;
+  padding: 4px 2px 2px 2px;
+  height: 16px;
+  text-decoration: none;
+}
+.field .onoff .off {
+  border-color: #666666;
+  padding-left: 40px;
+  background-position: left center;
+  background-color: #cccccc;
+  color: #666666;
+  text-align: right;
+}
+.field .onoff .on {
+  border-color: #204A87;
+  padding-right: 40px;
+  background-position: right center;
+  background-color: #D7E3F1;
+  color: #204A87;
+  text-align: left;
+}
+.field .hidden {
+  display: none!important;
+}
+.field.radio .field_help {
+  margin-left: 0px;
+}
+#directory-search-form{
+	margin-bottom: 50px;
+	}
+#profile-edit-links-end {
+        clear: both;
+        margin-bottom: 15px;
+}
+
+#profile-edit-links ul { margin: 20px; padding-bottom: 20px; list-style: none; }
+
+#profile-edit-links li {
+  float: left;
+  list-style: none;
+  margin-left: 10px;
+}
+
+.profile-edit-side-div {
+  display: none;
+}
+
+#register-form label,
+#profile-edit-form label {
+        width: 300px; float: left;
+}
+
+.required {
+  display: inline;
+  color: #B20202;
+}
+
+/* oauth */
+.oauthapp {
+  height: auto;
+  overflow: auto;
+  border-bottom: 2px solid #cccccc;
+  padding-bottom: 1em;
+  margin-bottom: 1em;
+}
+.oauthapp img {
+  float: left;
+  width: 48px;
+  height: 48px;
+  margin: 10px;
+}
+.oauthapp img.noicon {
+  background-image: url("../../../../images/icons/48/plugin.png");
+  background-position: center center;
+  background-repeat: no-repeat;
+}
+.oauthapp a {
+  float: left;
+}
+/* contacts */
+.contact-entry-wrapper {
+  width: 120px;
+  height: 120px;
+  float: left;
+}
+/* photo */
+.photo {
+box-shadow: 2px 2px 5px 0px #000000;
+margin: 0px;
+border-radius: 10px;
+height: 145px !important;
+width: 145px !important;
+}
+.lframe {
+  float: left;
+  /*margin: 0px 10px 10px 0px;*/
+}
+/* profile match wrapper */
+.profile-match-wrapper {
+  float: left;
+  width: 90px;
+  height: 90px;
+  margin-bottom: 20px;
+}
+.profile-match-wrapper .contact-photo {
+  width: 80px;
+  height: 80px;
+}
+.profile-match-wrapper .contact-photo img {
+  width: 80px;
+  height: 80px;
+}
+.profile-match-wrapper {
+  left: 0px;
+  top: 63px;
+}
+
+.contact-photo-menu-button {
+        position: relative;
+        background-image: url("../../../../images/icons/16/menu.png");
+        background-position: top left; 
+        background-repeat: no-repeat;
+        margin: 0px 0px -16px 0px; 
+	padding: 0px;
+        width: 16px;
+        height: 16px;
+        top: -16px; left:0px;
+        overflow: hidden;
+        text-indent: 40px;
+        display: none;
+        
+}
+.contact-photo-menu {
+        width: 11em;
+        border: 3px solid #364e59;
+	color: #2d2d2d;
+        background: #FFFFFF;
+/*        position: absolute;*/
+        position: relative;
+        left: 0px; top: 0px;
+        display: none;
+        z-index: 10000;
+}
+.contact-photo-menu ul { margin:0px; padding: 0px; list-style: none }
+.contact-photo-menu li a {
+	display: block; 
+	padding: 5px 10px; 
+	color: #2d2d2d;
+	text-decoration: none;
+}
+.contact-photo-menu li a:hover {
+	background-color: #bdcdd4; 
+}
+
+/* page footer */
+footer {
+  height: 100px;
+  display: table-row;
+}
+
+blockquote {
+    border-left: 1px solid #D2D2D2;
+    padding-left: 9px;
+    margin: 0 0 0 .8ex;
+	 color: #777;
+}
+.oembed {
+	
+	font-weight: bold;
+}
+.aprofile dt{
+box-shadow: 1px 1px 5px 0;
+    color: #666666;
+    margin: 15px 0 5px;
+    padding-left: 5px;	
+	}
+/* ================== */
+/* = Contacts Block = */
+/* ================== */
+
+.contact-block-img {
+        width: 48px;
+        height: 48px;
+        padding-right: 3px;
+}
+.contact-block-div {
+        float: left;
+}
+
+.contact-block-textdiv { width: 150px; height: 34px; float: left; }
+#contact-block-end { clear: both; } 
+
+#group-edit-wrapper {
+        margin-bottom: 10px;
+}
+
+#group-members-end {
+        clear: both;
+}
+#group-edit-desc {
+ margin-top: 15px;
+}
+
+/*
+#group-separator,
+#prof-separator { display: none;}
+*/
+#prof-members-end{
+	clear: both;
+	}
+
+#prvmail-to-label, #prvmail-subject-label, #prvmail-message-label {
+	margin-bottom: 10px;
+	margin-top: 20px;
+}
+
+#prvmail-submit {
+	float: right;
+	margin-top: 10px;
+}
+
+#prvmail-subject
+{
+background: none repeat scroll 0 0 #FFFFFF;
+border: 1px solid #CCCCCC;
+border-radius: 5px 5px 5px 5px;
+font-weight: bold;
+height: 20px;
+margin: 0 0 5px;
+vertical-align: middle;
+}
+#prvmail-form{
+ width: 597px;	
+	}
+	
+#prvmail-upload-wrapper,
+#prvmail-link-wrapper,
+#prvmail-rotator-wrapper {
+	float: left;
+	margin-top: 10px;
+	margin-right: 10px;
+	width: 24px;
+}
+
+#prvmail-end {
+	clear: both;
+}
+
+.mail-list-sender,
+.mail-list-detail {
+	float: left;
+}
+.mail-list-detail {
+	margin-left: 20px;
+}
+
+.mail-list-subject {
+	font-size: 1.1em;
+	margin-top: 10px;
+}
+a.mail-list-link {
+    display: block;
+    font-size: 1.3em;
+    padding: 4px 0;
+}
+
+/*
+*a.mail-list-link:hover {
+*	background-color: #15607B;
+*	color: #F5F6FB;
+*}
+*/
+
+.mail-list-outside-wrapper-end {
+	clear: both;
+}
+
+.mail-list-outside-wrapper {
+	margin-top: 30px;
+}
+
+.mail-list-delete-wrapper {
+	float: right;
+	margin-right: 30px;
+	margin-top: 15px;
+}
+
+.mail-list-delete-icon {
+	border: none;
+}
+
+.mail-conv-sender,
+.mail-conv-detail {
+	float: left;
+}
+.mail-conv-detail {
+	margin-left: 20px;
+	width: 500px;
+}
+
+.mail-conv-subject {
+    font-size: 1.4em;
+    margin: 10px 0;
+}
+
+.mail-conv-outside-wrapper-end {
+	clear: both;
+}
+
+.mail-conv-outside-wrapper {
+	margin-top: 30px;
+}
+
+.mail-conv-delete-wrapper {
+	float: right;
+	margin-right: 30px;
+	margin-top: 15px;
+}
+.mail-conv-break {
+	clear: both;
+}
+
+.mail-conv-delete-icon {
+	border: none;
+}
+
+/* ========== */
+/* = Events = */
+/* ========== */
+.eventcal {
+        float: left;
+        font-size: 20px;
+}
+
+.vevent {
+
+}
+.vevent .event-description, .vevent .event-location {
+        margin-left: 10px;
+        margin-right: 10px;
+}
+.vevent .event-start {
+        margin-left: 10px;
+        margin-right: 10px;
+}
+
+#new-event-link {
+        margin-bottom: 10px;
+}
+
+.edit-event-link, .plink-event-link {
+        float: left;
+        margin-top: 4px;
+        margin-right: 4px;
+        margin-bottom: 15px;
+}
+
+.event-description:before {
+        content: url('../../../../images/calendar.png');
+        margin-right: 15px;
+}
+
+.event-start, .event-end {
+        margin-left: 10px;
+        width: 330px;
+        clear: both;
+}
+
+.event-start .dtstart, .event-end .dtend {
+        float: right;
+}
+
+.event-list-date {
+        margin-bottom: 10px;
+}
+
+.prevcal, .nextcal {
+        float: left;
+        margin-left: 32px;
+        margin-right: 32px;
+        margin-top: 64px;
+}
+.event-calendar-end {
+        clear: both;
+}
+
+ 
+.calendar {
+        font-family: Courier, monospace;
+}
+.calendar.eventcal a {
+  color: #3465A4;	
+	}
+.today {
+        font-weight: bold;
+        color: #FF0000;
+}
+
+.settings-block {
+        border: 1px solid #AAA;
+        margin: 10px;
+        padding: 10px;
+}
+
+.app-title {
+        margin: 10px;
+}
+
+#identity-manage-desc {
+        margin-top:15px;
+        margin-bottom: 15px;
+}
+
+#identity-manage-choose {
+        margin-bottom: 15px;
+}
+
+#identity-submit {
+        margin-top: 20px;
+}
+
+#photo-prev-link, #photo-next-link {
+        padding: 10px;
+        float: left;
+}
+.lightbox{
+	float: left;
+	}
+
+#photo-photo {
+        float: left;
+}
+#photo-like-div .wall-item-like-buttons {
+	 float: left;
+    margin-right: 5px;
+    margin-top: 30px;
+	}
+.comment-edit-text-empty {
+    margin: 10px 0 0;
+    width: 85%;
+}
+.comment-edit-photo {
+    margin: 10px 0 0;
+}
+.wall-item-like-buttons .icon.like {
+float: left;
+}
+
+#photo-photo-end {
+        clear: both;
+}
+
+.tabs .comment-wwedit-wrapper {
+	display: block;
+   margin-top: 30px;
+   margin-left: 50px;
+	}
+
+.profile-match-photo {
+        float: left;
+        text-align: center;
+        width: 120px;
+}
+
+.profile-match-name {
+        float: left;
+        text-align: center;
+        width: 120px;
+        overflow: hidden;
+}
+
+.profile-match-break,
+.profile-match-end {
+        clear: both;
+}
+
+.profile-match-connect {
+        text-align: center;
+        font-weight: bold;
+}
+
+.profile-match-wrapper {
+        float: left;
+        padding: 10px;
+        width: 120px;
+        height: 120px;
+        scroll: auto;
+}
+#profile-match-wrapper-end {
+        clear: both;
+}
+
+/* ============= */
+/* = Directory = */
+/* ============= */
+/* contacts menu */
+.contact-photo-wrapper {
+  position: relative;
+}
+.contact-photo {
+  width: 48px;
+  height: 48px;
+  overflow: hidden;
+  display: block;
+}
+.contact-photo img {
+  width: 48px;
+  height: 48px;
+}
+.contact-photo-menu-button {
+  display: none;
+  /* position: absolute; */
+  /* position: absolute; */
+  left: 0px;
+  top: -16px;
+}
+.contact-wrapper {
+  float: left;
+  width: 90px;
+  height: 90px;
+  margin-bottom: 15px;
+}
+.contact-wrapper .contact-photo {
+  width: 80px;
+  height: 80px;
+}
+.contact-wrapper .contact-photo img {
+  width: 80px;
+  height: 80px;
+}
+.contact-wrapper .contact-photo-menu-button {
+  left: 0px;
+  top: 63px;
+}
+.directory-item {
+  float: left;
+  width: 200px;
+  height: 200px;
+}
+.directory-item .contact-photo {
+  width: 175px;
+  height: 175px;
+}
+.directory-item .contact-photo img {
+  width: 175px;
+  height: 175px;
+}
+.contact-name {
+  text-align: left;
+  font-weight: bold;
+  font-size: 12px;
+}
+.contact-details {
+  color: #999999;
+}
+#side-bar-photos-albums li{
+list-style-type: disc;
+}
+#side-bar-photos-albums ul li{
+  margin-left: 30px;
+  padding-left: 0px;
+	}
+#side-bar-photos-albums{
+	margin-top: 15px;	
+	}
+.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-album-image-wrapper, .photo-top-image-wrapper {
+  float: left;
+   -moz-box-shadow: 0 0 5px #888;
+   -webkit-box-shadow: 0 0 5px #888;
+   box-shadow: 0 0 5px #888;
+  background-color: #000;
+   -webkit-border-radius: 5px;
+   -moz-border-radius: 5px;
+  border-radius: 5px;
+  padding-bottom: 20px;
+  position: relative;
+  margin: 0 10px 10px 0;
+  width: 200px; height: 140px;
+  overflow: hidden;  
+}
+.photo-top-album-name {
+        width: 100%;
+        position: absolute; 
+        bottom: 0px; 
+        padding-left: 3px;
+        background-color: #EEE;
+}
+.photo-top-album-link{
+  color: #3465A4;
+	}
+.photo-top-album-img{
+	
+	}
+/*.photo-top-image-wrapper {
+        position: relative;
+        float: left;
+        margin-top: 15px;
+        margin-right: 15px;
+        width: 200px; height: 200px; 
+        overflow: hidden; 
+}
+.photo-top-album-name {
+        width: 100%;
+        min-height: 2em;
+        position: absolute; 
+        bottom: 0px; 
+        padding: 0px 3px;
+        padding-top: 0.5em;
+        background-color: rgb(255, 255, 255);
+}*/
+#photo-top-end {
+        clear: both;
+}
+
+#photo-top-links {
+        margin-bottom: 30px;
+        margin-left: 30px;
+}
+
+#photos-upload-newalbum-div {
+        float: left;
+        width: 175px;
+}
+
diff --git a/view/theme/diabook/diabook-pink/style-wide.css b/view/theme/diabook/diabook-pink/style-wide.css
new file mode 100644
index 000000000..65e22aa90
--- /dev/null
+++ b/view/theme/diabook/diabook-pink/style-wide.css
@@ -0,0 +1,2920 @@
+/**
+ * Fabio Comuni <http://kirgroup.com/profile/fabrixxm>
+ * Additional Changes: Michael Vogel <icarus@dabo.de>
+ **/
+
+/* ========= */
+/* = Admin = */
+/* ========= */
+
+#adminpage {
+/*        width: 80%;*/
+}
+
+#pending-update {
+        float:right;
+        color: #ffffff;
+        font-weight: bold;
+        background-color: #FF0000;
+        padding: 0em 0.3em;
+}
+
+.admin.linklist {
+        border: 0px; padding: 0px;
+}
+
+.admin.link {
+        list-style-position: inside;
+        font-size: 1em;
+        padding: 5px;
+        width: 100px;
+        margin: 5px;
+}
+
+#adminpage dl {
+        clear: left;
+        margin-bottom: 2px;
+        padding-bottom: 2px;
+        border-bottom: 1px solid black;
+}
+
+#adminpage dt {
+        width: 200px;
+        float: left;
+        font-weight: bold;
+}
+
+#adminpage dd {
+        margin-left: 200px;
+}
+#adminpage h3 {
+        border-bottom: 1px solid #898989;
+        margin-bottom: 5px;
+        margin-top: 10px;
+}
+
+#adminpage .submit {
+        clear:left;
+}
+
+#adminpage #pluginslist {
+        margin: 0px; padding: 0px;
+}
+
+#adminpage .plugin {
+        list-style: none;
+        display: block;
+	/* border: 1px solid #888888; */
+        padding: 1em;
+        margin-bottom: 5px;
+        clear: left;
+}
+
+#adminpage .toggleplugin {
+        float:left;
+        margin-right: 1em;
+}
+
+#adminpage table {width:100%; border-bottom: 1p solid #000000; margin: 5px 0px;}
+#adminpage table th { text-align: left;}
+#adminpage td .icon { float: left;}
+#adminpage table#users img { width: 16px; height: 16px; }
+#adminpage table tr:hover { background-color: #eeeeee; }
+#adminpage .selectall { text-align: right; }
+/* icons */
+
+.icon.bb-url{
+  background-image: url("../../../view/theme/diabook/diabook-pink/icons/bb-url.png");
+  float: right;
+  margin-top: 2px;}
+.icon.quote{
+  background-image: url("../../../view/theme/diabook/diabook-pink/icons/quote.png");
+  float: right;
+  margin-top: 2px;}
+.icon.bold{
+  background-image: url("../../../view/theme/diabook/diabook-pink/icons/bold.png");
+  float: right;
+  margin-top: 2px;}
+.icon.underline{
+  background-image: url("../../../view/theme/diabook/diabook-pink/icons/underline.png");
+  float: right;
+  margin-top: 2px;}
+.icon.italic{
+  background-image: url("../../../view/theme/diabook/diabook-pink/icons/italic.png");
+  float: right;
+  margin-top: 2px;}
+.icon.bb-image{
+  background-image: url("../../../view/theme/diabook/diabook-pink/icons/bb-image.png");
+  float: right;
+  margin-top: 2px;}
+.icon.bb-video{
+  background-image: url("../../../view/theme/diabook/diabook-pink/icons/bb-video.png");
+  float: right;
+  margin-top: 2px;}
+  
+.icon.contacts {
+  background-image: url("../../../view/theme/diabook/diabook-pink/icons/contacts.png");}
+.icon.notifications {
+  background-image: url("../../../view/theme/diabook/diabook-pink/icons/notifications.png");}
+.icon.notify {
+  background-image: url("../../../view/theme/diabook/diabook-pink/icons/notify.png");}
+.icon.messages {
+  background-image: url("../../../view/theme/diabook/diabook-pink/icons/messages.png");}
+.icon.community {
+  background-image: url("../../../view/theme/diabook/diabook-pink/icons/community.png");}
+  
+.icon.drop 	{ background-image: url("../../../view/theme/diabook/diabook-pink/icons/drop.png");}
+.icon.drophide 	{ background-image: url("../../../view/theme/diabook/diabook-pink/icons/drop.png");}
+.icon.dislike 	{ background-image: url("../../../view/theme/diabook/diabook-pink/icons/dislike.png");}
+.icon.like 	{ background-image: url("../../../view/theme/diabook/diabook-pink/icons/like.png");}
+.icon.pencil 	{ background-image: url("../../../view/theme/diabook/diabook-pink/icons/pencil.png");}
+.icon.recycle 	{ background-image: url("../../../view/theme/diabook/diabook-pink/icons/recycle.png");}
+.icon.remote-link { background-image: url("../../../view/theme/diabook/diabook-pink/icons/remote.png");}
+.icon.tagged    { background-image: url("../../../view/theme/diabook/diabook-pink/icons/tagged.png");}
+.icon.file-as { background-image: url("../../../view/theme/diabook/diabook-pink/icons/file_as.png");}
+.star-item.icon.unstarred { background-image: url("../../../view/theme/diabook/diabook-pink/icons/unstarred.png");}
+.star-item.icon.starred { background-image: url("../../../view/theme/diabook/diabook-pink/icons/starred.png");}
+.icon.link		{ background-image: url("../../../view/theme/diabook/diabook-pink/icons/link.png");}
+.icon.lock		{ background-image: url("../../../view/theme/diabook/diabook-pink/icons/lock.png");}
+.icon.unlock		{ background-image: url("../../../view/theme/diabook/diabook-pink/icons/unlock.png");}
+.icon.language    { background-image: url("../../../view/theme/diabook/diabook-pink/icons/language.png");}
+
+
+.camera 	{ background-image: url("../../../view/theme/diabook/diabook-pink/icons/camera.png"); 
+			  display: block; width: 28px; height: 28px; background-repeat: no-repeat;
+			  }
+.attach 	{ background-image: url("../../../view/theme/diabook/diabook-pink/icons/attach.png"); 
+			  display: block; width: 28px; height: 28px; background-repeat: no-repeat;
+			  }
+.video2 	{ background-image: url("../../../view/theme/diabook/diabook-pink/icons/video.png"); 
+			  display: block; width: 28px; height: 28px; background-repeat: no-repeat;
+			  }	
+.video 	{ background-image: url("../../../view/theme/diabook/diabook-pink/icons/video.png"); 
+			  display: block; width: 100%; height: 140px; background-repeat: no-repeat;
+			  }
+.audio2 	{ background-image: url("../../../view/theme/diabook/diabook-pink/icons/audio.png"); 
+			  display: block; width: 28px; height: 28px; background-repeat: no-repeat;
+			  }
+.audio 	{ background-image: url("../../../view/theme/diabook/diabook-pink/icons/audio.png"); 
+			  display: block; width: 28px; height: 28px; background-repeat: no-repeat;
+			  }
+.weblink 	{ background-image: url("../../../view/theme/diabook/diabook-pink/icons/weblink.png"); 
+			  display: block; width: 28px; height: 28px; background-repeat: no-repeat;
+			  }
+.globe 	{ background-image: url("../../../view/theme/diabook/diabook-pink/icons/globe.png"); 
+			  display: block; width: 28px; height: 28px; background-repeat: no-repeat;
+			  }
+.unglobe 	{ background-image: url("../../../view/theme/diabook/diabook-pink/icons/unglobe.png"); 
+			  display: block; width: 28px; height: 28px; background-repeat: no-repeat;
+			  }
+.edit    {background-image: url("../../../view/theme/diabook/diabook-pink/icons/pencil2.png"); 
+			  display: block; width: 28px; height: 28px; background-repeat: no-repeat;}
+.icon.block   {background-image: url("../diabook/icons/block.png"); 
+			  display: block; width: 16px; height: 16px; background-repeat: no-repeat;}
+.icon.block.dim  {background-image: url("../diabook/icons/block.png"); 
+			  display: block; width: 16px; height: 16px; background-repeat: no-repeat; opacity: 0.3;}
+.icon.ad_drop 	{ background-image: url("../diabook/icons/drop.png");
+			  display: block; margin-left:5px; width: 16px; height: 16px; background-repeat: no-repeat;}			  
+			  
+
+
+.article	{ background-position: -50px  0px;}
+/*.audio 		{ background-position: -70px  0px;}*/
+/*.drop 		{ background-position: -110px 0px;}*/
+/*.drophide 	{ background-position: -130px 0px;}*/
+/*.edit 		{ background-position: -150px 0px;}*/
+/*.camera 	{ background-position: -170px 0px;}*/
+/*.dislike 	{ background-position: -190px 0px;}*/
+/*.like 		{ background-position: -210px 0px;}*/
+/*.link 		{ background-position: -230px 0px;}*/
+
+/*.globe 		{ background-position: -50px  -20px;}*/
+/*.noglobe 	{ background-position: -70px  -20px;}*/
+.no 		{ background-position: -90px  -20px;}
+.pause 		{ background-position: -110px -20px;}
+.play 		{ background-position: -130px -20px;}
+/*.pencil 	{ background-position: -150px -20px;}*/
+.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;}*/
+
+/*.video          { background-position: -110px -40px;}*/
+.youtube        { background-position: -130px -40px;}
+
+/*.attach         { background-position: -190px -40px;}*/
+/*.language       { background-position: -210px -40px;}*/
+
+
+.icon.on             { background-image: url("../../../view/theme/diabook/diabook-pink/icons/toogle_on.png"); background-repeat: no-repeat;}
+.icon.off            { background-image: url("../../../view/theme/diabook/diabook-pink/icons/toogle_off.png"); background-repeat: no-repeat;}
+.icon.prev           { background-image: url("../../../view/theme/diabook/diabook-pink/icons/prev.png"); background-repeat: no-repeat;}
+.icon.next           { background-image: url("../../../view/theme/diabook/diabook-pink/icons/next.png"); background-repeat: no-repeat;}
+/*.tagged     { background-position: -130px -60px;}*/
+
+.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 0px; }
+.type-audio { background-position: -40px 0px; }
+.type-text  { background-position: -60px 0px; }
+.type-unkn  { background-position: -80px 0px; }
+
+.icon.drop, .icon.drophide {
+ float: left;
+}
+
+.icon {
+  display: block;
+  width: 20px;
+  height: 20px;
+  /*background-image: url('icons.png');*/
+}
+
+.icon {
+  background-color: transparent ;
+  background-repeat: no-repeat;
+  /* background-position: left center; */
+  display: block;
+  overflow: hidden;
+  text-indent: -9999px;
+  padding: 1px;
+}
+
+.icon.border.camera{
+  background-image: url("../../../view/theme/diabook/diabook-pink/icons/camera.png"); 
+  display: block; width: 28px; height: 28px; background-repeat: no-repeat;
+	}
+	
+.icon.border.link{
+  background-image: url("../../../view/theme/diabook/diabook-pink/icons/weblink.png"); 
+  display: block; width: 28px; height: 28px; background-repeat: no-repeat;
+  margin-left: 10px;
+	}
+
+.icon.text {
+  text-indent: 0px;
+}
+.icon.s10 {
+  min-width: 10px;
+  height: 10px;
+}
+.icon.s10.notify {
+  background-image: url("../../../images/icons/10/notify_off.png");
+}
+.icon.s10.gear {
+  background-image: url("../../../images/icons/10/gear.png");
+}
+.icon.s10.add {
+  background-image: url("../../../images/icons/10/add.png");
+}
+.icon.s10.delete {
+  background-image: url("../../../images/icons/10/delete.png");
+}
+.icon.s10.edit {
+  background-image: url("../../../images/icons/10/edit.png");
+}
+.icon.s10.star {
+  background-image: url("../../../images/star_dummy.png");
+}
+.icon.s10.menu {
+  background-image: url("../../../images/icons/10/menu.png");
+}
+.icon.s10.link {
+  background-image: url("../../../images/icons/10/link.png");
+}
+.icon.s10.lock {
+  background-image: url("../../../images/icons/10/lock.png");
+}
+.icon.s10.unlock {
+  background-image: url("../../../images/icons/10/unlock.png");
+}
+.icon.s10.text {
+  padding: 2px 0px 0px 15px;
+  font-size: 10px;
+}
+.icon.s16 {
+  min-width: 16px;
+  height: 16px;
+}
+.icon.s16.notify {
+  background-image: url("../../../images/icons/16/notify_off.png");
+}
+.icon.s16.gear {
+  background-image: url("../../../images/icons/16/gear.png");
+}
+.icon.s16.add {
+  background-image: url("../../../images/icons/16/add.png");
+}
+.icon.s16.delete {
+  background-image: url("../../../images/icons/16/delete.png");
+}
+/*.icon.s16.edit {
+  background-image: url("../../../images/icons/16/edit.png");
+}*/
+.icon.s16.star {
+  background-image: url("../../../images/star_dummy.png");
+}
+.icon.s16.menu {
+  background-image: url("../../../images/icons/16/menu.png");
+}
+/*.icon.s16.link {
+  background-image: url("../../../images/icons/16/link.png");
+}*/
+.icon.s16.lock {
+  background-image: url("../../../images/icons/16/lock.png");
+}
+.icon.s16.unlock {
+  background-image: url("../../../images/icons/16/unlock.png");
+}
+.icon.s16.text {
+  padding: 4px 0px 0px 20px;
+  font-size: 10px;
+}
+.icon.s22 {
+  min-width: 22px;
+  height: 22px;
+}
+.icon.s22.notify {
+  background-image: url("../../../images/icons/22/notify_off.png");
+}
+.icon.s22.gear {
+  background-image: url("../../../images/icons/22/gear.png");
+}
+.icon.s22.add {
+  background-image: url("../../../images/icons/22/add.png");
+}
+.icon.s22.delete {
+  background-image: url("../../../images/icons/22/delete.png");
+}
+.icon.s22.edit {
+  background-image: url("../../../images/icons/22/edit.png");
+}
+.icon.s22.star {
+  background-image: url("../../../images/star_dummy.png");
+}
+.icon.s22.menu {
+  background-image: url("../../../images/icons/22/menu.png");
+}
+.icon.s22.link {
+  background-image: url("../../../images/icons/22/link.png");
+}
+.icon.s22.lock {
+  background-image: url("../../../images/icons/22/lock.png");
+}
+.icon.s22.unlock {
+  background-image: url("../../../images/icons/22/unlock.png");
+}
+.icon.s22.text {
+  padding: 10px 0px 0px 25px;
+  width: 200px;
+}
+.icon.s48 {
+  width: 48px;
+  height: 48px;
+}
+.icon.s48.notify {
+  background-image: url("../../../images/icons/48/notify_off.png");
+}
+.icon.s48.gear {
+  background-image: url("../../../images/icons/48/gear.png");
+}
+.icon.s48.add {
+  background-image: url("../../../images/icons/48/add.png");
+}
+.icon.s48.delete {
+  background-image: url("../../../images/icons/48/delete.png");
+}
+.icon.s48.edit {
+  background-image: url("../../../images/icons/48/edit.png");
+}
+.icon.s48.star {
+  background-image: url("../../../images/star_dummy.png");
+}
+.icon.s48.menu {
+  background-image: url("../../../images/icons/48/menu.png");
+}
+.icon.s48.link {
+  background-image: url("../../../images/icons/48/link.png");
+}
+.icon.s48.lock {
+  background-image: url("../../../images/icons/48/lock.png");
+}
+.icon.s48.unlock {
+  background-image: url("../../../images/icons/48/unlock.png");
+}
+
+#contact-edit-links ul {
+  list-style: none;
+  list-style-type: none;
+}
+
+.hide-comments-outer {
+  margin-left: 80px;
+  margin-bottom: 5px;
+  width: 675px;
+  border-bottom: 1px solid #BDCDD4;
+  padding: 8px;
+}
+
+/* global */
+body {
+  font-family: 'Lato', "Helvetica Neue", Helvetica, Arial, sans-serif;
+  font-size: 13px;
+  background-color: #ffffff;
+  color: #2d2d2d;
+  margin: 50px auto auto;
+  display: table;
+}
+
+#jappix_mini {
+right: 45px !important;
+}
+
+
+h4 {
+  font-size: 1.1em;
+}
+
+a {
+	color: #333333;
+	/* color: #3e3e8c; */
+	text-decoration: none;
+}
+a:hover {
+	/* color: blue; */
+	text-decoration: underline
+}
+
+.wall-item-name-link {
+/*  float: left;*/
+}
+
+.wall-item-photo {
+  width: 48px;
+  height: 48px;
+  overflow: hidden;
+  display: block;
+}
+
+.left {
+  float: left;
+}
+.right {
+  float: right;
+}
+.hidden {
+  display: none;
+}
+.clear {
+  clear: both;
+}
+.fakelink {
+  color: #996d73;
+  /* color: #3e3e8c; */
+  text-decoration: none;
+  cursor: pointer;
+}
+.fakelink:hover {
+  /* color: blue; */
+  /*color: #005c94; */
+  text-decoration: underline;
+}
+.intro-end {
+	border-bottom: 1px solid black;
+   clear: both;
+   margin-bottom: 25px;
+   padding-bottom: 25px;
+   width: 75%;
+	}
+.intro-form-end {
+	clear: both;
+	}
+.intro-fullname {
+	padding-bottom: 5px;
+   padding-top: 5px;
+	}
+.intro-wrapper-end {
+	clear: both;
+   padding-bottom: 5px;
+	}
+code {
+  font-family: Courier, monospace;
+  white-space: pre;
+  display: block;
+  overflow: auto;
+  border: 1px solid #444;
+  background: #EEE;
+  color: #444;
+  padding: 10px;
+  margin-top: 20px;
+}
+#panel {
+  position: absolute;
+  width: 12em;
+  background: #ffffff;
+  color: #2d2d2d;
+  margin: 0px;
+  padding: 1em;
+  list-style: none;
+  border: 3px solid #364e59;
+  z-index: 100000;
+  -webkit-box-shadow: 0px 5px 10px rgba(0, 0, 0, 0.7);
+  -moz-box-shadow: 0px 5px 10px rgba(0, 0, 0, 0.7);
+  box-shadow: 0px 5px 10px rgba(0, 0, 0, 0.7);
+}
+/* tool */
+.tool {
+  height: auto;
+  overflow: auto;
+  padding: 3px;
+}
+#saved-search-ul .tool:hover,
+#nets-sidebar .tool:hover,
+#sidebar-group-list .tool:hover,
+#fileas-sidebar .tool:hover  {
+	background: aliceBlue;
+}
+.tool .label {
+  float: left;
+}
+.tool .action {
+  float: right;
+}
+.tool a {
+  color: ##3F8FBA;
+}
+.tool a:hover {
+  text-decoration: none;
+}
+/* popup notifications */
+div.jGrowl div.notice {
+  background: #511919 url("../../../images/icons/48/notice.png") no-repeat 5px center;
+  color: #ffffff;
+  padding-left: 58px;
+}
+div.jGrowl div.info {
+  background: #364e59 url("../../../images/icons/48/info.png") no-repeat 5px center;
+  color: #ffffff;
+  padding-left: 58px;
+}
+/* header */
+header {
+  position: fixed;
+  left: 0%;
+  right: 80%;
+  top: 0px;
+  margin: 0px;
+  padding: 0px;
+  width: 22%;
+  height: 32px;
+  background: #FFC1CA;
+  background-color: #FFC1CA;
+  z-index: 100;
+  -webkit-box-shadow: -10px 0px 10px rgba(0, 0, 0, 0.7);
+  -moz-box-shadow: -10px 0px 10px rgba(0, 0, 0, 0.7);
+  box-shadow: -10px 0px 10px rgba(0, 0, 0, 0.7);
+  
+}
+header #site-location {
+  display: none;
+}
+header #banner {
+  overflow: hidden;
+  text-align: banner;
+  width: 82%;
+  margin-left: 25%;
+}
+header #banner a,
+header #banner a:active,
+header #banner a:visited,
+header #banner a:link,
+header #banner a:hover {
+  color: #1f1f1f;
+  text-decoration: none;
+  outline: none;
+  vertical-align: middle;
+  font-weight: bolder;
+  margin-left: 3px;
+}
+header #banner #logo-img {
+  height: 25px;
+  margin-top: 3px;
+}
+header #banner #logo-text {
+  font-size: 20px;
+  position: absolute;
+  top: 10%;
+}
+/* messages */
+#message-new {
+  background: #996d73;
+  border: 1px solid #333;
+  width: 150px;
+}
+#message-new a {
+  color: #ffffff;
+  text-align: center;
+  display: block;
+  font-weight: bold;
+  padding: 1em 0px;
+    text-decoration: none;
+}
+.mail-list-wrapper {
+  background-color: #f6f7f8;
+  margin-bottom: 5px;
+  width: 100%;
+  height: auto;
+  overflow: hidden;
+}
+.mail-list-wrapper span {
+  display: block;
+  float: left;
+  width: 20%;
+  overflow: hidden;
+}
+.mail-list-wrapper .mail-subject {
+  width: 30%;
+  padding: 4px 0px 0px 4px;
+}
+.mail-list-wrapper .mail-subject a {
+  display: block;
+}
+.mail-list-wrapper .mail-subject.unseen a {
+  font-weight: bold;
+}
+.mail-list-wrapper .mail-date {
+  padding: 4px 4px 0px 4px;
+}
+.mail-list-wrapper .mail-from {
+  padding: 4px 4px 0px 4px;
+}
+.mail-list-wrapper .mail-count {
+  padding: 4px 4px 0px 4px;
+  text-align: right;
+}
+.mail-list-wrapper .mail-delete {
+  float: right;
+}
+#mail-display-subject {
+  background-color: #f6f7f8;
+  color: #2d2d2d;
+  margin-bottom: 10px;
+  width: 100%;
+  height: auto;
+  overflow: hidden;
+}
+#mail-display-subject span {
+  float: left;
+  overflow: hidden;
+  padding: 4px 0px 0px 10px;
+}
+#mail-display-subject .mail-delete {
+  float: right;
+  opacity: 0.5;
+  -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;
+}
+#mail-display-subject:hover .mail-delete {
+  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;
+}
+/* nav */
+nav {
+  width: 80%;
+  height: 32px;
+  position: fixed;
+  left: 22%;
+  top: 0px;
+  padding: 0px;
+  background: #FFC1CA;
+  color: #1f1f1f;
+  z-index: 99;
+  -webkit-box-shadow: -10px 0px 10px rgba(0, 0, 0, 0.7);
+  -moz-box-shadow: -10px 0px 10px rgba(0, 0, 0, 0.7);
+  box-shadow: -10px 0px 10px rgba(0, 0, 0, 0.7);
+  
+}
+nav a,
+nav a:active,
+nav a:visited,
+nav a:link,
+nav a:hover {
+  color: #1f1f1f;
+  text-decoration: none;
+  outline: none;
+}
+nav #banner {
+  overflow: hidden;
+  /*text-align: center;*/
+  width: 100%;
+}
+nav #banner a,
+nav #banner a:active,
+nav #banner a:visited,
+nav #banner a:link,
+nav #banner a:hover {
+  color: #ffffff;
+  text-decoration: none;
+  outline: none;
+  vertical-align: bottom;
+}
+nav #banner #logo-img {
+  height: 22px;
+  margin-top: 5px;
+}
+nav #banner #logo-text {
+  font-size: 22px;
+}
+nav #navbar{
+	}
+nav ul {
+  margin: 0px;
+  padding: 0px 20px;
+}
+nav ul li {
+  list-style: none;
+  margin: 0px;
+  /* padding: 1px 1px 3px 1px; */
+  float: left;
+}
+nav ul li .menu-popup {
+  left: 0px;
+  right: auto;
+}
+
+nav #logo-img {
+  height: 25px;
+  margin-top: 4px;
+  margin-left: 30px;
+}
+
+nav #logo-text {
+    font-size: 22px;
+    margin-top: 3px;
+    margin-right: 15px;
+}
+nav .nav-menu-search {
+  position: relative;
+
+  margin: 4px 17px;
+  margin-right: 0px;
+  height: 17px;
+  width: 180px;
+  
+}
+
+nav #search-box #search-text {
+  background-image:  url('icons/lupe.png');
+  background-repeat:no-repeat;
+  padding-left:20px;
+  border-top-left-radius: 15px;
+border-top-right-radius: 15px;
+border-bottom-right-radius: 15px;
+border-bottom-left-radius: 15px;
+	}
+
+
+nav .nav-menu-icon {
+  position: relative;
+  height: 22px;
+  padding: 5px;
+  margin: 0px 5px;
+  -moz-border-radius: 5px 5px 0 0;
+  -webkit-border-radius: 5px 5px 0 0;
+  border-radius: 5px 5px 0 0;
+}
+nav .nav-menu-icon:hover {
+  position: relative;
+  height: 22px;
+  padding: 5px;
+  margin: 0px 5px;
+  -moz-border-radius: 5px 5px 0 0;
+  -webkit-border-radius: 5px 5px 0 0;
+  border-radius: 5px 5px 0 0;
+}
+
+/*color*/
+nav .nav-menu-icon.selected {
+  background-color: #FFE9EC;
+}
+nav .nav-menu-icon img {
+  width: 22px;
+  height: 22px;
+}
+nav .nav-menu-icon .nav-notify {
+  top: 3px;
+}
+/*marker*/
+nav .nav-menu {
+  position: relative;
+  height: 16px;
+  padding: 5px;
+  margin: 3px 15px 0px;
+  font-size: 15px;
+  /*border-bottom: 3px solid #364A84;*/
+}
+nav .nav-menu.selected {
+  /*border-bottom: 3px solid #9eabb0;*/
+}
+nav .nav-notify {
+  display: none;
+  position: absolute;
+  background-color: #fff;
+  /* background-color: #19aeff; */
+  -moz-border-radius: 5px 5px 5px 5px;
+  -webkit-border-radius: 5px 5px 5px 5px;
+  border-radius: 5px 5px 5px 5px;
+  font-size: 10px;
+  font-weight: 900;
+  padding: 1px 4px;
+  top: 0px;
+  right: -6px;
+  min-width: 10px;
+  text-align: center;
+  border: 1px solid black;
+}
+nav .nav-notify.show {
+  display: block;
+}
+nav #nav-help-link,
+nav #nav-search-link,
+nav #nav-directory-link,
+nav #nav-apps-link,
+nav #nav-site-linkmenu, 
+nav #nav-home-link,
+nav #nav-user-linkmenu
+{
+  float: right;
+}
+nav #nav-user-linkmenu{
+	margin-right: 0px;
+	}
+nav #nav-home-link, #nav-directory-link, #nav-apps-link{
+	margin-left: 0px;
+	margin-right: 0px;
+	font-weight: bold;
+	margin: 3px 5px;
+	font-size: 14px;
+	}
+nav #nav-directory-link{
+  margin-right: 0px;	
+	}
+nav #nav-home-link{
+  margin-left: 0px;	
+	}
+nav #nav-help-link .menu-popup,
+nav #nav-search-link .menu-popup,
+nav #nav-directory-link .menu-popup,
+nav #nav-apps-link .menu-popup,
+nav #nav-site-linkmenu .menu-popup {
+  right: 0px;
+  left: auto;
+}
+
+nav #nav-messages-linkmenu.on .icon.messages, nav #nav-messages-linkmenu.selected .icon.messages{
+	background-image: url("../../../view/theme/diabook/diabook-pink/icons/messages.png");
+	}
+	
+/*nav #nav-notifications-linkmenu.on .icon.notify,*/ nav #nav-notifications-linkmenu.selected .icon.notify{
+	background-image: url("../../../view/theme/diabook/diabook-pink/icons/notify.png");
+	}
+	
+nav #nav-contacts-linkmenu.on .icon.contacts, nav #nav-contacts-linkmenu.selected .icon.contacts{
+	background-image: url("../../../view/theme/diabook/diabook-pink/icons/contacts.png");
+	}
+	
+nav #nav-apps-link.selected {
+ background-color: #fff;
+  moz-border-radius: 5px 5px 0 0;
+-webkit-border-radius: 5px 5px 0 0;
+border-radius: 5px 5px 0 0;
+}
+
+#nav-notifications-mark-all {
+	/* padding: 1px 1px 2px 26px; */
+	/* border-bottom: 1px solid #364E59; */
+	/* margin: 0px 0px 2px 0px;
+	padding: 5px 10px; */
+}
+
+#nav-notifications-see-all {
+	/* padding: 1px 1px 2px 26px; */
+	/* border-bottom: 1px solid #364E59; */
+	/* margin: 0px 0px 2px 0px;
+	padding: 5px 10px; */
+}
+
+.notify-seen {
+	background: none repeat scroll 0 0 #DDDDDD;
+	}
+
+ul.menu-popup {
+  position: absolute;
+  display: none;
+  width: 11em;
+  background: #fff;
+  color: #2d2d2d;
+  margin: 0px;
+  padding: 0px;
+  list-style: none;
+  z-index: 100000;
+  -webkit-box-shadow: 0px 5px 10px rgba(0, 0, 0, 0.7);
+  -moz-box-shadow: 0px 5px 10px rgba(0, 0, 0, 0.7);
+  box-shadow: 0px 5px 10px rgba(0, 0, 0, 0.7);
+}
+ul.menu-popup a {
+  display: block;
+  color: #2d2d2d;
+  padding: 5px 10px;
+  text-decoration: none;
+}
+ul.menu-popup a:hover {
+  background-color: #996d73; /*bdcdd4;*/
+  color: #fff;
+}
+ul.menu-popup .menu-sep {
+  border-top: 1px solid #9eabb0;
+}
+ul.menu-popup li {
+  float: none;
+  overflow: auto;
+  height: auto;
+  display: block;
+}
+ul.menu-popup li img {
+  float: left;
+  width: 16px;
+  height: 16px;
+  padding-right: 5px;
+}
+ul.menu-popup .empty {
+  padding: 5px;
+  text-align: center;
+  color: #9eabb0;
+}
+/* autocomplete popup */
+.acpopup {
+  max-height: 150px;
+  background-color: #ffffff;
+  color: #2d2d2d;
+  border: 1px solid #MenuBorder;
+  overflow: auto;
+  z-index: 100000;
+  -webkit-box-shadow: 0px 5px 10px rgba(0, 0, 0, 0.7);
+  -moz-box-shadow: 0px 5px 10px rgba(0, 0, 0, 0.7);
+  box-shadow: 0px 5px 10px rgba(0, 0, 0, 0.7);
+}
+.acpopupitem {
+  color: #2d2d2d;
+  padding: 4px;
+  clear: left;
+}
+.acpopupitem img {
+  float: left;
+  margin-right: 4px;
+}
+.acpopupitem.selected {
+  background-color: #bdcdd4;
+}
+#nav-notifications-menu {
+  width: 400px;
+  max-height: 550px;
+  overflow: auto;
+}
+/* #nav-notifications-menu a {
+	display: inline;
+	padding: 5px 0px;
+	margin: 0px 0px 2px 0px;
+}
+#nav-notifications-menu li:hover {
+  background-color: #bdcdd4;
+}*/
+
+#nav-notifications-menu img {
+  float: left;
+  margin-right: 5px;
+}
+#nav-notifications-menu .contactname {
+  font-weight: bold;
+}
+#nav-notifications-menu .notif-when {
+  font-size: 10px;
+  color: #9eabb0;
+  display: block;
+}
+
+.notif-image {
+        width: 32px;
+        height: 32px;
+        padding: 7px 7px 0px 0px;
+}
+
+/*profile_side*/
+#profile_side {
+  margin-bottom: 30px;
+}
+#ps-usericon{
+	height: 25px	
+	}
+#ps-username{
+  font-size: 1.17em;
+  font-weight: bold;
+  vertical-align: top;
+  position: absolute;
+  padding-top: 4px;
+  padding-left: 5px;	
+  word-wrap: break-word;
+  width: 130px;
+	}
+#ps-username:hover{
+  text-decoration: none;	
+	}
+.menu-profile-side{
+  list-style: none;	
+  padding-left: 0px;
+  min-height: 0px;
+	}
+.menu-profile-list{
+  height: auto;
+  overflow: auto;  
+  min-height: 16px;
+  list-style: none;
+	}
+.menu-profile-list:hover{
+	background: #FFF4F6; 
+	}
+.menu-profile-list-item{
+	padding-left: 5px;
+	vertical-align: middle;
+	}	
+.menu-profile-list-item:hover{	
+	text-decoration: none;
+   }
+/*http://prothemedesign.com/circular-icons/*/
+.menu-profile-icon.home{
+	background: url("../../../view/theme/diabook/diabook-pink/icons/home.png") no-repeat;
+	float: left;
+	height: 22px;
+	width: 22px;
+	}
+.menu-profile-icon.photos{
+	background: url("../../../view/theme/diabook/diabook-pink/icons/mess_side.png") no-repeat;
+	float: left;
+	height: 22px;
+   width: 22px;}
+.menu-profile-icon.events{
+	background: url("../../../view/theme/diabook/diabook-pink/icons/events.png") no-repeat;
+	float: left;
+	height: 22px;
+   width: 22px;}
+.menu-profile-icon.notes{
+	background: url("../../../view/theme/diabook/diabook-pink/icons/notes.png") no-repeat;
+	float: left;
+	height: 22px;
+   width: 22px;}
+.menu-profile-icon.foren{
+	background: url("../../../view/theme/diabook/diabook-pink/icons/pubgroups.png") no-repeat;
+	float: left;
+	height: 22px;
+   width: 22px;}
+.menu-profile-icon.com_side{
+	background: url("../../../view/theme/diabook/diabook-pink/icons/com_side.png") no-repeat;
+	float: left;
+	height: 22px;
+   width: 22px;}
+.menu-profile-icon.pscontacts{
+	background: url("../../../view/theme/diabook/diabook-pink/icons/pscontacts.png") no-repeat;
+	float: left;
+	height: 22px;
+   width: 22px;}
+/* aside */
+/*marker*/
+aside {
+  display: table-cell;
+  vertical-align: top;
+  width: 180px;
+  padding: 0px 5px 0px 0px;
+  border-right: 1px solid #D2D2D2;
+  float: left;
+  /* background: #F1F1F1; */
+}
+aside #page-sidebar{display: none;}
+aside .vcard .fn {
+  font-size: 18px;
+  font-weight: bold;
+  margin-bottom: 5px;
+}
+aside .vcard .title {
+  margin-bottom: 5px;
+}
+aside .vcard dl {
+  height: auto;
+  overflow: auto;
+}
+aside .vcard dt {
+  float: left;
+  margin-left: 0px;
+  /*width: 35%;*/
+  text-align: right;
+  color: #999999;
+}
+aside .vcard dd {
+  float: left;
+  margin-left: 5px;
+  /*width: 60%;*/
+}
+aside #profile-extra-links ul {
+  padding: 0px;
+  margin: 0px;
+}
+aside #profile-extra-links li {
+  padding: 0px;
+  margin: 0px;
+  list-style: none;
+}
+aside #dfrn-request-link {
+  display: block;
+  -moz-border-radius: 5px 5px 5px 5px;
+  -webkit-border-radius: 5px 5px 5px 5px;
+  border-radius: 5px 5px 5px 5px;
+  color: #ffffff;
+  background: #005c94 url('../../../images/connect-bg.png') no-repeat left center;
+  font-weight: bold;
+  text-transform: uppercase;
+  padding: 4px 2px 2px 35px;
+}
+aside #dfrn-request-link:hover {
+  text-decoration: none;
+  background-color: #36c;
+  /* background-color: #19aeff; */
+}
+aside #profiles-menu {
+  width: 20em;
+}
+aside #search-text {
+	width: 173px;
+	height: 17px;
+	padding-left: 10px;
+	border-top-left-radius: 15px;
+border-top-right-radius: 15px;
+border-bottom-right-radius: 15px;
+border-bottom-left-radius: 15px;
+}
+aside #side-follow-url {
+	width: 173px;
+	}
+aside #side-peoplefind-url {
+	width: 173px;
+	}
+#contact-block {
+  overflow: auto;
+  height: auto;
+}
+aside #likes a, a:visited, a:link {
+		color: #996d73;
+		text-decoration: none;
+		cursor: pointer;
+		
+}
+aside #likes a:hover{
+	text-decoration: underline;
+	}
+
+#contact-block .contact-block-h4 {
+  float: left;
+  margin: 5px 0px;
+}
+#contact-block .allcontact-link {
+  float: right;
+  margin: 5px 0px;
+}
+#contact-block .contact-block-content {
+  clear: both;
+  overflow: auto;
+  height: auto;
+}
+#contact-block .contact-block-link {
+  float: left;
+  margin: 0px 2px 2px 0px;
+}
+#contact-block .contact-block-link img {
+  widht: 55px;
+  height: 55px;
+}
+#lost-password-link {
+  float: left;
+  margin-right: 20px;		
+	}
+#login-submit-wrapper{
+margin-bottom: 15px;
+	}
+.group_selected {
+  background: url("../diabook/icons/selected.png") no-repeat left center;
+  float: left;
+  height: 22px;
+  width: 22px;
+}
+.group_unselected {
+  background: url("../diabook/icons/unselected.png") no-repeat left center;
+  float: left;
+  height: 22px;
+  width: 22px;
+}
+.icon.text_add		{ 
+		background-image: url("../../../images/icons/16/add.png");
+		float: right;
+		opacity: 0.2;
+		margin-right: 14px;
+		}
+.icon.text_add:hover	{ 
+		background-image: url("../../../images/icons/16/add.png");
+		float: right;
+		cursor: pointer;
+		margin-right: 14px;
+		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;
+		}
+.icon.text_edit {
+  background-image: url("../../../images/icons/10/edit.png");
+  opacity: 0.2;
+  margin-top: 6px;
+  float: right;
+  height: 10px;
+}
+.icon.text_edit:hover {
+  background-image: url("../../../images/icons/10/edit.png");
+  opacity: 1;
+  margin-top: 6px;
+  float: right;
+  height: 10px;
+}
+/* widget */
+.widget {
+  margin-bottom: 2em;
+  /*.action .s10 { width: 10px; overflow: hidden; padding: 0px;}
+	.action .s16 { width: 16px; overflow: hidden; padding: 0px;}*/
+/*  font-size: 12px; */
+}
+/*marker*/
+.widget h3 {
+  padding: 0px;
+  margin: 2px;
+  font-size: 1.05em;
+}
+.widget .action {
+  opacity: 0.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;
+}
+.widget input.action {
+  opacity: 0.5;
+  -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;
+}
+.widget:hover .title .action {
+  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;
+}
+.widget .tool:hover .action {
+  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;
+}
+.widget .tool:hover .action.ticked {
+  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;
+}
+.widget ul {
+  padding: 0px;
+}
+.widget ul li {
+  padding-left: 16px;
+  min-height: 16px;
+  list-style: none;
+}
+#side-bar-photos-albums li{
+list-style-type: disc;
+}
+#side-bar-photos-albums ul li{
+  margin-left: 30px;
+  padding-left: 0px;
+	}
+#side-bar-photos-albums ul li a{
+  color: #3465A4;
+}
+.widget .tool.selected {
+  background: url("../../../view/theme/diabook/diabook-pink/icons/selected.png") no-repeat left center;
+}
+/* widget: search */
+#add-search-popup {
+  width: 200px;
+  top: 18px;
+}
+/* section */
+section {
+  display: table-cell;
+  vertical-align: top;
+  width: 800px;
+  padding: 0px 0px 0px 12px;
+}
+body .pageheader{
+  text-align: center;
+  font-size: 20px;
+  margin-bottom: 20px;
+  margin-top: 0px;
+  max-width: 775px;
+	}
+.qcomment{
+  max-width: 122px;	
+	}
+#id_username {
+  width: 173px;	
+	}
+#id_password {
+  width: 173px;		
+	}
+#id_openid_url {
+  width: 173px;	
+	}
+#contact-edit-end {
+	}
+.pager {
+   padding: 10px;
+	text-align: center;
+	font-size: 1.0em;
+	clear: both;
+	display: block;
+}	
+
+.tabs {
+    
+    background-position: 0 -20px;
+    background-repeat: repeat-x;
+    height: 27px;
+    padding: 0;
+ }
+.tab.button {
+    margin-left: 5px;	
+    /*background: none repeat scroll 0 0 #F8F8F8;*/
+    border: 1px solid #CCCCCC;
+    border-radius: 3px 3px 3px 3px;
+    font-weight: normal;
+    padding: 3px;
+    color:  #333333;
+	}
+	
+#birthday-notice, #event-notice, #birthday-wrapper, #event-wrapper{
+	margin-bottom: 10px;
+	}
+
+#birthday-wrapper a {
+	color: #3465A4;
+	}
+/* wall item */
+.tread-wrapper {
+  border-bottom: 1px solid #D2D2D2;
+  position: relative;
+  padding: 5px;
+  margin-bottom: 0px;
+  width: 775px;
+  padding-top: 10px;
+}
+.tread-wrapper a{
+  color: #996d73;
+}
+
+/*marker*/
+.wall-item-decor {
+  position: absolute;
+  left: 780px;
+  top: -10px;
+  width: 16px;
+}
+/*marker*/
+.wall-item-container {
+  display: table;
+  width: 770px;
+}
+.wall-item-photo-container .wall-item-item, .wall-item-container .wall-item-bottom {
+  display: table-row;
+}
+.wall-item-photo-container .wall-item-info {
+  display: table-cell;
+  vertical-align: top;
+  text-align: left;
+  width: 80px;
+}
+.wall-item-photo-container .wall-item-location {
+  padding-right: 40px;
+  display: table-cell;
+}
+.wall-item-photo-container .wall-item-ago {
+  word-wrap: break-word;
+  width: 50px;
+  margin-left: 10px;
+  color: #999;
+}
+/*marker*/
+.wall-item-photo-container .wall-item-content {
+
+  max-width: 690px;
+  word-wrap: break-word;
+  
+  margin-bottom: 14px;
+}
+.wall-item-photo-container .wall-item-content img {
+  max-width: 700px;
+}
+.wall-item-photo-container .wall-item-links, .wall-item-photo-container .wall-item-actions {
+  display: table-cell;
+  vertical-align: middle;
+}
+.wall-item-photo-container .wall-item-links .icon, .wall-item-photo-container .wall-item-actions .icon {
+  opacity: 0.5;
+  -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;
+}
+.wall-item-photo-container .wall-item-links .icon:hover, .wall-item-photo-container .wall-item-actions .icon: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;
+}
+.wall-item-photo-container .wall-item-name {
+  font-weight: bold;
+}
+.wall-item-photo-container .wall-item-actions-author {
+  width: 100%;
+  margin-bottom: 0.3em;
+}
+.wall-item-photo-container .wall-item-actions-social {
+  float: left;
+  margin-bottom: 1px;
+  display: table-cell;
+}
+.wall-item-photo-container .wall-item-actions-social a {
+  margin-right: 1em;
+}
+.wall-item-photo-container .wall-item-actions-tools {
+  float: right;
+  width: 80px;
+  display: table-cell;
+}
+.wall-item-photo-container .wall-item-actions-tools a {
+  float: right;
+}
+.wall-item-photo-container .wall-item-actions-tools input {
+  float: right;
+}
+.wall-item-photo-container.comment {
+  margin-top: 5px;
+  margin-bottom: 5px;
+  margin-left: 40px;
+  width: 650px;
+  border-bottom: 1px solid #D2D2D2;
+}
+.wall-item-photo-container.comment {
+  top: 15px !important;
+  left: 15px !important;
+}
+.wall-item-photo-container {
+  display: table;
+  width: 780px;
+}
+.my-comment-photo {
+  width: 48px;
+  margin-left: 40px;
+  margin-right: 32px;
+	}
+.comment-edit-preview {
+  width: 500px;
+  margin-top: 10px;
+}
+.comment-edit-text-empty {
+    width: 500px;
+    border: 1px solid #D2D2D2;
+    height: 3.2em;
+    color: #2d2d2d;
+}
+.comment-edit-text-full {
+  font-size: 12.5px;
+  height: 3.3em;
+  
+  border: 1px solid #D2D2D2;
+  width: 500px;
+}
+.comment-edit-photo {
+    margin: 10px 0 0;
+    display: table-cell;
+}
+
+
+.wall-item-container .wall-item-item, .wall-item-container .wall-item-bottom {
+  display: table-row;
+}
+.wall-item-bottom {
+  font-size: 13px;
+}
+.wall-item-container .wall-item-bottom {
+/*  opacity: 0.5;
+  -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; */
+}
+.wall-item-container:hover .wall-item-bottom {
+/*  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; */
+}
+.wall-item-container .wall-item-info {
+  display: table-cell;
+  vertical-align: top;
+  text-align: left;
+  width: 80px;
+}
+.wall-item-container .wall-item-location {
+  padding-right: 40px;
+  display: table-cell;
+}
+.wall-item-container .wall-item-ago {
+  word-wrap: break-word;
+  width: 50px;
+  margin-left: 10px;
+  color: #999;
+}
+.wall-item-location {
+  
+  clear: both;
+  overflow: hidden;
+  
+  margin-bottom: 5px;
+}
+
+/*marker*/
+.wall-item-container .wall-item-content {
+
+  max-width: 690px;
+  word-wrap: break-word;
+
+
+}
+
+.wall-item-container .wall-item-content img {
+  max-width: 700px;
+}
+.wall-item-container .wall-item-links, .wall-item-container .wall-item-actions {
+  display: table-cell;
+  vertical-align: middle;
+}
+.wall-item-container .wall-item-links .icon, .wall-item-container .wall-item-actions .icon {
+  opacity: 0.5;
+  -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;
+}
+.wall-item-container .wall-item-links .icon:hover, .wall-item-container .wall-item-actions .icon: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;
+}
+.wall-item-container .wall-item-name {
+  font-weight: bold;
+}
+.wall-item-container .wall-item-actions-author {
+  width: 100%;
+  margin-bottom: 0.3em;
+}
+.wall-item-container .wall-item-actions-social {
+  float: left;
+  margin-bottom: 1px;
+  display: table-cell;
+}
+.wall-item-container .wall-item-actions-social a {
+  margin-right: 1em;
+}
+.wall-item-actions-social a {
+  float: left;
+}
+.wall-item-container .wall-item-actions-tools {
+  float: right;
+  width: 80px;
+  display: table-cell;done
+}
+.wall-item-container .wall-item-actions-tools a {
+  float: right;
+}
+.wall-item-container .wall-item-actions-tools input {
+  float: right;
+}
+/*marker*/
+.wall-item-container.comment {
+  margin-top: 5px;
+  margin-bottom: 5px;
+  margin-left: 80px;
+  width: 690px;
+  border-bottom: 1px solid hsl(198, 21%, 79%);
+}
+.wall-item-container.comment .contact-photo {
+  width: 32px;
+  height: 32px;
+  margin-left: 16px;
+  /*background: url(../../../images/icons/22/user.png) no-repeat center center;*/
+
+}
+.wall-item-container.comment {
+  top: 15px !important;
+  left: 15px !important;
+}
+.wall-item-container.comment .wall-item-links {
+  padding-left: 12px;
+}
+.wall-item-comment-wrapper {
+  margin: 1px 5px 5px 80px;
+}
+.wall-item-comment-wrapper .comment-edit-photo {
+  display: none;
+}
+.wall-item-comment-wrapper textarea {
+  height: 2.0em;
+  width: 100%;
+  font-size: 10px;
+  color: #999999;
+  border: 1px solid #DDD;
+  padding: 0.3em;
+  font-size: 14px;
+}
+.wall-item-comment-wrapper .comment-edit-text-full {
+  font-size: 14px;
+  height: 4em;
+  color: #2d2d2d;
+  border: 1px solid #2d2d2d;
+}
+.comment-edit-preview {
+  width: 500px;
+  margin-top: 10px;
+  background-color:  #fff797;
+}
+.comment-edit-preview .contact-photo {
+  width: 32px;
+  height: 32px;
+  margin-left: 16px;
+  /*background: url(../../../images/icons/22/user.png) no-repeat center center;*/
+
+}
+.comment-edit-preview {
+  top: 15px !important;
+  left: 15px !important;
+}
+.comment-edit-preview .wall-item-links {
+  padding-left: 12px;
+}
+.comment-edit-preview .wall-item-container {
+  width: 700px;
+}
+.comment-edit-preview .tread-wrapper {
+  width: 700px;
+  padding: 0;
+  margin: 10px 0;
+}
+
+.shiny {
+  /* border-right: 10px solid #fce94f; */
+	border-right: 1px solid #A7C7F7;
+	padding-right: 12px;
+}
+
+#jot-preview-content{
+	margin-top: 30px;}
+	
+#jot-preview-content .tread-wrapper {
+  background-color: #fff797;
+}
+
+.wall-item-tags {
+  padding-top: 1px;
+  padding-bottom: 2px;
+}
+.tag {
+  /*background: url("../../../images/tag_b.png") repeat-x center left;*/
+  color: #999;
+  padding-left: 3px;
+  font-size: 12px;
+}
+.tag a {
+  padding-right: 5px;
+  /*background: url("../../../images/tag.png") no-repeat center right;*/
+  color: #999;
+}
+.wwto {
+  position: absolute !important;
+  width: 25px;
+  height: 25px;
+  background: #FFFFFF;
+  border: 2px solid #364e59;
+  height: 25px;
+  width: 25px;
+  overflow: hidden;
+  padding: 1px;
+  position: absolute !important;
+  top: 40px;
+  left: 30px;
+  -webkit-box-shadow: 0px 0px 10px rgba(0, 0, 0, 0.7);
+  -moz-box-shadow: 0px 0px 10px rgba(0, 0, 0, 0.7);
+  box-shadow: 0px 0px 10px rgba(0, 0, 0, 0.7);
+}
+.wwto .contact-photo {
+  width: auto;
+  height: 25px;
+}
+/* contacts menu */
+.contact-photo-wrapper {
+  position: relative;
+  width: 80px;
+}
+
+.contact-photo-wrapper.wwto {
+  width: 25px;
+}
+
+.contact-photo {
+  width: 48px;
+  height: 48px;
+  overflow: hidden;
+  display: block;
+}
+.contact-photo img {
+  width: 48px;
+  height: 48px;
+}
+
+.contact-wrapper {
+  float: left;
+  width: 90px;
+  height: 90px;
+  margin-bottom: 15px;
+}
+.contact-wrapper .contact-photo {
+  width: 80px;
+  height: 80px;
+}
+.contact-wrapper .contact-photo img {
+  width: 80px;
+  height: 80px;
+}
+.contact-wrapper {
+  left: 0px;
+  top: 63px;
+}
+.contact-photo {
+  width: 48px;
+  height: 48px;
+}
+.contact-photo img {
+  width: 48px;
+  height: 48px;
+}
+.contact-name {
+  /* text-align: center; */
+  /*font-weight: bold;*/
+  font-size: 12px;
+}
+.contact-details {
+  color: #999999;
+}
+/* editor */
+.jothidden {
+  display: none;
+}
+#jot {
+  width: 785px;
+  margin: 0px 2em 20px 0px;
+}
+#profile-jot-form #profile-jot-text {
+  height: 2.0em;
+  width: 99%;
+  font-size: 15px;
+  color: #999999;
+  border: 1px solid #DDD;
+  padding: 0.3em;
+  margin-bottom: 10px;
+}
+.grey
+{
+  display: inline;
+  float: right;	
+	}
+#jot #jot-tools {
+  margin: 0px;
+  padding: 0px;
+  height: 40px;
+  overflow: none;
+  width: 783px;
+  background-color: #fff;
+  border-bottom: 2px solid #9eabb0;
+}
+
+#jot #jot-tools li {
+  list-style: none;
+  float: left;
+  width: 80px;
+  height: 40px;
+  border-bottom: 2px solid #9eabb0;
+}
+#jot #jot-tools li a {
+  display: block;
+  color: #cccccc;
+  width: 100%;
+  height: 40px;
+  text-align: center;
+  line-height: 40px;
+  overflow: hidden;
+}
+#jot #jot-tools li:hover {
+  background-color: #364e59;
+  border-bottom: 2px solid #bdcdd4;
+}
+#jot #jot-tools li.perms {
+  float: right;
+  width: 40px;
+}
+#jot #jot-tools li.perms a.unlock {
+  width: 30px;
+  border-left: 10px solid #cccccc;
+  background-color: #cccccc;
+  background-position: left center;
+}
+#jot #jot-tools li.perms a.lock {
+  width: 30px;
+  border-left: 10px solid #666666;
+  background-color: #666666;
+}
+#jot #jot-tools li.submit {
+  float: right;
+  background-color: #cccccc;
+  border-bottom: 2px solid #cccccc;
+  border-right: 1px solid #666666;
+  border-left: 1px solid #666666;
+}
+#jot #jot-tools li.submit input {
+  border: 0px;
+  margin: 0px;
+  padding: 0px;
+  background-color: #cccccc;
+  color: #666666;
+  width: 80px;
+  height: 40px;
+  line-height: 40px;
+}
+#jot #jot-tools li.submit input:hover {
+  background-color: #bdcdd4;
+  color: #666666;
+}
+#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;
+}
+#profile-jot-form #jot-title, #profile-jot-form #jot-category {
+    
+  	 border-radius: 5px 5px 5px 5px;
+    font-weight: bold;
+    height: 20px;
+    margin: 0 0 5px;
+    width: 60%;
+    border: 1px solid #d2d2d2;
+}
+#profile-jot-form #jot-title:-webkit-input-placeholder {
+  font-weight: normal;
+}
+#profile-jot-form #jot-title:-moz-placeholder {
+  font-weight: normal;
+}
+#profile-jot-form #profile-jot-text_parent #profile-jot-text_tbl{
+	width: 785px;
+	height: 100px;
+	}
+#jot #jot-title:hover {
+  border: 1px solid #999999;
+}
+#jot #jot-title:focus {
+  border: 1px solid #999999;
+}
+#jot #character-counter {
+  width: 80px;
+  float: right;
+  text-align: right;
+  height: 20px;
+  line-height: 20px;
+  padding-right: 20px;
+}
+#jot-perms-icon, 
+#profile-location,
+#profile-nolocation,
+#profile-youtube, 
+#profile-video, 
+#profile-audio,
+#profile-link,
+#profile-title, 
+#wall-image-upload,
+#wall-file-upload,
+#wall-image-upload-div,
+#wall-file-upload-div,
+.hover, .focus {
+	cursor: pointer;
+	margin-top: 2px;
+}
+/*marker*/
+#profile-jot-wrapper{
+	margin: 0 20px 20px 0;
+   width: 785px;
+	}
+/*marker*/
+#profile-jot-submit-wrapper {
+	margin-bottom: 50px;
+	width: 785px;
+}
+
+#profile-jot-submit {
+	float: right;
+	margin-top: 2px;
+	font-size: 14px;
+	
+}
+#profile-upload-wrapper {
+	float: left;
+	margin-top: 2px;
+	margin-left: 10px;
+	
+}
+#profile-attach-wrapper {
+	float: left;
+	margin-left: 15px;
+	margin-top: 2px;
+}
+#profile-rotator {
+	float: left;
+	margin-left: 30px;
+	margin-top: 2px;
+}
+#profile-link-wrapper {
+	float: left;
+	margin-left: 15px;
+	margin-top: 2px;
+}
+#profile-youtube-wrapper {
+	float: left;
+	margin-left: 15px;
+	margin-top: 2px;
+}
+#profile-video-wrapper {
+	float: left;
+	margin-left: 15px;
+	margin-top: 2px;
+}
+#profile-audio-wrapper {
+	float: left;
+	margin-left: 15px;
+	margin-top: 2px;
+}
+#profile-location-wrapper {
+	float: left;
+	margin-left: 15px;
+	margin-top: 2px;
+}
+#profile-jot-perms {
+	float: left;
+	margin-left: 45px;
+	margin-top: 2px;
+}
+#jot-preview-link {
+	float: right;
+	margin-left: 10px;
+	margin-top: 2px;
+	font-size: 9px;
+	font-weight: bolder;
+	cursor: pointer;
+}
+#profile-jot-perms{
+   float: right;
+	margin-left: 10px;
+	margin-top: 2px;	
+	}
+/** buttons **/
+.button.creation1 {
+    background-color: #fff;
+    border: 1px solid #777777;
+    border-radius: 3px 3px 3px 3px;
+    box-shadow: 0 1px 1px #CFCFCF;
+    font-weight: bolder;
+	 cursor: pointer;
+}
+.button.creation2 {
+    background-color: #996d73;
+    border: 1px solid #777777;
+    color: white;
+    border-radius: 3px 3px 3px 3px;
+    box-shadow: 0 1px 1px #CFCFCF;
+    margin-left: 5px;
+    font-weight: bolder;
+	 cursor: pointer;
+}
+/*input[type="submit"] {
+	border: 0px;
+    background-color: @ButtonBackgroundColor;
+    color: @ButtonColor;
+    padding: 0px 10px;
+	.rounded(5px);
+    height: 18px;
+}*/
+/** acl **/
+#photo-edit-perms-select, #photos-upload-permissions-wrapper, #profile-jot-acl-wrapper {
+  display: block!important;
+}
+#acl-wrapper {
+  width: 690px;
+  float: left;
+}
+#acl-search {
+  float: right;
+  background: #ffffff url("../../../images/search_18.png") no-repeat right center;
+  padding-right: 20px;
+}
+#acl-showall {
+  float: left;
+  display: block;
+  width: auto;
+  height: 18px;
+  background-color: #cccccc;
+  background-image: url("../../../images/show_all_off.png");
+  background-position: 7px 7px;
+  background-repeat: no-repeat;
+  padding: 7px 5px 0px 30px;
+  color: #999999;
+  -moz-border-radius: 5px 5px 5px 5px;
+  -webkit-border-radius: 5px 5px 5px 5px;
+  border-radius: 5px 5px 5px 5px;
+}
+#acl-showall.selected {
+  color: #000000;
+  background-color: #ff9900;
+  background-image: url("../../../images/show_all_on.png");
+}
+#acl-list {
+  height: 210px;
+  border: 1px solid #cccccc;
+  clear: both;
+  margin-top: 30px;
+  overflow: auto;
+}
+.acl-list-item {
+  display: block;
+  width: 150px;
+  height: 30px;
+  border: 1px solid #cccccc;
+  margin: 5px;
+  float: left;
+}
+.acl-list-item img {
+  width: 22px;
+  height: 22px;
+  float: left;
+  margin: 4px;
+}
+.acl-list-item p {
+  height: 12px;
+  font-size: 10px;
+  margin: 0px;
+  padding: 2px 0px 1px;
+  overflow: hidden;
+}
+.acl-list-item a {
+  font-size: 8px;
+  display: block;
+  width: 40px;
+  height: 10px;
+  float: left;
+  color: #999999;
+  background-color: #cccccc;
+  background-position: 3px 3px;
+  background-repeat: no-repeat;
+  margin-right: 5px;
+  -webkit-border-radius: 2px ;
+  -moz-border-radius: 2px;
+  border-radius: 2px;
+  padding-left: 15px;
+}
+#acl-wrapper a:hover {
+  text-decoration: none;
+  color: #000000;
+}
+.acl-button-show {
+  background-image: url("../../../images/show_off.png");
+}
+.acl-button-hide {
+  background-image: url("../../../images/hide_off.png");
+}
+.acl-button-show.selected {
+  color: #000000;
+  background-color: #9ade00;
+  background-image: url("../../../images/show_on.png");
+}
+.acl-button-hide.selected {
+  color: #000000;
+  background-color: #ff4141;
+  background-image: url("../../../images/hide_on.png");
+}
+.acl-list-item.groupshow {
+  border-color: #9ade00;
+}
+.acl-list-item.grouphide {
+  border-color: #ff4141;
+}
+/** /acl **/
+/** tab buttons 14618a**/
+/*marker*/
+ul.tabs {
+  list-style-type: none;
+  padding-bottom: 10px;
+  font-size: 13px;
+  width: 805px;
+}
+ul.tabs li {
+  float: left;
+  margin-left: 5px;
+}
+ul.tabs li .active {
+    background-color: #996d73;
+    border: 1px solid #777777;
+    color: white;
+    border-radius: 3px 3px 3px 3px;
+    box-shadow: 2px 2px 2px #CFCFCF;
+    margin-left: 5px;
+}
+//settings tabs
+ul.rs_tabs {
+  list-style-type: none;
+  font-size: 11px;
+}
+ul.rs_tabs li {
+  float: left;
+  margin-bottom: 30px;
+  clear: both;
+}
+ul.rs_tabs li .selected {
+    background-color: #996d73;
+    border: 1px solid #777777;
+    color: white;
+    border-radius: 3px 3px 3px 3px;
+    box-shadow: 2px 2px 2px #CFCFCF;
+    font-size: 13px;
+}
+.rs_tabs {
+    list-style-type: none;
+    font-size: 11px;
+    background-position: 0 -20px;
+    background-repeat: repeat-x;
+    height: 27px;
+    padding: 0;
+ }
+.rs_tab.button {	
+    /*background: none repeat scroll 0 0 #F8F8F8;*/
+    border: 1px solid #CCCCCC;
+    border-radius: 3px 3px 3px 3px;
+    font-weight: bolder;
+    padding: 3px;
+    color:  #333333;
+    text-decoration: none;
+	}
+/**
+ * Form fields
+ */
+.field {
+  margin-bottom: 10px;
+  padding-bottom: 10px;
+  overflow: auto;
+  width: 100%;
+}
+.field label {
+  float: left;
+  width: 200px;
+}
+.field input, .field textarea {
+  width: 400px;
+}
+.field textarea {
+  height: 100px;
+}
+.field .field_help {
+  display: block;
+  margin-left: 200px;
+  color: #666666;
+}
+.field .onoff {
+  float: left;
+  width: 80px;
+}
+.field .onoff a {
+  display: block;
+  border: 1px solid #666666;
+  background-image: url("../../../images/onoff.jpg");
+  background-repeat: no-repeat;
+  padding: 4px 2px 2px 2px;
+  height: 16px;
+  text-decoration: none;
+}
+.field .onoff .off {
+  border-color: #666666;
+  padding-left: 40px;
+  background-position: left center;
+  background-color: #cccccc;
+  color: #666666;
+  text-align: right;
+}
+.field .onoff .on {
+  border-color: #204A87;
+  padding-right: 40px;
+  background-position: right center;
+  background-color: #D7E3F1;
+  color: #204A87;
+  text-align: left;
+}
+.field .hidden {
+  display: none!important;
+}
+.field.radio .field_help {
+  margin-left: 0px;
+}
+.suggest-select {
+width: 500px;
+height: 350px;	
+	}
+.message-to-select {
+	width: 400px;
+   height: 150px;
+	}
+#directory-search-form{
+	margin-bottom: 50px;
+	}
+#profile-edit-links-end {
+        clear: both;
+        margin-bottom: 15px;
+}
+
+#profile-edit-links ul { margin: 20px; padding-bottom: 20px; list-style: none; }
+
+#profile-edit-links li {
+  float: left;
+  list-style: none;
+  margin-left: 10px;
+}
+
+.profile-edit-side-div {
+  display: none;
+}
+
+#register-form label,
+#profile-edit-form label {
+        width: 300px; float: left;
+}
+
+.required {
+  display: inline;
+  color: #B20202;
+}
+
+/* oauth */
+.oauthapp {
+  height: auto;
+  overflow: auto;
+  border-bottom: 2px solid #cccccc;
+  padding-bottom: 1em;
+  margin-bottom: 1em;
+}
+.oauthapp img {
+  float: left;
+  width: 48px;
+  height: 48px;
+  margin: 10px;
+}
+.oauthapp img.noicon {
+  background-image: url("../../../images/icons/48/plugin.png");
+  background-position: center center;
+  background-repeat: no-repeat;
+}
+.oauthapp a {
+  float: left;
+}
+/* contacts */
+.contact-entry-wrapper {
+  width: 120px;
+  height: 120px;
+  float: left;
+}
+/* photo */
+.photo {
+box-shadow: 2px 2px 5px 0px #000000;
+margin: 0px;
+border-radius: 10px;
+height: 145px !important;
+width: 145px !important;
+}
+.lframe {
+  float: left;
+  /*margin: 0px 10px 10px 0px;*/
+}
+/* profile match wrapper */
+.profile-match-wrapper {
+  float: left;
+  width: 90px;
+  height: 90px;
+  margin-bottom: 20px;
+}
+.profile-match-wrapper .contact-photo {
+  width: 80px;
+  height: 80px;
+}
+.profile-match-wrapper .contact-photo img {
+  width: 80px;
+  height: 80px;
+}
+.profile-match-wrapper {
+  left: 0px;
+  top: 63px;
+}
+
+.contact-photo-menu-button {
+        position: relative;
+        background-image: url("../../../images/icons/16/menu.png");
+        background-position: top left; 
+        background-repeat: no-repeat;
+        margin: 0px 0px -16px 0px; 
+	padding: 0px;
+        width: 16px;
+        height: 16px;
+        top: -16px; left:0px;
+        overflow: hidden;
+        text-indent: 40px;
+        display: none;
+        
+}
+.contact-photo-menu {
+        width: 11em;
+        border: 3px solid #364e59;
+	color: #2d2d2d;
+        background: #FFFFFF;
+/*        position: absolute;*/
+        position: relative;
+        left: 0px; top: 0px;
+        display: none;
+        z-index: 10000;
+}
+.contact-photo-menu ul { margin:0px; padding: 0px; list-style: none }
+.contact-photo-menu li a {
+	display: block; 
+	padding: 5px 10px; 
+	color: #2d2d2d;
+	text-decoration: none;
+}
+.contact-photo-menu li a:hover {
+	background-color: #bdcdd4; 
+}
+
+/* page footer */
+footer {
+  height: 100px;
+  display: table-row;
+}
+
+blockquote {
+    border-left: 1px solid #D2D2D2;
+    padding-left: 9px;
+    margin: 0 0 0 .8ex;
+    color: #777;
+}
+.oembed {
+	
+	font-weight: bold;
+}
+.aprofile dt{
+box-shadow: 1px 1px 5px 0;
+    color: #666666;
+    margin: 15px 0 5px;
+    padding-left: 5px;	
+	}
+/* ================== */
+/* = Contacts Block = */
+/* ================== */
+
+.contact-block-img {
+        width: 55px;
+        height: 55px;
+        padding-right: 3px;
+}
+.contact-block-div {
+        float: left;
+}
+
+.contact-block-textdiv { width: 150px; height: 34px; float: left; }
+#contact-block-end { clear: both; } 
+
+#group-edit-wrapper {
+        margin-bottom: 10px;
+}
+
+#group-members-end {
+        clear: both;
+}
+#group-edit-desc {
+ margin-top: 15px;
+}
+
+/*
+#group-separator,
+#prof-separator { display: none;}
+*/
+#prof-members-end{
+	clear: both;
+	}
+
+#prvmail-to-label, #prvmail-subject-label, #prvmail-message-label {
+	margin-bottom: 10px;
+	margin-top: 20px;
+}
+
+#prvmail-submit {
+	float: right;
+	margin-top: 10px;
+}
+
+#prvmail-subject
+{
+background: none repeat scroll 0 0 #FFFFFF;
+border: 1px solid #CCCCCC;
+border-radius: 5px 5px 5px 5px;
+font-weight: bold;
+height: 20px;
+margin: 0 0 5px;
+vertical-align: middle;
+}
+#prvmail-form{
+ width: 597px;	
+	}
+	
+#prvmail-upload-wrapper,
+#prvmail-link-wrapper,
+#prvmail-rotator-wrapper {
+	float: left;
+	margin-top: 10px;
+	margin-right: 10px;
+	width: 24px;
+}
+
+#prvmail-end {
+	clear: both;
+}
+
+.mail-list-sender,
+.mail-list-detail {
+	float: left;
+}
+.mail-list-detail {
+	margin-left: 20px;
+}
+
+.mail-list-subject {
+	font-size: 1.1em;
+	margin-top: 10px;
+}
+a.mail-list-link {
+    display: block;
+    font-size: 1.3em;
+    padding: 4px 0;
+}
+
+/*
+*a.mail-list-link:hover {
+*	background-color: #15607B;
+*	color: #F5F6FB;
+*}
+*/
+
+.mail-list-outside-wrapper-end {
+	clear: both;
+}
+
+.mail-list-outside-wrapper {
+	margin-top: 30px;
+}
+
+.mail-list-delete-wrapper {
+	float: right;
+	margin-right: 30px;
+	margin-top: 15px;
+}
+
+.mail-list-delete-icon {
+	border: none;
+}
+
+.mail-conv-sender,
+.mail-conv-detail {
+	float: left;
+}
+.mail-conv-detail {
+	margin-left: 20px;
+	width: 500px;
+}
+
+.mail-conv-subject {
+    font-size: 1.4em;
+    margin: 10px 0;
+}
+
+.mail-conv-outside-wrapper-end {
+	clear: both;
+}
+
+.mail-conv-outside-wrapper {
+	margin-top: 30px;
+}
+
+.mail-conv-delete-wrapper {
+	float: right;
+	margin-right: 30px;
+	margin-top: 15px;
+}
+.mail-conv-break {
+	clear: both;
+}
+
+.mail-conv-delete-icon {
+	border: none;
+}
+
+/* ========== */
+/* = Events = */
+/* ========== */
+.eventcal {
+        float: left;
+        font-size: 20px;
+}
+
+.vevent {
+position: relative;
+width: 400px;
+padding: 20px;
+padding-top: 10px;
+margin: 0 0px;
+margin-bottom: 10px;
+background-color: white;
+-webkit-box-shadow: 0 0 4px rgba(0, 0, 0, 0.2), inset 0 0 50px rgba(0, 0, 0, 0.1);
+-moz-box-shadow: 0 0 4px rgba(0, 0, 0, 0.2), inset 0 0 50px rgba(0, 0, 0, 0.1);
+box-shadow: 0 0 5px rgba(0, 0, 0, 0.2), inset 0 0 50px rgba(0, 0, 0, 0.1);
+}
+.vevent .event-location {
+        margin-left: 10px;
+        margin-right: 10px;
+}
+.vevent .event-description {
+margin-left: 10px;
+margin-right: 10px;
+font-size: 1.1em;
+font-weight: bolder;
+}
+.vevent .event-start, .vevent .event-end {
+
+margin-right: 20px;
+margin-bottom: 2px;
+margin-top: 2px;
+font-size: 0.9em;
+text-align: left;
+}
+.event-start .dtstart, .event-end .dtend {
+float: right;
+}
+
+
+#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("../diabook/icons/events2.png") !important;
+        margin-right: 15px;
+}
+
+.event-start, .event-end {
+        margin-left: 10px;
+        width: 330px;
+        clear: both;
+}
+
+.event-start .dtstart, .event-end .dtend {
+        float: right;
+}
+
+.event-list-date {
+        margin-bottom: 10px;
+}
+
+.prevcal, .nextcal {
+        float: left;
+        margin-left: 32px;
+        margin-right: 32px;
+        margin-top: 64px;
+}
+.event-calendar-end {
+        clear: both;
+}
+
+ 
+.calendar {
+        font-family: Courier, monospace;
+}
+.calendar.eventcal a {
+  color: #3465A4;	
+	}
+.today {
+        font-weight: bold;
+        color: #FF0000;
+}
+
+.settings-block {
+        border: 1px solid #AAA;
+        margin: 10px;
+        padding: 10px;
+}
+
+.app-title {
+        margin: 10px;
+}
+
+#identity-manage-desc {
+        margin-top:15px;
+        margin-bottom: 15px;
+}
+
+#identity-manage-choose {
+        margin-bottom: 15px;
+}
+
+#identity-submit {
+        margin-top: 20px;
+}
+
+#photo-prev-link, #photo-next-link {
+        padding: 10px;
+        float: left;
+}
+.lightbox{
+	float: left;
+	}
+#photo-photo {
+        float: left;
+}
+#photo-like-div .wall-item-like-buttons {
+	float: left;
+   margin-right: 10px;
+	}
+.wall-item-like-buttons .icon.like {
+float: left;
+}
+
+#photo-photo-end {
+        clear: both;
+}
+
+.tabs .comment-wwedit-wrapper {
+	display: block;
+   margin-top: 30px;
+   margin-left: 50px;
+	}
+
+.profile-match-photo {
+        float: left;
+        text-align: center;
+        width: 120px;
+}
+
+.profile-match-name {
+        float: left;
+        text-align: center;
+        width: 120px;
+        overflow: hidden;
+}
+
+.profile-match-break,
+.profile-match-end {
+        clear: both;
+}
+
+.profile-match-connect {
+        text-align: center;
+        font-weight: bold;
+}
+
+.profile-match-wrapper {
+        float: left;
+        padding: 10px;
+        width: 120px;
+        height: 120px;
+        scroll: auto;
+}
+#profile-match-wrapper-end {
+        clear: both;
+}
+
+/* ============= */
+/* = Directory = */
+/* ============= */
+/* contacts menu */
+.contact-photo-wrapper {
+  position: relative;
+}
+.contact-photo {
+  width: 48px;
+  height: 48px;
+  overflow: hidden;
+  display: block;
+}
+.contact-photo img {
+  width: 48px;
+  height: 48px;
+}
+.contact-photo-menu-button {
+  display: none;
+  /* position: absolute; */
+  /* position: absolute; */
+  left: 0px;
+  top: -16px;
+}
+.contact-wrapper {
+  float: left;
+  width: 90px;
+  height: 90px;
+  margin-bottom: 15px;
+}
+.contact-wrapper .contact-photo {
+  width: 80px;
+  height: 80px;
+}
+.contact-wrapper .contact-photo img {
+  width: 80px;
+  height: 80px;
+}
+.contact-wrapper .contact-photo-menu-button {
+  left: 0px;
+  top: 63px;
+}
+.directory-item {
+  float: left;
+  width: 200px;
+  height: 200px;
+}
+.directory-item .contact-photo {
+  width: 175px;
+  height: 175px;
+}
+.directory-item .contact-photo img {
+  width: 175px;
+  height: 175px;
+}
+.contact-name {
+  text-align: left;
+  font-weight: bold;
+  font-size: 12px;
+}
+.contact-details {
+  color: #999999;
+}
+#side-bar-photos-albums{
+	margin-top: 15px;	
+	}
+.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-album-image-wrapper, .photo-top-image-wrapper {
+  float: left;
+   -moz-box-shadow: 0 0 5px #888;
+   -webkit-box-shadow: 0 0 5px #888;
+   box-shadow: 0 0 5px #888;
+  background-color: #000;
+   -webkit-border-radius: 5px;
+   -moz-border-radius: 5px;
+  border-radius: 5px;
+  padding-bottom: 20px;
+  position: relative;
+  margin: 0 10px 10px 0;
+  width: 200px; height: 140px;
+  overflow: hidden;  
+}
+.photo-top-album-name {
+        width: 100%;
+        position: absolute; 
+        bottom: 0px; 
+        padding-left: 3px;
+        background-color: #EEE;
+}
+.photo-top-album-link{
+  color: #3465A4;
+	}
+.photo-top-album-img{
+	
+	}
+/*.photo-top-image-wrapper {
+        position: relative;
+        float: left;
+        margin-top: 15px;
+        margin-right: 15px;
+        width: 200px; height: 200px; 
+        overflow: hidden; 
+}
+.photo-top-album-name {
+        width: 100%;
+        min-height: 2em;
+        position: absolute; 
+        bottom: 0px; 
+        padding: 0px 3px;
+        padding-top: 0.5em;
+        background-color: rgb(255, 255, 255);
+}*/
+#photo-top-end {
+        clear: both;
+}
+
+#photo-top-links {
+        margin-bottom: 30px;
+        margin-left: 30px;
+}
+
+#photos-upload-newalbum-div {
+        float: left;
+        width: 175px;
+}
+
diff --git a/view/theme/diabook/diabook-pink/style.css b/view/theme/diabook/diabook-pink/style.css
new file mode 100644
index 000000000..c223e6439
--- /dev/null
+++ b/view/theme/diabook/diabook-pink/style.css
@@ -0,0 +1,2917 @@
+/**
+ * Fabio Comuni <http://kirgroup.com/profile/fabrixxm>
+ * Additional Changes: Michael Vogel <icarus@dabo.de>
+ **/
+
+/* ========= */
+/* = Admin = */
+/* ========= */
+
+#adminpage {
+/*        width: 80%;*/
+}
+
+#pending-update {
+        float:right;
+        color: #ffffff;
+        font-weight: bold;
+        background-color: #FF0000;
+        padding: 0em 0.3em;
+}
+
+.admin.linklist {
+        border: 0px; padding: 0px;
+}
+
+.admin.link {
+        list-style-position: inside;
+        font-size: 1em;
+        padding: 5px;
+        width: 100px;
+        margin: 5px;
+}
+
+#adminpage dl {
+        clear: left;
+        margin-bottom: 2px;
+        padding-bottom: 2px;
+        border-bottom: 1px solid black;
+}
+
+#adminpage dt {
+        width: 200px;
+        float: left;
+        font-weight: bold;
+}
+
+#adminpage dd {
+        margin-left: 200px;
+}
+#adminpage h3 {
+        border-bottom: 1px solid #898989;
+        margin-bottom: 5px;
+        margin-top: 10px;
+}
+
+#adminpage .submit {
+        clear:left;
+}
+
+#adminpage #pluginslist {
+        margin: 0px; padding: 0px;
+}
+
+#adminpage .plugin {
+        list-style: none;
+        display: block;
+	/* border: 1px solid #888888; */
+        padding: 1em;
+        margin-bottom: 5px;
+        clear: left;
+}
+
+#adminpage .toggleplugin {
+        float:left;
+        margin-right: 1em;
+}
+
+#adminpage table {width:100%; border-bottom: 1p solid #000000; margin: 5px 0px;}
+#adminpage table th { text-align: left;}
+#adminpage td .icon { float: left;}
+#adminpage table#users img { width: 16px; height: 16px; }
+#adminpage table tr:hover { background-color: #eeeeee; }
+#adminpage .selectall { text-align: right; }
+/* icons */
+
+.icon.bb-url{
+  background-image: url("../../../view/theme/diabook/diabook-pink/icons/bb-url.png");
+  float: right;
+  margin-top: 2px;}
+.icon.quote{
+  background-image: url("../../../view/theme/diabook/diabook-pink/icons/quote.png");
+  float: right;
+  margin-top: 2px;}
+.icon.bold{
+  background-image: url("../../../view/theme/diabook/diabook-pink/icons/bold.png");
+  float: right;
+  margin-top: 2px;}
+.icon.underline{
+  background-image: url("../../../view/theme/diabook/diabook-pink/icons/underline.png");
+  float: right;
+  margin-top: 2px;}
+.icon.italic{
+  background-image: url("../../../view/theme/diabook/diabook-pink/icons/italic.png");
+  float: right;
+  margin-top: 2px;}
+.icon.bb-image{
+  background-image: url("../../../view/theme/diabook/diabook-pink/icons/bb-image.png");
+  float: right;
+  margin-top: 2px;}
+.icon.bb-video{
+  background-image: url("../../../view/theme/diabook/diabook-pink/icons/bb-video.png");
+  float: right;
+  margin-top: 2px;}
+  
+.icon.contacts {
+  background-image: url("../../../view/theme/diabook/diabook-pink/icons/contacts.png");}
+.icon.notifications {
+  background-image: url("../../../view/theme/diabook/diabook-pink/icons/notifications.png");}
+.icon.notify {
+  background-image: url("../../../view/theme/diabook/diabook-pink/icons/notify.png");}
+.icon.messages {
+  background-image: url("../../../view/theme/diabook/diabook-pink/icons/messages.png");}
+.icon.community {
+  background-image: url("../../../view/theme/diabook/diabook-pink/icons/community.png");}
+  
+.icon.drop 	{ background-image: url("../../../view/theme/diabook/diabook-pink/icons/drop.png");}
+.icon.drophide 	{ background-image: url("../../../view/theme/diabook/diabook-pink/icons/drop.png");}
+.icon.dislike 	{ background-image: url("../../../view/theme/diabook/diabook-pink/icons/dislike.png");}
+.icon.like 	{ background-image: url("../../../view/theme/diabook/diabook-pink/icons/like.png");}
+.icon.pencil 	{ background-image: url("../../../view/theme/diabook/diabook-pink/icons/pencil.png");}
+.icon.recycle 	{ background-image: url("../../../view/theme/diabook/diabook-pink/icons/recycle.png");}
+.icon.remote-link { background-image: url("../../../view/theme/diabook/diabook-pink/icons/remote.png");}
+.icon.tagged    { background-image: url("../../../view/theme/diabook/diabook-pink/icons/tagged.png");}
+.icon.file-as { background-image: url("../../../view/theme/diabook/diabook-pink/icons/file_as.png");}
+.star-item.icon.unstarred { background-image: url("../../../view/theme/diabook/diabook-pink/icons/unstarred.png");}
+.star-item.icon.starred { background-image: url("../../../view/theme/diabook/diabook-pink/icons/starred.png");}
+.icon.link		{ background-image: url("../../../view/theme/diabook/diabook-pink/icons/link.png");}
+.icon.lock		{ background-image: url("../../../view/theme/diabook/diabook-pink/icons/lock.png");}
+.icon.unlock		{ background-image: url("../../../view/theme/diabook/diabook-pink/icons/unlock.png");}
+.icon.language    { background-image: url("../../../view/theme/diabook/diabook-pink/icons/language.png");}
+
+
+.camera 	{ background-image: url("../../../view/theme/diabook/diabook-pink/icons/camera.png"); 
+			  display: block; width: 28px; height: 28px; background-repeat: no-repeat;
+			  }
+.attach 	{ background-image: url("../../../view/theme/diabook/diabook-pink/icons/attach.png"); 
+			  display: block; width: 28px; height: 28px; background-repeat: no-repeat;
+			  }
+.video2 	{ background-image: url("../../../view/theme/diabook/diabook-pink/icons/video.png"); 
+			  display: block; width: 28px; height: 28px; background-repeat: no-repeat;
+			  }	
+.video 	{ background-image: url("../../../view/theme/diabook/diabook-pink/icons/video.png"); 
+			  display: block; width: 100%; height: 140px; background-repeat: no-repeat;
+			  }
+.audio2 	{ background-image: url("../../../view/theme/diabook/diabook-pink/icons/audio.png"); 
+			  display: block; width: 28px; height: 28px; background-repeat: no-repeat;
+			  }
+.audio 	{ background-image: url("../../../view/theme/diabook/diabook-pink/icons/audio.png"); 
+			  display: block; width: 28px; height: 28px; background-repeat: no-repeat;
+			  }
+.weblink 	{ background-image: url("../../../view/theme/diabook/diabook-pink/icons/weblink.png"); 
+			  display: block; width: 28px; height: 28px; background-repeat: no-repeat;
+			  }
+.globe 	{ background-image: url("../../../view/theme/diabook/diabook-pink/icons/globe.png"); 
+			  display: block; width: 28px; height: 28px; background-repeat: no-repeat;
+			  }
+.unglobe 	{ background-image: url("../../../view/theme/diabook/diabook-pink/icons/unglobe.png"); 
+			  display: block; width: 28px; height: 28px; background-repeat: no-repeat;
+			  }
+.edit    {background-image: url("../../../view/theme/diabook/diabook-pink/icons/pencil2.png"); 
+			  display: block; width: 28px; height: 28px; background-repeat: no-repeat;}
+.icon.block   {background-image: url("../diabook/icons/block.png"); 
+			  display: block; width: 16px; height: 16px; background-repeat: no-repeat;}
+.icon.block.dim  {background-image: url("../diabook/icons/block.png"); 
+			  display: block; width: 16px; height: 16px; background-repeat: no-repeat; opacity: 0.3;}
+.icon.ad_drop 	{ background-image: url("../diabook/icons/drop.png");
+			  display: block; margin-left:5px; width: 16px; height: 16px; background-repeat: no-repeat;}			  
+			  
+
+
+.article	{ background-position: -50px  0px;}
+/*.audio 		{ background-position: -70px  0px;}*/
+/*.drop 		{ background-position: -110px 0px;}*/
+/*.drophide 	{ background-position: -130px 0px;}*/
+/*.edit 		{ background-position: -150px 0px;}*/
+/*.camera 	{ background-position: -170px 0px;}*/
+/*.dislike 	{ background-position: -190px 0px;}*/
+/*.like 		{ background-position: -210px 0px;}*/
+/*.link 		{ background-position: -230px 0px;}*/
+
+/*.globe 		{ background-position: -50px  -20px;}*/
+/*.noglobe 	{ background-position: -70px  -20px;}*/
+.no 		{ background-position: -90px  -20px;}
+.pause 		{ background-position: -110px -20px;}
+.play 		{ background-position: -130px -20px;}
+/*.pencil 	{ background-position: -150px -20px;}*/
+.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;}*/
+
+/*.video          { background-position: -110px -40px;}*/
+.youtube        { background-position: -130px -40px;}
+
+/*.attach         { background-position: -190px -40px;}*/
+/*.language       { background-position: -210px -40px;}*/
+
+
+.icon.on             { background-image: url("../../../view/theme/diabook/diabook-pink/icons/toogle_on.png"); background-repeat: no-repeat;}
+.icon.off            { background-image: url("../../../view/theme/diabook/diabook-pink/icons/toogle_off.png"); background-repeat: no-repeat;}
+.icon.prev           { background-image: url("../../../view/theme/diabook/diabook-pink/icons/prev.png"); background-repeat: no-repeat;}
+.icon.next           { background-image: url("../../../view/theme/diabook/diabook-pink/icons/next.png"); background-repeat: no-repeat;}
+/*.tagged     { background-position: -130px -60px;}*/
+
+.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 0px; }
+.type-audio { background-position: -40px 0px; }
+.type-text  { background-position: -60px 0px; }
+.type-unkn  { background-position: -80px 0px; }
+
+.icon.drop, .icon.drophide {
+ float: left;
+}
+
+.icon {
+  display: block;
+  width: 20px;
+  height: 20px;
+  /*background-image: url('icons.png');*/
+}
+
+.icon {
+  background-color: transparent ;
+  background-repeat: no-repeat;
+  /* background-position: left center; */
+  display: block;
+  overflow: hidden;
+  text-indent: -9999px;
+  padding: 1px;
+}
+
+.icon.border.camera{
+  background-image: url("../../../view/theme/diabook/diabook-pink/icons/camera.png"); 
+  display: block; width: 28px; height: 28px; background-repeat: no-repeat;
+	}
+	
+.icon.border.link{
+  background-image: url("../../../view/theme/diabook/diabook-pink/icons/weblink.png"); 
+  display: block; width: 28px; height: 28px; background-repeat: no-repeat;
+  margin-left: 10px;
+	}
+
+.icon.text {
+  text-indent: 0px;
+}
+.icon.s10 {
+  min-width: 10px;
+  height: 10px;
+}
+.icon.s10.notify {
+  background-image: url("../../../images/icons/10/notify_off.png");
+}
+.icon.s10.gear {
+  background-image: url("../../../images/icons/10/gear.png");
+}
+.icon.s10.add {
+  background-image: url("../../../images/icons/10/add.png");
+}
+.icon.s10.delete {
+  background-image: url("../../../images/icons/10/delete.png");
+}
+.icon.s10.edit {
+  background-image: url("../../../images/icons/10/edit.png");
+}
+.icon.s10.star {
+  background-image: url("../../../images/star_dummy.png");
+}
+.icon.s10.menu {
+  background-image: url("../../../images/icons/10/menu.png");
+}
+.icon.s10.link {
+  background-image: url("../../../images/icons/10/link.png");
+}
+.icon.s10.lock {
+  background-image: url("../../../images/icons/10/lock.png");
+}
+.icon.s10.unlock {
+  background-image: url("../../../images/icons/10/unlock.png");
+}
+.icon.s10.text {
+  padding: 2px 0px 0px 15px;
+  font-size: 10px;
+}
+.icon.s16 {
+  min-width: 16px;
+  height: 16px;
+}
+.icon.s16.notify {
+  background-image: url("../../../images/icons/16/notify_off.png");
+}
+.icon.s16.gear {
+  background-image: url("../../../images/icons/16/gear.png");
+}
+.icon.s16.add {
+  background-image: url("../../../images/icons/16/add.png");
+}
+.icon.s16.delete {
+  background-image: url("../../../images/icons/16/delete.png");
+}
+/*.icon.s16.edit {
+  background-image: url("../../../images/icons/16/edit.png");
+}*/
+.icon.s16.star {
+  background-image: url("../../../images/star_dummy.png");
+}
+.icon.s16.menu {
+  background-image: url("../../../images/icons/16/menu.png");
+}
+/*.icon.s16.link {
+  background-image: url("../../../images/icons/16/link.png");
+}*/
+.icon.s16.lock {
+  background-image: url("../../../images/icons/16/lock.png");
+}
+.icon.s16.unlock {
+  background-image: url("../../../images/icons/16/unlock.png");
+}
+.icon.s16.text {
+  padding: 4px 0px 0px 20px;
+  font-size: 10px;
+}
+.icon.s22 {
+  min-width: 22px;
+  height: 22px;
+}
+.icon.s22.notify {
+  background-image: url("../../../images/icons/22/notify_off.png");
+}
+.icon.s22.gear {
+  background-image: url("../../../images/icons/22/gear.png");
+}
+.icon.s22.add {
+  background-image: url("../../../images/icons/22/add.png");
+}
+.icon.s22.delete {
+  background-image: url("../../../images/icons/22/delete.png");
+}
+.icon.s22.edit {
+  background-image: url("../../../images/icons/22/edit.png");
+}
+.icon.s22.star {
+  background-image: url("../../../images/star_dummy.png");
+}
+.icon.s22.menu {
+  background-image: url("../../../images/icons/22/menu.png");
+}
+.icon.s22.link {
+  background-image: url("../../../images/icons/22/link.png");
+}
+.icon.s22.lock {
+  background-image: url("../../../images/icons/22/lock.png");
+}
+.icon.s22.unlock {
+  background-image: url("../../../images/icons/22/unlock.png");
+}
+.icon.s22.text {
+  padding: 10px 0px 0px 25px;
+  width: 200px;
+}
+.icon.s48 {
+  width: 48px;
+  height: 48px;
+}
+.icon.s48.notify {
+  background-image: url("../../../images/icons/48/notify_off.png");
+}
+.icon.s48.gear {
+  background-image: url("../../../images/icons/48/gear.png");
+}
+.icon.s48.add {
+  background-image: url("../../../images/icons/48/add.png");
+}
+.icon.s48.delete {
+  background-image: url("../../../images/icons/48/delete.png");
+}
+.icon.s48.edit {
+  background-image: url("../../../images/icons/48/edit.png");
+}
+.icon.s48.star {
+  background-image: url("../../../images/star_dummy.png");
+}
+.icon.s48.menu {
+  background-image: url("../../../images/icons/48/menu.png");
+}
+.icon.s48.link {
+  background-image: url("../../../images/icons/48/link.png");
+}
+.icon.s48.lock {
+  background-image: url("../../../images/icons/48/lock.png");
+}
+.icon.s48.unlock {
+  background-image: url("../../../images/icons/48/unlock.png");
+}
+
+#contact-edit-links ul {
+  list-style: none;
+  list-style-type: none;
+}
+
+.hide-comments-outer {
+  margin-left: 80px;
+  margin-bottom: 5px;
+  width: 684px;
+  border-bottom: 1px solid #BDCDD4;
+  padding: 8px;
+}
+
+/* global */
+body {
+  font-family: 'Lato', "Helvetica Neue", Helvetica, Arial, sans-serif;
+  font-size: 12.5px;
+  background-color: #ffffff;
+  color: #2d2d2d;
+  margin: 50px auto auto;
+  display: table;
+}
+
+#jappix_mini {
+right: 45px !important;
+}
+
+
+h4 {
+  font-size: 1.1em;
+}
+
+a {
+	color: #333333;
+	/* color: #3e3e8c; */
+	text-decoration: none;
+}
+a:hover {
+	/* color: blue; */
+	text-decoration: underline
+}
+
+.wall-item-name-link {
+/*  float: left;*/
+}
+
+.wall-item-photo {
+  width: 48px;
+  height: 48px;
+  overflow: hidden;
+  display: block;
+}
+
+.left {
+  float: left;
+}
+.right {
+  float: right;
+}
+.hidden {
+  display: none;
+}
+.clear {
+  clear: both;
+}
+/*color*/
+.fakelink {
+  color: #996d73;
+  /* color: #3e3e8c; */
+  text-decoration: none;
+  cursor: pointer;
+}
+.fakelink:hover {
+  /* color: blue; */
+  /*color: #005c94; */
+  text-decoration: underline;
+}
+.intro-end {
+	border-bottom: 1px solid black;
+   clear: both;
+   margin-bottom: 25px;
+   padding-bottom: 25px;
+   width: 75%;
+	}
+.intro-form-end {
+	clear: both;
+	}
+.intro-fullname {
+	padding-bottom: 5px;
+   padding-top: 5px;
+	}
+.intro-wrapper-end {
+	clear: both;
+   padding-bottom: 5px;
+	}
+code {
+  font-family: Courier, monospace;
+  white-space: pre;
+  display: block;
+  overflow: auto;
+  border: 1px solid #444;
+  background: #EEE;
+  color: #444;
+  padding: 10px;
+  margin-top: 20px;
+}
+#panel {
+  position: absolute;
+  width: 12em;
+  background: #ffffff;
+  color: #2d2d2d;
+  margin: 0px;
+  padding: 1em;
+  list-style: none;
+  border: 3px solid #364e59;
+  z-index: 100000;
+  -webkit-box-shadow: 0px 5px 10px rgba(0, 0, 0, 0.7);
+  -moz-box-shadow: 0px 5px 10px rgba(0, 0, 0, 0.7);
+  box-shadow: 0px 5px 10px rgba(0, 0, 0, 0.7);
+}
+/* tool */
+.tool {
+  height: auto;
+  overflow: auto;
+  padding: 3px;
+}
+#saved-search-ul .tool:hover,
+#nets-sidebar .tool:hover,
+#sidebar-group-list .tool:hover,
+#fileas-sidebar .tool:hover  {
+	background: aliceBlue;
+}
+.tool .label {
+  float: left;
+}
+.tool .action {
+  float: right;
+}
+/*color*/
+.tool a {
+  color: #996d73;
+}
+.tool a:hover {
+  text-decoration: none;
+}
+/* popup notifications */
+div.jGrowl div.notice {
+  background: #511919 url("../../../images/icons/48/notice.png") no-repeat 5px center;
+  color: #ffffff;
+  padding-left: 58px;
+}
+div.jGrowl div.info {
+  background: #364e59 url("../../../images/icons/48/info.png") no-repeat 5px center;
+  color: #ffffff;
+  padding-left: 58px;
+}
+/*color*/
+/* header */
+header {
+  position: fixed;
+  left: 0%;
+  right: 80%;
+  top: 0px;
+  margin: 0px;
+  padding: 0px;
+  width: 22%;
+  height: 32px;
+  background: #FFC1CA;
+  background-color: #FFC1CA;
+  z-index: 100;
+-webkit-box-shadow: -10px 0px 10px rgba(0, 0, 0, 0.7);
+  -moz-box-shadow: -10px 0px 10px rgba(0, 0, 0, 0.7);
+  box-shadow: -10px 0px 10px rgba(0, 0, 0, 0.7);
+}
+header #site-location {
+  display: none;
+}
+header #banner {
+  overflow: hidden;
+  text-align: banner;
+  width: 82%;
+  margin-left: 25%;
+}
+header #banner a,
+header #banner a:active,
+header #banner a:visited,
+header #banner a:link,
+header #banner a:hover {
+  color: #1f1f1f;
+  text-decoration: none;
+  outline: none;
+  vertical-align: middle;
+  font-weight: bolder;
+  margin-left: 3px;
+}
+header #banner #logo-img {
+  height: 25px;
+  margin-top: 3px;
+}
+header #banner #logo-text {
+  font-size: 20px;
+  position: absolute;
+  top: 10%;
+}
+/* messages */
+/*color*/
+#message-new {
+  background: #996d73;
+  border: 1px solid #333;
+  width: 150px;
+}
+#message-new a {
+  color: #ffffff;
+  text-align: center;
+  display: block;
+  font-weight: bold;
+  padding: 1em 0px;
+    text-decoration: none;
+}
+.mail-list-wrapper {
+  background-color: #f6f7f8;
+  margin-bottom: 5px;
+  width: 100%;
+  height: auto;
+  overflow: hidden;
+}
+.mail-list-wrapper span {
+  display: block;
+  float: left;
+  width: 20%;
+  overflow: hidden;
+}
+.mail-list-wrapper .mail-subject {
+  width: 30%;
+  padding: 4px 0px 0px 4px;
+}
+.mail-list-wrapper .mail-subject a {
+  display: block;
+}
+.mail-list-wrapper .mail-subject.unseen a {
+  font-weight: bold;
+}
+.mail-list-wrapper .mail-date {
+  padding: 4px 4px 0px 4px;
+}
+.mail-list-wrapper .mail-from {
+  padding: 4px 4px 0px 4px;
+}
+.mail-list-wrapper .mail-count {
+  padding: 4px 4px 0px 4px;
+  text-align: right;
+}
+.mail-list-wrapper .mail-delete {
+  float: right;
+}
+#mail-display-subject {
+  background-color: #f6f7f8;
+  color: #2d2d2d;
+  margin-bottom: 10px;
+  width: 100%;
+  height: auto;
+  overflow: hidden;
+}
+#mail-display-subject span {
+  float: left;
+  overflow: hidden;
+  padding: 4px 0px 0px 10px;
+}
+#mail-display-subject .mail-delete {
+  float: right;
+  opacity: 0.5;
+  -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;
+}
+#mail-display-subject:hover .mail-delete {
+  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;
+}
+/*color*/
+/* nav */
+nav {
+  width: 80%;
+  height: 32px;
+  position: fixed;
+  left: 22%;
+  top: 0px;
+  padding: 0px;
+  background: #FFC1CA;
+  color: #1f1f1f;
+  z-index: 99;
+  -webkit-box-shadow: -10px 0px 10px rgba(0, 0, 0, 0.7);
+  -moz-box-shadow: -10px 0px 10px rgba(0, 0, 0, 0.7);
+  box-shadow: -10px 0px 10px rgba(0, 0, 0, 0.7);
+  
+}
+nav a,
+nav a:active,
+nav a:visited,
+nav a:link,
+nav a:hover {
+  color: #1f1f1f;
+  text-decoration: none;
+  outline: none;
+}
+nav #banner {
+  overflow: hidden;
+  /*text-align: center;*/
+  width: 100%;
+}
+nav #banner a,
+nav #banner a:active,
+nav #banner a:visited,
+nav #banner a:link,
+nav #banner a:hover {
+  color: #ffffff;
+  text-decoration: none;
+  outline: none;
+  vertical-align: bottom;
+}
+nav #banner #logo-img {
+  height: 22px;
+  margin-top: 5px;
+}
+nav #banner #logo-text {
+  font-size: 22px;
+}
+nav #navbar{
+	}
+nav ul {
+  margin: 0px;
+  padding: 0px 20px;
+}
+nav ul li {
+  list-style: none;
+  margin: 0px;
+  /* padding: 1px 1px 3px 1px; */
+  float: left;
+}
+nav ul li .menu-popup {
+  left: 0px;
+  right: auto;
+}
+
+nav #logo-img {
+  height: 25px;
+  margin-top: 4px;
+  margin-left: 30px;
+}
+
+nav #logo-text {
+    font-size: 22px;
+    margin-top: 3px;
+    margin-right: 15px;
+}
+nav .nav-menu-search {
+  position: relative;
+
+  margin: 4px 17px;
+  margin-right: 0px;
+  height: 17px;
+  width: 180px;
+  
+}
+
+nav #search-box #search-text {
+  background-image:  url('icons/lupe.png');
+  background-repeat:no-repeat;
+  padding-left:20px;
+  border-top-left-radius: 15px;
+border-top-right-radius: 15px;
+border-bottom-right-radius: 15px;
+border-bottom-left-radius: 15px;
+	}
+
+
+nav .nav-menu-icon {
+  position: relative;
+  height: 22px;
+  padding: 5px;
+  margin: 0px 5px;
+  -moz-border-radius: 5px 5px 0 0;
+  -webkit-border-radius: 5px 5px 0 0;
+  border-radius: 5px 5px 0 0;
+}
+nav .nav-menu-icon:hover {
+  position: relative;
+  height: 22px;
+  padding: 5px;
+  margin: 0px 5px;
+  -moz-border-radius: 5px 5px 0 0;
+  -webkit-border-radius: 5px 5px 0 0;
+  border-radius: 5px 5px 0 0;
+}
+/*color*/
+nav .nav-menu-icon.selected {
+  background-color: #FFE9EC;
+}
+nav .nav-menu-icon img {
+  width: 22px;
+  height: 22px;
+}
+nav .nav-menu-icon .nav-notify {
+  top: 3px;
+}
+nav .nav-menu {
+  position: relative;
+  height: 16px;
+  padding: 5px;
+  margin: 3px 15px 0px;
+  font-size: 13px;
+  /*border-bottom: 3px solid #364A84;*/
+}
+nav .nav-menu.selected {
+  /*border-bottom: 3px solid #9eabb0;*/
+}
+nav .nav-notify {
+  display: none;
+  position: absolute;
+  background-color: #fff;
+  /* background-color: #19aeff; */
+  -moz-border-radius: 5px 5px 5px 5px;
+  -webkit-border-radius: 5px 5px 5px 5px;
+  border-radius: 5px 5px 5px 5px;
+  font-size: 10px;
+  font-weight: 900;
+  padding: 1px 4px;
+  top: 0px;
+  right: -6px;
+  min-width: 10px;
+  text-align: center;
+  border: 1px solid black;
+}
+nav .nav-notify.show {
+  display: block;
+}
+nav #nav-help-link,
+nav #nav-search-link,
+nav #nav-directory-link,
+nav #nav-apps-link,
+nav #nav-site-linkmenu, 
+nav #nav-home-link,
+nav #nav-user-linkmenu
+{
+  float: right;
+}
+nav #nav-user-linkmenu{
+	margin-right: 0px;
+	}
+nav #nav-home-link, #nav-directory-link, #nav-apps-link{
+	margin-left: 0px;
+	margin-right: 0px;
+	font-weight: bold;
+	margin: 3px 5px;
+	font-size: 14px;
+	}
+nav #nav-directory-link{
+  margin-right: 0px;	
+	}
+nav #nav-home-link{
+  margin-left: 0px;	
+	}
+nav #nav-help-link .menu-popup,
+nav #nav-search-link .menu-popup,
+nav #nav-directory-link .menu-popup,
+nav #nav-apps-link .menu-popup,
+nav #nav-site-linkmenu .menu-popup {
+  right: 0px;
+  left: auto;
+}
+
+nav #nav-messages-linkmenu.on .icon.messages, nav #nav-messages-linkmenu.selected .icon.messages{
+	background-image: url("../../../view/theme/diabook/diabook-pink/icons/messages.png");
+	}
+	
+/*nav #nav-notifications-linkmenu.on .icon.notify,*/ nav #nav-notifications-linkmenu.selected .icon.notify{
+	background-image: url("../../../view/theme/diabook/diabook-pink/icons/notify.png");
+	}
+	
+nav #nav-contacts-linkmenu.on .icon.contacts, nav #nav-contacts-linkmenu.selected .icon.contacts{
+	background-image: url("../../../view/theme/diabook/diabook-pink/icons/contacts.png");
+	}
+	
+nav #nav-apps-link.selected {
+ background-color: #fff;
+  moz-border-radius: 5px 5px 0 0;
+-webkit-border-radius: 5px 5px 0 0;
+border-radius: 5px 5px 0 0;
+}
+
+#nav-notifications-mark-all {
+	/* padding: 1px 1px 2px 26px; */
+	/* border-bottom: 1px solid #364E59; */
+	/* margin: 0px 0px 2px 0px;
+	padding: 5px 10px; */
+}
+
+#nav-notifications-see-all {
+	/* padding: 1px 1px 2px 26px; */
+	/* border-bottom: 1px solid #364E59; */
+	/* margin: 0px 0px 2px 0px;
+	padding: 5px 10px; */
+}
+
+.notify-seen {
+	background: none repeat scroll 0 0 #DDDDDD;
+	}
+/*color*/
+ul.menu-popup {
+  position: absolute;
+  display: none;
+  width: 11em;
+  background: #FFE9EC;
+  color: #2d2d2d;
+  margin: 0px;
+  padding: 0px;
+  list-style: none;
+  z-index: 100000;
+  -webkit-box-shadow: 0px 5px 10px rgba(0, 0, 0, 0.7);
+  -moz-box-shadow: 0px 5px 10px rgba(0, 0, 0, 0.7);
+  box-shadow: 0px 5px 10px rgba(0, 0, 0, 0.7);
+}
+ul.menu-popup a {
+  display: block;
+  color: #2d2d2d;
+  padding: 5px 10px;
+  text-decoration: none;
+}
+/*color*/
+ul.menu-popup a:hover {
+  background-color: #996d73; /*bdcdd4;*/
+  color: #fff;
+}
+ul.menu-popup .menu-sep {
+  border-top: 1px solid #9eabb0;
+}
+ul.menu-popup li {
+  float: none;
+  overflow: auto;
+  height: auto;
+  display: block;
+}
+ul.menu-popup li img {
+  float: left;
+  width: 16px;
+  height: 16px;
+  padding-right: 5px;
+}
+ul.menu-popup .empty {
+  padding: 5px;
+  text-align: center;
+  color: #9eabb0;
+}
+/* autocomplete popup */
+.acpopup {
+  max-height: 150px;
+  background-color: #ffffff;
+  color: #2d2d2d;
+  border: 1px solid #MenuBorder;
+  overflow: auto;
+  z-index: 100000;
+  -webkit-box-shadow: 0px 5px 10px rgba(0, 0, 0, 0.7);
+  -moz-box-shadow: 0px 5px 10px rgba(0, 0, 0, 0.7);
+  box-shadow: 0px 5px 10px rgba(0, 0, 0, 0.7);
+}
+.acpopupitem {
+  color: #2d2d2d;
+  padding: 4px;
+  clear: left;
+}
+.acpopupitem img {
+  float: left;
+  margin-right: 4px;
+}
+.acpopupitem.selected {
+  background-color: #bdcdd4;
+}
+#nav-notifications-menu {
+  width: 400px;
+  max-height: 550px;
+  overflow: auto;
+}
+/* #nav-notifications-menu a {
+	display: inline;
+	padding: 5px 0px;
+	margin: 0px 0px 2px 0px;
+}
+#nav-notifications-menu li:hover {
+  background-color: #bdcdd4;
+}*/
+
+#nav-notifications-menu img {
+  float: left;
+  margin-right: 5px;
+}
+#nav-notifications-menu .contactname {
+  font-weight: bold;
+}
+#nav-notifications-menu .notif-when {
+  font-size: 10px;
+  color: #9eabb0;
+  display: block;
+}
+
+.notif-image {
+        width: 32px;
+        height: 32px;
+        padding: 7px 7px 0px 0px;
+}
+
+/*profile_side*/
+#profile_side {
+  margin-bottom: 30px;
+}
+#ps-usericon{
+	height: 25px	
+	}
+#ps-username{
+  font-size: 1.17em;
+  font-weight: bold;
+  vertical-align: top;
+  position: absolute;
+  padding-top: 4px;
+  padding-left: 5px;	
+  word-wrap: break-word;
+  width: 130px;
+	}
+#ps-username:hover{
+  text-decoration: none;	
+	}
+.menu-profile-side{
+  list-style: none;	
+  padding-left: 0px;
+  min-height: 0px;
+	}
+.menu-profile-list{
+  height: auto;
+  overflow: auto;  
+  min-height: 16px;
+  list-style: none;
+	}
+	/*color*/
+.menu-profile-list:hover{
+	background: #FFF4F6; 
+	}
+.menu-profile-list-item{
+	padding-left: 5px;
+	vertical-align: middle;
+	}	
+.menu-profile-list-item:hover{	
+	text-decoration: none;
+   }
+/*http://prothemedesign.com/circular-icons/*/
+.menu-profile-icon.home{
+	background: url("../../../view/theme/diabook/diabook-pink/icons/home.png") no-repeat;
+	float: left;
+	height: 22px;
+	width: 22px;
+	}
+.menu-profile-icon.photos{
+	background: url("../../../view/theme/diabook/diabook-pink/icons/mess_side.png") no-repeat;
+	float: left;
+	height: 22px;
+   width: 22px;}
+.menu-profile-icon.events{
+	background: url("../../../view/theme/diabook/diabook-pink/icons/events.png") no-repeat;
+	float: left;
+	height: 22px;
+   width: 22px;}
+.menu-profile-icon.notes{
+	background: url("../../../view/theme/diabook/diabook-pink/icons/notes.png") no-repeat;
+	float: left;
+	height: 22px;
+   width: 22px;}
+.menu-profile-icon.foren{
+	background: url("../../../view/theme/diabook/diabook-pink/icons/pubgroups.png") no-repeat;
+	float: left;
+	height: 22px;
+   width: 22px;}
+.menu-profile-icon.com_side{
+	background: url("../../../view/theme/diabook/diabook-pink/icons/com_side.png") no-repeat;
+	float: left;
+	height: 22px;
+   width: 22px;}
+.menu-profile-icon.pscontacts{
+	background: url("../../../view/theme/diabook/diabook-pink/icons/pscontacts.png") no-repeat;
+	float: left;
+	height: 22px;
+   width: 22px;}
+/* aside */
+aside {
+  display: table-cell;
+  vertical-align: top;
+  width: 180px;
+  padding: 0px 10px 0px 20px;
+  border-right: 1px solid #D2D2D2;
+  float: left;
+  /* background: #F1F1F1; */
+}
+aside #page-sidebar{display: none;}
+aside .vcard .fn {
+  font-size: 18px;
+  font-weight: bold;
+  margin-bottom: 5px;
+}
+aside .vcard .title {
+  margin-bottom: 5px;
+}
+aside .vcard dl {
+  height: auto;
+  overflow: auto;
+}
+aside .vcard dt {
+  float: left;
+  margin-left: 0px;
+  /*width: 35%;*/
+  text-align: right;
+  color: #999999;
+}
+aside .vcard dd {
+  float: left;
+  margin-left: 5px;
+  /*width: 60%;*/
+}
+aside #profile-extra-links ul {
+  padding: 0px;
+  margin: 0px;
+}
+aside #profile-extra-links li {
+  padding: 0px;
+  margin: 0px;
+  list-style: none;
+}
+aside #dfrn-request-link {
+  display: block;
+  -moz-border-radius: 5px 5px 5px 5px;
+  -webkit-border-radius: 5px 5px 5px 5px;
+  border-radius: 5px 5px 5px 5px;
+  color: #ffffff;
+  background: #005c94 url('../../../images/connect-bg.png') no-repeat left center;
+  font-weight: bold;
+  text-transform: uppercase;
+  padding: 4px 2px 2px 35px;
+}
+aside #dfrn-request-link:hover {
+  text-decoration: none;
+  background-color: #36c;
+  /* background-color: #19aeff; */
+}
+aside #profiles-menu {
+  width: 20em;
+}
+aside #search-text {
+	width: 173px;
+	height: 17px;
+	padding-left: 10px;
+	border-top-left-radius: 15px;
+border-top-right-radius: 15px;
+border-bottom-right-radius: 15px;
+border-bottom-left-radius: 15px;
+}
+aside #side-follow-url {
+	width: 173px;
+	}
+aside #side-peoplefind-url {
+	width: 173px;
+	}
+#contact-block {
+  overflow: auto;
+  height: auto;
+}
+/*color*/
+aside #likes a, a:visited, a:link {
+		color: #996d73;
+		text-decoration: none;
+		cursor: pointer;
+		
+}
+aside #likes a:hover{
+	text-decoration: underline;
+	}
+
+#contact-block .contact-block-h4 {
+  float: left;
+  margin: 5px 0px;
+}
+#contact-block .allcontact-link {
+  float: right;
+  margin: 5px 0px;
+}
+#contact-block .contact-block-content {
+  clear: both;
+  overflow: auto;
+  height: auto;
+}
+#contact-block .contact-block-link {
+  float: left;
+  margin: 0px 2px 2px 0px;
+}
+#contact-block .contact-block-link img {
+  widht: 55px;
+  height: 55px;
+}
+#lost-password-link {
+  float: left;
+  margin-right: 20px;		
+	}
+#login-submit-wrapper{
+margin-bottom: 15px;
+	}
+.group_selected {
+  background: url("../diabook/icons/selected.png") no-repeat left center;
+  float: left;
+  height: 22px;
+  width: 22px;
+}
+.group_unselected {
+  background: url("../diabook/icons/unselected.png") no-repeat left center;
+  float: left;
+  height: 22px;
+  width: 22px;
+}
+.icon.text_add		{ 
+		background-image: url("../../../images/icons/16/add.png");
+		float: right;
+		opacity: 0.2;
+		margin-right: 14px;
+		}
+.icon.text_add:hover	{ 
+		background-image: url("../../../images/icons/16/add.png");
+		float: right;
+		cursor: pointer;
+		margin-right: 14px;
+		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;
+		}
+.icon.text_edit {
+  background-image: url("../../../images/icons/10/edit.png");
+  opacity: 0.2;
+  margin-top: 6px;
+  float: right;
+  height: 10px;
+}
+.icon.text_edit:hover {
+  background-image: url("../../../images/icons/10/edit.png");
+  opacity: 1;
+  margin-top: 6px;
+  float: right;
+  height: 10px;
+}
+/* widget */
+.widget {
+  margin-bottom: 2em;
+  /*.action .s10 { width: 10px; overflow: hidden; padding: 0px;}
+	.action .s16 { width: 16px; overflow: hidden; padding: 0px;}*/
+/*  font-size: 12px; */
+}
+.widget h3 {
+  padding: 0px;
+  margin: 2px;
+}
+.widget .action {
+  opacity: 0.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;
+}
+.widget input.action {
+  opacity: 0.5;
+  -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;
+}
+.widget:hover .title .action {
+  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;
+}
+.widget .tool:hover .action {
+  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;
+}
+.widget .tool:hover .action.ticked {
+  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;
+}
+.widget ul {
+  padding: 0px;
+}
+.widget ul li {
+  padding-left: 16px;
+  min-height: 16px;
+  list-style: none;
+}
+#side-bar-photos-albums li{
+list-style-type: disc;
+}
+#side-bar-photos-albums ul li{
+  margin-left: 30px;
+  padding-left: 0px;
+	}
+#side-bar-photos-albums ul li a{
+  color: #3465A4;
+}
+.widget .tool.selected {
+  background: url("../../../view/theme/diabook/diabook-pink/icons/selected.png") no-repeat left center;
+}
+/* widget: search */
+#add-search-popup {
+  width: 200px;
+  top: 18px;
+}
+/* section */
+section {
+  display: table-cell;
+  vertical-align: top;
+  width: 800px;
+  padding: 0px 0px 0px 12px;
+}
+body .pageheader{
+  text-align: center;
+  font-size: 20px;
+  margin-bottom: 20px;
+  margin-top: 0px;
+  max-width: 775px;
+	}
+.qcomment{
+  max-width: 122px;	
+	}
+#id_username {
+  width: 173px;	
+	}
+#id_password {
+  width: 173px;		
+	}
+#id_openid_url {
+  width: 173px;	
+	}
+#contact-edit-end {
+	}
+.pager {
+   padding: 10px;
+	text-align: center;
+	font-size: 1.0em;
+	clear: both;
+	display: block;
+}	
+
+.tabs {
+    
+    background-position: 0 -20px;
+    background-repeat: repeat-x;
+    height: 27px;
+    padding: 0;
+ }
+.tab.button {
+    margin-left: 5px;	
+    /*background: none repeat scroll 0 0 #F8F8F8;*/
+    border: 1px solid #CCCCCC;
+    border-radius: 3px 3px 3px 3px;
+    font-weight: normal;
+    padding: 3px;
+    color:  #333333;
+	}
+	
+#birthday-notice, #event-notice, #birthday-wrapper, #event-wrapper{
+	margin-bottom: 10px;
+	}
+
+#birthday-wrapper a {
+	color: #3465A4;
+	}
+/* wall item */
+.tread-wrapper {
+  border-bottom: 1px solid #D2D2D2;
+  position: relative;
+  padding: 5px;
+  margin-bottom: 0px;
+  width: 775px;
+  padding-top: 10px;
+}
+/*color*/
+.tread-wrapper a{
+  color: #996d73;
+}
+.wall-item-decor {
+  position: absolute;
+  left: 790px;
+  top: -10px;
+  width: 16px;
+}
+
+.wall-item-container {
+  display: table;
+  width: 780px;
+}
+.wall-item-photo-container .wall-item-item, .wall-item-container .wall-item-bottom {
+  display: table-row;
+}
+.wall-item-photo-container .wall-item-info {
+  display: table-cell;
+  vertical-align: top;
+  text-align: left;
+  width: 80px;
+}
+.wall-item-photo-container .wall-item-location {
+  padding-right: 40px;
+  display: table-cell;
+}
+.wall-item-photo-container .wall-item-ago {
+  word-wrap: break-word;
+  width: 50px;
+  margin-left: 10px;
+  color: #999;
+}
+.wall-item-photo-container .wall-item-content {
+
+  max-width: 720px;
+  word-wrap: break-word;
+
+  margin-bottom: 14px;
+}
+.wall-item-photo-container .wall-item-content img {
+  max-width: 700px;
+}
+.wall-item-photo-container .wall-item-links, .wall-item-photo-container .wall-item-actions {
+  display: table-cell;
+  vertical-align: middle;
+}
+.wall-item-photo-container .wall-item-links .icon, .wall-item-photo-container .wall-item-actions .icon {
+  opacity: 0.5;
+  -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;
+}
+.wall-item-photo-container .wall-item-links .icon:hover, .wall-item-photo-container .wall-item-actions .icon: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;
+}
+.wall-item-photo-container .wall-item-name {
+  font-weight: bold;
+}
+.wall-item-photo-container .wall-item-actions-author {
+  width: 100%;
+  margin-bottom: 0.3em;
+}
+.wall-item-photo-container .wall-item-actions-social {
+  float: left;
+  margin-bottom: 1px;
+  display: table-cell;
+}
+.wall-item-photo-container .wall-item-actions-social a {
+  margin-right: 1em;
+}
+.wall-item-photo-container .wall-item-actions-tools {
+  float: right;
+  width: 80px;
+  display: table-cell;
+}
+.wall-item-photo-container .wall-item-actions-tools a {
+  float: right;
+}
+.wall-item-photo-container .wall-item-actions-tools input {
+  float: right;
+}
+.wall-item-photo-container.comment {
+  margin-top: 5px;
+  margin-bottom: 5px;
+  margin-left: 40px;
+  width: 650px;
+  border-bottom: 1px solid #D2D2D2;
+}
+.wall-item-photo-container.comment {
+  top: 15px !important;
+  left: 15px !important;
+}
+.wall-item-photo-container {
+  display: table;
+  width: 780px;
+}
+.my-comment-photo {
+  width: 48px;
+  margin-left: 40px;
+  margin-right: 32px;
+	}
+.comment-edit-preview {
+  width: 500px;
+  margin-top: 10px;
+}
+.comment-edit-text-empty {
+    width: 500px;
+    border: 1px solid #D2D2D2;
+    height: 3.2em;
+    color: #2d2d2d;
+}
+.comment-edit-text-full {
+  font-size: 12.5px;
+  height: 3.3em;
+  
+  border: 1px solid #D2D2D2;
+  width: 500px;
+}
+.comment-edit-photo {
+    margin: 10px 0 0;
+    display: table-cell;
+}
+
+
+.wall-item-container .wall-item-item, .wall-item-container .wall-item-bottom {
+  display: table-row;
+}
+.wall-item-bottom {
+  font-size: 13px;
+}
+.wall-item-container .wall-item-bottom {
+/*  opacity: 0.5;
+  -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; */
+}
+.wall-item-container:hover .wall-item-bottom {
+/*  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; */
+}
+.wall-item-container .wall-item-info {
+  display: table-cell;
+  vertical-align: top;
+  text-align: left;
+  width: 80px;
+}
+.wall-item-container .wall-item-location {
+  padding-right: 40px;
+  display: table-cell;
+}
+.wall-item-container .wall-item-ago {
+  word-wrap: break-word;
+  width: 50px;
+  margin-left: 10px;
+  color: #999;
+}
+.wall-item-location {
+  
+  clear: both;
+  overflow: hidden;
+  
+  margin-bottom: 5px;
+}
+
+.wall-item-container .wall-item-content {
+
+  max-width: 720px;
+  word-wrap: break-word;
+
+
+}
+
+.wall-item-container .wall-item-content img {
+  max-width: 700px;
+}
+.wall-item-container .wall-item-links, .wall-item-container .wall-item-actions {
+  display: table-cell;
+  vertical-align: middle;
+}
+.wall-item-container .wall-item-links .icon, .wall-item-container .wall-item-actions .icon {
+  opacity: 0.5;
+  -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;
+}
+.wall-item-container .wall-item-links .icon:hover, .wall-item-container .wall-item-actions .icon: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;
+}
+.wall-item-container .wall-item-name {
+  font-weight: bold;
+}
+.wall-item-container .wall-item-actions-author {
+  width: 100%;
+  margin-bottom: 0.3em;
+}
+.wall-item-container .wall-item-actions-social {
+  float: left;
+  margin-bottom: 1px;
+  display: table-cell;
+}
+.wall-item-container .wall-item-actions-social a {
+  margin-right: 1em;
+}
+.wall-item-actions-social a {
+  float: left;
+}
+.wall-item-container .wall-item-actions-tools {
+  float: right;
+  width: 80px;
+  display: table-cell;done
+}
+.wall-item-container .wall-item-actions-tools a {
+  float: right;
+}
+.wall-item-container .wall-item-actions-tools input {
+  float: right;
+}
+.wall-item-container.comment {
+  margin-top: 5px;
+  margin-bottom: 5px;
+  margin-left: 80px;
+  width: 700px;
+  border-bottom: 1px solid hsl(198, 21%, 79%);
+}
+.wall-item-container.comment .contact-photo {
+  width: 32px;
+  height: 32px;
+  margin-left: 16px;
+  /*background: url(../../../images/icons/22/user.png) no-repeat center center;*/
+
+}
+.wall-item-container.comment {
+  top: 15px !important;
+  left: 15px !important;
+}
+.wall-item-container.comment .wall-item-links {
+  padding-left: 12px;
+}
+.wall-item-comment-wrapper {
+  margin: 1px 5px 5px 80px;
+}
+.wall-item-comment-wrapper .comment-edit-photo {
+  display: none;
+}
+.wall-item-comment-wrapper textarea {
+  height: 2.0em;
+  width: 100%;
+  font-size: 10px;
+  color: #999999;
+  border: 1px solid #DDD;
+  padding: 0.3em;
+  font-size: 14px;
+}
+.wall-item-comment-wrapper .comment-edit-text-full {
+  font-size: 14px;
+  height: 4em;
+  color: #2d2d2d;
+  border: 1px solid #2d2d2d;
+}
+.comment-edit-preview {
+  width: 500px;
+  margin-top: 10px;
+  background-color:  #fff797;
+}
+.comment-edit-preview .contact-photo {
+  width: 32px;
+  height: 32px;
+  margin-left: 16px;
+  /*background: url(../../../images/icons/22/user.png) no-repeat center center;*/
+
+}
+.comment-edit-preview {
+  top: 15px !important;
+  left: 15px !important;
+}
+.comment-edit-preview .wall-item-links {
+  padding-left: 12px;
+}
+.comment-edit-preview .wall-item-container {
+  width: 700px;
+}
+.comment-edit-preview .tread-wrapper {
+  width: 700px;
+  padding: 0;
+  margin: 10px 0;
+}
+
+.shiny {
+  /* border-right: 10px solid #fce94f; */
+	border-right: 1px solid #A7C7F7;
+	padding-right: 12px;
+}
+
+#jot-preview-content{
+	margin-top: 30px;}
+	
+#jot-preview-content .tread-wrapper {
+  background-color: #fff797;
+}
+
+.wall-item-tags {
+  padding-top: 1px;
+  padding-bottom: 2px;
+}
+.tag {
+  /*background: url("../../../images/tag_b.png") repeat-x center left;*/
+  color: #999;
+  padding-left: 3px;
+  font-size: 12px;
+}
+.tag a {
+  padding-right: 5px;
+  /*background: url("../../../images/tag.png") no-repeat center right;*/
+  color: #999;
+}
+.wwto {
+  position: absolute !important;
+  width: 25px;
+  height: 25px;
+  background: #FFFFFF;
+  border: 2px solid #364e59;
+  height: 25px;
+  width: 25px;
+  overflow: hidden;
+  padding: 1px;
+  position: absolute !important;
+  top: 40px;
+  left: 30px;
+  -webkit-box-shadow: 0px 0px 10px rgba(0, 0, 0, 0.7);
+  -moz-box-shadow: 0px 0px 10px rgba(0, 0, 0, 0.7);
+  box-shadow: 0px 0px 10px rgba(0, 0, 0, 0.7);
+}
+.wwto .contact-photo {
+  width: auto;
+  height: 25px;
+}
+/* contacts menu */
+.contact-photo-wrapper {
+  position: relative;
+  width: 80px;
+}
+
+.contact-photo-wrapper.wwto {
+  width: 25px;
+}
+
+.contact-photo {
+  width: 48px;
+  height: 48px;
+  overflow: hidden;
+  display: block;
+}
+.contact-photo img {
+  width: 48px;
+  height: 48px;
+}
+
+.contact-wrapper {
+  float: left;
+  width: 90px;
+  height: 90px;
+  margin-bottom: 15px;
+}
+.contact-wrapper .contact-photo {
+  width: 80px;
+  height: 80px;
+}
+.contact-wrapper .contact-photo img {
+  width: 80px;
+  height: 80px;
+}
+.contact-wrapper {
+  left: 0px;
+  top: 63px;
+}
+.contact-photo {
+  width: 48px;
+  height: 48px;
+}
+.contact-photo img {
+  width: 48px;
+  height: 48px;
+}
+.contact-name {
+  /* text-align: center; */
+  /*font-weight: bold;*/
+  font-size: 12px;
+}
+.contact-details {
+  color: #999999;
+}
+/* editor */
+.jothidden {
+  display: none;
+}
+#jot {
+  width: 785px;
+  margin: 0px 2em 20px 0px;
+}
+#profile-jot-form #profile-jot-text {
+  height: 2.0em;
+  width: 99%;
+  font-size: 15px;
+  color: #999999;
+  border: 1px solid #DDD;
+  padding: 0.3em;
+  margin-bottom: 10px;
+}
+.grey
+{
+  display: inline;
+  float: right;	
+	}
+#jot #jot-tools {
+  margin: 0px;
+  padding: 0px;
+  height: 40px;
+  overflow: none;
+  width: 783px;
+  background-color: #fff;
+  border-bottom: 2px solid #9eabb0;
+}
+
+#jot #jot-tools li {
+  list-style: none;
+  float: left;
+  width: 80px;
+  height: 40px;
+  border-bottom: 2px solid #9eabb0;
+}
+#jot #jot-tools li a {
+  display: block;
+  color: #cccccc;
+  width: 100%;
+  height: 40px;
+  text-align: center;
+  line-height: 40px;
+  overflow: hidden;
+}
+#jot #jot-tools li:hover {
+  background-color: #364e59;
+  border-bottom: 2px solid #bdcdd4;
+}
+#jot #jot-tools li.perms {
+  float: right;
+  width: 40px;
+}
+#jot #jot-tools li.perms a.unlock {
+  width: 30px;
+  border-left: 10px solid #cccccc;
+  background-color: #cccccc;
+  background-position: left center;
+}
+#jot #jot-tools li.perms a.lock {
+  width: 30px;
+  border-left: 10px solid #666666;
+  background-color: #666666;
+}
+#jot #jot-tools li.submit {
+  float: right;
+  background-color: #cccccc;
+  border-bottom: 2px solid #cccccc;
+  border-right: 1px solid #666666;
+  border-left: 1px solid #666666;
+}
+#jot #jot-tools li.submit input {
+  border: 0px;
+  margin: 0px;
+  padding: 0px;
+  background-color: #cccccc;
+  color: #666666;
+  width: 80px;
+  height: 40px;
+  line-height: 40px;
+}
+#jot #jot-tools li.submit input:hover {
+  background-color: #bdcdd4;
+  color: #666666;
+}
+#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;
+}
+#profile-jot-form #jot-title, #profile-jot-form #jot-category {
+    
+  	 border-radius: 5px 5px 5px 5px;
+    font-weight: bold;
+    height: 20px;
+    margin: 0 0 5px;
+    width: 60%;
+    border: 1px solid #d2d2d2;
+}
+#profile-jot-form #jot-title:-webkit-input-placeholder {
+  font-weight: normal;
+}
+#profile-jot-form #jot-title:-moz-placeholder {
+  font-weight: normal;
+}
+#profile-jot-form #profile-jot-text_parent #profile-jot-text_tbl{
+	width: 785px;
+	height: 100px;
+	}
+#jot #jot-title:hover {
+  border: 1px solid #999999;
+}
+#jot #jot-title:focus {
+  border: 1px solid #999999;
+}
+#jot #character-counter {
+  width: 80px;
+  float: right;
+  text-align: right;
+  height: 20px;
+  line-height: 20px;
+  padding-right: 20px;
+}
+#jot-perms-icon, 
+#profile-location,
+#profile-nolocation,
+#profile-youtube, 
+#profile-video, 
+#profile-audio,
+#profile-link,
+#profile-title, 
+#wall-image-upload,
+#wall-file-upload,
+#wall-image-upload-div,
+#wall-file-upload-div,
+.hover, .focus {
+	cursor: pointer;
+	margin-top: 2px;
+}
+#profile-jot-wrapper{
+	margin: 0 2em 20px 0;
+   width: 785px;
+	}
+
+#profile-jot-submit-wrapper {
+	margin-bottom: 50px;
+	width: 785px;
+}
+
+#profile-jot-submit {
+	float: right;
+	margin-top: 2px;
+	font-size: 14px;
+	
+}
+#profile-upload-wrapper {
+	float: left;
+	margin-top: 2px;
+	margin-left: 10px;
+	
+}
+#profile-attach-wrapper {
+	float: left;
+	margin-left: 15px;
+	margin-top: 2px;
+}
+#profile-rotator {
+	float: left;
+	margin-left: 30px;
+	margin-top: 2px;
+}
+#profile-link-wrapper {
+	float: left;
+	margin-left: 15px;
+	margin-top: 2px;
+}
+#profile-youtube-wrapper {
+	float: left;
+	margin-left: 15px;
+	margin-top: 2px;
+}
+#profile-video-wrapper {
+	float: left;
+	margin-left: 15px;
+	margin-top: 2px;
+}
+#profile-audio-wrapper {
+	float: left;
+	margin-left: 15px;
+	margin-top: 2px;
+}
+#profile-location-wrapper {
+	float: left;
+	margin-left: 15px;
+	margin-top: 2px;
+}
+#profile-jot-perms {
+	float: left;
+	margin-left: 45px;
+	margin-top: 2px;
+}
+#jot-preview-link {
+	float: right;
+	margin-left: 10px;
+	margin-top: 2px;
+	font-size: 9px;
+	font-weight: bolder;
+	cursor: pointer;
+}
+#profile-jot-perms{
+   float: right;
+	margin-left: 10px;
+	margin-top: 2px;	
+	}
+/** buttons **/
+.button.creation1 {
+    background-color: #fff;
+    border: 1px solid #777777;
+    border-radius: 3px 3px 3px 3px;
+    box-shadow: 0 1px 1px #CFCFCF;
+    font-weight: bolder;
+	 cursor: pointer;
+}
+/*color*/
+.button.creation2 {
+    background-color: #996d73;
+    border: 1px solid #777777;
+    color: white;
+    border-radius: 3px 3px 3px 3px;
+    box-shadow: 0 1px 1px #CFCFCF;
+    margin-left: 5px;
+    font-weight: bolder;
+	 cursor: pointer;
+}
+/*input[type="submit"] {
+	border: 0px;
+    background-color: @ButtonBackgroundColor;
+    color: @ButtonColor;
+    padding: 0px 10px;
+	.rounded(5px);
+    height: 18px;
+}*/
+/** acl **/
+#photo-edit-perms-select, #photos-upload-permissions-wrapper, #profile-jot-acl-wrapper {
+  display: block!important;
+}
+#acl-wrapper {
+  width: 690px;
+  float: left;
+}
+#acl-search {
+  float: right;
+  background: #ffffff url("../../../images/search_18.png") no-repeat right center;
+  padding-right: 20px;
+}
+#acl-showall {
+  float: left;
+  display: block;
+  width: auto;
+  height: 18px;
+  background-color: #cccccc;
+  background-image: url("../../../images/show_all_off.png");
+  background-position: 7px 7px;
+  background-repeat: no-repeat;
+  padding: 7px 5px 0px 30px;
+  color: #999999;
+  -moz-border-radius: 5px 5px 5px 5px;
+  -webkit-border-radius: 5px 5px 5px 5px;
+  border-radius: 5px 5px 5px 5px;
+}
+#acl-showall.selected {
+  color: #000000;
+  background-color: #ff9900;
+  background-image: url("../../../images/show_all_on.png");
+}
+#acl-list {
+  height: 210px;
+  border: 1px solid #cccccc;
+  clear: both;
+  margin-top: 30px;
+  overflow: auto;
+}
+.acl-list-item {
+  display: block;
+  width: 150px;
+  height: 30px;
+  border: 1px solid #cccccc;
+  margin: 5px;
+  float: left;
+}
+.acl-list-item img {
+  width: 22px;
+  height: 22px;
+  float: left;
+  margin: 4px;
+}
+.acl-list-item p {
+  height: 12px;
+  font-size: 10px;
+  margin: 0px;
+  padding: 2px 0px 1px;
+  overflow: hidden;
+}
+.acl-list-item a {
+  font-size: 8px;
+  display: block;
+  width: 40px;
+  height: 10px;
+  float: left;
+  color: #999999;
+  background-color: #cccccc;
+  background-position: 3px 3px;
+  background-repeat: no-repeat;
+  margin-right: 5px;
+  -webkit-border-radius: 2px ;
+  -moz-border-radius: 2px;
+  border-radius: 2px;
+  padding-left: 15px;
+}
+#acl-wrapper a:hover {
+  text-decoration: none;
+  color: #000000;
+}
+.acl-button-show {
+  background-image: url("../../../images/show_off.png");
+}
+.acl-button-hide {
+  background-image: url("../../../images/hide_off.png");
+}
+.acl-button-show.selected {
+  color: #000000;
+  background-color: #9ade00;
+  background-image: url("../../../images/show_on.png");
+}
+.acl-button-hide.selected {
+  color: #000000;
+  background-color: #ff4141;
+  background-image: url("../../../images/hide_on.png");
+}
+.acl-list-item.groupshow {
+  border-color: #9ade00;
+}
+.acl-list-item.grouphide {
+  border-color: #ff4141;
+}
+/** /acl **/
+/** tab buttons 14618a**/
+ul.tabs {
+  list-style-type: none;
+  padding-bottom: 10px;
+  font-size: 13px;
+}
+ul.tabs li {
+  float: left;
+  margin-left: 5px;
+}
+/*color*/
+ul.tabs li .active {
+    background-color: #996d73;
+    border: 1px solid #777777;
+    color: white;
+    border-radius: 3px 3px 3px 3px;
+    box-shadow: 2px 2px 2px #CFCFCF;
+    margin-left: 5px;
+}
+//settings tabs
+ul.rs_tabs {
+  list-style-type: none;
+  font-size: 11px;
+}
+ul.rs_tabs li {
+  float: left;
+  margin-bottom: 30px;
+  clear: both;
+}
+/*color*/
+ul.rs_tabs li .selected {
+    background-color: #996d73;
+    border: 1px solid #777777;
+    color: white;
+    border-radius: 3px 3px 3px 3px;
+    box-shadow: 2px 2px 2px #CFCFCF;
+    font-size: 13px;
+}
+.rs_tabs {
+    list-style-type: none;
+    font-size: 11px;
+    background-position: 0 -20px;
+    background-repeat: repeat-x;
+    height: 27px;
+    padding: 0;
+ }
+.rs_tab.button {	
+    /*background: none repeat scroll 0 0 #F8F8F8;*/
+    border: 1px solid #CCCCCC;
+    border-radius: 3px 3px 3px 3px;
+    font-weight: bolder;
+    padding: 3px;
+    color:  #333333;
+    text-decoration: none;
+	}
+/**
+ * Form fields
+ */
+.field {
+  margin-bottom: 10px;
+  padding-bottom: 10px;
+  overflow: auto;
+  width: 100%;
+}
+.field label {
+  float: left;
+  width: 200px;
+}
+.field input, .field textarea {
+  width: 400px;
+}
+.field textarea {
+  height: 100px;
+}
+.field .field_help {
+  display: block;
+  margin-left: 200px;
+  color: #666666;
+}
+.field .onoff {
+  float: left;
+  width: 80px;
+}
+.field .onoff a {
+  display: block;
+  border: 1px solid #666666;
+  background-image: url("../../../images/onoff.jpg");
+  background-repeat: no-repeat;
+  padding: 4px 2px 2px 2px;
+  height: 16px;
+  text-decoration: none;
+}
+.field .onoff .off {
+  border-color: #666666;
+  padding-left: 40px;
+  background-position: left center;
+  background-color: #cccccc;
+  color: #666666;
+  text-align: right;
+}
+.field .onoff .on {
+  border-color: #204A87;
+  padding-right: 40px;
+  background-position: right center;
+  background-color: #D7E3F1;
+  color: #204A87;
+  text-align: left;
+}
+.field .hidden {
+  display: none!important;
+}
+.field.radio .field_help {
+  margin-left: 0px;
+}
+.suggest-select {
+width: 500px;
+height: 350px;	
+	}
+.message-to-select {
+	width: 400px;
+   height: 150px;
+	}
+#directory-search-form{
+	margin-bottom: 50px;
+	}
+#profile-edit-links-end {
+        clear: both;
+        margin-bottom: 15px;
+}
+
+#profile-edit-links ul { margin: 20px; padding-bottom: 20px; list-style: none; }
+
+#profile-edit-links li {
+  float: left;
+  list-style: none;
+  margin-left: 10px;
+}
+
+.profile-edit-side-div {
+  display: none;
+}
+
+#register-form label,
+#profile-edit-form label {
+        width: 300px; float: left;
+}
+
+.required {
+  display: inline;
+  color: #B20202;
+}
+
+/* oauth */
+.oauthapp {
+  height: auto;
+  overflow: auto;
+  border-bottom: 2px solid #cccccc;
+  padding-bottom: 1em;
+  margin-bottom: 1em;
+}
+.oauthapp img {
+  float: left;
+  width: 48px;
+  height: 48px;
+  margin: 10px;
+}
+.oauthapp img.noicon {
+  background-image: url("../../../images/icons/48/plugin.png");
+  background-position: center center;
+  background-repeat: no-repeat;
+}
+.oauthapp a {
+  float: left;
+}
+/* contacts */
+.contact-entry-wrapper {
+  width: 120px;
+  height: 120px;
+  float: left;
+}
+/* photo */
+.photo {
+box-shadow: 2px 2px 5px 0px #000000;
+margin: 0px;
+border-radius: 10px;
+height: 145px !important;
+width: 145px !important;
+}
+.lframe {
+  float: left;
+  /*margin: 0px 10px 10px 0px;*/
+}
+/* profile match wrapper */
+.profile-match-wrapper {
+  float: left;
+  width: 90px;
+  height: 90px;
+  margin-bottom: 20px;
+}
+.profile-match-wrapper .contact-photo {
+  width: 80px;
+  height: 80px;
+}
+.profile-match-wrapper .contact-photo img {
+  width: 80px;
+  height: 80px;
+}
+.profile-match-wrapper {
+  left: 0px;
+  top: 63px;
+}
+
+.contact-photo-menu-button {
+        position: relative;
+        background-image: url("../../../images/icons/16/menu.png");
+        background-position: top left; 
+        background-repeat: no-repeat;
+        margin: 0px 0px -16px 0px; 
+	padding: 0px;
+        width: 16px;
+        height: 16px;
+        top: -16px; left:0px;
+        overflow: hidden;
+        text-indent: 40px;
+        display: none;
+        
+}
+.contact-photo-menu {
+        width: 11em;
+        border: 3px solid #364e59;
+	color: #2d2d2d;
+        background: #FFFFFF;
+/*        position: absolute;*/
+        position: relative;
+        left: 0px; top: 0px;
+        display: none;
+        z-index: 10000;
+}
+.contact-photo-menu ul { margin:0px; padding: 0px; list-style: none }
+.contact-photo-menu li a {
+	display: block; 
+	padding: 5px 10px; 
+	color: #2d2d2d;
+	text-decoration: none;
+}
+.contact-photo-menu li a:hover {
+	background-color: #bdcdd4; 
+}
+
+/* page footer */
+footer {
+  height: 100px;
+  display: table-row;
+}
+
+blockquote {
+    border-left: 1px solid #D2D2D2;
+    padding-left: 9px;
+    margin: 0 0 0 .8ex;
+    color: #777;
+}
+.oembed {
+	
+	font-weight: bold;
+}
+.aprofile dt{
+box-shadow: 1px 1px 5px 0;
+    color: #666666;
+    margin: 15px 0 5px;
+    padding-left: 5px;	
+	}
+/* ================== */
+/* = Contacts Block = */
+/* ================== */
+
+.contact-block-img {
+        width: 55px;
+        height: 55px;
+        padding-right: 3px;
+}
+.contact-block-div {
+        float: left;
+}
+
+.contact-block-textdiv { width: 150px; height: 34px; float: left; }
+#contact-block-end { clear: both; } 
+
+#group-edit-wrapper {
+        margin-bottom: 10px;
+}
+
+#group-members-end {
+        clear: both;
+}
+#group-edit-desc {
+ margin-top: 15px;
+}
+
+/*
+#group-separator,
+#prof-separator { display: none;}
+*/
+#prof-members-end{
+	clear: both;
+	}
+
+#prvmail-to-label, #prvmail-subject-label, #prvmail-message-label {
+	margin-bottom: 10px;
+	margin-top: 20px;
+}
+
+#prvmail-submit {
+	float: right;
+	margin-top: 10px;
+}
+
+#prvmail-subject
+{
+background: none repeat scroll 0 0 #FFFFFF;
+border: 1px solid #CCCCCC;
+border-radius: 5px 5px 5px 5px;
+font-weight: bold;
+height: 20px;
+margin: 0 0 5px;
+vertical-align: middle;
+}
+#prvmail-form{
+ width: 597px;	
+	}
+	
+#prvmail-upload-wrapper,
+#prvmail-link-wrapper,
+#prvmail-rotator-wrapper {
+	float: left;
+	margin-top: 10px;
+	margin-right: 10px;
+	width: 24px;
+}
+
+#prvmail-end {
+	clear: both;
+}
+
+.mail-list-sender,
+.mail-list-detail {
+	float: left;
+}
+.mail-list-detail {
+	margin-left: 20px;
+}
+
+.mail-list-subject {
+	font-size: 1.1em;
+	margin-top: 10px;
+}
+a.mail-list-link {
+    display: block;
+    font-size: 1.3em;
+    padding: 4px 0;
+}
+
+/*
+*a.mail-list-link:hover {
+*	background-color: #15607B;
+*	color: #F5F6FB;
+*}
+*/
+
+.mail-list-outside-wrapper-end {
+	clear: both;
+}
+
+.mail-list-outside-wrapper {
+	margin-top: 30px;
+}
+
+.mail-list-delete-wrapper {
+	float: right;
+	margin-right: 30px;
+	margin-top: 15px;
+}
+
+.mail-list-delete-icon {
+	border: none;
+}
+
+.mail-conv-sender,
+.mail-conv-detail {
+	float: left;
+}
+.mail-conv-detail {
+	margin-left: 20px;
+	width: 500px;
+}
+
+.mail-conv-subject {
+    font-size: 1.4em;
+    margin: 10px 0;
+}
+
+.mail-conv-outside-wrapper-end {
+	clear: both;
+}
+
+.mail-conv-outside-wrapper {
+	margin-top: 30px;
+}
+
+.mail-conv-delete-wrapper {
+	float: right;
+	margin-right: 30px;
+	margin-top: 15px;
+}
+.mail-conv-break {
+	clear: both;
+}
+
+.mail-conv-delete-icon {
+	border: none;
+}
+
+/* ========== */
+/* = Events = */
+/* ========== */
+.eventcal {
+        float: left;
+        font-size: 20px;
+}
+
+.vevent {
+position: relative;
+width: 400px;
+padding: 20px;
+padding-top: 10px;
+margin: 0 0px;
+margin-bottom: 10px;
+background-color: white;
+-webkit-box-shadow: 0 0 4px rgba(0, 0, 0, 0.2), inset 0 0 50px rgba(0, 0, 0, 0.1);
+-moz-box-shadow: 0 0 4px rgba(0, 0, 0, 0.2), inset 0 0 50px rgba(0, 0, 0, 0.1);
+box-shadow: 0 0 5px rgba(0, 0, 0, 0.2), inset 0 0 50px rgba(0, 0, 0, 0.1);
+}
+.vevent .event-location {
+        margin-left: 10px;
+        margin-right: 10px;
+}
+.vevent .event-description {
+margin-left: 10px;
+margin-right: 10px;
+font-size: 1.1em;
+font-weight: bolder;
+}
+.vevent .event-start, .vevent .event-end {
+
+margin-right: 20px;
+margin-bottom: 2px;
+margin-top: 2px;
+font-size: 0.9em;
+text-align: left;
+}
+.event-start .dtstart, .event-end .dtend {
+float: right;
+}
+
+
+#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("../diabook/icons/events2.png") !important;
+        margin-right: 15px;
+}
+
+.event-start, .event-end {
+        margin-left: 10px;
+        width: 330px;
+        clear: both;
+}
+
+.event-start .dtstart, .event-end .dtend {
+        float: right;
+}
+.event-list-date {
+        margin-bottom: 10px;
+}
+
+.prevcal, .nextcal {
+        float: left;
+        margin-left: 32px;
+        margin-right: 32px;
+        margin-top: 64px;
+}
+.event-calendar-end {
+        clear: both;
+}
+
+ 
+.calendar {
+        font-family: Courier, monospace;
+}
+.calendar.eventcal a {
+  color: #3465A4;	
+	}
+.today {
+        font-weight: bold;
+        color: #FF0000;
+}
+
+.settings-block {
+        border: 1px solid #AAA;
+        margin: 10px;
+        padding: 10px;
+}
+
+.app-title {
+        margin: 10px;
+}
+
+#identity-manage-desc {
+        margin-top:15px;
+        margin-bottom: 15px;
+}
+
+#identity-manage-choose {
+        margin-bottom: 15px;
+}
+
+#identity-submit {
+        margin-top: 20px;
+}
+
+#photo-prev-link, #photo-next-link {
+        padding: 10px;
+        float: left;
+}
+.lightbox{
+	float: left;
+	}
+#photo-photo {
+        float: left;
+}
+#photo-like-div .wall-item-like-buttons {
+	float: left;
+   margin-right: 10px;
+	}
+.wall-item-like-buttons .icon.like {
+float: left;
+}
+
+#photo-photo-end {
+        clear: both;
+}
+
+.tabs .comment-wwedit-wrapper {
+	display: block;
+   margin-top: 30px;
+   margin-left: 50px;
+	}
+
+.profile-match-photo {
+        float: left;
+        text-align: center;
+        width: 120px;
+}
+
+.profile-match-name {
+        float: left;
+        text-align: center;
+        width: 120px;
+        overflow: hidden;
+}
+
+.profile-match-break,
+.profile-match-end {
+        clear: both;
+}
+
+.profile-match-connect {
+        text-align: center;
+        font-weight: bold;
+}
+
+.profile-match-wrapper {
+        float: left;
+        padding: 10px;
+        width: 120px;
+        height: 120px;
+        scroll: auto;
+}
+#profile-match-wrapper-end {
+        clear: both;
+}
+
+/* ============= */
+/* = Directory = */
+/* ============= */
+/* contacts menu */
+.contact-photo-wrapper {
+  position: relative;
+}
+.contact-photo {
+  width: 48px;
+  height: 48px;
+  overflow: hidden;
+  display: block;
+}
+.contact-photo img {
+  width: 48px;
+  height: 48px;
+}
+.contact-photo-menu-button {
+  display: none;
+  /* position: absolute; */
+  /* position: absolute; */
+  left: 0px;
+  top: -16px;
+}
+.contact-wrapper {
+  float: left;
+  width: 90px;
+  height: 90px;
+  margin-bottom: 15px;
+}
+.contact-wrapper .contact-photo {
+  width: 80px;
+  height: 80px;
+}
+.contact-wrapper .contact-photo img {
+  width: 80px;
+  height: 80px;
+}
+.contact-wrapper .contact-photo-menu-button {
+  left: 0px;
+  top: 63px;
+}
+.directory-item {
+  float: left;
+  width: 200px;
+  height: 200px;
+}
+.directory-item .contact-photo {
+  width: 175px;
+  height: 175px;
+}
+.directory-item .contact-photo img {
+  width: 175px;
+  height: 175px;
+}
+.contact-name {
+  text-align: left;
+  font-weight: bold;
+  font-size: 12px;
+}
+.contact-details {
+  color: #999999;
+}
+#side-bar-photos-albums{
+	margin-top: 15px;	
+	}
+.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-album-image-wrapper, .photo-top-image-wrapper {
+  float: left;
+   -moz-box-shadow: 0 0 5px #888;
+   -webkit-box-shadow: 0 0 5px #888;
+   box-shadow: 0 0 5px #888;
+  background-color: #000;
+   -webkit-border-radius: 5px;
+   -moz-border-radius: 5px;
+  border-radius: 5px;
+  padding-bottom: 20px;
+  position: relative;
+  margin: 0 10px 10px 0;
+  width: 200px; height: 140px;
+  overflow: hidden;  
+}
+.photo-top-album-name {
+        width: 100%;
+        position: absolute; 
+        bottom: 0px; 
+        padding-left: 3px;
+        background-color: #EEE;
+}
+.photo-top-album-link{
+  color: #3465A4;
+	}
+.photo-top-album-img{
+	
+	}
+/*.photo-top-image-wrapper {
+        position: relative;
+        float: left;
+        margin-top: 15px;
+        margin-right: 15px;
+        width: 200px; height: 200px; 
+        overflow: hidden; 
+}
+.photo-top-album-name {
+        width: 100%;
+        min-height: 2em;
+        position: absolute; 
+        bottom: 0px; 
+        padding: 0px 3px;
+        padding-top: 0.5em;
+        background-color: rgb(255, 255, 255);
+}*/
+#photo-top-end {
+        clear: both;
+}
+
+#photo-top-links {
+        margin-bottom: 30px;
+        margin-left: 30px;
+}
+
+#photos-upload-newalbum-div {
+        float: left;
+        width: 175px;
+}
+
diff --git a/view/theme/diabook/diabook-red/icons/StatusNet.png b/view/theme/diabook/diabook-red/icons/StatusNet.png
new file mode 100644
index 000000000..398bca716
--- /dev/null
+++ b/view/theme/diabook/diabook-red/icons/StatusNet.png
diff --git a/view/theme/diabook/diabook-red/icons/attach.png b/view/theme/diabook/diabook-red/icons/attach.png
new file mode 100644
index 000000000..1958041cf
--- /dev/null
+++ b/view/theme/diabook/diabook-red/icons/attach.png
diff --git a/view/theme/diabook/diabook-red/icons/audio.png b/view/theme/diabook/diabook-red/icons/audio.png
new file mode 100644
index 000000000..8d779a409
--- /dev/null
+++ b/view/theme/diabook/diabook-red/icons/audio.png
diff --git a/view/theme/diabook/diabook-red/icons/bb-image.png b/view/theme/diabook/diabook-red/icons/bb-image.png
new file mode 100644
index 000000000..9a1b32113
--- /dev/null
+++ b/view/theme/diabook/diabook-red/icons/bb-image.png
diff --git a/view/theme/diabook/diabook-red/icons/bb-url.png b/view/theme/diabook/diabook-red/icons/bb-url.png
new file mode 100644
index 000000000..071fc1865
--- /dev/null
+++ b/view/theme/diabook/diabook-red/icons/bb-url.png
diff --git a/view/theme/diabook/diabook-red/icons/bb-video.png b/view/theme/diabook/diabook-red/icons/bb-video.png
new file mode 100644
index 000000000..bd323531e
--- /dev/null
+++ b/view/theme/diabook/diabook-red/icons/bb-video.png
diff --git a/view/theme/diabook/diabook-red/icons/block.png b/view/theme/diabook/diabook-red/icons/block.png
new file mode 100755
index 000000000..a0b1dffe9
--- /dev/null
+++ b/view/theme/diabook/diabook-red/icons/block.png
diff --git a/view/theme/diabook/diabook-red/icons/bluebug.png b/view/theme/diabook/diabook-red/icons/bluebug.png
new file mode 100644
index 000000000..3979e7d8e
--- /dev/null
+++ b/view/theme/diabook/diabook-red/icons/bluebug.png
diff --git a/view/theme/diabook/diabook-red/icons/bold.png b/view/theme/diabook/diabook-red/icons/bold.png
new file mode 100644
index 000000000..8fab2a10f
--- /dev/null
+++ b/view/theme/diabook/diabook-red/icons/bold.png
diff --git a/view/theme/diabook/diabook-red/icons/camera.png b/view/theme/diabook/diabook-red/icons/camera.png
new file mode 100644
index 000000000..a5c7f1236
--- /dev/null
+++ b/view/theme/diabook/diabook-red/icons/camera.png
diff --git a/view/theme/diabook/diabook-red/icons/close_box.png b/view/theme/diabook/diabook-red/icons/close_box.png
new file mode 100644
index 000000000..28e2675b8
--- /dev/null
+++ b/view/theme/diabook/diabook-red/icons/close_box.png
diff --git a/view/theme/diabook/diabook-red/icons/com_side.png b/view/theme/diabook/diabook-red/icons/com_side.png
new file mode 100644
index 000000000..00186ba05
--- /dev/null
+++ b/view/theme/diabook/diabook-red/icons/com_side.png
diff --git a/view/theme/diabook/diabook-red/icons/community.png b/view/theme/diabook/diabook-red/icons/community.png
new file mode 100644
index 000000000..7c91e8b75
--- /dev/null
+++ b/view/theme/diabook/diabook-red/icons/community.png
diff --git a/view/theme/diabook-red/icons/contacts.png b/view/theme/diabook/diabook-red/icons/contacts.png
index 20c990c84..20c990c84 100755..100644
--- a/view/theme/diabook-red/icons/contacts.png
+++ b/view/theme/diabook/diabook-red/icons/contacts.png
diff --git a/view/theme/diabook-red/icons/contacts2.png b/view/theme/diabook/diabook-red/icons/contacts2.png
index 7817279f4..7817279f4 100755..100644
--- a/view/theme/diabook-red/icons/contacts2.png
+++ b/view/theme/diabook/diabook-red/icons/contacts2.png
diff --git a/view/theme/diabook/diabook-red/icons/dislike.png b/view/theme/diabook/diabook-red/icons/dislike.png
new file mode 100644
index 000000000..23de426c5
--- /dev/null
+++ b/view/theme/diabook/diabook-red/icons/dislike.png
diff --git a/view/theme/diabook/diabook-red/icons/drop.png b/view/theme/diabook/diabook-red/icons/drop.png
new file mode 100644
index 000000000..2abb82ef2
--- /dev/null
+++ b/view/theme/diabook/diabook-red/icons/drop.png
diff --git a/view/theme/diabook/diabook-red/icons/email.png b/view/theme/diabook/diabook-red/icons/email.png
new file mode 100644
index 000000000..240cef2c3
--- /dev/null
+++ b/view/theme/diabook/diabook-red/icons/email.png
diff --git a/view/theme/diabook/diabook-red/icons/events.png b/view/theme/diabook/diabook-red/icons/events.png
new file mode 100644
index 000000000..cf195fbb6
--- /dev/null
+++ b/view/theme/diabook/diabook-red/icons/events.png
diff --git a/view/theme/diabook/diabook-red/icons/facebook.png b/view/theme/diabook/diabook-red/icons/facebook.png
new file mode 100644
index 000000000..3e5dd39c3
--- /dev/null
+++ b/view/theme/diabook/diabook-red/icons/facebook.png
diff --git a/view/theme/diabook/diabook-red/icons/file_as.png b/view/theme/diabook/diabook-red/icons/file_as.png
new file mode 100644
index 000000000..16713fa53
--- /dev/null
+++ b/view/theme/diabook/diabook-red/icons/file_as.png
diff --git a/view/theme/diabook/diabook-red/icons/ftdevs.gif b/view/theme/diabook/diabook-red/icons/ftdevs.gif
new file mode 100644
index 000000000..e0fc25743
--- /dev/null
+++ b/view/theme/diabook/diabook-red/icons/ftdevs.gif
diff --git a/view/theme/diabook/diabook-red/icons/globe.png b/view/theme/diabook/diabook-red/icons/globe.png
new file mode 100644
index 000000000..6bb9bc09d
--- /dev/null
+++ b/view/theme/diabook/diabook-red/icons/globe.png
diff --git a/view/theme/diabook/diabook-red/icons/home.png b/view/theme/diabook/diabook-red/icons/home.png
new file mode 100644
index 000000000..5c610805f
--- /dev/null
+++ b/view/theme/diabook/diabook-red/icons/home.png
diff --git a/view/theme/diabook/diabook-red/icons/italic.png b/view/theme/diabook/diabook-red/icons/italic.png
new file mode 100644
index 000000000..bf4b2b81d
--- /dev/null
+++ b/view/theme/diabook/diabook-red/icons/italic.png
diff --git a/view/theme/diabook/diabook-red/icons/language.png b/view/theme/diabook/diabook-red/icons/language.png
new file mode 100644
index 000000000..8029c0155
--- /dev/null
+++ b/view/theme/diabook/diabook-red/icons/language.png
diff --git a/view/theme/diabook/diabook-red/icons/like.png b/view/theme/diabook/diabook-red/icons/like.png
new file mode 100644
index 000000000..b65edccc0
--- /dev/null
+++ b/view/theme/diabook/diabook-red/icons/like.png
diff --git a/view/theme/diabook/diabook-red/icons/link.png b/view/theme/diabook/diabook-red/icons/link.png
new file mode 100644
index 000000000..0ef666a67
--- /dev/null
+++ b/view/theme/diabook/diabook-red/icons/link.png
diff --git a/view/theme/diabook/diabook-red/icons/livejournal.png b/view/theme/diabook/diabook-red/icons/livejournal.png
new file mode 100644
index 000000000..6d27d265e
--- /dev/null
+++ b/view/theme/diabook/diabook-red/icons/livejournal.png
diff --git a/view/theme/diabook/diabook-red/icons/lock.png b/view/theme/diabook/diabook-red/icons/lock.png
new file mode 100644
index 000000000..7e34bf279
--- /dev/null
+++ b/view/theme/diabook/diabook-red/icons/lock.png
diff --git a/view/theme/diabook/diabook-red/icons/lupe.png b/view/theme/diabook/diabook-red/icons/lupe.png
new file mode 100644
index 000000000..f8b228347
--- /dev/null
+++ b/view/theme/diabook/diabook-red/icons/lupe.png
diff --git a/view/theme/diabook/diabook-red/icons/mess_side.png b/view/theme/diabook/diabook-red/icons/mess_side.png
new file mode 100644
index 000000000..5295e2e74
--- /dev/null
+++ b/view/theme/diabook/diabook-red/icons/mess_side.png
diff --git a/view/theme/diabook-red/icons/messages.png b/view/theme/diabook/diabook-red/icons/messages.png
index 4a9e9de13..4a9e9de13 100644
--- a/view/theme/diabook-red/icons/messages.png
+++ b/view/theme/diabook/diabook-red/icons/messages.png
diff --git a/view/theme/diabook-red/icons/messages2.png b/view/theme/diabook/diabook-red/icons/messages2.png
index 54b68e7f7..54b68e7f7 100644
--- a/view/theme/diabook-red/icons/messages2.png
+++ b/view/theme/diabook/diabook-red/icons/messages2.png
diff --git a/view/theme/diabook/diabook-red/icons/next.png b/view/theme/diabook/diabook-red/icons/next.png
new file mode 100644
index 000000000..7b5e25b90
--- /dev/null
+++ b/view/theme/diabook/diabook-red/icons/next.png
diff --git a/view/theme/diabook/diabook-red/icons/notes.png b/view/theme/diabook/diabook-red/icons/notes.png
new file mode 100644
index 000000000..28dca30a3
--- /dev/null
+++ b/view/theme/diabook/diabook-red/icons/notes.png
diff --git a/view/theme/diabook-red/icons/notifications.png b/view/theme/diabook/diabook-red/icons/notifications.png
index 97e5c311c..97e5c311c 100755..100644
--- a/view/theme/diabook-red/icons/notifications.png
+++ b/view/theme/diabook/diabook-red/icons/notifications.png
diff --git a/view/theme/diabook-red/icons/notify.png b/view/theme/diabook/diabook-red/icons/notify.png
index 3a8e1d4b8..3a8e1d4b8 100644
--- a/view/theme/diabook-red/icons/notify.png
+++ b/view/theme/diabook/diabook-red/icons/notify.png
diff --git a/view/theme/diabook-red/icons/notify2.png b/view/theme/diabook/diabook-red/icons/notify2.png
index 407e2dbb4..407e2dbb4 100644
--- a/view/theme/diabook-red/icons/notify2.png
+++ b/view/theme/diabook/diabook-red/icons/notify2.png
diff --git a/view/theme/diabook/diabook-red/icons/pencil.png b/view/theme/diabook/diabook-red/icons/pencil.png
new file mode 100644
index 000000000..772e49b17
--- /dev/null
+++ b/view/theme/diabook/diabook-red/icons/pencil.png
diff --git a/view/theme/diabook/diabook-red/icons/pencil2.png b/view/theme/diabook/diabook-red/icons/pencil2.png
new file mode 100644
index 000000000..3b47d1864
--- /dev/null
+++ b/view/theme/diabook/diabook-red/icons/pencil2.png
diff --git a/view/theme/diabook/diabook-red/icons/photo-menu.jpg b/view/theme/diabook/diabook-red/icons/photo-menu.jpg
new file mode 100644
index 000000000..fde5eb535
--- /dev/null
+++ b/view/theme/diabook/diabook-red/icons/photo-menu.jpg
diff --git a/view/theme/diabook/diabook-red/icons/posterous.png b/view/theme/diabook/diabook-red/icons/posterous.png
new file mode 100644
index 000000000..c8e86078e
--- /dev/null
+++ b/view/theme/diabook/diabook-red/icons/posterous.png
diff --git a/view/theme/diabook/diabook-red/icons/prev.png b/view/theme/diabook/diabook-red/icons/prev.png
new file mode 100644
index 000000000..55c1464ba
--- /dev/null
+++ b/view/theme/diabook/diabook-red/icons/prev.png
diff --git a/view/theme/diabook/diabook-red/icons/pscontacts.png b/view/theme/diabook/diabook-red/icons/pscontacts.png
new file mode 100644
index 000000000..23a78bcac
--- /dev/null
+++ b/view/theme/diabook/diabook-red/icons/pscontacts.png
diff --git a/view/theme/diabook/diabook-red/icons/pubgroups.png b/view/theme/diabook/diabook-red/icons/pubgroups.png
new file mode 100644
index 000000000..ae04194b1
--- /dev/null
+++ b/view/theme/diabook/diabook-red/icons/pubgroups.png
diff --git a/view/theme/diabook/diabook-red/icons/quote.png b/view/theme/diabook/diabook-red/icons/quote.png
new file mode 100644
index 000000000..a464f2859
--- /dev/null
+++ b/view/theme/diabook/diabook-red/icons/quote.png
diff --git a/view/theme/diabook/diabook-red/icons/recycle.png b/view/theme/diabook/diabook-red/icons/recycle.png
new file mode 100644
index 000000000..c3b8d2bf4
--- /dev/null
+++ b/view/theme/diabook/diabook-red/icons/recycle.png
diff --git a/view/theme/diabook/diabook-red/icons/remote.png b/view/theme/diabook/diabook-red/icons/remote.png
new file mode 100644
index 000000000..a560cc55e
--- /dev/null
+++ b/view/theme/diabook/diabook-red/icons/remote.png
diff --git a/view/theme/diabook/diabook-red/icons/scroll_top.png b/view/theme/diabook/diabook-red/icons/scroll_top.png
new file mode 100644
index 000000000..0e7f7ae6a
--- /dev/null
+++ b/view/theme/diabook/diabook-red/icons/scroll_top.png
diff --git a/view/theme/diabook/diabook-red/icons/selected.png b/view/theme/diabook/diabook-red/icons/selected.png
new file mode 100644
index 000000000..3fcb95c29
--- /dev/null
+++ b/view/theme/diabook/diabook-red/icons/selected.png
diff --git a/view/theme/diabook/diabook-red/icons/srch_bg.gif b/view/theme/diabook/diabook-red/icons/srch_bg.gif
new file mode 100644
index 000000000..6a523ba8f
--- /dev/null
+++ b/view/theme/diabook/diabook-red/icons/srch_bg.gif
diff --git a/view/theme/diabook/diabook-red/icons/srch_l.gif b/view/theme/diabook/diabook-red/icons/srch_l.gif
new file mode 100644
index 000000000..6d95bf35d
--- /dev/null
+++ b/view/theme/diabook/diabook-red/icons/srch_l.gif
diff --git a/view/theme/diabook/diabook-red/icons/srch_r.gif b/view/theme/diabook/diabook-red/icons/srch_r.gif
new file mode 100644
index 000000000..89833a316
--- /dev/null
+++ b/view/theme/diabook/diabook-red/icons/srch_r.gif
diff --git a/view/theme/diabook/diabook-red/icons/srch_r_f2.gif b/view/theme/diabook/diabook-red/icons/srch_r_f2.gif
new file mode 100644
index 000000000..6df457bed
--- /dev/null
+++ b/view/theme/diabook/diabook-red/icons/srch_r_f2.gif
diff --git a/view/theme/diabook/diabook-red/icons/star.png b/view/theme/diabook/diabook-red/icons/star.png
new file mode 100644
index 000000000..0b00cb189
--- /dev/null
+++ b/view/theme/diabook/diabook-red/icons/star.png
diff --git a/view/theme/diabook/diabook-red/icons/star_dummy.png b/view/theme/diabook/diabook-red/icons/star_dummy.png
new file mode 100644
index 000000000..ce11f30d4
--- /dev/null
+++ b/view/theme/diabook/diabook-red/icons/star_dummy.png
diff --git a/view/theme/diabook/diabook-red/icons/starred.png b/view/theme/diabook/diabook-red/icons/starred.png
new file mode 100644
index 000000000..2b82dfca3
--- /dev/null
+++ b/view/theme/diabook/diabook-red/icons/starred.png
diff --git a/view/theme/diabook/diabook-red/icons/tagged.png b/view/theme/diabook/diabook-red/icons/tagged.png
new file mode 100644
index 000000000..144649ef8
--- /dev/null
+++ b/view/theme/diabook/diabook-red/icons/tagged.png
diff --git a/view/theme/diabook/diabook-red/icons/toogle_off.png b/view/theme/diabook/diabook-red/icons/toogle_off.png
new file mode 100644
index 000000000..0fcce4d5a
--- /dev/null
+++ b/view/theme/diabook/diabook-red/icons/toogle_off.png
diff --git a/view/theme/diabook/diabook-red/icons/toogle_on.png b/view/theme/diabook/diabook-red/icons/toogle_on.png
new file mode 100644
index 000000000..79ce07f0e
--- /dev/null
+++ b/view/theme/diabook/diabook-red/icons/toogle_on.png
diff --git a/view/theme/diabook/diabook-red/icons/tumblr.png b/view/theme/diabook/diabook-red/icons/tumblr.png
new file mode 100644
index 000000000..1dc7fa072
--- /dev/null
+++ b/view/theme/diabook/diabook-red/icons/tumblr.png
diff --git a/view/theme/diabook/diabook-red/icons/twitter.png b/view/theme/diabook/diabook-red/icons/twitter.png
new file mode 100644
index 000000000..b7a687b9f
--- /dev/null
+++ b/view/theme/diabook/diabook-red/icons/twitter.png
diff --git a/view/theme/diabook/diabook-red/icons/underline.png b/view/theme/diabook/diabook-red/icons/underline.png
new file mode 100644
index 000000000..b1b4d3574
--- /dev/null
+++ b/view/theme/diabook/diabook-red/icons/underline.png
diff --git a/view/theme/diabook/diabook-red/icons/unlock.png b/view/theme/diabook/diabook-red/icons/unlock.png
new file mode 100644
index 000000000..a0cda0ae5
--- /dev/null
+++ b/view/theme/diabook/diabook-red/icons/unlock.png
diff --git a/view/theme/diabook/diabook-red/icons/unselected.png b/view/theme/diabook/diabook-red/icons/unselected.png
new file mode 100644
index 000000000..9e9cead4b
--- /dev/null
+++ b/view/theme/diabook/diabook-red/icons/unselected.png
diff --git a/view/theme/diabook/diabook-red/icons/unstarred.png b/view/theme/diabook/diabook-red/icons/unstarred.png
new file mode 100644
index 000000000..ba3183f5c
--- /dev/null
+++ b/view/theme/diabook/diabook-red/icons/unstarred.png
diff --git a/view/theme/diabook/diabook-red/icons/video.png b/view/theme/diabook/diabook-red/icons/video.png
new file mode 100644
index 000000000..a03d1d818
--- /dev/null
+++ b/view/theme/diabook/diabook-red/icons/video.png
diff --git a/view/theme/diabook/diabook-red/icons/weblink.png b/view/theme/diabook/diabook-red/icons/weblink.png
new file mode 100644
index 000000000..216e78344
--- /dev/null
+++ b/view/theme/diabook/diabook-red/icons/weblink.png
diff --git a/view/theme/diabook/diabook-red/icons/wordpress.png b/view/theme/diabook/diabook-red/icons/wordpress.png
new file mode 100644
index 000000000..f564c4300
--- /dev/null
+++ b/view/theme/diabook/diabook-red/icons/wordpress.png
diff --git a/view/theme/diabook/diabook-red/style-network-wide.css b/view/theme/diabook/diabook-red/style-network-wide.css
new file mode 100644
index 000000000..8c3b67cb6
--- /dev/null
+++ b/view/theme/diabook/diabook-red/style-network-wide.css
@@ -0,0 +1,2665 @@
+/**
+ * Fabio Comuni <http://kirgroup.com/profile/fabrixxm>
+ * Additional Changes: Michael Vogel <icarus@dabo.de>
+ **/
+
+/* ========= */
+/* = Admin = */
+/* ========= */
+
+#adminpage {
+/*        width: 80%;*/
+}
+
+#pending-update {
+        float:right;
+        color: #ffffff;
+        font-weight: bold;
+        background-color: #FF0000;
+        padding: 0em 0.3em;
+}
+
+.admin.linklist {
+        border: 0px; padding: 0px;
+}
+
+.admin.link {
+        list-style-position: inside;
+        font-size: 1em;
+        padding: 5px;
+        width: 100px;
+        margin: 5px;
+}
+
+#adminpage dl {
+        clear: left;
+        margin-bottom: 2px;
+        padding-bottom: 2px;
+        border-bottom: 1px solid black;
+}
+
+#adminpage dt {
+        width: 200px;
+        float: left;
+        font-weight: bold;
+}
+
+#adminpage dd {
+        margin-left: 200px;
+}
+#adminpage h3 {
+        border-bottom: 1px solid #898989;
+        margin-bottom: 5px;
+        margin-top: 10px;
+}
+
+#adminpage .submit {
+        clear:left;
+}
+
+#adminpage #pluginslist {
+        margin: 0px; padding: 0px;
+}
+
+#adminpage .plugin {
+        list-style: none;
+        display: block;
+	/* border: 1px solid #888888; */
+        padding: 1em;
+        margin-bottom: 5px;
+        clear: left;
+}
+
+#adminpage .toggleplugin {
+        float:left;
+        margin-right: 1em;
+}
+
+#adminpage table {width:100%; border-bottom: 1p solid #000000; margin: 5px 0px;}
+#adminpage table th { text-align: left;}
+#adminpage td .icon { float: left;}
+#adminpage table#users img { width: 16px; height: 16px; }
+#adminpage table tr:hover { background-color: #eeeeee; }
+#adminpage .selectall { text-align: right; }
+/* icons */
+
+.icon.contacts {
+  background-image: url("../diabook-red/icons/contacts.png");}
+.icon.notifications {
+  background-image: url("../diabook-red/icons/notifications.png");}
+.icon.notify {
+  background-image: url("../diabook-red/icons/notify.png");}
+.icon.messages {
+  background-image: url("../diabook-red/icons/messages.png");}
+.icon.community {
+  background-image: url("../diabook-red/icons/community.png");}
+  
+.icon.drop 	{ background-image: url("../diabook-red/icons/drop.png");}
+.icon.drophide 	{ background-image: url("../diabook-red/icons/drop.png");}
+.icon.dislike 	{ background-image: url("../diabook-red/icons/dislike.png");}
+.icon.like 	{ background-image: url("../diabook-red/icons/like.png");}
+.icon.pencil 	{ background-image: url("../diabook-red/icons/pencil.png");}
+.icon.recycle 	{ background-image: url("../diabook-red/icons/recycle.png");}
+.icon.remote-link { background-image: url("../diabook-red/icons/remote.png");}
+.icon.tagged    { background-image: url("../diabook-red/icons/tagged.png");}
+.icon.file-as { background-image: url("../diabook-red/icons/file_as.png");}
+.star-item.icon.unstarred { background-image: url("../diabook-red/icons/unstarred.png");}
+.star-item.icon.starred { background-image: url("../diabook-red/icons/starred.png");}
+.icon.link		{ background-image: url("../diabook-red/icons/link.png");}
+.icon.lock		{ background-image: url("../diabook-red/icons/lock.png");}
+.icon.unlock		{ background-image: url("../diabook-red/icons/unlock.png");}
+.icon.language    { background-image: url("../diabook-red/icons/language.png");}
+
+
+.camera 	{ background-image: url("../diabook-red/icons/camera.png"); 
+			  display: block; width: 28px; height: 28px; background-repeat: no-repeat;
+			  }
+.attach 	{ background-image: url("../diabook-red/icons/attach.png"); 
+			  display: block; width: 28px; height: 28px; background-repeat: no-repeat;
+			  }
+.video2 	{ background-image: url("../diabook-red/icons/video.png"); 
+			  display: block; width: 28px; height: 28px; background-repeat: no-repeat;
+			  }	
+.video 	{ background-image: url("../diabook-red/icons/video.png"); 
+			  display: block; width: 100%; height: 140px; background-repeat: no-repeat;
+			  }
+.audio2 	{ background-image: url("../diabook-red/icons/audio.png"); 
+			  display: block; width: 28px; height: 28px; background-repeat: no-repeat;
+			  }
+.audio 	{ background-image: url("../diabook-red/icons/audio.png"); 
+			  display: block; width: 28px; height: 28px; background-repeat: no-repeat;
+			  }
+.weblink 	{ background-image: url("../diabook-red/icons/weblink.png"); 
+			  display: block; width: 28px; height: 28px; background-repeat: no-repeat;
+			  }
+.globe 	{ background-image: url("../diabook-red/icons/globe.png"); 
+			  display: block; width: 28px; height: 28px; background-repeat: no-repeat;
+			  }
+.unglobe 	{ background-image: url("../diabook-red/icons/unglobe.png"); 
+			  display: block; width: 28px; height: 28px; background-repeat: no-repeat;
+			  }
+.edit    {background-image: url("../diabook-red/icons/pencil2.png"); 
+			  display: block; width: 28px; height: 28px; background-repeat: no-repeat;}
+			  
+			  
+
+
+.article	{ background-position: -50px  0px;}
+/*.audio 		{ background-position: -70px  0px;}*/
+.block 		{ background-position: -90px  0px;}
+/*.drop 		{ background-position: -110px 0px;}*/
+/*.drophide 	{ background-position: -130px 0px;}*/
+/*.edit 		{ background-position: -150px 0px;}*/
+/*.camera 	{ background-position: -170px 0px;}*/
+/*.dislike 	{ background-position: -190px 0px;}*/
+/*.like 		{ background-position: -210px 0px;}*/
+/*.link 		{ background-position: -230px 0px;}*/
+
+/*.globe 		{ background-position: -50px  -20px;}*/
+/*.noglobe 	{ background-position: -70px  -20px;}*/
+.no 		{ background-position: -90px  -20px;}
+.pause 		{ background-position: -110px -20px;}
+.play 		{ background-position: -130px -20px;}
+/*.pencil 	{ background-position: -150px -20px;}*/
+.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;}*/
+
+/*.video          { background-position: -110px -40px;}*/
+.youtube        { background-position: -130px -40px;}
+
+/*.attach         { background-position: -190px -40px;}*/
+/*.language       { background-position: -210px -40px;}*/
+
+
+.icon.on             { background-image: url("../diabook-red/icons/toogle_on.png"); background-repeat: no-repeat;}
+.icon.off            { background-image: url("../diabook-red/icons/toogle_off.png"); background-repeat: no-repeat;}
+.prev           { background-position: -90px  -60px;}
+.next           { background-position: -110px -60px;}
+/*.tagged     { background-position: -130px -60px;}*/
+
+.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 0px; }
+.type-audio { background-position: -40px 0px; }
+.type-text  { background-position: -60px 0px; }
+.type-unkn  { background-position: -80px 0px; }
+
+.icon.drop, .icon.drophide {
+ float: left;
+}
+
+.icon {
+  display: block;
+  width: 20px;
+  height: 20px;
+  /*background-image: url('icons.png');*/
+}
+
+.icon {
+  background-color: transparent ;
+  background-repeat: no-repeat;
+  /* background-position: left center; */
+  display: block;
+  overflow: hidden;
+  text-indent: -9999px;
+  padding: 1px;
+}
+
+.icon.border.camera{
+  background-image: url("../diabook-red/icons/camera.png"); 
+  display: block; width: 28px; height: 28px; background-repeat: no-repeat;
+	}
+	
+.icon.border.link{
+  background-image: url("../diabook-red/icons/weblink.png"); 
+  display: block; width: 28px; height: 28px; background-repeat: no-repeat;
+  margin-left: 10px;
+	}
+
+.icon.text {
+  text-indent: 0px;
+}
+.icon.s10 {
+  min-width: 10px;
+  height: 10px;
+}
+.icon.s10.notify {
+  background-image: url("../../../../images/icons/10/notify_off.png");
+}
+.icon.s10.gear {
+  background-image: url("../../../../images/icons/10/gear.png");
+}
+.icon.s10.add {
+  background-image: url("../../../../images/icons/10/add.png");
+}
+.icon.s10.delete {
+  background-image: url("../../../../images/icons/10/delete.png");
+}
+.icon.s10.edit {
+  background-image: url("../../../../images/icons/10/edit.png");
+}
+.icon.s10.star {
+  background-image: url("../../../../images/star_dummy.png");
+}
+.icon.s10.menu {
+  background-image: url("../../../../images/icons/10/menu.png");
+}
+.icon.s10.link {
+  background-image: url("../../../../images/icons/10/link.png");
+}
+.icon.s10.lock {
+  background-image: url("../../../../images/icons/10/lock.png");
+}
+.icon.s10.unlock {
+  background-image: url("../../../../images/icons/10/unlock.png");
+}
+.icon.s10.text {
+  padding: 2px 0px 0px 15px;
+  font-size: 10px;
+}
+.icon.s16 {
+  min-width: 16px;
+  height: 16px;
+}
+.icon.s16.notify {
+  background-image: url("../../../../images/icons/16/notify_off.png");
+}
+.icon.s16.gear {
+  background-image: url("../../../../images/icons/16/gear.png");
+}
+.icon.s16.add {
+  background-image: url("../../../../images/icons/16/add.png");
+}
+.icon.s16.delete {
+  background-image: url("../../../../images/icons/16/delete.png");
+}
+/*.icon.s16.edit {
+  background-image: url("../../../../images/icons/16/edit.png");
+}*/
+.icon.s16.star {
+  background-image: url("../../../../images/star_dummy.png");
+}
+.icon.s16.menu {
+  background-image: url("../../../../images/icons/16/menu.png");
+}
+/*.icon.s16.link {
+  background-image: url("../../../../images/icons/16/link.png");
+}*/
+.icon.s16.lock {
+  background-image: url("../../../../images/icons/16/lock.png");
+}
+.icon.s16.unlock {
+  background-image: url("../../../../images/icons/16/unlock.png");
+}
+.icon.s16.text {
+  padding: 4px 0px 0px 20px;
+  font-size: 10px;
+}
+.icon.s22 {
+  min-width: 22px;
+  height: 22px;
+}
+.icon.s22.notify {
+  background-image: url("../../../../images/icons/22/notify_off.png");
+}
+.icon.s22.gear {
+  background-image: url("../../../../images/icons/22/gear.png");
+}
+.icon.s22.add {
+  background-image: url("../../../../images/icons/22/add.png");
+}
+.icon.s22.delete {
+  background-image: url("../../../../images/icons/22/delete.png");
+}
+.icon.s22.edit {
+  background-image: url("../../../../images/icons/22/edit.png");
+}
+.icon.s22.star {
+  background-image: url("../../../../images/star_dummy.png");
+}
+.icon.s22.menu {
+  background-image: url("../../../../images/icons/22/menu.png");
+}
+.icon.s22.link {
+  background-image: url("../../../../images/icons/22/link.png");
+}
+.icon.s22.lock {
+  background-image: url("../../../../images/icons/22/lock.png");
+}
+.icon.s22.unlock {
+  background-image: url("../../../../images/icons/22/unlock.png");
+}
+.icon.s22.text {
+  padding: 10px 0px 0px 25px;
+  width: 200px;
+}
+.icon.s48 {
+  width: 48px;
+  height: 48px;
+}
+.icon.s48.notify {
+  background-image: url("../../../../images/icons/48/notify_off.png");
+}
+.icon.s48.gear {
+  background-image: url("../../../../images/icons/48/gear.png");
+}
+.icon.s48.add {
+  background-image: url("../../../../images/icons/48/add.png");
+}
+.icon.s48.delete {
+  background-image: url("../../../../images/icons/48/delete.png");
+}
+.icon.s48.edit {
+  background-image: url("../../../../images/icons/48/edit.png");
+}
+.icon.s48.star {
+  background-image: url("../../../../images/star_dummy.png");
+}
+.icon.s48.menu {
+  background-image: url("../../../../images/icons/48/menu.png");
+}
+.icon.s48.link {
+  background-image: url("../../../../images/icons/48/link.png");
+}
+.icon.s48.lock {
+  background-image: url("../../../../images/icons/48/lock.png");
+}
+.icon.s48.unlock {
+  background-image: url("../../../../images/icons/48/unlock.png");
+}
+
+#contact-edit-links ul {
+  list-style: none;
+  list-style-type: none;
+}
+
+.hide-comments-outer {
+  margin-left: 80px;
+  margin-bottom: 1px;
+  width: 675px;
+  border-bottom: 1px solid #BDCDD4;
+  background-color: #fff;
+  padding: 8px;
+}
+
+/* global */
+body {
+  font-family: 'Lato', "Helvetica Neue", Helvetica, Arial, sans-serif;
+  font-size: 13px;
+  background-color: #ffffff;
+  color: #2d2d2d;
+  margin: 50px auto auto;
+  display: table;
+}
+
+h4 {
+  font-size: 1.1em;
+}
+
+a {
+	color: #333333;
+	/* color: #3e3e8c; */
+	text-decoration: none;
+}
+a:hover {
+	/* color: blue; */
+	text-decoration: underline
+}
+
+.wall-item-name-link {
+/*  float: left;*/
+}
+
+.wall-item-photo {
+  width: 48px;
+  height: 48px;
+  overflow: hidden;
+  display: block;
+}
+
+.left {
+  float: left;
+}
+.right {
+  float: right;
+}
+.hidden {
+  display: none;
+}
+.clear {
+  clear: both;
+}
+.fakelink {
+  color: #333
+  /* color: #3e3e8c; */
+  text-decoration: none;
+  cursor: pointer;
+}
+.fakelink:hover {
+  /* color: blue; */
+  /*color: #005c94; */
+  text-decoration: underline;
+}
+code {
+  font-family: Courier, monospace;
+  white-space: pre;
+  display: block;
+  overflow: auto;
+  border: 1px solid #444;
+  background: #EEE;
+  color: #444;
+  padding: 10px;
+  margin-top: 20px;
+}
+#panel {
+  position: absolute;
+  width: 12em;
+  background: #ffffff;
+  color: #2d2d2d;
+  margin: 0px;
+  padding: 1em;
+  list-style: none;
+  border: 3px solid #364e59;
+  z-index: 100000;
+  -webkit-box-shadow: 0px 5px 10px rgba(0, 0, 0, 0.7);
+  -moz-box-shadow: 0px 5px 10px rgba(0, 0, 0, 0.7);
+  box-shadow: 0px 5px 10px rgba(0, 0, 0, 0.7);
+}
+/* tool */
+.tool {
+  height: auto;
+  overflow: auto;
+  padding: 3px;
+}
+#saved-search-ul .tool:hover,
+#nets-sidebar .tool:hover,
+#sidebar-group-list .tool:hover,
+#fileas-sidebar .tool:hover {
+	background: #FFE499;
+}
+.tool .label {
+  float: left;
+}
+.tool .action {
+  float: right;
+}
+.tool a {
+  color: ##3F8FBA;
+}
+.tool a:hover {
+  text-decoration: none;
+}
+/* popup notifications */
+div.jGrowl div.notice {
+  background: #511919 url("../../../../images/icons/48/notice.png") no-repeat 5px center;
+  color: #ffffff;
+  padding-left: 58px;
+}
+div.jGrowl div.info {
+  background: #364e59 url("../../../../images/icons/48/info.png") no-repeat 5px center;
+  color: #ffffff;
+  padding-left: 58px;
+}
+/* header */
+header {
+  position: fixed;
+  left: 0%;
+  right: 80%;
+  top: 0px;
+  margin: 0px;
+  padding: 0px;
+  width: 22%;
+  height: 32px;
+  background: #ff500f;
+  background-color: #ff500f;
+  z-index: 100;
+  border-bottom: 1px;
+  border-bottom-color: black;
+  border-bottom-style: inset;
+  background-image: linear-gradient(bottom, rgb(173,59,10) 0%, rgb(255,79,15) 65%);
+background-image: -o-linear-gradient(bottom, rgb(173,59,10) 0%, rgb(255,79,15) 65%);
+background-image: -moz-linear-gradient(bottom, rgb(173,59,10) 0%, rgb(255,79,15) 65%);
+background-image: -webkit-linear-gradient(bottom, rgb(173,59,10) 0%, rgb(255,79,15) 65%);
+background-image: -ms-linear-gradient(bottom, rgb(173,59,10) 0%, rgb(255,79,15) 65%);
+filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#ad3b0a', endColorstr='#ff4f0f');
+
+background-image: -webkit-gradient(
+	linear,
+	left bottom,
+	left top,
+	color-stop(0, rgb(173,59,10)),
+	color-stop(0.65, rgb(255,79,15))
+);
+}
+header #site-location {
+  display: none;
+}
+header #banner {
+  overflow: hidden;
+  text-align: left;
+  width: 82%%;
+  margin-left: 25%;
+}
+header #banner a,
+header #banner a:active,
+header #banner a:visited,
+header #banner a:link,
+header #banner a:hover {
+  color: black;
+  text-decoration: none;
+  outline: none;
+  vertical-align: middle;
+  font-weight: bolder;
+  
+}
+header #banner #logo-img {
+  height: 25px;
+  margin-top: 3px;
+}
+header #banner #logo-text {
+  font-size: 20px;
+  position: absolute;
+  top: 10%;
+  margin-left: 3px;
+}
+/* nav */
+nav {
+  width: 80%;
+  height: 32px;
+  position: fixed;
+  left: 22%;
+  top: 0px;
+  padding: 0px;
+  background: #ff500f;
+  color: #000;
+  z-index: 99;
+  border-bottom: 1px;
+  border-bottom-color: black;
+  border-bottom-style: inset;
+  background-image: linear-gradient(bottom, rgb(173,59,10) 0%, rgb(255,79,15) 65%);
+background-image: -o-linear-gradient(bottom, rgb(173,59,10) 0%, rgb(255,79,15) 65%);
+background-image: -moz-linear-gradient(bottom, rgb(173,59,10) 0%, rgb(255,79,15) 65%);
+background-image: -webkit-linear-gradient(bottom, rgb(173,59,10) 0%, rgb(255,79,15) 65%);
+background-image: -ms-linear-gradient(bottom, rgb(173,59,10) 0%, rgb(255,79,15) 65%);
+
+background-image: -webkit-gradient(
+	linear,
+	left bottom,
+	left top,
+	color-stop(0, rgb(173,59,10)),
+	color-stop(0.65, rgb(255,79,15))
+);
+}
+nav a,
+nav a:active,
+nav a:visited,
+nav a:link,
+nav a:hover {
+  /*color: #1f1f1f;*/
+  text-decoration: none;
+  outline: none;
+}
+nav #banner {
+  overflow: hidden;
+  /*text-align: center;*/
+  width: 100%;
+}
+nav #banner a,
+nav #banner a:active,
+nav #banner a:visited,
+nav #banner a:link,
+nav #banner a:hover {
+  color: #ffffff;
+  text-decoration: none;
+  outline: none;
+  vertical-align: bottom;
+}
+nav #banner #logo-img {
+  height: 22px;
+  margin-top: 5px;
+}
+nav #banner #logo-text {
+  font-size: 22px;
+}
+nav #navbar{
+	}
+nav ul {
+  margin: 0px;
+  padding: 0px 20px;
+}
+nav ul li {
+  list-style: none;
+  margin: 0px;
+  /* padding: 1px 1px 3px 1px; */
+  float: left;
+}
+nav ul li .menu-popup {
+  left: 0px;
+  right: auto;
+}
+
+nav #logo-img {
+  height: 25px;
+  margin-top: 4px;
+  margin-left: 30px;
+}
+
+nav #logo-text {
+    font-size: 22px;
+    margin-top: 3px;
+    margin-right: 15px;
+}
+nav .nav-menu-search {
+  position: relative;
+
+  margin: 4px 17px;
+  margin-right: 0px;
+  height: 17px;
+  width: 180px;
+  
+}
+
+nav #search-box #search-text {
+  background-image:  url('icons/lupe.png');
+  background-repeat:no-repeat;
+  padding-left:20px;
+  border-top-left-radius: 15px;
+border-top-right-radius: 15px;
+border-bottom-right-radius: 15px;
+border-bottom-left-radius: 15px;
+	}
+
+
+nav .nav-menu-icon {
+  position: relative;
+  height: 22px;
+  padding: 5px;
+  margin: 0px 5px;
+  -moz-border-radius: 5px 5px 0 0;
+  -webkit-border-radius: 5px 5px 0 0;
+  border-radius: 5px 5px 0 0;
+}
+nav .nav-menu-icon:hover {
+  position: relative;
+  height: 22px;
+  padding: 5px;
+  margin: 0px 5px;
+  -moz-border-radius: 5px 5px 0 0;
+  -webkit-border-radius: 5px 5px 0 0;
+  border-radius: 5px 5px 0 0;
+}
+
+nav .nav-menu-icon.selected {
+  background-color: #fff4d6;
+}
+nav .nav-menu-icon img {
+  width: 22px;
+  height: 22px;
+}
+nav .nav-menu-icon .nav-notify {
+  top: 3px;
+}
+/*marker*/
+nav .nav-menu {
+  position: relative;
+  height: 16px;
+  padding: 5px;
+  margin: 3px 15px 0px;
+  font-size: 15px;
+  /*border: 3px solid #364A84;*/
+}
+nav .nav-menu.selected {
+  /*border-bottom: 3px solid #9eabb0;*/
+}
+nav .nav-notify {
+  display: none;
+  position: absolute;
+  background-color: #fff;
+  /* background-color: #19aeff; */
+  -moz-border-radius: 5px 5px 5px 5px;
+  -webkit-border-radius: 5px 5px 5px 5px;
+  border-radius: 5px 5px 5px 5px;
+  font-size: 10px;
+  font-weight: 900;
+  padding: 1px 4px;
+  top: 0px;
+  right: -6px;
+  min-width: 10px;
+  text-align: center;
+}
+nav .nav-notify.show {
+  display: block;
+}
+nav #nav-help-link,
+nav #nav-search-link,
+nav #nav-directory-link,
+nav #nav-apps-link,
+nav #nav-site-linkmenu, 
+nav #nav-home-link,
+nav #nav-user-linkmenu
+{
+  float: right;
+}
+nav #nav-user-linkmenu{
+	margin-right: 0px;
+	}
+nav #nav-home-link, #nav-directory-link, #nav-apps-link{
+	margin-left: 0px;
+	margin-right: 0px;
+	font-weight: bold;
+	margin: 3px 5px;
+	font-size: 15px;
+	}
+nav #nav-directory-link{
+  margin-right: 0px;	
+	}
+nav #nav-home-link{
+  margin-left: 0px;	
+	}
+nav #nav-help-link .menu-popup,
+nav #nav-search-link .menu-popup,
+nav #nav-directory-link .menu-popup,
+nav #nav-apps-link .menu-popup,
+nav #nav-site-linkmenu .menu-popup {
+  right: 0px;
+  left: auto;
+}
+
+nav #nav-messages-linkmenu.on .icon.messages, nav #nav-messages-linkmenu.selected .icon.messages{
+	background-image: url("../diabook-red/icons/messages2.png");
+	}
+	
+/*nav #nav-notifications-linkmenu.on .icon.notify,*/ nav #nav-notifications-linkmenu.selected .icon.notify{
+	background-image: url("../diabook-red/icons/notify2.png");
+	}
+	
+nav #nav-contacts-linkmenu.on .icon.contacts, nav #nav-contacts-linkmenu.selected .icon.contacts{
+	background-image: url("../diabook-red/icons/contacts2.png");
+	}
+	
+nav #nav-apps-link.selected {
+  background-color: #fff4d6;
+  moz-border-radius: 5px 5px 0 0;
+-webkit-border-radius: 5px 5px 0 0;
+border-radius: 5px 5px 0 0;
+}
+
+#nav-notifications-mark-all {
+	/* padding: 1px 1px 2px 26px; */
+	/* border-bottom: 1px solid #364E59; */
+	/* margin: 0px 0px 2px 0px;
+	padding: 5px 10px; */
+}
+
+#nav-notifications-see-all {
+	/* padding: 1px 1px 2px 26px; */
+	/* border-bottom: 1px solid #364E59; */
+	/* margin: 0px 0px 2px 0px;
+	padding: 5px 10px; */
+}
+
+.notify-seen {
+	background: none repeat scroll 0 0 #DDDDDD;
+	}
+
+ul.menu-popup {
+  position: absolute;
+  display: none;
+  width: 11em;
+  background: #fff4d6;
+  color: #2d2d2d;
+  margin: 0px;
+  padding: 0px;
+  list-style: none;
+  z-index: 100000;
+  -webkit-box-shadow: 0px 5px 10px rgba(0, 0, 0, 0.7);
+  -moz-box-shadow: 0px 5px 10px rgba(0, 0, 0, 0.7);
+  box-shadow: 0px 5px 10px rgba(0, 0, 0, 0.7);
+}
+ul.menu-popup a {
+  display: block;
+  color: #2d2d2d;
+  padding: 5px 10px;
+  text-decoration: none;
+}
+ul.menu-popup a:hover {
+  background-color: #ffe499; /*bdcdd4;*/
+  color: #000;
+}
+ul.menu-popup .menu-sep {
+  border-top: 1px solid #9eabb0;
+}
+ul.menu-popup li {
+  float: none;
+  overflow: auto;
+  height: auto;
+  display: block;
+}
+ul.menu-popup li img {
+  float: left;
+  width: 16px;
+  height: 16px;
+  padding-right: 5px;
+}
+ul.menu-popup .empty {
+  padding: 5px;
+  text-align: center;
+  color: #9eabb0;
+}
+/* autocomplete popup */
+.acpopup {
+  max-height: 150px;
+  background-color: #ffffff;
+  color: #2d2d2d;
+  border: 1px solid #MenuBorder;
+  overflow: auto;
+  z-index: 100000;
+  -webkit-box-shadow: 0px 5px 10px rgba(0, 0, 0, 0.7);
+  -moz-box-shadow: 0px 5px 10px rgba(0, 0, 0, 0.7);
+  box-shadow: 0px 5px 10px rgba(0, 0, 0, 0.7);
+}
+.acpopupitem {
+  color: #2d2d2d;
+  padding: 4px;
+  clear: left;
+}
+.acpopupitem img {
+  float: left;
+  margin-right: 4px;
+}
+.acpopupitem.selected {
+  background-color: #bdcdd4;
+}
+#nav-notifications-menu {
+  width: 400px;
+  max-height: 550px;
+  overflow: auto;
+}
+/* #nav-notifications-menu a {
+	display: inline;
+	padding: 5px 0px;
+	margin: 0px 0px 2px 0px;
+}
+#nav-notifications-menu li:hover {
+  background-color: #bdcdd4;
+}*/
+
+#nav-notifications-menu img {
+  float: left;
+  margin-right: 5px;
+}
+#nav-notifications-menu .contactname {
+  font-weight: bold;
+}
+#nav-notifications-menu .notif-when {
+  font-size: 10px;
+  color: #9eabb0;
+  display: block;
+}
+
+.notif-image {
+        width: 32px;
+        height: 32px;
+        padding: 7px 7px 0px 0px;
+}
+
+/*profile_side*/
+#profile_side {
+  margin-bottom: 30px;
+ 
+}
+#profile_side a{
+  color: #333;
+}
+#ps-usericon{
+	height: 25px	
+	}
+#ps-username{
+  font-size: 1.17em;
+  font-weight: bold;
+  vertical-align: top;
+  position: absolute;
+  padding-top: 4px;
+  padding-left: 5px;	
+  word-wrap: break-word;
+  width: 130px;
+	}
+#ps-username:hover{
+  text-decoration: none;	
+	}
+.menu-profile-side{
+  list-style: none;	
+  padding-left: 0px;
+  min-height: 0px;
+	}
+.menu-profile-list{
+  height: auto;
+  overflow: auto;  
+  min-height: 16px;
+  list-style: none;
+	}
+.menu-profile-list:hover{
+	background: #FFE499; 
+	}
+.menu-profile-list-item{
+	padding-left: 5px;
+	vertical-align: middle;
+	}	
+.menu-profile-list-item:hover{	
+	text-decoration: none;
+   }
+/*http://prothemedesign.com/circular-icons/*/
+.menu-profile-icon.home{
+	background: url("../diabook-red/icons/home.png") no-repeat;
+	float: left;
+	height: 22px;
+	width: 22px;
+	}
+.menu-profile-icon.photos{
+	background: url("../diabook-red/icons/mess_side.png") no-repeat;
+	float: left;
+	height: 22px;
+   width: 22px;}
+.menu-profile-icon.events{
+	background: url("../diabook-red/icons/events.png") no-repeat;
+	float: left;
+	height: 22px;
+   width: 22px;}
+.menu-profile-icon.notes{
+	background: url("../diabook-red/icons/notes.png") no-repeat;
+	float: left;
+	height: 22px;
+   width: 22px;}
+.menu-profile-icon.foren{
+	background: url("../diabook-red/icons/pubgroups.png") no-repeat;
+	float: left;
+	height: 22px;
+   width: 22px;}
+.menu-profile-icon.com_side{
+	background: url("../diabook-red/icons/com_side.png") no-repeat;
+	float: left;
+	height: 22px;
+   width: 22px;}
+.menu-profile-icon.pscontacts{
+	background: url("../diabook-red/icons/pscontacts.png") no-repeat;
+	float: left;
+	height: 22px;
+   width: 22px;}
+/* aside */
+/*marker*/
+aside {
+  display: table-cell;
+  vertical-align: top;
+  width: 180px;
+  padding: 0px 5px 0px 0px;
+  border-right: 1px solid #D2D2D2;
+  float: left;
+  /* background: #F1F1F1; */
+}
+aside #page-sidebar{display: none;}
+aside .vcard .fn {
+  font-size: 18px;
+  font-weight: bold;
+  margin-bottom: 5px;
+}
+aside .vcard .title {
+  margin-bottom: 5px;
+}
+aside .vcard dl {
+  height: auto;
+  overflow: auto;
+}
+aside .vcard dt {
+  float: left;
+  margin-left: 0px;
+  /*width: 35%;*/
+  text-align: right;
+  color: #999999;
+}
+aside .vcard dd {
+  float: left;
+  margin-left: 5px;
+  /*width: 60%;*/
+}
+aside #profile-extra-links ul {
+  padding: 0px;
+  margin: 0px;
+}
+aside #profile-extra-links li {
+  padding: 0px;
+  margin: 0px;
+  list-style: none;
+}
+aside #dfrn-request-link {
+  display: block;
+  -moz-border-radius: 5px 5px 5px 5px;
+  -webkit-border-radius: 5px 5px 5px 5px;
+  border-radius: 5px 5px 5px 5px;
+  color: #ffffff;
+  background: #005c94 url('../../../../images/connect-bg.png') no-repeat left center;
+  font-weight: bold;
+  text-transform: uppercase;
+  padding: 4px 2px 2px 35px;
+}
+aside #dfrn-request-link:hover {
+  text-decoration: none;
+  background-color: #36c;
+  /* background-color: #19aeff; */
+}
+aside #profiles-menu {
+  width: 20em;
+}
+aside #search-text {
+	width: 150px;
+	height: 17px;
+	padding-left: 10px;
+	border-top-left-radius: 15px;
+border-top-right-radius: 15px;
+border-bottom-right-radius: 15px;
+border-bottom-left-radius: 15px;
+-moz-border-bottom-colors: #dbdbdb;
+  -moz-border-top-colors: #999;
+  -moz-border-left-colors: #999;
+  -moz-border-right-colors: #dbdbdb;
+}
+aside #side-follow-url {
+	width: 150px;
+	}
+aside #side-peoplefind-url {
+	width: 150px;
+	}
+#contact-block {
+  overflow: auto;
+  height: auto;
+}
+#contact-block .contact-block-h4 {
+  float: left;
+  margin: 5px 0px;
+}
+#contact-block .allcontact-link {
+  float: right;
+  margin: 5px 0px;
+}
+#contact-block .contact-block-content {
+  clear: both;
+  overflow: auto;
+  height: auto;
+}
+#contact-block .contact-block-link {
+  float: left;
+  margin: 0px 2px 2px 0px;
+}
+#contact-block .contact-block-link img {
+  widht: 55px;
+  height: 55px;
+}
+#lost-password-link {
+  float: left;
+  margin-right: 20px;	
+	}
+/* widget */
+.widget {
+  margin-bottom: 2em;
+  /*.action .s10 { width: 10px; overflow: hidden; padding: 0px;}
+	.action .s16 { width: 16px; overflow: hidden; padding: 0px;}*/
+/*  font-size: 12px; */
+}
+/*marker*/
+.widget h3 {
+  padding: 0px;
+  margin: 2px;
+  font-size: 1.05em;
+}
+.widget .action {
+  opacity: 0.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;
+}
+.widget input.action {
+  opacity: 0.5;
+  -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;
+}
+.widget:hover .title .action {
+  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;
+}
+.widget .tool:hover .action {
+  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;
+}
+.widget .tool:hover .action.ticked {
+  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;
+}
+.widget ul {
+  padding: 0px;
+}
+.widget ul li {
+  padding-left: 16px;
+  min-height: 16px;
+  list-style: none;
+}
+#side-bar-photos-albums li{
+list-style-type: disc;
+}
+#side-bar-photos-albums ul li{
+  margin-left: 30px;
+  padding-left: 0px;
+	}
+#side-bar-photos-albums ul li a{
+  color: #1872A2;
+}
+.widget .tool.selected {
+  background: url("../diabook-red/icons/selected.png") no-repeat left center;
+}
+/* widget: search */
+span.sbox_l  {
+	background: white url('../diabook/icons/srch_l.gif') no-repeat top left;
+	float: left;
+	width: 19px; height: 19px;
+	margin-left: 10px;
+	margin-top: 5px;
+	
+}
+
+span.sbox_r  {
+	background: white url('../diabook/icons/srch_r.gif') no-repeat top left;
+	float: left;
+	width: 19px; height: 19px;
+	margin-top: 5px;
+}
+
+span.sbox input {
+	background: white url('../diabook/icons/srch_bg.gif') repeat-x top left;
+	float: left;
+	margin-top: 5px;
+	border: 0;
+	height: 13px; width: 100px;
+	padding: 3px;
+	font: 11px/13px arial;
+	color: #000;
+}
+#add-search-popup {
+  width: 200px;
+  top: 18px;
+}
+/* section */
+section {
+  display: table-cell;
+  vertical-align: top;
+  width: auto;
+  padding: 0px 0px 0px 12px;
+}
+
+body .pageheader{
+  text-align: center;
+  font-size: 20px;
+  margin-bottom: 20px;
+  margin-top: 0px;
+  max-width: 575px;
+	}
+.qcomment{
+  max-width: 122px;	
+	}
+#id_username {
+  width: 173px;	
+	}
+#id_password {
+  width: 173px;		
+	}
+#id_openid_url {
+  width: 173px;	
+	}
+#contact-edit-end {
+	}
+.pager {
+   padding: 10px;
+	text-align: center;
+	font-size: 1.0em;
+	clear: both;
+	display: block;
+}	
+
+.tabs {
+    
+    background-position: 0 -20px;
+    background-repeat: repeat-x;
+    height: 27px;
+    padding: 0;
+ }
+.tab.button {
+    margin-left: 5px;	
+    /*background: none repeat scroll 0 0 #F8F8F8;*/
+    border: 1px solid #CCCCCC;
+    border-radius: 3px 3px 3px 3px;
+    font-weight: normal;
+    padding: 3px;
+    color:  #333333;
+	}
+	
+#birthday-notice, #event-notice, #birthday-wrapper, #event-wrapper{
+	margin-bottom: 10px;
+	}
+
+/*marker*/
+right_aside {
+  display: table-cell;
+  vertical-align: top;
+  width: 180px;
+  /*border-left: 1px solid #D2D2D2;*/
+  
+  /* background: #F1F1F1; */
+}
+right_aside a{color: red;}
+/*marker*/
+right_aside h3 {font-size: 1.05em; border-bottom: 1px solid #D2D2D2; padding-top: 5px; padding-bottom: 0px; padding-left: 9px; margin-bottom: 0px; 
+margin-top:30px;}
+right_aside .directory-item {	width: 50px; height: 50px; vertical-align: center; text-align: center; }
+right_aside .directory-photo { margin: 0px; }
+right_aside .directory-photo-img { max-width: 45px; max-height: 45px; }
+right_aside #likes { margin: 0px; padding: 0px; list-style: none; }
+right_aside .items-wrapper{ overflow: auto;	width: 100%; }
+right_aside #lastusers-wrapper { padding-left: 6px; padding-top: 3px; overflow: auto;	width: 100%; }
+right_aside #ra-photos-wrapper { padding-left: 5px; padding-top: 3px; overflow: auto;	width: 100%; }
+#page-sidebar-right_aside{margin-top: 0px; margin-bottom: 30px;}
+#page-sidebar-right_aside ul {margin-top: 0px;}
+#page-sidebar-right_aside .label {max-width: 128px;}
+right_aside .icon {width: 10px; height: 10px;}
+.close_box		{ 
+		background-image: url("../diabook-red/icons/close_box.png");
+		float: right;
+		cursor: pointer;
+		opacity: 0.1;
+		}
+.close_box:hover	{ 
+		background-image: url("../diabook-red/icons/close_box.png");
+		float: right;
+		cursor: pointer;
+		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;
+		}
+		
+/* wall item */
+.tread-wrapper {
+  border-bottom: 1px solid #D2D2D2;
+  position: relative;
+  padding: 5px;
+  margin-bottom: 0px;
+  width: 775px;
+  padding-top: 10px;
+}
+.tread-wrapper a{
+  color: red;
+}
+
+/*marker*/
+.wall-item-decor {
+  position: absolute;
+  left: 780px;
+  top: -10px;
+  width: 16px;
+}
+/*marker*/
+.wall-item-container {
+  display: table;
+  width: 770px;
+}
+
+
+.wall-item-container .wall-item-item, .wall-item-container .wall-item-bottom {
+  display: table-row;
+}
+
+.wall-item-bottom {
+  font-size: 13px;
+}
+.wall-item-container .wall-item-bottom {
+/*  opacity: 0.5;
+  -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; */
+}
+.wall-item-container:hover .wall-item-bottom {
+/*  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; */
+}
+.wall-item-container .wall-item-info {
+  display: table-cell;
+  vertical-align: top;
+  text-align: left;
+  width: 80px;
+}
+.wall-item-container .wall-item-location {
+  padding-right: 40px;
+  display: table-cell;
+}
+.wall-item-container .wall-item-ago {
+  word-wrap: break-word;
+  width: 50px;
+  margin-left: 10px;
+  color: #999;
+}
+.wall-item-location {
+  
+  clear: both;
+  overflow: hidden;
+  
+  margin-bottom: 5px;
+}
+
+/*marker*/
+.wall-item-container .wall-item-content {
+
+  max-width: 690px;
+  word-wrap: break-word;
+
+
+}
+/*marker*/
+.wall-item-container .wall-item-content img {
+
+
+}
+.wall-item-container .wall-item-links, .wall-item-container .wall-item-actions {
+  display: table-cell;
+  vertical-align: middle;
+}
+.wall-item-container .wall-item-links .icon, .wall-item-container .wall-item-actions .icon {
+  opacity: 0.5;
+  -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;
+}
+.wall-item-container .wall-item-links .icon:hover, .wall-item-container .wall-item-actions .icon: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;
+}
+.wall-item-container .wall-item-name {
+  font-weight: bold;
+}
+.wall-item-container .wall-item-actions-author {
+  width: 100%;
+  margin-bottom: 0.3em;
+}
+.wall-item-container .wall-item-actions-social {
+  float: left;
+  margin-bottom: 1px;
+  display: table-cell;
+}
+.wall-item-container .wall-item-actions-social a {
+  margin-right: 1em;
+}
+.wall-item-actions-social a {
+  float: left;
+}
+.wall-item-container .wall-item-actions-tools {
+  float: right;
+  width: 80px;
+  display: table-cell;
+}
+.wall-item-container .wall-item-actions-tools a {
+  float: right;
+}
+.wall-item-container .wall-item-actions-tools input {
+  float: right;
+}
+/*marker*/
+.wall-item-container.comment {
+  margin-top: 5px;
+  margin-bottom: 5px;
+  margin-left: 80px;
+  width: 690px;
+  border-bottom: 1px solid hsl(198, 21%, 79%);
+}
+.wall-item-container.comment .contact-photo {
+  width: 32px;
+  height: 32px;
+  margin-left: 16px;
+  /*background: url(../../../../images/icons/22/user.png) no-repeat center center;*/
+
+}
+.wall-item-container.comment {
+  top: 15px !important;
+  left: 15px !important;
+}
+.wall-item-container.comment .wall-item-links {
+  padding-left: 12px;
+}
+
+.wall-item-comment-wrapper {
+  margin: 1px 5px 5px 80px;
+  background-color: #fff;
+  width: 500px;
+}
+.wall-item-comment-wrapper .comment-edit-photo {
+  display: none;
+}
+.wall-item-comment-wrapper textarea {
+  height: 2.0em;
+  width: 100%;
+  font-size: 10px;
+  color: #999999;
+  border: 1px solid #DDD;
+  padding: 0.3em;
+  font-size: 14px;
+}
+.wall-item-comment-wrapper .comment-edit-text-full {
+  font-size: 14px;
+  height: 4em;
+  color: #2d2d2d;
+  border: 1px solid #2d2d2d;
+}
+.comment-edit-preview {
+  width: 500px;
+  margin-top: 10px;
+  background-color:  #fff797;
+}
+.comment-edit-preview .contact-photo {
+  width: 32px;
+  height: 32px;
+  margin-left: 16px;
+  /*background: url(../../../../images/icons/22/user.png) no-repeat center center;*/
+
+}
+.comment-edit-preview {
+  top: 15px !important;
+  left: 15px !important;
+}
+.comment-edit-preview .wall-item-links {
+  padding-left: 12px;
+}
+.comment-edit-preview .wall-item-container {
+  width: 700px;
+}
+.comment-edit-preview .tread-wrapper {
+  width: 700px;
+  padding: 0;
+  margin: 10px 0;
+}
+
+.shiny {
+  /* border-right: 10px solid #fce94f; */
+	border-right: 1px solid #A7C7F7;
+	padding-right: 12px;
+}
+
+#jot-preview-content{
+	margin-top: 30px;}
+	
+#jot-preview-content .tread-wrapper {
+  background-color: #fff797;
+}
+
+.wall-item-tags {
+  padding-top: 1px;
+  padding-bottom: 2px;
+}
+.tag {
+  /*background: url("../../../../images/tag_b.png") repeat-x center left;*/
+  color: #999;
+  padding-left: 3px;
+  font-size: 12px;
+}
+.tag a {
+  padding-right: 5px;
+  /*background: url("../../../../images/tag.png") no-repeat center right;*/
+  color: #999;
+}
+.wwto {
+  position: absolute !important;
+  width: 25px;
+  height: 25px;
+  background: #FFFFFF;
+  border: 2px solid #364e59;
+  height: 25px;
+  width: 25px;
+  overflow: hidden;
+  padding: 1px;
+  position: absolute !important;
+  top: 40px;
+  left: 30px;
+  -webkit-box-shadow: 0px 0px 10px rgba(0, 0, 0, 0.7);
+  -moz-box-shadow: 0px 0px 10px rgba(0, 0, 0, 0.7);
+  box-shadow: 0px 0px 10px rgba(0, 0, 0, 0.7);
+}
+.wwto .contact-photo {
+  width: auto;
+  height: 25px;
+}
+/* contacts menu */
+.contact-photo-wrapper {
+  position: relative;
+  width: 80px;
+}
+
+.contact-photo-wrapper.wwto {
+  width: 25px;
+}
+
+.contact-photo {
+  width: 48px;
+  height: 48px;
+  overflow: hidden;
+  display: block;
+}
+.contact-photo img {
+  width: 48px;
+  height: 48px;
+}
+
+.contact-wrapper {
+  float: left;
+  width: 90px;
+  height: 90px;
+  margin-bottom: 15px;
+}
+.contact-wrapper .contact-photo {
+  width: 80px;
+  height: 80px;
+}
+.contact-wrapper .contact-photo img {
+  width: 80px;
+  height: 80px;
+}
+.contact-wrapper {
+  left: 0px;
+  top: 63px;
+}
+.contact-photo {
+  width: 48px;
+  height: 48px;
+}
+.contact-photo img {
+  width: 48px;
+  height: 48px;
+}
+.contact-name {
+  /* text-align: center; */
+  /*font-weight: bold;*/
+  font-size: 12px;
+}
+.contact-details {
+  color: #999999;
+}
+/* editor */
+.jothidden {
+  display: none;
+}
+#jot {
+  width: 585px;
+  margin: 0px 2em 20px 0px;
+}
+#profile-jot-form #profile-jot-text {
+  height: 2.0em;
+  width: 99%;
+  font-size: 15px;
+  color: #999999;
+  border: 1px solid #DDD;
+  padding: 0.3em;
+  margin-bottom: 10px;
+}
+.grey
+{
+  display: inline;
+  float: right;	
+	}
+#jot #jot-tools {
+  margin: 0px;
+  padding: 0px;
+  height: 40px;
+  overflow: none;
+  width: 583px;
+  background-color: #fff;
+  border-bottom: 2px solid #9eabb0;
+}
+
+#jot #jot-tools li {
+  list-style: none;
+  float: left;
+  width: 80px;
+  height: 40px;
+  border-bottom: 2px solid #9eabb0;
+}
+#jot #jot-tools li a {
+  display: block;
+  color: #cccccc;
+  width: 100%;
+  height: 40px;
+  text-align: center;
+  line-height: 40px;
+  overflow: hidden;
+}
+#jot #jot-tools li:hover {
+  background-color: #364e59;
+  border-bottom: 2px solid #bdcdd4;
+}
+#jot #jot-tools li.perms {
+  float: right;
+  width: 40px;
+}
+#jot #jot-tools li.perms a.unlock {
+  width: 30px;
+  border-left: 10px solid #cccccc;
+  background-color: #cccccc;
+  background-position: left center;
+}
+#jot #jot-tools li.perms a.lock {
+  width: 30px;
+  border-left: 10px solid #666666;
+  background-color: #666666;
+}
+#jot #jot-tools li.submit {
+  float: right;
+  background-color: #cccccc;
+  border-bottom: 2px solid #cccccc;
+  border-right: 1px solid #666666;
+  border-left: 1px solid #666666;
+}
+#jot #jot-tools li.submit input {
+  border: 0px;
+  margin: 0px;
+  padding: 0px;
+  background-color: #cccccc;
+  color: #666666;
+  width: 80px;
+  height: 40px;
+  line-height: 40px;
+}
+#jot #jot-tools li.submit input:hover {
+  background-color: #bdcdd4;
+  color: #666666;
+}
+#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;
+}
+#profile-jot-form #jot-title {
+    
+  	 border-radius: 5px 5px 5px 5px;
+    font-weight: bold;
+    height: 20px;
+    margin: 0 0 5px;
+    width: 60%;
+    border: 1px solid #d2d2d2;
+}
+#profile-jot-form #jot-title:-webkit-input-placeholder {
+  font-weight: normal;
+}
+#profile-jot-form #jot-title:-moz-placeholder {
+  font-weight: normal;
+}
+#profile-jot-form #profile-jot-text_parent #profile-jot-text_tbl{
+	width: 585px;
+	height: 100px;
+	}
+#jot #jot-title:hover {
+  border: 1px solid #999999;
+}
+#jot #jot-title:focus {
+  border: 1px solid #999999;
+}
+#jot #character-counter {
+  width: 80px;
+  float: right;
+  text-align: right;
+  height: 20px;
+  line-height: 20px;
+  padding-right: 20px;
+}
+#jot-perms-icon, 
+#profile-location,
+#profile-nolocation,
+#profile-youtube, 
+#profile-video, 
+#profile-audio,
+#profile-link,
+#profile-title, 
+#wall-image-upload,
+#wall-file-upload,
+#wall-image-upload-div,
+#wall-file-upload-div,
+.hover, .focus {
+	cursor: pointer;
+	margin-top: 2px;
+}
+/*marker*/
+#profile-jot-wrapper{
+	margin: 0 20px 20px 0;
+   width: 785px;
+	}
+/*marker*/
+#profile-jot-submit-wrapper {
+	margin-bottom: 50px;
+	width: 785px;
+}
+
+#profile-jot-submit {
+	float: right;
+	margin-top: 2px;
+	font-size: 14px;
+}
+#profile-upload-wrapper {
+	float: left;
+	margin-top: 2px;
+	margin-left: 10px;
+	
+}
+#profile-attach-wrapper {
+	float: left;
+	margin-left: 15px;
+	margin-top: 2px;
+}
+#profile-rotator {
+	float: left;
+	margin-left: 30px;
+	margin-top: 2px;
+}
+#profile-link-wrapper {
+	float: left;
+	margin-left: 15px;
+	margin-top: 2px;
+}
+#profile-youtube-wrapper {
+	float: left;
+	margin-left: 15px;
+	margin-top: 2px;
+}
+#profile-video-wrapper {
+	float: left;
+	margin-left: 15px;
+	margin-top: 2px;
+}
+#profile-audio-wrapper {
+	float: left;
+	margin-left: 15px;
+	margin-top: 2px;
+}
+#profile-location-wrapper {
+	float: left;
+	margin-left: 15px;
+	margin-top: 2px;
+}
+#profile-jot-perms {
+	float: left;
+	margin-left: 45px;
+	margin-top: 2px;
+}
+#jot-preview-link {
+	float: right;
+	margin-left: 10px;
+	margin-top: 2px;
+	font-size: 9px;
+	font-weight: bolder;
+	cursor: pointer;
+}
+#profile-jot-perms{
+   float: right;
+	margin-left: 10px;
+	margin-top: 2px;	
+	}
+/** buttons **/
+.button.creation1 {
+    background-color: #fff;
+    border: 1px solid #777777;
+    border-radius: 3px 3px 3px 3px;
+    box-shadow: 0 1px 1px #CFCFCF;
+    cursor: pointer;
+    font-weight: bolder;
+}
+.button.creation2 {
+    background-color: #FF500F;
+    border: 1px solid #777777;
+    color: white;
+    border-radius: 3px 3px 3px 3px;
+    box-shadow: 0 1px 1px #CFCFCF;
+    margin-left: 5px;
+    cursor: pointer;
+    font-weight: bolder;
+}
+/*input[type="submit"] {
+	background-color: #FF500F;
+    border: 1px solid #777777;
+    color: white;
+    border-radius: 3px 3px 3px 3px;
+    box-shadow: 0 1px 1px #CFCFCF;
+    margin-left: 5px;
+    cursor: pointer;
+    font-weight: bolder;
+}*/
+/** acl **/
+#photo-edit-perms-select, #photos-upload-permissions-wrapper, #profile-jot-acl-wrapper {
+  display: block!important;
+}
+#acl-wrapper {
+  width: 690px;
+  float: left;
+}
+#acl-search {
+  float: right;
+  background: #ffffff url("../../../../images/search_18.png") no-repeat right center;
+  padding-right: 20px;
+}
+#acl-showall {
+  float: left;
+  display: block;
+  width: auto;
+  height: 18px;
+  background-color: #cccccc;
+  background-image: url("../../../../images/show_all_off.png");
+  background-position: 7px 7px;
+  background-repeat: no-repeat;
+  padding: 7px 5px 0px 30px;
+  color: #999999;
+  -moz-border-radius: 5px 5px 5px 5px;
+  -webkit-border-radius: 5px 5px 5px 5px;
+  border-radius: 5px 5px 5px 5px;
+}
+#acl-showall.selected {
+  color: #000000;
+  background-color: #ff9900;
+  background-image: url("../../../../images/show_all_on.png");
+}
+#acl-list {
+  height: 210px;
+  border: 1px solid #cccccc;
+  clear: both;
+  margin-top: 30px;
+  overflow: auto;
+}
+.acl-list-item {
+  display: block;
+  width: 150px;
+  height: 30px;
+  border: 1px solid #cccccc;
+  margin: 5px;
+  float: left;
+}
+.acl-list-item img {
+  width: 22px;
+  height: 22px;
+  float: left;
+  margin: 4px;
+}
+.acl-list-item p {
+  height: 12px;
+  font-size: 10px;
+  margin: 0px;
+  padding: 2px 0px 1px;
+  overflow: hidden;
+}
+.acl-list-item a {
+  font-size: 8px;
+  display: block;
+  width: 40px;
+  height: 10px;
+  float: left;
+  color: #999999;
+  background-color: #cccccc;
+  background-position: 3px 3px;
+  background-repeat: no-repeat;
+  margin-right: 5px;
+  -webkit-border-radius: 2px ;
+  -moz-border-radius: 2px;
+  border-radius: 2px;
+  padding-left: 15px;
+}
+#acl-wrapper a:hover {
+  text-decoration: none;
+  color: #000000;
+}
+.acl-button-show {
+  background-image: url("../../../../images/show_off.png");
+}
+.acl-button-hide {
+  background-image: url("../../../../images/hide_off.png");
+}
+.acl-button-show.selected {
+  color: #000000;
+  background-color: #9ade00;
+  background-image: url("../../../../images/show_on.png");
+}
+.acl-button-hide.selected {
+  color: #000000;
+  background-color: #ff4141;
+  background-image: url("../../../../images/hide_on.png");
+}
+.acl-list-item.groupshow {
+  border-color: #9ade00;
+}
+.acl-list-item.grouphide {
+  border-color: #ff4141;
+}
+/** /acl **/
+/** tab buttons 14618a**/
+/*marker*/
+ul.tabs {
+  list-style-type: none;
+  padding-bottom: 10px;
+  font-size: 13px;
+  width: 805px;
+}
+ul.tabs li {
+  float: left;
+  margin-left: 5px;
+}
+ul.tabs li .active {
+    background-color: #535353;
+    border: 1px solid #777777;
+    color: white;
+    border-radius: 3px 3px 3px 3px;
+    box-shadow: 2px 2px 2px #CFCFCF;
+    margin-left: 5px;
+}
+/**
+ * Form fields
+ */
+.field {
+  margin-bottom: 10px;
+  padding-bottom: 10px;
+  overflow: auto;
+  width: 100%;
+}
+.field label {
+  float: left;
+  width: 200px;
+}
+.field input, .field textarea {
+  width: 400px;
+}
+.field textarea {
+  height: 100px;
+}
+.field .field_help {
+  display: block;
+  margin-left: 200px;
+  color: #666666;
+}
+.field .onoff {
+  float: left;
+  width: 80px;
+}
+.field .onoff a {
+  display: block;
+  border: 1px solid #666666;
+  background-image: url("../../../../images/onoff.jpg");
+  background-repeat: no-repeat;
+  padding: 4px 2px 2px 2px;
+  height: 16px;
+  text-decoration: none;
+}
+.field .onoff .off {
+  border-color: #666666;
+  padding-left: 40px;
+  background-position: left center;
+  background-color: #cccccc;
+  color: #666666;
+  text-align: right;
+}
+.field .onoff .on {
+  border-color: #204A87;
+  padding-right: 40px;
+  background-position: right center;
+  background-color: #D7E3F1;
+  color: #204A87;
+  text-align: left;
+}
+.field .hidden {
+  display: none!important;
+}
+.field.radio .field_help {
+  margin-left: 0px;
+}
+#directory-search-form{
+	margin-bottom: 50px;
+	}
+#profile-edit-links-end {
+        clear: both;
+        margin-bottom: 15px;
+}
+
+#profile-edit-links ul { margin: 20px; padding-bottom: 20px; list-style: none; }
+
+#profile-edit-links li {
+  float: left;
+  list-style: none;
+  margin-left: 10px;
+}
+
+.profile-edit-side-div {
+  display: none;
+}
+
+#register-form label,
+#profile-edit-form label {
+        width: 300px; float: left;
+}
+
+.required {
+  display: inline;
+  color: #B20202;
+}
+
+/* oauth */
+.oauthapp {
+  height: auto;
+  overflow: auto;
+  border-bottom: 2px solid #cccccc;
+  padding-bottom: 1em;
+  margin-bottom: 1em;
+}
+.oauthapp img {
+  float: left;
+  width: 48px;
+  height: 48px;
+  margin: 10px;
+}
+.oauthapp img.noicon {
+  background-image: url("../../../../images/icons/48/plugin.png");
+  background-position: center center;
+  background-repeat: no-repeat;
+}
+.oauthapp a {
+  float: left;
+}
+/* contacts */
+.contact-entry-wrapper {
+  width: 120px;
+  height: 120px;
+  float: left;
+}
+/* photo */
+.photo {
+box-shadow: 2px 2px 5px 0px #000000;
+margin: 0px;
+border-radius: 10px;
+height: 145px !important;
+width: 145px !important;
+}
+.lframe {
+  float: left;
+  /*margin: 0px 10px 10px 0px;*/
+}
+/* profile match wrapper */
+.profile-match-wrapper {
+  float: left;
+  width: 90px;
+  height: 90px;
+  margin-bottom: 20px;
+}
+.profile-match-wrapper .contact-photo {
+  width: 80px;
+  height: 80px;
+}
+.profile-match-wrapper .contact-photo img {
+  width: 80px;
+  height: 80px;
+}
+.profile-match-wrapper {
+  left: 0px;
+  top: 63px;
+}
+
+.contact-photo-menu-button {
+        position: relative;
+        background-image: url("../../../../images/icons/16/menu.png");
+        background-position: top left; 
+        background-repeat: no-repeat;
+        margin: 0px 0px -16px 0px; 
+	padding: 0px;
+        width: 16px;
+        height: 16px;
+        top: -16px; left:0px;
+        overflow: hidden;
+        text-indent: 40px;
+        display: none;
+        
+}
+.contact-photo-menu {
+        width: 11em;
+        border: 3px solid #364e59;
+	color: #2d2d2d;
+        background: #FFFFFF;
+/*        position: absolute;*/
+        position: relative;
+        left: 0px; top: 0px;
+        display: none;
+        z-index: 10000;
+}
+.contact-photo-menu ul { margin:0px; padding: 0px; list-style: none }
+.contact-photo-menu li a {
+	display: block; 
+	padding: 5px 10px; 
+	color: #2d2d2d;
+	text-decoration: none;
+}
+.contact-photo-menu li a:hover {
+	background-color: #bdcdd4; 
+}
+
+/* page footer */
+footer {
+  height: 100px;
+  display: table-row;
+}
+
+blockquote {
+    border-left: 1px solid #D2D2D2;
+    padding-left: 9px;
+    margin: 0 0 0 .8ex;
+	 color: #777;
+}
+.oembed {
+	
+	font-weight: bold;
+}
+.aprofile dt{
+box-shadow: 1px 1px 5px 0;
+    color: #666666;
+    margin: 15px 0 5px;
+    padding-left: 5px;	
+	}
+/* ================== */
+/* = Contacts Block = */
+/* ================== */
+
+.contact-block-img {
+        width: 55px;
+        height: 55px;
+        padding-right: 3px;
+}
+.contact-block-div {
+        float: left;
+}
+
+.contact-block-textdiv { width: 150px; height: 34px; float: left; }
+#contact-block-end { clear: both; } 
+
+#group-edit-wrapper {
+        margin-bottom: 10px;
+}
+
+#group-members-end {
+        clear: both;
+}
+#group-edit-desc {
+ margin-top: 15px;
+}
+
+/*
+#group-separator,
+#prof-separator { display: none;}
+*/
+#prof-members-end{
+	clear: both;
+	}
+
+#prvmail-to-label, #prvmail-subject-label, #prvmail-message-label {
+	margin-bottom: 10px;
+	margin-top: 20px;
+}
+
+#prvmail-submit {
+	float: right;
+	margin-top: 10px;
+}
+
+#prvmail-subject
+{
+background: none repeat scroll 0 0 #FFFFFF;
+border: 1px solid #CCCCCC;
+border-radius: 5px 5px 5px 5px;
+font-weight: bold;
+height: 20px;
+margin: 0 0 5px;
+vertical-align: middle;
+}
+#prvmail-form{
+ width: 597px;	
+	}
+	
+#prvmail-upload-wrapper,
+#prvmail-link-wrapper,
+#prvmail-rotator-wrapper {
+	float: left;
+	margin-top: 10px;
+	margin-right: 10px;
+	width: 24px;
+}
+
+#prvmail-end {
+	clear: both;
+}
+
+.mail-list-sender,
+.mail-list-detail {
+	float: left;
+}
+.mail-list-detail {
+	margin-left: 20px;
+}
+
+.mail-list-subject {
+	font-size: 1.1em;
+	margin-top: 10px;
+}
+a.mail-list-link {
+    display: block;
+    font-size: 1.3em;
+    padding: 4px 0;
+}
+
+/*
+*a.mail-list-link:hover {
+*	background-color: #15607B;
+*	color: #F5F6FB;
+*}
+*/
+
+.mail-list-outside-wrapper-end {
+	clear: both;
+}
+
+.mail-list-outside-wrapper {
+	margin-top: 30px;
+}
+
+.mail-list-delete-wrapper {
+	float: right;
+	margin-right: 30px;
+	margin-top: 15px;
+}
+
+.mail-list-delete-icon {
+	border: none;
+}
+
+.mail-conv-sender,
+.mail-conv-detail {
+	float: left;
+}
+.mail-conv-detail {
+	margin-left: 20px;
+	width: 500px;
+}
+
+.mail-conv-subject {
+    font-size: 1.4em;
+    margin: 10px 0;
+}
+
+.mail-conv-outside-wrapper-end {
+	clear: both;
+}
+
+.mail-conv-outside-wrapper {
+	margin-top: 30px;
+}
+
+.mail-conv-delete-wrapper {
+	float: right;
+	margin-right: 30px;
+	margin-top: 15px;
+}
+.mail-conv-break {
+	clear: both;
+}
+
+.mail-conv-delete-icon {
+	border: none;
+}
+
+/* ========== */
+/* = Events = */
+/* ========== */
+.eventcal {
+        float: left;
+        font-size: 20px;
+}
+
+.vevent {
+
+}
+.vevent .event-description, .vevent .event-location {
+        margin-left: 10px;
+        margin-right: 10px;
+}
+.vevent .event-start {
+        margin-left: 10px;
+        margin-right: 10px;
+}
+
+#new-event-link {
+        margin-bottom: 10px;
+}
+
+.edit-event-link, .plink-event-link {
+        float: left;
+        margin-top: 4px;
+        margin-right: 4px;
+        margin-bottom: 15px;
+}
+
+.event-description:before {
+        content: url('../../../../images/calendar.png');
+        margin-right: 15px;
+}
+
+.event-start, .event-end {
+        margin-left: 10px;
+        width: 330px;
+        clear: both;
+}
+
+.event-start .dtstart, .event-end .dtend {
+        float: right;
+}
+
+.event-list-date {
+        margin-bottom: 10px;
+}
+
+.prevcal, .nextcal {
+        float: left;
+        margin-left: 32px;
+        margin-right: 32px;
+        margin-top: 64px;
+}
+.event-calendar-end {
+        clear: both;
+}
+
+ 
+.calendar {
+        font-family: Courier, monospace;
+}
+.calendar.eventcal a {
+  color: #1872A2;	
+	}
+.today {
+        font-weight: bold;
+        color: #FF0000;
+}
+
+.settings-block {
+        border: 1px solid #AAA;
+        margin: 10px;
+        padding: 10px;
+}
+
+.app-title {
+        margin: 10px;
+}
+
+#identity-manage-desc {
+        margin-top:15px;
+        margin-bottom: 15px;
+}
+
+#identity-manage-choose {
+        margin-bottom: 15px;
+}
+
+#identity-submit {
+        margin-top: 20px;
+}
+
+#photo-prev-link, #photo-next-link {
+        padding: 10px;
+        float: left;
+}
+.lightbox{
+	float: left;
+	}
+
+#photo-photo {
+        float: left;
+}
+#photo-like-div .wall-item-like-buttons {
+	 float: left;
+    margin-right: 5px;
+    margin-top: 30px;
+	}
+.comment-edit-text-empty {
+    margin: 10px 0 0;
+    width: 85%;
+}
+.comment-edit-photo {
+    margin: 10px 0 0;
+}
+.wall-item-like-buttons .icon.like {
+float: left;
+}
+
+#photo-photo-end {
+        clear: both;
+}
+
+.tabs .comment-wwedit-wrapper {
+	display: block;
+   margin-top: 30px;
+   margin-left: 50px;
+	}
+
+.profile-match-photo {
+        float: left;
+        text-align: center;
+        width: 120px;
+}
+
+.profile-match-name {
+        float: left;
+        text-align: center;
+        width: 120px;
+        overflow: hidden;
+}
+
+.profile-match-break,
+.profile-match-end {
+        clear: both;
+}
+
+.profile-match-connect {
+        text-align: center;
+        font-weight: bold;
+}
+
+.profile-match-wrapper {
+        float: left;
+        padding: 10px;
+        width: 120px;
+        height: 120px;
+        scroll: auto;
+}
+#profile-match-wrapper-end {
+        clear: both;
+}
+
+/* ============= */
+/* = Directory = */
+/* ============= */
+/* contacts menu */
+.contact-photo-wrapper {
+  position: relative;
+}
+.contact-photo {
+  width: 48px;
+  height: 48px;
+  overflow: hidden;
+  display: block;
+}
+.contact-photo img {
+  width: 48px;
+  height: 48px;
+}
+.contact-photo-menu-button {
+  display: none;
+  /* position: absolute; */
+  /* position: absolute; */
+  left: 0px;
+  top: -16px;
+}
+.contact-wrapper {
+  float: left;
+  width: 90px;
+  height: 90px;
+  margin-bottom: 15px;
+}
+.contact-wrapper .contact-photo {
+  width: 80px;
+  height: 80px;
+}
+.contact-wrapper .contact-photo img {
+  width: 80px;
+  height: 80px;
+}
+.contact-wrapper .contact-photo-menu-button {
+  left: 0px;
+  top: 63px;
+}
+.directory-item {
+  float: left;
+  width: 200px;
+  height: 200px;
+}
+.directory-item .contact-photo {
+  width: 175px;
+  height: 175px;
+}
+.directory-item .contact-photo img {
+  width: 175px;
+  height: 175px;
+}
+.contact-name {
+  text-align: left;
+  font-weight: bold;
+  font-size: 12px;
+}
+.contact-details {
+  color: #999999;
+}
+#side-bar-photos-albums li{
+list-style-type: disc;
+}
+#side-bar-photos-albums ul li{
+  margin-left: 30px;
+  padding-left: 0px;
+	}
+#side-bar-photos-albums{
+	margin-top: 15px;	
+	}
+.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-album-image-wrapper, .photo-top-image-wrapper {
+  float: left;
+   -moz-box-shadow: 0 0 5px #888;
+   -webkit-box-shadow: 0 0 5px #888;
+   box-shadow: 0 0 5px #888;
+  background-color: #000;
+   -webkit-border-radius: 5px;
+   -moz-border-radius: 5px;
+  border-radius: 5px;
+  padding-bottom: 20px;
+  position: relative;
+  margin: 0 10px 10px 0;
+  width: 200px; height: 140px;
+  overflow: hidden;  
+}
+.photo-top-album-name {
+        width: 100%;
+        position: absolute; 
+        bottom: 0px; 
+        padding-left: 3px;
+        background-color: #EEE;
+}
+.photo-top-album-link{
+  color: #1872A2;
+	}
+.photo-top-album-img{
+	
+	}
+/*.photo-top-image-wrapper {
+        position: relative;
+        float: left;
+        margin-top: 15px;
+        margin-right: 15px;
+        width: 200px; height: 200px; 
+        overflow: hidden; 
+}
+.photo-top-album-name {
+        width: 100%;
+        min-height: 2em;
+        position: absolute; 
+        bottom: 0px; 
+        padding: 0px 3px;
+        padding-top: 0.5em;
+        background-color: rgb(255, 255, 255);
+}*/
+#photo-top-end {
+        clear: both;
+}
+
+#photo-top-links {
+        margin-bottom: 30px;
+        margin-left: 30px;
+}
+
+#photos-upload-newalbum-div {
+        float: left;
+        width: 175px;
+}
+
diff --git a/view/theme/diabook-red/style-network.css b/view/theme/diabook/diabook-red/style-network.css
index c7063860f..84fd5da48 100644
--- a/view/theme/diabook-red/style-network.css
+++ b/view/theme/diabook/diabook-red/style-network.css
@@ -84,61 +84,61 @@
 /* icons */
 
 .icon.contacts {
-  background-image: url("../../../view/theme/diabook-red/icons/contacts.png");}
+  background-image: url("../diabook-red/icons/contacts.png");}
 .icon.notifications {
-  background-image: url("../../../view/theme/diabook-red/icons/notifications.png");}
+  background-image: url("../diabook-red/icons/notifications.png");}
 .icon.notify {
-  background-image: url("../../../view/theme/diabook-red/icons/notify.png");}
+  background-image: url("../diabook-red/icons/notify.png");}
 .icon.messages {
-  background-image: url("../../../view/theme/diabook-red/icons/messages.png");}
+  background-image: url("../diabook-red/icons/messages.png");}
 .icon.community {
-  background-image: url("../../../view/theme/diabook-red/icons/community.png");}
+  background-image: url("../diabook-red/icons/community.png");}
   
-.icon.drop 	{ background-image: url("../../../view/theme/diabook-red/icons/drop.png");}
-.icon.drophide 	{ background-image: url("../../../view/theme/diabook-red/icons/drop.png");}
-.icon.dislike 	{ background-image: url("../../../view/theme/diabook-red/icons/dislike.png");}
-.icon.like 	{ background-image: url("../../../view/theme/diabook-red/icons/like.png");}
-.icon.pencil 	{ background-image: url("../../../view/theme/diabook-red/icons/pencil.png");}
-.icon.recycle 	{ background-image: url("../../../view/theme/diabook-red/icons/recycle.png");}
-.icon.remote-link { background-image: url("../../../view/theme/diabook-red/icons/remote.png");}
-.icon.tagged    { background-image: url("../../../view/theme/diabook-red/icons/tagged.png");}
-.icon.file-as { background-image: url("../../../view/theme/diabook-red/icons/file_as.png");}
-.star-item.icon.unstarred { background-image: url("../../../view/theme/diabook-red/icons/unstarred.png");}
-.star-item.icon.starred { background-image: url("../../../view/theme/diabook-red/icons/starred.png");}
-.icon.link		{ background-image: url("../../../view/theme/diabook-red/icons/link.png");}
-.icon.lock		{ background-image: url("../../../view/theme/diabook-red/icons/lock.png");}
-.icon.unlock		{ background-image: url("../../../view/theme/diabook-red/icons/unlock.png");}
-.icon.language    { background-image: url("../../../view/theme/diabook-red/icons/language.png");}
-
-
-.camera 	{ background-image: url("../../../view/theme/diabook-red/icons/camera.png"); 
+.icon.drop 	{ background-image: url("../diabook-red/icons/drop.png");}
+.icon.drophide 	{ background-image: url("../diabook-red/icons/drop.png");}
+.icon.dislike 	{ background-image: url("../diabook-red/icons/dislike.png");}
+.icon.like 	{ background-image: url("../diabook-red/icons/like.png");}
+.icon.pencil 	{ background-image: url("../diabook-red/icons/pencil.png");}
+.icon.recycle 	{ background-image: url("../diabook-red/icons/recycle.png");}
+.icon.remote-link { background-image: url("../diabook-red/icons/remote.png");}
+.icon.tagged    { background-image: url("../diabook-red/icons/tagged.png");}
+.icon.file-as { background-image: url("../diabook-red/icons/file_as.png");}
+.star-item.icon.unstarred { background-image: url("../diabook-red/icons/unstarred.png");}
+.star-item.icon.starred { background-image: url("../diabook-red/icons/starred.png");}
+.icon.link		{ background-image: url("../diabook-red/icons/link.png");}
+.icon.lock		{ background-image: url("../diabook-red/icons/lock.png");}
+.icon.unlock		{ background-image: url("../diabook-red/icons/unlock.png");}
+.icon.language    { background-image: url("../diabook-red/icons/language.png");}
+
+
+.camera 	{ background-image: url("../diabook-red/icons/camera.png"); 
 			  display: block; width: 28px; height: 28px; background-repeat: no-repeat;
 			  }
-.attach 	{ background-image: url("../../../view/theme/diabook-red/icons/attach.png"); 
+.attach 	{ background-image: url("../diabook-red/icons/attach.png"); 
 			  display: block; width: 28px; height: 28px; background-repeat: no-repeat;
 			  }
-.video2 	{ background-image: url("../../../view/theme/diabook-red/icons/video.png"); 
+.video2 	{ background-image: url("../diabook-red/icons/video.png"); 
 			  display: block; width: 28px; height: 28px; background-repeat: no-repeat;
 			  }	
-.video 	{ background-image: url("../../../view/theme/diabook-red/icons/video.png"); 
-			  display: block; width: 100%; height: 28px; background-repeat: no-repeat;
+.video 	{ background-image: url("../diabook-red/icons/video.png"); 
+			  display: block; width: 100%; height: 140px; background-repeat: no-repeat;
 			  }
-.audio2 	{ background-image: url("../../../view/theme/diabook-red/icons/audio.png"); 
+.audio2 	{ background-image: url("../diabook-red/icons/audio.png"); 
 			  display: block; width: 28px; height: 28px; background-repeat: no-repeat;
 			  }
-.audio 	{ background-image: url("../../../view/theme/diabook-red/icons/audio.png"); 
+.audio 	{ background-image: url("../diabook-red/icons/audio.png"); 
 			  display: block; width: 28px; height: 28px; background-repeat: no-repeat;
 			  }
-.weblink 	{ background-image: url("../../../view/theme/diabook-red/icons/weblink.png"); 
+.weblink 	{ background-image: url("../diabook-red/icons/weblink.png"); 
 			  display: block; width: 28px; height: 28px; background-repeat: no-repeat;
 			  }
-.globe 	{ background-image: url("../../../view/theme/diabook-red/icons/globe.png"); 
+.globe 	{ background-image: url("../diabook-red/icons/globe.png"); 
 			  display: block; width: 28px; height: 28px; background-repeat: no-repeat;
 			  }
-.unglobe 	{ background-image: url("../../../view/theme/diabook-red/icons/unglobe.png"); 
+.unglobe 	{ background-image: url("../diabook-red/icons/unglobe.png"); 
 			  display: block; width: 28px; height: 28px; background-repeat: no-repeat;
 			  }
-.edit    {background-image: url("../../../view/theme/diabook-red/icons/pencil2.png"); 
+.edit    {background-image: url("../diabook-red/icons/pencil2.png"); 
 			  display: block; width: 28px; height: 28px; background-repeat: no-repeat;}
 			  
 			  
@@ -176,15 +176,15 @@
 /*.language       { background-position: -210px -40px;}*/
 
 
-.icon.on             { background-image: url("../../../view/theme/diabook-red/icons/toogle_on.png"); background-repeat: no-repeat;}
-.icon.off            { background-image: url("../../../view/theme/diabook-red/icons/toogle_off.png"); background-repeat: no-repeat;}
+.icon.on             { background-image: url("../diabook-red/icons/toogle_on.png"); background-repeat: no-repeat;}
+.icon.off            { background-image: url("../diabook-red/icons/toogle_off.png"); background-repeat: no-repeat;}
 .prev           { background-position: -90px  -60px;}
 .next           { background-position: -110px -60px;}
 /*.tagged     { background-position: -130px -60px;}*/
 
 .attachtype {
         display: block; width: 20px; height: 23px;
-        background-image: url('../../../images/content-types.png');
+        background-image: url('../../../../images/content-types.png');
 }
 
 .type-video { background-position: 0px 0px; }
@@ -215,12 +215,12 @@
 }
 
 .icon.border.camera{
-  background-image: url("../../../view/theme/diabook-red/icons/camera.png"); 
+  background-image: url("../diabook-red/icons/camera.png"); 
   display: block; width: 28px; height: 28px; background-repeat: no-repeat;
 	}
 	
 .icon.border.link{
-  background-image: url("../../../view/theme/diabook-red/icons/weblink.png"); 
+  background-image: url("../diabook-red/icons/weblink.png"); 
   display: block; width: 28px; height: 28px; background-repeat: no-repeat;
   margin-left: 10px;
 	}
@@ -233,34 +233,34 @@
   height: 10px;
 }
 .icon.s10.notify {
-  background-image: url("../../../images/icons/10/notify_off.png");
+  background-image: url("../../../../images/icons/10/notify_off.png");
 }
 .icon.s10.gear {
-  background-image: url("../../../images/icons/10/gear.png");
+  background-image: url("../../../../images/icons/10/gear.png");
 }
 .icon.s10.add {
-  background-image: url("../../../images/icons/10/add.png");
+  background-image: url("../../../../images/icons/10/add.png");
 }
 .icon.s10.delete {
-  background-image: url("../../../images/icons/10/delete.png");
+  background-image: url("../../../../images/icons/10/delete.png");
 }
 .icon.s10.edit {
-  background-image: url("../../../images/icons/10/edit.png");
+  background-image: url("../../../../images/icons/10/edit.png");
 }
 .icon.s10.star {
-  background-image: url("../../../images/star_dummy.png");
+  background-image: url("../../../../images/star_dummy.png");
 }
 .icon.s10.menu {
-  background-image: url("../../../images/icons/10/menu.png");
+  background-image: url("../../../../images/icons/10/menu.png");
 }
 .icon.s10.link {
-  background-image: url("../../../images/icons/10/link.png");
+  background-image: url("../../../../images/icons/10/link.png");
 }
 .icon.s10.lock {
-  background-image: url("../../../images/icons/10/lock.png");
+  background-image: url("../../../../images/icons/10/lock.png");
 }
 .icon.s10.unlock {
-  background-image: url("../../../images/icons/10/unlock.png");
+  background-image: url("../../../../images/icons/10/unlock.png");
 }
 .icon.s10.text {
   padding: 2px 0px 0px 15px;
@@ -271,34 +271,34 @@
   height: 16px;
 }
 .icon.s16.notify {
-  background-image: url("../../../images/icons/16/notify_off.png");
+  background-image: url("../../../../images/icons/16/notify_off.png");
 }
 .icon.s16.gear {
-  background-image: url("../../../images/icons/16/gear.png");
+  background-image: url("../../../../images/icons/16/gear.png");
 }
 .icon.s16.add {
-  background-image: url("../../../images/icons/16/add.png");
+  background-image: url("../../../../images/icons/16/add.png");
 }
 .icon.s16.delete {
-  background-image: url("../../../images/icons/16/delete.png");
+  background-image: url("../../../../images/icons/16/delete.png");
 }
 /*.icon.s16.edit {
-  background-image: url("../../../images/icons/16/edit.png");
+  background-image: url("../../../../images/icons/16/edit.png");
 }*/
 .icon.s16.star {
-  background-image: url("../../../images/star_dummy.png");
+  background-image: url("../../../../images/star_dummy.png");
 }
 .icon.s16.menu {
-  background-image: url("../../../images/icons/16/menu.png");
+  background-image: url("../../../../images/icons/16/menu.png");
 }
 /*.icon.s16.link {
-  background-image: url("../../../images/icons/16/link.png");
+  background-image: url("../../../../images/icons/16/link.png");
 }*/
 .icon.s16.lock {
-  background-image: url("../../../images/icons/16/lock.png");
+  background-image: url("../../../../images/icons/16/lock.png");
 }
 .icon.s16.unlock {
-  background-image: url("../../../images/icons/16/unlock.png");
+  background-image: url("../../../../images/icons/16/unlock.png");
 }
 .icon.s16.text {
   padding: 4px 0px 0px 20px;
@@ -309,34 +309,34 @@
   height: 22px;
 }
 .icon.s22.notify {
-  background-image: url("../../../images/icons/22/notify_off.png");
+  background-image: url("../../../../images/icons/22/notify_off.png");
 }
 .icon.s22.gear {
-  background-image: url("../../../images/icons/22/gear.png");
+  background-image: url("../../../../images/icons/22/gear.png");
 }
 .icon.s22.add {
-  background-image: url("../../../images/icons/22/add.png");
+  background-image: url("../../../../images/icons/22/add.png");
 }
 .icon.s22.delete {
-  background-image: url("../../../images/icons/22/delete.png");
+  background-image: url("../../../../images/icons/22/delete.png");
 }
 .icon.s22.edit {
-  background-image: url("../../../images/icons/22/edit.png");
+  background-image: url("../../../../images/icons/22/edit.png");
 }
 .icon.s22.star {
-  background-image: url("../../../images/star_dummy.png");
+  background-image: url("../../../../images/star_dummy.png");
 }
 .icon.s22.menu {
-  background-image: url("../../../images/icons/22/menu.png");
+  background-image: url("../../../../images/icons/22/menu.png");
 }
 .icon.s22.link {
-  background-image: url("../../../images/icons/22/link.png");
+  background-image: url("../../../../images/icons/22/link.png");
 }
 .icon.s22.lock {
-  background-image: url("../../../images/icons/22/lock.png");
+  background-image: url("../../../../images/icons/22/lock.png");
 }
 .icon.s22.unlock {
-  background-image: url("../../../images/icons/22/unlock.png");
+  background-image: url("../../../../images/icons/22/unlock.png");
 }
 .icon.s22.text {
   padding: 10px 0px 0px 25px;
@@ -347,34 +347,34 @@
   height: 48px;
 }
 .icon.s48.notify {
-  background-image: url("../../../images/icons/48/notify_off.png");
+  background-image: url("../../../../images/icons/48/notify_off.png");
 }
 .icon.s48.gear {
-  background-image: url("../../../images/icons/48/gear.png");
+  background-image: url("../../../../images/icons/48/gear.png");
 }
 .icon.s48.add {
-  background-image: url("../../../images/icons/48/add.png");
+  background-image: url("../../../../images/icons/48/add.png");
 }
 .icon.s48.delete {
-  background-image: url("../../../images/icons/48/delete.png");
+  background-image: url("../../../../images/icons/48/delete.png");
 }
 .icon.s48.edit {
-  background-image: url("../../../images/icons/48/edit.png");
+  background-image: url("../../../../images/icons/48/edit.png");
 }
 .icon.s48.star {
-  background-image: url("../../../images/star_dummy.png");
+  background-image: url("../../../../images/star_dummy.png");
 }
 .icon.s48.menu {
-  background-image: url("../../../images/icons/48/menu.png");
+  background-image: url("../../../../images/icons/48/menu.png");
 }
 .icon.s48.link {
-  background-image: url("../../../images/icons/48/link.png");
+  background-image: url("../../../../images/icons/48/link.png");
 }
 .icon.s48.lock {
-  background-image: url("../../../images/icons/48/lock.png");
+  background-image: url("../../../../images/icons/48/lock.png");
 }
 .icon.s48.unlock {
-  background-image: url("../../../images/icons/48/unlock.png");
+  background-image: url("../../../../images/icons/48/unlock.png");
 }
 
 #contact-edit-links ul {
@@ -482,8 +482,9 @@ code {
 }
 #saved-search-ul .tool:hover,
 #nets-sidebar .tool:hover,
-#sidebar-group-list .tool:hover {
-	background: #EEE;
+#sidebar-group-list .tool:hover,
+#fileas-sidebar .tool:hover {
+	background: #FFE499;
 }
 .tool .label {
   float: left;
@@ -499,12 +500,12 @@ code {
 }
 /* popup notifications */
 div.jGrowl div.notice {
-  background: #511919 url("../../../images/icons/48/notice.png") no-repeat 5px center;
+  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;
+  background: #364e59 url("../../../../images/icons/48/info.png") no-repeat 5px center;
   color: #ffffff;
   padding-left: 58px;
 }
@@ -529,6 +530,7 @@ background-image: -o-linear-gradient(bottom, rgb(173,59,10) 0%, rgb(255,79,15) 6
 background-image: -moz-linear-gradient(bottom, rgb(173,59,10) 0%, rgb(255,79,15) 65%);
 background-image: -webkit-linear-gradient(bottom, rgb(173,59,10) 0%, rgb(255,79,15) 65%);
 background-image: -ms-linear-gradient(bottom, rgb(173,59,10) 0%, rgb(255,79,15) 65%);
+filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#ad3b0a', endColorstr='#ff4f0f');
 
 background-image: -webkit-gradient(
 	linear,
@@ -772,15 +774,15 @@ nav #nav-site-linkmenu .menu-popup {
 }
 
 nav #nav-messages-linkmenu.on .icon.messages, nav #nav-messages-linkmenu.selected .icon.messages{
-	background-image: url("../../../view/theme/diabook-red/icons/messages2.png");
+	background-image: url("../diabook-red/icons/messages2.png");
 	}
 	
 /*nav #nav-notifications-linkmenu.on .icon.notify,*/ nav #nav-notifications-linkmenu.selected .icon.notify{
-	background-image: url("../../../view/theme/diabook-red/icons/notify2.png");
+	background-image: url("../diabook-red/icons/notify2.png");
 	}
 	
 nav #nav-contacts-linkmenu.on .icon.contacts, nav #nav-contacts-linkmenu.selected .icon.contacts{
-	background-image: url("../../../view/theme/diabook-red/icons/contacts2.png");
+	background-image: url("../diabook-red/icons/contacts2.png");
 	}
 	
 nav #nav-apps-link.selected {
@@ -940,44 +942,57 @@ ul.menu-popup .empty {
 	}
 .menu-profile-list{
   height: auto;
-  overflow: auto;
-  padding-top: 3px;
-  padding-bottom: 3px;
-  padding-left: 16px;
+  overflow: auto;  
   min-height: 16px;
   list-style: none;
 	}
 .menu-profile-list:hover{
-	background: #EEE;
+	background: #FFE499; 
 	}
 .menu-profile-list-item{
 	padding-left: 5px;
+	vertical-align: middle;
 	}	
 .menu-profile-list-item:hover{	
 	text-decoration: none;
    }
 /*http://prothemedesign.com/circular-icons/*/
-.menu-profile-list.home{
-	background: url("../../../view/theme/diabook-red/icons/home.png") no-repeat;
-	}
-.menu-profile-list.photos{
-	background: url("../../../view/theme/diabook-red/icons/mess_side.png") no-repeat;
-	}
-.menu-profile-list.events{
-	background: url("../../../view/theme/diabook-red/icons/events.png") no-repeat;
-	}
-.menu-profile-list.notes{
-	background: url("../../../view/theme/diabook-red/icons/notes.png") no-repeat;
-	}
-.menu-profile-list.foren{
-	background: url("../../../view/theme/diabook-red/icons/pubgroups.png") no-repeat;
-	}
-.menu-profile-list.com_side{
-	background: url("../../../view/theme/diabook-red/icons/com_side.png") no-repeat;
-	}
-.menu-profile-list.pscontacts{
-	background: url("../../../view/theme/diabook-red/icons/pscontacts.png") no-repeat;
+.menu-profile-icon.home{
+	background: url("../diabook-red/icons/home.png") no-repeat;
+	float: left;
+	height: 22px;
+	width: 22px;
 	}
+.menu-profile-icon.photos{
+	background: url("../diabook-red/icons/mess_side.png") no-repeat;
+	float: left;
+	height: 22px;
+   width: 22px;}
+.menu-profile-icon.events{
+	background: url("../diabook-red/icons/events.png") no-repeat;
+	float: left;
+	height: 22px;
+   width: 22px;}
+.menu-profile-icon.notes{
+	background: url("../diabook-red/icons/notes.png") no-repeat;
+	float: left;
+	height: 22px;
+   width: 22px;}
+.menu-profile-icon.foren{
+	background: url("../diabook-red/icons/pubgroups.png") no-repeat;
+	float: left;
+	height: 22px;
+   width: 22px;}
+.menu-profile-icon.com_side{
+	background: url("../diabook-red/icons/com_side.png") no-repeat;
+	float: left;
+	height: 22px;
+   width: 22px;}
+.menu-profile-icon.pscontacts{
+	background: url("../diabook-red/icons/pscontacts.png") no-repeat;
+	float: left;
+	height: 22px;
+   width: 22px;}
 /* aside */
 aside {
   display: table-cell;
@@ -1028,7 +1043,7 @@ aside #dfrn-request-link {
   -webkit-border-radius: 5px 5px 5px 5px;
   border-radius: 5px 5px 5px 5px;
   color: #ffffff;
-  background: #005c94 url('../../../images/connect-bg.png') no-repeat left center;
+  background: #005c94 url('../../../../images/connect-bg.png') no-repeat left center;
   font-weight: bold;
   text-transform: uppercase;
   padding: 4px 2px 2px 35px;
@@ -1049,6 +1064,10 @@ aside #search-text {
 border-top-right-radius: 15px;
 border-bottom-right-radius: 15px;
 border-bottom-left-radius: 15px;
+-moz-border-bottom-colors: #dbdbdb;
+  -moz-border-top-colors: #999;
+  -moz-border-left-colors: #999;
+  -moz-border-right-colors: #dbdbdb;
 }
 aside #side-follow-url {
 	width: 150px;
@@ -1155,11 +1174,11 @@ list-style-type: disc;
   color: #1872A2;
 }
 .widget .tool.selected {
-  background: url("../../../view/theme/diabook-red/icons/selected.png") no-repeat left center;
+  background: url("../diabook-red/icons/selected.png") no-repeat left center;
 }
 /* widget: search */
 span.sbox_l  {
-	background: white url('../../../view/theme/diabook/icons/srch_l.gif') no-repeat top left;
+	background: white url('../diabook/icons/srch_l.gif') no-repeat top left;
 	float: left;
 	width: 19px; height: 19px;
 	margin-left: 10px;
@@ -1168,14 +1187,14 @@ span.sbox_l  {
 }
 
 span.sbox_r  {
-	background: white url('../../../view/theme/diabook/icons/srch_r.gif') no-repeat top left;
+	background: white url('../diabook/icons/srch_r.gif') no-repeat top left;
 	float: left;
 	width: 19px; height: 19px;
 	margin-top: 5px;
 }
 
 span.sbox input {
-	background: white url('../../../view/theme/diabook/icons/srch_bg.gif') repeat-x top left;
+	background: white url('../diabook/icons/srch_bg.gif') repeat-x top left;
 	float: left;
 	margin-top: 5px;
 	border: 0;
@@ -1198,10 +1217,14 @@ section {
 
 body .pageheader{
   text-align: center;
-  margin-top: 25px;
-  font-size: 0px;
+  font-size: 20px;
+  margin-bottom: 20px;
+  margin-top: 0px;
+  max-width: 575px;
+	}
+.qcomment{
+  max-width: 122px;	
 	}
-
 #id_username {
   width: 173px;	
 	}
@@ -1229,7 +1252,6 @@ body .pageheader{
     padding: 0;
  }
 .tab.button {
-    margin-right: 5px; 
     margin-left: 5px;	
     /*background: none repeat scroll 0 0 #F8F8F8;*/
     border: 1px solid #CCCCCC;
@@ -1253,7 +1275,7 @@ right_aside {
   /* background: #F1F1F1; */
 }
 right_aside a{color: red;}
-right_aside h3 {border-bottom: 1px solid #D2D2D2; padding-top: 5px; padding-bottom: 0px; padding-left: 5px; margin-bottom: 0px; 
+right_aside h3 {border-bottom: 1px solid #D2D2D2; padding-top: 5px; padding-bottom: 0px; padding-left: 9px; margin-bottom: 0px; 
 margin-top:30px;}
 right_aside .directory-item {	width: 50px; height: 50px; vertical-align: center; text-align: center; }
 right_aside .directory-photo { margin: 0px; }
@@ -1267,13 +1289,13 @@ right_aside #ra-photos-wrapper { padding-left: 5px; padding-top: 3px; overflow:
 #page-sidebar-right_aside .label {max-width: 128px;}
 right_aside .icon {width: 10px; height: 10px;}
 .close_box		{ 
-		background-image: url("../../../view/theme/diabook-red/icons/close_box.png");
+		background-image: url("../diabook-red/icons/close_box.png");
 		float: right;
 		cursor: pointer;
 		opacity: 0.1;
 		}
 .close_box:hover	{ 
-		background-image: url("../../../view/theme/diabook-red/icons/close_box.png");
+		background-image: url("../diabook-red/icons/close_box.png");
 		float: right;
 		cursor: pointer;
 		opacity: 1;
@@ -1291,6 +1313,7 @@ transition: all 0.2s ease-in-out;
   padding: 5px;
   margin-bottom: 0px;
   width: 575px;
+  padding-top: 10px;
 }
 .tread-wrapper a{
   color: red;
@@ -1357,14 +1380,16 @@ transition: all 0.2s ease-in-out;
 }
 
 .wall-item-container .wall-item-content {
-  font-size: 12.5px;
+
   max-width: 420px;
   word-wrap: break-word;
-  line-height: 1.2;
+
+
 }
 
 .wall-item-container .wall-item-content img {
   max-width: 400px; 
+
 }
 .wall-item-container .wall-item-links, .wall-item-container .wall-item-actions {
   display: table-cell;
@@ -1426,7 +1451,7 @@ transition: all 0.2s ease-in-out;
   width: 32px;
   height: 32px;
   margin-left: 16px;
-  /*background: url(../../../images/icons/22/user.png) no-repeat center center;*/
+  /*background: url(../../../../images/icons/22/user.png) no-repeat center center;*/
 
 }
 .wall-item-container.comment {
@@ -1438,7 +1463,7 @@ transition: all 0.2s ease-in-out;
 }
 
 .wall-item-comment-wrapper {
-  margin: 1px 0px 0px 80px;
+  margin: 1px 5px 5px 80px;
   background-color: #fff;
   width: 500px;
 }
@@ -1461,15 +1486,15 @@ transition: all 0.2s ease-in-out;
   border: 1px solid #2d2d2d;
 }
 .comment-edit-preview {
-  width: 710px;
-  border: 1px solid #2d2d2d;
+  width: 500px;
   margin-top: 10px;
+  background-color:  #fff797;
 }
 .comment-edit-preview .contact-photo {
   width: 32px;
   height: 32px;
   margin-left: 16px;
-  /*background: url(../../../images/icons/22/user.png) no-repeat center center;*/
+  /*background: url(../../../../images/icons/22/user.png) no-repeat center center;*/
 
 }
 .comment-edit-preview {
@@ -1506,14 +1531,14 @@ transition: all 0.2s ease-in-out;
   padding-bottom: 2px;
 }
 .tag {
-  /*background: url("../../../images/tag_b.png") repeat-x center left;*/
+  /*background: url("../../../../images/tag_b.png") repeat-x center left;*/
   color: #999;
   padding-left: 3px;
   font-size: 12px;
 }
 .tag a {
   padding-right: 5px;
-  /*background: url("../../../images/tag.png") no-repeat center right;*/
+  /*background: url("../../../../images/tag.png") no-repeat center right;*/
   color: #999;
 }
 .wwto {
@@ -1609,6 +1634,11 @@ transition: all 0.2s ease-in-out;
   padding: 0.3em;
   margin-bottom: 10px;
 }
+.grey
+{
+  display: inline;
+  float: right;	
+	}
 #jot #jot-tools {
   margin: 0px;
   padding: 0px;
@@ -1694,7 +1724,7 @@ transition: all 0.2s ease-in-out;
     height: 20px;
     margin: 0 0 5px;
     width: 60%;
-    border: 1px solid #ffffff;
+    border: 1px solid #d2d2d2;
 }
 #profile-jot-form #jot-title:-webkit-input-placeholder {
   font-weight: normal;
@@ -1849,7 +1879,7 @@ transition: all 0.2s ease-in-out;
 }
 #acl-search {
   float: right;
-  background: #ffffff url("../../../images/search_18.png") no-repeat right center;
+  background: #ffffff url("../../../../images/search_18.png") no-repeat right center;
   padding-right: 20px;
 }
 #acl-showall {
@@ -1858,7 +1888,7 @@ transition: all 0.2s ease-in-out;
   width: auto;
   height: 18px;
   background-color: #cccccc;
-  background-image: url("../../../images/show_all_off.png");
+  background-image: url("../../../../images/show_all_off.png");
   background-position: 7px 7px;
   background-repeat: no-repeat;
   padding: 7px 5px 0px 30px;
@@ -1870,7 +1900,7 @@ transition: all 0.2s ease-in-out;
 #acl-showall.selected {
   color: #000000;
   background-color: #ff9900;
-  background-image: url("../../../images/show_all_on.png");
+  background-image: url("../../../../images/show_all_on.png");
 }
 #acl-list {
   height: 210px;
@@ -1921,20 +1951,20 @@ transition: all 0.2s ease-in-out;
   color: #000000;
 }
 .acl-button-show {
-  background-image: url("../../../images/show_off.png");
+  background-image: url("../../../../images/show_off.png");
 }
 .acl-button-hide {
-  background-image: url("../../../images/hide_off.png");
+  background-image: url("../../../../images/hide_off.png");
 }
 .acl-button-show.selected {
   color: #000000;
   background-color: #9ade00;
-  background-image: url("../../../images/show_on.png");
+  background-image: url("../../../../images/show_on.png");
 }
 .acl-button-hide.selected {
   color: #000000;
   background-color: #ff4141;
-  background-image: url("../../../images/hide_on.png");
+  background-image: url("../../../../images/hide_on.png");
 }
 .acl-list-item.groupshow {
   border-color: #9ade00;
@@ -1992,7 +2022,7 @@ ul.tabs li .active {
 .field .onoff a {
   display: block;
   border: 1px solid #666666;
-  background-image: url("../../../images/onoff.jpg");
+  background-image: url("../../../../images/onoff.jpg");
   background-repeat: no-repeat;
   padding: 4px 2px 2px 2px;
   height: 16px;
@@ -2065,7 +2095,7 @@ ul.tabs li .active {
   margin: 10px;
 }
 .oauthapp img.noicon {
-  background-image: url("../../../images/icons/48/plugin.png");
+  background-image: url("../../../../images/icons/48/plugin.png");
   background-position: center center;
   background-repeat: no-repeat;
 }
@@ -2081,9 +2111,10 @@ ul.tabs li .active {
 /* photo */
 .photo {
 box-shadow: 2px 2px 5px 0px #000000;
-margin: 2px 5px 2px 5px;
-max-height: 85%;
-max-width: 85%;
+margin: 0px;
+border-radius: 10px;
+height: 145px !important;
+width: 145px !important;
 }
 .lframe {
   float: left;
@@ -2111,7 +2142,7 @@ max-width: 85%;
 
 .contact-photo-menu-button {
         position: relative;
-        background-image: url("../../../images/icons/16/menu.png");
+        background-image: url("../../../../images/icons/16/menu.png");
         background-position: top left; 
         background-repeat: no-repeat;
         margin: 0px 0px -16px 0px; 
@@ -2156,6 +2187,11 @@ blockquote {
     border-left: 1px solid #D2D2D2;
     padding-left: 9px;
     margin: 0 0 0 .8ex;
+	 color: #777;
+}
+.oembed {
+	
+	font-weight: bold;
 }
 .aprofile dt{
 box-shadow: 1px 1px 5px 0;
@@ -2194,6 +2230,9 @@ box-shadow: 1px 1px 5px 0;
 #group-separator,
 #prof-separator { display: none;}
 */
+#prof-members-end{
+	clear: both;
+	}
 
 #prvmail-to-label, #prvmail-subject-label, #prvmail-message-label {
 	margin-bottom: 10px;
@@ -2319,7 +2358,7 @@ a.mail-list-link {
 }
 
 .vevent {
-        border: 1px solid #CCCCCC;
+
 }
 .vevent .event-description, .vevent .event-location {
         margin-left: 10px;
@@ -2342,7 +2381,7 @@ a.mail-list-link {
 }
 
 .event-description:before {
-        content: url('../../../images/calendar.png');
+        content: url('../../../../images/calendar.png');
         margin-right: 15px;
 }
 
diff --git a/view/theme/diabook-red/style-settings.css b/view/theme/diabook/diabook-red/style-profile-wide.css
index 9407c68f9..acb6075f7 100644
--- a/view/theme/diabook-red/style-settings.css
+++ b/view/theme/diabook/diabook-red/style-profile-wide.css
@@ -84,61 +84,61 @@
 /* icons */
 
 .icon.contacts {
-  background-image: url("../../../view/theme/diabook-red/icons/contacts.png");}
+  background-image: url("../diabook-red/icons/contacts.png");}
 .icon.notifications {
-  background-image: url("../../../view/theme/diabook-red/icons/notifications.png");}
+  background-image: url("../diabook-red/icons/notifications.png");}
 .icon.notify {
-  background-image: url("../../../view/theme/diabook-red/icons/notify.png");}
+  background-image: url("../diabook-red/icons/notify.png");}
 .icon.messages {
-  background-image: url("../../../view/theme/diabook-red/icons/messages.png");}
+  background-image: url("../diabook-red/icons/messages.png");}
 .icon.community {
-  background-image: url("../../../view/theme/diabook-red/icons/community.png");}
+  background-image: url("../diabook-red/icons/community.png");}
   
-.icon.drop 	{ background-image: url("../../../view/theme/diabook-red/icons/drop.png");}
-.icon.drophide 	{ background-image: url("../../../view/theme/diabook-red/icons/drop.png");}
-.icon.dislike 	{ background-image: url("../../../view/theme/diabook-red/icons/dislike.png");}
-.icon.like 	{ background-image: url("../../../view/theme/diabook-red/icons/like.png");}
-.icon.pencil 	{ background-image: url("../../../view/theme/diabook-red/icons/pencil.png");}
-.icon.recycle 	{ background-image: url("../../../view/theme/diabook-red/icons/recycle.png");}
-.icon.remote-link { background-image: url("../../../view/theme/diabook-red/icons/remote.png");}
-.icon.tagged    { background-image: url("../../../view/theme/diabook-red/icons/tagged.png");}
-.icon.file-as { background-image: url("../../../view/theme/diabook-red/icons/file_as.png");}
-.star-item.icon.unstarred { background-image: url("../../../view/theme/diabook-red/icons/unstarred.png");}
-.star-item.icon.starred { background-image: url("../../../view/theme/diabook-red/icons/starred.png");}
-.icon.link		{ background-image: url("../../../view/theme/diabook-red/icons/link.png");}
-.icon.lock		{ background-image: url("../../../view/theme/diabook-red/icons/lock.png");}
-.icon.unlock		{ background-image: url("../../../view/theme/diabook-red/icons/unlock.png");}
-.icon.language    { background-image: url("../../../view/theme/diabook-red/icons/language.png");}
-
-
-.camera 	{ background-image: url("../../../view/theme/diabook-red/icons/camera.png"); 
+.icon.drop 	{ background-image: url("../diabook-red/icons/drop.png");}
+.icon.drophide 	{ background-image: url("../diabook-red/icons/drop.png");}
+.icon.dislike 	{ background-image: url("../diabook-red/icons/dislike.png");}
+.icon.like 	{ background-image: url("../diabook-red/icons/like.png");}
+.icon.pencil 	{ background-image: url("../diabook-red/icons/pencil.png");}
+.icon.recycle 	{ background-image: url("../diabook-red/icons/recycle.png");}
+.icon.remote-link { background-image: url("../diabook-red/icons/remote.png");}
+.icon.tagged    { background-image: url("../diabook-red/icons/tagged.png");}
+.icon.file-as { background-image: url("../diabook-red/icons/file_as.png");}
+.star-item.icon.unstarred { background-image: url("../diabook-red/icons/unstarred.png");}
+.star-item.icon.starred { background-image: url("../diabook-red/icons/starred.png");}
+.icon.link		{ background-image: url("../diabook-red/icons/link.png");}
+.icon.lock		{ background-image: url("../diabook-red/icons/lock.png");}
+.icon.unlock		{ background-image: url("../diabook-red/icons/unlock.png");}
+.icon.language    { background-image: url("../diabook-red/icons/language.png");}
+
+
+.camera 	{ background-image: url("../diabook-red/icons/camera.png"); 
 			  display: block; width: 28px; height: 28px; background-repeat: no-repeat;
 			  }
-.attach 	{ background-image: url("../../../view/theme/diabook-red/icons/attach.png"); 
+.attach 	{ background-image: url("../diabook-red/icons/attach.png"); 
 			  display: block; width: 28px; height: 28px; background-repeat: no-repeat;
 			  }
-.video2 	{ background-image: url("../../../view/theme/diabook-red/icons/video.png"); 
+.video2 	{ background-image: url("../diabook-red/icons/video.png"); 
 			  display: block; width: 28px; height: 28px; background-repeat: no-repeat;
 			  }	
-.video 	{ background-image: url("../../../view/theme/diabook-red/icons/video.png"); 
-			  display: block; width: 100%; height: 28px; background-repeat: no-repeat;
+.video 	{ background-image: url("../diabook-red/icons/video.png"); 
+			  display: block; width: 100%; height: 140px; background-repeat: no-repeat;
 			  }
-.audio2 	{ background-image: url("../../../view/theme/diabook-red/icons/audio.png"); 
+.audio2 	{ background-image: url("../diabook-red/icons/audio.png"); 
 			  display: block; width: 28px; height: 28px; background-repeat: no-repeat;
 			  }
-.audio 	{ background-image: url("../../../view/theme/diabook-red/icons/audio.png"); 
+.audio 	{ background-image: url("../diabook-red/icons/audio.png"); 
 			  display: block; width: 28px; height: 28px; background-repeat: no-repeat;
 			  }
-.weblink 	{ background-image: url("../../../view/theme/diabook-red/icons/weblink.png"); 
+.weblink 	{ background-image: url("../diabook-red/icons/weblink.png"); 
 			  display: block; width: 28px; height: 28px; background-repeat: no-repeat;
 			  }
-.globe 	{ background-image: url("../../../view/theme/diabook-red/icons/globe.png"); 
+.globe 	{ background-image: url("../diabook-red/icons/globe.png"); 
 			  display: block; width: 28px; height: 28px; background-repeat: no-repeat;
 			  }
-.unglobe 	{ background-image: url("../../../view/theme/diabook-red/icons/unglobe.png"); 
+.unglobe 	{ background-image: url("../diabook-red/icons/unglobe.png"); 
 			  display: block; width: 28px; height: 28px; background-repeat: no-repeat;
 			  }
-.edit    {background-image: url("../../../view/theme/diabook-red/icons/pencil2.png"); 
+.edit    {background-image: url("../diabook-red/icons/pencil2.png"); 
 			  display: block; width: 28px; height: 28px; background-repeat: no-repeat;}
 			  
 			  
@@ -176,15 +176,15 @@
 /*.language       { background-position: -210px -40px;}*/
 
 
-.icon.on             { background-image: url("../../../view/theme/diabook-red/icons/toogle_on.png"); background-repeat: no-repeat;}
-.icon.off            { background-image: url("../../../view/theme/diabook-red/icons/toogle_off.png"); background-repeat: no-repeat;}
+.icon.on             { background-image: url("../diabook-red/icons/toogle_on.png"); background-repeat: no-repeat;}
+.icon.off            { background-image: url("../diabook-red/icons/toogle_off.png"); background-repeat: no-repeat;}
 .prev           { background-position: -90px  -60px;}
 .next           { background-position: -110px -60px;}
 /*.tagged     { background-position: -130px -60px;}*/
 
 .attachtype {
         display: block; width: 20px; height: 23px;
-        background-image: url('../../../images/content-types.png');
+        background-image: url('../../../../images/content-types.png');
 }
 
 .type-video { background-position: 0px 0px; }
@@ -215,12 +215,12 @@
 }
 
 .icon.border.camera{
-  background-image: url("../../../view/theme/diabook-red/icons/camera.png"); 
+  background-image: url("../diabook-red/icons/camera.png"); 
   display: block; width: 28px; height: 28px; background-repeat: no-repeat;
 	}
 	
 .icon.border.link{
-  background-image: url("../../../view/theme/diabook-red/icons/weblink.png"); 
+  background-image: url("../diabook-red/icons/weblink.png"); 
   display: block; width: 28px; height: 28px; background-repeat: no-repeat;
   margin-left: 10px;
 	}
@@ -233,34 +233,34 @@
   height: 10px;
 }
 .icon.s10.notify {
-  background-image: url("../../../images/icons/10/notify_off.png");
+  background-image: url("../../../../images/icons/10/notify_off.png");
 }
 .icon.s10.gear {
-  background-image: url("../../../images/icons/10/gear.png");
+  background-image: url("../../../../images/icons/10/gear.png");
 }
 .icon.s10.add {
-  background-image: url("../../../images/icons/10/add.png");
+  background-image: url("../../../../images/icons/10/add.png");
 }
 .icon.s10.delete {
-  background-image: url("../../../images/icons/10/delete.png");
+  background-image: url("../../../../images/icons/10/delete.png");
 }
 .icon.s10.edit {
-  background-image: url("../../../images/icons/10/edit.png");
+  background-image: url("../../../../images/icons/10/edit.png");
 }
 .icon.s10.star {
-  background-image: url("../../../images/star_dummy.png");
+  background-image: url("../../../../images/star_dummy.png");
 }
 .icon.s10.menu {
-  background-image: url("../../../images/icons/10/menu.png");
+  background-image: url("../../../../images/icons/10/menu.png");
 }
 .icon.s10.link {
-  background-image: url("../../../images/icons/10/link.png");
+  background-image: url("../../../../images/icons/10/link.png");
 }
 .icon.s10.lock {
-  background-image: url("../../../images/icons/10/lock.png");
+  background-image: url("../../../../images/icons/10/lock.png");
 }
 .icon.s10.unlock {
-  background-image: url("../../../images/icons/10/unlock.png");
+  background-image: url("../../../../images/icons/10/unlock.png");
 }
 .icon.s10.text {
   padding: 2px 0px 0px 15px;
@@ -271,34 +271,34 @@
   height: 16px;
 }
 .icon.s16.notify {
-  background-image: url("../../../images/icons/16/notify_off.png");
+  background-image: url("../../../../images/icons/16/notify_off.png");
 }
 .icon.s16.gear {
-  background-image: url("../../../images/icons/16/gear.png");
+  background-image: url("../../../../images/icons/16/gear.png");
 }
 .icon.s16.add {
-  background-image: url("../../../images/icons/16/add.png");
+  background-image: url("../../../../images/icons/16/add.png");
 }
 .icon.s16.delete {
-  background-image: url("../../../images/icons/16/delete.png");
+  background-image: url("../../../../images/icons/16/delete.png");
 }
 /*.icon.s16.edit {
-  background-image: url("../../../images/icons/16/edit.png");
+  background-image: url("../../../../images/icons/16/edit.png");
 }*/
 .icon.s16.star {
-  background-image: url("../../../images/star_dummy.png");
+  background-image: url("../../../../images/star_dummy.png");
 }
 .icon.s16.menu {
-  background-image: url("../../../images/icons/16/menu.png");
+  background-image: url("../../../../images/icons/16/menu.png");
 }
 /*.icon.s16.link {
-  background-image: url("../../../images/icons/16/link.png");
+  background-image: url("../../../../images/icons/16/link.png");
 }*/
 .icon.s16.lock {
-  background-image: url("../../../images/icons/16/lock.png");
+  background-image: url("../../../../images/icons/16/lock.png");
 }
 .icon.s16.unlock {
-  background-image: url("../../../images/icons/16/unlock.png");
+  background-image: url("../../../../images/icons/16/unlock.png");
 }
 .icon.s16.text {
   padding: 4px 0px 0px 20px;
@@ -309,34 +309,34 @@
   height: 22px;
 }
 .icon.s22.notify {
-  background-image: url("../../../images/icons/22/notify_off.png");
+  background-image: url("../../../../images/icons/22/notify_off.png");
 }
 .icon.s22.gear {
-  background-image: url("../../../images/icons/22/gear.png");
+  background-image: url("../../../../images/icons/22/gear.png");
 }
 .icon.s22.add {
-  background-image: url("../../../images/icons/22/add.png");
+  background-image: url("../../../../images/icons/22/add.png");
 }
 .icon.s22.delete {
-  background-image: url("../../../images/icons/22/delete.png");
+  background-image: url("../../../../images/icons/22/delete.png");
 }
 .icon.s22.edit {
-  background-image: url("../../../images/icons/22/edit.png");
+  background-image: url("../../../../images/icons/22/edit.png");
 }
 .icon.s22.star {
-  background-image: url("../../../images/star_dummy.png");
+  background-image: url("../../../../images/star_dummy.png");
 }
 .icon.s22.menu {
-  background-image: url("../../../images/icons/22/menu.png");
+  background-image: url("../../../../images/icons/22/menu.png");
 }
 .icon.s22.link {
-  background-image: url("../../../images/icons/22/link.png");
+  background-image: url("../../../../images/icons/22/link.png");
 }
 .icon.s22.lock {
-  background-image: url("../../../images/icons/22/lock.png");
+  background-image: url("../../../../images/icons/22/lock.png");
 }
 .icon.s22.unlock {
-  background-image: url("../../../images/icons/22/unlock.png");
+  background-image: url("../../../../images/icons/22/unlock.png");
 }
 .icon.s22.text {
   padding: 10px 0px 0px 25px;
@@ -347,34 +347,34 @@
   height: 48px;
 }
 .icon.s48.notify {
-  background-image: url("../../../images/icons/48/notify_off.png");
+  background-image: url("../../../../images/icons/48/notify_off.png");
 }
 .icon.s48.gear {
-  background-image: url("../../../images/icons/48/gear.png");
+  background-image: url("../../../../images/icons/48/gear.png");
 }
 .icon.s48.add {
-  background-image: url("../../../images/icons/48/add.png");
+  background-image: url("../../../../images/icons/48/add.png");
 }
 .icon.s48.delete {
-  background-image: url("../../../images/icons/48/delete.png");
+  background-image: url("../../../../images/icons/48/delete.png");
 }
 .icon.s48.edit {
-  background-image: url("../../../images/icons/48/edit.png");
+  background-image: url("../../../../images/icons/48/edit.png");
 }
 .icon.s48.star {
-  background-image: url("../../../images/star_dummy.png");
+  background-image: url("../../../../images/star_dummy.png");
 }
 .icon.s48.menu {
-  background-image: url("../../../images/icons/48/menu.png");
+  background-image: url("../../../../images/icons/48/menu.png");
 }
 .icon.s48.link {
-  background-image: url("../../../images/icons/48/link.png");
+  background-image: url("../../../../images/icons/48/link.png");
 }
 .icon.s48.lock {
-  background-image: url("../../../images/icons/48/lock.png");
+  background-image: url("../../../../images/icons/48/lock.png");
 }
 .icon.s48.unlock {
-  background-image: url("../../../images/icons/48/unlock.png");
+  background-image: url("../../../../images/icons/48/unlock.png");
 }
 
 #contact-edit-links ul {
@@ -385,7 +385,7 @@
 .hide-comments-outer {
   margin-left: 80px;
   margin-bottom: 5px;
-  width: 484px;
+  width: 675px;
   border-bottom: 1px solid #BDCDD4;
   border-top: 1px solid #BDCDD4;
 
@@ -395,7 +395,7 @@
 /* global */
 body {
   font-family: 'Lato', "Helvetica Neue", Helvetica, Arial, sans-serif;
-  font-size: 12.5px;
+  font-size: 13px;
   background-color: #ffffff;
   color: #2d2d2d;
   margin: 50px auto auto;
@@ -500,12 +500,12 @@ code {
 }
 /* popup notifications */
 div.jGrowl div.notice {
-  background: #511919 url("../../../images/icons/48/notice.png") no-repeat 5px center;
+  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;
+  background: #364e59 url("../../../../images/icons/48/info.png") no-repeat 5px center;
   color: #ffffff;
   padding-left: 58px;
 }
@@ -690,12 +690,13 @@ nav .nav-menu-icon img {
 nav .nav-menu-icon .nav-notify {
   top: 3px;
 }
+/*marker*/
 nav .nav-menu {
   position: relative;
   height: 16px;
   padding: 5px;
   margin: 3px 15px 0px;
-  font-size: 13px;
+  font-size: 15px;
   /*border-bottom: 3px solid #364A84;*/
 }
 nav .nav-menu.selected {
@@ -756,15 +757,15 @@ nav #nav-site-linkmenu .menu-popup {
 }
 
 nav #nav-messages-linkmenu.on .icon.messages, nav #nav-messages-linkmenu.selected .icon.messages{
-	background-image: url("../../../view/theme/diabook-red/icons/messages2.png");
+	background-image: url("../diabook-red/icons/messages2.png");
 	}
 	
 /*nav #nav-notifications-linkmenu.on .icon.notify,*/ nav #nav-notifications-linkmenu.selected .icon.notify{
-	background-image: url("../../../view/theme/diabook-red/icons/notify2.png");
+	background-image: url("../diabook-red/icons/notify2.png");
 	}
 	
 nav #nav-contacts-linkmenu.on .icon.contacts, nav #nav-contacts-linkmenu.selected .icon.contacts{
-	background-image: url("../../../view/theme/diabook-red/icons/contacts2.png");
+	background-image: url("../diabook-red/icons/contacts2.png");
 	}
 	
 nav #nav-apps-link.selected {
@@ -938,37 +939,40 @@ ul.menu-popup .empty {
    }
 /*http://prothemedesign.com/circular-icons/*/
 .menu-profile-list.home{
-	background: url("../../../view/theme/diabook-red/icons/home.png") no-repeat;
+	background: url("../diabook-red/icons/home.png") no-repeat;
 	}
 .menu-profile-list.photos{
-	background: url("../../../view/theme/diabook-red/icons/mess_side.png") no-repeat;
+	background: url("../diabook-red/icons/mess_side.png") no-repeat;
 	}
 .menu-profile-list.events{
-	background: url("../../../view/theme/diabook-red/icons/events.png") no-repeat;
+	background: url("../diabook-red/icons/events.png") no-repeat;
 	}
 .menu-profile-list.notes{
-	background: url("../../../view/theme/diabook-red/icons/notes.png") no-repeat;
+	background: url("../diabook-red/icons/notes.png") no-repeat;
 	}
 .menu-profile-list.foren{
-	background: url("../../../view/theme/diabook-red/icons/pubgroups.png") no-repeat;
+	background: url("../diabook-red/icons/pubgroups.png") no-repeat;
 	}
 .menu-profile-list.com_side{
-	background: url("../../../view/theme/diabook-red/icons/com_side.png") no-repeat;
+	background: url("../diabook-red/icons/com_side.png") no-repeat;
 	}
 
 /* aside */
+/*marker*/
 aside {
   display: table-cell;
   vertical-align: top;
-  width: 200px;
-  padding: 0px 10px 0px 10px;
+  width: 180px;
+  padding: 0px 5px 0px 0px;
   border-right: 1px solid #D2D2D2;
   float: left;
   /* background: #F1F1F1; */
 }
 
-aside .vcard {
-  display: none;
+aside .vcard .fn {
+  font-size: 18px;
+  font-weight: bold;
+  margin-bottom: 5px;
 }
 aside .vcard .title {
   margin-bottom: 5px;
@@ -1004,7 +1008,7 @@ aside #dfrn-request-link {
   -webkit-border-radius: 5px 5px 5px 5px;
   border-radius: 5px 5px 5px 5px;
   color: #ffffff;
-  background: #005c94 url('../../../images/connect-bg.png') no-repeat left center;
+  background: #005c94 url('../../../../images/connect-bg.png') no-repeat left center;
   font-weight: bold;
   text-transform: uppercase;
   padding: 4px 2px 2px 35px;
@@ -1033,7 +1037,8 @@ aside #side-peoplefind-url {
 	width: 150px;
 	}
 #contact-block {
-  display: none;
+  overflow: auto;
+  height: auto;
 }
 #contact-block .contact-block-h4 {
   float: left;
@@ -1067,9 +1072,11 @@ aside #side-peoplefind-url {
 	.action .s16 { width: 16px; overflow: hidden; padding: 0px;}*/
 /*  font-size: 12px; */
 }
+/*marker*/
 .widget h3 {
   padding: 0px;
   margin: 2px;
+  font-size: 1.05em;
 }
 .widget .action {
   opacity: 0.1;
@@ -1130,11 +1137,11 @@ list-style-type: disc;
   color: #1872A2;
 }
 .widget .tool.selected {
-  background: url("../../../view/theme/diabook-red/icons/selected.png") no-repeat left center;
+  background: url("../diabook-red/icons/selected.png") no-repeat left center;
 }
 /* widget: search */
 span.sbox_l  {
-	background: white url('../../../view/theme/diabook/icons/srch_l.gif') no-repeat top left;
+	background: white url('../diabook/icons/srch_l.gif') no-repeat top left;
 	float: left;
 	width: 19px; height: 19px;
 	margin-left: 10px;
@@ -1143,14 +1150,14 @@ span.sbox_l  {
 }
 
 span.sbox_r  {
-	background: white url('../../../view/theme/diabook/icons/srch_r.gif') no-repeat top left;
+	background: white url('../diabook/icons/srch_r.gif') no-repeat top left;
 	float: left;
 	width: 19px; height: 19px;
 	margin-top: 5px;
 }
 
 span.sbox input {
-	background: white url('../../../view/theme/diabook/icons/srch_bg.gif') repeat-x top left;
+	background: white url('../diabook/icons/srch_bg.gif') repeat-x top left;
 	float: left;
 	margin-top: 5px;
 	border: 0;
@@ -1167,16 +1174,20 @@ span.sbox input {
 section {
   display: table-cell;
   vertical-align: top;
-  width: 650px;
-  padding: 0px 0px 0px 20px;
+  width: 611px;
+  padding: 0px 0px 0px 12px;
 }
 
 body .pageheader{
   text-align: center;
-  margin-top: 25px;
-  font-size: 0px;
+  font-size: 20px;
+  margin-bottom: 20px;
+  margin-top: 0px;
+  max-width: 575px;
+	}
+.qcomment{
+  max-width: 122px;	
 	}
-
 #id_username {
   width: 173px;	
 	}
@@ -1196,41 +1207,39 @@ body .pageheader{
 	display: block;
 }	
 
-.tabs {display: none;}
-.tab.button{display: none;}
-.rs_tabs {
+.tabs {
     
     background-position: 0 -20px;
     background-repeat: repeat-x;
     height: 27px;
     padding: 0;
  }
-.rs_tab.button {	
+.tab.button {
+    margin-left: 5px;	
     /*background: none repeat scroll 0 0 #F8F8F8;*/
     border: 1px solid #CCCCCC;
     border-radius: 3px 3px 3px 3px;
-    font-weight: bolder;
+    font-weight: normal;
     padding: 3px;
     color:  #333333;
-    text-decoration: none;
 	}
-
 	
 #birthday-notice, #event-notice, #birthday-wrapper, #event-wrapper{
 	margin-bottom: 10px;
 	}
 
+/*marker*/
 right_aside {
   display: table-cell;
   vertical-align: top;
-  width: 170px;
-  /*padding-right: 10px;*/
+  width: 180px;
   /*border-left: 1px solid #D2D2D2;*/
   
   /* background: #F1F1F1; */
 }
 right_aside a{color: red;}
-right_aside h3 {border-bottom: 1px solid #D2D2D2; padding-top: 5px; padding-bottom: 0px; padding-left: 5px; margin-bottom: 0px; 
+/*marker*/
+right_aside h3 {font-size: 1.05em; border-bottom: 1px solid #D2D2D2; padding-top: 5px; padding-bottom: 0px; padding-left: 9px; margin-bottom: 0px; 
 margin-top:30px;}
 right_aside .directory-item {	width: 50px; height: 50px; vertical-align: center; text-align: center; }
 right_aside .directory-photo { margin: 0px; }
@@ -1244,13 +1253,13 @@ right_aside #ra-photos-wrapper { padding-left: 5px; padding-top: 3px; overflow:
 #page-sidebar-right_aside .label {max-width: 128px;}
 right_aside .icon {width: 10px; height: 10px;}
 .close_box		{ 
-		background-image: url("../../../view/theme/diabook-red/icons/close_box.png");
+		background-image: url("../diabook-red/icons/close_box.png");
 		float: right;
 		cursor: pointer;
 		opacity: 0.1;
 		}
 .close_box:hover	{ 
-		background-image: url("../../../view/theme/diabook-red/icons/close_box.png");
+		background-image: url("../diabook-red/icons/close_box.png");
 		float: right;
 		cursor: pointer;
 		opacity: 1;
@@ -1261,27 +1270,30 @@ right_aside .icon {width: 10px; height: 10px;}
 transition: all 0.2s ease-in-out;
 		}
 /* wall item */
+/*marker*/
 .tread-wrapper {
   border-bottom: 1px solid #D2D2D2;
   position: relative;
   padding: 5px;
   margin-bottom: 0px;
-  width: 575px;
+  width: 775px;
+  padding-top: 10px;
 }
 .tread-wrapper a{
   color: red;
 }
 
+/*marker*/
 .wall-item-decor {
   position: absolute;
-  left: 790px;
+  left: 780px;
   top: -10px;
   width: 16px;
 }
-
+/*marker*/
 .wall-item-container {
   display: table;
-  width: 580px;
+  width: 770px;
 }
 
 
@@ -1332,15 +1344,18 @@ transition: all 0.2s ease-in-out;
   margin-bottom: 5px;
 }
 
+/*marker*/
 .wall-item-container .wall-item-content {
-  font-size: 12.5px;
-  max-width: 420px;
+
+  max-width: 690px;
   word-wrap: break-word;
-  line-height: 1.2;
-}
 
+
+}
+/*marker*/
 .wall-item-container .wall-item-content img {
-  max-width: 400px;
+
+
 }
 .wall-item-container .wall-item-links, .wall-item-container .wall-item-actions {
   display: table-cell;
@@ -1391,18 +1406,19 @@ transition: all 0.2s ease-in-out;
 .wall-item-container .wall-item-actions-tools input {
   float: right;
 }
+/*marker*/
 .wall-item-container.comment {
   margin-top: 5px;
   margin-bottom: 5px;
   margin-left: 80px;
-  width: 500px;
+  width: 690px;
   border-bottom: 1px solid hsl(198, 21%, 79%);
 }
 .wall-item-container.comment .contact-photo {
   width: 32px;
   height: 32px;
   margin-left: 16px;
-  /*background: url(../../../images/icons/22/user.png) no-repeat center center;*/
+  /*background: url(../../../../images/icons/22/user.png) no-repeat center center;*/
 
 }
 .wall-item-container.comment {
@@ -1413,7 +1429,7 @@ transition: all 0.2s ease-in-out;
   padding-left: 12px;
 }
 .wall-item-comment-wrapper {
-  margin: 1px 5px 1px 80px;
+  margin: 1px 5px 5px 80px;
 }
 .wall-item-comment-wrapper .comment-edit-photo {
   display: none;
@@ -1434,15 +1450,15 @@ transition: all 0.2s ease-in-out;
   border: 1px solid #2d2d2d;
 }
 .comment-edit-preview {
-  width: 710px;
-  border: 1px solid #2d2d2d;
+  width: 500px;
   margin-top: 10px;
+  background-color:  #fff797;
 }
 .comment-edit-preview .contact-photo {
   width: 32px;
   height: 32px;
   margin-left: 16px;
-  /*background: url(../../../images/icons/22/user.png) no-repeat center center;*/
+  /*background: url(../../../../images/icons/22/user.png) no-repeat center center;*/
 
 }
 .comment-edit-preview {
@@ -1479,14 +1495,14 @@ transition: all 0.2s ease-in-out;
   padding-bottom: 2px;
 }
 .tag {
-  /*background: url("../../../images/tag_b.png") repeat-x center left;*/
+  /*background: url("../../../../images/tag_b.png") repeat-x center left;*/
   color: #999;
   padding-left: 3px;
   font-size: 12px;
 }
 .tag a {
   padding-right: 5px;
-  /*background: url("../../../images/tag.png") no-repeat center right;*/
+  /*background: url("../../../../images/tag.png") no-repeat center right;*/
   color: #999;
 }
 .wwto {
@@ -1582,6 +1598,11 @@ transition: all 0.2s ease-in-out;
   padding: 0.3em;
   margin-bottom: 10px;
 }
+.grey
+{
+  display: inline;
+  float: right;	
+	}
 #jot #jot-tools {
   margin: 0px;
   padding: 0px;
@@ -1667,7 +1688,7 @@ transition: all 0.2s ease-in-out;
     height: 20px;
     margin: 0 0 5px;
     width: 60%;
-    border: 1px solid #ffffff;
+    border: 1px solid #d2d2d2;
 }
 #profile-jot-form #jot-title:-webkit-input-placeholder {
   font-weight: normal;
@@ -1709,14 +1730,15 @@ transition: all 0.2s ease-in-out;
 	cursor: pointer;
 	margin-top: 2px;
 }
+/*marker*/
 #profile-jot-wrapper{
-	margin: 0 2em 20px 0;
-   width: 585px;
+	margin: 0 20px 20px 0;
+   width: 785px;
 	}
-
+/*marker*/
 #profile-jot-submit-wrapper {
 	margin-bottom: 50px;
-	width: 585px;
+	width: 785px;
 }
 
 #profile-jot-submit {
@@ -1821,7 +1843,7 @@ transition: all 0.2s ease-in-out;
 }
 #acl-search {
   float: right;
-  background: #ffffff url("../../../images/search_18.png") no-repeat right center;
+  background: #ffffff url("../../../../images/search_18.png") no-repeat right center;
   padding-right: 20px;
 }
 #acl-showall {
@@ -1830,7 +1852,7 @@ transition: all 0.2s ease-in-out;
   width: auto;
   height: 18px;
   background-color: #cccccc;
-  background-image: url("../../../images/show_all_off.png");
+  background-image: url("../../../../images/show_all_off.png");
   background-position: 7px 7px;
   background-repeat: no-repeat;
   padding: 7px 5px 0px 30px;
@@ -1842,7 +1864,7 @@ transition: all 0.2s ease-in-out;
 #acl-showall.selected {
   color: #000000;
   background-color: #ff9900;
-  background-image: url("../../../images/show_all_on.png");
+  background-image: url("../../../../images/show_all_on.png");
 }
 #acl-list {
   height: 210px;
@@ -1893,20 +1915,20 @@ transition: all 0.2s ease-in-out;
   color: #000000;
 }
 .acl-button-show {
-  background-image: url("../../../images/show_off.png");
+  background-image: url("../../../../images/show_off.png");
 }
 .acl-button-hide {
-  background-image: url("../../../images/hide_off.png");
+  background-image: url("../../../../images/hide_off.png");
 }
 .acl-button-show.selected {
   color: #000000;
   background-color: #9ade00;
-  background-image: url("../../../images/show_on.png");
+  background-image: url("../../../../images/show_on.png");
 }
 .acl-button-hide.selected {
   color: #000000;
   background-color: #ff4141;
-  background-image: url("../../../images/hide_on.png");
+  background-image: url("../../../../images/hide_on.png");
 }
 .acl-list-item.groupshow {
   border-color: #9ade00;
@@ -1916,23 +1938,24 @@ transition: all 0.2s ease-in-out;
 }
 /** /acl **/
 /** tab buttons 14618a**/
-ul.rs_tabs {
+/*marker*/
+ul.tabs {
   list-style-type: none;
-
-  font-size: 11px;
+  padding-bottom: 10px;
+  font-size: 13px;
+  width: 805px;
 }
-ul.rs_tabs li {
+ul.tabs li {
   float: left;
-  margin-bottom: 30px;
-  clear: both;
+  margin-left: 5px;
 }
-ul.rs_tabs li .active {
+ul.tabs li .active {
     background-color: #535353;
     border: 1px solid #777777;
     color: white;
     border-radius: 3px 3px 3px 3px;
     box-shadow: 2px 2px 2px #CFCFCF;
-    font-size: 13px;
+    margin-left: 5px;
 }
 /**
  * Form fields
@@ -1965,7 +1988,7 @@ ul.rs_tabs li .active {
 .field .onoff a {
   display: block;
   border: 1px solid #666666;
-  background-image: url("../../../images/onoff.jpg");
+  background-image: url("../../../../images/onoff.jpg");
   background-repeat: no-repeat;
   padding: 4px 2px 2px 2px;
   height: 16px;
@@ -2038,7 +2061,7 @@ ul.rs_tabs li .active {
   margin: 10px;
 }
 .oauthapp img.noicon {
-  background-image: url("../../../images/icons/48/plugin.png");
+  background-image: url("../../../../images/icons/48/plugin.png");
   background-position: center center;
   background-repeat: no-repeat;
 }
@@ -2054,9 +2077,10 @@ ul.rs_tabs li .active {
 /* photo */
 .photo {
 box-shadow: 2px 2px 5px 0px #000000;
-margin: 2px 5px 2px 5px;
-max-height: 85%;
-max-width: 85%;
+margin: 0px;
+border-radius: 10px;
+height: 145px !important;
+width: 145px !important;
 }
 .lframe {
   float: left;
@@ -2084,14 +2108,14 @@ max-width: 85%;
 
 .contact-photo-menu-button {
         position: relative;
-        background-image: url("../../../images/icons/16/menu.png");
+        background-image: url("../../../../images/icons/16/menu.png");
         background-position: top left; 
         background-repeat: no-repeat;
         margin: 0px 0px -16px 0px; 
 	padding: 0px;
         width: 16px;
         height: 16px;
-        top: -20px; left:0px;
+        top: -16px; left:0px;
         overflow: hidden;
         text-indent: 40px;
         display: none;
@@ -2129,6 +2153,11 @@ blockquote {
     border-left: 1px solid #D2D2D2;
     padding-left: 9px;
     margin: 0 0 0 .8ex;
+	 color: #777;
+}
+.oembed {
+	
+	font-weight: bold;
 }
 .aprofile dt{
 box-shadow: 1px 1px 5px 0;
@@ -2167,6 +2196,9 @@ box-shadow: 1px 1px 5px 0;
 #group-separator,
 #prof-separator { display: none;}
 */
+#prof-members-end{
+	clear: both;
+	}
 
 #prvmail-to-label, #prvmail-subject-label, #prvmail-message-label {
 	margin-bottom: 10px;
@@ -2292,7 +2324,7 @@ a.mail-list-link {
 }
 
 .vevent {
-        border: 1px solid #CCCCCC;
+
 }
 .vevent .event-description, .vevent .event-location {
         margin-left: 10px;
@@ -2315,7 +2347,7 @@ a.mail-list-link {
 }
 
 .event-description:before {
-        content: url('../../../images/calendar.png');
+        content: url('../../../../images/calendar.png');
         margin-right: 15px;
 }
 
@@ -2470,8 +2502,8 @@ float: left;
   display: none;
   /* position: absolute; */
   /* position: absolute; */
-  left: -2px;
-  top: -20px;
+  left: 0px;
+  top: -16px;
 }
 .contact-wrapper {
   float: left;
diff --git a/view/theme/diabook-red/style-profile.css b/view/theme/diabook/diabook-red/style-profile.css
index 5124ed8c0..a29eb3eb0 100644
--- a/view/theme/diabook-red/style-profile.css
+++ b/view/theme/diabook/diabook-red/style-profile.css
@@ -84,61 +84,61 @@
 /* icons */
 
 .icon.contacts {
-  background-image: url("../../../view/theme/diabook-red/icons/contacts.png");}
+  background-image: url("../diabook-red/icons/contacts.png");}
 .icon.notifications {
-  background-image: url("../../../view/theme/diabook-red/icons/notifications.png");}
+  background-image: url("../diabook-red/icons/notifications.png");}
 .icon.notify {
-  background-image: url("../../../view/theme/diabook-red/icons/notify.png");}
+  background-image: url("../diabook-red/icons/notify.png");}
 .icon.messages {
-  background-image: url("../../../view/theme/diabook-red/icons/messages.png");}
+  background-image: url("../diabook-red/icons/messages.png");}
 .icon.community {
-  background-image: url("../../../view/theme/diabook-red/icons/community.png");}
+  background-image: url("../diabook-red/icons/community.png");}
   
-.icon.drop 	{ background-image: url("../../../view/theme/diabook-red/icons/drop.png");}
-.icon.drophide 	{ background-image: url("../../../view/theme/diabook-red/icons/drop.png");}
-.icon.dislike 	{ background-image: url("../../../view/theme/diabook-red/icons/dislike.png");}
-.icon.like 	{ background-image: url("../../../view/theme/diabook-red/icons/like.png");}
-.icon.pencil 	{ background-image: url("../../../view/theme/diabook-red/icons/pencil.png");}
-.icon.recycle 	{ background-image: url("../../../view/theme/diabook-red/icons/recycle.png");}
-.icon.remote-link { background-image: url("../../../view/theme/diabook-red/icons/remote.png");}
-.icon.tagged    { background-image: url("../../../view/theme/diabook-red/icons/tagged.png");}
-.icon.file-as { background-image: url("../../../view/theme/diabook-red/icons/file_as.png");}
-.star-item.icon.unstarred { background-image: url("../../../view/theme/diabook-red/icons/unstarred.png");}
-.star-item.icon.starred { background-image: url("../../../view/theme/diabook-red/icons/starred.png");}
-.icon.link		{ background-image: url("../../../view/theme/diabook-red/icons/link.png");}
-.icon.lock		{ background-image: url("../../../view/theme/diabook-red/icons/lock.png");}
-.icon.unlock		{ background-image: url("../../../view/theme/diabook-red/icons/unlock.png");}
-.icon.language    { background-image: url("../../../view/theme/diabook-red/icons/language.png");}
-
-
-.camera 	{ background-image: url("../../../view/theme/diabook-red/icons/camera.png"); 
+.icon.drop 	{ background-image: url("../diabook-red/icons/drop.png");}
+.icon.drophide 	{ background-image: url("../diabook-red/icons/drop.png");}
+.icon.dislike 	{ background-image: url("../diabook-red/icons/dislike.png");}
+.icon.like 	{ background-image: url("../diabook-red/icons/like.png");}
+.icon.pencil 	{ background-image: url("../diabook-red/icons/pencil.png");}
+.icon.recycle 	{ background-image: url("../diabook-red/icons/recycle.png");}
+.icon.remote-link { background-image: url("../diabook-red/icons/remote.png");}
+.icon.tagged    { background-image: url("../diabook-red/icons/tagged.png");}
+.icon.file-as { background-image: url("../diabook-red/icons/file_as.png");}
+.star-item.icon.unstarred { background-image: url("../diabook-red/icons/unstarred.png");}
+.star-item.icon.starred { background-image: url("../diabook-red/icons/starred.png");}
+.icon.link		{ background-image: url("../diabook-red/icons/link.png");}
+.icon.lock		{ background-image: url("../diabook-red/icons/lock.png");}
+.icon.unlock		{ background-image: url("../diabook-red/icons/unlock.png");}
+.icon.language    { background-image: url("../diabook-red/icons/language.png");}
+
+
+.camera 	{ background-image: url("../diabook-red/icons/camera.png"); 
 			  display: block; width: 28px; height: 28px; background-repeat: no-repeat;
 			  }
-.attach 	{ background-image: url("../../../view/theme/diabook-red/icons/attach.png"); 
+.attach 	{ background-image: url("../diabook-red/icons/attach.png"); 
 			  display: block; width: 28px; height: 28px; background-repeat: no-repeat;
 			  }
-.video2 	{ background-image: url("../../../view/theme/diabook-red/icons/video.png"); 
+.video2 	{ background-image: url("../diabook-red/icons/video.png"); 
 			  display: block; width: 28px; height: 28px; background-repeat: no-repeat;
 			  }	
-.video 	{ background-image: url("../../../view/theme/diabook-red/icons/video.png"); 
-			  display: block; width: 100%; height: 28px; background-repeat: no-repeat;
+.video 	{ background-image: url("../diabook-red/icons/video.png"); 
+			  display: block; width: 100%; height: 140px; background-repeat: no-repeat;
 			  }
-.audio2 	{ background-image: url("../../../view/theme/diabook-red/icons/audio.png"); 
+.audio2 	{ background-image: url("../diabook-red/icons/audio.png"); 
 			  display: block; width: 28px; height: 28px; background-repeat: no-repeat;
 			  }
-.audio 	{ background-image: url("../../../view/theme/diabook-red/icons/audio.png"); 
+.audio 	{ background-image: url("../diabook-red/icons/audio.png"); 
 			  display: block; width: 28px; height: 28px; background-repeat: no-repeat;
 			  }
-.weblink 	{ background-image: url("../../../view/theme/diabook-red/icons/weblink.png"); 
+.weblink 	{ background-image: url("../diabook-red/icons/weblink.png"); 
 			  display: block; width: 28px; height: 28px; background-repeat: no-repeat;
 			  }
-.globe 	{ background-image: url("../../../view/theme/diabook-red/icons/globe.png"); 
+.globe 	{ background-image: url("../diabook-red/icons/globe.png"); 
 			  display: block; width: 28px; height: 28px; background-repeat: no-repeat;
 			  }
-.unglobe 	{ background-image: url("../../../view/theme/diabook-red/icons/unglobe.png"); 
+.unglobe 	{ background-image: url("../diabook-red/icons/unglobe.png"); 
 			  display: block; width: 28px; height: 28px; background-repeat: no-repeat;
 			  }
-.edit    {background-image: url("../../../view/theme/diabook-red/icons/pencil2.png"); 
+.edit    {background-image: url("../diabook-red/icons/pencil2.png"); 
 			  display: block; width: 28px; height: 28px; background-repeat: no-repeat;}
 			  
 			  
@@ -176,15 +176,15 @@
 /*.language       { background-position: -210px -40px;}*/
 
 
-.icon.on             { background-image: url("../../../view/theme/diabook-red/icons/toogle_on.png"); background-repeat: no-repeat;}
-.icon.off            { background-image: url("../../../view/theme/diabook-red/icons/toogle_off.png"); background-repeat: no-repeat;}
+.icon.on             { background-image: url("../diabook-red/icons/toogle_on.png"); background-repeat: no-repeat;}
+.icon.off            { background-image: url("../diabook-red/icons/toogle_off.png"); background-repeat: no-repeat;}
 .prev           { background-position: -90px  -60px;}
 .next           { background-position: -110px -60px;}
 /*.tagged     { background-position: -130px -60px;}*/
 
 .attachtype {
         display: block; width: 20px; height: 23px;
-        background-image: url('../../../images/content-types.png');
+        background-image: url('../../../../images/content-types.png');
 }
 
 .type-video { background-position: 0px 0px; }
@@ -215,12 +215,12 @@
 }
 
 .icon.border.camera{
-  background-image: url("../../../view/theme/diabook-red/icons/camera.png"); 
+  background-image: url("../diabook-red/icons/camera.png"); 
   display: block; width: 28px; height: 28px; background-repeat: no-repeat;
 	}
 	
 .icon.border.link{
-  background-image: url("../../../view/theme/diabook-red/icons/weblink.png"); 
+  background-image: url("../diabook-red/icons/weblink.png"); 
   display: block; width: 28px; height: 28px; background-repeat: no-repeat;
   margin-left: 10px;
 	}
@@ -233,34 +233,34 @@
   height: 10px;
 }
 .icon.s10.notify {
-  background-image: url("../../../images/icons/10/notify_off.png");
+  background-image: url("../../../../images/icons/10/notify_off.png");
 }
 .icon.s10.gear {
-  background-image: url("../../../images/icons/10/gear.png");
+  background-image: url("../../../../images/icons/10/gear.png");
 }
 .icon.s10.add {
-  background-image: url("../../../images/icons/10/add.png");
+  background-image: url("../../../../images/icons/10/add.png");
 }
 .icon.s10.delete {
-  background-image: url("../../../images/icons/10/delete.png");
+  background-image: url("../../../../images/icons/10/delete.png");
 }
 .icon.s10.edit {
-  background-image: url("../../../images/icons/10/edit.png");
+  background-image: url("../../../../images/icons/10/edit.png");
 }
 .icon.s10.star {
-  background-image: url("../../../images/star_dummy.png");
+  background-image: url("../../../../images/star_dummy.png");
 }
 .icon.s10.menu {
-  background-image: url("../../../images/icons/10/menu.png");
+  background-image: url("../../../../images/icons/10/menu.png");
 }
 .icon.s10.link {
-  background-image: url("../../../images/icons/10/link.png");
+  background-image: url("../../../../images/icons/10/link.png");
 }
 .icon.s10.lock {
-  background-image: url("../../../images/icons/10/lock.png");
+  background-image: url("../../../../images/icons/10/lock.png");
 }
 .icon.s10.unlock {
-  background-image: url("../../../images/icons/10/unlock.png");
+  background-image: url("../../../../images/icons/10/unlock.png");
 }
 .icon.s10.text {
   padding: 2px 0px 0px 15px;
@@ -271,34 +271,34 @@
   height: 16px;
 }
 .icon.s16.notify {
-  background-image: url("../../../images/icons/16/notify_off.png");
+  background-image: url("../../../../images/icons/16/notify_off.png");
 }
 .icon.s16.gear {
-  background-image: url("../../../images/icons/16/gear.png");
+  background-image: url("../../../../images/icons/16/gear.png");
 }
 .icon.s16.add {
-  background-image: url("../../../images/icons/16/add.png");
+  background-image: url("../../../../images/icons/16/add.png");
 }
 .icon.s16.delete {
-  background-image: url("../../../images/icons/16/delete.png");
+  background-image: url("../../../../images/icons/16/delete.png");
 }
 /*.icon.s16.edit {
-  background-image: url("../../../images/icons/16/edit.png");
+  background-image: url("../../../../images/icons/16/edit.png");
 }*/
 .icon.s16.star {
-  background-image: url("../../../images/star_dummy.png");
+  background-image: url("../../../../images/star_dummy.png");
 }
 .icon.s16.menu {
-  background-image: url("../../../images/icons/16/menu.png");
+  background-image: url("../../../../images/icons/16/menu.png");
 }
 /*.icon.s16.link {
-  background-image: url("../../../images/icons/16/link.png");
+  background-image: url("../../../../images/icons/16/link.png");
 }*/
 .icon.s16.lock {
-  background-image: url("../../../images/icons/16/lock.png");
+  background-image: url("../../../../images/icons/16/lock.png");
 }
 .icon.s16.unlock {
-  background-image: url("../../../images/icons/16/unlock.png");
+  background-image: url("../../../../images/icons/16/unlock.png");
 }
 .icon.s16.text {
   padding: 4px 0px 0px 20px;
@@ -309,34 +309,34 @@
   height: 22px;
 }
 .icon.s22.notify {
-  background-image: url("../../../images/icons/22/notify_off.png");
+  background-image: url("../../../../images/icons/22/notify_off.png");
 }
 .icon.s22.gear {
-  background-image: url("../../../images/icons/22/gear.png");
+  background-image: url("../../../../images/icons/22/gear.png");
 }
 .icon.s22.add {
-  background-image: url("../../../images/icons/22/add.png");
+  background-image: url("../../../../images/icons/22/add.png");
 }
 .icon.s22.delete {
-  background-image: url("../../../images/icons/22/delete.png");
+  background-image: url("../../../../images/icons/22/delete.png");
 }
 .icon.s22.edit {
-  background-image: url("../../../images/icons/22/edit.png");
+  background-image: url("../../../../images/icons/22/edit.png");
 }
 .icon.s22.star {
-  background-image: url("../../../images/star_dummy.png");
+  background-image: url("../../../../images/star_dummy.png");
 }
 .icon.s22.menu {
-  background-image: url("../../../images/icons/22/menu.png");
+  background-image: url("../../../../images/icons/22/menu.png");
 }
 .icon.s22.link {
-  background-image: url("../../../images/icons/22/link.png");
+  background-image: url("../../../../images/icons/22/link.png");
 }
 .icon.s22.lock {
-  background-image: url("../../../images/icons/22/lock.png");
+  background-image: url("../../../../images/icons/22/lock.png");
 }
 .icon.s22.unlock {
-  background-image: url("../../../images/icons/22/unlock.png");
+  background-image: url("../../../../images/icons/22/unlock.png");
 }
 .icon.s22.text {
   padding: 10px 0px 0px 25px;
@@ -347,34 +347,34 @@
   height: 48px;
 }
 .icon.s48.notify {
-  background-image: url("../../../images/icons/48/notify_off.png");
+  background-image: url("../../../../images/icons/48/notify_off.png");
 }
 .icon.s48.gear {
-  background-image: url("../../../images/icons/48/gear.png");
+  background-image: url("../../../../images/icons/48/gear.png");
 }
 .icon.s48.add {
-  background-image: url("../../../images/icons/48/add.png");
+  background-image: url("../../../../images/icons/48/add.png");
 }
 .icon.s48.delete {
-  background-image: url("../../../images/icons/48/delete.png");
+  background-image: url("../../../../images/icons/48/delete.png");
 }
 .icon.s48.edit {
-  background-image: url("../../../images/icons/48/edit.png");
+  background-image: url("../../../../images/icons/48/edit.png");
 }
 .icon.s48.star {
-  background-image: url("../../../images/star_dummy.png");
+  background-image: url("../../../../images/star_dummy.png");
 }
 .icon.s48.menu {
-  background-image: url("../../../images/icons/48/menu.png");
+  background-image: url("../../../../images/icons/48/menu.png");
 }
 .icon.s48.link {
-  background-image: url("../../../images/icons/48/link.png");
+  background-image: url("../../../../images/icons/48/link.png");
 }
 .icon.s48.lock {
-  background-image: url("../../../images/icons/48/lock.png");
+  background-image: url("../../../../images/icons/48/lock.png");
 }
 .icon.s48.unlock {
-  background-image: url("../../../images/icons/48/unlock.png");
+  background-image: url("../../../../images/icons/48/unlock.png");
 }
 
 #contact-edit-links ul {
@@ -500,12 +500,12 @@ code {
 }
 /* popup notifications */
 div.jGrowl div.notice {
-  background: #511919 url("../../../images/icons/48/notice.png") no-repeat 5px center;
+  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;
+  background: #364e59 url("../../../../images/icons/48/info.png") no-repeat 5px center;
   color: #ffffff;
   padding-left: 58px;
 }
@@ -756,15 +756,15 @@ nav #nav-site-linkmenu .menu-popup {
 }
 
 nav #nav-messages-linkmenu.on .icon.messages, nav #nav-messages-linkmenu.selected .icon.messages{
-	background-image: url("../../../view/theme/diabook-red/icons/messages2.png");
+	background-image: url("../diabook-red/icons/messages2.png");
 	}
 	
 /*nav #nav-notifications-linkmenu.on .icon.notify,*/ nav #nav-notifications-linkmenu.selected .icon.notify{
-	background-image: url("../../../view/theme/diabook-red/icons/notify2.png");
+	background-image: url("../diabook-red/icons/notify2.png");
 	}
 	
 nav #nav-contacts-linkmenu.on .icon.contacts, nav #nav-contacts-linkmenu.selected .icon.contacts{
-	background-image: url("../../../view/theme/diabook-red/icons/contacts2.png");
+	background-image: url("../diabook-red/icons/contacts2.png");
 	}
 	
 nav #nav-apps-link.selected {
@@ -938,22 +938,22 @@ ul.menu-popup .empty {
    }
 /*http://prothemedesign.com/circular-icons/*/
 .menu-profile-list.home{
-	background: url("../../../view/theme/diabook-red/icons/home.png") no-repeat;
+	background: url("../diabook-red/icons/home.png") no-repeat;
 	}
 .menu-profile-list.photos{
-	background: url("../../../view/theme/diabook-red/icons/mess_side.png") no-repeat;
+	background: url("../diabook-red/icons/mess_side.png") no-repeat;
 	}
 .menu-profile-list.events{
-	background: url("../../../view/theme/diabook-red/icons/events.png") no-repeat;
+	background: url("../diabook-red/icons/events.png") no-repeat;
 	}
 .menu-profile-list.notes{
-	background: url("../../../view/theme/diabook-red/icons/notes.png") no-repeat;
+	background: url("../diabook-red/icons/notes.png") no-repeat;
 	}
 .menu-profile-list.foren{
-	background: url("../../../view/theme/diabook-red/icons/pubgroups.png") no-repeat;
+	background: url("../diabook-red/icons/pubgroups.png") no-repeat;
 	}
 .menu-profile-list.com_side{
-	background: url("../../../view/theme/diabook-red/icons/com_side.png") no-repeat;
+	background: url("../diabook-red/icons/com_side.png") no-repeat;
 	}
 
 /* aside */
@@ -1006,7 +1006,7 @@ aside #dfrn-request-link {
   -webkit-border-radius: 5px 5px 5px 5px;
   border-radius: 5px 5px 5px 5px;
   color: #ffffff;
-  background: #005c94 url('../../../images/connect-bg.png') no-repeat left center;
+  background: #005c94 url('../../../../images/connect-bg.png') no-repeat left center;
   font-weight: bold;
   text-transform: uppercase;
   padding: 4px 2px 2px 35px;
@@ -1133,11 +1133,11 @@ list-style-type: disc;
   color: #1872A2;
 }
 .widget .tool.selected {
-  background: url("../../../view/theme/diabook-red/icons/selected.png") no-repeat left center;
+  background: url("../diabook-red/icons/selected.png") no-repeat left center;
 }
 /* widget: search */
 span.sbox_l  {
-	background: white url('../../../view/theme/diabook/icons/srch_l.gif') no-repeat top left;
+	background: white url('../diabook/icons/srch_l.gif') no-repeat top left;
 	float: left;
 	width: 19px; height: 19px;
 	margin-left: 10px;
@@ -1146,14 +1146,14 @@ span.sbox_l  {
 }
 
 span.sbox_r  {
-	background: white url('../../../view/theme/diabook/icons/srch_r.gif') no-repeat top left;
+	background: white url('../diabook/icons/srch_r.gif') no-repeat top left;
 	float: left;
 	width: 19px; height: 19px;
 	margin-top: 5px;
 }
 
 span.sbox input {
-	background: white url('../../../view/theme/diabook/icons/srch_bg.gif') repeat-x top left;
+	background: white url('../diabook/icons/srch_bg.gif') repeat-x top left;
 	float: left;
 	margin-top: 5px;
 	border: 0;
@@ -1176,10 +1176,14 @@ section {
 
 body .pageheader{
   text-align: center;
-  margin-top: 25px;
-  font-size: 0px;
+  font-size: 20px;
+  margin-bottom: 20px;
+  margin-top: 0px;
+  max-width: 575px;
+	}
+.qcomment{
+  max-width: 122px;	
 	}
-
 #id_username {
   width: 173px;	
 	}
@@ -1207,7 +1211,6 @@ body .pageheader{
     padding: 0;
  }
 .tab.button {
-    margin-right: 5px; 
     margin-left: 5px;	
     /*background: none repeat scroll 0 0 #F8F8F8;*/
     border: 1px solid #CCCCCC;
@@ -1231,7 +1234,7 @@ right_aside {
   /* background: #F1F1F1; */
 }
 right_aside a{color: red;}
-right_aside h3 {border-bottom: 1px solid #D2D2D2; padding-top: 5px; padding-bottom: 0px; padding-left: 5px; margin-bottom: 0px; 
+right_aside h3 {border-bottom: 1px solid #D2D2D2; padding-top: 5px; padding-bottom: 0px; padding-left: 9px; margin-bottom: 0px; 
 margin-top:30px;}
 right_aside .directory-item {	width: 50px; height: 50px; vertical-align: center; text-align: center; }
 right_aside .directory-photo { margin: 0px; }
@@ -1245,13 +1248,13 @@ right_aside #ra-photos-wrapper { padding-left: 5px; padding-top: 3px; overflow:
 #page-sidebar-right_aside .label {max-width: 128px;}
 right_aside .icon {width: 10px; height: 10px;}
 .close_box		{ 
-		background-image: url("../../../view/theme/diabook-red/icons/close_box.png");
+		background-image: url("../diabook-red/icons/close_box.png");
 		float: right;
 		cursor: pointer;
 		opacity: 0.1;
 		}
 .close_box:hover	{ 
-		background-image: url("../../../view/theme/diabook-red/icons/close_box.png");
+		background-image: url("../diabook-red/icons/close_box.png");
 		float: right;
 		cursor: pointer;
 		opacity: 1;
@@ -1268,6 +1271,7 @@ transition: all 0.2s ease-in-out;
   padding: 5px;
   margin-bottom: 0px;
   width: 575px;
+  padding-top: 10px;
 }
 .tread-wrapper a{
   color: red;
@@ -1334,14 +1338,16 @@ transition: all 0.2s ease-in-out;
 }
 
 .wall-item-container .wall-item-content {
-  font-size: 12.5px;
+
   max-width: 420px;
   word-wrap: break-word;
-  line-height: 1.2;
+
+
 }
 
 .wall-item-container .wall-item-content img {
   max-width: 400px;
+
 }
 .wall-item-container .wall-item-links, .wall-item-container .wall-item-actions {
   display: table-cell;
@@ -1403,7 +1409,7 @@ transition: all 0.2s ease-in-out;
   width: 32px;
   height: 32px;
   margin-left: 16px;
-  /*background: url(../../../images/icons/22/user.png) no-repeat center center;*/
+  /*background: url(../../../../images/icons/22/user.png) no-repeat center center;*/
 
 }
 .wall-item-container.comment {
@@ -1414,7 +1420,7 @@ transition: all 0.2s ease-in-out;
   padding-left: 12px;
 }
 .wall-item-comment-wrapper {
-  margin: 1px 5px 1px 80px;
+  margin: 1px 5px 5px 80px;
 }
 .wall-item-comment-wrapper .comment-edit-photo {
   display: none;
@@ -1435,15 +1441,15 @@ transition: all 0.2s ease-in-out;
   border: 1px solid #2d2d2d;
 }
 .comment-edit-preview {
-  width: 710px;
-  border: 1px solid #2d2d2d;
+  width: 500px;
   margin-top: 10px;
+  background-color:  #fff797;
 }
 .comment-edit-preview .contact-photo {
   width: 32px;
   height: 32px;
   margin-left: 16px;
-  /*background: url(../../../images/icons/22/user.png) no-repeat center center;*/
+  /*background: url(../../../../images/icons/22/user.png) no-repeat center center;*/
 
 }
 .comment-edit-preview {
@@ -1480,14 +1486,14 @@ transition: all 0.2s ease-in-out;
   padding-bottom: 2px;
 }
 .tag {
-  /*background: url("../../../images/tag_b.png") repeat-x center left;*/
+  /*background: url("../../../../images/tag_b.png") repeat-x center left;*/
   color: #999;
   padding-left: 3px;
   font-size: 12px;
 }
 .tag a {
   padding-right: 5px;
-  /*background: url("../../../images/tag.png") no-repeat center right;*/
+  /*background: url("../../../../images/tag.png") no-repeat center right;*/
   color: #999;
 }
 .wwto {
@@ -1583,6 +1589,11 @@ transition: all 0.2s ease-in-out;
   padding: 0.3em;
   margin-bottom: 10px;
 }
+.grey
+{
+  display: inline;
+  float: right;	
+	}
 #jot #jot-tools {
   margin: 0px;
   padding: 0px;
@@ -1668,7 +1679,7 @@ transition: all 0.2s ease-in-out;
     height: 20px;
     margin: 0 0 5px;
     width: 60%;
-    border: 1px solid #ffffff;
+    border: 1px solid #d2d2d2;
 }
 #profile-jot-form #jot-title:-webkit-input-placeholder {
   font-weight: normal;
@@ -1822,7 +1833,7 @@ transition: all 0.2s ease-in-out;
 }
 #acl-search {
   float: right;
-  background: #ffffff url("../../../images/search_18.png") no-repeat right center;
+  background: #ffffff url("../../../../images/search_18.png") no-repeat right center;
   padding-right: 20px;
 }
 #acl-showall {
@@ -1831,7 +1842,7 @@ transition: all 0.2s ease-in-out;
   width: auto;
   height: 18px;
   background-color: #cccccc;
-  background-image: url("../../../images/show_all_off.png");
+  background-image: url("../../../../images/show_all_off.png");
   background-position: 7px 7px;
   background-repeat: no-repeat;
   padding: 7px 5px 0px 30px;
@@ -1843,7 +1854,7 @@ transition: all 0.2s ease-in-out;
 #acl-showall.selected {
   color: #000000;
   background-color: #ff9900;
-  background-image: url("../../../images/show_all_on.png");
+  background-image: url("../../../../images/show_all_on.png");
 }
 #acl-list {
   height: 210px;
@@ -1894,20 +1905,20 @@ transition: all 0.2s ease-in-out;
   color: #000000;
 }
 .acl-button-show {
-  background-image: url("../../../images/show_off.png");
+  background-image: url("../../../../images/show_off.png");
 }
 .acl-button-hide {
-  background-image: url("../../../images/hide_off.png");
+  background-image: url("../../../../images/hide_off.png");
 }
 .acl-button-show.selected {
   color: #000000;
   background-color: #9ade00;
-  background-image: url("../../../images/show_on.png");
+  background-image: url("../../../../images/show_on.png");
 }
 .acl-button-hide.selected {
   color: #000000;
   background-color: #ff4141;
-  background-image: url("../../../images/hide_on.png");
+  background-image: url("../../../../images/hide_on.png");
 }
 .acl-list-item.groupshow {
   border-color: #9ade00;
@@ -1965,7 +1976,7 @@ ul.tabs li .active {
 .field .onoff a {
   display: block;
   border: 1px solid #666666;
-  background-image: url("../../../images/onoff.jpg");
+  background-image: url("../../../../images/onoff.jpg");
   background-repeat: no-repeat;
   padding: 4px 2px 2px 2px;
   height: 16px;
@@ -2038,7 +2049,7 @@ ul.tabs li .active {
   margin: 10px;
 }
 .oauthapp img.noicon {
-  background-image: url("../../../images/icons/48/plugin.png");
+  background-image: url("../../../../images/icons/48/plugin.png");
   background-position: center center;
   background-repeat: no-repeat;
 }
@@ -2054,9 +2065,10 @@ ul.tabs li .active {
 /* photo */
 .photo {
 box-shadow: 2px 2px 5px 0px #000000;
-margin: 2px 5px 2px 5px;
-max-height: 85%;
-max-width: 85%;
+margin: 0px;
+border-radius: 10px;
+height: 145px !important;
+width: 145px !important;
 }
 .lframe {
   float: left;
@@ -2084,7 +2096,7 @@ max-width: 85%;
 
 .contact-photo-menu-button {
         position: relative;
-        background-image: url("../../../images/icons/16/menu.png");
+        background-image: url("../../../../images/icons/16/menu.png");
         background-position: top left; 
         background-repeat: no-repeat;
         margin: 0px 0px -16px 0px; 
@@ -2129,6 +2141,11 @@ blockquote {
     border-left: 1px solid #D2D2D2;
     padding-left: 9px;
     margin: 0 0 0 .8ex;
+	 color: #777;
+}
+.oembed {
+	
+	font-weight: bold;
 }
 .aprofile dt{
 box-shadow: 1px 1px 5px 0;
@@ -2167,6 +2184,9 @@ box-shadow: 1px 1px 5px 0;
 #group-separator,
 #prof-separator { display: none;}
 */
+#prof-members-end{
+	clear: both;
+	}
 
 #prvmail-to-label, #prvmail-subject-label, #prvmail-message-label {
 	margin-bottom: 10px;
@@ -2292,7 +2312,7 @@ a.mail-list-link {
 }
 
 .vevent {
-        border: 1px solid #CCCCCC;
+
 }
 .vevent .event-description, .vevent .event-location {
         margin-left: 10px;
@@ -2315,7 +2335,7 @@ a.mail-list-link {
 }
 
 .event-description:before {
-        content: url('../../../images/calendar.png');
+        content: url('../../../../images/calendar.png');
         margin-right: 15px;
 }
 
diff --git a/view/theme/diabook/diabook-red/style-wide.css b/view/theme/diabook/diabook-red/style-wide.css
new file mode 100644
index 000000000..1df0d56bc
--- /dev/null
+++ b/view/theme/diabook/diabook-red/style-wide.css
@@ -0,0 +1,2927 @@
+/**
+ * Fabio Comuni <http://kirgroup.com/profile/fabrixxm>
+ * Additional Changes: Michael Vogel <icarus@dabo.de>
+ **/
+
+/* ========= */
+/* = Admin = */
+/* ========= */
+
+#adminpage {
+/*        width: 80%;*/
+}
+
+#pending-update {
+        float:right;
+        color: #ffffff;
+        font-weight: bold;
+        background-color: #FF0000;
+        padding: 0em 0.3em;
+}
+
+.admin.linklist {
+        border: 0px; padding: 0px;
+}
+
+.admin.link {
+        list-style-position: inside;
+        font-size: 1em;
+        padding: 5px;
+        width: 100px;
+        margin: 5px;
+}
+
+#adminpage dl {
+        clear: left;
+        margin-bottom: 2px;
+        padding-bottom: 2px;
+        border-bottom: 1px solid black;
+}
+
+#adminpage dt {
+        width: 200px;
+        float: left;
+        font-weight: bold;
+}
+
+#adminpage dd {
+        margin-left: 200px;
+}
+#adminpage h3 {
+        border-bottom: 1px solid #898989;
+        margin-bottom: 5px;
+        margin-top: 10px;
+}
+
+#adminpage .submit {
+        clear:left;
+}
+
+#adminpage #pluginslist {
+        margin: 0px; padding: 0px;
+}
+
+#adminpage .plugin {
+        list-style: none;
+        display: block;
+	/* border: 1px solid #888888; */
+        padding: 1em;
+        margin-bottom: 5px;
+        clear: left;
+}
+
+#adminpage .toggleplugin {
+        float:left;
+        margin-right: 1em;
+}
+
+#adminpage table {width:100%; border-bottom: 1p solid #000000; margin: 5px 0px;}
+#adminpage table th { text-align: left;}
+#adminpage td .icon { float: left;}
+#adminpage table#users img { width: 16px; height: 16px; }
+#adminpage table tr:hover { background-color: #eeeeee; }
+#adminpage .selectall { text-align: right; }
+/* icons */
+.icon.bb-url{
+  background-image: url("../../../view/theme/diabook/diabook-red/icons/bb-url.png");
+  float: right;
+  margin-top: 2px;}
+.icon.quote{
+  background-image: url("../../../view/theme/diabook/diabook-red/icons/quote.png");
+  float: right;
+  margin-top: 2px;}
+.icon.bold{
+  background-image: url("../../../view/theme/diabook/diabook-red/icons/bold.png");
+  float: right;
+  margin-top: 2px;}
+.icon.underline{
+  background-image: url("../../../view/theme/diabook/diabook-red/icons/underline.png");
+  float: right;
+  margin-top: 2px;}
+.icon.italic{
+  background-image: url("../../../view/theme/diabook/diabook-red/icons/italic.png");
+  float: right;
+  margin-top: 2px;}
+.icon.bb-image{
+  background-image: url("../../../view/theme/diabook/diabook-red/icons/bb-image.png");
+  float: right;
+  margin-top: 2px;}
+.icon.bb-video{
+  background-image: url("../../../view/theme/diabook/diabook-red/icons/bb-video.png");
+  float: right;
+  margin-top: 2px;}
+  
+.icon.contacts {
+  background-image: url("../../../view/theme/diabook/diabook-red/icons/contacts.png");}
+.icon.notifications {
+  background-image: url("../../../view/theme/diabook/diabook-red/icons/notifications.png");}
+.icon.notify {
+  background-image: url("../../../view/theme/diabook/diabook-red/icons/notify.png");}
+.icon.messages {
+  background-image: url("../../../view/theme/diabook/diabook-red/icons/messages.png");}
+.icon.community {
+  background-image: url("../../../view/theme/diabook/diabook-red/icons/community.png");}
+  
+.icon.drop 	{ background-image: url("../../../view/theme/diabook/diabook-red/icons/drop.png");}
+.icon.drophide 	{ background-image: url("../../../view/theme/diabook/diabook-red/icons/drop.png");}
+.icon.dislike 	{ background-image: url("../../../view/theme/diabook/diabook-red/icons/dislike.png");}
+.icon.like 	{ background-image: url("../../../view/theme/diabook/diabook-red/icons/like.png");}
+.icon.pencil 	{ background-image: url("../../../view/theme/diabook/diabook-red/icons/pencil.png");}
+.icon.recycle 	{ background-image: url("../../../view/theme/diabook/diabook-red/icons/recycle.png");}
+.icon.remote-link { background-image: url("../../../view/theme/diabook/diabook-red/icons/remote.png");}
+.icon.tagged    { background-image: url("../../../view/theme/diabook/diabook-red/icons/tagged.png");}
+.icon.file-as { background-image: url("../../../view/theme/diabook/diabook-red/icons/file_as.png");}
+.star-item.icon.unstarred { background-image: url("../../../view/theme/diabook/diabook-red/icons/unstarred.png");}
+.star-item.icon.starred { background-image: url("../../../view/theme/diabook/diabook-red/icons/starred.png");}
+.icon.link		{ background-image: url("../../../view/theme/diabook/diabook-red/icons/link.png");}
+.icon.lock		{ background-image: url("../../../view/theme/diabook/diabook-red/icons/lock.png");}
+.icon.unlock		{ background-image: url("../../../view/theme/diabook/diabook-red/icons/unlock.png");}
+.icon.language    { background-image: url("../../../view/theme/diabook/diabook-red/icons/language.png");}
+
+
+.camera 	{ background-image: url("../../../view/theme/diabook/diabook-red/icons/camera.png"); 
+			  display: block; width: 28px; height: 28px; background-repeat: no-repeat;
+			  }
+.attach 	{ background-image: url("../../../view/theme/diabook/diabook-red/icons/attach.png"); 
+			  display: block; width: 28px; height: 28px; background-repeat: no-repeat;
+			  }
+.video2 	{ background-image: url("../../../view/theme/diabook/diabook-red/icons/video.png"); 
+			  display: block; width: 28px; height: 28px; background-repeat: no-repeat;
+			  }	
+.video 	{ background-image: url("../../../view/theme/diabook/diabook-red/icons/video.png"); 
+			  display: block; width: 100%; height: 140px; background-repeat: no-repeat;
+			  }
+.audio2 	{ background-image: url("../../../view/theme/diabook/diabook-red/icons/audio.png"); 
+			  display: block; width: 28px; height: 28px; background-repeat: no-repeat;
+			  }
+.audio 	{ background-image: url("../../../view/theme/diabook/diabook-red/icons/audio.png"); 
+			  display: block; width: 28px; height: 28px; background-repeat: no-repeat;
+			  }
+.weblink 	{ background-image: url("../../../view/theme/diabook/diabook-red/icons/weblink.png"); 
+			  display: block; width: 28px; height: 28px; background-repeat: no-repeat;
+			  }
+.globe 	{ background-image: url("../../../view/theme/diabook/diabook-red/icons/globe.png"); 
+			  display: block; width: 28px; height: 28px; background-repeat: no-repeat;
+			  }
+.unglobe 	{ background-image: url("../../../view/theme/diabook/diabook-red/icons/unglobe.png"); 
+			  display: block; width: 28px; height: 28px; background-repeat: no-repeat;
+			  }
+.edit    {background-image: url("../../../view/theme/diabook/diabook-red/icons/pencil2.png"); 
+			  display: block; width: 28px; height: 28px; background-repeat: no-repeat;}
+.icon.block   {background-image: url("../../../view/theme/diabook/icons/block.png"); 
+			  display: block; width: 16px; height: 16px; background-repeat: no-repeat;}
+.icon.block.dim  {background-image: url("../../../view/theme/diabook/icons/block.png"); 
+			  display: block; width: 16px; height: 16px; background-repeat: no-repeat; opacity: 0.3;}
+.icon.ad_drop 	{ background-image: url("../../../view/theme/diabook/icons/drop.png");
+			  display: block; margin-left:5px; width: 16px; height: 16px; background-repeat: no-repeat;}			  
+			  
+
+
+.article	{ background-position: -50px  0px;}
+/*.audio 		{ background-position: -70px  0px;}*/
+/*.drop 		{ background-position: -110px 0px;}*/
+/*.drophide 	{ background-position: -130px 0px;}*/
+/*.edit 		{ background-position: -150px 0px;}*/
+/*.camera 	{ background-position: -170px 0px;}*/
+/*.dislike 	{ background-position: -190px 0px;}*/
+/*.like 		{ background-position: -210px 0px;}*/
+/*.link 		{ background-position: -230px 0px;}*/
+
+/*.globe 		{ background-position: -50px  -20px;}*/
+/*.noglobe 	{ background-position: -70px  -20px;}*/
+.no 		{ background-position: -90px  -20px;}
+.pause 		{ background-position: -110px -20px;}
+.play 		{ background-position: -130px -20px;}
+/*.pencil 	{ background-position: -150px -20px;}*/
+.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;}*/
+
+/*.video          { background-position: -110px -40px;}*/
+.youtube        { background-position: -130px -40px;}
+
+/*.attach         { background-position: -190px -40px;}*/
+/*.language       { background-position: -210px -40px;}*/
+
+
+.icon.on             { background-image: url("../../../view/theme/diabook/diabook-red/icons/toogle_on.png"); background-repeat: no-repeat;}
+.icon.off            { background-image: url("../../../view/theme/diabook/diabook-red/icons/toogle_off.png"); background-repeat: no-repeat;}
+.icon.prev           { background-image: url("../../../view/theme/diabook/diabook-red/icons/prev.png"); background-repeat: no-repeat;}
+.icon.next           { background-image: url("../../../view/theme/diabook/diabook-red/icons/next.png"); background-repeat: no-repeat;}
+/*.tagged     { background-position: -130px -60px;}*/
+
+.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 0px; }
+.type-audio { background-position: -40px 0px; }
+.type-text  { background-position: -60px 0px; }
+.type-unkn  { background-position: -80px 0px; }
+
+.icon.drop, .icon.drophide {
+ float: left;
+}
+
+.icon {
+  display: block;
+  width: 20px;
+  height: 20px;
+  /*background-image: url('icons.png');*/
+}
+
+.icon {
+  background-color: transparent ;
+  background-repeat: no-repeat;
+  /* background-position: left center; */
+  display: block;
+  overflow: hidden;
+  text-indent: -9999px;
+  padding: 1px;
+}
+
+.icon.border.camera{
+  background-image: url("../../../view/theme/diabook/diabook-red/icons/camera.png"); 
+  display: block; width: 28px; height: 28px; background-repeat: no-repeat;
+	}
+	
+.icon.border.link{
+  background-image: url("../../../view/theme/diabook/diabook-red/icons/weblink.png"); 
+  display: block; width: 28px; height: 28px; background-repeat: no-repeat;
+  margin-left: 10px;
+	}
+
+.icon.text {
+  text-indent: 0px;
+}
+.icon.s10 {
+  min-width: 10px;
+  height: 10px;
+}
+.icon.s10.notify {
+  background-image: url("../../../images/icons/10/notify_off.png");
+}
+.icon.s10.gear {
+  background-image: url("../../../images/icons/10/gear.png");
+}
+.icon.s10.add {
+  background-image: url("../../../images/icons/10/add.png");
+}
+.icon.s10.delete {
+  background-image: url("../../../images/icons/10/delete.png");
+}
+.icon.s10.edit {
+  background-image: url("../../../images/icons/10/edit.png");
+}
+.icon.s10.star {
+  background-image: url("../../../images/star_dummy.png");
+}
+.icon.s10.menu {
+  background-image: url("../../../images/icons/10/menu.png");
+}
+.icon.s10.link {
+  background-image: url("../../../images/icons/10/link.png");
+}
+.icon.s10.lock {
+  background-image: url("../../../images/icons/10/lock.png");
+}
+.icon.s10.unlock {
+  background-image: url("../../../images/icons/10/unlock.png");
+}
+.icon.s10.text {
+  padding: 2px 0px 0px 15px;
+  font-size: 10px;
+}
+.icon.s16 {
+  min-width: 16px;
+  height: 16px;
+}
+.icon.s16.notify {
+  background-image: url("../../../images/icons/16/notify_off.png");
+}
+.icon.s16.gear {
+  background-image: url("../../../images/icons/16/gear.png");
+}
+.icon.s16.add {
+  background-image: url("../../../images/icons/16/add.png");
+}
+.icon.s16.delete {
+  background-image: url("../../../images/icons/16/delete.png");
+}
+/*.icon.s16.edit {
+  background-image: url("../../../images/icons/16/edit.png");
+}*/
+.icon.s16.star {
+  background-image: url("../../../images/star_dummy.png");
+}
+.icon.s16.menu {
+  background-image: url("../../../images/icons/16/menu.png");
+}
+/*.icon.s16.link {
+  background-image: url("../../../images/icons/16/link.png");
+}*/
+.icon.s16.lock {
+  background-image: url("../../../images/icons/16/lock.png");
+}
+.icon.s16.unlock {
+  background-image: url("../../../images/icons/16/unlock.png");
+}
+.icon.s16.text {
+  padding: 4px 0px 0px 20px;
+  font-size: 10px;
+}
+.icon.s22 {
+  min-width: 22px;
+  height: 22px;
+}
+.icon.s22.notify {
+  background-image: url("../../../images/icons/22/notify_off.png");
+}
+.icon.s22.gear {
+  background-image: url("../../../images/icons/22/gear.png");
+}
+.icon.s22.add {
+  background-image: url("../../../images/icons/22/add.png");
+}
+.icon.s22.delete {
+  background-image: url("../../../images/icons/22/delete.png");
+}
+.icon.s22.edit {
+  background-image: url("../../../images/icons/22/edit.png");
+}
+.icon.s22.star {
+  background-image: url("../../../images/star_dummy.png");
+}
+.icon.s22.menu {
+  background-image: url("../../../images/icons/22/menu.png");
+}
+.icon.s22.link {
+  background-image: url("../../../images/icons/22/link.png");
+}
+.icon.s22.lock {
+  background-image: url("../../../images/icons/22/lock.png");
+}
+.icon.s22.unlock {
+  background-image: url("../../../images/icons/22/unlock.png");
+}
+.icon.s22.text {
+  padding: 10px 0px 0px 25px;
+  width: 200px;
+}
+.icon.s48 {
+  width: 48px;
+  height: 48px;
+}
+.icon.s48.notify {
+  background-image: url("../../../images/icons/48/notify_off.png");
+}
+.icon.s48.gear {
+  background-image: url("../../../images/icons/48/gear.png");
+}
+.icon.s48.add {
+  background-image: url("../../../images/icons/48/add.png");
+}
+.icon.s48.delete {
+  background-image: url("../../../images/icons/48/delete.png");
+}
+.icon.s48.edit {
+  background-image: url("../../../images/icons/48/edit.png");
+}
+.icon.s48.star {
+  background-image: url("../../../images/star_dummy.png");
+}
+.icon.s48.menu {
+  background-image: url("../../../images/icons/48/menu.png");
+}
+.icon.s48.link {
+  background-image: url("../../../images/icons/48/link.png");
+}
+.icon.s48.lock {
+  background-image: url("../../../images/icons/48/lock.png");
+}
+.icon.s48.unlock {
+  background-image: url("../../../images/icons/48/unlock.png");
+}
+
+#contact-edit-links ul {
+  list-style: none;
+  list-style-type: none;
+}
+
+.hide-comments-outer {
+  margin-left: 80px;
+  margin-bottom: 5px;
+  width: 675px;
+  border-bottom: 1px solid #BDCDD4;
+  padding: 8px;
+}
+
+/* global */
+body {
+  font-family: 'Lato', "Helvetica Neue", Helvetica, Arial, sans-serif;
+  font-size: 13px;
+  background-color: #ffffff;
+  color: #2d2d2d;
+  margin: 50px auto auto;
+  display: table;
+}
+
+#jappix_mini {
+right: 45px !important;
+}
+
+
+h4 {
+  font-size: 1.1em;
+}
+
+a {
+	color: red;
+	/* color: #3e3e8c; */
+	text-decoration: none;
+}
+a:hover {
+	/* color: blue; */
+	text-decoration: underline
+}
+
+.wall-item-name-link {
+/*  float: left;*/
+}
+
+.wall-item-photo {
+  width: 48px;
+  height: 48px;
+  overflow: hidden;
+  display: block;
+}
+
+.left {
+  float: left;
+}
+.right {
+  float: right;
+}
+.hidden {
+  display: none;
+}
+.clear {
+  clear: both;
+}
+.fakelink {
+  color: red;
+  /* color: #3e3e8c; */
+  text-decoration: none;
+  cursor: pointer;
+}
+.fakelink:hover {
+  /* color: blue; */
+  /*color: #005c94; */
+  text-decoration: underline;
+}
+.intro-end {
+	border-bottom: 1px solid black;
+   clear: both;
+   margin-bottom: 25px;
+   padding-bottom: 25px;
+   width: 75%;
+	}
+.intro-form-end {
+	clear: both;
+	}
+.intro-fullname {
+	padding-bottom: 5px;
+   padding-top: 5px;
+	}
+.intro-wrapper-end {
+	clear: both;
+   padding-bottom: 5px;
+	}
+code {
+  font-family: Courier, monospace;
+  white-space: pre;
+  display: block;
+  overflow: auto;
+  border: 1px solid #444;
+  background: #EEE;
+  color: #444;
+  padding: 10px;
+  margin-top: 20px;
+}
+#panel {
+  position: absolute;
+  width: 12em;
+  background: #ffffff;
+  color: #2d2d2d;
+  margin: 0px;
+  padding: 1em;
+  list-style: none;
+  border: 3px solid #364e59;
+  z-index: 100000;
+  -webkit-box-shadow: 0px 5px 10px rgba(0, 0, 0, 0.7);
+  -moz-box-shadow: 0px 5px 10px rgba(0, 0, 0, 0.7);
+  box-shadow: 0px 5px 10px rgba(0, 0, 0, 0.7);
+}
+/* tool */
+.tool {
+  height: auto;
+  overflow: auto;
+  padding: 3px;
+}
+#saved-search-ul .tool:hover,
+#nets-sidebar .tool:hover,
+#sidebar-group-list .tool:hover,
+#fileas-sidebar .tool:hover {
+	background: #FFE499;
+}
+.tool .label {
+  float: left;
+}
+.tool .action {
+  float: right;
+}
+.tool a {
+  color: ##3F8FBA;
+}
+.tool a:hover {
+  text-decoration: none;
+}
+/* popup notifications */
+div.jGrowl div.notice {
+  background: #511919 url("../../../images/icons/48/notice.png") no-repeat 5px center;
+  color: #ffffff;
+  padding-left: 58px;
+}
+div.jGrowl div.info {
+  background: #364e59 url("../../../images/icons/48/info.png") no-repeat 5px center;
+  color: #ffffff;
+  padding-left: 58px;
+}
+/* header */
+header {
+  position: fixed;
+  left: 0%;
+  right: 80%;
+  top: 0px;
+  margin: 0px;
+  padding: 0px;
+  width: 22%;
+  height: 32px;
+  background: #ff500f;
+  background-color: #ff500f;
+  z-index: 100;
+  border-bottom: 1px;
+  border-bottom-color: black;
+  border-bottom-style: inset;
+  background-image: linear-gradient(bottom, rgb(173,59,10) 0%, rgb(255,79,15) 65%);
+background-image: -o-linear-gradient(bottom, rgb(173,59,10) 0%, rgb(255,79,15) 65%);
+background-image: -moz-linear-gradient(bottom, rgb(173,59,10) 0%, rgb(255,79,15) 65%);
+background-image: -webkit-linear-gradient(bottom, rgb(173,59,10) 0%, rgb(255,79,15) 65%);
+background-image: -ms-linear-gradient(bottom, rgb(173,59,10) 0%, rgb(255,79,15) 65%);
+
+background-image: -webkit-gradient(
+	linear,
+	left bottom,
+	left top,
+	color-stop(0, rgb(173,59,10)),
+	color-stop(0.65, rgb(255,79,15))
+);
+}
+header #site-location {
+  display: none;
+}
+header #banner {
+  overflow: hidden;
+  text-align: banner;
+  width: 82%;
+  margin-left: 25%;
+}
+header #banner a,
+header #banner a:active,
+header #banner a:visited,
+header #banner a:link,
+header #banner a:hover {
+  color: #1f1f1f;
+  text-decoration: none;
+  outline: none;
+  vertical-align: middle;
+  font-weight: bolder;
+}
+header #banner #logo-img {
+  height: 25px;
+  margin-top: 3px;
+}
+header #banner #logo-text {
+  font-size: 20px;
+  position: absolute;
+  top: 10%;
+  margin-left: 3px;
+}
+/* messages */
+#message-new {
+  background: ;
+  border: 1px solid #333;
+  width: 150px;
+}
+#message-new a {
+  color: #ffffff;
+  text-align: center;
+  display: block;
+  font-weight: bold;
+  padding: 1em 0px;
+  text-decoration: none;
+  background-color: red;
+}
+.mail-list-wrapper {
+  background-color: #f6f7f8;
+  margin-bottom: 5px;
+  width: 100%;
+  height: auto;
+  overflow: hidden;
+}
+.mail-list-wrapper span {
+  display: block;
+  float: left;
+  width: 20%;
+  overflow: hidden;
+}
+.mail-list-wrapper .mail-subject {
+  width: 30%;
+  padding: 4px 0px 0px 4px;
+}
+.mail-list-wrapper .mail-subject a {
+  display: block;
+}
+.mail-list-wrapper .mail-subject.unseen a {
+  font-weight: bold;
+}
+.mail-list-wrapper .mail-date {
+  padding: 4px 4px 0px 4px;
+}
+.mail-list-wrapper .mail-from {
+  padding: 4px 4px 0px 4px;
+}
+.mail-list-wrapper .mail-count {
+  padding: 4px 4px 0px 4px;
+  text-align: right;
+}
+.mail-list-wrapper .mail-delete {
+  float: right;
+}
+#mail-display-subject {
+  background-color: #f6f7f8;
+  color: #2d2d2d;
+  margin-bottom: 10px;
+  width: 100%;
+  height: auto;
+  overflow: hidden;
+}
+#mail-display-subject span {
+  float: left;
+  overflow: hidden;
+  padding: 4px 0px 0px 10px;
+}
+#mail-display-subject .mail-delete {
+  float: right;
+  opacity: 0.5;
+  -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;
+}
+#mail-display-subject:hover .mail-delete {
+  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;
+}
+/* nav */
+nav {
+  width: 80%;
+  height: 32px;
+  position: fixed;
+  left: 22%;
+  top: 0px;
+  padding: 0px;
+  background: #ff500f;
+  color: #1f1f1f;
+  z-index: 99;
+  border-bottom: 1px;
+  border-bottom-color: black;
+  border-bottom-style: inset;
+  background-image: linear-gradient(bottom, rgb(173,59,10) 0%, rgb(255,79,15) 65%);
+background-image: -o-linear-gradient(bottom, rgb(173,59,10) 0%, rgb(255,79,15) 65%);
+background-image: -moz-linear-gradient(bottom, rgb(173,59,10) 0%, rgb(255,79,15) 65%);
+background-image: -webkit-linear-gradient(bottom, rgb(173,59,10) 0%, rgb(255,79,15) 65%);
+background-image: -ms-linear-gradient(bottom, rgb(173,59,10) 0%, rgb(255,79,15) 65%);
+
+background-image: -webkit-gradient(
+	linear,
+	left bottom,
+	left top,
+	color-stop(0, rgb(173,59,10)),
+	color-stop(0.65, rgb(255,79,15))
+);
+}
+nav a,
+nav a:active,
+nav a:visited,
+nav a:link,
+nav a:hover {
+  color: #1f1f1f;
+  text-decoration: none;
+  outline: none;
+}
+nav #banner {
+  overflow: hidden;
+  /*text-align: center;*/
+  width: 100%;
+}
+nav #banner a,
+nav #banner a:active,
+nav #banner a:visited,
+nav #banner a:link,
+nav #banner a:hover {
+  color: #ffffff;
+  text-decoration: none;
+  outline: none;
+  vertical-align: bottom;
+}
+nav #banner #logo-img {
+  height: 22px;
+  margin-top: 5px;
+}
+nav #banner #logo-text {
+  font-size: 22px;
+}
+nav #navbar{
+	}
+nav ul {
+  margin: 0px;
+  padding: 0px 20px;
+}
+nav ul li {
+  list-style: none;
+  margin: 0px;
+  /* padding: 1px 1px 3px 1px; */
+  float: left;
+}
+nav ul li .menu-popup {
+  left: 0px;
+  right: auto;
+}
+
+nav #logo-img {
+  height: 25px;
+  margin-top: 4px;
+  margin-left: 30px;
+}
+
+nav #logo-text {
+    font-size: 22px;
+    margin-top: 3px;
+    margin-right: 15px;
+}
+nav .nav-menu-search {
+  position: relative;
+
+  margin: 4px 17px;
+  margin-right: 0px;
+  height: 17px;
+  width: 180px;
+  
+}
+
+nav #search-box #search-text {
+  background-image:  url('icons/lupe.png');
+  background-repeat:no-repeat;
+  padding-left:20px;
+  border-top-left-radius: 15px;
+border-top-right-radius: 15px;
+border-bottom-right-radius: 15px;
+border-bottom-left-radius: 15px;
+	}
+
+
+nav .nav-menu-icon {
+  position: relative;
+  height: 22px;
+  padding: 5px;
+  margin: 0px 5px;
+  -moz-border-radius: 5px 5px 0 0;
+  -webkit-border-radius: 5px 5px 0 0;
+  border-radius: 5px 5px 0 0;
+}
+nav .nav-menu-icon:hover {
+  position: relative;
+  height: 22px;
+  padding: 5px;
+  margin: 0px 5px;
+  -moz-border-radius: 5px 5px 0 0;
+  -webkit-border-radius: 5px 5px 0 0;
+  border-radius: 5px 5px 0 0;
+}
+
+nav .nav-menu-icon.selected {
+  background-color: #fff4d6;
+}
+nav .nav-menu-icon img {
+  width: 22px;
+  height: 22px;
+}
+nav .nav-menu-icon .nav-notify {
+  top: 3px;
+}
+/*marker*/
+nav .nav-menu {
+  position: relative;
+  height: 16px;
+  padding: 5px;
+  margin: 3px 15px 0px;
+  font-size: 15px;
+  /*border-bottom: 3px solid #364A84;*/
+}
+nav .nav-menu.selected {
+  /*border-bottom: 3px solid #9eabb0;*/
+}
+nav .nav-notify {
+  display: none;
+  position: absolute;
+  background-color: #fff;
+  /* background-color: #19aeff; */
+  -moz-border-radius: 5px 5px 5px 5px;
+  -webkit-border-radius: 5px 5px 5px 5px;
+  border-radius: 5px 5px 5px 5px;
+  font-size: 10px;
+  font-weight: 900;
+  padding: 1px 4px;
+  top: 0px;
+  right: -6px;
+  min-width: 10px;
+  text-align: center;
+}
+nav .nav-notify.show {
+  display: block;
+}
+nav #nav-help-link,
+nav #nav-search-link,
+nav #nav-directory-link,
+nav #nav-apps-link,
+nav #nav-site-linkmenu, 
+nav #nav-home-link,
+nav #nav-user-linkmenu
+{
+  float: right;
+}
+nav #nav-user-linkmenu{
+	margin-right: 0px;
+	}
+nav #nav-home-link, #nav-directory-link, #nav-apps-link{
+	margin-left: 0px;
+	margin-right: 0px;
+	font-weight: bold;
+	margin: 3px 5px;
+	font-size: 15px;
+	}
+nav #nav-directory-link{
+  margin-right: 0px;	
+	}
+nav #nav-home-link{
+  margin-left: 0px;	
+	}
+nav #nav-help-link .menu-popup,
+nav #nav-search-link .menu-popup,
+nav #nav-directory-link .menu-popup,
+nav #nav-apps-link .menu-popup,
+nav #nav-site-linkmenu .menu-popup {
+  right: 0px;
+  left: auto;
+}
+
+nav #nav-messages-linkmenu.on .icon.messages, nav #nav-messages-linkmenu.selected .icon.messages{
+	background-image: url("../../../view/theme/diabook/diabook-red/icons/messages2.png");
+	}
+	
+/*nav #nav-notifications-linkmenu.on .icon.notify,*/ nav #nav-notifications-linkmenu.selected .icon.notify{
+	background-image: url("../../../view/theme/diabook/diabook-red/icons/notify2.png");
+	}
+	
+nav #nav-contacts-linkmenu.on .icon.contacts, nav #nav-contacts-linkmenu.selected .icon.contacts{
+	background-image: url("../../../view/theme/diabook/diabook-red/icons/contacts2.png");
+	}
+	
+nav #nav-apps-link.selected {
+ background-color: #fff4d6;
+  moz-border-radius: 5px 5px 0 0;
+-webkit-border-radius: 5px 5px 0 0;
+border-radius: 5px 5px 0 0;
+}
+
+#nav-notifications-mark-all {
+	/* padding: 1px 1px 2px 26px; */
+	/* border-bottom: 1px solid #364E59; */
+	/* margin: 0px 0px 2px 0px;
+	padding: 5px 10px; */
+}
+
+#nav-notifications-see-all {
+	/* padding: 1px 1px 2px 26px; */
+	/* border-bottom: 1px solid #364E59; */
+	/* margin: 0px 0px 2px 0px;
+	padding: 5px 10px; */
+}
+
+.notify-seen {
+	background: none repeat scroll 0 0 #DDDDDD;
+	}
+
+ul.menu-popup {
+  position: absolute;
+  display: none;
+  width: 11em;
+  background: #fff4d6;
+  color: #2d2d2d;
+  margin: 0px;
+  padding: 0px;
+  list-style: none;
+  z-index: 100000;
+  -webkit-box-shadow: 0px 5px 10px rgba(0, 0, 0, 0.7);
+  -moz-box-shadow: 0px 5px 10px rgba(0, 0, 0, 0.7);
+  box-shadow: 0px 5px 10px rgba(0, 0, 0, 0.7);
+}
+ul.menu-popup a {
+  display: block;
+  color: #2d2d2d;
+  padding: 5px 10px;
+  text-decoration: none;
+}
+ul.menu-popup a:hover {
+  background-color: #ffe499; /*bdcdd4;*/
+  color: #000;
+}
+ul.menu-popup .menu-sep {
+  border-top: 1px solid #9eabb0;
+}
+ul.menu-popup li {
+  float: none;
+  overflow: auto;
+  height: auto;
+  display: block;
+}
+ul.menu-popup li img {
+  float: left;
+  width: 16px;
+  height: 16px;
+  padding-right: 5px;
+}
+ul.menu-popup .empty {
+  padding: 5px;
+  text-align: center;
+  color: #9eabb0;
+}
+/* autocomplete popup */
+.acpopup {
+  max-height: 150px;
+  background-color: #ffffff;
+  color: #2d2d2d;
+  border: 1px solid #MenuBorder;
+  overflow: auto;
+  z-index: 100000;
+  -webkit-box-shadow: 0px 5px 10px rgba(0, 0, 0, 0.7);
+  -moz-box-shadow: 0px 5px 10px rgba(0, 0, 0, 0.7);
+  box-shadow: 0px 5px 10px rgba(0, 0, 0, 0.7);
+}
+.acpopupitem {
+  color: #2d2d2d;
+  padding: 4px;
+  clear: left;
+}
+.acpopupitem img {
+  float: left;
+  margin-right: 4px;
+}
+.acpopupitem.selected {
+  background-color: #bdcdd4;
+}
+#nav-notifications-menu {
+  width: 400px;
+  max-height: 550px;
+  overflow: auto;
+}
+/* #nav-notifications-menu a {
+	display: inline;
+	padding: 5px 0px;
+	margin: 0px 0px 2px 0px;
+}
+#nav-notifications-menu li:hover {
+  background-color: #bdcdd4;
+}*/
+
+#nav-notifications-menu img {
+  float: left;
+  margin-right: 5px;
+}
+#nav-notifications-menu .contactname {
+  font-weight: bold;
+}
+#nav-notifications-menu .notif-when {
+  font-size: 10px;
+  color: #9eabb0;
+  display: block;
+}
+
+.notif-image {
+        width: 32px;
+        height: 32px;
+        padding: 7px 7px 0px 0px;
+}
+
+/*profile_side*/
+#profile_side {
+  margin-bottom: 30px;
+}
+#ps-usericon{
+	height: 25px	
+	}
+#ps-username{
+  font-size: 1.17em;
+  font-weight: bold;
+  vertical-align: top;
+  position: absolute;
+  padding-top: 4px;
+  padding-left: 5px;	
+  word-wrap: break-word;
+  width: 130px;
+	}
+#ps-username:hover{
+  text-decoration: none;	
+	}
+.menu-profile-side{
+  list-style: none;	
+  padding-left: 0px;
+  min-height: 0px;
+	}
+.menu-profile-list{
+  height: auto;
+  overflow: auto;  
+  min-height: 16px;
+  list-style: none;
+	}
+.menu-profile-list:hover{
+	background: #FFE499; 
+	}
+.menu-profile-list-item{
+	padding-left: 5px;
+	vertical-align: middle;
+	}	
+.menu-profile-list-item:hover{	
+	text-decoration: none;
+   }
+/*http://prothemedesign.com/circular-icons/*/
+.menu-profile-icon.home{
+	background: url("../../../view/theme/diabook/diabook-red/icons/home.png") no-repeat;
+	float: left;
+	height: 22px;
+	width: 22px;
+	}
+.menu-profile-icon.photos{
+	background: url("../../../view/theme/diabook/diabook-red/icons/mess_side.png") no-repeat;
+	float: left;
+	height: 22px;
+   width: 22px;}
+.menu-profile-icon.events{
+	background: url("../../../view/theme/diabook/diabook-red/icons/events.png") no-repeat;
+	float: left;
+	height: 22px;
+   width: 22px;}
+.menu-profile-icon.notes{
+	background: url("../../../view/theme/diabook/diabook-red/icons/notes.png") no-repeat;
+	float: left;
+	height: 22px;
+   width: 22px;}
+.menu-profile-icon.foren{
+	background: url("../../../view/theme/diabook/diabook-red/icons/pubgroups.png") no-repeat;
+	float: left;
+	height: 22px;
+   width: 22px;}
+.menu-profile-icon.com_side{
+	background: url("../../../view/theme/diabook/diabook-red/icons/com_side.png") no-repeat;
+	float: left;
+	height: 22px;
+   width: 22px;}
+.menu-profile-icon.pscontacts{
+	background: url("../../../view/theme/diabook/diabook-red/icons/pscontacts.png") no-repeat;
+	float: left;
+	height: 22px;
+   width: 22px;}
+/* aside */
+/*marker*/
+aside {
+  display: table-cell;
+  vertical-align: top;
+  width: 180px;
+  padding: 0px 5px 0px 0px;
+  border-right: 1px solid #D2D2D2;
+  float: left;
+  /* background: #F1F1F1; */
+}
+aside #page-sidebar{display: none;}
+aside .vcard .fn {
+  font-size: 18px;
+  font-weight: bold;
+  margin-bottom: 5px;
+}
+aside .vcard .title {
+  margin-bottom: 5px;
+}
+aside .vcard dl {
+  height: auto;
+  overflow: auto;
+}
+aside .vcard dt {
+  float: left;
+  margin-left: 0px;
+  /*width: 35%;*/
+  text-align: right;
+  color: #999999;
+}
+aside .vcard dd {
+  float: left;
+  margin-left: 5px;
+  /*width: 60%;*/
+}
+aside #profile-extra-links ul {
+  padding: 0px;
+  margin: 0px;
+}
+aside #profile-extra-links li {
+  padding: 0px;
+  margin: 0px;
+  list-style: none;
+}
+aside #dfrn-request-link {
+  display: block;
+  -moz-border-radius: 5px 5px 5px 5px;
+  -webkit-border-radius: 5px 5px 5px 5px;
+  border-radius: 5px 5px 5px 5px;
+  color: #ffffff;
+  background: #005c94 url('../../../images/connect-bg.png') no-repeat left center;
+  font-weight: bold;
+  text-transform: uppercase;
+  padding: 4px 2px 2px 35px;
+}
+aside #dfrn-request-link:hover {
+  text-decoration: none;
+  background-color: #36c;
+  /* background-color: #19aeff; */
+}
+aside #profiles-menu {
+  width: 20em;
+}
+aside #search-text {
+	width: 173px;
+	height: 17px;
+	padding-left: 10px;
+	border-top-left-radius: 15px;
+border-top-right-radius: 15px;
+border-bottom-right-radius: 15px;
+border-bottom-left-radius: 15px;
+}
+aside #side-follow-url {
+	width: 173px;
+	}
+aside #side-peoplefind-url {
+	width: 173px;
+	}
+#contact-block {
+  overflow: auto;
+  height: auto;
+}
+#contact-block .contact-block-h4 {
+  float: left;
+  margin: 5px 0px;
+}
+#contact-block .allcontact-link {
+  float: right;
+  margin: 5px 0px;
+}
+#contact-block .contact-block-content {
+  clear: both;
+  overflow: auto;
+  height: auto;
+}
+#contact-block .contact-block-link {
+  float: left;
+  margin: 0px 2px 2px 0px;
+}
+#contact-block .contact-block-link img {
+  widht: 55px;
+  height: 55px;
+}
+#lost-password-link {
+  float: left;
+  margin-right: 20px;		
+	}
+#login-submit-wrapper{
+margin-bottom: 15px;
+	}
+.group_selected {
+  background: url("../../../view/theme/diabook/icons/selected.png") no-repeat left center;
+  float: left;
+  height: 22px;
+  width: 22px;
+}
+.group_unselected {
+  background: url("../../../view/theme/diabook/icons/unselected.png") no-repeat left center;
+  float: left;
+  height: 22px;
+  width: 22px;
+}
+.icon.text_add		{ 
+		background-image: url("../../../images/icons/16/add.png");
+		float: right;
+		opacity: 0.2;
+		margin-right: 14px;
+		}
+.icon.text_add:hover	{ 
+		background-image: url("../../../images/icons/16/add.png");
+		float: right;
+		cursor: pointer;
+		margin-right: 14px;
+		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;
+		}
+.icon.text_edit {
+  background-image: url("../../../images/icons/10/edit.png");
+  opacity: 0.2;
+  margin-top: 6px;
+  float: right;
+  height: 10px;
+}
+.icon.text_edit:hover {
+  background-image: url("../../../images/icons/10/edit.png");
+  opacity: 1;
+  margin-top: 6px;
+  float: right;
+  height: 10px;
+}
+/* widget */
+.widget {
+  margin-bottom: 2em;
+  /*.action .s10 { width: 10px; overflow: hidden; padding: 0px;}
+	.action .s16 { width: 16px; overflow: hidden; padding: 0px;}*/
+/*  font-size: 12px; */
+}
+/*marker*/
+.widget h3 {
+  padding: 0px;
+  margin: 2px;
+  font-size: 1.05em;
+}
+.widget .action {
+  opacity: 0.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;
+}
+.widget input.action {
+  opacity: 0.5;
+  -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;
+}
+.widget:hover .title .action {
+  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;
+}
+.widget .tool:hover .action {
+  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;
+}
+.widget .tool:hover .action.ticked {
+  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;
+}
+.widget ul {
+  padding: 0px;
+}
+.widget ul li {
+  padding-left: 16px;
+  min-height: 16px;
+  list-style: none;
+}
+#side-bar-photos-albums li{
+list-style-type: disc;
+}
+#side-bar-photos-albums ul li{
+  margin-left: 30px;
+  padding-left: 0px;
+	}
+#side-bar-photos-albums ul li a{
+  color: #1872A2;
+}
+.widget .tool.selected {
+  background: url("../../../view/theme/diabook/diabook-red/icons/selected.png") no-repeat left center;
+}
+/* widget: search */
+#add-search-popup {
+  width: 200px;
+  top: 18px;
+}
+/* section */
+section {
+  display: table-cell;
+  vertical-align: top;
+  width: 800px;
+  padding: 0px 0px 0px 12px;
+}
+body .pageheader{
+  text-align: center;
+  font-size: 20px;
+  margin-bottom: 20px;
+  margin-top: 0px;
+  max-width: 775px;
+	}
+.qcomment{
+  max-width: 122px;	
+	}
+#id_username {
+  width: 173px;	
+	}
+#id_password {
+  width: 173px;		
+	}
+#id_openid_url {
+  width: 173px;	
+	}
+#contact-edit-end {
+	}
+.pager {
+   padding: 10px;
+	text-align: center;
+	font-size: 1.0em;
+	clear: both;
+	display: block;
+}	
+
+.tabs {
+    
+    background-position: 0 -20px;
+    background-repeat: repeat-x;
+    height: 27px;
+    padding: 0;
+ }
+.tab.button {
+    margin-left: 5px;	
+    /*background: none repeat scroll 0 0 #F8F8F8;*/
+    border: 1px solid #CCCCCC;
+    border-radius: 3px 3px 3px 3px;
+    font-weight: normal;
+    padding: 3px;
+    color:  #333333;
+	}
+	
+#birthday-notice, #event-notice, #birthday-wrapper, #event-wrapper{
+	margin-bottom: 10px;
+	}
+/* wall item */
+.tread-wrapper {
+  border-bottom: 1px solid #D2D2D2;
+  position: relative;
+  padding: 5px;
+  margin-bottom: 0px;
+  width: 775px;
+  padding-top: 10px;
+}
+.tread-wrapper a{
+  color: red;
+}
+
+/*marker*/
+.wall-item-decor {
+  position: absolute;
+  left: 780px;
+  top: -10px;
+  width: 16px;
+}
+/*marker*/
+.wall-item-container {
+  display: table;
+  width: 770px;
+}
+.wall-item-photo-container .wall-item-item, .wall-item-container .wall-item-bottom {
+  display: table-row;
+}
+.wall-item-photo-container .wall-item-info {
+  display: table-cell;
+  vertical-align: top;
+  text-align: left;
+  width: 80px;
+}
+.wall-item-photo-container .wall-item-location {
+  padding-right: 40px;
+  display: table-cell;
+}
+.wall-item-photo-container .wall-item-ago {
+  word-wrap: break-word;
+  width: 50px;
+  margin-left: 10px;
+  color: #999;
+}
+/*marker*/
+.wall-item-photo-container .wall-item-content {
+
+  max-width: 690px;
+  word-wrap: break-word;
+  
+  margin-bottom: 14px;
+}
+.wall-item-photo-container .wall-item-content img {
+  max-width: 700px;
+}
+.wall-item-photo-container .wall-item-links, .wall-item-photo-container .wall-item-actions {
+  display: table-cell;
+  vertical-align: middle;
+}
+.wall-item-photo-container .wall-item-links .icon, .wall-item-photo-container .wall-item-actions .icon {
+  opacity: 0.5;
+  -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;
+}
+.wall-item-photo-container .wall-item-links .icon:hover, .wall-item-photo-container .wall-item-actions .icon: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;
+}
+.wall-item-photo-container .wall-item-name {
+  font-weight: bold;
+}
+.wall-item-photo-container .wall-item-actions-author {
+  width: 100%;
+  margin-bottom: 0.3em;
+}
+.wall-item-photo-container .wall-item-actions-social {
+  float: left;
+  margin-bottom: 1px;
+  display: table-cell;
+}
+.wall-item-photo-container .wall-item-actions-social a {
+  margin-right: 1em;
+}
+.wall-item-photo-container .wall-item-actions-tools {
+  float: right;
+  width: 80px;
+  display: table-cell;
+}
+.wall-item-photo-container .wall-item-actions-tools a {
+  float: right;
+}
+.wall-item-photo-container .wall-item-actions-tools input {
+  float: right;
+}
+.wall-item-photo-container.comment {
+  margin-top: 5px;
+  margin-bottom: 5px;
+  margin-left: 40px;
+  width: 650px;
+  border-bottom: 1px solid #D2D2D2;
+}
+.wall-item-photo-container.comment {
+  top: 15px !important;
+  left: 15px !important;
+}
+.wall-item-photo-container {
+  display: table;
+  width: 780px;
+}
+.my-comment-photo {
+  width: 48px;
+  margin-left: 40px;
+  margin-right: 32px;
+	}
+.comment-edit-preview {
+  width: 500px;
+  margin-top: 10px;
+}
+.comment-edit-text-empty {
+    width: 500px;
+    border: 1px solid #D2D2D2;
+    height: 3.2em;
+    color: #2d2d2d;
+}
+.comment-edit-text-full {
+  font-size: 12.5px;
+  height: 3.3em;
+  
+  border: 1px solid #D2D2D2;
+  width: 500px;
+}
+.comment-edit-photo {
+    margin: 10px 0 0;
+    display: table-cell;
+}
+
+
+.wall-item-container .wall-item-item, .wall-item-container .wall-item-bottom {
+  display: table-row;
+}
+.wall-item-bottom {
+  font-size: 13px;
+}
+.wall-item-container .wall-item-bottom {
+/*  opacity: 0.5;
+  -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; */
+}
+.wall-item-container:hover .wall-item-bottom {
+/*  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; */
+}
+.wall-item-container .wall-item-info {
+  display: table-cell;
+  vertical-align: top;
+  text-align: left;
+  width: 80px;
+}
+.wall-item-container .wall-item-location {
+  padding-right: 40px;
+  display: table-cell;
+}
+.wall-item-container .wall-item-ago {
+  word-wrap: break-word;
+  width: 50px;
+  margin-left: 10px;
+  color: #999;
+}
+.wall-item-location {
+  
+  clear: both;
+  overflow: hidden;
+  
+  margin-bottom: 5px;
+}
+
+/*marker*/
+.wall-item-container .wall-item-content {
+
+  max-width: 690px;
+  word-wrap: break-word;
+
+
+}
+
+.wall-item-container .wall-item-content img {
+  max-width: 700px;
+}
+.wall-item-container .wall-item-links, .wall-item-container .wall-item-actions {
+  display: table-cell;
+  vertical-align: middle;
+}
+.wall-item-container .wall-item-links .icon, .wall-item-container .wall-item-actions .icon {
+  opacity: 0.5;
+  -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;
+}
+.wall-item-container .wall-item-links .icon:hover, .wall-item-container .wall-item-actions .icon: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;
+}
+.wall-item-container .wall-item-name {
+  font-weight: bold;
+}
+.wall-item-container .wall-item-actions-author {
+  width: 100%;
+  margin-bottom: 0.3em;
+}
+.wall-item-container .wall-item-actions-social {
+  float: left;
+  margin-bottom: 1px;
+  display: table-cell;
+}
+.wall-item-container .wall-item-actions-social a {
+  margin-right: 1em;
+}
+.wall-item-actions-social a {
+  float: left;
+}
+.wall-item-container .wall-item-actions-tools {
+  float: right;
+  width: 80px;
+  display: table-cell;done
+}
+.wall-item-container .wall-item-actions-tools a {
+  float: right;
+}
+.wall-item-container .wall-item-actions-tools input {
+  float: right;
+}
+/*marker*/
+.wall-item-container.comment {
+  margin-top: 5px;
+  margin-bottom: 5px;
+  margin-left: 80px;
+  width: 690px;
+  border-bottom: 1px solid hsl(198, 21%, 79%);
+}
+.wall-item-container.comment .contact-photo {
+  width: 32px;
+  height: 32px;
+  margin-left: 16px;
+  /*background: url(../../../images/icons/22/user.png) no-repeat center center;*/
+
+}
+.wall-item-container.comment {
+  top: 15px !important;
+  left: 15px !important;
+}
+.wall-item-container.comment .wall-item-links {
+  padding-left: 12px;
+}
+.wall-item-comment-wrapper {
+  margin: 1px 5px 5px 80px;
+}
+.wall-item-comment-wrapper .comment-edit-photo {
+  display: none;
+}
+.wall-item-comment-wrapper textarea {
+  height: 2.0em;
+  width: 100%;
+  font-size: 10px;
+  color: #999999;
+  border: 1px solid #DDD;
+  padding: 0.3em;
+  font-size: 14px;
+}
+.wall-item-comment-wrapper .comment-edit-text-full {
+  font-size: 14px;
+  height: 4em;
+  color: #2d2d2d;
+  border: 1px solid #2d2d2d;
+}
+.comment-edit-preview {
+  width: 500px;
+  margin-top: 10px;
+  background-color:  #fff797;
+}
+.comment-edit-preview .contact-photo {
+  width: 32px;
+  height: 32px;
+  margin-left: 16px;
+  /*background: url(../../../images/icons/22/user.png) no-repeat center center;*/
+
+}
+.comment-edit-preview {
+  top: 15px !important;
+  left: 15px !important;
+}
+.comment-edit-preview .wall-item-links {
+  padding-left: 12px;
+}
+.comment-edit-preview .wall-item-container {
+  width: 700px;
+}
+.comment-edit-preview .tread-wrapper {
+  width: 700px;
+  padding: 0;
+  margin: 10px 0;
+}
+
+.shiny {
+  /* border-right: 10px solid #fce94f; */
+	border-right: 1px solid #A7C7F7;
+	padding-right: 12px;
+}
+
+#jot-preview-content{
+	margin-top: 30px;}
+	
+#jot-preview-content .tread-wrapper {
+  background-color: #fff797;
+}
+
+.wall-item-tags {
+  padding-top: 1px;
+  padding-bottom: 2px;
+}
+.tag {
+  /*background: url("../../../images/tag_b.png") repeat-x center left;*/
+  color: #999;
+  padding-left: 3px;
+  font-size: 12px;
+}
+.tag a {
+  padding-right: 5px;
+  /*background: url("../../../images/tag.png") no-repeat center right;*/
+  color: #999;
+}
+.wwto {
+  position: absolute !important;
+  width: 25px;
+  height: 25px;
+  background: #FFFFFF;
+  border: 2px solid #364e59;
+  height: 25px;
+  width: 25px;
+  overflow: hidden;
+  padding: 1px;
+  position: absolute !important;
+  top: 40px;
+  left: 30px;
+  -webkit-box-shadow: 0px 0px 10px rgba(0, 0, 0, 0.7);
+  -moz-box-shadow: 0px 0px 10px rgba(0, 0, 0, 0.7);
+  box-shadow: 0px 0px 10px rgba(0, 0, 0, 0.7);
+}
+.wwto .contact-photo {
+  width: auto;
+  height: 25px;
+}
+/* contacts menu */
+.contact-photo-wrapper {
+  position: relative;
+  width: 80px;
+}
+
+.contact-photo-wrapper.wwto {
+  width: 25px;
+}
+
+.contact-photo {
+  width: 48px;
+  height: 48px;
+  overflow: hidden;
+  display: block;
+}
+.contact-photo img {
+  width: 48px;
+  height: 48px;
+}
+
+.contact-wrapper {
+  float: left;
+  width: 90px;
+  height: 90px;
+  margin-bottom: 15px;
+}
+.contact-wrapper .contact-photo {
+  width: 80px;
+  height: 80px;
+}
+.contact-wrapper .contact-photo img {
+  width: 80px;
+  height: 80px;
+}
+.contact-wrapper {
+  left: 0px;
+  top: 63px;
+}
+.contact-photo {
+  width: 48px;
+  height: 48px;
+}
+.contact-photo img {
+  width: 48px;
+  height: 48px;
+}
+.contact-name {
+  /* text-align: center; */
+  /*font-weight: bold;*/
+  font-size: 12px;
+}
+.contact-details {
+  color: #999999;
+}
+/* editor */
+.jothidden {
+  display: none;
+}
+#jot {
+  width: 785px;
+  margin: 0px 2em 20px 0px;
+}
+#profile-jot-form #profile-jot-text {
+  height: 2.0em;
+  width: 99%;
+  font-size: 15px;
+  color: #999999;
+  border: 1px solid #DDD;
+  padding: 0.3em;
+  margin-bottom: 10px;
+}
+.grey
+{
+  display: inline;
+  float: right;	
+	}
+#jot #jot-tools {
+  margin: 0px;
+  padding: 0px;
+  height: 40px;
+  overflow: none;
+  width: 783px;
+  background-color: #fff;
+  border-bottom: 2px solid #9eabb0;
+}
+
+#jot #jot-tools li {
+  list-style: none;
+  float: left;
+  width: 80px;
+  height: 40px;
+  border-bottom: 2px solid #9eabb0;
+}
+#jot #jot-tools li a {
+  display: block;
+  color: #cccccc;
+  width: 100%;
+  height: 40px;
+  text-align: center;
+  line-height: 40px;
+  overflow: hidden;
+}
+#jot #jot-tools li:hover {
+  background-color: #364e59;
+  border-bottom: 2px solid #bdcdd4;
+}
+#jot #jot-tools li.perms {
+  float: right;
+  width: 40px;
+}
+#jot #jot-tools li.perms a.unlock {
+  width: 30px;
+  border-left: 10px solid #cccccc;
+  background-color: #cccccc;
+  background-position: left center;
+}
+#jot #jot-tools li.perms a.lock {
+  width: 30px;
+  border-left: 10px solid #666666;
+  background-color: #666666;
+}
+#jot #jot-tools li.submit {
+  float: right;
+  background-color: #cccccc;
+  border-bottom: 2px solid #cccccc;
+  border-right: 1px solid #666666;
+  border-left: 1px solid #666666;
+}
+#jot #jot-tools li.submit input {
+  border: 0px;
+  margin: 0px;
+  padding: 0px;
+  background-color: #cccccc;
+  color: #666666;
+  width: 80px;
+  height: 40px;
+  line-height: 40px;
+}
+#jot #jot-tools li.submit input:hover {
+  background-color: #bdcdd4;
+  color: #666666;
+}
+#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;
+}
+#profile-jot-form #jot-title, #profile-jot-form #jot-category {
+    
+  	 border-radius: 5px 5px 5px 5px;
+    font-weight: bold;
+    height: 20px;
+    margin: 0 0 5px;
+    width: 60%;
+    border: 1px solid #d2d2d2;
+}
+#profile-jot-form #jot-title:-webkit-input-placeholder {
+  font-weight: normal;
+}
+#profile-jot-form #jot-title:-moz-placeholder {
+  font-weight: normal;
+}
+#profile-jot-form #profile-jot-text_parent #profile-jot-text_tbl{
+	width: 785px;
+	height: 100px;
+	}
+#jot #jot-title:hover {
+  border: 1px solid #999999;
+}
+#jot #jot-title:focus {
+  border: 1px solid #999999;
+}
+#jot #character-counter {
+  width: 80px;
+  float: right;
+  text-align: right;
+  height: 20px;
+  line-height: 20px;
+  padding-right: 20px;
+}
+#jot-perms-icon, 
+#profile-location,
+#profile-nolocation,
+#profile-youtube, 
+#profile-video, 
+#profile-audio,
+#profile-link,
+#profile-title, 
+#wall-image-upload,
+#wall-file-upload,
+#wall-image-upload-div,
+#wall-file-upload-div,
+.hover, .focus {
+	cursor: pointer;
+	margin-top: 2px;
+}
+/*marker*/
+#profile-jot-wrapper{
+	margin: 0 20px 20px 0;
+   width: 785px;
+	}
+/*marker*/
+#profile-jot-submit-wrapper {
+	margin-bottom: 50px;
+	width: 785px;
+}
+
+#profile-jot-submit {
+	float: right;
+	margin-top: 2px;
+	font-size: 14px;
+}
+#profile-upload-wrapper {
+	float: left;
+	margin-top: 2px;
+	margin-left: 10px;
+	
+}
+#profile-attach-wrapper {
+	float: left;
+	margin-left: 15px;
+	margin-top: 2px;
+}
+#profile-rotator {
+	float: left;
+	margin-left: 30px;
+	margin-top: 2px;
+}
+#profile-link-wrapper {
+	float: left;
+	margin-left: 15px;
+	margin-top: 2px;
+}
+#profile-youtube-wrapper {
+	float: left;
+	margin-left: 15px;
+	margin-top: 2px;
+}
+#profile-video-wrapper {
+	float: left;
+	margin-left: 15px;
+	margin-top: 2px;
+}
+#profile-audio-wrapper {
+	float: left;
+	margin-left: 15px;
+	margin-top: 2px;
+}
+#profile-location-wrapper {
+	float: left;
+	margin-left: 15px;
+	margin-top: 2px;
+}
+#profile-jot-perms {
+	float: left;
+	margin-left: 45px;
+	margin-top: 2px;
+}
+#jot-preview-link {
+	float: right;
+	margin-left: 10px;
+	margin-top: 2px;
+	font-size: 9px;
+	font-weight: bolder;
+	cursor: pointer;
+}
+#profile-jot-perms{
+   float: right;
+	margin-left: 10px;
+	margin-top: 2px;	
+	}
+/** buttons **/
+.button.creation1 {
+    background-color: #fff;
+    border: 1px solid #777777;
+    border-radius: 3px 3px 3px 3px;
+    box-shadow: 0 1px 1px #CFCFCF;
+    font-weight: bolder;
+	 cursor: pointer;
+}
+.button.creation2 {
+    background-color: #FF500F;
+    border: 1px solid #777777;
+    color: white;
+    border-radius: 3px 3px 3px 3px;
+    box-shadow: 0 1px 1px #CFCFCF;
+    margin-left: 5px;
+    font-weight: bolder;
+	 cursor: pointer;
+}
+/*input[type="submit"] {
+	border: 0px;
+    background-color: @ButtonBackgroundColor;
+    color: @ButtonColor;
+    padding: 0px 10px;
+	.rounded(5px);
+    height: 18px;
+}*/
+/** acl **/
+#photo-edit-perms-select, #photos-upload-permissions-wrapper, #profile-jot-acl-wrapper {
+  display: block!important;
+}
+#acl-wrapper {
+  width: 690px;
+  float: left;
+}
+#acl-search {
+  float: right;
+  background: #ffffff url("../../../images/search_18.png") no-repeat right center;
+  padding-right: 20px;
+}
+#acl-showall {
+  float: left;
+  display: block;
+  width: auto;
+  height: 18px;
+  background-color: #cccccc;
+  background-image: url("../../../images/show_all_off.png");
+  background-position: 7px 7px;
+  background-repeat: no-repeat;
+  padding: 7px 5px 0px 30px;
+  color: #999999;
+  -moz-border-radius: 5px 5px 5px 5px;
+  -webkit-border-radius: 5px 5px 5px 5px;
+  border-radius: 5px 5px 5px 5px;
+}
+#acl-showall.selected {
+  color: #000000;
+  background-color: #ff9900;
+  background-image: url("../../../images/show_all_on.png");
+}
+#acl-list {
+  height: 210px;
+  border: 1px solid #cccccc;
+  clear: both;
+  margin-top: 30px;
+  overflow: auto;
+}
+.acl-list-item {
+  display: block;
+  width: 150px;
+  height: 30px;
+  border: 1px solid #cccccc;
+  margin: 5px;
+  float: left;
+}
+.acl-list-item img {
+  width: 22px;
+  height: 22px;
+  float: left;
+  margin: 4px;
+}
+.acl-list-item p {
+  height: 12px;
+  font-size: 10px;
+  margin: 0px;
+  padding: 2px 0px 1px;
+  overflow: hidden;
+}
+.acl-list-item a {
+  font-size: 8px;
+  display: block;
+  width: 40px;
+  height: 10px;
+  float: left;
+  color: #999999;
+  background-color: #cccccc;
+  background-position: 3px 3px;
+  background-repeat: no-repeat;
+  margin-right: 5px;
+  -webkit-border-radius: 2px ;
+  -moz-border-radius: 2px;
+  border-radius: 2px;
+  padding-left: 15px;
+}
+#acl-wrapper a:hover {
+  text-decoration: none;
+  color: #000000;
+}
+.acl-button-show {
+  background-image: url("../../../images/show_off.png");
+}
+.acl-button-hide {
+  background-image: url("../../../images/hide_off.png");
+}
+.acl-button-show.selected {
+  color: #000000;
+  background-color: #9ade00;
+  background-image: url("../../../images/show_on.png");
+}
+.acl-button-hide.selected {
+  color: #000000;
+  background-color: #ff4141;
+  background-image: url("../../../images/hide_on.png");
+}
+.acl-list-item.groupshow {
+  border-color: #9ade00;
+}
+.acl-list-item.grouphide {
+  border-color: #ff4141;
+}
+/** /acl **/
+/** tab buttons 14618a**/
+/*marker*/
+ul.tabs {
+  list-style-type: none;
+  padding-bottom: 10px;
+  font-size: 13px;
+  width: 805px;
+}
+ul.tabs li {
+  float: left;
+  margin-left: 5px;
+}
+ul.tabs li .active {
+    background-color: #535353;
+    border: 1px solid #777777;
+    color: white;
+    border-radius: 3px 3px 3px 3px;
+    box-shadow: 2px 2px 2px #CFCFCF;
+    margin-left: 5px;
+}
+//settings tabs
+ul.rs_tabs {
+  list-style-type: none;
+  font-size: 11px;
+}
+ul.rs_tabs li {
+  float: left;
+  margin-bottom: 30px;
+  clear: both;
+}
+ul.rs_tabs li .selected {
+    background-color: #535353;
+    border: 1px solid #777777;
+    color: white;
+    border-radius: 3px 3px 3px 3px;
+    box-shadow: 2px 2px 2px #CFCFCF;
+    font-size: 13px;
+}
+.rs_tabs {
+    list-style-type: none;
+    font-size: 11px;
+    background-position: 0 -20px;
+    background-repeat: repeat-x;
+    height: 27px;
+    padding: 0;
+ }
+.rs_tab.button {	
+    /*background: none repeat scroll 0 0 #F8F8F8;*/
+    border: 1px solid #CCCCCC;
+    border-radius: 3px 3px 3px 3px;
+    font-weight: bolder;
+    padding: 3px;
+    color:  #333333;
+    text-decoration: none;
+	}
+/**
+ * Form fields
+ */
+.field {
+  margin-bottom: 10px;
+  padding-bottom: 10px;
+  overflow: auto;
+  width: 100%;
+}
+.field label {
+  float: left;
+  width: 200px;
+}
+.field input, .field textarea {
+  width: 400px;
+}
+.field textarea {
+  height: 100px;
+}
+.field .field_help {
+  display: block;
+  margin-left: 200px;
+  color: #666666;
+}
+.field .onoff {
+  float: left;
+  width: 80px;
+}
+.field .onoff a {
+  display: block;
+  border: 1px solid #666666;
+  background-image: url("../../../images/onoff.jpg");
+  background-repeat: no-repeat;
+  padding: 4px 2px 2px 2px;
+  height: 16px;
+  text-decoration: none;
+}
+.field .onoff .off {
+  border-color: #666666;
+  padding-left: 40px;
+  background-position: left center;
+  background-color: #cccccc;
+  color: #666666;
+  text-align: right;
+}
+.field .onoff .on {
+  border-color: #204A87;
+  padding-right: 40px;
+  background-position: right center;
+  background-color: #D7E3F1;
+  color: #204A87;
+  text-align: left;
+}
+.field .hidden {
+  display: none!important;
+}
+.field.radio .field_help {
+  margin-left: 0px;
+}
+.suggest-select {
+width: 500px;
+height: 350px;	
+	}
+.message-to-select {
+	width: 400px;
+   height: 150px;
+	}
+#directory-search-form{
+	margin-bottom: 50px;
+	}
+#profile-edit-links-end {
+        clear: both;
+        margin-bottom: 15px;
+}
+
+#profile-edit-links ul { margin: 20px; padding-bottom: 20px; list-style: none; }
+
+#profile-edit-links li {
+  float: left;
+  list-style: none;
+  margin-left: 10px;
+}
+
+.profile-edit-side-div {
+  display: none;
+}
+
+#register-form label,
+#profile-edit-form label {
+        width: 300px; float: left;
+}
+
+.required {
+  display: inline;
+  color: #B20202;
+}
+
+/* oauth */
+.oauthapp {
+  height: auto;
+  overflow: auto;
+  border-bottom: 2px solid #cccccc;
+  padding-bottom: 1em;
+  margin-bottom: 1em;
+}
+.oauthapp img {
+  float: left;
+  width: 48px;
+  height: 48px;
+  margin: 10px;
+}
+.oauthapp img.noicon {
+  background-image: url("../../../images/icons/48/plugin.png");
+  background-position: center center;
+  background-repeat: no-repeat;
+}
+.oauthapp a {
+  float: left;
+}
+/* contacts */
+.contact-entry-wrapper {
+  width: 120px;
+  height: 120px;
+  float: left;
+}
+/* photo */
+.photo {
+box-shadow: 2px 2px 5px 0px #000000;
+margin: 0px;
+border-radius: 10px;
+height: 145px !important;
+width: 145px !important;
+}
+.lframe {
+  float: left;
+  /*margin: 0px 10px 10px 0px;*/
+}
+/* profile match wrapper */
+.profile-match-wrapper {
+  float: left;
+  width: 90px;
+  height: 90px;
+  margin-bottom: 20px;
+}
+.profile-match-wrapper .contact-photo {
+  width: 80px;
+  height: 80px;
+}
+.profile-match-wrapper .contact-photo img {
+  width: 80px;
+  height: 80px;
+}
+.profile-match-wrapper {
+  left: 0px;
+  top: 63px;
+}
+
+.contact-photo-menu-button {
+        position: relative;
+        background-image: url("../../../images/icons/16/menu.png");
+        background-position: top left; 
+        background-repeat: no-repeat;
+        margin: 0px 0px -16px 0px; 
+	padding: 0px;
+        width: 16px;
+        height: 16px;
+        top: -16px; left:0px;
+        overflow: hidden;
+        text-indent: 40px;
+        display: none;
+        
+}
+.contact-photo-menu {
+        width: 11em;
+        border: 3px solid #364e59;
+	color: #2d2d2d;
+        background: #FFFFFF;
+/*        position: absolute;*/
+        position: relative;
+        left: 0px; top: 0px;
+        display: none;
+        z-index: 10000;
+}
+.contact-photo-menu ul { margin:0px; padding: 0px; list-style: none }
+.contact-photo-menu li a {
+	display: block; 
+	padding: 5px 10px; 
+	color: #2d2d2d;
+	text-decoration: none;
+}
+.contact-photo-menu li a:hover {
+	background-color: #bdcdd4; 
+}
+
+/* page footer */
+footer {
+  height: 100px;
+  display: table-row;
+}
+
+blockquote {
+    border-left: 1px solid #D2D2D2;
+    padding-left: 9px;
+    margin: 0 0 0 .8ex;
+	 color: #777;
+}
+.oembed {
+	
+	font-weight: bold;
+}
+.aprofile dt{
+box-shadow: 1px 1px 5px 0;
+    color: #666666;
+    margin: 15px 0 5px;
+    padding-left: 5px;	
+	}
+/* ================== */
+/* = Contacts Block = */
+/* ================== */
+
+.contact-block-img {
+        width: 55px;
+        height: 55px;
+        padding-right: 3px;
+}
+.contact-block-div {
+        float: left;
+}
+
+.contact-block-textdiv { width: 150px; height: 34px; float: left; }
+#contact-block-end { clear: both; } 
+
+#group-edit-wrapper {
+        margin-bottom: 10px;
+}
+
+#group-members-end {
+        clear: both;
+}
+#group-edit-desc {
+ margin-top: 15px;
+}
+
+/*
+#group-separator,
+#prof-separator { display: none;}
+*/
+#prof-members-end{
+	clear: both;
+	}
+
+#prvmail-to-label, #prvmail-subject-label, #prvmail-message-label {
+	margin-bottom: 10px;
+	margin-top: 20px;
+}
+
+#prvmail-submit {
+	float: right;
+	margin-top: 10px;
+}
+
+#prvmail-subject
+{
+background: none repeat scroll 0 0 #FFFFFF;
+border: 1px solid #CCCCCC;
+border-radius: 5px 5px 5px 5px;
+font-weight: bold;
+height: 20px;
+margin: 0 0 5px;
+vertical-align: middle;
+}
+#prvmail-form{
+ width: 597px;	
+	}
+	
+#prvmail-upload-wrapper,
+#prvmail-link-wrapper,
+#prvmail-rotator-wrapper {
+	float: left;
+	margin-top: 10px;
+	margin-right: 10px;
+	width: 24px;
+}
+
+#prvmail-end {
+	clear: both;
+}
+
+.mail-list-sender,
+.mail-list-detail {
+	float: left;
+}
+.mail-list-detail {
+	margin-left: 20px;
+}
+
+.mail-list-subject {
+	font-size: 1.1em;
+	margin-top: 10px;
+}
+a.mail-list-link {
+    display: block;
+    font-size: 1.3em;
+    padding: 4px 0;
+}
+
+/*
+*a.mail-list-link:hover {
+*	background-color: #15607B;
+*	color: #F5F6FB;
+*}
+*/
+
+.mail-list-outside-wrapper-end {
+	clear: both;
+}
+
+.mail-list-outside-wrapper {
+	margin-top: 30px;
+}
+
+.mail-list-delete-wrapper {
+	float: right;
+	margin-right: 30px;
+	margin-top: 15px;
+}
+
+.mail-list-delete-icon {
+	border: none;
+}
+
+.mail-conv-sender,
+.mail-conv-detail {
+	float: left;
+}
+.mail-conv-detail {
+	margin-left: 20px;
+	width: 500px;
+}
+
+.mail-conv-subject {
+    font-size: 1.4em;
+    margin: 10px 0;
+}
+
+.mail-conv-outside-wrapper-end {
+	clear: both;
+}
+
+.mail-conv-outside-wrapper {
+	margin-top: 30px;
+}
+
+.mail-conv-delete-wrapper {
+	float: right;
+	margin-right: 30px;
+	margin-top: 15px;
+}
+.mail-conv-break {
+	clear: both;
+}
+
+.mail-conv-delete-icon {
+	border: none;
+}
+
+/* ========== */
+/* = Events = */
+/* ========== */
+.eventcal {
+        float: left;
+        font-size: 20px;
+}
+
+.vevent {
+position: relative;
+width: 400px;
+padding: 20px;
+padding-top: 10px;
+margin: 0 0px;
+margin-bottom: 10px;
+background-color: white;
+-webkit-box-shadow: 0 0 4px rgba(0, 0, 0, 0.2), inset 0 0 50px rgba(0, 0, 0, 0.1);
+-moz-box-shadow: 0 0 4px rgba(0, 0, 0, 0.2), inset 0 0 50px rgba(0, 0, 0, 0.1);
+box-shadow: 0 0 5px rgba(0, 0, 0, 0.2), inset 0 0 50px rgba(0, 0, 0, 0.1);
+}
+.vevent .event-location {
+        margin-left: 10px;
+        margin-right: 10px;
+}
+.vevent .event-description {
+margin-left: 10px;
+margin-right: 10px;
+font-size: 1.1em;
+font-weight: bolder;
+}
+.vevent .event-start, .vevent .event-end {
+
+margin-right: 20px;
+margin-bottom: 2px;
+margin-top: 2px;
+font-size: 0.9em;
+text-align: left;
+}
+.event-start .dtstart, .event-end .dtend {
+float: right;
+}
+
+
+#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("../../../view/theme/diabook/icons/events2.png") !important;
+        margin-right: 15px;
+}
+
+.event-start, .event-end {
+        margin-left: 10px;
+        width: 330px;
+        clear: both;
+}
+
+.event-start .dtstart, .event-end .dtend {
+        float: right;
+}
+
+.event-list-date {
+        margin-bottom: 10px;
+}
+
+.prevcal, .nextcal {
+        float: left;
+        margin-left: 32px;
+        margin-right: 32px;
+        margin-top: 64px;
+}
+.event-calendar-end {
+        clear: both;
+}
+
+ 
+.calendar {
+        font-family: Courier, monospace;
+}
+.calendar.eventcal a {
+  color: #1872A2;	
+	}
+.today {
+        font-weight: bold;
+        color: #FF0000;
+}
+
+.settings-block {
+        border: 1px solid #AAA;
+        margin: 10px;
+        padding: 10px;
+}
+
+.app-title {
+        margin: 10px;
+}
+
+#identity-manage-desc {
+        margin-top:15px;
+        margin-bottom: 15px;
+}
+
+#identity-manage-choose {
+        margin-bottom: 15px;
+}
+
+#identity-submit {
+        margin-top: 20px;
+}
+
+#photo-prev-link, #photo-next-link {
+        padding: 10px;
+        float: left;
+}
+.lightbox{
+	float: left;
+	}
+#photo-photo {
+        float: left;
+}
+#photo-like-div .wall-item-like-buttons {
+	float: left;
+   margin-right: 10px;
+	}
+.wall-item-like-buttons .icon.like {
+float: left;
+}
+
+#photo-photo-end {
+        clear: both;
+}
+
+.tabs .comment-wwedit-wrapper {
+	display: block;
+   margin-top: 30px;
+   margin-left: 50px;
+	}
+
+.profile-match-photo {
+        float: left;
+        text-align: center;
+        width: 120px;
+}
+
+.profile-match-name {
+        float: left;
+        text-align: center;
+        width: 120px;
+        overflow: hidden;
+}
+
+.profile-match-break,
+.profile-match-end {
+        clear: both;
+}
+
+.profile-match-connect {
+        text-align: center;
+        font-weight: bold;
+}
+
+.profile-match-wrapper {
+        float: left;
+        padding: 10px;
+        width: 120px;
+        height: 120px;
+        scroll: auto;
+}
+#profile-match-wrapper-end {
+        clear: both;
+}
+
+/* ============= */
+/* = Directory = */
+/* ============= */
+/* contacts menu */
+.contact-photo-wrapper {
+  position: relative;
+}
+.contact-photo {
+  width: 48px;
+  height: 48px;
+  overflow: hidden;
+  display: block;
+}
+.contact-photo img {
+  width: 48px;
+  height: 48px;
+}
+.contact-photo-menu-button {
+  display: none;
+  /* position: absolute; */
+  /* position: absolute; */
+  left: 0px;
+  top: -16px;
+}
+.contact-wrapper {
+  float: left;
+  width: 90px;
+  height: 90px;
+  margin-bottom: 15px;
+}
+.contact-wrapper .contact-photo {
+  width: 80px;
+  height: 80px;
+}
+.contact-wrapper .contact-photo img {
+  width: 80px;
+  height: 80px;
+}
+.contact-wrapper .contact-photo-menu-button {
+  left: 0px;
+  top: 63px;
+}
+.directory-item {
+  float: left;
+  width: 200px;
+  height: 200px;
+}
+.directory-item .contact-photo {
+  width: 175px;
+  height: 175px;
+}
+.directory-item .contact-photo img {
+  width: 175px;
+  height: 175px;
+}
+.contact-name {
+  text-align: left;
+  font-weight: bold;
+  font-size: 12px;
+}
+.contact-details {
+  color: #999999;
+}
+#side-bar-photos-albums{
+	margin-top: 15px;	
+	}
+.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-album-image-wrapper, .photo-top-image-wrapper {
+  float: left;
+   -moz-box-shadow: 0 0 5px #888;
+   -webkit-box-shadow: 0 0 5px #888;
+   box-shadow: 0 0 5px #888;
+  background-color: #000;
+   -webkit-border-radius: 5px;
+   -moz-border-radius: 5px;
+  border-radius: 5px;
+  padding-bottom: 20px;
+  position: relative;
+  margin: 0 10px 10px 0;
+  width: 200px; height: 140px;
+  overflow: hidden;  
+}
+.photo-top-album-name {
+        width: 100%;
+        position: absolute; 
+        bottom: 0px; 
+        padding-left: 3px;
+        background-color: #EEE;
+}
+.photo-top-album-link{
+  color: #1872A2;
+	}
+.photo-top-album-img{
+	
+	}
+/*.photo-top-image-wrapper {
+        position: relative;
+        float: left;
+        margin-top: 15px;
+        margin-right: 15px;
+        width: 200px; height: 200px; 
+        overflow: hidden; 
+}
+.photo-top-album-name {
+        width: 100%;
+        min-height: 2em;
+        position: absolute; 
+        bottom: 0px; 
+        padding: 0px 3px;
+        padding-top: 0.5em;
+        background-color: rgb(255, 255, 255);
+}*/
+#photo-top-end {
+        clear: both;
+}
+
+#photo-top-links {
+        margin-bottom: 30px;
+        margin-left: 30px;
+}
+
+#photos-upload-newalbum-div {
+        float: left;
+        width: 175px;
+}
+
diff --git a/view/theme/diabook-red/style.css b/view/theme/diabook/diabook-red/style.css
index 578a5473a..856a5d08a 100644
--- a/view/theme/diabook-red/style.css
+++ b/view/theme/diabook/diabook-red/style.css
@@ -82,71 +82,103 @@
 #adminpage table tr:hover { background-color: #eeeeee; }
 #adminpage .selectall { text-align: right; }
 /* icons */
-
+.icon.bb-url{
+  background-image: url("../../../view/theme/diabook/diabook-red/icons/bb-url.png");
+  float: right;
+  margin-top: 2px;}
+.icon.quote{
+  background-image: url("../../../view/theme/diabook/diabook-red/icons/quote.png");
+  float: right;
+  margin-top: 2px;}
+.icon.bold{
+  background-image: url("../../../view/theme/diabook/diabook-red/icons/bold.png");
+  float: right;
+  margin-top: 2px;}
+.icon.underline{
+  background-image: url("../../../view/theme/diabook/diabook-red/icons/underline.png");
+  float: right;
+  margin-top: 2px;}
+.icon.italic{
+  background-image: url("../../../view/theme/diabook/diabook-red/icons/italic.png");
+  float: right;
+  margin-top: 2px;}
+.icon.bb-image{
+  background-image: url("../../../view/theme/diabook/diabook-red/icons/bb-image.png");
+  float: right;
+  margin-top: 2px;}
+.icon.bb-video{
+  background-image: url("../../../view/theme/diabook/diabook-red/icons/bb-video.png");
+  float: right;
+  margin-top: 2px;}
+  
 .icon.contacts {
-  background-image: url("../../../view/theme/diabook-red/icons/contacts.png");}
+  background-image: url("../../../view/theme/diabook/diabook-red/icons/contacts.png");}
 .icon.notifications {
-  background-image: url("../../../view/theme/diabook-red/icons/notifications.png");}
+  background-image: url("../../../view/theme/diabook/diabook-red/icons/notifications.png");}
 .icon.notify {
-  background-image: url("../../../view/theme/diabook-red/icons/notify.png");}
+  background-image: url("../../../view/theme/diabook/diabook-red/icons/notify.png");}
 .icon.messages {
-  background-image: url("../../../view/theme/diabook-red/icons/messages.png");}
+  background-image: url("../../../view/theme/diabook/diabook-red/icons/messages.png");}
 .icon.community {
-  background-image: url("../../../view/theme/diabook-red/icons/community.png");}
+  background-image: url("../../../view/theme/diabook/diabook-red/icons/community.png");}
   
-.icon.drop 	{ background-image: url("../../../view/theme/diabook-red/icons/drop.png");}
-.icon.drophide 	{ background-image: url("../../../view/theme/diabook-red/icons/drop.png");}
-.icon.dislike 	{ background-image: url("../../../view/theme/diabook-red/icons/dislike.png");}
-.icon.like 	{ background-image: url("../../../view/theme/diabook-red/icons/like.png");}
-.icon.pencil 	{ background-image: url("../../../view/theme/diabook-red/icons/pencil.png");}
-.icon.recycle 	{ background-image: url("../../../view/theme/diabook-red/icons/recycle.png");}
-.icon.remote-link { background-image: url("../../../view/theme/diabook-red/icons/remote.png");}
-.icon.tagged    { background-image: url("../../../view/theme/diabook-red/icons/tagged.png");}
-.icon.file-as { background-image: url("../../../view/theme/diabook-red/icons/file_as.png");}
-.star-item.icon.unstarred { background-image: url("../../../view/theme/diabook-red/icons/unstarred.png");}
-.star-item.icon.starred { background-image: url("../../../view/theme/diabook-red/icons/starred.png");}
-.icon.link		{ background-image: url("../../../view/theme/diabook-red/icons/link.png");}
-.icon.lock		{ background-image: url("../../../view/theme/diabook-red/icons/lock.png");}
-.icon.unlock		{ background-image: url("../../../view/theme/diabook-red/icons/unlock.png");}
-.icon.language    { background-image: url("../../../view/theme/diabook-red/icons/language.png");}
-
-
-.camera 	{ background-image: url("../../../view/theme/diabook-red/icons/camera.png"); 
+.icon.drop 	{ background-image: url("../../../view/theme/diabook/diabook-red/icons/drop.png");}
+.icon.drophide 	{ background-image: url("../../../view/theme/diabook/diabook-red/icons/drop.png");}
+.icon.dislike 	{ background-image: url("../../../view/theme/diabook/diabook-red/icons/dislike.png");}
+.icon.like 	{ background-image: url("../../../view/theme/diabook/diabook-red/icons/like.png");}
+.icon.pencil 	{ background-image: url("../../../view/theme/diabook/diabook-red/icons/pencil.png");}
+.icon.recycle 	{ background-image: url("../../../view/theme/diabook/diabook-red/icons/recycle.png");}
+.icon.remote-link { background-image: url("../../../view/theme/diabook/diabook-red/icons/remote.png");}
+.icon.tagged    { background-image: url("../../../view/theme/diabook/diabook-red/icons/tagged.png");}
+.icon.file-as { background-image: url("../../../view/theme/diabook/diabook-red/icons/file_as.png");}
+.star-item.icon.unstarred { background-image: url("../../../view/theme/diabook/diabook-red/icons/unstarred.png");}
+.star-item.icon.starred { background-image: url("../../../view/theme/diabook/diabook-red/icons/starred.png");}
+.icon.link		{ background-image: url("../../../view/theme/diabook/diabook-red/icons/link.png");}
+.icon.lock		{ background-image: url("../../../view/theme/diabook/diabook-red/icons/lock.png");}
+.icon.unlock		{ background-image: url("../../../view/theme/diabook/diabook-red/icons/unlock.png");}
+.icon.language    { background-image: url("../../../view/theme/diabook/diabook-red/icons/language.png");}
+
+
+.camera 	{ background-image: url("../../../view/theme/diabook/diabook-red/icons/camera.png"); 
 			  display: block; width: 28px; height: 28px; background-repeat: no-repeat;
 			  }
-.attach 	{ background-image: url("../../../view/theme/diabook-red/icons/attach.png"); 
+.attach 	{ background-image: url("../../../view/theme/diabook/diabook-red/icons/attach.png"); 
 			  display: block; width: 28px; height: 28px; background-repeat: no-repeat;
 			  }
-.video2 	{ background-image: url("../../../view/theme/diabook-red/icons/video.png"); 
+.video2 	{ background-image: url("../../../view/theme/diabook/diabook-red/icons/video.png"); 
 			  display: block; width: 28px; height: 28px; background-repeat: no-repeat;
 			  }	
-.video 	{ background-image: url("../../../view/theme/diabook-red/icons/video.png"); 
-			  display: block; width: 100%; height: 28px; background-repeat: no-repeat;
+.video 	{ background-image: url("../../../view/theme/diabook/diabook-red/icons/video.png"); 
+			  display: block; width: 100%; height: 140px; background-repeat: no-repeat;
 			  }
-.audio2 	{ background-image: url("../../../view/theme/diabook-red/icons/audio.png"); 
+.audio2 	{ background-image: url("../../../view/theme/diabook/diabook-red/icons/audio.png"); 
 			  display: block; width: 28px; height: 28px; background-repeat: no-repeat;
 			  }
-.audio 	{ background-image: url("../../../view/theme/diabook-red/icons/audio.png"); 
+.audio 	{ background-image: url("../../../view/theme/diabook/diabook-red/icons/audio.png"); 
 			  display: block; width: 28px; height: 28px; background-repeat: no-repeat;
 			  }
-.weblink 	{ background-image: url("../../../view/theme/diabook-red/icons/weblink.png"); 
+.weblink 	{ background-image: url("../../../view/theme/diabook/diabook-red/icons/weblink.png"); 
 			  display: block; width: 28px; height: 28px; background-repeat: no-repeat;
 			  }
-.globe 	{ background-image: url("../../../view/theme/diabook-red/icons/globe.png"); 
+.globe 	{ background-image: url("../../../view/theme/diabook/diabook-red/icons/globe.png"); 
 			  display: block; width: 28px; height: 28px; background-repeat: no-repeat;
 			  }
-.unglobe 	{ background-image: url("../../../view/theme/diabook-red/icons/unglobe.png"); 
+.unglobe 	{ background-image: url("../../../view/theme/diabook/diabook-red/icons/unglobe.png"); 
 			  display: block; width: 28px; height: 28px; background-repeat: no-repeat;
 			  }
-.edit    {background-image: url("../../../view/theme/diabook-red/icons/pencil2.png"); 
+.edit    {background-image: url("../../../view/theme/diabook/diabook-red/icons/pencil2.png"); 
 			  display: block; width: 28px; height: 28px; background-repeat: no-repeat;}
-			  
+.icon.block   {background-image: url("../../../view/theme/diabook/icons/block.png"); 
+			  display: block; width: 16px; height: 16px; background-repeat: no-repeat;}
+.icon.block.dim  {background-image: url("../../../view/theme/diabook/icons/block.png"); 
+			  display: block; width: 16px; height: 16px; background-repeat: no-repeat; opacity: 0.3;}
+.icon.ad_drop 	{ background-image: url("../../../view/theme/diabook/icons/drop.png");
+			  display: block; margin-left:5px; width: 16px; height: 16px; background-repeat: no-repeat;}			  
 			  
 
 
 .article	{ background-position: -50px  0px;}
 /*.audio 		{ background-position: -70px  0px;}*/
-.block 		{ background-position: -90px  0px;}
 /*.drop 		{ background-position: -110px 0px;}*/
 /*.drophide 	{ background-position: -130px 0px;}*/
 /*.edit 		{ background-position: -150px 0px;}*/
@@ -176,10 +208,10 @@
 /*.language       { background-position: -210px -40px;}*/
 
 
-.icon.on             { background-image: url("../../../view/theme/diabook-red/icons/toogle_on.png"); background-repeat: no-repeat;}
-.icon.off            { background-image: url("../../../view/theme/diabook-red/icons/toogle_off.png"); background-repeat: no-repeat;}
-.icon.prev           { background-image: url("../../../view/theme/diabook-red/icons/prev.png"); background-repeat: no-repeat;}
-.icon.next           { background-image: url("../../../view/theme/diabook-red/icons/next.png"); background-repeat: no-repeat;}
+.icon.on             { background-image: url("../../../view/theme/diabook/diabook-red/icons/toogle_on.png"); background-repeat: no-repeat;}
+.icon.off            { background-image: url("../../../view/theme/diabook/diabook-red/icons/toogle_off.png"); background-repeat: no-repeat;}
+.icon.prev           { background-image: url("../../../view/theme/diabook/diabook-red/icons/prev.png"); background-repeat: no-repeat;}
+.icon.next           { background-image: url("../../../view/theme/diabook/diabook-red/icons/next.png"); background-repeat: no-repeat;}
 /*.tagged     { background-position: -130px -60px;}*/
 
 .attachtype {
@@ -215,12 +247,12 @@
 }
 
 .icon.border.camera{
-  background-image: url("../../../view/theme/diabook-red/icons/camera.png"); 
+  background-image: url("../../../view/theme/diabook/diabook-red/icons/camera.png"); 
   display: block; width: 28px; height: 28px; background-repeat: no-repeat;
 	}
 	
 .icon.border.link{
-  background-image: url("../../../view/theme/diabook-red/icons/weblink.png"); 
+  background-image: url("../../../view/theme/diabook/diabook-red/icons/weblink.png"); 
   display: block; width: 28px; height: 28px; background-repeat: no-repeat;
   margin-left: 10px;
 	}
@@ -399,6 +431,12 @@ body {
   margin: 50px auto auto;
   display: table;
 }
+
+#jappix_mini {
+right: 45px !important;
+}
+
+
 h4 {
   font-size: 1.1em;
 }
@@ -447,6 +485,24 @@ a:hover {
   /*color: #005c94; */
   text-decoration: underline;
 }
+.intro-end {
+	border-bottom: 1px solid black;
+   clear: both;
+   margin-bottom: 25px;
+   padding-bottom: 25px;
+   width: 75%;
+	}
+.intro-form-end {
+	clear: both;
+	}
+.intro-fullname {
+	padding-bottom: 5px;
+   padding-top: 5px;
+	}
+.intro-wrapper-end {
+	clear: both;
+   padding-bottom: 5px;
+	}
 code {
   font-family: Courier, monospace;
   white-space: pre;
@@ -480,8 +536,9 @@ code {
 }
 #saved-search-ul .tool:hover,
 #nets-sidebar .tool:hover,
-#sidebar-group-list .tool:hover {
-	background: #EEE;
+#sidebar-group-list .tool:hover,
+#fileas-sidebar .tool:hover {
+	background: #FFE499;
 }
 .tool .label {
   float: left;
@@ -579,6 +636,7 @@ header #banner #logo-text {
   font-weight: bold;
   padding: 1em 0px;
   text-decoration: none;
+  background-color: red;
 }
 .mail-list-wrapper {
   background-color: #f6f7f8;
@@ -849,15 +907,15 @@ nav #nav-site-linkmenu .menu-popup {
 }
 
 nav #nav-messages-linkmenu.on .icon.messages, nav #nav-messages-linkmenu.selected .icon.messages{
-	background-image: url("../../../view/theme/diabook-red/icons/messages2.png");
+	background-image: url("../../../view/theme/diabook/diabook-red/icons/messages2.png");
 	}
 	
 /*nav #nav-notifications-linkmenu.on .icon.notify,*/ nav #nav-notifications-linkmenu.selected .icon.notify{
-	background-image: url("../../../view/theme/diabook-red/icons/notify2.png");
+	background-image: url("../../../view/theme/diabook/diabook-red/icons/notify2.png");
 	}
 	
 nav #nav-contacts-linkmenu.on .icon.contacts, nav #nav-contacts-linkmenu.selected .icon.contacts{
-	background-image: url("../../../view/theme/diabook-red/icons/contacts2.png");
+	background-image: url("../../../view/theme/diabook/diabook-red/icons/contacts2.png");
 	}
 	
 nav #nav-apps-link.selected {
@@ -1013,44 +1071,57 @@ ul.menu-popup .empty {
 	}
 .menu-profile-list{
   height: auto;
-  overflow: auto;
-  padding-top: 3px;
-  padding-bottom: 3px;
-  padding-left: 16px;
+  overflow: auto;  
   min-height: 16px;
   list-style: none;
 	}
 .menu-profile-list:hover{
-	background: #EEE;
+	background: #FFE499; 
 	}
 .menu-profile-list-item{
 	padding-left: 5px;
+	vertical-align: middle;
 	}	
 .menu-profile-list-item:hover{	
 	text-decoration: none;
    }
 /*http://prothemedesign.com/circular-icons/*/
-.menu-profile-list.home{
-	background: url("../../../view/theme/diabook-red/icons/home.png") no-repeat;
-	}
-.menu-profile-list.photos{
-	background: url("../../../view/theme/diabook-red/icons/mess_side.png") no-repeat;
-	}
-.menu-profile-list.events{
-	background: url("../../../view/theme/diabook-red/icons/events.png") no-repeat;
-	}
-.menu-profile-list.notes{
-	background: url("../../../view/theme/diabook-red/icons/notes.png") no-repeat;
-	}
-.menu-profile-list.foren{
-	background: url("../../../view/theme/diabook-red/icons/pubgroups.png") no-repeat;
-	}
-.menu-profile-list.com_side{
-	background: url("../../../view/theme/diabook-red/icons/com_side.png") no-repeat;
-	}
-.menu-profile-list.pscontacts{
-	background: url("../../../view/theme/diabook-red/icons/pscontacts.png") no-repeat;
+.menu-profile-icon.home{
+	background: url("../../../view/theme/diabook/diabook-red/icons/home.png") no-repeat;
+	float: left;
+	height: 22px;
+	width: 22px;
 	}
+.menu-profile-icon.photos{
+	background: url("../../../view/theme/diabook/diabook-red/icons/mess_side.png") no-repeat;
+	float: left;
+	height: 22px;
+   width: 22px;}
+.menu-profile-icon.events{
+	background: url("../../../view/theme/diabook/diabook-red/icons/events.png") no-repeat;
+	float: left;
+	height: 22px;
+   width: 22px;}
+.menu-profile-icon.notes{
+	background: url("../../../view/theme/diabook/diabook-red/icons/notes.png") no-repeat;
+	float: left;
+	height: 22px;
+   width: 22px;}
+.menu-profile-icon.foren{
+	background: url("../../../view/theme/diabook/diabook-red/icons/pubgroups.png") no-repeat;
+	float: left;
+	height: 22px;
+   width: 22px;}
+.menu-profile-icon.com_side{
+	background: url("../../../view/theme/diabook/diabook-red/icons/com_side.png") no-repeat;
+	float: left;
+	height: 22px;
+   width: 22px;}
+.menu-profile-icon.pscontacts{
+	background: url("../../../view/theme/diabook/diabook-red/icons/pscontacts.png") no-repeat;
+	float: left;
+	height: 22px;
+   width: 22px;}
 /* aside */
 aside {
   display: table-cell;
@@ -1061,6 +1132,7 @@ aside {
   float: left;
   /* background: #F1F1F1; */
 }
+aside #page-sidebar{display: none;}
 aside .vcard .fn {
   font-size: 18px;
   font-weight: bold;
@@ -1157,6 +1229,53 @@ aside #side-peoplefind-url {
   float: left;
   margin-right: 20px;		
 	}
+#login-submit-wrapper{
+margin-bottom: 15px;
+	}
+.group_selected {
+  background: url("../../../view/theme/diabook/icons/selected.png") no-repeat left center;
+  float: left;
+  height: 22px;
+  width: 22px;
+}
+.group_unselected {
+  background: url("../../../view/theme/diabook/icons/unselected.png") no-repeat left center;
+  float: left;
+  height: 22px;
+  width: 22px;
+}
+.icon.text_add		{ 
+		background-image: url("../../../images/icons/16/add.png");
+		float: right;
+		opacity: 0.2;
+		margin-right: 14px;
+		}
+.icon.text_add:hover	{ 
+		background-image: url("../../../images/icons/16/add.png");
+		float: right;
+		cursor: pointer;
+		margin-right: 14px;
+		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;
+		}
+.icon.text_edit {
+  background-image: url("../../../images/icons/10/edit.png");
+  opacity: 0.2;
+  margin-top: 6px;
+  float: right;
+  height: 10px;
+}
+.icon.text_edit:hover {
+  background-image: url("../../../images/icons/10/edit.png");
+  opacity: 1;
+  margin-top: 6px;
+  float: right;
+  height: 10px;
+}
 /* widget */
 .widget {
   margin-bottom: 2em;
@@ -1227,7 +1346,7 @@ list-style-type: disc;
   color: #1872A2;
 }
 .widget .tool.selected {
-  background: url("../../../view/theme/diabook-red/icons/selected.png") no-repeat left center;
+  background: url("../../../view/theme/diabook/diabook-red/icons/selected.png") no-repeat left center;
 }
 /* widget: search */
 #add-search-popup {
@@ -1243,10 +1362,14 @@ section {
 }
 body .pageheader{
   text-align: center;
-  margin-top: 25px;
-  font-size: 0px;
+  font-size: 20px;
+  margin-bottom: 20px;
+  margin-top: 0px;
+  max-width: 775px;
+	}
+.qcomment{
+  max-width: 122px;	
 	}
-
 #id_username {
   width: 173px;	
 	}
@@ -1274,7 +1397,6 @@ body .pageheader{
     padding: 0;
  }
 .tab.button {
-    margin-right: 5px; 
     margin-left: 5px;	
     /*background: none repeat scroll 0 0 #F8F8F8;*/
     border: 1px solid #CCCCCC;
@@ -1294,6 +1416,7 @@ body .pageheader{
   padding: 5px;
   margin-bottom: 0px;
   width: 775px;
+  padding-top: 10px;
 }
 .tread-wrapper a{
   color: red;
@@ -1310,6 +1433,122 @@ body .pageheader{
   display: table;
   width: 780px;
 }
+.wall-item-photo-container .wall-item-item, .wall-item-container .wall-item-bottom {
+  display: table-row;
+}
+.wall-item-photo-container .wall-item-info {
+  display: table-cell;
+  vertical-align: top;
+  text-align: left;
+  width: 80px;
+}
+.wall-item-photo-container .wall-item-location {
+  padding-right: 40px;
+  display: table-cell;
+}
+.wall-item-photo-container .wall-item-ago {
+  word-wrap: break-word;
+  width: 50px;
+  margin-left: 10px;
+  color: #999;
+}
+.wall-item-photo-container .wall-item-content {
+
+  max-width: 720px;
+  word-wrap: break-word;
+
+  margin-bottom: 14px;
+}
+.wall-item-photo-container .wall-item-content img {
+  max-width: 700px;
+}
+.wall-item-photo-container .wall-item-links, .wall-item-photo-container .wall-item-actions {
+  display: table-cell;
+  vertical-align: middle;
+}
+.wall-item-photo-container .wall-item-links .icon, .wall-item-photo-container .wall-item-actions .icon {
+  opacity: 0.5;
+  -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;
+}
+.wall-item-photo-container .wall-item-links .icon:hover, .wall-item-photo-container .wall-item-actions .icon: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;
+}
+.wall-item-photo-container .wall-item-name {
+  font-weight: bold;
+}
+.wall-item-photo-container .wall-item-actions-author {
+  width: 100%;
+  margin-bottom: 0.3em;
+}
+.wall-item-photo-container .wall-item-actions-social {
+  float: left;
+  margin-bottom: 1px;
+  display: table-cell;
+}
+.wall-item-photo-container .wall-item-actions-social a {
+  margin-right: 1em;
+}
+.wall-item-photo-container .wall-item-actions-tools {
+  float: right;
+  width: 80px;
+  display: table-cell;
+}
+.wall-item-photo-container .wall-item-actions-tools a {
+  float: right;
+}
+.wall-item-photo-container .wall-item-actions-tools input {
+  float: right;
+}
+.wall-item-photo-container.comment {
+  margin-top: 5px;
+  margin-bottom: 5px;
+  margin-left: 40px;
+  width: 650px;
+  border-bottom: 1px solid #D2D2D2;
+}
+.wall-item-photo-container.comment {
+  top: 15px !important;
+  left: 15px !important;
+}
+.wall-item-photo-container {
+  display: table;
+  width: 780px;
+}
+.my-comment-photo {
+  width: 48px;
+  margin-left: 40px;
+  margin-right: 32px;
+	}
+.comment-edit-preview {
+  width: 500px;
+  margin-top: 10px;
+}
+.comment-edit-text-empty {
+    width: 500px;
+    border: 1px solid #D2D2D2;
+    height: 3.2em;
+    color: #2d2d2d;
+}
+.comment-edit-text-full {
+  font-size: 12.5px;
+  height: 3.3em;
+  
+  border: 1px solid #D2D2D2;
+  width: 500px;
+}
+.comment-edit-photo {
+    margin: 10px 0 0;
+    display: table-cell;
+}
 
 
 .wall-item-container .wall-item-item, .wall-item-container .wall-item-bottom {
@@ -1359,10 +1598,11 @@ body .pageheader{
 }
 
 .wall-item-container .wall-item-content {
-  font-size: 12.5px;
+
   max-width: 720px;
   word-wrap: break-word;
-  line-height: 1.2;
+
+
 }
 
 .wall-item-container .wall-item-content img {
@@ -1439,7 +1679,7 @@ body .pageheader{
   padding-left: 12px;
 }
 .wall-item-comment-wrapper {
-  margin: 1px 5px 1px 80px;
+  margin: 1px 5px 5px 80px;
 }
 .wall-item-comment-wrapper .comment-edit-photo {
   display: none;
@@ -1460,9 +1700,9 @@ body .pageheader{
   border: 1px solid #2d2d2d;
 }
 .comment-edit-preview {
-  width: 710px;
-  border: 1px solid #2d2d2d;
+  width: 500px;
   margin-top: 10px;
+  background-color:  #fff797;
 }
 .comment-edit-preview .contact-photo {
   width: 32px;
@@ -1608,6 +1848,11 @@ body .pageheader{
   padding: 0.3em;
   margin-bottom: 10px;
 }
+.grey
+{
+  display: inline;
+  float: right;	
+	}
 #jot #jot-tools {
   margin: 0px;
   padding: 0px;
@@ -1686,14 +1931,14 @@ body .pageheader{
 #jot #jot-tools li.loading img {
   margin-top: 10px;
 }
-#profile-jot-form #jot-title {
+#profile-jot-form #jot-title, #profile-jot-form #jot-category {
     
   	 border-radius: 5px 5px 5px 5px;
     font-weight: bold;
     height: 20px;
     margin: 0 0 5px;
     width: 60%;
-    border: 1px solid #ffffff;
+    border: 1px solid #d2d2d2;
 }
 #profile-jot-form #jot-title:-webkit-input-placeholder {
   font-weight: normal;
@@ -1958,6 +2203,41 @@ ul.tabs li .active {
     box-shadow: 2px 2px 2px #CFCFCF;
     margin-left: 5px;
 }
+//settings tabs
+ul.rs_tabs {
+  list-style-type: none;
+  font-size: 11px;
+}
+ul.rs_tabs li {
+  float: left;
+  margin-bottom: 30px;
+  clear: both;
+}
+ul.rs_tabs li .selected {
+    background-color: #535353;
+    border: 1px solid #777777;
+    color: white;
+    border-radius: 3px 3px 3px 3px;
+    box-shadow: 2px 2px 2px #CFCFCF;
+    font-size: 13px;
+}
+.rs_tabs {
+    list-style-type: none;
+    font-size: 11px;
+    background-position: 0 -20px;
+    background-repeat: repeat-x;
+    height: 27px;
+    padding: 0;
+ }
+.rs_tab.button {	
+    /*background: none repeat scroll 0 0 #F8F8F8;*/
+    border: 1px solid #CCCCCC;
+    border-radius: 3px 3px 3px 3px;
+    font-weight: bolder;
+    padding: 3px;
+    color:  #333333;
+    text-decoration: none;
+	}
 /**
  * Form fields
  */
@@ -2017,6 +2297,14 @@ ul.tabs li .active {
 .field.radio .field_help {
   margin-left: 0px;
 }
+.suggest-select {
+width: 500px;
+height: 350px;	
+	}
+.message-to-select {
+	width: 400px;
+   height: 150px;
+	}
 #directory-search-form{
 	margin-bottom: 50px;
 	}
@@ -2078,9 +2366,10 @@ ul.tabs li .active {
 /* photo */
 .photo {
 box-shadow: 2px 2px 5px 0px #000000;
-margin: 2px 5px 2px 5px;
-max-height: 85%;
-max-width: 85%;
+margin: 0px;
+border-radius: 10px;
+height: 145px !important;
+width: 145px !important;
 }
 .lframe {
   float: left;
@@ -2153,6 +2442,11 @@ blockquote {
     border-left: 1px solid #D2D2D2;
     padding-left: 9px;
     margin: 0 0 0 .8ex;
+	 color: #777;
+}
+.oembed {
+	
+	font-weight: bold;
 }
 .aprofile dt{
 box-shadow: 1px 1px 5px 0;
@@ -2191,6 +2485,9 @@ box-shadow: 1px 1px 5px 0;
 #group-separator,
 #prof-separator { display: none;}
 */
+#prof-members-end{
+	clear: both;
+	}
 
 #prvmail-to-label, #prvmail-subject-label, #prvmail-message-label {
 	margin-bottom: 10px;
@@ -2316,16 +2613,39 @@ a.mail-list-link {
 }
 
 .vevent {
-        border: 1px solid #CCCCCC;
-}
-.vevent .event-description, .vevent .event-location {
+position: relative;
+width: 400px;
+padding: 20px;
+padding-top: 10px;
+margin: 0 0px;
+margin-bottom: 10px;
+background-color: white;
+-webkit-box-shadow: 0 0 4px rgba(0, 0, 0, 0.2), inset 0 0 50px rgba(0, 0, 0, 0.1);
+-moz-box-shadow: 0 0 4px rgba(0, 0, 0, 0.2), inset 0 0 50px rgba(0, 0, 0, 0.1);
+box-shadow: 0 0 5px rgba(0, 0, 0, 0.2), inset 0 0 50px rgba(0, 0, 0, 0.1);
+}
+.vevent .event-location {
         margin-left: 10px;
         margin-right: 10px;
 }
-.vevent .event-start {
-        margin-left: 10px;
-        margin-right: 10px;
+.vevent .event-description {
+margin-left: 10px;
+margin-right: 10px;
+font-size: 1.1em;
+font-weight: bolder;
 }
+.vevent .event-start, .vevent .event-end {
+
+margin-right: 20px;
+margin-bottom: 2px;
+margin-top: 2px;
+font-size: 0.9em;
+text-align: left;
+}
+.event-start .dtstart, .event-end .dtend {
+float: right;
+}
+
 
 #new-event-link {
         margin-bottom: 10px;
@@ -2339,7 +2659,7 @@ a.mail-list-link {
 }
 
 .event-description:before {
-        content: url('../../../images/calendar.png');
+        content:   url("../../../view/theme/diabook/icons/events2.png") !important;
         margin-right: 15px;
 }
 
diff --git a/view/theme/diabook/directory_item.tpl b/view/theme/diabook/directory_item.tpl
index db1936e4b..bc2af16c2 100755
--- a/view/theme/diabook/directory_item.tpl
+++ b/view/theme/diabook/directory_item.tpl
@@ -7,4 +7,5 @@
 			</a>
 		</div>
 	</div>
+	<div class="contact-name" id="directory-name-$id">$name</div>
 </div>
diff --git a/view/theme/diabook/footer.tpl b/view/theme/diabook/footer.tpl
new file mode 100644
index 000000000..8d3c65162
--- /dev/null
+++ b/view/theme/diabook/footer.tpl
@@ -0,0 +1,4 @@
+<div style="display: table-cell"></div>
+<div style="border-top: 1px solid #D2D2D2; width: 100%;margin-top: 30px;">
+<a style="float:right; color:#333;margin-right:10px;display: table;margin-top: 5px;" href="friendica" title="Site Info / Impressum" >Info / Impressum</a>
+</div>
\ No newline at end of file
diff --git a/view/theme/diabook/fpostit/README b/view/theme/diabook/fpostit/README
deleted file mode 100644
index 39b7c5761..000000000
--- a/view/theme/diabook/fpostit/README
+++ /dev/null
@@ -1,8 +0,0 @@
-fpostit
-
-original author: Devlon Duthied
-
-see his blog posting:
-http://blog.duthied.com/2011/09/13/node-agnostic-friendika-bookmarklet/
-
-original published at github https://github.com/duthied/Friendika-Bookmarklet
diff --git a/view/theme/diabook/fpostit/fpostit.js b/view/theme/diabook/fpostit/fpostit.js
deleted file mode 100755
index d183c7573..000000000
--- a/view/theme/diabook/fpostit/fpostit.js
+++ /dev/null
@@ -1,6 +0,0 @@
-javascript: (function() {
-    					the_url = 'localhost/view/theme/diabook/fpostit/fpostit.php?url=' + encodeURIComponent(window.location.href) + '&title=' + encodeURIComponent(document.title) + '&text=' + encodeURIComponent(''+(window.getSelection ? window.getSelection() : document.getSelection ? document.getSelection() : document.selection.createRange().text));
-    						a_funct = function() {
-        						if (!window.open(the_url, 'fpostit', 'location=yes,links=no,scrollbars=no,toolbar=no,width=600,height=300')) location.href = the_url};
-    							if (/Firefox/.test(navigator.userAgent)) {setTimeout(a_funct, 0)} 
-    							else {a_funct()}})()"
\ No newline at end of file
diff --git a/view/theme/diabook/fpostit/fpostit.php b/view/theme/diabook/fpostit/fpostit.php
deleted file mode 100644
index 4505c9946..000000000
--- a/view/theme/diabook/fpostit/fpostit.php
+++ /dev/null
@@ -1,135 +0,0 @@
-<?php
-if (!isset($_POST["friendika_acct_name"])) $_POST["friendika_acct_name"] = '';
-if (!isset($_COOKIE['username'])) $_COOKIE['username'] = '';
-if (!isset($_COOKIE['password'])) $_COOKIE['password'] = '';
-if (!isset($hostname)) $hostname = '';
-if (!isset($username)) $username = '';
-
-
-if (($_POST["friendika_acct_name"] != '') && ($_POST["friendika_password"] != '')) {
-	setcookie("username", $_POST["friendika_acct_name"], time()+60*60*24*300);
-	setcookie("password", $_POST["friendika_password"], time()+60*60*24*300);
-}
-
-?>
-<html>
-<head>
-	<style>
-		body {
-			font-family: arial, Helvetica,sans-serif;
-			margin: 0px;
-		}
-		.wrap1 {
-			padding: 2px 5px;
-			background-color: #000;
-			margin-bottom: 10px;
-		}
-		.wrap2 {
-			margin-left: 10px;
-			font-size: 12px;
-		}
-		.logo {
-			margin-left: 3px;
-			margin-right: 5px;
-			float: left;
-		}
-		h2 {
-			color: #ffffff;
-		}
-		.error {
-			background-color: #FFFF66;
-			font-size: 12px;
-			margin-left: 10px;
-		}
-	</style>
-</head>
-
-<body>
-<?php
-
-if (isset($_GET['title'])) {
-	$title = $_GET['title'];
-}
-if (isset($_GET['text'])) {
-	$text = $_GET['text'];
-}
-if (isset($_GET['url'])) {
-	$url = $_GET['url'];
-}
-
-if ((isset($title)) && (isset($text)) && (isset($url))) {
-	$content = "$title\nsource:$url\n\n$text";
-} else {
-	$content = $_POST['content'];
-}
-
-if (isset($_POST['submit'])) {
-	
-	if (($_POST["friendika_acct_name"] != '') && ($_POST["friendika_password"] != '')) {
-		$acctname = $_POST["friendika_acct_name"];
-		$tmp_account_array = explode("@", $acctname);
-		if (isset($tmp_account_array[1])) {
-			$username = $tmp_account_array[0];
-			$hostname = $tmp_account_array[1];
-		}
-		$password = $_POST["friendika_password"];
-		$content = $_POST["content"];
-
-		$url = "http://" . $hostname . '/api/statuses/update';
-		$data = array('status' => $content);
-		
-		// echo "posting to: $url<br/>";
-
-		$c = curl_init();
-		curl_setopt($c, CURLOPT_URL, $url); 
-		curl_setopt($c, CURLOPT_USERPWD, "$username:$password");
-		curl_setopt($c, CURLOPT_POSTFIELDS, $data); 
-		curl_setopt($c, CURLOPT_RETURNTRANSFER, true); 
-		curl_setopt($c, CURLOPT_FOLLOWLOCATION, true);
-		$c_result = curl_exec($c); 
-		if(curl_errno($c)){ 
-			$error = curl_error($c);
-			showForm($error, $content);
-		}
-		
-		curl_close($c);
-		if (!isset($error)) {
-			echo '<script language="javascript" type="text/javascript">window.close();</script>';
-		}
-		
-	} else {
-		$error = "Missing account name and/or password...try again please";
-		showForm($error, $content);
-	}
-	
-} else {
-	showForm(null, $content);
-}
-
-function showForm($error, $content) {
-	$username_cookie = $_COOKIE['username'];
-	$password_cookie = $_COOKIE['password'];
-	
-	echo <<<EOF
-	<div class='wrap1'>
-		<h2><img class='logo' src='friendika-32.png' align='middle';/>
-		Friendica Bookmarklet</h2>
-	</div>
-
-	<div class="wrap2">
-		<form method="post" action="{$_SERVER['PHP_SELF']}">
-			Enter the email address of the Friendica Account that you want to cross-post to:(example: user@friendica.org)<br /><br />
-			Account ID: <input type="text" name="friendika_acct_name" value="{$username_cookie}" size="50"/><br />
-			Password: <input type="password" name="friendika_password" value="{$password_cookie}" size="50"/><br />
-			<textarea name="content" id="content" rows="6" cols="70">{$content}</textarea><br />
-			<input type="submit" value="PostIt!" name="submit" />&nbsp;&nbsp;<span class='error'>$error</span>
-		</form>
-		<p></p>
-	</div>
-EOF;
-	
-}
-?>
-
-</body>
-</html>
\ No newline at end of file
diff --git a/view/theme/diabook/fpostit/friendika-32.png b/view/theme/diabook/fpostit/friendika-32.png
deleted file mode 100644
index 61764bf20..000000000
--- a/view/theme/diabook/fpostit/friendika-32.png
+++ /dev/null
diff --git a/view/theme/diabook/generic_links_widget.tpl b/view/theme/diabook/generic_links_widget.tpl
new file mode 100644
index 000000000..001c1395e
--- /dev/null
+++ b/view/theme/diabook/generic_links_widget.tpl
@@ -0,0 +1,11 @@
+<div id="widget_$title">
+	{{if $title}}<h3 style="border-bottom: 1px solid #D2D2D2;">$title</h3>{{endif}}
+	{{if $desc}}<div class="desc">$desc</div>{{endif}}
+	
+	<ul  class="rs_tabs">
+		{{ for $items as $item }}
+			<li><a href="$item.url" class="rs_tab button {{ if $item.selected }}selected{{ endif }}">$item.label</a></li>
+		{{ endfor }}
+	</ul>
+	
+</div>
diff --git a/view/theme/diabook/group_side.tpl b/view/theme/diabook/group_side.tpl
index af183d04d..ce4b25fbf 100755
--- a/view/theme/diabook/group_side.tpl
+++ b/view/theme/diabook/group_side.tpl
@@ -1,18 +1,18 @@
-<div id="group-sidebar" class="widget">
-	<div class="title tool">
-		<h3 class="label">$title</h3>
-		<a href="group/new" title="$createtext" class="action"><span class="icon text s16 add"></span></a>
+<div id="profile_side" >
+	<div class="">
+		<h3 style="margin-left: 2px;">$title<a href="group/new" title="$createtext" class="icon text_add"></a></h3>
 	</div>
 
 	<div id="sidebar-group-list">
-		<ul>
+		<ul class="menu-profile-side">
 			{{ for $groups as $group }}
-			<li class="tool  {{ if $group.selected }}selected{{ endif }}">
-				<a href="$group.href" class="label">
+			<li class="menu-profile-list">
+				<a href="$group.href" class="menu-profile-list-item">
+					<span class="menu-profile-icon {{ if $group.selected }}group_selected{{else}}group_unselected{{ endif }}"></span>
 					$group.text
 				</a>
 				{{ if $group.edit }}
-					<a href="$group.edit.href" class="action"><span class="icon text s10 edit"></span></a>
+					<a href="$group.edit.href" class="action"><span class="icon text_edit" ></span></a>
 				{{ endif }}
 				{{ if $group.cid }}
 					<input type="checkbox" 
@@ -25,5 +25,10 @@
 			{{ endfor }}
 		</ul>
 	</div>
+  {{ if $ungrouped }}
+  <div id="sidebar-ungrouped">
+  <a href="nogroup">$ungrouped</a>
+  </div>
+  {{ endif }}
 </div>	
 
diff --git a/view/theme/diabook/icons/bb-image.png b/view/theme/diabook/icons/bb-image.png
new file mode 100644
index 000000000..9a1b32113
--- /dev/null
+++ b/view/theme/diabook/icons/bb-image.png
diff --git a/view/theme/diabook/icons/bb-url.png b/view/theme/diabook/icons/bb-url.png
new file mode 100644
index 000000000..071fc1865
--- /dev/null
+++ b/view/theme/diabook/icons/bb-url.png
diff --git a/view/theme/diabook/icons/bb-video.png b/view/theme/diabook/icons/bb-video.png
new file mode 100644
index 000000000..bd323531e
--- /dev/null
+++ b/view/theme/diabook/icons/bb-video.png
diff --git a/view/theme/diabook/icons/block.png b/view/theme/diabook/icons/block.png
new file mode 100755
index 000000000..a0b1dffe9
--- /dev/null
+++ b/view/theme/diabook/icons/block.png
diff --git a/view/theme/diabook/icons/bold.png b/view/theme/diabook/icons/bold.png
new file mode 100644
index 000000000..8fab2a10f
--- /dev/null
+++ b/view/theme/diabook/icons/bold.png
diff --git a/view/theme/diabook/icons/com_side.png b/view/theme/diabook/icons/com_side.png
index bc5969ef1..00186ba05 100644
--- a/view/theme/diabook/icons/com_side.png
+++ b/view/theme/diabook/icons/com_side.png
diff --git a/view/theme/diabook/icons/contacts.png b/view/theme/diabook/icons/contacts.png
index 8a3e69ec1..1fb6d695b 100644
--- a/view/theme/diabook/icons/contacts.png
+++ b/view/theme/diabook/icons/contacts.png
diff --git a/view/theme/diabook/icons/contacts3.png b/view/theme/diabook/icons/contacts3.png
new file mode 100644
index 000000000..8a3e69ec1
--- /dev/null
+++ b/view/theme/diabook/icons/contacts3.png
diff --git a/view/theme/diabook/icons/events.png b/view/theme/diabook/icons/events.png
index 4a0b3f3f1..cf195fbb6 100644
--- a/view/theme/diabook/icons/events.png
+++ b/view/theme/diabook/icons/events.png
diff --git a/view/theme/diabook/icons/events2.png b/view/theme/diabook/icons/events2.png
new file mode 100644
index 000000000..53f59c006
--- /dev/null
+++ b/view/theme/diabook/icons/events2.png
diff --git a/view/theme/diabook/icons/home.png b/view/theme/diabook/icons/home.png
index be47a48fc..5c610805f 100644
--- a/view/theme/diabook/icons/home.png
+++ b/view/theme/diabook/icons/home.png
diff --git a/view/theme/diabook/icons/italic.png b/view/theme/diabook/icons/italic.png
new file mode 100644
index 000000000..bf4b2b81d
--- /dev/null
+++ b/view/theme/diabook/icons/italic.png
diff --git a/view/theme/diabook/icons/mess_side.png b/view/theme/diabook/icons/mess_side.png
index 49ef896bc..5295e2e74 100644
--- a/view/theme/diabook/icons/mess_side.png
+++ b/view/theme/diabook/icons/mess_side.png
diff --git a/view/theme/diabook/icons/messages.png b/view/theme/diabook/icons/messages.png
index 38e11ef88..ab7b0f491 100755..100644
--- a/view/theme/diabook/icons/messages.png
+++ b/view/theme/diabook/icons/messages.png
diff --git a/view/theme/diabook/icons/messages3.png b/view/theme/diabook/icons/messages3.png
new file mode 100644
index 000000000..4f3ce3693
--- /dev/null
+++ b/view/theme/diabook/icons/messages3.png
diff --git a/view/theme/diabook/icons/notes.png b/view/theme/diabook/icons/notes.png
index 7d4afca90..28dca30a3 100644
--- a/view/theme/diabook/icons/notes.png
+++ b/view/theme/diabook/icons/notes.png
diff --git a/view/theme/diabook/icons/notifications.png b/view/theme/diabook/icons/notifications.png
index 270997740..347f1519e 100755
--- a/view/theme/diabook/icons/notifications.png
+++ b/view/theme/diabook/icons/notifications.png
diff --git a/view/theme/diabook/icons/notifications3.png b/view/theme/diabook/icons/notifications3.png
new file mode 100755
index 000000000..2c9c791c0
--- /dev/null
+++ b/view/theme/diabook/icons/notifications3.png
diff --git a/view/theme/diabook/icons/notify.png b/view/theme/diabook/icons/notify.png
index 9b852d05b..355abb1eb 100755
--- a/view/theme/diabook/icons/notify.png
+++ b/view/theme/diabook/icons/notify.png
diff --git a/view/theme/diabook/icons/notify3.png b/view/theme/diabook/icons/notify3.png
new file mode 100755
index 000000000..9b852d05b
--- /dev/null
+++ b/view/theme/diabook/icons/notify3.png
diff --git a/view/theme/diabook/icons/pscontacts.png b/view/theme/diabook/icons/pscontacts.png
index acf857f32..23a78bcac 100644
--- a/view/theme/diabook/icons/pscontacts.png
+++ b/view/theme/diabook/icons/pscontacts.png
diff --git a/view/theme/diabook/icons/pubgroups.png b/view/theme/diabook/icons/pubgroups.png
index 6d9539610..ae04194b1 100644
--- a/view/theme/diabook/icons/pubgroups.png
+++ b/view/theme/diabook/icons/pubgroups.png
diff --git a/view/theme/diabook/icons/quote.png b/view/theme/diabook/icons/quote.png
new file mode 100644
index 000000000..a464f2859
--- /dev/null
+++ b/view/theme/diabook/icons/quote.png
diff --git a/view/theme/diabook/icons/selected.png b/view/theme/diabook/icons/selected.png
index 2a30ae252..3fcb95c29 100755..100644
--- a/view/theme/diabook/icons/selected.png
+++ b/view/theme/diabook/icons/selected.png
diff --git a/view/theme/diabook/icons/underline.png b/view/theme/diabook/icons/underline.png
new file mode 100644
index 000000000..b1b4d3574
--- /dev/null
+++ b/view/theme/diabook/icons/underline.png
diff --git a/view/theme/diabook/icons/unselected.png b/view/theme/diabook/icons/unselected.png
new file mode 100644
index 000000000..9e9cead4b
--- /dev/null
+++ b/view/theme/diabook/icons/unselected.png
diff --git a/view/theme/diabook/jot.tpl b/view/theme/diabook/jot.tpl
index 9aef99787..79151aeed 100755
--- a/view/theme/diabook/jot.tpl
+++ b/view/theme/diabook/jot.tpl
@@ -2,7 +2,6 @@
 <div id="profile-jot-wrapper" >
 	<div id="profile-jot-banner-wrapper">
 		<div id="profile-jot-desc" >&nbsp;</div>
-		<div id="character-counter" class="grey"></div>
 	</div>
 	<div id="profile-jot-banner-end"></div>
 
@@ -15,6 +14,8 @@
 		<input type="hidden" name="post_id" value="$post_id" />
 		<input type="hidden" name="preview" id="jot-preview" value="0" />
 		<input name="title" id="jot-title" type="text" placeholder="$placeholdertitle" value="$title" class="jothidden" style="display:none">
+		<div id="jot-category-wrap"><input name="category" id="jot-category" type="text" placeholder="$placeholdercategory" value="$category" class="jothidden" style="display:none" /></div>		
+		<div id="character-counter" class="grey"></div>		
 		<img id="profile-jot-text-loading" src="images/rotator.gif" alt="$wait" title="$wait" style="display: none;" />
 		<textarea rows="5" cols="64" class="profile-jot-text" id="profile-jot-text" name="body" >{{ if $content }}$content{{ else }}$share{{ endif }}</textarea>
 
diff --git a/view/theme/diabook/js/README b/view/theme/diabook/js/README
new file mode 100644
index 000000000..57ca16d02
--- /dev/null
+++ b/view/theme/diabook/js/README
@@ -0,0 +1,26 @@
+jQuery Resize Plugin Demo
+
+Version: v2.1.1
+Author: Adeel Ejaz (http://adeelejaz.com/)
+License: Dual licensed under MIT and GPL licenses.
+
+Introduction
+aeImageResize is a jQuery plugin to dynamically resize the images without distorting the proportions.
+
+Usage:
+.aeImageResize( height, width )
+
+height
+An integer representing the maximum height for the image.
+
+width
+An integer representing the maximum width for the image.
+
+Example
+$(function() {
+  $( ".resizeme" ).aeImageResize({ height: 250, width: 250 });
+});
+
+_______________________________________________________________________________________________
+
+http://javascriptly.com/examples/jquery-grab-bag/autogrow-textarea.html
diff --git a/view/theme/diabook/js/jquery.ae.image.resize.js b/view/theme/diabook/js/jquery.ae.image.resize.js
new file mode 100644
index 000000000..bac09cd45
--- /dev/null
+++ b/view/theme/diabook/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/diabook/js/jquery.ae.image.resize.min.js b/view/theme/diabook/js/jquery.ae.image.resize.min.js
new file mode 100644
index 000000000..16c30b123
--- /dev/null
+++ b/view/theme/diabook/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/diabook/js/jquery.autogrow.textarea.js b/view/theme/diabook/js/jquery.autogrow.textarea.js
new file mode 100644
index 000000000..806e34f51
--- /dev/null
+++ b/view/theme/diabook/js/jquery.autogrow.textarea.js
@@ -0,0 +1,46 @@
+(function($) {
+
+    /*
+     * Auto-growing textareas; technique ripped from Facebook
+     */
+    $.fn.autogrow = function(options) {
+        
+        this.filter('textarea').each(function() {
+            
+            var $this       = $(this),
+                minHeight   = $this.height(),
+                lineHeight  = $this.css('lineHeight');
+            
+            var shadow = $('<div></div>').css({
+                position:   'absolute',
+                top:        -10000,
+                left:       -10000,
+                width:      $(this).width(),
+                fontSize:   $this.css('fontSize'),
+                fontFamily: $this.css('fontFamily'),
+                lineHeight: $this.css('lineHeight'),
+                resize:     'none'
+            }).appendTo(document.body);
+            
+            var update = function() {
+                
+                var val = this.value.replace(/</g, '&lt;')
+                                    .replace(/>/g, '&gt;')
+                                    .replace(/&/g, '&amp;')
+                                    .replace(/\n/g, '<br/>');
+                
+                shadow.html(val);
+                $(this).css('height', Math.max(shadow.height() + 20, minHeight));
+            }
+            
+            $(this).change(update).keyup(update).keydown(update);
+            
+            update.apply(this);
+            
+        });
+        
+        return this;
+        
+    }
+    
+})(jQuery);
\ No newline at end of file
diff --git a/view/theme/diabook/login.tpl b/view/theme/diabook/login.tpl
new file mode 100644
index 000000000..efa7c2d6d
--- /dev/null
+++ b/view/theme/diabook/login.tpl
@@ -0,0 +1,33 @@
+
+<form action="$dest_url" method="post" >
+	<input type="hidden" name="auth-params" value="login" />
+
+	<div id="login_standard">
+	{{ inc field_input.tpl with $field=$lname }}{{ endinc }}
+	{{ inc field_password.tpl with $field=$lpassword }}{{ endinc }}
+	</div>
+	
+	{{ if $openid }}
+			<div id="login_openid">
+			{{ inc field_openid.tpl with $field=$lopenid }}{{ endinc }}
+			</div>
+	{{ endif }}
+	
+	<div id="login-submit-wrapper" >
+		<input type="submit" name="submit" id="login-submit-button" value="$login" />
+	</div>
+	
+   <div id="login-extra-links">
+		{{ if $register }}<a href="register" title="$register.title" id="register-link">$register.desc</a>{{ endif }}
+        <a href="lostpass" title="$lostpass" id="lost-password-link" >$lostlink</a>
+	</div>	
+	
+	{{ for $hiddens as $k=>$v }}
+		<input type="hidden" name="$k" value="$v" />
+	{{ endfor }}
+	
+	
+</form>
+
+
+<script type="text/javascript"> $(document).ready(function() { $("#id_$lname.0").focus();} );</script>
diff --git a/view/theme/diabook/nav.tpl b/view/theme/diabook/nav.tpl
index 78eb34197..e0ffa4f7b 100644
--- a/view/theme/diabook/nav.tpl
+++ b/view/theme/diabook/nav.tpl
@@ -22,7 +22,7 @@
 				<span class="icon contacts">$nav.contacts.1</span>
 				<span id="intro-update" class="nav-notify"></span></a>
 				<ul id="nav-contacts-menu" class="menu-popup">
-					<li id="nav-contacts-see-intro"><a href="$nav.notifications.0">$nav.introductions.1</a><span id="intro-update" class="nav-notify"></span></li>
+					<li id="nav-contacts-see-intro"><a href="$nav.notifications.0">$nav.introductions.1</a><span id="intro-update-li" class="nav-notify"></span></li>
 					<li id="nav-contacts-all"><a href="contacts">$nav.contacts.1</a></li> 
 				</ul>
 			</li>	
@@ -36,8 +36,6 @@
 				<span id="mail-update" class="nav-notify"></span></a>
 				<ul id="nav-messages-menu" class="menu-popup">
 					<li id="nav-messages-see-all"><a href="$nav.messages.0">$nav.messages.1</a></li>
-					<li id="nav-messages-see-all"><a href="$nav.messages.inbox.0">$nav.messages.inbox.1</a></li>
-					<li id="nav-messages-see-all"><a href="$nav.messages.outbox.0">$nav.messages.outbox.1</a></li>
 					<li id="nav-messages-see-all"><a href="$nav.messages.new.0">$nav.messages.new.1</a></li>
 				</ul>
 			</li>		
@@ -64,12 +62,12 @@
 		</li>		
 		{{ endif }}	
 		
+		<li  style="width: 1%; height: 1px;float: right;"></li>	
+		
 		<li id="nav-site-linkmenu" class="nav-menu-icon"><a href="#" rel="#nav-site-menu"><span class="icon s22 gear">Site</span></a>
 			<ul id="nav-site-menu" class="menu-popup">
 				{{ if $nav.manage }}<li><a class="$nav.manage.2" href="$nav.manage.0" title="$nav.manage.3">$nav.manage.1</a></li>{{ endif }}				
-
-				{{ if $nav.settings }} <li><a class="$nav.search.2" onClick="restore_boxes()" title="Restore right-hand column" style="cursor: pointer;">Restore right-hand column</a></li>{{ endif }}
-										
+					
 				{{ if $nav.help }} <li><a class="$nav.help.2" target="friendika-help" href="$nav.help.0" title="$nav.help.3" >$nav.help.1</a></li>{{ endif }}									
 										
 										 <li><a class="$nav.search.2" href="friendica" title="Site Info / Impressum" >Info/Impressum</a></li>
@@ -101,7 +99,7 @@
 			</li>	
 		{{ endif }}		
 		
-      {{ if $nav.settings }}
+      {{ if $nav.home }}
 			<li id="nav-home-link" class="nav-menu $sel.home">
 				<a class="$nav.home.2" href="$nav.home.0" title="$nav.home.3" >$nav.home.1
 				<span id="home-update" class="nav-notify"></span></a>
@@ -138,7 +136,7 @@
 </nav>
 
 
-<div style="position: fixed; bottom: 5px; right: 10px;"><a href="javascript:scroll(0,0); "><img src="view/theme/diabook/icons/scroll_top.png" title="scroll to top"></a></div>
+<div id="scrollup" style="position: fixed; bottom: 5px; right: 10px;"><a href="#top"><img src="view/theme/diabook/icons/scroll_top.png" alt="back to top" title="Back to top"></a></div>
 <div style="position: fixed; bottom: 3px; left: 25px;">$langselector</div>
 <div style="position: fixed; bottom: 23px; left: 5px;"><a href="http://pad.toktan.org/p/diabook" target="blank" ><img src="view/theme/diabook/icons/bluebug.png" title="report bugs for the theme diabook"/></a></div>
 
diff --git a/view/theme/diabook/nets.tpl b/view/theme/diabook/nets.tpl
new file mode 100644
index 000000000..351e2c3e2
--- /dev/null
+++ b/view/theme/diabook/nets.tpl
@@ -0,0 +1,17 @@
+<div id="profile_side">
+	<h3 style="margin-left: 2px;">$title</h3>
+	<div id="nets-desc">$desc</div>
+   
+	<ul class="menu-profile-side">
+	<li class="menu-profile-list">
+	<span class="menu-profile-icon {{ if $sel_all }}group_selected{{else}}group_unselected{{ endif }}"></span>	
+	<a style="text-decoration: none;" href="$base" class="menu-profile-list-item">$all</a></li>
+	{{ for $nets as $net }}
+	<li class="menu-profile-list">
+	<a href="$base?nets=$net.ref" class="menu-profile-list-item">
+	<span class="menu-profile-icon {{ if $net.selected }}group_selected{{else}}group_unselected{{ endif }}"></span>		
+	$net.name	
+	</a></li>
+	{{ endfor }}
+	</ul>
+</div>
diff --git a/view/theme/diabook/oembed_video.tpl b/view/theme/diabook/oembed_video.tpl
new file mode 100644
index 000000000..5e046d8c5
--- /dev/null
+++ b/view/theme/diabook/oembed_video.tpl
@@ -0,0 +1,4 @@
+<a class="embed_yt" href='$embedurl' onclick='this.innerHTML=Base64.decode("$escapedhtml"); yt_iframe();javascript:$(this).parent().css("height", "370px"); return false;' style='float:left; margin: 1em; position: relative;'>
+	<img width='$tw' height='$th' src='$turl' >
+	<div style='position: absolute; top: 0px; left: 0px; width: $twpx; height: $thpx; background: url(images/icons/48/play.png) no-repeat center center;'></div>
+</a>
diff --git a/view/theme/diabook/photo_item.tpl b/view/theme/diabook/photo_item.tpl
new file mode 100644
index 000000000..5d65a89b7
--- /dev/null
+++ b/view/theme/diabook/photo_item.tpl
@@ -0,0 +1,65 @@
+{{ if $indent }}{{ else }}
+<div class="wall-item-decor">
+	<img id="like-rotator-$id" class="like-rotator" src="images/rotator.gif" alt="$wait" title="$wait" style="display: none;" />
+</div>
+{{ endif }}
+
+<div class="wall-item-photo-container $indent">
+	<div class="wall-item-item">
+		<div class="wall-item-info">
+			<div class="contact-photo-wrapper" >
+				<a href="$profile_url" target="redir" title="" class="contact-photo-link" id="wall-item-photo-link-$id">
+					<img src="$thumb" class="contact-photo$sparkle" id="wall-item-photo-$id" alt="$name" />
+				</a>
+				<a href="#" rel="#wall-item-photo-menu-$id" class="contact-photo-menu-button icon s16 menu" id="wall-item-photo-menu-button-$id">menu</a>
+				<ul class="contact-menu menu-popup" id="wall-item-photo-menu-$id">
+				$photo_menu
+				</ul>
+				
+			</div>
+		</div>
+			<div class="wall-item-actions-author">
+				<a href="$profile_url" target="redir" title="$name" class="wall-item-name-link"><span class="wall-item-name$sparkle">$name</span></a> 
+			<span class="wall-item-ago">-
+			{{ if $plink }}<a class="link" title="$plink.title" href="$plink.href" style="color: #999">$ago</a>{{ else }} $ago {{ endif }}
+			{{ if $lock }} - <span class="fakelink" style="color: #999" onclick="lockview(event,$id);">$lock</span> {{ endif }}
+			</span>
+			</div>
+		<div class="wall-item-content">
+			{{ if $title }}<h2><a href="$plink.href">$title</a></h2>{{ endif }}
+			$body
+		</div>
+	</div>
+	<div class="wall-item-bottom">
+		<div class="wall-item-links">
+		</div>
+		<div class="wall-item-tags">
+			{{ for $tags as $tag }}
+				<span class='tag'>$tag</span>
+			{{ endfor }}
+		</div>
+	</div>
+	
+	<div class="wall-item-bottom" style="display: table-row;">
+		<div class="wall-item-actions">
+	   </div>
+		<div class="wall-item-actions">
+			
+			<div class="wall-item-actions-tools">
+
+				{{ if $drop.dropping }}
+					<input type="checkbox" title="$drop.select" name="itemselected[]" class="item-select" value="$id" />
+					<a href="item/drop/$id" onclick="return confirmDelete();" class="icon drop" title="$drop.delete">$drop.delete</a>
+				{{ endif }}
+				{{ if $edpost }}
+					<a class="icon pencil" href="$edpost.0" title="$edpost.1"></a>
+				{{ endif }}
+			</div>
+
+		</div>
+	</div>
+	<div class="wall-item-bottom">
+			
+	</div>
+</div>
+
diff --git a/view/theme/diabook/photo_view.tpl b/view/theme/diabook/photo_view.tpl
index 511fc73ac..272b67048 100755..100644
--- a/view/theme/diabook/photo_view.tpl
+++ b/view/theme/diabook/photo_view.tpl
@@ -4,24 +4,30 @@
 <div id="photo-edit-link-wrap">
 {{ if $tools }}
 <a id="photo-edit-link" href="$tools.edit.0">$tools.edit.1</a>
--
+|
 <a id="photo-toprofile-link" href="$tools.profile.0">$tools.profile.1</a>
 {{ endif }}
-{{ if $lock }} - <img src="images/lock_icon.gif" class="lockview" alt="$lock" onclick="lockview(event,'photo$id');" /> {{ endif }}
-</div>
-
-<div id="photo-photo">
-	{{ if $prevlink }}<div id="photo-prev-link"><a href="$prevlink.0">$prevlink.1</a></div>{{ endif }}
-	<a href="$photo.href" class="lightbox" title="$photo.title"><img src="$photo.src" /></a>
-	{{ if $nextlink }}<div id="photo-next-link"><a href="$nextlink.0">$nextlink.1</a></div>{{ endif }}
+{{ 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" class="lightbox" 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>
+<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 }}
\ No newline at end of file
+{{ if $edit }}$edit{{ endif }}
+
+<div style="margin-top:20px">
+</div>
+<div id="wall-photo-container">
+$comments
+</div>
+
+$paginate
+
diff --git a/view/theme/diabook/profile_side.tpl b/view/theme/diabook/profile_side.tpl
index 0762dbe44..01e80f238 100644
--- a/view/theme/diabook/profile_side.tpl
+++ b/view/theme/diabook/profile_side.tpl
@@ -7,13 +7,13 @@
 	</div>
 	
 <ul id="profile-side-menu" class="menu-profile-side">
-	<li id="profile-side-status" class="menu-profile-list home"><a class="menu-profile-list-item" href="$ps.usermenu.status.0">$ps.usermenu.status.1</a></li>
-	<li id="profile-side-photos" class="menu-profile-list photos"><a class="menu-profile-list-item" href="$ps.usermenu.photos.0">$ps.usermenu.photos.1</a></li>
-	<li id="profile-side-photos" class="menu-profile-list pscontacts"><a class="menu-profile-list-item" href="$ps.usermenu.contacts.0">$ps.usermenu.contacts.1</a></li>		
-	<li id="profile-side-events" class="menu-profile-list events"><a class="menu-profile-list-item" href="$ps.usermenu.events.0">$ps.usermenu.events.1</a></li>
-	<li id="profile-side-notes" class="menu-profile-list notes"><a class="menu-profile-list-item" href="$ps.usermenu.notes.0">$ps.usermenu.notes.1</a></li>
-	<li id="profile-side-foren" class="menu-profile-list foren"><a class="menu-profile-list-item" href="$ps.usermenu.pgroups.0" target="blanc">$ps.usermenu.pgroups.1</a></li>
-	<li id="profile-side-foren" class="menu-profile-list com_side"><a class="menu-profile-list-item" href="$ps.usermenu.community.0">$ps.usermenu.community.1</a></li>
+	<li id="profile-side-status" class="menu-profile-list"><a class="menu-profile-list-item" href="$ps.usermenu.status.0">$ps.usermenu.status.1<span class="menu-profile-icon home"></span></a></li>
+	<li id="profile-side-photos" class="menu-profile-list photos"><a class="menu-profile-list-item" href="$ps.usermenu.photos.0">$ps.usermenu.photos.1<span class="menu-profile-icon photos"></span></a></li>
+	<li id="profile-side-photos" class="menu-profile-list pscontacts"><a class="menu-profile-list-item" href="$ps.usermenu.contacts.0">$ps.usermenu.contacts.1<span class="menu-profile-icon pscontacts"></span></a></li>		
+	<li id="profile-side-events" class="menu-profile-list events"><a class="menu-profile-list-item" href="$ps.usermenu.events.0">$ps.usermenu.events.1<span class="menu-profile-icon events"></span></a></li>
+	<li id="profile-side-notes" class="menu-profile-list notes"><a class="menu-profile-list-item" href="$ps.usermenu.notes.0">$ps.usermenu.notes.1<span class="menu-profile-icon notes"></span></a></li>
+	<li id="profile-side-foren" class="menu-profile-list foren"><a class="menu-profile-list-item" href="$ps.usermenu.pgroups.0" target="blanc">$ps.usermenu.pgroups.1<span class="menu-profile-icon foren"></span></a></li>
+	<li id="profile-side-foren" class="menu-profile-list com_side"><a class="menu-profile-list-item" href="$ps.usermenu.community.0">$ps.usermenu.community.1<span class="menu-profile-icon com_side"></span></a></li>
 </ul>
 
 </div>
diff --git a/view/theme/diabook/profile_vcard.tpl b/view/theme/diabook/profile_vcard.tpl
index 918cfc97c..b982a2069 100644
--- a/view/theme/diabook/profile_vcard.tpl
+++ b/view/theme/diabook/profile_vcard.tpl
@@ -21,9 +21,9 @@
 	</div>
 				
 	
-	{{ if $pdesc }}<div class="title">$profile.pdesc</div>{{ endif }}
-	<div id="profile-photo-wrapper"><img class="photo" width="155" height="155" src="$profile.photo?rev=$profile.picdate" alt="$profile.name" /></div>
 
+	<div id="profile-photo-wrapper"><img class="photo" src="$profile.photo?rev=$profile.picdate" alt="$profile.name" /></div>
+	{{ if $pdesc }}<div class="title">$profile.pdesc</div>{{ endif }}
 
 
 	{{ if $location }}
diff --git a/view/theme/diabook/rs_common_tabs.tpl b/view/theme/diabook/rs_common_tabs.tpl
deleted file mode 100755
index 6a1c5c71b..000000000
--- a/view/theme/diabook/rs_common_tabs.tpl
+++ /dev/null
@@ -1,6 +0,0 @@
-<h3 style="border-bottom: 1px solid #D2D2D2;">Settings Menu</h3>
-<ul class="rs_tabs">
-	{{ for $tabs as $tab }}
-		<li><a href="$tab.url" class="rs_tab button $tab.sel">$tab.label</a></li>
-	{{ endfor }}
-</ul>
diff --git a/view/theme/diabook/screenshot.png b/view/theme/diabook/screenshot.png
index 2826f4261..0c98d8f48 100644
--- a/view/theme/diabook/screenshot.png
+++ b/view/theme/diabook/screenshot.png
diff --git a/view/theme/diabook-blue/style-network.css b/view/theme/diabook/style-network-wide.css
index 5d16cde9e..06e9718fc 100644
--- a/view/theme/diabook-blue/style-network.css
+++ b/view/theme/diabook/style-network-wide.css
@@ -6,7 +6,7 @@
 /* ========= */
 /* = Admin = */
 /* ========= */
-
+1024
 #adminpage {
 /*        width: 80%;*/
 }
@@ -84,61 +84,62 @@
 /* icons */
 
 .icon.contacts {
-  background-image: url("../../../view/theme/diabook-blue/icons/contacts.png");}
+  background-image: url("../../../view/theme/diabook/icons/contacts.png");}
 .icon.notifications {
-  background-image: url("../../../view/theme/diabook-blue/icons/notifications.png");}
+  background-image: url("../../../view/theme/diabook/icons/notifications.png");}
 .icon.notify {
-  background-image: url("../../../view/theme/diabook-blue/icons/notify.png");}
+  background-image: url("../../../view/theme/diabook/icons/notify.png");}
 .icon.messages {
-  background-image: url("../../../view/theme/diabook-blue/icons/messages.png");}
+  background-image: url("../../../view/theme/diabook/icons/messages.png");}
 .icon.community {
-  background-image: url("../../../view/theme/diabook-blue/icons/community.png");}
+  background-image: url("../../../view/theme/diabook/icons/community.png");}
   
-.icon.drop 	{ background-image: url("../../../view/theme/diabook-blue/icons/drop.png");}
-.icon.drophide 	{ background-image: url("../../../view/theme/diabook-blue/icons/drop.png");}
-.icon.dislike 	{ background-image: url("../../../view/theme/diabook-blue/icons/dislike.png");}
-.icon.like 	{ background-image: url("../../../view/theme/diabook-blue/icons/like.png");}
-.icon.pencil 	{ background-image: url("../../../view/theme/diabook-blue/icons/pencil.png");}
-.icon.recycle 	{ background-image: url("../../../view/theme/diabook-blue/icons/recycle.png");}
-.icon.remote-link { background-image: url("../../../view/theme/diabook-blue/icons/remote.png");}
-.icon.tagged    { background-image: url("../../../view/theme/diabook-blue/icons/tagged.png");}
-.icon.file-as { background-image: url("../../../view/theme/diabook-blue/icons/file_as.png");}
-.star-item.icon.unstarred { background-image: url("../../../view/theme/diabook-blue/icons/unstarred.png");}
-.star-item.icon.starred { background-image: url("../../../view/theme/diabook-blue/icons/starred.png");}
-.icon.link		{ background-image: url("../../../view/theme/diabook-blue/icons/link.png");}
-.icon.lock		{ background-image: url("../../../view/theme/diabook-blue/icons/lock.png");}
-.icon.unlock		{ background-image: url("../../../view/theme/diabook-blue/icons/unlock.png");}
-.icon.language    { background-image: url("../../../view/theme/diabook-blue/icons/language.png");}
-
-
-.camera 	{ background-image: url("../../../view/theme/diabook-blue/icons/camera.png"); 
+.icon.drop 	{ background-image: url("../../../view/theme/diabook/icons/drop.png");}
+.icon.drophide 	{ background-image: url("../../../view/theme/diabook/icons/drop.png");}
+.icon.dislike 	{ background-image: url("../../../view/theme/diabook/icons/dislike.png");}
+.icon.like 	{ background-image: url("../../../view/theme/diabook/icons/like.png");}
+.icon.pencil 	{ background-image: url("../../../view/theme/diabook/icons/pencil.png");}
+.icon.recycle 	{ background-image: url("../../../view/theme/diabook/icons/recycle.png");}
+.icon.remote-link { background-image: url("../../../view/theme/diabook/icons/remote.png");}
+.icon.tagged    { background-image: url("../../../view/theme/diabook/icons/tagged.png");}  
+.icon.file-as { background-image: url("../../../view/theme/diabook/icons/file_as.png");}
+.star-item.icon.unstarred { background-image: url("../../../view/theme/diabook/icons/unstarred.png");}
+.star-item.icon.starred { background-image: url("../../../view/theme/diabook/icons/starred.png");}
+.icon.link		{ background-image: url("../../../view/theme/diabook/icons/link.png");}
+.icon.lock		{ background-image: url("../../../view/theme/diabook/icons/lock.png");}
+.icon.unlock		{ background-image: url("../../../view/theme/diabook/icons/unlock.png");}
+.icon.language    { background-image: url("../../../view/theme/diabook/icons/language.png");}
+
+
+
+.camera 	{ background-image: url("../../../view/theme/diabook/icons/camera.png"); 
 			  display: block; width: 28px; height: 28px; background-repeat: no-repeat;
 			  }
-.attach 	{ background-image: url("../../../view/theme/diabook-blue/icons/attach.png"); 
+.attach 	{ background-image: url("../../../view/theme/diabook/icons/attach.png"); 
 			  display: block; width: 28px; height: 28px; background-repeat: no-repeat;
 			  }
-.video2 	{ background-image: url("../../../view/theme/diabook-blue/icons/video.png"); 
+.video2 	{ background-image: url("../../../view/theme/diabook/icons/video.png"); 
 			  display: block; width: 28px; height: 28px; background-repeat: no-repeat;
 			  }	
-.video 	{ background-image: url("../../../view/theme/diabook-blue/icons/video.png"); 
-			  display: block; width: 100%; height: 28px; background-repeat: no-repeat;
+.video 	{ background-image: url("../../../view/theme/diabook/icons/video.png"); 
+			  display: block; width: 100%; height: 140px; background-repeat: no-repeat;
 			  }
-.audio2 	{ background-image: url("../../../view/theme/diabook-blue/icons/audio.png"); 
+.audio2 	{ background-image: url("../../../view/theme/diabook/icons/audio.png"); 
 			  display: block; width: 28px; height: 28px; background-repeat: no-repeat;
 			  }
-.audio 	{ background-image: url("../../../view/theme/diabook-blue/icons/audio.png"); 
+.audio 	{ background-image: url("../../../view/theme/diabook/icons/audio.png"); 
 			  display: block; width: 28px; height: 28px; background-repeat: no-repeat;
 			  }
-.weblink 	{ background-image: url("../../../view/theme/diabook-blue/icons/weblink.png"); 
+.weblink 	{ background-image: url("../../../view/theme/diabook/icons/weblink.png"); 
 			  display: block; width: 28px; height: 28px; background-repeat: no-repeat;
 			  }
-.globe 	{ background-image: url("../../../view/theme/diabook-blue/icons/globe.png"); 
+.globe 	{ background-image: url("../../../view/theme/diabook/icons/globe.png"); 
 			  display: block; width: 28px; height: 28px; background-repeat: no-repeat;
 			  }
-.unglobe 	{ background-image: url("../../../view/theme/diabook-blue/icons/unglobe.png"); 
+.unglobe 	{ background-image: url("../../../view/theme/diabook/icons/unglobe.png"); 
 			  display: block; width: 28px; height: 28px; background-repeat: no-repeat;
 			  }
-.edit    {background-image: url("../../../view/theme/diabook-blue/icons/pencil2.png"); 
+.edit    {background-image: url("../../../view/theme/diabook/icons/pencil2.png"); 
 			  display: block; width: 28px; height: 28px; background-repeat: no-repeat;}
 			  
 			  
@@ -176,10 +177,10 @@
 /*.language       { background-position: -210px -40px;}*/
 
 
-.icon.on             { background-image: url("../../../view/theme/diabook-blue/icons/toogle_on.png"); background-repeat: no-repeat;}
-.icon.off            { background-image: url("../../../view/theme/diabook-blue/icons/toogle_off.png"); background-repeat: no-repeat;}
-.prev           { background-position: -90px  -60px;}
-.next           { background-position: -110px -60px;}
+.icon.on             { background-image: url("../../../view/theme/diabook/icons/toogle_on.png"); background-repeat: no-repeat;}
+.icon.off            { background-image: url("../../../view/theme/diabook/icons/toogle_off.png"); background-repeat: no-repeat;}
+.icon.prev           { background-image: url("../../../view/theme/diabook/icons/prev.png"); background-repeat: no-repeat;}
+.icon.next           { background-image: url("../../../view/theme/diabook/icons/next.png"); background-repeat: no-repeat;}
 /*.tagged     { background-position: -130px -60px;}*/
 
 .attachtype {
@@ -215,12 +216,12 @@
 }
 
 .icon.border.camera{
-  background-image: url("../../../view/theme/diabook-blue/icons/camera.png"); 
+  background-image: url("../../../view/theme/diabook/icons/camera.png"); 
   display: block; width: 28px; height: 28px; background-repeat: no-repeat;
 	}
 	
 .icon.border.link{
-  background-image: url("../../../view/theme/diabook-blue/icons/weblink.png"); 
+  background-image: url("../../../view/theme/diabook/icons/weblink.png"); 
   display: block; width: 28px; height: 28px; background-repeat: no-repeat;
   margin-left: 10px;
 	}
@@ -384,21 +385,23 @@
 
 .hide-comments-outer {
   margin-left: 80px;
-  margin-bottom: 1px;
-  width: 484px;
+  margin-bottom: 5px;
+  width: 675px;
   border-bottom: 1px solid #BDCDD4;
-  background-color: #fff;
+  border-top: 1px solid #BDCDD4;
+
   padding: 8px;
 }
 
 /* global */
 body {
   font-family: 'Lato', "Helvetica Neue", Helvetica, Arial, sans-serif;
-  font-size: 12.5px;
+  font-size: 13px;
   background-color: #ffffff;
   color: #2d2d2d;
   margin: 50px auto auto;
   display: table;
+
 }
 
 h4 {
@@ -406,7 +409,7 @@ h4 {
 }
 
 a {
-	color: #333333;
+	color: #3465A4;
 	/* color: #3e3e8c; */
 	text-decoration: none;
 }
@@ -439,7 +442,7 @@ a:hover {
   clear: both;
 }
 .fakelink {
-  color: #1872A2;
+  color: #3465A4;
   /* color: #3e3e8c; */
   text-decoration: none;
   cursor: pointer;
@@ -482,8 +485,9 @@ code {
 }
 #saved-search-ul .tool:hover,
 #nets-sidebar .tool:hover,
-#sidebar-group-list .tool:hover {
-	background: #EEE;
+#sidebar-group-list .tool:hover,
+#fileas-sidebar .tool:hover {
+	background: #E7F2F7;
 }
 .tool .label {
   float: left;
@@ -518,15 +522,15 @@ header {
   padding: 0px;
   width: 22%;
   height: 32px;
-  background: #1872a2;
-  background-color: #1872a2;
+  background: #000;
   z-index: 100;
-  border-bottom: 1px;
-  border-bottom-color: black;
-  border-bottom-style: inset;
+  -webkit-box-shadow: 0px 0px 10px rgba(0, 0, 0, 0.7);
+  -moz-box-shadow: 0px 0px 10px rgba(0, 0, 0, 0.7);
+  box-shadow: 0px 0px 10px rgba(0, 0, 0, 0.7);
 }
 header #site-location {
-  display: none;
+position: absolute;
+top: 30px;
 }
 header #banner {
   overflow: hidden;
@@ -543,15 +547,17 @@ header #banner a:hover {
   text-decoration: none;
   outline: none;
   vertical-align: middle;
+ font-weight: bolder;
+  margin-left: 3px;
 }
 header #banner #logo-img {
   height: 25px;
-  margin-top: 5px;
+  margin-top: 3px;
 }
 header #banner #logo-text {
-  font-size: 22px;
+  font-size: 20px;
   position: absolute;
-  top: 15%;
+  top: 10%;
 }
 /* nav */
 nav {
@@ -561,12 +567,12 @@ nav {
   left: 22%;
   top: 0px;
   padding: 0px;
-  background: #1872a2;
+  background: #000;
   color: #ffffff;
   z-index: 99;
-  border-bottom: 1px;
-  border-bottom-color: black;
-  border-bottom-style: inset;
+  -webkit-box-shadow: 0px 0px 10px rgba(0, 0, 0, 0.7);
+  -moz-box-shadow: 0px 0px 10px rgba(0, 0, 0, 0.7);
+  box-shadow: 0px 0px 10px rgba(0, 0, 0, 0.7);
 }
 nav a,
 nav a:active,
@@ -630,7 +636,7 @@ nav #logo-text {
 nav .nav-menu-search {
   position: relative;
 
-  margin: 3px 17px;
+  margin: 4px 17px;
   margin-right: 0px;
   height: 17px;
   width: 180px;
@@ -652,22 +658,11 @@ nav .nav-menu-icon {
   position: relative;
   height: 22px;
   padding: 5px;
-  margin: 0px 5px;
+  margin: 0px 7px;
   -moz-border-radius: 5px 5px 0 0;
   -webkit-border-radius: 5px 5px 0 0;
   border-radius: 5px 5px 0 0;
 }
-nav .nav-menu-icon:hover {
-  background-color: #308dbf;  
-  position: relative;
-  height: 22px;
-  padding: 5px;
-  margin: 0px 5px;
-  -moz-border-radius: 5px 5px 0 0;
-  -webkit-border-radius: 5px 5px 0 0;
-  border-radius: 5px 5px 0 0;
-}
-
 nav .nav-menu-icon.selected {
   background-color: #fff;
 }
@@ -678,12 +673,13 @@ nav .nav-menu-icon img {
 nav .nav-menu-icon .nav-notify {
   top: 3px;
 }
+/*marker*/
 nav .nav-menu {
   position: relative;
   height: 16px;
   padding: 5px;
   margin: 3px 15px 0px;
-  font-size: 13px;
+  font-size: 15px;
   /*border-bottom: 3px solid #364A84;*/
 }
 nav .nav-menu.selected {
@@ -743,15 +739,15 @@ nav #nav-site-linkmenu .menu-popup {
 }
 
 nav #nav-messages-linkmenu.on .icon.messages, nav #nav-messages-linkmenu.selected .icon.messages{
-	background-image: url("../../../view/theme/diabook-blue/icons/messages2.png");
+	background-image: url("../../../view/theme/diabook/icons/messages2.png");
 	}
 	
 /*nav #nav-notifications-linkmenu.on .icon.notify,*/ nav #nav-notifications-linkmenu.selected .icon.notify{
-	background-image: url("../../../view/theme/diabook-blue/icons/notify2.png");
+	background-image: url("../../../view/theme/diabook/icons/notify2.png");
 	}
 	
 nav #nav-contacts-linkmenu.on .icon.contacts, nav #nav-contacts-linkmenu.selected .icon.contacts{
-	background-image: url("../../../view/theme/diabook-blue/icons/contacts2.png");
+	background-image: url("../../../view/theme/diabook/icons/contacts2.png");
 	}
 	
 nav #nav-apps-link.selected {
@@ -797,8 +793,8 @@ ul.menu-popup a {
   text-decoration: none;
 }
 ul.menu-popup a:hover {
-  background-color: #308DBF; /*bdcdd4;*/
-  color: #fff;
+  background-color: #fff797; /*bdcdd4;*/
+  color: #000;
 }
 ul.menu-popup .menu-sep {
   border-top: 1px solid #9eabb0;
@@ -891,6 +887,7 @@ ul.menu-popup .empty {
   position: absolute;
   padding-top: 4px;
   padding-left: 5px;	
+  color: #2D2D2D;
   word-wrap: break-word;
   width: 130px;
 	}
@@ -904,55 +901,71 @@ ul.menu-popup .empty {
 	}
 .menu-profile-list{
   height: auto;
-  overflow: auto;
-  padding-top: 3px;
-  padding-bottom: 3px;
-  padding-left: 16px;
+  overflow: auto;  
   min-height: 16px;
   list-style: none;
 	}
 .menu-profile-list:hover{
-	background: #EEE;
+	background: #E7F2F7; 
 	}
 .menu-profile-list-item{
 	padding-left: 5px;
+	vertical-align: middle;
 	}	
 .menu-profile-list-item:hover{	
 	text-decoration: none;
    }
 /*http://prothemedesign.com/circular-icons/*/
-.menu-profile-list.home{
-	background: url("../../../view/theme/diabook-blue/icons/home.png") no-repeat;
-	}
-.menu-profile-list.photos{
-	background: url("../../../view/theme/diabook-blue/icons/mess_side.png") no-repeat;
-	}
-.menu-profile-list.events{
-	background: url("../../../view/theme/diabook-blue/icons/events.png") no-repeat;
-	}
-.menu-profile-list.notes{
-	background: url("../../../view/theme/diabook-blue/icons/notes.png") no-repeat;
-	}
-.menu-profile-list.foren{
-	background: url("../../../view/theme/diabook-blue/icons/pubgroups.png") no-repeat;
-	}
-.menu-profile-list.com_side{
-	background: url("../../../view/theme/diabook-blue/icons/com_side.png") no-repeat;
-	}
-.menu-profile-list.pscontacts{
-	background: url("../../../view/theme/diabook-blue/icons/pscontacts.png") no-repeat;
+.menu-profile-icon.home{
+	background: url("../../../view/theme/diabook/icons/home.png") no-repeat;
+	float: left;
+	height: 22px;
+	width: 22px;
 	}
+.menu-profile-icon.photos{
+	background: url("../../../view/theme/diabook/icons/mess_side.png") no-repeat;
+	float: left;
+	height: 22px;
+   width: 22px;}
+.menu-profile-icon.events{
+	background: url("../../../view/theme/diabook/icons/events.png") no-repeat;
+	float: left;
+	height: 22px;
+   width: 22px;}
+.menu-profile-icon.notes{
+	background: url("../../../view/theme/diabook/icons/notes.png") no-repeat;
+	float: left;
+	height: 22px;
+   width: 22px;}
+.menu-profile-icon.foren{
+	background: url("../../../view/theme/diabook/icons/pubgroups.png") no-repeat;
+	float: left;
+	height: 22px;
+   width: 22px;}
+.menu-profile-icon.com_side{
+	background: url("../../../view/theme/diabook/icons/com_side.png") no-repeat;
+	float: left;
+	height: 22px;
+   width: 22px;}
+.menu-profile-icon.pscontacts{
+	background: url("../../../view/theme/diabook/icons/pscontacts.png") no-repeat;
+	float: left;
+	height: 22px;
+   width: 22px;}
+
 /* aside */
+/*marker*/
 aside {
   display: table-cell;
   vertical-align: top;
-  width: 160px;
-  padding: 0px 10px 0px 10px;
+  width: 180px;
+  padding: 0px 5px 0px 0px;
   border-right: 1px solid #D2D2D2;
   float: left;
   /* background: #F1F1F1; */
 }
 aside #page-sidebar{display: none;}
+
 aside .vcard .fn {
   font-size: 18px;
   font-weight: bold;
@@ -1007,10 +1020,16 @@ aside #profiles-menu {
 }
 aside #search-text {
 	width: 150px;
+	height: 17px;
+	padding-left: 10px;
 	border-top-left-radius: 15px;
 border-top-right-radius: 15px;
 border-bottom-right-radius: 15px;
 border-bottom-left-radius: 15px;
+-moz-border-bottom-colors: #dbdbdb;
+  -moz-border-top-colors: #999;
+  -moz-border-left-colors: #999;
+  -moz-border-right-colors: #dbdbdb;
 }
 aside #side-follow-url {
 	width: 150px;
@@ -1054,9 +1073,11 @@ aside #side-peoplefind-url {
 	.action .s16 { width: 16px; overflow: hidden; padding: 0px;}*/
 /*  font-size: 12px; */
 }
+/*marker*/
 .widget h3 {
   padding: 0px;
   margin: 2px;
+  font-size: 1.05em;
 }
 .widget .action {
   opacity: 0.1;
@@ -1106,18 +1127,8 @@ aside #side-peoplefind-url {
   min-height: 16px;
   list-style: none;
 }
-#side-bar-photos-albums li{
-list-style-type: disc;
-}
-#side-bar-photos-albums ul li{
-  margin-left: 30px;
-  padding-left: 0px;
-	}
-#side-bar-photos-albums ul li a{
-  color: #1872A2;
-}
 .widget .tool.selected {
-  background: url("../../../view/theme/diabook-blue/icons/selected.png") no-repeat left center;
+  background: url("../../../view/theme/diabook/icons/selected.png") no-repeat left center;
 }
 /* widget: search */
 span.sbox_l  {
@@ -1160,8 +1171,13 @@ section {
 
 body .pageheader{
   text-align: center;
-  margin-top: 25px;
-  font-size: 0px;
+  font-size: 20px;
+  margin-bottom: 20px;
+  margin-top: 0px;
+  max-width: 575px;
+	}
+.qcomment{
+  max-width: 122px;	
 	}
 
 #id_username {
@@ -1182,7 +1198,6 @@ body .pageheader{
 	clear: both;
 	display: block;
 }	
-
 .tabs {
     
     background-position: 0 -20px;
@@ -1191,7 +1206,6 @@ body .pageheader{
     padding: 0;
  }
 .tab.button {
-    margin-right: 5px; 
     margin-left: 5px;	
     /*background: none repeat scroll 0 0 #F8F8F8;*/
     border: 1px solid #CCCCCC;
@@ -1204,18 +1218,17 @@ body .pageheader{
 #birthday-notice, #event-notice, #birthday-wrapper, #event-wrapper{
 	margin-bottom: 10px;
 	}
-
+/*marker*/
 right_aside {
   display: table-cell;
   vertical-align: top;
-  width: 170px;
-  
+  width: 180px;
   /*border-left: 1px solid #D2D2D2;*/
   
   /* background: #F1F1F1; */
 }
-right_aside a{color: #1872A2;}
-right_aside h3 {border-bottom: 1px solid #D2D2D2; padding-top: 5px; padding-bottom: 0px; padding-left: 5px; margin-bottom: 0px; 
+/*marker*/
+right_aside h3 {font-size: 1.05em; border-bottom: 1px solid #D2D2D2; padding-top: 5px; padding-bottom: 0px; padding-left: 9px; margin-bottom: 0px; 
 margin-top:30px;}
 right_aside .directory-item {	width: 50px; height: 50px; vertical-align: center; text-align: center; }
 right_aside .directory-photo { margin: 0px; }
@@ -1229,13 +1242,12 @@ right_aside #ra-photos-wrapper { padding-left: 5px; padding-top: 3px; overflow:
 #page-sidebar-right_aside .label {max-width: 128px;}
 right_aside .icon {width: 10px; height: 10px;}
 .close_box		{ 
-		background-image: url("../../../view/theme/diabook-blue/icons/close_box.png");
+		background-image: url("../../../view/theme/diabook/icons/close_box.png");
 		float: right;
-		cursor: pointer;
 		opacity: 0.1;
 		}
 .close_box:hover	{ 
-		background-image: url("../../../view/theme/diabook-blue/icons/close_box.png");
+		background-image: url("../../../view/theme/diabook/icons/close_box.png");
 		float: right;
 		cursor: pointer;
 		opacity: 1;
@@ -1245,29 +1257,28 @@ right_aside .icon {width: 10px; height: 10px;}
 -ms-transition: all 0.2s ease-in-out;
 transition: all 0.2s ease-in-out;
 		}
-		
+
 /* wall item */
+/*marker*/
 .tread-wrapper {
   border-bottom: 1px solid #D2D2D2;
   position: relative;
   padding: 5px;
   margin-bottom: 0px;
-  width: 575px;
-}
-.tread-wrapper a{
-  color: #1872A2;
+  width: 775px;
+  padding-top: 10px;
 }
-
+/*marker*/
 .wall-item-decor {
   position: absolute;
-  left: 790px;
+  left: 780px;
   top: -10px;
   width: 16px;
 }
-
+/*marker*/
 .wall-item-container {
   display: table;
-  width: 580px;
+  width: 770px;
 }
 
 
@@ -1317,16 +1328,18 @@ transition: all 0.2s ease-in-out;
   
   margin-bottom: 5px;
 }
-
+/*marker*/
 .wall-item-container .wall-item-content {
-  font-size: 12.5px;
-  max-width: 420px;
+
+  max-width: 690px;
   word-wrap: break-word;
-  line-height: 1.2;
-}
 
+
+}
+/*marker*/
 .wall-item-container .wall-item-content img {
-  max-width: 400px; 
+
+
 }
 .wall-item-container .wall-item-links, .wall-item-container .wall-item-actions {
   display: table-cell;
@@ -1377,11 +1390,12 @@ transition: all 0.2s ease-in-out;
 .wall-item-container .wall-item-actions-tools input {
   float: right;
 }
+/*marker*/
 .wall-item-container.comment {
   margin-top: 5px;
   margin-bottom: 5px;
   margin-left: 80px;
-  width: 500px;
+  width: 690px;
   border-bottom: 1px solid hsl(198, 21%, 79%);
 }
 .wall-item-container.comment .contact-photo {
@@ -1398,17 +1412,14 @@ transition: all 0.2s ease-in-out;
 .wall-item-container.comment .wall-item-links {
   padding-left: 12px;
 }
-
 .wall-item-comment-wrapper {
-  margin: 1px 0px 0px 80px;
-  background-color: #fff;
-  width: 500px;
+  margin: 1px 5px 5px 80px;
 }
 .wall-item-comment-wrapper .comment-edit-photo {
   display: none;
 }
 .wall-item-comment-wrapper textarea {
-  height: 2.0em;
+  height: 1.6em;
   width: 100%;
   font-size: 10px;
   color: #999999;
@@ -1423,9 +1434,9 @@ transition: all 0.2s ease-in-out;
   border: 1px solid #2d2d2d;
 }
 .comment-edit-preview {
-  width: 710px;
-  border: 1px solid #2d2d2d;
+  width: 500px;
   margin-top: 10px;
+  background-color:  #fff797;
 }
 .comment-edit-preview .contact-photo {
   width: 32px;
@@ -1571,6 +1582,11 @@ transition: all 0.2s ease-in-out;
   padding: 0.3em;
   margin-bottom: 10px;
 }
+.grey
+{
+  display: inline;
+  float: right;	
+	}
 #jot #jot-tools {
   margin: 0px;
   padding: 0px;
@@ -1656,7 +1672,7 @@ transition: all 0.2s ease-in-out;
     height: 20px;
     margin: 0 0 5px;
     width: 60%;
-    border: 1px solid #ffffff;
+    border: 1px solid #d2d2d2;
 }
 #profile-jot-form #jot-title:-webkit-input-placeholder {
   font-weight: normal;
@@ -1698,19 +1714,21 @@ transition: all 0.2s ease-in-out;
 	cursor: pointer;
 	margin-top: 2px;
 }
+/*marker*/
 #profile-jot-wrapper{
-	margin: 0 2em 20px 0;
-   width: 585px;
+	margin: 0 20px 20px 0;
+   width: 785px;
 	}
-
+/*marker*/
 #profile-jot-submit-wrapper {
 	margin-bottom: 50px;
-	width: 585px;
+	width: 785px;
 }
 
 #profile-jot-submit {
 	float: right;
 	margin-top: 2px;
+	font-size: 14px;
 	
 }
 #profile-upload-wrapper {
@@ -1763,7 +1781,9 @@ transition: all 0.2s ease-in-out;
 	float: right;
 	margin-left: 10px;
 	margin-top: 2px;
-	font-size: 10px;
+	font-size: 9px;
+	font-weight: bolder;
+	cursor: pointer;
 }
 #profile-jot-perms{
    float: right;
@@ -1774,26 +1794,30 @@ transition: all 0.2s ease-in-out;
 .button.creation1 {
     background-color: #fff;
     border: 1px solid #777777;
-    background-image: -moz-linear-gradient(center top , white 0%, #DDDDDD 100%);
     border-radius: 3px 3px 3px 3px;
     box-shadow: 0 1px 1px #CFCFCF;
+    cursor: pointer;
+    font-weight: bolder;
 }
 .button.creation2 {
-    background-color: #1872A2;
+    background-color: #33ACFF;
     background-image: -moz-linear-gradient(center top , #66C1FF 0%, #0097FF 100%);
     border: 1px solid #777777;
     color: white;
     border-radius: 3px 3px 3px 3px;
     box-shadow: 0 1px 1px #CFCFCF;
     margin-left: 5px;
+    cursor: pointer;
+    font-weight: bolder;
 }
 /*input[type="submit"] {
-	border: 0px;
-    background-color: @ButtonBackgroundColor;
-    color: @ButtonColor;
-    padding: 0px 10px;
-	.rounded(5px);
-    height: 18px;
+    background-color: #33ACFF;
+    background-image: -moz-linear-gradient(center top , #66C1FF 0%, #0097FF 100%);
+    border: 1px solid #777777;
+    color: white;
+    border-radius: 3px 3px 3px 3px;
+    box-shadow: 0 1px 1px #CFCFCF;
+    margin-left: 5px;
 }*/
 /** acl **/
 #photo-edit-perms-select, #photos-upload-permissions-wrapper, #profile-jot-acl-wrapper {
@@ -1899,18 +1923,20 @@ transition: all 0.2s ease-in-out;
   border-color: #ff4141;
 }
 /** /acl **/
-/** tab buttons 14618a**/
+/** tab buttons **/
+/*marker*/
 ul.tabs {
   list-style-type: none;
   padding-bottom: 10px;
   font-size: 13px;
+  width: 805px;
 }
 ul.tabs li {
   float: left;
   margin-left: 5px;
 }
 ul.tabs li .active {
-    background-color: #055580;
+    background-color: #333333;
     border: 1px solid #777777;
     color: white;
     border-radius: 3px 3px 3px 3px;
@@ -2035,15 +2061,8 @@ ul.tabs li .active {
   float: left;
 }
 /* photo */
-.photo {
-box-shadow: 2px 2px 5px 0px #000000;
-margin: 2px 5px 2px 5px;
-max-height: 85%;
-max-width: 85%;
-}
 .lframe {
   float: left;
-  /*margin: 0px 10px 10px 0px;*/
 }
 /* profile match wrapper */
 .profile-match-wrapper {
@@ -2074,7 +2093,7 @@ max-width: 85%;
 	padding: 0px;
         width: 16px;
         height: 16px;
-        top: -20px; left:0px;
+        top: -16px; left:0px;
         overflow: hidden;
         text-indent: 40px;
         display: none;
@@ -2112,6 +2131,10 @@ blockquote {
     border-left: 1px solid #D2D2D2;
     padding-left: 9px;
     margin: 0 0 0 .8ex;
+    color: #777;
+}
+.oembed {
+	font-weight: bold;
 }
 .aprofile dt{
 box-shadow: 1px 1px 5px 0;
@@ -2150,6 +2173,9 @@ box-shadow: 1px 1px 5px 0;
 #group-separator,
 #prof-separator { display: none;}
 */
+#prof-members-end{
+	clear: both;
+	}
 
 #prvmail-to-label, #prvmail-subject-label, #prvmail-message-label {
 	margin-bottom: 10px;
@@ -2160,7 +2186,6 @@ box-shadow: 1px 1px 5px 0;
 	float: right;
 	margin-top: 10px;
 }
-
 #prvmail-subject
 {
 background: none repeat scroll 0 0 #FFFFFF;
@@ -2174,7 +2199,6 @@ vertical-align: middle;
 #prvmail-form{
  width: 597px;	
 	}
-	
 #prvmail-upload-wrapper,
 #prvmail-link-wrapper,
 #prvmail-rotator-wrapper {
@@ -2275,7 +2299,7 @@ a.mail-list-link {
 }
 
 .vevent {
-        border: 1px solid #CCCCCC;
+
 }
 .vevent .event-description, .vevent .event-location {
         margin-left: 10px;
@@ -2330,9 +2354,6 @@ a.mail-list-link {
 .calendar {
         font-family: Courier, monospace;
 }
-.calendar.eventcal a {
-  color: #1872A2;	
-	}
 .today {
         font-weight: bold;
         color: #FF0000;
@@ -2525,36 +2546,30 @@ list-style-type: disc;
   width: 200px; height: 140px;
   overflow: hidden;  
 }
+/*
 .photo-top-album-name {
-        width: 100%;
-        position: absolute; 
-        bottom: 0px; 
-        padding-left: 3px;
-        background-color: #EEE;
-}
-.photo-top-album-link{
-  color: #1872A2;
-	}
-.photo-top-album-img{
-	
-	}
+  position: absolute;
+  bottom: 0;
+  padding: 0 5px;
+}*/
 /*.photo-top-image-wrapper {
         position: relative;
         float: left;
         margin-top: 15px;
         margin-right: 15px;
         width: 200px; height: 200px; 
-        overflow: hidden; 
-}
+        
+}*/
 .photo-top-album-name {
         width: 100%;
-        min-height: 2em;
         position: absolute; 
         bottom: 0px; 
-        padding: 0px 3px;
-        padding-top: 0.5em;
-        background-color: rgb(255, 255, 255);
-}*/
+        padding-left: 3px;
+        background-color: #EEE;
+}
+.photo-top-album-link{
+  color: #3465A4;
+	}
 #photo-top-end {
         clear: both;
 }
@@ -2567,5 +2582,4 @@ list-style-type: disc;
 #photos-upload-newalbum-div {
         float: left;
         width: 175px;
-}
-
+}
\ No newline at end of file
diff --git a/view/theme/diabook/style-network.css b/view/theme/diabook/style-network.css
index 518e7b88d..a8ed1e9a2 100644
--- a/view/theme/diabook/style-network.css
+++ b/view/theme/diabook/style-network.css
@@ -122,7 +122,7 @@
 			  display: block; width: 28px; height: 28px; background-repeat: no-repeat;
 			  }	
 .video 	{ background-image: url("../../../view/theme/diabook/icons/video.png"); 
-			  display: block; width: 100%; height: 28px; background-repeat: no-repeat;
+			  display: block; width: 100%; height: 140px; background-repeat: no-repeat;
 			  }
 .audio2 	{ background-image: url("../../../view/theme/diabook/icons/audio.png"); 
 			  display: block; width: 28px; height: 28px; background-repeat: no-repeat;
@@ -484,8 +484,9 @@ code {
 }
 #saved-search-ul .tool:hover,
 #nets-sidebar .tool:hover,
-#sidebar-group-list .tool:hover {
-	background: #EEE;
+#sidebar-group-list .tool:hover,
+#fileas-sidebar .tool:hover {
+	background: #E7F2F7;
 }
 .tool .label {
   float: left;
@@ -545,15 +546,17 @@ header #banner a:hover {
   text-decoration: none;
   outline: none;
   vertical-align: middle;
+ font-weight: bolder;
+  margin-left: 3px;
 }
 header #banner #logo-img {
   height: 25px;
-  margin-top: 5px;
+  margin-top: 3px;
 }
 header #banner #logo-text {
-  font-size: 22px;
+  font-size: 20px;
   position: absolute;
-  top: 15%;
+  top: 10%;
 }
 /* nav */
 nav {
@@ -632,7 +635,7 @@ nav #logo-text {
 nav .nav-menu-search {
   position: relative;
 
-  margin: 3px 17px;
+  margin: 4px 17px;
   margin-right: 0px;
   height: 17px;
   width: 180px;
@@ -896,44 +899,57 @@ ul.menu-popup .empty {
 	}
 .menu-profile-list{
   height: auto;
-  overflow: auto;
-  padding-top: 3px;
-  padding-bottom: 3px;
-  padding-left: 16px;
+  overflow: auto;  
   min-height: 16px;
   list-style: none;
 	}
 .menu-profile-list:hover{
-	background: #EEE;
+	background: #E7F2F7; 
 	}
 .menu-profile-list-item{
 	padding-left: 5px;
+	vertical-align: middle;
 	}	
 .menu-profile-list-item:hover{	
 	text-decoration: none;
    }
 /*http://prothemedesign.com/circular-icons/*/
-.menu-profile-list.home{
+.menu-profile-icon.home{
 	background: url("../../../view/theme/diabook/icons/home.png") no-repeat;
+	float: left;
+	height: 22px;
+	width: 22px;
 	}
-.menu-profile-list.photos{
+.menu-profile-icon.photos{
 	background: url("../../../view/theme/diabook/icons/mess_side.png") no-repeat;
-	}
-.menu-profile-list.events{
+	float: left;
+	height: 22px;
+   width: 22px;}
+.menu-profile-icon.events{
 	background: url("../../../view/theme/diabook/icons/events.png") no-repeat;
-	}
-.menu-profile-list.notes{
+	float: left;
+	height: 22px;
+   width: 22px;}
+.menu-profile-icon.notes{
 	background: url("../../../view/theme/diabook/icons/notes.png") no-repeat;
-	}
-.menu-profile-list.foren{
+	float: left;
+	height: 22px;
+   width: 22px;}
+.menu-profile-icon.foren{
 	background: url("../../../view/theme/diabook/icons/pubgroups.png") no-repeat;
-	}
-.menu-profile-list.com_side{
+	float: left;
+	height: 22px;
+   width: 22px;}
+.menu-profile-icon.com_side{
 	background: url("../../../view/theme/diabook/icons/com_side.png") no-repeat;
-	}
-.menu-profile-list.pscontacts{
+	float: left;
+	height: 22px;
+   width: 22px;}
+.menu-profile-icon.pscontacts{
 	background: url("../../../view/theme/diabook/icons/pscontacts.png") no-repeat;
-	}
+	float: left;
+	height: 22px;
+   width: 22px;}
 
 /* aside */
 aside {
@@ -1001,10 +1017,16 @@ aside #profiles-menu {
 }
 aside #search-text {
 	width: 150px;
+	height: 17px;
+	padding-left: 10px;
 	border-top-left-radius: 15px;
 border-top-right-radius: 15px;
 border-bottom-right-radius: 15px;
 border-bottom-left-radius: 15px;
+ -moz-border-bottom-colors: #dbdbdb;
+  -moz-border-top-colors: #999;
+  -moz-border-left-colors: #999;
+  -moz-border-right-colors: #dbdbdb;
 }
 aside #side-follow-url {
 	width: 150px;
@@ -1144,8 +1166,13 @@ section {
 
 body .pageheader{
   text-align: center;
-  margin-top: 25px;
-  font-size: 0px;
+  font-size: 20px;
+  margin-bottom: 20px;
+  margin-top: 0px;
+  max-width: 575px;
+	}
+.qcomment{
+  max-width: 122px;	
 	}
 
 #id_username {
@@ -1174,7 +1201,6 @@ body .pageheader{
     padding: 0;
  }
 .tab.button {
-    margin-right: 5px; 
     margin-left: 5px;	
     /*background: none repeat scroll 0 0 #F8F8F8;*/
     border: 1px solid #CCCCCC;
@@ -1196,7 +1222,7 @@ right_aside {
   
   /* background: #F1F1F1; */
 }
-right_aside h3 {border-bottom: 1px solid #D2D2D2; padding-top: 5px; padding-bottom: 0px; padding-left: 5px; margin-bottom: 0px; 
+right_aside h3 {border-bottom: 1px solid #D2D2D2; padding-top: 5px; padding-bottom: 0px; padding-left: 9px; margin-bottom: 0px; 
 margin-top:30px;}
 right_aside .directory-item {	width: 50px; height: 50px; vertical-align: center; text-align: center; }
 right_aside .directory-photo { margin: 0px; }
@@ -1210,12 +1236,12 @@ right_aside #ra-photos-wrapper { padding-left: 5px; padding-top: 3px; overflow:
 #page-sidebar-right_aside .label {max-width: 128px;}
 right_aside .icon {width: 10px; height: 10px;}
 .close_box		{ 
-		background-image: url("../../../view/theme/diabook-blue/icons/close_box.png");
+		background-image: url("../../../view/theme/diabook/icons/close_box.png");
 		float: right;
 		opacity: 0.1;
 		}
 .close_box:hover	{ 
-		background-image: url("../../../view/theme/diabook-blue/icons/close_box.png");
+		background-image: url("../../../view/theme/diabook/icons/close_box.png");
 		float: right;
 		cursor: pointer;
 		opacity: 1;
@@ -1233,6 +1259,7 @@ transition: all 0.2s ease-in-out;
   padding: 5px;
   margin-bottom: 0px;
   width: 575px;
+  padding-top: 10px;
 }
 .wall-item-decor {
   position: absolute;
@@ -1295,14 +1322,16 @@ transition: all 0.2s ease-in-out;
 }
 
 .wall-item-container .wall-item-content {
-  font-size: 12.5px;
+
   max-width: 420px;
   word-wrap: break-word;
-  line-height: 1.2;
+
+
 }
 
 .wall-item-container .wall-item-content img {
   max-width: 400px;
+
 }
 .wall-item-container .wall-item-links, .wall-item-container .wall-item-actions {
   display: table-cell;
@@ -1375,13 +1404,13 @@ transition: all 0.2s ease-in-out;
   padding-left: 12px;
 }
 .wall-item-comment-wrapper {
-  margin: 1px 5px 1px 80px;
+  margin: 1px 5px 5px 80px;
 }
 .wall-item-comment-wrapper .comment-edit-photo {
   display: none;
 }
 .wall-item-comment-wrapper textarea {
-  height: 2.0em;
+  height: 1.6em;
   width: 100%;
   font-size: 10px;
   color: #999999;
@@ -1396,9 +1425,9 @@ transition: all 0.2s ease-in-out;
   border: 1px solid #2d2d2d;
 }
 .comment-edit-preview {
-  width: 710px;
-  border: 1px solid #2d2d2d;
+  width: 500px;
   margin-top: 10px;
+  background-color:  #fff797;
 }
 .comment-edit-preview .contact-photo {
   width: 32px;
@@ -1442,14 +1471,14 @@ transition: all 0.2s ease-in-out;
 }
 .tag {
   /*background: url("../../../images/tag_b.png") repeat-x center left;*/
-  color: #3465A4;
+  color: #999;
   padding-left: 3px;
   font-size: 12px;
 }
 .tag a {
   padding-right: 5px;
   /*background: url("../../../images/tag.png") no-repeat center right;*/
-  color: #3465A4;
+  color: #999;
 }
 .wwto {
   position: absolute !important;
@@ -1544,6 +1573,11 @@ transition: all 0.2s ease-in-out;
   padding: 0.3em;
   margin-bottom: 10px;
 }
+.grey
+{
+  display: inline;
+  float: right;	
+	}
 #jot #jot-tools {
   margin: 0px;
   padding: 0px;
@@ -1629,7 +1663,7 @@ transition: all 0.2s ease-in-out;
     height: 20px;
     margin: 0 0 5px;
     width: 60%;
-    border: 1px solid #ffffff;
+    border: 1px solid #d2d2d2;
 }
 #profile-jot-form #jot-title:-webkit-input-placeholder {
   font-weight: normal;
@@ -1684,6 +1718,7 @@ transition: all 0.2s ease-in-out;
 #profile-jot-submit {
 	float: right;
 	margin-top: 2px;
+	font-size: 14px;
 	
 }
 #profile-upload-wrapper {
@@ -1736,7 +1771,9 @@ transition: all 0.2s ease-in-out;
 	float: right;
 	margin-left: 10px;
 	margin-top: 2px;
-	font-size: 10px;
+	font-size: 9px;
+	font-weight: bolder;
+	cursor: pointer;
 }
 #profile-jot-perms{
    float: right;
@@ -1747,9 +1784,10 @@ transition: all 0.2s ease-in-out;
 .button.creation1 {
     background-color: #fff;
     border: 1px solid #777777;
-    background-image: -moz-linear-gradient(center top , white 0%, #DDDDDD 100%);
     border-radius: 3px 3px 3px 3px;
     box-shadow: 0 1px 1px #CFCFCF;
+    cursor: pointer;
+    font-weight: bolder;
 }
 .button.creation2 {
     background-color: #33ACFF;
@@ -1759,6 +1797,8 @@ transition: all 0.2s ease-in-out;
     border-radius: 3px 3px 3px 3px;
     box-shadow: 0 1px 1px #CFCFCF;
     margin-left: 5px;
+    cursor: pointer;
+    font-weight: bolder;
 }
 /*input[type="submit"] {
     background-color: #33ACFF;
@@ -2079,6 +2119,10 @@ blockquote {
     border-left: 1px solid #D2D2D2;
     padding-left: 9px;
     margin: 0 0 0 .8ex;
+    color: #777;
+}
+.oembed {
+	font-weight: bold;
 }
 .aprofile dt{
 box-shadow: 1px 1px 5px 0;
@@ -2117,6 +2161,9 @@ box-shadow: 1px 1px 5px 0;
 #group-separator,
 #prof-separator { display: none;}
 */
+#prof-members-end{
+	clear: both;
+	}
 
 #prvmail-to-label, #prvmail-subject-label, #prvmail-message-label {
 	margin-bottom: 10px;
@@ -2240,7 +2287,7 @@ a.mail-list-link {
 }
 
 .vevent {
-        border: 1px solid #CCCCCC;
+
 }
 .vevent .event-description, .vevent .event-location {
         margin-left: 10px;
@@ -2262,10 +2309,7 @@ a.mail-list-link {
         margin-bottom: 15px;
 }
 
-.event-description:before {
-        content: url('../../../images/calendar.png');
-        margin-right: 15px;
-}
+
 
 .event-start, .event-end {
         margin-left: 10px;
diff --git a/view/theme/diabook/style-settings.css b/view/theme/diabook/style-profile-wide.css
index 46f7e957e..c4c72fb68 100644
--- a/view/theme/diabook/style-settings.css
+++ b/view/theme/diabook/style-profile-wide.css
@@ -121,7 +121,7 @@
 			  display: block; width: 28px; height: 28px; background-repeat: no-repeat;
 			  }	
 .video 	{ background-image: url("../../../view/theme/diabook/icons/video.png"); 
-			  display: block; width: 100%; height: 28px; background-repeat: no-repeat;
+			  display: block; width: 100%; height: 140px; background-repeat: no-repeat;
 			  }
 .audio2 	{ background-image: url("../../../view/theme/diabook/icons/audio.png"); 
 			  display: block; width: 28px; height: 28px; background-repeat: no-repeat;
@@ -385,7 +385,7 @@
 .hide-comments-outer {
   margin-left: 80px;
   margin-bottom: 5px;
-  width: 484px;
+  width: 675px;
   border-bottom: 1px solid #BDCDD4;
   border-top: 1px solid #BDCDD4;
 
@@ -395,11 +395,12 @@
 /* global */
 body {
   font-family: 'Lato', "Helvetica Neue", Helvetica, Arial, sans-serif;
-  font-size: 12.5px;
+  font-size: 13px;
   background-color: #ffffff;
   color: #2d2d2d;
   margin: 50px auto auto;
   display: table;
+
 }
 
 h4 {
@@ -483,8 +484,9 @@ code {
 }
 #saved-search-ul .tool:hover,
 #nets-sidebar .tool:hover,
-#sidebar-group-list .tool:hover {
-	background: #EEE;
+#sidebar-group-list .tool:hover,
+#fileas-sidebar .tool:hover{
+	background: #E7F2F7;
 }
 .tool .label {
   float: left;
@@ -543,15 +545,17 @@ header #banner a:hover {
   text-decoration: none;
   outline: none;
   vertical-align: middle;
+ font-weight: bolder;
+  margin-left: 3px;
 }
 header #banner #logo-img {
   height: 25px;
-  margin-top: 5px;
+  margin-top: 3px;
 }
 header #banner #logo-text {
-  font-size: 22px;
+  font-size: 20px;
   position: absolute;
-  top: 15%;
+  top: 10%;
 }
 /* nav */
 nav {
@@ -630,7 +634,7 @@ nav #logo-text {
 nav .nav-menu-search {
   position: relative;
 
-  margin: 3px 17px;
+  margin: 4px 17px;
   margin-right: 0px;
   height: 17px;
   width: 180px;
@@ -667,12 +671,13 @@ nav .nav-menu-icon img {
 nav .nav-menu-icon .nav-notify {
   top: 3px;
 }
+/*marker*/
 nav .nav-menu {
   position: relative;
   height: 16px;
   padding: 5px;
   margin: 3px 15px 0px;
-  font-size: 13px;
+  font-size: 15px;
   /*border-bottom: 3px solid #364A84;*/
 }
 nav .nav-menu.selected {
@@ -895,8 +900,6 @@ ul.menu-popup .empty {
 .menu-profile-list{
   height: auto;
   overflow: auto;
-  padding-top: 3px;
-  padding-bottom: 3px;
   padding-left: 16px;
   min-height: 16px;
   list-style: none;
@@ -906,43 +909,47 @@ ul.menu-popup .empty {
 	}
 .menu-profile-list-item{
 	padding-left: 5px;
+	vertical-align: middle;
 	}	
 .menu-profile-list-item:hover{	
 	text-decoration: none;
    }
 /*http://prothemedesign.com/circular-icons/*/
-.menu-profile-list.home{
-	background: url("../../../view/theme/diabook-blue/icons/home.png") no-repeat;
+.menu-profile-icon.home{
+	background: url("../../../view/theme/diabook/icons/home.png") no-repeat;
 	}
-.menu-profile-list.photos{
-	background: url("../../../view/theme/diabook-blue/icons/mess_side.png") no-repeat;
+.menu-profile-icon.photos{
+	background: url("../../../view/theme/diabook/icons/mess_side.png") no-repeat;
 	}
-.menu-profile-list.events{
-	background: url("../../../view/theme/diabook-blue/icons/events.png") no-repeat;
+.menu-profile-icon.events{
+	background: url("../../../view/theme/diabook/icons/events.png") no-repeat;
 	}
-.menu-profile-list.notes{
-	background: url("../../../view/theme/diabook-blue/icons/notes.png") no-repeat;
+.menu-profile-icon.notes{
+	background: url("../../../view/theme/diabook/icons/notes.png") no-repeat;
 	}
-.menu-profile-list.foren{
-	background: url("../../../view/theme/diabook-blue/icons/pubgroups.png") no-repeat;
+.menu-profile-icon.foren{
+	background: url("../../../view/theme/diabook/icons/pubgroups.png") no-repeat;
 	}
-.menu-profile-list.com_side{
-	background: url("../../../view/theme/diabook-blue/icons/com_side.png") no-repeat;
+.menu-profile-icon.com_side{
+	background: url("../../../view/theme/diabook/icons/com_side.png") no-repeat;
 	}
 
 /* aside */
+/*marker*/
 aside {
   display: table-cell;
   vertical-align: top;
-  width: 200px;
-  padding: 0px 10px 0px 10px;
+  width: 180px;
+  padding: 0px 5px 0px 0px;
   border-right: 1px solid #D2D2D2;
   float: left;
   /* background: #F1F1F1; */
 }
 
-aside .vcard  {
-  display: none;
+aside .vcard .fn {
+  font-size: 18px;
+  font-weight: bold;
+  margin-bottom: 5px;
 }
 aside .vcard .title {
   margin-bottom: 5px;
@@ -993,6 +1000,8 @@ aside #profiles-menu {
 }
 aside #search-text {
 	width: 150px;
+	height: 17px;
+	padding-left: 10px;
 	border-top-left-radius: 15px;
 border-top-right-radius: 15px;
 border-bottom-right-radius: 15px;
@@ -1005,7 +1014,8 @@ aside #side-peoplefind-url {
 	width: 150px;
 	}
 #contact-block {
-  display: none;
+  overflow: auto;
+  height: auto;
 }
 #contact-block .contact-block-h4 {
   float: left;
@@ -1039,9 +1049,11 @@ aside #side-peoplefind-url {
 	.action .s16 { width: 16px; overflow: hidden; padding: 0px;}*/
 /*  font-size: 12px; */
 }
+/*marker*/
 .widget h3 {
   padding: 0px;
   margin: 2px;
+  font-size: 1.05em;
 }
 .widget .action {
   opacity: 0.1;
@@ -1129,16 +1141,20 @@ span.sbox input {
 section {
   display: table-cell;
   vertical-align: top;
-  width: 650px;
-  padding: 0px 0px 0px 20px;
+  width: 610px;
+  padding: 0px 0px 0px 12px;
 }
 
 body .pageheader{
   text-align: center;
-  margin-top: 25px;
-  font-size: 0px;
+  font-size: 20px;
+  margin-bottom: 20px;
+  margin-top: 0px;
+  max-width: 575px;
+	}
+.qcomment{
+  max-width: 122px;	
 	}
-
 #id_username {
   width: 173px;	
 	}
@@ -1157,39 +1173,37 @@ body .pageheader{
 	clear: both;
 	display: block;
 }	
-.tabs {display: none;}
-.tab.button{display: none;}
-.rs_tabs {
+.tabs {
     
     background-position: 0 -20px;
     background-repeat: repeat-x;
     height: 27px;
     padding: 0;
  }
-.rs_tab.button {	
+.tab.button {
+    margin-left: 5px;	
     /*background: none repeat scroll 0 0 #F8F8F8;*/
     border: 1px solid #CCCCCC;
     border-radius: 3px 3px 3px 3px;
-    font-weight: bolder;
+    font-weight: normal;
     padding: 3px;
     color:  #333333;
-    text-decoration: none;
 	}
 	
 #birthday-notice, #event-notice, #birthday-wrapper, #event-wrapper{
 	margin-bottom: 10px;
 	}
-
+/*marker*/
 right_aside {
   display: table-cell;
   vertical-align: top;
-  width: 170px;
-  
+  width: 180px;
   /*border-left: 1px solid #D2D2D2;*/
   
   /* background: #F1F1F1; */
 }
-right_aside h3 {border-bottom: 1px solid #D2D2D2; padding-top: 5px; padding-bottom: 0px; padding-left: 5px; margin-bottom: 0px; 
+/*marker*/
+right_aside h3 {font-size: 1.05em; border-bottom: 1px solid #D2D2D2; padding-top: 5px; padding-bottom: 0px; padding-left: 9px; margin-bottom: 0px; 
 margin-top:30px;}
 right_aside .directory-item {	width: 50px; height: 50px; vertical-align: center; text-align: center; }
 right_aside .directory-photo { margin: 0px; }
@@ -1203,13 +1217,13 @@ right_aside #ra-photos-wrapper { padding-left: 5px; padding-top: 3px; overflow:
 #page-sidebar-right_aside .label {max-width: 128px;}
 right_aside .icon {width: 10px; height: 10px;}
 .close_box		{ 
-		background-image: url("../../../view/theme/diabook-blue/icons/close_box.png");
+		background-image: url("../../../view/theme/diabook/icons/close_box.png");
 		float: right;
 		cursor: pointer;
 		opacity: 0.1;
 		}
 .close_box:hover	{ 
-		background-image: url("../../../view/theme/diabook-blue/icons/close_box.png");
+		background-image: url("../../../view/theme/diabook/icons/close_box.png");
 		float: right;
 		cursor: pointer;
 		opacity: 1;
@@ -1220,23 +1234,26 @@ right_aside .icon {width: 10px; height: 10px;}
 transition: all 0.2s ease-in-out;
 		}
 /* wall item */
+/*marker*/
 .tread-wrapper {
   border-bottom: 1px solid #D2D2D2;
   position: relative;
   padding: 5px;
   margin-bottom: 0px;
-  width: 575px;
+  width: 775px;
+  padding-top: 10px;
 }
+/*marker*/
 .wall-item-decor {
   position: absolute;
-  left: 790px;
+  left: 780px;
   top: -10px;
   width: 16px;
 }
-
+/*marker*/
 .wall-item-container {
   display: table;
-  width: 580px;
+  width: 770px;
 }
 
 
@@ -1286,16 +1303,18 @@ transition: all 0.2s ease-in-out;
   
   margin-bottom: 5px;
 }
-
+/*marker*/
 .wall-item-container .wall-item-content {
-  font-size: 12.5px;
-  max-width: 420px;
+
+  max-width: 690px;
   word-wrap: break-word;
-  line-height: 1.2;
-}
 
+
+}
+/*marker*/
 .wall-item-container .wall-item-content img {
-  max-width: 400px;
+
+
 }
 .wall-item-container .wall-item-links, .wall-item-container .wall-item-actions {
   display: table-cell;
@@ -1346,11 +1365,12 @@ transition: all 0.2s ease-in-out;
 .wall-item-container .wall-item-actions-tools input {
   float: right;
 }
+/*marker*/
 .wall-item-container.comment {
   margin-top: 5px;
   margin-bottom: 5px;
   margin-left: 80px;
-  width: 500px;
+  width: 690px;
   border-bottom: 1px solid hsl(198, 21%, 79%);
 }
 .wall-item-container.comment .contact-photo {
@@ -1368,13 +1388,13 @@ transition: all 0.2s ease-in-out;
   padding-left: 12px;
 }
 .wall-item-comment-wrapper {
-  margin: 1px 5px 1px 80px;
+  margin: 1px 5px 5px 80px;
 }
 .wall-item-comment-wrapper .comment-edit-photo {
   display: none;
 }
 .wall-item-comment-wrapper textarea {
-  height: 2.0em;
+  height: 1.6em;
   width: 100%;
   font-size: 10px;
   color: #999999;
@@ -1389,9 +1409,9 @@ transition: all 0.2s ease-in-out;
   border: 1px solid #2d2d2d;
 }
 .comment-edit-preview {
-  width: 710px;
-  border: 1px solid #2d2d2d;
+  width: 500px;
   margin-top: 10px;
+  background-color:  #fff797;
 }
 .comment-edit-preview .contact-photo {
   width: 32px;
@@ -1435,14 +1455,14 @@ transition: all 0.2s ease-in-out;
 }
 .tag {
   /*background: url("../../../images/tag_b.png") repeat-x center left;*/
-  color: #3465A4;
+  color: #999;
   padding-left: 3px;
   font-size: 12px;
 }
 .tag a {
   padding-right: 5px;
   /*background: url("../../../images/tag.png") no-repeat center right;*/
-  color: #3465A4;
+  color: #999;
 }
 .wwto {
   position: absolute !important;
@@ -1537,6 +1557,11 @@ transition: all 0.2s ease-in-out;
   padding: 0.3em;
   margin-bottom: 10px;
 }
+.grey
+{
+  display: inline;
+  float: right;	
+	}
 #jot #jot-tools {
   margin: 0px;
   padding: 0px;
@@ -1622,7 +1647,7 @@ transition: all 0.2s ease-in-out;
     height: 20px;
     margin: 0 0 5px;
     width: 60%;
-    border: 1px solid #ffffff;
+    border: 1px solid #d2d2d2;
 }
 #profile-jot-form #jot-title:-webkit-input-placeholder {
   font-weight: normal;
@@ -1664,20 +1689,21 @@ transition: all 0.2s ease-in-out;
 	cursor: pointer;
 	margin-top: 2px;
 }
+/*marker*/
 #profile-jot-wrapper{
-	margin: 0 2em 20px 0;
-   width: 585px;
+	margin: 0 20px 20px 0;
+   width: 785px;
 	}
-
+/*marker*/
 #profile-jot-submit-wrapper {
 	margin-bottom: 50px;
-	width: 585px;
+	width: 785px;
 }
 
 #profile-jot-submit {
 	float: right;
 	margin-top: 2px;
-	
+	font-size: 14px;
 }
 #profile-upload-wrapper {
 	float: left;
@@ -1729,7 +1755,9 @@ transition: all 0.2s ease-in-out;
 	float: right;
 	margin-left: 10px;
 	margin-top: 2px;
-	font-size: 10px;
+	font-size: 9px;
+	font-weight: bolder;
+	cursor: pointer;
 }
 #profile-jot-perms{
    float: right;
@@ -1740,9 +1768,10 @@ transition: all 0.2s ease-in-out;
 .button.creation1 {
     background-color: #fff;
     border: 1px solid #777777;
-    background-image: -moz-linear-gradient(center top , white 0%, #DDDDDD 100%);
     border-radius: 3px 3px 3px 3px;
     box-shadow: 0 1px 1px #CFCFCF;
+    cursor: pointer;
+    font-weight: bolder;
 }
 .button.creation2 {
     background-color: #33ACFF;
@@ -1752,6 +1781,8 @@ transition: all 0.2s ease-in-out;
     border-radius: 3px 3px 3px 3px;
     box-shadow: 0 1px 1px #CFCFCF;
     margin-left: 5px;
+    cursor: pointer;
+    font-weight: bolder;
 }
 /*input[type="submit"] {
 	border: 0px;
@@ -1866,23 +1897,24 @@ transition: all 0.2s ease-in-out;
 }
 /** /acl **/
 /** tab buttons **/
-ul.rs_tabs {
+/*marker*/
+ul.tabs {
   list-style-type: none;
-
-  font-size: 11px;
+  padding-bottom: 10px;
+  font-size: 13px;
+  width: 805px;
 }
-ul.rs_tabs li {
+ul.tabs li {
   float: left;
-  margin-bottom: 30px;
-  clear: both;
+  margin-left: 5px;
 }
-ul.rs_tabs li .active {
-    background-color: #333;
+ul.tabs li .active {
+    background-color: #333333;
     border: 1px solid #777777;
     color: white;
     border-radius: 3px 3px 3px 3px;
-    box-shadow: 2px 2px 2px #CFCFCF;
-    font-size: 13px;
+    box-shadow: 0 1px 1px #CFCFCF;
+    margin-left: 5px;
 }
 /**
  * Form fields
@@ -2002,6 +2034,11 @@ ul.rs_tabs li .active {
   float: left;
 }
 /* photo */
+.photo {
+border-radius: 10px;	
+height: 145px !important;
+width: 145px !important;
+	}
 .lframe {
   float: left;
 }
@@ -2034,7 +2071,7 @@ ul.rs_tabs li .active {
 	padding: 0px;
         width: 16px;
         height: 16px;
-        top: -20px; left:0px;
+        top: -16px; left:0px;
         overflow: hidden;
         text-indent: 40px;
         display: none;
@@ -2072,6 +2109,10 @@ blockquote {
     border-left: 1px solid #D2D2D2;
     padding-left: 9px;
     margin: 0 0 0 .8ex;
+    color: #777;
+}
+.oembed {
+	font-weight: bold;
 }
 .aprofile dt{
 box-shadow: 1px 1px 5px 0;
@@ -2110,6 +2151,9 @@ box-shadow: 1px 1px 5px 0;
 #group-separator,
 #prof-separator { display: none;}
 */
+#prof-members-end{
+	clear: both;
+	}
 
 #prvmail-to-label, #prvmail-subject-label, #prvmail-message-label {
 	margin-bottom: 10px;
@@ -2233,7 +2277,7 @@ a.mail-list-link {
 }
 
 .vevent {
-        border: 1px solid #CCCCCC;
+
 }
 .vevent .event-description, .vevent .event-location {
         margin-left: 10px;
@@ -2408,8 +2452,8 @@ float: left;
   display: none;
   /* position: absolute; */
   /* position: absolute; */
-  left: -2px;
-  top: -20px;
+  left: 0px;
+  top: -16px;
 }
 .contact-wrapper {
   float: left;
diff --git a/view/theme/diabook/style-profile.css b/view/theme/diabook/style-profile.css
index 0077510a1..a0a2adb53 100644
--- a/view/theme/diabook/style-profile.css
+++ b/view/theme/diabook/style-profile.css
@@ -121,7 +121,7 @@
 			  display: block; width: 28px; height: 28px; background-repeat: no-repeat;
 			  }	
 .video 	{ background-image: url("../../../view/theme/diabook/icons/video.png"); 
-			  display: block; width: 100%; height: 28px; background-repeat: no-repeat;
+			  display: block; width: 100%; height: 140px; background-repeat: no-repeat;
 			  }
 .audio2 	{ background-image: url("../../../view/theme/diabook/icons/audio.png"); 
 			  display: block; width: 28px; height: 28px; background-repeat: no-repeat;
@@ -483,8 +483,9 @@ code {
 }
 #saved-search-ul .tool:hover,
 #nets-sidebar .tool:hover,
-#sidebar-group-list .tool:hover {
-	background: #EEE;
+#sidebar-group-list .tool:hover,
+#fileas-sidebar .tool:hover{
+	background: #E7F2F7;
 }
 .tool .label {
   float: left;
@@ -543,15 +544,17 @@ header #banner a:hover {
   text-decoration: none;
   outline: none;
   vertical-align: middle;
+ font-weight: bolder;
+  margin-left: 3px;
 }
 header #banner #logo-img {
   height: 25px;
-  margin-top: 5px;
+  margin-top: 3px;
 }
 header #banner #logo-text {
-  font-size: 22px;
+  font-size: 20px;
   position: absolute;
-  top: 15%;
+  top: 10%;
 }
 /* nav */
 nav {
@@ -630,7 +633,7 @@ nav #logo-text {
 nav .nav-menu-search {
   position: relative;
 
-  margin: 3px 17px;
+  margin: 4px 17px;
   margin-right: 0px;
   height: 17px;
   width: 180px;
@@ -895,8 +898,6 @@ ul.menu-popup .empty {
 .menu-profile-list{
   height: auto;
   overflow: auto;
-  padding-top: 3px;
-  padding-bottom: 3px;
   padding-left: 16px;
   min-height: 16px;
   list-style: none;
@@ -906,28 +907,29 @@ ul.menu-popup .empty {
 	}
 .menu-profile-list-item{
 	padding-left: 5px;
+	vertical-align: middle;
 	}	
 .menu-profile-list-item:hover{	
 	text-decoration: none;
    }
 /*http://prothemedesign.com/circular-icons/*/
-.menu-profile-list.home{
-	background: url("../../../view/theme/diabook-blue/icons/home.png") no-repeat;
+.menu-profile-icon.home{
+	background: url("../../../view/theme/diabook/icons/home.png") no-repeat;
 	}
-.menu-profile-list.photos{
-	background: url("../../../view/theme/diabook-blue/icons/mess_side.png") no-repeat;
+.menu-profile-icon.photos{
+	background: url("../../../view/theme/diabook/icons/mess_side.png") no-repeat;
 	}
-.menu-profile-list.events{
-	background: url("../../../view/theme/diabook-blue/icons/events.png") no-repeat;
+.menu-profile-icon.events{
+	background: url("../../../view/theme/diabook/icons/events.png") no-repeat;
 	}
-.menu-profile-list.notes{
-	background: url("../../../view/theme/diabook-blue/icons/notes.png") no-repeat;
+.menu-profile-icon.notes{
+	background: url("../../../view/theme/diabook/icons/notes.png") no-repeat;
 	}
-.menu-profile-list.foren{
-	background: url("../../../view/theme/diabook-blue/icons/pubgroups.png") no-repeat;
+.menu-profile-icon.foren{
+	background: url("../../../view/theme/diabook/icons/pubgroups.png") no-repeat;
 	}
-.menu-profile-list.com_side{
-	background: url("../../../view/theme/diabook-blue/icons/com_side.png") no-repeat;
+.menu-profile-icon.com_side{
+	background: url("../../../view/theme/diabook/icons/com_side.png") no-repeat;
 	}
 
 /* aside */
@@ -995,6 +997,8 @@ aside #profiles-menu {
 }
 aside #search-text {
 	width: 150px;
+	height: 17px;
+	padding-left: 10px;
 	border-top-left-radius: 15px;
 border-top-right-radius: 15px;
 border-bottom-right-radius: 15px;
@@ -1138,10 +1142,14 @@ section {
 
 body .pageheader{
   text-align: center;
-  margin-top: 25px;
-  font-size: 0px;
+  font-size: 20px;
+  margin-bottom: 20px;
+  margin-top: 0px;
+  max-width: 575px;
+	}
+.qcomment{
+  max-width: 122px;	
 	}
-
 #id_username {
   width: 173px;	
 	}
@@ -1168,7 +1176,6 @@ body .pageheader{
     padding: 0;
  }
 .tab.button {
-    margin-right: 5px; 
     margin-left: 5px;	
     /*background: none repeat scroll 0 0 #F8F8F8;*/
     border: 1px solid #CCCCCC;
@@ -1191,7 +1198,7 @@ right_aside {
   
   /* background: #F1F1F1; */
 }
-right_aside h3 {border-bottom: 1px solid #D2D2D2; padding-top: 5px; padding-bottom: 0px; padding-left: 5px; margin-bottom: 0px; 
+right_aside h3 {border-bottom: 1px solid #D2D2D2; padding-top: 5px; padding-bottom: 0px; padding-left: 9px; margin-bottom: 0px; 
 margin-top:30px;}
 right_aside .directory-item {	width: 50px; height: 50px; vertical-align: center; text-align: center; }
 right_aside .directory-photo { margin: 0px; }
@@ -1205,13 +1212,13 @@ right_aside #ra-photos-wrapper { padding-left: 5px; padding-top: 3px; overflow:
 #page-sidebar-right_aside .label {max-width: 128px;}
 right_aside .icon {width: 10px; height: 10px;}
 .close_box		{ 
-		background-image: url("../../../view/theme/diabook-blue/icons/close_box.png");
+		background-image: url("../../../view/theme/diabook/icons/close_box.png");
 		float: right;
 		cursor: pointer;
 		opacity: 0.1;
 		}
 .close_box:hover	{ 
-		background-image: url("../../../view/theme/diabook-blue/icons/close_box.png");
+		background-image: url("../../../view/theme/diabook/icons/close_box.png");
 		float: right;
 		cursor: pointer;
 		opacity: 1;
@@ -1228,6 +1235,7 @@ transition: all 0.2s ease-in-out;
   padding: 5px;
   margin-bottom: 0px;
   width: 575px;
+  padding-top: 10px;
 }
 .wall-item-decor {
   position: absolute;
@@ -1290,14 +1298,16 @@ transition: all 0.2s ease-in-out;
 }
 
 .wall-item-container .wall-item-content {
-  font-size: 12.5px;
+
   max-width: 420px;
   word-wrap: break-word;
-  line-height: 1.2;
+
+
 }
 
 .wall-item-container .wall-item-content img {
   max-width: 400px;
+
 }
 .wall-item-container .wall-item-links, .wall-item-container .wall-item-actions {
   display: table-cell;
@@ -1370,13 +1380,13 @@ transition: all 0.2s ease-in-out;
   padding-left: 12px;
 }
 .wall-item-comment-wrapper {
-  margin: 1px 5px 1px 80px;
+  margin: 1px 5px 5px 80px;
 }
 .wall-item-comment-wrapper .comment-edit-photo {
   display: none;
 }
 .wall-item-comment-wrapper textarea {
-  height: 2.0em;
+  height: 1.6em;
   width: 100%;
   font-size: 10px;
   color: #999999;
@@ -1391,9 +1401,9 @@ transition: all 0.2s ease-in-out;
   border: 1px solid #2d2d2d;
 }
 .comment-edit-preview {
-  width: 710px;
-  border: 1px solid #2d2d2d;
+  width: 500px;
   margin-top: 10px;
+  background-color:  #fff797;
 }
 .comment-edit-preview .contact-photo {
   width: 32px;
@@ -1437,14 +1447,14 @@ transition: all 0.2s ease-in-out;
 }
 .tag {
   /*background: url("../../../images/tag_b.png") repeat-x center left;*/
-  color: #3465A4;
+  color: #999;
   padding-left: 3px;
   font-size: 12px;
 }
 .tag a {
   padding-right: 5px;
   /*background: url("../../../images/tag.png") no-repeat center right;*/
-  color: #3465A4;
+  color: #999;
 }
 .wwto {
   position: absolute !important;
@@ -1539,6 +1549,11 @@ transition: all 0.2s ease-in-out;
   padding: 0.3em;
   margin-bottom: 10px;
 }
+.grey
+{
+  display: inline;
+  float: right;	
+	}
 #jot #jot-tools {
   margin: 0px;
   padding: 0px;
@@ -1624,7 +1639,7 @@ transition: all 0.2s ease-in-out;
     height: 20px;
     margin: 0 0 5px;
     width: 60%;
-    border: 1px solid #ffffff;
+    border: 1px solid #d2d2d2;
 }
 #profile-jot-form #jot-title:-webkit-input-placeholder {
   font-weight: normal;
@@ -1679,7 +1694,7 @@ transition: all 0.2s ease-in-out;
 #profile-jot-submit {
 	float: right;
 	margin-top: 2px;
-	
+	font-size: 14px;
 }
 #profile-upload-wrapper {
 	float: left;
@@ -1731,7 +1746,9 @@ transition: all 0.2s ease-in-out;
 	float: right;
 	margin-left: 10px;
 	margin-top: 2px;
-	font-size: 10px;
+	font-size: 9px;
+	font-weight: bolder;
+	cursor: pointer;
 }
 #profile-jot-perms{
    float: right;
@@ -1742,9 +1759,10 @@ transition: all 0.2s ease-in-out;
 .button.creation1 {
     background-color: #fff;
     border: 1px solid #777777;
-    background-image: -moz-linear-gradient(center top , white 0%, #DDDDDD 100%);
     border-radius: 3px 3px 3px 3px;
     box-shadow: 0 1px 1px #CFCFCF;
+    cursor: pointer;
+    font-weight: bolder;
 }
 .button.creation2 {
     background-color: #33ACFF;
@@ -1754,6 +1772,8 @@ transition: all 0.2s ease-in-out;
     border-radius: 3px 3px 3px 3px;
     box-shadow: 0 1px 1px #CFCFCF;
     margin-left: 5px;
+    cursor: pointer;
+    font-weight: bolder;
 }
 /*input[type="submit"] {
 	border: 0px;
@@ -2003,6 +2023,11 @@ ul.tabs li .active {
   float: left;
 }
 /* photo */
+.photo {
+border-radius: 10px;	
+height: 145px !important;
+width: 145px !important;
+	}
 .lframe {
   float: left;
 }
@@ -2073,6 +2098,10 @@ blockquote {
     border-left: 1px solid #D2D2D2;
     padding-left: 9px;
     margin: 0 0 0 .8ex;
+    color: #777;
+}
+.oembed {
+	font-weight: bold;
 }
 .aprofile dt{
 box-shadow: 1px 1px 5px 0;
@@ -2111,6 +2140,9 @@ box-shadow: 1px 1px 5px 0;
 #group-separator,
 #prof-separator { display: none;}
 */
+#prof-members-end{
+	clear: both;
+	}
 
 #prvmail-to-label, #prvmail-subject-label, #prvmail-message-label {
 	margin-bottom: 10px;
@@ -2234,7 +2266,7 @@ a.mail-list-link {
 }
 
 .vevent {
-        border: 1px solid #CCCCCC;
+
 }
 .vevent .event-description, .vevent .event-location {
         margin-left: 10px;
diff --git a/view/theme/diabook/style-wide.css b/view/theme/diabook/style-wide.css
new file mode 100644
index 000000000..abd10476a
--- /dev/null
+++ b/view/theme/diabook/style-wide.css
@@ -0,0 +1,2858 @@
+/**
+ * Fabio Comuni <http://kirgroup.com/profile/fabrixxm>
+ * Additional Changes: Michael Vogel <icarus@dabo.de>
+ **/
+
+/* ========= */
+/* = Admin = */
+/* ========= */
+
+#adminpage {
+/*        width: 80%;*/
+}
+
+#pending-update {
+        float:right;
+        color: #ffffff;
+        font-weight: bold;
+        background-color: #FF0000;
+        padding: 0em 0.3em;
+}
+
+.admin.linklist {
+        border: 0px; padding: 0px;
+}
+
+.admin.link {
+        list-style-position: inside;
+        font-size: 1em;
+        padding: 5px;
+        width: 100px;
+        margin: 5px;
+}
+
+#adminpage dl {
+        clear: left;
+        margin-bottom: 2px;
+        padding-bottom: 2px;
+        border-bottom: 1px solid black;
+}
+
+#adminpage dt {
+        width: 200px;
+        float: left;
+        font-weight: bold;
+}
+
+#adminpage dd {
+        margin-left: 200px;
+}
+#adminpage h3 {
+        border-bottom: 1px solid #898989;
+        margin-bottom: 5px;
+        margin-top: 10px;
+}
+
+#adminpage .submit {
+        clear:left;
+}
+
+#adminpage #pluginslist {
+        margin: 0px; padding: 0px;
+}
+
+#adminpage .plugin {
+        list-style: none;
+        display: block;
+	/* border: 1px solid #888888; */
+        padding: 1em;
+        margin-bottom: 5px;
+        clear: left;
+}
+
+#adminpage .toggleplugin {
+        float:left;
+        margin-right: 1em;
+}
+
+#adminpage table {width:100%; border-bottom: 1p solid #000000; margin: 5px 0px;}
+#adminpage table th { text-align: left;}
+#adminpage td .icon { float: left;}
+#adminpage table#users img { width: 16px; height: 16px; }
+#adminpage table tr:hover { background-color: #eeeeee; }
+#adminpage .selectall { text-align: right; }
+/* icons */
+
+.icon.bb-url{
+  background-image: url("../../../view/theme/diabook/icons/bb-url.png");
+  float: right;
+  margin-top: 2px;}
+.icon.quote{
+  background-image: url("../../../view/theme/diabook/icons/quote.png");
+  float: right;
+  margin-top: 2px;}
+.icon.bold{
+  background-image: url("../../../view/theme/diabook/icons/bold.png");
+  float: right;
+  margin-top: 2px;}
+.icon.underline{
+  background-image: url("../../../view/theme/diabook/icons/underline.png");
+  float: right;
+  margin-top: 2px;}
+.icon.italic{
+  background-image: url("../../../view/theme/diabook/icons/italic.png");
+  float: right;
+  margin-top: 2px;}
+.icon.bb-image{
+  background-image: url("../../../view/theme/diabook/icons/bb-image.png");
+  float: right;
+  margin-top: 2px;}
+.icon.bb-video{
+  background-image: url("../../../view/theme/diabook/icons/bb-video.png");
+  float: right;
+  margin-top: 2px;}
+  
+.icon.contacts {
+  background-image: url("../../../view/theme/diabook/icons/contacts.png");}
+.icon.notifications {
+  background-image: url("../../../view/theme/diabook/icons/notifications.png");}
+.icon.notify {
+  background-image: url("../../../view/theme/diabook/icons/notify.png");}
+.icon.messages {
+  background-image: url("../../../view/theme/diabook/icons/messages.png");}
+.icon.community {
+  background-image: url("../../../view/theme/diabook/icons/community.png");}
+  
+.icon.drop 	{ background-image: url("../../../view/theme/diabook/icons/drop.png");}
+.icon.drophide 	{ background-image: url("../../../view/theme/diabook/icons/drop.png");}
+.icon.dislike 	{ background-image: url("../../../view/theme/diabook/icons/dislike.png");}
+.icon.like 	{ background-image: url("../../../view/theme/diabook/icons/like.png");}
+.icon.pencil 	{ background-image: url("../../../view/theme/diabook/icons/pencil.png");}
+.icon.recycle 	{ background-image: url("../../../view/theme/diabook/icons/recycle.png");}
+.icon.remote-link { background-image: url("../../../view/theme/diabook/icons/remote.png");}
+.icon.tagged    { background-image: url("../../../view/theme/diabook/icons/tagged.png");}
+.icon.file-as { background-image: url("../../../view/theme/diabook/icons/file_as.png");}  
+.star-item.icon.unstarred { background-image: url("../../../view/theme/diabook/icons/unstarred.png");}
+.star-item.icon.starred { background-image: url("../../../view/theme/diabook/icons/starred.png");}
+.icon.link		{ background-image: url("../../../view/theme/diabook/icons/link.png");}
+.icon.lock		{ background-image: url("../../../view/theme/diabook/icons/lock.png");}
+.icon.unlock		{ background-image: url("../../../view/theme/diabook/icons/unlock.png");}
+.icon.language    { background-image: url("../../../view/theme/diabook/icons/language.png");}
+
+
+.camera 	{ background-image: url("../../../view/theme/diabook/icons/camera.png"); 
+			  display: block; width: 28px; height: 28px; background-repeat: no-repeat;
+			  }
+.attach 	{ background-image: url("../../../view/theme/diabook/icons/attach.png"); 
+			  display: block; width: 28px; height: 28px; background-repeat: no-repeat;
+			  }
+.video2 	{ background-image: url("../../../view/theme/diabook/icons/video.png"); 
+			  display: block; width: 28px; height: 28px; background-repeat: no-repeat;
+			  }	
+.video 	{ background-image: url("../../../view/theme/diabook/icons/video.png"); 
+			  display: block; width: 100%; height: 140px; background-repeat: no-repeat;
+			  }
+.audio2 	{ background-image: url("../../../view/theme/diabook/icons/audio.png"); 
+			  display: block; width: 28px; height: 28px; background-repeat: no-repeat;
+			  }
+.audio 	{ background-image: url("../../../view/theme/diabook/icons/audio.png"); 
+			  display: block; width: 28px; height: 28px; background-repeat: no-repeat;
+			  }
+.weblink 	{ background-image: url("../../../view/theme/diabook/icons/weblink.png"); 
+			  display: block; width: 28px; height: 28px; background-repeat: no-repeat;
+			  }
+.globe 	{ background-image: url("../../../view/theme/diabook/icons/globe.png"); 
+			  display: block; width: 28px; height: 28px; background-repeat: no-repeat;
+			  }
+.unglobe 	{ background-image: url("../../../view/theme/diabook/icons/unglobe.png"); 
+			  display: block; width: 28px; height: 28px; background-repeat: no-repeat;
+			  }
+.edit    {background-image: url("../../../view/theme/diabook/icons/pencil2.png"); 
+			  display: block; width: 28px; height: 28px; background-repeat: no-repeat;}
+.icon.block   {background-image: url("../../../view/theme/diabook/icons/block.png"); 
+			  display: block; width: 16px; height: 16px; background-repeat: no-repeat;}
+.icon.block.dim  {background-image: url("../../../view/theme/diabook/icons/block.png"); 
+			  display: block; width: 16px; height: 16px; background-repeat: no-repeat; opacity: 0.3;}
+.icon.ad_drop 	{ background-image: url("../../../view/theme/diabook/icons/drop.png");
+			  display: block; margin-left:5px; width: 16px; height: 16px; background-repeat: no-repeat;}			  
+			  
+
+
+.article	{ background-position: -50px  0px;}
+/*.audio 		{ background-position: -70px  0px;}*/
+/*.drop 		{ background-position: -110px 0px;}*/
+/*.drophide 	{ background-position: -130px 0px;}*/
+/*.edit 		{ background-position: -150px 0px;}*/
+/*.camera 	{ background-position: -170px 0px;}*/
+/*.dislike 	{ background-position: -190px 0px;}*/
+/*.like 		{ background-position: -210px 0px;}*/
+/*.link 		{ background-position: -230px 0px;}*/
+
+/*.globe 		{ background-position: -50px  -20px;}*/
+/*.noglobe 	{ background-position: -70px  -20px;}*/
+.no 		{ background-position: -90px  -20px;}
+.pause 		{ background-position: -110px -20px;}
+.play 		{ background-position: -130px -20px;}
+/*.pencil 	{ background-position: -150px -20px;}*/
+.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;}*/
+
+/*.video          { background-position: -110px -40px;}*/
+.youtube        { background-position: -130px -40px;}
+
+/*.attach         { background-position: -190px -40px;}*/
+/*.language       { background-position: -210px -40px;}*/
+
+
+.icon.on             { background-image: url("../../../view/theme/diabook/icons/toogle_on.png"); background-repeat: no-repeat;}
+.icon.off            { background-image: url("../../../view/theme/diabook/icons/toogle_off.png"); background-repeat: no-repeat;}
+.icon.prev           { background-image: url("../../../view/theme/diabook/icons/prev.png"); background-repeat: no-repeat;}
+.icon.next           { background-image: url("../../../view/theme/diabook/icons/next.png"); background-repeat: no-repeat;}
+/*.tagged     { background-position: -130px -60px;}*/
+
+.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 0px; }
+.type-audio { background-position: -40px 0px; }
+.type-text  { background-position: -60px 0px; }
+.type-unkn  { background-position: -80px 0px; }
+
+.icon.drop, .icon.drophide {
+ float: left;
+}
+
+.icon {
+  display: block;
+  width: 20px;
+  height: 20px;
+  /*background-image: url('icons.png');*/
+}
+
+.icon {
+  background-color: transparent ;
+  background-repeat: no-repeat;
+  /* background-position: left center; */
+  display: block;
+  overflow: hidden;
+  text-indent: -9999px;
+  padding: 1px;
+}
+
+.icon.border.camera{
+  background-image: url("../../../view/theme/diabook/icons/camera.png"); 
+  display: block; width: 28px; height: 28px; background-repeat: no-repeat;
+	}
+	
+.icon.border.link{
+  background-image: url("../../../view/theme/diabook/icons/weblink.png"); 
+  display: block; width: 28px; height: 28px; background-repeat: no-repeat;
+  margin-left: 10px;
+	}
+
+.icon.text {
+  text-indent: 0px;
+}
+.icon.s10 {
+  min-width: 10px;
+  height: 10px;
+}
+.icon.s10.notify {
+  background-image: url("../../../images/icons/10/notify_off.png");
+}
+.icon.s10.gear {
+  background-image: url("../../../images/icons/10/gear.png");
+}
+.icon.s10.add {
+  background-image: url("../../../images/icons/10/add.png");
+}
+.icon.s10.delete {
+  background-image: url("../../../images/icons/10/delete.png");
+}
+.icon.s10.edit {
+  background-image: url("../../../images/icons/10/edit.png");
+}
+.icon.s10.star {
+  background-image: url("../../../images/star_dummy.png");
+}
+.icon.s10.menu {
+  background-image: url("../../../images/icons/10/menu.png");
+}
+.icon.s10.link {
+  background-image: url("../../../images/icons/10/link.png");
+}
+.icon.s10.lock {
+  background-image: url("../../../images/icons/10/lock.png");
+}
+.icon.s10.unlock {
+  background-image: url("../../../images/icons/10/unlock.png");
+}
+.icon.s10.text {
+  padding: 2px 0px 0px 15px;
+  font-size: 10px;
+}
+.icon.s16 {
+  min-width: 16px;
+  height: 16px;
+}
+.icon.s16.notify {
+  background-image: url("../../../images/icons/16/notify_off.png");
+}
+.icon.s16.gear {
+  background-image: url("../../../images/icons/16/gear.png");
+}
+.icon.s16.add {
+  background-image: url("../../../images/icons/16/add.png");
+}
+.icon.s16.delete {
+  background-image: url("../../../images/icons/16/delete.png");
+}
+/*.icon.s16.edit {
+  background-image: url("../../../images/icons/16/edit.png");
+}*/
+.icon.s16.star {
+  background-image: url("../../../images/star_dummy.png");
+}
+.icon.s16.menu {
+  background-image: url("../../../images/icons/16/menu.png");
+}
+/*.icon.s16.link {
+  background-image: url("../../../images/icons/16/link.png");
+}*/
+.icon.s16.lock {
+  background-image: url("../../../images/icons/16/lock.png");
+}
+.icon.s16.unlock {
+  background-image: url("../../../images/icons/16/unlock.png");
+}
+.icon.s16.text {
+  padding: 4px 0px 0px 20px;
+  font-size: 10px;
+}
+.icon.s22 {
+  min-width: 22px;
+  height: 22px;
+}
+.icon.s22.notify {
+  background-image: url("../../../images/icons/22/notify_off.png");
+}
+.icon.s22.gear {
+  background-image: url("../../../images/icons/22/gear.png");
+}
+.icon.s22.add {
+  background-image: url("../../../images/icons/22/add.png");
+}
+.icon.s22.delete {
+  background-image: url("../../../images/icons/22/delete.png");
+}
+.icon.s22.edit {
+  background-image: url("../../../images/icons/22/edit.png");
+}
+.icon.s22.star {
+  background-image: url("../../../images/star_dummy.png");
+}
+.icon.s22.menu {
+  background-image: url("../../../images/icons/22/menu.png");
+}
+.icon.s22.link {
+  background-image: url("../../../images/icons/22/link.png");
+}
+.icon.s22.lock {
+  background-image: url("../../../images/icons/22/lock.png");
+}
+.icon.s22.unlock {
+  background-image: url("../../../images/icons/22/unlock.png");
+}
+.icon.s22.text {
+  padding: 10px 0px 0px 25px;
+  width: 200px;
+}
+.icon.s48 {
+  width: 48px;
+  height: 48px;
+}
+.icon.s48.notify {
+  background-image: url("../../../images/icons/48/notify_off.png");
+}
+.icon.s48.gear {
+  background-image: url("../../../images/icons/48/gear.png");
+}
+.icon.s48.add {
+  background-image: url("../../../images/icons/48/add.png");
+}
+.icon.s48.delete {
+  background-image: url("../../../images/icons/48/delete.png");
+}
+.icon.s48.edit {
+  background-image: url("../../../images/icons/48/edit.png");
+}
+.icon.s48.star {
+  background-image: url("../../../images/star_dummy.png");
+}
+.icon.s48.menu {
+  background-image: url("../../../images/icons/48/menu.png");
+}
+.icon.s48.link {
+  background-image: url("../../../images/icons/48/link.png");
+}
+.icon.s48.lock {
+  background-image: url("../../../images/icons/48/lock.png");
+}
+.icon.s48.unlock {
+  background-image: url("../../../images/icons/48/unlock.png");
+}
+
+#contact-edit-links ul {
+  list-style: none;
+  list-style-type: none;
+}
+
+.hide-comments-outer {
+  margin-left: 80px;
+  margin-bottom: 5px;
+  width: 675px;
+  border-bottom: 1px solid #BDCDD4;
+  border-top: 1px solid #BDCDD4;
+
+  padding: 8px;
+}
+
+/* global */
+body {
+  font-family: 'Lato', "Helvetica Neue", Helvetica, Arial, sans-serif;
+  font-size: 13px;
+  background-color: #ffffff;
+  color: #2d2d2d;
+  margin: 50px auto auto;
+  display: table;
+
+}
+
+#jappix_mini {
+right: 45px !important;
+}
+
+h4 {
+  font-size: 1.1em;
+}
+
+a {
+	color: #3465A4;
+	/* color: #3e3e8c; */
+	text-decoration: none;
+}
+a:hover {
+	/* color: blue; */
+	text-decoration: underline
+}
+
+.wall-item-name-link {
+/*  float: left;*/
+}
+
+.wall-item-photo {
+  width: 48px;
+  height: 48px;
+  overflow: hidden;
+  display: block;
+}
+
+.left {
+  float: left;
+}
+.right {
+  float: right;
+}
+.hidden {
+  display: none;
+}
+.clear {
+  clear: both;
+}
+.fakelink {
+  color: #3465A4;
+  /* color: #3e3e8c; */
+  text-decoration: none;
+  cursor: pointer;
+}
+.fakelink:hover {
+  /* color: blue; */
+  /*color: #005c94; */
+  text-decoration: underline;
+}
+.intro-end {
+	border-bottom: 1px solid black;
+   clear: both;
+   margin-bottom: 25px;
+   padding-bottom: 25px;
+   width: 75%;
+	}
+.intro-form-end {
+	clear: both;
+	}
+.intro-fullname {
+	padding-bottom: 5px;
+   padding-top: 5px;
+	}
+.intro-wrapper-end {
+	clear: both;
+   padding-bottom: 5px;
+	}
+code {
+  font-family: Courier, monospace;
+  white-space: pre;
+  display: block;
+  overflow: auto;
+  border: 1px solid #444;
+  background: #EEE;
+  color: #444;
+  padding: 10px;
+  margin-top: 20px;
+}
+#panel {
+  position: absolute;
+  width: 12em;
+  background: #ffffff;
+  color: #2d2d2d;
+  margin: 0px;
+  padding: 1em;
+  list-style: none;
+  border: 3px solid #364e59;
+  z-index: 100000;
+  -webkit-box-shadow: 0px 5px 10px rgba(0, 0, 0, 0.7);
+  -moz-box-shadow: 0px 5px 10px rgba(0, 0, 0, 0.7);
+  box-shadow: 0px 5px 10px rgba(0, 0, 0, 0.7);
+}
+/* tool */
+.tool {
+  height: auto;
+  overflow: auto;
+  padding: 3px;
+}
+#saved-search-ul .tool:hover,
+#nets-sidebar .tool:hover,
+#sidebar-group-list .tool:hover,
+#fileas-sidebar .tool:hover {
+	background: #E7F2F7;
+}
+.tool .label {
+  float: left;
+}
+.tool .action {
+  float: right;
+}
+.tool a {
+  color: ##3F8FBA;
+}
+.tool a:hover {
+  text-decoration: none;
+}
+/* popup notifications */
+div.jGrowl div.notice {
+  background: #511919 url("../../../images/icons/48/notice.png") no-repeat 5px center;
+  color: #ffffff;
+  padding-left: 58px;
+}
+div.jGrowl div.info {
+  background: #364e59 url("../../../images/icons/48/info.png") no-repeat 5px center;
+  color: #ffffff;
+  padding-left: 58px;
+}
+/* header */
+header {
+  position: fixed;
+  left: 0%;
+  right: 80%;
+  top: 0px;
+  margin: 0px;
+  padding: 0px;
+  width: 22%;
+  height: 32px;
+  background: #000;
+  z-index: 100;
+  -webkit-box-shadow: 0px 0px 10px rgba(0, 0, 0, 0.7);
+  -moz-box-shadow: 0px 0px 10px rgba(0, 0, 0, 0.7);
+  box-shadow: 0px 0px 10px rgba(0, 0, 0, 0.7);
+}
+header #site-location {
+  display: none;
+}
+header #banner {
+  overflow: hidden;
+  text-align: left;
+  width: 82%%;
+  margin-left: 25%;
+}
+header #banner a,
+header #banner a:active,
+header #banner a:visited,
+header #banner a:link,
+header #banner a:hover {
+  color: #ffffff;
+  text-decoration: none;
+  outline: none;
+  vertical-align: middle;
+ font-weight: bolder;
+  margin-left: 3px;
+}
+header #banner #logo-img {
+  height: 25px;
+  margin-top: 3px;
+}
+header #banner #logo-text {
+  font-size: 20px;
+  position: absolute;
+  top: 10%;
+}
+/* messages */
+#message-new {
+  background: #19aeff;
+  border: 1px solid #005c94;
+  width: 150px;
+}
+#message-new a {
+  color: #ffffff;
+  text-align: center;
+  display: block;
+  font-weight: bold;
+  padding: 1em 0px;
+  text-decoration: none;
+}
+.mail-list-wrapper {
+  background-color: #f6f7f8;
+  margin-bottom: 5px;
+  width: 100%;
+  height: auto;
+  overflow: hidden;
+}
+.mail-list-wrapper span {
+  display: block;
+  float: left;
+  width: 20%;
+  overflow: hidden;
+}
+.mail-list-wrapper .mail-subject {
+  width: 30%;
+  padding: 4px 0px 0px 4px;
+}
+.mail-list-wrapper .mail-subject a {
+  display: block;
+}
+.mail-list-wrapper .mail-subject.unseen a {
+  font-weight: bold;
+}
+.mail-list-wrapper .mail-date {
+  padding: 4px 4px 0px 4px;
+}
+.mail-list-wrapper .mail-from {
+  padding: 4px 4px 0px 4px;
+}
+.mail-list-wrapper .mail-count {
+  padding: 4px 4px 0px 4px;
+  text-align: right;
+}
+.mail-list-wrapper .mail-delete {
+  float: right;
+}
+#mail-display-subject {
+  background-color: #f6f7f8;
+  color: #2d2d2d;
+  margin-bottom: 10px;
+  width: 100%;
+  height: auto;
+  overflow: hidden;
+}
+#mail-display-subject span {
+  float: left;
+  overflow: hidden;
+  padding: 4px 0px 0px 10px;
+}
+#mail-display-subject .mail-delete {
+  float: right;
+  opacity: 0.5;
+  -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;
+}
+#mail-display-subject:hover .mail-delete {
+  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;
+}
+/* nav */
+nav {
+  width: 80%;
+  height: 32px;
+  position: fixed;
+  left: 22%;
+  top: 0px;
+  padding: 0px;
+  background: #000;
+  color: #ffffff;
+  z-index: 99;
+  -webkit-box-shadow: 0px 0px 10px rgba(0, 0, 0, 0.7);
+  -moz-box-shadow: 0px 0px 10px rgba(0, 0, 0, 0.7);
+  box-shadow: 0px 0px 10px rgba(0, 0, 0, 0.7);
+}
+nav a,
+nav a:active,
+nav a:visited,
+nav a:link,
+nav a:hover {
+  color: #ffffff;
+  text-decoration: none;
+  outline: none;
+}
+nav #banner {
+  overflow: hidden;
+  /*text-align: center;*/
+  width: 100%;
+}
+nav #banner a,
+nav #banner a:active,
+nav #banner a:visited,
+nav #banner a:link,
+nav #banner a:hover {
+  color: #ffffff;
+  text-decoration: none;
+  outline: none;
+  vertical-align: bottom;
+}
+nav #banner #logo-img {
+  height: 22px;
+  margin-top: 5px;
+}
+nav #banner #logo-text {
+  font-size: 22px;
+}
+nav #navbar{
+	}
+nav ul {
+  margin: 0px;
+  padding: 0px 20px;
+}
+nav ul li {
+  list-style: none;
+  margin: 0px;
+  /* padding: 1px 1px 3px 1px; */
+  float: left;
+}
+nav ul li .menu-popup {
+  left: 0px;
+  right: auto;
+}
+
+nav #logo-img {
+  height: 25px;
+  margin-top: 4px;
+  margin-left: 30px;
+}
+
+nav #logo-text {
+    font-size: 22px;
+    margin-top: 3px;
+    margin-right: 15px;
+}
+nav .nav-menu-search {
+  position: relative;
+
+  margin: 4px 17px;
+  margin-right: 0px;
+  height: 17px;
+  width: 180px;
+  
+}
+
+nav #search-box #search-text {
+  background-image:  url('icons/lupe.png');
+  background-repeat:no-repeat;
+  padding-left:20px;
+  border-top-left-radius: 15px;
+border-top-right-radius: 15px;
+border-bottom-right-radius: 15px;
+border-bottom-left-radius: 15px;
+	}
+
+
+nav .nav-menu-icon {
+  position: relative;
+  height: 22px;
+  padding: 5px;
+  margin: 0px 7px;
+  -moz-border-radius: 5px 5px 0 0;
+  -webkit-border-radius: 5px 5px 0 0;
+  border-radius: 5px 5px 0 0;
+}
+nav .nav-menu-icon.selected {
+  background-color: #fff;
+}
+nav .nav-menu-icon img {
+  width: 22px;
+  height: 22px;
+}
+nav .nav-menu-icon .nav-notify {
+  top: 3px;
+}
+/*marker*/
+nav .nav-menu {
+  position: relative;
+  height: 16px;
+  padding: 5px;
+  margin: 3px 15px 0px;
+  font-size: 15px;
+  /*border-bottom: 3px solid #364A84;*/
+}
+nav .nav-menu.selected {
+  /*border-bottom: 3px solid #9eabb0;*/
+}
+nav .nav-notify {
+  display: none;
+  position: absolute;
+  background-color: #ff0000;
+  /* background-color: #19aeff; */
+  -moz-border-radius: 5px 5px 5px 5px;
+  -webkit-border-radius: 5px 5px 5px 5px;
+  border-radius: 5px 5px 5px 5px;
+  font-size: 10px;
+  font-weight: 900;
+  padding: 1px 4px;
+  top: 0px;
+  right: -6px;
+  min-width: 10px;
+  text-align: center;
+}
+nav .nav-notify.show {
+  display: block;
+}
+nav #nav-help-link,
+nav #nav-search-link,
+nav #nav-directory-link,
+nav #nav-apps-link,
+nav #nav-site-linkmenu, 
+nav #nav-home-link,
+nav #nav-user-linkmenu
+{
+  float: right;
+}
+nav #nav-user-linkmenu{
+	margin-right: 0px;
+	}
+nav #nav-home-link, #nav-directory-link, #nav-apps-link{
+	margin-left: 0px;
+	margin-right: 0px;
+	font-weight: bold;
+	margin: 3px 5px;
+	}
+nav #nav-directory-link{
+  margin-right: 0px;	
+	}
+nav #nav-home-link{
+  margin-left: 0px;	
+	}
+nav #nav-help-link .menu-popup,
+nav #nav-search-link .menu-popup,
+nav #nav-directory-link .menu-popup,
+nav #nav-apps-link .menu-popup,
+nav #nav-site-linkmenu .menu-popup {
+  right: 0px;
+  left: auto;
+}
+
+nav #nav-messages-linkmenu.on .icon.messages, nav #nav-messages-linkmenu.selected .icon.messages{
+	background-image: url("../../../view/theme/diabook/icons/messages2.png");
+	}
+	
+/*nav #nav-notifications-linkmenu.on .icon.notify,*/ nav #nav-notifications-linkmenu.selected .icon.notify{
+	background-image: url("../../../view/theme/diabook/icons/notify2.png");
+	}
+	
+nav #nav-contacts-linkmenu.on .icon.contacts, nav #nav-contacts-linkmenu.selected .icon.contacts{
+	background-image: url("../../../view/theme/diabook/icons/contacts2.png");
+	}
+	
+nav #nav-apps-link.selected {
+  background-color: #364e59;
+}
+
+#nav-notifications-mark-all {
+	/* padding: 1px 1px 2px 26px; */
+	/* border-bottom: 1px solid #364E59; */
+	/* margin: 0px 0px 2px 0px;
+	padding: 5px 10px; */
+}
+
+#nav-notifications-see-all {
+	/* padding: 1px 1px 2px 26px; */
+	/* border-bottom: 1px solid #364E59; */
+	/* margin: 0px 0px 2px 0px;
+	padding: 5px 10px; */
+}
+
+.notify-seen {
+	background: none repeat scroll 0 0 #DDDDDD;
+	}
+
+ul.menu-popup {
+  position: absolute;
+  display: none;
+  width: 11em;
+  background: #ffffff;
+  color: #2d2d2d;
+  margin: 0px;
+  padding: 0px;
+  list-style: none;
+  z-index: 100000;
+  -webkit-box-shadow: 0px 5px 10px rgba(0, 0, 0, 0.7);
+  -moz-box-shadow: 0px 5px 10px rgba(0, 0, 0, 0.7);
+  box-shadow: 0px 5px 10px rgba(0, 0, 0, 0.7);
+}
+ul.menu-popup a {
+  display: block;
+  color: #2d2d2d;
+  padding: 5px 10px;
+  text-decoration: none;
+}
+ul.menu-popup a:hover {
+  background-color: #fff797; /*bdcdd4;*/
+  color: #000;
+}
+ul.menu-popup .menu-sep {
+  border-top: 1px solid #9eabb0;
+}
+ul.menu-popup li {
+  float: none;
+  overflow: auto;
+  height: auto;
+  display: block;
+}
+ul.menu-popup li img {
+  float: left;
+  width: 16px;
+  height: 16px;
+  padding-right: 5px;
+}
+ul.menu-popup .empty {
+  padding: 5px;
+  text-align: center;
+  color: #9eabb0;
+}
+/* autocomplete popup */
+.acpopup {
+  max-height: 150px;
+  background-color: #ffffff;
+  color: #2d2d2d;
+  border: 1px solid #MenuBorder;
+  overflow: auto;
+  z-index: 100000;
+  -webkit-box-shadow: 0px 5px 10px rgba(0, 0, 0, 0.7);
+  -moz-box-shadow: 0px 5px 10px rgba(0, 0, 0, 0.7);
+  box-shadow: 0px 5px 10px rgba(0, 0, 0, 0.7);
+}
+.acpopupitem {
+  color: #2d2d2d;
+  padding: 4px;
+  clear: left;
+}
+.acpopupitem img {
+  float: left;
+  margin-right: 4px;
+}
+.acpopupitem.selected {
+  background-color: #bdcdd4;
+}
+#nav-notifications-menu {
+  width: 400px;
+  max-height: 550px;
+  overflow: auto;
+}
+/* #nav-notifications-menu a {
+	display: inline;
+	padding: 5px 0px;
+	margin: 0px 0px 2px 0px;
+}
+#nav-notifications-menu li:hover {
+  background-color: #bdcdd4;
+}*/
+
+#nav-notifications-menu img {
+  float: left;
+  margin-right: 5px;
+}
+#nav-notifications-menu .contactname {
+  font-weight: bold;
+}
+#nav-notifications-menu .notif-when {
+  font-size: 10px;
+  color: #9eabb0;
+  display: block;
+}
+
+.notif-image {
+        width: 32px;
+        height: 32px;
+        padding: 7px 7px 0px 0px;
+}
+
+/*profile_side*/
+#profile_side {
+  margin-bottom: 30px;
+}
+#ps-usericon{
+	height: 25px	
+	}
+#ps-username{
+  font-size: 1.17em;
+  font-weight: bold;
+  vertical-align: top;
+  position: absolute;
+  padding-top: 4px;
+  padding-left: 5px;	
+  color: #2D2D2D;
+  word-wrap: break-word;
+  width: 130px;
+	}
+#ps-username:hover{
+  text-decoration: none;	
+	}
+.menu-profile-side{
+  list-style: none;	
+  padding-left: 0px;
+  min-height: 0px;
+	}
+.menu-profile-list{
+  height: auto;
+  overflow: auto;
+  min-height: 16px;
+  list-style: none;
+	}
+.menu-profile-list:hover{
+	background: #E7F2F7;
+	}
+.menu-profile-list-item{
+	padding-left: 5px;
+	vertical-align: middle;
+	}	
+.menu-profile-list-item:hover{	
+	text-decoration: none;
+   }
+/*http://prothemedesign.com/circular-icons/*/
+.menu-profile-icon.home{
+	background: url("../../../view/theme/diabook/icons/home.png") no-repeat;
+	float: left;
+	height: 22px;
+   width: 22px;
+	}
+.menu-profile-icon.photos{
+	background: url("../../../view/theme/diabook/icons/mess_side.png") no-repeat;
+	float: left;
+	height: 22px;
+   width: 22px;}
+.menu-profile-icon.events{
+	background: url("../../../view/theme/diabook/icons/events.png") no-repeat;
+	float: left;
+	height: 22px;
+   width: 22px;}
+.menu-profile-icon.notes{
+	background: url("../../../view/theme/diabook/icons/notes.png") no-repeat;
+	float: left;
+	height: 22px;
+   width: 22px;}
+.menu-profile-icon.foren{
+	background: url("../../../view/theme/diabook/icons/pubgroups.png") no-repeat;
+	float: left;
+	height: 22px;
+   width: 22px;}
+.menu-profile-icon.com_side{
+	background: url("../../../view/theme/diabook/icons/com_side.png") no-repeat;
+	float: left;
+	height: 22px;
+   width: 22px;}
+.menu-profile-icon.pscontacts{
+	background: url("../../../view/theme/diabook/icons/pscontacts.png") no-repeat;
+	float: left;
+	height: 22px;
+   width: 22px;}
+
+/* aside */
+/*marker*/
+aside {
+  display: table-cell;
+  vertical-align: top;
+  width: 180px;
+  padding: 0px 5px 0px 0px;
+  border-right: 1px solid #D2D2D2;
+  float: left;
+  /* background: #F1F1F1; */
+}
+aside #page-sidebar{display: none;}
+aside .vcard .fn {
+  font-size: 18px;
+  font-weight: bold;
+  margin-bottom: 5px;
+}
+aside .vcard .title {
+  margin-bottom: 5px;
+}
+aside .vcard dl {
+  height: auto;
+  overflow: auto;
+}
+aside .vcard dt {
+  float: left;
+  margin-left: 0px;
+  /*width: 35%;*/
+  text-align: right;
+  color: #999999;
+}
+aside .vcard dd {
+  float: left;
+  margin-left: 5px;
+  /*width: 60%;*/
+}
+aside #profile-extra-links ul {
+  padding: 0px;
+  margin: 0px;
+}
+aside #profile-extra-links li {
+  padding: 0px;
+  margin: 0px;
+  list-style: none;
+}
+aside #dfrn-request-link {
+  display: block;
+  -moz-border-radius: 5px 5px 5px 5px;
+  -webkit-border-radius: 5px 5px 5px 5px;
+  border-radius: 5px 5px 5px 5px;
+  color: #ffffff;
+  background: #005c94 url('../../../images/connect-bg.png') no-repeat left center;
+  font-weight: bold;
+  text-transform: uppercase;
+  padding: 4px 2px 2px 35px;
+}
+aside #dfrn-request-link:hover {
+  text-decoration: none;
+  background-color: #36c;
+  /* background-color: #19aeff; */
+}
+aside #profiles-menu {
+  width: 20em;
+}
+aside #search-text {
+	width: 150px;
+	height: 17px;
+	padding-left: 10px;
+	border-top-left-radius: 15px;
+border-top-right-radius: 15px;
+border-bottom-right-radius: 15px;
+border-bottom-left-radius: 15px;
+}
+aside #side-follow-url {
+	width: 173px;
+	}
+aside #side-peoplefind-url {
+	width: 173px;
+	}
+#contact-block {
+  overflow: auto;
+  height: auto;
+}
+#contact-block .contact-block-h4 {
+  float: left;
+  margin: 5px 0px;
+}
+#contact-block .allcontact-link {
+  float: right;
+  margin: 5px 0px;
+}
+#contact-block .contact-block-content {
+  clear: both;
+  overflow: auto;
+  height: auto;
+}
+#contact-block .contact-block-link {
+  float: left;
+  margin: 0px 2px 2px 0px;
+}
+#contact-block .contact-block-link img {
+  widht: 55px;
+  height: 55px;
+}
+#lost-password-link {
+  float: left;
+  margin-right: 20px;	
+	}
+#login-submit-wrapper{
+  margin-bottom: 15px;
+	}
+/* widget */
+.widget {
+  margin-bottom: 2em;
+  /*.action .s10 { width: 10px; overflow: hidden; padding: 0px;}
+	.action .s16 { width: 16px; overflow: hidden; padding: 0px;}*/
+/*  font-size: 12px; */
+}
+/*marker*/
+.widget h3 {
+  padding: 0px;
+  margin: 2px;
+  font-size: 1.05em;
+}
+.widget .action {
+  opacity: 0.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;
+}
+.widget input.action {
+  opacity: 0.5;
+  -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;
+}
+.widget:hover .title .action {
+  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;
+}
+.widget .tool:hover .action {
+  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;
+}
+.widget .tool:hover .action.ticked {
+  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;
+}
+.widget ul {
+  padding: 0px;
+}
+.widget ul li {
+  padding-left: 16px;
+  min-height: 16px;
+  list-style: none;
+}
+.group_selected {
+  background: url("../../../view/theme/diabook/icons/selected.png") no-repeat left center;
+  float: left;
+  height: 22px;
+  width: 22px;
+}
+.group_unselected {
+  background: url("../../../view/theme/diabook/icons/unselected.png") no-repeat left center;
+  float: left;
+  height: 22px;
+  width: 22px;
+}
+.icon.text_add		{ 
+		background-image: url("../../../images/icons/16/add.png");
+		float: right;
+		opacity: 0.2;
+		margin-right: 14px;
+		}
+.icon.text_add:hover	{ 
+		background-image: url("../../../images/icons/16/add.png");
+		float: right;
+		cursor: pointer;
+		margin-right: 14px;
+		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;
+		}
+.icon.text_edit {
+  background-image: url("../../../images/icons/10/edit.png");
+  opacity: 0.2;
+  margin-top: 6px;
+  float: right;
+  height: 10px;
+}
+.icon.text_edit:hover {
+  background-image: url("../../../images/icons/10/edit.png");
+  opacity: 1;
+  margin-top: 6px;
+  float: right;
+  height: 10px;
+}
+/* widget: search */
+#add-search-popup {
+  width: 200px;
+  top: 18px;
+}
+/* section */
+section {
+  display: table-cell;
+  vertical-align: top;
+  width: 800px;
+  padding: 0px 0px 0px 12px;
+}
+
+body .pageheader{
+  text-align: center;
+  font-size: 20px;
+  margin-bottom: 20px;
+  margin-top: 0px;
+  max-width: 775px;
+	}
+.qcomment{
+  max-width: 122px;	
+	}
+#id_username {
+  width: 173px;	
+	}
+#id_password {
+  width: 173px;		
+	}
+#id_openid_url {
+  width: 173px;	
+	}
+#contact-edit-end {
+	}
+.pager {
+   padding: 10px;
+	text-align: center;
+	font-size: 1.0em;
+	clear: both;
+	display: block;
+}	
+.tabs {
+    
+    background-position: 0 -20px;
+    background-repeat: repeat-x;
+    height: 27px;
+    padding: 0;
+ }
+.tab.button {
+    margin-left: 5px;	
+    /*background: none repeat scroll 0 0 #F8F8F8;*/
+    border: 1px solid #CCCCCC;
+    border-radius: 3px 3px 3px 3px;
+    font-weight: normal;
+    padding: 3px;
+    color:  #333333;
+	}
+
+	
+#birthday-notice, #event-notice, #birthday-wrapper, #event-wrapper{
+	margin-bottom: 10px;
+	}
+/* wall item */
+
+.tread-wrapper {
+  border-bottom: 1px solid #D2D2D2;
+  position: relative;
+  padding: 5px;
+  margin-bottom: 0px;
+  width: 775px;
+  padding-top: 10px;
+}
+/*marker*/
+.wall-item-decor {
+  position: absolute;
+  left: 780px;
+  top: -10px;
+  width: 16px;
+}
+/*marker*/
+.wall-item-container {
+  display: table;
+  width: 770px;
+}
+
+.wall-item-container .wall-item-item, .wall-item-container .wall-item-bottom {
+  display: table-row;
+}
+.wall-item-photo-container .wall-item-item, .wall-item-container .wall-item-bottom {
+  display: table-row;
+}
+.wall-item-bottom {
+  font-size: 13px;
+}
+.wall-item-container .wall-item-bottom {
+/*  opacity: 0.5;
+  -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; */
+}
+.wall-item-container:hover .wall-item-bottom {
+/*  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; */
+}
+.wall-item-container .wall-item-info {
+  display: table-cell;
+  vertical-align: top;
+  text-align: left;
+  width: 80px;
+}
+.wall-item-photo-container .wall-item-info {
+  display: table-cell;
+  vertical-align: top;
+  text-align: left;
+  width: 80px;
+}
+.wall-item-container .wall-item-location {
+  padding-right: 40px;
+  display: table-cell;
+}
+.wall-item-photo-container .wall-item-location {
+  padding-right: 40px;
+  display: table-cell;
+}
+.wall-item-container .wall-item-ago {
+  word-wrap: break-word;
+  width: 50px;
+  margin-left: 10px;
+  color: #999;
+}
+.wall-item-photo-container .wall-item-ago {
+  word-wrap: break-word;
+  width: 50px;
+  margin-left: 10px;
+  color: #999;
+}
+.wall-item-location {
+  
+  clear: both;
+  overflow: hidden;
+  
+  margin-bottom: 5px;
+}
+/*marker*/
+.wall-item-container .wall-item-content {
+
+  max-width: 690px;
+  word-wrap: break-word;
+
+
+}
+/*marker*/
+.wall-item-photo-container .wall-item-content {
+
+  max-width: 690px;
+  word-wrap: break-word;
+  
+  margin-bottom: 14px;
+}
+.wall-item-container .wall-item-content img {
+  max-width: 700px;
+}
+.wall-item-photo-container .wall-item-content img {
+  max-width: 700px;
+}
+.wall-item-container .wall-item-links, .wall-item-container .wall-item-actions {
+  display: table-cell;
+  vertical-align: middle;
+}
+.wall-item-photo-container .wall-item-links, .wall-item-photo-container .wall-item-actions {
+  display: table-cell;
+  vertical-align: middle;
+}
+.wall-item-container .wall-item-links .icon, .wall-item-container .wall-item-actions .icon {
+  opacity: 0.5;
+  -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;
+}
+.wall-item-photo-container .wall-item-links .icon, .wall-item-photo-container .wall-item-actions .icon {
+  opacity: 0.5;
+  -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;
+}
+.wall-item-container .wall-item-links .icon:hover, .wall-item-container .wall-item-actions .icon: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;
+}
+.wall-item-photo-container .wall-item-links .icon:hover, .wall-item-photo-container .wall-item-actions .icon: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;
+}
+.wall-item-container .wall-item-name, .wall-item-photo-container .wall-item-name {
+  font-weight: bold;
+}
+.wall-item-container .wall-item-actions-author, .wall-item-photo-container .wall-item-actions-author {
+  width: 100%;
+  margin-bottom: 0.3em;
+}
+.wall-item-container .wall-item-actions-social, .wall-item-photo-container .wall-item-actions-social {
+  float: left;
+  margin-bottom: 1px;
+  display: table-cell;
+}
+.wall-item-container .wall-item-actions-social a {
+  margin-right: 1em;
+}
+.wall-item-photo-container .wall-item-actions-social a {
+  margin-right: 1em;
+}
+.wall-item-actions-social a {
+  float: left;
+}
+
+.wall-item-container .wall-item-actions-tools {
+  float: right;
+  width: 80px;
+  display: table-cell;
+}
+.wall-item-photo-container .wall-item-actions-tools {
+  float: right;
+  width: 80px;
+  display: table-cell;
+}
+.wall-item-container .wall-item-actions-tools a {
+  float: right;
+}
+.wall-item-photo-container .wall-item-actions-tools a {
+  float: right;
+}
+.wall-item-container .wall-item-actions-tools input {
+  float: right;
+}
+.wall-item-photo-container .wall-item-actions-tools input {
+  float: right;
+}
+/*marker*/
+.wall-item-container.comment {
+  margin-top: 5px;
+  margin-bottom: 5px;
+  margin-left: 80px;
+  width: 690px;
+  border-bottom: 1px solid hsl(198, 21%, 79%);
+}
+.wall-item-photo-container.comment {
+  margin-top: 5px;
+  margin-bottom: 5px;
+  margin-left: 40px;
+  width: 650px;
+  border-bottom: 1px solid #D2D2D2;
+}
+.wall-item-photo-container.comment {
+  top: 15px !important;
+  left: 15px !important;
+}
+.wall-item-photo-container {
+  display: table;
+  width: 780px;
+}
+
+.my-comment-photo {
+  width: 48px;
+  margin-left: 40px;
+  margin-right: 32px;
+	}
+.comment-edit-preview {
+  width: 500px;
+  margin-top: 10px;
+}
+.comment-edit-text-empty {
+    width: 500px;
+    border: 1px solid #D2D2D2;
+    height: 3.2em;
+    color: #2d2d2d;
+}
+.comment-edit-text-full {
+  font-size: 12.5px;
+  height: 3.3em;
+  
+  border: 1px solid #D2D2D2;
+  width: 500px;
+}
+.comment-edit-photo {
+    margin: 10px 0 0;
+    display: table-cell;
+}
+.wall-item-container.comment .contact-photo {
+  width: 32px;
+  height: 32px;
+  margin-left: 16px;
+  /*background: url(../../../images/icons/22/user.png) no-repeat center center;*/
+
+}
+.wall-item-container.comment {
+  top: 15px !important;
+  left: 15px !important;
+}
+.wall-item-container.comment .wall-item-links {
+  padding-left: 12px;
+}
+.wall-item-comment-wrapper {
+  margin: 1px 5px 5px 80px;
+}
+.wall-item-comment-wrapper .comment-edit-photo {
+  display: none;
+}
+.wall-item-comment-wrapper textarea {
+  height: 1.6em;
+  width: 100%;
+  font-size: 10px;
+  color: #999999;
+  border: 1px solid #DDD;
+  padding: 0.3em;
+  font-size: 14px;
+}
+.wall-item-comment-wrapper .comment-edit-text-full {
+  font-size: 14px;
+  height: 4em;
+  color: #2d2d2d;
+  border: 1px solid #2d2d2d;
+}
+
+.comment-edit-preview .contact-photo {
+  width: 32px;
+  height: 32px;
+  margin-left: 16px;
+  /*background: url(../../../images/icons/22/user.png) no-repeat center center;*/
+
+}
+.comment-edit-preview {
+  top: 15px !important;
+  left: 15px !important;
+}
+.comment-edit-preview {
+  width: 500px;
+  margin-top: 10px;
+  background-color:  #fff797;
+}
+.comment-edit-preview .wall-item-links {
+  padding-left: 12px;
+}
+.comment-edit-preview .wall-item-container {
+  width: 700px;
+}
+.comment-edit-preview .tread-wrapper {
+  width: 700px;
+  padding: 0;
+  margin: 10px 0;
+}
+
+.shiny {
+  /* border-right: 10px solid #fce94f; */
+	border-right: 1px solid #A7C7F7;
+	padding-right: 12px;
+}
+
+#jot-preview-content{
+	margin-top: 30px;}
+	
+#jot-preview-content .tread-wrapper {
+  background-color: #fff797;
+}
+
+.wall-item-tags {
+  padding-top: 1px;
+  padding-bottom: 2px;
+}
+.tag {
+  /*background: url("../../../images/tag_b.png") repeat-x center left;*/
+  color: #999;
+  padding-left: 3px;
+  font-size: 12px;
+}
+.tag a {
+  padding-right: 5px;
+  /*background: url("../../../images/tag.png") no-repeat center right;*/
+  color: #999;
+}
+.wwto {
+  position: absolute !important;
+  width: 25px;
+  height: 25px;
+  background: #FFFFFF;
+  border: 2px solid #364e59;
+  height: 25px;
+  width: 25px;
+  overflow: hidden;
+  padding: 1px;
+  position: absolute !important;
+  top: 40px;
+  left: 30px;
+  -webkit-box-shadow: 0px 0px 10px rgba(0, 0, 0, 0.7);
+  -moz-box-shadow: 0px 0px 10px rgba(0, 0, 0, 0.7);
+  box-shadow: 0px 0px 10px rgba(0, 0, 0, 0.7);
+}
+.wwto .contact-photo {
+  width: auto;
+  height: 25px;
+}
+/* contacts menu */
+.contact-photo-wrapper {
+  position: relative;
+  width: 80px;
+}
+
+.contact-photo-wrapper.wwto {
+  width: 25px;
+}
+
+.contact-photo {
+  width: 48px;
+  height: 48px;
+  overflow: hidden;
+  display: block;
+}
+.contact-photo img {
+  width: 48px;
+  height: 48px;
+}
+
+.contact-wrapper {
+  float: left;
+  width: 90px;
+  height: 90px;
+  margin-bottom: 15px;
+}
+.contact-wrapper .contact-photo {
+  width: 80px;
+  height: 80px;
+}
+.contact-wrapper .contact-photo img {
+  width: 80px;
+  height: 80px;
+}
+.contact-wrapper {
+  left: 0px;
+  top: 63px;
+}
+.contact-photo {
+  width: 48px;
+  height: 48px;
+}
+.contact-photo img {
+  width: 48px;
+  height: 48px;
+}
+.contact-name {
+  /* text-align: center; */
+  /*font-weight: bold;*/
+  font-size: 12px;
+}
+.contact-details {
+  color: #999999;
+}
+/* editor */
+.jothidden {
+  display: none;
+}
+#jot {
+  width: 785px;
+  margin: 0px 2em 20px 0px;
+}
+#profile-jot-form #profile-jot-text {
+  height: 2.0em;
+  width: 99%;
+  font-size: 15px;
+  color: #999999;
+  border: 1px solid #DDD;
+  padding: 0.3em;
+  margin-bottom: 10px;
+}
+.grey
+{
+  display: inline;
+  float: right;	
+	}
+#jot #jot-tools {
+  margin: 0px;
+  padding: 0px;
+  height: 40px;
+  overflow: none;
+  width: 783px;
+  background-color: #fff;
+  border-bottom: 2px solid #9eabb0;
+}
+
+#jot #jot-tools li {
+  list-style: none;
+  float: left;
+  width: 80px;
+  height: 40px;
+  border-bottom: 2px solid #9eabb0;
+}
+#jot #jot-tools li a {
+  display: block;
+  color: #cccccc;
+  width: 100%;
+  height: 40px;
+  text-align: center;
+  line-height: 40px;
+  overflow: hidden;
+}
+#jot #jot-tools li:hover {
+  background-color: #364e59;
+  border-bottom: 2px solid #bdcdd4;
+}
+#jot #jot-tools li.perms {
+  float: right;
+  width: 40px;
+}
+#jot #jot-tools li.perms a.unlock {
+  width: 30px;
+  border-left: 10px solid #cccccc;
+  background-color: #cccccc;
+  background-position: left center;
+}
+#jot #jot-tools li.perms a.lock {
+  width: 30px;
+  border-left: 10px solid #666666;
+  background-color: #666666;
+}
+#jot #jot-tools li.submit {
+  float: right;
+  background-color: #cccccc;
+  border-bottom: 2px solid #cccccc;
+  border-right: 1px solid #666666;
+  border-left: 1px solid #666666;
+}
+#jot #jot-tools li.submit input {
+  border: 0px;
+  margin: 0px;
+  padding: 0px;
+  background-color: #cccccc;
+  color: #666666;
+  width: 80px;
+  height: 40px;
+  line-height: 40px;
+}
+#jot #jot-tools li.submit input:hover {
+  background-color: #bdcdd4;
+  color: #666666;
+}
+#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;
+}
+#profile-jot-form #jot-title, #profile-jot-form #jot-category {
+    
+  	 border-radius: 5px 5px 5px 5px;
+    font-weight: bold;
+    height: 20px;
+    margin: 0 0 5px;
+    width: 60%;
+    border: 1px solid #d2d2d2;
+}
+#profile-jot-form #jot-title:-webkit-input-placeholder {
+  font-weight: normal;
+}
+#profile-jot-form #jot-title:-moz-placeholder {
+  font-weight: normal;
+}
+#profile-jot-form #profile-jot-text_parent #profile-jot-text_tbl{
+	width: 785px;
+	height: 100px;
+	}
+#jot #jot-title:hover {
+  border: 1px solid #999999;
+}
+#jot #jot-title:focus {
+  border: 1px solid #999999;
+}
+#jot #character-counter {
+  width: 80px;
+  float: right;
+  text-align: right;
+  height: 20px;
+  line-height: 20px;
+  padding-right: 20px;
+}
+#jot-perms-icon, 
+#profile-location,
+#profile-nolocation,
+#profile-youtube, 
+#profile-video, 
+#profile-audio,
+#profile-link,
+#profile-title, 
+#wall-image-upload,
+#wall-file-upload,
+#wall-image-upload-div,
+#wall-file-upload-div,
+.hover, .focus {
+	cursor: pointer;
+	margin-top: 2px;
+}
+/*marker*/
+#profile-jot-wrapper{
+	margin: 0 20px 20px 0;
+   width: 785px;
+	}
+/*marker*/
+#profile-jot-submit-wrapper {
+	margin-bottom: 50px;
+	width: 785px;
+}
+
+#profile-jot-submit {
+	float: right;
+	margin-top: 2px;
+	font-size: 14px;
+}
+#profile-upload-wrapper {
+	float: left;
+	margin-top: 2px;
+	margin-left: 10px;
+	
+}
+#profile-attach-wrapper {
+	float: left;
+	margin-left: 15px;
+	margin-top: 2px;
+}
+#profile-rotator {
+	float: left;
+	margin-left: 30px;
+	margin-top: 2px;
+}
+#profile-link-wrapper {
+	float: left;
+	margin-left: 15px;
+	margin-top: 2px;
+}
+#profile-youtube-wrapper {
+	float: left;
+	margin-left: 15px;
+	margin-top: 2px;
+}
+#profile-video-wrapper {
+	float: left;
+	margin-left: 15px;
+	margin-top: 2px;
+}
+#profile-audio-wrapper {
+	float: left;
+	margin-left: 15px;
+	margin-top: 2px;
+}
+#profile-location-wrapper {
+	float: left;
+	margin-left: 15px;
+	margin-top: 2px;
+}
+#profile-jot-perms {
+	float: left;
+	margin-left: 45px;
+	margin-top: 2px;
+}
+#jot-preview-link {
+	float: right;
+	margin-left: 10px;
+	margin-top: 2px;
+	font-size: 9px;
+	font-weight: bolder;
+	cursor: pointer;
+}
+#profile-jot-perms{
+   float: right;
+	margin-left: 10px;
+	margin-top: 2px;	
+	}
+/** buttons **/
+.button.creation1 {
+    background-color: #fff;
+    border: 1px solid #777777;
+    border-radius: 3px 3px 3px 3px;
+    box-shadow: 0 1px 1px #CFCFCF;
+    cursor: pointer;
+    font-weight: bolder;
+}
+.button.creation2 {
+    background-color: #33ACFF;
+    background-image: -moz-linear-gradient(center top , #66C1FF 0%, #0097FF 100%);
+    border: 1px solid #777777;
+    color: white;
+    border-radius: 3px 3px 3px 3px;
+    box-shadow: 0 1px 1px #CFCFCF;
+    margin-left: 5px;
+    cursor: pointer;
+    font-weight: bolder;
+}
+/*input[type="submit"] {
+	border: 0px;
+    background-color: @ButtonBackgroundColor;
+    color: @ButtonColor;
+    padding: 0px 10px;
+	.rounded(5px);
+    height: 18px;
+}*/
+/** acl **/
+#photo-edit-perms-select, #photos-upload-permissions-wrapper, #profile-jot-acl-wrapper {
+  display: block!important;
+}
+#acl-wrapper {
+  width: 690px;
+  float: left;
+}
+#acl-search {
+  float: right;
+  background: #ffffff url("../../../images/search_18.png") no-repeat right center;
+  padding-right: 20px;
+}
+#acl-showall {
+  float: left;
+  display: block;
+  width: auto;
+  height: 18px;
+  background-color: #cccccc;
+  background-image: url("../../../images/show_all_off.png");
+  background-position: 7px 7px;
+  background-repeat: no-repeat;
+  padding: 7px 5px 0px 30px;
+  color: #999999;
+  -moz-border-radius: 5px 5px 5px 5px;
+  -webkit-border-radius: 5px 5px 5px 5px;
+  border-radius: 5px 5px 5px 5px;
+}
+#acl-showall.selected {
+  color: #000000;
+  background-color: #ff9900;
+  background-image: url("../../../images/show_all_on.png");
+}
+#acl-list {
+  height: 210px;
+  border: 1px solid #cccccc;
+  clear: both;
+  margin-top: 30px;
+  overflow: auto;
+}
+.acl-list-item {
+  display: block;
+  width: 150px;
+  height: 30px;
+  border: 1px solid #cccccc;
+  margin: 5px;
+  float: left;
+}
+.acl-list-item img {
+  width: 22px;
+  height: 22px;
+  float: left;
+  margin: 4px;
+}
+.acl-list-item p {
+  height: 12px;
+  font-size: 10px;
+  margin: 0px;
+  padding: 2px 0px 1px;
+  overflow: hidden;
+}
+.acl-list-item a {
+  font-size: 8px;
+  display: block;
+  width: 40px;
+  height: 10px;
+  float: left;
+  color: #999999;
+  background-color: #cccccc;
+  background-position: 3px 3px;
+  background-repeat: no-repeat;
+  margin-right: 5px;
+  -webkit-border-radius: 2px ;
+  -moz-border-radius: 2px;
+  border-radius: 2px;
+  padding-left: 15px;
+}
+#acl-wrapper a:hover {
+  text-decoration: none;
+  color: #000000;
+}
+.acl-button-show {
+  background-image: url("../../../images/show_off.png");
+}
+.acl-button-hide {
+  background-image: url("../../../images/hide_off.png");
+}
+.acl-button-show.selected {
+  color: #000000;
+  background-color: #9ade00;
+  background-image: url("../../../images/show_on.png");
+}
+.acl-button-hide.selected {
+  color: #000000;
+  background-color: #ff4141;
+  background-image: url("../../../images/hide_on.png");
+}
+.acl-list-item.groupshow {
+  border-color: #9ade00;
+}
+.acl-list-item.grouphide {
+  border-color: #ff4141;
+}
+/** /acl **/
+/** tab buttons **/
+/*marker*/
+ul.tabs {
+  list-style-type: none;
+  padding-bottom: 10px;
+  font-size: 13px;
+  width: 805px;
+}
+ul.tabs li {
+  float: left;
+  margin-left: 5px;
+}
+ul.tabs li .active {
+    background-color: #333333;
+    border: 1px solid #777777;
+    color: white;
+    border-radius: 3px 3px 3px 3px;
+    box-shadow: 0 1px 1px #CFCFCF;
+    margin-left: 5px;
+}
+//settings tabs
+ul.rs_tabs {
+  list-style-type: none;
+  font-size: 11px;
+}
+ul.rs_tabs li {
+  float: left;
+  margin-bottom: 30px;
+  clear: both;
+}
+ul.rs_tabs li .selected {
+    background-color: #333;
+    border: 1px solid #777777;
+    color: white;
+    border-radius: 3px 3px 3px 3px;
+    box-shadow: 2px 2px 2px #CFCFCF;
+    font-size: 13px;
+}
+.rs_tabs {
+    list-style-type: none;
+    font-size: 11px;
+    background-position: 0 -20px;
+    background-repeat: repeat-x;
+    height: 27px;
+    padding: 0;
+ }
+.rs_tab.button {	
+    /*background: none repeat scroll 0 0 #F8F8F8;*/
+    border: 1px solid #CCCCCC;
+    border-radius: 3px 3px 3px 3px;
+    font-weight: bolder;
+    padding: 3px;
+    color:  #333333;
+    text-decoration: none;
+	}
+/**
+ * Form fields
+ */
+.field {
+  margin-bottom: 10px;
+  padding-bottom: 10px;
+  overflow: auto;
+  width: 100%;
+}
+.field label {
+  float: left;
+  width: 200px;
+}
+.field input, .field textarea {
+  width: 400px;
+}
+.field textarea {
+  height: 100px;
+}
+.field .field_help {
+  display: block;
+  margin-left: 200px;
+  color: #666666;
+}
+.field .onoff {
+  float: left;
+  width: 80px;
+}
+.field .onoff a {
+  display: block;
+  border: 1px solid #666666;
+  background-image: url("../../../images/onoff.jpg");
+  background-repeat: no-repeat;
+  padding: 4px 2px 2px 2px;
+  height: 16px;
+  text-decoration: none;
+}
+.field .onoff .off {
+  border-color: #666666;
+  padding-left: 40px;
+  background-position: left center;
+  background-color: #cccccc;
+  color: #666666;
+  text-align: right;
+}
+.field .onoff .on {
+  border-color: #204A87;
+  padding-right: 40px;
+  background-position: right center;
+  background-color: #D7E3F1;
+  color: #204A87;
+  text-align: left;
+}
+.field .hidden {
+  display: none!important;
+}
+.field.radio .field_help {
+  margin-left: 0px;
+}
+.suggest-select {
+width: 500px;
+height: 350px;	
+	}
+.message-to-select {
+	width: 400px;
+   height: 150px;
+	}
+#directory-search-form{
+	margin-bottom: 50px;
+	}
+#profile-edit-links-end {
+        clear: both;
+        margin-bottom: 15px;
+}
+
+#profile-edit-links ul { margin: 20px; padding-bottom: 20px; list-style: none; }
+
+#profile-edit-links li {
+  float: left;
+  list-style: none;
+  margin-left: 10px;
+}
+
+.profile-edit-side-div {
+  display: none;
+}
+
+#register-form label,
+#profile-edit-form label {
+        width: 300px; float: left;
+}
+
+.required {
+  display: inline;
+  color: #B20202;
+}
+
+/* oauth */
+.oauthapp {
+  height: auto;
+  overflow: auto;
+  border-bottom: 2px solid #cccccc;
+  padding-bottom: 1em;
+  margin-bottom: 1em;
+}
+.oauthapp img {
+  float: left;
+  width: 48px;
+  height: 48px;
+  margin: 10px;
+}
+.oauthapp img.noicon {
+  background-image: url("../../../images/icons/48/plugin.png");
+  background-position: center center;
+  background-repeat: no-repeat;
+}
+.oauthapp a {
+  float: left;
+}
+/* contacts */
+.contact-entry-wrapper {
+  width: 120px;
+  height: 120px;
+  float: left;
+}
+/* photo */
+.photo {
+border-radius: 10px;	
+height: 145px !important;
+width: 145px !important;
+	}
+.lframe {
+  float: left;
+}
+/* profile match wrapper */
+.profile-match-wrapper {
+  float: left;
+  width: 90px;
+  height: 90px;
+  margin-bottom: 20px;
+}
+.profile-match-wrapper .contact-photo {
+  width: 80px;
+  height: 80px;
+}
+.profile-match-wrapper .contact-photo img {
+  width: 80px;
+  height: 80px;
+}
+.profile-match-wrapper {
+  left: 0px;
+  top: 63px;
+}
+
+.contact-photo-menu-button {
+        position: relative;
+        background-image: url("../../../images/icons/16/menu.png");
+        background-position: top left; 
+        background-repeat: no-repeat;
+        margin: 0px 0px -16px 0px; 
+	padding: 0px;
+        width: 16px;
+        height: 16px;
+        top: -16px; left:0px;
+        overflow: hidden;
+        text-indent: 40px;
+        display: none;
+        
+}
+.contact-photo-menu {
+        width: 11em;
+        border: 3px solid #364e59;
+	color: #2d2d2d;
+        background: #FFFFFF;
+/*        position: absolute;*/
+        position: relative;
+        left: 0px; top: 0px;
+        display: none;
+        z-index: 10000;
+}
+.contact-photo-menu ul { margin:0px; padding: 0px; list-style: none }
+.contact-photo-menu li a {
+	display: block; 
+	padding: 5px 10px; 
+	color: #2d2d2d;
+	text-decoration: none;
+}
+.contact-photo-menu li a:hover {
+	background-color: #bdcdd4; 
+}
+
+/* page footer */
+footer {
+  height: 100px;
+  display: table-row;
+}
+
+blockquote {
+    border-left: 1px solid #D2D2D2;
+    padding-left: 9px;
+    margin: 0 0 0 .8ex;
+	 color: #777;
+}
+.oembed {
+	font-weight: bold;
+}
+.aprofile dt{
+box-shadow: 1px 1px 5px 0;
+    color: #666666;
+    margin: 15px 0 5px;
+    padding-left: 5px;	
+	}
+/* ================== */
+/* = Contacts Block = */
+/* ================== */
+
+.contact-block-img {
+        width: 55px;
+        height: 55px;
+        padding-right: 3px;
+}
+.contact-block-div {
+        float: left;
+}
+
+.contact-block-textdiv { width: 150px; height: 34px; float: left; }
+#contact-block-end { clear: both; } 
+
+#group-edit-wrapper {
+        margin-bottom: 10px;
+}
+
+#group-members-end {
+        clear: both;
+}
+#group-edit-desc {
+ margin-top: 15px;
+}
+
+/*
+#group-separator,
+#prof-separator { display: none;}
+*/
+#prof-members-end{
+	clear: both;
+	}
+
+#prvmail-to-label, #prvmail-subject-label, #prvmail-message-label {
+	margin-bottom: 10px;
+	margin-top: 20px;
+}
+
+#prvmail-submit {
+	float: right;
+	margin-top: 10px;
+}
+#prvmail-subject
+{
+background: none repeat scroll 0 0 #FFFFFF;
+border: 1px solid #CCCCCC;
+border-radius: 5px 5px 5px 5px;
+font-weight: bold;
+height: 20px;
+margin: 0 0 5px;
+vertical-align: middle;
+}
+#prvmail-form{
+ width: 597px;	
+	}
+#prvmail-upload-wrapper,
+#prvmail-link-wrapper,
+#prvmail-rotator-wrapper {
+	float: left;
+	margin-top: 10px;
+	margin-right: 10px;
+	width: 24px;
+}
+
+#prvmail-end {
+	clear: both;
+}
+
+.mail-list-sender,
+.mail-list-detail {
+	float: left;
+}
+.mail-list-detail {
+	margin-left: 20px;
+}
+
+.mail-list-subject {
+	font-size: 1.1em;
+	margin-top: 10px;
+}
+a.mail-list-link {
+    display: block;
+    font-size: 1.3em;
+    padding: 4px 0;
+}
+
+/*
+*a.mail-list-link:hover {
+*	background-color: #15607B;
+*	color: #F5F6FB;
+*}
+*/
+
+.mail-list-outside-wrapper-end {
+	clear: both;
+}
+
+.mail-list-outside-wrapper {
+	margin-top: 30px;
+}
+
+.mail-list-delete-wrapper {
+	float: right;
+	margin-right: 30px;
+	margin-top: 15px;
+}
+
+.mail-list-delete-icon {
+	border: none;
+}
+
+.mail-conv-sender,
+.mail-conv-detail {
+	float: left;
+}
+.mail-conv-detail {
+	margin-left: 20px;
+	width: 500px;
+}
+
+.mail-conv-subject {
+    font-size: 1.4em;
+    margin: 10px 0;
+}
+
+.mail-conv-outside-wrapper-end {
+	clear: both;
+}
+
+.mail-conv-outside-wrapper {
+	margin-top: 30px;
+}
+
+.mail-conv-delete-wrapper {
+	float: right;
+	margin-right: 30px;
+	margin-top: 15px;
+}
+.mail-conv-break {
+	clear: both;
+}
+
+.mail-conv-delete-icon {
+	border: none;
+}
+
+/* ========== */
+/* = Events = */
+/* ========== */
+.eventcal {
+        float: left;
+        font-size: 20px;
+}
+
+.vevent {
+position: relative;
+width: 400px;
+padding: 20px;
+padding-top: 10px;
+margin: 0 0px;
+margin-bottom: 10px;
+background-color: white;
+-webkit-box-shadow: 0 0 4px rgba(0, 0, 0, 0.2), inset 0 0 50px rgba(0, 0, 0, 0.1);
+-moz-box-shadow: 0 0 4px rgba(0, 0, 0, 0.2), inset 0 0 50px rgba(0, 0, 0, 0.1);
+box-shadow: 0 0 5px rgba(0, 0, 0, 0.2), inset 0 0 50px rgba(0, 0, 0, 0.1);
+}
+.vevent .event-location {
+        margin-left: 10px;
+        margin-right: 10px;
+}
+.vevent .event-description {
+margin-left: 10px;
+margin-right: 10px;
+font-size: 1.1em;
+font-weight: bolder;
+}
+.vevent .event-start, .vevent .event-end {
+
+margin-right: 20px;
+margin-bottom: 2px;
+margin-top: 2px;
+font-size: 0.9em;
+text-align: left;
+}
+.event-start .dtstart, .event-end .dtend {
+float: right;
+}
+
+
+#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("../../../view/theme/diabook/icons/events2.png") !important;
+        margin-right: 15px;
+}
+
+.event-start, .event-end {
+        margin-left: 10px;
+        width: 330px;
+        clear: both;
+}
+
+.event-start .dtstart, .event-end .dtend {
+        float: right;
+}
+.event-list-date {
+        margin-bottom: 10px;
+}
+
+.prevcal, .nextcal {
+        float: left;
+        margin-left: 32px;
+        margin-right: 32px;
+        margin-top: 64px;
+}
+.event-calendar-end {
+        clear: both;
+}
+
+ 
+.calendar {
+        font-family: Courier, monospace;
+}
+.today {
+        font-weight: bold;
+        color: #FF0000;
+}
+
+.settings-block {
+        border: 1px solid #AAA;
+        margin: 10px;
+        padding: 10px;
+}
+
+.app-title {
+        margin: 10px;
+}
+
+#identity-manage-desc {
+        margin-top:15px;
+        margin-bottom: 15px;
+}
+
+#identity-manage-choose {
+        margin-bottom: 15px;
+}
+
+#identity-submit {
+        margin-top: 20px;
+}
+
+#photo-prev-link, #photo-next-link {
+        padding: 10px;
+        float: left;
+}
+.lightbox{
+	float: left;
+	}
+
+#photo-photo {
+        float: left;
+}
+#photo-like-div .wall-item-like-buttons {
+	 float: left;
+    margin-right: 5px;
+    margin-top: 30px;
+	}
+
+
+.wall-item-like-buttons .icon.like {
+float: left;
+}
+
+#photo-photo-end {
+        clear: both;
+}
+
+.tabs .comment-wwedit-wrapper {
+	display: block;
+   margin-top: 30px;
+   margin-left: 50px;
+	}
+
+.profile-match-photo {
+        float: left;
+        text-align: center;
+        width: 120px;
+}
+
+.profile-match-name {
+        float: left;
+        text-align: center;
+        width: 120px;
+        overflow: hidden;
+}
+
+.profile-match-break,
+.profile-match-end {
+        clear: both;
+}
+
+.profile-match-connect {
+        text-align: center;
+        font-weight: bold;
+}
+
+.profile-match-wrapper {
+        float: left;
+        padding: 10px;
+        width: 120px;
+        height: 120px;
+        scroll: auto;
+}
+#profile-match-wrapper-end {
+        clear: both;
+}
+
+/* ============= */
+/* = Directory = */
+/* ============= */
+/* contacts menu */
+.contact-photo-wrapper {
+  position: relative;
+}
+.contact-photo {
+  width: 48px;
+  height: 48px;
+  overflow: hidden;
+  display: block;
+}
+.contact-photo img {
+  width: 48px;
+  height: 48px;
+}
+.contact-photo-menu-button {
+  display: none;
+  /* position: absolute; */
+  /* position: absolute; */
+  left: 0px;
+  top: -16px;
+}
+.contact-wrapper {
+  float: left;
+  width: 90px;
+  height: 90px;
+  margin-bottom: 15px;
+}
+.contact-wrapper .contact-photo {
+  width: 80px;
+  height: 80px;
+}
+.contact-wrapper .contact-photo img {
+  width: 80px;
+  height: 80px;
+}
+.contact-wrapper .contact-photo-menu-button {
+  left: 0px;
+  top: 63px;
+}
+.directory-item {
+  float: left;
+  width: 200px;
+  height: 200px;
+}
+.directory-item .contact-photo {
+  width: 175px;
+  height: 175px;
+}
+.directory-item .contact-photo img {
+  width: 175px;
+  height: 175px;
+}
+.contact-name {
+  text-align: left;
+  font-weight: bold;
+  font-size: 12px;
+}
+.contact-details {
+  color: #999999;
+}
+#side-bar-photos-albums li{
+list-style-type: disc;
+}
+#side-bar-photos-albums ul li{
+  margin-left: 30px;
+  padding-left: 0px;
+	}
+#side-bar-photos-albums{
+	margin-top: 15px;	
+	}
+.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-album-image-wrapper, .photo-top-image-wrapper {
+  float: left;
+   -moz-box-shadow: 0 0 5px #888;
+   -webkit-box-shadow: 0 0 5px #888;
+   box-shadow: 0 0 5px #888;
+  background-color: #000;
+   -webkit-border-radius: 5px;
+   -moz-border-radius: 5px;
+  border-radius: 5px;
+  padding-bottom: 20px;
+  position: relative;
+  margin: 0 10px 10px 0;
+  width: 200px; height: 140px;
+  overflow: hidden;  
+}
+/*
+.photo-top-album-name {
+  position: absolute;
+  bottom: 0;
+  padding: 0 5px;
+}*/
+/*.photo-top-image-wrapper {
+        position: relative;
+        float: left;
+        margin-top: 15px;
+        margin-right: 15px;
+        width: 200px; height: 200px; 
+        
+}*/
+.photo-top-album-name {
+        width: 100%;
+        position: absolute; 
+        bottom: 0px; 
+        padding-left: 3px;
+        background-color: #EEE;
+}
+.photo-top-album-link{
+  color: #3465A4;
+	}
+#photo-top-end {
+        clear: both;
+}
+
+#photo-top-links {
+        margin-bottom: 30px;
+        margin-left: 30px;
+}
+
+#photos-upload-newalbum-div {
+        float: left;
+        width: 175px;
+}
\ No newline at end of file
diff --git a/view/theme/diabook/style.css b/view/theme/diabook/style.css
index 97a26a41d..23f8ac465 100644
--- a/view/theme/diabook/style.css
+++ b/view/theme/diabook/style.css
@@ -83,6 +83,35 @@
 #adminpage .selectall { text-align: right; }
 /* icons */
 
+.icon.bb-url{
+  background-image: url("../../../view/theme/diabook/icons/bb-url.png");
+  float: right;
+  margin-top: 2px;}
+.icon.quote{
+  background-image: url("../../../view/theme/diabook/icons/quote.png");
+  float: right;
+  margin-top: 2px;}
+.icon.bold{
+  background-image: url("../../../view/theme/diabook/icons/bold.png");
+  float: right;
+  margin-top: 2px;}
+.icon.underline{
+  background-image: url("../../../view/theme/diabook/icons/underline.png");
+  float: right;
+  margin-top: 2px;}
+.icon.italic{
+  background-image: url("../../../view/theme/diabook/icons/italic.png");
+  float: right;
+  margin-top: 2px;}
+.icon.bb-image{
+  background-image: url("../../../view/theme/diabook/icons/bb-image.png");
+  float: right;
+  margin-top: 2px;}
+.icon.bb-video{
+  background-image: url("../../../view/theme/diabook/icons/bb-video.png");
+  float: right;
+  margin-top: 2px;}
+  
 .icon.contacts {
   background-image: url("../../../view/theme/diabook/icons/contacts.png");}
 .icon.notifications {
@@ -101,7 +130,8 @@
 .icon.pencil 	{ background-image: url("../../../view/theme/diabook/icons/pencil.png");}
 .icon.recycle 	{ background-image: url("../../../view/theme/diabook/icons/recycle.png");}
 .icon.remote-link { background-image: url("../../../view/theme/diabook/icons/remote.png");}
-.icon.tagged    { background-image: url("../../../view/theme/diabook/icons/tagged.png");}  
+.icon.tagged    { background-image: url("../../../view/theme/diabook/icons/tagged.png");}
+.icon.file-as { background-image: url("../../../view/theme/diabook/icons/file_as.png");}  
 .star-item.icon.unstarred { background-image: url("../../../view/theme/diabook/icons/unstarred.png");}
 .star-item.icon.starred { background-image: url("../../../view/theme/diabook/icons/starred.png");}
 .icon.link		{ background-image: url("../../../view/theme/diabook/icons/link.png");}
@@ -120,7 +150,7 @@
 			  display: block; width: 28px; height: 28px; background-repeat: no-repeat;
 			  }	
 .video 	{ background-image: url("../../../view/theme/diabook/icons/video.png"); 
-			  display: block; width: 100%; height: 28px; background-repeat: no-repeat;
+			  display: block; width: 100%; height: 140px; background-repeat: no-repeat;
 			  }
 .audio2 	{ background-image: url("../../../view/theme/diabook/icons/audio.png"); 
 			  display: block; width: 28px; height: 28px; background-repeat: no-repeat;
@@ -139,13 +169,19 @@
 			  }
 .edit    {background-image: url("../../../view/theme/diabook/icons/pencil2.png"); 
 			  display: block; width: 28px; height: 28px; background-repeat: no-repeat;}
+.icon.block   {background-image: url("../../../view/theme/diabook/icons/block.png"); 
+			  display: block; width: 16px; height: 16px; background-repeat: no-repeat;}
+.icon.block.dim  {background-image: url("../../../view/theme/diabook/icons/block.png"); 
+			  display: block; width: 16px; height: 16px; background-repeat: no-repeat; opacity: 0.3;}
+.icon.ad_drop 	{ background-image: url("../../../view/theme/diabook/icons/drop.png");
+			  display: block; margin-left:5px; width: 16px; height: 16px; background-repeat: no-repeat;}
 			  
 			  
 
 
 .article	{ background-position: -50px  0px;}
 /*.audio 		{ background-position: -70px  0px;}*/
-.block 		{ background-position: -90px  0px;}
+/*.block 		{ background-position: -90px  0px;}*/
 /*.drop 		{ background-position: -110px 0px;}*/
 /*.drophide 	{ background-position: -130px 0px;}*/
 /*.edit 		{ background-position: -150px 0px;}*/
@@ -401,6 +437,10 @@ body {
   display: table;
 }
 
+#jappix_mini {
+right: 45px !important;
+}
+
 h4 {
   font-size: 1.1em;
 }
@@ -449,6 +489,24 @@ a:hover {
   /*color: #005c94; */
   text-decoration: underline;
 }
+.intro-end {
+	border-bottom: 1px solid black;
+   clear: both;
+   margin-bottom: 25px;
+   padding-bottom: 25px;
+   width: 75%;
+	}
+.intro-form-end {
+	clear: both;
+	}
+.intro-fullname {
+	padding-bottom: 5px;
+   padding-top: 5px;
+	}
+.intro-wrapper-end {
+	clear: both;
+   padding-bottom: 5px;
+	}
 code {
   font-family: Courier, monospace;
   white-space: pre;
@@ -482,8 +540,9 @@ code {
 }
 #saved-search-ul .tool:hover,
 #nets-sidebar .tool:hover,
-#sidebar-group-list .tool:hover {
-	background: #EEE;
+#sidebar-group-list .tool:hover,
+#fileas-sidebar .tool:hover {
+	background: #E7F2F7;
 }
 .tool .label {
   float: left;
@@ -542,15 +601,17 @@ header #banner a:hover {
   text-decoration: none;
   outline: none;
   vertical-align: middle;
+ font-weight: bolder;
+  margin-left: 3px;
 }
 header #banner #logo-img {
   height: 25px;
-  margin-top: 5px;
+  margin-top: 3px;
 }
 header #banner #logo-text {
-  font-size: 22px;
+  font-size: 20px;
   position: absolute;
-  top: 15%;
+  top: 10%;
 }
 /* messages */
 #message-new {
@@ -709,7 +770,7 @@ nav #logo-text {
 nav .nav-menu-search {
   position: relative;
 
-  margin: 3px 17px;
+  margin: 4px 17px;
   margin-right: 0px;
   height: 17px;
   width: 180px;
@@ -974,43 +1035,56 @@ ul.menu-popup .empty {
 .menu-profile-list{
   height: auto;
   overflow: auto;
-  padding-top: 3px;
-  padding-bottom: 3px;
-  padding-left: 16px;
   min-height: 16px;
   list-style: none;
 	}
 .menu-profile-list:hover{
-	background: #EEE;
+	background: #E7F2F7;
 	}
 .menu-profile-list-item{
 	padding-left: 5px;
+	vertical-align: middle;
 	}	
 .menu-profile-list-item:hover{	
 	text-decoration: none;
    }
 /*http://prothemedesign.com/circular-icons/*/
-.menu-profile-list.home{
-	background: url("../../../view/theme/diabook-blue/icons/home.png") no-repeat;
-	}
-.menu-profile-list.photos{
-	background: url("../../../view/theme/diabook-blue/icons/mess_side.png") no-repeat;
-	}
-.menu-profile-list.events{
-	background: url("../../../view/theme/diabook-blue/icons/events.png") no-repeat;
-	}
-.menu-profile-list.notes{
-	background: url("../../../view/theme/diabook-blue/icons/notes.png") no-repeat;
-	}
-.menu-profile-list.foren{
-	background: url("../../../view/theme/diabook-blue/icons/pubgroups.png") no-repeat;
-	}
-.menu-profile-list.com_side{
-	background: url("../../../view/theme/diabook-blue/icons/com_side.png") no-repeat;
+.menu-profile-icon.home{
+	background: url("../../../view/theme/diabook/icons/home.png") no-repeat;
+	float: left;
+	height: 22px;
+   width: 22px;
 	}
-.menu-profile-list.pscontacts{
+.menu-profile-icon.photos{
+	background: url("../../../view/theme/diabook/icons/mess_side.png") no-repeat;
+	float: left;
+	height: 22px;
+   width: 22px;}
+.menu-profile-icon.events{
+	background: url("../../../view/theme/diabook/icons/events.png") no-repeat;
+	float: left;
+	height: 22px;
+   width: 22px;}
+.menu-profile-icon.notes{
+	background: url("../../../view/theme/diabook/icons/notes.png") no-repeat;
+	float: left;
+	height: 22px;
+   width: 22px;}
+.menu-profile-icon.foren{
+	background: url("../../../view/theme/diabook/icons/pubgroups.png") no-repeat;
+	float: left;
+	height: 22px;
+   width: 22px;}
+.menu-profile-icon.com_side{
+	background: url("../../../view/theme/diabook/icons/com_side.png") no-repeat;
+	float: left;
+	height: 22px;
+   width: 22px;}
+.menu-profile-icon.pscontacts{
 	background: url("../../../view/theme/diabook/icons/pscontacts.png") no-repeat;
-	}
+	float: left;
+	height: 22px;
+   width: 22px;}
 
 /* aside */
 aside {
@@ -1022,7 +1096,7 @@ aside {
   float: left;
   /* background: #F1F1F1; */
 }
-
+aside #page-sidebar{display: none;}
 aside .vcard .fn {
   font-size: 18px;
   font-weight: bold;
@@ -1076,7 +1150,17 @@ aside #profiles-menu {
   width: 20em;
 }
 aside #search-text {
-	width: 173px;
+	width: 150px;
+	height: 17px;
+	padding-left: 10px;
+	border-top-left-radius: 15px;
+border-top-right-radius: 15px;
+border-bottom-right-radius: 15px;
+border-bottom-left-radius: 15px;
+-moz-border-bottom-colors: #dbdbdb;
+  -moz-border-top-colors: #999;
+  -moz-border-left-colors: #999;
+  -moz-border-right-colors: #dbdbdb;
 }
 aside #side-follow-url {
 	width: 173px;
@@ -1113,6 +1197,9 @@ aside #side-peoplefind-url {
   float: left;
   margin-right: 20px;	
 	}
+#login-submit-wrapper{
+  margin-bottom: 15px;
+	}
 /* widget */
 .widget {
   margin-bottom: 2em;
@@ -1172,8 +1259,49 @@ aside #side-peoplefind-url {
   min-height: 16px;
   list-style: none;
 }
-.widget .tool.selected {
+.group_selected {
   background: url("../../../view/theme/diabook/icons/selected.png") no-repeat left center;
+  float: left;
+  height: 22px;
+  width: 22px;
+}
+.group_unselected {
+  background: url("../../../view/theme/diabook/icons/unselected.png") no-repeat left center;
+  float: left;
+  height: 22px;
+  width: 22px;
+}
+.icon.text_add		{ 
+		background-image: url("../../../images/icons/16/add.png");
+		float: right;
+		opacity: 0.2;
+		margin-right: 14px;
+		}
+.icon.text_add:hover	{ 
+		background-image: url("../../../images/icons/16/add.png");
+		float: right;
+		cursor: pointer;
+		margin-right: 14px;
+		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;
+		}
+.icon.text_edit {
+  background-image: url("../../../images/icons/10/edit.png");
+  opacity: 0.2;
+  margin-top: 6px;
+  float: right;
+  height: 10px;
+}
+.icon.text_edit:hover {
+  background-image: url("../../../images/icons/10/edit.png");
+  opacity: 1;
+  margin-top: 6px;
+  float: right;
+  height: 10px;
 }
 /* widget: search */
 #add-search-popup {
@@ -1190,10 +1318,14 @@ section {
 
 body .pageheader{
   text-align: center;
-  margin-top: 25px;
-  font-size: 0px;
+  font-size: 20px;
+  margin-bottom: 20px;
+  margin-top: 0px;
+  max-width: 775px;
+	}
+.qcomment{
+  max-width: 122px;	
 	}
-
 #id_username {
   width: 173px;	
 	}
@@ -1220,7 +1352,6 @@ body .pageheader{
     padding: 0;
  }
 .tab.button {
-    margin-right: 5px; 
     margin-left: 5px;	
     /*background: none repeat scroll 0 0 #F8F8F8;*/
     border: 1px solid #CCCCCC;
@@ -1229,6 +1360,7 @@ body .pageheader{
     padding: 3px;
     color:  #333333;
 	}
+
 	
 #birthday-notice, #event-notice, #birthday-wrapper, #event-wrapper{
 	margin-bottom: 10px;
@@ -1240,6 +1372,7 @@ body .pageheader{
   padding: 5px;
   margin-bottom: 0px;
   width: 775px;
+  padding-top: 10px;
 }
 
 .wall-item-decor {
@@ -1257,6 +1390,9 @@ body .pageheader{
 .wall-item-container .wall-item-item, .wall-item-container .wall-item-bottom {
   display: table-row;
 }
+.wall-item-photo-container .wall-item-item, .wall-item-container .wall-item-bottom {
+  display: table-row;
+}
 .wall-item-bottom {
   font-size: 13px;
 }
@@ -1282,16 +1418,32 @@ body .pageheader{
   text-align: left;
   width: 80px;
 }
+.wall-item-photo-container .wall-item-info {
+  display: table-cell;
+  vertical-align: top;
+  text-align: left;
+  width: 80px;
+}
 .wall-item-container .wall-item-location {
   padding-right: 40px;
   display: table-cell;
 }
+.wall-item-photo-container .wall-item-location {
+  padding-right: 40px;
+  display: table-cell;
+}
 .wall-item-container .wall-item-ago {
   word-wrap: break-word;
   width: 50px;
   margin-left: 10px;
   color: #999;
 }
+.wall-item-photo-container .wall-item-ago {
+  word-wrap: break-word;
+  width: 50px;
+  margin-left: 10px;
+  color: #999;
+}
 .wall-item-location {
   
   clear: both;
@@ -1301,19 +1453,33 @@ body .pageheader{
 }
 
 .wall-item-container .wall-item-content {
-  font-size: 12.5px;
+
   max-width: 720px;
   word-wrap: break-word;
-  line-height: 1.2;
+
+
 }
+.wall-item-photo-container .wall-item-content {
 
+  max-width: 720px;
+  word-wrap: break-word;
+  
+  margin-bottom: 14px;
+}
 .wall-item-container .wall-item-content img {
   max-width: 700px;
 }
+.wall-item-photo-container .wall-item-content img {
+  max-width: 700px;
+}
 .wall-item-container .wall-item-links, .wall-item-container .wall-item-actions {
   display: table-cell;
   vertical-align: middle;
 }
+.wall-item-photo-container .wall-item-links, .wall-item-photo-container .wall-item-actions {
+  display: table-cell;
+  vertical-align: middle;
+}
 .wall-item-container .wall-item-links .icon, .wall-item-container .wall-item-actions .icon {
   opacity: 0.5;
   -webkit-transition: all 0.2s ease-in-out;
@@ -1322,6 +1488,14 @@ body .pageheader{
   -ms-transition: all 0.2s ease-in-out;
   transition: all 0.2s ease-in-out;
 }
+.wall-item-photo-container .wall-item-links .icon, .wall-item-photo-container .wall-item-actions .icon {
+  opacity: 0.5;
+  -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;
+}
 .wall-item-container .wall-item-links .icon:hover, .wall-item-container .wall-item-actions .icon:hover {
   opacity: 1;
   -webkit-transition: all 0.2s ease-in-out;
@@ -1330,14 +1504,22 @@ body .pageheader{
   -ms-transition: all 0.2s ease-in-out;
   transition: all 0.2s ease-in-out;
 }
-.wall-item-container .wall-item-name {
+.wall-item-photo-container .wall-item-links .icon:hover, .wall-item-photo-container .wall-item-actions .icon: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;
+}
+.wall-item-container .wall-item-name, .wall-item-photo-container .wall-item-name {
   font-weight: bold;
 }
-.wall-item-container .wall-item-actions-author {
+.wall-item-container .wall-item-actions-author, .wall-item-photo-container .wall-item-actions-author {
   width: 100%;
   margin-bottom: 0.3em;
 }
-.wall-item-container .wall-item-actions-social {
+.wall-item-container .wall-item-actions-social, .wall-item-photo-container .wall-item-actions-social {
   float: left;
   margin-bottom: 1px;
   display: table-cell;
@@ -1345,20 +1527,35 @@ body .pageheader{
 .wall-item-container .wall-item-actions-social a {
   margin-right: 1em;
 }
+.wall-item-photo-container .wall-item-actions-social a {
+  margin-right: 1em;
+}
 .wall-item-actions-social a {
   float: left;
 }
+
 .wall-item-container .wall-item-actions-tools {
   float: right;
   width: 80px;
   display: table-cell;
 }
+.wall-item-photo-container .wall-item-actions-tools {
+  float: right;
+  width: 80px;
+  display: table-cell;
+}
 .wall-item-container .wall-item-actions-tools a {
   float: right;
 }
+.wall-item-photo-container .wall-item-actions-tools a {
+  float: right;
+}
 .wall-item-container .wall-item-actions-tools input {
   float: right;
 }
+.wall-item-photo-container .wall-item-actions-tools input {
+  float: right;
+}
 .wall-item-container.comment {
   margin-top: 5px;
   margin-bottom: 5px;
@@ -1366,6 +1563,48 @@ body .pageheader{
   width: 700px;
   border-bottom: 1px solid hsl(198, 21%, 79%);
 }
+.wall-item-photo-container.comment {
+  margin-top: 5px;
+  margin-bottom: 5px;
+  margin-left: 40px;
+  width: 650px;
+  border-bottom: 1px solid #D2D2D2;
+}
+.wall-item-photo-container.comment {
+  top: 15px !important;
+  left: 15px !important;
+}
+.wall-item-photo-container {
+  display: table;
+  width: 780px;
+}
+
+.my-comment-photo {
+  width: 48px;
+  margin-left: 40px;
+  margin-right: 32px;
+	}
+.comment-edit-preview {
+  width: 500px;
+  margin-top: 10px;
+}
+.comment-edit-text-empty {
+    width: 500px;
+    border: 1px solid #D2D2D2;
+    height: 3.2em;
+    color: #2d2d2d;
+}
+.comment-edit-text-full {
+  font-size: 12.5px;
+  height: 3.3em;
+  
+  border: 1px solid #D2D2D2;
+  width: 500px;
+}
+.comment-edit-photo {
+    margin: 10px 0 0;
+    display: table-cell;
+}
 .wall-item-container.comment .contact-photo {
   width: 32px;
   height: 32px;
@@ -1381,13 +1620,13 @@ body .pageheader{
   padding-left: 12px;
 }
 .wall-item-comment-wrapper {
-  margin: 1px 5px 1px 80px;
+  margin: 1px 5px 5px 80px;
 }
 .wall-item-comment-wrapper .comment-edit-photo {
   display: none;
 }
 .wall-item-comment-wrapper textarea {
-  height: 2.0em;
+  height: 1.6em;
   width: 100%;
   font-size: 10px;
   color: #999999;
@@ -1401,11 +1640,7 @@ body .pageheader{
   color: #2d2d2d;
   border: 1px solid #2d2d2d;
 }
-.comment-edit-preview {
-  width: 710px;
-  border: 1px solid #2d2d2d;
-  margin-top: 10px;
-}
+
 .comment-edit-preview .contact-photo {
   width: 32px;
   height: 32px;
@@ -1417,6 +1652,11 @@ body .pageheader{
   top: 15px !important;
   left: 15px !important;
 }
+.comment-edit-preview {
+  width: 500px;
+  margin-top: 10px;
+  background-color:  #fff797;
+}
 .comment-edit-preview .wall-item-links {
   padding-left: 12px;
 }
@@ -1448,14 +1688,14 @@ body .pageheader{
 }
 .tag {
   /*background: url("../../../images/tag_b.png") repeat-x center left;*/
-  color: #3465A4;
+  color: #999;
   padding-left: 3px;
   font-size: 12px;
 }
 .tag a {
   padding-right: 5px;
   /*background: url("../../../images/tag.png") no-repeat center right;*/
-  color: #3465A4;
+  color: #999;
 }
 .wwto {
   position: absolute !important;
@@ -1550,6 +1790,11 @@ body .pageheader{
   padding: 0.3em;
   margin-bottom: 10px;
 }
+.grey
+{
+  display: inline;
+  float: right;	
+	}
 #jot #jot-tools {
   margin: 0px;
   padding: 0px;
@@ -1628,14 +1873,14 @@ body .pageheader{
 #jot #jot-tools li.loading img {
   margin-top: 10px;
 }
-#profile-jot-form #jot-title {
+#profile-jot-form #jot-title, #profile-jot-form #jot-category {
     
   	 border-radius: 5px 5px 5px 5px;
     font-weight: bold;
     height: 20px;
     margin: 0 0 5px;
     width: 60%;
-    border: 1px solid #ffffff;
+    border: 1px solid #d2d2d2;
 }
 #profile-jot-form #jot-title:-webkit-input-placeholder {
   font-weight: normal;
@@ -1690,7 +1935,7 @@ body .pageheader{
 #profile-jot-submit {
 	float: right;
 	margin-top: 2px;
-	
+	font-size: 14px;
 }
 #profile-upload-wrapper {
 	float: left;
@@ -1742,7 +1987,9 @@ body .pageheader{
 	float: right;
 	margin-left: 10px;
 	margin-top: 2px;
-	font-size: 10px;
+	font-size: 9px;
+	font-weight: bolder;
+	cursor: pointer;
 }
 #profile-jot-perms{
    float: right;
@@ -1753,9 +2000,10 @@ body .pageheader{
 .button.creation1 {
     background-color: #fff;
     border: 1px solid #777777;
-    background-image: -moz-linear-gradient(center top , white 0%, #DDDDDD 100%);
     border-radius: 3px 3px 3px 3px;
     box-shadow: 0 1px 1px #CFCFCF;
+    cursor: pointer;
+    font-weight: bolder;
 }
 .button.creation2 {
     background-color: #33ACFF;
@@ -1765,6 +2013,8 @@ body .pageheader{
     border-radius: 3px 3px 3px 3px;
     box-shadow: 0 1px 1px #CFCFCF;
     margin-left: 5px;
+    cursor: pointer;
+    font-weight: bolder;
 }
 /*input[type="submit"] {
 	border: 0px;
@@ -1896,6 +2146,41 @@ ul.tabs li .active {
     box-shadow: 0 1px 1px #CFCFCF;
     margin-left: 5px;
 }
+//settings tabs
+ul.rs_tabs {
+  list-style-type: none;
+  font-size: 11px;
+}
+ul.rs_tabs li {
+  float: left;
+  margin-bottom: 30px;
+  clear: both;
+}
+ul.rs_tabs li .selected {
+    background-color: #333;
+    border: 1px solid #777777;
+    color: white;
+    border-radius: 3px 3px 3px 3px;
+    box-shadow: 2px 2px 2px #CFCFCF;
+    font-size: 13px;
+}
+.rs_tabs {
+    list-style-type: none;
+    font-size: 11px;
+    background-position: 0 -20px;
+    background-repeat: repeat-x;
+    height: 27px;
+    padding: 0;
+ }
+.rs_tab.button {	
+    /*background: none repeat scroll 0 0 #F8F8F8;*/
+    border: 1px solid #CCCCCC;
+    border-radius: 3px 3px 3px 3px;
+    font-weight: bolder;
+    padding: 3px;
+    color:  #333333;
+    text-decoration: none;
+	}
 /**
  * Form fields
  */
@@ -1955,6 +2240,14 @@ ul.tabs li .active {
 .field.radio .field_help {
   margin-left: 0px;
 }
+.suggest-select {
+width: 500px;
+height: 350px;	
+	}
+.message-to-select {
+	width: 400px;
+   height: 150px;
+	}
 #directory-search-form{
 	margin-bottom: 50px;
 	}
@@ -2014,6 +2307,11 @@ ul.tabs li .active {
   float: left;
 }
 /* photo */
+.photo {
+border-radius: 10px;	
+height: 145px !important;
+width: 145px !important;
+	}
 .lframe {
   float: left;
 }
@@ -2084,6 +2382,10 @@ blockquote {
     border-left: 1px solid #D2D2D2;
     padding-left: 9px;
     margin: 0 0 0 .8ex;
+	 color: #777;
+}
+.oembed {
+	font-weight: bold;
 }
 .aprofile dt{
 box-shadow: 1px 1px 5px 0;
@@ -2122,6 +2424,9 @@ box-shadow: 1px 1px 5px 0;
 #group-separator,
 #prof-separator { display: none;}
 */
+#prof-members-end{
+	clear: both;
+	}
 
 #prvmail-to-label, #prvmail-subject-label, #prvmail-message-label {
 	margin-bottom: 10px;
@@ -2245,17 +2550,40 @@ a.mail-list-link {
 }
 
 .vevent {
-        border: 1px solid #CCCCCC;
-}
-.vevent .event-description, .vevent .event-location {
+position: relative;
+width: 400px;
+padding: 20px;
+padding-top: 10px;
+margin: 0 0px;
+margin-bottom: 10px;
+background-color: white;
+-webkit-box-shadow: 0 0 4px rgba(0, 0, 0, 0.2), inset 0 0 50px rgba(0, 0, 0, 0.1);
+-moz-box-shadow: 0 0 4px rgba(0, 0, 0, 0.2), inset 0 0 50px rgba(0, 0, 0, 0.1);
+box-shadow: 0 0 5px rgba(0, 0, 0, 0.2), inset 0 0 50px rgba(0, 0, 0, 0.1);
+}
+.vevent .event-location {
         margin-left: 10px;
         margin-right: 10px;
 }
-.vevent .event-start {
-        margin-left: 10px;
-        margin-right: 10px;
+.vevent .event-description {
+margin-left: 10px;
+margin-right: 10px;
+font-size: 1.1em;
+font-weight: bolder;
+}
+.vevent .event-start, .vevent .event-end {
+
+margin-right: 20px;
+margin-bottom: 2px;
+margin-top: 2px;
+font-size: 0.9em;
+text-align: left;
+}
+.event-start .dtstart, .event-end .dtend {
+float: right;
 }
 
+
 #new-event-link {
         margin-bottom: 10px;
 }
@@ -2268,7 +2596,7 @@ a.mail-list-link {
 }
 
 .event-description:before {
-        content: url('../../../images/calendar.png');
+        content:   url("../../../view/theme/diabook/icons/events2.png") !important;
         margin-right: 15px;
 }
 
@@ -2344,13 +2672,8 @@ a.mail-list-link {
     margin-right: 5px;
     margin-top: 30px;
 	}
-.comment-edit-text-empty {
-    margin: 10px 0 0;
-    width: 85%;
-}
-.comment-edit-photo {
-    margin: 10px 0 0;
-}
+
+
 .wall-item-like-buttons .icon.like {
 float: left;
 }
diff --git a/view/theme/diabook/style.php b/view/theme/diabook/style.php
new file mode 100644
index 000000000..d926579da
--- /dev/null
+++ b/view/theme/diabook/style.php
@@ -0,0 +1,1974 @@
+<?php
+	$line_height=false;
+	$diabook_font_size=false;
+	$resolution=false;
+	$color=false;
+	$site_line_height = get_config("diabook","line_height");
+	$site_diabook_font_size = get_config("diabook", "font_size" );
+	$site_resolution = get_config("diabook", "resolution" );
+	$site_color = get_config("diabook", "color" );
+	
+	
+	if (local_user()) {
+		$line_height = get_pconfig(local_user(), "diabook","line_height");
+		$diabook_font_size = get_pconfig(local_user(), "diabook", "font_size");
+		$resolution = get_pconfig(local_user(), "diabook", "resolution");
+		$color = get_pconfig(local_user(), "diabook", "color");
+	}
+	
+	if ($line_height===false) $line_height=$site_line_height;
+	if ($line_height===false) $line_height="1.3";
+	if ($diabook_font_size===false) $diabook_font_size=$site_diabook_font_size;
+	if ($diabook_font_size===false) $diabook_font_size="13";
+	if ($resolution===false) $resolution=$site_resolution;
+	if ($resolution===false) $resolution="normal";
+	if ($color===false) $color=$site_color;
+	if ($color===false) $color="diabook";
+	
+	if($color == "diabook") {
+	if($resolution == "normal") {	
+	if (file_exists("$THEMEPATH/style.css")){
+		echo file_get_contents("$THEMEPATH/style.css");
+	}
+
+	if($diabook_font_size == "16"){
+		echo "
+			.wall-item-container .wall-item-content {
+  					font-size: 16px;
+  					}
+  					
+			.wall-item-photo-container .wall-item-content {
+  					font-size: 16px;
+  					}
+		";  
+   }
+   if($diabook_font_size == "15"){
+		echo "
+			.wall-item-container .wall-item-content {
+  					font-size: 15px;
+  					}
+  					
+			.wall-item-photo-container .wall-item-content {
+  					font-size: 15px;
+  					}
+		";
+	}	
+	if($diabook_font_size == "14"){
+		echo "
+			.wall-item-container .wall-item-content {
+  					font-size: 14px;
+  					}
+  					
+			.wall-item-photo-container .wall-item-content {
+  					font-size: 14px;
+  					}
+		";
+	}
+	if($diabook_font_size == "13.5"){
+		echo "
+			.wall-item-container .wall-item-content {
+  					font-size: 13.5px;
+  					}
+  					
+			.wall-item-photo-container .wall-item-content {
+  					font-size: 13.5px;
+  					}
+		";
+	}
+	if($diabook_font_size == "13"){
+		echo "
+			.wall-item-container .wall-item-content {
+  					font-size: 13px;
+  					}
+  					
+			.wall-item-photo-container .wall-item-content {
+  					font-size: 13px;
+  					}
+		";
+	}
+	if($diabook_font_size == "12.5"){
+		echo "
+			.wall-item-container .wall-item-content {
+  					font-size: 12.5px;
+  					}
+  					
+			.wall-item-photo-container .wall-item-content {
+  					font-size: 12.5px;
+  					}
+		";
+	}
+	if($diabook_font_size == "12"){
+		echo "
+			.wall-item-container .wall-item-content {
+  					font-size: 12px;
+  					}
+  					
+			.wall-item-photo-container .wall-item-content {
+  					font-size: 12px;
+  					}
+		";
+	}
+	if($line_height == "1.5"){
+		echo "
+			.wall-item-container .wall-item-content {
+  					line-height: 1.5;
+  					}
+  					
+			.wall-item-photo-container .wall-item-content {
+ 					line-height: 1.5;
+  					}
+		";
+	}	
+	if($line_height == "1.4"){
+		echo "
+			.wall-item-container .wall-item-content {
+  					line-height: 1.4;
+  					}
+  					
+			.wall-item-photo-container .wall-item-content {
+ 					line-height: 1.4;
+  					}
+		";
+	}
+	if($line_height == "1.3"){
+		echo "
+			.wall-item-container .wall-item-content {
+  					line-height: 1.3;
+  					}
+  					
+			.wall-item-photo-container .wall-item-content {
+ 					line-height: 1.3;
+  					}
+		";
+	}
+	if($line_height == "1.2"){
+		echo "
+			.wall-item-container .wall-item-content {
+  					line-height: 1.2;
+  					}
+  					
+			.wall-item-photo-container .wall-item-content {
+ 					line-height: 1.2;
+  					}
+		";
+	}
+	if($line_height == "1.1"){
+		echo "
+			.wall-item-container .wall-item-content {
+  					line-height: 1.1;
+  					}
+  					
+			.wall-item-photo-container .wall-item-content {
+ 					line-height: 1.1;
+  					}
+		";
+	}
+	}
+	
+	if($resolution == "wide") {	
+	if (file_exists("$THEMEPATH/style-wide.css")){
+		echo file_get_contents("$THEMEPATH/style-wide.css");
+	}
+	if($diabook_font_size == "16"){
+		echo "
+			.wall-item-container .wall-item-content {
+  					font-size: 16px;
+  					}
+  					
+			.wall-item-photo-container .wall-item-content {
+  					font-size: 16px;
+  					}
+		";  
+   }
+   
+	if($diabook_font_size == "15"){
+		echo "
+			.wall-item-container .wall-item-content {
+  					font-size: 15px;
+  					}
+  					
+			.wall-item-photo-container .wall-item-content {
+  					font-size: 15px;
+  					}
+		";
+	}
+	if($diabook_font_size == "14"){
+		echo "
+			.wall-item-container .wall-item-content {
+  					font-size: 14px;
+  					}
+  					
+			.wall-item-photo-container .wall-item-content {
+  					font-size: 14px;
+  					}
+		";
+	}
+	if($diabook_font_size == "13.5"){
+		echo "
+			.wall-item-container .wall-item-content {
+  					font-size: 13.5px;
+  					}
+  					
+			.wall-item-photo-container .wall-item-content {
+  					font-size: 13.5px;
+  					}
+		";
+	}
+	if($diabook_font_size == "13"){
+		echo "
+			.wall-item-container .wall-item-content {
+  					font-size: 13px;
+  					}
+  					
+			.wall-item-photo-container .wall-item-content {
+  					font-size: 13px;
+  					}
+		";
+	}
+	if($diabook_font_size == "12.5"){
+		echo "
+			.wall-item-container .wall-item-content {
+  					font-size: 12.5px;
+  					}
+  					
+			.wall-item-photo-container .wall-item-content {
+  					font-size: 12.5px;
+  					}
+		";
+	}
+	if($diabook_font_size == "12"){
+		echo "
+			.wall-item-container .wall-item-content {
+  					font-size: 12px;
+  					}
+  					
+			.wall-item-photo-container .wall-item-content {
+  					font-size: 12px;
+  					}
+		";
+	}
+	if($line_height == "1.5"){
+		echo "
+			.wall-item-container .wall-item-content {
+  					line-height: 1.5;
+  					}
+  					
+			.wall-item-photo-container .wall-item-content {
+ 					line-height: 1.5;
+  					}
+		";
+	}	
+	if($line_height == "1.4"){
+		echo "
+			.wall-item-container .wall-item-content {
+  					line-height: 1.4;
+  					}
+  					
+			.wall-item-photo-container .wall-item-content {
+ 					line-height: 1.4;
+  					}
+		";
+	}
+	if($line_height == "1.3"){
+		echo "
+			.wall-item-container .wall-item-content {
+  					line-height: 1.3;
+  					}
+  					
+			.wall-item-photo-container .wall-item-content {
+ 					line-height: 1.3;
+  					}
+		";
+	}
+	if($line_height == "1.2"){
+		echo "
+			.wall-item-container .wall-item-content {
+  					line-height: 1.2;
+  					}
+  					
+			.wall-item-photo-container .wall-item-content {
+ 					line-height: 1.2;
+  					}
+		";
+	}
+	if($line_height == "1.1"){
+		echo "
+			.wall-item-container .wall-item-content {
+  					line-height: 1.1;
+  					}
+  					
+			.wall-item-photo-container .wall-item-content {
+ 					line-height: 1.1;
+  					}
+		";
+	}
+	}
+	}
+	
+	if($color == "aerith") {
+	if($resolution == "normal") {	
+	if (file_exists("$THEMEPATH/diabook-aerith/style.css")){
+		echo file_get_contents("$THEMEPATH/diabook-aerith/style.css");
+	}
+	if($diabook_font_size == "16"){
+		echo "
+			.wall-item-container .wall-item-content {
+  					font-size: 16px;
+  					}
+  					
+			.wall-item-photo-container .wall-item-content {
+  					font-size: 16px;
+  					}
+		";  
+   }
+   if($diabook_font_size == "15"){
+		echo "
+			.wall-item-container .wall-item-content {
+  					font-size: 15px;
+  					}
+  					
+			.wall-item-photo-container .wall-item-content {
+  					font-size: 15px;
+  					}
+		";
+	}	
+	if($diabook_font_size == "14"){
+		echo "
+			.wall-item-container .wall-item-content {
+  					font-size: 14px;
+  					}
+  					
+			.wall-item-photo-container .wall-item-content {
+  					font-size: 14px;
+  					}
+		";
+	}
+	if($diabook_font_size == "13.5"){
+		echo "
+			.wall-item-container .wall-item-content {
+  					font-size: 13.5px;
+  					}
+  					
+			.wall-item-photo-container .wall-item-content {
+  					font-size: 13.5px;
+  					}
+		";
+	}
+	if($diabook_font_size == "13"){
+		echo "
+			.wall-item-container .wall-item-content {
+  					font-size: 13px;
+  					}
+  					
+			.wall-item-photo-container .wall-item-content {
+  					font-size: 13px;
+  					}
+		";
+	}
+	if($diabook_font_size == "12.5"){
+		echo "
+			.wall-item-container .wall-item-content {
+  					font-size: 12.5px;
+  					}
+  					
+			.wall-item-photo-container .wall-item-content {
+  					font-size: 12.5px;
+  					}
+		";
+	}
+	if($diabook_font_size == "12"){
+		echo "
+			.wall-item-container .wall-item-content {
+  					font-size: 12px;
+  					}
+  					
+			.wall-item-photo-container .wall-item-content {
+  					font-size: 12px;
+  					}
+		";
+	}
+	if($line_height == "1.5"){
+		echo "
+			.wall-item-container .wall-item-content {
+  					line-height: 1.5;
+  					}
+  					
+			.wall-item-photo-container .wall-item-content {
+ 					line-height: 1.5;
+  					}
+		";
+	}	
+	if($line_height == "1.4"){
+		echo "
+			.wall-item-container .wall-item-content {
+  					line-height: 1.4;
+  					}
+  					
+			.wall-item-photo-container .wall-item-content {
+ 					line-height: 1.4;
+  					}
+		";
+	}
+	if($line_height == "1.3"){
+		echo "
+			.wall-item-container .wall-item-content {
+  					line-height: 1.3;
+  					}
+  					
+			.wall-item-photo-container .wall-item-content {
+ 					line-height: 1.3;
+  					}
+		";
+	}
+	if($line_height == "1.2"){
+		echo "
+			.wall-item-container .wall-item-content {
+  					line-height: 1.2;
+  					}
+  					
+			.wall-item-photo-container .wall-item-content {
+ 					line-height: 1.2;
+  					}
+		";
+	}
+	if($line_height == "1.1"){
+		echo "
+			.wall-item-container .wall-item-content {
+  					line-height: 1.1;
+  					}
+  					
+			.wall-item-photo-container .wall-item-content {
+ 					line-height: 1.1;
+  					}
+		";
+	}
+	}
+	
+	if($resolution == "wide") {	
+	if (file_exists("$THEMEPATH/diabook-aerith/style-wide.css")){
+		echo file_get_contents("$THEMEPATH/diabook-aerith/style-wide.css");
+	}
+	if($diabook_font_size == "16"){
+		echo "
+			.wall-item-container .wall-item-content {
+  					font-size: 16px;
+  					}
+  					
+			.wall-item-photo-container .wall-item-content {
+  					font-size: 16px;
+  					}
+		";  
+   }
+	if($diabook_font_size == "15"){
+		echo "
+			.wall-item-container .wall-item-content {
+  					font-size: 15px;
+  					}
+  					
+			.wall-item-photo-container .wall-item-content {
+  					font-size: 15px;
+  					}
+		";
+	}
+	if($diabook_font_size == "14"){
+		echo "
+			.wall-item-container .wall-item-content {
+  					font-size: 14px;
+  					}
+  					
+			.wall-item-photo-container .wall-item-content {
+  					font-size: 14px;
+  					}
+		";
+	}
+	if($diabook_font_size == "13.5"){
+		echo "
+			.wall-item-container .wall-item-content {
+  					font-size: 13.5px;
+  					}
+  					
+			.wall-item-photo-container .wall-item-content {
+  					font-size: 13.5px;
+  					}
+		";
+	}
+	if($diabook_font_size == "13"){
+		echo "
+			.wall-item-container .wall-item-content {
+  					font-size: 13px;
+  					}
+  					
+			.wall-item-photo-container .wall-item-content {
+  					font-size: 13px;
+  					}
+		";
+	}
+	if($diabook_font_size == "12.5"){
+		echo "
+			.wall-item-container .wall-item-content {
+  					font-size: 12.5px;
+  					}
+  					
+			.wall-item-photo-container .wall-item-content {
+  					font-size: 12.5px;
+  					}
+		";
+	}
+	if($diabook_font_size == "12"){
+		echo "
+			.wall-item-container .wall-item-content {
+  					font-size: 12px;
+  					}
+  					
+			.wall-item-photo-container .wall-item-content {
+  					font-size: 12px;
+  					}
+		";
+	}
+	if($line_height == "1.5"){
+		echo "
+			.wall-item-container .wall-item-content {
+  					line-height: 1.5;
+  					}
+  					
+			.wall-item-photo-container .wall-item-content {
+ 					line-height: 1.5;
+  					}
+		";
+	}	
+	if($line_height == "1.4"){
+		echo "
+			.wall-item-container .wall-item-content {
+  					line-height: 1.4;
+  					}
+  					
+			.wall-item-photo-container .wall-item-content {
+ 					line-height: 1.4;
+  					}
+		";
+	}
+	if($line_height == "1.3"){
+		echo "
+			.wall-item-container .wall-item-content {
+  					line-height: 1.3;
+  					}
+  					
+			.wall-item-photo-container .wall-item-content {
+ 					line-height: 1.3;
+  					}
+		";
+	}
+	if($line_height == "1.2"){
+		echo "
+			.wall-item-container .wall-item-content {
+  					line-height: 1.2;
+  					}
+  					
+			.wall-item-photo-container .wall-item-content {
+ 					line-height: 1.2;
+  					}
+		";
+	}
+	if($line_height == "1.1"){
+		echo "
+			.wall-item-container .wall-item-content {
+  					line-height: 1.1;
+  					}
+  					
+			.wall-item-photo-container .wall-item-content {
+ 					line-height: 1.1;
+  					}
+		";
+	}
+	}
+	}
+	
+	if($color== "blue") {
+	if($resolution == "normal") {	
+	if (file_exists("$THEMEPATH/diabook-blue/style.css")){
+		echo file_get_contents("$THEMEPATH/diabook-blue/style.css");
+	}
+	if($diabook_font_size == "16"){
+		echo "
+			.wall-item-container .wall-item-content {
+  					font-size: 16px;
+  					}
+  					
+			.wall-item-photo-container .wall-item-content {
+  					font-size: 16px;
+  					}
+		";  
+   }
+   if($diabook_font_size == "15"){
+		echo "
+			.wall-item-container .wall-item-content {
+  					font-size: 15px;
+  					}
+  					
+			.wall-item-photo-container .wall-item-content {
+  					font-size: 15px;
+  					}
+		";
+	}	
+	if($diabook_font_size == "14"){
+		echo "
+			.wall-item-container .wall-item-content {
+  					font-size: 14px;
+  					}
+  					
+			.wall-item-photo-container .wall-item-content {
+  					font-size: 14px;
+  					}
+		";
+	}
+	if($diabook_font_size == "13.5"){
+		echo "
+			.wall-item-container .wall-item-content {
+  					font-size: 13.5px;
+  					}
+  					
+			.wall-item-photo-container .wall-item-content {
+  					font-size: 13.5px;
+  					}
+		";
+	}
+	if($diabook_font_size == "13"){
+		echo "
+			.wall-item-container .wall-item-content {
+  					font-size: 13px;
+  					}
+  					
+			.wall-item-photo-container .wall-item-content {
+  					font-size: 13px;
+  					}
+		";
+	}
+	if($diabook_font_size == "12.5"){
+		echo "
+			.wall-item-container .wall-item-content {
+  					font-size: 12.5px;
+  					}
+  					
+			.wall-item-photo-container .wall-item-content {
+  					font-size: 12.5px;
+  					}
+		";
+	}
+	if($diabook_font_size == "12"){
+		echo "
+			.wall-item-container .wall-item-content {
+  					font-size: 12px;
+  					}
+  					
+			.wall-item-photo-container .wall-item-content {
+  					font-size: 12px;
+  					}
+		";
+	}
+	if($line_height == "1.5"){
+		echo "
+			.wall-item-container .wall-item-content {
+  					line-height: 1.5;
+  					}
+  					
+			.wall-item-photo-container .wall-item-content {
+ 					line-height: 1.5;
+  					}
+		";
+	}	
+	if($line_height == "1.4"){
+		echo "
+			.wall-item-container .wall-item-content {
+  					line-height: 1.4;
+  					}
+  					
+			.wall-item-photo-container .wall-item-content {
+ 					line-height: 1.4;
+  					}
+		";
+	}
+	if($line_height == "1.3"){
+		echo "
+			.wall-item-container .wall-item-content {
+  					line-height: 1.3;
+  					}
+  					
+			.wall-item-photo-container .wall-item-content {
+ 					line-height: 1.3;
+  					}
+		";
+	}
+	if($line_height == "1.2"){
+		echo "
+			.wall-item-container .wall-item-content {
+  					line-height: 1.2;
+  					}
+  					
+			.wall-item-photo-container .wall-item-content {
+ 					line-height: 1.2;
+  					}
+		";
+	}
+	if($line_height == "1.1"){
+		echo "
+			.wall-item-container .wall-item-content {
+  					line-height: 1.1;
+  					}
+  					
+			.wall-item-photo-container .wall-item-content {
+ 					line-height: 1.1;
+  					}
+		";
+	}
+	}
+	
+	if($resolution == "wide") {	
+	if (file_exists("$THEMEPATH/diabook-blue/style-wide.css")){
+		echo file_get_contents("$THEMEPATH/diabook-blue/style-wide.css");
+	}
+	if($diabook_font_size == "16"){
+		echo "
+			.wall-item-container .wall-item-content {
+  					font-size: 16px;
+  					}
+  					
+			.wall-item-photo-container .wall-item-content {
+  					font-size: 16px;
+  					}
+		";  
+   }
+	if($diabook_font_size == "15"){
+		echo "
+			.wall-item-container .wall-item-content {
+  					font-size: 15px;
+  					}
+  					
+			.wall-item-photo-container .wall-item-content {
+  					font-size: 15px;
+  					}
+		";
+	}
+	if($diabook_font_size == "14"){
+		echo "
+			.wall-item-container .wall-item-content {
+  					font-size: 14px;
+  					}
+  					
+			.wall-item-photo-container .wall-item-content {
+  					font-size: 14px;
+  					}
+		";
+	}
+	if($diabook_font_size == "13.5"){
+		echo "
+			.wall-item-container .wall-item-content {
+  					font-size: 13.5px;
+  					}
+  					
+			.wall-item-photo-container .wall-item-content {
+  					font-size: 13.5px;
+  					}
+		";
+	}
+	if($diabook_font_size == "13"){
+		echo "
+			.wall-item-container .wall-item-content {
+  					font-size: 13px;
+  					}
+  					
+			.wall-item-photo-container .wall-item-content {
+  					font-size: 13px;
+  					}
+		";
+	}
+	if($diabook_font_size == "12.5"){
+		echo "
+			.wall-item-container .wall-item-content {
+  					font-size: 12.5px;
+  					}
+  					
+			.wall-item-photo-container .wall-item-content {
+  					font-size: 12.5px;
+  					}
+		";
+	}
+	if($diabook_font_size == "12"){
+		echo "
+			.wall-item-container .wall-item-content {
+  					font-size: 12px;
+  					}
+  					
+			.wall-item-photo-container .wall-item-content {
+  					font-size: 12px;
+  					}
+		";
+	}
+	if($line_height == "1.5"){
+		echo "
+			.wall-item-container .wall-item-content {
+  					line-height: 1.5;
+  					}
+  					
+			.wall-item-photo-container .wall-item-content {
+ 					line-height: 1.5;
+  					}
+		";
+	}	
+	if($line_height == "1.4"){
+		echo "
+			.wall-item-container .wall-item-content {
+  					line-height: 1.4;
+  					}
+  					
+			.wall-item-photo-container .wall-item-content {
+ 					line-height: 1.4;
+  					}
+		";
+	}
+	if($line_height == "1.3"){
+		echo "
+			.wall-item-container .wall-item-content {
+  					line-height: 1.3;
+  					}
+  					
+			.wall-item-photo-container .wall-item-content {
+ 					line-height: 1.3;
+  					}
+		";
+	}
+	if($line_height == "1.2"){
+		echo "
+			.wall-item-container .wall-item-content {
+  					line-height: 1.2;
+  					}
+  					
+			.wall-item-photo-container .wall-item-content {
+ 					line-height: 1.2;
+  					}
+		";
+	}
+	if($line_height == "1.1"){
+		echo "
+			.wall-item-container .wall-item-content {
+  					line-height: 1.1;
+  					}
+  					
+			.wall-item-photo-container .wall-item-content {
+ 					line-height: 1.1;
+  					}
+		";
+	}
+	}
+	}
+	
+	if($color== "red") {
+	if($resolution == "normal") {	
+	if (file_exists("$THEMEPATH/diabook-red/style.css")){
+		echo file_get_contents("$THEMEPATH/diabook-red/style.css");
+	}
+	if($diabook_font_size == "16"){
+		echo "
+			.wall-item-container .wall-item-content {
+  					font-size: 16px;
+  					}
+  					
+			.wall-item-photo-container .wall-item-content {
+  					font-size: 16px;
+  					}
+		";  
+   }
+   if($diabook_font_size == "15"){
+		echo "
+			.wall-item-container .wall-item-content {
+  					font-size: 15px;
+  					}
+  					
+			.wall-item-photo-container .wall-item-content {
+  					font-size: 15px;
+  					}
+		";
+	}	
+	if($diabook_font_size == "14"){
+		echo "
+			.wall-item-container .wall-item-content {
+  					font-size: 14px;
+  					}
+  					
+			.wall-item-photo-container .wall-item-content {
+  					font-size: 14px;
+  					}
+		";
+	}
+	if($diabook_font_size == "13.5"){
+		echo "
+			.wall-item-container .wall-item-content {
+  					font-size: 13.5px;
+  					}
+  					
+			.wall-item-photo-container .wall-item-content {
+  					font-size: 13.5px;
+  					}
+		";
+	}
+	if($diabook_font_size == "13"){
+		echo "
+			.wall-item-container .wall-item-content {
+  					font-size: 13px;
+  					}
+  					
+			.wall-item-photo-container .wall-item-content {
+  					font-size: 13px;
+  					}
+		";
+	}
+	if($diabook_font_size == "12.5"){
+		echo "
+			.wall-item-container .wall-item-content {
+  					font-size: 12.5px;
+  					}
+  					
+			.wall-item-photo-container .wall-item-content {
+  					font-size: 12.5px;
+  					}
+		";
+	}
+	if($diabook_font_size == "12"){
+		echo "
+			.wall-item-container .wall-item-content {
+  					font-size: 12px;
+  					}
+  					
+			.wall-item-photo-container .wall-item-content {
+  					font-size: 12px;
+  					}
+		";
+	}
+	if($line_height == "1.5"){
+		echo "
+			.wall-item-container .wall-item-content {
+  					line-height: 1.5;
+  					}
+  					
+			.wall-item-photo-container .wall-item-content {
+ 					line-height: 1.5;
+  					}
+		";
+	}	
+	if($line_height == "1.4"){
+		echo "
+			.wall-item-container .wall-item-content {
+  					line-height: 1.4;
+  					}
+  					
+			.wall-item-photo-container .wall-item-content {
+ 					line-height: 1.4;
+  					}
+		";
+	}
+	if($line_height == "1.3"){
+		echo "
+			.wall-item-container .wall-item-content {
+  					line-height: 1.3;
+  					}
+  					
+			.wall-item-photo-container .wall-item-content {
+ 					line-height: 1.3;
+  					}
+		";
+	}
+	if($line_height == "1.2"){
+		echo "
+			.wall-item-container .wall-item-content {
+  					line-height: 1.2;
+  					}
+  					
+			.wall-item-photo-container .wall-item-content {
+ 					line-height: 1.2;
+  					}
+		";
+	}
+	if($line_height == "1.1"){
+		echo "
+			.wall-item-container .wall-item-content {
+  					line-height: 1.1;
+  					}
+  					
+			.wall-item-photo-container .wall-item-content {
+ 					line-height: 1.1;
+  					}
+		";
+	}
+	}
+	
+	if($resolution == "wide") {	
+	if (file_exists("$THEMEPATH/diabook-red/style-wide.css")){
+		echo file_get_contents("$THEMEPATH/diabook-red/style-wide.css");
+	}
+	if($diabook_font_size == "16"){
+		echo "
+			.wall-item-container .wall-item-content {
+  					font-size: 16px;
+  					}
+  					
+			.wall-item-photo-container .wall-item-content {
+  					font-size: 16px;
+  					}
+		";  
+   }
+	if($diabook_font_size == "15"){
+		echo "
+			.wall-item-container .wall-item-content {
+  					font-size: 15px;
+  					}
+  					
+			.wall-item-photo-container .wall-item-content {
+  					font-size: 15px;
+  					}
+		";
+	}
+	if($diabook_font_size == "14"){
+		echo "
+			.wall-item-container .wall-item-content {
+  					font-size: 14px;
+  					}
+  					
+			.wall-item-photo-container .wall-item-content {
+  					font-size: 14px;
+  					}
+		";
+	}
+	if($diabook_font_size == "13.5"){
+		echo "
+			.wall-item-container .wall-item-content {
+  					font-size: 13.5px;
+  					}
+  					
+			.wall-item-photo-container .wall-item-content {
+  					font-size: 13.5px;
+  					}
+		";
+	}
+	if($diabook_font_size == "13"){
+		echo "
+			.wall-item-container .wall-item-content {
+  					font-size: 13px;
+  					}
+  					
+			.wall-item-photo-container .wall-item-content {
+  					font-size: 13px;
+  					}
+		";
+	}
+	if($diabook_font_size == "12.5"){
+		echo "
+			.wall-item-container .wall-item-content {
+  					font-size: 12.5px;
+  					}
+  					
+			.wall-item-photo-container .wall-item-content {
+  					font-size: 12.5px;
+  					}
+		";
+	}
+	if($diabook_font_size == "12"){
+		echo "
+			.wall-item-container .wall-item-content {
+  					font-size: 12px;
+  					}
+  					
+			.wall-item-photo-container .wall-item-content {
+  					font-size: 12px;
+  					}
+		";
+	}
+	if($line_height == "1.5"){
+		echo "
+			.wall-item-container .wall-item-content {
+  					line-height: 1.5;
+  					}
+  					
+			.wall-item-photo-container .wall-item-content {
+ 					line-height: 1.5;
+  					}
+		";
+	}	
+	if($line_height == "1.4"){
+		echo "
+			.wall-item-container .wall-item-content {
+  					line-height: 1.4;
+  					}
+  					
+			.wall-item-photo-container .wall-item-content {
+ 					line-height: 1.4;
+  					}
+		";
+	}
+	if($line_height == "1.3"){
+		echo "
+			.wall-item-container .wall-item-content {
+  					line-height: 1.3;
+  					}
+  					
+			.wall-item-photo-container .wall-item-content {
+ 					line-height: 1.3;
+  					}
+		";
+	}
+	if($line_height == "1.2"){
+		echo "
+			.wall-item-container .wall-item-content {
+  					line-height: 1.2;
+  					}
+  					
+			.wall-item-photo-container .wall-item-content {
+ 					line-height: 1.2;
+  					}
+		";
+	}
+	if($line_height == "1.1"){
+		echo "
+			.wall-item-container .wall-item-content {
+  					line-height: 1.1;
+  					}
+  					
+			.wall-item-photo-container .wall-item-content {
+ 					line-height: 1.1;
+  					}
+		";
+	}
+	}
+	}
+	
+	if($color== "pink") {
+	if($resolution == "normal") {	
+	if (file_exists("$THEMEPATH/diabook-pink/style.css")){
+		echo file_get_contents("$THEMEPATH/diabook-pink/style.css");
+	}
+	if($diabook_font_size == "16"){
+		echo "
+			.wall-item-container .wall-item-content {
+  					font-size: 16px;
+  					}
+  					
+			.wall-item-photo-container .wall-item-content {
+  					font-size: 16px;
+  					}
+		";  
+   }
+   if($diabook_font_size == "15"){
+		echo "
+			.wall-item-container .wall-item-content {
+  					font-size: 15px;
+  					}
+  					
+			.wall-item-photo-container .wall-item-content {
+  					font-size: 15px;
+  					}
+		";
+	}	
+	if($diabook_font_size == "14"){
+		echo "
+			.wall-item-container .wall-item-content {
+  					font-size: 14px;
+  					}
+  					
+			.wall-item-photo-container .wall-item-content {
+  					font-size: 14px;
+  					}
+		";
+	}
+	if($diabook_font_size == "13.5"){
+		echo "
+			.wall-item-container .wall-item-content {
+  					font-size: 13.5px;
+  					}
+  					
+			.wall-item-photo-container .wall-item-content {
+  					font-size: 13.5px;
+  					}
+		";
+	}
+	if($diabook_font_size == "13"){
+		echo "
+			.wall-item-container .wall-item-content {
+  					font-size: 13px;
+  					}
+  					
+			.wall-item-photo-container .wall-item-content {
+  					font-size: 13px;
+  					}
+		";
+	}
+	if($diabook_font_size == "12.5"){
+		echo "
+			.wall-item-container .wall-item-content {
+  					font-size: 12.5px;
+  					}
+  					
+			.wall-item-photo-container .wall-item-content {
+  					font-size: 12.5px;
+  					}
+		";
+	}
+	if($diabook_font_size == "12"){
+		echo "
+			.wall-item-container .wall-item-content {
+  					font-size: 12px;
+  					}
+  					
+			.wall-item-photo-container .wall-item-content {
+  					font-size: 12px;
+  					}
+		";
+	}
+	if($line_height == "1.5"){
+		echo "
+			.wall-item-container .wall-item-content {
+  					line-height: 1.5;
+  					}
+  					
+			.wall-item-photo-container .wall-item-content {
+ 					line-height: 1.5;
+  					}
+		";
+	}	
+	if($line_height == "1.4"){
+		echo "
+			.wall-item-container .wall-item-content {
+  					line-height: 1.4;
+  					}
+  					
+			.wall-item-photo-container .wall-item-content {
+ 					line-height: 1.4;
+  					}
+		";
+	}
+	if($line_height == "1.3"){
+		echo "
+			.wall-item-container .wall-item-content {
+  					line-height: 1.3;
+  					}
+  					
+			.wall-item-photo-container .wall-item-content {
+ 					line-height: 1.3;
+  					}
+		";
+	}
+	if($line_height == "1.2"){
+		echo "
+			.wall-item-container .wall-item-content {
+  					line-height: 1.2;
+  					}
+  					
+			.wall-item-photo-container .wall-item-content {
+ 					line-height: 1.2;
+  					}
+		";
+	}
+	if($line_height == "1.1"){
+		echo "
+			.wall-item-container .wall-item-content {
+  					line-height: 1.1;
+  					}
+  					
+			.wall-item-photo-container .wall-item-content {
+ 					line-height: 1.1;
+  					}
+		";
+	}
+	}
+	
+	if($resolution == "wide") {	
+	if (file_exists("$THEMEPATH/diabook-pink/style-wide.css")){
+		echo file_get_contents("$THEMEPATH/diabook-pink/style-wide.css");
+	}
+	if($diabook_font_size == "16"){
+		echo "
+			.wall-item-container .wall-item-content {
+  					font-size: 16px;
+  					}
+  					
+			.wall-item-photo-container .wall-item-content {
+  					font-size: 16px;
+  					}
+		";  
+   }
+	if($diabook_font_size == "15"){
+		echo "
+			.wall-item-container .wall-item-content {
+  					font-size: 15px;
+  					}
+  					
+			.wall-item-photo-container .wall-item-content {
+  					font-size: 15px;
+  					}
+		";
+	}
+	if($diabook_font_size == "14"){
+		echo "
+			.wall-item-container .wall-item-content {
+  					font-size: 14px;
+  					}
+  					
+			.wall-item-photo-container .wall-item-content {
+  					font-size: 14px;
+  					}
+		";
+	}
+	if($diabook_font_size == "13.5"){
+		echo "
+			.wall-item-container .wall-item-content {
+  					font-size: 13.5px;
+  					}
+  					
+			.wall-item-photo-container .wall-item-content {
+  					font-size: 13.5px;
+  					}
+		";
+	}
+	if($diabook_font_size == "13"){
+		echo "
+			.wall-item-container .wall-item-content {
+  					font-size: 13px;
+  					}
+  					
+			.wall-item-photo-container .wall-item-content {
+  					font-size: 13px;
+  					}
+		";
+	}
+	if($diabook_font_size == "12.5"){
+		echo "
+			.wall-item-container .wall-item-content {
+  					font-size: 12.5px;
+  					}
+  					
+			.wall-item-photo-container .wall-item-content {
+  					font-size: 12.5px;
+  					}
+		";
+	}
+	if($diabook_font_size == "12"){
+		echo "
+			.wall-item-container .wall-item-content {
+  					font-size: 12px;
+  					}
+  					
+			.wall-item-photo-container .wall-item-content {
+  					font-size: 12px;
+  					}
+		";
+	}
+	if($line_height == "1.5"){
+		echo "
+			.wall-item-container .wall-item-content {
+  					line-height: 1.5;
+  					}
+  					
+			.wall-item-photo-container .wall-item-content {
+ 					line-height: 1.5;
+  					}
+		";
+	}	
+	if($line_height == "1.4"){
+		echo "
+			.wall-item-container .wall-item-content {
+  					line-height: 1.4;
+  					}
+  					
+			.wall-item-photo-container .wall-item-content {
+ 					line-height: 1.4;
+  					}
+		";
+	}
+	if($line_height == "1.3"){
+		echo "
+			.wall-item-container .wall-item-content {
+  					line-height: 1.3;
+  					}
+  					
+			.wall-item-photo-container .wall-item-content {
+ 					line-height: 1.3;
+  					}
+		";
+	}
+	if($line_height == "1.2"){
+		echo "
+			.wall-item-container .wall-item-content {
+  					line-height: 1.2;
+  					}
+  					
+			.wall-item-photo-container .wall-item-content {
+ 					line-height: 1.2;
+  					}
+		";
+	}
+	if($line_height == "1.1"){
+		echo "
+			.wall-item-container .wall-item-content {
+  					line-height: 1.1;
+  					}
+  					
+			.wall-item-photo-container .wall-item-content {
+ 					line-height: 1.1;
+  					}
+		";
+	}
+	}
+	}
+	
+	if($color== "green") {
+	if($resolution == "normal") {	
+	if (file_exists("$THEMEPATH/diabook-green/style.css")){
+		echo file_get_contents("$THEMEPATH/diabook-green/style.css");
+	}
+	if($diabook_font_size == "16"){
+		echo "
+			.wall-item-container .wall-item-content {
+  					font-size: 16px;
+  					}
+  					
+			.wall-item-photo-container .wall-item-content {
+  					font-size: 16px;
+  					}
+		";  
+   }
+   if($diabook_font_size == "15"){
+		echo "
+			.wall-item-container .wall-item-content {
+  					font-size: 15px;
+  					}
+  					
+			.wall-item-photo-container .wall-item-content {
+  					font-size: 15px;
+  					}
+		";
+	}	
+	if($diabook_font_size == "14"){
+		echo "
+			.wall-item-container .wall-item-content {
+  					font-size: 14px;
+  					}
+  					
+			.wall-item-photo-container .wall-item-content {
+  					font-size: 14px;
+  					}
+		";
+	}
+	if($diabook_font_size == "13.5"){
+		echo "
+			.wall-item-container .wall-item-content {
+  					font-size: 13.5px;
+  					}
+  					
+			.wall-item-photo-container .wall-item-content {
+  					font-size: 13.5px;
+  					}
+		";
+	}
+	if($diabook_font_size == "13"){
+		echo "
+			.wall-item-container .wall-item-content {
+  					font-size: 13px;
+  					}
+  					
+			.wall-item-photo-container .wall-item-content {
+  					font-size: 13px;
+  					}
+		";
+	}
+	if($diabook_font_size == "12.5"){
+		echo "
+			.wall-item-container .wall-item-content {
+  					font-size: 12.5px;
+  					}
+  					
+			.wall-item-photo-container .wall-item-content {
+  					font-size: 12.5px;
+  					}
+		";
+	}
+	if($diabook_font_size == "12"){
+		echo "
+			.wall-item-container .wall-item-content {
+  					font-size: 12px;
+  					}
+  					
+			.wall-item-photo-container .wall-item-content {
+  					font-size: 12px;
+  					}
+		";
+	}
+	if($line_height == "1.5"){
+		echo "
+			.wall-item-container .wall-item-content {
+  					line-height: 1.5;
+  					}
+  					
+			.wall-item-photo-container .wall-item-content {
+ 					line-height: 1.5;
+  					}
+		";
+	}	
+	if($line_height == "1.4"){
+		echo "
+			.wall-item-container .wall-item-content {
+  					line-height: 1.4;
+  					}
+  					
+			.wall-item-photo-container .wall-item-content {
+ 					line-height: 1.4;
+  					}
+		";
+	}
+	if($line_height == "1.3"){
+		echo "
+			.wall-item-container .wall-item-content {
+  					line-height: 1.3;
+  					}
+  					
+			.wall-item-photo-container .wall-item-content {
+ 					line-height: 1.3;
+  					}
+		";
+	}
+	if($line_height == "1.2"){
+		echo "
+			.wall-item-container .wall-item-content {
+  					line-height: 1.2;
+  					}
+  					
+			.wall-item-photo-container .wall-item-content {
+ 					line-height: 1.2;
+  					}
+		";
+	}
+	if($line_height == "1.1"){
+		echo "
+			.wall-item-container .wall-item-content {
+  					line-height: 1.1;
+  					}
+  					
+			.wall-item-photo-container .wall-item-content {
+ 					line-height: 1.1;
+  					}
+		";
+	}
+	}
+	
+	if($resolution == "wide") {	
+	if (file_exists("$THEMEPATH/diabook-green/style-wide.css")){
+		echo file_get_contents("$THEMEPATH/diabook-green/style-wide.css");
+	}
+	if($diabook_font_size == "16"){
+		echo "
+			.wall-item-container .wall-item-content {
+  					font-size: 16px;
+  					}
+  					
+			.wall-item-photo-container .wall-item-content {
+  					font-size: 16px;
+  					}
+		";  
+   }
+	if($diabook_font_size == "15"){
+		echo "
+			.wall-item-container .wall-item-content {
+  					font-size: 15px;
+  					}
+  					
+			.wall-item-photo-container .wall-item-content {
+  					font-size: 15px;
+  					}
+		";
+	}
+	if($diabook_font_size == "14"){
+		echo "
+			.wall-item-container .wall-item-content {
+  					font-size: 14px;
+  					}
+  					
+			.wall-item-photo-container .wall-item-content {
+  					font-size: 14px;
+  					}
+		";
+	}
+	if($diabook_font_size == "13.5"){
+		echo "
+			.wall-item-container .wall-item-content {
+  					font-size: 13.5px;
+  					}
+  					
+			.wall-item-photo-container .wall-item-content {
+  					font-size: 13.5px;
+  					}
+		";
+	}
+	if($diabook_font_size == "13"){
+		echo "
+			.wall-item-container .wall-item-content {
+  					font-size: 13px;
+  					}
+  					
+			.wall-item-photo-container .wall-item-content {
+  					font-size: 13px;
+  					}
+		";
+	}
+	if($diabook_font_size == "12.5"){
+		echo "
+			.wall-item-container .wall-item-content {
+  					font-size: 12.5px;
+  					}
+  					
+			.wall-item-photo-container .wall-item-content {
+  					font-size: 12.5px;
+  					}
+		";
+	}
+	if($diabook_font_size == "12"){
+		echo "
+			.wall-item-container .wall-item-content {
+  					font-size: 12px;
+  					}
+  					
+			.wall-item-photo-container .wall-item-content {
+  					font-size: 12px;
+  					}
+		";
+	}
+	if($line_height == "1.5"){
+		echo "
+			.wall-item-container .wall-item-content {
+  					line-height: 1.5;
+  					}
+  					
+			.wall-item-photo-container .wall-item-content {
+ 					line-height: 1.5;
+  					}
+		";
+	}	
+	if($line_height == "1.4"){
+		echo "
+			.wall-item-container .wall-item-content {
+  					line-height: 1.4;
+  					}
+  					
+			.wall-item-photo-container .wall-item-content {
+ 					line-height: 1.4;
+  					}
+		";
+	}
+	if($line_height == "1.3"){
+		echo "
+			.wall-item-container .wall-item-content {
+  					line-height: 1.3;
+  					}
+  					
+			.wall-item-photo-container .wall-item-content {
+ 					line-height: 1.3;
+  					}
+		";
+	}
+	if($line_height == "1.2"){
+		echo "
+			.wall-item-container .wall-item-content {
+  					line-height: 1.2;
+  					}
+  					
+			.wall-item-photo-container .wall-item-content {
+ 					line-height: 1.2;
+  					}
+		";
+	}
+	if($line_height == "1.1"){
+		echo "
+			.wall-item-container .wall-item-content {
+  					line-height: 1.1;
+  					}
+  					
+			.wall-item-photo-container .wall-item-content {
+ 					line-height: 1.1;
+  					}
+		";
+	}
+	}
+	}
+	
+	if($color== "dark") {
+	if($resolution == "normal") {	
+	if (file_exists("$THEMEPATH/diabook-dark/style.css")){
+		echo file_get_contents("$THEMEPATH/diabook-dark/style.css");
+	}
+	if($diabook_font_size == "16"){
+		echo "
+			.wall-item-container .wall-item-content {
+  					font-size: 16px;
+  					}
+  					
+			.wall-item-photo-container .wall-item-content {
+  					font-size: 16px;
+  					}
+		";  
+   }
+   if($diabook_font_size == "15"){
+		echo "
+			.wall-item-container .wall-item-content {
+  					font-size: 15px;
+  					}
+  					
+			.wall-item-photo-container .wall-item-content {
+  					font-size: 15px;
+  					}
+		";
+	}	
+	if($diabook_font_size == "14"){
+		echo "
+			.wall-item-container .wall-item-content {
+  					font-size: 14px;
+  					}
+  					
+			.wall-item-photo-container .wall-item-content {
+  					font-size: 14px;
+  					}
+		";
+	}
+	if($diabook_font_size == "13.5"){
+		echo "
+			.wall-item-container .wall-item-content {
+  					font-size: 13.5px;
+  					}
+  					
+			.wall-item-photo-container .wall-item-content {
+  					font-size: 13.5px;
+  					}
+		";
+	}
+	if($diabook_font_size == "13"){
+		echo "
+			.wall-item-container .wall-item-content {
+  					font-size: 13px;
+  					}
+  					
+			.wall-item-photo-container .wall-item-content {
+  					font-size: 13px;
+  					}
+		";
+	}
+	if($diabook_font_size == "12.5"){
+		echo "
+			.wall-item-container .wall-item-content {
+  					font-size: 12.5px;
+  					}
+  					
+			.wall-item-photo-container .wall-item-content {
+  					font-size: 12.5px;
+  					}
+		";
+	}
+	if($diabook_font_size == "12"){
+		echo "
+			.wall-item-container .wall-item-content {
+  					font-size: 12px;
+  					}
+  					
+			.wall-item-photo-container .wall-item-content {
+  					font-size: 12px;
+  					}
+		";
+	}
+	if($line_height == "1.5"){
+		echo "
+			.wall-item-container .wall-item-content {
+  					line-height: 1.5;
+  					}
+  					
+			.wall-item-photo-container .wall-item-content {
+ 					line-height: 1.5;
+  					}
+		";
+	}	
+	if($line_height == "1.4"){
+		echo "
+			.wall-item-container .wall-item-content {
+  					line-height: 1.4;
+  					}
+  					
+			.wall-item-photo-container .wall-item-content {
+ 					line-height: 1.4;
+  					}
+		";
+	}
+	if($line_height == "1.3"){
+		echo "
+			.wall-item-container .wall-item-content {
+  					line-height: 1.3;
+  					}
+  					
+			.wall-item-photo-container .wall-item-content {
+ 					line-height: 1.3;
+  					}
+		";
+	}
+	if($line_height == "1.2"){
+		echo "
+			.wall-item-container .wall-item-content {
+  					line-height: 1.2;
+  					}
+  					
+			.wall-item-photo-container .wall-item-content {
+ 					line-height: 1.2;
+  					}
+		";
+	}
+	if($line_height == "1.1"){
+		echo "
+			.wall-item-container .wall-item-content {
+  					line-height: 1.1;
+  					}
+  					
+			.wall-item-photo-container .wall-item-content {
+ 					line-height: 1.1;
+  					}
+		";
+	}
+	}
+	
+	if($resolution == "wide") {	
+	if (file_exists("$THEMEPATH/diabook-dark/style-wide.css")){
+		echo file_get_contents("$THEMEPATH/diabook-dark/style-wide.css");
+	}
+	if($diabook_font_size == "16"){
+		echo "
+			.wall-item-container .wall-item-content {
+  					font-size: 16px;
+  					}
+  					
+			.wall-item-photo-container .wall-item-content {
+  					font-size: 16px;
+  					}
+		";  
+   }
+	if($diabook_font_size == "15"){
+		echo "
+			.wall-item-container .wall-item-content {
+  					font-size: 15px;
+  					}
+  					
+			.wall-item-photo-container .wall-item-content {
+  					font-size: 15px;
+  					}
+		";
+	}
+	if($diabook_font_size == "14"){
+		echo "
+			.wall-item-container .wall-item-content {
+  					font-size: 14px;
+  					}
+  					
+			.wall-item-photo-container .wall-item-content {
+  					font-size: 14px;
+  					}
+		";
+	}
+	if($diabook_font_size == "13.5"){
+		echo "
+			.wall-item-container .wall-item-content {
+  					font-size: 13.5px;
+  					}
+  					
+			.wall-item-photo-container .wall-item-content {
+  					font-size: 13.5px;
+  					}
+		";
+	}
+	if($diabook_font_size == "13"){
+		echo "
+			.wall-item-container .wall-item-content {
+  					font-size: 13px;
+  					}
+  					
+			.wall-item-photo-container .wall-item-content {
+  					font-size: 13px;
+  					}
+		";
+	}
+	if($diabook_font_size == "12.5"){
+		echo "
+			.wall-item-container .wall-item-content {
+  					font-size: 12.5px;
+  					}
+  					
+			.wall-item-photo-container .wall-item-content {
+  					font-size: 12.5px;
+  					}
+		";
+	}
+	if($diabook_font_size == "12"){
+		echo "
+			.wall-item-container .wall-item-content {
+  					font-size: 12px;
+  					}
+  					
+			.wall-item-photo-container .wall-item-content {
+  					font-size: 12px;
+  					}
+		";
+	}
+	if($line_height == "1.5"){
+		echo "
+			.wall-item-container .wall-item-content {
+  					line-height: 1.5;
+  					}
+  					
+			.wall-item-photo-container .wall-item-content {
+ 					line-height: 1.5;
+  					}
+		";
+	}	
+	if($line_height == "1.4"){
+		echo "
+			.wall-item-container .wall-item-content {
+  					line-height: 1.4;
+  					}
+  					
+			.wall-item-photo-container .wall-item-content {
+ 					line-height: 1.4;
+  					}
+		";
+	}
+	if($line_height == "1.3"){
+		echo "
+			.wall-item-container .wall-item-content {
+  					line-height: 1.3;
+  					}
+  					
+			.wall-item-photo-container .wall-item-content {
+ 					line-height: 1.3;
+  					}
+		";
+	}
+	if($line_height == "1.2"){
+		echo "
+			.wall-item-container .wall-item-content {
+  					line-height: 1.2;
+  					}
+  					
+			.wall-item-photo-container .wall-item-content {
+ 					line-height: 1.2;
+  					}
+		";
+	}
+	if($line_height == "1.1"){
+		echo "
+			.wall-item-container .wall-item-content {
+  					line-height: 1.1;
+  					}
+  					
+			.wall-item-photo-container .wall-item-content {
+ 					line-height: 1.1;
+  					}
+		";
+	}
+	}
+	}
\ No newline at end of file
diff --git a/view/theme/diabook/theme.php b/view/theme/diabook/theme.php
index d6ee57316..269015d0a 100755
--- a/view/theme/diabook/theme.php
+++ b/view/theme/diabook/theme.php
@@ -3,14 +3,30 @@
 /*
  * Name: Diabook
  * Description: Diabook: report bugs and request here: http://pad.toktan.org/p/diabook or contact me : thomas_bierey@friendica.eu
- * Version: 
+ * Version: (Version: 1.022)
  * Author: 
  */
 
 
+//print diabook-version for debugging
+$diabook_version = "Diabook (Version: 1.022)";
+$a->page['htmlhead'] .= sprintf('<script "%s" ></script>', $diabook_version);
 
 //change css on network and profilepages
 $cssFile = null;
+$resolution=false;
+$resolution = get_pconfig(local_user(), "diabook", "resolution");
+if ($resolution===false) $resolution="normal";
+$color = false;
+$color = get_pconfig(local_user(), "diabook", "color");
+if ($color===false) $color="diabook";
+if ($color=="diabook") $color_path = "/";
+if ($color=="aerith") $color_path = "/diabook-aerith/";
+if ($color=="blue") $color_path = "/diabook-blue/";
+if ($color=="red") $color_path = "/diabook-red/";
+if ($color=="pink") $color_path = "/diabook-pink/";
+if ($color=="green") $color_path = "/diabook-green/";
+if ($color=="dark") $color_path = "/diabook-dark/";
 
 
 /**
@@ -21,7 +37,7 @@ $cssFile = null;
  
 function diabook_community_info(){
 	$a = get_app();
-	//right_aside at networkpages
+
 
 	// last 12 users
 	$aside['$lastusers_title'] = t('Last users');
@@ -36,7 +52,7 @@ function diabook_community_info(){
 		0,
 		9
 	);
-	$tpl = file_get_contents( dirname(__file__).'/directory_item.tpl');
+	$tpl = file_get_contents( dirname(__file__).'/ch_directory_item.tpl');
 	if(count($r)) {
 		$photo = 'thumb';
 		foreach($r as $rr) {
@@ -115,7 +131,7 @@ function diabook_community_info(){
 				dbesc(t('Profile Photos'))
 				);
 		if(count($r)) {
-		$tpl = file_get_contents( dirname(__file__).'/directory_item.tpl');
+		$tpl = file_get_contents( dirname(__file__).'/ch_directory_item.tpl');
 		foreach($r as $rr) {
 			$photo_page = $a->get_baseurl() . '/photos/' . $rr['nickname'] . '/image/' . $rr['resource-id'];
 			$photo_url = $a->get_baseurl() . '/photo/' .  $rr['resource-id'] . '-' . $rr['scale'] .'.jpg';
@@ -131,19 +147,12 @@ function diabook_community_info(){
 		}
 	}
 	
-	$fostitJS = "javascript: (function() {
-    					the_url = '".$a->get_baseurl($ssl_state)."/view/theme/diabook/fpostit/fpostit.php?url=' + encodeURIComponent(window.location.href) + '&title=' + encodeURIComponent(document.title) + '&text=' + encodeURIComponent(''+(window.getSelection ? window.getSelection() : document.getSelection ? document.getSelection() : document.selection.createRange().text));
-    						a_funct = function() {
-        						if (!window.open(the_url, 'fpostit', 'location=yes,links=no,scrollbars=no,toolbar=no,width=600,height=300')) location.href = the_url};
-    							if (/Firefox/.test(navigator.userAgent)) {setTimeout(a_funct, 0)} 
-    							else {a_funct()}})()" ;
-  
-   $aside['$fostitJS'] = $fostitJS;
    
    //right_aside FIND FRIENDS
 	if(local_user()) {
 	$nv = array();
-	$nv['directory'] = Array('directory', t('Local').' '.t('Directory'), "", "");
+	$nv['title'] = Array("", t('Find Friends'), "", "");
+	$nv['directory'] = Array('directory', t('Local Directory'), "", "");
 	$nv['global_directory'] = Array('http://dir.friendica.com/', t('Global Directory'), "", "");
 	$nv['match'] = Array('match', t('Similar Interests'), "", "");
 	$nv['suggest'] = Array('suggest', t('Friend Suggestions'), "", "");
@@ -169,7 +178,8 @@ function diabook_community_info(){
 	$pagelist = array();
 
 	$contacts = q("SELECT `id`, `url`, `name`, `micro`FROM `contact`
-			WHERE `network`= 'dfrn' AND `forum` = 1 AND `uid` = %d",
+			WHERE `network`= 'dfrn' AND `forum` = 1 AND `uid` = %d
+			ORDER BY `name` ASC",
 			intval($a->user['uid'])
 	);
 
@@ -192,9 +202,22 @@ function diabook_community_info(){
 		
 		$aside['$page'] = $page;	
 	}
-  //END Community Page		
-     
-   
+  //END Community Page	
+  //helpers
+   $helpers = array();
+	$helpers['title'] = Array("", t('Help or @NewHere ?'), "", "");
+	
+	$aside['$helpers'] = $helpers;
+   //end helpers
+   //connectable services
+   $con_services = array();
+	$con_services['title'] = Array("", t('Connect Services'), "", "");
+	
+	$aside['$con_services'] = $con_services;
+   //end connectable services
+  
+  
+   //get_baseurl
    $url = $a->get_baseurl($ssl_state);   
    $aside['$url'] = $url;
 
@@ -238,14 +261,15 @@ if ($a->argv[0] === "network" && local_user()){
 
 	}
 	
-	$ccCookie = $_COOKIE['close_pages'] + $_COOKIE['close_helpers'] + $_COOKIE['close_services'] + $_COOKIE['close_friends'] + $_COOKIE['close_postit'] + $_COOKIE['close_lastusers'] + $_COOKIE['close_lastphotos'] + $_COOKIE['close_lastlikes'];
+	$ccCookie = $_COOKIE['close_pages'] + $_COOKIE['close_helpers'] + $_COOKIE['close_services'] + $_COOKIE['close_friends'] + $_COOKIE['close_lastusers'] + $_COOKIE['close_lastphotos'] + $_COOKIE['close_lastlikes'];
 	
-	if($ccCookie != "8") {
+	if($ccCookie != "7") {
 	// COMMUNITY
 	diabook_community_info();
-	
+
 	// CUSTOM CSS
-	$cssFile = $a->get_baseurl($ssl_state)."/view/theme/diabook/style-network.css";
+	if($resolution == "normal") {$cssFile = $a->get_baseurl($ssl_state)."/view/theme/diabook".$color_path."style-network.css";}
+	if($resolution == "wide") {$cssFile = $a->get_baseurl($ssl_state)."/view/theme/diabook".$color_path."style-network-wide.css";}
 	}
 }
 
@@ -253,125 +277,171 @@ if ($a->argv[0] === "network" && local_user()){
 
 //right_aside at profile pages
 if ($a->argv[0].$a->argv[1] === "profile".$a->user['nickname']){
-	if($ccCookie != "8") {
+	if($ccCookie != "7") {
 	// COMMUNITY
 	diabook_community_info();
 	
 	// CUSTOM CSS
-	$cssFile = $a->get_baseurl($ssl_state)."/view/theme/diabook/style-profile.css";
-	
+	if($resolution == "normal") {$cssFile = $a->get_baseurl($ssl_state)."/view/theme/diabook".$color_path."style-profile.css";}
+	if($resolution == "wide") {$cssFile = $a->get_baseurl($ssl_state)."/view/theme/diabook".$color_path."style-profile-wide.css";}
 	
 	}
 }
 
-//tabs at right_aside on settings page
-if ($a->argv[0] === "settings"){
-	
-	$tabs = array(
-		array(
-			'label'	=> t('Account settings'),
-			'url' 	=> $a->get_baseurl(true).'/settings',
-			'sel'	=> (($a->argc == 1)?'active':''),
-		),	
-		array(
-			'label'	=> t('Display settings'),
-			'url' 	=> $a->get_baseurl(true).'/settings/display',
-			'sel'	=> (($a->argc > 1) && ($a->argv[1] === 'display')?'active':''),
-		),	
-		array(
-			'label'	=> t('Edit/Manage Profiles'),
-			'url' 	=> $a->get_baseurl(true).'/profiles',
-		),	
-		array(
-			'label'	=> t('Connector settings'),
-			'url' 	=> $a->get_baseurl(true).'/settings/connectors',
-			'sel'	=> (($a->argc > 1) && ($a->argv[1] === 'connectors')?'active':''),
-		),
-		array(
-			'label'	=> t('Plugin settings'),
-			'url' 	=> $a->get_baseurl(true).'/settings/addon',
-			'sel'	=> (($a->argc > 1) && ($a->argv[1] === 'addon')?'active':''),
-		),
-		array(
-			'label' => t('Connections'),
-			'url' => $a->get_baseurl(true) . '/settings/oauth',
-			'sel' => (($a->argc > 1) && ($a->argv[1] === 'oauth')?'active':''),
-		),
-		array(
-			'label' => t('Export personal data'),
-			'url' => $a->get_baseurl(true) . '/uexport',
-			'sel' => ''
-		)
-	);
-	$tabtpl = file_get_contents(dirname(__file__).'/rs_common_tabs.tpl') ;
-	$a->page['aside'] = replace_macros($tabtpl, array(
-		'$tabs' => $tabs,
-	));
-	
-	
-	// CUSTOM CSS
-	$cssFile = $a->get_baseurl($ssl_state)."/view/theme/diabook/style-settings.css";
-	
-}
-
 // custom css
 if (!is_null($cssFile)) $a->page['htmlhead'] .= sprintf('<link rel="stylesheet" type="text/css" href="%s" />', $cssFile);
 
+//footer
+$tpl = get_markup_template('footer.tpl');
+$a->page['footer'] .= replace_macros($tpl, array());
+
 //load jquery.cookie.js
-$cookieJS = $a->get_baseurl($ssl_state)."/view/theme/diabook-blue/js/jquery.cookie.js";
-$a->page['htmlhead'] .= sprintf('<script language="JavaScript" src="%s" ></script>', $cookieJS);
+$cookieJS = $a->get_baseurl($ssl_state)."/view/theme/diabook/js/jquery.cookie.js";
+$a->page['htmlhead'] .= sprintf('<script language="JavaScript" src="%s"></script>', $cookieJS);
+
+//load jquery.ae.image.resize.js
+$imageresizeJS = $a->get_baseurl($ssl_state)."/view/theme/diabook/js/jquery.ae.image.resize.js";
+$a->page['htmlhead'] .= sprintf('<script language="JavaScript" src="%s" ></script>', $imageresizeJS);
+
+//load jquery.autogrow-textarea.js
+$autogrowJS = $a->get_baseurl($ssl_state)."/view/theme/diabook/js/jquery.autogrow.textarea.js";
+$a->page['htmlhead'] .= sprintf('<script language="JavaScript" src="%s" ></script>', $autogrowJS);
 
 //js scripts
+//comment-edit-wrapper on photo_view
+if ($a->argv[0].$a->argv[2] === "photos"."image"){
+
+$a->page['htmlhead'] .= '
+<script>
+	$(function(){
+	
+		$(".comment-edit-form").css("display","table");
+			
+			});
+    </script>';
+	
+}
 
-$a->page['htmlhead'] .= <<< EOT
+$a->page['htmlhead'] .= '
 
 <script>
  $(function() {
-	$('a.lightbox').fancybox(); // Select all links with lightbox class
+	$("a.lightbox").fancybox(); // Select all links with lightbox class
  });
+   
+ </script>';
+ 
+ 
+$a->page['htmlhead'] .= '
+
+<script type="text/javascript">
+
+function tautogrow(id){
+		$("textarea#comment-edit-text-" +id).autogrow(); 	
+ 	};
+ </script>';
+ 
+ 
+$a->page['htmlhead'] .= '
+ <script>
+ 
+$(document).ready(function() {
+    $("iframe").each(function(){
+        var ifr_source = $(this).attr("src");
+        var wmode = "wmode=transparent";
+        if(ifr_source.indexOf("?") != -1) {
+            var getQString = ifr_source.split("?");
+            var oldString = getQString[1];
+            var newString = getQString[0];
+            $(this).attr("src",newString+"?"+wmode+"&"+oldString);
+        }
+        else $(this).attr("src",ifr_source+"?"+wmode);
+    });
+    
+    $("a[href=#top]").click(function() {
+			$("html, body").animate({scrollTop:0}, "slow");
+			return false;
+		});
+      
+
+});
+
+function yt_iframe() {
+
+
+	$("iframe").load(function() { 
+	var ifr_src = $(this).contents().find("body iframe").attr("src");
+	$("iframe").contents().find("body iframe").attr("src", ifr_src+"&wmode=transparent");
+    });
+
+	};
   
- </script>
+ </script>';
+ 
+if($a->argv[0] === "settings" && local_user()) {
+$a->page['htmlhead'] .= ' 
+<script>
+function restore_boxes(){
+	$.cookie("close_pages","2", { expires: 365, path: "/" });
+	$.cookie("close_helpers","2", { expires: 365, path: "/" });
+	$.cookie("close_services","2", { expires: 365, path: "/" });
+	$.cookie("close_friends","2", { expires: 365, path: "/" });
+	$.cookie("close_lastusers","2", { expires: 365, path: "/" });
+	$.cookie("close_lastphotos","2", { expires: 365, path: "/" });
+	$.cookie("close_lastlikes","2", { expires: 365, path: "/" });
+	alert("Right-hand column was restored. Please refresh your browser");
+  }
+</script>';}
 
+
+
+if ($a->argv[0].$a->argv[1] === "profile".$a->user['nickname'] or $a->argv[0] === "network" && local_user()){
+$a->page['htmlhead'] .= '
 <script>
 
+ $(function() {
+	$(".oembed.photo img").aeImageResize({height: 400, width: 400});
+  });
+</script>';
+
+
+	if($ccCookie != "7") {
+$a->page['htmlhead'] .= '
+<script>
 $("right_aside").ready(function(){
 	
-	if($.cookie('close_pages') == '1') 
+	if($.cookie("close_pages") == "1") 
 		{
 		document.getElementById( "close_pages" ).style.display = "none";
 			};
 	
-	if($.cookie('close_helpers') == '1') 
+	if($.cookie("close_helpers") == "1") 
 		{
 		document.getElementById( "close_helpers" ).style.display = "none";
 			};
 			
-	if($.cookie('close_services') == '1') 
+	if($.cookie("close_services") == "1") 
 		{
 		document.getElementById( "close_services" ).style.display = "none";
 			};
 			
-	if($.cookie('close_friends') == '1') 
+	if($.cookie("close_friends") == "1") 
 		{
 		document.getElementById( "close_friends" ).style.display = "none";
 			};
 	
-	if($.cookie('close_postit') == '1') 
-		{
-		document.getElementById( "close_postit" ).style.display = "none";
-			};
 			
-	if($.cookie('close_lastusers') == '1') 
+	if($.cookie("close_lastusers") == "1") 
 		{
 		document.getElementById( "close_lastusers" ).style.display = "none";
 			};
 			
-	if($.cookie('close_lastphotos') == '1') 
+	if($.cookie("close_lastphotos") == "1") 
 		{
 		document.getElementById( "close_lastphotos" ).style.display = "none";
 			};
 			
-	if($.cookie('close_lastlikes') == '1') 
+	if($.cookie("close_lastlikes") == "1") 
 		{
 		document.getElementById( "close_lastlikes" ).style.display = "none";
 			};}
@@ -380,60 +450,78 @@ $("right_aside").ready(function(){
 
 function close_pages(){
  document.getElementById( "close_pages" ).style.display = "none";
- $.cookie('close_pages','1', { expires: 365, path: '/' });
+ $.cookie("close_pages","1", { expires: 365, path: "/" });
  };
  
 function close_helpers(){
  document.getElementById( "close_helpers" ).style.display = "none";
-  $.cookie('close_helpers','1', { expires: 365, path: '/' });
+  $.cookie("close_helpers","1", { expires: 365, path: "/" });
  };
 
 function close_services(){
  document.getElementById( "close_services" ).style.display = "none";
- $.cookie('close_services','1', { expires: 365, path: '/' });
+ $.cookie("close_services","1", { expires: 365, path: "/" });
  };
  
 function close_friends(){
  document.getElementById( "close_friends" ).style.display = "none";
- $.cookie('close_friends','1', { expires: 365, path: '/' });
+ $.cookie("close_friends","1", { expires: 365, path: "/" });
  };
 
-function close_postit(){
- document.getElementById( "close_postit" ).style.display = "none";
- $.cookie('close_postit','1', { expires: 365, path: '/' });
- };
  
 function close_lastusers(){
  document.getElementById( "close_lastusers" ).style.display = "none";
- $.cookie('close_lastusers','1', { expires: 365, path: '/' });
+ $.cookie("close_lastusers","1", { expires: 365, path: "/" });
  };
 
 function close_lastphotos(){
  document.getElementById( "close_lastphotos" ).style.display = "none";
- $.cookie('close_lastphotos','1', { expires: 365, path: '/' });
+ $.cookie("close_lastphotos","1", { expires: 365, path: "/" });
  };
  
 function close_lastlikes(){
  document.getElementById( "close_lastlikes" ).style.display = "none";
- $.cookie('close_lastlikes','1', { expires: 365, path: '/' });
+ $.cookie("close_lastlikes","1", { expires: 365, path: "/" });
  };
- 
- 
+</script>';}}
 
-function restore_boxes(){
-	$.cookie('close_pages','2', { expires: 365, path: '/' });
-	$.cookie('close_helpers','2', { expires: 365, path: '/' });
-	$.cookie('close_services','2', { expires: 365, path: '/' });
-	$.cookie('close_friends','2', { expires: 365, path: '/' });
-	$.cookie('close_postit','2', { expires: 365, path: '/' });
-	$.cookie('close_lastusers','2', { expires: 365, path: '/' });
-	$.cookie('close_lastphotos','2', { expires: 365, path: '/' });
-	$.cookie('close_lastlikes','2', { expires: 365, path: '/' });
-	alert('Right-hand column was restored. Please refresh your browser');
-  };
+$a->page['htmlhead'] .= ' 
 
- 
-</script>
- 
- 
-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);
+								}
+
+	textarea = document.getElementById("comment-edit-text-" +id);
+	if (document.selection) {
+		textarea.focus();
+		selected = document.selection.createRange();
+		if (BBcode == "url"){
+			selected.text = "["+BBcode+"]" + "http://" +  selected.text + "[/"+BBcode+"]";
+			} else			
+		selected.text = "["+BBcode+"]" + selected.text + "[/"+BBcode+"]";
+	} else if (textarea.selectionStart || textarea.selectionStart == "0") {
+		var start = textarea.selectionStart;
+		var end = textarea.selectionEnd;
+		if (BBcode == "url"){
+			textarea.value = textarea.value.substring(0, start) + "["+BBcode+"]" + "http://" + textarea.value.substring(start, end) + "[/"+BBcode+"]" + textarea.value.substring(end, textarea.value.length);
+			} else
+		textarea.value = textarea.value.substring(0, start) + "["+BBcode+"]" + textarea.value.substring(start, end) + "[/"+BBcode+"]" + textarea.value.substring(end, textarea.value.length);
+	}
+	return true;
+}
+
+function cmtBbOpen(id) {
+	$(".comment-edit-bb-" + id).show();
+}
+function cmtBbClose(id) {
+	$(".comment-edit-bb-" + id).hide();
+}
+
+</script> ';
\ No newline at end of file
diff --git a/view/theme/diabook/theme_settings.tpl b/view/theme/diabook/theme_settings.tpl
new file mode 100644
index 000000000..61b0b6dac
--- /dev/null
+++ b/view/theme/diabook/theme_settings.tpl
@@ -0,0 +1,16 @@
+{{inc field_select.tpl with $field=$color}}{{endinc}}
+
+{{inc field_select.tpl with $field=$font_size}}{{endinc}}
+
+{{inc field_select.tpl with $field=$line_height}}{{endinc}}
+
+{{inc field_select.tpl with $field=$resolution}}{{endinc}}
+
+<div class="field select">
+<a onClick="restore_boxes()" title="Restore right-hand column" style="cursor: pointer;">Restore right-hand column</a>
+</div>
+
+<div class="settings-submit-wrapper">
+	<input type="submit" value="$submit" class="settings-submit" name="diabook-settings-submit" />
+</div>
+
diff --git a/view/theme/diabook/wallwall_item.tpl b/view/theme/diabook/wallwall_item.tpl
index c5b6b36b5..bee75ad99 100644
--- a/view/theme/diabook/wallwall_item.tpl
+++ b/view/theme/diabook/wallwall_item.tpl
@@ -71,6 +71,10 @@
 				<a href="#" id="tagger-$item.id" onclick="itemTag($item.id); return false;" class="tag-item icon tagged" title="$item.star.tagger"></a>
 			{{ endif }}	
 			
+			{{ if $item.filer }}
+			<a href="#" id="filer-$item.id" onclick="itemFiler($item.id); return false;" class="filer-item icon file-as" title="$item.star.filer"></a>
+			{{ endif }}	
+			
 			{{ if $item.plink }}<a class="icon link" title="$item.plink.title" href="$item.plink.href">$item.plink.title</a>{{ endif }}
 			
 					
diff --git a/view/theme/dispy-dark/bottom.tpl b/view/theme/dispy-dark/bottom.tpl
new file mode 100644
index 000000000..130bfb25a
--- /dev/null
+++ b/view/theme/dispy-dark/bottom.tpl
@@ -0,0 +1,46 @@
+<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
index adf2772af..b4fbae5df 100644
--- a/view/theme/dispy-dark/comment_item.tpl
+++ b/view/theme/dispy-dark/comment_item.tpl
@@ -11,14 +11,49 @@
 					<a class="comment-edit-photo-link" href="$mylink" title="$mytitle"><img class="my-comment-photo" src="$myphoto" alt="$mytitle" title="$mytitle" /></a>
 				</div>
 				<div class="comment-edit-photo-end"></div>
-				<textarea id="comment-edit-text-$id" class="comment-edit-text-empty" name="body" onFocus="commentOpen(this,$id);" onBlur="commentClose(this,$id);" >$comment</textarea>
+				<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);">
+					<select id="qcomment-select-$id"
+						name="qcomment-$id"
+						class="qcomment"
+						onchange="qCommentInsert(this,$id);">
 					<option value=""></option>
-				{{ for $qcomment as $qc }}
+					{{ for $qcomment as $qc }}
 					<option value="$qc">$qc</option>
-				{{ endfor }}
+					{{ endfor }}
 					</select>
 				</div>
 				{{ endif }}
diff --git a/view/theme/dispy-dark/communityhome.tpl b/view/theme/dispy-dark/communityhome.tpl
index 340b7216c..4d09b9255 100644
--- a/view/theme/dispy-dark/communityhome.tpl
+++ b/view/theme/dispy-dark/communityhome.tpl
@@ -37,10 +37,3 @@
 </div>
 {{ endif }}
 
-{{ if $lastusers_title }}
-<h3 id="postit-header">PostIt to Friendica</h3>
-<div id="postit">
-<a href="$fostitJS" title="PostIt">Post to Friendica</a> from anywhere by bookmarking this link.
-</div>
-{{ endif }}
-
diff --git a/view/theme/dispy-dark/default.php b/view/theme/dispy-dark/default.php
index e74ec1a4f..c3e6c9119 100644
--- a/view/theme/dispy-dark/default.php
+++ b/view/theme/dispy-dark/default.php
@@ -1,20 +1,44 @@
 <!DOCTYPE html>
 <html>
 <head>
-  <title><?php if(x($page,'title')) echo $page['title'] ?></title>
+  <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'] ?>
+  <?php if(x($page,'htmlhead')) echo $page['htmlhead']; ?>
 </head>
 <body>
-	<?php if(x($page,'nav')) echo $page['nav']; ?>
-	<aside>
-		<?php if(x($page,'aside')) echo $page['aside']; ?>
-		<?php if(x($page,'aside_bottom')) echo $page['aside_bottom']; ?>
-	</aside>
-	<section><?php if(x($page,'content')) echo $page['content']; ?>
-		<div id="page-footer"></div>
-	</section>
-	<footer><?php if(x($page,'footer')) echo $page['footer']; ?></footer>
+	<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/editicons.png b/view/theme/dispy-dark/editicons.png
new file mode 100644
index 000000000..51e0d9830
--- /dev/null
+++ b/view/theme/dispy-dark/editicons.png
diff --git a/view/theme/dispy-dark/editicons.svg b/view/theme/dispy-dark/editicons.svg
new file mode 100644
index 000000000..8804d0907
--- /dev/null
+++ b/view/theme/dispy-dark/editicons.svg
@@ -0,0 +1,725 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:xlink="http://www.w3.org/1999/xlink"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   width="250"
+   height="200"
+   contentStyleType="text/css"
+   contentScriptType="text/ecmascript"
+   sodipodi:docname="editicons.svg"
+   inkscape:output_extension="org.inkscape.output.svg.inkscape"
+   version="1.1"
+   id="svg1"
+   inkscape:version="0.48+devel r"
+   inkscape:export-filename="/var/www3/kisikew.org/portal/pub/fd/view/theme/dispy-dark/editicons.png"
+   inkscape:export-xdpi="90"
+   inkscape:export-ydpi="90">
+  <title
+     id="title4806">editicons</title>
+  <defs
+     id="defs4" />
+  <sodipodi:namedview
+     id="base"
+     pagecolor="#8a8a8a"
+     bordercolor="#666666"
+     borderopacity="1.0"
+     inkscape:pageopacity="0"
+     inkscape:pageshadow="0"
+     inkscape:zoom="3.6894726"
+     inkscape:cx="54.191332"
+     inkscape:cy="133.63138"
+     inkscape:document-units="px"
+     inkscape:current-layer="svg1"
+     showgrid="false"
+     inkscape:window-width="1100"
+     inkscape:window-height="740"
+     inkscape:window-x="34"
+     inkscape:window-y="42"
+     inkscape:window-maximized="0"
+     inkscape:showpageshadow="false"
+     width="0px"
+     height="0px"
+     fit-margin-top="0"
+     fit-margin-left="0"
+     fit-margin-right="0"
+     fit-margin-bottom="0" />
+  <metadata
+     id="metadata1">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <dc:title>editicons</dc:title>
+        <dc:contributor>
+          <cc:Agent>
+            <dc:title>Simon L'nu</dc:title>
+          </cc:Agent>
+        </dc:contributor>
+        <dc:date>2012-04-20</dc:date>
+        <dc:creator>
+          <cc:Agent>
+            <dc:title>Simon L'nu</dc:title>
+          </cc:Agent>
+        </dc:creator>
+        <dc:publisher>
+          <cc:Agent>
+            <dc:title>Simon L'nu</dc:title>
+          </cc:Agent>
+        </dc:publisher>
+        <dc:subject>
+          <rdf:Bag>
+            <rdf:li />
+          </rdf:Bag>
+        </dc:subject>
+        <dc:description>
+          <dc:title>DESCRIPTION</dc:title>
+        </dc:description>
+        <cc:license
+           rdf:resource="http://artlibre.org/licence/lal" />
+        <dc:language>en-CA</dc:language>
+      </cc:Work>
+      <cc:License
+         rdf:about="http://artlibre.org/licence/lal">
+        <cc:permits
+           rdf:resource="http://creativecommons.org/ns#Reproduction" />
+        <cc:permits
+           rdf:resource="http://creativecommons.org/ns#Distribution" />
+        <cc:permits
+           rdf:resource="http://creativecommons.org/ns#DerivativeWorks" />
+        <cc:requires
+           rdf:resource="http://creativecommons.org/ns#ShareAlike" />
+        <cc:requires
+           rdf:resource="http://creativecommons.org/ns#Notice" />
+        <cc:requires
+           rdf:resource="http://creativecommons.org/ns#Attribution" />
+      </cc:License>
+    </rdf:RDF>
+  </metadata>
+  <g
+     inkscape:label="Layer1"
+     inkscape:groupmode="layer"
+     id="layer1"
+     transform="translate(0.43349891,-524.43349)" />
+  <rect
+     style="fill:#1a1a1a;fill-opacity:1;fill-rule:nonzero;stroke:#ececec;stroke-opacity:1"
+     id="rect4713"
+     width="20"
+     height="20"
+     x="66.405151"
+     y="68.413567"
+     rx="3"
+     ry="3"
+     transform="translate(-64.805152,-66.847069)" />
+  <text
+     xml:space="preserve"
+     style="font-size:22px;font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;text-align:center;writing-mode:lr-tb;text-anchor:middle;fill:#e6e6e6;fill-opacity:1;fill-rule:nonzero;stroke:none;font-family:Verdana;-inkscape-font-specification:Verdana Bold"
+     x="79.591835"
+     y="91.591835"
+     id="text4709"
+     transform="translate(-68.16293,-73.825339)"><tspan
+       sodipodi:role="line"
+       id="tspan4711"
+       x="79.591835"
+       y="91.591835"
+       style="font-size:18px;font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;fill:#e6e6e6;font-family:Droid Sans;-inkscape-font-specification:Droid Sans Bold">B</tspan></text>
+  <rect
+     style="fill:#1a1a1a;fill-opacity:1;fill-rule:nonzero;stroke:#ececec;stroke-opacity:1"
+     id="rect4721"
+     width="20"
+     height="20"
+     x="66.405151"
+     y="68.413567"
+     rx="3"
+     ry="3"
+     transform="translate(-64.805152,21.152934)" />
+  <rect
+     style="fill:#2e2f2e;fill-opacity:1;fill-rule:nonzero;stroke:#ececec;stroke-opacity:1"
+     id="rect4725"
+     width="20"
+     height="20"
+     x="66.405151"
+     y="68.413567"
+     rx="3"
+     ry="3"
+     transform="translate(-42.805152,-66.847066)" />
+  <rect
+     transform="translate(-42.805152,-44.847066)"
+     ry="3"
+     rx="3"
+     y="68.413567"
+     x="66.405151"
+     height="20"
+     width="20"
+     id="rect4727"
+     style="fill:#2e2f2e;fill-opacity:1;fill-rule:nonzero;stroke:#ececec;stroke-opacity:1" />
+  <rect
+     style="fill:#2e2f2e;fill-opacity:1;fill-rule:nonzero;stroke:#ececec;stroke-opacity:1"
+     id="rect4729"
+     width="20"
+     height="20"
+     x="66.405151"
+     y="68.413567"
+     rx="3"
+     ry="3"
+     transform="translate(-42.805152,-22.84707)" />
+  <rect
+     transform="translate(-42.805152,-0.8470705)"
+     ry="3"
+     rx="3"
+     y="68.413567"
+     x="66.405151"
+     height="20"
+     width="20"
+     id="rect4731"
+     style="fill:#2e2f2e;fill-opacity:1;fill-rule:nonzero;stroke:#ececec;stroke-opacity:1" />
+  <rect
+     style="fill:#2e2f2e;fill-opacity:1;fill-rule:nonzero;stroke:#ececec;stroke-opacity:1"
+     id="rect4733"
+     width="20"
+     height="20"
+     x="66.405151"
+     y="68.413567"
+     rx="3"
+     ry="3"
+     transform="translate(-42.805152,21.15293)" />
+  <rect
+     transform="translate(-20.805152,-66.847066)"
+     ry="3"
+     rx="3"
+     y="68.413567"
+     x="66.405151"
+     height="20"
+     width="20"
+     id="rect4735"
+     style="fill:#1a1a1a;fill-opacity:1;fill-rule:nonzero;stroke:#ececec;stroke-opacity:1" />
+  <rect
+     style="fill:#1a1a1a;fill-opacity:1;fill-rule:nonzero;stroke:#ececec;stroke-opacity:1"
+     id="rect4737"
+     width="20"
+     height="20"
+     x="66.405151"
+     y="68.413567"
+     rx="3"
+     ry="3"
+     transform="translate(-20.805152,-44.847066)" />
+  <rect
+     transform="translate(-20.805152,-22.84707)"
+     ry="3"
+     rx="3"
+     y="68.413567"
+     x="66.405151"
+     height="20"
+     width="20"
+     id="rect4739"
+     style="fill:#1a1a1a;fill-opacity:1;fill-rule:nonzero;stroke:#ececec;stroke-opacity:1" />
+  <rect
+     style="fill:#1a1a1a;fill-opacity:1;fill-rule:nonzero;stroke:#ececec;stroke-opacity:1"
+     id="rect4741"
+     width="20"
+     height="20"
+     x="66.405151"
+     y="68.413567"
+     rx="3"
+     ry="3"
+     transform="translate(-20.805152,-0.8470705)" />
+  <rect
+     transform="translate(-20.805152,21.15293)"
+     ry="3"
+     rx="3"
+     y="68.413567"
+     x="66.405151"
+     height="20"
+     width="20"
+     id="rect4743"
+     style="fill:#1a1a1a;fill-opacity:1;fill-rule:nonzero;stroke:#ececec;stroke-opacity:1" />
+  <rect
+     style="fill:#2e2f2e;fill-opacity:1;fill-rule:nonzero;stroke:#ececec;stroke-opacity:1"
+     id="rect4745"
+     width="20"
+     height="20"
+     x="66.405151"
+     y="68.413567"
+     rx="3"
+     ry="3"
+     transform="translate(1.194848,-66.847066)" />
+  <rect
+     transform="translate(1.194848,-44.847066)"
+     ry="3"
+     rx="3"
+     y="68.413567"
+     x="66.405151"
+     height="20"
+     width="20"
+     id="rect4747"
+     style="fill:#2e2f2e;fill-opacity:1;fill-rule:nonzero;stroke:#ececec;stroke-opacity:1" />
+  <rect
+     style="fill:#2e2f2e;fill-opacity:1;fill-rule:nonzero;stroke:#ececec;stroke-opacity:1"
+     id="rect4749"
+     width="20"
+     height="20"
+     x="66.405151"
+     y="68.413567"
+     rx="3"
+     ry="3"
+     transform="translate(1.194848,-22.84707)" />
+  <rect
+     transform="translate(1.194848,-0.8470705)"
+     ry="3"
+     rx="3"
+     y="68.413567"
+     x="66.405151"
+     height="20"
+     width="20"
+     id="rect4751"
+     style="fill:#2e2f2e;fill-opacity:1;fill-rule:nonzero;stroke:#ececec;stroke-opacity:1" />
+  <rect
+     style="fill:#2e2f2e;fill-opacity:1;fill-rule:nonzero;stroke:#ececec;stroke-opacity:1"
+     id="rect4753"
+     width="20"
+     height="20"
+     x="66.405151"
+     y="68.413567"
+     rx="3"
+     ry="3"
+     transform="translate(1.194848,21.15293)" />
+  <rect
+     transform="translate(-64.805152,-44.847069)"
+     ry="3"
+     rx="3"
+     y="68.413567"
+     x="66.405151"
+     height="20"
+     width="20"
+     id="rect4715"
+     style="fill:#1a1a1a;fill-opacity:1;fill-rule:nonzero;stroke:#ececec;stroke-opacity:1" />
+  <text
+     xml:space="preserve"
+     style="font-size:20px;font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;text-align:center;writing-mode:lr-tb;text-anchor:middle;fill:#ececec;fill-opacity:1;fill-rule:nonzero;stroke:none;font-family:Droid Sans;-inkscape-font-specification:Droid Sans Bold"
+     x="4.7811713"
+     y="28.940323"
+     id="text4774"
+     transform="translate(6.806399,11)"><tspan
+       sodipodi:role="line"
+       id="tspan4776"
+       x="4.7811713"
+       y="28.940323"
+       style="font-size:18px">I</tspan></text>
+  <rect
+     style="fill:#1a1a1a;fill-opacity:1;fill-rule:nonzero;stroke:#ececec;stroke-opacity:1"
+     id="rect4717"
+     width="20"
+     height="20"
+     x="66.405151"
+     y="68.413567"
+     rx="3"
+     ry="3"
+     transform="translate(-64.805152,-22.847069)" />
+  <text
+     xml:space="preserve"
+     style="font-size:20px;font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;text-align:center;writing-mode:lr-tb;text-anchor:middle;fill:#ececec;fill-opacity:1;fill-rule:nonzero;stroke:none;font-family:Droid Sans;-inkscape-font-specification:Droid Sans Bold"
+     x="6.4507866"
+     y="61.118362"
+     id="text4778"
+     transform="translate(5,1)"><tspan
+       sodipodi:role="line"
+       id="tspan4780"
+       x="6.4507866"
+       y="61.118362"
+       style="font-size:18px">U</tspan></text>
+  <rect
+     transform="translate(-64.805152,-0.8470699)"
+     ry="3"
+     rx="3"
+     y="68.413567"
+     x="66.405151"
+     height="20"
+     width="20"
+     id="rect4719"
+     style="fill:#1a1a1a;fill-opacity:1;fill-rule:nonzero;stroke:#ececec;stroke-opacity:1" />
+  <text
+     xml:space="preserve"
+     style="font-size:20px;font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;text-align:center;writing-mode:lr-tb;text-anchor:middle;fill:#ececec;fill-opacity:1;fill-rule:nonzero;stroke:none;font-family:Droid Sans;-inkscape-font-specification:Droid Sans Bold"
+     x="4.28688"
+     y="81.765083"
+     id="text4782"
+     transform="translate(7,0.7234271)"><tspan
+       sodipodi:role="line"
+       id="tspan4784"
+       x="4.28688"
+       y="81.765083"
+       style="font-size:18px">Q</tspan></text>
+  <g
+     id="g1783"
+     transform="translate(44.197715,-88)">
+    <rect
+       inkscape:export-ydpi="90"
+       inkscape:export-xdpi="90"
+       inkscape:export-filename="/home/fabio/public_html/f9k-tre/icons2.png"
+       ry="2.9268293"
+       rx="2.9268293"
+       y="858.11218"
+       x="173.12502"
+       height="9"
+       width="14.5"
+       id="rect4387-8"
+       style="fill:#666666;stroke:#ececec;stroke-width:0.5;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;display:inline"
+       transform="translate(-168.97273,-762.7948)" />
+    <path
+       inkscape:export-ydpi="90"
+       inkscape:export-xdpi="90"
+       inkscape:export-filename="/home/fabio/public_html/f9k-tre/icons2.png"
+       transform="matrix(1.1489362,0,0,1.1489362,-455.1097,-153.28349)"
+       d="m 411.5,220.26843 c 0,1.50153 -1.20323,2.71875 -2.6875,2.71875 -1.48427,0 -2.6875,-1.21722 -2.6875,-2.71875 0,-1.50152 1.20323,-2.71875 2.6875,-2.71875 1.48427,0 2.6875,1.21723 2.6875,2.71875 z"
+       sodipodi:ry="2.71875"
+       sodipodi:rx="2.6875"
+       sodipodi:cy="220.26843"
+       sodipodi:cx="408.8125"
+       id="path4391-3"
+       style="fill:#1a1a1a;stroke:#e6e6e6;stroke-width:0.5;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;display:inline"
+       sodipodi:type="arc" />
+    <rect
+       inkscape:export-ydpi="90"
+       inkscape:export-xdpi="90"
+       inkscape:export-filename="/home/fabio/public_html/f9k-tre/icons2.png"
+       ry="1"
+       rx="1"
+       y="859.06403"
+       x="174.89275"
+       height="1.8561553"
+       width="3.5355339"
+       id="rect4290"
+       style="fill:#1a1a1a;stroke:#e6e6e6;stroke-width:0.5;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;display:inline"
+       transform="translate(-168.97273,-762.7948)" />
+  </g>
+  <g
+     transform="translate(-65.063391,-846.33726)"
+     id="g1037">
+    <path
+       inkscape:export-ydpi="90"
+       inkscape:export-xdpi="90"
+       inkscape:export-filename="/home/fabio/public_html/f9k-tre/icons2.png"
+       sodipodi:nodetypes="csccccscc"
+       inkscape:connector-curvature="0"
+       id="rect4428-4"
+       d="m 118.03127,895.15627 0,0.3125 c 0,1.2601 -0.0643,3.4345 -0.35937,5.75 l -1.5625,1e-4 c -0.80183,0.011 -1.64766,4.0737 -1.60938,8.0625 l 8.25,0 c -0.057,-5.5479 1.56902,-11.5211 1.75,-5.6563 0.21453,6.9525 1.74237,-5.1823 1.75,-8.4687 z"
+       style="fill:none;stroke:#e6e6e6;stroke-width:0.5;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;display:inline" />
+    <path
+       inkscape:export-ydpi="90"
+       inkscape:export-xdpi="90"
+       inkscape:export-filename="/home/fabio/public_html/f9k-tre/icons2.png"
+       inkscape:connector-curvature="0"
+       id="path4440-4"
+       d="m 124.78127,905.73727 -1.9375,-0.063"
+       style="fill:none;stroke:#e6e6e6;stroke-width:0.5;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;display:inline" />
+    <path
+       inkscape:export-ydpi="90"
+       inkscape:export-xdpi="90"
+       inkscape:export-filename="/home/fabio/public_html/f9k-tre/icons2.png"
+       sodipodi:nodetypes="cc"
+       inkscape:connector-curvature="0"
+       id="path4442-9"
+       d="m 117.59377,901.20597 6.4375,0"
+       style="fill:none;stroke:#e6e6e6;stroke-width:0.5;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;display:inline" />
+    <rect
+       inkscape:export-ydpi="90"
+       inkscape:export-xdpi="90"
+       inkscape:export-filename="/home/fabio/public_html/f9k-tre/icons2.png"
+       y="908.11218"
+       x="115.28126"
+       height="0.375"
+       width="1.0625"
+       id="rect4446-9"
+       style="fill:none;stroke:#e6e6e6;stroke-width:0.5;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;display:inline" />
+    <rect
+       inkscape:export-ydpi="90"
+       inkscape:export-xdpi="90"
+       inkscape:export-filename="/home/fabio/public_html/f9k-tre/icons2.png"
+       style="fill:none;stroke:#e6e6e6;stroke-width:0.5;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;display:inline"
+       id="rect4448-3"
+       width="1.0625"
+       height="0.375"
+       x="115.34376"
+       y="906.51843" />
+    <rect
+       inkscape:export-ydpi="90"
+       inkscape:export-xdpi="90"
+       inkscape:export-filename="/home/fabio/public_html/f9k-tre/icons2.png"
+       y="904.89343"
+       x="115.50001"
+       height="0.375"
+       width="1.0625"
+       id="rect4450-6"
+       style="fill:none;stroke:#e6e6e6;stroke-width:0.5;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;display:inline" />
+    <rect
+       inkscape:export-ydpi="90"
+       inkscape:export-xdpi="90"
+       inkscape:export-filename="/home/fabio/public_html/f9k-tre/icons2.png"
+       style="fill:none;stroke:#e6e6e6;stroke-width:0.5;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;display:inline"
+       id="rect4452-0"
+       width="1.0625"
+       height="0.375"
+       x="115.81251"
+       y="903.42468" />
+    <rect
+       inkscape:export-ydpi="90"
+       inkscape:export-xdpi="90"
+       inkscape:export-filename="/home/fabio/public_html/f9k-tre/icons2.png"
+       y="902.17468"
+       x="116.21876"
+       height="0.375"
+       width="1.0625"
+       id="rect4454-5"
+       style="fill:none;stroke:#e6e6e6;stroke-width:0.5;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;display:inline" />
+    <rect
+       inkscape:export-ydpi="90"
+       inkscape:export-xdpi="90"
+       inkscape:export-filename="/home/fabio/public_html/f9k-tre/icons2.png"
+       style="fill:none;stroke:#e6e6e6;stroke-width:0.5;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;display:inline"
+       id="rect4456-0"
+       width="1.0625"
+       height="0.375"
+       x="118.50001"
+       y="900.17468" />
+    <rect
+       inkscape:export-ydpi="90"
+       inkscape:export-xdpi="90"
+       inkscape:export-filename="/home/fabio/public_html/f9k-tre/icons2.png"
+       y="898.70593"
+       x="118.68751"
+       height="0.375"
+       width="1.0625"
+       id="rect4458-2"
+       style="fill:none;stroke:#e6e6e6;stroke-width:0.5;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;display:inline" />
+    <rect
+       inkscape:export-ydpi="90"
+       inkscape:export-xdpi="90"
+       inkscape:export-filename="/home/fabio/public_html/f9k-tre/icons2.png"
+       style="fill:none;stroke:#e6e6e6;stroke-width:0.5;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;display:inline"
+       id="rect4460-9"
+       width="1.0625"
+       height="0.375"
+       x="118.75001"
+       y="897.20593" />
+    <rect
+       inkscape:export-ydpi="90"
+       inkscape:export-xdpi="90"
+       inkscape:export-filename="/home/fabio/public_html/f9k-tre/icons2.png"
+       y="895.79968"
+       x="118.75001"
+       height="0.375"
+       width="1.0625"
+       id="rect4462-4"
+       style="fill:none;stroke:#e6e6e6;stroke-width:0.5;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;display:inline" />
+    <rect
+       inkscape:export-ydpi="90"
+       inkscape:export-xdpi="90"
+       inkscape:export-filename="/home/fabio/public_html/f9k-tre/icons2.png"
+       style="fill:none;stroke:#e6e6e6;stroke-width:0.5;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;display:inline"
+       id="rect4464-3"
+       width="1.0625"
+       height="0.375"
+       x="120.84376"
+       y="908.11218" />
+    <rect
+       inkscape:export-ydpi="90"
+       inkscape:export-xdpi="90"
+       inkscape:export-filename="/home/fabio/public_html/f9k-tre/icons2.png"
+       y="906.51843"
+       x="120.90627"
+       height="0.375"
+       width="1.0625"
+       id="rect4466-5"
+       style="fill:none;stroke:#e6e6e6;stroke-width:0.5;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;display:inline" />
+    <rect
+       inkscape:export-ydpi="90"
+       inkscape:export-xdpi="90"
+       inkscape:export-filename="/home/fabio/public_html/f9k-tre/icons2.png"
+       style="fill:none;stroke:#e6e6e6;stroke-width:0.5;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;display:inline"
+       id="rect4468-1"
+       width="1.0625"
+       height="0.375"
+       x="121.06252"
+       y="904.89343" />
+    <rect
+       inkscape:export-ydpi="90"
+       inkscape:export-xdpi="90"
+       inkscape:export-filename="/home/fabio/public_html/f9k-tre/icons2.png"
+       y="903.42468"
+       x="121.37502"
+       height="0.375"
+       width="1.0625"
+       id="rect4470-7"
+       style="fill:none;stroke:#e6e6e6;stroke-width:0.5;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;display:inline" />
+    <rect
+       inkscape:export-ydpi="90"
+       inkscape:export-xdpi="90"
+       inkscape:export-filename="/home/fabio/public_html/f9k-tre/icons2.png"
+       style="fill:none;stroke:#e6e6e6;stroke-width:0.5;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;display:inline"
+       id="rect4472-4"
+       width="1.0625"
+       height="0.375"
+       x="121.78127"
+       y="902.17468" />
+    <rect
+       inkscape:export-ydpi="90"
+       inkscape:export-xdpi="90"
+       inkscape:export-filename="/home/fabio/public_html/f9k-tre/icons2.png"
+       y="900.17468"
+       x="124.06252"
+       height="0.375"
+       width="1.0625"
+       id="rect4474-3"
+       style="fill:none;stroke:#e6e6e6;stroke-width:0.5;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;display:inline" />
+    <rect
+       inkscape:export-ydpi="90"
+       inkscape:export-xdpi="90"
+       inkscape:export-filename="/home/fabio/public_html/f9k-tre/icons2.png"
+       style="fill:none;stroke:#e6e6e6;stroke-width:0.5;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;display:inline"
+       id="rect4476-1"
+       width="1.0625"
+       height="0.375"
+       x="124.25002"
+       y="898.70593" />
+    <rect
+       inkscape:export-ydpi="90"
+       inkscape:export-xdpi="90"
+       inkscape:export-filename="/home/fabio/public_html/f9k-tre/icons2.png"
+       y="897.20593"
+       x="124.31252"
+       height="0.375"
+       width="1.0625"
+       id="rect4478-4"
+       style="fill:none;stroke:#e6e6e6;stroke-width:0.5;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;display:inline" />
+    <rect
+       inkscape:export-ydpi="90"
+       inkscape:export-xdpi="90"
+       inkscape:export-filename="/home/fabio/public_html/f9k-tre/icons2.png"
+       style="fill:none;stroke:#e6e6e6;stroke-width:0.5;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;display:inline"
+       id="rect4480-6"
+       width="1.0625"
+       height="0.375"
+       x="124.31252"
+       y="895.79968" />
+  </g>
+  <g
+     id="g1790"
+     transform="translate(0,22)">
+    <path
+       inkscape:export-ydpi="90"
+       inkscape:export-xdpi="90"
+       inkscape:export-filename="/home/fabio/public_html/f9k-tre/icons2.png"
+       inkscape:connector-curvature="0"
+       id="rect4397-0"
+       d="m 242.44524,860.13287 c -0.98011,0 -1.77562,0.6006 -1.77562,1.3586 l 0,1.5632 c 0,0.7581 0.79551,1.3733 1.77562,1.3733 l 4.53349,0 c 0.98012,0 1.77562,-0.6152 1.77562,-1.3733 l 0,-1.5632 c 0,-0.758 -0.7955,-1.3586 -1.77562,-1.3586 l -4.53349,0 z m 0.41557,1.0372 3.70235,0 c 0.51967,0 0.94448,0.2879 0.94448,0.6574 l 0,0.8912 c 0,0.3695 -0.42481,0.672 -0.94448,0.672 l -3.70235,0 c -0.51966,0 -0.94447,-0.3025 -0.94447,-0.672 l 0,-0.8912 c 0,-0.3695 0.42481,-0.6574 0.94447,-0.6574 z"
+       style="fill:#1a1a1a;fill-opacity:1;stroke:#e6e6e6;stroke-width:0.47366244;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;display:inline"
+       transform="matrix(0.87398418,0,0,1,-154.20273,-850.767)" />
+    <path
+       inkscape:export-ydpi="90"
+       inkscape:export-xdpi="90"
+       inkscape:export-filename="/home/fabio/public_html/f9k-tre/icons2.png"
+       style="fill:#1a1a1a;fill-opacity:1;stroke:#e6e6e6;stroke-width:0.47366244;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;display:inline"
+       d="m 232.97199,860.13287 c -0.98011,0 -1.77562,0.6006 -1.77562,1.3586 l 0,1.5632 c 0,0.7581 0.79551,1.3733 1.77562,1.3733 l 4.53349,0 c 0.98012,0 1.77562,-0.6152 1.77562,-1.3733 l 0,-1.5632 c 0,-0.758 -0.7955,-1.3586 -1.77562,-1.3586 l -4.53349,0 z m 0.41557,1.0372 3.70236,0 c 0.51966,0 0.94447,0.2879 0.94447,0.6574 l 0,0.8912 c 0,0.3695 -0.42481,0.672 -0.94447,0.672 l -3.70236,0 c -0.51966,0 -0.94447,-0.3025 -0.94447,-0.672 l 0,-0.8912 c 0,-0.3695 0.42481,-0.6574 0.94447,-0.6574 z"
+       id="path4418-4"
+       inkscape:connector-curvature="0"
+       transform="matrix(0.87398418,0,0,1,-154.20273,-850.767)" />
+    <rect
+       inkscape:export-ydpi="90"
+       inkscape:export-xdpi="90"
+       inkscape:export-filename="/home/fabio/public_html/f9k-tre/icons2.png"
+       ry="0.81812328"
+       rx="1.0135853"
+       y="861.57312"
+       x="236.7028"
+       height="1.6362466"
+       width="6.7246785"
+       id="rect4395-0"
+       style="fill:#1a1a1a;fill-opacity:1;stroke:#e6e6e6;stroke-width:0.47366244;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;display:inline"
+       transform="matrix(0.87398418,0,0,1,-154.20273,-850.767)" />
+  </g>
+  <use
+     x="0"
+     y="0"
+     xlink:href="#text4709"
+     id="use1769"
+     transform="translate(22,0)"
+     width="250"
+     height="200" />
+  <use
+     x="0"
+     y="0"
+     xlink:href="#text4774"
+     id="use1771"
+     transform="translate(22,0)"
+     width="250"
+     height="200" />
+  <use
+     x="0"
+     y="0"
+     xlink:href="#text4778"
+     id="use1773"
+     transform="translate(22,0)"
+     width="250"
+     height="200" />
+  <use
+     x="0"
+     y="0"
+     xlink:href="#text4782"
+     id="use1775"
+     transform="translate(22,0)"
+     width="250"
+     height="200" />
+  <use
+     x="0"
+     y="0"
+     xlink:href="#g1783"
+     id="use1788"
+     transform="translate(22,0)"
+     width="250"
+     height="200" />
+  <use
+     x="0"
+     y="0"
+     xlink:href="#g1037"
+     id="use1795"
+     transform="translate(22,0)"
+     width="250"
+     height="200" />
+  <use
+     x="0"
+     y="0"
+     xlink:href="#g1790"
+     id="use1797"
+     transform="translate(22,0)"
+     width="250"
+     height="200" />
+  <text
+     xml:space="preserve"
+     style="font-size:18px;font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;text-align:center;writing-mode:lr-tb;text-anchor:middle;fill:#1a1a1a;fill-opacity:1;fill-rule:nonzero;stroke:none;font-family:Droid Sans;-inkscape-font-specification:Droid Sans Bold"
+     x="6.5049949"
+     y="106.76174"
+     id="text1799"
+     transform="translate(4,-1)"><tspan
+       sodipodi:role="line"
+       id="tspan1801"
+       x="6.5049949"
+       y="106.76174"
+       style="fill:#ececec;fill-opacity:1">C</tspan></text>
+  <use
+     x="0"
+     y="0"
+     xlink:href="#text1799"
+     id="use1803"
+     transform="translate(22,0)"
+     width="250"
+     height="200" />
+</svg>
diff --git a/view/theme/dispy-dark/fpostit/README b/view/theme/dispy-dark/fpostit/README
deleted file mode 100644
index 39b7c5761..000000000
--- a/view/theme/dispy-dark/fpostit/README
+++ /dev/null
@@ -1,8 +0,0 @@
-fpostit
-
-original author: Devlon Duthied
-
-see his blog posting:
-http://blog.duthied.com/2011/09/13/node-agnostic-friendika-bookmarklet/
-
-original published at github https://github.com/duthied/Friendika-Bookmarklet
diff --git a/view/theme/dispy-dark/fpostit/fpostit.js b/view/theme/dispy-dark/fpostit/fpostit.js
deleted file mode 100755
index eb593d838..000000000
--- a/view/theme/dispy-dark/fpostit/fpostit.js
+++ /dev/null
@@ -1,14 +0,0 @@
-javascript: (function() {
-    					the_url = 'view/theme/dispy-dark/fpostit/fpostit.php?url=' + encodeURIComponent(window.location.href) + '&title=' + encodeURIComponent(document.title) + '&text=' +
-						encodeURIComponent(''+(window.getSelection ? window.getSelection() : document.getSelection ?
-						document.getSelection() : document.selection.createRange().text));
-    					a_funct = function() {
-							if (!window.open(the_url, 'fpostit','location=yes,links=no,scrollbars=no,toolbar=no,width=600,height=300')) {
-								location.href = the_url
-							};
-    						if (/Firefox/.test(navigator.userAgent)) {
-								setTimeout(a_funct, 0)
-							} else {
-								a_funct();
-							}
-						})();"
diff --git a/view/theme/dispy-dark/fpostit/fpostit.php b/view/theme/dispy-dark/fpostit/fpostit.php
deleted file mode 100644
index d00182946..000000000
--- a/view/theme/dispy-dark/fpostit/fpostit.php
+++ /dev/null
@@ -1,134 +0,0 @@
-<?php
-if (!isset($_POST["friendica_acct_name"])) $_POST["friendica_acct_name"] = '';
-if (!isset($_COOKIE['username'])) $_COOKIE['username'] = '';
-if (!isset($_COOKIE['password'])) $_COOKIE['password'] = '';
-if (!isset($hostname)) $hostname = '';
-if (!isset($username)) $username = '';
-
-
-if (($_POST["friendica_acct_name"] != '') && ($_POST["friendica_password"] != '')) {
-	setcookie("username", $_POST["friendica_acct_name"], time()+60*60*24*300);
-	setcookie("password", $_POST["friendica_password"], time()+60*60*24*300);
-}
-
-?>
-<html>
-<head>
-	<style>
-		body {
-			font-family: sans-serif;
-			margin: 0px;
-		}
-		.wrap1 {
-			padding: 2px 5px;
-			background-color: #000;
-			margin-bottom: 10px;
-		}
-		.wrap2 {
-			margin-left: 10px;
-			font-size: 12px;
-		}
-		.logo {
-			margin-left: 3px;
-			margin-right: 5px;
-			float: left;
-		}
-		h2 {
-			color: #ffffff;
-		}
-		.error {
-			background-color: #FFFF66;
-			font-size: 12px;
-			margin-left: 10px;
-		}
-	</style>
-</head>
-
-<body>
-<?php
-
-if (isset($_GET['title'])) {
-	$title = $_GET['title'];
-}
-if (isset($_GET['text'])) {
-	$text = $_GET['text'];
-}
-if (isset($_GET['url'])) {
-	$url = $_GET['url'];
-}
-
-if ((isset($title)) && (isset($text)) && (isset($url))) {
-	$content = "$title\nsource:$url\n\n$text";
-} else {
-	$content = $_POST['content'];
-}
-
-if (isset($_POST['submit'])) {
-	
-	if (($_POST["friendica_acct_name"] != '') && ($_POST["friendica_password"] != '')) {
-		$acctname = $_POST["friendica_acct_name"];
-		$tmp_account_array = explode("@", $acctname);
-		if (isset($tmp_account_array[1])) {
-			$username = $tmp_account_array[0];
-			$hostname = $tmp_account_array[1];
-		}
-		$password = $_POST["friendica_password"];
-		$content = $_POST["content"];
-
-		$url = "http://" . $hostname . '/api/statuses/update';
-		$data = array('status' => $content);
-		
-		// echo "posting to: $url<br/>";
-
-		$c = curl_init();
-		curl_setopt($c, CURLOPT_URL, $url); 
-		curl_setopt($c, CURLOPT_USERPWD, "$username:$password");
-		curl_setopt($c, CURLOPT_POSTFIELDS, $data); 
-		curl_setopt($c, CURLOPT_RETURNTRANSFER, true); 
-		curl_setopt($c, CURLOPT_FOLLOWLOCATION, true);
-		$c_result = curl_exec($c); 
-		if(curl_errno($c)){ 
-			$error = curl_error($c);
-			showForm($error, $content);
-		}
-		
-		curl_close($c);
-		if (!isset($error)) {
-			echo '<script language="javascript" type="text/javascript">window.close();</script>';
-		}
-		
-	} else {
-		$error = "Missing account name and/or password. Please try again.";
-		showForm($error, $content);
-	}
-	
-} else {
-	showForm(null, $content);
-}
-
-function showForm($error, $content) {
-	$username_cookie = $_COOKIE['username'];
-	$password_cookie = $_COOKIE['password'];
-	
-	echo <<<EOF
-	<div class="wrap1">
-		<h2><img class="logo" src="friendica-32.png" align="middle" />Friendica Bookmarklet</h2>
-	</div>
-
-	<div class="wrap2">
-		<form method="post" action="{$_SERVER['PHP_SELF']}">
-			Enter the email address of the Friendica Account that you want to cross-post to: (example: user@friendica.org)<br /><br />
-			Account ID: <input type="text" name="friendica_acct_name" value="{$username_cookie}" size="50" /><br />
-			Password: <input type="password" name="friendica_password" value="{$password_cookie}" size="50" /><br />
-			<textarea name="content" id="content" rows="6" cols="70">{$content}</textarea><br />
-			<input type="submit" value="PostIt!" name="submit" />&#160;&#160;<span class="error">$error</span>
-		</form>
-		<p></p>
-	</div>
-EOF;
-	
-}
-?>
-
-</body>
-</html>
diff --git a/view/theme/dispy-dark/fpostit/friendica-32.png b/view/theme/dispy-dark/fpostit/friendica-32.png
deleted file mode 100644
index 61764bf20..000000000
--- a/view/theme/dispy-dark/fpostit/friendica-32.png
+++ /dev/null
diff --git a/view/theme/dispy-dark/fpostit/friendika-32.png b/view/theme/dispy-dark/fpostit/friendika-32.png
deleted file mode 100644
index 61764bf20..000000000
--- a/view/theme/dispy-dark/fpostit/friendika-32.png
+++ /dev/null
diff --git a/view/theme/dispy-dark/head.tpl b/view/theme/dispy-dark/head.tpl
index f606f2f7e..d42b19aef 100644
--- a/view/theme/dispy-dark/head.tpl
+++ b/view/theme/dispy-dark/head.tpl
@@ -1,52 +1,49 @@
 <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" />
-
-<link rel="shortcut icon" href="$baseurl/images/friendika-32.png" />
-<link rel="search"
-         href="$baseurl/opensearch" 
-         type="application/opensearchdescription+xml" 
-         title="Search in Friendica" />
-
 <!--[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/jquery.textinputs.js" ></script>
-<script type="text/javascript" src="$baseurl/js/fk.autocomplete.js" ></script>
+<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/acl.js" ></script>
-<script type="text/javascript" src="$baseurl/js/webtoolkit.base64.js" ></script>
-<script type="text/javascript" src="$baseurl/js/main.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 = '';
-			obj.className = "comment-edit-text-full";
+			$("#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';
-			obj.className="comment-edit-text-empty";
+			$("#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') {
@@ -63,6 +60,22 @@
 		$("#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();
@@ -73,8 +86,4 @@
 			$('#hide-comments-' + id).html('$showfewer');
 		}
 	}
-
-
 </script>
-
-
diff --git a/view/theme/clean/unsupported b/view/theme/dispy-dark/header.tpl
index e69de29bb..e69de29bb 100644
--- a/view/theme/clean/unsupported
+++ b/view/theme/dispy-dark/header.tpl
diff --git a/view/theme/dispy-dark/icons.png b/view/theme/dispy-dark/icons.png
index 203568135..2ee1a5ecb 100644
--- a/view/theme/dispy-dark/icons.png
+++ b/view/theme/dispy-dark/icons.png
diff --git a/view/theme/dispy-dark/jot-header.tpl b/view/theme/dispy-dark/jot-header.tpl
index 92eccf740..ab15f9516 100644
--- a/view/theme/dispy-dark/jot-header.tpl
+++ b/view/theme/dispy-dark/jot-header.tpl
@@ -9,6 +9,7 @@ function initEditor(cb) {
 		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',
@@ -23,13 +24,14 @@ function initEditor(cb) {
 			mode : "specific_textareas",
 			editor_selector: $editselect,
 			auto_focus: "profile-jot-text",
-			plugins : "bbcode,paste,fullscreen,autoresize",
+			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,
@@ -40,6 +42,7 @@ function initEditor(cb) {
 			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) {
@@ -296,7 +299,6 @@ function enableOnUser(){
 		
 	}
 
-
 	function jotClearLocation() {
 		$('#jot-coord').val('');
 		$('#profile-nolocation-wrapper').hide();
@@ -345,4 +347,3 @@ function enableOnUser(){
 	}
 
 </script>
-
diff --git a/view/theme/dispy-dark/jot.tpl b/view/theme/dispy-dark/jot.tpl
index 94c31da23..688ac1451 100644
--- a/view/theme/dispy-dark/jot.tpl
+++ b/view/theme/dispy-dark/jot.tpl
@@ -11,7 +11,7 @@
 		<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>
 
diff --git a/view/theme/dispy-dark/lang_selector.tpl b/view/theme/dispy-dark/lang_selector.tpl
new file mode 100644
index 000000000..e777a0a86
--- /dev/null
+++ b/view/theme/dispy-dark/lang_selector.tpl
@@ -0,0 +1,10 @@
+<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/nav.tpl b/view/theme/dispy-dark/nav.tpl
index e38b2bbe2..6ffd2b379 100644
--- a/view/theme/dispy-dark/nav.tpl
+++ b/view/theme/dispy-dark/nav.tpl
@@ -1,49 +1,53 @@
-<nav>
+<nav id="pagenav">
 
 <span id="banner">$banner</span>
 
-<!-- yes, they're going the other way. seems that's how the template renderer
-works -->
-
+<a name="top" id="top"></a>
 <div id="nav-floater">
-    <div id="nav-buttons">
-    {{ if $nav.help }}
-    <a id="nav-help-link" class="nav-link $nav.help.2" href="$nav.help.0" title="$nav.help.1">$nav.help.1</a>
-    {{ endif }}
-    {{ if $nav.community }}
-    <a id="nav-community-link" class="nav-link $nav.community.2"
-    href="$nav.community.0" title="$nav.community.1">$nav.community.1</a>
+    <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.apps }}
-    <a id="nav-apps-link" class="nav-link $nav.apps.2" href="$nav.apps.0" title="$nav.apps.1">$nav.apps.1</a>
+    {{ 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 }}
-    <a id="nav-directory-link" class="nav-link $nav.directory.2" href="$nav.directory.0" title="$nav.directory.1">$nav.directory.1</a>
-    <a id="nav-search-link" class="nav-link $nav.search.2" href="$nav.search.0" title="$nav.search.1">$nav.search.1</a>
-    {{ if $nav.messages }}
-    <a id="nav-messages-link" class="nav-link $nav.messages.2"
-    href="$nav.messages.0" title="$nav.messages.1">$nav.messages.1</a>
+    {{ 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 }}
-    <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>
-    <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>
+    <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.network }}
-    <a id="nav-network-link" class="nav-link $nav.network.2"
-		href="$nav.network.0" title="$nav.network.1">$nav.network.1</a>
+    {{ 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.home }}
-    <a id="nav-home-link" class="nav-link $nav.home.2"
-		href="$nav.home.0" title="$nav.home.1">$nav.home.1</a>
+    {{ 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 }}
-    {{ 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>
+    <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 }}
-	</div>
+	</ul>
 
 	<div id="user-menu">
         <a id="user-menu-label" onclick="openClose('user-menu-popup'); return false" href="$nav.home.0">$sitelocation</a>
@@ -56,7 +60,6 @@ works -->
         <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 }}
@@ -75,11 +78,9 @@ works -->
         {{ 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 }}
@@ -119,6 +120,12 @@ works -->
 $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" />
diff --git a/view/theme/dispy-dark/nets.tpl b/view/theme/dispy-dark/nets.tpl
index b322717ad..b0cb8890c 100644
--- a/view/theme/dispy-dark/nets.tpl
+++ b/view/theme/dispy-dark/nets.tpl
@@ -4,7 +4,7 @@
 	<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?f=&nets=$net.ref" class="nets-link{{ if $net.selected }} nets-selected{{ endif }}">$net.name</a></li>
+	<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/saved_searches_aside.tpl b/view/theme/dispy-dark/saved_searches_aside.tpl
index 63a85dda5..fb822fe5d 100644
--- a/view/theme/dispy-dark/saved_searches_aside.tpl
+++ b/view/theme/dispy-dark/saved_searches_aside.tpl
@@ -1,12 +1,12 @@
-<div id="saved-search-list" class="widget">
+<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 onmouseout="imgdull(this);" onmouseover="imgbright(this);" onclick="return confirmDelete();" class="icon savedsearchdrop drophide" href="network/?f=&amp;remove=1&amp;search=$search.encodedterm"></a>
-			<a class="savedsearchterm" href="network/?f=&amp;search=$search.encodedterm">$search.term</a>
+			<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>
diff --git a/view/theme/dispy-dark/search_item.tpl b/view/theme/dispy-dark/search_item.tpl
index 54c3e389c..bfad1b7b7 100644
--- a/view/theme/dispy-dark/search_item.tpl
+++ b/view/theme/dispy-dark/search_item.tpl
@@ -1,10 +1,10 @@
-<div class="wall-item-outside-wrapper$item.indent" id="wall-item-outside-wrapper-$item.id" >
+<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" title="$item.linktitle" class="wall-item-photo-link" id="wall-item-photo-link-$item.id">
+				<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">
@@ -14,11 +14,21 @@
 				</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 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-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 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" >
@@ -27,25 +37,18 @@
 				{{ 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 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-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>
 
-<div class="wall-item-outside-wrapper-end$item.indent" ></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>
+			<a href='$item.conv.href' id='context-$item.id' title='$item.conv.title'>$item.conv.title</a>
 	{{ endif }}
 	</div>
 
+<div class="wall-item-outside-wrapper-end$item.indent" ></div>
+
+</div>
+
+
diff --git a/view/theme/dispy-dark/style.css b/view/theme/dispy-dark/style.css
index 5f9b38f8c..05d544b0a 100644
--- a/view/theme/dispy-dark/style.css
+++ b/view/theme/dispy-dark/style.css
@@ -1,18 +1,29 @@
 /*
  * dispy-dark
  *
- * modernised, sort of, by simon <http://simon.kisikew.org/>
+ * author, maintainer: simon <http://simon.kisikew.org/>
  *
  */
 
 /* from html5boilerplate */
 
 /* these are to tell browsers they should be displayed a certain way */
-article, aside, details, figcaption, figure, footer,
-header, hgroup, nav, section {
+article,
+aside,
+details,
+figcaption,
+figure,
+footer,
+header,
+hgroup,
+nav,
+section {
     display: block;
 }
-audio, canvas, video, time {
+audio,
+canvas,
+video,
+time {
     display: inline-block;
     *display: inline;
     *zoom: 1;
@@ -45,31 +56,42 @@ body {
     font-size: 16px;
     line-height: 1.1em;
 }
-body, button, input, select, textarea {
+body,
+button,
+input,
+select,
+textarea {
     font-family: sans-serif;
     color: #eec;
     background-color: #2e2f2e;
 }
 select {
-	border: 1px #555 dotted;
-	padding: 3px;
-	margin: 2px;
-	color: #eec;
-	background: #2e2f2e;
+    border: 1px #555 dotted;
+    padding: 3px;
+    margin: 3px;
+    color: #eec;
+    background: #2e2f2e;
 }
 option {
-	padding: 3px;
-	vertical-align: middle;
-	color: #eec;
-	background: #2e2f2e;
+    padding: 3px;
+    color: #eec;
+    background: #2e2f2e;
 }
-li {
-	padding: 0 0 0 2px;
+option[selected="selected"] {
+	color: #2e2f2e;
+	background: #eec;
+}
+ul, ol {
+    padding: 0;
 }
 /* remember to define focus styles! */
 :focus {
     outline: 0;
 }
+[disabled="disabled"] {
+    background: #4e4f4f;
+    color: #ddb;
+}
 
 /* remember to highlight inserts somehow! */
 ins {
@@ -134,7 +156,7 @@ a:hover img {
 }
 blockquote {
     background: #444;
-	color: #eec;
+    color: #eec;
     text-indent: 5px;
     padding: 5px;
     border: 1px #aaa solid;
@@ -158,36 +180,25 @@ a:hover {
 .fakelink:hover {
     color: #729fcf;
 }
-input[type=submit] {
-    background-color: #eee;
-	color: #2e302e;
-	font-weight: bold;
-    margin-top: 10px;
-    height: 22px;
-    -webkit-border-radius: 5px;
-    -moz-border-radius: 5px;
-    border-radius: 5px;
-    border: 0;
-}
 .smalltext {
     font-size: 0.7em;
 }
 #panel {
-	position: absolute;
-	font-size: 0.8em;
-	-webkit-border-radius: 5px;
-	-moz-border-radius: 5px;
-	border-radius: 5px;
-	border: 1px solid #fff;
-	background-color: #2e302e;
-	color: #eeeeec;
-	padding: 1em;
+    position: absolute;
+    font-size: 0.8em;
+    -webkit-border-radius: 5px;
+    -moz-border-radius: 5px;
+    border-radius: 5px;
+    border: 1px solid #fff;
+    background-color: #2e302e;
+    color: #eeeeec;
+    padding: 1em;
 }
 .pager {
-	margin-top: 60px;
-	display: block;
-	clear: both;
-	text-align: center;
+    margin-top: 60px;
+    display: block;
+    clear: both;
+    text-align: center;
 }
 .pager span {
     padding: 4px;
@@ -204,20 +215,25 @@ input[type=submit] {
  */
 /* .tool .action */
 .action {
-	margin: 5px 0;
+    margin: 5px 0;
 }
 .tool {
-	margin: 5px 0;
-	list-style: none;
+    margin: 5px 0;
+    list-style: none;
+}
+#articlemain {
+    width: 100%;
+    height: 100%;
+    margin: 0 auto;
 }
 
 
 /**
- * 	login
+ * login
  */
-aside .field {
-	overflow: hidden;
-	width: 200px;
+#asidemain .field {
+    overflow: hidden;
+    width: 200px;
 }
 #login-extra-links {
     overflow: auto !important;
@@ -232,34 +248,34 @@ aside .field {
     float: none !important;
     height: 100% !important;
     position: relative !important;
-	width: 100% !important;
+    width: 100% !important;
 }
 #login_standard .field label {
-	width: 200px !important;
+    width: 200px !important;
 }
 #login_standard input, #login_standard input[type="text"] {
-	margin: 0 0 8px !important;
+    margin: 0 0 8px !important;
     width: 210px !important;
 }
 #login-submit-wrapper {
-	margin: 0 !important;
+    margin: 0 !important;
 }
 #login-submit-button {
     margin-left: 0px !important;
 }
-aside #login_openid {
-	position: relative !important;
-	float: none !important;
-	margin-left: 0px !important;
-	height: auto !important;
-	width: 200px !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;
+    width: 180px !important;
+    overflow: hidden !important;
 }
 #login_openid label {
-	width: 180px !important;
+    width: 180px !important;
 }
 
 
@@ -267,79 +283,76 @@ aside #login_openid {
  * nav
  */
 nav {
-	height: 60px;
-	display: block;
-	background-color: #1d1f1d;
-	color: #eeeeec;
-	position: relative;
-	padding: 20px 20px 10px 95px;
-    margin-left: auto;
-    margin-right: auto;
+    height: 60px;
+    background-color: #1d1f1d;
+    color: #eeeeec;
+    position: relative;
+    padding: 20px 20px 10px 95px;
 }
 nav a {
-	text-decoration: none;
-	color: #eeeeec;
-	border: 0px;
+    text-decoration: none;
+    color: #eeeeec;
+    border: 0px;
 }
 nav a:hover {
-	text-decoration: none;
-	color: #eeeeec;
+    text-decoration: none;
+    color: #eeeeec;
     border: 0px;
 }
 nav #banner {
-	display: block;
-	position: absolute;
-	left: 51px;
-	top: 25px;
+    display: block;
+    position: absolute;
+    left: 51px;
+    top: 25px;
 }
 nav #banner #logo-text a {
-	font-size: 40px;
-	font-weight: bold;
-	margin-left: 3px;
+    font-size: 40px;
+    font-weight: bold;
+    margin-left: 3px;
 }
 ul#user-menu-popup {
-	display: none;
-	position: absolute;
-	background-color: #555753;
-	width: 100%;
+    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;
-	z-index: 10000;
+    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;
+    display: block;
 }
 ul#user-menu-popup li a {
-	display: block;
-	padding: 5px;
+    display: block;
+    padding: 5px;
 }
 ul#user-menu-popup li a:hover {
-	color: #2e302e;
-	background-color: #eeeeec;
+    color: #2e302e;
+    background-color: #eeeeec;
 }
 ul#user-menu-popup li a.nav-sep {
-	border-top: 1px solid #eeeeec;
+    border-top: 1px solid #eeeeec;
 }
 nav .nav-link {
-	float: right;
-	display: block;
-	width: 22px;
-	height: 22px;
-	overflow: hidden;
-	margin: 0px 5px 5px;
-	text-indent: 50px;
-	background: transparent url(icons.png) 0 0 no-repeat;
+    display: inline-block;
+    width: 22px;
+    height: 22px;
+    overflow: hidden;
+    margin: 0px 5px 5px;
+    text-indent: 50px;
+    background: transparent url(icons.png) 0 0 no-repeat;
 }
 #nav-apps-link {
-	background-position: 0 -66px;
+    background-position: 0 -66px;
 }
 #nav-apps-link:hover {
-	background-position: -22px -66px;
+    background-position: -22px -66px;
 }
 #nav-community-link {
     background-position: 0 -22px;
@@ -354,16 +367,16 @@ nav .nav-link {
     background-position: -22px -22px;
 }
 #nav-directory-link {
-	background-position: -44px -154px;
+    background-position: -44px -154px;
 }
 #nav-directory-link:hover {
-	background-position: -66px -154px;
+    background-position: -66px -154px;
 }
 #nav-help-link {
-	background-position: 0 -110px;
+    background-position: 0 -110px;
 }
 #nav-help-link:hover {
-	background-position: -22px -110px;
+    background-position: -22px -110px;
 }
 #nav-home-link {
     background-position: -44px -132px;
@@ -372,22 +385,22 @@ nav .nav-link {
     background-position: -66px -132px;
 }
 #nav-intro-link {
-	background-position: 0px -190px;
+    background-position: 0px -190px;
 }
 #nav-intro-link:hover {
-	background-position: -44px -190px;
+    background-position: -44px -190px;
 }
 #nav-login-link {
-	background-position: 0 -88px;
+    background-position: 0 -88px;
 }
 #nav-login-link:hover {
-	background-position: -22px -88px;
+    background-position: -22px -88px;
 }
 #nav-logout-link {
-	background-position: 0 -88px;
+    background-position: 0 -88px;
 }
 #nav-logout-link:hover {
-	background-position: -22px -88px;
+    background-position: -22px -88px;
 }
 #nav-messages-link {
     background-position: -44px -88px;
@@ -408,10 +421,10 @@ nav .nav-link {
     background-position: -22px -177px;
 }
 #nav-search-link {
-	background-position: 0 -44px;
+    background-position: 0 -44px;
 }
 #nav-search-link:hover {
-	background-position: -22px -44px;
+    background-position: -22px -44px;
 }
 #profile-link,
 #profile-title, 
@@ -432,6 +445,8 @@ nav .nav-link {
 .icon, .hover, .focus, .pointer {
     cursor: pointer;
 }
+
+
 /* popup notifications */
 div.jGrowl div.notice {
     background: #511919 url("../../../images/icons/48/notice.png") no-repeat 5px center;
@@ -444,10 +459,10 @@ div.jGrowl div.info {
     padding-left: 58px;
 }
 #nav-notifications-menu {
-    margin: 30px 0 0 -45px;
-    width: 300px;
-    max-height: 400px;
-    overflow: auto;
+    margin: 30px 0 0 -20px;
+    width: 275px;
+    max-height: 300px;
+    overflow-y: auto;
     font-size: 9pt;
 }
 #nav-notifications-menu .contactname {
@@ -463,7 +478,6 @@ div.jGrowl div.info {
     display: block;
 }
 #nav-notifications-menu li {
-    padding: 7px 0px 7px 10px;
     word-wrap: normal;
     border-bottom: 1px solid #000;
 }
@@ -474,18 +488,19 @@ div.jGrowl div.info {
     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");
+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: 7px;
+    height: 20px;
+    width: 170px;
+    position: absolute;
+    top: -19px;
+    left: 4px;
 }
 #nav-floater {
     position: fixed;
@@ -493,121 +508,135 @@ nav #nav-notifications-linkmenu.on .icon.s22.notify, nav #nav-notifications-link
     right: 1%;
     padding: 5px;
     background: #1d1f1d;
-	color: transparent;
+    color: transparent;
     border-radius: 5px;
     z-index: 100;
-	width: 300px;
-	height: 60px;
+    width: 300px;
+    height: 60px;
 }
 #nav-buttons {
     clear: both;
-	list-style: none;
-	padding: 0px;
-	margin: 0 7px 0 0;
-	height: 25px;
+    list-style: none;
+    padding: 0px;
+    margin: 0px;
+    height: 25px;
 }
-#nav-buttons li {
-	padding: 0;
+#nav-buttons > li {
+    padding: 0;
+	display: inline-block;
+	margin: 0px -4px 0px 0px;
 }
 .floaterflip {
-	display: block;
+    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;
+    width: 22px;
+    height: 22px;
+    overflow: hidden;
+    margin: 0px;
+    background: transparent url(icons.png) -190px -60px no-repeat;
 }
 .search-box {
-	display: inline-block;
-	margin: 5px;
-	position: fixed;
-	right: 0px;
-	bottom: 0px;
-	z-index: 100;
-	background: #1d1f1d;
-	border-radius: 5px;
+    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;
+    border: 1px #eec solid;
+    background: #2e2f2e;
+    color: #eec;
 }
 .search-box #search-text {
-	margin: 8px;
-	width: 10em;
-	color: #eec;
+    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;
+    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;
+    top: 4px;
+    left: 10px;
+    padding: 2px;
 }
 #user-menu > a {
-	vertical-align: top;
+    vertical-align: top;
 }
 #user-menu-label {
-   	font-size: 12px;
+    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;
+    width: 30px;
+    height: 19px;
+    background: transparent url(notifications.png) 0 0 no-repeat;
+    color: #222;
+    font-weight: bold;
+    font-size: 0.8em;
+    padding-top: 0.2em;
+    text-align: center;
+    float: left;
+    margin: 0 -1px 0 3px;
+    display: block;
+    visibility: hidden;
 }
 .nav-ajax-update.show, .nav-ajax-left.show {
     visibility: visible;
 }
 #net-update {
-	background-position: 0px 0px;
+    background-position: 0px 0px;
 }
 #mail-update {
-	background-position: -30px 0;
+    background-position: -30px 0;
 }
 #notify-update {
-	background-position: -60px 0px;
+    background-position: -60px 0px;
 }
 #home-update {
-	background-position: -90px 0px;
+    background-position: -90px 0px;
 }
 #intro-update {
-	background-position: -120px 0px;
+    background-position: -120px 0px;
 }
 #lang-select-icon {
-	cursor: pointer;
-	position: fixed;
-	left: 28px;
-	bottom: 6px;
-	z-index: 10;
+    cursor: pointer;
+    position: fixed;
+    left: 28px;
+    bottom: 6px;
+    z-index: 10;
 }
 #language-selector {
     position: fixed;
     bottom: 2px;
     left: 52px;
-	z-index: 10;
+    z-index: 10;
 }
 .menu-popup {
     position: absolute;
@@ -669,121 +698,135 @@ nav #nav-notifications-linkmenu.on .icon.s22.notify, nav #nav-notifications-link
 }
 
 
-/** sysmsg **/
+/**
+ * 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;
+    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;
+    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;
+    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;
+    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;
+    display: block;
+    margin: 2px 0px;
+    border-top: 1px solid #ccccce;
 }
 
 
 /**
-* aside
-**/
-aside {
-    position: absolute;
-    right: 15px;
-    width: 245px;
-	padding-top: 15px;
+ * 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;
+    font-size: 1.7em;
+    font-weight: bold;
+    border-bottom: 1px solid #729fcf;
+    padding-bottom: 3px;
 }
 .vcard #profile-photo-wrapper {
-	margin: 20px;
+    margin: 20px;
 }
 /* http://css-tricks.com/snippets/css/css-box-shadow/
- * box-shadow:
- * 1. The horizontal offset of the shadow, positive means
- * the shadow will be on the right of the box, a negative
- * offset will put the shadow on the left of the box.
- * 2. The vertical offset of the shadow, a negative one
- * means the box-shadow will be above the box, a
- * positive one means the shadow will be below the box.
- * 3. The blur radius (optional), if set to 0 the shadow
- * will be sharp, the higher the number, the more blurred
- * it will be.
- * 4. The spread radius (optional), positive values increase
- * the size of the shadow, negative values decrease the size.
- * Default is 0 (the shadow is same size as blur).
- * 5. Colo[u]r
- */
+* box-shadow:
+* 1. The horizontal offset of the shadow, positive means
+* the shadow will be on the right of the box, a negative
+* offset will put the shadow on the left of the box.
+* 2. The vertical offset of the shadow, a negative one
+* means the box-shadow will be above the box, a
+* positive one means the shadow will be below the box.
+* 3. The blur radius (optional), if set to 0 the shadow
+* will be sharp, the higher the number, the more blurred
+* it will be.
+* 4. The spread radius (optional), positive values increase
+* the size of the shadow, negative values decrease the size.
+* Default is 0 (the shadow is same size as blur).
+* 5. Colo[u]r
+*/
 .vcard #profile-photo-wrapper img {
-	box-shadow: 3px 3px 10px 0 #000;
+    box-shadow: 3px 3px 10px 0 #000;
 }
-aside h4 {
-	font-size: 1.2em;
+#asidemain h4 {
+    font-size: 1.2em;
 }
-aside #viewcontacts {
-	text-align: right;
+#asidemain #viewcontacts {
+    text-align: right;
 }
 .aprofile dt {
-	background: #eec;
-	color: #2e2f2e;
-	font-weight: bold;
+    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;
+    margin-left: 0px;
     padding-left: 0px;
     list-style: none;
 }
 #dfrn-request-link {
-	background:#3465A4 url(connect.png) no-repeat 95% center;
-	border-radius:5px 5px 5px 5px;
-	color:#fff;
-	display:block;
-	font-size:1.2em;
-	padding:.2em .5em;
+    background: #3465A4 url(connect.png) no-repeat 95% center;
+    border-radius: 5px 5px 5px 5px;
+    color: #eec;
+    display: block;
+    font-size: 1.2em;
+    padding: 0.2em 0.5em;
+}
+#wallmessage-link {
+    /*background: #3465A4 url(connect.png) no-repeat 95% center;*/
+    /*border-radius: 5px 5px 5px 5px;*/
+    color: #eee;
+    display: block;
+    font-size: 1.2em;
+    padding: 0.2em 0.5em;
 }
 #netsearch-box {
-	margin: 20px 0px 30px;
+    margin: 20px 0px 30px;
     width: 150px;
 }
 #netsearch-box #search-submit {
     margin: 5px 5px 0px 0px;
 }
 .ttright {
-	margin: 0px 0px 0px 0px;
+    margin: 0px 0px 0px 0px;
 }
 
 
 /**
-* contacts block
-*/
+ * contacts block
+ */
 .contact-block-div {
     width: 50px;
     height: 50px;
@@ -801,20 +844,20 @@ aside #viewcontacts {
 
 /**
  * jot
- **/
+ */
 #jot {
-  /*width: 785px;*/
-  margin: 10px 0 20px 0px;
-  width: 100%;
+/*width: 785px;*/
+margin: 10px 0 20px 0px;
+width: 100%;
 }
 #jot #jot-tools {
-  margin: 0px;
-  padding: 0px;
-  height: 35px;
-  overflow: none;
-  width: 100%;
-  /*background-color: #0e232e;*/
-  /*border-bottom: 2px solid #9eabb0;*/
+margin: 0px;
+padding: 0px;
+height: 35px;
+overflow: none;
+width: 100%;
+/*background-color: #0e232e;*/
+/*border-bottom: 2px solid #9eabb0;*/
 }
 #jot #jot-tools span {
     float: left;
@@ -840,36 +883,71 @@ aside #viewcontacts {
     margin-top: 10px;
 }
 #jot #jot-title {
-	border: 1px solid #ccc;
+    border: 1px solid #ccc;
     margin: 0 0 5px;
     height: 20px;
     width: 90%;
     font-weight: bold;
     border-radius: 5px;
-	vertical-align: middle;
+    vertical-align: middle;
+}
+#jot-category {
+    margin: 5px 0;
+    border-radius: 5px;
+    border: 1px #999 solid;
+    color: #aaa;
+    font-size: smaller;
+}
+#jot-category:focus {
+    color: #eee;
 }
 #jot #character-counter {
-	width: 6%;
-	float: right;
-	text-align: right;
-	height: 15px;
-	line-height: 20px;
-	padding: 2px 20px 5px 0;
+    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;
+    margin-bottom: 10px;
+    background: #777;
 }
 #profile-jot-text_ifr {
-	width:99.900002% !important;
+    width:99.900002% !important;
+}
+#profile-jot-text_toolbargroup {
+    background: #777;
+}
+.mceCenter table tr {
+    background: #777;
 }
 [id$="jot-text_ifr"] {
-	width: 99.900002% !important;
-	color: #2e2f2e;
-	background: #eec;
+    width: 99.900002% !important;
+    color: #2e2f2e;
+    background: #eec;
 }
 [id$="jot-text_ifr"] .mceContentBody {
-	color: #2e2f2e;
-	background: #eec;
+    color: #2e2f2e;
+    background: #eec;
+}
+.defaultSkin tr.mceFirst {
+    background: #777;
+}
+.defaultSkin td.mceFirst {
+	background-color: #eec;
+}
+.defaultSkin td.mceLast {
+	background-color: #eec;
+}
+.defaultSkin span.mceIcon, .defaultSkin img.mceIcon {
+	background-color: #eec;
+}
+.defaultSkin .mceButtonDisabled .mceIcon {
+	background-color: #eec;
 }
 #profile-attach-wrapper,
 #profile-audio-wrapper,
@@ -880,58 +958,58 @@ aside #viewcontacts {
 #profile-upload-wrapper,
 #profile-video-wrapper {
     float: left;
-	margin: 0 20px 0 0;
+    margin: 0 20px 0 0;
 }
 #profile-rotator-wrapper {
-	float: right; 
+    float: right; 
 }
 #profile-jot-tools-end,
 #profile-jot-banner-end {
-	clear: both;
+    clear: both;
 }
 #profile-jot-email-wrapper {
-	margin:10px 10% 0;
-	border:1px solid #555753;
-	border-bottom:0;
+    margin:10px 10% 0;
+    border:1px solid #555753;
+    border-bottom:0;
 }
 #profile-jot-email-label {
-	background-color:#555753;
-	color:#ccccce;
-	padding:5px;
+    background-color:#555753;
+    color:#ccccce;
+    padding:5px;
 }
 #profile-jot-email {
-	width:90%;
-	margin:5px;
+    width:90%;
+    margin:5px;
 }
 #profile-jot-networks {
-	margin: 0 10%;
-	border: 1px solid #555753;
-	border-top: 0;
-	border-bottom: 0;
-	padding: 5px;
+    margin: 0 10%;
+    border: 1px solid #555753;
+    border-top: 0;
+    border-bottom: 0;
+    padding: 5px;
 }
 #profile-jot-net {
-	margin: 5px 0;
+    margin: 5px 0;
 }
 #jot-preview-link {
     margin: 0 0 0 10px;
     border: 0;
     text-decoration: none;
-	float: right;
+    float: right;
 }
 .icon-text-preview {
-	margin: 0 0 -18px 0;
-	display: block;
+    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;
+    float: right;
+    cursor: pointer;
 }
 #profile-jot-perms { 
-	float: right;
+    float: right;
     background-color: #555753;
     height: 22px;
     width: 20px;
@@ -943,118 +1021,127 @@ aside #viewcontacts {
     margin: 0 10px 0 10px;
 }
 #profile-jot-plugin-wrapper {
-	width: 1px;
-	margin: 10px 0 0 0;
-	float: right;
+    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;
+    float: right;
+    width: 100%;
+    list-style: none;
+    margin: 10px 0 0 0;
+    padding: 0;
 }
 #profile-jot-submit {
-	height: 22px;
-	background-color: #555753;
-	color: #eeeeec;
-	-webkit-border-radius: 5px;
-	-moz-border-radius: 5px;
-	border-radius: 5px;
-	border: 0;
-	margin: 0;
-	float: right;
+    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;
+    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;
+    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;
+    width:47%;
+    float:left;
 }
 #contact_allow_wrapper,
 #contact_deny_wrapper,
 #acl-deny-outer-wrapper {
-	width:47%;
-	float:right;
+    width:47%;
+    float:right;
 }
 #acl-permit-text {
-	background-color: #555753;
-	color: #ccccce;
-	padding: 5px;
-	float: left;
+    background-color: #555753;
+    color: #ccccce;
+    padding: 5px;
+    float: left;
 }
 #jot-public {
-	background-color: #555753;
-	color: #ff0000;
-	padding: 5px;
-	float: left;
+    background-color: #555753;
+    color: #ff0000;
+    padding: 5px;
+    float: left;
 }
 #acl-deny-text {
-	background-color: #555753;
-	color: #ccccce;
-	padding: 5px;
-	float: left;
+    background-color: #555753;
+    color: #ccccce;
+    padding: 5px;
+    float: left;
 }
 #acl-permit-text-end,
 #acl-deny-text-end {
-	clear: both;
+    clear: both;
 }
 #jot-title-desc {
-	color: #ccc;
+    color: #ccc;
 }
 #profile-jot-desc {
-	color: #ff2000;
-	margin: 5px 0;
+    color: #ff2000;
+    margin: 5px 0;
 }
 #jot-title-wrapper {
-	margin-bottom: 5px;
+    margin-bottom: 5px;
 }
 #jot-title-display {
-	font-weight: bold;
+    font-weight: bold;
 }
 .jothidden {
     display: none;
 }
 #jot-preview-content {
     background-color: #3e3f3e;
-	color: #eec;
+    color: #eec;
     border: 1px #eec solid;
     border-radius: 5px;
     padding: 3px 3px 6px 10px;
 }
 #jot-preview-content .wall-item-outside-wrapper {
-	border: 0;
-	border-radius: 0px;
+    border: 0;
+    border-radius: 0px;
 }
 
 
 /**
  * section
  */
-section {
-    margin: 20px 9% 0 4%;
+#sectionmain {
+    margin: 20px;
     font-size: 0.8em;
-    padding-right: 230px;
-	min-width: 475px;
-	width: 65%;
+    min-width: 475px;
+    width: 67%;
+    float: left;
+    display: inline;
 }
 
-/** tabs **/
+
+/**
+ * tabs
+ */
 .tabs {
     list-style: none;
     margin: 10px 0;
@@ -1062,12 +1149,12 @@ section {
 }
 .tabs li {
     display: inline;
-	font-size: smaller;
-	font-weight: bold;
+    font-size: smaller;
+    font-weight: bold;
 }
 .tab {
     border: 1px solid #729fcf;
-	padding: 4px;
+    padding: 4px;
 }
 .tab:hover, .tab.active:hover {
     background: #88a9d2;
@@ -1078,58 +1165,60 @@ section {
     color: #2e2f2e;
 }
 .tab.active {
-	background: #88a9d2;
+    background: #88a9d2;
     color: #2e2f2e;
 }
 .tab.active a {
-	color: #2e2f2e;
+    color: #2e2f2e;
 }
 .tab a {
-	border: 0;
-	text-decoration: none;
+    border: 0;
+    text-decoration: none;
 }
 
 
 /**
- * 	items
+ * items
  */
 .wall-item-outside-wrapper {
-	border: 1px solid #aaa;
-	border-radius: 5px;
+    border: 1px solid #aaa;
+    border-radius: 5px;
+    box-shadow: 5px 0 10px 0 #111;
 }
 .wall-item-outside-wrapper.comment {
-	margin-top: 5px;
+    margin-top: 5px;
 }
 .wall-item-outside-wrapper-end {
     clear: both;
 }
 .wall-item-content-wrapper {
     position: relative;
-	padding: 10px;
-	width: auto;
+    padding: 10px;
+    width: auto;
 }
 .wall-item-outside-wrapper .wall-item-comment-wrapper {
     /*margin-left: 90px;*/
 }
 .shiny {
     background: #2e3436;
+    border-radius: 5px;
 }
 .wall-outside-wrapper .shiny {
-	border-radius: 5px;
+    border-radius: 5px;
 }
 .heart {
-	color: red;
+    color: red;
 }
 .wall-item-content {
-	overflow-x: auto;
-	margin: 0px 15px 0px 5px;
+    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 ;) */
+* might break things for people. we shall see ;) */
 [id^="tread-wrapper"], [class^="tread-wrapper"] {
     margin: 15px 0 0 0;
     padding: 0px;
-	/*overflow-x: auto;*/
+    /*overflow-x: auto;*/
 }
 .wall-item-photo-menu {
     display: none;
@@ -1163,7 +1252,7 @@ section {
     border-radius: 5px;
 }
 [class^="wall-item-tools"] > *, [class^="wall-item-tools"] > * > * {
-	/*margin: 0 0 5px 0;*/
+    /*margin: 0 0 5px 0;*/
 }
 .wall-item-tools {
     float: right;
@@ -1199,41 +1288,41 @@ section {
     width: 25px;
 }
 .wall-item-title {
-	font-size: 1.2em;
-	font-weight: bold;
+    font-size: 1.2em;
+    font-weight: bold;
     margin-bottom: 1em;
 }
 .wall-item-body {
-	margin: 20px 20px 10px 0px;
+    margin: 20px 20px 10px 0px;
     text-align: left;
-	overflow-x: auto;
+    overflow-x: auto;
 }
 .wall-item-lock-wrapper {
-	float: right;
+    float: right;
     height: 22px;
     margin: 0 -5px 0 0;
     width: 22px;
-	opacity: 1;
+    opacity: 1;
 }
 .wall-item-dislike,
 .wall-item-like {
-	clear: left;
-	font-size: 0.8em;
-	color: #878883;
-	margin: 5px 0 5px 120px;
+    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;
+    clear: left;
+    font-size: 0.8em;
+    color: #878883;
+    margin: 20px 20px 0 110px;
 }
 .wall-item-ago {
-	display: inline;
-	padding-left: 10px;
+    display: inline;
+    padding-left: 10px;
 }
 .wall-item-wrapper-end {
-	clear:both;
+    clear:both;
 }
 .wall-item-location {
     margin-top: 15px;
@@ -1282,17 +1371,17 @@ section {
     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;
+    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;
@@ -1314,27 +1403,27 @@ section {
     width: 100%;
 }
 #connect-services-header {
-
+    margin: 5px 0 0 0;
 }
 #connect-services {
-	margin: 5px 0 0 0;
+    margin: 5px 0 0 0;
 }
 #extra-help-header {
-
+    margin: 5px 0 0 0;
 }
 #extra-help {
-	margin: 5px 0 0 0;
+    margin: 5px 0 0 0;
 }
 #postit-header {
-
+    margin: 5px 0 0 0;
 }
 #postit {
-	margin: 5px 0 0 0;
+    margin: 5px 0 0 0;
 }
 
 
 /**
- * 	comment
+ * comment
  */
 .ccollapse-wrapper {
     font-size: 0.9em;
@@ -1353,7 +1442,7 @@ section {
     height: 40px;
 }
 .wall-item-outside-wrapper.comment .wall-item-photo-menu-button {
-	width: 50px;
+    width: 50px;
     top: 45px;
     background-position: 35px center;
 }
@@ -1377,14 +1466,24 @@ section {
 .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;
+    width: 20px;
+    height: 20px;
 }
 .comment-edit-photo-link, .comment-edit-photo {
-	float: left;
-	margin-left: 10px;
+    margin-left: 10px;
 }
 .my-comment-photo {
     width: 40px;
@@ -1396,32 +1495,32 @@ section {
     width: 84.5%;
 }
 .comment-edit-text-empty {
-	height: 20px;
-	border: 2px #c8bebe solid;
-	border-radius: 5px;
-	color: #c8bebe;
-	-webkit-transition: all 0.5s ease-in-out;
-	-moz-transition: all 0.5s ease-in-out;
-	-o-transition: all 0.5s ease-in-out;
-	-ms-transition: all 0.5s ease-in-out;
-	transition: all 0.5s ease-in-out;	
+    height: 20px;
+    border: 2px #c8bebe solid;
+    border-radius: 5px;
+    color: #c8bebe;
+    -webkit-transition: all 0.5s ease-in-out;
+    -moz-transition: all 0.5s ease-in-out;
+    -o-transition: all 0.5s ease-in-out;
+    -ms-transition: all 0.5s ease-in-out;
+    transition: all 0.5s ease-in-out;	
 }
 .comment-edit-text-empty:hover {
-	color: #999999;
+    color: #999999;
 }
 .comment-edit-text-full {
-	height: 10em;
+    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;	
+    -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;
+    width: 90%;
+    margin: 5px 5px 10px 50px;
+    text-align: right;
 }
 .comment-edit-submit {
     height: 22px;
@@ -1436,22 +1535,22 @@ section {
 
 /**
  * item text style
- **/
+ */
 .wall-item-body code {
-	display: block;
-	padding: 0 0 10px 5px;
-	border-color: #ccc;
-	border-style: solid;
-	border-width: 1px 1px 1px 10px;
-	background: #eee;
-	color: #2e2f2e;
-	width: 95%;
+    display: block;
+    padding: 0 0 10px 5px;
+    border-color: #ccc;
+    border-style: solid;
+    border-width: 1px 1px 1px 10px;
+    background: #eee;
+    color: #2e2f2e;
+    width: 95%;
 }
 
 
 /**
  * profile
- **/
+ */
 div[id$="text"] {
     font-weight: bold;
     border-bottom: 1px solid #ccc;
@@ -1463,6 +1562,10 @@ div[id$="wrapper"] {
 div[id$="wrapper"] br {
     clear: left;
 }
+[id$="-end"], [class$="end"] {
+	clear: both;
+	margin: 0 0 10px 0;
+}
 #advanced-profile-with {
     margin-left: 200px;
 }
@@ -1470,10 +1573,10 @@ div[id$="wrapper"] br {
 
 /**
  * photos
- **/
+ */
 .photos {
-	height: auto;
-	overflow: auto;
+    height: auto;
+    overflow: auto;
 }
 #photo-top-links {
     margin-bottom: 30px;
@@ -1485,7 +1588,7 @@ div[id$="wrapper"] br {
     -webkit-box-shadow: 3px 3px 10px 0 #000;
     box-shadow: 3px 3px 10px 0 #000;
     background-color: #222;
-	color: #2e2f2e;
+    color: #2e2f2e;
     -webkit-border-radius: 5px;
     -moz-border-radius: 5px;
     border-radius: 5px;
@@ -1521,11 +1624,8 @@ div[id$="wrapper"] br {
     margin: 0 5px;
 }
 #photo-photo {
-	position: relative;
-	float:left;
-}
-#photo-photo-end {
-    clear: both;
+    position: relative;
+    float:left;
 }
 #photo-prev-link,
 #photo-next-link {
@@ -1599,10 +1699,10 @@ div[id$="wrapper"] br {
     margin-bottom: 15px;
 }
 #photo-edit-caption {
-	width: 100%;
+    width: 100%;
 }
 #photo-edit-newtag {
-	width: 100%;
+    width: 100%;
 }
 #photo-like-div {
     margin-bottom: 25px;
@@ -1624,15 +1724,15 @@ div[id$="wrapper"] br {
 }
 
 /**
- * 	message
+ * message
  */
 .prvmail-text {
     width: 100%;
 }
 #prvmail-subject {
     width: 100%;
-	color: #2e2f2e;
-	background: #eec;
+    color: #2e2f2e;
+    background: #eec;
 }
 #prvmail-submit-wrapper {
     margin-top: 10px;
@@ -1656,7 +1756,7 @@ div[id$="wrapper"] br {
 }
 .mail-list-sender-name {
     display: inline;
-	font-size: 1.1em;
+    font-size: 1.1em;
 }
 .mail-list-date {
     display: inline;
@@ -1664,7 +1764,7 @@ div[id$="wrapper"] br {
     padding-left: 10px;
 }
 .mail-list-sender-name, .mail-list-date {
-	font-style: italic;
+    font-style: italic;
 }
 .mail-list-subject {
     font-size: 1.2em;
@@ -1674,7 +1774,7 @@ div[id$="wrapper"] br {
 }
 .mail-list-outside-wrapper-end {
     clear: both;
-	border-bottom: 1px #eec dotted;
+    border-bottom: 1px #eec dotted;
 }
 .mail-conv-sender {
     float: left;
@@ -1704,15 +1804,15 @@ div[id$="wrapper"] br {
 
 
 /**
- * 	contacts
+ * contacts
  */
 .view-contact-wrapper,
 .contact-entry-wrapper {
     float: left;
     margin: 0 5px 40px 0;
     width: 120px;
-	height: 120px;
-	padding: 3px;
+    height: 120px;
+    padding: 3px;
     position: relative;
 }
 .contact-direction-wrapper {
@@ -1727,7 +1827,7 @@ div[id$="wrapper"] br {
 
 }
 .contact-entry-photo {
-	margin-left: 20px;
+    margin-left: 20px;
 }
 .contact-entry-name {
     width: 120px;
@@ -1735,7 +1835,7 @@ div[id$="wrapper"] br {
     /*overflow: hidden;*/
 }
 .contact-entry-photo {
-	position: relative;
+    position: relative;
 }
 .contact-entry-edit-links .icon {
     border: 1px solid #babdb6;
@@ -1778,7 +1878,7 @@ div[id$="wrapper"] br {
     margin-left:5px;
 }
 #contact-edit-nav-wrapper .icon {
-	border: 1px solid #babdb6;
+    border: 1px solid #babdb6;
     -webkit-border-radius: 3px;
     -moz-border-radius: 3px;
     border-radius: 3px;	
@@ -1823,7 +1923,7 @@ div[id$="wrapper"] br {
     width: auto;
     border: 2px solid #444;
     background: #2e2f2e;
-	color: #eec;
+    color: #eec;
     position: absolute;
     left: 0px; top: 90px;
     display: none;
@@ -1846,7 +1946,7 @@ div[id$="wrapper"] br {
 
 
 /**
- * 	register, settings & profile forms
+ * register, settings & profile forms
  */
 .openid {
 
@@ -1863,7 +1963,7 @@ div[id$="wrapper"] br {
     -moz-border-radius: 5px;
     border-radius: 5px;
     padding: 5px;
-	color: #111;
+    color: #111;
 }
 #settings-default-perms {
     margin-bottom: 20px;
@@ -1872,7 +1972,15 @@ div[id$="wrapper"] br {
 #profile-edit-form div {
     clear: both;
 }
-
+.settings-block {
+    
+}
+.settings-block label {
+    clear: left;
+}
+.settings-block input {
+    margin: 10px 5px;
+}
 /*#register-form label,     */
 /*#profile-edit-form label {*/
 /*    width: 300px;         */
@@ -1886,23 +1994,23 @@ div[id$="wrapper"] br {
 /*    margin-bottom: 20px; */
 /*}                        */
 #profile-edit-marital-label span {
-	margin: -4px;
+    margin: -4px;
 }
 .settings-submit-wrapper,
 .profile-edit-submit-wrapper {
     margin: 30px 0px;
 }
 .profile-edit-side-div {
-	display: none;
+    display: none;
 }
 /*.profile-edit-side-div:hover {
-	display: block;
+    display: block;
 }
 .profile-edit-side-link {
-	margin: 3px 0px 0px 70px;
+    margin: 3px 0px 0px 70px;
 }*/
 #profiles-menu-trigger {
-	margin: 0px 0px 0px 25px;
+    margin: 0px 0px 0px 25px;
 }
 .profile-listing {
     float: left;
@@ -1911,16 +2019,16 @@ div[id$="wrapper"] br {
 .icon-profile-edit {
     background: url("icons.png") -150px 0px no-repeat;
     border: 0;
-	cursor: pointer;
+    cursor: pointer;
     display: block;
     float: right;
-	width: 20px;
+    width: 20px;
     height: 20px;
     margin: 0 0 -18px;
-	position: absolute;
+    position: absolute;
     text-decoration: none;
-	top: 18px;
-	right: 226px;
+    top: 113px;
+    right: 260px;
 }
 #profile-edit-links ul {
     margin: 20px 0;
@@ -1928,26 +2036,32 @@ div[id$="wrapper"] br {
     list-style: none;
 }
 .marital {
-	margin-top: 5px;
+    margin-top: 5px;
 }
 #register-sitename {
     display: inline;
     font-weight: bold;
 }
 #advanced-expire-popup {
-	background: #2e2f2e;
-	color: #eec;
+    background: #2e2f2e;
+    color: #eec;
 }
 #id_ssl_policy {
-	width: 374px;
+    width: 374px;
+}
+#theme-preview {
+
+}
+#theme-preview img {
+    margin: 10px 10px 10px 288px;
 }
 
 
 /**
- * 	contacts selector
+ * contacts selector
  */
 .group-delete-wrapper {
-	margin: -31px 50px 0 0;
+    margin: -31px 50px 0 0;
     float: right;
 }
 /*.group-delete-icon {
@@ -2070,70 +2184,70 @@ div[id$="wrapper"] br {
 
 /**
  * events
- **/
+ */
 .clear { clear: both; }
 .eventcal {
     float:left;
     font-size:20px;
 }
 .event {
-	background: #2e2f2e;
+    background: #2e2f2e;
 }
 .vevent {
     border:1px solid #ccc;
 }
 .vevent .event-description, .vevent .event-location {
-	margin-left: 10px;
-	margin-right: 10px;
+    margin-left: 10px;
+    margin-right: 10px;
 }
 .vevent .event-start {
-	margin-left: 10px;
-	margin-right: 10px;
+    margin-left: 10px;
+    margin-right: 10px;
 }
 #new-event-link {
-	margin-bottom: 10px;
+    margin-bottom: 10px;
 }
 .edit-event-link, .plink-event-link {
-	/*float: left;      */
-	/*margin-top: 4px;  */
-	/*margin-right: 4px;*/
-	/*margin-bottom: 15px;*/
+    /*float: left;      */
+    /*margin-top: 4px;  */
+    /*margin-right: 4px;*/
+    /*margin-bottom: 15px;*/
 }
 .event-description:before {
-	content: url('../../../images/calendar.png');
-	margin-right: 15px;
+    content: url('../../../images/calendar.png');
+    margin-right: 15px;
 }
 .event-start, .event-end {
-	margin-left: 10px;
-	width: 330px;
-	font-size: smaller;
+    margin-left: 10px;
+    width: 330px;
+    font-size: smaller;
 }
 .event-start .dtstart, .event-end .dtend {
-	float: right;
+    float: right;
 }
 .event-list-date {
-	margin-bottom: 10px;
+    margin-bottom: 10px;
 }
 .prevcal, .nextcal {
-	float: left;
-	margin-left: 32px;
-	margin-right: 32px;
-	margin-top: 64px;
+    float: left;
+    margin-left: 32px;
+    margin-right: 32px;
+    margin-top: 64px;
 }
 .event-calendar-end {
-	clear: both;
+    clear: both;
 }
 .calendar {
     font-family: monospace;
 }
 .today {
-	font-weight: bold;
-	color: #FF0000;
+    font-weight: bold;
+    color: #FF0000;
 } 
 #event-start-text, 
 #event-finish-text {
-	margin-top: 10px;
-	margin-bottom: 5px;
+    margin-top: 10px;
+    margin-bottom: 5px;
 }
 #event-nofinish-checkbox,
 #event-nofinish-text,
@@ -2143,69 +2257,68 @@ div[id$="wrapper"] br {
     float:left;
 }
 #event-datetime-break {
-	margin-bottom: 10px;
+    margin-bottom: 10px;
 }
 #event-nofinish-break,
 #event-adjust-break,
 #event-share-break {
-	clear: both;
+    clear: both;
 }
 #event-desc-text, 
 #event-location-text {
-	margin-top: 10px;
-	margin-bottom: 5px;
+    margin-top: 10px;
+    margin-bottom: 5px;
 }
 #event-submit {
-	margin-top: 10px;
+    margin-top: 10px;
 }
 .body-tag {
-	margin: 10px 0;
-	opacity: 0.5;
-	filter:alpha(opacity=50);
+    margin: 10px 0;
+    opacity: 0.5;
+    filter:alpha(opacity=50);
 }
 .body-tag:hover {
-	opacity: 1.0 !important;
-	filter:alpha(opacity=100) !important;
+    opacity: 1.0 !important;
+    filter:alpha(opacity=100) !important;
 }
-.filesavetags {
-	margin: 20px 0;
-	opacity: 0.5;
-	filter:alpha(opacity=50);
+.filesavetags, .categorytags {
+    margin: 20px 0;
+    opacity: 0.5;
+    filter:alpha(opacity=50);
 }
-.filesavetags:hover {
-	margin: 20px 0;
-	opacity: 1.0 !important;
-	filter:alpha(opacity=100) !important;
+.filesavetags:hover, .categorytags:hover {
+    margin: 20px 0;
+    opacity: 1.0 !important;
+    filter:alpha(opacity=100) !important;
 }
 .item-select {
-	opacity: 0.1;
-	filter:alpha(opacity=10);
-	float: right;
-	margin-right: 5px;
+    opacity: 0.1;
+    filter:alpha(opacity=10);
+    margin: 5px 0 0 6px !important;
 }
 .item-select:hover, .checkeditem {
-	opacity: 1;
-	filter:alpha(opacity=100);
+    opacity: 1;
+    filter:alpha(opacity=100);
 }
 #item-delete-selected {
-	margin-top: 30px;
+    margin-top: 30px;
 }
 /* was tired of having no way of moving it around, so
- * here's a little 'hook' to do so */
+* here's a little 'hook' to do so */
 .delete-checked {
-	position: absolute;
-	left: 35px;
-	margin-top: 20px;
+    position: absolute;
+    left: 35px;
+    margin-top: 20px;
 }
 #item-delete-selected-end {
-	clear: both;
+    clear: both;
 }
 #item-delete-selected-icon, #item-delete-selected-desc {
-	float: left;
-	margin-right: 5px;
+    float: left;
+    margin-right: 5px;
 }
 #item-delete-selected-desc:hover {
-	text-decoration: underline;
+    text-decoration: underline;
 }
 .fc-state-highlight {
     background: #eec;
@@ -2214,15 +2327,15 @@ div[id$="wrapper"] br {
 
 
 /**
- * 	directory
+ * directory
  */
 .directory-item {
     float: left;
-	/*margin: 50px 50px 0px 0px;*/
-	margin: 0 5px 4px 0;
-	padding: 3px;
-	width: 180px;
-	height: 250px;
+    /*margin: 50px 50px 0px 0px;*/
+    margin: 0 5px 4px 0;
+    padding: 3px;
+    width: 180px;
+    height: 250px;
     position: relative;
 }
 
@@ -2235,12 +2348,12 @@ div[id$="wrapper"] br {
 }
 .group-selected, .nets-selected, .fileas-selected {
     padding: 3px;
-	color: #2e2f2e;
+    color: #2e2f2e;
     background: #88a9d2;
     font-weight: bold;
 }
 .group-selected:hover, .nets-selected:hover, .fileas-selected:hover {
-	color: #2e2f2e;
+    color: #2e2f2e;
 }
 .groupsideedit {
     margin-right: 10px;
@@ -2271,7 +2384,7 @@ div[id$="wrapper"] br {
     text-align: center;
 }
 #peoplefind-sidebar form {
-	margin-bottom: 10px;
+    margin-bottom: 10px;
 }
 #sidebar-new-group:hover {
     /*background: -webkit-gradient( linear, left top, left bottom, color-stop(0.05, #b20202), color-stop(1, #d60808) );*/
@@ -2286,14 +2399,14 @@ div[id$="wrapper"] br {
 #side-peoplefind-url {
     background-color: #2e2f2e;
     color: #eec;
-	border: 1px 999 solid;
-	margin-right: 3px;
-	width: 75%;
+    border: 1px 999 solid;
+    margin-right: 3px;
+    width: 75%;
 }
 #side-peoplefind-url:hover, #side-peoplefind-url:focus {
     background-color: #efefef;
     color: #222;
-	border: 1px 333 solid;
+    border: 1px 333 solid;
 }
 .nets-ul {
     list-style-type: none;
@@ -2319,7 +2432,7 @@ div[id$="wrapper"] br {
 
 
 /**
- * ADMIN
+ * admin
  */
 #pending-update {
     float:right;
@@ -2334,6 +2447,12 @@ div[id$="wrapper"] br {
 .admin.link {
     list-style-position: inside;
 }
+#adminpage {
+    color: #eec;
+    background: #2e2f2e;
+    margin: 5px;
+    padding: 10px;
+}
 #adminpage dl {
     clear:left;
     margin-bottom: 2px;
@@ -2346,16 +2465,15 @@ div[id$="wrapper"] br {
     font-weight: bold;
 }
 #adminpage dd {
-	margin-left: 250px;
+    margin-left: 250px;
 }
 #adminpage h3 {
     border-bottom:1px solid #ccc;
 }
 
 #adminpage .submit {
-	clear:left;
+    clear:left;
 }
-
 #adminpage #pluginslist {
     margin: 0;
     padding: 0;
@@ -2369,10 +2487,9 @@ div[id$="wrapper"] br {
     clear: left;
 }
 #adminpage .toggleplugin {
-	float:left;
-	margin-right: 1em;
+    float:left;
+    margin-right: 1em;
 }
-
 #adminpage table {
     width: 100%;
     border-bottom: 1px solid #000;
@@ -2388,42 +2505,69 @@ div[id$="wrapper"] br {
     width: 16px; height: 16px;
 }
 #adminpage table tr:hover {
-	color: #2e2f2e;
+    color: #2e2f2e;
     background-color: #eec;
 }
 #adminpage .selectall {
     text-align: right;
 }
 #adminpage #users a {
-	color: #2e2f2e;
-	text-decoration: underline;
+    color: #eec;
+    text-decoration: underline;
+}
+#users .name {
+    color: #eec;
 }
 
+
 /**
- * Form fields
+ * form fields
  */
 .field {
-	/*margin-bottom: 10px;*/
-	/*padding-bottom: 10px;*/
-	overflow: auto;
+    /*margin-bottom: 10px;*/
+    /*padding-bottom: 10px;*/
+    overflow: auto;
     width: 100%;
 }
 .field label, label {
-    float: left;
-    width: 275px;
-	display: block;
-	font-size: 1.077em;
-	margin: 0 10px 0.5em 0;
-	border: 1px #2e2f2e solid;
-	padding: 5px;
-	background: #eec;
-	vertical-align: middle;
-	color: #111;
+    width: 38%;
+    display: inline-block;
+    font-size: 1.077em;
+    margin: 0 10px 1em 0;
+    border: 1px #2e2f2e solid;
+    padding: 5px;
+    background: #eec;
+    color: #111;
+}
+input,
+input[type="text"],
+input[type="password"],
+input[type="search"] {
+    width: 250px;
+    height: 25px;
+    border: 1px #999 solid;
+}
+input[type="checkbox"], input[type="radio"] {
+    border: 1px #999 solid;
+    margin: 0 0 0 0;
+	height: 15px;
+	width: 15px;
+}
+input[type="submit"], input[type="button"] {
+    background-color: #eee;
+    border: 2px outset #aaa;
+    border-radius: 5px;
+    box-shadow: 1px 3px 4px 0 #111;
+    color: #2e302e;
+    cursor: pointer;
+    font-weight: bold;
+    width: auto;
+    text-shadow: 1px 1px #000;
+    -webkit-border-radius: 5px;
+    -moz-border-radius: 5px;
 }
-.field input, input[type="text"] {
-	width: 250px;
-	height: 25px;
-	border: 1px #999 solid;
+input[type="submit"]:active, input[type="button"]:active {
+    box-shadow: 0 0 0 0;
 }
 .field textarea {
     width: 80%;
@@ -2446,12 +2590,12 @@ div[id$="wrapper"] br {
     text-decoration: none;
 }
 .field .onoff .on {
-	background: url("../../../images/onoff.jpg") no-repeat 42px 1px #999;
+    background: url("../../../images/onoff.jpg") no-repeat 42px 1px #999;
     color: #111;
     text-align: left;
 }
 .field .onoff .off {
-	background: url("../../../images/onoff.jpg") no-repeat 2px 1px #ccc;
+    background: url("../../../images/onoff.jpg") no-repeat 2px 1px #ccc;
     color: #333;
     text-align: right;
 }
@@ -2464,34 +2608,34 @@ div[id$="wrapper"] br {
 
 
 /*
- * UPDATE
+ * update
  */
 .popup { 	
-	width: 100%;
+    width: 100%;
     height: 100%;
-	top: 0px;
+    top: 0px;
     left: 0px;
-	position: absolute;
-	display: none;
+    position: absolute;
+    display: none;
 }
 .popup .background {
-	background-color: rgba(0,0,0,128);
-	opacity: 0.5;
-	width: 100%;
+    background-color: rgba(0,0,0,128);
+    opacity: 0.5;
+    width: 100%;
     height: 100%;
-	position: absolute;
-	top:0px;
+    position: absolute;
+    top:0px;
     left:0px;
 }
 .popup .panel {
-	top: 25%;
+    top: 25%;
     left: 25%;
     width: 50%;
     height: 50%;
-	padding: 1em;
-	position: absolute;
-	border: 4px solid #000000;
-	background-color: #FFFFFF;
+    padding: 1em;
+    position: absolute;
+    border: 4px solid #000000;
+    background-color: #FFFFFF;
 }
 #panel {
     z-index: 100;
@@ -2540,32 +2684,32 @@ div[id$="wrapper"] br {
  * OAuth
  */
 .oauthapp {
-	height: auto;
+    height: auto;
     overflow: auto;
-	border-bottom: 2px solid #cccccc;
-	padding-bottom: 1em;
-	margin-bottom: 1em;	
+    border-bottom: 2px solid #cccccc;
+    padding-bottom: 1em;
+    margin-bottom: 1em;	
 }
 .oauthapp img {
-	float: left;
-	width: 48px; height: 48px;
-	margin: 10px;
+    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;
+    background-image: url("../../../images/icons/48/plugin.png");
+    background-position: center center;
+    background-repeat: no-repeat;
 }
 .oauthapp a {
-	float: left;
+    float: left;
 }
 
 
 /**
- * ICONS
+ * icons
  */
 .iconspacer {
-	display: block;
+    display: block;
     width: 16px;
     height: 16px;
 }
@@ -2576,23 +2720,89 @@ div[id$="wrapper"] br {
     background: url(icons.png) no-repeat;
     border: 0;
     text-decoration: none;
-	border-radius: 5px;
+    border-radius: 5px;
 }
 .icon:hover {
     border: 0;
     text-decoration: none;
 }
+.editicon {
+    display: inline-block;
+    width: 21px;
+    height: 21px;
+    background: url(editicons.png) no-repeat;
+    border: 0;
+    text-decoration: none;
+}
+.shadow {
+	box-shadow: 2px 2px 5px 2px #111;
+}
+.shadow:active, .shadow:focus, .shadow:hover {
+	box-shadow: 0 0 0 0;
+}
+.editicon:hover {
+	border: 0;
+}
+.boldbb {
+	background-position: 0px 0px;
+}
+.boldbb:hover {
+	background-position: -22px 0px;
+}
+.italicbb {
+	background-position: 0px -22px;
+}
+.italicbb:hover {
+	background-position: -22px -22px;
+}
+.underlinebb {
+	background-position: 0px -44px;
+}
+.underlinebb:hover {
+	background-position: -22px -44px;
+}
+.quotebb {
+	background-position: 0px -66px;
+}
+.quotebb:hover {
+	background-position: -22px -66px;
+}
+.codebb {
+	background-position: 0px -88px;
+}
+.codebb:hover {
+	background-position: -22px -88px;
+}
+.imagebb {
+	background-position: -44px 0px;
+}
+.imagebb:hover {
+	background-position: -66px 0px;
+}
+.urlbb {
+	background-position: -44px -22px;
+}
+.urlbb:hover {
+	background-position: -66px -22px;
+}
+.videobb {
+	background-position: -44px -44px;
+}
+.videobb:hover {
+	background-position: -66px -44px;
+}
 .icon.drop,
 .icon.drophide, .icon.delete {
     float: left;
+    margin: 0 2px;
 }
 .icon.s22.delete {
-	display: block;
-	background-position: -110px 0;
+    display: block;
+    background-position: -110px 0;
 }
 .icon.s22.text {
-	padding: 10px 0px 0px 25px;
-	width: 200px;
+    padding: 10px 0px 0px 25px;
+    width: 200px;
 }
 .icon.text {
     text-indent: 0px;
@@ -2608,118 +2818,118 @@ div[id$="wrapper"] br {
     margin: 0px 5px;    
 }
 .article {
-	background-position: -50px 0;
+    background-position: -50px 0;
 }
 .audio {
-	background-position: -70px 0;
+    background-position: -70px 0;
 }
 .block {
-	background-position: -90px 0px;
+    background-position: -90px 0px;
 }
 .drop, .delete {
-	background-position: -110px 0;
+    background-position: -110px 0;
 }
 .drophide {
-	background-position: -130px 0;
+    background-position: -130px 0;
 }
 .edit {
-	background-position: -150px 0;
+    background-position: -150px 0;
 }
 .camera {
-	background-position: -170px 0;
+    background-position: -170px 0;
 }
 .dislike {
-	background-position: -190px 0;
+    background-position: -190px 0;
 }
 .file-as {
-	background-position: -230px -60px;
+    background-position: -230px -60px;
 }
 .like {
-	background-position: -211px 0;
+    background-position: -211px 0;
 }
 .link {
-	background-position: -230px 0;
+    background-position: -230px 0;
 }
 .globe, .location {
-	background-position: -50px -20px;
+    background-position: -50px -20px;
 }
 .noglobe, .nolocation {
-	background-position: -70px -20px;
+    background-position: -70px -20px;
 }
 .no {
-	background-position: -90px -20px;
+    background-position: -90px -20px;
 }
 .pause {
-	background-position: -110px -20px;
+    background-position: -110px -20px;
 }
 .play {
-	background-position: -130px -20px;
+    background-position: -130px -20px;
 }
 .pencil {
-	background-position: -151px -18px;
+    background-position: -151px -18px;
 }
 .small-pencil {
-	background-position: -170px -20px;
+    background-position: -170px -20px;
 }
 .recycle {
-	background-position: -190px -20px;
+    background-position: -190px -20px;
 }
 .remote-link {
-	background-position: -210px -20px;
+    background-position: -210px -20px;
 }
 .share {
-	background-position: -230px -20px;
+    background-position: -230px -20px;
 }
 .tools {
-	background-position: -50px -40px;
+    background-position: -50px -40px;
 }
 .lock {
-	background-position: -70px -40px;
+    background-position: -70px -40px;
 }
 .unlock {
-	background-position: -88px -40px;
+    background-position: -88px -40px;
 }
 .video {
-	background-position: -110px -40px;
+    background-position: -110px -40px;
 }
 .attach {
-	background-position: -190px -40px;
+    background-position: -190px -40px;
 }
 .language {
-	background-position: -210px -40px;
+    background-position: -210px -40px;
 }
 .starred {
-	background-position: -130px -60px;
+    background-position: -130px -60px;
 }
 .unstarred {
-	background-position: -150px -60px;
+    background-position: -150px -60px;
 }
 .tagged {
-	background-position: -170px -60px;
+    background-position: -170px -60px;
 }
 .on {
-	background-position: -50px  -60px;
+    background-position: -50px  -60px;
 }
 .off {
-	background-position: -70px  -60px;
+    background-position: -70px  -60px;
 }
 .prev {
-	background-position: -90px  -60px;
+    background-position: -90px  -60px;
 }
 .next {
-	background-position: -110px  -60px;
+    background-position: -110px  -60px;
 }
 .icon.dim {
-	opacity: 0.3;
-	filter: alpha(opacity=30);
+    opacity: 0.3;
+    filter: alpha(opacity=30);
 }
 #pause {
-	position: fixed;
-	bottom: 5px;
-	right: 5px;
+    position: fixed;
+    bottom: 40px;
+    right: 30px;
 }
 .border, .border:hover {
-	border: 1px solid #babdb6;
+    border: 1px solid #babdb6;
     -webkit-border-radius: 5px;
     -moz-border-radius: 5px;
     border-radius: 5px;	
@@ -2748,7 +2958,7 @@ div[id$="wrapper"] br {
 
 
 /**
- * 	footer
+ * footer
  */
 .cc-license {
     margin-top: 100px;
@@ -2756,7 +2966,7 @@ div[id$="wrapper"] br {
 }
 footer {
     display: block;
-    margin: 50px 20%;
+    /*margin: 50px 20%;*/
     clear: both;
 }
 #profile-jot-text {
@@ -2768,23 +2978,26 @@ footer {
 }
 
 
-/** acl **/
+/**
+ * acl
+ */
 #photo-edit-perms-select,
 #photos-upload-permissions-wrapper,
 #profile-jot-acl-wrapper {
     display: block !important;
-	background: #2e2f2e;
-	color: #eec;
+    background: #2e2f2e;
+    color: #eec;
 }
 #acl-wrapper {
     width: 660px;
-	margin: 0 auto;
+    margin: 0 auto;
 }
 #acl-search {
     float: right;
     background: #fff url("../../../images/search_18.png") no-repeat right center;
     padding-right: 20px;
-	margin: 6px;
+    margin: 6px;
+    color: #111;
 }
 #acl-showall {
     float: left;
@@ -2797,7 +3010,7 @@ footer {
     -moz-border-radius: 5px;
     border-radius: 5px;
     color: #999;
-	margin: 5px 0;
+    margin: 5px 0;
 }
 #acl-showall.selected {
     color: #000;
@@ -2813,7 +3026,7 @@ footer {
 /*#acl-list-content {
 }*/
 .acl-list-item {
-	border: 1px solid #eec;
+    border: 1px solid #eec;
     display: block;
     float: left;
     height: 110px;
@@ -2837,29 +3050,29 @@ footer {
     -webkit-border-radius: 2px;
     -moz-border-radius: 2px;
     border-radius: 2px;
-	clear: both;
+    clear: both;
     font-size: 10px;
     display: block;
     width: 55px;
     height: 20px;
     color: #2e2f2e;
     margin: 5px auto 0;
-	padding: 0 3px;
-	text-align: center;
-	vertical-align: middle;
+    padding: 0 3px;
+    text-align: center;
+    vertical-align: middle;
 }
 #acl-wrapper a:hover {
     text-decoration: none;
     color: #2e2f2e;
-	border: 0;
+    border: 0;
 }
 .acl-button-show {
     background-image: url('../../../images/show_off.png');
-	margin: 0 auto;
+    margin: 0 auto;
 }
 .acl-button-hide {
     background-image: url('../../../images/hide_off.png');
-	margin: 0 auto;
+    margin: 0 auto;
 }
 .acl-button-show.selected {
     color: #2e2f2e;
@@ -2882,25 +3095,25 @@ footer {
 
 /* autocomplete popup */
 .acpopup {
-	max-height: 175px;
+    max-height: 175px;
     max-width: 42%;
-	background-color: #555753;
-	color: #fff;
-	overflow: auto;
-	z-index: 100000;
-	border: 1px solid #cccccc;
+    background-color: #555753;
+    color: #fff;
+    overflow: auto;
+    z-index: 100000;
+    border: 1px solid #cccccc;
 }
 .acpopupitem {
-	background-color: #555753;
+    background-color: #555753;
     padding: 4px;
-	clear: left;
+    clear: left;
 }
 .acpopupitem img {
-	float: left;
-	margin-right: 4px;
+    float: left;
+    margin-right: 4px;
 }
 .acpopupitem.selected {
-	color: #2e302e;
+    color: #2e302e;
     background-color: #eeeeec;
 }
 .qcomment-wrapper {
@@ -2908,12 +3121,12 @@ footer {
     margin: 5px 5px 5px 81%;
 }
 .qcomment {
-	opacity: 0.5;
-	filter:alpha(opacity=50);
+    opacity: 0.5;
+    filter:alpha(opacity=50);
 }
 .qcomment:hover {
-	opacity: 1.0;
-	filter:alpha(opacity=100);
+    opacity: 1.0;
+    filter:alpha(opacity=100);
 }
 #network-star-link {
     margin-top: 10px;
@@ -2926,32 +3139,38 @@ footer {
     display: inline-block;
 }
 #fileas-sidebar {
-	
+    
 }
 .fileas-ul {
-	padding: 0;
+    padding: 0;
 }
 
 
 
 /*
- * ADDONS THEMING
+ * addons theming
  */
 
 #sidebar-page-list {
-	
+    
 }
 #sidebar-page-list ul {
-	padding: 0;
-	margin: 5px 0;
+    padding: 0;
+    margin: 5px 0;
 }
 #sidebar-page-list li {
-	list-style: none;
+    list-style: none;
+}
+#jappix_mini {
+    margin-left: 130px;
+    position: fixed;
+    bottom: 0;
+    right: 175px !important; /* override the jappix css */
+    z-index: 999;
 }
-
 
 @media handheld {
-	body {
-		font-size: 15pt;
-	}
+    body {
+        font-size: 15pt;
+    }
 }
diff --git a/view/theme/dispy-dark/theme.php b/view/theme/dispy-dark/theme.php
index 17d31feda..57e0fbe5c 100644
--- a/view/theme/dispy-dark/theme.php
+++ b/view/theme/dispy-dark/theme.php
@@ -3,146 +3,161 @@
 /*
  * Name: Dispy Dark
  * Description: Dispy Dark, Friendica theme
- * Version: 1.0
+ * Version: 1.1
  * Author: Simon <http://simon.kisikew.org/>
  * Maintainer: Simon <http://simon.kisikew.org/>
  * Screenshot: <a href="screenshot.jpg">Screenshot</a>
  */
 
-$a->page['htmlhead'] .= <<< EOT
-<script>
-$(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');
-		document.getElementById("nav-notifications-menu").style.display = "none";
-	});
-
-	$('#nav-notifications-linkmenu').click(function(event) {
-		event.stopPropagation();
-	});
-	// click outside profiles menu closes it
-	$('html').click(function() {
-		$('#profiles-menu-trigger').removeClass('selected');
-		document.getElementById("profiles-menu").style.display = "none";
-	});
+$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;
+		});
 
-	$('#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'});
+	// 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>
+	</script>
 EOT;
 
-function dispydark_community_info() {
-	$a = get_app();
-
-	$aside['$lastusers_title'] = t('Last users');
-    $aside['$lastusers_items'] = array();
-	$publish = (get_config('system','publish_all') ? '' : " AND `publish` = 1 " );
-
-	$fostitJS = "javascript: (function() {
-		the_url = '".$a->get_baseurl($ssl_state)."/view/theme/dispy-dark/fpostit/fpostit.php?url=' +
-		encodeURIComponent(window.location.href) + '&title=' + encodeURIComponent(document.title) + '&text=' +
-		encodeURIComponent(''+(window.getSelection ? window.getSelection() : document.getSelection ?
-		document.getSelection() : document.selection.createRange().text));
-		a_funct = function() {
-			if (!window.open(the_url, 'fpostit', 'location=yes,links=no,scrollbars=no,toolbar=no,width=600,height=300')) {
-				location.href = the_url;
-			}
-			if (/Firefox/.test(navigator.userAgent)) {
-				setTimeout(a_funct, 0)
-			} else {
-				a_funct();
-			}
-		})();";
+	js_in_foot();
+}
 
-	$aside['$fostitJS'] = $fostitJS;
+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');
-	$a->page['aside_bottom'] = replace_macros($tpl, $aside);
+	$tpl = file_get_contents(dirname(__file__) . '/communityhome.tpl');
+	return $a->page['aside_bottom'] = replace_macros($tpl, $aside);
 }
 
-// aside on profile page
-//if (($a->argv[0] . $a->argv[1]) === ("profile" . $a->user['nickname'])) {
-	dispydark_community_info();
-//}
+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
index b54f753d3..52af07532 100644
--- a/view/theme/dispy-dark/wall_item.tpl
+++ b/view/theme/dispy-dark/wall_item.tpl
@@ -1,10 +1,10 @@
-<div class="wall-item-outside-wrapper$item.indent" id="wall-item-outside-wrapper-$item.id" >
+<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" 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>
+				<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>
@@ -16,10 +16,10 @@
 			<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>
+			<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>
@@ -55,21 +55,21 @@
 			</ul>
 			<div class="wall-item-delete-end"></div>
 		</div>
-		<div class="wall-item-content" id="wall-item-content-$item.id" >
+		<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 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>
diff --git a/view/theme/dispy-dark/wallwall_item.tpl b/view/theme/dispy-dark/wallwall_item.tpl
index b25d13409..e8cbc2cd4 100644
--- a/view/theme/dispy-dark/wallwall_item.tpl
+++ b/view/theme/dispy-dark/wallwall_item.tpl
@@ -2,15 +2,13 @@
 	<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>
+				<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>
+				<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>
@@ -22,55 +20,58 @@
 			<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-lock-wrapper">
+		<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>
-		<div class="wall-item-tools" id="wall-item-tools-$item.id">
-			{{ if $item.star }}
-				<a href="#" id="starred-$item.id" onclick="dostar($item.id); return false;" class="star-item icon $item.isstarred" title="$item.star.toggle"></a>
-				<a href="#" id="tagger-$item.id" onclick="itemTag($item.id); return false;" class="tag-item icon tagged" title="$item.star.tagger"></a>
-			{{ endif }}
-			
-			{{ if $item.vote }}
-			<div 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;" />
 			</div>
-			{{ endif }}
+			<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 }}
-				<div 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></div>
+				<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 }}
-				<div class="wall-item-links-wrapper"><a href="$item.plink.href" title="$item.plink.title" target="external-link" class="icon remote-link"></a></div>
+				<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 }}
-				<a class="editpost icon pencil" href="$item.edpost.0" title="$item.edpost.1"></a>
+				<li><a class="editpost icon pencil" href="$item.edpost.0" title="$item.edpost.1"></a></li>
 			{{ endif }}
 		
-			<div class="wall-item-delete-wrapper" id="wall-item-delete-wrapper-$item.id" >
+			<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 }}
-			</div>
 				{{ 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-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 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>
diff --git a/view/theme/dispy/bottom.tpl b/view/theme/dispy/bottom.tpl
new file mode 100644
index 000000000..130bfb25a
--- /dev/null
+++ b/view/theme/dispy/bottom.tpl
@@ -0,0 +1,46 @@
+<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/comment_item.tpl b/view/theme/dispy/comment_item.tpl
index adf2772af..b4fbae5df 100644
--- a/view/theme/dispy/comment_item.tpl
+++ b/view/theme/dispy/comment_item.tpl
@@ -11,14 +11,49 @@
 					<a class="comment-edit-photo-link" href="$mylink" title="$mytitle"><img class="my-comment-photo" src="$myphoto" alt="$mytitle" title="$mytitle" /></a>
 				</div>
 				<div class="comment-edit-photo-end"></div>
-				<textarea id="comment-edit-text-$id" class="comment-edit-text-empty" name="body" onFocus="commentOpen(this,$id);" onBlur="commentClose(this,$id);" >$comment</textarea>
+				<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);">
+					<select id="qcomment-select-$id"
+						name="qcomment-$id"
+						class="qcomment"
+						onchange="qCommentInsert(this,$id);">
 					<option value=""></option>
-				{{ for $qcomment as $qc }}
+					{{ for $qcomment as $qc }}
 					<option value="$qc">$qc</option>
-				{{ endfor }}
+					{{ endfor }}
 					</select>
 				</div>
 				{{ endif }}
diff --git a/view/theme/dispy/communityhome.tpl b/view/theme/dispy/communityhome.tpl
index 2876f936e..4d09b9255 100644
--- a/view/theme/dispy/communityhome.tpl
+++ b/view/theme/dispy/communityhome.tpl
@@ -37,8 +37,3 @@
 </div>
 {{ endif }}
 
-<h3 id="postit-header">PostIt to Friendica</h3>
-<div id="postit">
-<a href="$fostitJS" title="PostIt">Post to Friendica</a> from anywhere by bookmarking this link.
-</div>
-
diff --git a/view/theme/dispy/connect.png b/view/theme/dispy/connect.png
index b76fc13dc..b76fc13dc 100755..100644
--- a/view/theme/dispy/connect.png
+++ b/view/theme/dispy/connect.png
diff --git a/view/theme/dispy/default.php b/view/theme/dispy/default.php
index e74ec1a4f..c3e6c9119 100644
--- a/view/theme/dispy/default.php
+++ b/view/theme/dispy/default.php
@@ -1,20 +1,44 @@
 <!DOCTYPE html>
 <html>
 <head>
-  <title><?php if(x($page,'title')) echo $page['title'] ?></title>
+  <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'] ?>
+  <?php if(x($page,'htmlhead')) echo $page['htmlhead']; ?>
 </head>
 <body>
-	<?php if(x($page,'nav')) echo $page['nav']; ?>
-	<aside>
-		<?php if(x($page,'aside')) echo $page['aside']; ?>
-		<?php if(x($page,'aside_bottom')) echo $page['aside_bottom']; ?>
-	</aside>
-	<section><?php if(x($page,'content')) echo $page['content']; ?>
-		<div id="page-footer"></div>
-	</section>
-	<footer><?php if(x($page,'footer')) echo $page['footer']; ?></footer>
+	<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/editicons.png b/view/theme/dispy/editicons.png
new file mode 100644
index 000000000..41eafbb15
--- /dev/null
+++ b/view/theme/dispy/editicons.png
diff --git a/view/theme/dispy/editicons.svg b/view/theme/dispy/editicons.svg
new file mode 100644
index 000000000..2691d24b4
--- /dev/null
+++ b/view/theme/dispy/editicons.svg
@@ -0,0 +1,725 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:xlink="http://www.w3.org/1999/xlink"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   width="250"
+   height="200"
+   contentStyleType="text/css"
+   contentScriptType="text/ecmascript"
+   sodipodi:docname="editicons.svg"
+   inkscape:output_extension="org.inkscape.output.svg.inkscape"
+   version="1.1"
+   id="svg1"
+   inkscape:version="0.48+devel r"
+   inkscape:export-filename="/var/www3/kisikew.org/portal/pub/fd/view/theme/dispy/editicons.png"
+   inkscape:export-xdpi="90"
+   inkscape:export-ydpi="90">
+  <title
+     id="title4806">editicons</title>
+  <defs
+     id="defs4" />
+  <sodipodi:namedview
+     id="base"
+     pagecolor="#8a8a8a"
+     bordercolor="#666666"
+     borderopacity="1.0"
+     inkscape:pageopacity="0"
+     inkscape:pageshadow="0"
+     inkscape:zoom="2.6353376"
+     inkscape:cx="71.888976"
+     inkscape:cy="165.17294"
+     inkscape:document-units="px"
+     inkscape:current-layer="svg1"
+     showgrid="false"
+     inkscape:window-width="1100"
+     inkscape:window-height="740"
+     inkscape:window-x="34"
+     inkscape:window-y="42"
+     inkscape:window-maximized="0"
+     inkscape:showpageshadow="false"
+     width="0px"
+     height="0px"
+     fit-margin-top="0"
+     fit-margin-left="0"
+     fit-margin-right="0"
+     fit-margin-bottom="0" />
+  <metadata
+     id="metadata1">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <dc:title>editicons</dc:title>
+        <dc:contributor>
+          <cc:Agent>
+            <dc:title>Simon L'nu</dc:title>
+          </cc:Agent>
+        </dc:contributor>
+        <dc:date>2012-04-20</dc:date>
+        <dc:creator>
+          <cc:Agent>
+            <dc:title>Simon L'nu</dc:title>
+          </cc:Agent>
+        </dc:creator>
+        <dc:publisher>
+          <cc:Agent>
+            <dc:title>Simon L'nu</dc:title>
+          </cc:Agent>
+        </dc:publisher>
+        <dc:subject>
+          <rdf:Bag>
+            <rdf:li />
+          </rdf:Bag>
+        </dc:subject>
+        <dc:description>
+          <dc:title>DESCRIPTION</dc:title>
+        </dc:description>
+        <cc:license
+           rdf:resource="http://artlibre.org/licence/lal" />
+        <dc:language>en-CA</dc:language>
+      </cc:Work>
+      <cc:License
+         rdf:about="http://artlibre.org/licence/lal">
+        <cc:permits
+           rdf:resource="http://creativecommons.org/ns#Reproduction" />
+        <cc:permits
+           rdf:resource="http://creativecommons.org/ns#Distribution" />
+        <cc:permits
+           rdf:resource="http://creativecommons.org/ns#DerivativeWorks" />
+        <cc:requires
+           rdf:resource="http://creativecommons.org/ns#ShareAlike" />
+        <cc:requires
+           rdf:resource="http://creativecommons.org/ns#Notice" />
+        <cc:requires
+           rdf:resource="http://creativecommons.org/ns#Attribution" />
+      </cc:License>
+    </rdf:RDF>
+  </metadata>
+  <g
+     inkscape:label="Layer1"
+     inkscape:groupmode="layer"
+     id="layer1"
+     transform="translate(0.43349891,-524.43349)" />
+  <rect
+     style="fill:#1a1a1a;fill-opacity:1;fill-rule:nonzero;stroke:#ececec;stroke-opacity:1"
+     id="rect4713"
+     width="20"
+     height="20"
+     x="66.405151"
+     y="68.413567"
+     rx="3"
+     ry="3"
+     transform="translate(-42.805152,-66.847069)" />
+  <text
+     xml:space="preserve"
+     style="font-size:22px;font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;text-align:center;writing-mode:lr-tb;text-anchor:middle;fill:#e6e6e6;fill-opacity:1;fill-rule:nonzero;stroke:none;font-family:Verdana;-inkscape-font-specification:Verdana Bold"
+     x="79.591835"
+     y="91.591835"
+     id="text4709"
+     transform="translate(-46.16293,-73.825339)"><tspan
+       sodipodi:role="line"
+       id="tspan4711"
+       x="79.591835"
+       y="91.591835"
+       style="font-size:18px;font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;fill:#e6e6e6;font-family:Droid Sans;-inkscape-font-specification:Droid Sans Bold">B</tspan></text>
+  <rect
+     style="fill:#1a1a1a;fill-opacity:1;fill-rule:nonzero;stroke:#ececec;stroke-opacity:1"
+     id="rect4721"
+     width="20"
+     height="20"
+     x="66.405151"
+     y="68.413567"
+     rx="3"
+     ry="3"
+     transform="translate(-42.805152,21.152934)" />
+  <rect
+     style="fill:#2e2f2e;fill-opacity:1;fill-rule:nonzero;stroke:#ececec;stroke-opacity:1"
+     id="rect4725"
+     width="20"
+     height="20"
+     x="66.405151"
+     y="68.413567"
+     rx="3"
+     ry="3"
+     transform="translate(-64.805152,-66.847066)" />
+  <rect
+     transform="translate(-64.805152,-44.847066)"
+     ry="3"
+     rx="3"
+     y="68.413567"
+     x="66.405151"
+     height="20"
+     width="20"
+     id="rect4727"
+     style="fill:#2e2f2e;fill-opacity:1;fill-rule:nonzero;stroke:#ececec;stroke-opacity:1" />
+  <rect
+     style="fill:#2e2f2e;fill-opacity:1;fill-rule:nonzero;stroke:#ececec;stroke-opacity:1"
+     id="rect4729"
+     width="20"
+     height="20"
+     x="66.405151"
+     y="68.413567"
+     rx="3"
+     ry="3"
+     transform="translate(-64.805152,-22.84707)" />
+  <rect
+     transform="translate(-64.805152,-0.8470705)"
+     ry="3"
+     rx="3"
+     y="68.413567"
+     x="66.405151"
+     height="20"
+     width="20"
+     id="rect4731"
+     style="fill:#2e2f2e;fill-opacity:1;fill-rule:nonzero;stroke:#ececec;stroke-opacity:1" />
+  <rect
+     style="fill:#2e2f2e;fill-opacity:1;fill-rule:nonzero;stroke:#ececec;stroke-opacity:1"
+     id="rect4733"
+     width="20"
+     height="20"
+     x="66.405151"
+     y="68.413567"
+     rx="3"
+     ry="3"
+     transform="translate(-64.805152,21.15293)" />
+  <rect
+     transform="translate(1.194848,-66.847066)"
+     ry="3"
+     rx="3"
+     y="68.413567"
+     x="66.405151"
+     height="20"
+     width="20"
+     id="rect4735"
+     style="fill:#1a1a1a;fill-opacity:1;fill-rule:nonzero;stroke:#ececec;stroke-opacity:1" />
+  <rect
+     style="fill:#1a1a1a;fill-opacity:1;fill-rule:nonzero;stroke:#ececec;stroke-opacity:1"
+     id="rect4737"
+     width="20"
+     height="20"
+     x="66.405151"
+     y="68.413567"
+     rx="3"
+     ry="3"
+     transform="translate(1.194848,-44.847066)" />
+  <rect
+     transform="translate(1.194848,-22.84707)"
+     ry="3"
+     rx="3"
+     y="68.413567"
+     x="66.405151"
+     height="20"
+     width="20"
+     id="rect4739"
+     style="fill:#1a1a1a;fill-opacity:1;fill-rule:nonzero;stroke:#ececec;stroke-opacity:1" />
+  <rect
+     style="fill:#1a1a1a;fill-opacity:1;fill-rule:nonzero;stroke:#ececec;stroke-opacity:1"
+     id="rect4741"
+     width="20"
+     height="20"
+     x="66.405151"
+     y="68.413567"
+     rx="3"
+     ry="3"
+     transform="translate(1.194848,-0.8470705)" />
+  <rect
+     transform="translate(1.194848,21.15293)"
+     ry="3"
+     rx="3"
+     y="68.413567"
+     x="66.405151"
+     height="20"
+     width="20"
+     id="rect4743"
+     style="fill:#1a1a1a;fill-opacity:1;fill-rule:nonzero;stroke:#ececec;stroke-opacity:1" />
+  <rect
+     style="fill:#2e2f2e;fill-opacity:1;fill-rule:nonzero;stroke:#ececec;stroke-opacity:1"
+     id="rect4745"
+     width="20"
+     height="20"
+     x="66.405151"
+     y="68.413567"
+     rx="3"
+     ry="3"
+     transform="translate(-20.805152,-66.847066)" />
+  <rect
+     transform="translate(-20.805152,-44.847066)"
+     ry="3"
+     rx="3"
+     y="68.413567"
+     x="66.405151"
+     height="20"
+     width="20"
+     id="rect4747"
+     style="fill:#2e2f2e;fill-opacity:1;fill-rule:nonzero;stroke:#ececec;stroke-opacity:1" />
+  <rect
+     style="fill:#2e2f2e;fill-opacity:1;fill-rule:nonzero;stroke:#ececec;stroke-opacity:1"
+     id="rect4749"
+     width="20"
+     height="20"
+     x="66.405151"
+     y="68.413567"
+     rx="3"
+     ry="3"
+     transform="translate(-20.805152,-22.84707)" />
+  <rect
+     transform="translate(-20.805152,-0.84707)"
+     ry="3"
+     rx="3"
+     y="68.413567"
+     x="66.405151"
+     height="20"
+     width="20"
+     id="rect4751"
+     style="fill:#2e2f2e;fill-opacity:1;fill-rule:nonzero;stroke:#ececec;stroke-opacity:1" />
+  <rect
+     style="fill:#2e2f2e;fill-opacity:1;fill-rule:nonzero;stroke:#ececec;stroke-opacity:1"
+     id="rect4753"
+     width="20"
+     height="20"
+     x="66.405151"
+     y="68.413567"
+     rx="3"
+     ry="3"
+     transform="translate(-20.805152,21.15293)" />
+  <rect
+     transform="translate(-42.805152,-44.847069)"
+     ry="3"
+     rx="3"
+     y="68.413567"
+     x="66.405151"
+     height="20"
+     width="20"
+     id="rect4715"
+     style="fill:#1a1a1a;fill-opacity:1;fill-rule:nonzero;stroke:#ececec;stroke-opacity:1" />
+  <text
+     xml:space="preserve"
+     style="font-size:20px;font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;text-align:center;writing-mode:lr-tb;text-anchor:middle;fill:#ececec;fill-opacity:1;fill-rule:nonzero;stroke:none;font-family:Droid Sans;-inkscape-font-specification:Droid Sans Bold"
+     x="4.7811713"
+     y="28.940323"
+     id="text4774"
+     transform="translate(28.806399,11)"><tspan
+       sodipodi:role="line"
+       id="tspan4776"
+       x="4.7811713"
+       y="28.940323"
+       style="font-size:18px">I</tspan></text>
+  <rect
+     style="fill:#1a1a1a;fill-opacity:1;fill-rule:nonzero;stroke:#ececec;stroke-opacity:1"
+     id="rect4717"
+     width="20"
+     height="20"
+     x="66.405151"
+     y="68.413567"
+     rx="3"
+     ry="3"
+     transform="translate(-42.805152,-22.847069)" />
+  <text
+     xml:space="preserve"
+     style="font-size:20px;font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;text-align:center;writing-mode:lr-tb;text-anchor:middle;fill:#ececec;fill-opacity:1;fill-rule:nonzero;stroke:none;font-family:Droid Sans;-inkscape-font-specification:Droid Sans Bold"
+     x="6.4507866"
+     y="61.118362"
+     id="text4778"
+     transform="translate(27,1)"><tspan
+       sodipodi:role="line"
+       id="tspan4780"
+       x="6.4507866"
+       y="61.118362"
+       style="font-size:18px">U</tspan></text>
+  <rect
+     transform="translate(-42.805152,-0.8470699)"
+     ry="3"
+     rx="3"
+     y="68.413567"
+     x="66.405151"
+     height="20"
+     width="20"
+     id="rect4719"
+     style="fill:#1a1a1a;fill-opacity:1;fill-rule:nonzero;stroke:#ececec;stroke-opacity:1" />
+  <text
+     xml:space="preserve"
+     style="font-size:20px;font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;text-align:center;writing-mode:lr-tb;text-anchor:middle;fill:#ececec;fill-opacity:1;fill-rule:nonzero;stroke:none;font-family:Droid Sans;-inkscape-font-specification:Droid Sans Bold"
+     x="4.28688"
+     y="81.765083"
+     id="text4782"
+     transform="translate(29,0.7234271)"><tspan
+       sodipodi:role="line"
+       id="tspan4784"
+       x="4.28688"
+       y="81.765083"
+       style="font-size:18px">Q</tspan></text>
+  <g
+     id="g1783"
+     transform="translate(66.197715,-88)">
+    <rect
+       inkscape:export-ydpi="90"
+       inkscape:export-xdpi="90"
+       inkscape:export-filename="/home/fabio/public_html/f9k-tre/icons2.png"
+       ry="2.9268293"
+       rx="2.9268293"
+       y="858.11218"
+       x="173.12502"
+       height="9"
+       width="14.5"
+       id="rect4387-8"
+       style="fill:#666666;stroke:#ececec;stroke-width:0.5;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;display:inline"
+       transform="translate(-168.97273,-762.7948)" />
+    <path
+       inkscape:export-ydpi="90"
+       inkscape:export-xdpi="90"
+       inkscape:export-filename="/home/fabio/public_html/f9k-tre/icons2.png"
+       transform="matrix(1.1489362,0,0,1.1489362,-455.1097,-153.28349)"
+       d="m 411.5,220.26843 c 0,1.50153 -1.20323,2.71875 -2.6875,2.71875 -1.48427,0 -2.6875,-1.21722 -2.6875,-2.71875 0,-1.50152 1.20323,-2.71875 2.6875,-2.71875 1.48427,0 2.6875,1.21723 2.6875,2.71875 z"
+       sodipodi:ry="2.71875"
+       sodipodi:rx="2.6875"
+       sodipodi:cy="220.26843"
+       sodipodi:cx="408.8125"
+       id="path4391-3"
+       style="fill:#1a1a1a;stroke:#e6e6e6;stroke-width:0.5;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;display:inline"
+       sodipodi:type="arc" />
+    <rect
+       inkscape:export-ydpi="90"
+       inkscape:export-xdpi="90"
+       inkscape:export-filename="/home/fabio/public_html/f9k-tre/icons2.png"
+       ry="1"
+       rx="1"
+       y="859.06403"
+       x="174.89275"
+       height="1.8561553"
+       width="3.5355339"
+       id="rect4290"
+       style="fill:#1a1a1a;stroke:#e6e6e6;stroke-width:0.5;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;display:inline"
+       transform="translate(-168.97273,-762.7948)" />
+  </g>
+  <g
+     transform="translate(-43.063391,-846.33726)"
+     id="g1037">
+    <path
+       inkscape:export-ydpi="90"
+       inkscape:export-xdpi="90"
+       inkscape:export-filename="/home/fabio/public_html/f9k-tre/icons2.png"
+       sodipodi:nodetypes="csccccscc"
+       inkscape:connector-curvature="0"
+       id="rect4428-4"
+       d="m 118.03127,895.15627 0,0.3125 c 0,1.2601 -0.0643,3.4345 -0.35937,5.75 l -1.5625,1e-4 c -0.80183,0.011 -1.64766,4.0737 -1.60938,8.0625 l 8.25,0 c -0.057,-5.5479 1.56902,-11.5211 1.75,-5.6563 0.21453,6.9525 1.74237,-5.1823 1.75,-8.4687 z"
+       style="fill:none;stroke:#e6e6e6;stroke-width:0.5;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;display:inline" />
+    <path
+       inkscape:export-ydpi="90"
+       inkscape:export-xdpi="90"
+       inkscape:export-filename="/home/fabio/public_html/f9k-tre/icons2.png"
+       inkscape:connector-curvature="0"
+       id="path4440-4"
+       d="m 124.78127,905.73727 -1.9375,-0.063"
+       style="fill:none;stroke:#e6e6e6;stroke-width:0.5;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;display:inline" />
+    <path
+       inkscape:export-ydpi="90"
+       inkscape:export-xdpi="90"
+       inkscape:export-filename="/home/fabio/public_html/f9k-tre/icons2.png"
+       sodipodi:nodetypes="cc"
+       inkscape:connector-curvature="0"
+       id="path4442-9"
+       d="m 117.59377,901.20597 6.4375,0"
+       style="fill:none;stroke:#e6e6e6;stroke-width:0.5;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;display:inline" />
+    <rect
+       inkscape:export-ydpi="90"
+       inkscape:export-xdpi="90"
+       inkscape:export-filename="/home/fabio/public_html/f9k-tre/icons2.png"
+       y="908.11218"
+       x="115.28126"
+       height="0.375"
+       width="1.0625"
+       id="rect4446-9"
+       style="fill:none;stroke:#e6e6e6;stroke-width:0.5;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;display:inline" />
+    <rect
+       inkscape:export-ydpi="90"
+       inkscape:export-xdpi="90"
+       inkscape:export-filename="/home/fabio/public_html/f9k-tre/icons2.png"
+       style="fill:none;stroke:#e6e6e6;stroke-width:0.5;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;display:inline"
+       id="rect4448-3"
+       width="1.0625"
+       height="0.375"
+       x="115.34376"
+       y="906.51843" />
+    <rect
+       inkscape:export-ydpi="90"
+       inkscape:export-xdpi="90"
+       inkscape:export-filename="/home/fabio/public_html/f9k-tre/icons2.png"
+       y="904.89343"
+       x="115.50001"
+       height="0.375"
+       width="1.0625"
+       id="rect4450-6"
+       style="fill:none;stroke:#e6e6e6;stroke-width:0.5;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;display:inline" />
+    <rect
+       inkscape:export-ydpi="90"
+       inkscape:export-xdpi="90"
+       inkscape:export-filename="/home/fabio/public_html/f9k-tre/icons2.png"
+       style="fill:none;stroke:#e6e6e6;stroke-width:0.5;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;display:inline"
+       id="rect4452-0"
+       width="1.0625"
+       height="0.375"
+       x="115.81251"
+       y="903.42468" />
+    <rect
+       inkscape:export-ydpi="90"
+       inkscape:export-xdpi="90"
+       inkscape:export-filename="/home/fabio/public_html/f9k-tre/icons2.png"
+       y="902.17468"
+       x="116.21876"
+       height="0.375"
+       width="1.0625"
+       id="rect4454-5"
+       style="fill:none;stroke:#e6e6e6;stroke-width:0.5;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;display:inline" />
+    <rect
+       inkscape:export-ydpi="90"
+       inkscape:export-xdpi="90"
+       inkscape:export-filename="/home/fabio/public_html/f9k-tre/icons2.png"
+       style="fill:none;stroke:#e6e6e6;stroke-width:0.5;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;display:inline"
+       id="rect4456-0"
+       width="1.0625"
+       height="0.375"
+       x="118.50001"
+       y="900.17468" />
+    <rect
+       inkscape:export-ydpi="90"
+       inkscape:export-xdpi="90"
+       inkscape:export-filename="/home/fabio/public_html/f9k-tre/icons2.png"
+       y="898.70593"
+       x="118.68751"
+       height="0.375"
+       width="1.0625"
+       id="rect4458-2"
+       style="fill:none;stroke:#e6e6e6;stroke-width:0.5;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;display:inline" />
+    <rect
+       inkscape:export-ydpi="90"
+       inkscape:export-xdpi="90"
+       inkscape:export-filename="/home/fabio/public_html/f9k-tre/icons2.png"
+       style="fill:none;stroke:#e6e6e6;stroke-width:0.5;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;display:inline"
+       id="rect4460-9"
+       width="1.0625"
+       height="0.375"
+       x="118.75001"
+       y="897.20593" />
+    <rect
+       inkscape:export-ydpi="90"
+       inkscape:export-xdpi="90"
+       inkscape:export-filename="/home/fabio/public_html/f9k-tre/icons2.png"
+       y="895.79968"
+       x="118.75001"
+       height="0.375"
+       width="1.0625"
+       id="rect4462-4"
+       style="fill:none;stroke:#e6e6e6;stroke-width:0.5;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;display:inline" />
+    <rect
+       inkscape:export-ydpi="90"
+       inkscape:export-xdpi="90"
+       inkscape:export-filename="/home/fabio/public_html/f9k-tre/icons2.png"
+       style="fill:none;stroke:#e6e6e6;stroke-width:0.5;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;display:inline"
+       id="rect4464-3"
+       width="1.0625"
+       height="0.375"
+       x="120.84376"
+       y="908.11218" />
+    <rect
+       inkscape:export-ydpi="90"
+       inkscape:export-xdpi="90"
+       inkscape:export-filename="/home/fabio/public_html/f9k-tre/icons2.png"
+       y="906.51843"
+       x="120.90627"
+       height="0.375"
+       width="1.0625"
+       id="rect4466-5"
+       style="fill:none;stroke:#e6e6e6;stroke-width:0.5;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;display:inline" />
+    <rect
+       inkscape:export-ydpi="90"
+       inkscape:export-xdpi="90"
+       inkscape:export-filename="/home/fabio/public_html/f9k-tre/icons2.png"
+       style="fill:none;stroke:#e6e6e6;stroke-width:0.5;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;display:inline"
+       id="rect4468-1"
+       width="1.0625"
+       height="0.375"
+       x="121.06252"
+       y="904.89343" />
+    <rect
+       inkscape:export-ydpi="90"
+       inkscape:export-xdpi="90"
+       inkscape:export-filename="/home/fabio/public_html/f9k-tre/icons2.png"
+       y="903.42468"
+       x="121.37502"
+       height="0.375"
+       width="1.0625"
+       id="rect4470-7"
+       style="fill:none;stroke:#e6e6e6;stroke-width:0.5;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;display:inline" />
+    <rect
+       inkscape:export-ydpi="90"
+       inkscape:export-xdpi="90"
+       inkscape:export-filename="/home/fabio/public_html/f9k-tre/icons2.png"
+       style="fill:none;stroke:#e6e6e6;stroke-width:0.5;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;display:inline"
+       id="rect4472-4"
+       width="1.0625"
+       height="0.375"
+       x="121.78127"
+       y="902.17468" />
+    <rect
+       inkscape:export-ydpi="90"
+       inkscape:export-xdpi="90"
+       inkscape:export-filename="/home/fabio/public_html/f9k-tre/icons2.png"
+       y="900.17468"
+       x="124.06252"
+       height="0.375"
+       width="1.0625"
+       id="rect4474-3"
+       style="fill:none;stroke:#e6e6e6;stroke-width:0.5;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;display:inline" />
+    <rect
+       inkscape:export-ydpi="90"
+       inkscape:export-xdpi="90"
+       inkscape:export-filename="/home/fabio/public_html/f9k-tre/icons2.png"
+       style="fill:none;stroke:#e6e6e6;stroke-width:0.5;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;display:inline"
+       id="rect4476-1"
+       width="1.0625"
+       height="0.375"
+       x="124.25002"
+       y="898.70593" />
+    <rect
+       inkscape:export-ydpi="90"
+       inkscape:export-xdpi="90"
+       inkscape:export-filename="/home/fabio/public_html/f9k-tre/icons2.png"
+       y="897.20593"
+       x="124.31252"
+       height="0.375"
+       width="1.0625"
+       id="rect4478-4"
+       style="fill:none;stroke:#e6e6e6;stroke-width:0.5;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;display:inline" />
+    <rect
+       inkscape:export-ydpi="90"
+       inkscape:export-xdpi="90"
+       inkscape:export-filename="/home/fabio/public_html/f9k-tre/icons2.png"
+       style="fill:none;stroke:#e6e6e6;stroke-width:0.5;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;display:inline"
+       id="rect4480-6"
+       width="1.0625"
+       height="0.375"
+       x="124.31252"
+       y="895.79968" />
+  </g>
+  <g
+     id="g1790"
+     transform="translate(22,22)">
+    <path
+       inkscape:export-ydpi="90"
+       inkscape:export-xdpi="90"
+       inkscape:export-filename="/home/fabio/public_html/f9k-tre/icons2.png"
+       inkscape:connector-curvature="0"
+       id="rect4397-0"
+       d="m 242.44524,860.13287 c -0.98011,0 -1.77562,0.6006 -1.77562,1.3586 l 0,1.5632 c 0,0.7581 0.79551,1.3733 1.77562,1.3733 l 4.53349,0 c 0.98012,0 1.77562,-0.6152 1.77562,-1.3733 l 0,-1.5632 c 0,-0.758 -0.7955,-1.3586 -1.77562,-1.3586 l -4.53349,0 z m 0.41557,1.0372 3.70235,0 c 0.51967,0 0.94448,0.2879 0.94448,0.6574 l 0,0.8912 c 0,0.3695 -0.42481,0.672 -0.94448,0.672 l -3.70235,0 c -0.51966,0 -0.94447,-0.3025 -0.94447,-0.672 l 0,-0.8912 c 0,-0.3695 0.42481,-0.6574 0.94447,-0.6574 z"
+       style="fill:#1a1a1a;fill-opacity:1;stroke:#e6e6e6;stroke-width:0.47366244;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;display:inline"
+       transform="matrix(0.87398418,0,0,1,-154.20273,-850.767)" />
+    <path
+       inkscape:export-ydpi="90"
+       inkscape:export-xdpi="90"
+       inkscape:export-filename="/home/fabio/public_html/f9k-tre/icons2.png"
+       style="fill:#1a1a1a;fill-opacity:1;stroke:#e6e6e6;stroke-width:0.47366244;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;display:inline"
+       d="m 232.97199,860.13287 c -0.98011,0 -1.77562,0.6006 -1.77562,1.3586 l 0,1.5632 c 0,0.7581 0.79551,1.3733 1.77562,1.3733 l 4.53349,0 c 0.98012,0 1.77562,-0.6152 1.77562,-1.3733 l 0,-1.5632 c 0,-0.758 -0.7955,-1.3586 -1.77562,-1.3586 l -4.53349,0 z m 0.41557,1.0372 3.70236,0 c 0.51966,0 0.94447,0.2879 0.94447,0.6574 l 0,0.8912 c 0,0.3695 -0.42481,0.672 -0.94447,0.672 l -3.70236,0 c -0.51966,0 -0.94447,-0.3025 -0.94447,-0.672 l 0,-0.8912 c 0,-0.3695 0.42481,-0.6574 0.94447,-0.6574 z"
+       id="path4418-4"
+       inkscape:connector-curvature="0"
+       transform="matrix(0.87398418,0,0,1,-154.20273,-850.767)" />
+    <rect
+       inkscape:export-ydpi="90"
+       inkscape:export-xdpi="90"
+       inkscape:export-filename="/home/fabio/public_html/f9k-tre/icons2.png"
+       ry="0.81812328"
+       rx="1.0135853"
+       y="861.57312"
+       x="236.7028"
+       height="1.6362466"
+       width="6.7246785"
+       id="rect4395-0"
+       style="fill:#1a1a1a;fill-opacity:1;stroke:#e6e6e6;stroke-width:0.47366244;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;display:inline"
+       transform="matrix(0.87398418,0,0,1,-154.20273,-850.767)" />
+  </g>
+  <use
+     x="0"
+     y="0"
+     xlink:href="#text4709"
+     id="use1769"
+     transform="translate(-22,0)"
+     width="250"
+     height="200" />
+  <use
+     x="0"
+     y="0"
+     xlink:href="#text4774"
+     id="use1771"
+     transform="translate(-22,0)"
+     width="250"
+     height="200" />
+  <use
+     x="0"
+     y="0"
+     xlink:href="#text4778"
+     id="use1773"
+     transform="translate(-22,0)"
+     width="250"
+     height="200" />
+  <use
+     x="0"
+     y="0"
+     xlink:href="#text4782"
+     id="use1775"
+     transform="translate(-22,0)"
+     width="250"
+     height="200" />
+  <use
+     x="0"
+     y="0"
+     xlink:href="#g1783"
+     id="use1788"
+     width="250"
+     height="200"
+     transform="translate(-22,0)" />
+  <use
+     x="0"
+     y="0"
+     xlink:href="#g1037"
+     id="use1795"
+     width="250"
+     height="200"
+     transform="translate(-22,0)" />
+  <use
+     x="0"
+     y="0"
+     xlink:href="#g1790"
+     id="use1797"
+     width="250"
+     height="200"
+     transform="translate(-22,0)" />
+  <text
+     xml:space="preserve"
+     style="font-size:18px;font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;text-align:center;writing-mode:lr-tb;text-anchor:middle;fill:#1a1a1a;fill-opacity:1;fill-rule:nonzero;stroke:none;font-family:Droid Sans;-inkscape-font-specification:Droid Sans Bold"
+     x="6.5049949"
+     y="106.76174"
+     id="text1799"
+     transform="translate(26,-1)"><tspan
+       sodipodi:role="line"
+       id="tspan1801"
+       x="6.5049949"
+       y="106.76174"
+       style="fill:#ececec;fill-opacity:1">C</tspan></text>
+  <use
+     x="0"
+     y="0"
+     xlink:href="#text1799"
+     id="use1803"
+     transform="translate(-22,0)"
+     width="250"
+     height="200" />
+</svg>
diff --git a/view/theme/dispy/fpostit/README b/view/theme/dispy/fpostit/README
deleted file mode 100644
index 39b7c5761..000000000
--- a/view/theme/dispy/fpostit/README
+++ /dev/null
@@ -1,8 +0,0 @@
-fpostit
-
-original author: Devlon Duthied
-
-see his blog posting:
-http://blog.duthied.com/2011/09/13/node-agnostic-friendika-bookmarklet/
-
-original published at github https://github.com/duthied/Friendika-Bookmarklet
diff --git a/view/theme/dispy/fpostit/fpostit.js b/view/theme/dispy/fpostit/fpostit.js
deleted file mode 100755
index d18f5d345..000000000
--- a/view/theme/dispy/fpostit/fpostit.js
+++ /dev/null
@@ -1,14 +0,0 @@
-javascript: (function() {
-    					the_url = 'view/theme/dispy/fpostit/fpostit.php?url=' + encodeURIComponent(window.location.href) + '&title=' + encodeURIComponent(document.title) + '&text=' +
-						encodeURIComponent(''+(window.getSelection ? window.getSelection() : document.getSelection ?
-						document.getSelection() : document.selection.createRange().text));
-    					a_funct = function() {
-							if (!window.open(the_url, 'fpostit','location=yes,links=no,scrollbars=no,toolbar=no,width=600,height=300')) {
-								location.href = the_url
-							};
-    						if (/Firefox/.test(navigator.userAgent)) {
-								setTimeout(a_funct, 0)
-							} else {
-								a_funct();
-							}
-						})();"
diff --git a/view/theme/dispy/fpostit/fpostit.php b/view/theme/dispy/fpostit/fpostit.php
deleted file mode 100644
index d00182946..000000000
--- a/view/theme/dispy/fpostit/fpostit.php
+++ /dev/null
@@ -1,134 +0,0 @@
-<?php
-if (!isset($_POST["friendica_acct_name"])) $_POST["friendica_acct_name"] = '';
-if (!isset($_COOKIE['username'])) $_COOKIE['username'] = '';
-if (!isset($_COOKIE['password'])) $_COOKIE['password'] = '';
-if (!isset($hostname)) $hostname = '';
-if (!isset($username)) $username = '';
-
-
-if (($_POST["friendica_acct_name"] != '') && ($_POST["friendica_password"] != '')) {
-	setcookie("username", $_POST["friendica_acct_name"], time()+60*60*24*300);
-	setcookie("password", $_POST["friendica_password"], time()+60*60*24*300);
-}
-
-?>
-<html>
-<head>
-	<style>
-		body {
-			font-family: sans-serif;
-			margin: 0px;
-		}
-		.wrap1 {
-			padding: 2px 5px;
-			background-color: #000;
-			margin-bottom: 10px;
-		}
-		.wrap2 {
-			margin-left: 10px;
-			font-size: 12px;
-		}
-		.logo {
-			margin-left: 3px;
-			margin-right: 5px;
-			float: left;
-		}
-		h2 {
-			color: #ffffff;
-		}
-		.error {
-			background-color: #FFFF66;
-			font-size: 12px;
-			margin-left: 10px;
-		}
-	</style>
-</head>
-
-<body>
-<?php
-
-if (isset($_GET['title'])) {
-	$title = $_GET['title'];
-}
-if (isset($_GET['text'])) {
-	$text = $_GET['text'];
-}
-if (isset($_GET['url'])) {
-	$url = $_GET['url'];
-}
-
-if ((isset($title)) && (isset($text)) && (isset($url))) {
-	$content = "$title\nsource:$url\n\n$text";
-} else {
-	$content = $_POST['content'];
-}
-
-if (isset($_POST['submit'])) {
-	
-	if (($_POST["friendica_acct_name"] != '') && ($_POST["friendica_password"] != '')) {
-		$acctname = $_POST["friendica_acct_name"];
-		$tmp_account_array = explode("@", $acctname);
-		if (isset($tmp_account_array[1])) {
-			$username = $tmp_account_array[0];
-			$hostname = $tmp_account_array[1];
-		}
-		$password = $_POST["friendica_password"];
-		$content = $_POST["content"];
-
-		$url = "http://" . $hostname . '/api/statuses/update';
-		$data = array('status' => $content);
-		
-		// echo "posting to: $url<br/>";
-
-		$c = curl_init();
-		curl_setopt($c, CURLOPT_URL, $url); 
-		curl_setopt($c, CURLOPT_USERPWD, "$username:$password");
-		curl_setopt($c, CURLOPT_POSTFIELDS, $data); 
-		curl_setopt($c, CURLOPT_RETURNTRANSFER, true); 
-		curl_setopt($c, CURLOPT_FOLLOWLOCATION, true);
-		$c_result = curl_exec($c); 
-		if(curl_errno($c)){ 
-			$error = curl_error($c);
-			showForm($error, $content);
-		}
-		
-		curl_close($c);
-		if (!isset($error)) {
-			echo '<script language="javascript" type="text/javascript">window.close();</script>';
-		}
-		
-	} else {
-		$error = "Missing account name and/or password. Please try again.";
-		showForm($error, $content);
-	}
-	
-} else {
-	showForm(null, $content);
-}
-
-function showForm($error, $content) {
-	$username_cookie = $_COOKIE['username'];
-	$password_cookie = $_COOKIE['password'];
-	
-	echo <<<EOF
-	<div class="wrap1">
-		<h2><img class="logo" src="friendica-32.png" align="middle" />Friendica Bookmarklet</h2>
-	</div>
-
-	<div class="wrap2">
-		<form method="post" action="{$_SERVER['PHP_SELF']}">
-			Enter the email address of the Friendica Account that you want to cross-post to: (example: user@friendica.org)<br /><br />
-			Account ID: <input type="text" name="friendica_acct_name" value="{$username_cookie}" size="50" /><br />
-			Password: <input type="password" name="friendica_password" value="{$password_cookie}" size="50" /><br />
-			<textarea name="content" id="content" rows="6" cols="70">{$content}</textarea><br />
-			<input type="submit" value="PostIt!" name="submit" />&#160;&#160;<span class="error">$error</span>
-		</form>
-		<p></p>
-	</div>
-EOF;
-	
-}
-?>
-
-</body>
-</html>
diff --git a/view/theme/dispy/fpostit/friendica-32.png b/view/theme/dispy/fpostit/friendica-32.png
deleted file mode 100644
index 61764bf20..000000000
--- a/view/theme/dispy/fpostit/friendica-32.png
+++ /dev/null
diff --git a/view/theme/dispy/fpostit/friendika-32.png b/view/theme/dispy/fpostit/friendika-32.png
deleted file mode 100644
index 61764bf20..000000000
--- a/view/theme/dispy/fpostit/friendika-32.png
+++ /dev/null
diff --git a/view/theme/dispy/head.tpl b/view/theme/dispy/head.tpl
index f606f2f7e..d42b19aef 100644
--- a/view/theme/dispy/head.tpl
+++ b/view/theme/dispy/head.tpl
@@ -1,52 +1,49 @@
 <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" />
-
-<link rel="shortcut icon" href="$baseurl/images/friendika-32.png" />
-<link rel="search"
-         href="$baseurl/opensearch" 
-         type="application/opensearchdescription+xml" 
-         title="Search in Friendica" />
-
 <!--[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/jquery.textinputs.js" ></script>
-<script type="text/javascript" src="$baseurl/js/fk.autocomplete.js" ></script>
+<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/acl.js" ></script>
-<script type="text/javascript" src="$baseurl/js/webtoolkit.base64.js" ></script>
-<script type="text/javascript" src="$baseurl/js/main.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 = '';
-			obj.className = "comment-edit-text-full";
+			$("#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';
-			obj.className="comment-edit-text-empty";
+			$("#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') {
@@ -63,6 +60,22 @@
 		$("#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();
@@ -73,8 +86,4 @@
 			$('#hide-comments-' + id).html('$showfewer');
 		}
 	}
-
-
 </script>
-
-
diff --git a/view/theme/darkness/unsupported b/view/theme/dispy/header.tpl
index e69de29bb..e69de29bb 100644
--- a/view/theme/darkness/unsupported
+++ b/view/theme/dispy/header.tpl
diff --git a/view/theme/dispy/icons.png b/view/theme/dispy/icons.png
index f42330d65..5c2eab36e 100644
--- a/view/theme/dispy/icons.png
+++ b/view/theme/dispy/icons.png
diff --git a/view/theme/dispy/icons/email.png b/view/theme/dispy/icons/email.png
index b9d64cb93..349f5a91e 100644
--- a/view/theme/dispy/icons/email.png
+++ b/view/theme/dispy/icons/email.png
diff --git a/view/theme/dispy/icons/facebook.png b/view/theme/dispy/icons/facebook.png
index ff5129f94..be04f2b52 100644
--- a/view/theme/dispy/icons/facebook.png
+++ b/view/theme/dispy/icons/facebook.png
diff --git a/view/theme/dispy/icons/posterous.png b/view/theme/dispy/icons/posterous.png
index d0ae6face..0d25e01b8 100644
--- a/view/theme/dispy/icons/posterous.png
+++ b/view/theme/dispy/icons/posterous.png
diff --git a/view/theme/dispy/icons/scroll_top.png b/view/theme/dispy/icons/scroll_top.png
new file mode 100644
index 000000000..fa6736086
--- /dev/null
+++ b/view/theme/dispy/icons/scroll_top.png
diff --git a/view/theme/dispy/icons/tumblr.png b/view/theme/dispy/icons/tumblr.png
index 9d5fcd045..054cd119d 100644
--- a/view/theme/dispy/icons/tumblr.png
+++ b/view/theme/dispy/icons/tumblr.png
diff --git a/view/theme/dispy/icons/wordpress.png b/view/theme/dispy/icons/wordpress.png
index 6a4e36d45..4ee872b74 100644
--- a/view/theme/dispy/icons/wordpress.png
+++ b/view/theme/dispy/icons/wordpress.png
diff --git a/view/theme/dispy/jot-header.tpl b/view/theme/dispy/jot-header.tpl
index 92eccf740..ab15f9516 100644
--- a/view/theme/dispy/jot-header.tpl
+++ b/view/theme/dispy/jot-header.tpl
@@ -9,6 +9,7 @@ function initEditor(cb) {
 		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',
@@ -23,13 +24,14 @@ function initEditor(cb) {
 			mode : "specific_textareas",
 			editor_selector: $editselect,
 			auto_focus: "profile-jot-text",
-			plugins : "bbcode,paste,fullscreen,autoresize",
+			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,
@@ -40,6 +42,7 @@ function initEditor(cb) {
 			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) {
@@ -296,7 +299,6 @@ function enableOnUser(){
 		
 	}
 
-
 	function jotClearLocation() {
 		$('#jot-coord').val('');
 		$('#profile-nolocation-wrapper').hide();
@@ -345,4 +347,3 @@ function enableOnUser(){
 	}
 
 </script>
-
diff --git a/view/theme/dispy/jot.tpl b/view/theme/dispy/jot.tpl
index 94c31da23..688ac1451 100644
--- a/view/theme/dispy/jot.tpl
+++ b/view/theme/dispy/jot.tpl
@@ -11,7 +11,7 @@
 		<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>
 
diff --git a/view/theme/dispy/js/jquery.autogrow.textarea.js b/view/theme/dispy/js/jquery.autogrow.textarea.js
new file mode 100644
index 000000000..806e34f51
--- /dev/null
+++ b/view/theme/dispy/js/jquery.autogrow.textarea.js
@@ -0,0 +1,46 @@
+(function($) {
+
+    /*
+     * Auto-growing textareas; technique ripped from Facebook
+     */
+    $.fn.autogrow = function(options) {
+        
+        this.filter('textarea').each(function() {
+            
+            var $this       = $(this),
+                minHeight   = $this.height(),
+                lineHeight  = $this.css('lineHeight');
+            
+            var shadow = $('<div></div>').css({
+                position:   'absolute',
+                top:        -10000,
+                left:       -10000,
+                width:      $(this).width(),
+                fontSize:   $this.css('fontSize'),
+                fontFamily: $this.css('fontFamily'),
+                lineHeight: $this.css('lineHeight'),
+                resize:     'none'
+            }).appendTo(document.body);
+            
+            var update = function() {
+                
+                var val = this.value.replace(/</g, '&lt;')
+                                    .replace(/>/g, '&gt;')
+                                    .replace(/&/g, '&amp;')
+                                    .replace(/\n/g, '<br/>');
+                
+                shadow.html(val);
+                $(this).css('height', Math.max(shadow.height() + 20, minHeight));
+            }
+            
+            $(this).change(update).keyup(update).keydown(update);
+            
+            update.apply(this);
+            
+        });
+        
+        return this;
+        
+    }
+    
+})(jQuery);
\ No newline at end of file
diff --git a/view/theme/dispy/lang_selector.tpl b/view/theme/dispy/lang_selector.tpl
new file mode 100644
index 000000000..e777a0a86
--- /dev/null
+++ b/view/theme/dispy/lang_selector.tpl
@@ -0,0 +1,10 @@
+<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/login-bg.gif b/view/theme/dispy/login-bg.gif
index cde836c89..cde836c89 100755..100644
--- a/view/theme/dispy/login-bg.gif
+++ b/view/theme/dispy/login-bg.gif
diff --git a/view/theme/dispy/menu-user-pin.jpg b/view/theme/dispy/menu-user-pin.jpg
index 26449569f..26449569f 100755..100644
--- a/view/theme/dispy/menu-user-pin.jpg
+++ b/view/theme/dispy/menu-user-pin.jpg
diff --git a/view/theme/dispy/nav.tpl b/view/theme/dispy/nav.tpl
index e38b2bbe2..6ffd2b379 100644
--- a/view/theme/dispy/nav.tpl
+++ b/view/theme/dispy/nav.tpl
@@ -1,49 +1,53 @@
-<nav>
+<nav id="pagenav">
 
 <span id="banner">$banner</span>
 
-<!-- yes, they're going the other way. seems that's how the template renderer
-works -->
-
+<a name="top" id="top"></a>
 <div id="nav-floater">
-    <div id="nav-buttons">
-    {{ if $nav.help }}
-    <a id="nav-help-link" class="nav-link $nav.help.2" href="$nav.help.0" title="$nav.help.1">$nav.help.1</a>
-    {{ endif }}
-    {{ if $nav.community }}
-    <a id="nav-community-link" class="nav-link $nav.community.2"
-    href="$nav.community.0" title="$nav.community.1">$nav.community.1</a>
+    <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.apps }}
-    <a id="nav-apps-link" class="nav-link $nav.apps.2" href="$nav.apps.0" title="$nav.apps.1">$nav.apps.1</a>
+    {{ 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 }}
-    <a id="nav-directory-link" class="nav-link $nav.directory.2" href="$nav.directory.0" title="$nav.directory.1">$nav.directory.1</a>
-    <a id="nav-search-link" class="nav-link $nav.search.2" href="$nav.search.0" title="$nav.search.1">$nav.search.1</a>
-    {{ if $nav.messages }}
-    <a id="nav-messages-link" class="nav-link $nav.messages.2"
-    href="$nav.messages.0" title="$nav.messages.1">$nav.messages.1</a>
+    {{ 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 }}
-    <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>
-    <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>
+    <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.network }}
-    <a id="nav-network-link" class="nav-link $nav.network.2"
-		href="$nav.network.0" title="$nav.network.1">$nav.network.1</a>
+    {{ 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.home }}
-    <a id="nav-home-link" class="nav-link $nav.home.2"
-		href="$nav.home.0" title="$nav.home.1">$nav.home.1</a>
+    {{ 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 }}
-    {{ 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>
+    <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 }}
-	</div>
+	</ul>
 
 	<div id="user-menu">
         <a id="user-menu-label" onclick="openClose('user-menu-popup'); return false" href="$nav.home.0">$sitelocation</a>
@@ -56,7 +60,6 @@ works -->
         <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 }}
@@ -75,11 +78,9 @@ works -->
         {{ 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 }}
@@ -119,6 +120,12 @@ works -->
 $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" />
diff --git a/view/theme/dispy/nets.tpl b/view/theme/dispy/nets.tpl
index b322717ad..b0cb8890c 100644
--- a/view/theme/dispy/nets.tpl
+++ b/view/theme/dispy/nets.tpl
@@ -4,7 +4,7 @@
 	<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?f=&nets=$net.ref" class="nets-link{{ if $net.selected }} nets-selected{{ endif }}">$net.name</a></li>
+	<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/photo-menu.jpg b/view/theme/dispy/photo-menu.jpg
index fde5eb535..fde5eb535 100755..100644
--- a/view/theme/dispy/photo-menu.jpg
+++ b/view/theme/dispy/photo-menu.jpg
diff --git a/view/theme/dispy/profile_vcard.tpl b/view/theme/dispy/profile_vcard.tpl
index 350a6ce4a..f14ea7915 100644
--- a/view/theme/dispy/profile_vcard.tpl
+++ b/view/theme/dispy/profile_vcard.tpl
@@ -10,9 +10,8 @@
 			<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="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 }}
@@ -81,4 +80,3 @@
 
 $contact_block
 
-
diff --git a/view/theme/dispy/saved_searches_aside.tpl b/view/theme/dispy/saved_searches_aside.tpl
index 63a85dda5..fb822fe5d 100644
--- a/view/theme/dispy/saved_searches_aside.tpl
+++ b/view/theme/dispy/saved_searches_aside.tpl
@@ -1,12 +1,12 @@
-<div id="saved-search-list" class="widget">
+<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 onmouseout="imgdull(this);" onmouseover="imgbright(this);" onclick="return confirmDelete();" class="icon savedsearchdrop drophide" href="network/?f=&amp;remove=1&amp;search=$search.encodedterm"></a>
-			<a class="savedsearchterm" href="network/?f=&amp;search=$search.encodedterm">$search.term</a>
+			<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>
diff --git a/view/theme/dispy/search_item.tpl b/view/theme/dispy/search_item.tpl
index 54c3e389c..bfad1b7b7 100755..100644
--- a/view/theme/dispy/search_item.tpl
+++ b/view/theme/dispy/search_item.tpl
@@ -1,10 +1,10 @@
-<div class="wall-item-outside-wrapper$item.indent" id="wall-item-outside-wrapper-$item.id" >
+<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" title="$item.linktitle" class="wall-item-photo-link" id="wall-item-photo-link-$item.id">
+				<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">
@@ -14,11 +14,21 @@
 				</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 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-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 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" >
@@ -27,25 +37,18 @@
 				{{ 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 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-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>
 
-<div class="wall-item-outside-wrapper-end$item.indent" ></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>
+			<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/star.png b/view/theme/dispy/star.png
index a327ba14e..a327ba14e 100755..100644
--- a/view/theme/dispy/star.png
+++ b/view/theme/dispy/star.png
diff --git a/view/theme/dispy/style.css b/view/theme/dispy/style.css
index 49148eed4..cf3b83cfa 100644
--- a/view/theme/dispy/style.css
+++ b/view/theme/dispy/style.css
@@ -1,18 +1,30 @@
 /*
  * dispy
  *
- * modernised, sort of, by simon <http://simon.kisikew.org/>
+ * maintainer: simon <http://simon.kisikew.org/>
+ * author: unknown
  *
  */
 
 /* from html5boilerplate */
 
 /* these are to tell browsers they should be displayed a certain way */
-article, aside, details, figcaption, figure, footer,
-header, hgroup, nav, section {
+article,
+aside,
+details,
+figcaption,
+figure,
+footer,
+header,
+hgroup,
+nav,
+section {
     display: block;
 }
-audio, canvas, video, time {
+audio,
+canvas,
+video,
+time {
     display: inline-block;
     *display: inline;
     *zoom: 1;
@@ -45,31 +57,42 @@ body {
     font-size: 16px;
     line-height: 1.1em;
 }
-body, button, input, select, textarea {
+body,
+button,
+input,
+select,
+textarea {
     font-family: sans-serif;
     color: #222;
-    background-color: #efefef;
+    background-color: #e8e8e8;
 }
 select {
-	border: 1px #555 dotted;
-	padding: 3px;
-	margin: 2px;
-	color: #222;
-	background: #efefef;
+    border: 1px #555 dotted;
+    padding: 3px;
+    margin: 3px;
+    color: #222;
+    background: #e8e8e8;
 }
 option {
-	padding: 3px;
-	vertical-align: middle;
-	color: #222;
-	background: #efefef;
+    padding: 3px;
+    color: #222;
+    background: #e8e8e8;
 }
-li {
-	padding: 0 0 0 2px;
+option[selected="selected"] {
+    color: #111;
+	background: #cca;
+}
+ul, ol {
+    padding: 0;
 }
 /* remember to define focus styles! */
 :focus {
     outline: 0;
 }
+[disabled="disabled"] {
+    background: #ddd;
+    color: #333;
+}
 
 /* remember to highlight inserts somehow! */
 ins {
@@ -134,7 +157,7 @@ a:hover img {
 }
 blockquote {
     background: #eee;
-	color: #111;
+    color: #111;
     text-indent: 5px;
     padding: 5px;
     border: 1px #aaa solid;
@@ -158,36 +181,25 @@ a:hover {
 .fakelink:hover {
     color: #729fcf;
 }
-input[type=submit] {
-    background-color: #555753;
-	color: #eeeeec;
-	font-weight: bold;
-    margin-top: 10px;
-    height: 22px;
-    -webkit-border-radius: 5px;
-    -moz-border-radius: 5px;
-    border-radius: 5px;
-    border: 0;
-}
 .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;
+    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;
+    margin-top: 60px;
+    display: block;
+    clear: both;
+    text-align: center;
 }
 .pager span {
     padding: 4px;
@@ -204,20 +216,25 @@ input[type=submit] {
  */
 /* .tool .action */
 .action {
-	margin: 5px 0;
+    margin: 5px 0;
 }
 .tool {
-	margin: 5px 0;
-	list-style: none;
+    margin: 5px 0;
+    list-style: none;
+}
+#articlemain {
+    width: 100%;
+    height: 100%;
+    margin: 0 auto;
 }
 
 
 /**
- * 	login
+ * login
  */
-aside .field {
-	overflow: hidden;
-	width: 200px;
+#asidemain .field {
+    overflow: hidden;
+    width: 200px;
 }
 #login-extra-links {
     overflow: auto !important;
@@ -232,34 +249,34 @@ aside .field {
     float: none !important;
     height: 100% !important;
     position: relative !important;
-	width: 100% !important;
+    width: 100% !important;
 }
 #login_standard .field label {
-	width: 200px !important;
+    width: 200px !important;
 }
 #login_standard input, #login_standard input[type="text"] {
-	margin: 0 0 8px !important;
+    margin: 0 0 8px !important;
     width: 210px !important;
 }
 #login-submit-wrapper {
-	margin: 0 !important;
+    margin: 0 !important;
 }
 #login-submit-button {
     margin-left: 0px !important;
 }
-aside #login_openid {
-	position: relative !important;
-	float: none !important;
-	margin-left: 0px !important;
-	height: auto !important;
-	width: 200px !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;
+    width: 180px !important;
+    overflow: hidden !important;
 }
 #login_openid label {
-	width: 180px !important;
+    width: 180px !important;
 }
 
 
@@ -267,79 +284,76 @@ aside #login_openid {
  * nav
  */
 nav {
-	height: 60px;
-	display: block;
-	background-color: #2e3436;
-	color: #eeeeec;
-	position: relative;
-	padding: 20px 20px 10px 95px;
-    margin-left: auto;
-    margin-right: auto;
+    height: 60px;
+    background-color: #2e3436;
+    color: #eeeeec;
+    position: relative;
+    padding: 20px 20px 10px 95px;
 }
 nav a {
-	text-decoration: none;
-	color: #eeeeec;
-	border: 0px;
+    text-decoration: none;
+    color: #eeeeec;
+    border: 0px;
 }
 nav a:hover {
-	text-decoration: none;
-	color: #eeeeec;
+    text-decoration: none;
+    color: #eeeeec;
     border: 0px;
 }
 nav #banner {
-	display: block;
-	position: absolute;
-	left: 51px;
-	top: 25px;
+    display: block;
+    position: absolute;
+    left: 51px;
+    top: 25px;
 }
 nav #banner #logo-text a {
-	font-size: 40px;
-	font-weight: bold;
-	margin-left: 3px;
+    font-size: 40px;
+    font-weight: bold;
+    margin-left: 3px;
 }
 ul#user-menu-popup {
-	display: none;
-	position: absolute;
-	background-color: #555753;
-	width: 100%;
+    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;
-	z-index: 10000;
+    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;
+    display: block;
 }
 ul#user-menu-popup li a {
-	display: block;
-	padding: 5px;
+    display: block;
+    padding: 5px;
 }
 ul#user-menu-popup li a:hover {
-	color: #2e3436;
-	background-color: #eeeeec;
+    color: #2e3436;
+    background-color: #eeeeec;
 }
 ul#user-menu-popup li a.nav-sep {
-	border-top: 1px solid #eeeeec;
+    border-top: 1px solid #eeeeec;
 }
 nav .nav-link {
-	float: right;
-	display: block;
-	width: 22px;
-	height: 22px;
-	overflow: hidden;
-	margin: 0px 5px 5px;
-	text-indent: 50px;
-	background: transparent url(icons.png) 0 0 no-repeat;
+    display: inline-block;
+    width: 22px;
+    height: 22px;
+    overflow: hidden;
+    margin: 0px 5px 5px;
+    text-indent: 50px;
+    background: transparent url(icons.png) 0 0 no-repeat;
 }
 #nav-apps-link {
-	background-position: 0 -66px;
+    background-position: 0 -66px;
 }
 #nav-apps-link:hover {
-	background-position: -22px -66px;
+    background-position: -22px -66px;
 }
 #nav-community-link {
     background-position: 0 -22px;
@@ -354,16 +368,16 @@ nav .nav-link {
     background-position: -22px -22px;
 }
 #nav-directory-link {
-	background-position: -44px -154px;
+    background-position: -44px -154px;
 }
 #nav-directory-link:hover {
-	background-position: -66px -154px;
+    background-position: -66px -154px;
 }
 #nav-help-link {
-	background-position: 0 -110px;
+    background-position: 0 -110px;
 }
 #nav-help-link:hover {
-	background-position: -22px -110px;
+    background-position: -22px -110px;
 }
 #nav-home-link {
     background-position: -44px -132px;
@@ -372,22 +386,22 @@ nav .nav-link {
     background-position: -66px -132px;
 }
 #nav-intro-link {
-	background-position: 0px -190px;
+    background-position: 0px -190px;
 }
 #nav-intro-link:hover {
-	background-position: -44px -190px;
+    background-position: -44px -190px;
 }
 #nav-login-link {
-	background-position: 0 -88px;
+    background-position: 0 -88px;
 }
 #nav-login-link:hover {
-	background-position: -22px -88px;
+    background-position: -22px -88px;
 }
 #nav-logout-link {
-	background-position: 0 -88px;
+    background-position: 0 -88px;
 }
 #nav-logout-link:hover {
-	background-position: -22px -88px;
+    background-position: -22px -88px;
 }
 #nav-messages-link {
     background-position: -44px -88px;
@@ -408,10 +422,10 @@ nav .nav-link {
     background-position: -22px -177px;
 }
 #nav-search-link {
-	background-position: 0 -44px;
+    background-position: 0 -44px;
 }
 #nav-search-link:hover {
-	background-position: -22px -44px;
+    background-position: -22px -44px;
 }
 #profile-link,
 #profile-title, 
@@ -432,6 +446,8 @@ nav .nav-link {
 .icon, .hover, .focus, .pointer {
     cursor: pointer;
 }
+
+
 /* popup notifications */
 div.jGrowl div.notice {
     background: #511919 url("../../../images/icons/48/notice.png") no-repeat 5px center;
@@ -444,10 +460,10 @@ div.jGrowl div.info {
     padding-left: 58px;
 }
 #nav-notifications-menu {
-    margin: 30px 0 0 -45px;
-    width: 300px;
-    max-height: 400px;
-    overflow: auto;
+    margin: 30px 0 0 -20px;
+    width: 275px;
+    max-height: 300px;
+    overflow-y: auto;
     font-size: 9pt;
 }
 #nav-notifications-menu .contactname {
@@ -463,7 +479,6 @@ div.jGrowl div.info {
     display: block;
 }
 #nav-notifications-menu li {
-    padding: 7px 0px 7px 10px;
     word-wrap: normal;
     border-bottom: 1px solid #000;
 }
@@ -474,18 +489,19 @@ div.jGrowl div.info {
     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");
+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: 7px;
+    height: 20px;
+    width: 170px;
+    position: absolute;
+    top: -19px;
+    left: 4px;
 }
 #nav-floater {
     position: fixed;
@@ -493,121 +509,135 @@ nav #nav-notifications-linkmenu.on .icon.s22.notify, nav #nav-notifications-link
     right: 1%;
     padding: 5px;
     background: #2e3436;
-	color: transparent;
+    color: transparent;
     border-radius: 5px;
     z-index: 100;
-	width: 300px;
-	height: 60px;
+    width: 300px;
+    height: 60px;
 }
 #nav-buttons {
     clear: both;
-	list-style: none;
-	padding: 0px;
-	margin: 0 7px 0 0;
-	height: 25px;
+    list-style: none;
+    padding: 0px;
+    margin: 0px;
+    height: 25px;
 }
-#nav-buttons li {
-	padding: 0;
+#nav-buttons > li {
+    padding: 0;
+	display: inline-block;
+	margin: 0px -4px 0px 0px;
 }
 .floaterflip {
-	display: block;
+    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;
+    width: 22px;
+    height: 22px;
+    overflow: hidden;
+    margin: 0px;
+    background: transparent url(icons.png) -190px -60px no-repeat;
 }
 .search-box {
-	display: inline-block;
-	margin: 5px;
-	position: fixed;
-	right: 0px;
-	bottom: 0px;
-	z-index: 100;
-	background: #1d1f1d;
-	border-radius: 5px;
+    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;
+    border: 1px #eec solid;
+    background: #2e3436;
+    color: #eec;
 }
 .search-box #search-text {
-	margin: 8px;
-	width: 10em;
-	color: #eec;
+    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;
+    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;
+    top: 4px;
+    left: 10px;
+    padding: 2px;
 }
 #user-menu > a {
-	vertical-align: top;
+    vertical-align: top;
 }
 #user-menu-label {
-   	font-size: 12px;
+    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;
+    width: 30px;
+    height: 19px;
+    background: transparent url(notifications.png) 0 0 no-repeat;
+    color: #222;
+    font-weight: bold;
+    font-size: 0.8em;
+    padding-top: 0.2em;
+    text-align: center;
+    float: left;
+    margin: 0 -1px 0 3px;
+    display: block;
+    visibility: hidden;
 }
 .nav-ajax-update.show, .nav-ajax-left.show {
     visibility: visible;
 }
 #net-update {
-	background-position: 0px 0px;
+    background-position: 0px 0px;
 }
 #mail-update {
-	background-position: -30px 0;
+    background-position: -30px 0;
 }
 #notify-update {
-	background-position: -60px 0px;
+    background-position: -60px 0px;
 }
 #home-update {
-	background-position: -90px 0px;
+    background-position: -90px 0px;
 }
 #intro-update {
-	background-position: -120px 0px;
+    background-position: -120px 0px;
 }
 #lang-select-icon {
-	cursor: pointer;
-	position: fixed;
-	left: 28px;
-	bottom: 6px;
-	z-index: 10;
+    cursor: pointer;
+    position: fixed;
+    left: 28px;
+    bottom: 6px;
+    z-index: 10;
 }
 #language-selector {
     position: fixed;
     bottom: 2px;
     left: 52px;
-	z-index: 10;
+    z-index: 10;
 }
 .menu-popup {
     position: absolute;
@@ -669,121 +699,135 @@ nav #nav-notifications-linkmenu.on .icon.s22.notify, nav #nav-notifications-link
 }
 
 
-/** sysmsg **/
+/**
+ * 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;
+    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;
+    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;
+    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;
+    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;
+    display: block;
+    margin: 2px 0px;
+    border-top: 1px solid #ccccce;
 }
 
 
 /**
-* aside
-**/
-aside {
-    position: absolute;
-    right: 15px;
-    width: 245px;
-	padding-top: 15px;
+ * 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;
+    font-size: 1.7em;
+    font-weight: bold;
+    border-bottom: 1px solid #729fcf;
+    padding-bottom: 3px;
 }
 .vcard #profile-photo-wrapper {
-	margin: 20px;
+    margin: 20px;
 }
 /* http://css-tricks.com/snippets/css/css-box-shadow/
- * box-shadow:
- * 1. The horizontal offset of the shadow, positive means
- * the shadow will be on the right of the box, a negative
- * offset will put the shadow on the left of the box.
- * 2. The vertical offset of the shadow, a negative one
- * means the box-shadow will be above the box, a
- * positive one means the shadow will be below the box.
- * 3. The blur radius (optional), if set to 0 the shadow
- * will be sharp, the higher the number, the more blurred
- * it will be.
- * 4. The spread radius (optional), positive values increase
- * the size of the shadow, negative values decrease the size.
- * Default is 0 (the shadow is same size as blur).
- * 5. Colo[u]r
- */
+* box-shadow:
+* 1. The horizontal offset of the shadow, positive means
+* the shadow will be on the right of the box, a negative
+* offset will put the shadow on the left of the box.
+* 2. The vertical offset of the shadow, a negative one
+* means the box-shadow will be above the box, a
+* positive one means the shadow will be below the box.
+* 3. The blur radius (optional), if set to 0 the shadow
+* will be sharp, the higher the number, the more blurred
+* it will be.
+* 4. The spread radius (optional), positive values increase
+* the size of the shadow, negative values decrease the size.
+* Default is 0 (the shadow is same size as blur).
+* 5. Colo[u]r
+*/
 .vcard #profile-photo-wrapper img {
-	box-shadow: 3px 3px 10px 0 #000;
+    box-shadow: 3px 3px 10px 0 #000;
 }
-aside h4 {
-	font-size: 1.2em;
+#asidemain h4 {
+    font-size: 1.2em;
 }
-aside #viewcontacts {
-	text-align: right;
+#asidemain #viewcontacts {
+    text-align: right;
 }
 .aprofile dt {
+    background: transparent;
     color: #666666;
-	background: transparent;
-	font-weight: bold;
+    font-weight: bold;
     box-shadow: 1px 1px 5px 0 #000;
     margin: 15px 0 5px;
     padding-left: 5px;
 }
 #profile-extra-links ul {
-	margin-left: 0px;
+    margin-left: 0px;
     padding-left: 0px;
     list-style: none;
 }
 #dfrn-request-link {
-	background:#3465A4 url(connect.png) no-repeat 95% center;
-	border-radius:5px 5px 5px 5px;
-	color:#fff;
-	display:block;
-	font-size:1.2em;
-	padding:.2em .5em;
+    background: #3465A4 url(connect.png) no-repeat 95% center;
+    border-radius: 5px 5px 5px 5px;
+    color: #fff;
+    display: block;
+    font-size: 1.2em;
+    padding: 0.2em 0.5em;
+}
+#wallmessage-link {
+    /*background: #3465A4 url(connect.png) no-repeat 95% center;*/
+    /*border-radius: 5px 5px 5px 5px;*/
+    color: #eee;
+    display: block;
+    font-size: 1.2em;
+    padding: 0.2em 0.5em;
 }
 #netsearch-box {
-	margin: 20px 0px 30px;
+    margin: 20px 0px 30px;
     width: 150px;
 }
 #netsearch-box #search-submit {
     margin: 5px 5px 0px 0px;
 }
 .ttright {
-	margin: 0px 0px 0px 0px;
+    margin: 0px 0px 0px 0px;
 }
 
 
 /**
-* contacts block
-*/
+ * contacts block
+ */
 .contact-block-div {
     width: 50px;
     height: 50px;
@@ -801,20 +845,20 @@ aside #viewcontacts {
 
 /**
  * jot
- **/
+ */
 #jot {
-  /*width: 785px;*/
-  margin: 10px 0 20px 0px;
-  width: 100%;
+/*width: 785px;*/
+margin: 10px 0 20px 0px;
+width: 100%;
 }
 #jot #jot-tools {
-  margin: 0px;
-  padding: 0px;
-  height: 35px;
-  overflow: none;
-  width: 100%;
-  /*background-color: #0e232e;*/
-  /*border-bottom: 2px solid #9eabb0;*/
+margin: 0px;
+padding: 0px;
+height: 35px;
+overflow: none;
+width: 100%;
+/*background-color: #0e232e;*/
+/*border-bottom: 2px solid #9eabb0;*/
 }
 #jot #jot-tools span {
     float: left;
@@ -840,36 +884,71 @@ aside #viewcontacts {
     margin-top: 10px;
 }
 #jot #jot-title {
-	border: 1px solid #ccc;
+    border: 1px solid #ccc;
     margin: 0 0 5px;
     height: 20px;
     width: 90%;
     font-weight: bold;
     border-radius: 5px;
-	vertical-align: middle;
+    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;
+    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;
+    margin-bottom: 10px;
+    background: #777;
 }
 #profile-jot-text_ifr {
-	width:99.900002% !important;
+    width:99.900002% !important;
+}
+#profile-jot-text_toolbargroup {
+    background: #777;
+}
+.mceCenter table tr {
+    background: #777;
 }
 [id$="jot-text_ifr"] {
-	width: 99.900002% !important;
-	color: #2e2f2e;
-	background: #eec;
+    width: 99.900002% !important;
+    color: #2e2f2e;
+    background: #eec;
 }
 [id$="jot-text_ifr"] .mceContentBody {
-	color: #2e2f2e;
-	background: #eec;
+    color: #2e2f2e;
+    background: #eec;
+}
+.defaultSkin tr.mceFirst {
+    background: #777;
+}
+.defaultSkin td.mceFirst {
+	background-color: #eec;
+}
+.defaultSkin td.mceLast {
+	background-color: #eec;
+}
+.defaultSkin span.mceIcon, .defaultSkin img.mceIcon {
+	background-color: #eec;
+}
+.defaultSkin .mceButtonDisabled .mceIcon {
+	background-color: #eec;
 }
 #profile-attach-wrapper,
 #profile-audio-wrapper,
@@ -880,58 +959,58 @@ aside #viewcontacts {
 #profile-upload-wrapper,
 #profile-video-wrapper {
     float: left;
-	margin: 0 20px 0 0;
+    margin: 0 20px 0 0;
 }
 #profile-rotator-wrapper {
-	float: right; 
+    float: right; 
 }
 #profile-jot-tools-end,
 #profile-jot-banner-end {
-	clear: both;
+    clear: both;
 }
 #profile-jot-email-wrapper {
-	margin:10px 10% 0;
-	border:1px solid #555753;
-	border-bottom:0;
+    margin:10px 10% 0;
+    border:1px solid #555753;
+    border-bottom:0;
 }
 #profile-jot-email-label {
-	background-color:#555753;
-	color:#ccccce;
-	padding:5px;
+    background-color:#555753;
+    color:#ccccce;
+    padding:5px;
 }
 #profile-jot-email {
-	width:90%;
-	margin:5px;
+    width:90%;
+    margin:5px;
 }
 #profile-jot-networks {
-	margin: 0 10%;
-	border: 1px solid #555753;
-	border-top: 0;
-	border-bottom: 0;
-	padding: 5px;
+    margin: 0 10%;
+    border: 1px solid #555753;
+    border-top: 0;
+    border-bottom: 0;
+    padding: 5px;
 }
 #profile-jot-net {
-	margin: 5px 0;
+    margin: 5px 0;
 }
 #jot-preview-link {
     margin: 0 0 0 10px;
     border: 0;
     text-decoration: none;
-	float: right;
+    float: right;
 }
 .icon-text-preview {
-	margin: 0 0 -18px 0;
-	display: block;
+    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;
+    float: right;
+    cursor: pointer;
 }
 #profile-jot-perms { 
-	float: right;
+    float: right;
     background-color: #555753;
     height: 22px;
     width: 20px;
@@ -943,118 +1022,127 @@ aside #viewcontacts {
     margin: 0 10px 0 10px;
 }
 #profile-jot-plugin-wrapper {
-	width: 1px;
-	margin: 10px 0 0 0;
-	float: right;
+    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;
+    float: right;
+    width: 100%;
+    list-style: none;
+    margin: 10px 0 0 0;
+    padding: 0;
 }
 #profile-jot-submit {
-	height: 22px;
-	background-color: #555753;
-	color: #eeeeec;
-	-webkit-border-radius: 5px;
-	-moz-border-radius: 5px;
-	border-radius: 5px;
-	border: 0;
-	margin: 0;
-	float: right;
+    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;
+    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;
+    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;
+    width:47%;
+    float:left;
 }
 #contact_allow_wrapper,
 #contact_deny_wrapper,
 #acl-deny-outer-wrapper {
-	width:47%;
-	float:right;
+    width:47%;
+    float:right;
 }
 #acl-permit-text {
-	background-color: #555753;
-	color: #ccccce;
-	padding: 5px;
-	float: left;
+    background-color: #555753;
+    color: #ccccce;
+    padding: 5px;
+    float: left;
 }
 #jot-public {
-	background-color: #555753;
-	color: #ff0000;
-	padding: 5px;
-	float: left;
+    background-color: #555753;
+    color: #ff0000;
+    padding: 5px;
+    float: left;
 }
 #acl-deny-text {
-	background-color: #555753;
-	color: #ccccce;
-	padding: 5px;
-	float: left;
+    background-color: #555753;
+    color: #ccccce;
+    padding: 5px;
+    float: left;
 }
 #acl-permit-text-end,
 #acl-deny-text-end {
-	clear: both;
+    clear: both;
 }
 #jot-title-desc {
-	color: #ccc;
+    color: #ccc;
 }
 #profile-jot-desc {
-	color: #a00;
-	margin: 5px 0;
+    color: #a00;
+    margin: 5px 0;
 }
 #jot-title-wrapper {
-	margin-bottom: 5px;
+    margin-bottom: 5px;
 }
 #jot-title-display {
-	font-weight: bold;
+    font-weight: bold;
 }
 .jothidden {
     display: none;
 }
 #jot-preview-content {
     background-color: #ffffe0;
-	color: #111;
+    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;
+    border: 0;
+    border-radius: 0px;
 }
 
 
 /**
  * section
  */
-section {
-    margin: 20px 9% 0 4%;
+#sectionmain {
+    margin: 20px;
     font-size: 0.8em;
-    padding-right: 230px;
-	min-width: 475px;
-	width: 65%;
+    min-width: 475px;
+    width: 67%;
+    float: left;
+    display: inline;
 }
 
-/** tabs **/
+
+/**
+ * tabs
+ */
 .tabs {
     list-style: none;
     margin: 10px 0;
@@ -1062,12 +1150,12 @@ section {
 }
 .tabs li {
     display: inline;
-	font-size: smaller;
-	font-weight: bold;
+    font-size: smaller;
+    font-weight: bold;
 }
 .tab {
     border: 1px solid #729fcf;
-	padding: 4px;
+    padding: 4px;
 }
 .tab:hover, .tab.active:hover {
     background: #729fcf;
@@ -1078,58 +1166,60 @@ section {
     color: #eeeeec;
 }
 .tab.active {
-	background: #729fcf;
+    background: #729fcf;
     color: #eeeeec;
 }
 .tab.active a {
-	color: #729fcf;
+    color: #729fcf;
 }
 .tab a {
-	border: 0;
-	text-decoration: none;
+    border: 0;
+    text-decoration: none;
 }
 
 
 /**
- * 	items
+ * items
  */
 .wall-item-outside-wrapper {
-	border: 1px solid #aaa;
-	border-radius: 5px;
+    border: 1px solid #aaa;
+    border-radius: 5px;
+    box-shadow: 5px 0 10px 0 #888;
 }
 .wall-item-outside-wrapper.comment {
-	margin-top: 5px;
+    margin-top: 5px;
 }
 .wall-item-outside-wrapper-end {
     clear: both;
 }
 .wall-item-content-wrapper {
     position: relative;
-	padding: 10px;
-	width: auto;
+    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;
+    border-radius: 5px;
 }
 .heart {
-	color: red;
+    color: red;
 }
 .wall-item-content {
-	overflow-x: auto;
-	margin: 0px 15px 0px 5px;
+    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 ;) */
+* might break things for people. we shall see ;) */
 [id^="tread-wrapper"], [class^="tread-wrapper"] {
     margin: 15px 0 0 0;
     padding: 0px;
-	/*overflow-x: auto;*/
+    /*overflow-x: auto;*/
 }
 .wall-item-photo-menu {
     display: none;
@@ -1163,7 +1253,7 @@ section {
     border-radius: 5px;
 }
 [class^="wall-item-tools"] > *, [class^="wall-item-tools"] > * > * {
-	/*margin: 0 0 5px 0;*/
+    /*margin: 0 0 5px 0;*/
 }
 .wall-item-tools {
     float: right;
@@ -1199,41 +1289,41 @@ section {
     width: 25px;
 }
 .wall-item-title {
-	font-size: 1.2em;
-	font-weight: bold;
+    font-size: 1.2em;
+    font-weight: bold;
     margin-bottom: 1em;
 }
 .wall-item-body {
-	margin: 20px 20px 10px 0px;
+    margin: 20px 20px 10px 0px;
     text-align: left;
-	overflow-x: auto;
+    overflow-x: auto;
 }
 .wall-item-lock-wrapper {
-	float: right;
+    float: right;
     height: 22px;
     margin: 0 -5px 0 0;
     width: 22px;
-	opacity: 1;
+    opacity: 1;
 }
 .wall-item-dislike,
 .wall-item-like {
-	clear: left;
-	font-size: 0.8em;
-	color: #878883;
-	margin: 5px 0 5px 120px;
+    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;
+    clear: left;
+    font-size: 0.8em;
+    color: #878883;
+    margin: 20px 20px 0 110px;
 }
 .wall-item-ago {
-	display: inline;
-	padding-left: 10px;
+    display: inline;
+    padding-left: 10px;
 }
 .wall-item-wrapper-end {
-	clear:both;
+    clear:both;
 }
 .wall-item-location {
     margin-top: 15px;
@@ -1282,17 +1372,17 @@ section {
     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;
+    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;
@@ -1314,27 +1404,27 @@ section {
     width: 100%;
 }
 #connect-services-header {
-
+    margin: 5px 0 0 0;
 }
 #connect-services {
-	margin: 5px 0 0 0;
+    margin: 5px 0 0 0;
 }
 #extra-help-header {
-
+    margin: 5px 0 0 0;
 }
 #extra-help {
-	margin: 5px 0 0 0;
+    margin: 5px 0 0 0;
 }
 #postit-header {
-
+    margin: 5px 0 0 0;
 }
 #postit {
-	margin: 5px 0 0 0;
+    margin: 5px 0 0 0;
 }
 
 
 /**
- * 	comment
+ * comment
  */
 .ccollapse-wrapper {
     font-size: 0.9em;
@@ -1353,7 +1443,7 @@ section {
     height: 40px;
 }
 .wall-item-outside-wrapper.comment .wall-item-photo-menu-button {
-	width: 50px;
+    width: 50px;
     top: 45px;
     background-position: 35px center;
 }
@@ -1377,14 +1467,24 @@ section {
 .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;
+    width: 20px;
+    height: 20px;
 }
 .comment-edit-photo-link, .comment-edit-photo {
-	float: left;
-	margin-left: 10px;
+    margin-left: 10px;
 }
 .my-comment-photo {
     width: 40px;
@@ -1396,32 +1496,32 @@ section {
     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;	
+    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;
+    color: #999999;
 }
 .comment-edit-text-full {
-	height: 10em;
+    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;	
+    -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;
+    width: 90%;
+    margin: 5px 5px 10px 50px;
+    text-align: right;
 }
 .comment-edit-submit {
     height: 22px;
@@ -1436,22 +1536,22 @@ section {
 
 /**
  * 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%;
+    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;
@@ -1463,6 +1563,10 @@ div[id$="wrapper"] {
 div[id$="wrapper"] br {
     clear: left;
 }
+[id$="-end"], [class$="end"] {
+	clear: both;
+	margin: 0 0 10px 0;
+}
 #advanced-profile-with {
     margin-left: 200px;
 }
@@ -1470,10 +1574,10 @@ div[id$="wrapper"] br {
 
 /**
  * photos
- **/
+ */
 .photos {
-	height: auto;
-	overflow: auto;
+    height: auto;
+    overflow: auto;
 }
 #photo-top-links {
     margin-bottom: 30px;
@@ -1485,7 +1589,7 @@ div[id$="wrapper"] br {
     -webkit-box-shadow: 3px 3px 10px 0 #000;
     box-shadow: 3px 3px 10px 0 #000;
     background-color: #eee;
-	color: #111;
+    color: #111;
     -webkit-border-radius: 5px;
     -moz-border-radius: 5px;
     border-radius: 5px;
@@ -1521,11 +1625,8 @@ div[id$="wrapper"] br {
     margin: 0 5px;
 }
 #photo-photo {
-	position: relative;
-	float:left;
-}
-#photo-photo-end {
-    clear: both;
+    position: relative;
+    float:left;
 }
 #photo-prev-link,
 #photo-next-link {
@@ -1599,10 +1700,10 @@ div[id$="wrapper"] br {
     margin-bottom: 15px;
 }
 #photo-edit-caption {
-	width: 100%;
+    width: 100%;
 }
 #photo-edit-newtag {
-	width: 100%;
+    width: 100%;
 }
 #photo-like-div {
     margin-bottom: 25px;
@@ -1624,15 +1725,15 @@ div[id$="wrapper"] br {
 }
 
 /**
- * 	message
+ * message
  */
 .prvmail-text {
     width: 100%;
 }
 #prvmail-subject {
     width: 100%;
-	color: #eec;
-	background: #444;
+    color: #eec;
+    background: #444;
 }
 #prvmail-submit-wrapper {
     margin-top: 10px;
@@ -1656,7 +1757,7 @@ div[id$="wrapper"] br {
 }
 .mail-list-sender-name {
     display: inline;
-	font-size: 1.1em;
+    font-size: 1.1em;
 }
 .mail-list-date {
     display: inline;
@@ -1664,7 +1765,7 @@ div[id$="wrapper"] br {
     padding-left: 10px;
 }
 .mail-list-sender-name, .mail-list-date {
-	font-style: italic;
+    font-style: italic;
 }
 .mail-list-subject {
     font-size: 1.2em;
@@ -1674,7 +1775,7 @@ div[id$="wrapper"] br {
 }
 .mail-list-outside-wrapper-end {
     clear: both;
-	border-bottom: 1px #eec dotted;
+    border-bottom: 1px #eec dotted;
 }
 .mail-conv-sender {
     float: left;
@@ -1704,15 +1805,15 @@ div[id$="wrapper"] br {
 
 
 /**
- * 	contacts
+ * contacts
  */
 .view-contact-wrapper,
 .contact-entry-wrapper {
     float: left;
     margin: 0 5px 40px 0;
     width: 120px;
-	height: 120px;
-	padding: 3px;
+    height: 120px;
+    padding: 3px;
     position: relative;
 }
 .contact-direction-wrapper {
@@ -1727,7 +1828,7 @@ div[id$="wrapper"] br {
 
 }
 .contact-entry-photo {
-	margin-left: 20px;
+    margin-left: 20px;
 }
 .contact-entry-name {
     width: 120px;
@@ -1735,7 +1836,7 @@ div[id$="wrapper"] br {
     /*overflow: hidden;*/
 }
 .contact-entry-photo {
-	position: relative;
+    position: relative;
 }
 .contact-entry-edit-links .icon {
     border: 1px solid #babdb6;
@@ -1778,7 +1879,7 @@ div[id$="wrapper"] br {
     margin-left:5px;
 }
 #contact-edit-nav-wrapper .icon {
-	border: 1px solid #babdb6;
+    border: 1px solid #babdb6;
     -webkit-border-radius: 3px;
     -moz-border-radius: 3px;
     border-radius: 3px;	
@@ -1823,7 +1924,7 @@ div[id$="wrapper"] br {
     width: auto;
     border: 2px solid #444;
     background: #eee;
-	color: #111;
+    color: #111;
     position: absolute;
     left: 0px; top: 90px;
     display: none;
@@ -1846,7 +1947,7 @@ div[id$="wrapper"] br {
 
 
 /**
- * 	register, settings & profile forms
+ * register, settings & profile forms
  */
 .openid {
 
@@ -1863,7 +1964,7 @@ div[id$="wrapper"] br {
     -moz-border-radius: 5px;
     border-radius: 5px;
     padding: 5px;
-	color: #111;
+    color: #111;
 }
 #settings-default-perms {
     margin-bottom: 20px;
@@ -1872,7 +1973,15 @@ div[id$="wrapper"] br {
 #profile-edit-form div {
     clear: both;
 }
-
+.settings-block {
+    
+}
+.settings-block label {
+    clear: left;
+}
+.settings-block input {
+    margin: 10px 5px;
+}
 /*#register-form label,     */
 /*#profile-edit-form label {*/
 /*    width: 300px;         */
@@ -1886,23 +1995,23 @@ div[id$="wrapper"] br {
 /*    margin-bottom: 20px; */
 /*}                        */
 #profile-edit-marital-label span {
-	margin: -4px;
+    margin: -4px;
 }
 .settings-submit-wrapper,
 .profile-edit-submit-wrapper {
     margin: 30px 0px;
 }
 .profile-edit-side-div {
-	display: none;
+    display: none;
 }
 /*.profile-edit-side-div:hover {
-	display: block;
+    display: block;
 }
 .profile-edit-side-link {
-	margin: 3px 0px 0px 70px;
+    margin: 3px 0px 0px 70px;
 }*/
 #profiles-menu-trigger {
-	margin: 0px 0px 0px 25px;
+    margin: 0px 0px 0px 25px;
 }
 .profile-listing {
     float: left;
@@ -1911,16 +2020,16 @@ div[id$="wrapper"] br {
 .icon-profile-edit {
     background: url("icons.png") -150px 0px no-repeat;
     border: 0;
-	cursor: pointer;
+    cursor: pointer;
     display: block;
     float: right;
-	width: 20px;
+    width: 20px;
     height: 20px;
     margin: 0 0 -18px;
-	position: absolute;
+    position: absolute;
     text-decoration: none;
-	top: 18px;
-	right: 226px;
+    top: 113px;
+    right: 260px;
 }
 #profile-edit-links ul {
     margin: 20px 0;
@@ -1928,26 +2037,32 @@ div[id$="wrapper"] br {
     list-style: none;
 }
 .marital {
-	margin-top: 5px;
+    margin-top: 5px;
 }
 #register-sitename {
     display: inline;
     font-weight: bold;
 }
 #advanced-expire-popup {
-	background: #2e2f2e;
-	color: #eec;
+    background: #2e2f2e;
+    color: #eec;
 }
 #id_ssl_policy {
-	width: 374px;
+    width: 374px;
+}
+#theme-preview {
+
+}
+#theme-preview img {
+    margin: 10px 10px 10px 288px;
 }
 
 
 /**
- * 	contacts selector
+ * contacts selector
  */
 .group-delete-wrapper {
-	margin: -31px 50px 0 0;
+    margin: -31px 50px 0 0;
     float: right;
 }
 /*.group-delete-icon {
@@ -2070,67 +2185,70 @@ div[id$="wrapper"] br {
 
 /**
  * events
- **/
+ */
 .clear { clear: both; }
 .eventcal {
     float:left;
     font-size:20px;
 }
+.event {
+    background: #2e2f2e;
+}
 .vevent {
     border:1px solid #ccc;
 }
 .vevent .event-description, .vevent .event-location {
-	margin-left: 10px;
-	margin-right: 10px;
+    margin-left: 10px;
+    margin-right: 10px;
 }
 .vevent .event-start {
-	margin-left: 10px;
-	margin-right: 10px;
+    margin-left: 10px;
+    margin-right: 10px;
 }
-
 #new-event-link {
-	margin-bottom: 10px;
+    margin-bottom: 10px;
 }
 .edit-event-link, .plink-event-link {
-	float: left;
-	margin-top: 4px;
-	margin-right: 4px;
-	margin-bottom: 15px;
+    /*float: left;      */
+    /*margin-top: 4px;  */
+    /*margin-right: 4px;*/
+    /*margin-bottom: 15px;*/
 }
 .event-description:before {
-	content: url('../../../images/calendar.png');
-	margin-right: 15px;
+    content: url('../../../images/calendar.png');
+    margin-right: 15px;
 }
 .event-start, .event-end {
-	margin-left: 10px;
-	width: 330px;
+    margin-left: 10px;
+    width: 330px;
+    font-size: smaller;
 }
 .event-start .dtstart, .event-end .dtend {
-	float: right;
+    float: right;
 }
 .event-list-date {
-	margin-bottom: 10px;
+    margin-bottom: 10px;
 }
 .prevcal, .nextcal {
-	float: left;
-	margin-left: 32px;
-	margin-right: 32px;
-	margin-top: 64px;
+    float: left;
+    margin-left: 32px;
+    margin-right: 32px;
+    margin-top: 64px;
 }
 .event-calendar-end {
-	clear: both;
+    clear: both;
 }
 .calendar {
     font-family: monospace;
 }
 .today {
-	font-weight: bold;
-	color: #FF0000;
+    font-weight: bold;
+    color: #FF0000;
 } 
 #event-start-text, 
 #event-finish-text {
-	margin-top: 10px;
-	margin-bottom: 5px;
+    margin-top: 10px;
+    margin-bottom: 5px;
 }
 #event-nofinish-checkbox,
 #event-nofinish-text,
@@ -2140,82 +2258,85 @@ div[id$="wrapper"] br {
     float:left;
 }
 #event-datetime-break {
-	margin-bottom: 10px;
+    margin-bottom: 10px;
 }
 #event-nofinish-break,
 #event-adjust-break,
 #event-share-break {
-	clear: both;
+    clear: both;
 }
 #event-desc-text, 
 #event-location-text {
-	margin-top: 10px;
-	margin-bottom: 5px;
+    margin-top: 10px;
+    margin-bottom: 5px;
 }
 #event-submit {
-	margin-top: 10px;
+    margin-top: 10px;
 }
 .body-tag {
-	margin: 10px 0;
-	opacity: 0.5;
-	filter:alpha(opacity=50);
+    margin: 10px 0;
+    opacity: 0.5;
+    filter:alpha(opacity=50);
 }
 .body-tag:hover {
-	opacity: 1.0 !important;
-	filter:alpha(opacity=100) !important;
+    opacity: 1.0 !important;
+    filter:alpha(opacity=100) !important;
 }
-.filesavetags {
-	margin: 20px 0;
-	opacity: 0.5;
-	filter:alpha(opacity=50);
+.filesavetags, .categorytags {
+    margin: 20px 0;
+    opacity: 0.5;
+    filter:alpha(opacity=50);
 }
-.filesavetags:hover {
-	margin: 20px 0;
-	opacity: 1.0 !important;
-	filter:alpha(opacity=100) !important;
+.filesavetags:hover, .categorytags:hover {
+    margin: 20px 0;
+    opacity: 1.0 !important;
+    filter:alpha(opacity=100) !important;
 }
 .item-select {
-	opacity: 0.1;
-	filter:alpha(opacity=10);
-	float: right;
-	margin-right: 10px;
+    opacity: 0.1;
+    filter:alpha(opacity=10);
+    margin: 5px 0 0 6px !important;
 }
 .item-select:hover, .checkeditem {
-	opacity: 1;
-	filter:alpha(opacity=100);
+    opacity: 1;
+    filter:alpha(opacity=100);
 }
 #item-delete-selected {
-	margin-top: 30px;
+    margin-top: 30px;
 }
 /* was tired of having no way of moving it around, so
- * here's a little 'hook' to do so */
+* here's a little 'hook' to do so */
 .delete-checked {
-	position: absolute;
-	left: 35px;
-	margin-top: 20px;
+    position: absolute;
+    left: 35px;
+    margin-top: 20px;
 }
 #item-delete-selected-end {
-	clear: both;
+    clear: both;
 }
 #item-delete-selected-icon, #item-delete-selected-desc {
-	float: left;
-	margin-right: 5px;
+    float: left;
+    margin-right: 5px;
 }
 #item-delete-selected-desc:hover {
-	text-decoration: underline;
+    text-decoration: underline;
+}
+.fc-state-highlight {
+    background: #eec;
+    color: #2e2f2e;
 }
 
 
 /**
- * 	directory
+ * directory
  */
 .directory-item {
     float: left;
-	/*margin: 50px 50px 0px 0px;*/
-	margin: 0 5px 4px 0;
-	padding: 3px;
-	width: 180px;
-	height: 250px;
+    /*margin: 50px 50px 0px 0px;*/
+    margin: 0 5px 4px 0;
+    padding: 3px;
+    width: 180px;
+    height: 250px;
     position: relative;
 }
 
@@ -2228,12 +2349,12 @@ div[id$="wrapper"] br {
 }
 .group-selected, .nets-selected, .fileas-selected {
     padding: 3px;
-	color: #111;
+    color: #111;
     background: #f8f8f8;
     font-weight: bold;
 }
 .group-selected:hover, .nets-selected:hover, .fileas-selected:hover {
-	color: #111;
+    color: #111;
 }
 .groupsideedit {
     margin-right: 10px;
@@ -2264,7 +2385,7 @@ div[id$="wrapper"] br {
     text-align: center;
 }
 #peoplefind-sidebar form {
-	margin-bottom: 10px;
+    margin-bottom: 10px;
 }
 #sidebar-new-group:hover {
     /*background: -webkit-gradient( linear, left top, left bottom, color-stop(0.05, #b20202), color-stop(1, #d60808) );*/
@@ -2279,14 +2400,14 @@ div[id$="wrapper"] br {
 #side-peoplefind-url {
     background-color: #e5e0cf;
     color: #666;
-	border: 1px 666 solid;
-	margin-right: 3px;
-	width: 75%;
+    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;
+    border: 1px 333 solid;
 }
 .nets-ul {
     list-style-type: none;
@@ -2312,7 +2433,7 @@ div[id$="wrapper"] br {
 
 
 /**
- * ADMIN
+ * admin
  */
 #pending-update {
     float:right;
@@ -2327,6 +2448,12 @@ div[id$="wrapper"] br {
 .admin.link {
     list-style-position: inside;
 }
+#adminpage {
+    color: #111;
+    background: transparent;
+    margin: 5px;
+    padding: 10px;
+}
 #adminpage dl {
     clear:left;
     margin-bottom: 2px;
@@ -2339,16 +2466,15 @@ div[id$="wrapper"] br {
     font-weight: bold;
 }
 #adminpage dd {
-	margin-left: 250px;
+    margin-left: 250px;
 }
 #adminpage h3 {
     border-bottom:1px solid #ccc;
 }
 
 #adminpage .submit {
-	clear:left;
+    clear:left;
 }
-
 #adminpage #pluginslist {
     margin: 0;
     padding: 0;
@@ -2362,10 +2488,9 @@ div[id$="wrapper"] br {
     clear: left;
 }
 #adminpage .toggleplugin {
-	float:left;
-	margin-right: 1em;
+    float:left;
+    margin-right: 1em;
 }
-
 #adminpage table {
     width: 100%;
     border-bottom: 1px solid #000;
@@ -2389,34 +2514,61 @@ div[id$="wrapper"] br {
 }
 #adminpage #users a {
 /*	color: #;*/
-	text-decoration: underline;
+    text-decoration: underline;
+}
+#users .name {
+    color: #eec;
 }
 
+
 /**
- * Form fields
+ * form fields
  */
 .field {
-	/*margin-bottom: 10px;*/
-	/*padding-bottom: 10px;*/
-	overflow: auto;
+    /*margin-bottom: 10px;*/
+    /*padding-bottom: 10px;*/
+    overflow: auto;
     width: 100%;
 }
 .field label, label {
-    float: left;
-    width: 275px;
-	display: block;
-	font-size: 1.077em;
-	margin: 0 10px 0.5em 0;
-	border: 1px #999 solid;
-	padding: 5px;
-	background: #ccc;
-	vertical-align: middle;
-	color: #111;
-}
-.field input, input[type="text"] {
-	width: 250px;
-	height: 25px;
-	border: 1px #999 solid;
+    width: 38%;
+    display: inline-block;
+    font-size: 1.077em;
+    margin: 0 10px 1em 0;
+    border: 1px #999 solid;
+    padding: 5px;
+    background: #ccc;
+    color: #111;
+}
+input,
+input[type="text"],
+input[type="password"],
+input[type="search"] {
+    width: 250px;
+    height: 25px;
+    border: 1px #999 solid;
+}
+input[type="checkbox"], input[type="radio"] {
+    border: 1px #999 solid;
+    margin: 0 0 0 0;
+	height: 15px;
+	width: 15px;
+}
+input[type="submit"], input[type="button"] {
+    background-color: #555753;
+    border: 2px outset #444;
+    border-radius: 5px;
+    box-shadow: 1px 3px 4px 0 #111;
+    color: #eeeeec;
+    cursor: pointer;
+    font-weight: bold;
+    width: auto;
+    text-shadow: 1px 1px #111;
+    -webkit-border-radius: 5px;
+    -moz-border-radius: 5px;
+}
+input[type="submit"]:active, input[type="button"]:active {
+    box-shadow: 0 0 0 0;
 }
 .field textarea {
     width: 80%;
@@ -2439,12 +2591,12 @@ div[id$="wrapper"] br {
     text-decoration: none;
 }
 .field .onoff .on {
-	background: url("../../../images/onoff.jpg") no-repeat 42px 1px #999;
+    background: url("../../../images/onoff.jpg") no-repeat 42px 1px #999;
     color: #111;
     text-align: left;
 }
 .field .onoff .off {
-	background: url("../../../images/onoff.jpg") no-repeat 2px 1px #ccc;
+    background: url("../../../images/onoff.jpg") no-repeat 2px 1px #ccc;
     color: #333;
     text-align: right;
 }
@@ -2457,34 +2609,34 @@ div[id$="wrapper"] br {
 
 
 /*
- * UPDATE
+ * update
  */
 .popup { 	
-	width: 100%;
+    width: 100%;
     height: 100%;
-	top: 0px;
+    top: 0px;
     left: 0px;
-	position: absolute;
-	display: none;
+    position: absolute;
+    display: none;
 }
 .popup .background {
-	background-color: rgba(0,0,0,128);
-	opacity: 0.5;
-	width: 100%;
+    background-color: rgba(0,0,0,128);
+    opacity: 0.5;
+    width: 100%;
     height: 100%;
-	position: absolute;
-	top:0px;
+    position: absolute;
+    top:0px;
     left:0px;
 }
 .popup .panel {
-	top: 25%;
+    top: 25%;
     left: 25%;
     width: 50%;
     height: 50%;
-	padding: 1em;
-	position: absolute;
-	border: 4px solid #000000;
-	background-color: #FFFFFF;
+    padding: 1em;
+    position: absolute;
+    border: 4px solid #000000;
+    background-color: #FFFFFF;
 }
 #panel {
     z-index: 100;
@@ -2533,32 +2685,32 @@ div[id$="wrapper"] br {
  * OAuth
  */
 .oauthapp {
-	height: auto;
+    height: auto;
     overflow: auto;
-	border-bottom: 2px solid #cccccc;
-	padding-bottom: 1em;
-	margin-bottom: 1em;	
+    border-bottom: 2px solid #cccccc;
+    padding-bottom: 1em;
+    margin-bottom: 1em;	
 }
 .oauthapp img {
-	float: left;
-	width: 48px; height: 48px;
-	margin: 10px;
+    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;
+    background-image: url("../../../images/icons/48/plugin.png");
+    background-position: center center;
+    background-repeat: no-repeat;
 }
 .oauthapp a {
-	float: left;
+    float: left;
 }
 
 
 /**
- * ICONS
+ * icons
  */
 .iconspacer {
-	display: block;
+    display: block;
     width: 16px;
     height: 16px;
 }
@@ -2569,23 +2721,89 @@ div[id$="wrapper"] br {
     background: url(icons.png) no-repeat;
     border: 0;
     text-decoration: none;
-	border-radius: 5px;
+    border-radius: 5px;
 }
 .icon:hover {
     border: 0;
     text-decoration: none;
 }
+.editicon {
+    display: inline-block;
+    width: 21px;
+    height: 21px;
+    background: url(editicons.png) no-repeat;
+    border: 0;
+    text-decoration: none;
+}
+.shadow {
+	box-shadow: 2px 2px 5px 2px #111;
+}
+.shadow:active, .shadow:focus, .shadow:hover {
+	box-shadow: 0 0 0 0;
+}
+.editicon:hover {
+	border: 0;
+}
+.boldbb {
+	background-position: 0px 0px;
+}
+.boldbb:hover {
+	background-position: -22px 0px;
+}
+.italicbb {
+	background-position: 0px -22px;
+}
+.italicbb:hover {
+	background-position: -22px -22px;
+}
+.underlinebb {
+	background-position: 0px -44px;
+}
+.underlinebb:hover {
+	background-position: -22px -44px;
+}
+.quotebb {
+	background-position: 0px -66px;
+}
+.quotebb:hover {
+	background-position: -22px -66px;
+}
+.codebb {
+	background-position: 0px -88px;
+}
+.codebb:hover {
+	background-position: -22px -88px;
+}
+.imagebb {
+	background-position: -44px 0px;
+}
+.imagebb:hover {
+	background-position: -66px 0px;
+}
+.urlbb {
+	background-position: -44px -22px;
+}
+.urlbb:hover {
+	background-position: -66px -22px;
+}
+.videobb {
+	background-position: -44px -44px;
+}
+.videobb:hover {
+	background-position: -66px -44px;
+}
 .icon.drop,
 .icon.drophide, .icon.delete {
     float: left;
+    margin: 0 2px;
 }
 .icon.s22.delete {
-	display: block;
-	background-position: -110px 0;
+    display: block;
+    background-position: -110px 0;
 }
 .icon.s22.text {
-	padding: 10px 0px 0px 25px;
-	width: 200px;
+    padding: 10px 0px 0px 25px;
+    width: 200px;
 }
 .icon.text {
     text-indent: 0px;
@@ -2601,118 +2819,118 @@ div[id$="wrapper"] br {
     margin: 0px 5px;    
 }
 .article {
-	background-position: -50px 0;
+    background-position: -50px 0;
 }
 .audio {
-	background-position: -70px 0;
+    background-position: -70px 0;
 }
 .block {
-	background-position: -90px 0px;
+    background-position: -90px 0px;
 }
 .drop, .delete {
-	background-position: -110px 0;
+    background-position: -110px 0;
 }
 .drophide {
-	background-position: -130px 0;
+    background-position: -130px 0;
 }
 .edit {
-	background-position: -150px 0;
+    background-position: -150px 0;
 }
 .camera {
-	background-position: -170px 0;
+    background-position: -170px 0;
 }
 .dislike {
-	background-position: -190px 0;
+    background-position: -190px 0;
 }
 .file-as {
-	background-position: -230px -60px;
+    background-position: -230px -60px;
 }
 .like {
-	background-position: -211px 0;
+    background-position: -211px 0;
 }
 .link {
-	background-position: -230px 0;
+    background-position: -230px 0;
 }
 .globe, .location {
-	background-position: -50px -20px;
+    background-position: -50px -20px;
 }
 .noglobe, .nolocation {
-	background-position: -70px -20px;
+    background-position: -70px -20px;
 }
 .no {
-	background-position: -90px -20px;
+    background-position: -90px -20px;
 }
 .pause {
-	background-position: -110px -20px;
+    background-position: -110px -20px;
 }
 .play {
-	background-position: -130px -20px;
+    background-position: -130px -20px;
 }
 .pencil {
-	background-position: -151px -18px;
+    background-position: -151px -18px;
 }
 .small-pencil {
-	background-position: -170px -20px;
+    background-position: -170px -20px;
 }
 .recycle {
-	background-position: -190px -20px;
+    background-position: -190px -20px;
 }
 .remote-link {
-	background-position: -210px -20px;
+    background-position: -210px -20px;
 }
 .share {
-	background-position: -230px -20px;
+    background-position: -230px -20px;
 }
 .tools {
-	background-position: -50px -40px;
+    background-position: -50px -40px;
 }
 .lock {
-	background-position: -70px -40px;
+    background-position: -70px -40px;
 }
 .unlock {
-	background-position: -88px -40px;
+    background-position: -88px -40px;
 }
 .video {
-	background-position: -110px -40px;
+    background-position: -110px -40px;
 }
 .attach {
-	background-position: -190px -40px;
+    background-position: -190px -40px;
 }
 .language {
-	background-position: -210px -40px;
+    background-position: -210px -40px;
 }
 .starred {
-	background-position: -130px -60px;
+    background-position: -130px -60px;
 }
 .unstarred {
-	background-position: -150px -60px;
+    background-position: -150px -60px;
 }
 .tagged {
-	background-position: -170px -60px;
+    background-position: -170px -60px;
 }
 .on {
-	background-position: -50px  -60px;
+    background-position: -50px  -60px;
 }
 .off {
-	background-position: -70px  -60px;
+    background-position: -70px  -60px;
 }
 .prev {
-	background-position: -90px  -60px;
+    background-position: -90px  -60px;
 }
 .next {
-	background-position: -110px  -60px;
+    background-position: -110px  -60px;
 }
 .icon.dim {
-	opacity: 0.3;
-	filter: alpha(opacity=30);
+    opacity: 0.3;
+    filter: alpha(opacity=30);
 }
 #pause {
-	position: fixed;
-	bottom: 5px;
-	right: 5px;
+    position: fixed;
+    bottom: 40px;
+    right: 30px;
 }
 .border, .border:hover {
-	border: 1px solid #babdb6;
+    border: 1px solid #babdb6;
     -webkit-border-radius: 5px;
     -moz-border-radius: 5px;
     border-radius: 5px;	
@@ -2741,7 +2959,7 @@ div[id$="wrapper"] br {
 
 
 /**
- * 	footer
+ * footer
  */
 .cc-license {
     margin-top: 100px;
@@ -2749,7 +2967,7 @@ div[id$="wrapper"] br {
 }
 footer {
     display: block;
-    margin: 50px 20%;
+    /*margin: 50px 20%;*/
     clear: both;
 }
 #profile-jot-text {
@@ -2761,23 +2979,26 @@ footer {
 }
 
 
-/** acl **/
+/**
+ * acl
+ */
 #photo-edit-perms-select,
 #photos-upload-permissions-wrapper,
 #profile-jot-acl-wrapper {
     display: block !important;
-	background: #eec;
-	color: #2e2f2e;
+    background: #eec;
+    color: #2e2f2e;
 }
 #acl-wrapper {
     width: 660px;
-	margin: 0 auto;
+    margin: 0 auto;
 }
 #acl-search {
     float: right;
     background: #fff url("../../../images/search_18.png") no-repeat right center;
     padding-right: 20px;
-	margin: 6px;
+    margin: 6px;
+    color: #111;
 }
 #acl-showall {
     float: left;
@@ -2790,7 +3011,7 @@ footer {
     -moz-border-radius: 5px;
     border-radius: 5px;
     color: #999;
-	margin: 5px 0;
+    margin: 5px 0;
 }
 #acl-showall.selected {
     color: #000;
@@ -2806,7 +3027,7 @@ footer {
 /*#acl-list-content {
 }*/
 .acl-list-item {
-	border: 1px solid #ccc;
+    border: 1px solid #ccc;
     display: block;
     float: left;
     height: 110px;
@@ -2830,29 +3051,29 @@ footer {
     -webkit-border-radius: 2px;
     -moz-border-radius: 2px;
     border-radius: 2px;
-	clear: both;
+    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;
+    padding: 0 3px;
+    text-align: center;
+    vertical-align: middle;
 }
 #acl-wrapper a:hover {
     text-decoration: none;
     color: #000;
-	border: 0;
+    border: 0;
 }
 .acl-button-show {
     background-image: url('../../../images/show_off.png');
-	margin: 0 auto;
+    margin: 0 auto;
 }
 .acl-button-hide {
     background-image: url('../../../images/hide_off.png');
-	margin: 0 auto;
+    margin: 0 auto;
 }
 .acl-button-show.selected {
     color: #000;
@@ -2875,25 +3096,25 @@ footer {
 
 /* autocomplete popup */
 .acpopup {
-	max-height: 175px;
+    max-height: 175px;
     max-width: 42%;
-	background-color: #555753;
-	color: #fff;
-	overflow: auto;
-	z-index: 100000;
-	border: 1px solid #cccccc;
+    background-color: #555753;
+    color: #fff;
+    overflow: auto;
+    z-index: 100000;
+    border: 1px solid #cccccc;
 }
 .acpopupitem {
-	background-color: #555753;
+    background-color: #555753;
     padding: 4px;
-	clear: left;
+    clear: left;
 }
 .acpopupitem img {
-	float: left;
-	margin-right: 4px;
+    float: left;
+    margin-right: 4px;
 }
 .acpopupitem.selected {
-	color: #2e3436;
+    color: #2e3436;
     background-color: #eeeeec;
 }
 .qcomment-wrapper {
@@ -2901,12 +3122,12 @@ footer {
     margin: 5px 5px 5px 81%;
 }
 .qcomment {
-	opacity: 0.5;
-	filter:alpha(opacity=50);
+    opacity: 0.5;
+    filter:alpha(opacity=50);
 }
 .qcomment:hover {
-	opacity: 1.0;
-	filter:alpha(opacity=100);
+    opacity: 1.0;
+    filter:alpha(opacity=100);
 }
 #network-star-link {
     margin-top: 10px;
@@ -2919,32 +3140,38 @@ footer {
     display: inline-block;
 }
 #fileas-sidebar {
-	
+    
 }
 .fileas-ul {
-	padding: 0;
+    padding: 0;
 }
 
 
 
 /*
- * ADDONS THEMING
+ * addons theming
  */
 
 #sidebar-page-list {
-	
+    
 }
 #sidebar-page-list ul {
-	padding: 0;
-	margin: 5px 0;
+    padding: 0;
+    margin: 5px 0;
 }
 #sidebar-page-list li {
-	list-style: none;
+    list-style: none;
+}
+#jappix_mini {
+    margin-left: 130px;
+    position: fixed;
+    bottom: 0;
+    right: 175px !important; /* override the jappix css */
+    z-index: 999;
 }
-
 
 @media handheld {
-	body {
-		font-size: 15pt;
-	}
+    body {
+        font-size: 15pt;
+    }
 }
diff --git a/view/theme/dispy/theme.php b/view/theme/dispy/theme.php
index f3c54caf9..b72de51e5 100644
--- a/view/theme/dispy/theme.php
+++ b/view/theme/dispy/theme.php
@@ -3,141 +3,161 @@
 /*
  * Name: Dispy
  * Description: Dispy, Friendica theme
- * Version: 1.0
+ * Version: 1.1
  * Author: unknown
  * Maintainer: Simon <http://simon.kisikew.org/>
  * Screenshot: <a href="screenshot.jpg">Screenshot</a>
  */
 
-$a->page['htmlhead'] .= <<< EOT
-<script>
-$(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');
-		document.getElementById("nav-notifications-menu").style.display = "none";
-	});
-
-	$('#nav-notifications-linkmenu').click(function(event) {
-		event.stopPropagation();
-	});
-	// click outside profiles menu closes it
-	$('html').click(function() {
-		$('#profiles-menu-trigger').removeClass('selected');
-		document.getElementById("profiles-menu").style.display = "none";
-	});
+$a = get_app();
+$a->theme_info = array(
+	'name' => 'dispy',
+	'version' => '1.1'
+);
+
+function dispy_init(&$a) {
+
+	// aside on profile page
+	if (($a->argv[0] . $a->argv[1]) === ("profile" . $a->user['nickname'])) {
+		dispy_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;
+		});
 
-	$('#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'});
+	// 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>
+	</script>
 EOT;
 
+	js_in_foot();
+}
+
 function dispy_community_info() {
 	$a = get_app();
-
-	$fostitJS = "javascript: (function() {
-		the_url = '".$a->get_baseurl($ssl_state)."/view/theme/dispy-dark/fpostit/fpostit.php?url=' +
-		encodeURIComponent(window.location.href) + '&title=' + encodeURIComponent(document.title) + '&text=' +
-		encodeURIComponent(''+(window.getSelection ? window.getSelection() : document.getSelection ?
-		document.getSelection() : document.selection.createRange().text));
-		a_funct = function() {
-			if (!window.open(the_url, 'fpostit', 'location=yes,links=no,scrollbars=no,toolbar=no,width=600,height=300')) {
-				location.href = the_url;
-			}
-			if (/Firefox/.test(navigator.userAgent)) {
-				setTimeout(a_funct, 0)
-			} else {
-				a_funct();
-			}
-		})();";
-
-	$aside['$fostitJS'] = $fostitJS;
 	$url = $a->get_baseurl($ssl_state);
 	$aside['$url'] = $url;
 
-    $tpl = file_get_contents(dirname(__file__).'/communityhome.tpl');
-	$a->page['aside_bottom'] = replace_macros($tpl, $aside);
+	$tpl = file_get_contents(dirname(__file__) . '/communityhome.tpl');
+	return $a->page['aside_bottom'] = replace_macros($tpl, $aside);
 }
 
-// aside on profile page
-if (($a->argv[0] . $a->argv[1]) === ("profile" . $a->user['nickname'])) {
-	dispy_community_info();
+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/wall_item.tpl b/view/theme/dispy/wall_item.tpl
index b54f753d3..52af07532 100644
--- a/view/theme/dispy/wall_item.tpl
+++ b/view/theme/dispy/wall_item.tpl
@@ -1,10 +1,10 @@
-<div class="wall-item-outside-wrapper$item.indent" id="wall-item-outside-wrapper-$item.id" >
+<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" 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>
+				<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>
@@ -16,10 +16,10 @@
 			<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>
+			<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>
@@ -55,21 +55,21 @@
 			</ul>
 			<div class="wall-item-delete-end"></div>
 		</div>
-		<div class="wall-item-content" id="wall-item-content-$item.id" >
+		<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 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>
diff --git a/view/theme/dispy/wallwall_item.tpl b/view/theme/dispy/wallwall_item.tpl
index b25d13409..e8cbc2cd4 100644
--- a/view/theme/dispy/wallwall_item.tpl
+++ b/view/theme/dispy/wallwall_item.tpl
@@ -2,15 +2,13 @@
 	<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>
+				<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>
+				<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>
@@ -22,55 +20,58 @@
 			<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-lock-wrapper">
+		<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>
-		<div class="wall-item-tools" id="wall-item-tools-$item.id">
-			{{ if $item.star }}
-				<a href="#" id="starred-$item.id" onclick="dostar($item.id); return false;" class="star-item icon $item.isstarred" title="$item.star.toggle"></a>
-				<a href="#" id="tagger-$item.id" onclick="itemTag($item.id); return false;" class="tag-item icon tagged" title="$item.star.tagger"></a>
-			{{ endif }}
-			
-			{{ if $item.vote }}
-			<div 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;" />
 			</div>
-			{{ endif }}
+			<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 }}
-				<div 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></div>
+				<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 }}
-				<div class="wall-item-links-wrapper"><a href="$item.plink.href" title="$item.plink.title" target="external-link" class="icon remote-link"></a></div>
+				<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 }}
-				<a class="editpost icon pencil" href="$item.edpost.0" title="$item.edpost.1"></a>
+				<li><a class="editpost icon pencil" href="$item.edpost.0" title="$item.edpost.1"></a></li>
 			{{ endif }}
 		
-			<div class="wall-item-delete-wrapper" id="wall-item-delete-wrapper-$item.id" >
+			<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 }}
-			</div>
 				{{ 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-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 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>
diff --git a/view/theme/duepuntozero/border.jpg b/view/theme/duepuntozero/border.jpg
index 034a1cb63..034a1cb63 100755..100644
--- a/view/theme/duepuntozero/border.jpg
+++ b/view/theme/duepuntozero/border.jpg
diff --git a/view/theme/duepuntozero/ff-16.jpg b/view/theme/duepuntozero/ff-16.jpg
index 3621f5914..3621f5914 100755..100644
--- a/view/theme/duepuntozero/ff-16.jpg
+++ b/view/theme/duepuntozero/ff-16.jpg
diff --git a/view/theme/duepuntozero/friendika-16.png b/view/theme/duepuntozero/friendika-16.png
index 1a742ecdc..1a742ecdc 100755..100644
--- a/view/theme/duepuntozero/friendika-16.png
+++ b/view/theme/duepuntozero/friendika-16.png
diff --git a/view/theme/duepuntozero/head.jpg b/view/theme/duepuntozero/head.jpg
index 6210b76be..6210b76be 100755..100644
--- a/view/theme/duepuntozero/head.jpg
+++ b/view/theme/duepuntozero/head.jpg
diff --git a/view/theme/duepuntozero/lang_selector.tpl b/view/theme/duepuntozero/lang_selector.tpl
new file mode 100644
index 000000000..e777a0a86
--- /dev/null
+++ b/view/theme/duepuntozero/lang_selector.tpl
@@ -0,0 +1,10 @@
+<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/duepuntozero/lock.cur b/view/theme/duepuntozero/lock.cur
index 892c5e851..892c5e851 100755..100644
--- a/view/theme/duepuntozero/lock.cur
+++ b/view/theme/duepuntozero/lock.cur
diff --git a/view/theme/duepuntozero/login-bg.gif b/view/theme/duepuntozero/login-bg.gif
index cde836c89..cde836c89 100755..100644
--- a/view/theme/duepuntozero/login-bg.gif
+++ b/view/theme/duepuntozero/login-bg.gif
diff --git a/view/theme/duepuntozero/photo-menu.jpg b/view/theme/duepuntozero/photo-menu.jpg
index fde5eb535..fde5eb535 100755..100644
--- a/view/theme/duepuntozero/photo-menu.jpg
+++ b/view/theme/duepuntozero/photo-menu.jpg
diff --git a/view/theme/duepuntozero/shiny.png b/view/theme/duepuntozero/shiny.png
index 994c0d05d..994c0d05d 100755..100644
--- a/view/theme/duepuntozero/shiny.png
+++ b/view/theme/duepuntozero/shiny.png
diff --git a/view/theme/duepuntozero/style.css b/view/theme/duepuntozero/style.css
index 1f897f3b0..c30e643ce 100755..100644
--- a/view/theme/duepuntozero/style.css
+++ b/view/theme/duepuntozero/style.css
@@ -285,7 +285,7 @@ div.wall-item-content-wrapper.shiny {
 	float: left;
 }
 
-#jot-title {
+#jot-title, #jot-category {
 	border: 0px;
 	margin: 0px;
 	height: 20px;
@@ -296,11 +296,15 @@ div.wall-item-content-wrapper.shiny {
 }
 
 #jot-title::-webkit-input-placeholder{font-weight: normal;}
+#jot-category::-webkit-input-placeholder{font-weight: normal;}
 #jot-title:-moz-placeholder{font-weight: normal;}
+#jot-category:-moz-placeholder{font-weight: normal;}
 		
 	
 #jot-title:hover,
-#jot-title:focus {
+#jot-title:focus,
+#jot-category:hover,
+#jot-category:focus {
 	border: 1px solid #cccccc; 
 }
 
@@ -322,7 +326,7 @@ div.wall-item-content-wrapper.shiny {
 	margin-bottom: 10px;
 }
 
-.group-selected, .nets-selected, .fileas-selected {
+.group-selected, .nets-selected, .fileas-selected, .categories-selected {
 	padding: 3px;
 	-moz-border-radius: 3px;
 	border-radius: 3px;	
@@ -1881,11 +1885,11 @@ a.mail-list-link {
 	margin-top: 10px;
 }
 
-.nets-ul, .fileas-ul {
+.nets-ul, .fileas-ul, .categories-ul {
 	list-style-type: none;
 }
 
-.nets-ul li, .fileas-ul li {
+.nets-ul li, .fileas-ul li, .categories-ul li {
 	margin-top: 10px;
 }
 
@@ -1896,11 +1900,11 @@ a.mail-list-link {
 	margin-left: 42px;
 }
 
-.fileas-link {
+.fileas-link, .categories-link {
 	margin-left: 24px;
 }
 
-.fileas-all {
+.fileas-all, .categories-all {
 	margin-left: 0px;
 }
 
@@ -2628,12 +2632,12 @@ aside input[type='text'] {
 	margin-top: 10px;
 }
 
-.body-tag, .filesavetags {
+.body-tag, .filesavetags, .categorytags {
 	opacity: 0.5;
 	filter:alpha(opacity=50);
 }
 
-.body-tag:hover, .filesavetags:hover {
+.body-tag:hover, .filesavetags:hover, .categorytags:hover {
 	opacity: 1.0 !important;
 	filter:alpha(opacity=100) !important;
 }
@@ -2983,7 +2987,10 @@ div.jGrowl div.info {
   color: #ffffff;
   padding-left: 58px;
 }
-
+#jGrowl.top-right {
+	top: 15px;
+	right: 15px;
+}
 .qcomment {
 	border: 1px solid #EEE;
 	padding: 3px;
diff --git a/view/theme/duepuntozero/theme.php b/view/theme/duepuntozero/theme.php
index 701fb1349..7b42088e1 100755..100644
--- a/view/theme/duepuntozero/theme.php
+++ b/view/theme/duepuntozero/theme.php
@@ -1,6 +1,7 @@
 <?php
 $a->theme_info = array();
 
+function duepuntozero_init(&$a) {
 $a->page['htmlhead'] .= <<< EOT
 <script>
 $(document).ready(function() {
@@ -47,3 +48,4 @@ $('.savedsearchterm').hover(
 
 </script>
 EOT;
+}
diff --git a/view/theme/easterbunny/border.jpg b/view/theme/easterbunny/border.jpg
index 66c7a6fcc..66c7a6fcc 100755..100644
--- a/view/theme/easterbunny/border.jpg
+++ b/view/theme/easterbunny/border.jpg
diff --git a/view/theme/easterbunny/head.jpg b/view/theme/easterbunny/head.jpg
index 1acd2ddb8..1acd2ddb8 100755..100644
--- a/view/theme/easterbunny/head.jpg
+++ b/view/theme/easterbunny/head.jpg
diff --git a/view/theme/easterbunny/shiny.png b/view/theme/easterbunny/shiny.png
index d3f71ee1d..d3f71ee1d 100755..100644
--- a/view/theme/easterbunny/shiny.png
+++ b/view/theme/easterbunny/shiny.png
diff --git a/view/theme/easterbunny/style.css b/view/theme/easterbunny/style.css
index ab2e07053..ab2e07053 100755..100644
--- a/view/theme/easterbunny/style.css
+++ b/view/theme/easterbunny/style.css
diff --git a/view/theme/easterbunny/theme.php b/view/theme/easterbunny/theme.php
index 338f40cbf..338f40cbf 100755..100644
--- a/view/theme/easterbunny/theme.php
+++ b/view/theme/easterbunny/theme.php
diff --git a/view/theme/facepark/border.jpg b/view/theme/facepark/border.jpg
index 034a1cb63..034a1cb63 100755..100644
--- a/view/theme/facepark/border.jpg
+++ b/view/theme/facepark/border.jpg
diff --git a/view/theme/facepark/comment_item.tpl b/view/theme/facepark/comment_item.tpl
index 3503c3843..3503c3843 100755..100644
--- a/view/theme/facepark/comment_item.tpl
+++ b/view/theme/facepark/comment_item.tpl
diff --git a/view/theme/facepark/contact_template.tpl b/view/theme/facepark/contact_template.tpl
index 48930b48a..48930b48a 100755..100644
--- a/view/theme/facepark/contact_template.tpl
+++ b/view/theme/facepark/contact_template.tpl
diff --git a/view/theme/facepark/conversation.tpl b/view/theme/facepark/conversation.tpl
index 43bb1dd47..43bb1dd47 100755..100644
--- a/view/theme/facepark/conversation.tpl
+++ b/view/theme/facepark/conversation.tpl
diff --git a/view/theme/facepark/ff-16.jpg b/view/theme/facepark/ff-16.jpg
index 3621f5914..3621f5914 100755..100644
--- a/view/theme/facepark/ff-16.jpg
+++ b/view/theme/facepark/ff-16.jpg
diff --git a/view/theme/facepark/friendika-16.png b/view/theme/facepark/friendika-16.png
index 1a742ecdc..1a742ecdc 100755..100644
--- a/view/theme/facepark/friendika-16.png
+++ b/view/theme/facepark/friendika-16.png
diff --git a/view/theme/facepark/group_side.tpl b/view/theme/facepark/group_side.tpl
index 0353b1d2c..0353b1d2c 100755..100644
--- a/view/theme/facepark/group_side.tpl
+++ b/view/theme/facepark/group_side.tpl
diff --git a/view/theme/facepark/head.jpg b/view/theme/facepark/head.jpg
index 6210b76be..6210b76be 100755..100644
--- a/view/theme/facepark/head.jpg
+++ b/view/theme/facepark/head.jpg
diff --git a/view/theme/facepark/jot.tpl b/view/theme/facepark/jot.tpl
index 5fe1f954e..5fe1f954e 100755..100644
--- a/view/theme/facepark/jot.tpl
+++ b/view/theme/facepark/jot.tpl
diff --git a/view/theme/facepark/lock.cur b/view/theme/facepark/lock.cur
index 892c5e851..892c5e851 100755..100644
--- a/view/theme/facepark/lock.cur
+++ b/view/theme/facepark/lock.cur
diff --git a/view/theme/facepark/login-bg.gif b/view/theme/facepark/login-bg.gif
index cde836c89..cde836c89 100755..100644
--- a/view/theme/facepark/login-bg.gif
+++ b/view/theme/facepark/login-bg.gif
diff --git a/view/theme/facepark/nav.tpl b/view/theme/facepark/nav.tpl
index 4675c3e5c..4675c3e5c 100755..100644
--- a/view/theme/facepark/nav.tpl
+++ b/view/theme/facepark/nav.tpl
diff --git a/view/theme/facepark/nets.tpl b/view/theme/facepark/nets.tpl
index b0cb8890c..b0cb8890c 100755..100644
--- a/view/theme/facepark/nets.tpl
+++ b/view/theme/facepark/nets.tpl
diff --git a/view/theme/facepark/photo-menu.jpg b/view/theme/facepark/photo-menu.jpg
index fde5eb535..fde5eb535 100755..100644
--- a/view/theme/facepark/photo-menu.jpg
+++ b/view/theme/facepark/photo-menu.jpg
diff --git a/view/theme/facepark/profile_vcard.tpl b/view/theme/facepark/profile_vcard.tpl
index 154f22363..154f22363 100755..100644
--- a/view/theme/facepark/profile_vcard.tpl
+++ b/view/theme/facepark/profile_vcard.tpl
diff --git a/view/theme/facepark/saved_searches_aside.tpl b/view/theme/facepark/saved_searches_aside.tpl
index e6a0d6278..e6a0d6278 100755..100644
--- a/view/theme/facepark/saved_searches_aside.tpl
+++ b/view/theme/facepark/saved_searches_aside.tpl
diff --git a/view/theme/facepark/search_item.tpl b/view/theme/facepark/search_item.tpl
index bfad1b7b7..bfad1b7b7 100755..100644
--- a/view/theme/facepark/search_item.tpl
+++ b/view/theme/facepark/search_item.tpl
diff --git a/view/theme/facepark/shiny.png b/view/theme/facepark/shiny.png
index 994c0d05d..994c0d05d 100755..100644
--- a/view/theme/facepark/shiny.png
+++ b/view/theme/facepark/shiny.png
diff --git a/view/theme/facepark/theme.php b/view/theme/facepark/theme.php
index 701fb1349..701fb1349 100755..100644
--- a/view/theme/facepark/theme.php
+++ b/view/theme/facepark/theme.php
diff --git a/view/theme/facepark/wall_item.tpl b/view/theme/facepark/wall_item.tpl
index 2c88fc598..2c88fc598 100755..100644
--- a/view/theme/facepark/wall_item.tpl
+++ b/view/theme/facepark/wall_item.tpl
diff --git a/view/theme/facepark/wallwall_item.tpl b/view/theme/facepark/wallwall_item.tpl
index 211906c93..211906c93 100755..100644
--- a/view/theme/facepark/wallwall_item.tpl
+++ b/view/theme/facepark/wallwall_item.tpl
diff --git a/view/theme/goldenrod/screenshot.jpg b/view/theme/goldenrod/screenshot.jpg
deleted file mode 100644
index 357e00ae2..000000000
--- a/view/theme/goldenrod/screenshot.jpg
+++ /dev/null
diff --git a/view/theme/goldenrod/style.css b/view/theme/goldenrod/style.css
deleted file mode 100755
index 47985aaa8..000000000
--- a/view/theme/goldenrod/style.css
+++ /dev/null
@@ -1,121 +0,0 @@
-@import url('../loozah/style.css');
-
-footer {
-	background: #CCC;
-}
-
-#banner {
-	color: #444444;
-}
-
-#logo-text a, #logo-text a:visited, #site-location {
-	color: #000000;
-}
-
-body { 
-	background: #FFFFFF;
-	color: #000000;
-}
-.nav-selected {
-	background: #FFFFFF !important;
-	color: #888888 !important;
-}
-
-input:hover {
-	background-color: #FFEEBB;
-	color: #000000;
-	border: 1px solid #000000;
-}
-
-input, select {
-	background-color: #FFEEBB;
-	color: #000000;
-}
-.nav-link:hover, .nav-commlink:hover {
-	background: #FFDDAA;
-	color: #0000EE;
-}
-option {
-	background-color: #FFEEBB;
-}
-#page-footer {
-	border: none;
-}
-
-nav {
-	background: #FFEEBB;
-}
-
-
-
-body { 
-	background: #FFDDAA;
-	color: #444444;
-}
-
-.nav-link {
-	color: #444444;
-	background: #FFCC55;
-}
-
-.nav-commlink {
-	color: #444444;
-	background: #FFCC55;
-}
-
-.nav-selected {
-	background: #FFDDAA !important;
-}
-
-.tab {
-	color: #444444;
-	background: #FFCC55;
-
-}
-
-a, a:visited {
-	color: #8888FF;
-	text-decoration: none;
-}
-
-a:hover {
-	color: #0000FF;
-	text-decoration: underline;
-}
-
-.fakelink, .fakelink:visited {
-	color: #8888FF;
-}
-
-.fakelink:hover {
-	color: #0000FF;
-}
-
-
-
-.wall-item-content-wrapper.comment {
-	background: #FFCC55;
-}
-
-.comment-edit-wrapper {
-	background: #FFCC55;
-}
-
-.comment-wwedit-wrapper {
-	background: #FFCC55;
-}
-
-#photos-upload-perms-menu, #photos-upload-perms-menu:visited {
-	color: #8888FF;
-}
-
-#photos-upload-perms-menu:hover {
-	color: #0000FF;
-}
-#settings-default-perms-menu, #settings-default-perms-menu:visited {
-	color: #8888FF;
-}
-
-#settings-default-perms-menu:hover {
-	color: #0000FF;
-}
diff --git a/view/theme/goldenrod/theme.php b/view/theme/goldenrod/theme.php
deleted file mode 100755
index 47b43cf13..000000000
--- a/view/theme/goldenrod/theme.php
+++ /dev/null
@@ -1,4 +0,0 @@
-<?php
-$a->theme_info = array(
-  'extends' => 'loozah',
-);
diff --git a/view/theme/goldenrod/unsupported b/view/theme/goldenrod/unsupported
deleted file mode 100644
index e69de29bb..000000000
--- a/view/theme/goldenrod/unsupported
+++ /dev/null
diff --git a/view/theme/greenzero/border.jpg b/view/theme/greenzero/border.jpg
index 034a1cb63..034a1cb63 100755..100644
--- a/view/theme/greenzero/border.jpg
+++ b/view/theme/greenzero/border.jpg
diff --git a/view/theme/greenzero/greenicons.png b/view/theme/greenzero/greenicons.png
index 2644e4284..2644e4284 100755..100644
--- a/view/theme/greenzero/greenicons.png
+++ b/view/theme/greenzero/greenicons.png
diff --git a/view/theme/greenzero/head.jpg b/view/theme/greenzero/head.jpg
index c69776214..c69776214 100755..100644
--- a/view/theme/greenzero/head.jpg
+++ b/view/theme/greenzero/head.jpg
diff --git a/view/theme/greenzero/shiny.png b/view/theme/greenzero/shiny.png
index 994c0d05d..994c0d05d 100755..100644
--- a/view/theme/greenzero/shiny.png
+++ b/view/theme/greenzero/shiny.png
diff --git a/view/theme/greenzero/style.css b/view/theme/greenzero/style.css
index 355e7829a..355e7829a 100755..100644
--- a/view/theme/greenzero/style.css
+++ b/view/theme/greenzero/style.css
diff --git a/view/theme/greenzero/theme.php b/view/theme/greenzero/theme.php
index ceec4dd97..c80202475 100755..100644
--- a/view/theme/greenzero/theme.php
+++ b/view/theme/greenzero/theme.php
@@ -3,6 +3,7 @@ $a->theme_info = array(
   'extends' => 'duepuntozero',
 );
 
+function greenzero_init(&$a) {
 $a->page['htmlhead'] .= <<< EOT
 <script>
 $(document).ready(function() {
@@ -49,3 +50,4 @@ $('.savedsearchterm').hover(
 
 </script>
 EOT;
+}
\ No newline at end of file
diff --git a/view/theme/loozah/contact_template.tpl b/view/theme/loozah/contact_template.tpl
deleted file mode 100755
index 48930b48a..000000000
--- a/view/theme/loozah/contact_template.tpl
+++ /dev/null
@@ -1,25 +0,0 @@
-
-<div class="contact-entry-wrapper" id="contact-entry-wrapper-$contact.id" >
-	<div class="contact-entry-photo-wrapper" >
-		<div class="contact-entry-photo mframe" id="contact-entry-photo-$contact.id"
-		onmouseover="if (typeof t$contact.id != 'undefined') clearTimeout(t$contact.id); openMenu('contact-photo-menu-button-$contact.id')" 
-		onmouseout="t$contact.id=setTimeout('closeMenu(\'contact-photo-menu-button-$contact.id\'); closeMenu(\'contact-photo-menu-$contact.id\');',200)" >
-
-			<a href="$contact.url" title="$contact.img_hover" /><img src="$contact.thumb" $contact.sparkle alt="$contact.name" /></a>
-
-			{{ if $contact.photo_menu }}
-			<span onclick="openClose('contact-photo-menu-$contact.id');" class="fakelink contact-photo-menu-button" id="contact-photo-menu-button-$contact.id">menu</span>
-                <div class="contact-photo-menu" id="contact-photo-menu-$contact.id">
-                    <ul>
-                        $contact.photo_menu
-                    </ul>
-                </div>
-			{{ endif }}
-		</div>
-			
-	</div>
-	<div class="contact-entry-photo-end" ></div>
-		<div class="contact-entry-name" id="contact-entry-name-$contact.id" >$contact.name</div>
-
-	<div class="contact-entry-end" ></div>
-</div>
diff --git a/view/theme/loozah/conversation.tpl b/view/theme/loozah/conversation.tpl
deleted file mode 100755
index 33cedfb1e..000000000
--- a/view/theme/loozah/conversation.tpl
+++ /dev/null
@@ -1,13 +0,0 @@
-{{ for $threads as $thread }}
-<div id="tread-wrapper-$thread.id" class="tread-wrapper">
-	$thread.html
-</div>
-{{ endfor }}
-
-{{ if $dropping }}
-<div id="item-delete-selected" class="fakelink" onclick="deleteCheckedItems();">
-  <div id="item-delete-selected-icon" class="icon drophide" title="$dropping" onmouseover="imgbright(this);" onmouseout="imgdull(this);" ></div>
-  <div id="item-delete-selected-desc" >$dropping</div>
-</div>
-<div id="item-delete-selected-end"></div>
-{{ endif }}
diff --git a/view/theme/loozah/ff-16.jpg b/view/theme/loozah/ff-16.jpg
deleted file mode 100755
index 3621f5914..000000000
--- a/view/theme/loozah/ff-16.jpg
+++ /dev/null
diff --git a/view/theme/loozah/friendika-16.png b/view/theme/loozah/friendika-16.png
deleted file mode 100755
index 1a742ecdc..000000000
--- a/view/theme/loozah/friendika-16.png
+++ /dev/null
diff --git a/view/theme/loozah/group_side.tpl b/view/theme/loozah/group_side.tpl
deleted file mode 100755
index a1fc70a22..000000000
--- a/view/theme/loozah/group_side.tpl
+++ /dev/null
@@ -1,28 +0,0 @@
-<div class="widget" id="group-sidebar">
-<h3>$title</h3>
-
-<div id="sidebar-group-list">
-	<ul id="sidebar-group-ul">
-		{{ for $groups as $group }}
-			<li class="sidebar-group-li">
-				{{ 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 }}			
-				{{ if $group.edit }}
-					<a class="groupsideedit" href="$group.edit.href"><span class="icon small-pencil"></span></a>
-				{{ endif }}
-				<a class="sidebar-group-element {{ if $group.selected }}group-selected{{ endif }}" href="$group.href">$group.text</a>
-			</li>
-		{{ endfor }}
-	</ul>
-	</div>
-  <div id="sidebar-new-group">
-  <a href="group/new">$createtext</a>
-  </div>
-</div>
-
-
diff --git a/view/theme/loozah/jot.tpl b/view/theme/loozah/jot.tpl
deleted file mode 100755
index ac64223fb..000000000
--- a/view/theme/loozah/jot.tpl
+++ /dev/null
@@ -1,84 +0,0 @@
-
-<div id="profile-jot-wrapper" >
-	<div id="profile-jot-banner-wrapper">
-		<div id="profile-jot-desc" >&nbsp;</div>
-		<div id="character-counter" class="grey"></div>
-	</div>
-	<div id="profile-jot-banner-end"></div>
-
-	<form id="profile-jot-form" action="$action" method="post" >
-		<input type="hidden" name="type" value="$ptyp" />
-		<input type="hidden" name="profile_uid" value="$profile_uid" />
-		<input type="hidden" name="return" value="$return_path" />
-		<input type="hidden" name="location" id="jot-location" value="$defloc" />
-		<input type="hidden" name="coord" id="jot-coord" value="" />
-		<input type="hidden" name="title" id="jot-title" value="" />
-		<input type="hidden" name="preview" id="jot-preview" value="0" />
-		<input type="hidden" name="post_id" value="$post_id" />
-
-		<img id="profile-jot-text-loading" src="images/rotator.gif" alt="$wait" title="$wait" style="display: none;" />
-		<textarea rows="5" cols="64" class="profile-jot-text" id="profile-jot-text" name="body" >{{ if $content }}$content{{ else }}$share{{ endif }}</textarea>
-
-
-<div id="profile-jot-submit-wrapper" style="display:none" class="jothidden">
-<input type="submit" id="profile-jot-submit" name="submit" value="$share" />
-	<div id="profile-upload-wrapper" style="display: $visitor;" >
-		<div id="wall-image-upload-div" ><a href="#" onclick="return false;" id="wall-image-upload" class="icon camera" title="$upload"></a></div>
-	</div> 
-	<div id="profile-attach-wrapper" style="display: $visitor;" >
-		<div id="wall-file-upload-div" ><a href="#" onclick="return false;" id="wall-file-upload" class="icon attach" title="$attach"></a></div>
-	</div> 
-
-	<div id="profile-link-wrapper" style="display: $visitor;" ondragenter="linkdropper(event);" ondragover="linkdropper(event);" ondrop="linkdrop(event);" >
-		<a id="profile-link" class="icon link" title="$weblink" ondragenter="return linkdropper(event);" ondragover="return linkdropper(event);" ondrop="linkdrop(event);" onclick="jotGetLink(); return false;"></a>
-	</div> 
-	<div id="profile-video-wrapper" style="display: $visitor;" >
-		<a id="profile-video" class="icon video" title="$video" onclick="jotVideoURL();return false;"></a>
-	</div> 
-	<div id="profile-audio-wrapper" style="display: $visitor;" >
-		<a id="profile-audio" class="icon audio" title="$audio" onclick="jotAudioURL();return false;"></a>
-	</div> 
-	<div id="profile-location-wrapper" style="display: $visitor;" >
-		<a id="profile-location" class="icon globe" title="$setloc" onclick="jotGetLocation();return false;"></a>
-	</div> 
-	<div id="profile-nolocation-wrapper" style="display: none;" >
-		<a id="profile-nolocation" class="icon noglobe" title="$noloc" onclick="jotClearLocation();return false;"></a>
-	</div> 
-	<div id="profile-title-wrapper" style="display: $visitor;" >
-		<a id="profile-title" class="icon article" title="$title" onclick="jotTitle();return false;"></a>
-	</div> 
-
-	<div id="profile-jot-plugin-wrapper">
-  	$jotplugins
-	</div>
-
-	<div id="profile-rotator-wrapper" style="display: $visitor;" >
-		<img id="profile-rotator" src="images/rotator.gif" alt="$wait" title="$wait" style="display: none;" />
-	</div> 
-	<div id="profile-jot-perms" class="profile-jot-perms" style="display: $pvisit;" >
-		<a href="#profile-jot-acl-wrapper" id="jot-perms-icon" class="icon $lockstate"  title="$permset" ></a>$bang
-	</div>
-
-	<span onclick="preview_post();" id="jot-preview-link" class="fakelink">$preview</span>
-
-
-	<div id="profile-jot-perms-end"></div>
-
-	<div id="jot-preview-content" style="display:none;"></div>
-	
-	<div style="display: none;">
-		<div id="profile-jot-acl-wrapper" style="width:auto;height:auto;overflow:auto;">
-			$acl
-			<hr style="clear:both"/>
-			<div id="profile-jot-email-label">$emailcc</div><input type="text" name="emailcc" id="profile-jot-email" title="$emtitle" />
-			<div id="profile-jot-email-end"></div>
-			$jotnets
-		</div>
-	</div>
-
-</div>
-
-<div id="profile-jot-end"></div>
-</form>
-</div>
-		{{ if $content }}<script>initEditor();</script>{{ endif }}
diff --git a/view/theme/loozah/lock.cur b/view/theme/loozah/lock.cur
deleted file mode 100755
index 892c5e851..000000000
--- a/view/theme/loozah/lock.cur
+++ /dev/null
diff --git a/view/theme/loozah/login-bg.gif b/view/theme/loozah/login-bg.gif
deleted file mode 100755
index cde836c89..000000000
--- a/view/theme/loozah/login-bg.gif
+++ /dev/null
diff --git a/view/theme/loozah/nav.tpl b/view/theme/loozah/nav.tpl
deleted file mode 100755
index 6ab45b74f..000000000
--- a/view/theme/loozah/nav.tpl
+++ /dev/null
@@ -1,51 +0,0 @@
-<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" 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" 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" href="$nav.home.0" title="$nav.home.3" >$nav.home.1</a>
-	<span id="home-update" class="nav-ajax-left"></span>
-	{{ endif }}
-	{{ if $nav.community }}
-	<a id="nav-community-link" class="nav-commlink $nav.community.2" href="$nav.community.0" title="$nav.community.3" >$nav.community.1</a>
-	{{ endif }}
-	{{ if $nav.notifications }}
-	<a id="nav-notify-link" class="nav-commlink $nav.notifications.2" href="$nav.notifications.0" title="$nav.notifications.3" >$nav.notifications.1</a>
-	<span id="notify-update" class="nav-ajax-left"></span>
-	{{ endif }}
-	{{ if $nav.messages }}
-	<a id="nav-messages-link" class="nav-commlink $nav.messages.2" href="$nav.messages.0" title="$nav.messages.3" >$nav.messages.1</a>
-	<span id="mail-update" class="nav-ajax-left"></span>
-	{{ endif }}
-
-	{{ if $nav.manage }}<a id="nav-manage-link" class="nav-commlink $nav.manage.2" href="$nav.manage.0" title="$nav.manage.3">$nav.manage.1</a>{{ endif }}
-
-	{{ if $nav.settings }}<a id="nav-settings-link" class="nav-link $nav.settings.2" href="$nav.settings.0" title="$nav.settings.3">$nav.settings.1</a>{{ endif }}
-	{{ if $nav.profiles }}<a id="nav-profiles-link" class="nav-link $nav.profiles.2" href="$nav.profiles.0" title="$nav.profiles.3" >$nav.profiles.1</a>{{ endif }}
-
-	{{ 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 }}
-	</span>
-	<span id="nav-end"></span>
-	<span id="banner">$banner</span>
-</nav>
diff --git a/view/theme/loozah/nets.tpl b/view/theme/loozah/nets.tpl
deleted file mode 100755
index b0cb8890c..000000000
--- a/view/theme/loozah/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/loozah/photo-menu.jpg b/view/theme/loozah/photo-menu.jpg
deleted file mode 100755
index bd39696a2..000000000
--- a/view/theme/loozah/photo-menu.jpg
+++ /dev/null
diff --git a/view/theme/loozah/profile_vcard.tpl b/view/theme/loozah/profile_vcard.tpl
deleted file mode 100755
index b3f5cc50d..000000000
--- a/view/theme/loozah/profile_vcard.tpl
+++ /dev/null
@@ -1,47 +0,0 @@
-<div class="vcard">
-
-	<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" alt="$profile.name"></div>
-
-
-
-	{{ if $location }}
-		<dl class="location"><dt class="location-label">$location</dt> 
-		<dd class="adr">
-			{{ if $profile.address }}<div class="street-address">$profile.address</div>{{ endif }}
-			<span class="city-state-zip">
-				<span class="locality">$profile.locality</span>{{ if $profile.locality }}, {{ endif }}
-				<span class="region">$profile.region</span>
-				<span class="postal-code">$profile.postal-code</span>
-			</span>
-			{{ if $profile.country-name }}<span class="country-name">$profile.country-name</span>{{ endif }}
-		</dd>
-		</dl>
-	{{ endif }}
-
-	{{ if $gender }}<dl class="mf"><dt class="gender-label">$gender</dt> <dd class="x-gender">$profile.gender</dd></dl>{{ endif }}
-	
-	{{ if $profile.pubkey }}<div class="key" style="display:none;">$profile.pubkey</div>{{ endif }}
-
-	{{ if $marital }}<dl class="marital"><dt class="marital-label"><span class="heart">&hearts;</span>$marital</dt><dd class="marital-text">$profile.marital</dd></dl>{{ endif }}
-
-	{{ if $homepage }}<dl class="homepage"><dt class="homepage-label">$homepage</dt><dd class="homepage-url"><a href="$profile.homepage" target="external-link">$profile.homepage</a></dd></dl>{{ endif }}
-
-	{{ inc diaspora_vcard.tpl }}{{ endinc }}
-	
-	<div id="profile-extra-links">
-		<ul>
-			{{ if $connect }}
-				<li><a id="dfrn-request-link" href="dfrn_request/$profile.nickname">$connect</a></li>
-			{{ endif }}
-		</ul>
-	</div>
-</div>
-
-$contact_block
-
-
diff --git a/view/theme/loozah/saved_searches_aside.tpl b/view/theme/loozah/saved_searches_aside.tpl
deleted file mode 100755
index e2aae1e77..000000000
--- a/view/theme/loozah/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 onmouseout="imgdull(this);" onmouseover="imgbright(this);" onclick="return confirmDelete();" class="icon savedsearchdrop drophide" href="network/?f=&amp;remove=1&amp;search=$search.encodedterm"></a>
-			<a 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/loozah/screenshot.jpg b/view/theme/loozah/screenshot.jpg
deleted file mode 100644
index 41d6929ca..000000000
--- a/view/theme/loozah/screenshot.jpg
+++ /dev/null
diff --git a/view/theme/loozah/search_item.tpl b/view/theme/loozah/search_item.tpl
deleted file mode 100755
index 5db19b4f8..000000000
--- a/view/theme/loozah/search_item.tpl
+++ /dev/null
@@ -1,52 +0,0 @@
-<div class="wall-item-outside-wrapper$indent$previewing" id="wall-item-outside-wrapper-$id" >
-	<div class="wall-item-content-wrapper$indent" id="wall-item-content-wrapper-$id" >
-		<div class="wall-item-info" id="wall-item-info-$id">
-			<div class="wall-item-photo-wrapper" id="wall-item-photo-wrapper-$id" 
-				 onmouseover="if (typeof t$id != 'undefined') clearTimeout(t$id); openMenu('wall-item-photo-menu-button-$id')" 
-				 onmouseout="t$id=setTimeout('closeMenu(\'wall-item-photo-menu-button-$id\'); closeMenu(\'wall-item-photo-menu-$id\');',200)">
-				<a href="$profile_url" target="redir" title="$linktitle" class="wall-item-photo-link" id="wall-item-photo-link-$id">
-				<img src="$thumb" class="wall-item-photo$sparkle" id="wall-item-photo-$id" style="height: 80px; width: 80px;" alt="$name" /></a>
-				<span onclick="openClose('wall-item-photo-menu-$id');" class="fakelink wall-item-photo-menu-button" id="wall-item-photo-menu-button-$id">menu</span>
-				<div class="wall-item-photo-menu" id="wall-item-photo-menu-$id">
-					<ul>
-						$item_photo_menu
-					</ul>
-				</div>
-			</div>
-			<div class="wall-item-photo-end"></div>	
-			<div class="wall-item-wrapper" id="wall-item-wrapper-$id" >
-				{{ if $lock }}<div class="wall-item-lock"><img src="images/lock_icon.gif" class="lockview" alt="$lock" onclick="lockview(event,$id);" /></div>
-				{{ else }}<div class="wall-item-lock"></div>{{ endif }}	
-				<div class="wall-item-location" id="wall-item-location-$id">$location</div>
-			</div>
-		</div>
-		<div class="wall-item-author">
-				<a href="$profile_url" target="redir" title="$linktitle" class="wall-item-name-link"><span class="wall-item-name$sparkle" id="wall-item-name-$id" >$name</span></a>
-				<div class="wall-item-ago"  id="wall-item-ago-$id">$ago</div>
-				
-		</div>			
-		<div class="wall-item-content" id="wall-item-content-$id" >
-			<div class="wall-item-title" id="wall-item-title-$id">$title</div>
-			<div class="wall-item-title-end"></div>
-			<div class="wall-item-body" id="wall-item-body-$id" >$body</div>
-		</div>
-		<div class="wall-item-tools" id="wall-item-tools-$id">
-			<div class="wall-item-delete-wrapper" id="wall-item-delete-wrapper-$id" >
-				{{ if $drop.dropping }}<a href="item/drop/$id" onclick="return confirmDelete();" class="icon drophide" title="$drop.delete" onmouseover="imgbright(this);" onmouseout="imgdull(this);" ></a>{{ endif }}
-			</div>
-				{{ if $drop.dropping }}<input type="checkbox" onclick="checkboxhighlight(this);" title="$drop.select" class="item-select" name="itemselected[]" value="$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-$id" >
-	{{ if $conv }}<a href='$conv.href' id='context-$id' title='$conv.title'>$conv.title</a>{{ endif }}
-	</div>
-
-<div class="wall-item-outside-wrapper-end$indent" ></div>
-
-</div>
-
-
diff --git a/view/theme/loozah/style.css b/view/theme/loozah/style.css
deleted file mode 100755
index 73c8639b1..000000000
--- a/view/theme/loozah/style.css
+++ /dev/null
@@ -1,2831 +0,0 @@
-/*
-	Loozah CSS - Emmanuel Revah manurevah.com
-	Copy, Paste, Send - Free
-
-	this is still considered as messy :]
-*/
-
-/** {*/
-	/*margin: 0;*/
-	/*padding: 0;*/
-/*}*/
-
-/* GENERIC STUFF */
-body {
-	background: #F5F6FB;
-	color: #444444;
-	font-family: "lucida grande",tahoma,verdana,arial,sans-serif;
-	font-size: 90%;
-	margin-left: 10px;
-}
-a, a:visited {
-/*	color: #34366A; */
-	color: #15607B;
-	text-decoration: none;
-}
-a:hover {
-	color: #0CBEFE;
-	text-decoration: none;
-}
-input, select {
-	background-color: #ECECEC;
-	border: 1px solid #858585;
-}
-input:hover {
-
-	background-color: #0CBEFE;
-/*	background-color: #49dbFa; */
-	color: black;
-/*	color: #F5F6FB; */
-/*	border: 1px solid #F5F6FB; */
-	cursor: pointer;
-}
-
-.openid input{
-   background-color: #ECECEC !important;
-   background: url(login-bg.gif) no-repeat;
-   background-position: 0 50%;
-   padding-left: 18px;
-   width: 385px !important;
-}
-
-.openid input:hover {
-	background-color: #0CBEFE !important;
-}
-
-
-
-
-option {
-	background-color: #ECD6D2;
-}
-img {
-	border: none;
-}
-code {
-	font-family: Courier, monospace;
-	white-space: pre;
-	display: block;
-	overflow: auto;
-	border: 1px solid #444;
-	background: #EEE;
-	color: #444;
-	padding: 10px;
-	margin-top: 20px;
-}
-blockquote:before {
-	content: '>> ';
-}
-
-#site-location {
-	position: absolute;
-	right: 5px;
-	top: 3px;
-	color: white;
-	font-size: 60%;
-}
-
-.shiny {
-	border-color: orange !important;
-}
-
-.nav-login-link {
-	float: right;
-	margin-left: 0px;
-	margin-right: 3px;
-	padding: 3px;
-	font-size: 70%;
-}
-
-/* NOTIFICATION */
-#notification-show-hide-link {
-	background-color: red;
-	padding: 2px 4px;
-	background-color: #ECECEC;
-	border: 1px solid #858585;
-}
-#notification-show-hide-link:hover {
-	background-color: #0CBEFE;
-	color: #F5F6FB;
-	border: 1px solid #F5F6FB;
-}
-
-#jot-perms-icon, 
-#profile-location,
-#profile-nolocation,
-#profile-youtube, 
-#profile-video,
-#profile-audio, 
-#profile-link,
-#profile-title, 
-#wall-image-upload,
-#wall-file-upload,
-#profile-upload-wrapper,
-#wall-image-upload-div,
-#wall-file-upload-div,
-.hover, .focus {
-	cursor: pointer;
-}
-
-#jot-perms-icon {
-	float: left;
-}
-
-#jot-title-desc {
-	color: #cccccc;
-}
-
-#jot-title-wrapper {
-	margin-bottom: 5px;
-}
-
-#jot-title {
-	border: 1px solid #cccccc;
-	width: 530px;
-}
-
-#jot-title-display {
-	font-weight: bold;
-}
-
-.fakelink, .fakelink:visited {
-	color: #15607B;
-	text-decoration: none;
-	cursor: pointer;
-	margin-top: 15px;
-	margin-bottom: 15px;
-}
-.lockview {
-	cursor: pointer;
-}
-
-
-#group-sidebar {
-    margin-bottom: 10px;
-}
-
-.group-selected, .nets-selected {
-    padding: 3px;
-    border: 1px solid #CCCCCC;
-    background: #F8F8F8;
-    font-weight: bold;
-}
-
-.fakelink:hover {
-	color: #0CBEFE;
-	text-decoration: none;
-	cursor: pointer;
-}
-.smalltext {
-	font-size: 0.7em;
-}
-#sysmsg {
-	width: 600px;
-	margin-bottom: 10px;
-}
-
-#top-margin {
-	height: 20px;
-}
-
-#logo-img {
-	margin-top: 3px;
-
-}
-
-#logo-text {
-	font-family: "gill sans MT bold", "lucida grande",tahoma,verdana,arial,sans-serif;
-	margin-left: 3px;
-	vertical-align: top;
-}
-
-#logo-text a, #logo-text a:hover, #logo-text a:visited {
-	color: #F5F6FB;
-	font-family: "gill sans MT bold", "lucida grande",tahoma,verdana,arial,sans-serif;
-	margin-left: 3px;
-	vertical-align: top;
-}
-
-
-#banner {
-	color: #F5F6FB;
-	font-family: "lucida grande",tahoma,verdana,arial,sans-serif;
-	font-size: 2.0em;
-	position: absolute;
-	top: 5px;
-	left: 39%;
-}
-
-#panel {
-	background-color: ivory;
-	position: absolute;
-	z-index: 2;
-	width: 30%;
-	padding: 25px;
-	border: 1px solid #444;
-}
-
-img.photo {
-	/*border: 1px solid #AAAAAA;*/
-	/*padding: 5px;*/
-	/*background: #FFFFFF;*/
-}
-
-#logo {
-	font-size: 300%;
-	color: #A8A8A8;
-	font-weight: bold;
-	margin-left: 280px;
-}
-
-/*
- * #page-footer {
- *	height: 20px;
- *
- * }
- */
-
-.heart {
-	color: #FF0000;
-	font-size: 100%;
-}
-
-aside {
-	/*position: absolute;*/
-	/*left: 0px;*/
-	/*top: 60px;*/
-	/*right: 250px;*/
-	width: 230px;
-	/*margin-left: 20px;*/
-	/*margin-right: 0px;*/
-	font-size: 0.9em;
-
-	float: left;
-	margin-top: 64px;
-	margin-left: 20px;
-}
-section {
-	position: absolute;
-	left: 250px;
-	top: 60px;
-	margin-top: 25px;
-	margin-left: 20px;
-	margin-right: 20px;
-	right: 0px;
-}
-h1 {
-	font-size: 1.6em;
-}
-
-nav {
-	position: absolute;
-	top: 0px;
-	height: 48px;
-	left: 0px;
-	right: 0px;
-	background: #15607B;
-}
-
-/*
- * footer {
- *	left: 0px;
- *	bottom: 0px;
- *	position: fixed;
- *	background-color: #0CBEFE;
- *	width: 100%;
- *	padding: 2px 3%;
- * }
- */
-
-.fn {
-	font-size: 1.4em;
-	margin-bottom: 5px;
-	line-height: 1.5;
-}
-
-.vcard .title {
-	margin-bottom: 5px;
-}
-
-.vcard dl {
-	clear: both;
-}
-
-.powered {
-	font-size: 0.6em;
-	color: black;
-}
-.powered a {
-	color: #EBF3F3;
-	font-weight: bold;
-}
-.powered a:hover {
-	color: #FFC019;
-}
-.error-message {
-	color: #FF0000;
-	font-size: 1.1em;
-	border: 1px solid #FF8888;
-	background-color: #FFEEEE;
-	padding: 10px;
-}
-.info-message {
-	color: #204a87;
-	font-size: 1.1em;
-	border: 1px solid #3465a4;
-	background-color: #d7e3f1;
-	padding: 10px;
-}
-
-
-.nav-link {
-	float: right;
-	margin-left: 0px;
-	margin-right: 3px;
-	margin-top: 20px;
-	padding: 6px;
-	/*border: 2px solid #000000;*/
-	background: #D5D5D5;
-	font-size: 80%;
-	font-weight: bold;
-	-moz-border-radius-topleft: 3px;
- 	-moz-border-radius-topright: 3px;
- 	-webkit-border-radius-topleft: 3px;
- 	-webkit-border-radius-topright: 3px;
- 	border-radius-topleft: 3px;
- 	border-radius-topright: 3px;
-}
-.nav-link:hover {
-	background-color: #0CBEFE;
-	color: #F5F6FB;
-}
-
-
-.nav-ajax-left {
-	margin-left: 1px;
-	margin-right: 2px;
-	margin-top: 15px;
-	float: left;
-	font-size: 0.6em;
-	font-weight: bold;
-	color: #F8FF15;
-	/*background: #FFFFFF;*/
-}
-
-
-
-.nav-selected {
-	border-bottom: none !important;
-	background: #F5F6FB !important;
-	padding: 8px 6px 6px 6px !important;
-	color: #000 !important;
-}
-
-
-.nav-ajax-left:hover {
-	font-size: 1.5em;
-}
-
-.nav-ajax-right {
-	margin-left: 1px;
-	float: right;
-	font-size: 0.6em;
-	font-weight: bold;
-	color: #FF0000;
-}
-
-.nav-commlink {
-	float: left;
-	margin-left: 3px;
-	margin-right: 0px;
-	margin-top: 20px;
-	padding: 6px;
-	/*border: 2px solid #000000;*/
-	background: #D5D5D5;
-	font-size: 80%;
-	font-weight: bold;
-	text-decoration: none;
-	-moz-border-radius-topleft: 3px;
- 	-moz-border-radius-topright: 3px;
- 	-webkit-border-radius-topleft: 3px;
- 	-webkit-border-radius-topright: 3px;
- 	border-radius-topleft: 3px;
- 	border-radius-topright: 3px;
-}
-.nav-commlink:hover {
-	background-color: #0CBEFE;
-	color: #F5F6FB;
-}
-
-#nav-end {
-	clear: both;
-}
-
-.login-extra-links {
-	font-size: 0.7em;
-}
-
-#profile-extra-links {
-	clear: both;
-	margin-top: 20px;
-	margin-bottom: 20px;
-	margin-left: 20px;
-	margin-right: 20px;
-}
-#register-fill-ext {
-	margin-bottom: 25px;
-}
-
-#label-register-name, #label-register-email, #label-register-nickname, #label-register-openid {
-	float: left;
-	width: 350px;
-	margin-top: 10px;
-}
-
-#register-name, #register-email, #register-nickname {
-	float: left;
-	margin-top: 10px;
-	width: 150px;
-}
-
-#register-openid {
-	float: left;
-	margin-top: 10px;
-	width: 130px;
-}
-
-#register-name-end, #register-email-end, #register-nickname-end, #register-submit-end, #register-openid-end {
-	clear: both;
-}
-
-#register-nickname-desc {
-	margin-top: 30px;
-	width: 650px;
-}
-#register-sitename {
-	float: left;
-	margin-top: 10px;
-}
-
-#register-submit-button {
-	margin-top: 10px;
-}
-
-#login_standard {
-	width: 480px;
-	float: left;
-}
-#login_openid {
-	width: 480px;
-	margin-left: 490px;
-}
-
-#login_standard input,
-#login_openid input {
-	width: 180px!important;
-}
-#login-extra-links { clear: both; }
-
-#register-link, #lost-password-link {
-	float: left;
-	font-size: 80%;
-	margin-right: 15px;
-}
-
-
-#login-submit-button {
-/*	margin-top: 10px; */
-	margin-left: 200px;
-}
-
-input#dfrn-url {
-	float: left;
-	background: url(friendika-16.png) no-repeat;
-	background-position: 2px center;
-	font-size: 17px;
-	padding-left: 21px;
-	height: 21px;
-	background-color: #FFFFFF;
-	color: #000000;
-	margin-bottom: 20px;
-}
-
-#dfrn-url-label {
-	float: left;
-	width: 250px;
-}
-
-#dfrn-request-url-end {
-	clear: both;
-}
-
-#knowyouyes, #knowyouno {
-	float: left;
-}
-
-#dfrn-request-knowyou-yes-wrapper, #dfrn-request-knowyou-no-wrapper {
-
-	float: none;
-}
-#dfrn-request-knowyou-yes-label, #dfrn-request-knowyou-no-label {
-	float: left;
-	width: 75px;
-	margin-left: 50px;
-	margin-bottom: 7px;
-}
-#dfrn-request-knowyou-break, #dfrn-request-knowyou-end {
-	clear: both;
-
-}
-
-#dfrn-request-message-wrapper {
-	margin-bottom: 50px;
-}
-#dfrn-request-submit-wrapper {
-	clear: both;
-	margin-left: 50px;
-}
-
-#dfrn-request-info-wrapper {
-	margin-left: 50px;
-}
-
-
-#cropimage-wrapper, #cropimage-preview-wrapper {
-	float: left;
-	padding: 30px;
-}
-
-#crop-image-form {
-	margin-top: 30px;
-	clear: both;
-}
-
-.intro-wrapper {
-	margin-top: 20px;
-}
-
-.intro-fullname {
-	font-size: 1.1em;
-	font-weight: bold;
-
-}
-.intro-desc {
-	margin-bottom: 20px;
-	font-weight: bold;
-}
-
-.intro-note {
-	padding: 10px;
-}
-
-.intro-end {
-	padding: 30px;
-}
-
-.intro-form {
-	float: left;
-}
-.intro-approve-form {
-	clear: both;
-}
-.intro-approve-as-friend-end {
-	clear: both;
-}
-.intro-submit-approve, .intro-submit-ignore {
-	margin-right: 20px;
-}
-.intro-submit-approve {
-	margin-top: 15px;
-}
-
-.intro-approve-as-friend-label, .intro-approve-as-fan-label {
-	float: left;
-	width: 100px;
-	margin-left: 20px;
-}
-.intro-approve-as-friend, .intro-approve-as-fan {
-	float: left;
-}
-.intro-form-end {
-	clear: both;
-}
-.intro-approve-as-friend-desc {
-	margin-top: 15px;
-}
-.intro-approve-as-end {
-	clear: both;
-	margin-bottom: 10px;
-}
-
-.intro-end {
-	clear: both;
-	margin-bottom: 30px;
-}
-
-#profile-extra-links ul {
-	list-style-type: none;
-}
-
-
-#profile-extra-links li {
-	margin-top: 5px;
-}
-
-#profile-edit-links ul {
-	list-style-type: none;
-}
-
-#profile-edit-links li {
-	margin-top: 10px;
-}
-
-.profile-edit-side-div {
-	float: right;
-}
-
-.view-contact-wrapper {
-	margin-top: 20px;
-	float: left;
-	margin-left: 20px;
-	width: 180px;
-}
-#view-contact-end {
-	clear: both;
-}
-#viewcontacts {
-	margin-top: 15px;
-}
-#profile-edit-default-desc {
-	color: #FF0000;
-	border: 1px solid #FF8888;
-	background-color: #FFEEEE;
-	padding: 7px;
-}
-
-#profile-edit-clone-link-wrapper {
-	float: left;
-	margin-left: 50px;
-	margin-bottom: 20px;
-	width: 300px;
-}
-
-#profile-edit-drop-link-wrapper {
-	float: left;
-}
-
-#profile-edit-links-end {
-	clear: both;
-}
-.profile-listing-photo {
-	border: none;
-}
-
-.profile-edit-submit-wrapper {
-	margin-top: 20px;
-	margin-bottom: 20px;
-}
-
-#profile-photo-link-select-wrapper {
-	margin-top: 2em;
-}
-#profile-photo-wrapper img {
-	width:175px;
-	height:175px;
-}
-
-#profile-edit-profile-name-label,
-#profile-edit-name-label,
-#profile-edit-pdesc-label,
-#profile-edit-gender-label,
-#profile-edit-dob-label,
-#profile-edit-address-label,
-#profile-edit-locality-label,
-#profile-edit-region-label,
-#profile-edit-postal-code-label,
-#profile-edit-country-name-label,
-#profile-edit-marital-label,
-#profile-edit-sexual-label,
-#profile-edit-politic-label,
-#profile-edit-religion-label,
-#profile-edit-pubkeywords-label,
-#profile-edit-prvkeywords-label,
-#profile-edit-homepage-label {
-	float: left;
-	width: 175px;
-}
-
-#profile-edit-profile-name,
-#profile-edit-name,
-#profile-edit-pdesc,
-#gender-select,
-#profile-edit-dob,
-#profile-edit-address,
-#profile-edit-locality,
-#profile-edit-region,
-#profile-edit-postal-code,
-#profile-edit-country-name,
-#marital-select,
-#sexual-select,
-#profile-edit-politic,
-#profile-edit-religion,
-#profile-edit-pubkeywords,
-#profile-edit-prvkeywords,
-#profile-in-dir-yes,
-#profile-in-dir-no,
-#profile-in-netdir-yes,
-#profile-in-netdir-no,
-#hide-wall-yes,
-#hide-wall-no,
-#hide-friends-yes,
-#hide-friends-no,
-#settings-normal,
-#settings-soapbox,
-#settings-community,
-#settings-freelove {
-	float: left;
-	margin-bottom: 20px;
-}
-
-#profile-in-dir-yes-label,
-#profile-in-dir-no-label,
-#profile-in-netdir-yes-label,
-#profile-in-netdir-no-label,
-#hide-wall-yes-label,
-#hide-wall-no-label,
-#hide-friends-yes-label,
-#hide-friends-no-label {
-	margin-left: 125px;
-	float: left;
-	width: 50px;
-}
-
-#profile-edit-with-label {
-	width: 175px;
-	margin-left: 20px;
-}
-
-#profile-edit-pubkeywords-desc,
-#profile-edit-prvkeywords-desc {
-	float: left;
-	margin-left: 20px;
-}
-
-#profile-publish-yes-reg,
-#profile-publish-no-reg {
-       float: left;
-       margin-bottom: 10px;
-}
-
-#profile-publish-yes-label-reg,
-#profile-publish-no-label-reg {
-       margin-left: 350px;
-       float: left;
-       width: 50px;
-}
-
-#profile-publish-break-reg,
-#profile-publish-end-reg {
-       clear: both;
-}
-
-
-
-#profile-edit-homepage {
-	float: left;
-	margin-bottom: 35px;
-}
-#settings-normal-label,
-#settings-soapbox-label,
-#settings-community-label,
-#settings-freelove-label {
-	float: left;
-	width: 200px;
-}
-#settings-normal-desc,
-#settings-soapbox-desc,
-#settings-community-desc,
-#settings-freelove-desc {
-	float: left;
-	margin-left: 75px;
-}
-
-#profile-edit-profile-name-end,
-#profile-edit-name-end,
-#profile-edit-pdesc-end,
-#profile-edit-gender-end,
-#profile-edit-dob-end,
-#profile-edit-address-end,
-#profile-edit-locality-end,
-#profile-edit-region-end,
-#profile-edit-postal-code-end,
-#profile-edit-country-name-end,
-#profile-edit-marital-end,
-#profile-edit-sexual-end,
-#profile-edit-politic-end,
-#profile-edit-religion-end,
-#profile-edit-pubkeywords-end,
-#profile-edit-prvkeywords-end,
-#profile-edit-homepage-end,
-#profile-in-dir-break,
-#profile-in-dir-end,
-#profile-in-netdir-break,
-#profile-in-netdir-end,
-#hide-wall-break,
-#hide-wall-end,
-#hide-friends-break,
-#hide-friends-end,
-#settings-normal-break,
-#settings-soapbox-break,
-#settings-community-break,
-#settings-freelove-break {
-	clear: both;
-}
-
-
-
-
-
-#gender-select, #marital-select, #sexual-select {
-	width: 220px;
-}
-
-#profile-edit-profile-name-wrapper .required {
-	color: #FF0000;
-	float: left;
-}
-
-#contacts-main {
-	margin-top: 20px;
-	margin-bottom: 20px;
-}
-
-.contact-entry-wrapper {
-	float: left;
-	width: 120px;
-	height: 120px;
-}
-
-.contact-entry-direction-icon {
-	margin-top: 24px;
-	margin-right: 2px;
-}
-
-.contact-entry-photo img {
-	border: none;
-}
-.contact-entry-photo-end {
-	clear: both;
-}
-.contact-entry-name {
-	float: left;
-	margin-left: 0px;
-	width: 120px;
-	oveflow: hidden;
-}
-.contact-entry-edit-links {
-	margin-top: 6px;
-	margin-left: 10px;
-	width: 16px;
-}
-.contact-entry-nav-wrapper {
-	float: left;
-	margin-left: 10px;
-}
-
-.contact-entry-edit-links img {
-	border: none;
-	margin-right: 15px;
-}
-.contact-entry-photo {
-	float: left;
-	position: relative;
-}
-.contact-entry-end {
-	clear: both;
-}
-
-#contact-edit-end {
-	clear: both;
-	margin-bottom: 65px;
-}
-
-.contact-photo-menu-button {
-       position: absolute;
-       background-image: url("photo-menu.jpg");
-       background-position: top left; 
-       background-repeat: no-repeat;
-       margin: 0px; padding: 0px;
-       width: 16px;
-       height: 16px;
-       top: 64px; left:0px;
-       overflow: hidden;
-       text-indent: 40px;
-       display: none;
-       
-}
-
-.contact-photo-menu {
-       width: 100px;
-       border: 2px solid #444444;
-       background: #FFFFFF;
-       position: absolute;
-       left: 0px; top: 90px;
-       display: none;
-       z-index: 10000;
-}
-.contact-photo-menu ul { margin:0px; padding: 0px; list-style: none }
-.contact-photo-menu li a { display: block; padding: 2px; }
-.contact-photo-menu li a:hover { color: #FFFFFF; background: #3465A4; text-decoration: none; }
-
-#fsuggest-desc, #fsuggest-submit-wrapper {
-	margin-top: 15px;
-	margin-bottom: 15px;
-}
-
-
-.wall-item-content-wrapper {
-	margin-top: 10px;
-	border: 1px solid #CCC;
-	position: relative;
-}
-
-.wall-item-content-wrapper.comment {
-	margin-left: 50px;
-	background: #CCCCCC;
-}
-
-.wall-item-photo-wrapper {
-	margin-top: 10px;
-	margin-left: 10px;
-	margin-bottom: 10px;
-	width: 100px;
-	float: left;
-}
-
-.wall-item-photo-menu-button {
-	display: block;
-	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: 74px; left:10px;
-	overflow: hidden;
-	text-indent: 40px;
-	display: none;
-}
-.wall-item-photo-menu {
-	width: auto;
-	border: 2px solid #444444;
-	background: #FFFFFF;
-	position: absolute;
-	left: 10px; top: 90px;
-	display: none;
-	z-index: 10000;
-}
-.wall-item-photo-menu ul { margin:0px; padding: 0px; list-style: none }
-.wall-item-photo-menu li a { display: block; padding: 2px; }
-.wall-item-photo-menu li a:hover { color: #FFFFFF; background: #3465A4; text-decoration: none; }
-
-
-.wall-item-arrowphoto-wrapper {
-	margin-top: 40px;
-}
-.wall-item-wrapper {
-	margin-left: 10px;;
-}
-
-.wall-item-lock {
-	position: absolute;
-	left: 105px;
-	top: 1px;
-}
-
-.wall-item-ago {
-	color: #888888;
-	font-size: 0.8em;
-}
-.wall-item-like-buttons {
-    float: left;
-    margin-right: 10px;
-    padding-right: 10px;
-    border-right: 2px solid #fff;
-}
-.wall-item-like-buttons > a,
-.wall-item-like-buttons > img {
-	float: left;
-}
-
-.wall-item-share-buttons {
-	margin-left: 5px;
-}
-
-.editpost {
-	margin-left: 10px;
-	float: left;
-}
-.star-item {
-	margin-left: 10px;
-	float: left;	
-}
-
-
-#network-star-link{
-	margin-top: 10px;
-}
-.network-star {
-	float: left;
-	margin-right: 5px;
-}
-#network-bmark-link {
-	margin-top: 10px;
-}
-
-
-
-.wall-item-info.wallwall {
-	width: 285px;
-}
-
-.wwto, .wall-item-arrowphoto-wrapper, .wwfrom {
-	float: left;
-	margin-right: 10px;
-}
-
-
-.wall-item-links-wrapper {
-    float: left;
-}
-
-.wall-item-delete-wrapper {
-    float: right;
-}
-
-.wall-item-delete-end {
-    clear: both;
-}
-
-
-.wall-item-like-buttons img {
-	cursor: pointer;
-}
-
-.wall-item-delete-icon {
-	border: none;
-}
-
-
-.wall-item-wrapper-end {
-	clear: both;
-}
-.wall-item-name-link {
-	font-weight: bold;
-	text-decoration: none;
-	color: #3172BD;
-}
-.wall-item-photo {
-	border: none;
-}
-.wall-item-content {
-	float: left;
-	width: 450px;
-	margin-left: 10px;
-	margin-bottom: 20px;
-	padding: 20px;
-	max-height: 400px;
-	overflow: auto;
-
-}
-.wall-item-tools {
-    clear: both;
-padding: 5px 10px 0px;
-}
-.wall-item-photo-end {
-	clear: both;
-}
-.wall-item-author {
-	margin-top: 10px;
-}
-.wall-item-info {
-    display: block;
-    float: left;
-    width:110px;
-    margin-right:10px;
-}
-
-.wall-item-title {
-	float: left;
-	font-weight: bold;
-	width: 450px;
-}
-
-.wall-item-body {
-	float: left;
-	width: 450px;
-	margin-top: 10px;
-}
-
-.comment-edit-wrapper {
-	margin-top: 15px;
-	background: #CCCCCC;
-	margin-left: 50px;
-}
-
-.comment-wwedit-wrapper {
-	margin-top: 15px;
-	background: #CCCCCC;
-	margin-left: 250px;
-}
-
-.comment-edit-photo {
-	margin-top: 10px;
-	margin-left: 10px;
-	margin-bottom: 10px;
-	width: 100px;
-	float: left;
-}
-.comment-edit-text-empty, .comment-edit-text-full {
-	float: left;
-	margin-top: 40px;
-}
-.comment-edit-text-end {
-	clear: both;
-}
-
-.comment-edit-submit {
-	margin-left: 110px;
-	margin-top: 10px;
-}
-#profile-jot-plugin-wrapper,
-#profile-jot-submit-wrapper {
-	margin-top: 15px;
-}
-
-#profile-jot-submit {
-	float: left;
-}
-#profile-upload-wrapper {
-	float: left;
-	margin-left: 30px;
-}
-#profile-attach-wrapper {
-    float: left;
-    margin-left: 30px;
-}
-#profile-rotator {
-	float: left;
-	margin-left: 30px;
-}
-#profile-link-wrapper {
-	float: left;
-	margin-left: 15px;
-}
-#profile-youtube-wrapper {
-	float: left;
-	margin-left: 15px;
-}
-#profile-video-wrapper {
-	float: left;
-	margin-left: 15px;
-}
-#profile-audio-wrapper {
-	float: left;
-	margin-left: 15px;
-}
-#profile-location-wrapper {
-	float: left;
-	margin-left: 15px;
-}
-#profile-nolocation-wrapper {
-	float: left;
-	margin-left: 15px;
-}
-
-#profile-title-wrapper {
-	float: left;
-	margin-left: 15px;
-}
-
-#profile-jot-perms {
-	float: left;
-	margin-left: 100px;
-	font-weight: bold;
-	font-size: 1.2em;
-}
-
-#jot-preview-link {
-	margin-left: 45px;
-}
-
-.preview {
-	background: #FFFFC8;
-}
-
-
-
-#profile-jot-perms-end {
-	clear: both;
-}
-#profile-jot-plugin-end {
-  clear:both;
-}
-.profile-jot-net {
-	float: left;
-	margin-right: 10px;
-	margin-top: 5px;
-	margin-bottom: 5px;
-}
-
-#profile-jot-networks-end {
-	clear: both;
-}
-
-#profile-jot-end {
-	clear: both;
-	margin-bottom: 30px;
-}
-#about-jot-submit-wrapper {
-	margin-top: 15px;
-}
-#about-jot-end {
-	margin-bottom: 30px;
-}
-#contacts-main {
-	margin-bottom: 30px;
-}
-
-#profile-listing-desc {
-	margin-left: 30px;
-}
-
-#profile-listing-new-link-wrapper {
-	margin-left: 30px;
-	margin-bottom: 30px;
-}
-.profile-listing-photo-wrapper {
-	float: left;
-}
-
-.profile-listing-edit-buttons-wrapper {
-	clear: both;
-}
-.profile-listing-photo-edit-link {
-	float: left;
-	width: 125px;
-}
-.profile-listing-end {
-	clear: both;
-}
-.profile-listing-edit-buttons-wrapper img{
-	border: none;
-	margin-right: 20px;
-}
-.profile-listing {
-	margin-top: 25px;
-}
-.profile-listing-name {
-	float: left;
-	margin-left: 32px;
-	margin-top: 10px;
-	color: #3172BD;
-	font-weight: bold;
-	width: 200px;
-
-}
-.fortune {
-	margin-top: 50px;
-	color: #4444FF;
-	font-weight: bold;
-	margin-bottom: 20px;
-}
-
-
-.directory-end {
-	clear: both;
-}
-.directory-name {
-	text-align: center;
-}
-.directory-photo {
-	margin-left: 25px;
-}
-.directory-details {
-	font-size: 0.7em;
-	text-align: center;
-	margin-left: 5px;
-	margin-right: 5px;
-}
-.directory-item {
-	float: left;
-	width: 225px;
-	height: 260px;
-	overflow: auto;
-}
-
-#directory-search-wrapper {
-	margin-top: 20px;
-	margin-right: 20px;
-	margin-bottom: 50px;
-}
-
-#directory-search-end {
-}
-
-.directory-photo-img {
-	border: none;
-}
-
-
-.pager {
-  padding: 10px;
-  text-align: center;
-  font-size: 1.0em;
-}
-
-
-.pager_first,
-.pager_last,
-.pager_prev,
-.pager_next,
-.pager_n {
-	border: 1px solid black;
-	background: #EEE;
-	padding: 4px;
-}
-
-.pager_first a,
-.pager_last a,
-.pager_prev a,
-.pager_next a,
-.pager_n a {
-	text-decoration: none;
-}
-
-.pager_current {
-  border: 1px solid black;
-  background: #FFCCCC;
-  padding: 4px;
-}
-
-
-#advanced-profile-name-wrapper,
-#advanced-profile-gender-wrapper,
-#advanced-profile-dob-wrapper,
-#advanced-profile-age-wrapper,
-#advanced-profile-marital-wrapper,
-#advanced-profile-sexual-wrapper,
-#advanced-profile-homepage-wrapper,
-#advanced-profile-politic-wrapper,
-#advanced-profile-religion-wrapper,
-#advanced-profile-about-wrapper,
-#advanced-profile-interest-wrapper,
-#advanced-profile-contact-wrapper,
-#advanced-profile-music-wrapper,
-#advanced-profile-book-wrapper,
-#advanced-profile-tv-wrapper,
-#advanced-profile-film-wrapper,
-#advanced-profile-romance-wrapper,
-#advanced-profile-work-wrapper,
-#advanced-profile-education-wrapper {
-	margin-top: 20px;
-}
-
-#advanced-profile-name-text,
-#advanced-profile-gender-text,
-#advanced-profile-dob-text,
-#advanced-profile-age-text,
-#advanced-profile-marital-text,
-#advanced-profile-sexual-text,
-#advanced-profile-homepage-text,
-#advanced-profile-politic-text,
-#advanced-profile-religion-text,
-#advanced-profile-about-text,
-#advanced-profile-interest-text,
-#advanced-profile-contact-text,
-#advanced-profile-music-text,
-#advanced-profile-book-text,
-#advanced-profile-tv-text,
-#advanced-profile-film-text,
-#advanced-profile-romance-text,
-#advanced-profile-work-text,
-#advanced-profile-education-text {
-	width: 300px;
-	float: left;
-}
-
-#advanced-profile-name-end,
-#advanced-profile-gender-end,
-#advanced-profile-dob-end,
-#advanced-profile-age-end,
-#advanced-profile-marital-end,
-#advanced-profile-sexual-end,
-#advanced-profile-homepage-end,
-#advanced-profile-politic-end,
-#advanced-profile-religion-end {
-	clear: both;
-}
-
-#advanced-profile-about-end,
-#advanced-profile-interest-end,
-#advanced-profile-contact-end,
-#advanced-profile-music-end,
-#advanced-profile-book-end,
-#advanced-profile-tv-end,
-#advanced-profile-film-end,
-#advanced-profile-romance-end,
-#advanced-profile-work-end,
-#advanced-profile-education-end {
-
-
-}
-
-#advanced-profile-name,
-#advanced-profile-gender,
-#advanced-profile-dob,
-#advanced-profile-age,
-#advanced-profile-marital,
-#advanced-profile-sexual,
-#advanced-profile-homepage,
-#advanced-profile-politic,
-#advanced-profile-religion {
-	float: left;
-
-}
-
-
-#advanced-profile-about,
-#advanced-profile-interest,
-#advanced-profile-contact,
-#advanced-profile-music,
-#advanced-profile-book,
-#advanced-profile-tv,
-#advanced-profile-film,
-#advanced-profile-romance,
-#advanced-profile-work,
-#advanced-profile-education {
-	margin-top: 10px;
-	margin-left: 50px;
-	margin-right: 20px;
-	padding: 10px;
-	border: 1px solid #CCCCCC;
-}
-
-#advanced-profile-with {
-	float: left;
-	margin-left: 15px;
-}
-
-#contact-edit-wrapper {
-	margin-top: 50px;
-}
-
-#contact-edit-banner-name {
-	font-size: 1.4em;
-	font-weight: bold;
-	margin-left: 30px;
-}
-#contact-edit-nettype {
-	margin-top: 5px;
-	margin-left: 30px;
-}
-
-
-#contact-edit-poll-wrapper {
-	margin-left: 50px;
-	margin-top: 30px;
-}
-#contact-edit-poll-text {
-	margin-top: 15px;
-	margin-bottom: 5px;
-}
-
-#contact-edit-update-now {
-	margin-top: 15px;
-}
-
-#contact-edit-photo-wrapper {
-	margin-bottom: 20px;
-}
-#contact-edit-links {
-	float: left;
-}
-#contact-edit-links a {
-	float: left;
-}
-#contact-edit-links img {
-	margin-left: 20px;
-	border: none;
-}
-
-#contact-drop-links {
-	float: left;
-}
-
-#contact-drop-links img {
-	margin-left: 20px;
-	border: none;
-}
-
-#contact-edit-nav-end {
-	clear: both;
-}
-
-#contact-edit-direction-icon {
-	float: left;
-	margin-top: 70px;
-	margin-right: 2px;
-}
-
-#contact-edit-photo {
-	float: left;
-}
-
-#contact-edit-photo-end {
-	clear: both;
-}
-
-#contact-edit-photo-wrapper {
-	float: left;
-}
-
-#contact-edit-nav-wrapper {
-	float: left;
-}
-
-#contact-edit-end {
-	clear: both;
-}
-
-#contact-profile-selector {
-	width: 175px;
-	margin-left: 175px;
-}
-
-#contact-reputation-selector {
-	margin-left: 175px;
-}
-
-#contact-edit-rating-text {
-	margin-left: 175px;
-}
-
-.contact-edit-submit {
-	margin-top: 20px;
-	margin-left: 50px;
-}
-
-#block-message, #ignore-message, #profile-edit-insecure {
-	margin-top: 20px;
-	color: #FF0000;
-	font-size: 1.1em;
-	border: 1px solid #FF8888;
-	background-color: #FFEEEE;
-	padding: 10px;
-}
-
-#block-message, #ignore-message {
-	width: 180px;
-}
-
-#profile-edit-insecure {
-	width: 600px;
-}
-
-.tab {
-	float: left;
-	padding: 4px;
-	margin-top: 10px;
-	margin-bottom: 10px;
-	margin-right: 5px;
-	/*border: 1px solid #CCC;*/
-	/*background: #F8F8F8;*/
-	font-size: 0.8em;
-	font-weight: bold;
-	background-color: #ECECEC;
-	border: 1px solid #858585;
-}
-.tab.active,
-.tab:hover {
-	background-color: #0CBEFE;
-	color: #F5F6FB;
-	border: 1px solid #F5F6FB;
-	/*cursor: pointer;*/
-}
-.tabs {	padding:0px; margin: 0px; overflow: auto; height: auto;}
-.tabs li { margin: 0px; list-style: none; }
-
-.comment-edit-text-empty {
-	color: gray;
-	height: 30px;
-	width: 175px;
-	overflow: auto;
-	margin-bottom: 10px;
-}
-
-.comment-edit-text-full {
-	color: black;
-	height: 150px;
-	width: 350px;
-	overflow: auto;
-}
-
-#profile-jot-text {
-	height: 20px;
-	color:#cccccc;
-	border: 1px solid #cccccc;
-}
-
-
-/** acl **/
-#photo-edit-perms-select,
-#photos-upload-permissions-wrapper,
-#profile-jot-acl-wrapper{
-	display:block!important;
-}
-
-
-#acl-wrapper {
-	width: 690px;
-	float:left;
-}
-#acl-search {
-	float:right;
-	background: #ffffff url("../../../images/search_18.png") no-repeat right center;
-	padding-right:20px;
-}
-#acl-showall {
-	float: left;
-	display: block;
-	width: auto;
-	height: 20px;
-	background-color: #cccccc;
-	background-image: url("../../../images/show_all_off.png");
-	background-position: 7px 7px;
-	background-repeat: no-repeat;
-	padding: 5px 5px 0px 30px;
-	-webkit-border-radius: 5px ;
-	-moz-border-radius: 5px;
-	border-radius: 5px;
-	color: #999999;
-}
-#acl-showall.selected {
-	color: #000000;
-	background-color: #ff9900;
-	background-image: url("../../../images/show_all_on.png");
-}
-
-
-#acl-list {
-	height: 210px;
-	border: 1px solid #cccccc;
-	clear: both;
-	margin-top: 30px;
-	overflow: auto;
-}
-#acl-list-content {
-
-}
-.acl-list-item {
-	display: block;
-	width: 150px;
-	height: 30px;
-	border: 1px solid #cccccc;
-	margin: 5px;
-	float: left;
-}
-.acl-list-item img{
-	width:22px;
-	height: 22px;
-	float: left;
-	margin: 4px;
-}
-.acl-list-item p { height: 12px; font-size: 10px; margin: 0px; padding: 2px 0px 1px; overflow: hidden;}
-.acl-list-item a { 
-	font-size: 8px;
-	display: block;
-	width: 40px;
-	height: 10px;
-	float: left;
-	color: #999999;
-	background-color: #cccccc;
-	margin-right: 5px;
-	-webkit-border-radius: 2px ;
-	-moz-border-radius: 2px;
-	border-radius: 2px;
-	padding-left: 15px;
-}
-#acl-wrapper a:hover {
-	text-decoration: none;
-	color:#000000;
-}
-.acl-button-show { background-image: url("../../../images/show_off.png"); }
-.acl-button-hide { background-image: url("../../../images/hide_off.png"); }
-
-.acl-button-show.selected {
-	color: #000000;
-	background-color: #9ade00;
-	background-image: url("../../../images/show_on.png");
-}
-.acl-button-hide.selected {
-	color: #000000;
-	background-color: #ff4141;
-	background-image: url("../../../images/hide_on.png");
-}
-.acl-list-item.groupshow { border-color: #9ade00; }
-.acl-list-item.grouphide { border-color: #ff4141; }
-/** /acl **/
-
-#group-new-submit-wrapper {
-	margin-top: 30px;
-}
-
-#group-edit-name-label {
-	float: left;
-	width: 175px;
-	margin-top: 20px;
-	margin-bottom: 20px;
-}
-
-#group-edit-name {
-	float: left;
-	width: 225px;
-	margin-top: 20px;
-	margin-bottom: 20px;
-}
-
-#group-edit-name-wrapper {
-
-
-}
-
-
-#group_members_select_label {
-	display: block;
-	float: left;
-	width: 175px;
-}
-
-.group_members_select {
-	float: left;
-	width: 230px;
-	overflow: auto;
-}
-
-#group_members_select_end {
-	clear: both;
-}
-#group-edit-name-end {
-	clear: both;
-}
-
-#prvmail-to-label, #prvmail-subject-label, #prvmail-message-label {
-	margin-bottom: 10px;
-	margin-top: 20px;
-}
-
-#prvmail-submit {
-	float: left;
-	margin-top: 10px;
-	margin-right: 30px;
-}
-#prvmail-upload-wrapper,
-#prvmail-link-wrapper,
-#prvmail-rotator-wrapper {
-	float: left;
-	margin-top: 10px;
-	margin-right: 10px;
-	width: 24px;
-}
-
-#prvmail-end {
-	clear: both;
-}
-
-.mail-list-sender,
-.mail-list-detail {
-	float: left;
-}
-.mail-list-detail {
-	margin-left: 20px;
-}
-
-.mail-list-subject {
-	font-size: 1.1em;
-	margin-top: 10px;
-}
-a.mail-list-link {
-	display: block;
-	padding: 4px 5px;
-}
-
-/*
-*a.mail-list-link:hover {
-*	background-color: #15607B;
-*	color: #F5F6FB;
-*}
-*/
-
-.mail-list-outside-wrapper-end {
-	clear: both;
-}
-
-.mail-list-outside-wrapper {
-	margin-top: 30px;
-}
-
-.mail-list-delete-wrapper {
-	float: right;
-	margin-right: 30px;
-	margin-top: 15px;
-}
-
-.mail-list-delete-icon {
-	border: none;
-}
-
-.mail-conv-sender,
-.mail-conv-detail {
-	float: left;
-}
-.mail-conv-detail {
-	margin-left: 20px;
-	width: 500px;
-}
-
-.mail-conv-subject {
-	font-size: 1.1em;
-	margin-top: 10px;
-}
-
-.mail-conv-outside-wrapper-end {
-	clear: both;
-}
-
-.mail-conv-outside-wrapper {
-	margin-top: 30px;
-}
-
-.mail-conv-delete-wrapper {
-	float: right;
-	margin-right: 30px;
-	margin-top: 15px;
-}
-
-.mail-conv-delete-icon {
-	border: none;
-}
-
-.message-links ul {
-	list-style-type: none;
-}
-
-.message-links li {
-	margin-top: 10px;
-}
-.message-links a {
-	/*background-color: #ECECEC;*/
-	/*border: 1px solid #858585;*/
-	padding: 3px 5px;
-	/*display: block;*/
-}
-.message-links a:hover {
-	background-color: #0CBEFE;
-	color: #F5F6FB;
-	/*border: 1px solid #F5F6FB;*/
-}
-
-#sidebar-group-list ul {
-	list-style-type: none;
-}
-
-#sidebar-group-list li {
-	margin-top: 10px;
-}
-
-#sidebar-group-list .icon {
-	display: inline-block;
-	height: 12px;
-	width: 12px;
-}
-
-.nets-ul {
-	list-style-type: none;
-}
-
-.nets-ul li {
-	margin-top: 10px;
-}
-
-.nets-link {
-	margin-left: 24px;
-}
-.nets-all {
-	margin-left: 42px;
-}
-
-#search-save {
-    margin-left: 5px;
-}
-.groupsideedit {
-    margin-right: 10px;
-}
-#saved-search-ul {
-    list-style-type: none;
-}
-.savedsearchdrop, .savedsearchterm {
-    float: left;
-    margin-top: 10px;
-}
-.savedsearchterm {
-    margin-left: 10px;
-}
-
-
-#side-follow-wrapper {
-	margin-top: 20px;
-}
-#side-follow-url {
-	margin-top: 5px;
-}
-#side-follow-submit {
-	margin-top: 15px;
-}
-
-.photos {
-	height: auto;
-	overflow: auto;
-}
-
-.photo-album-image-wrapper {
-	float: left;
-	margin-top: 15px;
-	height: 350px;
-	width: 350px;
-}
-
-#photo-album-end {
-	clear: both;
-}
-
-.photo-top-image-wrapper {
-	float: left;
-	margin-top: 15px;
-	height: 350px;
-	width: 350px;
-}
-
-#photo-top-end {
-	clear: both;
-}
-
-#photo-top-links {
-	margin-bottom: 30px;
-	margin-left: 30px;
-}
-
-#photos-upload-newalbum-div {
-	float: left;
-	width: 175px;
-}
-#photos-upload-existing-album-text {
-	float: left;
-	width: 175px;
-}
-#photos-upload-newalbum {
-	float: left;
-}
-#photos-upload-album-select {
-	float: left;
-}
-#photos-upload-spacer {
-	margin-top: 25px;
-}
-#photos-upload-new-end, #photos-upload-exist-end {
-	clear: both;
-}
-#photos-upload-exist-end {
-	margin-bottom: 15px;
-}
-#photos-upload-submit {
-	margin-top: 15px;
-}
-
-#photos_upload_applet_wrapper {
-	margin-bottom: 15px;
-}
-
-#photos-upload-no-java-message {
-	margin-bottom: 15px;
-}
-
-#profile-jot-desc {
-	float: left;
-	width: 480px;
-	margin-top: 10px;
-	margin-bottom: 10px;
-}
-#character-counter {
-	float: left;
-	font-size: 120%;
-}
-
-#character-counter.grey {
-	color: #888888;
-}
-
-#character-counter.orange {
-	color: orange;
-}
-#character-counter.red {
-	color: red;
-}
-
-#profile-jot-banner-end {
-	clear: both;
-}
-
-#photos-upload-select-files-text {
-	margin-top: 15px;
-	margin-bottom: 15px;
-}
-
-#photos-upload-perms-menu, #photos-upload-perms-menu:visited {
-	color: #8888FF;
-	text-decoration: none;
-	cursor: pointer;
-}
-
-#photos-upload-perms-menu:hover {
-	color: #0000FF;
-	text-decoration: underline;
-	cursor: pointer;
-}
-#settings-default-perms-menu {
-	margin-top: 15px;
-	margin-bottom: 15px;
-}
-
-#photo-edit-caption-label, #photo-edit-tags-label, #photo-edit-albumname-label {
-	float: left;
-	width: 150px;
-}
-
-#photo-edit-perms-end {
-	margin-bottom: 15px;
-}
-
-#photo-edit-caption, #photo-edit-newtag, #photo-edit-albumname {
-	float: left;
-	margin-bottom: 25px;
-}
-#photo-edit-link-wrap {
-	margin-bottom: 15px;
-}
-#photo-like-div {
-	margin-bottom: 25px;
-}
-
-#photo-edit-caption-end, #photo-edit-tags-end, #photo-edit-albumname-end {
-	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;
-}
-
-#in-this-photo-text {
-	color: #0000FF;
-	margin-left: 30px;
-}
-
-#in-this-photo {
-	margin-left: 60px;
-	margin-top: 10px;
-	margin-bottom: 20px;
-}
-
-#photo-album-edit-submit, #photo-album-edit-drop {
-	margin-top: 15px;
-	margin-bottom: 15px;
-}
-
-#photo-album-edit-drop {
-	margin-left: 200px;
-}
-
-.group-delete-wrapper {
-	float: right;
-	margin-right: 50px;
-}
-
-#install-dbhost-label,
-#install-dbuser-label,
-#install-dbpass-label,
-#install-dbdata-label,
-#install-admin-label,
-#install-tz-desc {
-       float: left;
-       width: 250px;
-       margin-top: 10px;
-       margin-bottom: 10px;
-
-}
-
-#install-dbhost,
-#install-dbuser,
-#install-dbpass,
-#install-dbdata,
-#install-admin {
-       float: left;
-       width: 200px;
-       margin-left: 20px;
-}
-
-#install-dbhost-end,
-#install-dbuser-end,
-#install-dbpass-end,
-#install-dbdata-end,
-#install-admin-end,
-#install-tz-end {
-       clear: both;
-}
-
-#install-form select#timezone_select {
-       float: left;
-       margin-top: 18px;
-       margin-left: 20px;
-}
-
-#dfrn-request-networks {
-	margin-bottom: 30px;
-}
-
-#pause {
-  position: fixed;
-  bottom: 5px;
-  right: 5px;
-}
-
-.sparkle {
-	cursor: url('lock.cur'), pointer;
-/*	cursor: pointer !important; */
-}
-
-.contact-block-div {
-	float: left;
-	width: 52px;
-	height: 52px;
-}
-.contact-block-textdiv {
-	float: left;
-	width: 150px;
-	height: 34px;
-}
-
-#contact-block-end {
-	clear: both;
-}
-.contact-block-link {
-	float: left;
-}
-.contact-block-img {
-	width:48px;
-	height:48px;
-}
-
-#tag-remove {
-	margin-bottom: 15px;
-}
-
-#tagrm li {
-	margin-bottom: 10px;
-}
-
-#tagrm-submit, #tagrm-cancel {
-	margin-top: 25px;
-}
-
-#tagrm-cancel {
-	margin-left: 15px;
-}
-
-.wall-item-conv {
-	margin-top: 5px;
-	margin-bottom: 25px;
-}
-
-#search-submit {
-	margin-left: 15px;
-}
-
-#search-box {
-	margin-bottom: 25px;
-}
-
-.location-label, .gender-label, .marital-label, .homepage-label {
-	float: left;
-	text-align: right;
-	display: block;
-	width: 65px;
-}
-
-.adr, .x-gender, .marital-text, .homepage-url {
-	float: left;
-	display: block;
-	margin-left: 8px;
-}
-
-.profile-clear {
-	clear: both;
-}
-
-
-.clear {
-	clear: both;
-}
-
-.cc-license {
-	margin-top: 50px;
-	font-size: 70%;
-}
-
-
-#plugin-settings-link, #account-settings-link, #uexport-link {
-	margin-bottom: 10px;
-}
-
-
-#birthday-title {
-	float: left;
-	font-weight: bold;	
-}
-
-#birthday-adjust {
-	float: left;
-	font-size: 75%;
-	margin-left: 10px;
-}
-
-#birthday-title-end {
-	clear: both;
-}
-
-.birthday-list {
-	margin-left: 15px;
-}
-
-#birthday-wrapper {
-	margin-bottom: 20px;
-}
-
-
-#network-new-link {
-	margin-top: 15px;
-	margin-bottom: 15px;
-}
-
-.tool-wrapper {
-  float: left;
-  margin-left: 15px;
-}
-.tool-link {
-  cursor: pointer;
-}
-
-
-.calendar {
-	font-family: Courier, monospace;
-}
-.today {
-	color: #FF0000;
-}
-
-
-.settings-block {
-	border: 1px solid #AAA;
-	margin: 10px;
-	padding: 10px;
-}
-
-
-.app-title {
-	margin: 10px;
-}
-
-
-#identity-manage-desc {
-	margin-top:15px;
-	margin-bottom: 15px;
-}
-
-#identity-manage-choose {
-	margin-bottom: 15px;
-}
-
-#identity-submit {
-	margin-top: 20px;
-}
-
-
-#photo-prev-link, #photo-next-link {
-	padding: 10px;
-	float: left;
-}
-
-#photo-photo {
-	float: left;
-}
-
-#photo-photo-end {
-	clear: both;
-}
-
-
-.profile-match-photo {
-	float: left;
-	text-align: center;
-	width: 120px;
-}
-
-.profile-match-name {
-	float: left;
-	text-align: center;
-	width: 120px;
-	overflow: hidden;
-}
-
-.profile-match-break,
-.profile-match-end {
-	clear: both;
-}
-
-.profile-match-wrapper {
-	float: left;
-	padding: 10px;
-    width: 120px;
-    height: 120px;
-    scroll: auto;
-
-}
-#profile-match-wrapper-end {
-	clear: both;
-}
-
-.side-link {
-	margin-bottom: 15px;
-}
-
-#language-selector {
-	position: absolute;
-	top: 0;
-	left: 16px;
-}
-
-
-#group-members {
-	margin-top: 20px;
-	padding: 10px;
-	height: 250px;
-	overflow: auto;
-	border: 1px solid #ddd;
-}
-
-#group-members-end {
-	clear: both;
-}
-
-#group-separator {
-	margin-top: 10px;
-	margin-bottom: 10px;
-}
-
-#group-all-contacts {
-	padding: 10px;
-	height: 450px;
-	overflow: auto;
-	border: 1px solid #ddd;
-}
-
-#group-all-contacts-end {
-	clear: both;
-	margin-bottom: 10px;
-}
-
-#group-edit-desc {
-    margin-top: 15px;
-}
-
-
-#prof-members {
-	margin-top: 20px;
-	padding: 10px;
-	height: 250px;
-	overflow: auto;
-	border: 1px solid #ddd;
-}
-
-#prof-members-end {
-	clear: both;
-}
-
-#prof-separator {
-	margin-top: 10px;
-	margin-bottom: 10px;
-}
-
-#prof-all-contacts {
-	padding: 10px;
-	height: 450px;
-	overflow: auto;
-	border: 1px solid #ddd;
-}
-
-#prof-all-contacts-end {
-	clear: both;
-	margin-bottom: 10px;
-}
-
-#prof-edit-desc {
-	margin-top: 15px;
-}
-
-#crepair-nick-label,
-#crepair-attag-label,
-#crepair-url-label,
-#crepair-request-label,
-#crepair-confirm-label,
-#crepair-notify-label,
-#crepair-poll-label {
-	float: left;
-	width: 200px;
-	margin-bottom: 15px;
-}
-
-#crepair-nick,
-#crepair-attag,
-#crepair-url,
-#crepair-request,
-#crepair-confirm,
-#crepair-notify,
-#crepair-poll {
-	float: left;
-	width: 300px;
-}
-
-#netsearch-box {
-	margin-top: 20px;
-	width: 150px;	
-}
-
-#netsearch-box #search-submit {
-	margin: 5px 0px 0px 0px;
-}
-
-.required {
-	color: #FF0000;
-}
-
-.eventcal {
-	float: left;
-	font-size: 20px;
-}
-
-
-.vevent {
-       border: 1px solid #CCCCCC;
-}
-.vevent .event-description, .vevent .event-location {
-       margin-left: 10px;
-       margin-right: 10px;
-}
-.vevent .event-start {
-       margin-left: 10px;
-       margin-right: 10px;
-}
-
-
-#new-event-link {
-	margin-bottom: 10px;
-}
-
-
-.edit-event-link, .plink-event-link {
-	float: left;
-    margin-top: 4px;
-    margin-right: 4px;
-    margin-bottom: 15px;
-}
-
-
-.event-description:before {
-	content: url('../../../images/calendar.png');
-	margin-right: 15px;
-}
-
-.event-list-date {
-	margin-bottom: 10px;
-}
-
-.event-start, .event-end {
-	margin-left: 10px;
-	width: 330px;
-	clear: both;
-}
-
-.event-start .dtstart, .event-end .dtend {
-	float: right;
-}
-
-.prevcal, .nextcal {
-	float: left;
-	margin-left: 32px;
-	margin-right: 32px;
-	margin-top: 64px;
-}
-.event-calendar-end {
-	clear: both;
-}
- 
-.calendar {
-	font-family: Courier, monospace;
-}
-.today {
-	font-weight: bold;
-	color: #FF0000;
-}
-
-
-#event-start-text, #event-finish-text {
-	margin-top: 10px;
-	margin-bottom: 5px;
-}
-
-#event-nofinish-checkbox, #event-nofinish-text, #event-adjust-checkbox, #event-adjust-text {
-	float: left;
-}
-#event-datetime-break {
-	margin-bottom: 10px;
-}
-
-#event-nofinish-break, #event-adjust-break {
-	clear: both;
-}
-
-#event-desc-text, #event-location-text {
-	margin-top: 10px;
-	margin-bottom: 5px;
-}
-#event-submit {
-	margin-top: 10px;
-}
-
-
-.item-select {
-	opacity: 0.1;
-	filter:alpha(opacity=10);
-	float: right;
-	margin-right: 10px;
-
-}
-.item-select:hover, .checkeditem {
-	opacity: 1;
-	filter:alpha(opacity=100);
-}
-
-
-#item-delete-selected {
-	margin-top: 30px;
-}
-
-#item-delete-selected-end {
-	clear: both;
-}
-#item-delete-selected-icon, #item-delete-selected-desc {
-	float: left;
-	margin-right: 5px;
-}
-#item-delete-selected-desc:hover {
-	text-decoration: underline;
-}
-
-#lang-select-icon {
-	cursor: pointer;
-	position: absolute;
-	left: 0px;
-	top: 0px;
-}
-/**
- * Form fields
- */
-.field {
-	margin-bottom: 10px;
-	padding-bottom: 10px;
-	overflow: auto;
-	width: 100%
-}
-
-.field label {
-	float: left;
-	width: 200px;
-}
-
-.field input,
-.field textarea {
-	width: 400px;
-}
-.field textarea { height: 100px; }
-.field_help {
-	display: block;
-	margin-left: 200px;
-	color: #666666;
-	
-}
-
-
-.field .onoff {
-	float: left;
-	width: 80px;
-}
-.field .onoff a {
-	display: block;
-	border:1px solid #666666;
-	background-image:url("../../../images/onoff.jpg");
-	background-repeat: no-repeat;
-	padding: 4px 2px 2px 2px;
-	height: 16px;
-	text-decoration: none;
-}
-.field .onoff .off {
-	border-color:#666666;
-	padding-left: 40px;
-	background-position: left center;
-	background-color: #cccccc;
-	color: #666666;
-	text-align: right;
-}
-.field .onoff .on {
-	border-color:#204A87;
-	padding-right: 40px;
-	background-position: right center;
-	background-color: #3465A4;
-	color: #FFFFFF;
-	text-align: left;
-}
-.hidden { display: none!important; }
-
-.field.radio .field_help { margin-left: 0px; }
-
-
-/**
- * ADMIN
- */
-#pending-update {
-	float:right;
-	color: #ffffff;
-	font-weight: bold;
-	background-color: #FF0000;
-	padding: 0em 0.3em;
-}
-
-#adminpage dl {
-	clear: left;
-	margin-bottom: 2px;
-	padding-bottom: 2px;
-	border-bottom: 1px solid black;
-}
-#adminpage dt {
-	width: 200px;
-	float: left;
-	font-weight: bold;
-}
-#adminpage dd {
-	margin-left: 200px;
-}
-
-#adminpage h3 {
-	border-bottom: 1px solid #cccccc;
-}
-
-#adminpage .submit {
-	clear:left;
-}
-
-#adminpage #pluginslist {
-	margin: 0px; padding: 0px;
-}
-#adminpage .plugin {
-	list-style: none;
-	display: block;
-	border: 1px solid #888888;
-	padding: 1em;
-	margin-bottom: 5px;
-	clear: left;
-}
-#adminpage .toggleplugin {
-	float:left;
-	margin-right: 1em;
-}
-
-#adminpage table {width:100%; border-bottom: 1p solid #000000; margin: 5px 0px;}
-#adminpage table th { text-align: left;}
-#adminpage td .icon { float: left;}
-#adminpage table#users img { width: 16px; height: 16px; }
-#adminpage table tr:hover { background-color: #bbc7d7; }
-#adminpage .selectall { text-align: right; }
-/**
- * ICONS
- */
-.icon {
-	display: block; width: 16px; height: 16px;
-	background-image: url('../../../images/icons.png');
-}
-.article { background-position: 0px 0px;}
-.audio { background-position: -16px 0px;}
-.block { background-position: -32px 0px;}
-.drop { background-position: -48px 0px;}
-.drophide { background-position: -64px 0px;}
-.edit { background-position: -80px 0px;}
-.camera { background-position: -96px 0px;}
-.dislike { background-position: -112px 0px;}
-.like { background-position: -128px 0px;}
-.link { background-position: -144px 0px;}
-
-.globe { background-position: 0px -16px;}
-.noglobe { background-position: -16px -16px;}
-.no { background-position: -32px -16px;}
-.pause { background-position: -48px -16px;}
-.play { background-position: -64px -16px;}
-.pencil { background-position: -80px -16px;}
-.small-pencil { background-position: -96px -16px;}
-.recycle { background-position: -112px -16px;}
-.remote-link { background-position: -128px -16px;}
-.share { background-position: -144px -16px;}
-
-.tools { background-position: 0px -32px;}
-.lock { background-position: -16px -32px;}
-.unlock { background-position: -32px -32px;}
-.video { background-position: -48px -32px;}
-.youtube { background-position: -64px -32px;}
-.attach { background-position: -80px -32px; }
-.language { background-position: -96px -32px; }
-.prev { background-position: -112px -32px; }
-.next { background-position: -128px -32px; }
-.on { background-position: -144px -32px; }
-
-.off { background-position: 0px -48px; }
-.starred { background-position: -16px -48px; }
-.unstarred { background-position: -32px -48px; }
-.tagged { background-position: -48px -48px; }
-
-.icon.dim { opacity: 0.3;filter:alpha(opacity=30); }
-
-.attachtype {
-	display: block; width: 20px; height: 23px;
-	float: left;
-	background-image: url('../../../images/content-types.png');
-}
-
-.body-attach {
-	margin-top: 10px;
-}
-
-.type-video { background-position: 0px 0px; }
-.type-image { background-position: -20px 0px; }
-.type-audio { background-position: -40px 0px; }
-.type-text  { background-position: -60px 0px; }
-.type-unkn  { background-position: -80px 0px; }
-
-/* autocomplete popup */
-.acpopup {
-	max-height:150px;
-	background-color:#ffffff;
-	overflow:auto;
-	z-index:100000;
-	border:1px solid #cccccc;
-}
-.acpopupitem {
-	background-color:#ffffff; padding: 4px;
-	clear:left;
-}
-.acpopupitem img {
-	float: left;
-	margin-right: 4px;
-}
-
-.acpopupitem.selected {
-	color: #FFFFFF; background: #3465A4;
-}
-
-
diff --git a/view/theme/loozah/unsupported b/view/theme/loozah/unsupported
deleted file mode 100644
index e69de29bb..000000000
--- a/view/theme/loozah/unsupported
+++ /dev/null
diff --git a/view/theme/loozah/wall_item.tpl b/view/theme/loozah/wall_item.tpl
deleted file mode 100755
index 56c8a82e2..000000000
--- a/view/theme/loozah/wall_item.tpl
+++ /dev/null
@@ -1,71 +0,0 @@
-<div class="wall-item-outside-wrapper$indent" id="wall-item-outside-wrapper-$id" >
-	<div class="wall-item-content-wrapper$indent" id="wall-item-content-wrapper-$id" >
-		<div class="wall-item-info" id="wall-item-info-$id">
-			<div class="wall-item-photo-wrapper" id="wall-item-photo-wrapper-$id" 
-				 onmouseover="if (typeof t$id != 'undefined') clearTimeout(t$id); openMenu('wall-item-photo-menu-button-$id')" 
-				 onmouseout="t$id=setTimeout('closeMenu(\'wall-item-photo-menu-button-$id\'); closeMenu(\'wall-item-photo-menu-$id\');',200)">
-				<a href="$profile_url" target="redir" title="$linktitle" class="wall-item-photo-link" id="wall-item-photo-link-$id">
-					<img src="$thumb" class="wall-item-photo$sparkle" id="wall-item-photo-$id" style="height: 80px; width: 80px;" alt="$name" />
-				</a>
-				<span onclick="openClose('wall-item-photo-menu-$id');" class="fakelink wall-item-photo-menu-button" id="wall-item-photo-menu-button-$id">menu</span>
-				<div class="wall-item-photo-menu" id="wall-item-photo-menu-$id">
-					<ul>
-						$item_photo_menu
-					</ul>
-				</div>
-			</div>
-			<div class="wall-item-photo-end"></div>
-			<div class="wall-item-wrapper" id="wall-item-wrapper-$id" >
-				{{ if $lock }}<div class="wall-item-lock"><img src="images/lock_icon.gif" class="lockview" alt="$lock" onclick="lockview(event,$id);" /></div>
-				{{ else }}<div class="wall-item-lock"></div>{{ endif }}
-				<div class="wall-item-location" id="wall-item-location-$id">$location</div>				
-			</div>
-		</div>
-		<div class="wall-item-author">
-				<a href="$profile_url" target="redir" title="$linktitle" class="wall-item-name-link"><span class="wall-item-name$sparkle" id="wall-item-name-$id" >$name</span></a>
-				<div class="wall-item-ago"  id="wall-item-ago-$id">$ago</div>
-				
-		</div>	
-		<div class="wall-item-content" id="wall-item-content-$id" >
-			<div class="wall-item-title" id="wall-item-title-$id">$title</div>
-			<div class="wall-item-title-end"></div>
-			<div class="wall-item-body" id="wall-item-body-$id" >$body</div>
-		</div>
-		<div class="wall-item-tools" id="wall-item-tools-$id">
-			{{ if $vote }}
-			<div class="wall-item-like-buttons" id="wall-item-like-buttons-$id">
-				<a href="#" class="icon like" title="$vote.like.0" onclick="dolike($id,'like'); return false"></a>
-				<a href="#" class="icon dislike" title="$vote.dislike.0" onclick="dolike($id,'dislike'); return false"></a>
-				{{ if $vote.share }}<a href="#" class="icon recycle wall-item-share-buttons" title="$vote.share.0" onclick="jotShare($id); return false"></a>{{ endif }}
-				<img id="like-rotator-$id" class="like-rotator" src="images/rotator.gif" alt="$wait" title="$wait" style="display: none;" />
-			</div>
-			{{ endif }}
-			{{ if $plink }}
-				<div class="wall-item-links-wrapper"><a href="$plink.href" title="$plink.title" target="external-link" class="icon remote-link"></a></div>
-			{{ endif }}
-			{{ if $edpost }}
-				<a class="editpost icon pencil" href="$edpost.0" title="$edpost.1"></a>
-			{{ endif }}
-			 
-			{{ if $star }}
-			<a href="#" id="starred-$id" onclick="dostar($id); return false;" class="star-item icon $isstarred" title="$star.toggle"></a>
-			<a href="#" id="tagger-$id" onclick="itemTag($id); return false;" class="tag-item icon tagged" title="$star.tagger"></a>
-
-			{{ endif }}
-			
-			<div class="wall-item-delete-wrapper" id="wall-item-delete-wrapper-$id" >
-				{{ if $drop.dropping }}<a href="item/drop/$id" onclick="return confirmDelete();" class="icon drophide" title="$drop.delete" onmouseover="imgbright(this);" onmouseout="imgdull(this);" ></a>{{ endif }}
-			</div>
-				{{ if $drop.dropping }}<input type="checkbox" onclick="checkboxhighlight(this);" title="$drop.select" class="item-select" name="itemselected[]" value="$id" />{{ endif }}
-			<div class="wall-item-delete-end"></div>
-		</div>
-	</div>
-	<div class="wall-item-wrapper-end"></div>
-	<div class="wall-item-like" id="wall-item-like-$id">$like</div>
-	<div class="wall-item-dislike" id="wall-item-dislike-$id">$dislike</div>
-	<div class="wall-item-comment-wrapper" >
-	$comment
-	</div>
-
-<div class="wall-item-outside-wrapper-end$indent" ></div>
-</div>
diff --git a/view/theme/loozah/wallwall_item.tpl b/view/theme/loozah/wallwall_item.tpl
deleted file mode 100755
index 0e4c1a6cf..000000000
--- a/view/theme/loozah/wallwall_item.tpl
+++ /dev/null
@@ -1,76 +0,0 @@
-<div class="wall-item-outside-wrapper$indent wallwall" id="wall-item-outside-wrapper-$id" >
-	<div class="wall-item-content-wrapper$indent" id="wall-item-content-wrapper-$id" >
-		<div class="wall-item-info wallwall" id="wall-item-info-$id">
-			<div class="wall-item-photo-wrapper wwto" id="wall-item-ownerphoto-wrapper-$id" >
-				<a href="$owner_url" target="redir" title="$olinktitle" class="wall-item-photo-link" id="wall-item-ownerphoto-link-$id">
-				<img src="$owner_photo" class="wall-item-photo$osparkle" id="wall-item-ownerphoto-$id" style="height: 80px; width: 80px;" alt="$owner_name" /></a>
-			</div>
-			<div class="wall-item-arrowphoto-wrapper" ><img src="images/larrow.gif" alt="$wall" /></div>
-			<div class="wall-item-photo-wrapper wwfrom" id="wall-item-photo-wrapper-$id" 
-				onmouseover="if (typeof t$id != 'undefined') clearTimeout(t$id); openMenu('wall-item-photo-menu-button-$id')"
-                onmouseout="t$id=setTimeout('closeMenu(\'wall-item-photo-menu-button-$id\'); closeMenu(\'wall-item-photo-menu-$id\');',200)">
-				<a href="$profile_url" target="redir" title="$linktitle" class="wall-item-photo-link" id="wall-item-photo-link-$id">
-				<img src="$thumb" class="wall-item-photo$sparkle" id="wall-item-photo-$id" style="height: 80px; width: 80px;" alt="$name" /></a>
-				<span onclick="openClose('wall-item-photo-menu-$id');" class="fakelink wall-item-photo-menu-button" id="wall-item-photo-menu-button-$id">menu</span>
-                <div class="wall-item-photo-menu" id="wall-item-photo-menu-$id">
-                    <ul>
-                        $item_photo_menu
-                    </ul>
-                </div>
-
-			</div>
-			<div class="wall-item-photo-end"></div>
-			<div class="wall-item-wrapper" id="wall-item-wrapper-$id" >
-				{{ if $lock }}<div class="wall-item-lock"><img src="images/lock_icon.gif" class="lockview" alt="$lock" onclick="lockview(event,$id);" /></div>
-				{{ else }}<div class="wall-item-lock"></div>{{ endif }}	
-				<div class="wall-item-location" id="wall-item-location-$id">$location</div>
-			</div>
-		</div>
-		<div class="wall-item-author">
-				<a href="$profile_url" target="redir" title="$linktitle" class="wall-item-name-link"><span class="wall-item-name$sparkle" id="wall-item-name-$id" >$name</span></a> $to <a href="$owner_url" target="redir" title="$olinktitle" class="wall-item-name-link"><span class="wall-item-name$osparkle" id="wall-item-ownername-$id">$owner_name</span></a> $vwall<br />
-				<div class="wall-item-ago"  id="wall-item-ago-$id">$ago</div>				
-		</div>			
-		<div class="wall-item-content" id="wall-item-content-$id" >
-			<div class="wall-item-title" id="wall-item-title-$id">$title</div>
-			<div class="wall-item-title-end"></div>
-			<div class="wall-item-body" id="wall-item-body-$id" >$body</div>
-		</div>
-		<div class="wall-item-tools" id="wall-item-tools-$id">
-			{{ if $vote }}
-			<div class="wall-item-like-buttons" id="wall-item-like-buttons-$id">
-				<a href="#" class="icon like" title="$vote.like.0" onclick="dolike($id,'like'); return false"></a>
-				<a href="#" class="icon dislike" title="$vote.dislike.0" onclick="dolike($id,'dislike'); return false"></a>
-				{{ if $vote.share }}<a href="#" class="icon recycle wall-item-share-buttons" title="$vote.share.0" onclick="jotShare($id); return false"></a>{{ endif }}
-				<img id="like-rotator-$id" class="like-rotator" src="images/rotator.gif" alt="$wait" title="$wait" style="display: none;" />
-			</div>
-			{{ endif }}
-			{{ if $plink }}
-				<div class="wall-item-links-wrapper"><a href="$plink.href" title="$plink.title" target="external-link" class="icon remote-link"></a></div>
-			{{ endif }}
-			{{ if $edpost }}
-				<a class="editpost icon pencil" href="$edpost.0" title="$edpost.1"></a>
-			{{ endif }}
-			 
-			{{ if $star }}
-			<a href="#" id="starred-$id" onclick="dostar($id); return false;" class="star-item icon $isstarred" title="$star.toggle"></a>
-			<a href="#" id="tagger-$id" onclick="itemTag($id); return false;" class="tag-item icon tagged" title="$star.tagger"></a>
-			{{ endif }}
-			
-			<div class="wall-item-delete-wrapper" id="wall-item-delete-wrapper-$id" >
-				{{ if $drop.dropping }}<a href="item/drop/$id" onclick="return confirmDelete();" class="icon drophide" title="$drop.delete" onmouseover="imgbright(this);" onmouseout="imgdull(this);" ></a>{{ endif }}
-			</div>
-				{{ if $drop.dropping }}<input type="checkbox" onclick="checkboxhighlight(this);" title="$drop.select" class="item-select" name="itemselected[]" value="$id" />{{ endif }}
-			<div class="wall-item-delete-end"></div>
-		</div>
-	</div>	
-	<div class="wall-item-wrapper-end"></div>
-	<div class="wall-item-like" id="wall-item-like-$id">$like</div>
-	<div class="wall-item-dislike" id="wall-item-dislike-$id">$dislike</div>
-	<div class="wall-item-comment-separator"></div>
-	<div class="wall-item-comment-wrapper" >
-	$comment
-	</div>
-
-<div class="wall-item-outside-wrapper-end$indent" ></div>
-</div>
-
diff --git a/view/theme/purplezero/border.jpg b/view/theme/purplezero/border.jpg
index 66c7a6fcc..66c7a6fcc 100755..100644
--- a/view/theme/purplezero/border.jpg
+++ b/view/theme/purplezero/border.jpg
diff --git a/view/theme/purplezero/head.jpg b/view/theme/purplezero/head.jpg
index 1acd2ddb8..1acd2ddb8 100755..100644
--- a/view/theme/purplezero/head.jpg
+++ b/view/theme/purplezero/head.jpg
diff --git a/view/theme/purplezero/shiny.png b/view/theme/purplezero/shiny.png
index d3f71ee1d..d3f71ee1d 100755..100644
--- a/view/theme/purplezero/shiny.png
+++ b/view/theme/purplezero/shiny.png
diff --git a/view/theme/purplezero/style.css b/view/theme/purplezero/style.css
index f0d5b96b9..f0d5b96b9 100755..100644
--- a/view/theme/purplezero/style.css
+++ b/view/theme/purplezero/style.css
diff --git a/view/theme/purplezero/theme.php b/view/theme/purplezero/theme.php
index ceec4dd97..b9613027c 100755..100644
--- a/view/theme/purplezero/theme.php
+++ b/view/theme/purplezero/theme.php
@@ -3,6 +3,7 @@ $a->theme_info = array(
   'extends' => 'duepuntozero',
 );
 
+function purplezero_init(&$a) {
 $a->page['htmlhead'] .= <<< EOT
 <script>
 $(document).ready(function() {
@@ -49,3 +50,4 @@ $('.savedsearchterm').hover(
 
 </script>
 EOT;
+}
\ No newline at end of file
diff --git a/view/theme/quattro/TODO b/view/theme/quattro/TODO
new file mode 100644
index 000000000..12638551a
--- /dev/null
+++ b/view/theme/quattro/TODO
@@ -0,0 +1,2 @@
+jot.tpl:			<!-- TODO: waiting for a better placement 
+nav.tpl:					<!-- TODO: better icons! -->
diff --git a/view/theme/quattro/comment_item.tpl b/view/theme/quattro/comment_item.tpl
index cde4ca3ca..cde4ca3ca 100755..100644
--- a/view/theme/quattro/comment_item.tpl
+++ b/view/theme/quattro/comment_item.tpl
diff --git a/view/theme/quattro/config.php b/view/theme/quattro/config.php
index c9ab3a4a1..c261a78ec 100644
--- a/view/theme/quattro/config.php
+++ b/view/theme/quattro/config.php
@@ -11,6 +11,37 @@ function theme_content(&$a){
 	
 	$align = get_pconfig(local_user(), 'quattro', 'align' );
 	$color = get_pconfig(local_user(), 'quattro', 'color' );
+	
+	return quattro_form($a,$align, $color);
+}
+
+function theme_post(&$a){
+	if(! local_user())
+		return;
+	
+	if (isset($_POST['quattro-settings-submit'])){
+		set_pconfig(local_user(), 'quattro', 'align', $_POST['quattro_align']);
+		set_pconfig(local_user(), 'quattro', 'color', $_POST['quattro_color']);
+	}
+}
+
+
+function theme_admin(&$a){
+	$align = get_config('quattro', 'align' );
+	$color = get_config('quattro', 'color' );
+	
+	return quattro_form($a,$align, $color);
+}
+
+function theme_admin_post(&$a){
+	if (isset($_POST['quattro-settings-submit'])){
+		set_config('quattro', 'align', $_POST['quattro_align']);
+		set_config('quattro', 'color', $_POST['quattro_color']);
+	}
+}
+
+
+function quattro_form(&$a, $align, $color){
 	$colors = array(
 		"dark"=>"Quattro", 
 		"green"=>"Green"
@@ -26,14 +57,3 @@ function theme_content(&$a){
 	));
 	return $o;
 }
-
-function theme_post(&$a){
-	if(! local_user())
-		return;
-	
-	if (isset($_POST['quattro-settings-submit'])){
-		set_pconfig(local_user(), 'quattro', 'align', $_POST['quattro_align']);
-		set_pconfig(local_user(), 'quattro', 'color', $_POST['quattro_color']);
-	}
-}
-
diff --git a/view/theme/quattro/contact_template.tpl b/view/theme/quattro/contact_template.tpl
index b826acc65..b826acc65 100755..100644
--- a/view/theme/quattro/contact_template.tpl
+++ b/view/theme/quattro/contact_template.tpl
diff --git a/view/theme/quattro/conversation.tpl b/view/theme/quattro/conversation.tpl
index ff202bbe4..7bb7cd2fd 100755..100644
--- a/view/theme/quattro/conversation.tpl
+++ b/view/theme/quattro/conversation.tpl
@@ -9,8 +9,11 @@
 		{{endif}}
 		{{if $item.comment_lastcollapsed}}</div>{{endif}}
 		
-		{{ inc $item.template }}{{ endinc }}
-		
+		{{ if $item.type == tag }}
+			{{ inc wall_item_tag.tpl }}{{ endinc }}
+		{{ else }}
+			{{ inc $item.template }}{{ endinc }}
+		{{ endif }}
 		
 	{{ endfor }}
 </div>
diff --git a/view/theme/quattro/dark/colors.less b/view/theme/quattro/dark/colors.less
index b6d487f92..42fdd34bb 100755..100644
--- a/view/theme/quattro/dark/colors.less
+++ b/view/theme/quattro/dark/colors.less
@@ -38,7 +38,7 @@
 @Link: @Blue3;
 @LinkHover: @Blue3;
 @LinkVisited: @Blue3;
-
+@LinkDimmed: @Blue2;
 
 @ButtonColor: @Grey1;
 @ButtonBackgroundColor: @Grey5;
@@ -73,9 +73,13 @@
 
 @FieldHelpColor: @Grey3;
 
-@ThreadBackgroundColor: #f6f7f8;
+@ThreadBackgroundColor: #eff0f1;
+@ThreadBottomBorderColor: @Grey2;
 @ShinyBorderColor: @Yellow1;
 
+@ItemColor: @Grey5;
+@ItemColorDimmed: @Grey3;
+
 @CommentBoxEmptyColor: @Grey3;
 @CommentBoxEmptyBorderColor: @Grey3;
 @CommentBoxFullColor: @Grey5;
diff --git a/view/theme/quattro/dark/style.css b/view/theme/quattro/dark/style.css
index 1d951aba8..1fa03b253 100755..100644
--- a/view/theme/quattro/dark/style.css
+++ b/view/theme/quattro/dark/style.css
@@ -48,6 +48,9 @@
 .icon.s10.unlock {
   background-image: url("../../../images/icons/10/unlock.png");
 }
+.icon.s10.plugin {
+  background-image: url("../../../images/icons/10/plugin.png");
+}
 .icon.s10.type-unkn {
   background-image: url("../../../images/icons/10/zip.png");
 }
@@ -63,6 +66,9 @@
 .icon.s10.type-text {
   background-image: url("../../../images/icons/10/text.png");
 }
+.icon.s10.language {
+  background-image: url("icons/language.png");
+}
 .icon.s10.text {
   padding: 2px 0px 0px 15px;
 }
@@ -100,6 +106,9 @@
 .icon.s16.unlock {
   background-image: url("../../../images/icons/16/unlock.png");
 }
+.icon.s16.plugin {
+  background-image: url("../../../images/icons/16/plugin.png");
+}
 .icon.s16.type-unkn {
   background-image: url("../../../images/icons/16/zip.png");
 }
@@ -115,6 +124,9 @@
 .icon.s16.type-text {
   background-image: url("../../../images/icons/16/text.png");
 }
+.icon.s16.language {
+  background-image: url("icons/language.png");
+}
 .icon.s16.text {
   padding: 4px 0px 0px 20px;
 }
@@ -152,6 +164,9 @@
 .icon.s22.unlock {
   background-image: url("../../../images/icons/22/unlock.png");
 }
+.icon.s22.plugin {
+  background-image: url("../../../images/icons/22/plugin.png");
+}
 .icon.s22.type-unkn {
   background-image: url("../../../images/icons/22/zip.png");
 }
@@ -167,6 +182,9 @@
 .icon.s22.type-text {
   background-image: url("../../../images/icons/22/text.png");
 }
+.icon.s22.language {
+  background-image: url("icons/language.png");
+}
 .icon.s22.text {
   padding: 10px 0px 0px 25px;
 }
@@ -204,6 +222,9 @@
 .icon.s48.unlock {
   background-image: url("../../../images/icons/48/unlock.png");
 }
+.icon.s48.plugin {
+  background-image: url("../../../images/icons/48/plugin.png");
+}
 .icon.s48.type-unkn {
   background-image: url("../../../images/icons/48/zip.png");
 }
@@ -219,6 +240,9 @@
 .icon.s48.type-text {
   background-image: url("../../../images/icons/48/text.png");
 }
+.icon.s48.language {
+  background-image: url("icons/language.png");
+}
 /* global */
 body {
   font-family: Liberation Sans, helvetica, arial, clean, sans-serif;
@@ -302,6 +326,10 @@ code {
   float: right;
 }
 /* popup notifications */
+#jGrowl.top-right {
+  top: 30px;
+  right: 15px;
+}
 div.jGrowl div.notice {
   background: #511919 url("../../../images/icons/48/notice.png") no-repeat 5px center;
   color: #ffffff;
@@ -501,6 +529,17 @@ ul.menu-popup .empty {
   text-align: center;
   color: #9eabb0;
 }
+ul.menu-popup .toolbar {
+  background-color: #9eabb0;
+  height: auto;
+  overflow: auto;
+}
+ul.menu-popup .toolbar a {
+  float: right;
+}
+ul.menu-popup .toolbar a:hover {
+  background-color: #ffffff;
+}
 /* autocomplete popup */
 .acpopup {
   max-height: 150px;
@@ -542,7 +581,7 @@ ul.menu-popup .empty {
   color: #9eabb0;
   display: block;
 }
-/* aside */
+/* aside 230px*/
 aside {
   display: table-cell;
   vertical-align: top;
@@ -749,20 +788,21 @@ aside #profiles-menu {
   width: 200px;
   top: 18px;
 }
-/* section */
+/* section 800px */
 section {
   display: table-cell;
   vertical-align: top;
-  width: 800px;
+  width: 770px;
   padding: 0px 20px 0px 10px;
 }
 /* wall item */
 .tread-wrapper {
-  background-color: #f6f7f8;
+  background-color: #eff0f1;
   position: relative;
   padding: 10px;
   margin-bottom: 20px;
-  width: 780px;
+  width: 750px;
+  border-bottom: 1px solid #cccccc;
 }
 .wall-item-decor {
   position: absolute;
@@ -775,7 +815,7 @@ section {
 }
 .wall-item-container {
   display: table;
-  width: 780px;
+  width: 750px;
 }
 .wall-item-container .wall-item-item,
 .wall-item-container .wall-item-bottom {
@@ -867,26 +907,42 @@ section {
 .wall-item-container .wall-item-actions-tools input {
   float: right;
 }
-.wall-item-container.comment {
-  /*margin-top: 50px;*/
-
+.wall-item-container.comment .contact-photo-wrapper {
+  margin-left: 16px;
 }
 .wall-item-container.comment .contact-photo {
   width: 32px;
   height: 32px;
-  margin-left: 16px;
-  /*background: url(../../../images/icons/22/user.png) no-repeat center center;*/
-
 }
 .wall-item-container.comment .contact-photo-menu-button {
   top: 15px !important;
-  left: 15px !important;
+  left: 0px !important;
 }
 .wall-item-container.comment .wall-item-links {
   padding-left: 12px;
 }
+/* 'tag' item type */
+.wall-item-container.item-tag .wall-item-content {
+  opacity: 0.5;
+  -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;
+}
+.wall-item-container.item-tag .contact-photo-wrapper {
+  margin-left: 32px;
+}
+.wall-item-container.item-tag .contact-photo {
+  width: 16px;
+  height: 16px;
+}
+.wall-item-container.item-tag .contact-photo-menu-button {
+  top: 15px !important;
+  left: 15px !important;
+}
 .wall-item-comment-wrapper {
-  margin: 30px 2em 2em 60px;
+  margin: 1em 2em 1em 60px;
 }
 .wall-item-comment-wrapper .comment-edit-photo {
   display: none;
@@ -938,6 +994,9 @@ section {
 #jot-preview-content .tread-wrapper {
   background-color: #fce94f;
 }
+.hide-comments-outer {
+  margin-bottom: 0.8em;
+}
 .wall-item-tags {
   padding-top: 5px;
 }
@@ -1064,7 +1123,7 @@ section {
   padding: 0px;
   height: 40px;
   overflow: none;
-  width: 800px;
+  width: 770px;
   background-color: #0e232e;
   border-bottom: 2px solid #9eabb0;
 }
@@ -1139,7 +1198,7 @@ section {
   border: 0px;
   margin: 0px;
   height: 20px;
-  width: 700px;
+  width: 500px;
   font-weight: bold;
   border: 1px solid #ffffff;
 }
@@ -1156,13 +1215,26 @@ section {
   border: 1px solid #999999;
 }
 #jot #character-counter {
-  width: 80px;
+  width: 40px;
   float: right;
   text-align: right;
   height: 20px;
   line-height: 20px;
   padding-right: 20px;
 }
+#jot #jot-category {
+  border: 0px;
+  margin: 0px;
+  height: 20px;
+  width: 200px;
+  border: 1px solid #ffffff;
+}
+#jot #jot-category:hover {
+  border: 1px solid #999999;
+}
+#jot #jot-category:focus {
+  border: 1px solid #999999;
+}
 /** buttons **/
 /*input[type="submit"] {
 	border: 0px;
@@ -1569,44 +1641,19 @@ ul.tabs li .active {
   -ms-transition: all 0.2s ease-in-out;
   transition: all 0.2s ease-in-out;
 }
-/* mail view */
-/*
-.mail-conv-sender,
-.mail-conv-detail {
-	float: left;
-}
-.mail-conv-detail {
-	margin-left: 20px;
-	width: 500px;
-}
-
-.mail-conv-subject {
-    font-size: 1.4em;
-    margin: 10px 0;
-}
-
-.mail-conv-outside-wrapper-end {
-	clear: both;
-}
-
-.mail-conv-outside-wrapper {
-	margin-top: 30px;
-}
-
-.mail-conv-delete-wrapper {
-	float: right;
-	margin-right: 30px;
-	margin-top: 15px;
-}
-.mail-conv-break {
-	clear: both;
+/* theme screenshot */
+.screenshot,
+#theme-preview {
+  position: absolute;
+  width: 202px;
+  left: 70%;
+  top: 50px;
 }
-
-.mail-conv-delete-icon {
-	border: none;
+.screenshot img,
+#theme-preview img {
+  width: 200px;
+  height: 150px;
 }
-
-*/
 /* page footer */
 footer {
   height: 100px;
diff --git a/view/theme/quattro/dark/style.less b/view/theme/quattro/dark/style.less
index 7d81e788a..7d81e788a 100755..100644
--- a/view/theme/quattro/dark/style.less
+++ b/view/theme/quattro/dark/style.less
diff --git a/view/theme/quattro/experimental b/view/theme/quattro/experimental
index e69de29bb..e69de29bb 100755..100644
--- a/view/theme/quattro/experimental
+++ b/view/theme/quattro/experimental
diff --git a/view/theme/quattro/generic_links_widget.tpl b/view/theme/quattro/generic_links_widget.tpl
new file mode 100644
index 000000000..29580bbc7
--- /dev/null
+++ b/view/theme/quattro/generic_links_widget.tpl
@@ -0,0 +1,11 @@
+<div class="widget">
+	{{if $title}}<h3>$title</h3>{{endif}}
+	{{if $desc}}<div class="desc">$desc</div>{{endif}}
+	
+	<ul>
+		{{ for $items as $item }}
+			<li class="tool {{ if $item.selected }}selected{{ endif }}"><a href="$item.url" class="link">$item.label</a></li>
+		{{ endfor }}
+	</ul>
+	
+</div>
diff --git a/view/theme/quattro/green/colors.less b/view/theme/quattro/green/colors.less
index bc78c3fda..1f1df4c55 100755..100644
--- a/view/theme/quattro/green/colors.less
+++ b/view/theme/quattro/green/colors.less
@@ -74,7 +74,8 @@
 
 @FieldHelpColor: @Grey3;
 
-@ThreadBackgroundColor: #f6f7f8;
+@ThreadBackgroundColor: #eff0f1;
+@ThreadBottomBorderColor: @Grey2;
 @ShinyBorderColor: @Green4;
 
 @CommentBoxEmptyColor: @Grey3;
diff --git a/view/theme/quattro/green/style.css b/view/theme/quattro/green/style.css
index e7cc549d0..317112f6f 100755..100644
--- a/view/theme/quattro/green/style.css
+++ b/view/theme/quattro/green/style.css
@@ -48,6 +48,9 @@
 .icon.s10.unlock {
   background-image: url("../../../images/icons/10/unlock.png");
 }
+.icon.s10.plugin {
+  background-image: url("../../../images/icons/10/plugin.png");
+}
 .icon.s10.type-unkn {
   background-image: url("../../../images/icons/10/zip.png");
 }
@@ -63,6 +66,9 @@
 .icon.s10.type-text {
   background-image: url("../../../images/icons/10/text.png");
 }
+.icon.s10.language {
+  background-image: url("icons/language.png");
+}
 .icon.s10.text {
   padding: 2px 0px 0px 15px;
 }
@@ -100,6 +106,9 @@
 .icon.s16.unlock {
   background-image: url("../../../images/icons/16/unlock.png");
 }
+.icon.s16.plugin {
+  background-image: url("../../../images/icons/16/plugin.png");
+}
 .icon.s16.type-unkn {
   background-image: url("../../../images/icons/16/zip.png");
 }
@@ -115,6 +124,9 @@
 .icon.s16.type-text {
   background-image: url("../../../images/icons/16/text.png");
 }
+.icon.s16.language {
+  background-image: url("icons/language.png");
+}
 .icon.s16.text {
   padding: 4px 0px 0px 20px;
 }
@@ -152,6 +164,9 @@
 .icon.s22.unlock {
   background-image: url("../../../images/icons/22/unlock.png");
 }
+.icon.s22.plugin {
+  background-image: url("../../../images/icons/22/plugin.png");
+}
 .icon.s22.type-unkn {
   background-image: url("../../../images/icons/22/zip.png");
 }
@@ -167,6 +182,9 @@
 .icon.s22.type-text {
   background-image: url("../../../images/icons/22/text.png");
 }
+.icon.s22.language {
+  background-image: url("icons/language.png");
+}
 .icon.s22.text {
   padding: 10px 0px 0px 25px;
 }
@@ -204,6 +222,9 @@
 .icon.s48.unlock {
   background-image: url("../../../images/icons/48/unlock.png");
 }
+.icon.s48.plugin {
+  background-image: url("../../../images/icons/48/plugin.png");
+}
 .icon.s48.type-unkn {
   background-image: url("../../../images/icons/48/zip.png");
 }
@@ -219,6 +240,9 @@
 .icon.s48.type-text {
   background-image: url("../../../images/icons/48/text.png");
 }
+.icon.s48.language {
+  background-image: url("icons/language.png");
+}
 /* global */
 body {
   font-family: Liberation Sans, helvetica, arial, clean, sans-serif;
@@ -302,6 +326,10 @@ code {
   float: right;
 }
 /* popup notifications */
+#jGrowl.top-right {
+  top: 30px;
+  right: 15px;
+}
 div.jGrowl div.notice {
   background: #511919 url("../../../images/icons/48/notice.png") no-repeat 5px center;
   color: #ffffff;
@@ -501,6 +529,17 @@ ul.menu-popup .empty {
   text-align: center;
   color: #9eabb0;
 }
+ul.menu-popup .toolbar {
+  background-color: #9eabb0;
+  height: auto;
+  overflow: auto;
+}
+ul.menu-popup .toolbar a {
+  float: right;
+}
+ul.menu-popup .toolbar a:hover {
+  background-color: #ffffff;
+}
 /* autocomplete popup */
 .acpopup {
   max-height: 150px;
@@ -542,7 +581,7 @@ ul.menu-popup .empty {
   color: #9eabb0;
   display: block;
 }
-/* aside */
+/* aside 230px*/
 aside {
   display: table-cell;
   vertical-align: top;
@@ -749,20 +788,21 @@ aside #profiles-menu {
   width: 200px;
   top: 18px;
 }
-/* section */
+/* section 800px */
 section {
   display: table-cell;
   vertical-align: top;
-  width: 800px;
+  width: 770px;
   padding: 0px 20px 0px 10px;
 }
 /* wall item */
 .tread-wrapper {
-  background-color: #f6f7f8;
+  background-color: #eff0f1;
   position: relative;
   padding: 10px;
   margin-bottom: 20px;
-  width: 780px;
+  width: 750px;
+  border-bottom: 1px solid #cccccc;
 }
 .wall-item-decor {
   position: absolute;
@@ -775,7 +815,7 @@ section {
 }
 .wall-item-container {
   display: table;
-  width: 780px;
+  width: 750px;
 }
 .wall-item-container .wall-item-item,
 .wall-item-container .wall-item-bottom {
@@ -867,26 +907,42 @@ section {
 .wall-item-container .wall-item-actions-tools input {
   float: right;
 }
-.wall-item-container.comment {
-  /*margin-top: 50px;*/
-
+.wall-item-container.comment .contact-photo-wrapper {
+  margin-left: 16px;
 }
 .wall-item-container.comment .contact-photo {
   width: 32px;
   height: 32px;
-  margin-left: 16px;
-  /*background: url(../../../images/icons/22/user.png) no-repeat center center;*/
-
 }
 .wall-item-container.comment .contact-photo-menu-button {
   top: 15px !important;
-  left: 15px !important;
+  left: 0px !important;
 }
 .wall-item-container.comment .wall-item-links {
   padding-left: 12px;
 }
+/* 'tag' item type */
+.wall-item-container.item-tag .wall-item-content {
+  opacity: 0.5;
+  -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;
+}
+.wall-item-container.item-tag .contact-photo-wrapper {
+  margin-left: 32px;
+}
+.wall-item-container.item-tag .contact-photo {
+  width: 16px;
+  height: 16px;
+}
+.wall-item-container.item-tag .contact-photo-menu-button {
+  top: 15px !important;
+  left: 15px !important;
+}
 .wall-item-comment-wrapper {
-  margin: 30px 2em 2em 60px;
+  margin: 1em 2em 1em 60px;
 }
 .wall-item-comment-wrapper .comment-edit-photo {
   display: none;
@@ -938,6 +994,9 @@ section {
 #jot-preview-content .tread-wrapper {
   background-color: #ddffdd;
 }
+.hide-comments-outer {
+  margin-bottom: 0.8em;
+}
 .wall-item-tags {
   padding-top: 5px;
 }
@@ -1064,7 +1123,7 @@ section {
   padding: 0px;
   height: 40px;
   overflow: none;
-  width: 800px;
+  width: 770px;
   background-color: #009100;
   border-bottom: 2px solid #9eabb0;
 }
@@ -1139,7 +1198,7 @@ section {
   border: 0px;
   margin: 0px;
   height: 20px;
-  width: 700px;
+  width: 500px;
   font-weight: bold;
   border: 1px solid #ffffff;
 }
@@ -1156,13 +1215,26 @@ section {
   border: 1px solid #999999;
 }
 #jot #character-counter {
-  width: 80px;
+  width: 40px;
   float: right;
   text-align: right;
   height: 20px;
   line-height: 20px;
   padding-right: 20px;
 }
+#jot #jot-category {
+  border: 0px;
+  margin: 0px;
+  height: 20px;
+  width: 200px;
+  border: 1px solid #ffffff;
+}
+#jot #jot-category:hover {
+  border: 1px solid #999999;
+}
+#jot #jot-category:focus {
+  border: 1px solid #999999;
+}
 /** buttons **/
 /*input[type="submit"] {
 	border: 0px;
@@ -1569,44 +1641,19 @@ ul.tabs li .active {
   -ms-transition: all 0.2s ease-in-out;
   transition: all 0.2s ease-in-out;
 }
-/* mail view */
-/*
-.mail-conv-sender,
-.mail-conv-detail {
-	float: left;
-}
-.mail-conv-detail {
-	margin-left: 20px;
-	width: 500px;
-}
-
-.mail-conv-subject {
-    font-size: 1.4em;
-    margin: 10px 0;
-}
-
-.mail-conv-outside-wrapper-end {
-	clear: both;
-}
-
-.mail-conv-outside-wrapper {
-	margin-top: 30px;
-}
-
-.mail-conv-delete-wrapper {
-	float: right;
-	margin-right: 30px;
-	margin-top: 15px;
-}
-.mail-conv-break {
-	clear: both;
+/* theme screenshot */
+.screenshot,
+#theme-preview {
+  position: absolute;
+  width: 202px;
+  left: 70%;
+  top: 50px;
 }
-
-.mail-conv-delete-icon {
-	border: none;
+.screenshot img,
+#theme-preview img {
+  width: 200px;
+  height: 150px;
 }
-
-*/
 /* page footer */
 footer {
   height: 100px;
diff --git a/view/theme/quattro/green/style.less b/view/theme/quattro/green/style.less
index 7d81e788a..7d81e788a 100755..100644
--- a/view/theme/quattro/green/style.less
+++ b/view/theme/quattro/green/style.less
diff --git a/view/theme/quattro/group_side.tpl b/view/theme/quattro/group_side.tpl
index 596a8d13f..596a8d13f 100755..100644
--- a/view/theme/quattro/group_side.tpl
+++ b/view/theme/quattro/group_side.tpl
diff --git a/view/theme/quattro/icons.less b/view/theme/quattro/icons.less
index e314fba1f..24e96b5aa 100755..100644
--- a/view/theme/quattro/icons.less
+++ b/view/theme/quattro/icons.less
@@ -13,11 +13,15 @@
 	&.link		{ background-image: url("../../../images/icons/@{size}/link.png"); }
 	&.lock		{ background-image: url("../../../images/icons/@{size}/lock.png"); }
 	&.unlock	{ background-image: url("../../../images/icons/@{size}/unlock.png"); }
+	&.plugin	{ background-image: url("../../../images/icons/@{size}/plugin.png"); }
 	&.type-unkn	{ background-image: url("../../../images/icons/@{size}/zip.png"); }
 	&.type-audio{ background-image: url("../../../images/icons/@{size}/audio.png"); }
 	&.type-video{ background-image: url("../../../images/icons/@{size}/video.png"); }
 	&.type-image{ background-image: url("../../../images/icons/@{size}/image.png"); }
 	&.type-text	{ background-image: url("../../../images/icons/@{size}/text.png"); }
+
+	&.language	{ background-image: url("icons/language.png"); }
+	
 	
 }
 
diff --git a/view/theme/quattro/icons/language.png b/view/theme/quattro/icons/language.png
new file mode 100644
index 000000000..8029c0155
--- /dev/null
+++ b/view/theme/quattro/icons/language.png
diff --git a/view/theme/quattro/jot.tpl b/view/theme/quattro/jot.tpl
index 2f89d4372..95c0ff6b1 100755..100644
--- a/view/theme/quattro/jot.tpl
+++ b/view/theme/quattro/jot.tpl
@@ -1,8 +1,10 @@
 <form id="profile-jot-form" action="$action" method="post">
 	<div id="jot">
 		<div id="profile-jot-desc" class="jothidden">&nbsp;</div>
-		<input name="title" id="jot-title" type="text" placeholder="$placeholdertitle" value="$title" class="jothidden" style="display:none" />
+		<input name="title" id="jot-title" type="text" placeholder="$placeholdertitle" title="$placeholdertitle" value="$title" class="jothidden" style="display:none" /><input name="category" id="jot-category" type="text" placeholder="$placeholdercategory" title="$placeholdercategory" value="$category" 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" />
@@ -20,8 +22,10 @@
 			<li><a id="profile-link"  ondragenter="return linkdropper(event);" ondragover="return linkdropper(event);" ondrop="linkdrop(event);" onclick="jotGetLink(); return false;" title="$weblink">$shortweblink</a></li>
 			<li><a id="profile-video" onclick="jotVideoURL();return false;" title="$gvideo">$shortvideo</a></li>
 			<li><a id="profile-audio" onclick="jotAudioURL();return false;" title="$audio">$shortaudio</a></li>
+			<!-- TODO: waiting for a better placement 
 			<li><a id="profile-location" onclick="jotGetLocation();return false;" title="$setloc">$shortsetloc</a></li>
 			<li><a id="profile-nolocation" onclick="jotClearLocation();return false;" title="$noloc">$shortnoloc</a></li>
+			-->
 			<li><a id="jot-preview-link" onclick="preview_post(); return false;" title="$preview">$preview</a></li>
 			$jotplugins
 
diff --git a/view/theme/quattro/mail_conv.tpl b/view/theme/quattro/mail_conv.tpl
index 989f17878..989f17878 100755..100644
--- a/view/theme/quattro/mail_conv.tpl
+++ b/view/theme/quattro/mail_conv.tpl
diff --git a/view/theme/quattro/msg-header.tpl b/view/theme/quattro/msg-header.tpl
index 2d1ea7a61..2d1ea7a61 100755..100644
--- a/view/theme/quattro/msg-header.tpl
+++ b/view/theme/quattro/msg-header.tpl
diff --git a/view/theme/quattro/nav.tpl b/view/theme/quattro/nav.tpl
index 8c872864c..af1fc9414 100755..100644
--- a/view/theme/quattro/nav.tpl
+++ b/view/theme/quattro/nav.tpl
@@ -43,8 +43,8 @@
 			<li  id="nav-notifications-linkmenu" class="nav-menu-icon"><a href="$nav.notifications.0" rel="#nav-notifications-menu" title="$nav.notifications.1"><span class="icon s22 notify">$nav.notifications.1</span></a>
 				<span id="notify-update" class="nav-notify"></span>
 				<ul id="nav-notifications-menu" class="menu-popup">
-					<li id="nav-notifications-mark-all"><a href="#" onclick="notifyMarkAll(); return false;">$nav.notifications.mark.1</a></li>
-					<li id="nav-notifications-see-all"><a href="$nav.notifications.all.0">$nav.notifications.all.1</a></li>
+					<!-- TODO: better icons! -->
+					<li id="nav-notifications-mark-all" class="toolbar"><a href="#" onclick="notifyMarkAll(); return false;" title="$nav.notifications.mark.1"><span class="icon s10 edit"></span></a></a><a href="$nav.notifications.all.0" title="$nav.notifications.all.1"><span class="icon s10 plugin"></span></a></li>
 					<li class="empty">$emptynotifications</li>
 				</ul>
 			</li>		
@@ -92,40 +92,4 @@
 	<li><a href="{0}"><img src="{1}">{2} <span class="notif-when">{3}</span></a></li>
 </ul>
 
-{#
-
-{{ if $nav.logout }}<a id="nav-logout-link" class="nav-link $nav.logout.2" href="$nav.logout.0" title="$nav.logout.3" >$nav.logout.1</a> {{ endif }}
-{{ if $nav.login }}<a id="nav-login-link" class="nav-login-link $nav.login.2" href="$nav.login.0" title="$nav.login.3" >$nav.login.1</a> {{ endif }}
-
-<span id="nav-link-wrapper" >
-
-{{ if $nav.register }}<a id="nav-register-link" class="nav-commlink $nav.register.2" href="$nav.register.0" title="$nav.register.3" >$nav.register.1</a>{{ endif }}
-	
-<a id="nav-help-link" class="nav-link $nav.help.2" target="friendika-help" href="$nav.help.0" title="$nav.help.3" >$nav.help.1</a>
-	
-{{ if $nav.apps }}<a id="nav-apps-link" class="nav-link $nav.apps.2" href="$nav.apps.0" title="$nav.apps.3" >$nav.apps.1</a>{{ endif }}
-
-<a id="nav-search-link" class="nav-link $nav.search.2" href="$nav.search.0" title="$nav.search.3" >$nav.search.1</a>
-<a id="nav-directory-link" class="nav-link $nav.directory.2" href="$nav.directory.0" title="$nav.directory.3" >$nav.directory.1</a>
-
-{{ if $nav.admin }}<a id="nav-admin-link" class="nav-link $nav.admin.2" href="$nav.admin.0" title="$nav.admin.3" >$nav.admin.1</a>{{ endif }}
-
-{{ if $nav.notifications }}
-<a id="nav-notify-link" class="nav-commlink $nav.notifications.2" href="$nav.notifications.0" title="$nav.notifications.3" >$nav.notifications.1</a>
-<span id="notify-update" class="nav-ajax-left"></span>
-{{ endif }}
-{{ if $nav.messages }}
-<a id="nav-messages-link" class="nav-commlink $nav.messages.2" href="$nav.messages.0" title="$nav.messages.3" >$nav.messages.1</a>
-<span id="mail-update" class="nav-ajax-left"></span>
-{{ endif }}
-
-{{ if $nav.manage }}<a id="nav-manage-link" class="nav-commlink $nav.manage.2" href="$nav.manage.0" title="$nav.manage.3">$nav.manage.1</a>{{ endif }}
-
-{{ if $nav.settings }}<a id="nav-settings-link" class="nav-link $nav.settings.2" href="$nav.settings.0" title="$nav.settings.3">$nav.settings.1</a>{{ endif }}
-{{ if $nav.profiles }}<a id="nav-profiles-link" class="nav-link $nav.profiles.2" href="$nav.profiles.0" title="$nav.profiles.3" >$nav.profiles.1</a>{{ endif }}
-
-
-</span>
-<span id="nav-end"></span>
-<span id="banner">$banner</span>
-#}
+<div style="position: fixed; top: 3px; left: 5px; z-index:9999">$langselector</div>
diff --git a/view/theme/quattro/nets.tpl b/view/theme/quattro/nets.tpl
index cbadf1361..cbadf1361 100755..100644
--- a/view/theme/quattro/nets.tpl
+++ b/view/theme/quattro/nets.tpl
diff --git a/view/theme/quattro/profile_vcard.tpl b/view/theme/quattro/profile_vcard.tpl
index 7cd02f164..7cd02f164 100755..100644
--- a/view/theme/quattro/profile_vcard.tpl
+++ b/view/theme/quattro/profile_vcard.tpl
diff --git a/view/theme/quattro/quattro.less b/view/theme/quattro/quattro.less
index c6352cfe9..4c3279943 100755..100644
--- a/view/theme/quattro/quattro.less
+++ b/view/theme/quattro/quattro.less
@@ -87,6 +87,10 @@ code {
 
 
 /* popup notifications */
+#jGrowl.top-right {
+	top: 30px;
+	right: 15px;
+}
 div.jGrowl div.notice {
 	background: @NoticeBackgroundColor url("../../../images/icons/48/notice.png") no-repeat 5px center;
 	color: 	@NoticeColor;
@@ -227,6 +231,12 @@ ul.menu-popup {
 			text-align: center;
 			color: @MenuEmpty;
 		}
+		.toolbar {
+			background-color:  @MenuEmpty; 
+			height: auto; overflow: auto;
+			a { float: right; }
+			a:hover { background-color: @MenuBg; }
+		}
 		
 }
 
@@ -264,7 +274,7 @@ ul.menu-popup {
 
 
 
-/* aside */
+/* aside 230px*/
 aside { 
 	display: table-cell;
 	vertical-align: top;
@@ -397,11 +407,11 @@ aside {
 }
 
 
-/* section */
+/* section 800px */
 section { 
 	display: table-cell;
 	vertical-align: top;
-	width: 800px;
+	width: 770px;
 	padding:0px 20px 0px 10px;
 }
 
@@ -411,14 +421,15 @@ section {
 	position: relative;
 	padding: 10px;
 	margin-bottom: 20px;
-	width: 780px;
+	width: 750px;
+	border-bottom: 1px solid @ThreadBottomBorderColor;
 }
 .wall-item-decor { position: absolute; left: 97%; top: -10px;  width: 16px;}
 .unstarred { display: none; }
 
 .wall-item-container {
 	display: table;
-	width: 780px;
+	width: 750px;
 	
 	.wall-item-item,
 	.wall-item-bottom { display: table-row; }
@@ -472,19 +483,35 @@ section {
 
 
 .wall-item-container.comment {
-	/*margin-top: 50px;*/
-	.contact-photo { width: 32px; height: 32px; margin-left: 16px;
-		/*background: url(../../../images/icons/22/user.png) no-repeat center center;*/
+	.contact-photo-wrapper { margin-left: 16px; }
+	.contact-photo { 
+		width: 32px; height: 32px; 
 	}	
 	.contact-photo-menu-button {
 		top: 15px !important;
-		left: 15px !important;
+		left: 0px !important;
 	}
 	.wall-item-links { padding-left: 12px; }
 }
 
+/* 'tag' item type */
+.wall-item-container.item-tag {
+	.wall-item-content {
+		.opaque(0.5);
+	}
+	.contact-photo-wrapper { margin-left: 32px; }
+	.contact-photo { 
+		width: 16px; height: 16px;
+	}	
+	.contact-photo-menu-button {
+		top: 15px !important;
+		left: 15px !important;
+	}
+}
+
+
 .wall-item-comment-wrapper {
-	margin: 30px 2em 2em 60px;
+	margin: 1em 2em 1em 60px;
 	.comment-edit-photo { display: none; }
 	textarea {	
 		height: 1em; width: 100%; font-size: 10px;
@@ -516,13 +543,12 @@ section {
 
 	.wall-item-container { width: 700px; }
 	.tread-wrapper { width: 700px; padding: 0; margin: 10px 0;}
-
-
 }
 
 .shiny { border-right:10px solid @ShinyBorderColor; }
 #jot-preview-content .tread-wrapper { background-color: @JotPreviewBackgroundColor; }
 
+.hide-comments-outer {margin-bottom: 0.8em; }
 
 .wall-item-tags { padding-top: 5px; }
 .tag {
@@ -632,7 +658,7 @@ section {
 	#jot-tools {
 		margin: 0px; padding: 0px;
 		height: 40px; overflow: none;
-		width: 800px;
+		width: 770px;
 		background-color: @JotToolsBackgroundColor;
 		border-bottom: 2px solid @JotToolsBorderColor;
 		li {
@@ -704,7 +730,7 @@ section {
 		border: 0px;
 		margin: 0px;
 		height: 20px;
-		width: 700px;
+		width: 500px;
 		font-weight: bold;
 		border: 1px solid @BodyBackground;
 
@@ -721,14 +747,23 @@ section {
 	}
 	
 	#character-counter {
-		width: 80px;
+		width: 40px;
 		float: right;
 		text-align: right;
 		height: 20px;
 		line-height: 20px;
 		padding-right: 20px;
 	}
-
+	
+	#jot-category {
+		border: 0px;
+		margin: 0px;
+		height: 20px;
+		width: 200px;
+		border: 1px solid @BodyBackground;
+		&:hover { border: 1px solid @CommentBoxEmptyBorderColor }
+		&:focus { border: 1px solid @CommentBoxEmptyBorderColor }
+	}
 }
 
 
@@ -1100,46 +1135,15 @@ ul.tabs {
 	
 }
 
-/* mail view */
-/*
-.mail-conv-sender,
-.mail-conv-detail {
-	float: left;
-}
-.mail-conv-detail {
-	margin-left: 20px;
-	width: 500px;
-}
-
-.mail-conv-subject {
-    font-size: 1.4em;
-    margin: 10px 0;
-}
-
-.mail-conv-outside-wrapper-end {
-	clear: both;
-}
-
-.mail-conv-outside-wrapper {
-	margin-top: 30px;
-}
-
-.mail-conv-delete-wrapper {
-	float: right;
-	margin-right: 30px;
-	margin-top: 15px;
-}
-.mail-conv-break {
-	clear: both;
-}
-
-.mail-conv-delete-icon {
-	border: none;
+/* theme screenshot */
+.screenshot, #theme-preview {
+	position: absolute;
+	width:202px;
+	left: 70%;
+	top: 50px;
+	img { width: 200px; height: 150px; }
 }
 
-*/
-
-
 /* page footer */
 footer { height: 100px; display: table-row; }
 
diff --git a/view/theme/quattro/saved_searches_aside.tpl b/view/theme/quattro/saved_searches_aside.tpl
index 9c10a26de..9c10a26de 100755..100644
--- a/view/theme/quattro/saved_searches_aside.tpl
+++ b/view/theme/quattro/saved_searches_aside.tpl
diff --git a/view/theme/quattro/search_item.tpl b/view/theme/quattro/search_item.tpl
index 80d6678fb..80d6678fb 100755..100644
--- a/view/theme/quattro/search_item.tpl
+++ b/view/theme/quattro/search_item.tpl
diff --git a/view/theme/quattro/style.php b/view/theme/quattro/style.php
index 889ec1530..fa02a04b6 100644
--- a/view/theme/quattro/style.php
+++ b/view/theme/quattro/style.php
@@ -1,9 +1,30 @@
 <?php
-	$color = get_pconfig(local_user(), "quattro","color");
+	$color=false;
+	$quattro_align=false;
+	$site_color = get_config("quattro","color");
+	$site_quattro_align = get_config("quattro", "align" );
 	
+	if (local_user()) {
+		$color = get_pconfig(local_user(), "quattro","color");
+		$quattro_align = get_pconfig(local_user(), 'quattro', 'align' );
+	}
+	
+	if ($color===false) $color=$site_color;
 	if ($color===false) $color="dark";
+	if ($quattro_align===false) $quattro_align=$site_quattro_align;
+	
 		
 	if (file_exists("$THEMEPATH/$color/style.css")){
 		echo file_get_contents("$THEMEPATH/$color/style.css");
 	}
 
+
+	if($quattro_align=="center"){
+		echo "
+			html { width: 100%; margin:0px; padding:0px; }
+			body {
+				margin: 50px auto;
+				width: 900px;
+			}
+		";
+	}
diff --git a/view/theme/quattro/theme.php b/view/theme/quattro/theme.php
index be47a401c..0a13c2035 100644
--- a/view/theme/quattro/theme.php
+++ b/view/theme/quattro/theme.php
@@ -1,20 +1,12 @@
 <?php
+/**
+ * Name: Quattro
+ * Version: 0.5
+ * Author: Fabio <http://kirgroup.com/profile/fabrixxm>
+ * Maintainer: Fabio <http://kirgroup.com/profile/fabrixxm>
+ * Maintainer: Tobias <https://diekershoff.homeunix.net/friendika/profile/tobias>
+ */
+ 
+	$a->theme_info = array();
+ 
 
-
-
-
-$quattro_align = get_pconfig(local_user(), 'quattro', 'align' );
-
-if(local_user() && $quattro_align=="center"){
-	
-	$a->page['htmlhead'].="
-	<style>
-		html { width: 100%; margin:0px; padding:0px; }
-		body {
-			margin: 50px auto;
-			width: 900px;
-		}
-	</style>
-	";
-	
-}
diff --git a/view/theme/quattro/wall_item.tpl b/view/theme/quattro/wall_item.tpl
index e771db068..e771db068 100755..100644
--- a/view/theme/quattro/wall_item.tpl
+++ b/view/theme/quattro/wall_item.tpl
diff --git a/view/theme/quattro/wall_item_tag.tpl b/view/theme/quattro/wall_item_tag.tpl
new file mode 100644
index 000000000..926fc929d
--- /dev/null
+++ b/view/theme/quattro/wall_item_tag.tpl
@@ -0,0 +1,23 @@
+<div class="wall-item-container item-tag $item.indent">
+	<div class="wall-item-item">
+		<div class="wall-item-info">
+			<div class="contact-photo-wrapper">
+				<a href="$item.profile_url" target="redir" title="$item.linktitle" class="contact-photo-link" id="wall-item-photo-link-$item.id">
+					<img src="$item.thumb" class="contact-photo$item.sparkle" id="wall-item-photo-$item.id" alt="$item.name" />
+				</a>
+				<ul class="contact-menu menu-popup" id="wall-item-photo-menu-$item.id">
+				$item.item_photo_menu
+				</ul>
+				
+			</div>
+			<div class="wall-item-location">$item.location</div>	
+		</div>
+		<div class="wall-item-content">
+			$item.body
+		</div>
+	</div>
+</div>
+
+<div class="wall-item-comment-wrapper" >
+	$item.comment
+</div>
diff --git a/view/theme/quattro/wallwall_item.tpl b/view/theme/quattro/wallwall_item.tpl
index 693ebaba6..693ebaba6 100755..100644
--- a/view/theme/quattro/wallwall_item.tpl
+++ b/view/theme/quattro/wallwall_item.tpl
diff --git a/view/theme/shady/screenshot.jpg b/view/theme/shady/screenshot.jpg
deleted file mode 100644
index 79a9162a0..000000000
--- a/view/theme/shady/screenshot.jpg
+++ /dev/null
diff --git a/view/theme/shady/style.css b/view/theme/shady/style.css
deleted file mode 100755
index 1324af019..000000000
--- a/view/theme/shady/style.css
+++ /dev/null
@@ -1,70 +0,0 @@
-@import url('../loozah/style.css');
-
-body { 
-	background: #DDDDDD;
-	color: #444444;
-}
-
-.nav-link {
-	color: #444444;
-	background: #F4F4F4;
-}
-.nav-selected {
-	background: #DDDDDD !important;
-}
-
-.nav-commlink {
-	color: #444444;
-	background: #F4F4F4;
-}
-
-.tab {
-	color: #444444;
-	background: #F4F4F4;
-
-}
-
-a, a:visited {
-	color: #8888FF;
-	text-decoration: none;
-}
-
-a:hover {
-	color: #0000FF;
-	text-decoration: underline;
-}
-
-.fakelink, .fakelink:visited {
-	color: #8888FF;
-}
-
-.fakelink:hover {
-	color: #0000FF;
-}
-
-.wall-item-content-wrapper.comment {
-	background: #CCCCCC;
-}
-
-.comment-edit-wrapper {
-	background: #CCCCCC;
-}
-
-.comment-wwedit-wrapper {
-	background: #CCCCCC;
-}
-
-#photos-upload-perms-menu, #photos-upload-perms-menu:visited {
-	color: #8888FF;
-}
-
-#photos-upload-perms-menu:hover {
-	color: #0000FF;
-}
-#settings-default-perms-menu, #settings-default-perms-menu:visited {
-	color: #8888FF;
-}
-
-#settings-default-perms-menu:hover {
-	color: #0000FF;
-}
diff --git a/view/theme/shady/theme.php b/view/theme/shady/theme.php
deleted file mode 100755
index 47b43cf13..000000000
--- a/view/theme/shady/theme.php
+++ /dev/null
@@ -1,4 +0,0 @@
-<?php
-$a->theme_info = array(
-  'extends' => 'loozah',
-);
diff --git a/view/theme/shady/unsupported b/view/theme/shady/unsupported
deleted file mode 100644
index e69de29bb..000000000
--- a/view/theme/shady/unsupported
+++ /dev/null
diff --git a/view/theme/slack-NS/style.css b/view/theme/slack-NS/style.css
index 82bceeac8..82bceeac8 100755..100644
--- a/view/theme/slack-NS/style.css
+++ b/view/theme/slack-NS/style.css
diff --git a/view/theme/slack-NS/theme.php b/view/theme/slack-NS/theme.php
index ceec4dd97..a8934d03b 100755..100644
--- a/view/theme/slack-NS/theme.php
+++ b/view/theme/slack-NS/theme.php
@@ -3,6 +3,7 @@ $a->theme_info = array(
   'extends' => 'duepuntozero',
 );
 
+function slack_NS_init(&$a) {
 $a->page['htmlhead'] .= <<< EOT
 <script>
 $(document).ready(function() {
@@ -49,3 +50,4 @@ $('.savedsearchterm').hover(
 
 </script>
 EOT;
+}
\ No newline at end of file
diff --git a/view/theme/slackr/style.css b/view/theme/slackr/style.css
index ed3b413fb..ed3b413fb 100755..100644
--- a/view/theme/slackr/style.css
+++ b/view/theme/slackr/style.css
diff --git a/view/theme/slackr/theme.php b/view/theme/slackr/theme.php
index ceec4dd97..78f5d40f0 100755..100644
--- a/view/theme/slackr/theme.php
+++ b/view/theme/slackr/theme.php
@@ -3,6 +3,7 @@ $a->theme_info = array(
   'extends' => 'duepuntozero',
 );
 
+function slackr_init(&$a) {
 $a->page['htmlhead'] .= <<< EOT
 <script>
 $(document).ready(function() {
@@ -49,3 +50,4 @@ $('.savedsearchterm').hover(
 
 </script>
 EOT;
+}
\ No newline at end of file
diff --git a/view/theme/testbubble/calendar.png b/view/theme/testbubble/calendar.png
index 705a75b8a..705a75b8a 100755..100644
--- a/view/theme/testbubble/calendar.png
+++ b/view/theme/testbubble/calendar.png
diff --git a/view/theme/testbubble/comment_item.tpl b/view/theme/testbubble/comment_item.tpl
index 6d9230dbf..6d9230dbf 100755..100644
--- a/view/theme/testbubble/comment_item.tpl
+++ b/view/theme/testbubble/comment_item.tpl
diff --git a/view/theme/testbubble/connect.png b/view/theme/testbubble/connect.png
index b76fc13dc..b76fc13dc 100755..100644
--- a/view/theme/testbubble/connect.png
+++ b/view/theme/testbubble/connect.png
diff --git a/view/theme/testbubble/contact_template.tpl b/view/theme/testbubble/contact_template.tpl
index 48930b48a..48930b48a 100755..100644
--- a/view/theme/testbubble/contact_template.tpl
+++ b/view/theme/testbubble/contact_template.tpl
diff --git a/view/theme/testbubble/conversation.tpl b/view/theme/testbubble/conversation.tpl
index 43bb1dd47..43bb1dd47 100755..100644
--- a/view/theme/testbubble/conversation.tpl
+++ b/view/theme/testbubble/conversation.tpl
diff --git a/view/theme/testbubble/group_drop.tpl b/view/theme/testbubble/group_drop.tpl
index f088fc06f..f088fc06f 100755..100644
--- a/view/theme/testbubble/group_drop.tpl
+++ b/view/theme/testbubble/group_drop.tpl
diff --git a/view/theme/testbubble/group_edit.tpl b/view/theme/testbubble/group_edit.tpl
index a8b3f92a0..a8b3f92a0 100755..100644
--- a/view/theme/testbubble/group_edit.tpl
+++ b/view/theme/testbubble/group_edit.tpl
diff --git a/view/theme/testbubble/group_side.tpl b/view/theme/testbubble/group_side.tpl
index a1fc70a22..a1fc70a22 100755..100644
--- a/view/theme/testbubble/group_side.tpl
+++ b/view/theme/testbubble/group_side.tpl
diff --git a/view/theme/testbubble/groups.png b/view/theme/testbubble/groups.png
index a65a7218c..a65a7218c 100755..100644
--- a/view/theme/testbubble/groups.png
+++ b/view/theme/testbubble/groups.png
diff --git a/view/theme/testbubble/icons.png b/view/theme/testbubble/icons.png
index d21640eae..d21640eae 100755..100644
--- a/view/theme/testbubble/icons.png
+++ b/view/theme/testbubble/icons.png
diff --git a/view/theme/testbubble/icons.svg b/view/theme/testbubble/icons.svg
index 91bb2ff38..91bb2ff38 100755..100644
--- a/view/theme/testbubble/icons.svg
+++ b/view/theme/testbubble/icons.svg
diff --git a/view/theme/testbubble/jot-header.tpl b/view/theme/testbubble/jot-header.tpl
index 0d11da271..0d11da271 100755..100644
--- a/view/theme/testbubble/jot-header.tpl
+++ b/view/theme/testbubble/jot-header.tpl
diff --git a/view/theme/testbubble/jot.tpl b/view/theme/testbubble/jot.tpl
index 45d206d57..45d206d57 100755..100644
--- a/view/theme/testbubble/jot.tpl
+++ b/view/theme/testbubble/jot.tpl
diff --git a/view/theme/testbubble/login-bg.gif b/view/theme/testbubble/login-bg.gif
index cde836c89..cde836c89 100755..100644
--- a/view/theme/testbubble/login-bg.gif
+++ b/view/theme/testbubble/login-bg.gif
diff --git a/view/theme/testbubble/lrarrow.gif b/view/theme/testbubble/lrarrow.gif
index fa2676944..fa2676944 100755..100644
--- a/view/theme/testbubble/lrarrow.gif
+++ b/view/theme/testbubble/lrarrow.gif
diff --git a/view/theme/testbubble/mail_head.tpl b/view/theme/testbubble/mail_head.tpl
index afb65f537..afb65f537 100755..100644
--- a/view/theme/testbubble/mail_head.tpl
+++ b/view/theme/testbubble/mail_head.tpl
diff --git a/view/theme/testbubble/match.tpl b/view/theme/testbubble/match.tpl
index 244b243ec..244b243ec 100755..100644
--- a/view/theme/testbubble/match.tpl
+++ b/view/theme/testbubble/match.tpl
diff --git a/view/theme/testbubble/menu-user-pin.jpg b/view/theme/testbubble/menu-user-pin.jpg
index 26449569f..26449569f 100755..100644
--- a/view/theme/testbubble/menu-user-pin.jpg
+++ b/view/theme/testbubble/menu-user-pin.jpg
diff --git a/view/theme/testbubble/menu-user-pin.png b/view/theme/testbubble/menu-user-pin.png
index 6becfbb66..6becfbb66 100755..100644
--- a/view/theme/testbubble/menu-user-pin.png
+++ b/view/theme/testbubble/menu-user-pin.png
diff --git a/view/theme/testbubble/nav.tpl b/view/theme/testbubble/nav.tpl
index 43cc7bca0..43cc7bca0 100755..100644
--- a/view/theme/testbubble/nav.tpl
+++ b/view/theme/testbubble/nav.tpl
diff --git a/view/theme/testbubble/nets.tpl b/view/theme/testbubble/nets.tpl
index b0cb8890c..b0cb8890c 100755..100644
--- a/view/theme/testbubble/nets.tpl
+++ b/view/theme/testbubble/nets.tpl
diff --git a/view/theme/testbubble/next.png b/view/theme/testbubble/next.png
index 353e2e72a..353e2e72a 100755..100644
--- a/view/theme/testbubble/next.png
+++ b/view/theme/testbubble/next.png
diff --git a/view/theme/testbubble/notifications.png b/view/theme/testbubble/notifications.png
index f0e24a15b..f0e24a15b 100755..100644
--- a/view/theme/testbubble/notifications.png
+++ b/view/theme/testbubble/notifications.png
diff --git a/view/theme/testbubble/photo-menu.jpg b/view/theme/testbubble/photo-menu.jpg
index b96a96fa1..b96a96fa1 100755..100644
--- a/view/theme/testbubble/photo-menu.jpg
+++ b/view/theme/testbubble/photo-menu.jpg
diff --git a/view/theme/testbubble/photo_album.tpl b/view/theme/testbubble/photo_album.tpl
index a0e3f46c4..a0e3f46c4 100755..100644
--- a/view/theme/testbubble/photo_album.tpl
+++ b/view/theme/testbubble/photo_album.tpl
diff --git a/view/theme/testbubble/photo_top.tpl b/view/theme/testbubble/photo_top.tpl
index 48a546a16..48a546a16 100755..100644
--- a/view/theme/testbubble/photo_top.tpl
+++ b/view/theme/testbubble/photo_top.tpl
diff --git a/view/theme/testbubble/photo_view.tpl b/view/theme/testbubble/photo_view.tpl
index 4c754f597..4c754f597 100755..100644
--- a/view/theme/testbubble/photo_view.tpl
+++ b/view/theme/testbubble/photo_view.tpl
diff --git a/view/theme/testbubble/photography.png b/view/theme/testbubble/photography.png
index 7ec919f2b..7ec919f2b 100755..100644
--- a/view/theme/testbubble/photography.png
+++ b/view/theme/testbubble/photography.png
diff --git a/view/theme/testbubble/premium.png b/view/theme/testbubble/premium.png
index 1ad601c0f..1ad601c0f 100755..100644
--- a/view/theme/testbubble/premium.png
+++ b/view/theme/testbubble/premium.png
diff --git a/view/theme/testbubble/prev.png b/view/theme/testbubble/prev.png
index 0ae6022af..0ae6022af 100755..100644
--- a/view/theme/testbubble/prev.png
+++ b/view/theme/testbubble/prev.png
diff --git a/view/theme/testbubble/profile_entry.tpl b/view/theme/testbubble/profile_entry.tpl
index 5bea298ac..5bea298ac 100755..100644
--- a/view/theme/testbubble/profile_entry.tpl
+++ b/view/theme/testbubble/profile_entry.tpl
diff --git a/view/theme/testbubble/profile_vcard.tpl b/view/theme/testbubble/profile_vcard.tpl
index 0ee6919bc..0ee6919bc 100755..100644
--- a/view/theme/testbubble/profile_vcard.tpl
+++ b/view/theme/testbubble/profile_vcard.tpl
diff --git a/view/theme/testbubble/saved_searches_aside.tpl b/view/theme/testbubble/saved_searches_aside.tpl
index e2aae1e77..e2aae1e77 100755..100644
--- a/view/theme/testbubble/saved_searches_aside.tpl
+++ b/view/theme/testbubble/saved_searches_aside.tpl
diff --git a/view/theme/testbubble/search.png b/view/theme/testbubble/search.png
index 51c428594..51c428594 100755..100644
--- a/view/theme/testbubble/search.png
+++ b/view/theme/testbubble/search.png
diff --git a/view/theme/testbubble/search_item.tpl b/view/theme/testbubble/search_item.tpl
index a0a4ef393..a0a4ef393 100755..100644
--- a/view/theme/testbubble/search_item.tpl
+++ b/view/theme/testbubble/search_item.tpl
diff --git a/view/theme/testbubble/star.png b/view/theme/testbubble/star.png
index a327ba14e..a327ba14e 100755..100644
--- a/view/theme/testbubble/star.png
+++ b/view/theme/testbubble/star.png
diff --git a/view/theme/testbubble/style.css b/view/theme/testbubble/style.css
index 1e63c7ef6..1e63c7ef6 100755..100644
--- a/view/theme/testbubble/style.css
+++ b/view/theme/testbubble/style.css
diff --git a/view/theme/testbubble/user.png b/view/theme/testbubble/user.png
index df899e7e0..df899e7e0 100755..100644
--- a/view/theme/testbubble/user.png
+++ b/view/theme/testbubble/user.png
diff --git a/view/theme/testbubble/wall_item.tpl b/view/theme/testbubble/wall_item.tpl
index 44491d967..44491d967 100755..100644
--- a/view/theme/testbubble/wall_item.tpl
+++ b/view/theme/testbubble/wall_item.tpl
diff --git a/view/theme/testbubble/wallwall_item.tpl b/view/theme/testbubble/wallwall_item.tpl
index eb7c3ddba..eb7c3ddba 100755..100644
--- a/view/theme/testbubble/wallwall_item.tpl
+++ b/view/theme/testbubble/wallwall_item.tpl
diff --git a/view/theme/three-d/screenshot.jpg b/view/theme/three-d/screenshot.jpg
deleted file mode 100644
index c3f8e85dc..000000000
--- a/view/theme/three-d/screenshot.jpg
+++ /dev/null
diff --git a/view/theme/three-d/style.css b/view/theme/three-d/style.css
deleted file mode 100755
index ca3f6786d..000000000
--- a/view/theme/three-d/style.css
+++ /dev/null
@@ -1,35 +0,0 @@
-@import url('../loozah/style.css');
-
-.error-message {
-	-moz-box-shadow: 5px 5px 5px #888888;
-	-webkit-box-shadow: 5px 5px 5px #888888;
-	box-shadow: 5px 5px 5px #888888;
-	-ms-filter: "progid:DXImageTransform.Microsoft.Shadow(Strength=5, Direction=135, Color='#888888')";
-	filter: progid:DXImageTransform.Microsoft.Shadow(Strength=5, Direction=135, Color='#888888');
-
-}
-
-.nav-link {
-	-moz-box-shadow: 5px 5px 5px #888888;
-	-webkit-box-shadow: 5px 5px 5px #888888;
-	box-shadow: 5px 5px 5px #888888;
-	-ms-filter: "progid:DXImageTransform.Microsoft.Shadow(Strength=5, Direction=135, Color='#888888')";
-	filter: progid:DXImageTransform.Microsoft.Shadow(Strength=5, Direction=135, Color='#888888');
-}
-
-.nav-commlink {
-	-moz-box-shadow: 5px 5px 5px #888888;
-	-webkit-box-shadow: 5px 5px 5px #888888;
-	box-shadow: 5px 5px 5px #888888;
-	-ms-filter: "progid:DXImageTransform.Microsoft.Shadow(Strength=5, Direction=135, Color='#888888')";
-	filter: progid:DXImageTransform.Microsoft.Shadow(Strength=5, Direction=135, Color='#888888');
-
-}
-
-.tab {
-	-moz-box-shadow: 5px 5px 5px #888888;
-	-webkit-box-shadow: 5px 5px 5px #888888;
-	box-shadow: 5px 5px 5px #888888;
-	-ms-filter: "progid:DXImageTransform.Microsoft.Shadow(Strength=5, Direction=135, Color='#888888')";
-	filter: progid:DXImageTransform.Microsoft.Shadow(Strength=5, Direction=135, Color='#888888');
-}
diff --git a/view/theme/three-d/theme.php b/view/theme/three-d/theme.php
deleted file mode 100755
index 47b43cf13..000000000
--- a/view/theme/three-d/theme.php
+++ /dev/null
@@ -1,4 +0,0 @@
-<?php
-$a->theme_info = array(
-  'extends' => 'loozah',
-);
diff --git a/view/theme/vier/calendar.png b/view/theme/vier/calendar.png
index 705a75b8a..705a75b8a 100755..100644
--- a/view/theme/vier/calendar.png
+++ b/view/theme/vier/calendar.png
diff --git a/view/theme/vier/contact_template.tpl b/view/theme/vier/contact_template.tpl
index 48930b48a..48930b48a 100755..100644
--- a/view/theme/vier/contact_template.tpl
+++ b/view/theme/vier/contact_template.tpl
diff --git a/view/theme/vier/nav.tpl b/view/theme/vier/nav.tpl
index 8c872864c..8c872864c 100755..100644
--- a/view/theme/vier/nav.tpl
+++ b/view/theme/vier/nav.tpl
diff --git a/view/theme/vier/search_item.tpl b/view/theme/vier/search_item.tpl
index fb87d7661..fb87d7661 100755..100644
--- a/view/theme/vier/search_item.tpl
+++ b/view/theme/vier/search_item.tpl
diff --git a/view/theme/vier/style.css b/view/theme/vier/style.css
index 39f4ffea4..d8130e59f 100644
--- a/view/theme/vier/style.css
+++ b/view/theme/vier/style.css
@@ -108,6 +108,7 @@
 
 .tools 		{ background-position: -50px  -40px;}
 .lock 		{ background-position: -70px  -40px;}
+.unlock 	{ background-position: -90px  -40px;}
 
 .video          { background-position: -110px -40px;}
 .youtube        { background-position: -130px -40px;}
@@ -139,8 +140,8 @@
 
 .icon {
   display: block;
-  width: 20px;
-  height: 20px;
+  width: 18px;
+  height: 18px;
   background-image: url('icons.png');
 }
 
@@ -415,17 +416,21 @@ code {
 	background: #EEE;
 }
 .tool .label {
-  float: left;
+/*  float: left; */
 }
 .tool .action {
   float: right;
 }
 .tool a {
-  color: #000;
+/*  color: #000; */
 }
 .tool a:hover {
-  text-decoration: none;
+  text-decoration: underline;
+}
+.sidebar-group-element {
+/*  color: #000; */
 }
+
 /* popup notifications */
 div.jGrowl div.notice {
   background: #511919 url("../../../images/icons/48/notice.png") no-repeat 5px center;
@@ -604,6 +609,10 @@ nav #nav-apps-link.selected {
 	padding: 5px 10px; */
 }
 
+.notify-seen {
+        background: none repeat scroll 0 0 #DDDDDD;
+        }
+
 ul.menu-popup {
   position: absolute;
   display: none;
@@ -970,6 +979,7 @@ section {
   margin-bottom: 1px;
 }
 .wall-item-container .wall-item-actions-social a {
+  float: left;
   margin-right: 1em;
 }
 .wall-item-container .wall-item-actions-tools {
@@ -1244,7 +1254,8 @@ section {
 #jot #jot-tools li.loading img {
   margin-top: 10px;
 }
-#jot #jot-title {
+/* #jot */
+#jot-title {
   border: 0px;
   margin: 0px;
   height: 20px;
@@ -1272,6 +1283,56 @@ section {
   line-height: 20px;
   padding-right: 20px;
 }
+
+#profile-jot-submit {
+  float: right;
+  margin-left: 15px;
+}
+#profile-upload-wrapper {
+  float: left;
+  margin-left: 15px;
+}
+#profile-attach-wrapper {
+  float: left;
+  margin-left: 15px;
+}
+#profile-link-wrapper {
+  float: left;
+  margin-left: 15px;
+}
+#profile-video-wrapper {
+  float: left;
+  margin-left: 15px;
+}
+#profile-audio-wrapper {
+  float: left;
+  margin-left: 15px;
+}
+#profile-location-wrapper {
+  float: left;
+  margin-left: 15px;
+}
+#profile-nolocation-wrapper {
+  float: left;
+  margin-left: 15px;
+}
+#jot-perms-icon {
+  float: right;
+  margin-left: 15px;
+}
+#jot-preview-link {
+  float: right;
+}
+#profile-jot-end {
+  clear: both;
+}
+#profile-jot-text_tbl {
+  width: 800px;
+}
+#profile-jot-wrapper {
+  margin-bottom: 20px;
+}
+
 /** buttons **/
 /*input[type="submit"] {
 	border: 0px;
@@ -1585,6 +1646,12 @@ blockquote {
     border-left: 1px solid #D2D2D2;
     padding-left: 9px;
     margin: 0 0 0 .8ex;
+    color: #777;
+}
+
+.oembed {
+    font-size: large;
+    font-weight: bold;
 }
 
 /* ================== */
diff --git a/view/update_fail_eml.tpl b/view/update_fail_eml.tpl
new file mode 100644
index 000000000..f68a3dece
--- /dev/null
+++ b/view/update_fail_eml.tpl
@@ -0,0 +1,11 @@
+Hey, 

+I'm $sitename.   

+The friendica developers released update $update recently, 

+but when I tried to install it, something went terribly wrong.  

+This needs to be fixed soon and I can't do it alone. Please contact a 

+friendica developer if you can not help me on your own. My database might be invalid. 

+

+The error message is '$error'.   

+

+I'm sorry, 

+your friendica server at $siteurl
\ No newline at end of file
diff --git a/view/viewcontact_template.tpl b/view/viewcontact_template.tpl
index d6f01643e..d6f01643e 100755..100644
--- a/view/viewcontact_template.tpl
+++ b/view/viewcontact_template.tpl
diff --git a/view/wall_item.tpl b/view/wall_item.tpl
index 9d1dd7d70..9d1dd7d70 100755..100644
--- a/view/wall_item.tpl
+++ b/view/wall_item.tpl
diff --git a/view/wallmessage.tpl b/view/wallmessage.tpl
index 66b2bc3a0..66b2bc3a0 100755..100644
--- a/view/wallmessage.tpl
+++ b/view/wallmessage.tpl
diff --git a/view/wallmsg-header.tpl b/view/wallmsg-header.tpl
index cb3922572..cb3922572 100755..100644
--- a/view/wallmsg-header.tpl
+++ b/view/wallmsg-header.tpl
diff --git a/view/wallwall_item.tpl b/view/wallwall_item.tpl
index bad5680c7..bad5680c7 100755..100644
--- a/view/wallwall_item.tpl
+++ b/view/wallwall_item.tpl
diff --git a/view/xrd_diaspora.tpl b/view/xrd_diaspora.tpl
index 25cda533c..25cda533c 100755..100644
--- a/view/xrd_diaspora.tpl
+++ b/view/xrd_diaspora.tpl
diff --git a/view/xrd_host.tpl b/view/xrd_host.tpl
index dbb20256f..dbb20256f 100755..100644
--- a/view/xrd_host.tpl
+++ b/view/xrd_host.tpl
diff --git a/view/xrd_person.tpl b/view/xrd_person.tpl
index a4b921fe1..a4b921fe1 100755..100644
--- a/view/xrd_person.tpl
+++ b/view/xrd_person.tpl